From 3982f4f67314ec37fd9b22ae54049958af777c1b Mon Sep 17 00:00:00 2001 From: jimmydot Date: Sun, 7 May 2017 14:58:24 -0400 Subject: [PATCH] [VID-6] Initial rebase push Change-Id: I9077be9663754d9b22f77c6a7b3109b361b39346 Signed-off-by: jimmydot --- deliveries/pom.xml | 175 +- .../main/docker/assembly/assembly-for-plugin.xml | 62 +- deliveries/src/main/docker/docker-files/Dockerfile | 146 +- .../main/docker/docker-files/docker-compose.yml | 28 +- deliveries/src/main/scripts/localize.sh | 36 +- deliveries/src/main/scripts/localize_asdc.sh | 34 +- deliveries/src/main/scripts/localize_cache.sh | 30 +- deliveries/src/main/scripts/localize_log4j.sh | 38 +- deliveries/src/main/scripts/localize_logback.sh | 32 +- deliveries/src/main/scripts/localize_portal.sh | 44 +- deliveries/src/main/scripts/localize_quartz.sh | 40 +- deliveries/src/main/scripts/localize_system.sh | 80 +- deliveries/src/main/scripts/localize_war.sh | 62 +- epsdk-app-onap/.classpath | 32 + epsdk-app-onap/.project | 42 + epsdk-app-onap/.settings/.jsdtscope | 13 + .../.settings/org.eclipse.core.resources.prefs | 4 + .../.settings/org.eclipse.jdt.core.prefs | 8 + .../.settings/org.eclipse.m2e.core.prefs | 4 + .../.settings/org.eclipse.wst.common.component | 19 + ...eclipse.wst.common.project.facet.core.prefs.xml | 7 + .../org.eclipse.wst.common.project.facet.core.xml | 8 + .../org.eclipse.wst.jsdt.ui.superType.container | 1 + .../org.eclipse.wst.jsdt.ui.superType.name | 1 + .../.settings/org.eclipse.wst.validation.prefs | 2 + epsdk-app-onap/README.md | 60 + epsdk-app-onap/pom.xml | 341 + .../portalapp/conf/ExternalAppConfig.java | 249 + .../portalapp/conf/ExternalAppInitializer.java | 47 + .../portalapp/conf/HibernateMappingLocations.java | 57 + .../portalapp/lm/FusionLicenseManagerImpl.java | 70 + .../portalapp/lm/LicenseableClassImpl.java | 62 + .../portalapp/login/LoginStrategyImpl.java | 70 + .../openecomp/portalapp/scheduler/Register.java | 71 + .../portalapp/scheduler/RegistryAdapter.java | 92 + .../portalapp/service/AdminAuthExtension.java | 64 + epsdk-app-onap/src/main/resources/cache.ccf | 30 + .../src/main/resources/cache_template.ccf | 30 + epsdk-app-onap/src/main/resources/catalog.json | 174 + epsdk-app-onap/src/main/resources/logback.xml | 369 + .../src/main/resources/logback_template.xml | 341 + .../src/main/resources/mchange-log.properties | 23 + epsdk-app-onap/src/main/resources/my.cnf | 192 + .../src/main/resources/portal.properties | 62 + .../src/main/resources/portal_template.properties | 31 + .../src/main/resources/sampleTosca.csar | Bin epsdk-app-onap/src/main/resources/state-rules.drl | 38 + epsdk-app-onap/src/main/resources/vid-data.sql | 349 + epsdk-app-onap/src/main/resources/vid-pre-init.sql | 32 + epsdk-app-onap/src/main/resources/vid-schema.sql | 1272 + epsdk-app-onap/src/main/swm/common/common.sh | 35 + epsdk-app-onap/src/main/swm/common/localize.sh | 33 + .../src/main/swm/common/localize_asdc.sh | 68 + .../src/main/swm/common/localize_cache.sh | 41 + .../src/main/swm/common/localize_log4j.sh | 54 + .../src/main/swm/common/localize_logback.sh | 46 + .../src/main/swm/common/localize_portal.sh | 84 + .../src/main/swm/common/localize_quartz.sh | 67 + .../src/main/swm/common/localize_system.sh | 178 + .../src/main/swm/deinstall/postproc/post_proc | 4 + .../src/main/swm/deinstall/preproc/pre_proc | 4 + epsdk-app-onap/src/main/swm/descriptor.xml | 34 + .../src/main/swm/fallback/postproc/post_proc | 0 .../src/main/swm/fallback/preproc/pre_proc | 0 .../src/main/swm/initinst/postproc/post_proc | 7 + .../src/main/swm/initinst/preproc/pre_proc | 7 + .../src/main/swm/install/postproc/post_proc | 38 + .../src/main/swm/install/preproc/pre_proc | 18 + epsdk-app-onap/src/main/swm/notes.txt | 52 + .../src/main/webapp/WEB-INF/cert/tomcat_keystore | Bin .../src/main/webapp/WEB-INF/conf/asdc.properties | 6 + .../webapp/WEB-INF/conf/asdc_template.properties | 6 + .../src/main/webapp/WEB-INF/conf/quartz.properties | 30 + .../webapp/WEB-INF/conf/quartz_template.properties | 36 + .../src/main/webapp/WEB-INF/conf/raptor.properties | 187 + .../WEB-INF/conf/raptor_app_fusion.properties | 39 + .../WEB-INF/conf/raptor_db_fusion.properties | 19 + .../main/webapp/WEB-INF/conf/raptor_pdf.properties | 49 + .../src/main/webapp/WEB-INF/conf/sql.properties | 322 + .../src/main/webapp/WEB-INF/conf/system.properties | 174 + .../webapp/WEB-INF/conf/system_template.properties | 117 + .../webapp/WEB-INF/fusion/conf/fusion.properties | 42 + .../webapp/WEB-INF/fusion/defs/definitions.xml | 207 + .../main/webapp/WEB-INF/fusion/jsp/ds2/footer.jsp | 17 + .../main/webapp/WEB-INF/fusion/jsp/ds2/header.jsp | 1 + .../webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp | 688 + .../fusion/orm/RNoteBookIntegration.hbm.xml | 44 + epsdk-app-onap/src/main/webapp/WEB-INF/index.jsp | 24 + .../src/main/webapp/WEB-INF/jsp/login.jsp | 95 + .../src/main/webapp/WEB-INF/jsp/serviceModels.jsp | 81 + .../src/main/webapp/WEB-INF/jsp/testMso.jsp | 174 + .../src/main/webapp/WEB-INF/jsp/testViewEdit.jsp | 172 + .../src/main/webapp/WEB-INF/jsp/viewlog.jsp | 33 + .../src/main/webapp/WEB-INF/jsp/welcome.jsp | 45 + epsdk-app-onap/src/main/webapp/WEB-INF/web.xml | 17 + .../external/ebz/angular_js/angular-animate.js | 3721 ++ .../external/ebz/angular_js/angular-cookies-1.4.js | 320 + .../external/ebz/angular_js/angular-cookies.js | 206 + .../external/ebz/angular_js/angular-route.js | 911 + .../external/ebz/angular_js/angular-route.min.js | 14 + .../external/ebz/angular_js/angular-sanitize.js | 647 + .../external/ebz/angular_js/angular-touch.js | 628 + .../app/fusion/external/ebz/angular_js/angular.js | 22024 ++++++++++ .../app/fusion/external/ebz/angular_js/app.js | 6 + .../app/fusion/external/ebz/angular_js/appDS2.js | 5 + .../external/ebz/angular_js/checklist-model.js | 99 + .../external/ebz/angular_js/checklist-model.min.js | 1 + .../app/fusion/external/ebz/angular_js/gestures.js | 1495 + .../app/fusion/external/ebz/angular_js/ng_base.js | 4 + .../external/ebz/angular_js/ui-charts-tpls.js | 3909 ++ .../app/fusion/external/ebz/ebz_header/footer.css | 314 + .../app/fusion/external/ebz/ebz_header/header.css | 1955 + .../external/ebz/ebz_header/icons/Read Me.txt | 5 + .../external/ebz/ebz_header/icons/atticons.ttf | Bin 0 -> 93016 bytes .../external/ebz/ebz_header/icons/atticons.woff | Bin 0 -> 60208 bytes .../fusion/external/ebz/ebz_header/icons/demo.html | 3861 ++ .../ebz/ebz_header/icons/fonts/atticons.eot | Bin 0 -> 93184 bytes .../ebz/ebz_header/icons/fonts/atticons.svg | 304 + .../ebz/ebz_header/icons/fonts/atticons.ttf | Bin 0 -> 93016 bytes .../ebz/ebz_header/icons/fonts/atticons.woff | Bin 0 -> 60208 bytes .../external/ebz/ebz_header/icons/selection.json | 6038 +++ .../fusion/external/ebz/ebz_header/icons/style.css | 907 + .../external/ebz/ebz_header/portal_ebz_header.css | 63 + .../main/webapp/app/fusion/external/ebz/fn-ebz.css | 1691 + .../app/fusion/external/ebz/images/att_logo.png | Bin 0 -> 2827 bytes .../external/ebz/images/footer-attolympiclogo.png | Bin 0 -> 4173 bytes .../fusion/external/ebz/images/headerChatIcon.png | Bin .../external/ebz/images/no_favorites_star.png | Bin .../app/fusion/external/ebz/js/attHeaderSnippet.js | 210 + .../webapp/app/fusion/external/ebz/js/footer.js | 128 + .../fusion/external/ebz/sandbox/att-abs-tpls.js | 20451 +++++++++ .../external/ebz/sandbox/att-abs-tpls.min.js | 22 + .../fonts/glyphicons-halflings-regular.eot | Bin .../sandbox/fonts/glyphicons-halflings-regular.svg | 288 + .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin .../fusion/external/ebz/sandbox/styles/base.css | 1 + .../app/fusion/external/ebz/sandbox/styles/btn.css | 1 + .../clearviewatt/clearviewatt-bold-webfont.eot | Bin 0 -> 23250 bytes .../clearviewatt/clearviewatt-bold-webfont.ttf | Bin 0 -> 49832 bytes .../clearviewatt/clearviewatt-bold-webfont.woff | Bin 0 -> 26344 bytes .../clearviewatt-bolditalic-webfont.eot | Bin 0 -> 25523 bytes .../clearviewatt-bolditalic-webfont.ttf | Bin 0 -> 55292 bytes .../clearviewatt-bolditalic-webfont.woff | Bin 0 -> 28804 bytes .../clearviewatt-bookitalic-webfont.eot | Bin 0 -> 25105 bytes .../clearviewatt-bookitalic-webfont.ttf | Bin 0 -> 56380 bytes .../clearviewatt-bookitalic-webfont.woff | Bin 0 -> 28316 bytes .../clearviewatt/clearviewatt-light-webfont.eot | Bin 0 -> 22778 bytes .../clearviewatt/clearviewatt-light-webfont.ttf | Bin 0 -> 49804 bytes .../clearviewatt/clearviewatt-light-webfont.woff | Bin 0 -> 25740 bytes .../clearviewatt-lightitalic-webfont.eot | Bin 0 -> 25118 bytes .../clearviewatt-lightitalic-webfont.ttf | Bin 0 -> 56324 bytes .../clearviewatt-lightitalic-webfont.woff | Bin 0 -> 28352 bytes .../styles/clearviewatt/clvatt-book-webfont.eot | Bin 0 -> 21098 bytes .../styles/clearviewatt/clvatt-book-webfont.ttf | Bin 0 -> 41936 bytes .../styles/clearviewatt/clvatt-book-webfont.woff | Bin 0 -> 24624 bytes .../fusion/external/ebz/sandbox/styles/demo.css | 2 + .../fusion/external/ebz/sandbox/styles/dtpk.css | 9 + .../fusion/external/ebz/sandbox/styles/frms.css | 1 + .../external/ebz/sandbox/styles/icons/atticons.eot | Bin 0 -> 93184 bytes .../external/ebz/sandbox/styles/icons/atticons.ttf | Bin 0 -> 93016 bytes .../ebz/sandbox/styles/icons/atticons.woff | Bin 0 -> 60208 bytes .../sandbox/styles/icons/full-linear-atticons.eot | Bin 0 -> 122836 bytes .../sandbox/styles/icons/full-linear-atticons.ttf | Bin 0 -> 122620 bytes .../sandbox/styles/icons/full-linear-atticons.woff | Bin 0 -> 122696 bytes .../ebz/sandbox/styles/ie/backgroundsize.min.htc | 12 + .../external/ebz/sandbox/styles/images/bluebar.png | Bin 0 -> 41654 bytes .../ebz/sandbox/styles/images/calendar-icon.png | Bin .../ebz/sandbox/styles/images/checkbox.png | Bin .../external/ebz/sandbox/styles/images/down.png | Bin .../external/ebz/sandbox/styles/images/footer.png | Bin 0 -> 85877 bytes .../ebz/sandbox/styles/images/forms-diagram.png | Bin 0 -> 11148 bytes .../external/ebz/sandbox/styles/images/header.png | Bin 0 -> 137523 bytes .../ebz/sandbox/styles/images/icon-close-modal.png | Bin .../styles/images/icon-informative-modal.png | Bin .../sandbox/styles/images/icon-warning-modal.png | Bin .../external/ebz/sandbox/styles/images/loader.gif | Bin .../styles/images/loading-spinner-medium.png | Bin .../styles/images/loading-spinner-orange.png | Bin .../styles/images/loading_balls_black-small.gif | Bin .../sandbox/styles/images/loading_balls_black.gif | Bin .../styles/images/loading_balls_blue-small.gif | Bin .../sandbox/styles/images/loading_balls_blue.gif | Bin .../styles/images/loading_balls_white-small.gif | Bin .../sandbox/styles/images/loading_balls_white.gif | Bin .../ebz/sandbox/styles/images/loading_counter.png | Bin 0 -> 18179 bytes .../ebz/sandbox/styles/images/loading_dots.gif | Bin .../external/ebz/sandbox/styles/images/logo.png | Bin 0 -> 2212 bytes .../ebz/sandbox/styles/images/magnify_glass.png | Bin .../ebz/sandbox/styles/images/oops-exclamation.png | Bin .../sandbox/styles/images/pill-buttons-diagram.png | Bin 0 -> 15294 bytes .../external/ebz/sandbox/styles/images/radio.jpg | Bin .../ebz/sandbox/styles/images/select-arrows.png | Bin .../ebz/sandbox/styles/images/treearrow.png | Bin .../external/ebz/sandbox/styles/images/up.png | Bin .../ebz/sandbox/styles/images/upanddown.png | Bin .../styles/omnesatt/omnesatt-light-webfont.eot | Bin 0 -> 23180 bytes .../styles/omnesatt/omnesatt-light-webfont.ttf | Bin 0 -> 48116 bytes .../styles/omnesatt/omnesatt-light-webfont.woff | Bin 0 -> 27060 bytes .../omnesatt/omnesatt-lightitalic-webfont.eot | Bin 0 -> 26615 bytes .../omnesatt/omnesatt-lightitalic-webfont.ttf | Bin 0 -> 56172 bytes .../omnesatt/omnesatt-lightitalic-webfont.woff | Bin 0 -> 30812 bytes .../styles/omnesatt/omnesatt-medium-webfont.eot | Bin 0 -> 23197 bytes .../styles/omnesatt/omnesatt-medium-webfont.ttf | Bin 0 -> 47624 bytes .../styles/omnesatt/omnesatt-medium-webfont.woff | Bin 0 -> 27120 bytes .../omnesatt/omnesatt-mediumitalic-webfont.eot | Bin 0 -> 26382 bytes .../omnesatt/omnesatt-mediumitalic-webfont.ttf | Bin 0 -> 55464 bytes .../omnesatt/omnesatt-mediumitalic-webfont.woff | Bin 0 -> 30396 bytes .../styles/omnesatt/omnesatt-regular-webfont.eot | Bin 0 -> 22587 bytes .../styles/omnesatt/omnesatt-regular-webfont.ttf | Bin 0 -> 47228 bytes .../styles/omnesatt/omnesatt-regular-webfont.woff | Bin 0 -> 26408 bytes .../omnesatt/omnesatt-regularitalic-webfont.eot | Bin 0 -> 25687 bytes .../omnesatt/omnesatt-regularitalic-webfont.ttf | Bin 0 -> 55904 bytes .../omnesatt/omnesatt-regularitalic-webfont.woff | Bin 0 -> 29864 bytes .../styles/omnesatt2/omnesatt2-bold-webfont.eot | Bin 0 -> 32077 bytes .../styles/omnesatt2/omnesatt2-bold-webfont.ttf | Bin 0 -> 71564 bytes .../styles/omnesatt2/omnesatt2-bold-webfont.woff | Bin 0 -> 37149 bytes .../omnesatt2/omnesatt2-bolditalic-webfont.eot | Bin 0 -> 31322 bytes .../omnesatt2/omnesatt2-bolditalic-webfont.ttf | Bin 0 -> 68660 bytes .../omnesatt2/omnesatt2-bolditalic-webfont.woff | Bin 0 -> 35986 bytes .../styles/omnesatt2/omnesatt2-light-webfont.eot | Bin 0 -> 32072 bytes .../styles/omnesatt2/omnesatt2-light-webfont.ttf | Bin 0 -> 73968 bytes .../styles/omnesatt2/omnesatt2-light-webfont.woff | Bin 0 -> 37342 bytes .../omnesatt2/omnesatt2-lightitalic-webfont.eot | Bin 0 -> 30983 bytes .../omnesatt2/omnesatt2-lightitalic-webfont.ttf | Bin 0 -> 70088 bytes .../omnesatt2/omnesatt2-lightitalic-webfont.woff | Bin 0 -> 36261 bytes .../styles/omnesatt2/omnesatt2-medium-webfont.eot | Bin 0 -> 28695 bytes .../styles/omnesatt2/omnesatt2-medium-webfont.ttf | Bin 0 -> 65152 bytes .../styles/omnesatt2/omnesatt2-medium-webfont.woff | Bin 0 -> 33641 bytes .../omnesatt2/omnesatt2-mediumitalic-webfont.eot | Bin 0 -> 33730 bytes .../omnesatt2/omnesatt2-mediumitalic-webfont.ttf | Bin 0 -> 77508 bytes .../omnesatt2/omnesatt2-mediumitalic-webfont.woff | Bin 0 -> 39182 bytes .../styles/omnesatt2/omnesatt2-regular-webfont.eot | Bin 0 -> 30321 bytes .../styles/omnesatt2/omnesatt2-regular-webfont.ttf | Bin 0 -> 71692 bytes .../omnesatt2/omnesatt2-regular-webfont.woff | Bin 0 -> 35610 bytes .../omnesatt2/omnesatt2-regularitalic-webfont.eot | Bin 0 -> 32079 bytes .../omnesatt2/omnesatt2-regularitalic-webfont.ttf | Bin 0 -> 76564 bytes .../omnesatt2/omnesatt2-regularitalic-webfont.woff | Bin 0 -> 37872 bytes .../ebz/sandbox/styles/pages/iconography.css | 2 + .../fusion/external/ebz/sandbox/styles/sldr.css | 1 + .../fusion/external/ebz/sandbox/styles/style.css | 1 + .../app/fusion/external/ebz/sandbox/styles/tbs.css | 1 + .../DS2-controllers/ds-profile/post-controller.js | 3 + .../scripts/DS2-controllers/samplePage-route.js | 19 + .../app/fusion/scripts/DS2-services/postSearch.js | 5 + .../scripts/DS2-view-models/ds2-profile/post.html | 3 + .../ds2-profile/profile_searchDS2.html | 59 + .../DS2-view-models/ds2-profile/self_profile.html | 189 + .../ds2-samplePages/samplePage.html | 63 + .../app/fusion/scripts/DS2-view-models/footer.html | 13 + .../app/fusion/scripts/utils/page-resource-ds2.js | 97 + .../app/fusion/scripts/view-models/footer.html | 17 + .../css/att_angular_gridster/sandbox-gridster.css | 173 + .../css/att_angular_gridster/ui-gridster.css | 116 + .../main/webapp/static/fusion/css/fusion-sunny.css | 362 + .../webapp/static/fusion/images/ATT_Labs_Logo.png | Bin 0 -> 45492 bytes .../webapp/static/fusion/images/Logo_att_labs.png | Bin .../main/webapp/static}/fusion/images/Rlogo.jpg | Bin .../webapp/static}/fusion/images/action_icon.png | Bin .../static}/fusion/images/action_list_spacer.gif | Bin .../main/webapp/static}/fusion/images/active.png | Bin .../src/main/webapp/static}/fusion/images/add.png | Bin .../static}/fusion/images/add_tool_button.png | Bin .../main/webapp/static}/fusion/images/addicon.png | Bin .../fusion/images/application_window_bg.jpg | Bin .../webapp/static}/fusion/images/arrow-next.png | Bin .../webapp/static}/fusion/images/arrow-prev.png | Bin .../fusion/images/att_angular_gridster/grips.png | Bin .../main/webapp/static/fusion/images/att_logo.png | Bin 0 -> 2827 bytes .../webapp/static}/fusion/images/backButton.png | Bin .../main/webapp/static}/fusion/images/blank.gif | Bin .../webapp/static}/fusion/images/blueButton.png | Bin .../webapp/static}/fusion/images/body_graphic.jpg | Bin .../main/webapp/static}/fusion/images/bubble.png | Bin .../main/webapp/static}/fusion/images/cache.png | Bin .../main/webapp/static}/fusion/images/calendar.gif | Bin .../main/webapp/static}/fusion/images/chevron.png | Bin .../static}/fusion/images/close_container.gif | Bin .../static}/fusion/images/collapsed-icon.png | Bin .../webapp/static}/fusion/images/column-bg.png | Bin .../static}/fusion/images/copyicon-highlighted.png | Bin .../main/webapp/static}/fusion/images/copyicon.png | Bin .../main/webapp/static}/fusion/images/csv_icon.jpg | Bin .../main/webapp/static}/fusion/images/csv_icon.png | Bin .../webapp/static}/fusion/images/customers-add.png | Bin .../static}/fusion/images/customers-search.png | Bin .../webapp/static}/fusion/images/customers.png | Bin .../webapp/static}/fusion/images/decrypted.png | Bin .../fusion/images/deleteicon-highlighted.gif | Bin .../fusion/images/deleteicon-highlighted.png | Bin .../webapp/static}/fusion/images/deleteicon.gif | Bin .../static/fusion/images/ecomp-login-550x360.jpg | Bin 0 -> 62502 bytes .../webapp/static/fusion/images/ecomp-login.jpg | Bin 0 -> 21266 bytes .../src/main/webapp/static/fusion/images/ecomp.png | Bin .../webapp/static/fusion/images/ecomp_trans.png | Bin .../main/webapp/static}/fusion/images/editicon.gif | Bin .../webapp/static}/fusion/images/error_type.gif | Bin .../webapp/static}/fusion/images/example-frame.png | Bin .../static}/fusion/images/excelicon_multi.gif | Bin .../webapp/static}/fusion/images/executeicon.png | Bin .../webapp/static}/fusion/images/expanded-icon.png | Bin .../main/webapp/static}/fusion/images/file-add.png | Bin .../webapp/static}/fusion/images/file_import.png | Bin .../webapp/static}/fusion/images/file_save-all.png | Bin .../webapp/static}/fusion/images/filter_icon.png | Bin .../webapp/static}/fusion/images/folder_add.png | Bin .../webapp/static}/fusion/images/folder_closed.png | Bin .../webapp/static}/fusion/images/folder_delete.png | Bin .../webapp/static}/fusion/images/folder_edit.png | Bin .../webapp/static}/fusion/images/folder_open.png | Bin .../webapp/static}/fusion/images/folder_user.png | Bin .../main/webapp/static}/fusion/images/funnel.png | Bin .../main/webapp/static}/fusion/images/fusion.gif | Bin .../webapp/static}/fusion/images/grayButton.png | Bin .../static}/fusion/images/gray_add_tool_button.png | Bin .../static}/fusion/images/headerChatIcon.png | Bin .../static}/fusion/images/icon_remove_all.gif | Bin .../main/webapp/static}/fusion/images/inactive.png | Bin .../webapp/static}/fusion/images/info_type.gif | Bin .../webapp/static}/fusion/images/leftButton.png | Bin .../main/webapp/static}/fusion/images/loading.gif | Bin .../webapp/static}/fusion/images/loading_bar.gif | Bin .../webapp/static}/fusion/images/login_button.gif | Bin .../main/webapp/static/fusion/images/logo_att.jpg | Bin .../static/fusion/images/logo_att_header.jpg | Bin .../static/fusion/images/logo_att_header.png | Bin .../webapp/static/fusion/images/logo_header.png | Bin .../src/main/webapp/static}/fusion/images/m1.gif | Bin .../src/main/webapp/static}/fusion/images/mail.png | Bin .../src/main/webapp/static}/fusion/images/map.png | Bin .../webapp/static}/fusion/images/menu/bubble.png | Bin .../static}/fusion/images/menu/file_import.png | Bin .../static}/fusion/images/menu/file_save-all.png | Bin .../webapp/static}/fusion/images/menu/mail.png | Bin .../webapp/static}/fusion/images/menu/profile.png | Bin .../static}/fusion/images/menu/speechbubble.png | Bin .../webapp/static}/fusion/images/menu/users.png | Bin .../main/webapp/static}/fusion/images/minus.gif | Bin .../fusion/images/mobile_logo_att_header_black.png | Bin .../fusion/images/mobile_logo_att_header_grey.png | Bin .../images/mobile_logo_att_header_horizontal.png | Bin .../fusion/images/mobile_logo_att_header_white.png | Bin .../webapp/static}/fusion/images/modify_icon.gif | Bin .../static/fusion/images/no_favorites_star.png | Bin .../main/webapp/static}/fusion/images/note-add.png | Bin .../webapp/static}/fusion/images/note-search.png | Bin .../src/main/webapp/static}/fusion/images/note.png | Bin .../main/webapp/static}/fusion/images/notes.png | Bin .../main/webapp/static}/fusion/images/offline.png | Bin .../webapp/static}/fusion/images/offlineMsg.gif | Bin .../main/webapp/static}/fusion/images/online.png | Bin .../src/main/webapp/static}/fusion/images/page.gif | Bin .../webapp/static}/fusion/images/pagination.png | Bin .../static/fusion/images}/panel-e-w-toggle.png | Bin .../static/fusion/images}/panel-n-s-toggle.png | Bin .../src/main/webapp/static}/fusion/images/pix.gif | Bin .../src/main/webapp/static}/fusion/images/plus.gif | Bin .../main/webapp/static}/fusion/images/printer.gif | Bin .../main/webapp/static}/fusion/images/profile.png | Bin .../webapp/static}/fusion/images/report-add.png | Bin .../static}/fusion/images/report-favorite.png | Bin .../webapp/static}/fusion/images/report-my.png | Bin .../webapp/static}/fusion/images/report-public.png | Bin .../main/webapp/static}/fusion/images/report.png | Bin .../main/webapp/static}/fusion/images/reports.png | Bin .../static}/fusion/images/results-first-active.png | Bin .../fusion/images/results-first-disabled.png | Bin .../static}/fusion/images/results-last-active.png | Bin .../fusion/images/results-last-disabled.png | Bin .../static}/fusion/images/results-next-active.png | Bin .../fusion/images/results-next-disabled.png | Bin .../static}/fusion/images/results-prev-active.png | Bin .../fusion/images/results-prev-disabled.png | Bin .../static}/fusion/images/resultset_last.png | Bin .../static}/fusion/images/resultset_previous.png | Bin .../webapp/static}/fusion/images/return_to_top.gif | Bin .../webapp/static}/fusion/images/rightButton.png | Bin .../main/webapp/static}/fusion/images/search.png | Bin .../static}/fusion/images/search_profile.png | Bin .../main/webapp/static}/fusion/images/sort_asc.gif | Bin .../webapp/static}/fusion/images/sort_desc.gif | Bin .../main/webapp/static}/fusion/images/spacer.gif | Bin .../webapp/static}/fusion/images/success_type.gif | Bin .../main/webapp/static}/fusion/images/swoosh.gif | Bin .../main/webapp/static}/fusion/images/tab-hm.png | Bin .../main/webapp/static}/fusion/images/tab-v-hm.png | Bin .../src/main/webapp/static}/fusion/images/tab.png | Bin .../webapp/static}/fusion/images/table-add.png | Bin .../webapp/static}/fusion/images/table-delete.png | Bin .../webapp/static}/fusion/images/table-edit.png | Bin .../main/webapp/static}/fusion/images/table.png | Bin .../main/webapp/static}/fusion/images/tabs-bg.png | Bin .../webapp/static}/fusion/images/toolButton.gif | Bin .../webapp/static}/fusion/images/toolButton.png | Bin .../main/webapp/static}/fusion/images/toolbar.png | Bin .../main/webapp/static}/fusion/images/users.png | Bin .../webapp/static}/fusion/images/warning_type.gif | Bin .../main/webapp/static}/fusion/images/webphone.ico | Bin .../webapp/static}/fusion/images/whiteButton.png | Bin .../js/att_angular_gridster/angular-gridster.js | 2244 + .../js/att_angular_gridster/ui-gridster-tpls.js | 168 + lf_config/vid-pre-init.sql | 64 +- pom.xml | 432 +- vid-app-common/.classpath | 43 + vid-app-common/.project | 42 + vid-app-common/.settings/.jsdtscope | 13 + .../.settings/org.eclipse.core.resources.prefs | 5 + .../.settings/org.eclipse.jdt.core.prefs | 8 + .../.settings/org.eclipse.m2e.core.prefs | 4 + .../.settings/org.eclipse.wst.common.component | 18 + ...eclipse.wst.common.project.facet.core.prefs.xml | 7 + .../org.eclipse.wst.common.project.facet.core.xml | 8 + .../org.eclipse.wst.jsdt.ui.superType.container | 1 + .../org.eclipse.wst.jsdt.ui.superType.name | 1 + .../.settings/org.eclipse.wst.validation.prefs | 2 + vid-app-common/pom.xml | 392 + .../java/org/openecomp/aai/util/AAIProperties.java | 68 + .../org/openecomp/aai/util/AAIRestInterface.java | 303 + .../aai/util/CustomJacksonJaxBJsonProvider.java | 73 + .../org/openecomp/aai/util/HttpsAuthClient.java | 140 + .../openecomp/aai/util/HttpsComponentsClient.java | 99 + .../JettyObfuscationConversionCommandLineUtil.java | 78 + .../openecomp/vid/asdc/AsdcCatalogException.java | 58 + .../java/org/openecomp/vid/asdc/AsdcClient.java | 128 + .../org/openecomp/vid/asdc/beans/Artifact.java | 314 + .../org/openecomp/vid/asdc/beans/Resource.java | 429 + .../java/org/openecomp/vid/asdc/beans/Service.java | 351 + .../org/openecomp/vid/asdc/beans/SubResource.java | 175 + .../openecomp/vid/asdc/beans/tosca/Capability.java | 140 + .../openecomp/vid/asdc/beans/tosca/Constraint.java | 199 + .../org/openecomp/vid/asdc/beans/tosca/Group.java | 135 + .../org/openecomp/vid/asdc/beans/tosca/Import.java | 48 + .../org/openecomp/vid/asdc/beans/tosca/Input.java | 166 + .../vid/asdc/beans/tosca/NodeTemplate.java | 117 + .../openecomp/vid/asdc/beans/tosca/Property.java | 157 + .../vid/asdc/beans/tosca/Requirement.java | 120 + .../org/openecomp/vid/asdc/beans/tosca/Schema.java | 53 + .../vid/asdc/beans/tosca/SubstitutionMappings.java | 101 + .../vid/asdc/beans/tosca/TopologyTemplate.java | 124 + .../openecomp/vid/asdc/beans/tosca/ToscaCsar.java | 101 + .../openecomp/vid/asdc/beans/tosca/ToscaMeta.java | 122 + .../vid/asdc/beans/tosca/ToscaMetadata.java | 461 + .../openecomp/vid/asdc/beans/tosca/ToscaModel.java | 166 + .../vid/asdc/memory/InMemoryAsdcClient.java | 372 + .../openecomp/vid/asdc/rest/RestfulAsdcClient.java | 462 + .../org/openecomp/vid/client/HttpBasicClient.java | 67 + .../org/openecomp/vid/client/HttpsBasicClient.java | 143 + .../openecomp/vid/controller/AaiController.java | 864 + .../controller/BrowseServiceTypesController.java | 87 + .../vid/controller/HealthCheckController.java | 196 + .../openecomp/vid/controller/MsoController.java | 761 + .../vid/controller/PropertyController.java | 122 + .../openecomp/vid/controller/VidController.java | 351 + .../vid/controller/VidHomeController.java | 79 + .../vid/controller/ViewEditSubController.java | 107 + .../vid/controller/ViewLogController.java | 84 + .../vid/controller/test/TestAaiController.java | 93 + .../vid/controller/test/TestAsdcController.java | 112 + .../vid/controller/test/TestMsoController.java | 729 + .../vid/controller/test/TestPageController.java | 57 + .../java/org/openecomp/vid/dao/FnAppDoaImpl.java | 112 + .../java/org/openecomp/vid/dao/ProfileDao.java | 45 + .../exceptions/VidServiceUnavailableException.java | 69 + .../org/openecomp/vid/model/CommandProperty.java | 93 + .../org/openecomp/vid/model/ExceptionResponse.java | 70 + .../org/openecomp/vid/model/ModelConstants.java | 42 + .../main/java/org/openecomp/vid/model/Network.java | 62 + .../main/java/org/openecomp/vid/model/Node.java | 301 + .../java/org/openecomp/vid/model/Resource.java | 28 + .../main/java/org/openecomp/vid/model/Result.java | 58 + .../main/java/org/openecomp/vid/model/Service.java | 253 + .../java/org/openecomp/vid/model/ServiceModel.java | 261 + .../src/main/java/org/openecomp/vid/model/VNF.java | 165 + .../java/org/openecomp/vid/model/VfModule.java | 308 + .../java/org/openecomp/vid/model/VolumeGroup.java | 196 + .../java/org/openecomp/vid/mso/MsoProperties.java | 100 + .../org/openecomp/vid/mso/MsoResponseWrapper.java | 107 + .../java/org/openecomp/vid/mso/MsoRestInt.java | 71 + .../org/openecomp/vid/mso/MsoRestInterface.java | 290 + .../openecomp/vid/mso/MsoRestInterfaceFactory.java | 48 + .../org/openecomp/vid/mso/MsoRestInterfaceIfc.java | 79 + .../main/java/org/openecomp/vid/mso/MsoUtil.java | 125 + .../java/org/openecomp/vid/mso/RestObject.java | 68 + .../openecomp/vid/mso/rest/AsyncRequestStatus.java | 123 + .../openecomp/vid/mso/rest/RelatedInstance.java | 125 + .../org/openecomp/vid/mso/rest/RelatedModel.java | 121 + .../java/org/openecomp/vid/mso/rest/Request.java | 140 + .../org/openecomp/vid/mso/rest/RequestDetails.java | 233 + .../org/openecomp/vid/mso/rest/RequestList.java | 137 + .../vid/properties/AsdcClientConfiguration.java | 116 + .../openecomp/vid/properties/VidProperties.java | 93 + .../src/main/resources/json/mso/asyncRequestStatus | 54 + .../src/main/resources/json/mso/cloudConfiguration | 19 + .../src/main/resources/json/mso/instanceIds | 29 + .../src/main/resources/json/mso/modelInfo | 41 + .../src/main/resources/json/mso/relatedInstance | 16 + .../src/main/resources/json/mso/relatedModel | 15 + vid-app-common/src/main/resources/json/mso/request | 45 + .../src/main/resources/json/mso/requestDetails | 13 + .../src/main/resources/json/mso/requestError | 27 + .../src/main/resources/json/mso/requestInfo | 44 + .../src/main/resources/json/mso/requestParameters | 23 + .../src/main/resources/json/mso/requestReferences | 18 + .../src/main/resources/json/mso/requestStatus | 37 + .../src/main/resources/json/mso/response | 13 + .../src/main/resources/json/mso/subscriberInfo | 19 + .../src/main/webapp/META-INF/MANIFEST.MF | 3 + .../src/main/webapp/WEB-INF/defs/definitions.xml | 53 + .../webapp/WEB-INF/fusion/defs/definitions.xml | 279 + vid-app-common/src/main/webapp/WEB-INF/web.xml | 17 + .../src/main/webapp/app/vid/icons/7450-icon.png | Bin .../src/main/webapp/app/vid/icons/7450-text.png | Bin .../src/main/webapp/app/vid/icons/7750-icon.png | Bin .../src/main/webapp/app/vid/icons/7750-text.png | Bin .../src/main/webapp/app/vid/icons/apn-dns-icon.png | Bin .../src/main/webapp/app/vid/icons/apn-dns-text.png | Bin .../src/main/webapp/app/vid/icons/atcf-icon.png | Bin .../src/main/webapp/app/vid/icons/atcf-text.png | Bin .../src/main/webapp/app/vid/icons/atgw-icon.png | Bin .../src/main/webapp/app/vid/icons/atgw-text.png | Bin .../src/main/webapp/app/vid/icons/bgcf-icon.png | Bin .../src/main/webapp/app/vid/icons/bgcf-text.png | Bin .../src/main/webapp/app/vid/icons/com-icon.png | Bin .../src/main/webapp/app/vid/icons/cpm-icon.png | Bin .../src/main/webapp/app/vid/icons/cpm-text.png | Bin .../src/main/webapp/app/vid/icons/default-icon.png | Bin .../src/main/webapp/app/vid/icons/dra-epc-icon.png | Bin .../src/main/webapp/app/vid/icons/dra-epc-text.png | Bin .../src/main/webapp/app/vid/icons/dra-ims-icon.png | Bin .../src/main/webapp/app/vid/icons/dra-ims-text.png | Bin .../src/main/webapp/app/vid/icons/dslam-icon.png | Bin .../src/main/webapp/app/vid/icons/dslam-text.png | Bin .../src/main/webapp/app/vid/icons/eatf-icon.png | Bin .../src/main/webapp/app/vid/icons/eatf-text.png | Bin .../src/main/webapp/app/vid/icons/ecscf-icon.png | Bin .../src/main/webapp/app/vid/icons/ecscf-text.png | Bin .../src/main/webapp/app/vid/icons/emsc-icon.png | Bin .../src/main/webapp/app/vid/icons/enb-icon.png | Bin .../src/main/webapp/app/vid/icons/enb-text.png | Bin .../src/main/webapp/app/vid/icons/enum-icon.png | Bin .../src/main/webapp/app/vid/icons/enum-text.png | Bin .../src/main/webapp/app/vid/icons/esmlc-icon.png | Bin .../src/main/webapp/app/vid/icons/esmlc-text.png | Bin .../src/main/webapp/app/vid/icons/ettcs-icon.png | Bin .../src/main/webapp/app/vid/icons/ettcs-text.png | Bin .../src/main/webapp/app/vid/icons/gmlc-icon.png | Bin .../src/main/webapp/app/vid/icons/gmlc-text.png | Bin .../src/main/webapp/app/vid/icons/hlr-icon.png | Bin .../src/main/webapp/app/vid/icons/hlr-text.png | Bin .../src/main/webapp/app/vid/icons/hss-epc-icon.png | Bin .../src/main/webapp/app/vid/icons/hss-epc-text.png | Bin .../src/main/webapp/app/vid/icons/hss-ims-icon.png | Bin .../src/main/webapp/app/vid/icons/hss-ims-text.png | Bin .../src/main/webapp/app/vid/icons/icscf-icon.png | Bin .../src/main/webapp/app/vid/icons/icscf-text.png | Bin .../src/main/webapp/app/vid/icons/ipag-icon.png | Bin .../src/main/webapp/app/vid/icons/ipag-text.png | Bin .../src/main/webapp/app/vid/icons/isbc-icon.png | Bin .../src/main/webapp/app/vid/icons/isbc-text.png | Bin .../src/main/webapp/app/vid/icons/iwf-icon.png | Bin .../src/main/webapp/app/vid/icons/iwf-text.png | Bin .../src/main/webapp/app/vid/icons/lrf-rdf-icon.png | Bin .../src/main/webapp/app/vid/icons/lrf-rdf-text.png | Bin .../src/main/webapp/app/vid/icons/lrg-rdf-text.png | Bin .../src/main/webapp/app/vid/icons/mgc8-icon.png | Bin .../src/main/webapp/app/vid/icons/mgc8-text.png | Bin .../main/webapp/app/vid/icons/mgcf-emsc-icon.png | Bin .../main/webapp/app/vid/icons/mgcf-emsc-text.png | Bin .../src/main/webapp/app/vid/icons/mgw-icon.png | Bin .../src/main/webapp/app/vid/icons/mgw-text.png | Bin .../src/main/webapp/app/vid/icons/mind-icon.png | Bin .../src/main/webapp/app/vid/icons/mind-text.png | Bin .../src/main/webapp/app/vid/icons/mme-icon.png | Bin .../src/main/webapp/app/vid/icons/mme-text.png | Bin .../src/main/webapp/app/vid/icons/mrf-icon.png | Bin .../src/main/webapp/app/vid/icons/mrf-text.png | Bin .../src/main/webapp/app/vid/icons/msc-icon.png | Bin .../src/main/webapp/app/vid/icons/msn-icon.png | Bin .../src/main/webapp/app/vid/icons/msn-text.png | Bin .../src/main/webapp/app/vid/icons/multi-icon.png | Bin .../src/main/webapp/app/vid/icons/n7450-icon.png | Bin .../src/main/webapp/app/vid/icons/n7450-text.png | Bin .../src/main/webapp/app/vid/icons/n7750a-icon.png | Bin .../src/main/webapp/app/vid/icons/n7750a-text.png | Bin .../src/main/webapp/app/vid/icons/n7750b-icon.png | Bin .../src/main/webapp/app/vid/icons/n7750b-text.png | Bin .../src/main/webapp/app/vid/icons/n7750c-icon.png | Bin .../src/main/webapp/app/vid/icons/n7750c-text.png | Bin .../src/main/webapp/app/vid/icons/n7750d-icon.png | Bin .../src/main/webapp/app/vid/icons/n7750d-text.png | Bin .../src/main/webapp/app/vid/icons/nb-icon.png | Bin .../src/main/webapp/app/vid/icons/nb-text.png | Bin .../src/main/webapp/app/vid/icons/pas-icon.png | Bin .../src/main/webapp/app/vid/icons/pas-text.png | Bin .../src/main/webapp/app/vid/icons/pcef-icon.png | Bin .../src/main/webapp/app/vid/icons/pcef-text.png | Bin .../src/main/webapp/app/vid/icons/pcrf-icon.png | Bin .../src/main/webapp/app/vid/icons/pcrf-text.png | Bin .../src/main/webapp/app/vid/icons/pcscf-icon.png | Bin .../src/main/webapp/app/vid/icons/pcscf-text.png | Bin .../src/main/webapp/app/vid/icons/pgw-icon.png | Bin .../src/main/webapp/app/vid/icons/pgw-text.png | Bin .../src/main/webapp/app/vid/icons/plrf-icon.png | Bin .../src/main/webapp/app/vid/icons/plrf-text.png | Bin .../src/main/webapp/app/vid/icons/psap-icon.png | Bin .../main/webapp/app/vid/icons/pstn-tdm-icon.png | Bin .../main/webapp/app/vid/icons/pstn-tdm-text.png | Bin .../src/main/webapp/app/vid/icons/rg-icon.png | Bin .../src/main/webapp/app/vid/icons/rg-text.png | Bin .../src/main/webapp/app/vid/icons/rnc-icon.png | Bin .../src/main/webapp/app/vid/icons/rnc-text.png | Bin .../src/main/webapp/app/vid/icons/sbc-icon.png | Bin .../src/main/webapp/app/vid/icons/sbc-text.png | Bin .../src/main/webapp/app/vid/icons/sccas-icon.png | Bin .../src/main/webapp/app/vid/icons/sccas-text.png | Bin .../src/main/webapp/app/vid/icons/scscf-icon.png | Bin .../src/main/webapp/app/vid/icons/scscf-text.png | Bin .../src/main/webapp/app/vid/icons/sdg-icon.png | Bin .../src/main/webapp/app/vid/icons/sdg-text.png | Bin .../src/main/webapp/app/vid/icons/sgsns4-icon.png | Bin .../src/main/webapp/app/vid/icons/sgsns4-text.png | Bin .../src/main/webapp/app/vid/icons/sgw-icon.png | Bin .../src/main/webapp/app/vid/icons/sgw-text.png | Bin .../src/main/webapp/app/vid/icons/siad-icon.png | Bin .../src/main/webapp/app/vid/icons/siad-text.png | Bin .../main/webapp/app/vid/icons/ss7-gport-icon.png | Bin .../main/webapp/app/vid/icons/ss7-gport-text.png | Bin .../main/webapp/app/vid/icons/ss7gport-icon.png | Bin .../main/webapp/app/vid/icons/ss7gport-text.png | Bin .../src/main/webapp/app/vid/icons/switch-icon.png | Bin .../src/main/webapp/app/vid/icons/tas-icon.png | Bin .../src/main/webapp/app/vid/icons/tas-text.png | Bin .../main/webapp/app/vid/icons/transcoder-icon.png | Bin .../main/webapp/app/vid/icons/transcoder-text.png | Bin .../src/main/webapp/app/vid/icons/ue-icon.png | Bin .../src/main/webapp/app/vid/icons/uephone-icon.png | Bin .../src/main/webapp/app/vid/icons/usp-dns-icon.png | Bin .../src/main/webapp/app/vid/icons/usp-dns-text.png | Bin .../src/main/webapp/app/vid/images/asterisk.png | Bin .../src/main/webapp/app/vid/images}/dummy.txt | 0 .../src/main/webapp/app/vid/images/error.png | Bin .../src/main/webapp/app/vid/images/spinner.gif | Bin .../main/webapp/app/vid/scripts/angular-ui-tree.js | 1656 + .../vid/scripts/constants/componentConstants.js | 148 + .../app/vid/scripts/constants/fieldConstants.js | 378 + .../vid/scripts/constants/parameterConstants.js | 52 + .../app/vid/scripts/constants/vidConfiguration.js | 99 + .../scripts/controller/InstantiationController.js | 1217 + .../scripts/controller/ServiceModelController.js | 227 + .../webapp/app/vid/scripts/controller/VidApp.js | 79 + .../scripts/controller/aaiSubscriberController.js | 821 + .../scripts/controller/creationDialogController.js | 163 + .../scripts/controller/deletionDialogController.js | 119 + .../scripts/controller/detailsDialogController.js | 84 + .../vid/scripts/controller/msoCommitController.js | 300 + .../scripts/controller/statusDialogController.js | 233 + .../app/vid/scripts/controller/subscriberSearch.js | 246 + .../vid/scripts/directives/extensionsDirective.js | 79 + .../scripts/directives/parameterBlockDirective.js | 420 + .../vid/scripts/directives/popupWindowDirective.js | 88 + .../vid/scripts/directives/progressBarDirective.js | 173 + .../webapp/app/vid/scripts/services/aaiService.js | 339 + .../webapp/app/vid/scripts/services/asdcService.js | 40 + .../app/vid/scripts/services/componentService.js | 178 + .../app/vid/scripts/services/creationService.js | 924 + .../webapp/app/vid/scripts/services/dataService.js | 243 + .../app/vid/scripts/services/deletionService.js | 502 + .../app/vid/scripts/services/detailsService.js | 98 + .../webapp/app/vid/scripts/services/msoService.js | 175 + .../app/vid/scripts/services/propertyService.js | 89 + .../app/vid/scripts/services/statusService.js | 185 + .../app/vid/scripts/services/utilityService.js | 640 + .../webapp/app/vid/scripts/services/vnfService.js | 82 + .../app/vid/scripts/view-models/aaiGetSubs.htm | 83 + .../scripts/view-models/aaiGetSubscriberList.htm | 67 + .../vid/scripts/view-models/aaiServiceTypes.htm | 80 + .../app/vid/scripts/view-models/aaiSubDetails.htm | 95 + .../app/vid/scripts/view-models/aaiSubViewEdit.htm | 147 + .../view-models/createInstanceServiceModels.htm | 125 + .../app/vid/scripts/view-models/creationDialog.htm | 64 + .../app/vid/scripts/view-models/deletionDialog.htm | 70 + .../app/vid/scripts/view-models/detailsDialog.htm | 48 + .../app/vid/scripts/view-models/instantiate.htm | 248 + .../app/vid/scripts/view-models/msoCommit.htm | 47 + .../app/vid/scripts/view-models/popupWindow.htm | 30 + .../app/vid/scripts/view-models/serviceModels.htm | 91 + .../app/vid/scripts/view-models/statusDialog.htm | 66 + .../src/main/webapp/app/vid/styles/aaiGetSubs.css | 62 + .../main/webapp/app/vid/styles/aaiSubDetails.css | 62 + .../main/webapp/app/vid/styles/aaiSubViewEdit.css | 62 + .../main/webapp/app/vid/styles/angular-ui-tree.css | 61 + .../src/main/webapp/app/vid/styles/dialogs.css | 133 + .../src/main/webapp/app/vid/styles}/dummy.txt | 0 .../src/main/webapp/app/vid/styles/instantiate.css | 62 + .../main/webapp/app/vid/styles/serviceModels.css | 70 + .../webapp/app/vid/styles/subscriberSearch.css | 8 + .../src/main/webapp/app/vid/styles/vidTree.css | 67 + .../src/main/webapp/app/vid/test/testAaiData.js | 254 + .../src/main/webapp/app/vid/test/testMso.css | 22 + .../src/main/webapp/app/vid/test/testMso.js | 486 + .../src/main/webapp/app/vid/test/testViewEdit.css | 30 + .../src/main/webapp/app/vid/test/testViewEdit.js | 376 + vid-app-common/src/main/webapp/index.jsp | 5 + vid-app-common/src/main/webapp/test.jsp | 29 + .../openecomp/ecomp/vid/selenium/FirstClass.java | 606 + .../ecomp/vid/selenium/LogOutLeftPane.java | 242 + .../core/MockApplicationContextTestSuite.java | 176 + .../openecomp/fusionapp/controller/NetMapTest.java | 48 + .../fusionapp/service/ProfileServiceTest.java | 69 + .../main/java/org/vid/dao/FnAppDoaImplTest.java | 45 + .../src/test/resources/objectconfig.properties | 16 + vid/.gitignore | 1 - vid/pom.xml | 462 - .../java/org/openecomp/aai/util/AAIProperties.java | 64 - .../org/openecomp/aai/util/AAIRestInterface.java | 300 - .../aai/util/CustomJacksonJaxBJsonProvider.java | 72 - .../org/openecomp/aai/util/HttpsAuthClient.java | 111 - .../portalapp/service/AdminAuthExtension.java | 44 - .../portalapp/uebhandler/InitUebHandler.java | 88 - .../portalapp/uebhandler/MainUebHandler.java | 117 - .../uebhandler/WidgetNotificationHandler.java | 61 - .../portalapp/util/CustomLoggingFilter.java | 58 - .../org/openecomp/vid/client/HttpBasicClient.java | 67 - .../org/openecomp/vid/client/HttpsBasicClient.java | 143 - .../org/openecomp/vid/conf/ExternalAppConfig.java | 271 - .../openecomp/vid/conf/ExternalAppInitializer.java | 80 - .../vid/conf/HibernateMappingLocations.java | 44 - .../openecomp/vid/controller/AaiController.java | 748 - .../controller/BrowseServiceTypesController.java | 87 - .../CreateNewServiceInstanceController.java | 195 - .../openecomp/vid/controller/MsoController.java | 736 - .../vid/controller/PropertyController.java | 121 - .../vid/controller/SearchExistingSIController.java | 166 - .../controller/SubscriberDetailsController.java | 137 - .../vid/controller/UserProfileController.java | 80 - .../openecomp/vid/controller/VidController.java | 242 - .../vid/controller/VidHomeController.java | 79 - .../vid/controller/ViewEditSubController.java | 107 - .../vid/controller/ViewLogController.java | 84 - .../vid/controller/test/TestAaiController.java | 93 - .../vid/controller/test/TestAsdcController.java | 112 - .../vid/controller/test/TestMsoController.java | 729 - .../vid/controller/test/TestPageController.java | 57 - .../java/org/openecomp/vid/dao/ProfileDao.java | 45 - .../openecomp/vid/encryption/EncryptConvertor.java | 261 - .../vid/encryption/EncryptedConfiguration.java | 413 - .../vid/encryption/EncryptedPropValue.java | 279 - .../exceptions/VidServiceUnavailableException.java | 69 - .../org/openecomp/vid/model/ExceptionResponse.java | 70 - .../main/java/org/openecomp/vid/model/Network.java | 157 - .../java/org/openecomp/vid/model/Resource.java | 28 - .../main/java/org/openecomp/vid/model/Result.java | 58 - .../main/java/org/openecomp/vid/model/Service.java | 223 - .../java/org/openecomp/vid/model/ServiceModel.java | 126 - vid/src/main/java/org/openecomp/vid/model/VNF.java | 248 - .../java/org/openecomp/vid/model/VfModule.java | 185 - .../java/org/openecomp/vid/model/VolumeGroup.java | 157 - .../java/org/openecomp/vid/mso/MsoProperties.java | 100 - .../org/openecomp/vid/mso/MsoResponseWrapper.java | 107 - .../java/org/openecomp/vid/mso/MsoRestInt.java | 71 - .../org/openecomp/vid/mso/MsoRestInterface.java | 290 - .../openecomp/vid/mso/MsoRestInterfaceFactory.java | 48 - .../org/openecomp/vid/mso/MsoRestInterfaceIfc.java | 79 - .../main/java/org/openecomp/vid/mso/MsoUtil.java | 125 - .../java/org/openecomp/vid/mso/RestObject.java | 68 - .../openecomp/vid/mso/rest/AsyncRequestStatus.java | 108 - .../openecomp/vid/mso/rest/RelatedInstance.java | 112 - .../org/openecomp/vid/mso/rest/RelatedModel.java | 112 - .../java/org/openecomp/vid/mso/rest/Request.java | 130 - .../org/openecomp/vid/mso/rest/RequestDetails.java | 205 - .../org/openecomp/vid/mso/rest/RequestList.java | 113 - .../vid/properties/AsdcClientConfiguration.java | 70 - .../openecomp/vid/properties/VidProperties.java | 34 - .../java/org/openecomp/vid/scheduler/LogJob.java | 49 - .../org/openecomp/vid/scheduler/LogRegistry.java | 59 - .../openecomp/vid/scheduler/MyLoginsFeedJob.java | 434 - .../vid/scheduler/MyLoginsFeedRegistry.java | 67 - .../java/org/openecomp/vid/scheduler/Register.java | 93 - .../openecomp/vid/scheduler/RegistryAdapter.java | 111 - vid/src/main/resources/cache.ccf | 30 - vid/src/main/resources/cache_template.ccf | 30 - vid/src/main/resources/catalog.json | 174 - vid/src/main/resources/json/mso/asyncRequestStatus | 54 - vid/src/main/resources/json/mso/cloudConfiguration | 15 - vid/src/main/resources/json/mso/instanceIds | 29 - vid/src/main/resources/json/mso/modelInfo | 41 - vid/src/main/resources/json/mso/relatedInstance | 16 - vid/src/main/resources/json/mso/relatedModel | 15 - vid/src/main/resources/json/mso/request | 45 - vid/src/main/resources/json/mso/requestDetails | 13 - vid/src/main/resources/json/mso/requestError | 27 - vid/src/main/resources/json/mso/requestInfo | 44 - vid/src/main/resources/json/mso/requestParameters | 23 - vid/src/main/resources/json/mso/requestReferences | 18 - vid/src/main/resources/json/mso/requestStatus | 37 - vid/src/main/resources/json/mso/response | 13 - vid/src/main/resources/json/mso/subscriberInfo | 19 - vid/src/main/resources/logback.xml | 369 - vid/src/main/resources/logback_template.xml | 341 - vid/src/main/resources/mchange-log.properties | 23 - vid/src/main/resources/my.cnf | 192 - vid/src/main/resources/portal.properties | 68 - vid/src/main/resources/portal_template.properties | 35 - vid/src/main/resources/state-rules.drl | 38 - vid/src/main/resources/vid-data.sql | 347 - vid/src/main/resources/vid-pre-init.sql | 32 - vid/src/main/resources/vid-schema.sql | 1272 - vid/src/main/swm/common/common.sh | 35 - vid/src/main/swm/common/localize.sh | 33 - vid/src/main/swm/common/localize_asdc.sh | 68 - vid/src/main/swm/common/localize_cache.sh | 41 - vid/src/main/swm/common/localize_log4j.sh | 54 - vid/src/main/swm/common/localize_logback.sh | 46 - vid/src/main/swm/common/localize_portal.sh | 84 - vid/src/main/swm/common/localize_quartz.sh | 67 - vid/src/main/swm/common/localize_system.sh | 178 - vid/src/main/swm/deinstall/postproc/post_proc | 4 - vid/src/main/swm/deinstall/preproc/pre_proc | 4 - vid/src/main/swm/descriptor.xml | 34 - vid/src/main/swm/initinst/postproc/post_proc | 7 - vid/src/main/swm/initinst/preproc/pre_proc | 7 - vid/src/main/swm/install/postproc/post_proc | 38 - vid/src/main/swm/install/preproc/pre_proc | 18 - vid/src/main/swm/notes.txt | 52 - vid/src/main/webapp/WEB-INF/conf/asdc.properties | 6 - .../webapp/WEB-INF/conf/asdc_template.properties | 6 - vid/src/main/webapp/WEB-INF/conf/quartz.properties | 30 - .../webapp/WEB-INF/conf/quartz_template.properties | 36 - vid/src/main/webapp/WEB-INF/conf/raptor.properties | 187 - .../WEB-INF/conf/raptor_app_fusion.properties | 39 - .../WEB-INF/conf/raptor_db_fusion.properties | 19 - .../main/webapp/WEB-INF/conf/raptor_pdf.properties | 49 - vid/src/main/webapp/WEB-INF/conf/sql.properties | 322 - vid/src/main/webapp/WEB-INF/conf/system.properties | 171 - .../webapp/WEB-INF/conf/system_template.properties | 115 - vid/src/main/webapp/WEB-INF/defs/definitions.xml | 22 - .../webapp/WEB-INF/fusion/conf/fusion.properties | 61 - .../webapp/WEB-INF/fusion/defs/definitions.xml | 241 - .../main/webapp/WEB-INF/fusion/jsp/broadcast.jsp | 137 - .../webapp/WEB-INF/fusion/jsp/broadcast_list.jsp | 201 - .../webapp/WEB-INF/fusion/jsp/collaborateList.jsp | 146 - .../main/webapp/WEB-INF/fusion/jsp/data_out.jsp | 20 - .../webapp/WEB-INF/fusion/jsp/ebz/ebz_footer.jsp | 46 - .../webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp | 799 - .../WEB-INF/fusion/jsp/ebz/loginSnippet.html | 120 - .../webapp/WEB-INF/fusion/jsp/ebz_template.jsp | 45 - .../fusion/jsp/ebz_template_noheader_nofooter.jsp | 35 - .../fusion/jsp/ebz_template_report_embedded.jsp | 48 - .../webapp/WEB-INF/fusion/jsp/es_search_demo.jsp | 97 - .../webapp/WEB-INF/fusion/jsp/es_suggest_demo.jsp | 97 - .../webapp/WEB-INF/fusion/jsp/frame_insert.jsp | 44 - vid/src/main/webapp/WEB-INF/fusion/jsp/include.jsp | 30 - .../main/webapp/WEB-INF/fusion/jsp/jcs_admin.jsp | 144 - vid/src/main/webapp/WEB-INF/fusion/jsp/meta.jsp | 36 - .../webapp/WEB-INF/fusion/jsp/popup_modal.html | 324 - .../WEB-INF/fusion/jsp/popup_modal_role.html | 274 - .../fusion/jsp/popup_modal_rolefunction.html | 87 - .../main/webapp/WEB-INF/fusion/jsp/post_search.jsp | 356 - vid/src/main/webapp/WEB-INF/fusion/jsp/profile.jsp | 442 - .../webapp/WEB-INF/fusion/jsp/profile_search.jsp | 104 - vid/src/main/webapp/WEB-INF/fusion/jsp/role.jsp | 286 - .../WEB-INF/fusion/jsp/role_function_list.jsp | 213 - .../main/webapp/WEB-INF/fusion/jsp/role_list.jsp | 139 - .../webapp/WEB-INF/fusion/jsp/sequence/details.jsp | 1 - .../main/webapp/WEB-INF/fusion/jsp/usage_list.jsp | 87 - .../WEB-INF/fusion/jsp/webrtc/collaboration.jsp | 492 - .../main/webapp/WEB-INF/fusion/orm/Fusion.hbm.xml | 352 - .../fusion/orm/RNoteBookIntegration.hbm.xml | 44 - .../webapp/WEB-INF/fusion/orm/Workflow.hbm.xml | 48 - .../fusion/raptor/custom_header_include.jsp | 135 - .../WEB-INF/fusion/raptor/custom_js_include.jsp | 31 - .../fusion/raptor/date_end_field_run_sql.jsp | 38 - .../fusion/raptor/date_start_field_run_sql.jsp | 39 - .../fusion/raptor/default_field_run_sql.jsp | 39 - .../webapp/WEB-INF/fusion/raptor/disclaimer.jsp | 38 - .../webapp/WEB-INF/fusion/raptor/error_include.jsp | 58 - .../webapp/WEB-INF/fusion/raptor/error_page.jsp | 229 - .../main/webapp/WEB-INF/fusion/raptor/footer.jsp | 25 - .../fusion/raptor/popup_drill_down_report.jsp | 601 - .../fusion/raptor/popup_import_semaphore.jsp | 80 - .../WEB-INF/fusion/raptor/popup_semaphore.jsp | 419 - .../webapp/WEB-INF/fusion/raptor/popup_sql.jsp | 55 - .../WEB-INF/fusion/raptor/popup_table_cols.jsp | 171 - .../WEB-INF/fusion/raptor/popup_testrun_sql.jsp | 103 - .../WEB-INF/fusion/raptor/report_download_csv.jsp | 89 - .../WEB-INF/fusion/raptor/report_download_pdf.jsp | 40 - .../WEB-INF/fusion/raptor/report_download_xls.jsp | 64 - .../webapp/WEB-INF/fusion/raptor/report_ebz.jsp | 179 - .../webapp/WEB-INF/fusion/raptor/report_import.jsp | 69 - .../webapp/WEB-INF/fusion/raptor/report_sample.jsp | 40 - .../webapp/WEB-INF/fusion/raptor/report_search.jsp | 2432 -- .../webapp/WEB-INF/fusion/raptor/report_wizard.jsp | 309 - .../WEB-INF/fusion/raptor/test_field_run_sql.jsp | 39 - .../webapp/WEB-INF/fusion/raptor/test_run_sql.jsp | 38 - .../WEB-INF/fusion/raptor/tree/folderNav.jsp | 483 - .../webapp/WEB-INF/fusion/raptor/tree/testTree.jsp | 248 - .../fusion/raptor/wizard_adhoc_schedule.jsp | 733 - .../webapp/WEB-INF/fusion/raptor/wizard_chart.jsp | 1335 - .../fusion/raptor/wizard_columns_add_multi.jsp | 96 - .../WEB-INF/fusion/raptor/wizard_columns_edit.jsp | 1127 - .../WEB-INF/fusion/raptor/wizard_columns_list.jsp | 157 - .../fusion/raptor/wizard_columns_order_all.jsp | 88 - .../fusion/raptor/wizard_data_forecasting.jsp | 184 - .../WEB-INF/fusion/raptor/wizard_definition.jsp | 1122 - .../WEB-INF/fusion/raptor/wizard_filters_edit.jsp | 320 - .../WEB-INF/fusion/raptor/wizard_filters_list.jsp | 115 - .../fusion/raptor/wizard_form_fields_edit.jsp | 771 - .../fusion/raptor/wizard_form_fields_list.jsp | 107 - .../WEB-INF/fusion/raptor/wizard_javascript.jsp | 167 - .../webapp/WEB-INF/fusion/raptor/wizard_log.jsp | 109 - .../webapp/WEB-INF/fusion/raptor/wizard_map.jsp | 424 - .../webapp/WEB-INF/fusion/raptor/wizard_run.jsp | 74 - .../WEB-INF/fusion/raptor/wizard_schedule.jsp | 376 - .../raptor/wizard_schedule_formfield_include.jsp | 754 - .../fusion/raptor/wizard_schedule_multiple.jsp | 157 - .../WEB-INF/fusion/raptor/wizard_schedule_only.jsp | 172 - .../raptor/wizard_schedule_only_from_search.jsp | 173 - .../WEB-INF/fusion/raptor/wizard_sorting_edit.jsp | 86 - .../WEB-INF/fusion/raptor/wizard_sorting_list.jsp | 116 - .../fusion/raptor/wizard_sorting_order_all.jsp | 112 - .../WEB-INF/fusion/raptor/wizard_sql_def.jsp | 226 - .../WEB-INF/fusion/raptor/wizard_tables_edit.jsp | 369 - .../WEB-INF/fusion/raptor/wizard_tables_list.jsp | 85 - .../WEB-INF/fusion/raptor/wizard_user_access.jsp | 184 - .../WEB-INF/jsp/createnewserviceinstance.jsp | 146 - vid/src/main/webapp/WEB-INF/jsp/error.jsp | 20 - vid/src/main/webapp/WEB-INF/jsp/leafletMap.jsp | 288 - vid/src/main/webapp/WEB-INF/jsp/login_external.jsp | 154 - vid/src/main/webapp/WEB-INF/jsp/net_map.jsp | 38 - .../main/webapp/WEB-INF/jsp/searchexistingsi.jsp | 79 - vid/src/main/webapp/WEB-INF/jsp/serviceModels.jsp | 68 - .../main/webapp/WEB-INF/jsp/subscriberdetails.jsp | 184 - vid/src/main/webapp/WEB-INF/jsp/testMso.jsp | 172 - vid/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp | 170 - vid/src/main/webapp/WEB-INF/jsp/user_profile.jsp | 84 - vid/src/main/webapp/WEB-INF/jsp/vidhome.jsp | 45 - vid/src/main/webapp/WEB-INF/jsp/viewlog.jsp | 33 - vid/src/main/webapp/WEB-INF/jsp/welcome.jsp | 629 - vid/src/main/webapp/WEB-INF/web.xml | 17 - .../fusion/external/angular-1.5/angular-animate.js | 4121 -- .../external/angular-1.5/angular-animate.min.js | 56 - .../angular-1.5/angular-animate.min.js.map | 8 - .../fusion/external/angular-1.5/angular-aria.js | 398 - .../external/angular-1.5/angular-aria.min.js | 14 - .../external/angular-1.5/angular-aria.min.js.map | 8 - .../fusion/external/angular-1.5/angular-cookies.js | 322 - .../external/angular-1.5/angular-cookies.min.js | 9 - .../angular-1.5/angular-cookies.min.js.map | 8 - .../fusion/external/angular-1.5/angular-csp.css | 20 - .../fusion/external/angular-1.5/angular-loader.js | 484 - .../external/angular-1.5/angular-loader.min.js | 10 - .../external/angular-1.5/angular-loader.min.js.map | 8 - .../external/angular-1.5/angular-message-format.js | 980 - .../angular-1.5/angular-message-format.min.js | 26 - .../angular-1.5/angular-message-format.min.js.map | 8 - .../external/angular-1.5/angular-messages.js | 687 - .../external/angular-1.5/angular-messages.min.js | 12 - .../angular-1.5/angular-messages.min.js.map | 8 - .../fusion/external/angular-1.5/angular-mocks.js | 2842 -- .../external/angular-1.5/angular-resource.js | 768 - .../external/angular-1.5/angular-resource.min.js | 15 - .../angular-1.5/angular-resource.min.js.map | 8 - .../fusion/external/angular-1.5/angular-route.js | 1016 - .../external/angular-1.5/angular-route.min.js | 15 - .../external/angular-1.5/angular-route.min.js.map | 8 - .../external/angular-1.5/angular-sanitize.js | 717 - .../external/angular-1.5/angular-sanitize.min.js | 15 - .../angular-1.5/angular-sanitize.min.js.map | 8 - .../external/angular-1.5/angular-scenario.js | 41849 ------------------- .../fusion/external/angular-1.5/angular-touch.js | 729 - .../external/angular-1.5/angular-touch.min.js | 14 - .../external/angular-1.5/angular-touch.min.js.map | 8 - .../app/fusion/external/angular-1.5/angular.js | 30428 -------------- .../app/fusion/external/angular-1.5/angular.min.js | 307 - .../fusion/external/angular-1.5/angular.min.js.map | 8 - .../app/fusion/external/angular-1.5/errors.json | 1 - .../app/fusion/external/angular-1.5/version.json | 1 - .../app/fusion/external/angular-1.5/version.txt | 1 - .../angular-ui/ui-bootstrap-tpls-1.1.2.min.js | 10 - .../angular-ui/ui-bootstrap-tpls-1.2.4.min.js | 10 - .../webapp/app/fusion/external/bootstrap/bs.css | 678 - .../external/ebz/angular_js/angular-animate.js | 3721 -- .../external/ebz/angular_js/angular-cookies.js | 206 - .../external/ebz/angular_js/angular-route.js | 911 - .../external/ebz/angular_js/angular-route.min.js | 14 - .../external/ebz/angular_js/angular-sanitize.js | 647 - .../external/ebz/angular_js/angular-touch.js | 628 - .../app/fusion/external/ebz/angular_js/angular.js | 22024 ---------- .../app/fusion/external/ebz/angular_js/app.js | 6 - .../external/ebz/angular_js/checklist-model.js | 99 - .../external/ebz/angular_js/checklist-model.min.js | 1 - .../app/fusion/external/ebz/angular_js/gestures.js | 1495 - .../app/fusion/external/ebz/angular_js/ng_base.js | 4 - .../external/ebz/angular_js/ui-charts-tpls.js | 3909 -- .../app/fusion/external/ebz/ebz_header/footer.css | 311 - .../app/fusion/external/ebz/ebz_header/header.css | 1866 - .../external/ebz/ebz_header/portal_ebz_header.css | 63 - .../main/webapp/app/fusion/external/ebz/fn-ebz.css | 1614 - .../app/fusion/external/ebz/js/attHeaderSnippet.js | 210 - .../webapp/app/fusion/external/ebz/js/footer.js | 110 - .../fusion/external/ebz/sandbox/att-abs-tpls.js | 20451 --------- .../external/ebz/sandbox/att-abs-tpls.min.js | 22 - .../fusion/external/ebz/sandbox/styles/base.css | 1 - .../app/fusion/external/ebz/sandbox/styles/btn.css | 1 - .../fusion/external/ebz/sandbox/styles/demo.css | 2 - .../fusion/external/ebz/sandbox/styles/dtpk.css | 9 - .../fusion/external/ebz/sandbox/styles/frms.css | 1 - .../ebz/sandbox/styles/ie/backgroundsize.min.htc | 12 - .../ebz/sandbox/styles/pages/iconography.css | 2 - .../fusion/external/ebz/sandbox/styles/sldr.css | 1 - .../fusion/external/ebz/sandbox/styles/style.css | 1 - .../app/fusion/external/ebz/sandbox/styles/tbs.css | 1 - .../app/fusion/external/ionicons-2.0.1/.gitignore | 4 - .../app/fusion/external/ionicons-2.0.1/LICENSE | 21 - .../app/fusion/external/ionicons-2.0.1/bower.json | 31 - .../fusion/external/ionicons-2.0.1/component.json | 19 - .../fusion/external/ionicons-2.0.1/composer.json | 36 - .../external/ionicons-2.0.1/css/ionicons.css | 1480 - .../external/ionicons-2.0.1/css/ionicons.min.css | 11 - .../external/ionicons-2.0.1/fonts/ionicons.eot | Bin 120724 -> 0 bytes .../external/ionicons-2.0.1/fonts/ionicons.svg | 2230 - .../external/ionicons-2.0.1/fonts/ionicons.ttf | Bin 188508 -> 0 bytes .../external/ionicons-2.0.1/fonts/ionicons.woff | Bin 67904 -> 0 bytes .../ionicons-2.0.1/less/_ionicons-font.less | 27 - .../ionicons-2.0.1/less/_ionicons-icons.less | 1473 - .../ionicons-2.0.1/less/_ionicons-variables.less | 747 - .../external/ionicons-2.0.1/less/ionicons.less | 3 - .../ionicons-2.0.1/png/512/alert-circled.png | Bin 2551 -> 0 bytes .../external/ionicons-2.0.1/png/512/alert.png | Bin 766 -> 0 bytes .../ionicons-2.0.1/png/512/android-add-contact.png | Bin 3279 -> 0 bytes .../ionicons-2.0.1/png/512/android-add.png | Bin 240 -> 0 bytes .../ionicons-2.0.1/png/512/android-alarm.png | Bin 6428 -> 0 bytes .../ionicons-2.0.1/png/512/android-archive.png | Bin 1628 -> 0 bytes .../ionicons-2.0.1/png/512/android-arrow-back.png | Bin 1218 -> 0 bytes .../png/512/android-arrow-down-left.png | Bin 1451 -> 0 bytes .../png/512/android-arrow-down-right.png | Bin 1462 -> 0 bytes .../png/512/android-arrow-forward.png | Bin 1191 -> 0 bytes .../png/512/android-arrow-up-left.png | Bin 1499 -> 0 bytes .../png/512/android-arrow-up-right.png | Bin 1482 -> 0 bytes .../ionicons-2.0.1/png/512/android-battery.png | Bin 238 -> 0 bytes .../ionicons-2.0.1/png/512/android-book.png | Bin 3746 -> 0 bytes .../ionicons-2.0.1/png/512/android-calendar.png | Bin 849 -> 0 bytes .../ionicons-2.0.1/png/512/android-call.png | Bin 4766 -> 0 bytes .../ionicons-2.0.1/png/512/android-camera.png | Bin 3871 -> 0 bytes .../ionicons-2.0.1/png/512/android-chat.png | Bin 3577 -> 0 bytes .../ionicons-2.0.1/png/512/android-checkmark.png | Bin 1846 -> 0 bytes .../ionicons-2.0.1/png/512/android-clock.png | Bin 5268 -> 0 bytes .../ionicons-2.0.1/png/512/android-close.png | Bin 2156 -> 0 bytes .../ionicons-2.0.1/png/512/android-contact.png | Bin 3658 -> 0 bytes .../ionicons-2.0.1/png/512/android-contacts.png | Bin 4299 -> 0 bytes .../ionicons-2.0.1/png/512/android-data.png | Bin 4808 -> 0 bytes .../ionicons-2.0.1/png/512/android-developer.png | Bin 4115 -> 0 bytes .../ionicons-2.0.1/png/512/android-display.png | Bin 4909 -> 0 bytes .../ionicons-2.0.1/png/512/android-download.png | Bin 4890 -> 0 bytes .../ionicons-2.0.1/png/512/android-drawer.png | Bin 190 -> 0 bytes .../ionicons-2.0.1/png/512/android-dropdown.png | Bin 777 -> 0 bytes .../ionicons-2.0.1/png/512/android-earth.png | Bin 6517 -> 0 bytes .../ionicons-2.0.1/png/512/android-folder.png | Bin 1688 -> 0 bytes .../ionicons-2.0.1/png/512/android-forums.png | Bin 1739 -> 0 bytes .../ionicons-2.0.1/png/512/android-friends.png | Bin 4868 -> 0 bytes .../ionicons-2.0.1/png/512/android-hand.png | Bin 4650 -> 0 bytes .../ionicons-2.0.1/png/512/android-image.png | Bin 1433 -> 0 bytes .../ionicons-2.0.1/png/512/android-inbox.png | Bin 3018 -> 0 bytes .../ionicons-2.0.1/png/512/android-information.png | Bin 3370 -> 0 bytes .../ionicons-2.0.1/png/512/android-keypad.png | Bin 1055 -> 0 bytes .../ionicons-2.0.1/png/512/android-lightbulb.png | Bin 3515 -> 0 bytes .../ionicons-2.0.1/png/512/android-locate.png | Bin 5003 -> 0 bytes .../ionicons-2.0.1/png/512/android-location.png | Bin 3067 -> 0 bytes .../ionicons-2.0.1/png/512/android-mail.png | Bin 3455 -> 0 bytes .../ionicons-2.0.1/png/512/android-microphone.png | Bin 3267 -> 0 bytes .../ionicons-2.0.1/png/512/android-mixer.png | Bin 2727 -> 0 bytes .../ionicons-2.0.1/png/512/android-more.png | Bin 224 -> 0 bytes .../ionicons-2.0.1/png/512/android-note.png | Bin 249 -> 0 bytes .../ionicons-2.0.1/png/512/android-playstore.png | Bin 3165 -> 0 bytes .../ionicons-2.0.1/png/512/android-printer.png | Bin 1721 -> 0 bytes .../ionicons-2.0.1/png/512/android-promotion.png | Bin 2374 -> 0 bytes .../ionicons-2.0.1/png/512/android-reminder.png | Bin 2890 -> 0 bytes .../ionicons-2.0.1/png/512/android-remove.png | Bin 160 -> 0 bytes .../ionicons-2.0.1/png/512/android-search.png | Bin 4232 -> 0 bytes .../ionicons-2.0.1/png/512/android-send.png | Bin 2079 -> 0 bytes .../ionicons-2.0.1/png/512/android-settings.png | Bin 3883 -> 0 bytes .../ionicons-2.0.1/png/512/android-share.png | Bin 3212 -> 0 bytes .../ionicons-2.0.1/png/512/android-social-user.png | Bin 3644 -> 0 bytes .../ionicons-2.0.1/png/512/android-social.png | Bin 3849 -> 0 bytes .../ionicons-2.0.1/png/512/android-sort.png | Bin 197 -> 0 bytes .../png/512/android-stair-drawer.png | Bin 209 -> 0 bytes .../ionicons-2.0.1/png/512/android-star.png | Bin 2926 -> 0 bytes .../ionicons-2.0.1/png/512/android-stopwatch.png | Bin 5225 -> 0 bytes .../ionicons-2.0.1/png/512/android-storage.png | Bin 233 -> 0 bytes .../ionicons-2.0.1/png/512/android-system-back.png | Bin 1796 -> 0 bytes .../ionicons-2.0.1/png/512/android-system-home.png | Bin 1107 -> 0 bytes .../png/512/android-system-windows.png | Bin 202 -> 0 bytes .../ionicons-2.0.1/png/512/android-timer.png | Bin 3904 -> 0 bytes .../ionicons-2.0.1/png/512/android-trash.png | Bin 2865 -> 0 bytes .../ionicons-2.0.1/png/512/android-user-menu.png | Bin 3568 -> 0 bytes .../ionicons-2.0.1/png/512/android-volume.png | Bin 6022 -> 0 bytes .../ionicons-2.0.1/png/512/android-wifi.png | Bin 4868 -> 0 bytes .../external/ionicons-2.0.1/png/512/aperture.png | Bin 9500 -> 0 bytes .../external/ionicons-2.0.1/png/512/archive.png | Bin 2445 -> 0 bytes .../ionicons-2.0.1/png/512/arrow-down-a.png | Bin 1173 -> 0 bytes .../ionicons-2.0.1/png/512/arrow-down-b.png | Bin 1307 -> 0 bytes .../ionicons-2.0.1/png/512/arrow-down-c.png | Bin 1966 -> 0 bytes .../ionicons-2.0.1/png/512/arrow-expand.png | Bin 2498 -> 0 bytes .../png/512/arrow-graph-down-left.png | Bin 2478 -> 0 bytes .../png/512/arrow-graph-down-right.png | Bin 2545 -> 0 bytes .../ionicons-2.0.1/png/512/arrow-graph-up-left.png | Bin 2440 -> 0 bytes .../png/512/arrow-graph-up-right.png | Bin 2440 -> 0 bytes .../ionicons-2.0.1/png/512/arrow-left-a.png | Bin 1260 -> 0 bytes .../ionicons-2.0.1/png/512/arrow-left-b.png | Bin 1608 -> 0 bytes .../ionicons-2.0.1/png/512/arrow-left-c.png | Bin 1662 -> 0 bytes .../external/ionicons-2.0.1/png/512/arrow-move.png | Bin 1948 -> 0 bytes .../ionicons-2.0.1/png/512/arrow-resize.png | Bin 1266 -> 0 bytes .../ionicons-2.0.1/png/512/arrow-return-left.png | Bin 1082 -> 0 bytes .../ionicons-2.0.1/png/512/arrow-return-right.png | Bin 1124 -> 0 bytes .../ionicons-2.0.1/png/512/arrow-right-a.png | Bin 1317 -> 0 bytes .../ionicons-2.0.1/png/512/arrow-right-b.png | Bin 1671 -> 0 bytes .../ionicons-2.0.1/png/512/arrow-right-c.png | Bin 1657 -> 0 bytes .../ionicons-2.0.1/png/512/arrow-shrink.png | Bin 2594 -> 0 bytes .../external/ionicons-2.0.1/png/512/arrow-swap.png | Bin 1521 -> 0 bytes .../external/ionicons-2.0.1/png/512/arrow-up-a.png | Bin 1115 -> 0 bytes .../external/ionicons-2.0.1/png/512/arrow-up-b.png | Bin 1343 -> 0 bytes .../external/ionicons-2.0.1/png/512/arrow-up-c.png | Bin 2002 -> 0 bytes .../external/ionicons-2.0.1/png/512/asterisk.png | Bin 4023 -> 0 bytes .../fusion/external/ionicons-2.0.1/png/512/at.png | Bin 5852 -> 0 bytes .../fusion/external/ionicons-2.0.1/png/512/bag.png | Bin 3665 -> 0 bytes .../ionicons-2.0.1/png/512/battery-charging.png | Bin 1897 -> 0 bytes .../ionicons-2.0.1/png/512/battery-empty.png | Bin 1019 -> 0 bytes .../ionicons-2.0.1/png/512/battery-full.png | Bin 982 -> 0 bytes .../ionicons-2.0.1/png/512/battery-half.png | Bin 1320 -> 0 bytes .../ionicons-2.0.1/png/512/battery-low.png | Bin 1342 -> 0 bytes .../external/ionicons-2.0.1/png/512/beaker.png | Bin 3931 -> 0 bytes .../external/ionicons-2.0.1/png/512/beer.png | Bin 4559 -> 0 bytes .../external/ionicons-2.0.1/png/512/bluetooth.png | Bin 2909 -> 0 bytes .../external/ionicons-2.0.1/png/512/bonfire.png | Bin 4852 -> 0 bytes .../external/ionicons-2.0.1/png/512/bookmark.png | Bin 1102 -> 0 bytes .../external/ionicons-2.0.1/png/512/briefcase.png | Bin 1475 -> 0 bytes .../fusion/external/ionicons-2.0.1/png/512/bug.png | Bin 4736 -> 0 bytes .../external/ionicons-2.0.1/png/512/calculator.png | Bin 1315 -> 0 bytes .../external/ionicons-2.0.1/png/512/calendar.png | Bin 2577 -> 0 bytes .../external/ionicons-2.0.1/png/512/camera.png | Bin 4190 -> 0 bytes .../external/ionicons-2.0.1/png/512/card.png | Bin 1494 -> 0 bytes .../external/ionicons-2.0.1/png/512/cash.png | Bin 3435 -> 0 bytes .../ionicons-2.0.1/png/512/chatbox-working.png | Bin 2301 -> 0 bytes .../external/ionicons-2.0.1/png/512/chatbox.png | Bin 1870 -> 0 bytes .../external/ionicons-2.0.1/png/512/chatboxes.png | Bin 2562 -> 0 bytes .../ionicons-2.0.1/png/512/chatbubble-working.png | Bin 3028 -> 0 bytes .../external/ionicons-2.0.1/png/512/chatbubble.png | Bin 2579 -> 0 bytes .../ionicons-2.0.1/png/512/chatbubbles.png | Bin 3751 -> 0 bytes .../ionicons-2.0.1/png/512/checkmark-circled.png | Bin 3687 -> 0 bytes .../ionicons-2.0.1/png/512/checkmark-round.png | Bin 2367 -> 0 bytes .../external/ionicons-2.0.1/png/512/checkmark.png | Bin 2134 -> 0 bytes .../ionicons-2.0.1/png/512/chevron-down.png | Bin 1689 -> 0 bytes .../ionicons-2.0.1/png/512/chevron-left.png | Bin 1769 -> 0 bytes .../ionicons-2.0.1/png/512/chevron-right.png | Bin 1831 -> 0 bytes .../external/ionicons-2.0.1/png/512/chevron-up.png | Bin 1677 -> 0 bytes .../external/ionicons-2.0.1/png/512/clipboard.png | Bin 2593 -> 0 bytes .../external/ionicons-2.0.1/png/512/clock.png | Bin 5866 -> 0 bytes .../ionicons-2.0.1/png/512/close-circled.png | Bin 3809 -> 0 bytes .../ionicons-2.0.1/png/512/close-round.png | Bin 2177 -> 0 bytes .../external/ionicons-2.0.1/png/512/close.png | Bin 2244 -> 0 bytes .../ionicons-2.0.1/png/512/closed-captioning.png | Bin 3665 -> 0 bytes .../external/ionicons-2.0.1/png/512/cloud.png | Bin 2067 -> 0 bytes .../ionicons-2.0.1/png/512/code-download.png | Bin 2423 -> 0 bytes .../ionicons-2.0.1/png/512/code-working.png | Bin 2433 -> 0 bytes .../external/ionicons-2.0.1/png/512/code.png | Bin 1720 -> 0 bytes .../external/ionicons-2.0.1/png/512/coffee.png | Bin 3205 -> 0 bytes .../external/ionicons-2.0.1/png/512/compass.png | Bin 7318 -> 0 bytes .../external/ionicons-2.0.1/png/512/compose.png | Bin 4296 -> 0 bytes .../ionicons-2.0.1/png/512/connection-bars.png | Bin 214 -> 0 bytes .../external/ionicons-2.0.1/png/512/contrast.png | Bin 4087 -> 0 bytes .../external/ionicons-2.0.1/png/512/cube.png | Bin 3265 -> 0 bytes .../external/ionicons-2.0.1/png/512/disc.png | Bin 4935 -> 0 bytes .../ionicons-2.0.1/png/512/document-text.png | Bin 1918 -> 0 bytes .../external/ionicons-2.0.1/png/512/document.png | Bin 1914 -> 0 bytes .../external/ionicons-2.0.1/png/512/drag.png | Bin 178 -> 0 bytes .../external/ionicons-2.0.1/png/512/earth.png | Bin 6476 -> 0 bytes .../external/ionicons-2.0.1/png/512/edit.png | Bin 2741 -> 0 bytes .../fusion/external/ionicons-2.0.1/png/512/egg.png | Bin 4234 -> 0 bytes .../external/ionicons-2.0.1/png/512/eject.png | Bin 3209 -> 0 bytes .../external/ionicons-2.0.1/png/512/email.png | Bin 3125 -> 0 bytes .../ionicons-2.0.1/png/512/eye-disabled.png | Bin 3558 -> 0 bytes .../fusion/external/ionicons-2.0.1/png/512/eye.png | Bin 3297 -> 0 bytes .../external/ionicons-2.0.1/png/512/female.png | Bin 2779 -> 0 bytes .../external/ionicons-2.0.1/png/512/filing.png | Bin 2349 -> 0 bytes .../ionicons-2.0.1/png/512/film-marker.png | Bin 2645 -> 0 bytes .../external/ionicons-2.0.1/png/512/fireball.png | Bin 3325 -> 0 bytes .../external/ionicons-2.0.1/png/512/flag.png | Bin 2337 -> 0 bytes .../external/ionicons-2.0.1/png/512/flame.png | Bin 3012 -> 0 bytes .../external/ionicons-2.0.1/png/512/flash-off.png | Bin 5437 -> 0 bytes .../external/ionicons-2.0.1/png/512/flash.png | Bin 1965 -> 0 bytes .../external/ionicons-2.0.1/png/512/flask.png | Bin 2939 -> 0 bytes .../external/ionicons-2.0.1/png/512/folder.png | Bin 1689 -> 0 bytes .../external/ionicons-2.0.1/png/512/fork-repo.png | Bin 3236 -> 0 bytes .../external/ionicons-2.0.1/png/512/fork.png | Bin 3007 -> 0 bytes .../external/ionicons-2.0.1/png/512/forward.png | Bin 2142 -> 0 bytes .../external/ionicons-2.0.1/png/512/funnel.png | Bin 3354 -> 0 bytes .../ionicons-2.0.1/png/512/game-controller-a.png | Bin 2548 -> 0 bytes .../ionicons-2.0.1/png/512/game-controller-b.png | Bin 3623 -> 0 bytes .../external/ionicons-2.0.1/png/512/gear-a.png | Bin 3806 -> 0 bytes .../external/ionicons-2.0.1/png/512/gear-b.png | Bin 2756 -> 0 bytes .../external/ionicons-2.0.1/png/512/grid.png | Bin 1066 -> 0 bytes .../external/ionicons-2.0.1/png/512/hammer.png | Bin 2493 -> 0 bytes .../external/ionicons-2.0.1/png/512/happy.png | Bin 5732 -> 0 bytes .../external/ionicons-2.0.1/png/512/headphone.png | Bin 4082 -> 0 bytes .../ionicons-2.0.1/png/512/heart-broken.png | Bin 4007 -> 0 bytes .../external/ionicons-2.0.1/png/512/heart.png | Bin 2322 -> 0 bytes .../external/ionicons-2.0.1/png/512/help-buoy.png | Bin 5824 -> 0 bytes .../ionicons-2.0.1/png/512/help-circled.png | Bin 3940 -> 0 bytes .../external/ionicons-2.0.1/png/512/help.png | Bin 2678 -> 0 bytes .../external/ionicons-2.0.1/png/512/home.png | Bin 1275 -> 0 bytes .../external/ionicons-2.0.1/png/512/icecream.png | Bin 2317 -> 0 bytes .../png/512/icon-social-google-plus-outline.png | Bin 4071 -> 0 bytes .../png/512/icon-social-google-plus.png | Bin 3888 -> 0 bytes .../external/ionicons-2.0.1/png/512/image.png | Bin 2952 -> 0 bytes .../external/ionicons-2.0.1/png/512/images.png | Bin 5073 -> 0 bytes .../ionicons-2.0.1/png/512/information-circled.png | Bin 3300 -> 0 bytes .../ionicons-2.0.1/png/512/information.png | Bin 2236 -> 0 bytes .../external/ionicons-2.0.1/png/512/ionic.png | Bin 5541 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-alarm-outline.png | Bin 5769 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-alarm.png | Bin 3922 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-albums-outline.png | Bin 231 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-albums.png | Bin 226 -> 0 bytes .../png/512/ios7-americanfootball-outline.png | Bin 5767 -> 0 bytes .../png/512/ios7-americanfootball.png | Bin 5675 -> 0 bytes .../png/512/ios7-analytics-outline.png | Bin 5847 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-analytics.png | Bin 4406 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-arrow-back.png | Bin 881 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-arrow-down.png | Bin 1451 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-arrow-forward.png | Bin 898 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-arrow-left.png | Bin 1550 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-arrow-right.png | Bin 1537 -> 0 bytes .../png/512/ios7-arrow-thin-down.png | Bin 1632 -> 0 bytes .../png/512/ios7-arrow-thin-left.png | Bin 1258 -> 0 bytes .../png/512/ios7-arrow-thin-right.png | Bin 1235 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-arrow-thin-up.png | Bin 1647 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-arrow-up.png | Bin 1482 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-at-outline.png | Bin 4303 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-at.png | Bin 4153 -> 0 bytes .../png/512/ios7-barcode-outline.png | Bin 233 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-barcode.png | Bin 219 -> 0 bytes .../png/512/ios7-baseball-outline.png | Bin 6676 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-baseball.png | Bin 5565 -> 0 bytes .../png/512/ios7-basketball-outline.png | Bin 6200 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-basketball.png | Bin 6525 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-bell-outline.png | Bin 3615 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-bell.png | Bin 2769 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-bolt-outline.png | Bin 2384 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-bolt.png | Bin 1892 -> 0 bytes .../png/512/ios7-bookmarks-outline.png | Bin 2454 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-bookmarks.png | Bin 2172 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-box-outline.png | Bin 1602 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-box.png | Bin 1032 -> 0 bytes .../png/512/ios7-briefcase-outline.png | Bin 1359 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-briefcase.png | Bin 1316 -> 0 bytes .../png/512/ios7-browsers-outline.png | Bin 372 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-browsers.png | Bin 357 -> 0 bytes .../png/512/ios7-calculator-outline.png | Bin 1785 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-calculator.png | Bin 1500 -> 0 bytes .../png/512/ios7-calendar-outline.png | Bin 236 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-calendar.png | Bin 230 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-camera-outline.png | Bin 3582 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-camera.png | Bin 3099 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-cart-outline.png | Bin 2861 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-cart.png | Bin 2200 -> 0 bytes .../png/512/ios7-chatboxes-outline.png | Bin 901 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-chatboxes.png | Bin 512 -> 0 bytes .../png/512/ios7-chatbubble-outline.png | Bin 3640 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-chatbubble.png | Bin 2259 -> 0 bytes .../png/512/ios7-checkmark-empty.png | Bin 920 -> 0 bytes .../png/512/ios7-checkmark-outline.png | Bin 4706 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-checkmark.png | Bin 3080 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-circle-filled.png | Bin 6478 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-circle-outline.png | Bin 4120 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-clock-outline.png | Bin 4320 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-clock.png | Bin 2762 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-close-empty.png | Bin 1204 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-close-outline.png | Bin 4999 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-close.png | Bin 3426 -> 0 bytes .../png/512/ios7-cloud-download-outline.png | Bin 3953 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-cloud-download.png | Bin 2782 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-cloud-outline.png | Bin 3339 -> 0 bytes .../png/512/ios7-cloud-upload-outline.png | Bin 3927 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-cloud-upload.png | Bin 2815 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-cloud.png | Bin 2082 -> 0 bytes .../png/512/ios7-cloudy-night-outline.png | Bin 3814 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-cloudy-night.png | Bin 2870 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-cloudy-outline.png | Bin 2280 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-cloudy.png | Bin 1572 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-cog-outline.png | Bin 8008 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-cog.png | Bin 6029 -> 0 bytes .../png/512/ios7-compose-outline.png | Bin 1584 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-compose.png | Bin 2061 -> 0 bytes .../png/512/ios7-contact-outline.png | Bin 4846 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-contact.png | Bin 4218 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-copy-outline.png | Bin 927 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-copy.png | Bin 782 -> 0 bytes .../png/512/ios7-download-outline.png | Bin 1163 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-download.png | Bin 1135 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-drag.png | Bin 165 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-email-outline.png | Bin 2592 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-email.png | Bin 4167 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-expand.png | Bin 485 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-eye-outline.png | Bin 4381 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-eye.png | Bin 2973 -> 0 bytes .../png/512/ios7-fastforward-outline.png | Bin 2726 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-fastforward.png | Bin 2158 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-filing-outline.png | Bin 2041 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-filing.png | Bin 1933 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-film-outline.png | Bin 772 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-film.png | Bin 722 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-flag-outline.png | Bin 1928 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-flag.png | Bin 1483 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-folder-outline.png | Bin 1606 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-folder.png | Bin 1640 -> 0 bytes .../png/512/ios7-football-outline.png | Bin 6266 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-football.png | Bin 5391 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-gear-outline.png | Bin 5721 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-gear.png | Bin 3445 -> 0 bytes .../png/512/ios7-glasses-outline.png | Bin 3597 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-glasses.png | Bin 2350 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-heart-outline.png | Bin 3097 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-heart.png | Bin 2078 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-help-empty.png | Bin 1669 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-help-outline.png | Bin 5608 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-help.png | Bin 3587 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-home-outline.png | Bin 1710 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-home.png | Bin 1518 -> 0 bytes .../png/512/ios7-infinite-outline.png | Bin 3028 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-infinite.png | Bin 2989 -> 0 bytes .../png/512/ios7-information-empty.png | Bin 837 -> 0 bytes .../png/512/ios7-information-outline.png | Bin 4563 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-information.png | Bin 2959 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-ionic-outline.png | Bin 5780 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-keypad-outline.png | Bin 7485 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-keypad.png | Bin 7505 -> 0 bytes .../png/512/ios7-lightbulb-outline.png | Bin 3791 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-lightbulb.png | Bin 2696 -> 0 bytes .../png/512/ios7-location-outline.png | Bin 4116 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-location.png | Bin 2767 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-locked-outline.png | Bin 2640 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-locked.png | Bin 2674 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-loop-strong.png | Bin 4101 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-loop.png | Bin 4270 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-medkit-outline.png | Bin 1386 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-medkit.png | Bin 1373 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-mic-off.png | Bin 7597 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-mic-outline.png | Bin 3550 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-mic.png | Bin 3878 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-minus-empty.png | Bin 153 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-minus-outline.png | Bin 4137 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-minus.png | Bin 2520 -> 0 bytes .../png/512/ios7-monitor-outline.png | Bin 225 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-monitor.png | Bin 230 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-moon-outline.png | Bin 2566 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-moon.png | Bin 1784 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-more-outline.png | Bin 1598 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-more.png | Bin 1700 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-musical-note.png | Bin 1521 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-musical-notes.png | Bin 2124 -> 0 bytes .../png/512/ios7-navigate-outline.png | Bin 4901 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-navigate.png | Bin 3333 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-paper-outline.png | Bin 1361 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-paper.png | Bin 1197 -> 0 bytes .../png/512/ios7-paperplane-outline.png | Bin 2952 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-paperplane.png | Bin 4805 -> 0 bytes .../png/512/ios7-partlysunny-outline.png | Bin 4823 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-partlysunny.png | Bin 4052 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-pause-outline.png | Bin 227 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-pause.png | Bin 213 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-paw-outline.png | Bin 6318 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-paw.png | Bin 4119 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-people-outline.png | Bin 5295 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-people.png | Bin 3439 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-person-outline.png | Bin 3189 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-person.png | Bin 2046 -> 0 bytes .../png/512/ios7-personadd-outline.png | Bin 3246 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-personadd.png | Bin 2110 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-photos-outline.png | Bin 234 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-photos.png | Bin 226 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-pie-outline.png | Bin 4549 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-pie.png | Bin 3646 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-play-outline.png | Bin 1474 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-play.png | Bin 1216 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-plus-empty.png | Bin 204 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-plus-outline.png | Bin 4415 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-plus.png | Bin 2970 -> 0 bytes .../png/512/ios7-pricetag-outline.png | Bin 3007 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-pricetag.png | Bin 2593 -> 0 bytes .../png/512/ios7-pricetags-outline.png | Bin 3563 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-pricetags.png | Bin 3219 -> 0 bytes .../png/512/ios7-printer-outline.png | Bin 1764 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-printer.png | Bin 1456 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-pulse-strong.png | Bin 3326 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-pulse.png | Bin 2955 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-rainy-outline.png | Bin 3346 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-rainy.png | Bin 2567 -> 0 bytes .../png/512/ios7-recording-outline.png | Bin 4926 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-recording.png | Bin 3762 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-redo-outline.png | Bin 3094 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-redo.png | Bin 2054 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-refresh-empty.png | Bin 2685 -> 0 bytes .../png/512/ios7-refresh-outline.png | Bin 6021 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-refresh.png | Bin 4579 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-reload.png | Bin 4195 -> 0 bytes .../png/512/ios7-reverse-camera-outline.png | Bin 3404 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-reverse-camera.png | Bin 3019 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-rewind-outline.png | Bin 2898 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-rewind.png | Bin 2362 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-search-strong.png | Bin 3329 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-search.png | Bin 3361 -> 0 bytes .../png/512/ios7-settings-strong.png | Bin 1714 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-settings.png | Bin 2160 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-shrink.png | Bin 490 -> 0 bytes .../png/512/ios7-skipbackward-outline.png | Bin 1890 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-skipbackward.png | Bin 1533 -> 0 bytes .../png/512/ios7-skipforward-outline.png | Bin 1827 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-skipforward.png | Bin 1556 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-snowy.png | Bin 3775 -> 0 bytes .../png/512/ios7-speedometer-outline.png | Bin 4678 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-speedometer.png | Bin 5748 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-star-half.png | Bin 3431 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-star-outline.png | Bin 3572 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-star.png | Bin 2463 -> 0 bytes .../png/512/ios7-stopwatch-outline.png | Bin 4823 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-stopwatch.png | Bin 3451 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-sunny-outline.png | Bin 2669 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-sunny.png | Bin 2506 -> 0 bytes .../png/512/ios7-telephone-outline.png | Bin 3779 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-telephone.png | Bin 2352 -> 0 bytes .../png/512/ios7-tennisball-outline.png | Bin 5535 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-tennisball.png | Bin 6356 -> 0 bytes .../png/512/ios7-thunderstorm-outline.png | Bin 3053 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-thunderstorm.png | Bin 2492 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-time-outline.png | Bin 5875 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-time.png | Bin 4136 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-timer-outline.png | Bin 4578 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-timer.png | Bin 6013 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-toggle-outline.png | Bin 5660 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-toggle.png | Bin 4825 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-trash-outline.png | Bin 4497 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-trash.png | Bin 2760 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-undo-outline.png | Bin 3114 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-undo.png | Bin 1954 -> 0 bytes .../png/512/ios7-unlocked-outline.png | Bin 2580 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-unlocked.png | Bin 2605 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-upload-outline.png | Bin 1128 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-upload.png | Bin 1085 -> 0 bytes .../png/512/ios7-videocam-outline.png | Bin 2038 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-videocam.png | Bin 2715 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-volume-high.png | Bin 2977 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-volume-low.png | Bin 956 -> 0 bytes .../png/512/ios7-wineglass-outline.png | Bin 2527 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-wineglass.png | Bin 2013 -> 0 bytes .../ionicons-2.0.1/png/512/ios7-world-outline.png | Bin 7420 -> 0 bytes .../external/ionicons-2.0.1/png/512/ios7-world.png | Bin 10031 -> 0 bytes .../external/ionicons-2.0.1/png/512/ipad.png | Bin 1356 -> 0 bytes .../external/ionicons-2.0.1/png/512/iphone.png | Bin 1651 -> 0 bytes .../external/ionicons-2.0.1/png/512/ipod.png | Bin 3207 -> 0 bytes .../fusion/external/ionicons-2.0.1/png/512/jet.png | Bin 2856 -> 0 bytes .../fusion/external/ionicons-2.0.1/png/512/key.png | Bin 2722 -> 0 bytes .../external/ionicons-2.0.1/png/512/knife.png | Bin 1822 -> 0 bytes .../external/ionicons-2.0.1/png/512/laptop.png | Bin 2474 -> 0 bytes .../external/ionicons-2.0.1/png/512/leaf.png | Bin 3440 -> 0 bytes .../external/ionicons-2.0.1/png/512/levels.png | Bin 2431 -> 0 bytes .../external/ionicons-2.0.1/png/512/lightbulb.png | Bin 2474 -> 0 bytes .../external/ionicons-2.0.1/png/512/link.png | Bin 2306 -> 0 bytes .../external/ionicons-2.0.1/png/512/load-a.png | Bin 3941 -> 0 bytes .../external/ionicons-2.0.1/png/512/load-b.png | Bin 5473 -> 0 bytes .../external/ionicons-2.0.1/png/512/load-c.png | Bin 4337 -> 0 bytes .../external/ionicons-2.0.1/png/512/load-d.png | Bin 6618 -> 0 bytes .../external/ionicons-2.0.1/png/512/location.png | Bin 2739 -> 0 bytes .../external/ionicons-2.0.1/png/512/locked.png | Bin 2494 -> 0 bytes .../external/ionicons-2.0.1/png/512/log-in.png | Bin 1460 -> 0 bytes .../external/ionicons-2.0.1/png/512/log-out.png | Bin 1637 -> 0 bytes .../external/ionicons-2.0.1/png/512/loop.png | Bin 3794 -> 0 bytes .../external/ionicons-2.0.1/png/512/magnet.png | Bin 4495 -> 0 bytes .../external/ionicons-2.0.1/png/512/male.png | Bin 3788 -> 0 bytes .../fusion/external/ionicons-2.0.1/png/512/man.png | Bin 2126 -> 0 bytes .../fusion/external/ionicons-2.0.1/png/512/map.png | Bin 4906 -> 0 bytes .../external/ionicons-2.0.1/png/512/medkit.png | Bin 1605 -> 0 bytes .../external/ionicons-2.0.1/png/512/merge.png | Bin 3879 -> 0 bytes .../external/ionicons-2.0.1/png/512/mic-a.png | Bin 4098 -> 0 bytes .../external/ionicons-2.0.1/png/512/mic-b.png | Bin 2576 -> 0 bytes .../external/ionicons-2.0.1/png/512/mic-c.png | Bin 1726 -> 0 bytes .../ionicons-2.0.1/png/512/minus-circled.png | Bin 2655 -> 0 bytes .../ionicons-2.0.1/png/512/minus-round.png | Bin 937 -> 0 bytes .../external/ionicons-2.0.1/png/512/minus.png | Bin 160 -> 0 bytes .../external/ionicons-2.0.1/png/512/model-s.png | Bin 4262 -> 0 bytes .../external/ionicons-2.0.1/png/512/monitor.png | Bin 1469 -> 0 bytes .../external/ionicons-2.0.1/png/512/more.png | Bin 3357 -> 0 bytes .../external/ionicons-2.0.1/png/512/mouse.png | Bin 2891 -> 0 bytes .../external/ionicons-2.0.1/png/512/music-note.png | Bin 2519 -> 0 bytes .../ionicons-2.0.1/png/512/navicon-round.png | Bin 1628 -> 0 bytes .../external/ionicons-2.0.1/png/512/navicon.png | Bin 175 -> 0 bytes .../external/ionicons-2.0.1/png/512/navigate.png | Bin 1693 -> 0 bytes .../external/ionicons-2.0.1/png/512/network.png | Bin 3041 -> 0 bytes .../external/ionicons-2.0.1/png/512/no-smoking.png | Bin 5816 -> 0 bytes .../external/ionicons-2.0.1/png/512/nuclear.png | Bin 3618 -> 0 bytes .../external/ionicons-2.0.1/png/512/outlet.png | Bin 2882 -> 0 bytes .../ionicons-2.0.1/png/512/paper-airplane.png | Bin 3678 -> 0 bytes .../external/ionicons-2.0.1/png/512/paperclip.png | Bin 2710 -> 0 bytes .../external/ionicons-2.0.1/png/512/pause.png | Bin 1340 -> 0 bytes .../external/ionicons-2.0.1/png/512/person-add.png | Bin 2410 -> 0 bytes .../ionicons-2.0.1/png/512/person-stalker.png | Bin 3272 -> 0 bytes .../external/ionicons-2.0.1/png/512/person.png | Bin 2258 -> 0 bytes .../external/ionicons-2.0.1/png/512/pie-graph.png | Bin 3608 -> 0 bytes .../fusion/external/ionicons-2.0.1/png/512/pin.png | Bin 2270 -> 0 bytes .../external/ionicons-2.0.1/png/512/pinpoint.png | Bin 4799 -> 0 bytes .../external/ionicons-2.0.1/png/512/pizza.png | Bin 4548 -> 0 bytes .../external/ionicons-2.0.1/png/512/plane.png | Bin 3218 -> 0 bytes .../external/ionicons-2.0.1/png/512/planet.png | Bin 4319 -> 0 bytes .../external/ionicons-2.0.1/png/512/play.png | Bin 1787 -> 0 bytes .../ionicons-2.0.1/png/512/playstation.png | Bin 3275 -> 0 bytes .../ionicons-2.0.1/png/512/plus-circled.png | Bin 3114 -> 0 bytes .../external/ionicons-2.0.1/png/512/plus-round.png | Bin 1567 -> 0 bytes .../external/ionicons-2.0.1/png/512/plus.png | Bin 223 -> 0 bytes .../external/ionicons-2.0.1/png/512/podium.png | Bin 209 -> 0 bytes .../external/ionicons-2.0.1/png/512/pound.png | Bin 2383 -> 0 bytes .../external/ionicons-2.0.1/png/512/power.png | Bin 4727 -> 0 bytes .../external/ionicons-2.0.1/png/512/pricetag.png | Bin 2457 -> 0 bytes .../external/ionicons-2.0.1/png/512/pricetags.png | Bin 2906 -> 0 bytes .../external/ionicons-2.0.1/png/512/printer.png | Bin 1869 -> 0 bytes .../ionicons-2.0.1/png/512/pull-request.png | Bin 3613 -> 0 bytes .../external/ionicons-2.0.1/png/512/qr-scanner.png | Bin 1842 -> 0 bytes .../external/ionicons-2.0.1/png/512/quote.png | Bin 1743 -> 0 bytes .../ionicons-2.0.1/png/512/radio-waves.png | Bin 4978 -> 0 bytes .../external/ionicons-2.0.1/png/512/record.png | Bin 3779 -> 0 bytes .../external/ionicons-2.0.1/png/512/refresh.png | Bin 3582 -> 0 bytes .../external/ionicons-2.0.1/png/512/reply-all.png | Bin 3033 -> 0 bytes .../external/ionicons-2.0.1/png/512/reply.png | Bin 2131 -> 0 bytes .../external/ionicons-2.0.1/png/512/ribbon-a.png | Bin 6449 -> 0 bytes .../external/ionicons-2.0.1/png/512/ribbon-b.png | Bin 5913 -> 0 bytes .../fusion/external/ionicons-2.0.1/png/512/sad.png | Bin 5517 -> 0 bytes .../external/ionicons-2.0.1/png/512/scissors.png | Bin 5061 -> 0 bytes .../external/ionicons-2.0.1/png/512/search.png | Bin 3229 -> 0 bytes .../external/ionicons-2.0.1/png/512/settings.png | Bin 4141 -> 0 bytes .../external/ionicons-2.0.1/png/512/share.png | Bin 2616 -> 0 bytes .../external/ionicons-2.0.1/png/512/shuffle.png | Bin 3420 -> 0 bytes .../ionicons-2.0.1/png/512/skip-backward.png | Bin 2421 -> 0 bytes .../ionicons-2.0.1/png/512/skip-forward.png | Bin 2402 -> 0 bytes .../png/512/social-android-outline.png | Bin 3772 -> 0 bytes .../ionicons-2.0.1/png/512/social-android.png | Bin 2784 -> 0 bytes .../png/512/social-apple-outline.png | Bin 4104 -> 0 bytes .../ionicons-2.0.1/png/512/social-apple.png | Bin 2647 -> 0 bytes .../png/512/social-bitcoin-outline.png | Bin 3790 -> 0 bytes .../ionicons-2.0.1/png/512/social-bitcoin.png | Bin 2424 -> 0 bytes .../png/512/social-buffer-outline.png | Bin 3913 -> 0 bytes .../ionicons-2.0.1/png/512/social-buffer.png | Bin 4687 -> 0 bytes .../png/512/social-designernews-outline.png | Bin 4754 -> 0 bytes .../ionicons-2.0.1/png/512/social-designernews.png | Bin 4242 -> 0 bytes .../png/512/social-dribbble-outline.png | Bin 5588 -> 0 bytes .../ionicons-2.0.1/png/512/social-dribbble.png | Bin 6983 -> 0 bytes .../png/512/social-dropbox-outline.png | Bin 5113 -> 0 bytes .../ionicons-2.0.1/png/512/social-dropbox.png | Bin 6161 -> 0 bytes .../png/512/social-facebook-outline.png | Bin 1788 -> 0 bytes .../ionicons-2.0.1/png/512/social-facebook.png | Bin 1402 -> 0 bytes .../png/512/social-foursquare-outline.png | Bin 3364 -> 0 bytes .../ionicons-2.0.1/png/512/social-foursquare.png | Bin 3021 -> 0 bytes .../png/512/social-freebsd-devil.png | Bin 5300 -> 0 bytes .../png/512/social-github-outline.png | Bin 7475 -> 0 bytes .../ionicons-2.0.1/png/512/social-github.png | Bin 4561 -> 0 bytes .../png/512/social-google-outline.png | Bin 3890 -> 0 bytes .../ionicons-2.0.1/png/512/social-google.png | Bin 3682 -> 0 bytes .../png/512/social-googleplus-outline.png | Bin 4071 -> 0 bytes .../ionicons-2.0.1/png/512/social-googleplus.png | Bin 3888 -> 0 bytes .../png/512/social-hackernews-outline.png | Bin 1994 -> 0 bytes .../ionicons-2.0.1/png/512/social-hackernews.png | Bin 1905 -> 0 bytes .../png/512/social-instagram-outline.png | Bin 3317 -> 0 bytes .../ionicons-2.0.1/png/512/social-instagram.png | Bin 4403 -> 0 bytes .../png/512/social-linkedin-outline.png | Bin 2370 -> 0 bytes .../ionicons-2.0.1/png/512/social-linkedin.png | Bin 2275 -> 0 bytes .../png/512/social-pinterest-outline.png | Bin 6933 -> 0 bytes .../ionicons-2.0.1/png/512/social-pinterest.png | Bin 5532 -> 0 bytes .../png/512/social-reddit-outline.png | Bin 6414 -> 0 bytes .../ionicons-2.0.1/png/512/social-reddit.png | Bin 4498 -> 0 bytes .../ionicons-2.0.1/png/512/social-rss-outline.png | Bin 5945 -> 0 bytes .../external/ionicons-2.0.1/png/512/social-rss.png | Bin 4789 -> 0 bytes .../png/512/social-skype-outline.png | Bin 5608 -> 0 bytes .../ionicons-2.0.1/png/512/social-skype.png | Bin 4269 -> 0 bytes .../png/512/social-tumblr-outline.png | Bin 2725 -> 0 bytes .../ionicons-2.0.1/png/512/social-tumblr.png | Bin 1946 -> 0 bytes .../external/ionicons-2.0.1/png/512/social-tux.png | Bin 7103 -> 0 bytes .../png/512/social-twitter-outline.png | Bin 5569 -> 0 bytes .../ionicons-2.0.1/png/512/social-twitter.png | Bin 3405 -> 0 bytes .../ionicons-2.0.1/png/512/social-usd-outline.png | Bin 5744 -> 0 bytes .../external/ionicons-2.0.1/png/512/social-usd.png | Bin 3446 -> 0 bytes .../png/512/social-vimeo-outline.png | Bin 5525 -> 0 bytes .../ionicons-2.0.1/png/512/social-vimeo.png | Bin 3456 -> 0 bytes .../png/512/social-windows-outline.png | Bin 1775 -> 0 bytes .../ionicons-2.0.1/png/512/social-windows.png | Bin 2550 -> 0 bytes .../png/512/social-wordpress-outline.png | Bin 6418 -> 0 bytes .../ionicons-2.0.1/png/512/social-wordpress.png | Bin 5465 -> 0 bytes .../png/512/social-yahoo-outline.png | Bin 2119 -> 0 bytes .../ionicons-2.0.1/png/512/social-yahoo.png | Bin 1729 -> 0 bytes .../png/512/social-youtube-outline.png | Bin 4655 -> 0 bytes .../ionicons-2.0.1/png/512/social-youtube.png | Bin 2511 -> 0 bytes .../ionicons-2.0.1/png/512/speakerphone.png | Bin 4310 -> 0 bytes .../ionicons-2.0.1/png/512/speedometer.png | Bin 4238 -> 0 bytes .../external/ionicons-2.0.1/png/512/spoon.png | Bin 2306 -> 0 bytes .../external/ionicons-2.0.1/png/512/star.png | Bin 2195 -> 0 bytes .../external/ionicons-2.0.1/png/512/stats-bars.png | Bin 218 -> 0 bytes .../external/ionicons-2.0.1/png/512/steam.png | Bin 3875 -> 0 bytes .../external/ionicons-2.0.1/png/512/stop.png | Bin 1090 -> 0 bytes .../ionicons-2.0.1/png/512/thermometer.png | Bin 1980 -> 0 bytes .../external/ionicons-2.0.1/png/512/thumbsdown.png | Bin 2288 -> 0 bytes .../external/ionicons-2.0.1/png/512/thumbsup.png | Bin 2356 -> 0 bytes .../ionicons-2.0.1/png/512/toggle-filled.png | Bin 3194 -> 0 bytes .../external/ionicons-2.0.1/png/512/toggle.png | Bin 3599 -> 0 bytes .../external/ionicons-2.0.1/png/512/trash-a.png | Bin 2752 -> 0 bytes .../external/ionicons-2.0.1/png/512/trash-b.png | Bin 1882 -> 0 bytes .../external/ionicons-2.0.1/png/512/trophy.png | Bin 3579 -> 0 bytes .../external/ionicons-2.0.1/png/512/umbrella.png | Bin 3416 -> 0 bytes .../external/ionicons-2.0.1/png/512/university.png | Bin 3167 -> 0 bytes .../external/ionicons-2.0.1/png/512/unlocked.png | Bin 2412 -> 0 bytes .../external/ionicons-2.0.1/png/512/upload.png | Bin 2480 -> 0 bytes .../fusion/external/ionicons-2.0.1/png/512/usb.png | Bin 3950 -> 0 bytes .../ionicons-2.0.1/png/512/videocamera.png | Bin 2381 -> 0 bytes .../ionicons-2.0.1/png/512/volume-high.png | Bin 4334 -> 0 bytes .../external/ionicons-2.0.1/png/512/volume-low.png | Bin 2136 -> 0 bytes .../ionicons-2.0.1/png/512/volume-medium.png | Bin 3174 -> 0 bytes .../ionicons-2.0.1/png/512/volume-mute.png | Bin 4803 -> 0 bytes .../external/ionicons-2.0.1/png/512/wand.png | Bin 1933 -> 0 bytes .../external/ionicons-2.0.1/png/512/waterdrop.png | Bin 3169 -> 0 bytes .../external/ionicons-2.0.1/png/512/wifi.png | Bin 3037 -> 0 bytes .../external/ionicons-2.0.1/png/512/wineglass.png | Bin 3734 -> 0 bytes .../external/ionicons-2.0.1/png/512/woman.png | Bin 3592 -> 0 bytes .../external/ionicons-2.0.1/png/512/wrench.png | Bin 2866 -> 0 bytes .../external/ionicons-2.0.1/png/512/xbox.png | Bin 4958 -> 0 bytes .../app/fusion/external/ionicons-2.0.1/readme.md | 60 - .../ionicons-2.0.1/scss/_ionicons-font.scss | 27 - .../ionicons-2.0.1/scss/_ionicons-icons.scss | 1473 - .../ionicons-2.0.1/scss/_ionicons-variables.scss | 741 - .../external/ionicons-2.0.1/scss/ionicons.scss | 15 - .../external/ionicons-2.0.1/src/alert-circled.svg | 11 - .../fusion/external/ionicons-2.0.1/src/alert.svg | 9 - .../ionicons-2.0.1/src/android-add-circle.svg | 12 - .../external/ionicons-2.0.1/src/android-add.svg | 11 - .../ionicons-2.0.1/src/android-alarm-clock.svg | 15 - .../external/ionicons-2.0.1/src/android-alert.svg | 12 - .../external/ionicons-2.0.1/src/android-apps.svg | 12 - .../ionicons-2.0.1/src/android-archive.svg | 12 - .../ionicons-2.0.1/src/android-arrow-back.svg | 11 - .../ionicons-2.0.1/src/android-arrow-down.svg | 11 - .../src/android-arrow-dropdown-circle.svg | 10 - .../ionicons-2.0.1/src/android-arrow-dropdown.svg | 9 - .../src/android-arrow-dropleft-circle.svg | 10 - .../ionicons-2.0.1/src/android-arrow-dropleft.svg | 9 - .../src/android-arrow-dropright-circle.svg | 10 - .../ionicons-2.0.1/src/android-arrow-dropright.svg | 9 - .../src/android-arrow-dropup-circle.svg | 10 - .../ionicons-2.0.1/src/android-arrow-dropup.svg | 9 - .../ionicons-2.0.1/src/android-arrow-forward.svg | 11 - .../ionicons-2.0.1/src/android-arrow-up.svg | 11 - .../external/ionicons-2.0.1/src/android-attach.svg | 15 - .../external/ionicons-2.0.1/src/android-bar.svg | 12 - .../ionicons-2.0.1/src/android-bicycle.svg | 19 - .../external/ionicons-2.0.1/src/android-boat.svg | 16 - .../ionicons-2.0.1/src/android-bookmark.svg | 7 - .../external/ionicons-2.0.1/src/android-bulb.svg | 18 - .../external/ionicons-2.0.1/src/android-bus.svg | 18 - .../ionicons-2.0.1/src/android-calendar.svg | 11 - .../external/ionicons-2.0.1/src/android-call.svg | 10 - .../external/ionicons-2.0.1/src/android-camera.svg | 12 - .../external/ionicons-2.0.1/src/android-cancel.svg | 11 - .../external/ionicons-2.0.1/src/android-car.svg | 15 - .../external/ionicons-2.0.1/src/android-cart.svg | 14 - .../external/ionicons-2.0.1/src/android-chat.svg | 12 - .../ionicons-2.0.1/src/android-checkbox-blank.svg | 12 - .../src/android-checkbox-outline-blank.svg | 13 - .../src/android-checkbox-outline.svg | 13 - .../ionicons-2.0.1/src/android-checkbox.svg | 13 - .../src/android-checkmark-circle.svg | 9 - .../ionicons-2.0.1/src/android-clipboard.svg | 10 - .../external/ionicons-2.0.1/src/android-close.svg | 12 - .../ionicons-2.0.1/src/android-cloud-circle.svg | 16 - .../ionicons-2.0.1/src/android-cloud-done.svg | 12 - .../ionicons-2.0.1/src/android-cloud-outline.svg | 16 - .../external/ionicons-2.0.1/src/android-cloud.svg | 9 - .../ionicons-2.0.1/src/android-color-palette.svg | 17 - .../ionicons-2.0.1/src/android-compass.svg | 9 - .../ionicons-2.0.1/src/android-contact.svg | 15 - .../ionicons-2.0.1/src/android-contacts.svg | 26 - .../ionicons-2.0.1/src/android-contract.svg | 12 - .../external/ionicons-2.0.1/src/android-create.svg | 13 - .../external/ionicons-2.0.1/src/android-delete.svg | 10 - .../ionicons-2.0.1/src/android-desktop.svg | 13 - .../ionicons-2.0.1/src/android-document.svg | 10 - .../ionicons-2.0.1/src/android-done-all.svg | 13 - .../external/ionicons-2.0.1/src/android-done.svg | 13 - .../ionicons-2.0.1/src/android-download.svg | 9 - .../external/ionicons-2.0.1/src/android-drafts.svg | 15 - .../external/ionicons-2.0.1/src/android-exit.svg | 9 - .../external/ionicons-2.0.1/src/android-expand.svg | 12 - .../src/android-favorite-outline.svg | 13 - .../ionicons-2.0.1/src/android-favorite.svg | 11 - .../external/ionicons-2.0.1/src/android-film.svg | 9 - .../ionicons-2.0.1/src/android-folder-open.svg | 10 - .../external/ionicons-2.0.1/src/android-folder.svg | 14 - .../external/ionicons-2.0.1/src/android-funnel.svg | 7 - .../external/ionicons-2.0.1/src/android-globe.svg | 24 - .../external/ionicons-2.0.1/src/android-hand.svg | 15 - .../ionicons-2.0.1/src/android-hangout.svg | 9 - .../external/ionicons-2.0.1/src/android-happy.svg | 12 - .../external/ionicons-2.0.1/src/android-home.svg | 9 - .../external/ionicons-2.0.1/src/android-image.svg | 13 - .../external/ionicons-2.0.1/src/android-laptop.svg | 14 - .../external/ionicons-2.0.1/src/android-list.svg | 10 - .../external/ionicons-2.0.1/src/android-locate.svg | 16 - .../external/ionicons-2.0.1/src/android-lock.svg | 14 - .../external/ionicons-2.0.1/src/android-mail.svg | 13 - .../external/ionicons-2.0.1/src/android-map.svg | 16 - .../external/ionicons-2.0.1/src/android-menu.svg | 11 - .../ionicons-2.0.1/src/android-microphone-off.svg | 17 - .../ionicons-2.0.1/src/android-microphone.svg | 12 - .../ionicons-2.0.1/src/android-more-horizontal.svg | 9 - .../ionicons-2.0.1/src/android-more-vertical.svg | 9 - .../ionicons-2.0.1/src/android-navigate.svg | 11 - .../src/android-notifications-none.svg | 11 - .../src/android-notifications-off.svg | 13 - .../ionicons-2.0.1/src/android-notifications.svg | 9 - .../external/ionicons-2.0.1/src/android-open.svg | 9 - .../ionicons-2.0.1/src/android-options.svg | 26 - .../external/ionicons-2.0.1/src/android-people.svg | 11 - .../ionicons-2.0.1/src/android-person-add.svg | 17 - .../external/ionicons-2.0.1/src/android-person.svg | 10 - .../ionicons-2.0.1/src/android-phone-landscape.svg | 12 - .../ionicons-2.0.1/src/android-phone-portrait.svg | 12 - .../external/ionicons-2.0.1/src/android-pin.svg | 11 - .../external/ionicons-2.0.1/src/android-plane.svg | 12 - .../ionicons-2.0.1/src/android-playstore.svg | 11 - .../external/ionicons-2.0.1/src/android-print.svg | 10 - .../src/android-radio-button-off.svg | 12 - .../ionicons-2.0.1/src/android-radio-button-on.svg | 13 - .../ionicons-2.0.1/src/android-refresh.svg | 11 - .../ionicons-2.0.1/src/android-remove-circle.svg | 10 - .../external/ionicons-2.0.1/src/android-remove.svg | 7 - .../ionicons-2.0.1/src/android-restaurant.svg | 17 - .../external/ionicons-2.0.1/src/android-sad.svg | 16 - .../external/ionicons-2.0.1/src/android-search.svg | 19 - .../external/ionicons-2.0.1/src/android-send.svg | 7 - .../ionicons-2.0.1/src/android-settings.svg | 19 - .../ionicons-2.0.1/src/android-share-alt.svg | 16 - .../external/ionicons-2.0.1/src/android-share.svg | 12 - .../ionicons-2.0.1/src/android-star-half.svg | 9 - .../ionicons-2.0.1/src/android-star-outline.svg | 10 - .../external/ionicons-2.0.1/src/android-star.svg | 10 - .../ionicons-2.0.1/src/android-stopwatch.svg | 21 - .../external/ionicons-2.0.1/src/android-subway.svg | 13 - .../external/ionicons-2.0.1/src/android-sunny.svg | 18 - .../external/ionicons-2.0.1/src/android-sync.svg | 10 - .../ionicons-2.0.1/src/android-textsms.svg | 10 - .../external/ionicons-2.0.1/src/android-time.svg | 15 - .../external/ionicons-2.0.1/src/android-train.svg | 15 - .../external/ionicons-2.0.1/src/android-unlock.svg | 10 - .../external/ionicons-2.0.1/src/android-upload.svg | 9 - .../ionicons-2.0.1/src/android-volume-down.svg | 8 - .../ionicons-2.0.1/src/android-volume-mute.svg | 7 - .../ionicons-2.0.1/src/android-volume-off.svg | 15 - .../ionicons-2.0.1/src/android-volume-up.svg | 9 - .../external/ionicons-2.0.1/src/android-walk.svg | 12 - .../ionicons-2.0.1/src/android-warning.svg | 11 - .../external/ionicons-2.0.1/src/android-watch.svg | 15 - .../external/ionicons-2.0.1/src/android-wifi.svg | 14 - .../external/ionicons-2.0.1/src/aperture.svg | 20 - .../fusion/external/ionicons-2.0.1/src/archive.svg | 12 - .../external/ionicons-2.0.1/src/arrow-down-a.svg | 7 - .../external/ionicons-2.0.1/src/arrow-down-b.svg | 8 - .../external/ionicons-2.0.1/src/arrow-down-c.svg | 9 - .../external/ionicons-2.0.1/src/arrow-expand.svg | 12 - .../ionicons-2.0.1/src/arrow-graph-down-left.svg | 7 - .../ionicons-2.0.1/src/arrow-graph-down-right.svg | 7 - .../ionicons-2.0.1/src/arrow-graph-up-left.svg | 7 - .../ionicons-2.0.1/src/arrow-graph-up-right.svg | 7 - .../external/ionicons-2.0.1/src/arrow-left-a.svg | 7 - .../external/ionicons-2.0.1/src/arrow-left-b.svg | 8 - .../external/ionicons-2.0.1/src/arrow-left-c.svg | 9 - .../external/ionicons-2.0.1/src/arrow-move.svg | 8 - .../external/ionicons-2.0.1/src/arrow-resize.svg | 8 - .../ionicons-2.0.1/src/arrow-return-left.svg | 8 - .../ionicons-2.0.1/src/arrow-return-right.svg | 8 - .../external/ionicons-2.0.1/src/arrow-right-a.svg | 7 - .../external/ionicons-2.0.1/src/arrow-right-b.svg | 8 - .../external/ionicons-2.0.1/src/arrow-right-c.svg | 9 - .../external/ionicons-2.0.1/src/arrow-shrink.svg | 12 - .../external/ionicons-2.0.1/src/arrow-swap.svg | 10 - .../external/ionicons-2.0.1/src/arrow-up-a.svg | 7 - .../external/ionicons-2.0.1/src/arrow-up-b.svg | 8 - .../external/ionicons-2.0.1/src/arrow-up-c.svg | 9 - .../external/ionicons-2.0.1/src/asterisk.svg | 8 - .../app/fusion/external/ionicons-2.0.1/src/at.svg | 25 - .../ionicons-2.0.1/src/backspace-outline.svg | 21 - .../external/ionicons-2.0.1/src/backspace.svg | 17 - .../app/fusion/external/ionicons-2.0.1/src/bag.svg | 10 - .../ionicons-2.0.1/src/battery-charging.svg | 9 - .../external/ionicons-2.0.1/src/battery-empty.svg | 8 - .../external/ionicons-2.0.1/src/battery-full.svg | 8 - .../external/ionicons-2.0.1/src/battery-half.svg | 9 - .../external/ionicons-2.0.1/src/battery-low.svg | 9 - .../fusion/external/ionicons-2.0.1/src/beaker.svg | 20 - .../fusion/external/ionicons-2.0.1/src/beer.svg | 28 - .../external/ionicons-2.0.1/src/bluetooth.svg | 18 - .../fusion/external/ionicons-2.0.1/src/bonfire.svg | 32 - .../external/ionicons-2.0.1/src/bookmark.svg | 10 - .../fusion/external/ionicons-2.0.1/src/bowtie.svg | 22 - .../external/ionicons-2.0.1/src/briefcase.svg | 12 - .../app/fusion/external/ionicons-2.0.1/src/bug.svg | 30 - .../external/ionicons-2.0.1/src/calculator.svg | 10 - .../external/ionicons-2.0.1/src/calendar.svg | 12 - .../fusion/external/ionicons-2.0.1/src/camera.svg | 15 - .../fusion/external/ionicons-2.0.1/src/card.svg | 14 - .../fusion/external/ionicons-2.0.1/src/cash.svg | 31 - .../ionicons-2.0.1/src/chatbox-working.svg | 11 - .../fusion/external/ionicons-2.0.1/src/chatbox.svg | 8 - .../external/ionicons-2.0.1/src/chatboxes.svg | 12 - .../ionicons-2.0.1/src/chatbubble-working.svg | 12 - .../external/ionicons-2.0.1/src/chatbubble.svg | 9 - .../external/ionicons-2.0.1/src/chatbubbles.svg | 16 - .../ionicons-2.0.1/src/checkmark-circled.svg | 13 - .../ionicons-2.0.1/src/checkmark-round.svg | 9 - .../external/ionicons-2.0.1/src/checkmark.svg | 10 - .../external/ionicons-2.0.1/src/chevron-down.svg | 9 - .../external/ionicons-2.0.1/src/chevron-left.svg | 9 - .../external/ionicons-2.0.1/src/chevron-right.svg | 9 - .../external/ionicons-2.0.1/src/chevron-up.svg | 9 - .../external/ionicons-2.0.1/src/clipboard.svg | 22 - .../fusion/external/ionicons-2.0.1/src/clock.svg | 21 - .../external/ionicons-2.0.1/src/close-circled.svg | 13 - .../external/ionicons-2.0.1/src/close-round.svg | 9 - .../fusion/external/ionicons-2.0.1/src/close.svg | 10 - .../ionicons-2.0.1/src/closed-captioning.svg | 31 - .../fusion/external/ionicons-2.0.1/src/cloud.svg | 9 - .../external/ionicons-2.0.1/src/code-download.svg | 31 - .../external/ionicons-2.0.1/src/code-working.svg | 21 - .../fusion/external/ionicons-2.0.1/src/code.svg | 14 - .../fusion/external/ionicons-2.0.1/src/coffee.svg | 13 - .../fusion/external/ionicons-2.0.1/src/compass.svg | 16 - .../fusion/external/ionicons-2.0.1/src/compose.svg | 14 - .../ionicons-2.0.1/src/connection-bars.svg | 12 - .../external/ionicons-2.0.1/src/contrast.svg | 9 - .../fusion/external/ionicons-2.0.1/src/crop.svg | 11 - .../fusion/external/ionicons-2.0.1/src/cube.svg | 19 - .../fusion/external/ionicons-2.0.1/src/disc.svg | 13 - .../external/ionicons-2.0.1/src/document-text.svg | 15 - .../external/ionicons-2.0.1/src/document.svg | 10 - .../fusion/external/ionicons-2.0.1/src/drag.svg | 11 - .../fusion/external/ionicons-2.0.1/src/earth.svg | 44 - .../fusion/external/ionicons-2.0.1/src/easel.svg | 15 - .../fusion/external/ionicons-2.0.1/src/edit.svg | 13 - .../app/fusion/external/ionicons-2.0.1/src/egg.svg | 7 - .../fusion/external/ionicons-2.0.1/src/eject.svg | 12 - .../external/ionicons-2.0.1/src/email-unread.svg | 19 - .../fusion/external/ionicons-2.0.1/src/email.svg | 15 - .../src/erlenmeyer-flask-bubbles.svg | 15 - .../ionicons-2.0.1/src/erlenmeyer-flask.svg | 21 - .../external/ionicons-2.0.1/src/eye-disabled.svg | 18 - .../app/fusion/external/ionicons-2.0.1/src/eye.svg | 15 - .../fusion/external/ionicons-2.0.1/src/female.svg | 8 - .../fusion/external/ionicons-2.0.1/src/filing.svg | 12 - .../external/ionicons-2.0.1/src/film-marker.svg | 10 - .../external/ionicons-2.0.1/src/fireball.svg | 16 - .../fusion/external/ionicons-2.0.1/src/flag.svg | 12 - .../fusion/external/ionicons-2.0.1/src/flame.svg | 11 - .../external/ionicons-2.0.1/src/flash-off.svg | 16 - .../fusion/external/ionicons-2.0.1/src/flash.svg | 7 - .../fusion/external/ionicons-2.0.1/src/folder.svg | 14 - .../external/ionicons-2.0.1/src/fork-repo.svg | 20 - .../fusion/external/ionicons-2.0.1/src/fork.svg | 14 - .../fusion/external/ionicons-2.0.1/src/forward.svg | 9 - .../fusion/external/ionicons-2.0.1/src/funnel.svg | 13 - .../fusion/external/ionicons-2.0.1/src/gear-a.svg | 15 - .../fusion/external/ionicons-2.0.1/src/gear-b.svg | 11 - .../fusion/external/ionicons-2.0.1/src/grid.svg | 32 - .../fusion/external/ionicons-2.0.1/src/hammer.svg | 11 - .../external/ionicons-2.0.1/src/happy-outline.svg | 23 - .../fusion/external/ionicons-2.0.1/src/happy.svg | 20 - .../external/ionicons-2.0.1/src/headphone.svg | 15 - .../external/ionicons-2.0.1/src/heart-broken.svg | 17 - .../fusion/external/ionicons-2.0.1/src/heart.svg | 10 - .../external/ionicons-2.0.1/src/help-buoy.svg | 13 - .../external/ionicons-2.0.1/src/help-circled.svg | 15 - .../fusion/external/ionicons-2.0.1/src/help.svg | 14 - .../fusion/external/ionicons-2.0.1/src/home.svg | 9 - .../external/ionicons-2.0.1/src/icecream.svg | 15 - .../fusion/external/ionicons-2.0.1/src/image.svg | 13 - .../fusion/external/ionicons-2.0.1/src/images.svg | 20 - .../ionicons-2.0.1/src/information-circled.svg | 11 - .../external/ionicons-2.0.1/src/information.svg | 10 - .../fusion/external/ionicons-2.0.1/src/ionic.svg | 18 - .../ionicons-2.0.1/src/ios-alarm-outline.svg | 21 - .../external/ionicons-2.0.1/src/ios-alarm.svg | 14 - .../ionicons-2.0.1/src/ios-albums-outline.svg | 11 - .../external/ionicons-2.0.1/src/ios-albums.svg | 11 - .../src/ios-americanfootball-outline.svg | 24 - .../ionicons-2.0.1/src/ios-americanfootball.svg | 21 - .../ionicons-2.0.1/src/ios-analytics-outline.svg | 24 - .../external/ionicons-2.0.1/src/ios-analytics.svg | 17 - .../external/ionicons-2.0.1/src/ios-arrow-back.svg | 7 - .../external/ionicons-2.0.1/src/ios-arrow-down.svg | 7 - .../ionicons-2.0.1/src/ios-arrow-forward.svg | 7 - .../external/ionicons-2.0.1/src/ios-arrow-left.svg | 7 - .../ionicons-2.0.1/src/ios-arrow-right.svg | 7 - .../ionicons-2.0.1/src/ios-arrow-thin-down.svg | 9 - .../ionicons-2.0.1/src/ios-arrow-thin-left.svg | 9 - .../ionicons-2.0.1/src/ios-arrow-thin-right.svg | 9 - .../ionicons-2.0.1/src/ios-arrow-thin-up.svg | 9 - .../external/ionicons-2.0.1/src/ios-arrow-up.svg | 7 - .../external/ionicons-2.0.1/src/ios-at-outline.svg | 26 - .../fusion/external/ionicons-2.0.1/src/ios-at.svg | 24 - .../ionicons-2.0.1/src/ios-barcode-outline.svg | 15 - .../external/ionicons-2.0.1/src/ios-barcode.svg | 10 - .../ionicons-2.0.1/src/ios-baseball-outline.svg | 35 - .../external/ionicons-2.0.1/src/ios-baseball.svg | 27 - .../ionicons-2.0.1/src/ios-basketball-outline.svg | 25 - .../external/ionicons-2.0.1/src/ios-basketball.svg | 21 - .../ionicons-2.0.1/src/ios-bell-outline.svg | 13 - .../external/ionicons-2.0.1/src/ios-bell.svg | 11 - .../ionicons-2.0.1/src/ios-body-outline.svg | 27 - .../external/ionicons-2.0.1/src/ios-body.svg | 17 - .../ionicons-2.0.1/src/ios-bolt-outline.svg | 8 - .../external/ionicons-2.0.1/src/ios-bolt.svg | 7 - .../ionicons-2.0.1/src/ios-book-outline.svg | 13 - .../external/ionicons-2.0.1/src/ios-book.svg | 12 - .../ionicons-2.0.1/src/ios-bookmarks-outline.svg | 13 - .../external/ionicons-2.0.1/src/ios-bookmarks.svg | 13 - .../ionicons-2.0.1/src/ios-box-outline.svg | 13 - .../fusion/external/ionicons-2.0.1/src/ios-box.svg | 10 - .../ionicons-2.0.1/src/ios-briefcase-outline.svg | 11 - .../external/ionicons-2.0.1/src/ios-briefcase.svg | 13 - .../ionicons-2.0.1/src/ios-browsers-outline.svg | 12 - .../external/ionicons-2.0.1/src/ios-browsers.svg | 10 - .../ionicons-2.0.1/src/ios-calculator-outline.svg | 19 - .../external/ionicons-2.0.1/src/ios-calculator.svg | 9 - .../ionicons-2.0.1/src/ios-calendar-outline.svg | 14 - .../external/ionicons-2.0.1/src/ios-calendar.svg | 12 - .../ionicons-2.0.1/src/ios-camera-outline.svg | 17 - .../external/ionicons-2.0.1/src/ios-camera.svg | 13 - .../ionicons-2.0.1/src/ios-cart-outline.svg | 16 - .../external/ionicons-2.0.1/src/ios-cart.svg | 14 - .../ionicons-2.0.1/src/ios-chatboxes-outline.svg | 10 - .../external/ionicons-2.0.1/src/ios-chatboxes.svg | 10 - .../ionicons-2.0.1/src/ios-chatbubble-outline.svg | 14 - .../external/ionicons-2.0.1/src/ios-chatbubble.svg | 11 - .../ionicons-2.0.1/src/ios-checkmark-empty.svg | 10 - .../ionicons-2.0.1/src/ios-checkmark-outline.svg | 14 - .../external/ionicons-2.0.1/src/ios-checkmark.svg | 10 - .../ionicons-2.0.1/src/ios-circle-filled.svg | 18 - .../ionicons-2.0.1/src/ios-circle-outline.svg | 13 - .../ionicons-2.0.1/src/ios-clock-outline.svg | 12 - .../external/ionicons-2.0.1/src/ios-clock.svg | 10 - .../ionicons-2.0.1/src/ios-close-empty.svg | 13 - .../ionicons-2.0.1/src/ios-close-outline.svg | 20 - .../external/ionicons-2.0.1/src/ios-close.svg | 16 - .../src/ios-cloud-download-outline.svg | 19 - .../ionicons-2.0.1/src/ios-cloud-download.svg | 12 - .../ionicons-2.0.1/src/ios-cloud-outline.svg | 12 - .../src/ios-cloud-upload-outline.svg | 20 - .../ionicons-2.0.1/src/ios-cloud-upload.svg | 13 - .../external/ionicons-2.0.1/src/ios-cloud.svg | 9 - .../src/ios-cloudy-night-outline.svg | 24 - .../ionicons-2.0.1/src/ios-cloudy-night.svg | 21 - .../ionicons-2.0.1/src/ios-cloudy-outline.svg | 17 - .../external/ionicons-2.0.1/src/ios-cloudy.svg | 14 - .../ionicons-2.0.1/src/ios-cog-outline.svg | 29 - .../fusion/external/ionicons-2.0.1/src/ios-cog.svg | 23 - .../src/ios-color-filter-outline.svg | 25 - .../ionicons-2.0.1/src/ios-color-filter.svg | 29 - .../ionicons-2.0.1/src/ios-color-wand-outline.svg | 17 - .../external/ionicons-2.0.1/src/ios-color-wand.svg | 16 - .../ionicons-2.0.1/src/ios-compose-outline.svg | 14 - .../external/ionicons-2.0.1/src/ios-compose.svg | 13 - .../ionicons-2.0.1/src/ios-contact-outline.svg | 13 - .../external/ionicons-2.0.1/src/ios-contact.svg | 13 - .../ionicons-2.0.1/src/ios-copy-outline.svg | 11 - .../external/ionicons-2.0.1/src/ios-copy.svg | 12 - .../ionicons-2.0.1/src/ios-crop-strong.svg | 12 - .../external/ionicons-2.0.1/src/ios-crop.svg | 12 - .../ionicons-2.0.1/src/ios-download-outline.svg | 14 - .../external/ionicons-2.0.1/src/ios-download.svg | 11 - .../external/ionicons-2.0.1/src/ios-drag.svg | 11 - .../ionicons-2.0.1/src/ios-email-outline.svg | 8 - .../external/ionicons-2.0.1/src/ios-email.svg | 11 - .../ionicons-2.0.1/src/ios-eye-outline.svg | 18 - .../fusion/external/ionicons-2.0.1/src/ios-eye.svg | 13 - .../ionicons-2.0.1/src/ios-fastforward-outline.svg | 8 - .../ionicons-2.0.1/src/ios-fastforward.svg | 7 - .../ionicons-2.0.1/src/ios-filing-outline.svg | 9 - .../external/ionicons-2.0.1/src/ios-filing.svg | 11 - .../ionicons-2.0.1/src/ios-film-outline.svg | 9 - .../external/ionicons-2.0.1/src/ios-film.svg | 11 - .../ionicons-2.0.1/src/ios-flag-outline.svg | 13 - .../external/ionicons-2.0.1/src/ios-flag.svg | 11 - .../ionicons-2.0.1/src/ios-flame-outline.svg | 14 - .../external/ionicons-2.0.1/src/ios-flame.svg | 11 - .../ionicons-2.0.1/src/ios-flask-outline.svg | 19 - .../external/ionicons-2.0.1/src/ios-flask.svg | 17 - .../ionicons-2.0.1/src/ios-flower-outline.svg | 75 - .../external/ionicons-2.0.1/src/ios-flower.svg | 38 - .../ionicons-2.0.1/src/ios-folder-outline.svg | 11 - .../external/ionicons-2.0.1/src/ios-folder.svg | 13 - .../ionicons-2.0.1/src/ios-football-outline.svg | 20 - .../external/ionicons-2.0.1/src/ios-football.svg | 14 - .../src/ios-game-controller-a-outline.svg | 26 - .../ionicons-2.0.1/src/ios-game-controller-a.svg | 19 - .../src/ios-game-controller-b-outline.svg | 35 - .../ionicons-2.0.1/src/ios-game-controller-b.svg | 23 - .../ionicons-2.0.1/src/ios-gear-outline.svg | 40 - .../external/ionicons-2.0.1/src/ios-gear.svg | 17 - .../ionicons-2.0.1/src/ios-glasses-outline.svg | 12 - .../external/ionicons-2.0.1/src/ios-glasses.svg | 11 - .../ionicons-2.0.1/src/ios-grid-view-outline.svg | 8 - .../external/ionicons-2.0.1/src/ios-grid-view.svg | 11 - .../ionicons-2.0.1/src/ios-heart-outline.svg | 15 - .../external/ionicons-2.0.1/src/ios-heart.svg | 9 - .../external/ionicons-2.0.1/src/ios-help-empty.svg | 12 - .../ionicons-2.0.1/src/ios-help-outline.svg | 22 - .../external/ionicons-2.0.1/src/ios-help.svg | 12 - .../ionicons-2.0.1/src/ios-home-outline.svg | 11 - .../external/ionicons-2.0.1/src/ios-home.svg | 10 - .../ionicons-2.0.1/src/ios-infinite-outline.svg | 17 - .../external/ionicons-2.0.1/src/ios-infinite.svg | 16 - .../ionicons-2.0.1/src/ios-information-empty.svg | 12 - .../ionicons-2.0.1/src/ios-information-outline.svg | 17 - .../ionicons-2.0.1/src/ios-information.svg | 11 - .../ionicons-2.0.1/src/ios-ionic-outline.svg | 18 - .../ionicons-2.0.1/src/ios-keypad-outline.svg | 28 - .../external/ionicons-2.0.1/src/ios-keypad.svg | 20 - .../ionicons-2.0.1/src/ios-lightbulb-outline.svg | 17 - .../external/ionicons-2.0.1/src/ios-lightbulb.svg | 16 - .../ionicons-2.0.1/src/ios-list-outline.svg | 23 - .../external/ionicons-2.0.1/src/ios-list.svg | 11 - .../ionicons-2.0.1/src/ios-location-outline.svg | 14 - .../external/ionicons-2.0.1/src/ios-location.svg | 8 - .../ionicons-2.0.1/src/ios-locked-outline.svg | 14 - .../external/ionicons-2.0.1/src/ios-locked.svg | 12 - .../ionicons-2.0.1/src/ios-loop-strong.svg | 18 - .../external/ionicons-2.0.1/src/ios-loop.svg | 22 - .../ionicons-2.0.1/src/ios-medical-outline.svg | 10 - .../external/ionicons-2.0.1/src/ios-medical.svg | 8 - .../ionicons-2.0.1/src/ios-medkit-outline.svg | 14 - .../external/ionicons-2.0.1/src/ios-medkit.svg | 13 - .../external/ionicons-2.0.1/src/ios-mic-off.svg | 14 - .../ionicons-2.0.1/src/ios-mic-outline.svg | 12 - .../fusion/external/ionicons-2.0.1/src/ios-mic.svg | 12 - .../ionicons-2.0.1/src/ios-minus-empty.svg | 9 - .../ionicons-2.0.1/src/ios-minus-outline.svg | 16 - .../external/ionicons-2.0.1/src/ios-minus.svg | 10 - .../ionicons-2.0.1/src/ios-monitor-outline.svg | 7 - .../external/ionicons-2.0.1/src/ios-monitor.svg | 10 - .../ionicons-2.0.1/src/ios-moon-outline.svg | 15 - .../external/ionicons-2.0.1/src/ios-moon.svg | 13 - .../ionicons-2.0.1/src/ios-more-outline.svg | 14 - .../external/ionicons-2.0.1/src/ios-more.svg | 11 - .../ionicons-2.0.1/src/ios-musical-note.svg | 9 - .../ionicons-2.0.1/src/ios-musical-notes.svg | 9 - .../ionicons-2.0.1/src/ios-navigate-outline.svg | 12 - .../external/ionicons-2.0.1/src/ios-navigate.svg | 10 - .../ionicons-2.0.1/src/ios-nutrition-outline.svg | 29 - .../external/ionicons-2.0.1/src/ios-nutrition.svg | 17 - .../ionicons-2.0.1/src/ios-paper-outline.svg | 14 - .../external/ionicons-2.0.1/src/ios-paper.svg | 8 - .../ionicons-2.0.1/src/ios-paperplane-outline.svg | 8 - .../external/ionicons-2.0.1/src/ios-paperplane.svg | 10 - .../ionicons-2.0.1/src/ios-partlysunny-outline.svg | 33 - .../ionicons-2.0.1/src/ios-partlysunny.svg | 28 - .../ionicons-2.0.1/src/ios-pause-outline.svg | 10 - .../external/ionicons-2.0.1/src/ios-pause.svg | 10 - .../ionicons-2.0.1/src/ios-paw-outline.svg | 43 - .../fusion/external/ionicons-2.0.1/src/ios-paw.svg | 26 - .../ionicons-2.0.1/src/ios-people-outline.svg | 44 - .../external/ionicons-2.0.1/src/ios-people.svg | 29 - .../ionicons-2.0.1/src/ios-person-outline.svg | 22 - .../external/ionicons-2.0.1/src/ios-person.svg | 13 - .../ionicons-2.0.1/src/ios-personadd-outline.svg | 25 - .../external/ionicons-2.0.1/src/ios-personadd.svg | 16 - .../ionicons-2.0.1/src/ios-photos-outline.svg | 10 - .../external/ionicons-2.0.1/src/ios-photos.svg | 10 - .../ionicons-2.0.1/src/ios-pie-outline.svg | 16 - .../fusion/external/ionicons-2.0.1/src/ios-pie.svg | 11 - .../ionicons-2.0.1/src/ios-pint-outline.svg | 17 - .../external/ionicons-2.0.1/src/ios-pint.svg | 12 - .../ionicons-2.0.1/src/ios-play-outline.svg | 9 - .../external/ionicons-2.0.1/src/ios-play.svg | 9 - .../external/ionicons-2.0.1/src/ios-plus-empty.svg | 9 - .../ionicons-2.0.1/src/ios-plus-outline.svg | 18 - .../external/ionicons-2.0.1/src/ios-plus.svg | 10 - .../ionicons-2.0.1/src/ios-pricetag-outline.svg | 11 - .../external/ionicons-2.0.1/src/ios-pricetag.svg | 11 - .../ionicons-2.0.1/src/ios-pricetags-outline.svg | 12 - .../external/ionicons-2.0.1/src/ios-pricetags.svg | 16 - .../ionicons-2.0.1/src/ios-printer-outline.svg | 12 - .../external/ionicons-2.0.1/src/ios-printer.svg | 17 - .../ionicons-2.0.1/src/ios-pulse-strong.svg | 12 - .../external/ionicons-2.0.1/src/ios-pulse.svg | 12 - .../ionicons-2.0.1/src/ios-rainy-outline.svg | 20 - .../external/ionicons-2.0.1/src/ios-rainy.svg | 17 - .../ionicons-2.0.1/src/ios-recording-outline.svg | 15 - .../external/ionicons-2.0.1/src/ios-recording.svg | 14 - .../ionicons-2.0.1/src/ios-redo-outline.svg | 11 - .../external/ionicons-2.0.1/src/ios-redo.svg | 10 - .../ionicons-2.0.1/src/ios-refresh-empty.svg | 10 - .../ionicons-2.0.1/src/ios-refresh-outline.svg | 15 - .../external/ionicons-2.0.1/src/ios-refresh.svg | 11 - .../external/ionicons-2.0.1/src/ios-reload.svg | 11 - .../src/ios-reverse-camera-outline.svg | 20 - .../ionicons-2.0.1/src/ios-reverse-camera.svg | 15 - .../ionicons-2.0.1/src/ios-rewind-outline.svg | 8 - .../external/ionicons-2.0.1/src/ios-rewind.svg | 7 - .../ionicons-2.0.1/src/ios-rose-outline.svg | 29 - .../external/ionicons-2.0.1/src/ios-rose.svg | 18 - .../ionicons-2.0.1/src/ios-search-strong.svg | 10 - .../external/ionicons-2.0.1/src/ios-search.svg | 10 - .../ionicons-2.0.1/src/ios-settings-strong.svg | 14 - .../external/ionicons-2.0.1/src/ios-settings.svg | 24 - .../ionicons-2.0.1/src/ios-shuffle-strong.svg | 18 - .../external/ionicons-2.0.1/src/ios-shuffle.svg | 20 - .../src/ios-skipbackward-outline.svg | 8 - .../ionicons-2.0.1/src/ios-skipbackward.svg | 7 - .../ionicons-2.0.1/src/ios-skipforward-outline.svg | 8 - .../ionicons-2.0.1/src/ios-skipforward.svg | 7 - .../external/ionicons-2.0.1/src/ios-snowy.svg | 26 - .../ionicons-2.0.1/src/ios-speedometer-outline.svg | 24 - .../ionicons-2.0.1/src/ios-speedometer.svg | 28 - .../external/ionicons-2.0.1/src/ios-star-half.svg | 8 - .../ionicons-2.0.1/src/ios-star-outline.svg | 8 - .../external/ionicons-2.0.1/src/ios-star.svg | 7 - .../ionicons-2.0.1/src/ios-stopwatch-outline.svg | 15 - .../external/ionicons-2.0.1/src/ios-stopwatch.svg | 13 - .../ionicons-2.0.1/src/ios-sunny-outline.svg | 27 - .../external/ionicons-2.0.1/src/ios-sunny.svg | 26 - .../ionicons-2.0.1/src/ios-telephone-outline.svg | 17 - .../external/ionicons-2.0.1/src/ios-telephone.svg | 12 - .../ionicons-2.0.1/src/ios-tennisball-outline.svg | 19 - .../external/ionicons-2.0.1/src/ios-tennisball.svg | 25 - .../src/ios-thunderstorm-outline.svg | 22 - .../ionicons-2.0.1/src/ios-thunderstorm.svg | 17 - .../ionicons-2.0.1/src/ios-time-outline.svg | 36 - .../external/ionicons-2.0.1/src/ios-time.svg | 27 - .../ionicons-2.0.1/src/ios-timer-outline.svg | 11 - .../external/ionicons-2.0.1/src/ios-timer.svg | 12 - .../ionicons-2.0.1/src/ios-toggle-outline.svg | 22 - .../external/ionicons-2.0.1/src/ios-toggle.svg | 16 - .../ionicons-2.0.1/src/ios-trash-outline.svg | 17 - .../external/ionicons-2.0.1/src/ios-trash.svg | 12 - .../ionicons-2.0.1/src/ios-undo-outline.svg | 11 - .../external/ionicons-2.0.1/src/ios-undo.svg | 10 - .../ionicons-2.0.1/src/ios-unlocked-outline.svg | 14 - .../external/ionicons-2.0.1/src/ios-unlocked.svg | 12 - .../ionicons-2.0.1/src/ios-upload-outline.svg | 14 - .../external/ionicons-2.0.1/src/ios-upload.svg | 10 - .../ionicons-2.0.1/src/ios-videocam-outline.svg | 12 - .../external/ionicons-2.0.1/src/ios-videocam.svg | 11 - .../ionicons-2.0.1/src/ios-volume-high.svg | 19 - .../external/ionicons-2.0.1/src/ios-volume-low.svg | 7 - .../ionicons-2.0.1/src/ios-wineglass-outline.svg | 15 - .../external/ionicons-2.0.1/src/ios-wineglass.svg | 11 - .../ionicons-2.0.1/src/ios-world-outline.svg | 22 - .../external/ionicons-2.0.1/src/ios-world.svg | 29 - .../fusion/external/ionicons-2.0.1/src/ipad.svg | 10 - .../fusion/external/ionicons-2.0.1/src/iphone.svg | 13 - .../fusion/external/ionicons-2.0.1/src/ipod.svg | 13 - .../app/fusion/external/ionicons-2.0.1/src/jet.svg | 14 - .../app/fusion/external/ionicons-2.0.1/src/key.svg | 14 - .../fusion/external/ionicons-2.0.1/src/knife.svg | 9 - .../fusion/external/ionicons-2.0.1/src/laptop.svg | 10 - .../fusion/external/ionicons-2.0.1/src/leaf.svg | 12 - .../fusion/external/ionicons-2.0.1/src/levels.svg | 16 - .../external/ionicons-2.0.1/src/lightbulb.svg | 21 - .../fusion/external/ionicons-2.0.1/src/link.svg | 15 - .../fusion/external/ionicons-2.0.1/src/load-a.svg | 17 - .../fusion/external/ionicons-2.0.1/src/load-b.svg | 20 - .../fusion/external/ionicons-2.0.1/src/load-c.svg | 21 - .../fusion/external/ionicons-2.0.1/src/load-d.svg | 28 - .../external/ionicons-2.0.1/src/location.svg | 11 - .../ionicons-2.0.1/src/lock-combination.svg | 28 - .../fusion/external/ionicons-2.0.1/src/locked.svg | 11 - .../fusion/external/ionicons-2.0.1/src/log-in.svg | 14 - .../fusion/external/ionicons-2.0.1/src/log-out.svg | 17 - .../fusion/external/ionicons-2.0.1/src/loop.svg | 14 - .../fusion/external/ionicons-2.0.1/src/magnet.svg | 14 - .../fusion/external/ionicons-2.0.1/src/male.svg | 10 - .../app/fusion/external/ionicons-2.0.1/src/man.svg | 12 - .../app/fusion/external/ionicons-2.0.1/src/map.svg | 30 - .../fusion/external/ionicons-2.0.1/src/medkit.svg | 12 - .../fusion/external/ionicons-2.0.1/src/merge.svg | 13 - .../fusion/external/ionicons-2.0.1/src/mic-a.svg | 15 - .../fusion/external/ionicons-2.0.1/src/mic-b.svg | 17 - .../fusion/external/ionicons-2.0.1/src/mic-c.svg | 8 - .../external/ionicons-2.0.1/src/minus-circled.svg | 9 - .../external/ionicons-2.0.1/src/minus-round.svg | 8 - .../fusion/external/ionicons-2.0.1/src/minus.svg | 7 - .../fusion/external/ionicons-2.0.1/src/model-s.svg | 33 - .../fusion/external/ionicons-2.0.1/src/monitor.svg | 12 - .../fusion/external/ionicons-2.0.1/src/more.svg | 12 - .../fusion/external/ionicons-2.0.1/src/mouse.svg | 24 - .../external/ionicons-2.0.1/src/music-note.svg | 10 - .../external/ionicons-2.0.1/src/navicon-round.svg | 14 - .../fusion/external/ionicons-2.0.1/src/navicon.svg | 11 - .../external/ionicons-2.0.1/src/navigate.svg | 7 - .../fusion/external/ionicons-2.0.1/src/network.svg | 12 - .../external/ionicons-2.0.1/src/no-smoking.svg | 33 - .../fusion/external/ionicons-2.0.1/src/nuclear.svg | 18 - .../fusion/external/ionicons-2.0.1/src/outlet.svg | 16 - .../external/ionicons-2.0.1/src/paintbrush.svg | 18 - .../external/ionicons-2.0.1/src/paintbucket.svg | 12 - .../external/ionicons-2.0.1/src/paper-airplane.svg | 13 - .../external/ionicons-2.0.1/src/paperclip.svg | 13 - .../fusion/external/ionicons-2.0.1/src/pause.svg | 12 - .../external/ionicons-2.0.1/src/person-add.svg | 13 - .../external/ionicons-2.0.1/src/person-stalker.svg | 18 - .../fusion/external/ionicons-2.0.1/src/person.svg | 10 - .../external/ionicons-2.0.1/src/pie-graph.svg | 11 - .../app/fusion/external/ionicons-2.0.1/src/pin.svg | 11 - .../external/ionicons-2.0.1/src/pinpoint.svg | 11 - .../fusion/external/ionicons-2.0.1/src/pizza.svg | 20 - .../fusion/external/ionicons-2.0.1/src/plane.svg | 10 - .../fusion/external/ionicons-2.0.1/src/planet.svg | 21 - .../fusion/external/ionicons-2.0.1/src/play.svg | 8 - .../external/ionicons-2.0.1/src/playstation.svg | 27 - .../external/ionicons-2.0.1/src/plus-circled.svg | 10 - .../external/ionicons-2.0.1/src/plus-round.svg | 9 - .../fusion/external/ionicons-2.0.1/src/plus.svg | 7 - .../fusion/external/ionicons-2.0.1/src/podium.svg | 11 - .../fusion/external/ionicons-2.0.1/src/pound.svg | 11 - .../fusion/external/ionicons-2.0.1/src/power.svg | 15 - .../external/ionicons-2.0.1/src/pricetag.svg | 13 - .../external/ionicons-2.0.1/src/pricetags.svg | 18 - .../fusion/external/ionicons-2.0.1/src/printer.svg | 14 - .../external/ionicons-2.0.1/src/pull-request.svg | 16 - .../external/ionicons-2.0.1/src/qr-scanner.svg | 12 - .../fusion/external/ionicons-2.0.1/src/quote.svg | 16 - .../external/ionicons-2.0.1/src/radio-waves.svg | 25 - .../fusion/external/ionicons-2.0.1/src/record.svg | 7 - .../fusion/external/ionicons-2.0.1/src/refresh.svg | 15 - .../external/ionicons-2.0.1/src/reply-all.svg | 12 - .../fusion/external/ionicons-2.0.1/src/reply.svg | 9 - .../external/ionicons-2.0.1/src/ribbon-a.svg | 14 - .../external/ionicons-2.0.1/src/ribbon-b.svg | 18 - .../external/ionicons-2.0.1/src/sad-outline.svg | 28 - .../app/fusion/external/ionicons-2.0.1/src/sad.svg | 20 - .../external/ionicons-2.0.1/src/scissors.svg | 23 - .../fusion/external/ionicons-2.0.1/src/search.svg | 10 - .../external/ionicons-2.0.1/src/settings.svg | 18 - .../fusion/external/ionicons-2.0.1/src/share.svg | 11 - .../fusion/external/ionicons-2.0.1/src/shuffle.svg | 11 - .../external/ionicons-2.0.1/src/skip-backward.svg | 15 - .../external/ionicons-2.0.1/src/skip-forward.svg | 15 - .../ionicons-2.0.1/src/social-android-outline.svg | 29 - .../external/ionicons-2.0.1/src/social-android.svg | 22 - .../ionicons-2.0.1/src/social-angular-outline.svg | 11 - .../external/ionicons-2.0.1/src/social-angular.svg | 11 - .../ionicons-2.0.1/src/social-apple-outline.svg | 20 - .../external/ionicons-2.0.1/src/social-apple.svg | 14 - .../ionicons-2.0.1/src/social-bitcoin-outline.svg | 27 - .../external/ionicons-2.0.1/src/social-bitcoin.svg | 14 - .../ionicons-2.0.1/src/social-buffer-outline.svg | 24 - .../external/ionicons-2.0.1/src/social-buffer.svg | 18 - .../ionicons-2.0.1/src/social-chrome-outline.svg | 17 - .../external/ionicons-2.0.1/src/social-chrome.svg | 22 - .../ionicons-2.0.1/src/social-codepen-outline.svg | 26 - .../external/ionicons-2.0.1/src/social-codepen.svg | 26 - .../ionicons-2.0.1/src/social-css3-outline.svg | 12 - .../external/ionicons-2.0.1/src/social-css3.svg | 14 - .../src/social-designernews-outline.svg | 18 - .../ionicons-2.0.1/src/social-designernews.svg | 18 - .../ionicons-2.0.1/src/social-dribbble-outline.svg | 15 - .../ionicons-2.0.1/src/social-dribbble.svg | 26 - .../ionicons-2.0.1/src/social-dropbox-outline.svg | 13 - .../external/ionicons-2.0.1/src/social-dropbox.svg | 13 - .../ionicons-2.0.1/src/social-euro-outline.svg | 19 - .../external/ionicons-2.0.1/src/social-euro.svg | 12 - .../ionicons-2.0.1/src/social-facebook-outline.svg | 9 - .../ionicons-2.0.1/src/social-facebook.svg | 8 - .../src/social-foursquare-outline.svg | 22 - .../ionicons-2.0.1/src/social-foursquare.svg | 20 - .../ionicons-2.0.1/src/social-freebsd-devil.svg | 22 - .../ionicons-2.0.1/src/social-github-outline.svg | 24 - .../external/ionicons-2.0.1/src/social-github.svg | 14 - .../ionicons-2.0.1/src/social-google-outline.svg | 19 - .../external/ionicons-2.0.1/src/social-google.svg | 20 - .../src/social-googleplus-outline.svg | 18 - .../ionicons-2.0.1/src/social-googleplus.svg | 17 - .../src/social-hackernews-outline.svg | 12 - .../ionicons-2.0.1/src/social-hackernews.svg | 9 - .../ionicons-2.0.1/src/social-html5-outline.svg | 13 - .../external/ionicons-2.0.1/src/social-html5.svg | 9 - .../src/social-instagram-outline.svg | 12 - .../ionicons-2.0.1/src/social-instagram.svg | 18 - .../src/social-javascript-outline.svg | 27 - .../ionicons-2.0.1/src/social-javascript.svg | 17 - .../ionicons-2.0.1/src/social-linkedin-outline.svg | 22 - .../ionicons-2.0.1/src/social-linkedin.svg | 13 - .../ionicons-2.0.1/src/social-markdown.svg | 14 - .../external/ionicons-2.0.1/src/social-nodejs.svg | 26 - .../external/ionicons-2.0.1/src/social-octocat.svg | 28 - .../src/social-pinterest-outline.svg | 14 - .../ionicons-2.0.1/src/social-pinterest.svg | 15 - .../external/ionicons-2.0.1/src/social-python.svg | 21 - .../ionicons-2.0.1/src/social-reddit-outline.svg | 26 - .../external/ionicons-2.0.1/src/social-reddit.svg | 18 - .../ionicons-2.0.1/src/social-rss-outline.svg | 16 - .../external/ionicons-2.0.1/src/social-rss.svg | 12 - .../external/ionicons-2.0.1/src/social-sass.svg | 35 - .../ionicons-2.0.1/src/social-skype-outline.svg | 26 - .../external/ionicons-2.0.1/src/social-skype.svg | 20 - .../ionicons-2.0.1/src/social-snapchat-outline.svg | 42 - .../ionicons-2.0.1/src/social-snapchat.svg | 31 - .../ionicons-2.0.1/src/social-tumblr-outline.svg | 13 - .../external/ionicons-2.0.1/src/social-tumblr.svg | 10 - .../external/ionicons-2.0.1/src/social-tux.svg | 53 - .../ionicons-2.0.1/src/social-twitch-outline.svg | 13 - .../external/ionicons-2.0.1/src/social-twitch.svg | 9 - .../ionicons-2.0.1/src/social-twitter-outline.svg | 19 - .../external/ionicons-2.0.1/src/social-twitter.svg | 12 - .../ionicons-2.0.1/src/social-usd-outline.svg | 44 - .../external/ionicons-2.0.1/src/social-usd.svg | 24 - .../ionicons-2.0.1/src/social-vimeo-outline.svg | 23 - .../external/ionicons-2.0.1/src/social-vimeo.svg | 18 - .../ionicons-2.0.1/src/social-whatsapp-outline.svg | 25 - .../ionicons-2.0.1/src/social-whatsapp.svg | 18 - .../ionicons-2.0.1/src/social-windows-outline.svg | 17 - .../external/ionicons-2.0.1/src/social-windows.svg | 17 - .../src/social-wordpress-outline.svg | 16 - .../ionicons-2.0.1/src/social-wordpress.svg | 20 - .../ionicons-2.0.1/src/social-yahoo-outline.svg | 10 - .../external/ionicons-2.0.1/src/social-yahoo.svg | 8 - .../ionicons-2.0.1/src/social-yen-outline.svg | 9 - .../external/ionicons-2.0.1/src/social-yen.svg | 8 - .../ionicons-2.0.1/src/social-youtube-outline.svg | 22 - .../external/ionicons-2.0.1/src/social-youtube.svg | 12 - .../ionicons-2.0.1/src/soup-can-outline.svg | 28 - .../external/ionicons-2.0.1/src/soup-can.svg | 16 - .../external/ionicons-2.0.1/src/speakerphone.svg | 19 - .../external/ionicons-2.0.1/src/speedometer.svg | 15 - .../fusion/external/ionicons-2.0.1/src/spoon.svg | 10 - .../fusion/external/ionicons-2.0.1/src/star.svg | 7 - .../external/ionicons-2.0.1/src/stats-bars.svg | 12 - .../fusion/external/ionicons-2.0.1/src/steam.svg | 20 - .../fusion/external/ionicons-2.0.1/src/stop.svg | 8 - .../external/ionicons-2.0.1/src/thermometer.svg | 11 - .../external/ionicons-2.0.1/src/thumbsdown.svg | 13 - .../external/ionicons-2.0.1/src/thumbsup.svg | 13 - .../external/ionicons-2.0.1/src/toggle-filled.svg | 11 - .../fusion/external/ionicons-2.0.1/src/toggle.svg | 12 - .../external/ionicons-2.0.1/src/transgender.svg | 12 - .../fusion/external/ionicons-2.0.1/src/trash-a.svg | 10 - .../fusion/external/ionicons-2.0.1/src/trash-b.svg | 13 - .../fusion/external/ionicons-2.0.1/src/trophy.svg | 16 - .../external/ionicons-2.0.1/src/tshirt-outline.svg | 11 - .../fusion/external/ionicons-2.0.1/src/tshirt.svg | 8 - .../external/ionicons-2.0.1/src/umbrella.svg | 18 - .../external/ionicons-2.0.1/src/university.svg | 11 - .../external/ionicons-2.0.1/src/unlocked.svg | 10 - .../fusion/external/ionicons-2.0.1/src/upload.svg | 9 - .../app/fusion/external/ionicons-2.0.1/src/usb.svg | 22 - .../external/ionicons-2.0.1/src/videocamera.svg | 11 - .../external/ionicons-2.0.1/src/volume-high.svg | 15 - .../external/ionicons-2.0.1/src/volume-low.svg | 11 - .../external/ionicons-2.0.1/src/volume-medium.svg | 13 - .../external/ionicons-2.0.1/src/volume-mute.svg | 14 - .../fusion/external/ionicons-2.0.1/src/wand.svg | 17 - .../external/ionicons-2.0.1/src/waterdrop.svg | 11 - .../fusion/external/ionicons-2.0.1/src/wifi.svg | 16 - .../external/ionicons-2.0.1/src/wineglass.svg | 21 - .../fusion/external/ionicons-2.0.1/src/woman.svg | 13 - .../fusion/external/ionicons-2.0.1/src/wrench.svg | 11 - .../fusion/external/ionicons-2.0.1/src/xbox.svg | 21 - .../app/fusion/external/utils/js/browserCheck.js | 24 - vid/src/main/webapp/app/fusion/images/Thumbs.db | Bin 102912 -> 0 bytes .../webapp/app/fusion/images/panel-e-w-toggle.png | Bin 459 -> 0 bytes .../webapp/app/fusion/images/panel-n-s-toggle.png | Bin 335 -> 0 bytes .../scripts/controllers/nbook-framecontroller.js | 34 - .../scripts/controllers/nbookController.js | 179 - .../scripts/controllers/notebookFrameController.js | 65 - .../scripts/dependency/angular.js | 29400 ------------- .../scripts/view-models/notebook-frame.html | 85 - .../scripts/view-models/notebook-viz.html | 26 - .../scripts/view-models/notebook.htm | 54 - .../scripts/view-models/notebookInputs.html | 90 - .../att_angular_gridster/angular-gridster.js | 2244 - .../att_angular_gridster/ui-gridster-tpls.js | 168 - .../fusion/scripts/controllers/adminController.js | 65 - .../fusion/scripts/controllers/admin_menu_edit.js | 230 - .../fusion/scripts/controllers/ase-controller.js | 22 - .../scripts/controllers/broadcast-controller.js | 79 - .../controllers/broadcast-list-controller.js | 120 - .../controllers/collaborate-list-controller.js | 63 - .../controllers/fn_menu_add_popup_controller.js | 281 - .../scripts/controllers/jcs-admin-controller.js | 83 - .../scripts/controllers/modelpopupController.js | 40 - .../scripts/controllers/post-search-controller.js | 202 - .../scripts/controllers/profile-controller.js | 286 - .../controllers/profile-search-controller.js | 80 - .../scripts/controllers/profileController.js | 38 - .../fusion/scripts/controllers/role-controller.js | 226 - .../controllers/role-function-list-controller.js | 157 - .../scripts/controllers/role-list-controller.js | 102 - .../controllers/rolefunctionpopupController.js | 84 - .../controllers/rolepopupmodelController.js | 205 - .../scripts/controllers/self-profile-controller.js | 284 - .../scripts/controllers/usage-list-controller.js | 41 - .../scripts/controllers/workflows/workflowApp.js | 24 - .../controllers/workflows/workflowController.js | 509 - .../controllers/workflows/workflowRouting.js | 26 - .../webapp/app/fusion/scripts/directives/footer.js | 30 - .../webapp/app/fusion/scripts/directives/header.js | 504 - .../app/fusion/scripts/directives/leftMenu.js | 203 - .../webapp/app/fusion/scripts/jquery.resize.js | 139 - .../main/webapp/app/fusion/scripts/layout/debug.js | 329 - .../app/fusion/scripts/layout/jquery-latest.js | 9555 ----- .../app/fusion/scripts/layout/jquery-ui-latest.js | 14879 ------- .../fusion/scripts/layout/jquery.layout-latest.js | 6086 --- .../main/webapp/app/fusion/scripts/modalService.js | 185 - .../main/webapp/app/fusion/scripts/moment.min.js | 6 - .../app/fusion/scripts/services/adminService.js | 160 - .../app/fusion/scripts/services/headerService.js | 89 - .../app/fusion/scripts/services/leftMenuService.js | 54 - .../app/fusion/scripts/services/profileService.js | 98 - .../app/fusion/scripts/services/userInfoService.js | 51 - .../app/fusion/scripts/socket/peerBroadcast.js | 122 - .../main/webapp/app/fusion/scripts/utils/dummy.txt | 0 .../app/fusion/scripts/utils/page-resource.js | 95 - .../fusion/scripts/utils/sandbox-resources.html | 9 - .../scripts/view-models/admin-page/admin.html | 115 - .../scripts/view-models/admin-page/profile.html | 47 - .../app/fusion/scripts/view-models/dummy.txt | 0 .../app/fusion/scripts/view-models/footer.html | 42 - .../app/fusion/scripts/view-models/header.html | 186 - .../app/fusion/scripts/view-models/left_menu.html | 41 - .../view-models/profile-page/admin_menu_edit.html | 175 - .../view-models/profile-page/broadcast.html | 61 - .../view-models/profile-page/broadcast_list.html | 71 - .../view-models/profile-page/collaborate_list.html | 57 - .../view-models/profile-page/jcs_admin.html | 87 - .../view-models/profile-page/popup_modal.html | 282 - .../profile-page/popup_modal_fn_menu_add.html | 155 - .../profile-page/popup_modal_fn_menu_edit.html | 148 - .../view-models/profile-page/popup_modal_role.html | 82 - .../profile-page/popup_modal_rolefunction.html | 46 - .../view-models/profile-page/post_search.html | 139 - .../view-models/profile-page/profile_detail.html | 188 - .../view-models/profile-page/profile_search.html | 72 - .../scripts/view-models/profile-page/role.html | 118 - .../profile-page/role_function_list.html | 88 - .../view-models/profile-page/role_list.html | 61 - .../view-models/profile-page/self_profile.html | 183 - .../view-models/profile-page/usage_list.html | 64 - .../view-models/workflows/workflow-landing.html | 130 - .../view-models/workflows/workflow-listing.html | 85 - .../view-models/workflows/workflow-new.html | 108 - .../view-models/workflows/workflow-preview.html | 36 - .../view-models/workflows/workflow-remove.html | 38 - .../view-models/workflows/workflow-schedule.html | 116 - .../fusion/scripts/webrtc/RTCMultiConnection.js | 6788 --- .../app/fusion/scripts/webrtc/getSourceId.html | 78 - .../att_angular_gridster/sandbox-gridster.css | 173 - .../styles/att_angular_gridster/ui-gridster.css | 116 - .../main/webapp/app/fusion/styles/fusion-sunny.css | 362 - .../main/webapp/app/fusion/styles/jquery-ui.css | 1225 - .../fusion/styles/layout/layout-default-latest.css | 224 - .../app/fusion/styles/workflows/workflows.css | 50 - .../drools/controller/drools-list-controller.js | 62 - .../drools/controller/drools-view-controller.js | 64 - .../app/vid/drools/controller/droolsController.js | 30 - .../webapp/app/vid/drools/controller/dummy.txt | 0 .../webapp/app/vid/drools/directives/dummy.txt | 0 .../app/vid/drools/services/droolsService.js | 76 - vid/src/main/webapp/app/vid/drools/utils/dummy.txt | 0 .../app/vid/drools/view-models/droolsList.html | 47 - .../vid/drools/view-models/droolsSinglePage.html | 92 - .../app/vid/drools/view-models/droolsView.html | 61 - .../webapp/app/vid/drools/view-models/dummy.txt | 0 .../vid/external/bootstrap/css/bootstrap-theme.css | 596 - .../external/bootstrap/css/bootstrap-theme.min.css | 14 - .../app/vid/external/bootstrap/css/bootstrap.css | 820 - .../vid/external/bootstrap/css/bootstrap.min.css | 14 - .../fonts/glyphicons-halflings-regular.svg | 288 - .../fonts/glyphicons-halflings-regular.woff | Bin 23424 -> 0 bytes .../app/vid/external/bootstrap/js/bootstrap.js | 2380 -- .../app/vid/external/bootstrap/js/bootstrap.min.js | 12 - vid/src/main/webapp/app/vid/external/dummy.txt | 0 vid/src/main/webapp/app/vid/fonts/dummy.txt | 0 vid/src/main/webapp/app/vid/images/dummy.txt | 0 .../main/webapp/app/vid/scripts/angular-ui-tree.js | 1636 - .../vid/scripts/constants/componentConstants.js | 42 - .../app/vid/scripts/constants/fieldConstants.js | 182 - .../vid/scripts/constants/parameterConstants.js | 29 - .../scripts/controller/InstantiationController.js | 1028 - .../scripts/controller/ServiceModelController.js | 196 - .../webapp/app/vid/scripts/controller/VidApp.js | 67 - .../scripts/controller/aaiSubscriberController.js | 763 - .../scripts/controller/creationDialogController.js | 162 - .../scripts/controller/deletionDialogController.js | 117 - .../scripts/controller/detailsDialogController.js | 84 - .../webapp/app/vid/scripts/controller/dummy.txt | 0 .../vid/scripts/controller/msoCommitController.js | 249 - .../scripts/controller/sample-page-controller.js | 81 - .../controller/sample-page-iframe-controller.js | 24 - .../app/vid/scripts/controller/sampleController.js | 31 - .../app/vid/scripts/controller/subscriberSearch.js | 385 - .../webapp/app/vid/scripts/directives/dummy.txt | 0 .../vid/scripts/directives/extensionsDirective.js | 79 - .../scripts/directives/parameterBlockDirective.js | 309 - .../vid/scripts/directives/popupWindowDirective.js | 88 - .../vid/scripts/directives/progressBarDirective.js | 173 - .../webapp/app/vid/scripts/services/aaiService.js | 111 - .../webapp/app/vid/scripts/services/asdcService.js | 40 - .../app/vid/scripts/services/componentService.js | 148 - .../app/vid/scripts/services/creationService.js | 683 - .../webapp/app/vid/scripts/services/dataService.js | 197 - .../app/vid/scripts/services/deletionService.js | 442 - .../app/vid/scripts/services/detailsService.js | 98 - .../webapp/app/vid/scripts/services/msoService.js | 146 - .../app/vid/scripts/services/propertyService.js | 116 - .../app/vid/scripts/services/utilityService.js | 228 - .../main/webapp/app/vid/scripts/utils/dummy.txt | 0 .../app/vid/scripts/view-models/aaiGetSubs.htm | 79 - .../app/vid/scripts/view-models/aaiSubDetails.htm | 93 - .../app/vid/scripts/view-models/aaiSubViewEdit.htm | 147 - .../app/vid/scripts/view-models/creationDialog.htm | 64 - .../app/vid/scripts/view-models/deletionDialog.htm | 80 - .../app/vid/scripts/view-models/detailsDialog.htm | 48 - .../webapp/app/vid/scripts/view-models/dummy.txt | 0 .../app/vid/scripts/view-models/instantiate.htm | 204 - .../app/vid/scripts/view-models/msoCommit.htm | 47 - .../app/vid/scripts/view-models/popupWindow.htm | 8 - .../webapp/app/vid/scripts/view-models/sample.html | 61 - .../vid/scripts/view-models/sampleWithIframe.html | 23 - .../app/vid/scripts/view-models/serviceModels.htm | 90 - .../vid/scripts/view-models/singlePageSample.html | 87 - .../webapp/app/vid/scripts/view-models/vidhome.htm | 39 - vid/src/main/webapp/app/vid/styles/aaiGetSubs.css | 62 - .../main/webapp/app/vid/styles/aaiSubDetails.css | 62 - .../main/webapp/app/vid/styles/aaiSubViewEdit.css | 62 - .../main/webapp/app/vid/styles/angular-ui-tree.css | 61 - vid/src/main/webapp/app/vid/styles/dialogs.css | 126 - vid/src/main/webapp/app/vid/styles/dummy.txt | 0 vid/src/main/webapp/app/vid/styles/instantiate.css | 62 - .../main/webapp/app/vid/styles/serviceModels.css | 70 - .../webapp/app/vid/styles/subscriberSearch.css | 8 - vid/src/main/webapp/app/vid/styles/vidTree.css | 67 - vid/src/main/webapp/app/vid/test/testAaiData.js | 254 - vid/src/main/webapp/app/vid/test/testMso.css | 22 - vid/src/main/webapp/app/vid/test/testMso.js | 486 - vid/src/main/webapp/app/vid/test/testViewEdit.css | 30 - vid/src/main/webapp/app/vid/test/testViewEdit.js | 376 - vid/src/main/webapp/index.jsp | 5 - vid/src/main/webapp/manifest.jsp | 28 - .../css/att_angular_gridster/sandbox-gridster.css | 173 - .../css/att_angular_gridster/ui-gridster.css | 116 - .../webapp/static/fusion/css/bootstrap.min.css | 6 - .../main/webapp/static/fusion/css/fusion-sunny.css | 362 - .../main/webapp/static/fusion/css/jquery-ui.css | 1225 - .../fusion/css/layout/layout-default-latest.css | 224 - vid/src/main/webapp/static/fusion/gis/js/local.js | 178 - vid/src/main/webapp/static/fusion/images/Rlogo.jpg | Bin 3173 -> 0 bytes vid/src/main/webapp/static/fusion/images/Thumbs.db | Bin 102912 -> 0 bytes .../webapp/static/fusion/images/action_icon.png | Bin 2388 -> 0 bytes .../static/fusion/images/action_list_spacer.gif | Bin 73 -> 0 bytes .../main/webapp/static/fusion/images/active.png | Bin 682 -> 0 bytes vid/src/main/webapp/static/fusion/images/add.png | Bin 352 -> 0 bytes .../static/fusion/images/add_tool_button.png | Bin 31105 -> 0 bytes .../main/webapp/static/fusion/images/addicon.png | Bin 463 -> 0 bytes .../static/fusion/images/application_window_bg.jpg | Bin 914 -> 0 bytes .../webapp/static/fusion/images/arrow-next.png | Bin 1561 -> 0 bytes .../webapp/static/fusion/images/arrow-prev.png | Bin 1557 -> 0 bytes .../fusion/images/att_angular_gridster/grips.png | Bin 951 -> 0 bytes .../webapp/static/fusion/images/backButton.png | Bin 816 -> 0 bytes vid/src/main/webapp/static/fusion/images/blank.gif | Bin 49 -> 0 bytes .../webapp/static/fusion/images/blueButton.png | Bin 1468 -> 0 bytes .../main/webapp/static/fusion/images/bubble.png | Bin 662 -> 0 bytes vid/src/main/webapp/static/fusion/images/cache.png | Bin 1081 -> 0 bytes .../main/webapp/static/fusion/images/calendar.gif | Bin 929 -> 0 bytes .../main/webapp/static/fusion/images/chevron.png | Bin 252 -> 0 bytes .../static/fusion/images/close_container.gif | Bin 85 -> 0 bytes .../webapp/static/fusion/images/collapsed-icon.png | Bin 1379 -> 0 bytes .../main/webapp/static/fusion/images/column-bg.png | Bin 165 -> 0 bytes .../static/fusion/images/copyicon-highlighted.png | Bin 264 -> 0 bytes .../main/webapp/static/fusion/images/copyicon.png | Bin 235 -> 0 bytes .../main/webapp/static/fusion/images/csv_icon.jpg | Bin 632 -> 0 bytes .../main/webapp/static/fusion/images/csv_icon.png | Bin 938 -> 0 bytes .../webapp/static/fusion/images/customers-add.png | Bin 755 -> 0 bytes .../static/fusion/images/customers-search.png | Bin 976 -> 0 bytes .../main/webapp/static/fusion/images/customers.png | Bin 749 -> 0 bytes .../main/webapp/static/fusion/images/decrypted.png | Bin 628 -> 0 bytes .../fusion/images/deleteicon-highlighted.gif | Bin 592 -> 0 bytes .../fusion/images/deleteicon-highlighted.png | Bin 566 -> 0 bytes .../webapp/static/fusion/images/deleteicon.gif | Bin 579 -> 0 bytes .../main/webapp/static/fusion/images/editicon.gif | Bin 360 -> 0 bytes .../webapp/static/fusion/images/error_type.gif | Bin 398 -> 0 bytes .../webapp/static/fusion/images/example-frame.png | Bin 33699 -> 0 bytes .../static/fusion/images/excelicon_multi.gif | Bin 1028 -> 0 bytes .../webapp/static/fusion/images/executeicon.png | Bin 1076 -> 0 bytes .../webapp/static/fusion/images/expanded-icon.png | Bin 1372 -> 0 bytes .../main/webapp/static/fusion/images/file-add.png | Bin 675 -> 0 bytes .../webapp/static/fusion/images/file_import.png | Bin 653 -> 0 bytes .../webapp/static/fusion/images/file_save-all.png | Bin 610 -> 0 bytes .../webapp/static/fusion/images/filter_icon.png | Bin 29069 -> 0 bytes .../webapp/static/fusion/images/folder_add.png | Bin 772 -> 0 bytes .../webapp/static/fusion/images/folder_closed.png | Bin 559 -> 0 bytes .../webapp/static/fusion/images/folder_delete.png | Bin 767 -> 0 bytes .../webapp/static/fusion/images/folder_edit.png | Bin 829 -> 0 bytes .../webapp/static/fusion/images/folder_open.png | Bin 632 -> 0 bytes .../webapp/static/fusion/images/folder_user.png | Bin 887 -> 0 bytes .../main/webapp/static/fusion/images/funnel.png | Bin 543 -> 0 bytes .../main/webapp/static/fusion/images/fusion.gif | Bin 8821 -> 0 bytes .../webapp/static/fusion/images/grayButton.png | Bin 1361 -> 0 bytes .../static/fusion/images/gray_add_tool_button.png | Bin 30883 -> 0 bytes .../webapp/static/fusion/images/headerChatIcon.png | Bin 465 -> 0 bytes .../static/fusion/images/icon_remove_all.gif | Bin 982 -> 0 bytes .../main/webapp/static/fusion/images/inactive.png | Bin 842 -> 0 bytes .../main/webapp/static/fusion/images/info_type.gif | Bin 291 -> 0 bytes .../fusion/images/layout/panel-e-w-toggle.png | Bin 459 -> 0 bytes .../fusion/images/layout/panel-n-s-toggle.png | Bin 335 -> 0 bytes .../webapp/static/fusion/images/leftButton.png | Bin 681 -> 0 bytes .../main/webapp/static/fusion/images/loading.gif | Bin 6820 -> 0 bytes .../webapp/static/fusion/images/loading_bar.gif | Bin 28954 -> 0 bytes .../webapp/static/fusion/images/login_button.gif | Bin 1222 -> 0 bytes vid/src/main/webapp/static/fusion/images/m1.gif | Bin 636 -> 0 bytes vid/src/main/webapp/static/fusion/images/mail.png | Bin 449 -> 0 bytes vid/src/main/webapp/static/fusion/images/map.png | Bin 611 -> 0 bytes .../webapp/static/fusion/images/menu/bubble.png | Bin 662 -> 0 bytes .../static/fusion/images/menu/file_import.png | Bin 653 -> 0 bytes .../static/fusion/images/menu/file_save-all.png | Bin 610 -> 0 bytes .../main/webapp/static/fusion/images/menu/mail.png | Bin 449 -> 0 bytes .../webapp/static/fusion/images/menu/profile.png | Bin 462 -> 0 bytes .../static/fusion/images/menu/speechbubble.png | Bin 458 -> 0 bytes .../webapp/static/fusion/images/menu/users.png | Bin 938 -> 0 bytes vid/src/main/webapp/static/fusion/images/minus.gif | Bin 75 -> 0 bytes .../fusion/images/mobile_logo_att_header_black.png | Bin 34762 -> 0 bytes .../fusion/images/mobile_logo_att_header_grey.png | Bin 34636 -> 0 bytes .../images/mobile_logo_att_header_horizontal.png | Bin 5202 -> 0 bytes .../fusion/images/mobile_logo_att_header_white.png | Bin 34475 -> 0 bytes .../webapp/static/fusion/images/modify_icon.gif | Bin 246 -> 0 bytes .../main/webapp/static/fusion/images/note-add.png | Bin 589 -> 0 bytes .../webapp/static/fusion/images/note-search.png | Bin 876 -> 0 bytes vid/src/main/webapp/static/fusion/images/note.png | Bin 583 -> 0 bytes vid/src/main/webapp/static/fusion/images/notes.png | Bin 673 -> 0 bytes .../main/webapp/static/fusion/images/offline.png | Bin 3483 -> 0 bytes .../webapp/static/fusion/images/offlineMsg.gif | Bin 1004 -> 0 bytes .../main/webapp/static/fusion/images/online.png | Bin 888 -> 0 bytes vid/src/main/webapp/static/fusion/images/page.gif | Bin 131 -> 0 bytes .../webapp/static/fusion/images/pagination.png | Bin 724 -> 0 bytes .../static/fusion/images/panel-e-w-toggle.png | Bin 459 -> 0 bytes .../static/fusion/images/panel-n-s-toggle.png | Bin 335 -> 0 bytes vid/src/main/webapp/static/fusion/images/pix.gif | Bin 49 -> 0 bytes vid/src/main/webapp/static/fusion/images/plus.gif | Bin 78 -> 0 bytes vid/src/main/webapp/static/fusion/images/plus.png | Bin 388 -> 0 bytes .../main/webapp/static/fusion/images/printer.gif | Bin 1036 -> 0 bytes .../main/webapp/static/fusion/images/profile.png | Bin 462 -> 0 bytes .../main/webapp/static/fusion/images/refresh.jpg | Bin 1618 -> 0 bytes .../webapp/static/fusion/images/report-add.png | Bin 724 -> 0 bytes .../static/fusion/images/report-favorite.png | Bin 693 -> 0 bytes .../main/webapp/static/fusion/images/report-my.png | Bin 739 -> 0 bytes .../webapp/static/fusion/images/report-public.png | Bin 776 -> 0 bytes .../main/webapp/static/fusion/images/report.png | Bin 563 -> 0 bytes .../main/webapp/static/fusion/images/reports.png | Bin 769 -> 0 bytes .../static/fusion/images/results-first-active.png | Bin 545 -> 0 bytes .../fusion/images/results-first-disabled.png | Bin 421 -> 0 bytes .../static/fusion/images/results-last-active.png | Bin 541 -> 0 bytes .../static/fusion/images/results-last-disabled.png | Bin 421 -> 0 bytes .../static/fusion/images/results-next-active.png | Bin 416 -> 0 bytes .../static/fusion/images/results-next-disabled.png | Bin 326 -> 0 bytes .../static/fusion/images/results-prev-active.png | Bin 421 -> 0 bytes .../static/fusion/images/results-prev-disabled.png | Bin 322 -> 0 bytes .../webapp/static/fusion/images/resultset_last.png | Bin 506 -> 0 bytes .../static/fusion/images/resultset_previous.png | Bin 381 -> 0 bytes .../webapp/static/fusion/images/return_to_top.gif | Bin 846 -> 0 bytes .../webapp/static/fusion/images/rightButton.png | Bin 731 -> 0 bytes .../main/webapp/static/fusion/images/search.png | Bin 3501 -> 0 bytes .../webapp/static/fusion/images/search_profile.png | Bin 880 -> 0 bytes .../main/webapp/static/fusion/images/sort_asc.gif | Bin 57 -> 0 bytes .../main/webapp/static/fusion/images/sort_desc.gif | Bin 58 -> 0 bytes .../main/webapp/static/fusion/images/spacer.gif | Bin 43 -> 0 bytes .../webapp/static/fusion/images/success_type.gif | Bin 260 -> 0 bytes .../main/webapp/static/fusion/images/swoosh.gif | Bin 14250 -> 0 bytes .../main/webapp/static/fusion/images/tab-hm.png | Bin 249 -> 0 bytes .../main/webapp/static/fusion/images/tab-v-hm.png | Bin 317 -> 0 bytes vid/src/main/webapp/static/fusion/images/tab.png | Bin 343 -> 0 bytes .../main/webapp/static/fusion/images/table-add.png | Bin 3314 -> 0 bytes .../webapp/static/fusion/images/table-delete.png | Bin 3342 -> 0 bytes .../webapp/static/fusion/images/table-edit.png | Bin 3348 -> 0 bytes vid/src/main/webapp/static/fusion/images/table.png | Bin 496 -> 0 bytes .../main/webapp/static/fusion/images/tabs-bg.png | Bin 147 -> 0 bytes .../webapp/static/fusion/images/toolButton.gif | Bin 414 -> 0 bytes .../webapp/static/fusion/images/toolButton.png | Bin 531 -> 0 bytes .../main/webapp/static/fusion/images/toolbar.png | Bin 171 -> 0 bytes vid/src/main/webapp/static/fusion/images/users.png | Bin 938 -> 0 bytes .../webapp/static/fusion/images/warning_type.gif | Bin 1055 -> 0 bytes .../main/webapp/static/fusion/images/webphone.ico | Bin 241 -> 0 bytes .../webapp/static/fusion/images/whiteButton.png | Bin 1430 -> 0 bytes .../js/att_angular_gridster/angular-gridster.js | 2244 - .../js/att_angular_gridster/ui-gridster-tpls.js | 168 - .../main/webapp/static/fusion/js/jquery.resize.js | 139 - .../main/webapp/static/fusion/js/layout/debug.js | 329 - .../static/fusion/js/layout/jquery-latest.js | 9555 ----- .../static/fusion/js/layout/jquery-ui-latest.js | 14879 ------- .../fusion/js/layout/jquery.layout-latest.js | 6086 --- vid/src/main/webapp/static/fusion/js/moment.min.js | 6 - .../main/webapp/static/fusion/raptor/css/Style.css | 77 - .../static/fusion/raptor/css/bd_quantum_raptor.css | 305 - .../webapp/static/fusion/raptor/css/calendar.css | 97 - .../webapp/static/fusion/raptor/css/dashboard.css | 36 - .../webapp/static/fusion/raptor/css/drupal.css | 83 - .../fusion/raptor/css/form-field-tooltip.css | 12 - .../static/fusion/raptor/css/mobile_raptor.css | 73 - .../webapp/static/fusion/raptor/css/novamap.css | 25 - .../webapp/static/fusion/raptor/css/picker.css | 40 - .../main/webapp/static/fusion/raptor/css/ral.css | 1437 - .../webapp/static/fusion/raptor/css/raptor.css | 62 - .../static/fusion/raptor/css/tree/context-menu.css | 57 - .../raptor/css/tree/drag-drop-folder-tree.css | 64 - .../static/fusion/raptor/dy3/js/dashed-canvas.js | 176 - .../webapp/static/fusion/raptor/dy3/js/data.js | 63 - .../static/fusion/raptor/dy3/js/dygraph-canvas.js | 816 - .../fusion/raptor/dy3/js/dygraph-combined.js | 2 - .../raptor/dy3/js/dygraph-combined_bak_color.js | 2 - .../static/fusion/raptor/dy3/js/dygraph-dev.js | 45 - .../static/fusion/raptor/dy3/js/dygraph-externs.js | 93 - .../static/fusion/raptor/dy3/js/dygraph-gviz.js | 82 - .../raptor/dy3/js/dygraph-interaction-model.js | 676 - .../static/fusion/raptor/dy3/js/dygraph-layout.js | 349 - .../raptor/dy3/js/dygraph-options-reference.js | 867 - .../static/fusion/raptor/dy3/js/dygraph-options.js | 384 - .../fusion/raptor/dy3/js/dygraph-plugin-base.js | 4 - .../fusion/raptor/dy3/js/dygraph-plugin-install.js | 19 - .../static/fusion/raptor/dy3/js/dygraph-tickers.js | 487 - .../static/fusion/raptor/dy3/js/dygraph-utils.js | 1305 - .../webapp/static/fusion/raptor/dy3/js/dygraph.js | 3857 -- .../webapp/static/fusion/raptor/dy3/js/excanvas.js | 924 - .../static/fusion/raptor/dy3/js/interaction.js | 333 - .../static/fusion/raptor/dy3/js/interaction.min.js | 1 - .../static/fusion/raptor/dy3/js/interaction_sun.js | 303 - .../static/fusion/raptor/dy3/js/moment.min.js | 6 - .../static/fusion/raptor/dy3/js/phantom-driver.js | 206 - .../static/fusion/raptor/dy3/js/phantom-perf.js | 94 - .../static/fusion/raptor/dy3/js/plugins/README | 113 - .../fusion/raptor/dy3/js/plugins/annotations.js | 182 - .../static/fusion/raptor/dy3/js/plugins/axes.js | 315 - .../fusion/raptor/dy3/js/plugins/chart-labels.js | 202 - .../static/fusion/raptor/dy3/js/plugins/grid.js | 124 - .../static/fusion/raptor/dy3/js/plugins/legend.js | 332 - .../fusion/raptor/dy3/js/plugins/range-selector.js | 852 - .../fusion/raptor/dy3/js/rgbcolor/rgbcolor.js | 257 - .../static/fusion/raptor/dy3/js/stacktrace.js | 411 - .../static/fusion/raptor/dy3/js/strftime/Doxyfile | 243 - .../fusion/raptor/dy3/js/strftime/strftime-min.js | 1 - .../fusion/raptor/dy3/js/strftime/strftime.js | 731 - .../static/fusion/raptor/ebz/date_time_picker.css | 557 - .../static/fusion/raptor/ebz/date_time_picker.js | 277 - .../webapp/static/fusion/raptor/ebz/dynamicform.js | 112 - .../main/webapp/static/fusion/raptor/ebz/moment.js | 3688 -- .../webapp/static/fusion/raptor/ebz/multiselect.js | 62 - .../webapp/static/fusion/raptor/ebz/quick_links.js | 33 - .../fusion/raptor/ebz/report_chart_wizard.html | 313 - .../fusion/raptor/ebz/report_chart_wizard.js | 671 - .../static/fusion/raptor/ebz/report_run.html | 66 - .../webapp/static/fusion/raptor/ebz/report_run.js | 293 - .../static/fusion/raptor/ebz/report_search.html | 35 - .../static/fusion/raptor/ebz/report_search.js | 136 - .../fusion/raptor/images/ATT_Business_logo.gif | Bin 8203 -> 0 bytes .../static/fusion/raptor/images/RAPTOR_BANNER.jpg | Bin 6249 -> 0 bytes .../static/fusion/raptor/images/accessicon.gif | Bin 329 -> 0 bytes .../webapp/static/fusion/raptor/images/active.gif | Bin 338 -> 0 bytes .../webapp/static/fusion/raptor/images/addbtn.png | Bin 662 -> 0 bytes .../static/fusion/raptor/images/ajax-loader.gif | Bin 673 -> 0 bytes .../static/fusion/raptor/images/arrow_add.gif | Bin 469 -> 0 bytes .../static/fusion/raptor/images/arrow_add_edge.gif | Bin 564 -> 0 bytes .../fusion/raptor/images/arrow_add_multiple.gif | Bin 748 -> 0 bytes .../static/fusion/raptor/images/arrow_add_one.gif | Bin 631 -> 0 bytes .../static/fusion/raptor/images/arrow_back.gif | Bin 621 -> 0 bytes .../static/fusion/raptor/images/arrow_cancel.gif | Bin 652 -> 0 bytes .../static/fusion/raptor/images/arrow_left.gif | Bin 382 -> 0 bytes .../static/fusion/raptor/images/arrow_left2.gif | Bin 399 -> 0 bytes .../static/fusion/raptor/images/arrow_next.gif | Bin 609 -> 0 bytes .../static/fusion/raptor/images/arrow_plus.gif | Bin 67 -> 0 bytes .../fusion/raptor/images/arrow_reorder_all.gif | Bin 686 -> 0 bytes .../fusion/raptor/images/arrow_reorder_all.png | Bin 29837 -> 0 bytes .../static/fusion/raptor/images/arrow_right.gif | Bin 381 -> 0 bytes .../static/fusion/raptor/images/arrow_right2.gif | Bin 399 -> 0 bytes .../static/fusion/raptor/images/arrow_save.gif | Bin 606 -> 0 bytes .../static/fusion/raptor/images/att-globe1.jpg | Bin 5855 -> 0 bytes .../static/fusion/raptor/images/button_import.png | Bin 546 -> 0 bytes .../static/fusion/raptor/images/calendar_icon.gif | Bin 552 -> 0 bytes .../fusion/raptor/images/calendar_icon_nav.gif | Bin 538 -> 0 bytes .../fusion/raptor/images/calendar_icon_nav1.gif | Bin 1065 -> 0 bytes .../static/fusion/raptor/images/calender_icon.gif | Bin 552 -> 0 bytes .../fusion/raptor/images/columnblankdown.gif | Bin 192 -> 0 bytes .../static/fusion/raptor/images/columnblankup.gif | Bin 193 -> 0 bytes .../static/fusion/raptor/images/columndown.gif | Bin 124 -> 0 bytes .../static/fusion/raptor/images/columnup.gif | Bin 126 -> 0 bytes .../static/fusion/raptor/images/crosshairs.png | Bin 218 -> 0 bytes .../static/fusion/raptor/images/csv_icon.gif | Bin 447 -> 0 bytes .../static/fusion/raptor/images/deleteicon.gif | Bin 80 -> 0 bytes .../static/fusion/raptor/images/downloadicon.gif | Bin 74 -> 0 bytes .../static/fusion/raptor/images/excel2007.jpg | Bin 761 -> 0 bytes .../static/fusion/raptor/images/excel2007.png | Bin 3186 -> 0 bytes .../static/fusion/raptor/images/excelicon.gif | Bin 1055 -> 0 bytes .../fusion/raptor/images/excelicon_multi.gif | Bin 1026 -> 0 bytes .../fusion/raptor/images/green-arrow-right.gif | Bin 201 -> 0 bytes .../static/fusion/raptor/images/green-arrow.gif | Bin 195 -> 0 bytes .../static/fusion/raptor/images/grnarrowdn.gif | Bin 74 -> 0 bytes .../static/fusion/raptor/images/grnarrowup.gif | Bin 106 -> 0 bytes .../main/webapp/static/fusion/raptor/images/h.png | Bin 380 -> 0 bytes .../static/fusion/raptor/images/inactive.gif | Bin 352 -> 0 bytes .../webapp/static/fusion/raptor/images/loader.gif | Bin 958 -> 0 bytes .../webapp/static/fusion/raptor/images/loading.gif | Bin 4176 -> 0 bytes .../static/fusion/raptor/images/lookup_arrow.gif | Bin 645 -> 0 bytes .../static/fusion/raptor/images/maps/blue.png | Bin 1309 -> 0 bytes .../static/fusion/raptor/images/maps/green.png | Bin 1190 -> 0 bytes .../static/fusion/raptor/images/maps/lightblue.png | Bin 1269 -> 0 bytes .../fusion/raptor/images/maps/map_iphone.jpg | Bin 712 -> 0 bytes .../static/fusion/raptor/images/maps/orange.png | Bin 3413 -> 0 bytes .../static/fusion/raptor/images/maps/pink.png | Bin 1321 -> 0 bytes .../static/fusion/raptor/images/maps/purple.png | Bin 1324 -> 0 bytes .../static/fusion/raptor/images/maps/red.png | Bin 1305 -> 0 bytes .../static/fusion/raptor/images/maps/yellow.png | Bin 1309 -> 0 bytes .../webapp/static/fusion/raptor/images/minus.gif | Bin 75 -> 0 bytes .../static/fusion/raptor/images/modify_icon.gif | Bin 246 -> 0 bytes .../webapp/static/fusion/raptor/images/page.gif | Bin 554 -> 0 bytes .../static/fusion/raptor/images/pdficon_large.gif | Bin 434 -> 0 bytes .../static/fusion/raptor/images/pdficon_small.gif | Bin 361 -> 0 bytes .../static/fusion/raptor/images/pen_paper.gif | Bin 618 -> 0 bytes .../webapp/static/fusion/raptor/images/plus.gif | Bin 78 -> 0 bytes .../static/fusion/raptor/images/popupicon.gif | Bin 79 -> 0 bytes .../static/fusion/raptor/images/position.png | Bin 267 -> 0 bytes .../webapp/static/fusion/raptor/images/printer.gif | Bin 1019 -> 0 bytes .../static/fusion/raptor/images/progress.gif | Bin 734 -> 0 bytes .../static/fusion/raptor/images/question_mark.jpg | Bin 426 -> 0 bytes .../static/fusion/raptor/images/quickhelp_dk.gif | Bin 155 -> 0 bytes .../static/fusion/raptor/images/quickhelp_lt.gif | Bin 897 -> 0 bytes .../webapp/static/fusion/raptor/images/r_back.gif | Bin 918 -> 0 bytes .../webapp/static/fusion/raptor/images/raptor.jpg | Bin 889 -> 0 bytes .../static/fusion/raptor/images/raptor_logo.gif | Bin 3150 -> 0 bytes .../static/fusion/raptor/images/raptor_logo.jpg | Bin 1827 -> 0 bytes .../static/fusion/raptor/images/required.gif | Bin 854 -> 0 bytes .../static/fusion/raptor/images/shareicon.gif | Bin 542 -> 0 bytes .../main/webapp/static/fusion/raptor/images/sv.png | Bin 11373 -> 0 bytes .../static/fusion/raptor/images/tab_left.gif | Bin 137 -> 0 bytes .../static/fusion/raptor/images/tab_left_sel.gif | Bin 106 -> 0 bytes .../static/fusion/raptor/images/tab_right.gif | Bin 138 -> 0 bytes .../static/fusion/raptor/images/tab_right_sel.gif | Bin 104 -> 0 bytes .../static/fusion/raptor/images/test_run.gif | Bin 330 -> 0 bytes .../webapp/static/fusion/raptor/images/text.gif | Bin 141 -> 0 bytes .../raptor/images/tree/context-menu-gradient.gif | Bin 807 -> 0 bytes .../raptor/images/tree/dhtmlgoodies_folder.gif | Bin 1120 -> 0 bytes .../raptor/images/tree/dhtmlgoodies_minus.gif | Bin 197 -> 0 bytes .../raptor/images/tree/dhtmlgoodies_plus.gif | Bin 200 -> 0 bytes .../raptor/images/tree/dhtmlgoodies_sheet.gif | Bin 906 -> 0 bytes .../images/tree/dhtmlgoodies_sheet_crosstab.gif | Bin 1144 -> 0 bytes .../images/tree/dhtmlgoodies_sheet_dashboard.gif | Bin 1164 -> 0 bytes .../images/tree/dhtmlgoodies_sheet_graph.gif | Bin 983 -> 0 bytes .../fusion/raptor/images/tree/dragDrop_ind1.gif | Bin 53 -> 0 bytes .../fusion/raptor/images/tree/dragDrop_ind2.gif | Bin 56 -> 0 bytes .../fusion/raptor/images/tree/folder_close.gif | Bin 283 -> 0 bytes .../fusion/raptor/images/tree/folder_dots.gif | Bin 68 -> 0 bytes .../fusion/raptor/images/tree/folder_folder.gif | Bin 980 -> 0 bytes .../fusion/raptor/images/tree/folder_lastsub.gif | Bin 78 -> 0 bytes .../fusion/raptor/images/tree/folder_open.gif | Bin 286 -> 0 bytes .../fusion/raptor/images/tree/folder_sub.gif | Bin 265 -> 0 bytes .../fusion/raptor/images/tree/grnarrowleft.gif | Bin 854 -> 0 bytes .../fusion/raptor/images/tree/grnarrowright.gif | Bin 845 -> 0 bytes .../static/fusion/raptor/images/txt_icon.gif | Bin 154 -> 0 bytes .../webapp/static/fusion/raptor/images/uF033.png | Bin 520 -> 0 bytes .../webapp/static/fusion/raptor/images/uF034.png | Bin 536 -> 0 bytes .../webapp/static/fusion/raptor/images/uF035.png | Bin 487 -> 0 bytes .../webapp/static/fusion/raptor/images/uF036.png | Bin 482 -> 0 bytes .../fusion/raptor/img/BorderLayout-24x24.png | Bin 1369 -> 0 bytes .../static/fusion/raptor/img/Calendar-16x16.png | Bin 552 -> 0 bytes .../static/fusion/raptor/img/DeleteCross-16x16.png | Bin 750 -> 0 bytes .../webapp/static/fusion/raptor/img/addbtn.png | Bin 662 -> 0 bytes .../static/fusion/raptor/img/button_import.png | Bin 546 -> 0 bytes .../fusion/raptor/img/copyicon-highlighted.png | Bin 264 -> 0 bytes .../webapp/static/fusion/raptor/img/copyicon.png | Bin 235 -> 0 bytes .../static/fusion/raptor/img/cross-small.png | Bin 291 -> 0 bytes .../webapp/static/fusion/raptor/img/csv_icon.gif | Bin 447 -> 0 bytes .../webapp/static/fusion/raptor/img/csv_icon.jpg | Bin 632 -> 0 bytes .../webapp/static/fusion/raptor/img/csv_icon.png | Bin 938 -> 0 bytes .../fusion/raptor/img/deleteicon-highlighted.gif | Bin 592 -> 0 bytes .../fusion/raptor/img/deleteicon-highlighted.png | Bin 566 -> 0 bytes .../webapp/static/fusion/raptor/img/deleteicon.gif | Bin 579 -> 0 bytes .../static/fusion/raptor/img/downloadicon.gif | Bin 74 -> 0 bytes .../webapp/static/fusion/raptor/img/editicon.gif | Bin 360 -> 0 bytes .../webapp/static/fusion/raptor/img/excel2007.jpg | Bin 761 -> 0 bytes .../webapp/static/fusion/raptor/img/excelicon.gif | Bin 1055 -> 0 bytes .../static/fusion/raptor/img/excelicon_multi.gif | Bin 1026 -> 0 bytes .../static/fusion/raptor/img/executeicon.png | Bin 1076 -> 0 bytes .../static/fusion/raptor/img/file_import.png | Bin 653 -> 0 bytes .../static/fusion/raptor/img/pdficon_small.gif | Bin 361 -> 0 bytes .../webapp/static/fusion/raptor/img/pen_paper.gif | Bin 618 -> 0 bytes .../static/fusion/raptor/img/pencil-small.png | Bin 309 -> 0 bytes .../webapp/static/fusion/raptor/img/report-add.png | Bin 724 -> 0 bytes .../static/fusion/raptor/img/report-favorite.png | Bin 693 -> 0 bytes .../webapp/static/fusion/raptor/img/report-my.png | Bin 739 -> 0 bytes .../static/fusion/raptor/img/report-public.png | Bin 776 -> 0 bytes .../webapp/static/fusion/raptor/img/report.png | Bin 563 -> 0 bytes .../webapp/static/fusion/raptor/img/reports.png | Bin 769 -> 0 bytes .../webapp/static/fusion/raptor/img/search.gif | Bin 223 -> 0 bytes .../webapp/static/fusion/raptor/img/search.png | Bin 3501 -> 0 bytes .../webapp/static/fusion/raptor/img/tick-small.png | Bin 283 -> 0 bytes .../static/fusion/raptor/js/CalendarPopup.js | 1486 - .../main/webapp/static/fusion/raptor/js/ajax.js | 214 - .../fusion/raptor/js/ajax_dynamic_content.js | 97 - .../static/fusion/raptor/js/cingular_button.js | 217 - .../main/webapp/static/fusion/raptor/js/drupal.js | 1018 - .../static/fusion/raptor/js/editabledropdown.js | 363 - .../static/fusion/raptor/js/form-field-tooltip.js | 715 - .../main/webapp/static/fusion/raptor/js/gmap.js | 634 - .../main/webapp/static/fusion/raptor/js/jquery.js | 4376 -- .../webapp/static/fusion/raptor/js/jquery.min.js | 154 - .../static/fusion/raptor/js/label_quantum.js | 5 - .../webapp/static/fusion/raptor/js/nova_button.js | 1184 - .../static/fusion/raptor/js/other_scripts.js | 331 - .../fusion/raptor/js/persist_table_header.js | 47 - .../static/fusion/raptor/js/prototype-1.6.0.3.js | 4320 -- .../main/webapp/static/fusion/raptor/js/raptor.js | 314 - .../static/fusion/raptor/js/rounded-corners.js | 353 - .../main/webapp/static/fusion/raptor/js/script.js | 482 - .../webapp/static/fusion/raptor/js/tree/ajax.js | 194 - .../static/fusion/raptor/js/tree/context-menu.js | 444 - .../fusion/raptor/js/tree/drag-drop-folder-tree.js | 1059 - .../webapp/static/fusion/raptor/uigrid/ui-grid.css | 1971 - .../webapp/static/fusion/raptor/uigrid/ui-grid.eot | Bin 8728 -> 0 bytes .../webapp/static/fusion/raptor/uigrid/ui-grid.js | 26735 ------------ .../webapp/static/fusion/raptor/uigrid/ui-grid.svg | 34 - .../webapp/static/fusion/raptor/uigrid/ui-grid.ttf | Bin 8564 -> 0 bytes .../static/fusion/raptor/uigrid/ui-grid.woff | Bin 4792 -> 0 bytes .../static/fusion/raptor/uigrid/vfs_fonts.js | 1 - vid/src/main/webapp/static/js/jquery-1.10.2.js | 9789 ----- vid/src/main/webapp/static/js/jquery-ui.js | 16617 -------- vid/src/main/webapp/static/js/jquery.mask.min.js | 12 - vid/src/main/webapp/static/js/modalService.js | 169 - vid/src/main/webapp/static/js/search.js | 829 - vid/src/main/webapp/test.jsp | 29 - .../openecomp/ecomp/vid/selenium/FirstClass.java | 606 - .../ecomp/vid/selenium/LogOutLeftPane.java | 242 - .../openecomp/portalapp/controller/NetMapTest.java | 48 - .../portalapp/service/ProfileServiceTest.java | 69 - .../core/MockApplicationContextTestSuite.java | 174 - vid/src/test/resources/objectconfig.properties | 16 - vid/version.properties | 13 - 2941 files changed, 110911 insertions(+), 434292 deletions(-) mode change 100644 => 100755 deliveries/pom.xml mode change 100644 => 100755 deliveries/src/main/docker/assembly/assembly-for-plugin.xml mode change 100644 => 100755 deliveries/src/main/docker/docker-files/Dockerfile mode change 100644 => 100755 deliveries/src/main/docker/docker-files/docker-compose.yml mode change 100644 => 100755 deliveries/src/main/scripts/localize.sh mode change 100644 => 100755 deliveries/src/main/scripts/localize_asdc.sh mode change 100644 => 100755 deliveries/src/main/scripts/localize_cache.sh mode change 100644 => 100755 deliveries/src/main/scripts/localize_log4j.sh mode change 100644 => 100755 deliveries/src/main/scripts/localize_logback.sh mode change 100644 => 100755 deliveries/src/main/scripts/localize_portal.sh mode change 100644 => 100755 deliveries/src/main/scripts/localize_quartz.sh mode change 100644 => 100755 deliveries/src/main/scripts/localize_system.sh mode change 100644 => 100755 deliveries/src/main/scripts/localize_war.sh create mode 100755 epsdk-app-onap/.classpath create mode 100755 epsdk-app-onap/.project create mode 100755 epsdk-app-onap/.settings/.jsdtscope create mode 100755 epsdk-app-onap/.settings/org.eclipse.core.resources.prefs create mode 100755 epsdk-app-onap/.settings/org.eclipse.jdt.core.prefs create mode 100755 epsdk-app-onap/.settings/org.eclipse.m2e.core.prefs create mode 100755 epsdk-app-onap/.settings/org.eclipse.wst.common.component create mode 100755 epsdk-app-onap/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml create mode 100755 epsdk-app-onap/.settings/org.eclipse.wst.common.project.facet.core.xml create mode 100755 epsdk-app-onap/.settings/org.eclipse.wst.jsdt.ui.superType.container create mode 100755 epsdk-app-onap/.settings/org.eclipse.wst.jsdt.ui.superType.name create mode 100755 epsdk-app-onap/.settings/org.eclipse.wst.validation.prefs create mode 100755 epsdk-app-onap/README.md create mode 100755 epsdk-app-onap/pom.xml create mode 100755 epsdk-app-onap/src/main/java/org/openecomp/portalapp/conf/ExternalAppConfig.java create mode 100755 epsdk-app-onap/src/main/java/org/openecomp/portalapp/conf/ExternalAppInitializer.java create mode 100755 epsdk-app-onap/src/main/java/org/openecomp/portalapp/conf/HibernateMappingLocations.java create mode 100755 epsdk-app-onap/src/main/java/org/openecomp/portalapp/lm/FusionLicenseManagerImpl.java create mode 100755 epsdk-app-onap/src/main/java/org/openecomp/portalapp/lm/LicenseableClassImpl.java create mode 100755 epsdk-app-onap/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java create mode 100755 epsdk-app-onap/src/main/java/org/openecomp/portalapp/scheduler/Register.java create mode 100755 epsdk-app-onap/src/main/java/org/openecomp/portalapp/scheduler/RegistryAdapter.java create mode 100755 epsdk-app-onap/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java create mode 100755 epsdk-app-onap/src/main/resources/cache.ccf create mode 100755 epsdk-app-onap/src/main/resources/cache_template.ccf create mode 100755 epsdk-app-onap/src/main/resources/catalog.json create mode 100755 epsdk-app-onap/src/main/resources/logback.xml create mode 100755 epsdk-app-onap/src/main/resources/logback_template.xml create mode 100755 epsdk-app-onap/src/main/resources/mchange-log.properties create mode 100755 epsdk-app-onap/src/main/resources/my.cnf create mode 100755 epsdk-app-onap/src/main/resources/portal.properties create mode 100755 epsdk-app-onap/src/main/resources/portal_template.properties rename {vid => epsdk-app-onap}/src/main/resources/sampleTosca.csar (100%) mode change 100644 => 100755 create mode 100755 epsdk-app-onap/src/main/resources/state-rules.drl create mode 100755 epsdk-app-onap/src/main/resources/vid-data.sql create mode 100755 epsdk-app-onap/src/main/resources/vid-pre-init.sql create mode 100755 epsdk-app-onap/src/main/resources/vid-schema.sql create mode 100755 epsdk-app-onap/src/main/swm/common/common.sh create mode 100755 epsdk-app-onap/src/main/swm/common/localize.sh create mode 100755 epsdk-app-onap/src/main/swm/common/localize_asdc.sh create mode 100755 epsdk-app-onap/src/main/swm/common/localize_cache.sh create mode 100755 epsdk-app-onap/src/main/swm/common/localize_log4j.sh create mode 100755 epsdk-app-onap/src/main/swm/common/localize_logback.sh create mode 100755 epsdk-app-onap/src/main/swm/common/localize_portal.sh create mode 100755 epsdk-app-onap/src/main/swm/common/localize_quartz.sh create mode 100755 epsdk-app-onap/src/main/swm/common/localize_system.sh create mode 100755 epsdk-app-onap/src/main/swm/deinstall/postproc/post_proc create mode 100755 epsdk-app-onap/src/main/swm/deinstall/preproc/pre_proc create mode 100755 epsdk-app-onap/src/main/swm/descriptor.xml rename {vid => epsdk-app-onap}/src/main/swm/fallback/postproc/post_proc (100%) mode change 100644 => 100755 rename {vid => epsdk-app-onap}/src/main/swm/fallback/preproc/pre_proc (100%) mode change 100644 => 100755 create mode 100755 epsdk-app-onap/src/main/swm/initinst/postproc/post_proc create mode 100755 epsdk-app-onap/src/main/swm/initinst/preproc/pre_proc create mode 100755 epsdk-app-onap/src/main/swm/install/postproc/post_proc create mode 100755 epsdk-app-onap/src/main/swm/install/preproc/pre_proc create mode 100755 epsdk-app-onap/src/main/swm/notes.txt rename {vid => epsdk-app-onap}/src/main/webapp/WEB-INF/cert/tomcat_keystore (100%) mode change 100644 => 100755 create mode 100755 epsdk-app-onap/src/main/webapp/WEB-INF/conf/asdc.properties create mode 100755 epsdk-app-onap/src/main/webapp/WEB-INF/conf/asdc_template.properties create mode 100755 epsdk-app-onap/src/main/webapp/WEB-INF/conf/quartz.properties create mode 100755 epsdk-app-onap/src/main/webapp/WEB-INF/conf/quartz_template.properties create mode 100755 epsdk-app-onap/src/main/webapp/WEB-INF/conf/raptor.properties create mode 100755 epsdk-app-onap/src/main/webapp/WEB-INF/conf/raptor_app_fusion.properties create mode 100755 epsdk-app-onap/src/main/webapp/WEB-INF/conf/raptor_db_fusion.properties create mode 100755 epsdk-app-onap/src/main/webapp/WEB-INF/conf/raptor_pdf.properties create mode 100755 epsdk-app-onap/src/main/webapp/WEB-INF/conf/sql.properties create mode 100755 epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties create mode 100755 epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties create mode 100755 epsdk-app-onap/src/main/webapp/WEB-INF/fusion/conf/fusion.properties create mode 100755 epsdk-app-onap/src/main/webapp/WEB-INF/fusion/defs/definitions.xml create mode 100755 epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ds2/footer.jsp create mode 100755 epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ds2/header.jsp create mode 100755 epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp create mode 100755 epsdk-app-onap/src/main/webapp/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml create mode 100755 epsdk-app-onap/src/main/webapp/WEB-INF/index.jsp create mode 100755 epsdk-app-onap/src/main/webapp/WEB-INF/jsp/login.jsp create mode 100755 epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp create mode 100755 epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testMso.jsp create mode 100755 epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp create mode 100755 epsdk-app-onap/src/main/webapp/WEB-INF/jsp/viewlog.jsp create mode 100755 epsdk-app-onap/src/main/webapp/WEB-INF/jsp/welcome.jsp create mode 100755 epsdk-app-onap/src/main/webapp/WEB-INF/web.xml create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/angular-animate.js create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/angular-cookies-1.4.js create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/angular-cookies.js create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/angular-route.js create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/angular-route.min.js create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/angular-sanitize.js create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/angular-touch.js create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/angular.js create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/app.js create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/appDS2.js create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/checklist-model.js create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/checklist-model.min.js create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/gestures.js create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/ng_base.js create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/ui-charts-tpls.js create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/ebz_header/footer.css create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/ebz_header/header.css create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/ebz_header/icons/Read Me.txt create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/ebz_header/icons/atticons.ttf create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/ebz_header/icons/atticons.woff create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/ebz_header/icons/demo.html create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/ebz_header/icons/fonts/atticons.eot create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/ebz_header/icons/fonts/atticons.svg create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/ebz_header/icons/fonts/atticons.ttf create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/ebz_header/icons/fonts/atticons.woff create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/ebz_header/icons/selection.json create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/ebz_header/icons/style.css create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/ebz_header/portal_ebz_header.css create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/fn-ebz.css create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/images/att_logo.png create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/images/footer-attolympiclogo.png rename {vid => epsdk-app-onap}/src/main/webapp/app/fusion/external/ebz/images/headerChatIcon.png (100%) mode change 100644 => 100755 rename {vid => epsdk-app-onap}/src/main/webapp/app/fusion/external/ebz/images/no_favorites_star.png (100%) mode change 100644 => 100755 create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/js/attHeaderSnippet.js create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/js/footer.js create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/att-abs-tpls.js create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/att-abs-tpls.min.js rename {vid/src/main/webapp/app/vid/external/bootstrap => epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox}/fonts/glyphicons-halflings-regular.eot (100%) mode change 100644 => 100755 create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/fonts/glyphicons-halflings-regular.svg rename {vid/src/main/webapp/app/vid/external/bootstrap => epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox}/fonts/glyphicons-halflings-regular.ttf (100%) mode change 100644 => 100755 rename {vid => epsdk-app-onap}/src/main/webapp/app/fusion/external/ebz/sandbox/fonts/glyphicons-halflings-regular.woff (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app/vid/external/bootstrap => epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox}/fonts/glyphicons-halflings-regular.woff2 (100%) mode change 100644 => 100755 create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/base.css create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/btn.css create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/clearviewatt/clearviewatt-bold-webfont.eot create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/clearviewatt/clearviewatt-bold-webfont.ttf create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/clearviewatt/clearviewatt-bold-webfont.woff create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/clearviewatt/clearviewatt-bolditalic-webfont.eot create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/clearviewatt/clearviewatt-bolditalic-webfont.ttf create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/clearviewatt/clearviewatt-bolditalic-webfont.woff create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/clearviewatt/clearviewatt-bookitalic-webfont.eot create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/clearviewatt/clearviewatt-bookitalic-webfont.ttf create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/clearviewatt/clearviewatt-bookitalic-webfont.woff create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/clearviewatt/clearviewatt-light-webfont.eot create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/clearviewatt/clearviewatt-light-webfont.ttf create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/clearviewatt/clearviewatt-light-webfont.woff create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/clearviewatt/clearviewatt-lightitalic-webfont.eot create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/clearviewatt/clearviewatt-lightitalic-webfont.ttf create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/clearviewatt/clearviewatt-lightitalic-webfont.woff create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/clearviewatt/clvatt-book-webfont.eot create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/clearviewatt/clvatt-book-webfont.ttf create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/clearviewatt/clvatt-book-webfont.woff create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/demo.css create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/dtpk.css create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/frms.css create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/icons/atticons.eot create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/icons/atticons.ttf create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/icons/atticons.woff create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/icons/full-linear-atticons.eot create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/icons/full-linear-atticons.ttf create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/icons/full-linear-atticons.woff create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/ie/backgroundsize.min.htc create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/bluebar.png rename {vid => epsdk-app-onap}/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/calendar-icon.png (100%) mode change 100644 => 100755 rename {vid => epsdk-app-onap}/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/checkbox.png (100%) mode change 100644 => 100755 rename {vid => epsdk-app-onap}/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/down.png (100%) mode change 100644 => 100755 create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/footer.png create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/forms-diagram.png create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/header.png rename {vid => epsdk-app-onap}/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/icon-close-modal.png (100%) mode change 100644 => 100755 rename {vid => epsdk-app-onap}/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/icon-informative-modal.png (100%) mode change 100644 => 100755 rename {vid => epsdk-app-onap}/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/icon-warning-modal.png (100%) mode change 100644 => 100755 rename {vid => epsdk-app-onap}/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/loader.gif (100%) mode change 100644 => 100755 rename {vid => epsdk-app-onap}/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/loading-spinner-medium.png (100%) mode change 100644 => 100755 rename {vid => epsdk-app-onap}/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/loading-spinner-orange.png (100%) mode change 100644 => 100755 rename {vid => epsdk-app-onap}/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/loading_balls_black-small.gif (100%) mode change 100644 => 100755 rename {vid => epsdk-app-onap}/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/loading_balls_black.gif (100%) mode change 100644 => 100755 rename {vid => epsdk-app-onap}/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/loading_balls_blue-small.gif (100%) mode change 100644 => 100755 rename {vid => epsdk-app-onap}/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/loading_balls_blue.gif (100%) mode change 100644 => 100755 rename {vid => epsdk-app-onap}/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/loading_balls_white-small.gif (100%) mode change 100644 => 100755 rename {vid => epsdk-app-onap}/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/loading_balls_white.gif (100%) mode change 100644 => 100755 create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/loading_counter.png rename {vid => epsdk-app-onap}/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/loading_dots.gif (100%) mode change 100644 => 100755 create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/logo.png rename {vid => epsdk-app-onap}/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/magnify_glass.png (100%) mode change 100644 => 100755 rename {vid => epsdk-app-onap}/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/oops-exclamation.png (100%) mode change 100644 => 100755 create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/pill-buttons-diagram.png rename {vid => epsdk-app-onap}/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/radio.jpg (100%) mode change 100644 => 100755 rename {vid => epsdk-app-onap}/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/select-arrows.png (100%) mode change 100644 => 100755 rename {vid => epsdk-app-onap}/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/treearrow.png (100%) mode change 100644 => 100755 rename {vid => epsdk-app-onap}/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/up.png (100%) mode change 100644 => 100755 rename {vid => epsdk-app-onap}/src/main/webapp/app/fusion/external/ebz/sandbox/styles/images/upanddown.png (100%) mode change 100644 => 100755 create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-light-webfont.eot create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-light-webfont.ttf create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-light-webfont.woff create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-lightitalic-webfont.eot create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-lightitalic-webfont.ttf create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-lightitalic-webfont.woff create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-medium-webfont.eot create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-medium-webfont.ttf create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-medium-webfont.woff create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-mediumitalic-webfont.eot create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-mediumitalic-webfont.ttf create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-mediumitalic-webfont.woff create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-regular-webfont.eot create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-regular-webfont.ttf create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-regular-webfont.woff create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-regularitalic-webfont.eot create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-regularitalic-webfont.ttf create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-regularitalic-webfont.woff create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-bold-webfont.eot create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-bold-webfont.ttf create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-bold-webfont.woff create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-bolditalic-webfont.eot create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-bolditalic-webfont.ttf create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-bolditalic-webfont.woff create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-light-webfont.eot create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-light-webfont.ttf create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-light-webfont.woff create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-lightitalic-webfont.eot create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-lightitalic-webfont.ttf create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-lightitalic-webfont.woff create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-medium-webfont.eot create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-medium-webfont.ttf create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-medium-webfont.woff create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-mediumitalic-webfont.eot create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-mediumitalic-webfont.ttf create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-mediumitalic-webfont.woff create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-regular-webfont.eot create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-regular-webfont.ttf create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-regular-webfont.woff create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-regularitalic-webfont.eot create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-regularitalic-webfont.ttf create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-regularitalic-webfont.woff create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/pages/iconography.css create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/sldr.css create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/style.css create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/tbs.css create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-controllers/ds-profile/post-controller.js create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-controllers/samplePage-route.js create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-services/postSearch.js create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/post.html create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile_searchDS2.html create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/self_profile.html create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/samplePage.html create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/scripts/utils/page-resource-ds2.js create mode 100755 epsdk-app-onap/src/main/webapp/app/fusion/scripts/view-models/footer.html create mode 100755 epsdk-app-onap/src/main/webapp/static/fusion/css/att_angular_gridster/sandbox-gridster.css create mode 100755 epsdk-app-onap/src/main/webapp/static/fusion/css/att_angular_gridster/ui-gridster.css create mode 100755 epsdk-app-onap/src/main/webapp/static/fusion/css/fusion-sunny.css create mode 100755 epsdk-app-onap/src/main/webapp/static/fusion/images/ATT_Labs_Logo.png rename {vid => epsdk-app-onap}/src/main/webapp/static/fusion/images/Logo_att_labs.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/Rlogo.jpg (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/action_icon.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/action_list_spacer.gif (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/active.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/add.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/add_tool_button.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/addicon.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/application_window_bg.jpg (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/arrow-next.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/arrow-prev.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/att_angular_gridster/grips.png (100%) mode change 100644 => 100755 create mode 100755 epsdk-app-onap/src/main/webapp/static/fusion/images/att_logo.png rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/backButton.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/blank.gif (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/blueButton.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/body_graphic.jpg (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/bubble.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/cache.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/calendar.gif (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/chevron.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/close_container.gif (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/collapsed-icon.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/column-bg.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/copyicon-highlighted.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/copyicon.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/csv_icon.jpg (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/csv_icon.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/customers-add.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/customers-search.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/customers.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/decrypted.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/deleteicon-highlighted.gif (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/deleteicon-highlighted.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/deleteicon.gif (100%) mode change 100644 => 100755 create mode 100755 epsdk-app-onap/src/main/webapp/static/fusion/images/ecomp-login-550x360.jpg create mode 100755 epsdk-app-onap/src/main/webapp/static/fusion/images/ecomp-login.jpg rename {vid => epsdk-app-onap}/src/main/webapp/static/fusion/images/ecomp.png (100%) mode change 100644 => 100755 rename {vid => epsdk-app-onap}/src/main/webapp/static/fusion/images/ecomp_trans.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/editicon.gif (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/error_type.gif (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/example-frame.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/excelicon_multi.gif (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/executeicon.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/expanded-icon.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/file-add.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/file_import.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/file_save-all.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/filter_icon.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/folder_add.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/folder_closed.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/folder_delete.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/folder_edit.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/folder_open.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/folder_user.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/funnel.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/fusion.gif (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/grayButton.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/gray_add_tool_button.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/headerChatIcon.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/icon_remove_all.gif (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/inactive.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/info_type.gif (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/leftButton.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/loading.gif (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/loading_bar.gif (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/login_button.gif (100%) mode change 100644 => 100755 rename {vid => epsdk-app-onap}/src/main/webapp/static/fusion/images/logo_att.jpg (100%) mode change 100644 => 100755 rename {vid => epsdk-app-onap}/src/main/webapp/static/fusion/images/logo_att_header.jpg (100%) mode change 100644 => 100755 rename {vid => epsdk-app-onap}/src/main/webapp/static/fusion/images/logo_att_header.png (100%) mode change 100644 => 100755 rename {vid => epsdk-app-onap}/src/main/webapp/static/fusion/images/logo_header.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/m1.gif (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/mail.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/map.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/menu/bubble.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/menu/file_import.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/menu/file_save-all.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/menu/mail.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/menu/profile.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/menu/speechbubble.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/menu/users.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/minus.gif (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/mobile_logo_att_header_black.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/mobile_logo_att_header_grey.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/mobile_logo_att_header_horizontal.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/mobile_logo_att_header_white.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/modify_icon.gif (100%) mode change 100644 => 100755 rename {vid => epsdk-app-onap}/src/main/webapp/static/fusion/images/no_favorites_star.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/note-add.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/note-search.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/note.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/notes.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/offline.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/offlineMsg.gif (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/online.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/page.gif (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/pagination.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app/fusion/images/layout => epsdk-app-onap/src/main/webapp/static/fusion/images}/panel-e-w-toggle.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app/fusion/images/layout => epsdk-app-onap/src/main/webapp/static/fusion/images}/panel-n-s-toggle.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/pix.gif (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/plus.gif (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/printer.gif (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/profile.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/report-add.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/report-favorite.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/report-my.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/report-public.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/report.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/reports.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/results-first-active.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/results-first-disabled.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/results-last-active.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/results-last-disabled.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/results-next-active.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/results-next-disabled.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/results-prev-active.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/results-prev-disabled.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/resultset_last.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/resultset_previous.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/return_to_top.gif (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/rightButton.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/search.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/search_profile.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/sort_asc.gif (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/sort_desc.gif (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/spacer.gif (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/success_type.gif (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/swoosh.gif (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/tab-hm.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/tab-v-hm.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/tab.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/table-add.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/table-delete.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/table-edit.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/table.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/tabs-bg.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/toolButton.gif (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/toolButton.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/toolbar.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/users.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/warning_type.gif (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/webphone.ico (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app => epsdk-app-onap/src/main/webapp/static}/fusion/images/whiteButton.png (100%) mode change 100644 => 100755 create mode 100755 epsdk-app-onap/src/main/webapp/static/fusion/js/att_angular_gridster/angular-gridster.js create mode 100755 epsdk-app-onap/src/main/webapp/static/fusion/js/att_angular_gridster/ui-gridster-tpls.js create mode 100755 vid-app-common/.classpath create mode 100755 vid-app-common/.project create mode 100755 vid-app-common/.settings/.jsdtscope create mode 100755 vid-app-common/.settings/org.eclipse.core.resources.prefs create mode 100755 vid-app-common/.settings/org.eclipse.jdt.core.prefs create mode 100755 vid-app-common/.settings/org.eclipse.m2e.core.prefs create mode 100755 vid-app-common/.settings/org.eclipse.wst.common.component create mode 100755 vid-app-common/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml create mode 100755 vid-app-common/.settings/org.eclipse.wst.common.project.facet.core.xml create mode 100755 vid-app-common/.settings/org.eclipse.wst.jsdt.ui.superType.container create mode 100755 vid-app-common/.settings/org.eclipse.wst.jsdt.ui.superType.name create mode 100755 vid-app-common/.settings/org.eclipse.wst.validation.prefs create mode 100755 vid-app-common/pom.xml create mode 100755 vid-app-common/src/main/java/org/openecomp/aai/util/AAIProperties.java create mode 100755 vid-app-common/src/main/java/org/openecomp/aai/util/AAIRestInterface.java create mode 100755 vid-app-common/src/main/java/org/openecomp/aai/util/CustomJacksonJaxBJsonProvider.java create mode 100755 vid-app-common/src/main/java/org/openecomp/aai/util/HttpsAuthClient.java create mode 100755 vid-app-common/src/main/java/org/openecomp/aai/util/HttpsComponentsClient.java create mode 100755 vid-app-common/src/main/java/org/openecomp/aai/util/JettyObfuscationConversionCommandLineUtil.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/asdc/AsdcCatalogException.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/asdc/AsdcClient.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/Artifact.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/Resource.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/Service.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/SubResource.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Capability.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Constraint.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Group.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Import.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Input.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/NodeTemplate.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Property.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Requirement.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Schema.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/SubstitutionMappings.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/TopologyTemplate.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaCsar.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaMeta.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaMetadata.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaModel.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/asdc/memory/InMemoryAsdcClient.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/asdc/rest/RestfulAsdcClient.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/client/HttpBasicClient.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/client/HttpsBasicClient.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/controller/AaiController.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/controller/BrowseServiceTypesController.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/controller/HealthCheckController.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/controller/MsoController.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/controller/PropertyController.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/controller/VidController.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/controller/VidHomeController.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/controller/ViewEditSubController.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/controller/ViewLogController.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/controller/test/TestAaiController.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/controller/test/TestAsdcController.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/controller/test/TestMsoController.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/controller/test/TestPageController.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/dao/FnAppDoaImpl.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/dao/ProfileDao.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/exceptions/VidServiceUnavailableException.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/model/CommandProperty.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/model/ExceptionResponse.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/model/ModelConstants.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/model/Network.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/model/Node.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/model/Resource.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/model/Result.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/model/Service.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/model/ServiceModel.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/model/VNF.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/model/VfModule.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/model/VolumeGroup.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/mso/MsoProperties.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/mso/MsoResponseWrapper.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/mso/MsoRestInt.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/mso/MsoRestInterface.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/mso/MsoRestInterfaceFactory.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/mso/MsoRestInterfaceIfc.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/mso/MsoUtil.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/mso/RestObject.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/mso/rest/AsyncRequestStatus.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/mso/rest/RelatedInstance.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/mso/rest/RelatedModel.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/mso/rest/Request.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/mso/rest/RequestDetails.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/mso/rest/RequestList.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/properties/AsdcClientConfiguration.java create mode 100755 vid-app-common/src/main/java/org/openecomp/vid/properties/VidProperties.java create mode 100755 vid-app-common/src/main/resources/json/mso/asyncRequestStatus create mode 100755 vid-app-common/src/main/resources/json/mso/cloudConfiguration create mode 100755 vid-app-common/src/main/resources/json/mso/instanceIds create mode 100755 vid-app-common/src/main/resources/json/mso/modelInfo create mode 100755 vid-app-common/src/main/resources/json/mso/relatedInstance create mode 100755 vid-app-common/src/main/resources/json/mso/relatedModel create mode 100755 vid-app-common/src/main/resources/json/mso/request create mode 100755 vid-app-common/src/main/resources/json/mso/requestDetails create mode 100755 vid-app-common/src/main/resources/json/mso/requestError create mode 100755 vid-app-common/src/main/resources/json/mso/requestInfo create mode 100755 vid-app-common/src/main/resources/json/mso/requestParameters create mode 100755 vid-app-common/src/main/resources/json/mso/requestReferences create mode 100755 vid-app-common/src/main/resources/json/mso/requestStatus create mode 100755 vid-app-common/src/main/resources/json/mso/response create mode 100755 vid-app-common/src/main/resources/json/mso/subscriberInfo create mode 100755 vid-app-common/src/main/webapp/META-INF/MANIFEST.MF create mode 100755 vid-app-common/src/main/webapp/WEB-INF/defs/definitions.xml create mode 100755 vid-app-common/src/main/webapp/WEB-INF/fusion/defs/definitions.xml create mode 100755 vid-app-common/src/main/webapp/WEB-INF/web.xml rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/7450-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/7450-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/7750-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/7750-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/apn-dns-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/apn-dns-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/atcf-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/atcf-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/atgw-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/atgw-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/bgcf-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/bgcf-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/com-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/cpm-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/cpm-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/default-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/dra-epc-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/dra-epc-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/dra-ims-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/dra-ims-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/dslam-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/dslam-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/eatf-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/eatf-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/ecscf-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/ecscf-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/emsc-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/enb-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/enb-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/enum-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/enum-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/esmlc-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/esmlc-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/ettcs-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/ettcs-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/gmlc-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/gmlc-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/hlr-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/hlr-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/hss-epc-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/hss-epc-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/hss-ims-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/hss-ims-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/icscf-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/icscf-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/ipag-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/ipag-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/isbc-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/isbc-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/iwf-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/iwf-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/lrf-rdf-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/lrf-rdf-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/lrg-rdf-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/mgc8-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/mgc8-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/mgcf-emsc-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/mgcf-emsc-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/mgw-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/mgw-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/mind-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/mind-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/mme-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/mme-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/mrf-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/mrf-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/msc-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/msn-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/msn-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/multi-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/n7450-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/n7450-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/n7750a-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/n7750a-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/n7750b-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/n7750b-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/n7750c-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/n7750c-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/n7750d-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/n7750d-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/nb-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/nb-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/pas-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/pas-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/pcef-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/pcef-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/pcrf-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/pcrf-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/pcscf-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/pcscf-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/pgw-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/pgw-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/plrf-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/plrf-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/psap-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/pstn-tdm-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/pstn-tdm-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/rg-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/rg-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/rnc-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/rnc-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/sbc-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/sbc-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/sccas-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/sccas-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/scscf-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/scscf-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/sdg-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/sdg-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/sgsns4-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/sgsns4-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/sgw-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/sgw-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/siad-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/siad-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/ss7-gport-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/ss7-gport-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/ss7gport-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/ss7gport-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/switch-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/tas-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/tas-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/transcoder-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/transcoder-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/ue-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/uephone-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/usp-dns-icon.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/icons/usp-dns-text.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/images/asterisk.png (100%) mode change 100644 => 100755 rename {vid/src/main/webapp/app/fusion/scripts/controllers => vid-app-common/src/main/webapp/app/vid/images}/dummy.txt (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/images/error.png (100%) mode change 100644 => 100755 rename {vid => vid-app-common}/src/main/webapp/app/vid/images/spinner.gif (100%) mode change 100644 => 100755 create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/angular-ui-tree.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/constants/fieldConstants.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/constants/parameterConstants.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/constants/vidConfiguration.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/controller/VidApp.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/controller/creationDialogController.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/controller/deletionDialogController.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/controller/detailsDialogController.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/controller/msoCommitController.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/controller/statusDialogController.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/controller/subscriberSearch.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/directives/extensionsDirective.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/directives/parameterBlockDirective.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/directives/popupWindowDirective.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/directives/progressBarDirective.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/services/aaiService.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/services/asdcService.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/services/componentService.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/services/dataService.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/services/deletionService.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/services/detailsService.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/services/msoService.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/services/propertyService.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/services/statusService.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/services/utilityService.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/services/vnfService.js create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiGetSubs.htm create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiGetSubscriberList.htm create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiServiceTypes.htm create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiSubDetails.htm create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiSubViewEdit.htm create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/view-models/createInstanceServiceModels.htm create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/view-models/creationDialog.htm create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/view-models/deletionDialog.htm create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/view-models/detailsDialog.htm create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/view-models/instantiate.htm create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/view-models/msoCommit.htm create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/view-models/popupWindow.htm create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/view-models/serviceModels.htm create mode 100755 vid-app-common/src/main/webapp/app/vid/scripts/view-models/statusDialog.htm create mode 100755 vid-app-common/src/main/webapp/app/vid/styles/aaiGetSubs.css create mode 100755 vid-app-common/src/main/webapp/app/vid/styles/aaiSubDetails.css create mode 100755 vid-app-common/src/main/webapp/app/vid/styles/aaiSubViewEdit.css create mode 100755 vid-app-common/src/main/webapp/app/vid/styles/angular-ui-tree.css create mode 100755 vid-app-common/src/main/webapp/app/vid/styles/dialogs.css rename {vid/src/main/webapp/app/fusion/scripts/directives => vid-app-common/src/main/webapp/app/vid/styles}/dummy.txt (100%) mode change 100644 => 100755 create mode 100755 vid-app-common/src/main/webapp/app/vid/styles/instantiate.css create mode 100755 vid-app-common/src/main/webapp/app/vid/styles/serviceModels.css create mode 100755 vid-app-common/src/main/webapp/app/vid/styles/subscriberSearch.css create mode 100755 vid-app-common/src/main/webapp/app/vid/styles/vidTree.css create mode 100755 vid-app-common/src/main/webapp/app/vid/test/testAaiData.js create mode 100755 vid-app-common/src/main/webapp/app/vid/test/testMso.css create mode 100755 vid-app-common/src/main/webapp/app/vid/test/testMso.js create mode 100755 vid-app-common/src/main/webapp/app/vid/test/testViewEdit.css create mode 100755 vid-app-common/src/main/webapp/app/vid/test/testViewEdit.js create mode 100755 vid-app-common/src/main/webapp/index.jsp create mode 100755 vid-app-common/src/main/webapp/test.jsp create mode 100755 vid-app-common/src/test/java/org/openecomp/ecomp/vid/selenium/FirstClass.java create mode 100755 vid-app-common/src/test/java/org/openecomp/ecomp/vid/selenium/LogOutLeftPane.java create mode 100755 vid-app-common/src/test/java/org/openecomp/fusion/core/MockApplicationContextTestSuite.java create mode 100755 vid-app-common/src/test/java/org/openecomp/fusionapp/controller/NetMapTest.java create mode 100755 vid-app-common/src/test/java/org/openecomp/fusionapp/service/ProfileServiceTest.java create mode 100755 vid-app-common/src/test/java/org/openecomp/src/main/java/org/vid/dao/FnAppDoaImplTest.java create mode 100755 vid-app-common/src/test/resources/objectconfig.properties delete mode 100644 vid/.gitignore delete mode 100644 vid/pom.xml delete mode 100644 vid/src/main/java/org/openecomp/aai/util/AAIProperties.java delete mode 100644 vid/src/main/java/org/openecomp/aai/util/AAIRestInterface.java delete mode 100644 vid/src/main/java/org/openecomp/aai/util/CustomJacksonJaxBJsonProvider.java delete mode 100644 vid/src/main/java/org/openecomp/aai/util/HttpsAuthClient.java delete mode 100644 vid/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java delete mode 100644 vid/src/main/java/org/openecomp/portalapp/uebhandler/InitUebHandler.java delete mode 100644 vid/src/main/java/org/openecomp/portalapp/uebhandler/MainUebHandler.java delete mode 100644 vid/src/main/java/org/openecomp/portalapp/uebhandler/WidgetNotificationHandler.java delete mode 100644 vid/src/main/java/org/openecomp/portalapp/util/CustomLoggingFilter.java delete mode 100644 vid/src/main/java/org/openecomp/vid/client/HttpBasicClient.java delete mode 100644 vid/src/main/java/org/openecomp/vid/client/HttpsBasicClient.java delete mode 100644 vid/src/main/java/org/openecomp/vid/conf/ExternalAppConfig.java delete mode 100644 vid/src/main/java/org/openecomp/vid/conf/ExternalAppInitializer.java delete mode 100644 vid/src/main/java/org/openecomp/vid/conf/HibernateMappingLocations.java delete mode 100644 vid/src/main/java/org/openecomp/vid/controller/AaiController.java delete mode 100644 vid/src/main/java/org/openecomp/vid/controller/BrowseServiceTypesController.java delete mode 100644 vid/src/main/java/org/openecomp/vid/controller/CreateNewServiceInstanceController.java delete mode 100644 vid/src/main/java/org/openecomp/vid/controller/MsoController.java delete mode 100644 vid/src/main/java/org/openecomp/vid/controller/PropertyController.java delete mode 100644 vid/src/main/java/org/openecomp/vid/controller/SearchExistingSIController.java delete mode 100644 vid/src/main/java/org/openecomp/vid/controller/SubscriberDetailsController.java delete mode 100644 vid/src/main/java/org/openecomp/vid/controller/UserProfileController.java delete mode 100644 vid/src/main/java/org/openecomp/vid/controller/VidController.java delete mode 100644 vid/src/main/java/org/openecomp/vid/controller/VidHomeController.java delete mode 100644 vid/src/main/java/org/openecomp/vid/controller/ViewEditSubController.java delete mode 100644 vid/src/main/java/org/openecomp/vid/controller/ViewLogController.java delete mode 100644 vid/src/main/java/org/openecomp/vid/controller/test/TestAaiController.java delete mode 100644 vid/src/main/java/org/openecomp/vid/controller/test/TestAsdcController.java delete mode 100644 vid/src/main/java/org/openecomp/vid/controller/test/TestMsoController.java delete mode 100644 vid/src/main/java/org/openecomp/vid/controller/test/TestPageController.java delete mode 100644 vid/src/main/java/org/openecomp/vid/dao/ProfileDao.java delete mode 100644 vid/src/main/java/org/openecomp/vid/encryption/EncryptConvertor.java delete mode 100644 vid/src/main/java/org/openecomp/vid/encryption/EncryptedConfiguration.java delete mode 100644 vid/src/main/java/org/openecomp/vid/encryption/EncryptedPropValue.java delete mode 100644 vid/src/main/java/org/openecomp/vid/exceptions/VidServiceUnavailableException.java delete mode 100644 vid/src/main/java/org/openecomp/vid/model/ExceptionResponse.java delete mode 100644 vid/src/main/java/org/openecomp/vid/model/Network.java delete mode 100644 vid/src/main/java/org/openecomp/vid/model/Resource.java delete mode 100644 vid/src/main/java/org/openecomp/vid/model/Result.java delete mode 100644 vid/src/main/java/org/openecomp/vid/model/Service.java delete mode 100644 vid/src/main/java/org/openecomp/vid/model/ServiceModel.java delete mode 100644 vid/src/main/java/org/openecomp/vid/model/VNF.java delete mode 100644 vid/src/main/java/org/openecomp/vid/model/VfModule.java delete mode 100644 vid/src/main/java/org/openecomp/vid/model/VolumeGroup.java delete mode 100644 vid/src/main/java/org/openecomp/vid/mso/MsoProperties.java delete mode 100644 vid/src/main/java/org/openecomp/vid/mso/MsoResponseWrapper.java delete mode 100644 vid/src/main/java/org/openecomp/vid/mso/MsoRestInt.java delete mode 100644 vid/src/main/java/org/openecomp/vid/mso/MsoRestInterface.java delete mode 100644 vid/src/main/java/org/openecomp/vid/mso/MsoRestInterfaceFactory.java delete mode 100644 vid/src/main/java/org/openecomp/vid/mso/MsoRestInterfaceIfc.java delete mode 100644 vid/src/main/java/org/openecomp/vid/mso/MsoUtil.java delete mode 100644 vid/src/main/java/org/openecomp/vid/mso/RestObject.java delete mode 100644 vid/src/main/java/org/openecomp/vid/mso/rest/AsyncRequestStatus.java delete mode 100644 vid/src/main/java/org/openecomp/vid/mso/rest/RelatedInstance.java delete mode 100644 vid/src/main/java/org/openecomp/vid/mso/rest/RelatedModel.java delete mode 100644 vid/src/main/java/org/openecomp/vid/mso/rest/Request.java delete mode 100644 vid/src/main/java/org/openecomp/vid/mso/rest/RequestDetails.java delete mode 100644 vid/src/main/java/org/openecomp/vid/mso/rest/RequestList.java delete mode 100644 vid/src/main/java/org/openecomp/vid/properties/AsdcClientConfiguration.java delete mode 100644 vid/src/main/java/org/openecomp/vid/properties/VidProperties.java delete mode 100644 vid/src/main/java/org/openecomp/vid/scheduler/LogJob.java delete mode 100644 vid/src/main/java/org/openecomp/vid/scheduler/LogRegistry.java delete mode 100644 vid/src/main/java/org/openecomp/vid/scheduler/MyLoginsFeedJob.java delete mode 100644 vid/src/main/java/org/openecomp/vid/scheduler/MyLoginsFeedRegistry.java delete mode 100644 vid/src/main/java/org/openecomp/vid/scheduler/Register.java delete mode 100644 vid/src/main/java/org/openecomp/vid/scheduler/RegistryAdapter.java delete mode 100644 vid/src/main/resources/cache.ccf delete mode 100644 vid/src/main/resources/cache_template.ccf delete mode 100644 vid/src/main/resources/catalog.json delete mode 100644 vid/src/main/resources/json/mso/asyncRequestStatus delete mode 100644 vid/src/main/resources/json/mso/cloudConfiguration delete mode 100644 vid/src/main/resources/json/mso/instanceIds delete mode 100644 vid/src/main/resources/json/mso/modelInfo delete mode 100644 vid/src/main/resources/json/mso/relatedInstance delete mode 100644 vid/src/main/resources/json/mso/relatedModel delete mode 100644 vid/src/main/resources/json/mso/request delete mode 100644 vid/src/main/resources/json/mso/requestDetails delete mode 100644 vid/src/main/resources/json/mso/requestError delete mode 100644 vid/src/main/resources/json/mso/requestInfo delete mode 100644 vid/src/main/resources/json/mso/requestParameters delete mode 100644 vid/src/main/resources/json/mso/requestReferences delete mode 100644 vid/src/main/resources/json/mso/requestStatus delete mode 100644 vid/src/main/resources/json/mso/response delete mode 100644 vid/src/main/resources/json/mso/subscriberInfo delete mode 100644 vid/src/main/resources/logback.xml delete mode 100644 vid/src/main/resources/logback_template.xml delete mode 100644 vid/src/main/resources/mchange-log.properties delete mode 100644 vid/src/main/resources/my.cnf delete mode 100644 vid/src/main/resources/portal.properties delete mode 100644 vid/src/main/resources/portal_template.properties delete mode 100644 vid/src/main/resources/state-rules.drl delete mode 100644 vid/src/main/resources/vid-data.sql delete mode 100644 vid/src/main/resources/vid-pre-init.sql delete mode 100644 vid/src/main/resources/vid-schema.sql delete mode 100644 vid/src/main/swm/common/common.sh delete mode 100644 vid/src/main/swm/common/localize.sh delete mode 100644 vid/src/main/swm/common/localize_asdc.sh delete mode 100644 vid/src/main/swm/common/localize_cache.sh delete mode 100644 vid/src/main/swm/common/localize_log4j.sh delete mode 100644 vid/src/main/swm/common/localize_logback.sh delete mode 100644 vid/src/main/swm/common/localize_portal.sh delete mode 100644 vid/src/main/swm/common/localize_quartz.sh delete mode 100644 vid/src/main/swm/common/localize_system.sh delete mode 100644 vid/src/main/swm/deinstall/postproc/post_proc delete mode 100644 vid/src/main/swm/deinstall/preproc/pre_proc delete mode 100644 vid/src/main/swm/descriptor.xml delete mode 100644 vid/src/main/swm/initinst/postproc/post_proc delete mode 100644 vid/src/main/swm/initinst/preproc/pre_proc delete mode 100644 vid/src/main/swm/install/postproc/post_proc delete mode 100644 vid/src/main/swm/install/preproc/pre_proc delete mode 100644 vid/src/main/swm/notes.txt delete mode 100644 vid/src/main/webapp/WEB-INF/conf/asdc.properties delete mode 100644 vid/src/main/webapp/WEB-INF/conf/asdc_template.properties delete mode 100644 vid/src/main/webapp/WEB-INF/conf/quartz.properties delete mode 100644 vid/src/main/webapp/WEB-INF/conf/quartz_template.properties delete mode 100644 vid/src/main/webapp/WEB-INF/conf/raptor.properties delete mode 100644 vid/src/main/webapp/WEB-INF/conf/raptor_app_fusion.properties delete mode 100644 vid/src/main/webapp/WEB-INF/conf/raptor_db_fusion.properties delete mode 100644 vid/src/main/webapp/WEB-INF/conf/raptor_pdf.properties delete mode 100644 vid/src/main/webapp/WEB-INF/conf/sql.properties delete mode 100644 vid/src/main/webapp/WEB-INF/conf/system.properties delete mode 100644 vid/src/main/webapp/WEB-INF/conf/system_template.properties delete mode 100644 vid/src/main/webapp/WEB-INF/defs/definitions.xml delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/conf/fusion.properties delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/defs/definitions.xml delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/jsp/broadcast.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/jsp/broadcast_list.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/jsp/collaborateList.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/jsp/data_out.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_footer.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/jsp/ebz/loginSnippet.html delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/jsp/ebz_template.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/jsp/ebz_template_noheader_nofooter.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/jsp/ebz_template_report_embedded.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/jsp/es_search_demo.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/jsp/es_suggest_demo.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/jsp/frame_insert.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/jsp/include.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/jsp/jcs_admin.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/jsp/meta.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/jsp/popup_modal.html delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/jsp/popup_modal_role.html delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/jsp/popup_modal_rolefunction.html delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/jsp/post_search.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/jsp/profile.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/jsp/profile_search.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/jsp/role.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/jsp/role_function_list.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/jsp/role_list.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/jsp/sequence/details.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/jsp/usage_list.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/jsp/webrtc/collaboration.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/orm/Fusion.hbm.xml delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/orm/Workflow.hbm.xml delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/custom_header_include.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/custom_js_include.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/date_end_field_run_sql.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/date_start_field_run_sql.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/default_field_run_sql.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/disclaimer.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/error_include.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/error_page.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/footer.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/popup_drill_down_report.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/popup_import_semaphore.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/popup_semaphore.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/popup_sql.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/popup_table_cols.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/popup_testrun_sql.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/report_download_csv.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/report_download_pdf.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/report_download_xls.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/report_ebz.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/report_import.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/report_sample.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/report_search.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/report_wizard.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/test_field_run_sql.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/test_run_sql.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/tree/folderNav.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/tree/testTree.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_adhoc_schedule.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_chart.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_columns_add_multi.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_columns_edit.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_columns_list.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_columns_order_all.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_data_forecasting.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_definition.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_filters_edit.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_filters_list.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_form_fields_edit.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_form_fields_list.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_javascript.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_log.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_map.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_run.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule_formfield_include.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule_multiple.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule_only.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule_only_from_search.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_sorting_edit.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_sorting_list.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_sorting_order_all.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_sql_def.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_tables_edit.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_tables_list.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_user_access.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/jsp/createnewserviceinstance.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/jsp/error.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/jsp/leafletMap.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/jsp/login_external.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/jsp/net_map.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/jsp/searchexistingsi.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/jsp/serviceModels.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/jsp/subscriberdetails.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/jsp/testMso.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/jsp/user_profile.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/jsp/vidhome.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/jsp/viewlog.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/jsp/welcome.jsp delete mode 100644 vid/src/main/webapp/WEB-INF/web.xml delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-animate.js delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-animate.min.js delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-animate.min.js.map delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-aria.js delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-aria.min.js delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-aria.min.js.map delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-cookies.js delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-cookies.min.js delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-cookies.min.js.map delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-csp.css delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-loader.js delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-loader.min.js delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-loader.min.js.map delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-message-format.js delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-message-format.min.js delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-message-format.min.js.map delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-messages.js delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-messages.min.js delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-messages.min.js.map delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-mocks.js delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-resource.js delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-resource.min.js delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-resource.min.js.map delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-route.js delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-route.min.js delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-route.min.js.map delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-sanitize.js delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-sanitize.min.js delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-sanitize.min.js.map delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-scenario.js delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-touch.js delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-touch.min.js delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular-touch.min.js.map delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular.js delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular.min.js delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/angular.min.js.map delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/errors.json delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/version.json delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-1.5/version.txt delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-ui/ui-bootstrap-tpls-1.1.2.min.js delete mode 100644 vid/src/main/webapp/app/fusion/external/angular-ui/ui-bootstrap-tpls-1.2.4.min.js delete mode 100644 vid/src/main/webapp/app/fusion/external/bootstrap/bs.css delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/angular_js/angular-animate.js delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/angular_js/angular-cookies.js delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/angular_js/angular-route.js delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/angular_js/angular-route.min.js delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/angular_js/angular-sanitize.js delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/angular_js/angular-touch.js delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/angular_js/angular.js delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/angular_js/app.js delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/angular_js/checklist-model.js delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/angular_js/checklist-model.min.js delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/angular_js/gestures.js delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/angular_js/ng_base.js delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/angular_js/ui-charts-tpls.js delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/ebz_header/footer.css delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/ebz_header/header.css delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/ebz_header/portal_ebz_header.css delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/fn-ebz.css delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/js/attHeaderSnippet.js delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/js/footer.js delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/sandbox/att-abs-tpls.js delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/sandbox/att-abs-tpls.min.js delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/sandbox/styles/base.css delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/sandbox/styles/btn.css delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/sandbox/styles/demo.css delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/sandbox/styles/dtpk.css delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/sandbox/styles/frms.css delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/sandbox/styles/ie/backgroundsize.min.htc delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/sandbox/styles/pages/iconography.css delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/sandbox/styles/sldr.css delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/sandbox/styles/style.css delete mode 100644 vid/src/main/webapp/app/fusion/external/ebz/sandbox/styles/tbs.css delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/.gitignore delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/LICENSE delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/bower.json delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/component.json delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/composer.json delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/css/ionicons.css delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/css/ionicons.min.css delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/fonts/ionicons.eot delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/fonts/ionicons.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/fonts/ionicons.ttf delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/fonts/ionicons.woff delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/less/_ionicons-font.less delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/less/_ionicons-icons.less delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/less/_ionicons-variables.less delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/less/ionicons.less delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/alert-circled.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/alert.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-add-contact.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-add.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-alarm.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-archive.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-arrow-back.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-arrow-down-left.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-arrow-down-right.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-arrow-forward.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-arrow-up-left.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-arrow-up-right.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-battery.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-book.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-calendar.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-call.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-camera.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-chat.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-checkmark.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-clock.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-close.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-contact.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-contacts.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-data.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-developer.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-display.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-download.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-drawer.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-dropdown.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-earth.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-folder.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-forums.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-friends.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-hand.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-image.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-inbox.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-information.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-keypad.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-lightbulb.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-locate.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-location.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-mail.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-microphone.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-mixer.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-more.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-note.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-playstore.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-printer.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-promotion.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-reminder.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-remove.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-search.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-send.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-settings.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-share.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-social-user.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-social.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-sort.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-stair-drawer.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-star.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-stopwatch.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-storage.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-system-back.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-system-home.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-system-windows.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-timer.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-trash.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-user-menu.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-volume.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/android-wifi.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/aperture.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/archive.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/arrow-down-a.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/arrow-down-b.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/arrow-down-c.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/arrow-expand.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/arrow-graph-down-left.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/arrow-graph-down-right.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/arrow-graph-up-left.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/arrow-graph-up-right.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/arrow-left-a.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/arrow-left-b.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/arrow-left-c.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/arrow-move.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/arrow-resize.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/arrow-return-left.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/arrow-return-right.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/arrow-right-a.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/arrow-right-b.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/arrow-right-c.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/arrow-shrink.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/arrow-swap.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/arrow-up-a.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/arrow-up-b.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/arrow-up-c.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/asterisk.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/at.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/bag.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/battery-charging.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/battery-empty.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/battery-full.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/battery-half.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/battery-low.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/beaker.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/beer.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/bluetooth.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/bonfire.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/bookmark.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/briefcase.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/bug.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/calculator.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/calendar.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/camera.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/card.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/cash.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/chatbox-working.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/chatbox.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/chatboxes.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/chatbubble-working.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/chatbubble.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/chatbubbles.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/checkmark-circled.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/checkmark-round.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/checkmark.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/chevron-down.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/chevron-left.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/chevron-right.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/chevron-up.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/clipboard.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/clock.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/close-circled.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/close-round.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/close.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/closed-captioning.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/cloud.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/code-download.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/code-working.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/code.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/coffee.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/compass.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/compose.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/connection-bars.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/contrast.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/cube.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/disc.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/document-text.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/document.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/drag.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/earth.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/edit.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/egg.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/eject.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/email.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/eye-disabled.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/eye.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/female.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/filing.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/film-marker.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/fireball.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/flag.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/flame.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/flash-off.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/flash.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/flask.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/folder.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/fork-repo.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/fork.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/forward.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/funnel.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/game-controller-a.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/game-controller-b.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/gear-a.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/gear-b.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/grid.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/hammer.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/happy.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/headphone.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/heart-broken.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/heart.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/help-buoy.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/help-circled.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/help.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/home.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/icecream.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/icon-social-google-plus-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/icon-social-google-plus.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/image.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/images.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/information-circled.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/information.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ionic.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-alarm-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-alarm.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-albums-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-albums.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-americanfootball-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-americanfootball.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-analytics-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-analytics.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-arrow-back.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-arrow-down.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-arrow-forward.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-arrow-left.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-arrow-right.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-arrow-thin-down.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-arrow-thin-left.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-arrow-thin-right.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-arrow-thin-up.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-arrow-up.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-at-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-at.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-barcode-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-barcode.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-baseball-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-baseball.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-basketball-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-basketball.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-bell-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-bell.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-bolt-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-bolt.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-bookmarks-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-bookmarks.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-box-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-box.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-briefcase-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-briefcase.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-browsers-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-browsers.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-calculator-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-calculator.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-calendar-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-calendar.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-camera-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-camera.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-cart-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-cart.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-chatboxes-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-chatboxes.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-chatbubble-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-chatbubble.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-checkmark-empty.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-checkmark-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-checkmark.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-circle-filled.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-circle-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-clock-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-clock.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-close-empty.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-close-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-close.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-cloud-download-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-cloud-download.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-cloud-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-cloud-upload-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-cloud-upload.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-cloud.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-cloudy-night-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-cloudy-night.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-cloudy-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-cloudy.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-cog-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-cog.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-compose-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-compose.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-contact-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-contact.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-copy-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-copy.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-download-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-download.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-drag.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-email-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-email.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-expand.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-eye-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-eye.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-fastforward-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-fastforward.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-filing-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-filing.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-film-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-film.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-flag-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-flag.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-folder-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-folder.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-football-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-football.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-gear-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-gear.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-glasses-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-glasses.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-heart-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-heart.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-help-empty.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-help-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-help.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-home-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-home.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-infinite-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-infinite.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-information-empty.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-information-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-information.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-ionic-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-keypad-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-keypad.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-lightbulb-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-lightbulb.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-location-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-location.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-locked-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-locked.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-loop-strong.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-loop.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-medkit-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-medkit.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-mic-off.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-mic-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-mic.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-minus-empty.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-minus-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-minus.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-monitor-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-monitor.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-moon-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-moon.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-more-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-more.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-musical-note.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-musical-notes.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-navigate-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-navigate.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-paper-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-paper.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-paperplane-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-paperplane.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-partlysunny-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-partlysunny.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-pause-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-pause.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-paw-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-paw.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-people-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-people.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-person-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-person.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-personadd-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-personadd.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-photos-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-photos.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-pie-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-pie.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-play-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-play.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-plus-empty.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-plus-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-plus.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-pricetag-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-pricetag.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-pricetags-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-pricetags.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-printer-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-printer.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-pulse-strong.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-pulse.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-rainy-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-rainy.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-recording-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-recording.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-redo-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-redo.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-refresh-empty.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-refresh-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-refresh.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-reload.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-reverse-camera-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-reverse-camera.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-rewind-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-rewind.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-search-strong.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-search.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-settings-strong.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-settings.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-shrink.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-skipbackward-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-skipbackward.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-skipforward-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-skipforward.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-snowy.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-speedometer-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-speedometer.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-star-half.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-star-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-star.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-stopwatch-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-stopwatch.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-sunny-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-sunny.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-telephone-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-telephone.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-tennisball-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-tennisball.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-thunderstorm-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-thunderstorm.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-time-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-time.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-timer-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-timer.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-toggle-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-toggle.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-trash-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-trash.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-undo-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-undo.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-unlocked-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-unlocked.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-upload-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-upload.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-videocam-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-videocam.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-volume-high.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-volume-low.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-wineglass-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-wineglass.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-world-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ios7-world.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ipad.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/iphone.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ipod.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/jet.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/key.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/knife.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/laptop.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/leaf.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/levels.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/lightbulb.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/link.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/load-a.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/load-b.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/load-c.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/load-d.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/location.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/locked.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/log-in.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/log-out.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/loop.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/magnet.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/male.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/man.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/map.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/medkit.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/merge.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/mic-a.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/mic-b.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/mic-c.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/minus-circled.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/minus-round.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/minus.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/model-s.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/monitor.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/more.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/mouse.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/music-note.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/navicon-round.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/navicon.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/navigate.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/network.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/no-smoking.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/nuclear.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/outlet.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/paper-airplane.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/paperclip.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/pause.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/person-add.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/person-stalker.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/person.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/pie-graph.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/pin.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/pinpoint.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/pizza.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/plane.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/planet.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/play.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/playstation.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/plus-circled.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/plus-round.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/plus.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/podium.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/pound.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/power.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/pricetag.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/pricetags.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/printer.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/pull-request.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/qr-scanner.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/quote.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/radio-waves.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/record.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/refresh.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/reply-all.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/reply.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ribbon-a.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/ribbon-b.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/sad.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/scissors.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/search.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/settings.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/share.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/shuffle.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/skip-backward.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/skip-forward.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-android-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-android.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-apple-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-apple.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-bitcoin-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-bitcoin.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-buffer-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-buffer.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-designernews-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-designernews.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-dribbble-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-dribbble.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-dropbox-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-dropbox.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-facebook-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-facebook.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-foursquare-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-foursquare.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-freebsd-devil.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-github-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-github.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-google-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-google.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-googleplus-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-googleplus.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-hackernews-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-hackernews.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-instagram-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-instagram.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-linkedin-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-linkedin.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-pinterest-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-pinterest.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-reddit-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-reddit.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-rss-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-rss.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-skype-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-skype.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-tumblr-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-tumblr.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-tux.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-twitter-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-twitter.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-usd-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-usd.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-vimeo-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-vimeo.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-windows-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-windows.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-wordpress-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-wordpress.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-yahoo-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-yahoo.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-youtube-outline.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/social-youtube.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/speakerphone.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/speedometer.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/spoon.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/star.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/stats-bars.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/steam.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/stop.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/thermometer.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/thumbsdown.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/thumbsup.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/toggle-filled.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/toggle.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/trash-a.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/trash-b.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/trophy.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/umbrella.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/university.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/unlocked.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/upload.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/usb.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/videocamera.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/volume-high.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/volume-low.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/volume-medium.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/volume-mute.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/wand.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/waterdrop.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/wifi.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/wineglass.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/woman.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/wrench.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/png/512/xbox.png delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/readme.md delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/scss/_ionicons-font.scss delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/scss/_ionicons-icons.scss delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/scss/_ionicons-variables.scss delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/scss/ionicons.scss delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/alert-circled.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/alert.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-add-circle.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-add.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-alarm-clock.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-alert.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-apps.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-archive.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-arrow-back.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-arrow-down.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-arrow-dropdown-circle.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-arrow-dropdown.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-arrow-dropleft-circle.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-arrow-dropleft.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-arrow-dropright-circle.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-arrow-dropright.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-arrow-dropup-circle.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-arrow-dropup.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-arrow-forward.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-arrow-up.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-attach.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-bar.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-bicycle.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-boat.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-bookmark.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-bulb.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-bus.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-calendar.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-call.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-camera.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-cancel.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-car.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-cart.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-chat.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-checkbox-blank.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-checkbox-outline-blank.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-checkbox-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-checkbox.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-checkmark-circle.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-clipboard.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-close.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-cloud-circle.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-cloud-done.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-cloud-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-cloud.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-color-palette.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-compass.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-contact.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-contacts.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-contract.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-create.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-delete.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-desktop.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-document.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-done-all.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-done.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-download.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-drafts.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-exit.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-expand.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-favorite-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-favorite.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-film.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-folder-open.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-folder.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-funnel.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-globe.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-hand.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-hangout.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-happy.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-home.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-image.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-laptop.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-list.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-locate.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-lock.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-mail.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-map.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-menu.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-microphone-off.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-microphone.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-more-horizontal.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-more-vertical.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-navigate.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-notifications-none.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-notifications-off.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-notifications.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-open.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-options.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-people.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-person-add.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-person.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-phone-landscape.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-phone-portrait.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-pin.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-plane.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-playstore.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-print.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-radio-button-off.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-radio-button-on.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-refresh.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-remove-circle.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-remove.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-restaurant.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-sad.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-search.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-send.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-settings.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-share-alt.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-share.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-star-half.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-star-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-star.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-stopwatch.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-subway.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-sunny.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-sync.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-textsms.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-time.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-train.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-unlock.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-upload.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-volume-down.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-volume-mute.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-volume-off.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-volume-up.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-walk.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-warning.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-watch.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/android-wifi.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/aperture.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/archive.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/arrow-down-a.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/arrow-down-b.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/arrow-down-c.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/arrow-expand.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/arrow-graph-down-left.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/arrow-graph-down-right.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/arrow-graph-up-left.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/arrow-graph-up-right.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/arrow-left-a.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/arrow-left-b.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/arrow-left-c.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/arrow-move.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/arrow-resize.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/arrow-return-left.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/arrow-return-right.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/arrow-right-a.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/arrow-right-b.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/arrow-right-c.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/arrow-shrink.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/arrow-swap.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/arrow-up-a.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/arrow-up-b.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/arrow-up-c.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/asterisk.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/at.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/backspace-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/backspace.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/bag.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/battery-charging.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/battery-empty.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/battery-full.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/battery-half.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/battery-low.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/beaker.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/beer.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/bluetooth.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/bonfire.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/bookmark.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/bowtie.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/briefcase.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/bug.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/calculator.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/calendar.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/camera.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/card.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/cash.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/chatbox-working.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/chatbox.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/chatboxes.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/chatbubble-working.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/chatbubble.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/chatbubbles.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/checkmark-circled.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/checkmark-round.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/checkmark.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/chevron-down.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/chevron-left.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/chevron-right.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/chevron-up.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/clipboard.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/clock.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/close-circled.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/close-round.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/close.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/closed-captioning.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/cloud.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/code-download.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/code-working.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/code.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/coffee.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/compass.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/compose.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/connection-bars.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/contrast.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/crop.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/cube.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/disc.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/document-text.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/document.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/drag.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/earth.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/easel.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/edit.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/egg.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/eject.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/email-unread.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/email.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/erlenmeyer-flask-bubbles.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/erlenmeyer-flask.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/eye-disabled.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/eye.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/female.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/filing.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/film-marker.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/fireball.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/flag.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/flame.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/flash-off.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/flash.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/folder.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/fork-repo.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/fork.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/forward.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/funnel.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/gear-a.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/gear-b.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/grid.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/hammer.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/happy-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/happy.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/headphone.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/heart-broken.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/heart.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/help-buoy.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/help-circled.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/help.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/home.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/icecream.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/image.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/images.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/information-circled.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/information.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ionic.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-alarm-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-alarm.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-albums-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-albums.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-americanfootball-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-americanfootball.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-analytics-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-analytics.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-arrow-back.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-arrow-down.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-arrow-forward.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-arrow-left.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-arrow-right.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-arrow-thin-down.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-arrow-thin-left.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-arrow-thin-right.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-arrow-thin-up.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-arrow-up.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-at-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-at.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-barcode-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-barcode.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-baseball-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-baseball.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-basketball-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-basketball.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-bell-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-bell.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-body-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-body.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-bolt-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-bolt.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-book-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-book.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-bookmarks-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-bookmarks.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-box-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-box.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-briefcase-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-briefcase.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-browsers-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-browsers.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-calculator-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-calculator.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-calendar-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-calendar.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-camera-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-camera.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-cart-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-cart.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-chatboxes-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-chatboxes.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-chatbubble-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-chatbubble.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-checkmark-empty.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-checkmark-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-checkmark.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-circle-filled.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-circle-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-clock-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-clock.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-close-empty.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-close-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-close.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-cloud-download-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-cloud-download.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-cloud-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-cloud-upload-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-cloud-upload.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-cloud.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-cloudy-night-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-cloudy-night.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-cloudy-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-cloudy.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-cog-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-cog.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-color-filter-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-color-filter.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-color-wand-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-color-wand.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-compose-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-compose.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-contact-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-contact.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-copy-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-copy.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-crop-strong.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-crop.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-download-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-download.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-drag.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-email-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-email.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-eye-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-eye.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-fastforward-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-fastforward.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-filing-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-filing.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-film-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-film.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-flag-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-flag.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-flame-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-flame.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-flask-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-flask.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-flower-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-flower.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-folder-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-folder.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-football-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-football.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-game-controller-a-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-game-controller-a.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-game-controller-b-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-game-controller-b.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-gear-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-gear.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-glasses-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-glasses.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-grid-view-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-grid-view.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-heart-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-heart.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-help-empty.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-help-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-help.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-home-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-home.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-infinite-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-infinite.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-information-empty.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-information-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-information.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-ionic-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-keypad-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-keypad.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-lightbulb-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-lightbulb.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-list-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-list.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-location-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-location.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-locked-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-locked.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-loop-strong.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-loop.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-medical-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-medical.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-medkit-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-medkit.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-mic-off.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-mic-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-mic.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-minus-empty.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-minus-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-minus.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-monitor-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-monitor.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-moon-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-moon.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-more-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-more.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-musical-note.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-musical-notes.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-navigate-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-navigate.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-nutrition-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-nutrition.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-paper-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-paper.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-paperplane-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-paperplane.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-partlysunny-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-partlysunny.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-pause-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-pause.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-paw-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-paw.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-people-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-people.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-person-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-person.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-personadd-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-personadd.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-photos-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-photos.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-pie-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-pie.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-pint-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-pint.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-play-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-play.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-plus-empty.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-plus-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-plus.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-pricetag-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-pricetag.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-pricetags-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-pricetags.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-printer-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-printer.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-pulse-strong.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-pulse.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-rainy-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-rainy.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-recording-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-recording.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-redo-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-redo.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-refresh-empty.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-refresh-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-refresh.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-reload.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-reverse-camera-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-reverse-camera.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-rewind-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-rewind.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-rose-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-rose.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-search-strong.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-search.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-settings-strong.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-settings.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-shuffle-strong.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-shuffle.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-skipbackward-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-skipbackward.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-skipforward-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-skipforward.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-snowy.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-speedometer-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-speedometer.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-star-half.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-star-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-star.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-stopwatch-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-stopwatch.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-sunny-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-sunny.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-telephone-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-telephone.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-tennisball-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-tennisball.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-thunderstorm-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-thunderstorm.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-time-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-time.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-timer-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-timer.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-toggle-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-toggle.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-trash-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-trash.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-undo-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-undo.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-unlocked-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-unlocked.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-upload-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-upload.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-videocam-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-videocam.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-volume-high.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-volume-low.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-wineglass-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-wineglass.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-world-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ios-world.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ipad.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/iphone.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ipod.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/jet.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/key.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/knife.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/laptop.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/leaf.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/levels.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/lightbulb.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/link.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/load-a.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/load-b.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/load-c.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/load-d.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/location.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/lock-combination.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/locked.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/log-in.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/log-out.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/loop.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/magnet.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/male.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/man.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/map.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/medkit.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/merge.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/mic-a.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/mic-b.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/mic-c.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/minus-circled.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/minus-round.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/minus.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/model-s.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/monitor.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/more.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/mouse.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/music-note.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/navicon-round.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/navicon.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/navigate.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/network.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/no-smoking.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/nuclear.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/outlet.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/paintbrush.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/paintbucket.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/paper-airplane.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/paperclip.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/pause.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/person-add.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/person-stalker.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/person.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/pie-graph.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/pin.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/pinpoint.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/pizza.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/plane.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/planet.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/play.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/playstation.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/plus-circled.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/plus-round.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/plus.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/podium.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/pound.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/power.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/pricetag.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/pricetags.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/printer.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/pull-request.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/qr-scanner.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/quote.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/radio-waves.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/record.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/refresh.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/reply-all.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/reply.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ribbon-a.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/ribbon-b.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/sad-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/sad.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/scissors.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/search.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/settings.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/share.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/shuffle.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/skip-backward.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/skip-forward.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-android-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-android.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-angular-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-angular.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-apple-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-apple.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-bitcoin-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-bitcoin.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-buffer-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-buffer.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-chrome-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-chrome.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-codepen-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-codepen.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-css3-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-css3.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-designernews-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-designernews.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-dribbble-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-dribbble.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-dropbox-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-dropbox.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-euro-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-euro.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-facebook-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-facebook.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-foursquare-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-foursquare.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-freebsd-devil.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-github-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-github.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-google-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-google.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-googleplus-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-googleplus.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-hackernews-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-hackernews.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-html5-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-html5.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-instagram-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-instagram.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-javascript-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-javascript.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-linkedin-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-linkedin.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-markdown.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-nodejs.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-octocat.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-pinterest-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-pinterest.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-python.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-reddit-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-reddit.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-rss-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-rss.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-sass.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-skype-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-skype.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-snapchat-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-snapchat.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-tumblr-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-tumblr.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-tux.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-twitch-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-twitch.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-twitter-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-twitter.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-usd-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-usd.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-vimeo-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-vimeo.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-whatsapp-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-whatsapp.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-windows-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-windows.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-wordpress-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-wordpress.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-yahoo-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-yahoo.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-yen-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-yen.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-youtube-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/social-youtube.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/soup-can-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/soup-can.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/speakerphone.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/speedometer.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/spoon.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/star.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/stats-bars.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/steam.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/stop.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/thermometer.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/thumbsdown.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/thumbsup.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/toggle-filled.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/toggle.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/transgender.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/trash-a.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/trash-b.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/trophy.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/tshirt-outline.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/tshirt.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/umbrella.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/university.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/unlocked.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/upload.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/usb.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/videocamera.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/volume-high.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/volume-low.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/volume-medium.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/volume-mute.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/wand.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/waterdrop.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/wifi.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/wineglass.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/woman.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/wrench.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/ionicons-2.0.1/src/xbox.svg delete mode 100644 vid/src/main/webapp/app/fusion/external/utils/js/browserCheck.js delete mode 100644 vid/src/main/webapp/app/fusion/images/Thumbs.db delete mode 100644 vid/src/main/webapp/app/fusion/images/panel-e-w-toggle.png delete mode 100644 vid/src/main/webapp/app/fusion/images/panel-n-s-toggle.png delete mode 100644 vid/src/main/webapp/app/fusion/notebook-integration/scripts/controllers/nbook-framecontroller.js delete mode 100644 vid/src/main/webapp/app/fusion/notebook-integration/scripts/controllers/nbookController.js delete mode 100644 vid/src/main/webapp/app/fusion/notebook-integration/scripts/controllers/notebookFrameController.js delete mode 100644 vid/src/main/webapp/app/fusion/notebook-integration/scripts/dependency/angular.js delete mode 100644 vid/src/main/webapp/app/fusion/notebook-integration/scripts/view-models/notebook-frame.html delete mode 100644 vid/src/main/webapp/app/fusion/notebook-integration/scripts/view-models/notebook-viz.html delete mode 100644 vid/src/main/webapp/app/fusion/notebook-integration/scripts/view-models/notebook.htm delete mode 100644 vid/src/main/webapp/app/fusion/notebook-integration/scripts/view-models/notebookInputs.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/att_angular_gridster/angular-gridster.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/att_angular_gridster/ui-gridster-tpls.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/controllers/adminController.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/controllers/admin_menu_edit.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/controllers/ase-controller.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/controllers/broadcast-controller.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/controllers/broadcast-list-controller.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/controllers/collaborate-list-controller.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/controllers/fn_menu_add_popup_controller.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/controllers/jcs-admin-controller.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/controllers/modelpopupController.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/controllers/post-search-controller.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/controllers/profile-controller.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/controllers/profile-search-controller.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/controllers/profileController.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/controllers/role-controller.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/controllers/role-function-list-controller.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/controllers/role-list-controller.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/controllers/rolefunctionpopupController.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/controllers/rolepopupmodelController.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/controllers/self-profile-controller.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/controllers/usage-list-controller.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/controllers/workflows/workflowApp.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/controllers/workflows/workflowController.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/controllers/workflows/workflowRouting.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/directives/footer.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/directives/header.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/directives/leftMenu.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/jquery.resize.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/layout/debug.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/layout/jquery-latest.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/layout/jquery-ui-latest.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/layout/jquery.layout-latest.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/modalService.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/moment.min.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/services/adminService.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/services/headerService.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/services/leftMenuService.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/services/profileService.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/services/userInfoService.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/socket/peerBroadcast.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/utils/dummy.txt delete mode 100644 vid/src/main/webapp/app/fusion/scripts/utils/page-resource.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/utils/sandbox-resources.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/admin-page/admin.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/admin-page/profile.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/dummy.txt delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/footer.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/header.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/left_menu.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/admin_menu_edit.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/broadcast.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/broadcast_list.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/collaborate_list.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/jcs_admin.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/popup_modal.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/popup_modal_fn_menu_add.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/popup_modal_fn_menu_edit.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/popup_modal_role.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/popup_modal_rolefunction.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/post_search.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/profile_detail.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/profile_search.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/role.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/role_function_list.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/role_list.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/self_profile.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/usage_list.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/workflows/workflow-landing.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/workflows/workflow-listing.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/workflows/workflow-new.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/workflows/workflow-preview.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/workflows/workflow-remove.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/view-models/workflows/workflow-schedule.html delete mode 100644 vid/src/main/webapp/app/fusion/scripts/webrtc/RTCMultiConnection.js delete mode 100644 vid/src/main/webapp/app/fusion/scripts/webrtc/getSourceId.html delete mode 100644 vid/src/main/webapp/app/fusion/styles/att_angular_gridster/sandbox-gridster.css delete mode 100644 vid/src/main/webapp/app/fusion/styles/att_angular_gridster/ui-gridster.css delete mode 100644 vid/src/main/webapp/app/fusion/styles/fusion-sunny.css delete mode 100644 vid/src/main/webapp/app/fusion/styles/jquery-ui.css delete mode 100644 vid/src/main/webapp/app/fusion/styles/layout/layout-default-latest.css delete mode 100644 vid/src/main/webapp/app/fusion/styles/workflows/workflows.css delete mode 100644 vid/src/main/webapp/app/vid/drools/controller/drools-list-controller.js delete mode 100644 vid/src/main/webapp/app/vid/drools/controller/drools-view-controller.js delete mode 100644 vid/src/main/webapp/app/vid/drools/controller/droolsController.js delete mode 100644 vid/src/main/webapp/app/vid/drools/controller/dummy.txt delete mode 100644 vid/src/main/webapp/app/vid/drools/directives/dummy.txt delete mode 100644 vid/src/main/webapp/app/vid/drools/services/droolsService.js delete mode 100644 vid/src/main/webapp/app/vid/drools/utils/dummy.txt delete mode 100644 vid/src/main/webapp/app/vid/drools/view-models/droolsList.html delete mode 100644 vid/src/main/webapp/app/vid/drools/view-models/droolsSinglePage.html delete mode 100644 vid/src/main/webapp/app/vid/drools/view-models/droolsView.html delete mode 100644 vid/src/main/webapp/app/vid/drools/view-models/dummy.txt delete mode 100644 vid/src/main/webapp/app/vid/external/bootstrap/css/bootstrap-theme.css delete mode 100644 vid/src/main/webapp/app/vid/external/bootstrap/css/bootstrap-theme.min.css delete mode 100644 vid/src/main/webapp/app/vid/external/bootstrap/css/bootstrap.css delete mode 100644 vid/src/main/webapp/app/vid/external/bootstrap/css/bootstrap.min.css delete mode 100644 vid/src/main/webapp/app/vid/external/bootstrap/fonts/glyphicons-halflings-regular.svg delete mode 100644 vid/src/main/webapp/app/vid/external/bootstrap/fonts/glyphicons-halflings-regular.woff delete mode 100644 vid/src/main/webapp/app/vid/external/bootstrap/js/bootstrap.js delete mode 100644 vid/src/main/webapp/app/vid/external/bootstrap/js/bootstrap.min.js delete mode 100644 vid/src/main/webapp/app/vid/external/dummy.txt delete mode 100644 vid/src/main/webapp/app/vid/fonts/dummy.txt delete mode 100644 vid/src/main/webapp/app/vid/images/dummy.txt delete mode 100644 vid/src/main/webapp/app/vid/scripts/angular-ui-tree.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/constants/componentConstants.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/constants/fieldConstants.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/constants/parameterConstants.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/controller/InstantiationController.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/controller/VidApp.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/controller/creationDialogController.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/controller/deletionDialogController.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/controller/detailsDialogController.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/controller/dummy.txt delete mode 100644 vid/src/main/webapp/app/vid/scripts/controller/msoCommitController.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/controller/sample-page-controller.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/controller/sample-page-iframe-controller.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/controller/sampleController.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/controller/subscriberSearch.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/directives/dummy.txt delete mode 100644 vid/src/main/webapp/app/vid/scripts/directives/extensionsDirective.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/directives/parameterBlockDirective.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/directives/popupWindowDirective.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/directives/progressBarDirective.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/services/aaiService.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/services/asdcService.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/services/componentService.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/services/creationService.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/services/dataService.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/services/deletionService.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/services/detailsService.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/services/msoService.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/services/propertyService.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/services/utilityService.js delete mode 100644 vid/src/main/webapp/app/vid/scripts/utils/dummy.txt delete mode 100644 vid/src/main/webapp/app/vid/scripts/view-models/aaiGetSubs.htm delete mode 100644 vid/src/main/webapp/app/vid/scripts/view-models/aaiSubDetails.htm delete mode 100644 vid/src/main/webapp/app/vid/scripts/view-models/aaiSubViewEdit.htm delete mode 100644 vid/src/main/webapp/app/vid/scripts/view-models/creationDialog.htm delete mode 100644 vid/src/main/webapp/app/vid/scripts/view-models/deletionDialog.htm delete mode 100644 vid/src/main/webapp/app/vid/scripts/view-models/detailsDialog.htm delete mode 100644 vid/src/main/webapp/app/vid/scripts/view-models/dummy.txt delete mode 100644 vid/src/main/webapp/app/vid/scripts/view-models/instantiate.htm delete mode 100644 vid/src/main/webapp/app/vid/scripts/view-models/msoCommit.htm delete mode 100644 vid/src/main/webapp/app/vid/scripts/view-models/popupWindow.htm delete mode 100644 vid/src/main/webapp/app/vid/scripts/view-models/sample.html delete mode 100644 vid/src/main/webapp/app/vid/scripts/view-models/sampleWithIframe.html delete mode 100644 vid/src/main/webapp/app/vid/scripts/view-models/serviceModels.htm delete mode 100644 vid/src/main/webapp/app/vid/scripts/view-models/singlePageSample.html delete mode 100644 vid/src/main/webapp/app/vid/scripts/view-models/vidhome.htm delete mode 100644 vid/src/main/webapp/app/vid/styles/aaiGetSubs.css delete mode 100644 vid/src/main/webapp/app/vid/styles/aaiSubDetails.css delete mode 100644 vid/src/main/webapp/app/vid/styles/aaiSubViewEdit.css delete mode 100644 vid/src/main/webapp/app/vid/styles/angular-ui-tree.css delete mode 100644 vid/src/main/webapp/app/vid/styles/dialogs.css delete mode 100644 vid/src/main/webapp/app/vid/styles/dummy.txt delete mode 100644 vid/src/main/webapp/app/vid/styles/instantiate.css delete mode 100644 vid/src/main/webapp/app/vid/styles/serviceModels.css delete mode 100644 vid/src/main/webapp/app/vid/styles/subscriberSearch.css delete mode 100644 vid/src/main/webapp/app/vid/styles/vidTree.css delete mode 100644 vid/src/main/webapp/app/vid/test/testAaiData.js delete mode 100644 vid/src/main/webapp/app/vid/test/testMso.css delete mode 100644 vid/src/main/webapp/app/vid/test/testMso.js delete mode 100644 vid/src/main/webapp/app/vid/test/testViewEdit.css delete mode 100644 vid/src/main/webapp/app/vid/test/testViewEdit.js delete mode 100644 vid/src/main/webapp/index.jsp delete mode 100644 vid/src/main/webapp/manifest.jsp delete mode 100644 vid/src/main/webapp/static/fusion/css/att_angular_gridster/sandbox-gridster.css delete mode 100644 vid/src/main/webapp/static/fusion/css/att_angular_gridster/ui-gridster.css delete mode 100644 vid/src/main/webapp/static/fusion/css/bootstrap.min.css delete mode 100644 vid/src/main/webapp/static/fusion/css/fusion-sunny.css delete mode 100644 vid/src/main/webapp/static/fusion/css/jquery-ui.css delete mode 100644 vid/src/main/webapp/static/fusion/css/layout/layout-default-latest.css delete mode 100644 vid/src/main/webapp/static/fusion/gis/js/local.js delete mode 100644 vid/src/main/webapp/static/fusion/images/Rlogo.jpg delete mode 100644 vid/src/main/webapp/static/fusion/images/Thumbs.db delete mode 100644 vid/src/main/webapp/static/fusion/images/action_icon.png delete mode 100644 vid/src/main/webapp/static/fusion/images/action_list_spacer.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/active.png delete mode 100644 vid/src/main/webapp/static/fusion/images/add.png delete mode 100644 vid/src/main/webapp/static/fusion/images/add_tool_button.png delete mode 100644 vid/src/main/webapp/static/fusion/images/addicon.png delete mode 100644 vid/src/main/webapp/static/fusion/images/application_window_bg.jpg delete mode 100644 vid/src/main/webapp/static/fusion/images/arrow-next.png delete mode 100644 vid/src/main/webapp/static/fusion/images/arrow-prev.png delete mode 100644 vid/src/main/webapp/static/fusion/images/att_angular_gridster/grips.png delete mode 100644 vid/src/main/webapp/static/fusion/images/backButton.png delete mode 100644 vid/src/main/webapp/static/fusion/images/blank.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/blueButton.png delete mode 100644 vid/src/main/webapp/static/fusion/images/bubble.png delete mode 100644 vid/src/main/webapp/static/fusion/images/cache.png delete mode 100644 vid/src/main/webapp/static/fusion/images/calendar.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/chevron.png delete mode 100644 vid/src/main/webapp/static/fusion/images/close_container.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/collapsed-icon.png delete mode 100644 vid/src/main/webapp/static/fusion/images/column-bg.png delete mode 100644 vid/src/main/webapp/static/fusion/images/copyicon-highlighted.png delete mode 100644 vid/src/main/webapp/static/fusion/images/copyicon.png delete mode 100644 vid/src/main/webapp/static/fusion/images/csv_icon.jpg delete mode 100644 vid/src/main/webapp/static/fusion/images/csv_icon.png delete mode 100644 vid/src/main/webapp/static/fusion/images/customers-add.png delete mode 100644 vid/src/main/webapp/static/fusion/images/customers-search.png delete mode 100644 vid/src/main/webapp/static/fusion/images/customers.png delete mode 100644 vid/src/main/webapp/static/fusion/images/decrypted.png delete mode 100644 vid/src/main/webapp/static/fusion/images/deleteicon-highlighted.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/deleteicon-highlighted.png delete mode 100644 vid/src/main/webapp/static/fusion/images/deleteicon.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/editicon.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/error_type.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/example-frame.png delete mode 100644 vid/src/main/webapp/static/fusion/images/excelicon_multi.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/executeicon.png delete mode 100644 vid/src/main/webapp/static/fusion/images/expanded-icon.png delete mode 100644 vid/src/main/webapp/static/fusion/images/file-add.png delete mode 100644 vid/src/main/webapp/static/fusion/images/file_import.png delete mode 100644 vid/src/main/webapp/static/fusion/images/file_save-all.png delete mode 100644 vid/src/main/webapp/static/fusion/images/filter_icon.png delete mode 100644 vid/src/main/webapp/static/fusion/images/folder_add.png delete mode 100644 vid/src/main/webapp/static/fusion/images/folder_closed.png delete mode 100644 vid/src/main/webapp/static/fusion/images/folder_delete.png delete mode 100644 vid/src/main/webapp/static/fusion/images/folder_edit.png delete mode 100644 vid/src/main/webapp/static/fusion/images/folder_open.png delete mode 100644 vid/src/main/webapp/static/fusion/images/folder_user.png delete mode 100644 vid/src/main/webapp/static/fusion/images/funnel.png delete mode 100644 vid/src/main/webapp/static/fusion/images/fusion.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/grayButton.png delete mode 100644 vid/src/main/webapp/static/fusion/images/gray_add_tool_button.png delete mode 100644 vid/src/main/webapp/static/fusion/images/headerChatIcon.png delete mode 100644 vid/src/main/webapp/static/fusion/images/icon_remove_all.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/inactive.png delete mode 100644 vid/src/main/webapp/static/fusion/images/info_type.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/layout/panel-e-w-toggle.png delete mode 100644 vid/src/main/webapp/static/fusion/images/layout/panel-n-s-toggle.png delete mode 100644 vid/src/main/webapp/static/fusion/images/leftButton.png delete mode 100644 vid/src/main/webapp/static/fusion/images/loading.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/loading_bar.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/login_button.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/m1.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/mail.png delete mode 100644 vid/src/main/webapp/static/fusion/images/map.png delete mode 100644 vid/src/main/webapp/static/fusion/images/menu/bubble.png delete mode 100644 vid/src/main/webapp/static/fusion/images/menu/file_import.png delete mode 100644 vid/src/main/webapp/static/fusion/images/menu/file_save-all.png delete mode 100644 vid/src/main/webapp/static/fusion/images/menu/mail.png delete mode 100644 vid/src/main/webapp/static/fusion/images/menu/profile.png delete mode 100644 vid/src/main/webapp/static/fusion/images/menu/speechbubble.png delete mode 100644 vid/src/main/webapp/static/fusion/images/menu/users.png delete mode 100644 vid/src/main/webapp/static/fusion/images/minus.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/mobile_logo_att_header_black.png delete mode 100644 vid/src/main/webapp/static/fusion/images/mobile_logo_att_header_grey.png delete mode 100644 vid/src/main/webapp/static/fusion/images/mobile_logo_att_header_horizontal.png delete mode 100644 vid/src/main/webapp/static/fusion/images/mobile_logo_att_header_white.png delete mode 100644 vid/src/main/webapp/static/fusion/images/modify_icon.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/note-add.png delete mode 100644 vid/src/main/webapp/static/fusion/images/note-search.png delete mode 100644 vid/src/main/webapp/static/fusion/images/note.png delete mode 100644 vid/src/main/webapp/static/fusion/images/notes.png delete mode 100644 vid/src/main/webapp/static/fusion/images/offline.png delete mode 100644 vid/src/main/webapp/static/fusion/images/offlineMsg.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/online.png delete mode 100644 vid/src/main/webapp/static/fusion/images/page.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/pagination.png delete mode 100644 vid/src/main/webapp/static/fusion/images/panel-e-w-toggle.png delete mode 100644 vid/src/main/webapp/static/fusion/images/panel-n-s-toggle.png delete mode 100644 vid/src/main/webapp/static/fusion/images/pix.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/plus.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/plus.png delete mode 100644 vid/src/main/webapp/static/fusion/images/printer.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/profile.png delete mode 100644 vid/src/main/webapp/static/fusion/images/refresh.jpg delete mode 100644 vid/src/main/webapp/static/fusion/images/report-add.png delete mode 100644 vid/src/main/webapp/static/fusion/images/report-favorite.png delete mode 100644 vid/src/main/webapp/static/fusion/images/report-my.png delete mode 100644 vid/src/main/webapp/static/fusion/images/report-public.png delete mode 100644 vid/src/main/webapp/static/fusion/images/report.png delete mode 100644 vid/src/main/webapp/static/fusion/images/reports.png delete mode 100644 vid/src/main/webapp/static/fusion/images/results-first-active.png delete mode 100644 vid/src/main/webapp/static/fusion/images/results-first-disabled.png delete mode 100644 vid/src/main/webapp/static/fusion/images/results-last-active.png delete mode 100644 vid/src/main/webapp/static/fusion/images/results-last-disabled.png delete mode 100644 vid/src/main/webapp/static/fusion/images/results-next-active.png delete mode 100644 vid/src/main/webapp/static/fusion/images/results-next-disabled.png delete mode 100644 vid/src/main/webapp/static/fusion/images/results-prev-active.png delete mode 100644 vid/src/main/webapp/static/fusion/images/results-prev-disabled.png delete mode 100644 vid/src/main/webapp/static/fusion/images/resultset_last.png delete mode 100644 vid/src/main/webapp/static/fusion/images/resultset_previous.png delete mode 100644 vid/src/main/webapp/static/fusion/images/return_to_top.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/rightButton.png delete mode 100644 vid/src/main/webapp/static/fusion/images/search.png delete mode 100644 vid/src/main/webapp/static/fusion/images/search_profile.png delete mode 100644 vid/src/main/webapp/static/fusion/images/sort_asc.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/sort_desc.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/spacer.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/success_type.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/swoosh.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/tab-hm.png delete mode 100644 vid/src/main/webapp/static/fusion/images/tab-v-hm.png delete mode 100644 vid/src/main/webapp/static/fusion/images/tab.png delete mode 100644 vid/src/main/webapp/static/fusion/images/table-add.png delete mode 100644 vid/src/main/webapp/static/fusion/images/table-delete.png delete mode 100644 vid/src/main/webapp/static/fusion/images/table-edit.png delete mode 100644 vid/src/main/webapp/static/fusion/images/table.png delete mode 100644 vid/src/main/webapp/static/fusion/images/tabs-bg.png delete mode 100644 vid/src/main/webapp/static/fusion/images/toolButton.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/toolButton.png delete mode 100644 vid/src/main/webapp/static/fusion/images/toolbar.png delete mode 100644 vid/src/main/webapp/static/fusion/images/users.png delete mode 100644 vid/src/main/webapp/static/fusion/images/warning_type.gif delete mode 100644 vid/src/main/webapp/static/fusion/images/webphone.ico delete mode 100644 vid/src/main/webapp/static/fusion/images/whiteButton.png delete mode 100644 vid/src/main/webapp/static/fusion/js/att_angular_gridster/angular-gridster.js delete mode 100644 vid/src/main/webapp/static/fusion/js/att_angular_gridster/ui-gridster-tpls.js delete mode 100644 vid/src/main/webapp/static/fusion/js/jquery.resize.js delete mode 100644 vid/src/main/webapp/static/fusion/js/layout/debug.js delete mode 100644 vid/src/main/webapp/static/fusion/js/layout/jquery-latest.js delete mode 100644 vid/src/main/webapp/static/fusion/js/layout/jquery-ui-latest.js delete mode 100644 vid/src/main/webapp/static/fusion/js/layout/jquery.layout-latest.js delete mode 100644 vid/src/main/webapp/static/fusion/js/moment.min.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/css/Style.css delete mode 100644 vid/src/main/webapp/static/fusion/raptor/css/bd_quantum_raptor.css delete mode 100644 vid/src/main/webapp/static/fusion/raptor/css/calendar.css delete mode 100644 vid/src/main/webapp/static/fusion/raptor/css/dashboard.css delete mode 100644 vid/src/main/webapp/static/fusion/raptor/css/drupal.css delete mode 100644 vid/src/main/webapp/static/fusion/raptor/css/form-field-tooltip.css delete mode 100644 vid/src/main/webapp/static/fusion/raptor/css/mobile_raptor.css delete mode 100644 vid/src/main/webapp/static/fusion/raptor/css/novamap.css delete mode 100644 vid/src/main/webapp/static/fusion/raptor/css/picker.css delete mode 100644 vid/src/main/webapp/static/fusion/raptor/css/ral.css delete mode 100644 vid/src/main/webapp/static/fusion/raptor/css/raptor.css delete mode 100644 vid/src/main/webapp/static/fusion/raptor/css/tree/context-menu.css delete mode 100644 vid/src/main/webapp/static/fusion/raptor/css/tree/drag-drop-folder-tree.css delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/dashed-canvas.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/data.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-canvas.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-combined.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-combined_bak_color.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-dev.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-externs.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-gviz.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-interaction-model.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-layout.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-options-reference.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-options.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-plugin-base.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-plugin-install.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-tickers.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-utils.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/excanvas.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/interaction.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/interaction.min.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/interaction_sun.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/moment.min.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/phantom-driver.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/phantom-perf.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/plugins/README delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/plugins/annotations.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/plugins/axes.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/plugins/chart-labels.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/plugins/grid.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/plugins/legend.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/plugins/range-selector.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/rgbcolor/rgbcolor.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/stacktrace.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/strftime/Doxyfile delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/strftime/strftime-min.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/dy3/js/strftime/strftime.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/ebz/date_time_picker.css delete mode 100644 vid/src/main/webapp/static/fusion/raptor/ebz/date_time_picker.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/ebz/dynamicform.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/ebz/moment.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/ebz/multiselect.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/ebz/quick_links.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/ebz/report_chart_wizard.html delete mode 100644 vid/src/main/webapp/static/fusion/raptor/ebz/report_chart_wizard.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/ebz/report_run.html delete mode 100644 vid/src/main/webapp/static/fusion/raptor/ebz/report_run.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/ebz/report_search.html delete mode 100644 vid/src/main/webapp/static/fusion/raptor/ebz/report_search.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/ATT_Business_logo.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/RAPTOR_BANNER.jpg delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/accessicon.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/active.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/addbtn.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/ajax-loader.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/arrow_add.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/arrow_add_edge.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/arrow_add_multiple.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/arrow_add_one.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/arrow_back.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/arrow_cancel.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/arrow_left.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/arrow_left2.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/arrow_next.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/arrow_plus.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/arrow_reorder_all.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/arrow_reorder_all.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/arrow_right.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/arrow_right2.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/arrow_save.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/att-globe1.jpg delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/button_import.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/calendar_icon.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/calendar_icon_nav.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/calendar_icon_nav1.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/calender_icon.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/columnblankdown.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/columnblankup.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/columndown.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/columnup.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/crosshairs.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/csv_icon.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/deleteicon.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/downloadicon.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/excel2007.jpg delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/excel2007.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/excelicon.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/excelicon_multi.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/green-arrow-right.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/green-arrow.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/grnarrowdn.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/grnarrowup.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/h.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/inactive.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/loader.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/loading.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/lookup_arrow.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/maps/blue.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/maps/green.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/maps/lightblue.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/maps/map_iphone.jpg delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/maps/orange.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/maps/pink.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/maps/purple.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/maps/red.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/maps/yellow.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/minus.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/modify_icon.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/page.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/pdficon_large.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/pdficon_small.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/pen_paper.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/plus.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/popupicon.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/position.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/printer.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/progress.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/question_mark.jpg delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/quickhelp_dk.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/quickhelp_lt.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/r_back.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/raptor.jpg delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/raptor_logo.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/raptor_logo.jpg delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/required.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/shareicon.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/sv.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/tab_left.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/tab_left_sel.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/tab_right.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/tab_right_sel.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/test_run.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/text.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/tree/context-menu-gradient.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_folder.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_minus.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_plus.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_sheet.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_sheet_crosstab.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_sheet_dashboard.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_sheet_graph.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/tree/dragDrop_ind1.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/tree/dragDrop_ind2.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/tree/folder_close.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/tree/folder_dots.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/tree/folder_folder.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/tree/folder_lastsub.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/tree/folder_open.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/tree/folder_sub.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/tree/grnarrowleft.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/tree/grnarrowright.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/txt_icon.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/uF033.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/uF034.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/uF035.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/images/uF036.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/BorderLayout-24x24.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/Calendar-16x16.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/DeleteCross-16x16.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/addbtn.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/button_import.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/copyicon-highlighted.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/copyicon.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/cross-small.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/csv_icon.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/csv_icon.jpg delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/csv_icon.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/deleteicon-highlighted.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/deleteicon-highlighted.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/deleteicon.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/downloadicon.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/editicon.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/excel2007.jpg delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/excelicon.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/excelicon_multi.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/executeicon.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/file_import.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/pdficon_small.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/pen_paper.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/pencil-small.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/report-add.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/report-favorite.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/report-my.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/report-public.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/report.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/reports.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/search.gif delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/search.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/img/tick-small.png delete mode 100644 vid/src/main/webapp/static/fusion/raptor/js/CalendarPopup.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/js/ajax.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/js/ajax_dynamic_content.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/js/cingular_button.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/js/drupal.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/js/editabledropdown.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/js/form-field-tooltip.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/js/gmap.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/js/jquery.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/js/jquery.min.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/js/label_quantum.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/js/nova_button.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/js/other_scripts.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/js/persist_table_header.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/js/prototype-1.6.0.3.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/js/raptor.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/js/rounded-corners.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/js/script.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/js/tree/ajax.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/js/tree/context-menu.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/js/tree/drag-drop-folder-tree.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/uigrid/ui-grid.css delete mode 100644 vid/src/main/webapp/static/fusion/raptor/uigrid/ui-grid.eot delete mode 100644 vid/src/main/webapp/static/fusion/raptor/uigrid/ui-grid.js delete mode 100644 vid/src/main/webapp/static/fusion/raptor/uigrid/ui-grid.svg delete mode 100644 vid/src/main/webapp/static/fusion/raptor/uigrid/ui-grid.ttf delete mode 100644 vid/src/main/webapp/static/fusion/raptor/uigrid/ui-grid.woff delete mode 100644 vid/src/main/webapp/static/fusion/raptor/uigrid/vfs_fonts.js delete mode 100644 vid/src/main/webapp/static/js/jquery-1.10.2.js delete mode 100644 vid/src/main/webapp/static/js/jquery-ui.js delete mode 100644 vid/src/main/webapp/static/js/jquery.mask.min.js delete mode 100644 vid/src/main/webapp/static/js/modalService.js delete mode 100644 vid/src/main/webapp/static/js/search.js delete mode 100644 vid/src/main/webapp/test.jsp delete mode 100644 vid/src/test/java/org/openecomp/ecomp/vid/selenium/FirstClass.java delete mode 100644 vid/src/test/java/org/openecomp/ecomp/vid/selenium/LogOutLeftPane.java delete mode 100644 vid/src/test/java/org/openecomp/portalapp/controller/NetMapTest.java delete mode 100644 vid/src/test/java/org/openecomp/portalapp/service/ProfileServiceTest.java delete mode 100644 vid/src/test/java/org/openecomp/portalsdk/core/MockApplicationContextTestSuite.java delete mode 100644 vid/src/test/resources/objectconfig.properties delete mode 100644 vid/version.properties diff --git a/deliveries/pom.xml b/deliveries/pom.xml old mode 100644 new mode 100755 index 3dd6666f5..a8e3903cf --- a/deliveries/pom.xml +++ b/deliveries/pom.xml @@ -1,87 +1,88 @@ - - 4.0.0 - - - org.openecomp.vid - vid-parent - 1.0.0 - - - pom - org.openecomp.vid - vid-deliveries - - VID Deliveries - ECOMP VID Deliveries - - UTF-8 - UTF-8 - ${docker_registry} - true - - - - ${project.artifactId}-${project.version} - - - io.fabric8 - docker-maven-plugin - 0.16.5 - - - true - - 1.23 - - - openecomp/vid:${project.version} - - remove - docker-files - - / - vidadmin:vidadmin:vidadmin - assembly/assembly-for-plugin.xml - - - 1.1-STAGING-latest - - - - - - - - - generate-image - deploy - - build - - - - - push-image - deploy - - build - push - - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8 - - true - - - - - - + + 4.0.0 + + + org.openecomp.vid + vid-parent + 1.0.0 + + + pom + org.openecomp.vid + vid-deliveries + + VID Deliveries + ECOMP VID Deliveries + + UTF-8 + UTF-8 + ${docker_registry} + true + + + + ${project.artifactId}-${project.version} + + + io.fabric8 + docker-maven-plugin + 0.16.5 + + + true + + 1.23 + + + openecomp/vid:${project.version} + + remove + docker-files + + / + vidadmin:vidadmin:vidadmin + assembly/assembly-for-plugin.xml + + + 1.0-STAGING-latest + + + + + + + + + + generate-image + deploy + + build + + + + + push-image + deploy + + build + push + + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8 + + true + + + + + + diff --git a/deliveries/src/main/docker/assembly/assembly-for-plugin.xml b/deliveries/src/main/docker/assembly/assembly-for-plugin.xml old mode 100644 new mode 100755 index 2755e7e19..35c203352 --- a/deliveries/src/main/docker/assembly/assembly-for-plugin.xml +++ b/deliveries/src/main/docker/assembly/assembly-for-plugin.xml @@ -1,31 +1,31 @@ - - - assembly-for-war - - - - - vid.war - - ../vid/target/ - artifacts - - - - vid-pre-init.sql - - ../vid/src/main/resources - scripts - - - - *.sh - - src/main/scripts - scripts - - - - + + + assembly-for-war + + + + + vid.war + + ../epsdk-app-onap/target/ + artifacts + + + + vid-pre-init.sql + + ../epsdk-app-onap/src/main/resources + scripts + + + + *.sh + + src/main/scripts + scripts + + + + diff --git a/deliveries/src/main/docker/docker-files/Dockerfile b/deliveries/src/main/docker/docker-files/Dockerfile old mode 100644 new mode 100755 index ffe2b4665..d112738b2 --- a/deliveries/src/main/docker/docker-files/Dockerfile +++ b/deliveries/src/main/docker/docker-files/Dockerfile @@ -1,72 +1,74 @@ -FROM tomcat:8.0-jre8 - -RUN apt-get update && apt-get install -y \ - openjdk-8-jdk - -ENV ROOT_DIR /opt/app/vid - -ENV ASDC_CLIENT_TYPE REST -ENV ASDC_CLIENT_REST_HOST c2.vm1.sdc.simpledemo.openecomp.org -#old creds 1/9/2017 ENV ASDC_CLIENT_REST_AUTH Basic dmlkOnZpZG9z -ENV ASDC_CLIENT_REST_AUTH Basic dmlkOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU= -ENV ASDC_CLIENT_REST_PROTOCOL http -ENV ASDC_CLIENT_REST_PORT 8080 - -ENV CACHE_DIRECTORY $ROOT_DIR/cache - -ENV LOG4J_LOGLEVEL INFO -ENV LOG4J_APPENDER rollingfile -ENV LOG4J_LOGS_DIRECTORY ${ROOT_DIR}/logs - -ENV VID_AAI_HOST aai.api.simpledemo.openecomp.org -ENV VID_AAI_PORT 8443 -ENV VID_APP_DISPLAY_NAME VID -ENV VID_ECOMP_SHARED_CONTEXT_REST_URL https://portal.api.simpledemo.openecomp.org:8080/ecompportal/context -ENV VID_MSO_SERVER_URL http://vm1.mso.simpledemo.openecomp.org:8080 -ENV VID_TRUSTSTORE_FILE ${ROOT_DIR}/etc/vid_keystore.jks -ENV VID_MYLOGIN_FEED_DIRECTORY /tmp/MyLogins -ENV VID_TRUSTSTORE_PASS 5c84906b14912dbe96154e09b1e1db90e31f8dedb08e3e6c9f17da3f926cb67b33e4229cc1fe0f59c996d2e38b8ded42 -ENV VID_MSO_USER InfraPortalClient -ENV VID_MSO_PASS 51515201a8d4c5c08d533db9bd1e1a9b -ENV MSO_DME2_CLIENT_TIMEOUT 10000 -ENV MSO_DME2_CLIENT_READ_TIMEOUT 10000 -ENV MSO_DME2_SERVER_URL http://localhost:8081 -ENV MSO_DME2_ENABLED false -ENV MSO_POLLING_INTERVAL_MSECS 10000 -ENV AAI_TRUSTSTORE_FILENAME tomcat_keystore -ENV AAI_TRUSTSTORE_PASSWD_X 5c84906b14912dbe96154e09b1e1db90e31f8dedb08e3e6c9f17da3f926cb67b33e4229cc1fe0f59c996d2e38b8ded42 -ENV AAI_KEYSTORE_FILENAME tomcat_keystore -ENV AAI_KEYSTORE_PASSWD_X 5c84906b14912dbe96154e09b1e1db90e31f8dedb08e3e6c9f17da3f926cb67b33e4229cc1fe0f59c996d2e38b8ded42 -ENV AAI_VID_UID VID -ENV AAI_VID_PASSWD_X b78b4808b37a8aadf02a5cc0004f1ad0 - -ENV VID_ECOMP_REDIRECT_URL http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/login.htm -ENV VID_ECOMP_REST_URL http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/auxapi -ENV VID_ECOMP_SHARED_CONTEXT_REST_URL http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/context -ENV VID_CONTACT_US_LINK https://todo_contact_us_link.com - -ENV VID_DECRYPTION_KEY AGLDdG4D04BKm2IxIWEr8o= -ENV VID_UEB_URL_LIST vm1-message-router -ENV VID_UEB_CONSUMER_GROUP VID -ENV VID_ECOMP_PORTAL_INBOX_NAME ECOMP-PORTAL-INBOX -ENV VID_UEB_APP_KEY 2Re7Pvdkgw5aeAUD -ENV VID_UEB_APP_SECRET S31PrbOzGgL4hg4owgtx47Da -ENV VID_UEB_APP_MAILBOX_NAME ECOMP-PORTAL-OUTBOX-90 -ENV VID_UEB_LISTENERS_ENABLE false - -ENV VID_LOG_DIR ${ROOT_DIR}/logs -ENV VID_LOG_LEVEL INFO - -ENV VID_MYSQL_HOST vid-mariadb-docker-instance -ENV VID_MYSQL_PORT 3306 -ENV VID_MYSQL_DBNAME vid_portal -ENV VID_MYSQL_USER vidadmin -ENV VID_MYSQL_MAXCONNECTIONS 5 -ENV VID_MYSQL_PASS Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U - -ADD maven/scripts/*.sh /tmp/vid/ -ADD maven/artifacts/vid.war /tmp/vid/stage/ - -RUN chmod +x /tmp/vid/localize.sh - -CMD ["/tmp/vid/localize.sh"] +FROM tomcat:8.0-jre8 + +RUN apt-get update && apt-get install -y \ + openjdk-8-jdk + +ENV ROOT_DIR /opt/app/vid + +ENV ASDC_CLIENT_TYPE REST +ENV ASDC_CLIENT_REST_HOST c2.vm1.sdc.simpledemo.openecomp.org +#old creds 1/9/2017 ENV ASDC_CLIENT_REST_AUTH Basic dmlkOnZpZG9z +ENV ASDC_CLIENT_REST_AUTH Basic dmlkOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU= +ENV ASDC_CLIENT_REST_PROTOCOL http +ENV ASDC_CLIENT_REST_PORT 8080 +ENV ASDC_CLIENT_MODEL_NAMESPACE org.openecomp + +ENV CACHE_DIRECTORY $ROOT_DIR/cache + +ENV LOG4J_LOGLEVEL INFO +ENV LOG4J_APPENDER rollingfile +ENV LOG4J_LOGS_DIRECTORY ${ROOT_DIR}/logs + +ENV VID_AAI_HOST aai.api.simpledemo.openecomp.org +ENV VID_AAI_PORT 8443 +ENV VID_APP_DISPLAY_NAME VID +ENV VID_ECOMP_SHARED_CONTEXT_REST_URL https://portal.api.simpledemo.openecomp.org:8080/ecompportal/context +ENV VID_MSO_SERVER_URL http://vm1.mso.simpledemo.openecomp.org:8080 +ENV VID_TRUSTSTORE_FILE ${ROOT_DIR}/etc/vid_keystore.jks +ENV VID_MYLOGIN_FEED_DIRECTORY /tmp/MyLogins +ENV VID_TRUSTSTORE_PASS 5c84906b14912dbe96154e09b1e1db90e31f8dedb08e3e6c9f17da3f926cb67b33e4229cc1fe0f59c996d2e38b8ded42 +ENV VID_MSO_USER InfraPortalClient +ENV VID_MSO_PASS OBF:1ih71i271vny1yf41ymf1ylz1yf21vn41hzj1icz +ENV MSO_DME2_CLIENT_TIMEOUT 10000 +ENV MSO_DME2_CLIENT_READ_TIMEOUT 10000 +ENV MSO_DME2_SERVER_URL http://localhost:8081 +ENV MSO_DME2_ENABLED false +ENV MSO_POLLING_INTERVAL_MSECS 10000 +ENV AAI_TRUSTSTORE_FILENAME tomcat_keystore +ENV AAI_TRUSTSTORE_PASSWD_X OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp +ENV AAI_KEYSTORE_FILENAME tomcat_keystore +ENV AAI_KEYSTORE_PASSWD_X OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp +ENV AAI_VID_UID VID +ENV AAI_VID_PASSWD_X OBF:1jm91i0v1jl9 +ENV AAI_USE_CLIENT_CERT false +ENV AAI_VNF_PROV_STATUS PREPROV,NVTPROV,PROV,CAPPED +ENV VID_ECOMP_REDIRECT_URL http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/login.htm +ENV VID_ECOMP_REST_URL http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/auxapi +ENV VID_ECOMP_SHARED_CONTEXT_REST_URL http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/context +ENV VID_CONTACT_US_LINK https://todo_contact_us_link.com + +ENV VID_DECRYPTION_KEY AGLDdG4D04BKm2IxIWEr8o= +ENV VID_UEB_URL_LIST vm1-message-router +ENV VID_UEB_CONSUMER_GROUP VID +ENV VID_ECOMP_PORTAL_INBOX_NAME ECOMP-PORTAL-INBOX +ENV VID_UEB_APP_KEY 2Re7Pvdkgw5aeAUD +ENV VID_UEB_APP_SECRET S31PrbOzGgL4hg4owgtx47Da +ENV VID_UEB_APP_MAILBOX_NAME ECOMP-PORTAL-OUTBOX-90 +ENV VID_UEB_LISTENERS_ENABLE false + +ENV VID_LOG_DIR ${ROOT_DIR}/logs +ENV VID_LOG_LEVEL INFO + +ENV VID_MYSQL_HOST vid-mariadb-docker-instance +ENV VID_MYSQL_PORT 3306 +ENV VID_MYSQL_DBNAME vid_portal +ENV VID_MYSQL_USER vidadmin +ENV VID_MYSQL_MAXCONNECTIONS 5 +ENV VID_MYSQL_PASS Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U + +ADD maven/scripts/*.sh /tmp/vid/ +ADD maven/artifacts/vid.war /tmp/vid/stage/ + +RUN chmod +x /tmp/vid/localize.sh + +CMD ["/tmp/vid/localize.sh"] diff --git a/deliveries/src/main/docker/docker-files/docker-compose.yml b/deliveries/src/main/docker/docker-files/docker-compose.yml old mode 100644 new mode 100755 index 60599bc98..25a7acfc3 --- a/deliveries/src/main/docker/docker-files/docker-compose.yml +++ b/deliveries/src/main/docker/docker-files/docker-compose.yml @@ -1,14 +1,14 @@ -version: '2' -services: - vid-server: - image: openecomp/vid - ports: - - "8080:8080" - links: - - vid-mariadb:vid-mariadb-docker-instance - vid-mariadb: - image: mariadb:10.1.11 - ports: - - "3306:3306" - volumes: - - /var/lib/mysql +version: '2' +services: + vid-server: + image: openecomp/vid + ports: + - "8080:8080" + links: + - vid-mariadb:vid-mariadb-docker-instance + vid-mariadb: + image: mariadb:10.1.11 + ports: + - "3306:3306" + volumes: + - /var/lib/mysql diff --git a/deliveries/src/main/scripts/localize.sh b/deliveries/src/main/scripts/localize.sh old mode 100644 new mode 100755 index 3966f7023..e72d622b4 --- a/deliveries/src/main/scripts/localize.sh +++ b/deliveries/src/main/scripts/localize.sh @@ -1,18 +1,18 @@ -#!/bin/bash - -#Extract the WAR so it can be customized by the localization script -cd /tmp/vid/stage -jar -xf vid.war - -source /tmp/vid/localize_war.sh || { - echo "ERROR: Localization script failed" - exit 2 -} - -#Create the customized WAR and deploy it to Tomcat -mkdir -p /tmp/vid/deployed -cd /tmp/vid/stage -jar -cvf /tmp/vid/deployed/vid.war . -cd -mv -f /tmp/vid/deployed/vid.war /usr/local/tomcat/webapps -catalina.sh run +#!/bin/bash + +#Extract the WAR so it can be customized by the localization script +cd /tmp/vid/stage +jar -xf vid.war + +source /tmp/vid/localize_war.sh || { + echo "ERROR: Localization script failed" + exit 2 +} + +#Create the customized WAR and deploy it to Tomcat +mkdir -p /tmp/vid/deployed +cd /tmp/vid/stage +jar -cvf /tmp/vid/deployed/vid.war . +cd +mv -f /tmp/vid/deployed/vid.war /usr/local/tomcat/webapps +catalina.sh run diff --git a/deliveries/src/main/scripts/localize_asdc.sh b/deliveries/src/main/scripts/localize_asdc.sh old mode 100644 new mode 100755 index 549c17af1..9a25b61dc --- a/deliveries/src/main/scripts/localize_asdc.sh +++ b/deliveries/src/main/scripts/localize_asdc.sh @@ -1,17 +1,17 @@ -#!/bin/bash - -FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/asdc.properties -TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/asdc_template.properties - -echo "Localizing the ASDC client configuration" - -sed -e 's ${ASDC_CLIENT_TYPE} '${ASDC_CLIENT_TYPE}' g' \ - -e 's ${ASDC_CLIENT_REST_HOST} '${ASDC_CLIENT_REST_HOST}' g' \ - -e 's ${ASDC_CLIENT_REST_PORT} '${ASDC_CLIENT_REST_PORT}' g' \ - -e 's ${ASDC_CLIENT_REST_PROTOCOL} '${ASDC_CLIENT_REST_PROTOCOL}' g' \ - -e 's/${ASDC_CLIENT_REST_AUTH}/'"${ASDC_CLIENT_REST_AUTH}"'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { - echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" - exit 4 - } - -echo "Localized ${FINAL_CONFIG_FILE} successfully." +#!/bin/bash + +FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/asdc.properties +TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/asdc_template.properties + +echo "Localizing the ASDC client configuration" + +sed -e 's ${ASDC_CLIENT_TYPE} '${ASDC_CLIENT_TYPE}' g' \ + -e 's ${ASDC_CLIENT_REST_HOST} '${ASDC_CLIENT_REST_HOST}' g' \ + -e 's ${ASDC_CLIENT_REST_PORT} '${ASDC_CLIENT_REST_PORT}' g' \ + -e 's ${ASDC_CLIENT_REST_PROTOCOL} '${ASDC_CLIENT_REST_PROTOCOL}' g' \ + -e 's/${ASDC_CLIENT_REST_AUTH}/'"${ASDC_CLIENT_REST_AUTH}"'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { + echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" + exit 4 + } + +echo "Localized ${FINAL_CONFIG_FILE} successfully." diff --git a/deliveries/src/main/scripts/localize_cache.sh b/deliveries/src/main/scripts/localize_cache.sh old mode 100644 new mode 100755 index d25949ccc..7ef90283b --- a/deliveries/src/main/scripts/localize_cache.sh +++ b/deliveries/src/main/scripts/localize_cache.sh @@ -1,15 +1,15 @@ -#!/bin/bash - -FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/classes/cache.ccf -TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/classes/cache_template.ccf - -echo "Localizing the VID cache configuration" - -mkdir -p "${CACHE_DIRECTORY}" - -sed -e 's,${CACHE_DIRECTORY},'${CACHE_DIRECTORY}',g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { - echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" - exit 3 - } - -echo "Localized ${FINAL_CONFIG_FILE} successfully." +#!/bin/bash + +FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/classes/cache.ccf +TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/classes/cache_template.ccf + +echo "Localizing the VID cache configuration" + +mkdir -p "${CACHE_DIRECTORY}" + +sed -e 's,${CACHE_DIRECTORY},'${CACHE_DIRECTORY}',g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { + echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" + exit 3 + } + +echo "Localized ${FINAL_CONFIG_FILE} successfully." diff --git a/deliveries/src/main/scripts/localize_log4j.sh b/deliveries/src/main/scripts/localize_log4j.sh old mode 100644 new mode 100755 index d2ab2bba4..b3442c8f2 --- a/deliveries/src/main/scripts/localize_log4j.sh +++ b/deliveries/src/main/scripts/localize_log4j.sh @@ -1,19 +1,19 @@ -#!/bin/bash - -FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/log4j.properties -TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/log4j_template.properties - -echo "Localizing the VID log4j configuration" - -mkdir -p ${LOG4J_LOGS_DIRECTORY} - -sed -e 's/${LOG4J_LOGLEVEL}/'${LOG4J_LOGLEVEL}'/g' \ - -e 's/${LOG4J_APPENDER}/'${LOG4J_APPENDER}'/g' \ - -e 's,${LOG4J_LOGS_DIRECTORY},'${LOG4J_LOGS_DIRECTORY}',g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { - echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" - exit 3 - } - -echo "Localized ${FINAL_CONFIG_FILE} successfully." - - +#!/bin/bash + +FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/log4j.properties +TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/log4j_template.properties + +echo "Localizing the VID log4j configuration" + +mkdir -p ${LOG4J_LOGS_DIRECTORY} + +sed -e 's/${LOG4J_LOGLEVEL}/'${LOG4J_LOGLEVEL}'/g' \ + -e 's/${LOG4J_APPENDER}/'${LOG4J_APPENDER}'/g' \ + -e 's,${LOG4J_LOGS_DIRECTORY},'${LOG4J_LOGS_DIRECTORY}',g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { + echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" + exit 3 + } + +echo "Localized ${FINAL_CONFIG_FILE} successfully." + + diff --git a/deliveries/src/main/scripts/localize_logback.sh b/deliveries/src/main/scripts/localize_logback.sh old mode 100644 new mode 100755 index 43798eb84..d4e0bcc51 --- a/deliveries/src/main/scripts/localize_logback.sh +++ b/deliveries/src/main/scripts/localize_logback.sh @@ -1,16 +1,16 @@ -#!/bin/bash - -FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/classes/logback.xml -TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/classes/logback_template.xml - -echo "Localizing the VID logback configuration" - -mkdir -p "${VID_LOG_DIR}" - -sed -e 's/${VID_LOG_LEVEL}/'${VID_LOG_LEVEL}'/g' \ - -e 's,${VID_LOG_DIR},'${VID_LOG_DIR}',g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { - echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" - exit 3 - } - -echo "Localized ${FINAL_CONFIG_FILE} successfully." +#!/bin/bash + +FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/classes/logback.xml +TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/classes/logback_template.xml + +echo "Localizing the VID logback configuration" + +mkdir -p "${VID_LOG_DIR}" + +sed -e 's/${VID_LOG_LEVEL}/'${VID_LOG_LEVEL}'/g' \ + -e 's,${VID_LOG_DIR},'${VID_LOG_DIR}',g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { + echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" + exit 3 + } + +echo "Localized ${FINAL_CONFIG_FILE} successfully." diff --git a/deliveries/src/main/scripts/localize_portal.sh b/deliveries/src/main/scripts/localize_portal.sh old mode 100644 new mode 100755 index 7d630c56b..3ac535136 --- a/deliveries/src/main/scripts/localize_portal.sh +++ b/deliveries/src/main/scripts/localize_portal.sh @@ -1,22 +1,22 @@ -#!/bin/bash - -FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/classes/portal.properties -TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/classes/portal_template.properties - -echo "Localizing the VID portal configuration" - -sed -e 's ${VID_WJ_LOGOUT_URL} '${VID_WJ_LOGOUT_URL}' g' \ - -e 's ${VID_ECOMP_REDIRECT_URL} '${VID_ECOMP_REDIRECT_URL}' g' \ - -e 's ${VID_ECOMP_REST_URL} '${VID_ECOMP_REST_URL}' g' \ - -e 's ${VID_UEB_URL_LIST} '${VID_UEB_URL_LIST}' g' \ - -e 's ${VID_ECOMP_PORTAL_INBOX_NAME} '${VID_ECOMP_PORTAL_INBOX_NAME}' g' \ - -e 's ${VID_UEB_APP_KEY} '${VID_UEB_APP_KEY}' g' \ - -e 's ${VID_UEB_APP_SECRET} '${VID_UEB_APP_SECRET}' g' \ - -e 's ${VID_UEB_APP_MAILBOX_NAME} '${VID_UEB_APP_MAILBOX_NAME}' g' \ - -e 's ${VID_UEB_LISTENERS_ENABLE} '${VID_UEB_LISTENERS_ENABLE}' g' \ - -e 's/${VID_UEB_CONSUMER_GROUP}/'${VID_UEB_CONSUMER_GROUP}'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { - echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" - exit 4 - } - -echo "Localized ${FINAL_CONFIG_FILE} successfully." +#!/bin/bash + +FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/classes/portal.properties +TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/classes/portal_template.properties + +echo "Localizing the VID portal configuration" + +sed -e 's ${VID_WJ_LOGOUT_URL} '${VID_WJ_LOGOUT_URL}' g' \ + -e 's ${VID_ECOMP_REDIRECT_URL} '${VID_ECOMP_REDIRECT_URL}' g' \ + -e 's ${VID_ECOMP_REST_URL} '${VID_ECOMP_REST_URL}' g' \ + -e 's ${VID_UEB_URL_LIST} '${VID_UEB_URL_LIST}' g' \ + -e 's ${VID_ECOMP_PORTAL_INBOX_NAME} '${VID_ECOMP_PORTAL_INBOX_NAME}' g' \ + -e 's ${VID_UEB_APP_KEY} '${VID_UEB_APP_KEY}' g' \ + -e 's ${VID_UEB_APP_SECRET} '${VID_UEB_APP_SECRET}' g' \ + -e 's ${VID_UEB_APP_MAILBOX_NAME} '${VID_UEB_APP_MAILBOX_NAME}' g' \ + -e 's ${VID_UEB_LISTENERS_ENABLE} '${VID_UEB_LISTENERS_ENABLE}' g' \ + -e 's/${VID_UEB_CONSUMER_GROUP}/'${VID_UEB_CONSUMER_GROUP}'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { + echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" + exit 4 + } + +echo "Localized ${FINAL_CONFIG_FILE} successfully." diff --git a/deliveries/src/main/scripts/localize_quartz.sh b/deliveries/src/main/scripts/localize_quartz.sh old mode 100644 new mode 100755 index c284e6c24..242e76da7 --- a/deliveries/src/main/scripts/localize_quartz.sh +++ b/deliveries/src/main/scripts/localize_quartz.sh @@ -1,20 +1,20 @@ -#!/bin/bash - -FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/quartz.properties -TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/quartz_template.properties - -echo "Localizing the VID quartz configuration" - -sed -e 's/${VID_MYSQL_HOST}/'${VID_MYSQL_HOST}'/g' \ - -e 's/${VID_MYSQL_PORT}/'${VID_MYSQL_PORT}'/g' \ - -e 's/${VID_MYSQL_DBNAME}/'${VID_MYSQL_DBNAME}'/g' \ - -e 's/${VID_MYSQL_USER}/'${VID_MYSQL_USER}'/g' \ - -e 's/${VID_MYSQL_PASS}/'${VID_MYSQL_PASS}'/g' \ - -e 's/${VID_MYSQL_MAXCONNECTIONS}/'${VID_MYSQL_MAXCONNECTIONS}'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { - echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" - exit 4 - } - -echo "Localized ${FINAL_CONFIG_FILE} successfully." - - +#!/bin/bash + +FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/quartz.properties +TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/quartz_template.properties + +echo "Localizing the VID quartz configuration" + +sed -e 's/${VID_MYSQL_HOST}/'${VID_MYSQL_HOST}'/g' \ + -e 's/${VID_MYSQL_PORT}/'${VID_MYSQL_PORT}'/g' \ + -e 's/${VID_MYSQL_DBNAME}/'${VID_MYSQL_DBNAME}'/g' \ + -e 's/${VID_MYSQL_USER}/'${VID_MYSQL_USER}'/g' \ + -e 's/${VID_MYSQL_PASS}/'${VID_MYSQL_PASS}'/g' \ + -e 's/${VID_MYSQL_MAXCONNECTIONS}/'${VID_MYSQL_MAXCONNECTIONS}'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { + echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" + exit 4 + } + +echo "Localized ${FINAL_CONFIG_FILE} successfully." + + diff --git a/deliveries/src/main/scripts/localize_system.sh b/deliveries/src/main/scripts/localize_system.sh old mode 100644 new mode 100755 index 7cd7be68d..12aa0c91a --- a/deliveries/src/main/scripts/localize_system.sh +++ b/deliveries/src/main/scripts/localize_system.sh @@ -1,40 +1,40 @@ -#!/bin/bash - -FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/system.properties -TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/system_template.properties - -echo "Localizing the VID system configuration" - -mkdir -p "${VID_MYLOGIN_FEED_DIRECTORY}" - -sed -e 's/${VID_MYSQL_HOST}/'${VID_MYSQL_HOST}'/g' \ - -e 's/${VID_MYSQL_PORT}/'${VID_MYSQL_PORT}'/g' \ - -e 's/${VID_MYSQL_DBNAME}/'${VID_MYSQL_DBNAME}'/g' \ - -e 's/${VID_MYSQL_USER}/'${VID_MYSQL_USER}'/g' \ - -e 's/${VID_MYSQL_PASS}/'${VID_MYSQL_PASS}'/g' \ - -e 's/${VID_AAI_HOST}/'${VID_AAI_HOST}'/g' \ - -e 's/${VID_AAI_PORT}/'${VID_AAI_PORT}'/g' \ - -e 's,${AAI_TRUSTSTORE_FILENAME},'${AAI_TRUSTSTORE_FILENAME}',g' \ - -e 's/${AAI_TRUSTSTORE_PASSWD_X}/'${AAI_TRUSTSTORE_PASSWD_X}'/g' \ - -e 's,${AAI_KEYSTORE_FILENAME},'${AAI_KEYSTORE_FILENAME}',g' \ - -e 's/${AAI_KEYSTORE_PASSWD_X}/'${AAI_KEYSTORE_PASSWD_X}'/g' \ - -e 's/${VID_APP_DISPLAY_NAME}/'${VID_APP_DISPLAY_NAME}'/g' \ - -e 's ${VID_ECOMP_SHARED_CONTEXT_REST_URL} '${VID_ECOMP_SHARED_CONTEXT_REST_URL}' g' \ - -e 's ${VID_ECOMP_REDIRECT_URL} '${VID_ECOMP_REDIRECT_URL}' g' \ - -e 's ${VID_ECOMP_REST_URL} '${VID_ECOMP_REST_URL}' g' \ - -e 's ${VID_MSO_SERVER_URL} '${VID_MSO_SERVER_URL}' g' \ - -e 's/${VID_MSO_USER}/'${VID_MSO_USER}'/g' \ - -e 's/${VID_MSO_PASS}/'${VID_MSO_PASS}'/g' \ - -e 's,${VID_MYLOGIN_FEED_DIRECTORY},'${VID_MYLOGIN_FEED_DIRECTORY}',g' \ - -e 's,${MSO_DME2_CLIENT_TIMEOUT},'${MSO_DME2_CLIENT_TIMEOUT}',g' \ - -e 's,${MSO_DME2_CLIENT_READ_TIMEOUT},'${MSO_DME2_CLIENT_READ_TIMEOUT}',g' \ - -e 's,${MSO_DME2_SERVER_URL},'${MSO_DME2_SERVER_URL}',g' \ - -e 's,${MSO_DME2_ENABLED},'${MSO_DME2_ENABLED}',g' \ - -e 's,${MSO_POLLING_INTERVAL_MSECS},'${MSO_POLLING_INTERVAL_MSECS}',g' \ - -e 's,${VID_TRUSTSTORE_FILE},'${VID_TRUSTSTORE_FILE}',g' \ - -e 's/${VID_TRUSTSTORE_PASS}/'${VID_TRUSTSTORE_PASS}'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { - echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" - exit 4 - } - -echo "Localized ${FINAL_CONFIG_FILE} successfully." +#!/bin/bash + +FINAL_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/system.properties +TEMPLATE_CONFIG_FILE=/tmp/vid/stage/WEB-INF/conf/system_template.properties + +echo "Localizing the VID system configuration" + +mkdir -p "${VID_MYLOGIN_FEED_DIRECTORY}" + +sed -e 's/${VID_MYSQL_HOST}/'${VID_MYSQL_HOST}'/g' \ + -e 's/${VID_MYSQL_PORT}/'${VID_MYSQL_PORT}'/g' \ + -e 's/${VID_MYSQL_DBNAME}/'${VID_MYSQL_DBNAME}'/g' \ + -e 's/${VID_MYSQL_USER}/'${VID_MYSQL_USER}'/g' \ + -e 's/${VID_MYSQL_PASS}/'${VID_MYSQL_PASS}'/g' \ + -e 's/${VID_AAI_HOST}/'${VID_AAI_HOST}'/g' \ + -e 's/${VID_AAI_PORT}/'${VID_AAI_PORT}'/g' \ + -e 's,${AAI_TRUSTSTORE_FILENAME},'${AAI_TRUSTSTORE_FILENAME}',g' \ + -e 's/${AAI_TRUSTSTORE_PASSWD_X}/'${AAI_TRUSTSTORE_PASSWD_X}'/g' \ + -e 's,${AAI_KEYSTORE_FILENAME},'${AAI_KEYSTORE_FILENAME}',g' \ + -e 's/${AAI_KEYSTORE_PASSWD_X}/'${AAI_KEYSTORE_PASSWD_X}'/g' \ + -e 's/${VID_APP_DISPLAY_NAME}/'${VID_APP_DISPLAY_NAME}'/g' \ + -e 's ${VID_ECOMP_SHARED_CONTEXT_REST_URL} '${VID_ECOMP_SHARED_CONTEXT_REST_URL}' g' \ + -e 's ${VID_ECOMP_REDIRECT_URL} '${VID_ECOMP_REDIRECT_URL}' g' \ + -e 's ${VID_ECOMP_REST_URL} '${VID_ECOMP_REST_URL}' g' \ + -e 's ${VID_MSO_SERVER_URL} '${VID_MSO_SERVER_URL}' g' \ + -e 's/${VID_MSO_USER}/'${VID_MSO_USER}'/g' \ + -e 's/${VID_MSO_PASS}/'${VID_MSO_PASS}'/g' \ + -e 's,${VID_MYLOGIN_FEED_DIRECTORY},'${VID_MYLOGIN_FEED_DIRECTORY}',g' \ + -e 's,${MSO_DME2_CLIENT_TIMEOUT},'${MSO_DME2_CLIENT_TIMEOUT}',g' \ + -e 's,${MSO_DME2_CLIENT_READ_TIMEOUT},'${MSO_DME2_CLIENT_READ_TIMEOUT}',g' \ + -e 's,${MSO_DME2_SERVER_URL},'${MSO_DME2_SERVER_URL}',g' \ + -e 's,${MSO_DME2_ENABLED},'${MSO_DME2_ENABLED}',g' \ + -e 's,${MSO_POLLING_INTERVAL_MSECS},'${MSO_POLLING_INTERVAL_MSECS}',g' \ + -e 's,${VID_TRUSTSTORE_FILE},'${VID_TRUSTSTORE_FILE}',g' \ + -e 's/${VID_TRUSTSTORE_PASS}/'${VID_TRUSTSTORE_PASS}'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { + echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" + exit 4 + } + +echo "Localized ${FINAL_CONFIG_FILE} successfully." diff --git a/deliveries/src/main/scripts/localize_war.sh b/deliveries/src/main/scripts/localize_war.sh old mode 100644 new mode 100755 index f0669e0e6..68149211d --- a/deliveries/src/main/scripts/localize_war.sh +++ b/deliveries/src/main/scripts/localize_war.sh @@ -1,31 +1,31 @@ -#!/bin/bash - -source /tmp/vid/localize_logback.sh || { - echo "ERROR: Localizing logback.xml failed" - exit 1 -} - -source /tmp/vid/localize_portal.sh || { - echo "ERROR: Localizing portal.properties failed" - exit 1 -} - -source /tmp/vid/localize_quartz.sh || { - echo "ERROR: Localizing quartz.properties failed" - exit 1 -} - -source /tmp/vid/localize_system.sh || { - echo "ERROR: Localizing system.properties failed" - exit 1 -} - -source /tmp/vid/localize_cache.sh || { - echo "ERROR: Localizing cache.ccf failed" - exit 1 -} - -source /tmp/vid/localize_asdc.sh || { - echo "ERROR: Localizing asdc.properties failed" - exit 1 -} +#!/bin/bash + +source /tmp/vid/localize_logback.sh || { + echo "ERROR: Localizing logback.xml failed" + exit 1 +} + +source /tmp/vid/localize_portal.sh || { + echo "ERROR: Localizing portal.properties failed" + exit 1 +} + +source /tmp/vid/localize_quartz.sh || { + echo "ERROR: Localizing quartz.properties failed" + exit 1 +} + +source /tmp/vid/localize_system.sh || { + echo "ERROR: Localizing system.properties failed" + exit 1 +} + +source /tmp/vid/localize_cache.sh || { + echo "ERROR: Localizing cache.ccf failed" + exit 1 +} + +source /tmp/vid/localize_asdc.sh || { + echo "ERROR: Localizing asdc.properties failed" + exit 1 +} diff --git a/epsdk-app-onap/.classpath b/epsdk-app-onap/.classpath new file mode 100755 index 000000000..ede37b2b3 --- /dev/null +++ b/epsdk-app-onap/.classpath @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/epsdk-app-onap/.project b/epsdk-app-onap/.project new file mode 100755 index 000000000..7d373625e --- /dev/null +++ b/epsdk-app-onap/.project @@ -0,0 +1,42 @@ + + + epsdk-app-onap + + + + + + org.eclipse.wst.jsdt.core.javascriptValidator + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.wst.validation.validationbuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.wst.jsdt.core.jsNature + + diff --git a/epsdk-app-onap/.settings/.jsdtscope b/epsdk-app-onap/.settings/.jsdtscope new file mode 100755 index 000000000..c34a33690 --- /dev/null +++ b/epsdk-app-onap/.settings/.jsdtscope @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/epsdk-app-onap/.settings/org.eclipse.core.resources.prefs b/epsdk-app-onap/.settings/org.eclipse.core.resources.prefs new file mode 100755 index 000000000..cf6931b95 --- /dev/null +++ b/epsdk-app-onap/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/main/resources=UTF-8 +encoding/=UTF-8 diff --git a/epsdk-app-onap/.settings/org.eclipse.jdt.core.prefs b/epsdk-app-onap/.settings/org.eclipse.jdt.core.prefs new file mode 100755 index 000000000..1ab2bb53a --- /dev/null +++ b/epsdk-app-onap/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,8 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/epsdk-app-onap/.settings/org.eclipse.m2e.core.prefs b/epsdk-app-onap/.settings/org.eclipse.m2e.core.prefs new file mode 100755 index 000000000..302f92325 --- /dev/null +++ b/epsdk-app-onap/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles=onap +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/epsdk-app-onap/.settings/org.eclipse.wst.common.component b/epsdk-app-onap/.settings/org.eclipse.wst.common.component new file mode 100755 index 000000000..57b075ec9 --- /dev/null +++ b/epsdk-app-onap/.settings/org.eclipse.wst.common.component @@ -0,0 +1,19 @@ + + + + + + + + consumes + + + consumes + + + consumes + + + + + diff --git a/epsdk-app-onap/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/epsdk-app-onap/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml new file mode 100755 index 000000000..b01fdb78f --- /dev/null +++ b/epsdk-app-onap/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/epsdk-app-onap/.settings/org.eclipse.wst.common.project.facet.core.xml b/epsdk-app-onap/.settings/org.eclipse.wst.common.project.facet.core.xml new file mode 100755 index 000000000..91e8c54be --- /dev/null +++ b/epsdk-app-onap/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/epsdk-app-onap/.settings/org.eclipse.wst.jsdt.ui.superType.container b/epsdk-app-onap/.settings/org.eclipse.wst.jsdt.ui.superType.container new file mode 100755 index 000000000..3bd5d0a48 --- /dev/null +++ b/epsdk-app-onap/.settings/org.eclipse.wst.jsdt.ui.superType.container @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/epsdk-app-onap/.settings/org.eclipse.wst.jsdt.ui.superType.name b/epsdk-app-onap/.settings/org.eclipse.wst.jsdt.ui.superType.name new file mode 100755 index 000000000..05bd71b6e --- /dev/null +++ b/epsdk-app-onap/.settings/org.eclipse.wst.jsdt.ui.superType.name @@ -0,0 +1 @@ +Window \ No newline at end of file diff --git a/epsdk-app-onap/.settings/org.eclipse.wst.validation.prefs b/epsdk-app-onap/.settings/org.eclipse.wst.validation.prefs new file mode 100755 index 000000000..6f1cba68d --- /dev/null +++ b/epsdk-app-onap/.settings/org.eclipse.wst.validation.prefs @@ -0,0 +1,2 @@ +disabled=06target +eclipse.preferences.version=1 diff --git a/epsdk-app-onap/README.md b/epsdk-app-onap/README.md new file mode 100755 index 000000000..2d4f567a1 --- /dev/null +++ b/epsdk-app-onap/README.md @@ -0,0 +1,60 @@ +# ECOMP SDK Web Application for Open Source + +## Overview + +This is a Maven project with the ECOMP SDK web application for public release, +containing files specific to requirements of the open-source version. This +project uses the Maven war plugin to copy in ("overlay") the contents of the +ECOMP SDK web application overlay files distribution at package time. + +Use Apache Maven to build, package and deploy this webapp to a web container +like Apache Tomcat. Eclipse users must install the M2E-WTP connector, see +https://www.eclipse.org/m2e-wtp/ + +## Release Notes + +All of the release notes in the epsdk-app-common and epsdk-app-overlay areas apply here! + +Build 1.2.6, 23 Mar 2017 +- DE270905 Removed total page/current page text boxes from bottom of Profile Search page +- DE273128 Revise left menu to have unique IDs +- DE271378 fixed Camunda Page link in fn_menu; additional links were updated: Notebook +- US847688 Abstraction of support page content for AT&T vs Open Source in SQL Scripts +- Add sample defs/definitions.xml file for partner applications to configure jsp pages +- DE272154 SDK-App ATT: self profile page, changes on drop downs not saved +- Downgrade angularJS from 1.5.0 to 1.4.8 + +Build 1.2.5, 16 Mar 2017 +- DE272709 Update icon names from DS1 to DS2 in database load script +- Upgrade to EPSDK libraries version 1.2.5 + +Build 1.2.4, 10 Mar 2017 +- DE272042 Add missing includes so left menu appears on collaborate and notebook pages +- DE272193 Fix class/icon name to restore role icon on Self Profile page +- Restore spinners by changing class name from icon-spinner to icon-primary-spinner +- DE272202 updated ionicon.css for open source version of report search page +- Removed unused js files from samplePage.html in epsdk-app-onap +- Upgrade to EPSDK libraries version 1.2.4 + +Build 1.2.3, 8 Mar 2017 +- DE271038 Remove references to famous telecommunications company from system.properties +- Upgrade to EPSDK libraries version 1.2.3 + +Build 1.2.2, 6 Mar 2017 +- DE270658 EPSDK-app-onap header is covering part of left menu. +- DE271510 Pages not loading in IE and FF properly. Drop page-resource-ds2.js; load scripts in HTML directly +- Remove references to famous telecommunications company hosts from fusion.properties, portal.properties +- Upgrade to EPSDK libraries version 1.2.2 + +Build 1.2.1, 2 Mar 2017 +- DE269231 Separated footer files on OS module displaying black footer with no content +- US847688 Split database scripts; include full set in distributions +- US847706 Refactored AdminAuthExtension to implement interface expected in OnboardingApiServiceImpl +- Added class conf/HibernateMappingLocations - moved out of common to apps +- Added file logback.xml to src/main/resources with appropriate logger names +- Extend HibernateMappingLocations with method that returns list of package names to scan +- Remove references to famous telecommunications company hosts from system.properties file +- Upgrade to EPSDK libraries version 1.2.1 + +Build 1.2.0, 9 Feb 2017 +- Initial release diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml new file mode 100755 index 000000000..e82abd2a1 --- /dev/null +++ b/epsdk-app-onap/pom.xml @@ -0,0 +1,341 @@ + + + 4.0.0 + + + org.openecomp.ecompsdkos + epsdk-app-onap + 1.1.0-SNAPSHOT + war + ECOMP SDK Webapp for OpenSource + ECOMP SDK Web Application for public release + + + UTF-8 + UTF-8 + UTF-8 + 1.1.0-SNAPSHOT + 4.2.0.RELEASE + 4.3.11.Final + + true + + true + https://nexus.onap.org + /content/repositories/snapshots/ + /content/repositories/releases/ + /content/repositories/staging/ + /content/sites/site/org/openecomp/vid/${project.version} + + + + + + doclint-java8-disable + + [1.8,) + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + -Xdoclint:none + + + + + + + + onap + + true + + + + + + + + ecomp-releases + VID Release Repository + ${nexusproxy}${releaseNexusPath} + + + ecomp-snapshots + VID Snapshot Repository + ${nexusproxy}${snapshotNexusPath} + + + ecomp-staging + VID Staging Repository + ${nexusproxy}${stagingNexusPath} + + + + oss-snapshots + oss Central - Snapshots + https://oss.sonatype.org/service/local/repositories/releases/content/ + + + + + + + vid + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.19.1 + + ${skiptests} + + **/Test*.java + **/*Test.java + **/*TestCase.java + + + ${basedir}/war + + + classpath: + + + + + + + org.apache.maven.plugins + maven-war-plugin + 2.0.2 + + + + true + + + ${project.version} + ${maven.build.timestamp} + + + + + org.openecomp.vid + vid-app-common + + + org.openecomp.ecompsdkos + epsdk-app-overlay + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 3.0.0 + + ${skipassembly} + + ${basedir}/distribution.xml + + + + + make-assembly + package + + single + + + + + + + + + + + org.openecomp.ecompsdkos + epsdk-app-overlay + ${epsdk.version} + war + + + org.openecomp.ecompsdkos + epsdk-app-common + ${epsdk.version} + jar + + + org.openecomp.vid + vid-app-common + ${project.version} + war + + + org.openecomp.vid + vid-app-common + ${project.version} + jar + classes + + + + org.openecomp.ecompsdkos + epsdk-core + ${epsdk.version} + + + org.openecomp.ecompsdkos + epsdk-analytics + ${epsdk.version} + + + org.openecomp.ecompsdkos + epsdk-workflow + ${epsdk.version} + + + com.att.eelf + eelf-core + 1.0.0 + + + org.openecomp.vid + vid-app-common + ${version} + war + + + org.openecomp.vid + vid-app-common + ${version} + jar + classes + + + + com.fasterxml.jackson.core + jackson-annotations + 2.6.3 + + + com.fasterxml.jackson.core + jackson-core + 2.6.3 + + + com.fasterxml.jackson.core + jackson-databind + 2.6.3 + + + com.mchange + c3p0 + 0.9.5.2 + + + io.searchbox + jest + 2.0.0 + + + commons-logging + commons-logging + + + + + javax.servlet + javax.servlet-api + 3.1.0 + + + junit + junit + 4.12 + + + + + org.json + json + 20160212 + + + org.quartz-scheduler + quartz + 2.2.1 + + + + c3p0 + c3p0 + + + + + + org.slf4j + jcl-over-slf4j + 1.7.12 + + + org.springframework + spring-context-support + ${springframework.version} + + + org.springframework + spring-core + ${springframework.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-test + ${springframework.version} + + + org.springframework + spring-tx + ${springframework.version} + + + org.springframework + spring-web + ${springframework.version} + + + org.springframework + spring-webmvc + ${springframework.version} + + + diff --git a/epsdk-app-onap/src/main/java/org/openecomp/portalapp/conf/ExternalAppConfig.java b/epsdk-app-onap/src/main/java/org/openecomp/portalapp/conf/ExternalAppConfig.java new file mode 100755 index 000000000..f713cf110 --- /dev/null +++ b/epsdk-app-onap/src/main/java/org/openecomp/portalapp/conf/ExternalAppConfig.java @@ -0,0 +1,249 @@ +/*- + * ================================================================================ + * ECOMP Portal SDK + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +package org.openecomp.portalapp.conf; + +import java.util.ArrayList; +import java.util.List; +import javax.annotation.PostConstruct; +import javax.sql.DataSource; + +//import org.openecomp.portalapp.lm.FusionLicenseManagerImpl; +import org.openecomp.portalapp.login.LoginStrategyImpl; +import org.openecomp.portalapp.scheduler.RegistryAdapter; +import org.openecomp.portalsdk.core.auth.LoginStrategy; +import org.openecomp.portalsdk.core.conf.AppConfig; +import org.openecomp.portalsdk.core.conf.Configurable; +import org.openecomp.portalsdk.core.lm.FusionLicenseManager; +import org.openecomp.portalsdk.core.lm.FusionLicenseManagerUtils; +//import org.openecomp.portalsdk.core.lm.LicenseableClassImpl; +import org.openecomp.portalsdk.core.objectcache.AbstractCacheManager; +import org.openecomp.portalsdk.core.service.DataAccessService; +import org.openecomp.portalsdk.core.util.CacheManager; +import org.openecomp.portalsdk.core.util.SystemProperties; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; +import org.springframework.context.annotation.Profile; +import org.springframework.context.annotation.PropertySource; +import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; +import org.springframework.core.io.Resource; +import org.springframework.jdbc.datasource.init.DataSourceInitializer; +import org.springframework.jdbc.datasource.init.DatabasePopulator; +import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.scheduling.quartz.SchedulerFactoryBean; +import org.springframework.web.servlet.ViewResolver; +import org.springframework.web.servlet.config.annotation.EnableWebMvc; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.openecomp.portalsdk.core.service.DataAccessService; +import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; +/** + * ECOMP Portal SDK sample application. ECOMP Portal SDK core AppConfig class to + * reuse interceptors, view resolvers and other features defined there. + */ +@Configuration +@EnableWebMvc +@ComponentScan(basePackages = "org.openecomp") +@PropertySource(value = { "${container.classpath:}/WEB-INF/conf/app/test.properties" }, ignoreResourceNotFound = true) +@Profile("src") +@EnableAsync +@EnableScheduling +public class ExternalAppConfig extends AppConfig implements Configurable { + + private RegistryAdapter schedulerRegistryAdapter; + /** The Constant LOG. */ + private static final EELFLoggerDelegate LOG = EELFLoggerDelegate.getLogger(ExternalAppConfig.class); + + /** The vid schema script. */ + @Value("classpath:vid-schema.sql") + private Resource vidSchemaScript; + + /** The vid data script. */ + @Value("classpath:vid-data.sql") + private Resource vidDataScript; + + /** + * The Class InnerConfiguration. + */ + @Configuration + @Import(SystemProperties.class) + static class InnerConfiguration { + } + + /** + * View resolver. + * + * @return the view resolver + * @see org.openecomp.portalsdk.core.conf.AppConfig#viewResolver() + */ + public ViewResolver viewResolver() { + return super.viewResolver(); + } + + /** + * @see org.openecomp.portalsdk.core.conf.AppConfig#addResourceHandlers(ResourceHandlerRegistry) + * + * @param registry + */ + public void addResourceHandlers(ResourceHandlerRegistry registry) { + super.addResourceHandlers(registry); + } + + /** + * @see org.openecomp.portalsdk.core.conf.AppConfig#dataAccessService() + */ + public DataAccessService dataAccessService() { + // Echo the JDBC URL to assist developers when starting the app. + System.out.println("ExternalAppConfig: " + SystemProperties.DB_CONNECTIONURL + " is " + + SystemProperties.getProperty(SystemProperties.DB_CONNECTIONURL)); + return super.dataAccessService(); + } + + /** + * Creates a new list with a single entry that is the external app + * definitions.xml path. + * + * @return List of String, size 1 + */ + public List addTileDefinitions() { + List definitions = new ArrayList(); + definitions.add("/WEB-INF/defs/definitions.xml"); + return definitions; + } + + /** + * Adds request interceptors to the specified registry by calling + * {@link AppConfig#addInterceptors(InterceptorRegistry)}, but excludes + * certain paths from the session timeout interceptor. + */ + @Override + public void addInterceptors(InterceptorRegistry registry) { + super.setExcludeUrlPathsForSessionTimeout("/login_external", "*/login_external.htm", "login", "/login.htm", + "/api*", "/single_signon.htm", "/single_signon"); + super.addInterceptors(registry); + } + + /** + * Creates and returns a new instance of a {@link CacheManager} class. + * + * @return New instance of {@link CacheManager} + */ + @Bean + public AbstractCacheManager cacheManager() { + return new CacheManager(); + } + + + + + /** + * Creates and returns a new instance of a {@link FusionLicenseManager}. + * + * @return New instance of {@link FusionLicenseManager}. + */ +// @Bean +// public FusionLicenseManager fusionLicenseManager() { +// return new FusionLicenseManagerImpl(); +// } + + /** + * Creates and returns a new instance of a + * {@link FusionLicenseManagerUtils}. + * + * @return New instance of {@link FusionLicenseManagerUtils}. + */ +// @Bean +// public FusionLicenseManagerUtils fusionLicenseManagerUtils() { +// return new FusionLicenseManagerUtils(); +// } + + /** + * Creates and returns a new instance of a {@link SchedulerFactoryBean} and + * populates it with triggers. + * + * @return New instance of {@link SchedulerFactoryBean} + * @throws Exception + */ + // @Bean // ANNOTATION COMMENTED OUT + // APPLICATIONS REQUIRING QUARTZ SHOULD RESTORE ANNOTATION + public SchedulerFactoryBean schedulerFactoryBean() throws Exception { + SchedulerFactoryBean scheduler = new SchedulerFactoryBean(); + scheduler.setTriggers(schedulerRegistryAdapter.getTriggers()); + scheduler.setConfigLocation(appApplicationContext.getResource("WEB-INF/conf/quartz.properties")); + scheduler.setDataSource(dataSource()); + return scheduler; + } + + /** + * Data source initializer. + * + * @param dataSource the data source + * @return the data source initializer + */ + @Bean + public DataSourceInitializer dataSourceInitializer(DataSource dataSource) { + + LOG.info("Initializing VID data source"); + + final DataSourceInitializer initializer = new DataSourceInitializer(); + initializer.setDataSource(dataSource); + initializer.setDatabasePopulator(databasePopulator()); + return initializer; + } + + /** + * Database populator. + * + * @return the database populator + */ + public DatabasePopulator databasePopulator() { + LOG.info("Populating VID data source"); + + final ResourceDatabasePopulator populator = new ResourceDatabasePopulator(); + populator.addScript(vidSchemaScript); + populator.addScript(vidDataScript); + return populator; + } + + /** + * Sets the scheduler registry adapter. + * + * @param schedulerRegistryAdapter + */ + @Autowired + public void setSchedulerRegistryAdapter(final RegistryAdapter schedulerRegistryAdapter) { + this.schedulerRegistryAdapter = schedulerRegistryAdapter; + } + + /** + * Creates the LoginStrategy + * @return instance of LoginStrategy + */ + @Bean + public LoginStrategy loginStrategy() { + + return new LoginStrategyImpl(); + } +} diff --git a/epsdk-app-onap/src/main/java/org/openecomp/portalapp/conf/ExternalAppInitializer.java b/epsdk-app-onap/src/main/java/org/openecomp/portalapp/conf/ExternalAppInitializer.java new file mode 100755 index 000000000..6e5354a36 --- /dev/null +++ b/epsdk-app-onap/src/main/java/org/openecomp/portalapp/conf/ExternalAppInitializer.java @@ -0,0 +1,47 @@ +/*- + * ================================================================================ + * ECOMP Portal SDK + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +package org.openecomp.portalapp.conf; + +import org.openecomp.portalsdk.core.conf.AppInitializer; + +public class ExternalAppInitializer extends AppInitializer { + + @Override + protected Class[] getRootConfigClasses() { + return super.getRootConfigClasses(); + } + + @Override + protected Class[] getServletConfigClasses() { + Class appConfigClass = ExternalAppConfig.class; + // Show something on stdout to indicate the app is starting. + System.out.println("ExternalAppInitializer: servlet configuration class is " + appConfigClass.getName()); + return new Class[] { appConfigClass }; + } + + /* + * URL request will direct to the Spring dispatcher for processing + */ + @Override + protected String[] getServletMappings() { + return super.getServletMappings(); + } + +} diff --git a/epsdk-app-onap/src/main/java/org/openecomp/portalapp/conf/HibernateMappingLocations.java b/epsdk-app-onap/src/main/java/org/openecomp/portalapp/conf/HibernateMappingLocations.java new file mode 100755 index 000000000..bc751f750 --- /dev/null +++ b/epsdk-app-onap/src/main/java/org/openecomp/portalapp/conf/HibernateMappingLocations.java @@ -0,0 +1,57 @@ +/*- + * ================================================================================ + * ECOMP Portal SDK + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +package org.openecomp.portalapp.conf; + +import org.springframework.context.annotation.Profile; +import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.Resource; +import org.springframework.stereotype.Component; + +import org.openecomp.portalsdk.core.conf.HibernateMappingLocatable; + +@Component +@Profile("src") +public class HibernateMappingLocations implements HibernateMappingLocatable { + + /* + * (non-Javadoc) + * + * @see org.openecomp.portalsdk.core.conf.HibernateMappingLocatable# + * getMappingLocations() + */ + @Override + public Resource[] getMappingLocations() { + return new Resource[] { new ClassPathResource("../fusion/orm/Fusion.hbm.xml"), + new ClassPathResource("../fusion/orm/Workflow.hbm.xml"), + new ClassPathResource("../fusion/orm/RNoteBookIntegration.hbm.xml") }; + } + + /* + * (non-Javadoc) + * + * @see org.openecomp.portalsdk.core.conf.HibernateMappingLocatable# + * getPackagesToScan() + */ + @Override + public String[] getPackagesToScan() { + return new String[] { "org.openecomp" }; + } + +} diff --git a/epsdk-app-onap/src/main/java/org/openecomp/portalapp/lm/FusionLicenseManagerImpl.java b/epsdk-app-onap/src/main/java/org/openecomp/portalapp/lm/FusionLicenseManagerImpl.java new file mode 100755 index 000000000..e6a393668 --- /dev/null +++ b/epsdk-app-onap/src/main/java/org/openecomp/portalapp/lm/FusionLicenseManagerImpl.java @@ -0,0 +1,70 @@ +package org.openecomp.portalapp.lm; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +import javax.servlet.ServletContext; + +import org.openecomp.portalsdk.core.lm.FusionLicenseManager; +import org.springframework.stereotype.Component; + +/* + * Please note that this class is not being used; its a dummy stub to have a qualifying bean for the interface. + */ + +@Component +public class FusionLicenseManagerImpl implements FusionLicenseManager { + + @Override + public void initKeyStoreParam() { + + } + + @Override + public void initCipherParam() { + + } + + @Override + public void initLicenseParam() { + + } + + @Override + public void doInitWork() { + + } + + @Override + public int installLicense() { + return 0; + } + + @Override + public synchronized int verifyLicense(ServletContext context) { + return 0; + } + + @Override + public void generateLicense(Map clientInfoMap, List ipAddressList) throws Exception { + + } + + @Override + public String nvl(String s) { + return null; + } + + @Override + public Date getExpiredDate() { + return null; + } + + @Override + public void setExpiredDate(Date expiredDate) { + + } + + +} diff --git a/epsdk-app-onap/src/main/java/org/openecomp/portalapp/lm/LicenseableClassImpl.java b/epsdk-app-onap/src/main/java/org/openecomp/portalapp/lm/LicenseableClassImpl.java new file mode 100755 index 000000000..d688987ff --- /dev/null +++ b/epsdk-app-onap/src/main/java/org/openecomp/portalapp/lm/LicenseableClassImpl.java @@ -0,0 +1,62 @@ +/*- + * ================================================================================ + * eCOMP Portal SDK + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +package org.openecomp.portalapp.lm; + +import java.io.FileNotFoundException; +import java.io.InputStream; + +import org.openecomp.portalsdk.core.lm.LicenseableClass; + +/* + * Please note that this class is not being used; its a dummy stub to have a qualifying bean for the interface. + */ + +public class LicenseableClassImpl implements LicenseableClass { + + public String getApplicationName() { + return ""; + } + + public InputStream getPublicKeystoreAsInputStream() throws FileNotFoundException { + return null; + } + + public String getAlias() { + return ""; + } + + public String getKeyPasswd() { + return ""; + } + + public String getPublicKeystorePassword() { + return ""; + } + + public String getCipherParamPassword() { + return ""; + } + + @SuppressWarnings("rawtypes") + public Class getClassToLicense() { + return this.getClass(); + } +} + diff --git a/epsdk-app-onap/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java b/epsdk-app-onap/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java new file mode 100755 index 000000000..3c3dcb066 --- /dev/null +++ b/epsdk-app-onap/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java @@ -0,0 +1,70 @@ +package org.openecomp.portalapp.login; + +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.openecomp.portalsdk.core.auth.LoginStrategy; +import org.openecomp.portalsdk.core.onboarding.exception.PortalAPIException; +import org.openecomp.portalsdk.core.onboarding.util.CipherUtil; +import org.openecomp.portalsdk.core.onboarding.util.PortalApiConstants; +import org.openecomp.portalsdk.core.onboarding.util.PortalApiProperties; +import org.springframework.web.servlet.ModelAndView; + +public class LoginStrategyImpl extends LoginStrategy { + + @Override + public ModelAndView doLogin(HttpServletRequest request, HttpServletResponse response) throws Exception { + //'login' for opensource is same as 'external' login. + return doExternalLogin(request, response); + } + + @Override + public String getUserId(HttpServletRequest request) throws PortalAPIException { + // Check ECOMP Portal cookie + if (!isLoginCookieExist(request)) + return null; + + String userid = null; + try { + userid = getUserIdFromCookie(request); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return userid; + } + + private static String getUserIdFromCookie(HttpServletRequest request) throws Exception { + String userId = ""; + Cookie[] cookies = request.getCookies(); + Cookie userIdcookie = null; + if (cookies != null) + for (Cookie cookie : cookies) + if (cookie.getName().equals(USER_ID)) + userIdcookie = cookie; + if(userIdcookie!=null){ + userId = CipherUtil.decrypt(userIdcookie.getValue(), + PortalApiProperties.getProperty(PortalApiConstants.Decryption_Key)); + } + return userId; + + } + + private static boolean isLoginCookieExist(HttpServletRequest request) { + Cookie ep = getCookie(request, EP_SERVICE); + return (ep != null); + } + + private static Cookie getCookie(HttpServletRequest request, String cookieName) { + Cookie[] cookies = request.getCookies(); + if (cookies != null) + for (Cookie cookie : cookies) + if (cookie.getName().equals(cookieName)) + return cookie; + + return null; + } + + +} diff --git a/epsdk-app-onap/src/main/java/org/openecomp/portalapp/scheduler/Register.java b/epsdk-app-onap/src/main/java/org/openecomp/portalapp/scheduler/Register.java new file mode 100755 index 000000000..acf934dd7 --- /dev/null +++ b/epsdk-app-onap/src/main/java/org/openecomp/portalapp/scheduler/Register.java @@ -0,0 +1,71 @@ +/*- + * ================================================================================ + * ECOMP Portal SDK + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +package org.openecomp.portalapp.scheduler; + +import java.util.ArrayList; +import java.util.List; + +import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; +import org.openecomp.portalsdk.core.scheduler.Registerable; +import org.openecomp.portalsdk.core.util.SystemProperties; +import org.quartz.Trigger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.DependsOn; +import org.springframework.stereotype.Component; + +@Component +@DependsOn({ "logRegistry", "systemProperties" }) +public class Register implements Registerable { + + EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(Register.class); + + private List scheduleTriggers = new ArrayList(); + Trigger trigger[] = new Trigger[1]; + + @Autowired + private LogRegistry logRegistry; + + @Override + public Trigger[] getTriggers() { + return getScheduleTriggers().toArray(trigger); + } + + @Override + public void registerTriggers() { + // if the property value is not available; the cron will not be added + // and can be ignored. its safe to ignore the exceptions + try { + if (SystemProperties.getProperty(SystemProperties.LOG_CRON) != null) + getScheduleTriggers().add(logRegistry.getTrigger()); + } catch (IllegalStateException ies) { + logger.info(EELFLoggerDelegate.debugLogger, ("Log Cron not available")); + } + + } + + public List getScheduleTriggers() { + return scheduleTriggers; + } + + public void setScheduleTriggers(List scheduleTriggers) { + this.scheduleTriggers = scheduleTriggers; + } + +} diff --git a/epsdk-app-onap/src/main/java/org/openecomp/portalapp/scheduler/RegistryAdapter.java b/epsdk-app-onap/src/main/java/org/openecomp/portalapp/scheduler/RegistryAdapter.java new file mode 100755 index 000000000..902c545d3 --- /dev/null +++ b/epsdk-app-onap/src/main/java/org/openecomp/portalapp/scheduler/RegistryAdapter.java @@ -0,0 +1,92 @@ +/*- + * ================================================================================ + * ECOMP Portal SDK + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +package org.openecomp.portalapp.scheduler; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.openecomp.portalsdk.core.scheduler.Registerable; +import org.openecomp.portalsdk.workflow.services.WorkflowScheduleService; +import org.quartz.Trigger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.quartz.SchedulerFactoryBean; +import org.springframework.stereotype.Component; + +@Component +public class RegistryAdapter { + + @Autowired + private Registerable registry; + + @Autowired + private WorkflowScheduleService workflowScheduleService; + + private SchedulerFactoryBean schedulerBean; + + Trigger trigger[] = new Trigger[1]; + + public Trigger[] getTriggers() { + + registry.registerTriggers(); + + List allTriggers = new ArrayList(); + + List coreTriggers = addCoreTriggers(); + final Trigger[] extTriggerArray = registry.getTriggers(); + + allTriggers.addAll(Arrays.asList(extTriggerArray)); + allTriggers.addAll(coreTriggers); + + return allTriggers.toArray(trigger); + } + + public List addCoreTriggers() { + // On startup of the application after crash recovery, invoke workflow + // schedule trigger + List triggers = getWorkflowScheduleService().triggerWorkflowScheduling(); + return triggers; + } + + public void setSchedulerBean(SchedulerFactoryBean _schedulerBean) { + schedulerBean = _schedulerBean; + } + + public SchedulerFactoryBean getSchedulerBean() { + return schedulerBean; + } + + public Registerable getRegistry() { + return registry; + } + + public void setRegistry(Registerable registry) { + this.registry = registry; + } + + public WorkflowScheduleService getWorkflowScheduleService() { + return workflowScheduleService; + } + + public void setWorkflowScheduleService(WorkflowScheduleService workflowScheduleService) { + this.workflowScheduleService = workflowScheduleService; + } + +} diff --git a/epsdk-app-onap/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java b/epsdk-app-onap/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java new file mode 100755 index 000000000..4145aa3d3 --- /dev/null +++ b/epsdk-app-onap/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java @@ -0,0 +1,64 @@ +/*- + * ================================================================================ + * ECOMP Portal SDK + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +package org.openecomp.portalapp.service; + +import java.util.Set; + +import org.openecomp.portalsdk.core.domain.Role; +import org.openecomp.portalsdk.core.domain.User; +import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + + +@Service("adminAuthExtension") +@Transactional +/** + * Provides empty implementations of the methods in IAdminAuthExtension. + */ +public class AdminAuthExtension implements IAdminAuthExtension { + + EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(AdminAuthExtension.class); + + /* + * (non-Javadoc) + * @see org.openecomp.portalapp.service.IAdminAuthExtension#saveUserExtension(org.openecomp.portalsdk.core.domain.User) + */ + public void saveUserExtension(User user) { + logger.debug("saveUserExtension"); + } + + /* + * (non-Javadoc) + * @see org.openecomp.portalapp.service.IAdminAuthExtension#editUserExtension(org.openecomp.portalsdk.core.domain.User) + */ + public void editUserExtension(User user) { + logger.debug("editUserExtension"); + } + + /* + * (non-Javadoc) + * @see org.openecomp.portalapp.service.IAdminAuthExtension#saveUserRoleExtension(java.util.Set, org.openecomp.portalsdk.core.domain.User) + */ + public void saveUserRoleExtension(Set roles, User user) { + logger.debug("saveUserRoleExtension"); + } + +} diff --git a/epsdk-app-onap/src/main/resources/cache.ccf b/epsdk-app-onap/src/main/resources/cache.ccf new file mode 100755 index 000000000..1a91d9d6c --- /dev/null +++ b/epsdk-app-onap/src/main/resources/cache.ccf @@ -0,0 +1,30 @@ +# DEFAULT CACHE REGION +jcs.default=DC +jcs.default.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes +jcs.default.cacheattributes.MaxObjects=1000 +jcs.default.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache +jcs.default.elementattributes=org.apache.jcs.engine.ElementAttributes +jcs.default.elementattributes.IsEternal=true +jcs.default.elementattributes.IsSpool=true + + +# MEMORY SHRINKING CONFIGURATION (Commented) +#jcs.default.cacheattributes.UseMemoryShrinker=true +#jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600 +#jcs.default.cacheattributes.ShrinkerIntervalSeconds=60 +#jcs.default.cacheattributes.MaxSpoolPerRun=500 +#jcs.default.elementattributes=org.apache.jcs.engine.ElementAttributes +#jcs.default.elementattributes.IsEternal=false + + +# AUXILLARY CACHE CONFIGURATION +jcs.auxiliary.DC=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory +jcs.auxiliary.DC.attributes=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes +jcs.auxiliary.DC.attributes.DiskPath=/tmp + + +# PRE-DEFINED REGION FOR LOOKUP DATA +jcs.region.lookUpObjectCache=DC +jcs.region.lookUpObjectCache.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes +jcs.region.lookUpObjectCache.cacheattributes.MaxObjects=4000 +jcs.region.lookUpObjectCache.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache diff --git a/epsdk-app-onap/src/main/resources/cache_template.ccf b/epsdk-app-onap/src/main/resources/cache_template.ccf new file mode 100755 index 000000000..0ff68b83f --- /dev/null +++ b/epsdk-app-onap/src/main/resources/cache_template.ccf @@ -0,0 +1,30 @@ +# DEFAULT CACHE REGION +jcs.default=DC +jcs.default.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes +jcs.default.cacheattributes.MaxObjects=1000 +jcs.default.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache +jcs.default.elementattributes=org.apache.jcs.engine.ElementAttributes +jcs.default.elementattributes.IsEternal=true +jcs.default.elementattributes.IsSpool=true + + +# MEMORY SHRINKING CONFIGURATION (Commented) +#jcs.default.cacheattributes.UseMemoryShrinker=true +#jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600 +#jcs.default.cacheattributes.ShrinkerIntervalSeconds=60 +#jcs.default.cacheattributes.MaxSpoolPerRun=500 +#jcs.default.elementattributes=org.apache.jcs.engine.ElementAttributes +#jcs.default.elementattributes.IsEternal=false + + +# AUXILLARY CACHE CONFIGURATION +jcs.auxiliary.DC=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory +jcs.auxiliary.DC.attributes=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes +jcs.auxiliary.DC.attributes.DiskPath=${CACHE_DIRECTORY} + + +# PRE-DEFINED REGION FOR LOOKUP DATA +jcs.region.lookUpObjectCache=DC +jcs.region.lookUpObjectCache.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes +jcs.region.lookUpObjectCache.cacheattributes.MaxObjects=4000 +jcs.region.lookUpObjectCache.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache diff --git a/epsdk-app-onap/src/main/resources/catalog.json b/epsdk-app-onap/src/main/resources/catalog.json new file mode 100755 index 000000000..e5fb52136 --- /dev/null +++ b/epsdk-app-onap/src/main/resources/catalog.json @@ -0,0 +1,174 @@ +{ + "services": { + "0346aa9f-57b7-458a-9681-daf5b19d52b0": { + "uuid": "0346aa9f-57b7-458a-9681-daf5b19d52b0", + "name": "The Worst Service", + "version": "1.0", + "toscaModelURL": "sampleTosca.csar", + "category": "Bad Services", + "lifecycleState": "NOT_CERTIFIED_CHECKOUT", + "lastUpdaterUserId": "example@example.org", + "lastUpdaterFullName": "Example User", + "distributionStatus": "DISTRIBUTION_REJECTED", + "artifacts": [], + "resources": [] + }, + "1346aa9f-57b7-458a-9681-daf5b19d52b1": { + "uuid": "1346aa9f-57b7-458a-9681-daf5b19d52b1", + "name": "The Worst Service", + "version": "1.1", + "toscaModelURL": "sampleTosca.csar", + "category": "Bad Services", + "lifecycleState": "CERTIFIED", + "lastUpdaterUserId": "example@example.org", + "lastUpdaterFullName": "Example User", + "distributionStatus": "DISTRIBUTED", + "artifacts": [], + "resources": [] + }, + "3346aa9f-57b7-458a-9681-daf5b19d52b3": { + "uuid": "3346aa9f-57b7-458a-9681-daf5b19d52b3", + "name": "Bland Service", + "version": "1.9", + "toscaModelURL": "sampleTosca.csar", + "category": "Neutral Services", + "lifecycleState": "CERTIFIED", + "lastUpdaterUserId": "example@example.org", + "lastUpdaterFullName": "Example User", + "distributionStatus": "DISTRIBUTION_NOT_APPROVED", + "artifacts": [], + "resources": [] + }, + "2346aa9f-57b7-458a-9681-daf5b19d52b2": { + "uuid": "2346aa9f-57b7-458a-9681-daf5b19d52b2", + "name": "The Best Service", + "version": "1.3", + "toscaModelURL": "sampleTosca.csar", + "category": "Good Services", + "lifecycleState": "CERTIFIED", + "lastUpdaterUserId": "example@example.org", + "lastUpdaterFullName": "Example User", + "distributionStatus": "DISTRIBUTION_APPROVED", + "artifacts": [ + { + "artifactUUID": "0cf78c81-1246-45e7-a190-eaa309ee5680", + "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680", + "artifactName": "The Worst Artifact", + "artifactType": "HEAT", + "artifactDescription": "This is the worst artifact", + "artifactURL": "http://www.openecomp.org/", + "artifactTimeout": "60", + "artifactChecksum": "A worthy checksum", + "artifactVersion": "0.1", + }, + { + "artifactUUID": "1cf78c81-1246-45e7-a190-eaa309ee5681", + "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680", + "artifactName": "The Worst Artifact", + "artifactType": "HEAT", + "artifactDescription": "This is the worst artifact", + "artifactURL": "http://www.openecomp.org/", + "artifactTimeout": "60", + "artifactChecksum": "A worthy checksum", + "artifactVersion": "0.1", + }, + { + "artifactUUID": "2cf78c81-1246-45e7-a190-eaa309ee5682", + "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680", + "artifactName": "The Worst Artifact", + "artifactType": "HEAT", + "artifactDescription": "This is the worst artifact", + "artifactURL": "http://www.openecomp.org/", + "artifactTimeout": "60", + "artifactChecksum": "A worthy checksum", + "artifactVersion": "0.1", + } + ], + "resources": [] + } + }, + "resources": { + "2f92b5b0-10ff-4cf4-9531-88546fe88a42": { + "uuid": "2f92b5b0-10ff-4cf4-9531-88546fe88a42", + "invariantUUID": "df92b5b0-10ff-4cf4-9531-88546fe88a4d", + "name": "The Worst Resource", + "version": "0.1", + "toscaModelURL": "sampleTosca.csar", + "toscaModel": "http://www.openecomp.org/", + "toscaResourceName": "The Worst Resource (TOSCA)", + "category": "Bad Resources", + "subCategory": "Really Bad Resources", + "resourceType": "VF", + "lifecycleState": "CERTIFIED", + "lastUpdaterUserId": "example@example.org", + "lastUpdaterFullName": "Example User", + "artifacts": [ + { + "artifactUUID": "0cf78c81-1246-45e7-a190-eaa309ee5680", + "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680", + "artifactName": "The Worst Artifact", + "artifactType": "HEAT", + "artifactDescription": "This is the worst artifact", + "artifactURL": "http://www.openecomp.org/", + "artifactTimeout": "60", + "artifactChecksum": "A worthy checksum", + "artifactVersion": "0.1", + }, + { + "artifactUUID": "1cf78c81-1246-45e7-a190-eaa309ee5681", + "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680", + "artifactName": "The Worst Artifact", + "artifactType": "HEAT", + "artifactDescription": "This is the worst artifact", + "artifactURL": "http://www.openecomp.org/", + "artifactTimeout": "60", + "artifactChecksum": "A worthy checksum", + "artifactVersion": "0.1", + }, + { + "artifactUUID": "2cf78c81-1246-45e7-a190-eaa309ee5682", + "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680", + "artifactName": "The Worst Artifact", + "artifactType": "HEAT", + "artifactDescription": "This is the worst artifact", + "artifactURL": "http://www.openecomp.org/", + "artifactTimeout": "60", + "artifactChecksum": "A worthy checksum", + "artifactVersion": "0.1", + } + ] + }, + "0f92b5b0-10ff-4cf4-9531-88546fe88a40": { + "uuid": "0f92b5b0-10ff-4cf4-9531-88546fe88a40", + "invariantUUID": "df92b5b0-10ff-4cf4-9531-88546fe88a4d", + "name": "The Worst Resource", + "version": "0.1", + "toscaModelURL": "sampleTosca.csar", + "toscaModel": "http://www.openecomp.org/", + "toscaResourceName": "The Worst Resource (TOSCA)", + "category": "Bad Resources", + "subCategory": "Really Bad Resources", + "resourceType": "VF", + "lifecycleState": "CERTIFIED", + "lastUpdaterUserId": "example@example.org", + "lastUpdaterFullName": "Example User", + "artifacts": [] + }, + "1f92b5b0-10ff-4cf4-9531-88546fe88a41": { + "uuid": "1f92b5b0-10ff-4cf4-9531-88546fe88a41", + "invariantUUID": "df92b5b0-10ff-4cf4-9531-88546fe88a4d", + "name": "The Worst Resource", + "version": "0.1", + "toscaModelURL": "sampleTosca.csar", + "toscaModel": "http://www.openecomp.org/", + "toscaResourceName": "The Worst Resource (TOSCA)", + "category": "Bad Resources", + "subCategory": "Really Bad Resources", + "resourceType": "VF", + "lifecycleState": "CERTIFIED", + "lastUpdaterUserId": "example@example.org", + "lastUpdaterFullName": "Example User", + "artifacts": [] + } + } +} \ No newline at end of file diff --git a/epsdk-app-onap/src/main/resources/logback.xml b/epsdk-app-onap/src/main/resources/logback.xml new file mode 100755 index 000000000..1f0a6a9df --- /dev/null +++ b/epsdk-app-onap/src/main/resources/logback.xml @@ -0,0 +1,369 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${defaultLoggerPattern} + + + + + + + + + + + + ${logDirectory}/${generalLogName}.log + + + ${logDirectory}/${generalLogName}.%d{yyyy-MM-dd}.log.zip + + + 30 + 3GB + + + + ${applicationLoggerPattern} + + + + + + 256 + + true + + + + + + + + + + + + + + + + + + + ${logDirectory}/${auditLogName}.log + + + ${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.log.zip + + + 30 + 3GB + + + + ${auditLoggerPattern} + + + + 256 + + + + + ${logDirectory}/${metricsLogName}.log + + + ${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.log.zip + + + 30 + 3GB + + + + ${metricsLoggerPattern} + + + + + + 256 + + + + + ${logDirectory}/${errorLogName}.log + + + ${logDirectory}/${errorLogName}.%d{yyyy-MM-dd}.log.zip + + + 30 + 3GB + + + + ${errorLoggerPattern} + + + + + 256 + + + + + ${debugLogDirectory}/${debugLogName}.log + + + ${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.log.zip + + + 30 + 3GB + + + + ${defaultLoggerPattern} + + + + + 256 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/epsdk-app-onap/src/main/resources/logback_template.xml b/epsdk-app-onap/src/main/resources/logback_template.xml new file mode 100755 index 000000000..b516728df --- /dev/null +++ b/epsdk-app-onap/src/main/resources/logback_template.xml @@ -0,0 +1,341 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${defaultPattern} + + + + + + + + + + + + ${logDirectory}/${generalLogName}.log + + ${logDirectory}/${generalLogName}.%i.log.zip + + 1 + 9 + + + 5MB + + + ${defaultPattern} + + + + + + 256 + + + + + + + + + + + + + + + + + + + ${logDirectory}/${auditLogName}.log + + ${logDirectory}/${auditLogName}.%i.log.zip + + 1 + 9 + + + 5MB + + + ${defaultPattern} + + + + 256 + + + + + ${logDirectory}/${metricsLogName}.log + + ${logDirectory}/${metricsLogName}.%i.log.zip + + 1 + 9 + + + 5MB + + + + ${defaultPattern} + + + + + + 256 + + + + + ${logDirectory}/${errorLogName}.log + + ${logDirectory}/${errorLogName}.%i.log.zip + + 1 + 9 + + + 5MB + + + ${defaultPattern} + + + + + 256 + + + + + ${debugLogDirectory}/${debugLogName}.log + + ${debugLogDirectory}/${debugLogName}.%i.log.zip + + 1 + 9 + + + 5MB + + + ${debugLoggerPattern} + + + + + 256 + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/epsdk-app-onap/src/main/resources/mchange-log.properties b/epsdk-app-onap/src/main/resources/mchange-log.properties new file mode 100755 index 000000000..37e6f50cd --- /dev/null +++ b/epsdk-app-onap/src/main/resources/mchange-log.properties @@ -0,0 +1,23 @@ +### +# ================================================================================ +# eCOMP Portal SDK +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ================================================================================ +### +# Direct the proprietary logger used by com.mchange.c3p0 to use slf4j + +com.mchange.v2.log.MLog=com.mchange.v2.log.FallbackMLog +com.mchange.v2.log.FallbackMLog.DEFAULT_CUTOFF_LEVEL=OFF diff --git a/epsdk-app-onap/src/main/resources/my.cnf b/epsdk-app-onap/src/main/resources/my.cnf new file mode 100755 index 000000000..b47f64f1f --- /dev/null +++ b/epsdk-app-onap/src/main/resources/my.cnf @@ -0,0 +1,192 @@ +# MariaDB database server configuration file. +# +# You can copy this file to one of: +# - "/etc/mysql/my.cnf" to set global options, +# - "~/.my.cnf" to set user-specific options. +# +# One can use all long options that the program supports. +# Run program with --help to get a list of available options and with +# --print-defaults to see which it would actually understand and use. +# +# For explanations see +# http://dev.mysql.com/doc/mysql/en/server-system-variables.html + +# This will be passed to all mysql clients +# It has been reported that passwords should be enclosed with ticks/quotes +# escpecially if they contain "#" chars... +# Remember to edit /etc/mysql/debian.cnf when changing the socket location. +[client] +port = 3306 +socket = /var/run/mysqld/mysqld.sock + +# Here is entries for some specific programs +# The following values assume you have at least 32M ram + +# This was formally known as [safe_mysqld]. Both versions are currently parsed. +[mysqld_safe] +socket = /var/run/mysqld/mysqld.sock +nice = 0 + +[mysqld] +lower_case_table_names = 1 +skip-host-cache +skip-name-resolve +# +# * Basic Settings +# +#user = mysql +pid-file = /var/run/mysqld/mysqld.pid +socket = /var/run/mysqld/mysqld.sock +port = 3306 +basedir = /usr +datadir = /var/lib/mysql +tmpdir = /tmp +lc_messages_dir = /usr/share/mysql +lc_messages = en_US +skip-external-locking +# +# Instead of skip-networking the default is now to listen only on +# localhost which is more compatible and is not less secure. +#bind-address = 127.0.0.1 +# +# * Fine Tuning +# +max_connections = 100 +connect_timeout = 5 +wait_timeout = 600 +max_allowed_packet = 16M +thread_cache_size = 128 +sort_buffer_size = 4M +bulk_insert_buffer_size = 16M +tmp_table_size = 32M +max_heap_table_size = 32M +# +# * MyISAM +# +# This replaces the startup script and checks MyISAM tables if needed +# the first time they are touched. On error, make copy and try a repair. +myisam_recover_options = BACKUP +key_buffer_size = 128M +#open-files-limit = 2000 +table_open_cache = 400 +myisam_sort_buffer_size = 512M +concurrent_insert = 2 +read_buffer_size = 2M +read_rnd_buffer_size = 1M +# +# * Query Cache Configuration +# +# Cache only tiny result sets, so we can fit more in the query cache. +query_cache_limit = 128K +query_cache_size = 64M +# for more write intensive setups, set to DEMAND or OFF +#query_cache_type = DEMAND +# +# * Logging and Replication +# +# Both location gets rotated by the cronjob. +# Be aware that this log type is a performance killer. +# As of 5.1 you can enable the log at runtime! +#general_log_file = /var/log/mysql/mysql.log +#general_log = 1 +# +# Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf. +# +# we do want to know about network errors and such +#log_warnings = 2 +# +# Enable the slow query log to see queries with especially long duration +#slow_query_log[={0|1}] +slow_query_log_file = /var/log/mysql/mariadb-slow.log +long_query_time = 10 +#log_slow_rate_limit = 1000 +#log_slow_verbosity = query_plan + +#log-queries-not-using-indexes +#log_slow_admin_statements +# +# The following can be used as easy to replay backup logs or for replication. +# note: if you are setting up a replication slave, see README.Debian about +# other settings you may need to change. +#server-id = 1 +#report_host = master1 +#auto_increment_increment = 2 +#auto_increment_offset = 1 +#log_bin = /var/log/mysql/mariadb-bin +#log_bin_index = /var/log/mysql/mariadb-bin.index +# not fab for performance, but safer +#sync_binlog = 1 +expire_logs_days = 10 +max_binlog_size = 100M +# slaves +#relay_log = /var/log/mysql/relay-bin +#relay_log_index = /var/log/mysql/relay-bin.index +#relay_log_info_file = /var/log/mysql/relay-bin.info +#log_slave_updates +#read_only +# +# If applications support it, this stricter sql_mode prevents some +# mistakes like inserting invalid dates etc. +#sql_mode = NO_ENGINE_SUBSTITUTION,TRADITIONAL +# +# * InnoDB +# +# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/. +# Read the manual for more InnoDB related options. There are many! +default_storage_engine = InnoDB +# you can't just change log file size, requires special procedure +#innodb_log_file_size = 50M +innodb_buffer_pool_size = 256M +innodb_log_buffer_size = 8M +innodb_file_per_table = 1 +innodb_open_files = 400 +innodb_io_capacity = 400 +innodb_flush_method = O_DIRECT +# +# * Security Features +# +# Read the manual, too, if you want chroot! +# chroot = /var/lib/mysql/ +# +# For generating SSL certificates I recommend the OpenSSL GUI "tinyca". +# +# ssl-ca=/etc/mysql/cacert.pem +# ssl-cert=/etc/mysql/server-cert.pem +# ssl-key=/etc/mysql/server-key.pem + +# +# * Galera-related settings +# +[galera] +# Mandatory settings +#wsrep_on=ON +#wsrep_provider= +#wsrep_cluster_address= +#binlog_format=row +#default_storage_engine=InnoDB +#innodb_autoinc_lock_mode=2 +# +# Allow server to accept connections on all interfaces. +# +#bind-address=0.0.0.0 +# +# Optional setting +#wsrep_slave_threads=1 +#innodb_flush_log_at_trx_commit=0 + +[mysqldump] +quick +quote-names +max_allowed_packet = 16M + +[mysql] +#no-auto-rehash # faster start of mysql but no tab completion + +[isamchk] +key_buffer = 16M + +# +# * IMPORTANT: Additional settings that can override those from this file! +# The files must end with '.cnf', otherwise they'll be ignored. +# +!includedir /etc/mysql/conf.d/ \ No newline at end of file diff --git a/epsdk-app-onap/src/main/resources/portal.properties b/epsdk-app-onap/src/main/resources/portal.properties new file mode 100755 index 000000000..6cc64834a --- /dev/null +++ b/epsdk-app-onap/src/main/resources/portal.properties @@ -0,0 +1,62 @@ +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ================================================================================ +### +# Properties read by ECOMP Framework library, ecompFW.jar + +########################################################################## +# The following properties should NOT be changed by partner applications. +########################################################################## + +portal.api.prefix = /api +max.idle.time = 5 +user.attribute.name = user_attribute + +#Use REST API instead of UEB to fetch the functional menu data +use_rest_for_functional_menu=true + +########################################################################## +# The following properties MUST be changed by partner applications. +########################################################################## + +# Name of java class that implements the OnBoardingApiService interface. +portal.api.impl.class = org.openecomp.portalapp.service.OnBoardingApiServiceImpl + +# Log On for single sign on +ecomp_redirect_url = http://portal.openecomp.org:8989/login + +# URL of the ECOMP Portal REST API +ecomp_rest_url = http://portal.openecomp.org:50580/ecompportal/auxapi + +# Applications do not need to run a UEB listener after 1607. +ueb_listeners_enable = false + +# UEB Configuration +# In release 1607, all 6 entries below were required. +# In release 1610, if key ueb_listeners_enable is set to false, +# then only the ueb_app_key is required. +# UEB servers +ueb_url_list = todo_ueb_url_list +# ECOMP Portal listens on this UEB topic +ecomp_portal_inbox_name = ECOMP-PORTAL-INBOX-DEV-LOCAL + +# Replace these 3 default values with the ones for your specific App, +# as shown on the on-boarding page on the ECOMP Portal web application. +ueb_app_key = oVGikIIFjzjUNtph +ueb_app_secret = 8xJNPcgKJJgHhfbth6C1yN3e +ueb_app_mailbox_name = ECOMP-PORTAL-OUTBOX-TEST-77621 +# Consumer group name for UEB topic. +# Use the special tag to generate a unique one for each sdk-app server. +ueb_app_consumer_group_name = {UUID} + +decryption_key = AGLDdG4D04BKm2IxIWEr8o== diff --git a/epsdk-app-onap/src/main/resources/portal_template.properties b/epsdk-app-onap/src/main/resources/portal_template.properties new file mode 100755 index 000000000..8f15bb8eb --- /dev/null +++ b/epsdk-app-onap/src/main/resources/portal_template.properties @@ -0,0 +1,31 @@ +# Properties read by ECOMP Framework library, ecompFW.jar + +portal.api.impl.class = org.openecomp.portalsdk.core.onboarding.client.OnBoardingApiServiceImpl +portal.api.prefix = /api +max.idle.time = 5 +user.attribute.name = user_attribute + +# Log On for single sign on +ecomp_redirect_url = ${VID_ECOMP_REDIRECT_URL} + + +# URL of the ECOMP Portal REST API +ecomp_rest_url = ${VID_ECOMP_REST_URL} + +# UEB servers +ueb_url_list = ${VID_UEB_URL_LIST} + +# ECOMP Portal listens here +ecomp_portal_inbox_name = ${VID_ECOMP_PORTAL_INBOX_NAME} + +# Replace these 3 default values with the ones for your specific App, +# as shown on the on-boarding page on the ECOMP Portal website. +ueb_app_key = ${VID_UEB_APP_KEY} +ueb_app_secret = ${VID_UEB_APP_SECRET} +ueb_app_mailbox_name = ${VID_UEB_APP_MAILBOX_NAME} +# Consumer group name for UEB topic. +# Use the special tag to generate a unique one for each sdk-app server. +ueb_app_consumer_group_name = ${VID_UEB_CONSUMER_GROUP} + +ueb_listeners_enable = ${VID_UEB_LISTENERS_ENABLE} +ueb_rest_for_function_menu = true diff --git a/vid/src/main/resources/sampleTosca.csar b/epsdk-app-onap/src/main/resources/sampleTosca.csar old mode 100644 new mode 100755 similarity index 100% rename from vid/src/main/resources/sampleTosca.csar rename to epsdk-app-onap/src/main/resources/sampleTosca.csar diff --git a/epsdk-app-onap/src/main/resources/state-rules.drl b/epsdk-app-onap/src/main/resources/state-rules.drl new file mode 100755 index 000000000..5b139f270 --- /dev/null +++ b/epsdk-app-onap/src/main/resources/state-rules.drl @@ -0,0 +1,38 @@ +package org.openecomp.portalsdk.core.drools; +global String age + +rule "Default" +when +$droolsRuleService : DroolsRuleServiceImpl( state != null ) +then +System.out.println($droolsRuleService.accessLabel() +" "+ $droolsRuleService.getState() +" state legal age is " + getDefaultIfNull(age)); +$droolsRuleService.setResultsString($droolsRuleService.getState()+" state legal age is " + getDefaultIfNull(age)); +end + +rule "Drools NJ" +when +$droolsRuleService : DroolsRuleServiceImpl( state == "NJ" ) +then +System.out.println($droolsRuleService.accessLabel() +" "+ "NJ state legal age is " + getDefaultIfNull(age)); +$droolsRuleService.setResultsString("NJ state legal age is " + getDefaultIfNull(age)); +end + +rule "Drools KY" +when +$droolsRuleService : DroolsRuleServiceImpl( state == "KY" ) +then +System.out.println($droolsRuleService.accessLabel() +" "+ "KY state legal age is " + getDefaultIfNull("20")); +$droolsRuleService.setResultsString("KY state legal age is " + getDefaultIfNull("20")); +end + +rule "Drools NY" +when +$droolsRuleService : DroolsRuleServiceImpl( state == "NY" ) +then +System.out.println($droolsRuleService.accessLabel() +" "+ "NY state legal age is " + getDefaultIfNull("21")); +$droolsRuleService.setResultsString("NY state legal age is " + getDefaultIfNull("21")); +end + +function String getDefaultIfNull(String age) { +return age == null ? "18" : age; +} diff --git a/epsdk-app-onap/src/main/resources/vid-data.sql b/epsdk-app-onap/src/main/resources/vid-data.sql new file mode 100755 index 000000000..497ca2028 --- /dev/null +++ b/epsdk-app-onap/src/main/resources/vid-data.sql @@ -0,0 +1,349 @@ +/*- + * ============LICENSE_START======================================================= + * VID + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ +USE vid_openecomp_epsdk; + +DELETE FROM `fn_datasource`; +TRUNCATE `fn_menu`; +DELETE FROM `fn_role_function`; +DELETE FROM `fn_restricted_url`; +DELETE FROM `fn_tab_selected`; +DELETE FROM `fn_tab`; +DELETE FROM `fn_function`; +DELETE FROM `fn_lu_alert_method`; +DELETE FROM `fn_lu_activity`; +DELETE FROM `fn_lu_menu_set`; +DELETE FROM `fn_lu_priority`; +DELETE FROM `fn_lu_tab_set`; + +-- +-- Dumping data for table `cr_raptor_action_img` +-- +REPLACE INTO `cr_raptor_action_img` VALUES ('CALENDAR','/static/fusion/raptor/img/Calendar-16x16.png'); +REPLACE INTO `cr_raptor_action_img` VALUES ('DELETE','/static/fusion/raptor/img/deleteicon.gif'); + +-- +-- Dumping data for table `fn_app` +-- +INSERT IGNORE INTO `fn_app` VALUES (1,'Default',null,'Some Default Description','Some Default Note',null,null,null,'ECPP','?',1,'okYTaDrhzibcbGVq5mjkVQ==','N','N',null,'Default',null,null,'ECOMP-PORTAL-INBOX'); + + + +-- +-- Dumping data for table `fn_function` +-- +INSERT INTO `fn_function` VALUES ('1','test role function') ON DUPLICATE KEY UPDATE FUNCTION_NAME='test role function'; +INSERT INTO `fn_function` VALUES ('doclib','Document Library') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Document Library'; +INSERT INTO `fn_function` VALUES ('doclib_admin','Document Library Admin') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Document Library Admin'; +INSERT INTO `fn_function` VALUES ('login','Login') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Login'; +INSERT INTO `fn_function` VALUES ('menu_admin','Admin Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Admin Menu'; +INSERT INTO `fn_function` VALUES ('menu_ajax','Ajax Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Ajax Menu'; +INSERT INTO `fn_function` VALUES ('menu_servicemodels','Browse SDC Service Instances') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Browse SDC Service Instances'; +INSERT INTO `fn_function` VALUES ('menu_concept','CoNCEPT') ON DUPLICATE KEY UPDATE FUNCTION_NAME='CoNCEPT'; +INSERT INTO `fn_function` VALUES ('menu_customer','Customer Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Customer Menu'; +INSERT INTO `fn_function` VALUES ('menu_customer_create','Customer Create') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Customer Create'; +INSERT INTO `fn_function` VALUES ('menu_doclib','Document Library Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Document Library Menu'; +INSERT INTO `fn_function` VALUES ('menu_feedback','Feedback Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Feedback Menu'; +INSERT INTO `fn_function` VALUES ('menu_help','Help Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Help Menu'; +INSERT INTO `fn_function` VALUES ('menu_home','Home Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Home Menu'; +INSERT INTO `fn_function` VALUES ('menu_itracker','iTracker Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='iTracker Menu'; +INSERT INTO `fn_function` VALUES ('menu_itracker_admin','Itracker Admin/Support menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Itracker Admin/Support menu'; +INSERT INTO `fn_function` VALUES ('menu_job','Job Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Job Menu'; +INSERT INTO `fn_function` VALUES ('menu_job_create','Job Create') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Job Create'; +INSERT INTO `fn_function` VALUES ('menu_job_designer','Process in Designer view') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Process in Designer view'; +INSERT INTO `fn_function` VALUES ('menu_logout','Logout Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Logout Menu'; +INSERT INTO `fn_function` VALUES ('menu_map','Map Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Map Menu'; +INSERT INTO `fn_function` VALUES ('menu_newserinstance','Create New Service Instance') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Create New Service Instance'; +INSERT INTO `fn_function` VALUES ('menu_notes','Notes Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Notes Menu'; +INSERT INTO `fn_function` VALUES ('menu_process','Process List') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Process List'; +INSERT INTO `fn_function` VALUES ('menu_profile','Profile Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Profile Menu'; +INSERT INTO `fn_function` VALUES ('menu_profile_create','Profile Create') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Profile Create'; +INSERT INTO `fn_function` VALUES ('menu_profile_import','Profile Import') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Profile Import'; +INSERT INTO `fn_function` VALUES ('menu_reports','Reports Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Reports Menu'; +INSERT INTO `fn_function` VALUES ('menu_sample','Sample Pages Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Sample Pages Menu'; +INSERT INTO `fn_function` VALUES ('menu_tab','Sample Tab Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Sample Tab Menu'; +INSERT INTO `fn_function` VALUES ('menu_task','Task Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Task Menu'; +INSERT INTO `fn_function` VALUES ('menu_task_search','Task Search') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Task Search'; +INSERT INTO `fn_function` VALUES ('menu_test','Test Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Test Menu'; +INSERT INTO `fn_function` VALUES ('menu_viewlog','Log Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Log Menu'; +INSERT INTO `fn_function` VALUES ('view_reports','View Raptor reports') ON DUPLICATE KEY UPDATE FUNCTION_NAME='View Raptor reports'; +INSERT INTO `fn_function` VALUES ('menu_searchexisting', 'Search for Existing Service Instances') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Search for Existing Service Instances'; + +-- +-- Dumping data for table `fn_lu_activity` +-- +REPLACE INTO `fn_lu_activity` VALUES ('add_child_role','add_child_role'); +REPLACE INTO `fn_lu_activity` VALUES ('add_role','add_role'); +REPLACE INTO `fn_lu_activity` VALUES ('add_role_function','add_role_function'); +REPLACE INTO `fn_lu_activity` VALUES ('add_user_role','add_user_role'); +REPLACE INTO `fn_lu_activity` VALUES ('login','Login'); +REPLACE INTO `fn_lu_activity` VALUES ('logout','Logout'); +REPLACE INTO `fn_lu_activity` VALUES ('mobile_login','Mobile Login'); +REPLACE INTO `fn_lu_activity` VALUES ('mobile_logout','Mobile Logout'); +REPLACE INTO `fn_lu_activity` VALUES ('remove_child_role','remove_child_role'); +REPLACE INTO `fn_lu_activity` VALUES ('remove_role','remove_role'); +REPLACE INTO `fn_lu_activity` VALUES ('remove_role_function','remove_role_function'); +REPLACE INTO `fn_lu_activity` VALUES ('remove_user_role','remove_user_role'); + +-- +-- Dumping data for table `fn_lu_alert_method` +-- +REPLACE INTO `fn_lu_alert_method` VALUES ('EMAIL','Email'); +REPLACE INTO `fn_lu_alert_method` VALUES ('FAX','Fax'); +REPLACE INTO `fn_lu_alert_method` VALUES ('PAGER','Pager'); +REPLACE INTO `fn_lu_alert_method` VALUES ('PHONE','Phone'); +REPLACE INTO `fn_lu_alert_method` VALUES ('SMS','SMS'); + +-- +-- Dumping data for table `fn_lu_menu_set` +-- +INSERT INTO `fn_lu_menu_set` VALUES ('APP','Application Menu') ON DUPLICATE KEY UPDATE MENU_SET_NAME='Application Menu'; + +-- +-- Dumping data for table `fn_lu_priority` +-- +REPLACE INTO `fn_lu_priority` VALUES (10,'Low','Y',10); +REPLACE INTO `fn_lu_priority` VALUES (20,'Normal','Y',20); +REPLACE INTO `fn_lu_priority` VALUES (30,'High','Y',30); +REPLACE INTO `fn_lu_priority` VALUES (40,'Urgent','Y',40); +REPLACE INTO `fn_lu_priority` VALUES (50,'Fatal','Y',50); + + +-- +-- Dumping data for table `fn_lu_tab_set` +-- +INSERT INTO `fn_lu_tab_set` VALUES ('APP','Application Tabs') ON DUPLICATE KEY UPDATE TAB_SET_NAME='Application Tabs'; + +-- +-- Dumping data for table `fn_lu_timezone` +-- +INSERT INTO `fn_lu_timezone` VALUES (10,'US/Eastern','US/Eastern') ON DUPLICATE KEY UPDATE TIMEZONE_NAME='US/Eastern', TIMEZONE_VALUE='US/Eastern'; +INSERT INTO `fn_lu_timezone` VALUES (20,'US/Central','US/Central') ON DUPLICATE KEY UPDATE TIMEZONE_NAME='US/Central', TIMEZONE_VALUE='US/Central'; +INSERT INTO `fn_lu_timezone` VALUES (30,'US/Mountain','US/Mountain') ON DUPLICATE KEY UPDATE TIMEZONE_NAME='US/Mountain', TIMEZONE_VALUE='US/Mountain'; +INSERT INTO `fn_lu_timezone` VALUES (40,'US/Arizona','America/Phoenix') ON DUPLICATE KEY UPDATE TIMEZONE_NAME='US/Arizona', TIMEZONE_VALUE='America/Phoenix'; +INSERT INTO `fn_lu_timezone` VALUES (50,'US/Pacific','US/Pacific') ON DUPLICATE KEY UPDATE TIMEZONE_NAME='US/Pacific', TIMEZONE_VALUE='US/Pacific'; +INSERT INTO `fn_lu_timezone` VALUES (60,'US/Alaska','US/Alaska') ON DUPLICATE KEY UPDATE TIMEZONE_NAME='US/Alaska', TIMEZONE_VALUE='US/Alaska'; +INSERT INTO `fn_lu_timezone` VALUES (70,'US/Hawaii','US/Hawaii') ON DUPLICATE KEY UPDATE TIMEZONE_NAME='US/Hawaii', TIMEZONE_VALUE='US/Hawaii'; + +-- +-- Dumping data for table `fn_menu` +-- +INSERT INTO `fn_menu` VALUES (1,'Root',NULL,10,NULL,'menu_home','N',NULL,NULL,NULL,NULL,'APP','N',NULL) ON DUPLICATE KEY UPDATE LABEL='Root', PARENT_ID=NULL, SORT_ORDER=10, ACTION=NULL, FUNCTION_CD='menu_home', ACTIVE_YN='N', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC=NULL; +INSERT INTO `fn_menu` VALUES (2,'VID Home',1,10,'welcome.htm','menu_home','Y',NULL,NULL,NULL,NULL,'APP','N','ion-home') ON DUPLICATE KEY UPDATE LABEL='VID Home', PARENT_ID=1, SORT_ORDER=10, ACTION='welcome.htm', FUNCTION_CD='menu_home', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='ion-home'; +INSERT INTO `fn_menu` VALUES (3,'Search for Existing Service Instances',1,10,'serviceModels.htm#/instances/services','menu_searchexisting','Y',NULL,NULL,NULL,NULL,'APP','N','ion-android-search') ON DUPLICATE KEY UPDATE LABEL='Search for Existing Service Instances', PARENT_ID=1, SORT_ORDER=10, ACTION='searchexistingsi.htm', FUNCTION_CD='menu_searchexisting', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='ion-android-search';INSERT INTO `fn_menu` VALUES (8,'Reports',1,40,'report.htm','menu_reports','N',NULL,NULL,NULL,NULL,'APP','N','ion-ios-paper') ON DUPLICATE KEY UPDATE LABEL='Reports', PARENT_ID=1, SORT_ORDER=40, ACTION='report.htm', FUNCTION_CD='menu_reports', ACTIVE_YN='N', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='ion-ios-paper'; +INSERT INTO `fn_menu` VALUES (9,'Profile',1,90,'userProfile','menu_profile','N',NULL,NULL,NULL,NULL,'APP','N','ion-person') ON DUPLICATE KEY UPDATE LABEL='Profile', PARENT_ID=1, SORT_ORDER=90, ACTION='userProfile', FUNCTION_CD='menu_profile', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='ion-person'; +INSERT INTO `fn_menu` VALUES (10,'Admin',1,110,'role_list.htm','menu_admin','N',NULL,NULL,NULL,NULL,'APP','N','ion-gear-a') ON DUPLICATE KEY UPDATE LABEL='Admin', PARENT_ID=1, SORT_ORDER=110, ACTION='role_list.htm', FUNCTION_CD='menu_admin', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='ion-gear-a'; +INSERT INTO `fn_menu` VALUES (13,'VID Logout',1,130,'app_logout.htm','menu_logout','N',NULL,NULL,NULL,NULL,'APP','N','ion-android-exit') ON DUPLICATE KEY UPDATE LABEL='VID Logout', PARENT_ID=1, SORT_ORDER=130, ACTION='app_logout.htm', FUNCTION_CD='menu_logout', ACTIVE_YN='N', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='Y', IMAGE_SRC='ion-android-exit'; +INSERT INTO `fn_menu` VALUES (42,'Browse SDC Service Models',1,10,'serviceModels.htm','menu_servicemodels','Y',NULL,NULL,NULL,NULL,'APP','N','ion-android-navigate') ON DUPLICATE KEY UPDATE LABEL='Browse SDC Service Instances', PARENT_ID=1, SORT_ORDER=10, ACTION='serviceModels.htm', FUNCTION_CD='menu_servicemodels', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='ion-android-navigate';INSERT INTO `fn_menu` VALUES (43,'View Log',1,10,'viewlog.htm','menu_viewlog','N',NULL,NULL,NULL,NULL,'APP','N','icon-location-pin') ON DUPLICATE KEY UPDATE LABEL='View Log', PARENT_ID=1, SORT_ORDER=10, ACTION='viewlog.htm', FUNCTION_CD='menu_viewlog', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='icon-location-pin'; +INSERT INTO `fn_menu` VALUES (84,'All Reports',8,50,'report','menu_reports','N',null,null,null,null,'APP','N','/static/fusion/images/reports.png') ON DUPLICATE KEY UPDATE LABEL='All Reports', PARENT_ID=8, SORT_ORDER=50, ACTION='report', FUNCTION_CD='menu_reports', ACTIVE_YN='N', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='/static/fusion/images/reports.png'; +INSERT INTO `fn_menu` VALUES (87,'Create Reports',8,120,'report_wizard.htm?r_action=report.create','menu_reports','N',null,'r_action=report.create',null,null,'APP','N',null) ON DUPLICATE KEY UPDATE LABEL='Create Reports', PARENT_ID=8, SORT_ORDER=120, ACTION='report_wizard.htm?r_action=report.create', FUNCTION_CD='menu_reports', ACTIVE_YN='N', SERVLET=NULL, QUERY_STRING='r_action=report.create', EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC=NULL; +INSERT INTO `fn_menu` VALUES (88,'Sample Dashboard',8,130,'report_sample','menu_reports','N',null,null,null,null,'APP','N',null) ON DUPLICATE KEY UPDATE LABEL='Sample Dashboard', PARENT_ID=8, SORT_ORDER=130, ACTION='report_sample', FUNCTION_CD='menu_reports', ACTIVE_YN='N', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC=NULL; +INSERT INTO `fn_menu` VALUES (92,'Import User',9,30,'userProfile#/post_search','menu_profile_import','Y',null,null,null,null,'APP','N',NULL) ON DUPLICATE KEY UPDATE LABEL='Import User', PARENT_ID=9, SORT_ORDER=30, ACTION='userProfile#/post_search', FUNCTION_CD='menu_profile_import', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC=NULL; +INSERT INTO `fn_menu` VALUES (94,'Self',9,40,'userProfile#/self_profile','menu_profile','Y',null,null,null,null,'APP','N','/static/fusion/images/profile.png') ON DUPLICATE KEY UPDATE LABEL='Self', PARENT_ID=9, SORT_ORDER=40, ACTION='userProfile#/self_profile', FUNCTION_CD='menu_profile', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='/static/fusion/images/profile.png'; +INSERT INTO `fn_menu` VALUES (101,'Roles',10,20,'admin','menu_admin','N',NULL,NULL,NULL,NULL,'APP','N','/static/fusion/images/users.png') ON DUPLICATE KEY UPDATE LABEL='Roles', PARENT_ID=10, SORT_ORDER=20, ACTION='admin', FUNCTION_CD='menu_admin', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='/static/fusion/images/users.png'; +INSERT INTO `fn_menu` VALUES (102,'Role Functions',10,30,'admin#/role_function_list','menu_admin','N',NULL,NULL,NULL,NULL,'APP','N',NULL) ON DUPLICATE KEY UPDATE LABEL='Role Functions', PARENT_ID=10, SORT_ORDER=30, ACTION='admin#/role_function_list', FUNCTION_CD='menu_admin', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC=NULL; +INSERT INTO `fn_menu` VALUES (103,'Broadcast Messages',10,50,'admin#/broadcast_list','menu_admin','N',NULL,NULL,NULL,NULL,'APP','N','/static/fusion/images/bubble.png') ON DUPLICATE KEY UPDATE LABEL='Broadcast Messages', PARENT_ID=10, SORT_ORDER=50, ACTION='admin#/broadcast_list', FUNCTION_CD='menu_admin', ACTIVE_YN='N', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='/static/fusion/images/bubble.png'; +INSERT INTO `fn_menu` VALUES (105,'Cache Admin',10,40,'admin#/jcs_admin','menu_admin','N',NULL,NULL,NULL,NULL,'APP','N','/static/fusion/images/cache.png') ON DUPLICATE KEY UPDATE LABEL='Cache Admin', PARENT_ID=10, SORT_ORDER=40, ACTION='admin#/jcs_admin', FUNCTION_CD='menu_admin', ACTIVE_YN='N', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='/static/fusion/images/cache.png'; +-- INSERT INTO `fn_menu` VALUES (106,'Lock/Unlock Application',10,60,'application_lockout.htm','menu_admin','N',NULL,NULL,NULL,NULL,'APP','N','/static/fusion/images/decrypted.png') ON DUPLICATE KEY UPDATE LABEL='Lock/Unlock Application', PARENT_ID=10, SORT_ORDER=60, ACTION='application_lockout.htm', FUNCTION_CD='menu_admin', ACTIVE_YN='N', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='/static/fusion/images/decrypted.png'; +INSERT INTO `fn_menu` VALUES (108,'Usage',10,80,'admin#/usage_list','menu_admin','Y',NULL,NULL,NULL,NULL,'APP','N','/static/fusion/images/users.png') ON DUPLICATE KEY UPDATE LABEL='Usage', PARENT_ID=10, SORT_ORDER=80, ACTION='admin#/usage_list', FUNCTION_CD='menu_admin', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='/static/fusion/images/users.png'; +INSERT INTO `fn_menu` VALUES (930,'Search',9,15,'userProfile','menu_admin','Y',NULL,NULL,NULL,NULL,'APP','N','/static/fusion/images/search_profile.png') ON DUPLICATE KEY UPDATE LABEL='Search', PARENT_ID=9, SORT_ORDER=15, ACTION='userProfile', FUNCTION_CD='menu_admin', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='/static/fusion/images/search_profile.png'; +INSERT INTO `fn_menu` VALUES (41,'Create New Service Instance',1,10,'serviceModels.htm#/instances/subscribers','menu_newserinstance','Y',NULL,NULL,NULL,NULL,'APP','N','icon-location-pin') ON DUPLICATE KEY UPDATE LABEL='Create New Service Instance', PARENT_ID=1, SORT_ORDER=10, ACTION='searchexistingsi.htm', FUNCTION_CD='menu_newserinstance', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='icon-location-pin'; + +-- +-- Dumping data for table `fn_restricted_url` +-- +REPLACE INTO `fn_restricted_url` VALUES ('attachment.htm','menu_admin'); +REPLACE INTO `fn_restricted_url` VALUES ('broadcast.htm','menu_admin'); +REPLACE INTO `fn_restricted_url` VALUES ('file_upload.htm','menu_admin'); +REPLACE INTO `fn_restricted_url` VALUES ('job.htm','menu_admin'); +REPLACE INTO `fn_restricted_url` VALUES ('role.htm','menu_admin'); +REPLACE INTO `fn_restricted_url` VALUES ('role_function.htm','menu_admin'); +REPLACE INTO `fn_restricted_url` VALUES ('test.htm','menu_admin'); +REPLACE INTO `fn_restricted_url` VALUES ('serviceModels.htm','menu_servicemodels'); +REPLACE INTO `fn_restricted_url` VALUES ('async_test.htm','menu_home'); +REPLACE INTO `fn_restricted_url` VALUES ('chatWindow.htm','menu_home'); +REPLACE INTO `fn_restricted_url` VALUES ('contact_list.htm','menu_home'); +REPLACE INTO `fn_restricted_url` VALUES ('customer_dynamic_list.htm','menu_home'); +REPLACE INTO `fn_restricted_url` VALUES ('event.htm','menu_home'); +REPLACE INTO `fn_restricted_url` VALUES ('event_list.htm','menu_home'); +REPLACE INTO `fn_restricted_url` VALUES ('mobile_welcome.htm','menu_home'); +REPLACE INTO `fn_restricted_url` VALUES ('sample_map.htm','menu_home'); +REPLACE INTO `fn_restricted_url` VALUES ('template.jsp','menu_home'); +REPLACE INTO `fn_restricted_url` VALUES ('welcome.htm','menu_home'); +REPLACE INTO `fn_restricted_url` VALUES ('zkau','menu_home'); +REPLACE INTO `fn_restricted_url` VALUES ('itracker_assign.htm','menu_itracker'); +REPLACE INTO `fn_restricted_url` VALUES ('itracker_byassignee.htm','menu_itracker'); +REPLACE INTO `fn_restricted_url` VALUES ('itracker_create.htm','menu_itracker'); +REPLACE INTO `fn_restricted_url` VALUES ('itracker_update.htm','menu_itracker'); +REPLACE INTO `fn_restricted_url` VALUES ('manage_license.htm','menu_itracker'); +REPLACE INTO `fn_restricted_url` VALUES ('support_ticket.htm','menu_itracker'); +REPLACE INTO `fn_restricted_url` VALUES ('jbpm_designer.htm','menu_job_create'); +REPLACE INTO `fn_restricted_url` VALUES ('jbpm_drools.htm','menu_job_create'); +REPLACE INTO `fn_restricted_url` VALUES ('process_job.htm','menu_job_create'); +-- REPLACE INTO `fn_restricted_url` VALUES ('novamap_controller.htm','menu_map'); +REPLACE INTO `fn_restricted_url` VALUES ('createnewserviceinstance.htm','menu_newserinstance'); +REPLACE INTO `fn_restricted_url` VALUES ('profile.htm','menu_profile_create'); +REPLACE INTO `fn_restricted_url` VALUES ('raptor.htm','menu_reports'); +REPLACE INTO `fn_restricted_url` VALUES ('raptor2.htm','menu_reports'); +REPLACE INTO `fn_restricted_url` VALUES ('raptor_blob_extract.htm','menu_reports'); +REPLACE INTO `fn_restricted_url` VALUES ('raptor_email_attachment.htm','menu_reports'); +REPLACE INTO `fn_restricted_url` VALUES ('raptor_search.htm','menu_reports'); +REPLACE INTO `fn_restricted_url` VALUES ('report_list.htm','menu_reports'); +REPLACE INTO `fn_restricted_url` VALUES ('gauge.htm','menu_tab'); +REPLACE INTO `fn_restricted_url` VALUES ('gmap_controller.htm','menu_tab'); +REPLACE INTO `fn_restricted_url` VALUES ('gmap_frame.htm','menu_tab'); +REPLACE INTO `fn_restricted_url` VALUES ('map.htm','menu_tab'); +REPLACE INTO `fn_restricted_url` VALUES ('map_download.htm','menu_tab'); +REPLACE INTO `fn_restricted_url` VALUES ('map_grid_search.htm','menu_tab'); +REPLACE INTO `fn_restricted_url` VALUES ('sample_animated_map.htm','menu_tab'); +-- REPLACE INTO `fn_restricted_url` VALUES ('sample_heat_map.htm','menu_tab'); +-- REPLACE INTO `fn_restricted_url` VALUES ('sample_heat_map_no_header.htm','menu_tab'); +REPLACE INTO `fn_restricted_url` VALUES ('sample_map_2.htm','menu_tab'); +REPLACE INTO `fn_restricted_url` VALUES ('sample_map_3.htm','menu_tab'); +REPLACE INTO `fn_restricted_url` VALUES ('tab2_sub1.htm','menu_tab'); +REPLACE INTO `fn_restricted_url` VALUES ('tab2_sub2_link1.htm','menu_tab'); +REPLACE INTO `fn_restricted_url` VALUES ('tab2_sub2_link2.htm','menu_tab'); +REPLACE INTO `fn_restricted_url` VALUES ('tab2_sub3.htm','menu_tab'); +REPLACE INTO `fn_restricted_url` VALUES ('tab3.htm','menu_tab'); +REPLACE INTO `fn_restricted_url` VALUES ('tab4.htm','menu_tab'); +REPLACE INTO `fn_restricted_url` VALUES ('viewlog.htm','menu_viewlog'); +-- REPLACE INTO `fn_restricted_url` VALUES ('bd_optima.htm','quantum_bd'); +-- REPLACE INTO `fn_restricted_url` VALUES ('bd_optima_interactive.htm','quantum_bd'); +-- REPLACE INTO `fn_restricted_url` VALUES ('bd_p2t.htm','quantum_bd'); +-- REPLACE INTO `fn_restricted_url` VALUES ('grid_heatmap.htm','quantum_bd'); +-- REPLACE INTO `fn_restricted_url` VALUES ('hive.htm','quantum_bd'); +-- REPLACE INTO `fn_restricted_url` VALUES ('hiveconfig.htm','quantum_bd'); +-- REPLACE INTO `fn_restricted_url` VALUES ('hiveconfig_popup.htm','quantum_bd'); +-- REPLACE INTO `fn_restricted_url` VALUES ('hive_search.htm','quantum_bd'); +-- REPLACE INTO `fn_restricted_url` VALUES ('hive_search_popup.htm','quantum_bd'); +-- REPLACE INTO `fn_restricted_url` VALUES ('jbpmTestProcess.htm','quantum_bd'); +-- REPLACE INTO `fn_restricted_url` VALUES ('job_progress.htm','quantum_bd'); +-- REPLACE INTO `fn_restricted_url` VALUES ('mapreduce.htm','quantum_bd'); +-- REPLACE INTO `fn_restricted_url` VALUES ('mapreduce_search.htm','quantum_bd'); +REPLACE INTO `fn_restricted_url` VALUES ('raptor.htm','view_reports'); +REPLACE INTO `fn_restricted_url` VALUES ('raptor_blob_extract.htm','view_reports'); + +-- +-- Dumping data for table `fn_role` +-- +INSERT INTO `fn_role` VALUES (1,'System Administrator','Y',1) ON DUPLICATE KEY UPDATE ROLE_NAME='System Administrator', ACTIVE_YN='Y', PRIORITY=1; +INSERT INTO `fn_role` VALUES (16,'Standard User','Y',5) ON DUPLICATE KEY UPDATE ROLE_NAME='Standard User', ACTIVE_YN='Y', PRIORITY=5; + +-- +-- Dumping data for table `fn_role_composite` +-- +REPLACE INTO `fn_role_composite` VALUES (1,16); + +-- +-- Dumping data for table `fn_role_function` +-- +REPLACE INTO `fn_role_function` VALUES (1,'doclib'); +REPLACE INTO `fn_role_function` VALUES (1,'doclib_admin'); +REPLACE INTO `fn_role_function` VALUES (1,'login'); +REPLACE INTO `fn_role_function` VALUES (1,'menu_admin'); +REPLACE INTO `fn_role_function` VALUES (1,'menu_ajax'); +REPLACE INTO `fn_role_function` VALUES (1,'menu_servicemodels'); +REPLACE INTO `fn_role_function` VALUES (1,'menu_customer'); +REPLACE INTO `fn_role_function` VALUES (1,'menu_customer_create'); +REPLACE INTO `fn_role_function` VALUES (1,'menu_feedback'); +REPLACE INTO `fn_role_function` VALUES (1,'menu_help'); +-- REPLACE INTO `fn_role_function` VALUES (1,'menu_hiveconfig'); +-- REPLACE INTO `fn_role_function` VALUES (1,'menu_hiveconfig_create'); +-- REPLACE INTO `fn_role_function` VALUES (1,'menu_hiveconfig_search'); +REPLACE INTO `fn_role_function` VALUES (1,'menu_home'); +REPLACE INTO `fn_role_function` VALUES (1,'menu_itracker'); +REPLACE INTO `fn_role_function` VALUES (1,'menu_itracker_admin'); +REPLACE INTO `fn_role_function` VALUES (1,'menu_job'); +REPLACE INTO `fn_role_function` VALUES (1,'menu_job_create'); +REPLACE INTO `fn_role_function` VALUES (1,'menu_logout'); +-- REPLACE INTO `fn_role_function` VALUES (1,'menu_mapreduce'); +-- REPLACE INTO `fn_role_function` VALUES (1,'menu_mapreduce_create'); +-- REPLACE INTO `fn_role_function` VALUES (1,'menu_mapreduce_search'); +REPLACE INTO `fn_role_function` VALUES (1,'menu_newserinstance'); +REPLACE INTO `fn_role_function` VALUES (1,'menu_notes'); +REPLACE INTO `fn_role_function` VALUES (1,'menu_process'); +REPLACE INTO `fn_role_function` VALUES (1,'menu_profile'); +REPLACE INTO `fn_role_function` VALUES (1,'menu_profile_create'); +REPLACE INTO `fn_role_function` VALUES (1,'menu_profile_import'); +REPLACE INTO `fn_role_function` VALUES (1,'menu_reports'); +REPLACE INTO `fn_role_function` VALUES (1,'menu_sample'); +REPLACE INTO `fn_role_function` VALUES (1,'menu_tab'); +REPLACE INTO `fn_role_function` VALUES (1,'menu_test'); +REPLACE INTO `fn_role_function` VALUES (1,'menu_viewlog'); +-- REPLACE INTO `fn_role_function` VALUES (1,'quantum_bd'); +REPLACE INTO `fn_role_function` VALUES (16,'login'); +REPLACE INTO `fn_role_function` VALUES (16,'menu_ajax'); +REPLACE INTO `fn_role_function` VALUES (16,'menu_servicemodels'); +REPLACE INTO `fn_role_function` VALUES (16,'menu_customer'); +REPLACE INTO `fn_role_function` VALUES (16,'menu_customer_create'); +REPLACE INTO `fn_role_function` VALUES (16,'menu_home'); +REPLACE INTO `fn_role_function` VALUES (16,'menu_itracker'); +REPLACE INTO `fn_role_function` VALUES (16,'menu_logout'); +REPLACE INTO `fn_role_function` VALUES (16,'menu_map'); +REPLACE INTO `fn_role_function` VALUES (16,'menu_newserinstance'); +REPLACE INTO `fn_role_function` VALUES (16,'menu_profile'); +REPLACE INTO `fn_role_function` VALUES (16,'menu_reports'); +REPLACE INTO `fn_role_function` VALUES (16,'menu_tab'); +REPLACE INTO `fn_role_function` VALUES (16,'menu_viewlog'); +-- REPLACE INTO `fn_role_function` VALUES (16,'quantum_bd'); +REPLACE INTO `fn_role_function` VALUES ('1', 'menu_searchexisting'); +REPLACE INTO `fn_role_function` VALUES ('16', 'menu_searchexisting'); + + +-- +-- Dumping data for table `fn_tab` +-- +INSERT INTO `fn_tab` VALUES ('TAB1','Tab 1','Tab 1 Information','tab1.htm','menu_tab','Y',10,NULL,'APP') ON DUPLICATE KEY UPDATE TAB_NAME='Tab 1', TAB_DESCR='Tab 1 Information', ACTION='tab1.htm', FUNCTION_CD='menu_tab', ACTIVE_YN='Y', SORT_ORDER=10, PARENT_TAB_CD=NULL, TAB_SET_CD='APP'; +INSERT INTO `fn_tab` VALUES ('TAB2','Tab 2','Tab 2 Information','tab2_sub1.htm','menu_tab','Y',20,NULL,'APP') ON DUPLICATE KEY UPDATE TAB_NAME='Tab 2', TAB_DESCR='Tab 2 Information', ACTION='tab2_sub1.htm', FUNCTION_CD='menu_tab', ACTIVE_YN='Y', SORT_ORDER=20, PARENT_TAB_CD=NULL, TAB_SET_CD='APP'; +INSERT INTO `fn_tab` VALUES ('TAB2_SUB1','Sub Tab 1','Sub Tab 1 Information','tab2_sub1.htm','menu_tab','Y',10,'TAB2','APP') ON DUPLICATE KEY UPDATE TAB_NAME='Sub Tab 1', TAB_DESCR='Sub Tab 1 Information', ACTION='tab2_sub1.htm', FUNCTION_CD='menu_tab', ACTIVE_YN='Y', SORT_ORDER=10, PARENT_TAB_CD='TAB2', TAB_SET_CD='APP'; +INSERT INTO `fn_tab` VALUES ('TAB2_SUB1_S1','Left Tab 1','Sub - Sub Tab 1 Information','tab2_sub1.htm','menu_tab','Y',10,'TAB2_SUB1','APP') ON DUPLICATE KEY UPDATE TAB_NAME='Left Tab 1', TAB_DESCR='Sub - Sub Tab 1 Information', ACTION='tab2_sub1.htm', FUNCTION_CD='menu_tab', ACTIVE_YN='Y', SORT_ORDER=10, PARENT_TAB_CD='TAB2_SUB1', TAB_SET_CD='APP'; +INSERT INTO `fn_tab` VALUES ('TAB2_SUB2','Sub Tab 2','Sub Tab 2 Information','tab2_sub2.htm','menu_tab','Y',20,'TAB2','APP') ON DUPLICATE KEY UPDATE TAB_NAME='Sub Tab 2', TAB_DESCR='Sub Tab 2 Information', ACTION='tab2_sub2.htm', FUNCTION_CD='menu_tab', ACTIVE_YN='Y', SORT_ORDER=20, PARENT_TAB_CD='TAB2', TAB_SET_CD='APP'; +INSERT INTO `fn_tab` VALUES ('TAB2_SUB3','Sub Tab 3','Sub Tab 3 Information','tab2_sub3.htm','menu_tab','Y',30,'TAB2','APP') ON DUPLICATE KEY UPDATE TAB_NAME='Sub Tab 3', TAB_DESCR='Sub Tab 3 Information', ACTION='tab2_sub3.htm', FUNCTION_CD='menu_tab', ACTIVE_YN='Y', SORT_ORDER=30, PARENT_TAB_CD='TAB2', TAB_SET_CD='APP'; +INSERT INTO `fn_tab` VALUES ('TAB3','Tab 3','Tab 3 Information','tab3.htm','menu_tab','Y',30,NULL,'APP') ON DUPLICATE KEY UPDATE TAB_NAME='Tab 3', TAB_DESCR='Tab 3 Information', ACTION='tab3.htm', FUNCTION_CD='menu_tab', ACTIVE_YN='Y', SORT_ORDER=30, PARENT_TAB_CD=NULL, TAB_SET_CD='APP'; +INSERT INTO `fn_tab` VALUES ('TAB4','Tab 4','Tab 4 Information','tab4.htm','menu_tab','Y',40,NULL,'APP') ON DUPLICATE KEY UPDATE TAB_NAME='Tab 4', TAB_DESCR='Tab 4 Information', ACTION='tab4.htm', FUNCTION_CD='menu_tab', ACTIVE_YN='Y', SORT_ORDER=40, PARENT_TAB_CD=NULL, TAB_SET_CD='APP'; + +-- +-- Dumping data for table `fn_tab_selected` +-- +REPLACE INTO `fn_tab_selected` VALUES ('TAB1','tab1'); +REPLACE INTO `fn_tab_selected` VALUES ('TAB2','tab2_sub1'); +REPLACE INTO `fn_tab_selected` VALUES ('TAB2','tab2_sub2'); +REPLACE INTO `fn_tab_selected` VALUES ('TAB2','tab2_sub3'); +REPLACE INTO `fn_tab_selected` VALUES ('TAB2_SUB1','tab2_sub1'); +REPLACE INTO `fn_tab_selected` VALUES ('TAB2_SUB1_S1','tab2_sub1'); +REPLACE INTO `fn_tab_selected` VALUES ('TAB2_SUB2','tab2_sub2'); +REPLACE INTO `fn_tab_selected` VALUES ('TAB2_SUB3','tab2_sub3'); +REPLACE INTO `fn_tab_selected` VALUES ('TAB3','tab3'); +REPLACE INTO `fn_tab_selected` VALUES ('TAB4','tab4'); + + +-- +-- Dumping data for table `fn_user` +-- +INSERT IGNORE `fn_user` VALUES (1,null,null,'Demo',null,'User',null,null,null,null,null,null,null,'demo',null,'demo','Kp8bJ4SXszM0WX','2016-11-14 13:24:07','Y',null,'2016-10-17 00:00:00',1,'2016-11-14 13:24:07','N',null,null,null,'NJ',null,'US',null,null,null,null,null,10,null,null,null,null,null,null); +INSERT IGNORE `fn_user` VALUES (2,null,null,'vid1',null,'User',null,null,null,null,null,null,null,'vid1',null,'vid1','Kp8bJ4SXszM0WX','2016-11-14 13:24:07','Y',null,'2016-10-17 00:00:00',1,'2016-11-14 13:24:07','N',null,null,null,'NJ',null,'US',null,null,null,null,null,10,null,null,null,null,null,null); +INSERT IGNORE `fn_user` VALUES (3,null,null,'vid2',null,'User',null,null,null,null,null,null,null,'vid2',null,'vid2','Kp8bJ4SXszM0WX','2016-11-14 13:24:07','Y',null,'2016-10-17 00:00:00',1,'2016-11-14 13:24:07','N',null,null,null,'NJ',null,'US',null,null,null,null,null,10,null,null,null,null,null,null); +INSERT IGNORE `fn_user` VALUES (4,null,null,'vid3',null,'User',null,null,null,null,null,null,null,'vid3',null,'vid3','Kp8bJ4SXszM0WX','2016-11-14 13:24:07','Y',null,'2016-10-17 00:00:00',1,'2016-11-14 13:24:07','N',null,null,null,'NJ',null,'US',null,null,null,null,null,10,null,null,null,null,null,null); +INSERT IGNORE `fn_user` VALUES (5,null,null,'vid4',null,'User',null,null,null,null,null,null,null,'vid4',null,'vid4','Kp8bJ4SXszM0WX','2016-11-14 13:24:07','Y',null,'2016-10-17 00:00:00',1,'2016-11-14 13:24:07','N',null,null,null,'NJ',null,'US',null,null,null,null,null,10,null,null,null,null,null,null); + +INSERT IGNORE `fn_user_role` VALUES (1,1,NULL,1); +INSERT IGNORE `fn_user_role` VALUES (2,1,NULL,1); +INSERT IGNORE `fn_user_role` VALUES (3,1,NULL,1); +INSERT IGNORE `fn_user_role` VALUES (4,1,NULL,1); +INSERT IGNORE `fn_user_role` VALUES (5,1,NULL,1); diff --git a/epsdk-app-onap/src/main/resources/vid-pre-init.sql b/epsdk-app-onap/src/main/resources/vid-pre-init.sql new file mode 100755 index 000000000..107b582c6 --- /dev/null +++ b/epsdk-app-onap/src/main/resources/vid-pre-init.sql @@ -0,0 +1,32 @@ +/*- + * ============LICENSE_START======================================================= + * VID + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`schema_info` ( + `SCHEMA_ID` VARCHAR(25) NOT NULL, + `SCHEMA_DESC` VARCHAR(75) NOT NULL, + `DATASOURCE_TYPE` VARCHAR(100) NULL DEFAULT NULL, + `CONNECTION_URL` VARCHAR(200) NOT NULL, + `USER_NAME` VARCHAR(45) NOT NULL, + `PASSWORD` VARCHAR(45) NULL DEFAULT NULL, + `DRIVER_CLASS` VARCHAR(100) NOT NULL, + `MIN_POOL_SIZE` INT(11) NOT NULL, + `MAX_POOL_SIZE` INT(11) NOT NULL, + `IDLE_CONNECTION_TEST_PERIOD` INT(11) NOT NULL) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; diff --git a/epsdk-app-onap/src/main/resources/vid-schema.sql b/epsdk-app-onap/src/main/resources/vid-schema.sql new file mode 100755 index 000000000..6ca06b193 --- /dev/null +++ b/epsdk-app-onap/src/main/resources/vid-schema.sql @@ -0,0 +1,1272 @@ +/*- + * ============LICENSE_START======================================================= + * VID + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ +-- ---------------------------------------------------------------------------- +-- MySQL Workbench Migration +-- Migrated Schemata: vid_openecomp_epsdk +-- Source Schemata: ecomp_sd +-- Created: Sun Nov 13 08:58:53 2016 +-- Workbench Version: 6.3.6 +-- ---------------------------------------------------------------------------- + +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------------------------------------------------------- +-- Schema vid_openecomp_epsdk +-- ---------------------------------------------------------------------------- +CREATE SCHEMA IF NOT EXISTS `vid_openecomp_epsdk` ; + +USE vid_openecomp_epsdk; +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.cr_favorite_reports +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_favorite_reports` ( + `USER_ID` INT(11) NOT NULL, + `REP_ID` INT(11) NOT NULL, + PRIMARY KEY (`USER_ID`, `REP_ID`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.cr_filehist_log +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_filehist_log` ( + `SCHEDULE_ID` DECIMAL(11,0) NOT NULL, + `URL` VARCHAR(4000) NULL DEFAULT NULL, + `NOTES` VARCHAR(3500) NULL DEFAULT NULL, + `RUN_TIME` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.cr_folder +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_folder` ( + `FOLDER_ID` INT(11) NOT NULL, + `FOLDER_NAME` VARCHAR(50) NOT NULL, + `DESCR` VARCHAR(500) NULL DEFAULT NULL, + `CREATE_ID` INT(11) NOT NULL, + `CREATE_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `PARENT_FOLDER_ID` INT(11) NULL DEFAULT NULL, + `PUBLIC_YN` VARCHAR(1) NOT NULL DEFAULT 'N', + PRIMARY KEY (`FOLDER_ID`), + INDEX `fk_parent_key_cr_folder` (`PARENT_FOLDER_ID` ASC), + CONSTRAINT `fk_parent_key_cr_folder` + FOREIGN KEY (`PARENT_FOLDER_ID`) + REFERENCES `vid_openecomp_epsdk`.`cr_folder` (`FOLDER_ID`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.cr_folder_access +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_folder_access` ( + `FOLDER_ACCESS_ID` DECIMAL(11,0) NOT NULL, + `FOLDER_ID` DECIMAL(11,0) NOT NULL, + `ORDER_NO` DECIMAL(11,0) NOT NULL, + `ROLE_ID` DECIMAL(11,0) NULL DEFAULT NULL, + `USER_ID` DECIMAL(11,0) NULL DEFAULT NULL, + `READ_ONLY_YN` VARCHAR(1) NOT NULL DEFAULT 'N', + PRIMARY KEY (`FOLDER_ACCESS_ID`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.cr_hist_user_map +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_hist_user_map` ( + `HIST_ID` INT(11) NOT NULL, + `USER_ID` INT(11) NOT NULL, + PRIMARY KEY (`HIST_ID`, `USER_ID`), + INDEX `sys_c0014617` (`USER_ID` ASC), + CONSTRAINT `sys_c0014616` + FOREIGN KEY (`HIST_ID`) + REFERENCES `vid_openecomp_epsdk`.`cr_report_file_history` (`HIST_ID`), + CONSTRAINT `sys_c0014617` + FOREIGN KEY (`USER_ID`) + REFERENCES `vid_openecomp_epsdk`.`fn_user` (`USER_ID`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.cr_lu_file_type +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_lu_file_type` ( + `LOOKUP_ID` DECIMAL(2,0) NOT NULL, + `LOOKUP_DESCR` VARCHAR(255) NOT NULL, + `ACTIVE_YN` CHAR(1) NULL DEFAULT 'Y', + `ERROR_CODE` DECIMAL(11,0) NULL DEFAULT NULL, + PRIMARY KEY (`LOOKUP_ID`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.cr_raptor_action_img +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_raptor_action_img` ( + `IMAGE_ID` VARCHAR(100) NOT NULL, + `IMAGE_LOC` VARCHAR(400) NULL DEFAULT NULL, + PRIMARY KEY (`IMAGE_ID`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.cr_raptor_pdf_img +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_raptor_pdf_img` ( + `IMAGE_ID` VARCHAR(100) NOT NULL, + `IMAGE_LOC` VARCHAR(400) NULL DEFAULT NULL, + PRIMARY KEY (`IMAGE_ID`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.cr_remote_schema_info +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_remote_schema_info` ( + `SCHEMA_PREFIX` VARCHAR(5) NOT NULL, + `SCHEMA_DESC` VARCHAR(75) NOT NULL, + `DATASOURCE_TYPE` VARCHAR(100) NULL DEFAULT NULL, + PRIMARY KEY (`SCHEMA_PREFIX`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.cr_report +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_report` ( + `REP_ID` DECIMAL(11,0) NOT NULL, + `TITLE` VARCHAR(100) NOT NULL, + `DESCR` VARCHAR(255) NULL DEFAULT NULL, + `PUBLIC_YN` VARCHAR(1) NOT NULL DEFAULT 'N', + `REPORT_XML` TEXT NULL DEFAULT NULL, + `CREATE_ID` DECIMAL(11,0) NULL DEFAULT NULL, + `CREATE_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `MAINT_ID` DECIMAL(11,0) NULL DEFAULT NULL, + `MAINT_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `MENU_ID` VARCHAR(500) NULL DEFAULT NULL, + `MENU_APPROVED_YN` VARCHAR(1) NOT NULL DEFAULT 'N', + `OWNER_ID` DECIMAL(11,0) NULL DEFAULT NULL, + `FOLDER_ID` INT(11) NULL DEFAULT '0', + `DASHBOARD_TYPE_YN` VARCHAR(1) NULL DEFAULT 'N', + `DASHBOARD_YN` VARCHAR(1) NULL DEFAULT 'N', + PRIMARY KEY (`REP_ID`), + INDEX `cr_report_create_idpublic_yntitle` (`CREATE_ID` ASC, `PUBLIC_YN` ASC, `TITLE` ASC)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.cr_report_access +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_report_access` ( + `REP_ID` DECIMAL(11,0) NOT NULL, + `ORDER_NO` DECIMAL(11,0) NOT NULL, + `ROLE_ID` DECIMAL(11,0) NULL DEFAULT NULL, + `USER_ID` DECIMAL(11,0) NULL DEFAULT NULL, + `READ_ONLY_YN` VARCHAR(1) NOT NULL DEFAULT 'N', + PRIMARY KEY (`REP_ID`, `ORDER_NO`), + CONSTRAINT `fk_cr_repor_ref_8550_cr_repor` + FOREIGN KEY (`REP_ID`) + REFERENCES `vid_openecomp_epsdk`.`cr_report` (`REP_ID`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.cr_report_dwnld_log +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_report_dwnld_log` ( + `USER_ID` DECIMAL(11,0) NOT NULL, + `REP_ID` INT(11) NOT NULL, + `FILE_NAME` VARCHAR(100) NOT NULL, + `DWNLD_START_TIME` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `RECORD_READY_TIME` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `FILTER_PARAMS` VARCHAR(2000) NULL DEFAULT NULL) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.cr_report_email_sent_log +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_report_email_sent_log` ( + `LOG_ID` INT(11) NOT NULL, + `SCHEDULE_ID` DECIMAL(11,0) NULL DEFAULT NULL, + `GEN_KEY` VARCHAR(25) NOT NULL, + `REP_ID` DECIMAL(11,0) NOT NULL, + `USER_ID` DECIMAL(11,0) NULL DEFAULT NULL, + `SENT_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `ACCESS_FLAG` VARCHAR(1) NOT NULL DEFAULT 'Y', + `TOUCH_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`LOG_ID`), + INDEX `fk_cr_report_rep_id` (`REP_ID` ASC), + CONSTRAINT `fk_cr_report_rep_id` + FOREIGN KEY (`REP_ID`) + REFERENCES `vid_openecomp_epsdk`.`cr_report` (`REP_ID`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.cr_report_file_history +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_report_file_history` ( + `HIST_ID` INT(11) NOT NULL, + `SCHED_USER_ID` DECIMAL(11,0) NOT NULL, + `SCHEDULE_ID` DECIMAL(11,0) NOT NULL, + `USER_ID` DECIMAL(11,0) NOT NULL, + `REP_ID` DECIMAL(11,0) NULL DEFAULT NULL, + `RUN_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `RECURRENCE` VARCHAR(50) NULL DEFAULT NULL, + `FILE_TYPE_ID` DECIMAL(2,0) NULL DEFAULT NULL, + `FILE_NAME` VARCHAR(80) NULL DEFAULT NULL, + `FILE_BLOB` BLOB NULL DEFAULT NULL, + `FILE_SIZE` DECIMAL(11,0) NULL DEFAULT NULL, + `RAPTOR_URL` VARCHAR(4000) NULL DEFAULT NULL, + `ERROR_YN` CHAR(1) NULL DEFAULT 'N', + `ERROR_CODE` DECIMAL(11,0) NULL DEFAULT NULL, + `DELETED_YN` CHAR(1) NULL DEFAULT 'N', + `DELETED_BY` DECIMAL(38,0) NULL DEFAULT NULL, + PRIMARY KEY (`HIST_ID`), + INDEX `sys_c0014614` (`FILE_TYPE_ID` ASC), + INDEX `sys_c0014615` (`REP_ID` ASC), + CONSTRAINT `sys_c0014614` + FOREIGN KEY (`FILE_TYPE_ID`) + REFERENCES `vid_openecomp_epsdk`.`cr_lu_file_type` (`LOOKUP_ID`), + CONSTRAINT `sys_c0014615` + FOREIGN KEY (`REP_ID`) + REFERENCES `vid_openecomp_epsdk`.`cr_report` (`REP_ID`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.cr_report_log +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_report_log` ( + `REP_ID` DECIMAL(11,0) NOT NULL, + `LOG_TIME` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `USER_ID` DECIMAL(11,0) NOT NULL, + `ACTION` VARCHAR(2000) NOT NULL, + `ACTION_VALUE` VARCHAR(50) NULL DEFAULT NULL, + `FORM_FIELDS` VARCHAR(4000) NULL DEFAULT NULL, + INDEX `fk_cr_repor_ref_17645_cr_repor` (`REP_ID` ASC), + CONSTRAINT `fk_cr_repor_ref_17645_cr_repor` + FOREIGN KEY (`REP_ID`) + REFERENCES `vid_openecomp_epsdk`.`cr_report` (`REP_ID`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.cr_report_schedule +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_report_schedule` ( + `SCHEDULE_ID` DECIMAL(11,0) NOT NULL, + `SCHED_USER_ID` DECIMAL(11,0) NOT NULL, + `REP_ID` DECIMAL(11,0) NOT NULL, + `ENABLED_YN` VARCHAR(1) NOT NULL, + `START_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `END_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `RUN_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `RECURRENCE` VARCHAR(50) NULL DEFAULT NULL, + `CONDITIONAL_YN` VARCHAR(1) NOT NULL, + `CONDITION_SQL` VARCHAR(4000) NULL DEFAULT NULL, + `NOTIFY_TYPE` INT(11) NULL DEFAULT '0', + `MAX_ROW` INT(11) NULL DEFAULT '1000', + `INITIAL_FORMFIELDS` VARCHAR(3500) NULL DEFAULT NULL, + `PROCESSED_FORMFIELDS` VARCHAR(3500) NULL DEFAULT NULL, + `FORMFIELDS` VARCHAR(3500) NULL DEFAULT NULL, + `CONDITION_LARGE_SQL` TEXT NULL DEFAULT NULL, + `ENCRYPT_YN` CHAR(1) NULL DEFAULT 'N', + `ATTACHMENT_YN` CHAR(1) NULL DEFAULT 'Y', + PRIMARY KEY (`SCHEDULE_ID`), + INDEX `fk_cr_repor_ref_14707_cr_repor` (`REP_ID` ASC), + CONSTRAINT `fk_cr_repor_ref_14707_cr_repor` + FOREIGN KEY (`REP_ID`) + REFERENCES `vid_openecomp_epsdk`.`cr_report` (`REP_ID`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.cr_report_schedule_users +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_report_schedule_users` ( + `SCHEDULE_ID` DECIMAL(11,0) NOT NULL, + `REP_ID` DECIMAL(11,0) NOT NULL, + `USER_ID` DECIMAL(11,0) NOT NULL, + `ROLE_ID` DECIMAL(11,0) NULL DEFAULT NULL, + `ORDER_NO` DECIMAL(11,0) NOT NULL, + PRIMARY KEY (`SCHEDULE_ID`, `REP_ID`, `USER_ID`, `ORDER_NO`), + CONSTRAINT `fk_cr_repor_ref_14716_cr_repor` + FOREIGN KEY (`SCHEDULE_ID`) + REFERENCES `vid_openecomp_epsdk`.`cr_report_schedule` (`SCHEDULE_ID`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.cr_report_template_map +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_report_template_map` ( + `REPORT_ID` INT(11) NOT NULL, + `TEMPLATE_FILE` VARCHAR(200) NULL DEFAULT NULL, + PRIMARY KEY (`REPORT_ID`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.cr_schedule_activity_log +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_schedule_activity_log` ( + `SCHEDULE_ID` DECIMAL(11,0) NOT NULL, + `URL` VARCHAR(4000) NULL DEFAULT NULL, + `NOTES` VARCHAR(2000) NULL DEFAULT NULL, + `RUN_TIME` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.cr_table_join +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_table_join` ( + `SRC_TABLE_NAME` VARCHAR(30) NOT NULL, + `DEST_TABLE_NAME` VARCHAR(30) NOT NULL, + `JOIN_EXPR` VARCHAR(500) NOT NULL, + INDEX `cr_table_join_dest_table_name` (`DEST_TABLE_NAME` ASC), + INDEX `cr_table_join_src_table_name` (`SRC_TABLE_NAME` ASC), + CONSTRAINT `fk_cr_table_ref_311_cr_tab` + FOREIGN KEY (`SRC_TABLE_NAME`) + REFERENCES `vid_openecomp_epsdk`.`cr_table_source` (`TABLE_NAME`), + CONSTRAINT `fk_cr_table_ref_315_cr_tab` + FOREIGN KEY (`DEST_TABLE_NAME`) + REFERENCES `vid_openecomp_epsdk`.`cr_table_source` (`TABLE_NAME`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.cr_table_role +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_table_role` ( + `TABLE_NAME` VARCHAR(30) NOT NULL, + `ROLE_ID` DECIMAL(11,0) NOT NULL, + PRIMARY KEY (`TABLE_NAME`, `ROLE_ID`), + CONSTRAINT `fk_cr_table_ref_32384_cr_table` + FOREIGN KEY (`TABLE_NAME`) + REFERENCES `vid_openecomp_epsdk`.`cr_table_source` (`TABLE_NAME`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.cr_table_source +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_table_source` ( + `TABLE_NAME` VARCHAR(30) NOT NULL, + `DISPLAY_NAME` VARCHAR(30) NOT NULL, + `PK_FIELDS` VARCHAR(200) NULL DEFAULT NULL, + `WEB_VIEW_ACTION` VARCHAR(50) NULL DEFAULT NULL, + `LARGE_DATA_SOURCE_YN` VARCHAR(1) NOT NULL DEFAULT 'N', + `FILTER_SQL` VARCHAR(4000) NULL DEFAULT NULL, + `SOURCE_DB` VARCHAR(50) NULL DEFAULT NULL, + PRIMARY KEY (`TABLE_NAME`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.demo_bar_chart +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`demo_bar_chart` ( + `label` VARCHAR(20) NULL DEFAULT NULL, + `value` DECIMAL(25,15) NULL DEFAULT NULL) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.demo_bar_chart_inter +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`demo_bar_chart_inter` ( + `spam_date` DATE NULL DEFAULT NULL, + `num_rpt_sources` DECIMAL(10,0) NULL DEFAULT NULL, + `num_det_sources` DECIMAL(10,0) NULL DEFAULT NULL) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.demo_line_chart +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`demo_line_chart` ( + `series` VARCHAR(20) NULL DEFAULT NULL, + `log_date` DATE NULL DEFAULT NULL, + `data_value` DECIMAL(10,5) NULL DEFAULT NULL) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.demo_pie_chart +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`demo_pie_chart` ( + `legend` VARCHAR(20) NULL DEFAULT NULL, + `data_value` DECIMAL(10,5) NULL DEFAULT NULL) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.demo_scatter_chart +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`demo_scatter_chart` ( + `rainfall` DECIMAL(10,2) NULL DEFAULT NULL, + `key_value` VARCHAR(20) NULL DEFAULT NULL, + `measurements` DECIMAL(10,2) NULL DEFAULT NULL) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.demo_scatter_plot +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`demo_scatter_plot` ( + `SERIES` VARCHAR(20) NULL DEFAULT NULL, + `VALUEX` DECIMAL(25,15) NULL DEFAULT NULL, + `VALUEY` DECIMAL(25,15) NULL DEFAULT NULL) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.demo_util_chart +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`demo_util_chart` ( + `traffic_date` DATE NULL DEFAULT NULL, + `util_perc` DECIMAL(10,5) NULL DEFAULT NULL) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_app +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_app` ( + `APP_ID` INT(11) NOT NULL AUTO_INCREMENT, + `APP_NAME` VARCHAR(100) NOT NULL DEFAULT '?', + `APP_IMAGE_URL` VARCHAR(256) NULL DEFAULT NULL, + `APP_DESCRIPTION` VARCHAR(512) NULL DEFAULT NULL, + `APP_NOTES` VARCHAR(4096) NULL DEFAULT NULL, + `APP_URL` VARCHAR(256) NULL DEFAULT NULL, + `APP_ALTERNATE_URL` VARCHAR(256) NULL DEFAULT NULL, + `APP_REST_ENDPOINT` VARCHAR(2000) NULL DEFAULT NULL, + `ML_APP_NAME` VARCHAR(50) NOT NULL DEFAULT '?', + `ML_APP_ADMIN_ID` VARCHAR(7) NOT NULL DEFAULT '?', + `MOTS_ID` INT(11) NULL DEFAULT NULL, + `APP_PASSWORD` VARCHAR(256) NOT NULL DEFAULT '?', + `OPEN` CHAR(1) NULL DEFAULT 'N', + `ENABLED` CHAR(1) NULL DEFAULT 'Y', + `THUMBNAIL` MEDIUMBLOB NULL DEFAULT NULL, + `APP_USERNAME` VARCHAR(50) NULL DEFAULT NULL, + `UEB_KEY` VARCHAR(256) NULL DEFAULT NULL, + `UEB_SECRET` VARCHAR(256) NULL DEFAULT NULL, + `UEB_TOPIC_NAME` VARCHAR(256) NULL DEFAULT NULL, + PRIMARY KEY (`APP_ID`)) +ENGINE = InnoDB +AUTO_INCREMENT = 2 +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_audit_action +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_audit_action` ( + `AUDIT_ACTION_ID` INT(11) NOT NULL, + `CLASS_NAME` VARCHAR(500) NOT NULL, + `METHOD_NAME` VARCHAR(50) NOT NULL, + `AUDIT_ACTION_CD` VARCHAR(20) NOT NULL, + `AUDIT_ACTION_DESC` VARCHAR(200) NULL DEFAULT NULL, + `ACTIVE_YN` VARCHAR(1) NULL DEFAULT NULL, + PRIMARY KEY (`AUDIT_ACTION_ID`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_audit_action_log +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_audit_action_log` ( + `AUDIT_LOG_ID` INT(11) NOT NULL AUTO_INCREMENT, + `AUDIT_ACTION_CD` VARCHAR(200) NULL DEFAULT NULL, + `ACTION_TIME` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `USER_ID` DECIMAL(11,0) NULL DEFAULT NULL, + `CLASS_NAME` VARCHAR(100) NULL DEFAULT NULL, + `METHOD_NAME` VARCHAR(50) NULL DEFAULT NULL, + `SUCCESS_MSG` VARCHAR(20) NULL DEFAULT NULL, + `ERROR_MSG` VARCHAR(500) NULL DEFAULT NULL, + PRIMARY KEY (`AUDIT_LOG_ID`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_audit_log +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_audit_log` ( + `LOG_ID` INT(11) NOT NULL AUTO_INCREMENT, + `USER_ID` INT(11) NOT NULL, + `ACTIVITY_CD` VARCHAR(50) NOT NULL, + `AUDIT_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `COMMENTS` VARCHAR(1000) NULL DEFAULT NULL, + `AFFECTED_RECORD_ID_BK` VARCHAR(500) NULL DEFAULT NULL, + `AFFECTED_RECORD_ID` VARCHAR(4000) NULL DEFAULT NULL, + PRIMARY KEY (`LOG_ID`), + INDEX `fn_audit_log_activity_cd` (`ACTIVITY_CD` ASC), + INDEX `fn_audit_log_user_id` (`USER_ID` ASC), + CONSTRAINT `FK_FN_AUDIT_REF_209_FN_USER` + FOREIGN KEY (`USER_ID`) + REFERENCES `vid_openecomp_epsdk`.`fn_user` (`USER_ID`), + CONSTRAINT `fk_fn_audit_ref_205_fn_lu_ac` + FOREIGN KEY (`ACTIVITY_CD`) + REFERENCES `vid_openecomp_epsdk`.`fn_lu_activity` (`ACTIVITY_CD`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_broadcast_message +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_broadcast_message` ( + `MESSAGE_ID` INT(11) NOT NULL AUTO_INCREMENT, + `MESSAGE_TEXT` VARCHAR(1000) NOT NULL, + `MESSAGE_LOCATION_ID` DECIMAL(11,0) NOT NULL, + `BROADCAST_START_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `BROADCAST_END_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `ACTIVE_YN` CHAR(1) NOT NULL DEFAULT 'Y', + `SORT_ORDER` DECIMAL(4,0) NOT NULL, + `BROADCAST_SITE_CD` VARCHAR(50) NULL DEFAULT NULL, + PRIMARY KEY (`MESSAGE_ID`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_chat_logs +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_chat_logs` ( + `CHAT_LOG_ID` INT(11) NOT NULL, + `CHAT_ROOM_ID` INT(11) NULL DEFAULT NULL, + `USER_ID` INT(11) NULL DEFAULT NULL, + `MESSAGE` VARCHAR(1000) NULL DEFAULT NULL, + `MESSAGE_DATE_TIME` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`CHAT_LOG_ID`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_chat_room +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_chat_room` ( + `CHAT_ROOM_ID` INT(11) NOT NULL, + `NAME` VARCHAR(50) NOT NULL, + `DESCRIPTION` VARCHAR(500) NULL DEFAULT NULL, + `OWNER_ID` INT(11) NULL DEFAULT NULL, + `CREATED_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `UPDATED_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`CHAT_ROOM_ID`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_chat_users +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_chat_users` ( + `CHAT_ROOM_ID` INT(11) NULL DEFAULT NULL, + `USER_ID` INT(11) NULL DEFAULT NULL, + `LAST_ACTIVITY_DATE_TIME` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `CHAT_STATUS` VARCHAR(20) NULL DEFAULT NULL, + `ID` INT(11) NOT NULL, + PRIMARY KEY (`ID`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_datasource +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_datasource` ( + `ID` INT(11) NOT NULL AUTO_INCREMENT, + `NAME` VARCHAR(50) NULL DEFAULT NULL, + `DRIVER_NAME` VARCHAR(256) NULL DEFAULT NULL, + `SERVER` VARCHAR(256) NULL DEFAULT NULL, + `PORT` INT(11) NULL DEFAULT NULL, + `USER_NAME` VARCHAR(256) NULL DEFAULT NULL, + `PASSWORD` VARCHAR(256) NULL DEFAULT NULL, + `URL` VARCHAR(256) NULL DEFAULT NULL, + `MIN_POOL_SIZE` INT(11) NULL DEFAULT NULL, + `MAX_POOL_SIZE` INT(11) NULL DEFAULT NULL, + `ADAPTER_ID` INT(11) NULL DEFAULT NULL, + `DS_TYPE` VARCHAR(20) NULL DEFAULT NULL, + PRIMARY KEY (`ID`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_function +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_function` ( + `FUNCTION_CD` VARCHAR(30) NOT NULL, + `FUNCTION_NAME` VARCHAR(50) NOT NULL, + PRIMARY KEY (`FUNCTION_CD`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_lu_activity +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_lu_activity` ( + `ACTIVITY_CD` VARCHAR(50) NOT NULL, + `ACTIVITY` VARCHAR(50) NOT NULL, + PRIMARY KEY (`ACTIVITY_CD`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_lu_alert_method +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_lu_alert_method` ( + `ALERT_METHOD_CD` VARCHAR(10) NOT NULL, + `ALERT_METHOD` VARCHAR(50) NOT NULL, + PRIMARY KEY (`ALERT_METHOD_CD`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_lu_broadcast_site +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_lu_broadcast_site` ( + `BROADCAST_SITE_CD` VARCHAR(50) NOT NULL, + `BROADCAST_SITE_DESCR` VARCHAR(100) NULL DEFAULT NULL, + PRIMARY KEY (`BROADCAST_SITE_CD`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_lu_menu_set +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_lu_menu_set` ( + `MENU_SET_CD` VARCHAR(10) NOT NULL, + `MENU_SET_NAME` VARCHAR(50) NOT NULL, + PRIMARY KEY (`MENU_SET_CD`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_lu_message_location +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_lu_message_location` ( + `message_location_id` DECIMAL(11,0) NOT NULL, + `message_location_descr` VARCHAR(30) NOT NULL, + PRIMARY KEY (`message_location_id`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_lu_priority +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_lu_priority` ( + `PRIORITY_ID` DECIMAL(11,0) NOT NULL, + `PRIORITY` VARCHAR(50) NOT NULL, + `ACTIVE_YN` CHAR(1) NOT NULL, + `SORT_ORDER` DECIMAL(5,0) NULL DEFAULT NULL, + PRIMARY KEY (`PRIORITY_ID`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_lu_role_type +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_lu_role_type` ( + `ROLE_TYPE_ID` DECIMAL(11,0) NOT NULL, + `ROLE_TYPE` VARCHAR(50) NOT NULL, + PRIMARY KEY (`ROLE_TYPE_ID`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_lu_tab_set +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_lu_tab_set` ( + `TAB_SET_CD` VARCHAR(30) NOT NULL, + `TAB_SET_NAME` VARCHAR(50) NOT NULL, + PRIMARY KEY (`TAB_SET_CD`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_lu_timezone +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_lu_timezone` ( + `TIMEZONE_ID` INT(11) NOT NULL, + `TIMEZONE_NAME` VARCHAR(100) NOT NULL, + `TIMEZONE_VALUE` VARCHAR(100) NOT NULL, + PRIMARY KEY (`TIMEZONE_ID`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_menu +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_menu` ( + `MENU_ID` INT(11) NOT NULL AUTO_INCREMENT, + `LABEL` VARCHAR(100) NULL DEFAULT NULL, + `PARENT_ID` INT(11) NULL DEFAULT NULL, + `SORT_ORDER` DECIMAL(4,0) NULL DEFAULT NULL, + `ACTION` VARCHAR(200) NULL DEFAULT NULL, + `FUNCTION_CD` VARCHAR(30) NULL DEFAULT NULL, + `ACTIVE_YN` VARCHAR(1) NOT NULL DEFAULT 'Y', + `SERVLET` VARCHAR(50) NULL DEFAULT NULL, + `QUERY_STRING` VARCHAR(200) NULL DEFAULT NULL, + `EXTERNAL_URL` VARCHAR(200) NULL DEFAULT NULL, + `TARGET` VARCHAR(25) NULL DEFAULT NULL, + `MENU_SET_CD` VARCHAR(10) NULL DEFAULT 'APP', + `SEPARATOR_YN` CHAR(1) NULL DEFAULT 'N', + `IMAGE_SRC` VARCHAR(100) NULL DEFAULT NULL, + PRIMARY KEY (`MENU_ID`), + INDEX `FK_FN_MENU_REF_196_FN_MENU` (`PARENT_ID` ASC), + INDEX `FK_FN_MENU_MENU_SET_CD` (`MENU_SET_CD` ASC), + INDEX `fn_menu_function_cd` (`FUNCTION_CD` ASC), + CONSTRAINT `FK_FN_MENU_MENU_SET_CD` + FOREIGN KEY (`MENU_SET_CD`) + REFERENCES `vid_openecomp_epsdk`.`fn_lu_menu_set` (`MENU_SET_CD`), + CONSTRAINT `FK_FN_MENU_REF_196_FN_MENU` + FOREIGN KEY (`PARENT_ID`) + REFERENCES `vid_openecomp_epsdk`.`fn_menu` (`MENU_ID`), + CONSTRAINT `FK_FN_MENU_REF_223_FN_FUNCT` + FOREIGN KEY (`FUNCTION_CD`) + REFERENCES `vid_openecomp_epsdk`.`fn_function` (`FUNCTION_CD`)) +ENGINE = InnoDB +AUTO_INCREMENT = 150039 +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_org +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_org` ( + `ORG_ID` INT(11) NOT NULL, + `ORG_NAME` VARCHAR(50) NOT NULL, + `ACCESS_CD` VARCHAR(10) NULL DEFAULT NULL, + PRIMARY KEY (`ORG_ID`), + INDEX `fn_org_access_cd` (`ACCESS_CD` ASC)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_qz_blob_triggers +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_qz_blob_triggers` ( + `SCHED_NAME` VARCHAR(120) NOT NULL, + `TRIGGER_NAME` VARCHAR(200) NOT NULL, + `TRIGGER_GROUP` VARCHAR(200) NOT NULL, + `BLOB_DATA` BLOB NULL DEFAULT NULL, + PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`), + INDEX `SCHED_NAME` (`SCHED_NAME` ASC, `TRIGGER_NAME` ASC, `TRIGGER_GROUP` ASC), + CONSTRAINT `fn_qz_blob_triggers_ibfk_1` + FOREIGN KEY (`SCHED_NAME` , `TRIGGER_NAME` , `TRIGGER_GROUP`) + REFERENCES `vid_openecomp_epsdk`.`fn_qz_triggers` (`SCHED_NAME` , `TRIGGER_NAME` , `TRIGGER_GROUP`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_qz_calendars +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_qz_calendars` ( + `SCHED_NAME` VARCHAR(120) NOT NULL, + `CALENDAR_NAME` VARCHAR(200) NOT NULL, + `CALENDAR` BLOB NOT NULL, + PRIMARY KEY (`SCHED_NAME`, `CALENDAR_NAME`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_qz_cron_triggers +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_qz_cron_triggers` ( + `SCHED_NAME` VARCHAR(120) NOT NULL, + `TRIGGER_NAME` VARCHAR(200) NOT NULL, + `TRIGGER_GROUP` VARCHAR(200) NOT NULL, + `CRON_EXPRESSION` VARCHAR(120) NOT NULL, + `TIME_ZONE_ID` VARCHAR(80) NULL DEFAULT NULL, + PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`), + CONSTRAINT `fn_qz_cron_triggers_ibfk_1` + FOREIGN KEY (`SCHED_NAME` , `TRIGGER_NAME` , `TRIGGER_GROUP`) + REFERENCES `vid_openecomp_epsdk`.`fn_qz_triggers` (`SCHED_NAME` , `TRIGGER_NAME` , `TRIGGER_GROUP`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_qz_fired_triggers +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_qz_fired_triggers` ( + `SCHED_NAME` VARCHAR(120) NOT NULL, + `ENTRY_ID` VARCHAR(95) NOT NULL, + `TRIGGER_NAME` VARCHAR(200) NOT NULL, + `TRIGGER_GROUP` VARCHAR(200) NOT NULL, + `INSTANCE_NAME` VARCHAR(200) NOT NULL, + `FIRED_TIME` BIGINT(13) NOT NULL, + `SCHED_TIME` BIGINT(13) NOT NULL, + `PRIORITY` INT(11) NOT NULL, + `STATE` VARCHAR(16) NOT NULL, + `JOB_NAME` VARCHAR(200) NULL DEFAULT NULL, + `JOB_GROUP` VARCHAR(200) NULL DEFAULT NULL, + `IS_NONCONCURRENT` VARCHAR(1) NULL DEFAULT NULL, + `REQUESTS_RECOVERY` VARCHAR(1) NULL DEFAULT NULL, + PRIMARY KEY (`SCHED_NAME`, `ENTRY_ID`), + INDEX `idx_fn_qz_ft_trig_inst_name` (`SCHED_NAME` ASC, `INSTANCE_NAME` ASC), + INDEX `idx_fn_qz_ft_inst_job_req_rcvry` (`SCHED_NAME` ASC, `INSTANCE_NAME` ASC, `REQUESTS_RECOVERY` ASC), + INDEX `idx_fn_qz_ft_j_g` (`SCHED_NAME` ASC, `JOB_NAME` ASC, `JOB_GROUP` ASC), + INDEX `idx_fn_qz_ft_jg` (`SCHED_NAME` ASC, `JOB_GROUP` ASC), + INDEX `idx_fn_qz_ft_t_g` (`SCHED_NAME` ASC, `TRIGGER_NAME` ASC, `TRIGGER_GROUP` ASC), + INDEX `idx_fn_qz_ft_tg` (`SCHED_NAME` ASC, `TRIGGER_GROUP` ASC)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_qz_job_details +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_qz_job_details` ( + `SCHED_NAME` VARCHAR(120) NOT NULL, + `JOB_NAME` VARCHAR(200) NOT NULL, + `JOB_GROUP` VARCHAR(200) NOT NULL, + `DESCRIPTION` VARCHAR(250) NULL DEFAULT NULL, + `JOB_CLASS_NAME` VARCHAR(250) NOT NULL, + `IS_DURABLE` VARCHAR(1) NOT NULL, + `IS_NONCONCURRENT` VARCHAR(1) NOT NULL, + `IS_UPDATE_DATA` VARCHAR(1) NOT NULL, + `REQUESTS_RECOVERY` VARCHAR(1) NOT NULL, + `JOB_DATA` BLOB NULL DEFAULT NULL, + PRIMARY KEY (`SCHED_NAME`, `JOB_NAME`, `JOB_GROUP`), + INDEX `idx_fn_qz_j_req_recovery` (`SCHED_NAME` ASC, `REQUESTS_RECOVERY` ASC), + INDEX `idx_fn_qz_j_grp` (`SCHED_NAME` ASC, `JOB_GROUP` ASC)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_qz_locks +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_qz_locks` ( + `SCHED_NAME` VARCHAR(120) NOT NULL, + `LOCK_NAME` VARCHAR(40) NOT NULL, + PRIMARY KEY (`SCHED_NAME`, `LOCK_NAME`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_qz_paused_trigger_grps +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_qz_paused_trigger_grps` ( + `SCHED_NAME` VARCHAR(120) NOT NULL, + `TRIGGER_GROUP` VARCHAR(200) NOT NULL, + PRIMARY KEY (`SCHED_NAME`, `TRIGGER_GROUP`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_qz_scheduler_state +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_qz_scheduler_state` ( + `SCHED_NAME` VARCHAR(120) NOT NULL, + `INSTANCE_NAME` VARCHAR(200) NOT NULL, + `LAST_CHECKIN_TIME` BIGINT(13) NOT NULL, + `CHECKIN_INTERVAL` BIGINT(13) NOT NULL, + PRIMARY KEY (`SCHED_NAME`, `INSTANCE_NAME`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_qz_simple_triggers +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_qz_simple_triggers` ( + `SCHED_NAME` VARCHAR(120) NOT NULL, + `TRIGGER_NAME` VARCHAR(200) NOT NULL, + `TRIGGER_GROUP` VARCHAR(200) NOT NULL, + `REPEAT_COUNT` BIGINT(7) NOT NULL, + `REPEAT_INTERVAL` BIGINT(12) NOT NULL, + `TIMES_TRIGGERED` BIGINT(10) NOT NULL, + PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`), + CONSTRAINT `fn_qz_simple_triggers_ibfk_1` + FOREIGN KEY (`SCHED_NAME` , `TRIGGER_NAME` , `TRIGGER_GROUP`) + REFERENCES `vid_openecomp_epsdk`.`fn_qz_triggers` (`SCHED_NAME` , `TRIGGER_NAME` , `TRIGGER_GROUP`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_qz_simprop_triggers +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_qz_simprop_triggers` ( + `SCHED_NAME` VARCHAR(120) NOT NULL, + `TRIGGER_NAME` VARCHAR(200) NOT NULL, + `TRIGGER_GROUP` VARCHAR(200) NOT NULL, + `STR_PROP_1` VARCHAR(512) NULL DEFAULT NULL, + `STR_PROP_2` VARCHAR(512) NULL DEFAULT NULL, + `STR_PROP_3` VARCHAR(512) NULL DEFAULT NULL, + `INT_PROP_1` INT(11) NULL DEFAULT NULL, + `INT_PROP_2` INT(11) NULL DEFAULT NULL, + `LONG_PROP_1` BIGINT(20) NULL DEFAULT NULL, + `LONG_PROP_2` BIGINT(20) NULL DEFAULT NULL, + `DEC_PROP_1` DECIMAL(13,4) NULL DEFAULT NULL, + `DEC_PROP_2` DECIMAL(13,4) NULL DEFAULT NULL, + `BOOL_PROP_1` VARCHAR(1) NULL DEFAULT NULL, + `BOOL_PROP_2` VARCHAR(1) NULL DEFAULT NULL, + PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`), + CONSTRAINT `fn_qz_simprop_triggers_ibfk_1` + FOREIGN KEY (`SCHED_NAME` , `TRIGGER_NAME` , `TRIGGER_GROUP`) + REFERENCES `vid_openecomp_epsdk`.`fn_qz_triggers` (`SCHED_NAME` , `TRIGGER_NAME` , `TRIGGER_GROUP`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_qz_triggers +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_qz_triggers` ( + `SCHED_NAME` VARCHAR(120) NOT NULL, + `TRIGGER_NAME` VARCHAR(200) NOT NULL, + `TRIGGER_GROUP` VARCHAR(200) NOT NULL, + `JOB_NAME` VARCHAR(200) NOT NULL, + `JOB_GROUP` VARCHAR(200) NOT NULL, + `DESCRIPTION` VARCHAR(250) NULL DEFAULT NULL, + `NEXT_FIRE_TIME` BIGINT(13) NULL DEFAULT NULL, + `PREV_FIRE_TIME` BIGINT(13) NULL DEFAULT NULL, + `PRIORITY` INT(11) NULL DEFAULT NULL, + `TRIGGER_STATE` VARCHAR(16) NOT NULL, + `TRIGGER_TYPE` VARCHAR(8) NOT NULL, + `START_TIME` BIGINT(13) NOT NULL, + `END_TIME` BIGINT(13) NULL DEFAULT NULL, + `CALENDAR_NAME` VARCHAR(200) NULL DEFAULT NULL, + `MISFIRE_INSTR` SMALLINT(2) NULL DEFAULT NULL, + `JOB_DATA` BLOB NULL DEFAULT NULL, + PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`), + INDEX `idx_fn_qz_t_j` (`SCHED_NAME` ASC, `JOB_NAME` ASC, `JOB_GROUP` ASC), + INDEX `idx_fn_qz_t_jg` (`SCHED_NAME` ASC, `JOB_GROUP` ASC), + INDEX `idx_fn_qz_t_c` (`SCHED_NAME` ASC, `CALENDAR_NAME` ASC), + INDEX `idx_fn_qz_t_g` (`SCHED_NAME` ASC, `TRIGGER_GROUP` ASC), + INDEX `idx_fn_qz_t_state` (`SCHED_NAME` ASC, `TRIGGER_STATE` ASC), + INDEX `idx_fn_qz_t_n_state` (`SCHED_NAME` ASC, `TRIGGER_NAME` ASC, `TRIGGER_GROUP` ASC, `TRIGGER_STATE` ASC), + INDEX `idx_fn_qz_t_n_g_state` (`SCHED_NAME` ASC, `TRIGGER_GROUP` ASC, `TRIGGER_STATE` ASC), + INDEX `idx_fn_qz_t_next_fire_time` (`SCHED_NAME` ASC, `NEXT_FIRE_TIME` ASC), + INDEX `idx_fn_qz_t_nft_st` (`SCHED_NAME` ASC, `TRIGGER_STATE` ASC, `NEXT_FIRE_TIME` ASC), + INDEX `idx_fn_qz_t_nft_misfire` (`SCHED_NAME` ASC, `MISFIRE_INSTR` ASC, `NEXT_FIRE_TIME` ASC), + INDEX `idx_fn_qz_t_nft_st_misfire` (`SCHED_NAME` ASC, `MISFIRE_INSTR` ASC, `NEXT_FIRE_TIME` ASC, `TRIGGER_STATE` ASC), + INDEX `idx_fn_qz_t_nft_st_misfire_grp` (`SCHED_NAME` ASC, `MISFIRE_INSTR` ASC, `NEXT_FIRE_TIME` ASC, `TRIGGER_GROUP` ASC, + +`TRIGGER_STATE` ASC), + CONSTRAINT `fn_qz_triggers_ibfk_1` + FOREIGN KEY (`SCHED_NAME` , `JOB_NAME` , `JOB_GROUP`) + REFERENCES `vid_openecomp_epsdk`.`fn_qz_job_details` (`SCHED_NAME` , `JOB_NAME` , `JOB_GROUP`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_restricted_url +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_restricted_url` ( + `RESTRICTED_URL` VARCHAR(250) NOT NULL, + `FUNCTION_CD` VARCHAR(30) NOT NULL, + PRIMARY KEY (`RESTRICTED_URL`, `FUNCTION_CD`), + INDEX `fk_restricted_url_function_cd` (`FUNCTION_CD` ASC), + CONSTRAINT `fk_restricted_url_function_cd` + FOREIGN KEY (`FUNCTION_CD`) + REFERENCES `vid_openecomp_epsdk`.`fn_function` (`FUNCTION_CD`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_role +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_role` ( + `ROLE_ID` INT(11) NOT NULL AUTO_INCREMENT, + `ROLE_NAME` VARCHAR(50) NOT NULL, + `ACTIVE_YN` VARCHAR(1) NOT NULL DEFAULT 'Y', + `PRIORITY` DECIMAL(4,0) NULL DEFAULT NULL, + PRIMARY KEY (`ROLE_ID`)) +ENGINE = InnoDB +AUTO_INCREMENT = 17 +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_role_composite +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_role_composite` ( + `PARENT_ROLE_ID` INT(11) NOT NULL, + `CHILD_ROLE_ID` INT(11) NOT NULL, + PRIMARY KEY (`PARENT_ROLE_ID`, `CHILD_ROLE_ID`), + INDEX `FK_FN_ROLE_COMPOSITE_CHILD` (`CHILD_ROLE_ID` ASC), + CONSTRAINT `FK_FN_ROLE_COMPOSITE_CHILD` + FOREIGN KEY (`CHILD_ROLE_ID`) + REFERENCES `vid_openecomp_epsdk`.`fn_role` (`ROLE_ID`), + CONSTRAINT `FK_FN_ROLE_COMPOSITE_PARENT` + FOREIGN KEY (`PARENT_ROLE_ID`) + REFERENCES `vid_openecomp_epsdk`.`fn_role` (`ROLE_ID`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_role_function +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_role_function` ( + `ROLE_ID` INT(11) NOT NULL, + `FUNCTION_CD` VARCHAR(30) NOT NULL, + PRIMARY KEY (`ROLE_ID`, `FUNCTION_CD`), + INDEX `fn_role_function_function_cd` (`FUNCTION_CD` ASC), + INDEX `fn_role_function_role_id` (`ROLE_ID` ASC), + CONSTRAINT `FK_FN_ROLE__REF_198_FN_ROLE` + FOREIGN KEY (`ROLE_ID`) + REFERENCES `vid_openecomp_epsdk`.`fn_role` (`ROLE_ID`), + CONSTRAINT `fk_fn_role__ref_201_fn_funct` + FOREIGN KEY (`FUNCTION_CD`) + REFERENCES `vid_openecomp_epsdk`.`fn_function` (`FUNCTION_CD`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_schedule_workflows +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_schedule_workflows` ( + `id_schedule_workflows` BIGINT(25) NOT NULL AUTO_INCREMENT, + `workflow_server_url` VARCHAR(45) NULL DEFAULT NULL, + `workflow_key` VARCHAR(45) NOT NULL, + `workflow_arguments` VARCHAR(45) NULL DEFAULT NULL, + `startDateTimeCron` VARCHAR(45) NULL DEFAULT NULL, + `endDateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `start_date_time` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `recurrence` VARCHAR(45) NULL DEFAULT NULL, + PRIMARY KEY (`id_schedule_workflows`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_tab +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_tab` ( + `TAB_CD` VARCHAR(30) NOT NULL, + `TAB_NAME` VARCHAR(50) NOT NULL, + `TAB_DESCR` VARCHAR(100) NULL DEFAULT NULL, + `ACTION` VARCHAR(100) NOT NULL, + `FUNCTION_CD` VARCHAR(30) NOT NULL, + `ACTIVE_YN` CHAR(1) NOT NULL, + `SORT_ORDER` DECIMAL(11,0) NOT NULL, + `PARENT_TAB_CD` VARCHAR(30) NULL DEFAULT NULL, + `TAB_SET_CD` VARCHAR(30) NULL DEFAULT NULL, + PRIMARY KEY (`TAB_CD`), + INDEX `fk_fn_tab_function_cd` (`FUNCTION_CD` ASC), + INDEX `fk_fn_tab_set_cd` (`TAB_SET_CD` ASC), + CONSTRAINT `fk_fn_tab_function_cd` + FOREIGN KEY (`FUNCTION_CD`) + REFERENCES `vid_openecomp_epsdk`.`fn_function` (`FUNCTION_CD`), + CONSTRAINT `fk_fn_tab_set_cd` + FOREIGN KEY (`TAB_SET_CD`) + REFERENCES `vid_openecomp_epsdk`.`fn_lu_tab_set` (`TAB_SET_CD`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_tab_selected +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_tab_selected` ( + `SELECTED_TAB_CD` VARCHAR(30) NOT NULL, + `TAB_URI` VARCHAR(40) NOT NULL, + PRIMARY KEY (`SELECTED_TAB_CD`, `TAB_URI`), + CONSTRAINT `fk_fn_tab_selected_tab_cd` + FOREIGN KEY (`SELECTED_TAB_CD`) + REFERENCES `vid_openecomp_epsdk`.`fn_tab` (`TAB_CD`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_user +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_user` ( + `USER_ID` INT(11) NOT NULL AUTO_INCREMENT, + `ORG_ID` INT(11) NULL DEFAULT NULL, + `MANAGER_ID` INT(11) NULL DEFAULT NULL, + `FIRST_NAME` VARCHAR(50) NULL DEFAULT NULL, + `MIDDLE_NAME` VARCHAR(50) NULL DEFAULT NULL, + `LAST_NAME` VARCHAR(50) NULL DEFAULT NULL, + `PHONE` VARCHAR(25) NULL DEFAULT NULL, + `FAX` VARCHAR(25) NULL DEFAULT NULL, + `CELLULAR` VARCHAR(25) NULL DEFAULT NULL, + `EMAIL` VARCHAR(50) NULL DEFAULT NULL, + `ADDRESS_ID` DECIMAL(11,0) NULL DEFAULT NULL, + `ALERT_METHOD_CD` VARCHAR(10) NULL DEFAULT NULL, + `HRID` VARCHAR(20) NULL DEFAULT NULL, + `ORG_USER_ID` VARCHAR(20) NULL DEFAULT NULL, + `ORG_CODE` VARCHAR(30) NULL DEFAULT NULL, + `LOGIN_ID` VARCHAR(25) NULL DEFAULT NULL, + `LOGIN_PWD` VARCHAR(25) NULL DEFAULT NULL, + `LAST_LOGIN_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `ACTIVE_YN` VARCHAR(1) NOT NULL DEFAULT 'Y', + `CREATED_ID` INT(11) NULL DEFAULT NULL, + `CREATED_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `MODIFIED_ID` INT(11) NULL DEFAULT NULL, + `MODIFIED_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `IS_INTERNAL_YN` CHAR(1) NOT NULL DEFAULT 'N', + `ADDRESS_LINE_1` VARCHAR(100) NULL DEFAULT NULL, + `ADDRESS_LINE_2` VARCHAR(100) NULL DEFAULT NULL, + `CITY` VARCHAR(50) NULL DEFAULT NULL, + `STATE_CD` VARCHAR(3) NULL DEFAULT NULL, + `ZIP_CODE` VARCHAR(11) NULL DEFAULT NULL, + `COUNTRY_CD` VARCHAR(3) NULL DEFAULT NULL, + `LOCATION_CLLI` VARCHAR(8) NULL DEFAULT NULL, + `ORG_MANAGER_USERID` VARCHAR(20) NULL DEFAULT NULL, + `COMPANY` VARCHAR(100) NULL DEFAULT NULL, + `DEPARTMENT_NAME` VARCHAR(100) NULL DEFAULT NULL, + `JOB_TITLE` VARCHAR(100) NULL DEFAULT NULL, + `TIMEZONE` INT(11) NULL DEFAULT NULL, + `DEPARTMENT` VARCHAR(25) NULL DEFAULT NULL, + `BUSINESS_UNIT` VARCHAR(25) NULL DEFAULT NULL, + `BUSINESS_UNIT_NAME` VARCHAR(100) NULL DEFAULT NULL, + `COST_CENTER` VARCHAR(25) NULL DEFAULT NULL, + `FIN_LOC_CODE` VARCHAR(10) NULL DEFAULT NULL, + `SILO_STATUS` VARCHAR(10) NULL DEFAULT NULL, + PRIMARY KEY (`USER_ID`), + UNIQUE INDEX `fn_user_hrid` (`HRID` ASC), + UNIQUE INDEX `fn_user_login_id` (`LOGIN_ID` ASC), + INDEX `fn_user_address_id` (`ADDRESS_ID` ASC), + INDEX `fn_user_alert_method_cd` (`ALERT_METHOD_CD` ASC), + INDEX `fn_user_org_id` (`ORG_ID` ASC), + INDEX `fk_fn_user_ref_197_fn_user` (`MANAGER_ID` ASC), + INDEX `fk_fn_user_ref_198_fn_user` (`CREATED_ID` ASC), + INDEX `fk_fn_user_ref_199_fn_user` (`MODIFIED_ID` ASC), + INDEX `fk_timezone` (`TIMEZONE` ASC), + CONSTRAINT `fk_fn_user_ref_110_fn_org` + FOREIGN KEY (`ORG_ID`) + REFERENCES `vid_openecomp_epsdk`.`fn_org` (`ORG_ID`), + CONSTRAINT `fk_fn_user_ref_123_fn_lu_al` + FOREIGN KEY (`ALERT_METHOD_CD`) + REFERENCES `vid_openecomp_epsdk`.`fn_lu_alert_method` (`ALERT_METHOD_CD`), + CONSTRAINT `fk_fn_user_ref_197_fn_user` + FOREIGN KEY (`MANAGER_ID`) + REFERENCES `vid_openecomp_epsdk`.`fn_user` (`USER_ID`), + CONSTRAINT `fk_fn_user_ref_198_fn_user` + FOREIGN KEY (`CREATED_ID`) + REFERENCES `vid_openecomp_epsdk`.`fn_user` (`USER_ID`), + CONSTRAINT `fk_fn_user_ref_199_fn_user` + FOREIGN KEY (`MODIFIED_ID`) + REFERENCES `vid_openecomp_epsdk`.`fn_user` (`USER_ID`), + CONSTRAINT `fk_timezone` + FOREIGN KEY (`TIMEZONE`) + REFERENCES `vid_openecomp_epsdk`.`fn_lu_timezone` (`TIMEZONE_ID`)) +ENGINE = InnoDB +AUTO_INCREMENT = 2 +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_user_pseudo_role +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_user_pseudo_role` ( + `PSEUDO_ROLE_ID` INT(11) NOT NULL, + `USER_ID` INT(11) NOT NULL, + PRIMARY KEY (`PSEUDO_ROLE_ID`, `USER_ID`), + INDEX `fk_pseudo_role_user_id` (`USER_ID` ASC), + CONSTRAINT `fk_pseudo_role_pseudo_role_id` + FOREIGN KEY (`PSEUDO_ROLE_ID`) + REFERENCES `vid_openecomp_epsdk`.`fn_role` (`ROLE_ID`), + CONSTRAINT `fk_pseudo_role_user_id` + FOREIGN KEY (`USER_ID`) + REFERENCES `vid_openecomp_epsdk`.`fn_user` (`USER_ID`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_user_role +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_user_role` ( + `USER_ID` INT(10) NOT NULL, + `ROLE_ID` INT(10) NOT NULL, + `PRIORITY` DECIMAL(4,0) NULL DEFAULT NULL, + `APP_ID` INT(11) NOT NULL DEFAULT '1', + PRIMARY KEY (`USER_ID`, `ROLE_ID`, `APP_ID`), + INDEX `fn_user_role_role_id` (`ROLE_ID` ASC), + INDEX `fn_user_role_user_id` (`USER_ID` ASC), + INDEX `fk_fn_user__ref_178_fn_app_IDX` (`APP_ID` ASC), + CONSTRAINT `FK_FN_USER__REF_172_FN_USER` + FOREIGN KEY (`USER_ID`) + REFERENCES `vid_openecomp_epsdk`.`fn_user` (`USER_ID`), + CONSTRAINT `FK_FN_USER__REF_175_FN_ROLE` + FOREIGN KEY (`ROLE_ID`) + REFERENCES `vid_openecomp_epsdk`.`fn_role` (`ROLE_ID`), + CONSTRAINT `fk_fn_user__ref_178_fn_app` + FOREIGN KEY (`APP_ID`) + REFERENCES `vid_openecomp_epsdk`.`fn_app` (`APP_ID`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_workflow +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_workflow` ( + `id` MEDIUMINT(9) NOT NULL AUTO_INCREMENT, + `name` VARCHAR(20) NOT NULL, + `description` VARCHAR(500) NULL DEFAULT NULL, + `run_link` VARCHAR(300) NULL DEFAULT NULL, + `suspend_link` VARCHAR(300) NULL DEFAULT NULL, + `modified_link` VARCHAR(300) NULL DEFAULT NULL, + `active_yn` VARCHAR(300) NULL DEFAULT NULL, + `created` VARCHAR(300) NULL DEFAULT NULL, + `created_by` INT(11) NULL DEFAULT NULL, + `modified` VARCHAR(300) NULL DEFAULT NULL, + `modified_by` INT(11) NULL DEFAULT NULL, + `workflow_key` VARCHAR(50) NULL DEFAULT NULL, + PRIMARY KEY (`id`), + UNIQUE INDEX `name` (`name` ASC)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.rcloudinvocation +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`rcloudinvocation` ( + `id` VARCHAR(128) NOT NULL, + `created` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `userinfo` VARCHAR(2048) NOT NULL, + `notebookid` VARCHAR(128) NOT NULL, + `parameters` VARCHAR(2048) NULL DEFAULT NULL, + `tokenreaddate` TIMESTAMP NULL DEFAULT NULL, + PRIMARY KEY (`id`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.rcloudnotebook +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`rcloudnotebook` ( + `notebookname` VARCHAR(128) NOT NULL, + `notebookid` VARCHAR(128) NOT NULL, + PRIMARY KEY (`notebookname`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.schema_info +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`schema_info` ( + `SCHEMA_ID` VARCHAR(25) NOT NULL, + `SCHEMA_DESC` VARCHAR(75) NOT NULL, + `DATASOURCE_TYPE` VARCHAR(100) NULL DEFAULT NULL, + `CONNECTION_URL` VARCHAR(200) NOT NULL, + `USER_NAME` VARCHAR(45) NOT NULL, + `PASSWORD` VARCHAR(45) NULL DEFAULT NULL, + `DRIVER_CLASS` VARCHAR(100) NOT NULL, + `MIN_POOL_SIZE` INT(11) NOT NULL, + `MAX_POOL_SIZE` INT(11) NOT NULL, + `IDLE_CONNECTION_TEST_PERIOD` INT(11) NOT NULL) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- View vid_openecomp_epsdk.v_url_access +-- ---------------------------------------------------------------------------- +CREATE OR REPLACE ALGORITHM=UNDEFINED SQL SECURITY DEFINER VIEW `v_url_access` AS select distinct `m`.`ACTION` AS + +`URL`,`m`.`FUNCTION_CD` AS `FUNCTION_CD` from `fn_menu` `m` where (`m`.`ACTION` is not null) union select distinct + +`t`.`ACTION` AS `URL`,`t`.`FUNCTION_CD` AS `FUNCTION_CD` from `fn_tab` `t` where (`t`.`ACTION` is not null) union select + +`r`.`RESTRICTED_URL` AS `URL`,`r`.`FUNCTION_CD` AS `FUNCTION_CD` from `fn_restricted_url` `r`; +SET FOREIGN_KEY_CHECKS = 1; + diff --git a/epsdk-app-onap/src/main/swm/common/common.sh b/epsdk-app-onap/src/main/swm/common/common.sh new file mode 100755 index 000000000..4b98a5eac --- /dev/null +++ b/epsdk-app-onap/src/main/swm/common/common.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +if [[ "${INSTALL_ROOT}" = */ ]]; then + export ROOT_DIR=${INSTALL_ROOT}opt/app/vid/portal +else + export ROOT_DIR=${INSTALL_ROOT}/opt/app/vid/portal +fi + +export JAVA_HOME=/opt/app/java/jdk/jdk180 + + +OS=`uname` + +if [ "${OS}" = "SunOS" ]; then + CURRENT_USER=`/usr/xpg4/bin/id -un` + CURRENT_GROUP=`/usr/xpg4/bin/id -gn` +else + CURRENT_USER=`id -un` + CURRENT_GROUP=`id -gn` +fi + +export CURRENT_USER CURRENT_GROUP +export TOMCAT_HOME=/opt/app/vid/tomcat + +if [ -z "${VID_ENDPOINT_NAME}" ]; then + VID_ENDPOINT_NAME="vid" +fi + +# Fail - used to quickly exit with a rc and error message +fail() { + rc=$1 + shift; + echo "ERROR: $@" + exit $rc +} diff --git a/epsdk-app-onap/src/main/swm/common/localize.sh b/epsdk-app-onap/src/main/swm/common/localize.sh new file mode 100755 index 000000000..711287e1f --- /dev/null +++ b/epsdk-app-onap/src/main/swm/common/localize.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +COMMON_DIR="$(dirname "$AFTSWM_ACTIONHANDLER_SCRIPT")/../../common" + +source "${COMMON_DIR}/localize_logback.sh" || { + echo "ERROR: Localizing logback.xml failed" + exit 1 +} + +source "${COMMON_DIR}/localize_portal.sh" || { + echo "ERROR: Localizing portal.properties failed" + exit 1 +} + +source "${COMMON_DIR}/localize_quartz.sh" || { + echo "ERROR: Localizing quartz.properties failed" + exit 1 +} + +source "${COMMON_DIR}/localize_system.sh" || { + echo "ERROR: Localizing system.properties failed" + exit 1 +} + +source "${COMMON_DIR}/localize_cache.sh" || { + echo "ERROR: Localizing cache.ccf failed" + exit 1 +} + +source "${COMMON_DIR}/localize_asdc.sh" || { + echo "ERROR: Localizing asdc.properties failed" + exit 1 +} diff --git a/epsdk-app-onap/src/main/swm/common/localize_asdc.sh b/epsdk-app-onap/src/main/swm/common/localize_asdc.sh new file mode 100755 index 000000000..5774e5a0c --- /dev/null +++ b/epsdk-app-onap/src/main/swm/common/localize_asdc.sh @@ -0,0 +1,68 @@ +#!/bin/bash + +FINAL_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/asdc.properties +TEMPLATE_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/asdc_template.properties +BACKUP1_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/asdc.properties.bk.1 +BACKUP2_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/asdc.properties.bk.2 + +echo "Localizing the SDC client configuration" + +if [ -z "${ASDC_CLIENT_TYPE}" ]; then + ASDC_CLIENT_TYPE=REST +fi + +if [ "${ASDC_CLIENT_TYPE}" = "REST" ]; then + if [ -z "${ASDC_CLIENT_REST_HOST}" ]; then + echo 'ASDC_CLIENT_REST_HOST must be provided when ASDC_CLIENT_TYPE=REST' + exit 1 + fi + + if [ -z "${ASDC_CLIENT_REST_AUTH}" ]; then + echo 'ASDC_CLIENT_REST_AUTH must be provided when ASDC_CLIENT_TYPE=REST' + exit 2 + fi + + if [ -z "${ASDC_CLIENT_REST_PROTOCOL}" ]; then + ASDC_CLIENT_REST_PROTOCOL=http + fi + + if [ -z "${ASDC_CLIENT_REST_PORT}" ]; then + ASDC_CLIENT_REST_PORT=8080 + fi +else + ASDC_CLIENT_REST_HOST="" + ASDC_CLIENT_REST_AUTH="" + ASDC_CLIENT_REST_PROTOCOL="http" + ASDC_CLIENT_REST_PORT="8080" +fi + +#------------------------------------------------------------------------ +#- MAKE A BACKUP OF PREVIOUS BACKUP FILE, IF EXISTS +#------------------------------------------------------------------------ +if [ -f ${BACKUP1_CONFIG_FILE} ]; then + cp -f ${BACKUP1_CONFIG_FILE} ${BACKUP2_CONFIG_FILE} || { + echo "ERROR: Could not copy ${BACKUP1_CONFIG_FILE} to ${BACKUP2_CONFIG_FILE}" + exit 2 + } +fi + +#------------------------------------------------------------------------ +#- MAKE A BACKUP OF CURRENT FILE, IF EXISTS +#------------------------------------------------------------------------ +if [ -f ${FINAL_CONFIG_FILE} ]; then + cp -f ${FINAL_CONFIG_FILE} ${BACKUP1_CONFIG_FILE} || { + echo "ERROR: Could not copy ${FINAL_CONFIG_FILE} to ${BACKUP1_CONFIG_FILE}" + exit 3 + } +fi + +sed -e 's ${ASDC_CLIENT_TYPE} '${ASDC_CLIENT_TYPE}' g' \ + -e 's ${ASDC_CLIENT_REST_HOST} '${ASDC_CLIENT_REST_HOST}' g' \ + -e 's ${ASDC_CLIENT_REST_PORT} '${ASDC_CLIENT_REST_PORT}' g' \ + -e 's ${ASDC_CLIENT_REST_PROTOCOL} '${ASDC_CLIENT_REST_PROTOCOL}' g' \ + -e 's/${ASDC_CLIENT_REST_AUTH}/'"${ASDC_CLIENT_REST_AUTH}"'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { + echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" + exit 4 + } + +echo "Localized ${FINAL_CONFIG_FILE} successfully." diff --git a/epsdk-app-onap/src/main/swm/common/localize_cache.sh b/epsdk-app-onap/src/main/swm/common/localize_cache.sh new file mode 100755 index 000000000..00069f89f --- /dev/null +++ b/epsdk-app-onap/src/main/swm/common/localize_cache.sh @@ -0,0 +1,41 @@ +#!/bin/bash + +FINAL_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/cache.ccf +TEMPLATE_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/cache_template.ccf +BACKUP1_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/cache.ccf.bk.1 +BACKUP2_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/cache.ccf.bk.2 + +echo "Localizing the VID cache configuration" + +if [ -z "${CACHE_DIRECTORY}" ]; then + CACHE_DIRECTORY=${ROOT_DIR}/cache +fi + +mkdir -p "${CACHE_DIRECTORY}" + +#------------------------------------------------------------------------ +#- MAKE A BACKUP OF PREVIOUS BACKUP FILE, IF EXISTS +#------------------------------------------------------------------------ +if [ -f ${BACKUP1_CONFIG_FILE} ]; then + cp -f ${BACKUP1_CONFIG_FILE} ${BACKUP2_CONFIG_FILE} || { + echo "ERROR: Could not copy ${BACKUP1_CONFIG_FILE} to ${BACKUP2_CONFIG_FILE}" + exit 1 + } +fi + +#------------------------------------------------------------------------ +#- MAKE A BACKUP OF CURRENT FILE, IF EXISTS +#------------------------------------------------------------------------ +if [ -f ${FINAL_CONFIG_FILE} ]; then + cp -f ${FINAL_CONFIG_FILE} ${BACKUP1_CONFIG_FILE} || { + echo "ERROR: Could not copy ${FINAL_CONFIG_FILE} to ${BACKUP1_CONFIG_FILE}" + exit 2 + } +fi + +sed -e 's,${CACHE_DIRECTORY},'${CACHE_DIRECTORY}',g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { + echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" + exit 3 + } + +echo "Localized ${FINAL_CONFIG_FILE} successfully." diff --git a/epsdk-app-onap/src/main/swm/common/localize_log4j.sh b/epsdk-app-onap/src/main/swm/common/localize_log4j.sh new file mode 100755 index 000000000..1b044aa6b --- /dev/null +++ b/epsdk-app-onap/src/main/swm/common/localize_log4j.sh @@ -0,0 +1,54 @@ +#!/bin/bash + +FINAL_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/log4j.properties +TEMPLATE_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/log4j_template.properties +BACKUP1_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/log4j.properties.bk.1 +BACKUP2_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/log4j.properties.bk.2 + +echo "Localizing the VID log4j configuration" + +if [ -z "${LOG4J_LOGLEVEL}" ]; then + LOG4J_LOGLEVEL=INFO +fi + + +if [ -z "${LOG4J_APPENDER}" ]; then + LOG4J_APPENDER=rollingfile +fi + +if [ -z "${LOG4J_LOGS_DIRECTORY}" ]; then + LOG4J_LOGS_DIRECTORY=${ROOT_DIR}/logs +fi + +mkdir -p ${LOG4J_LOGS_DIRECTORY} + +#------------------------------------------------------------------------ +#- MAKE A BACKUP OF PREVIOUS BACKUP FILE, IF EXISTS +#------------------------------------------------------------------------ +if [ -f ${BACKUP1_CONFIG_FILE} ]; then + cp -f ${BACKUP1_CONFIG_FILE} ${BACKUP2_CONFIG_FILE} || { + echo "ERROR: Could not copy ${BACKUP1_CONFIG_FILE} to ${BACKUP2_CONFIG_FILE}" + exit 1 + } +fi + +#------------------------------------------------------------------------ +#- MAKE A BACKUP OF CURRENT FILE, IF EXISTS +#------------------------------------------------------------------------ +if [ -f ${FINAL_CONFIG_FILE} ]; then + cp -f ${FINAL_CONFIG_FILE} ${BACKUP1_CONFIG_FILE} || { + echo "ERROR: Could not copy ${FINAL_CONFIG_FILE} to ${BACKUP1_CONFIG_FILE}" + exit 2 + } +fi + +sed -e 's/${LOG4J_LOGLEVEL}/'${LOG4J_LOGLEVEL}'/g' \ + -e 's/${LOG4J_APPENDER}/'${LOG4J_APPENDER}'/g' \ + -e 's,${LOG4J_LOGS_DIRECTORY},'${LOG4J_LOGS_DIRECTORY}',g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { + echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" + exit 3 + } + +echo "Localized ${FINAL_CONFIG_FILE} successfully." + + diff --git a/epsdk-app-onap/src/main/swm/common/localize_logback.sh b/epsdk-app-onap/src/main/swm/common/localize_logback.sh new file mode 100755 index 000000000..bda2486d4 --- /dev/null +++ b/epsdk-app-onap/src/main/swm/common/localize_logback.sh @@ -0,0 +1,46 @@ +#!/bin/bash + +FINAL_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/logback.xml +TEMPLATE_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/logback_template.xml +BACKUP1_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/logback.xml.bk.1 +BACKUP2_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/logback.xml.bk.2 + +echo "Localizing the VID logback configuration" + +if [ -z "${VID_LOG_DIR}" ]; then + VID_LOG_DIR="${ROOT_DIR}/logs" +fi + +if [ -z "${VID_LOG_LEVEL}" ]; then + VID_LOG_LEVEL="INFO" +fi + +mkdir -p "${VID_LOG_DIR}" + +#------------------------------------------------------------------------ +#- MAKE A BACKUP OF PREVIOUS BACKUP FILE, IF EXISTS +#------------------------------------------------------------------------ +if [ -f ${BACKUP1_CONFIG_FILE} ]; then + cp -f ${BACKUP1_CONFIG_FILE} ${BACKUP2_CONFIG_FILE} || { + echo "ERROR: Could not copy ${BACKUP1_CONFIG_FILE} to ${BACKUP2_CONFIG_FILE}" + exit 1 + } +fi + +#------------------------------------------------------------------------ +#- MAKE A BACKUP OF CURRENT FILE, IF EXISTS +#------------------------------------------------------------------------ +if [ -f ${FINAL_CONFIG_FILE} ]; then + cp -f ${FINAL_CONFIG_FILE} ${BACKUP1_CONFIG_FILE} || { + echo "ERROR: Could not copy ${FINAL_CONFIG_FILE} to ${BACKUP1_CONFIG_FILE}" + exit 2 + } +fi + +sed -e 's/${VID_LOG_LEVEL}/'${VID_LOG_LEVEL}'/g' \ + -e 's,${VID_LOG_DIR},'${VID_LOG_DIR}',g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { + echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" + exit 3 + } + +echo "Localized ${FINAL_CONFIG_FILE} successfully." diff --git a/epsdk-app-onap/src/main/swm/common/localize_portal.sh b/epsdk-app-onap/src/main/swm/common/localize_portal.sh new file mode 100755 index 000000000..77e68df30 --- /dev/null +++ b/epsdk-app-onap/src/main/swm/common/localize_portal.sh @@ -0,0 +1,84 @@ +#!/bin/bash + +FINAL_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/portal.properties +TEMPLATE_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/portal_template.properties +BACKUP1_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/portal.properties.bk.1 +BACKUP2_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/portal.properties.bk.2 + +echo "Localizing the VID portal configuration" + +if [ -z "${VID_ECOMP_REDIRECT_URL}" ]; then + VID_ECOMP_REDIRECT_URL=https://portal.openecomp.org/ecompportal/ecompportal/process_csp +fi + +if [ -z "${VID_WJ_LOGOUT_URL}" ]; then + VID_WJ_LOGOUT_URL=https://portal.openecomp.org/ecompportal/ecompportal/process_csp +fi + +if [ -z "${VID_ECOMP_REST_URL}" ]; then + VID_ECOMP_REST_URL=https://portal.openecomp.org/ecompportal/auxapi +fi + +if [ -z "${VID_UEB_URL_LIST}" ]; then + VID_UEB_URL_LIST=ueb.openecomp.org +fi + +if [ -z "${VID_UEB_CONSUMER_GROUP}" ]; then + VID_UEB_CONSUMER_GROUP=VID +fi + +if [ -z "${VID_ECOMP_PORTAL_INBOX_NAME}" ]; then + VID_ECOMP_PORTAL_INBOX_NAME=ECOMP-PORTAL-INBOX-DEV-LOCAL +fi + +if [ -z "${VID_UEB_APP_KEY}" ]; then + VID_UEB_APP_KEY=sYH0NJnsKmJC1B2A +fi + +if [ -z "${VID_UEB_APP_SECRET}" ]; then + VID_UEB_APP_SECRET=YOtknsT2wVFz9WISlSPDaAtd +fi + +if [ -z "${VID_UEB_APP_MAILBOX_NAME}" ]; then + VID_UEB_APP_MAILBOX_NAME="ECOMP-PORTAL-OUTBOX-90" +fi + +if [ -z "${VID_UEB_LISTENERS_ENABLE}" ]; then + VID_UEB_LISTENERS_ENABLE="false" +fi + +#------------------------------------------------------------------------ +#- MAKE A BACKUP OF PREVIOUS BACKUP FILE, IF EXISTS +#------------------------------------------------------------------------ +if [ -f ${BACKUP1_CONFIG_FILE} ]; then + cp -f ${BACKUP1_CONFIG_FILE} ${BACKUP2_CONFIG_FILE} || { + echo "ERROR: Could not copy ${BACKUP1_CONFIG_FILE} to ${BACKUP2_CONFIG_FILE}" + exit 2 + } +fi + +#------------------------------------------------------------------------ +#- MAKE A BACKUP OF CURRENT FILE, IF EXISTS +#------------------------------------------------------------------------ +if [ -f ${FINAL_CONFIG_FILE} ]; then + cp -f ${FINAL_CONFIG_FILE} ${BACKUP1_CONFIG_FILE} || { + echo "ERROR: Could not copy ${FINAL_CONFIG_FILE} to ${BACKUP1_CONFIG_FILE}" + exit 3 + } +fi + +sed -e 's ${VID_WJ_LOGOUT_URL} '${VID_WJ_LOGOUT_URL}' g' \ + -e 's ${VID_ECOMP_REDIRECT_URL} '${VID_ECOMP_REDIRECT_URL}' g' \ + -e 's ${VID_ECOMP_REST_URL} '${VID_ECOMP_REST_URL}' g' \ + -e 's ${VID_UEB_URL_LIST} '${VID_UEB_URL_LIST}' g' \ + -e 's ${VID_ECOMP_PORTAL_INBOX_NAME} '${VID_ECOMP_PORTAL_INBOX_NAME}' g' \ + -e 's ${VID_UEB_APP_KEY} '${VID_UEB_APP_KEY}' g' \ + -e 's ${VID_UEB_APP_SECRET} '${VID_UEB_APP_SECRET}' g' \ + -e 's ${VID_UEB_APP_MAILBOX_NAME} '${VID_UEB_APP_MAILBOX_NAME}' g' \ + -e 's ${VID_UEB_LISTENERS_ENABLE} '${VID_UEB_LISTENERS_ENABLE}' g' \ + -e 's/${VID_UEB_CONSUMER_GROUP}/'${VID_UEB_CONSUMER_GROUP}'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { + echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" + exit 4 + } + +echo "Localized ${FINAL_CONFIG_FILE} successfully." diff --git a/epsdk-app-onap/src/main/swm/common/localize_quartz.sh b/epsdk-app-onap/src/main/swm/common/localize_quartz.sh new file mode 100755 index 000000000..9a646867c --- /dev/null +++ b/epsdk-app-onap/src/main/swm/common/localize_quartz.sh @@ -0,0 +1,67 @@ +#!/bin/bash + +FINAL_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/quartz.properties +TEMPLATE_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/quartz_template.properties +BACKUP1_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/quartz.properties.bk.1 +BACKUP2_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/quartz.properties.bk.2 + +echo "Localizing the VID quartz configuration" + +if [ -z "${VID_MYSQL_HOST}" ]; then + VID_MYSQL_HOST=localhost +fi + +if [ -z "${VID_MYSQL_PORT}" ]; then + VID_MYSQL_PORT=3306 +fi + +if [ -z "${VID_MYSQL_DBNAME}" ]; then + VID_MYSQL_DBNAME=vid_portal +fi + +if [ -z "${VID_MYSQL_USER}" ]; then + VID_MYSQL_USER=$(id -un) +fi + +if [ -z "${VID_MYSQL_MAXCONNECTIONS}" ]; then + VID_MYSQL_MAXCONNECTIONS=5 +fi + +if [ -z "${VID_MYSQL_PASS}" ]; then + echo "Missing required parameter VID_MYSQL_PASS" + exit 1 +fi + +#------------------------------------------------------------------------ +#- MAKE A BACKUP OF PREVIOUS BACKUP FILE, IF EXISTS +#------------------------------------------------------------------------ +if [ -f ${BACKUP1_CONFIG_FILE} ]; then + cp -f ${BACKUP1_CONFIG_FILE} ${BACKUP2_CONFIG_FILE} || { + echo "ERROR: Could not copy ${BACKUP1_CONFIG_FILE} to ${BACKUP2_CONFIG_FILE}" + exit 2 + } +fi + +#------------------------------------------------------------------------ +#- MAKE A BACKUP OF CURRENT FILE, IF EXISTS +#------------------------------------------------------------------------ +if [ -f ${FINAL_CONFIG_FILE} ]; then + cp -f ${FINAL_CONFIG_FILE} ${BACKUP1_CONFIG_FILE} || { + echo "ERROR: Could not copy ${FINAL_CONFIG_FILE} to ${BACKUP1_CONFIG_FILE}" + exit 3 + } +fi + +sed -e 's/${VID_MYSQL_HOST}/'${VID_MYSQL_HOST}'/g' \ + -e 's/${VID_MYSQL_PORT}/'${VID_MYSQL_PORT}'/g' \ + -e 's/${VID_MYSQL_DBNAME}/'${VID_MYSQL_DBNAME}'/g' \ + -e 's/${VID_MYSQL_USER}/'${VID_MYSQL_USER}'/g' \ + -e 's/${VID_MYSQL_PASS}/'${VID_MYSQL_PASS}'/g' \ + -e 's/${VID_MYSQL_MAXCONNECTIONS}/'${VID_MYSQL_MAXCONNECTIONS}'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { + echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" + exit 4 + } + +echo "Localized ${FINAL_CONFIG_FILE} successfully." + + diff --git a/epsdk-app-onap/src/main/swm/common/localize_system.sh b/epsdk-app-onap/src/main/swm/common/localize_system.sh new file mode 100755 index 000000000..bf4735d76 --- /dev/null +++ b/epsdk-app-onap/src/main/swm/common/localize_system.sh @@ -0,0 +1,178 @@ +#!/bin/bash + +FINAL_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/system.properties +TEMPLATE_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/system_template.properties +BACKUP1_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/system.properties.bk.1 +BACKUP2_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/system.properties.bk.2 + +echo "Localizing the VID system configuration" + +if [ -z "${VID_MYSQL_HOST}" ]; then + VID_MYSQL_HOST=localhost +fi + +if [ -z "${VID_MYSQL_PORT}" ]; then + VID_MYSQL_PORT=3306 +fi + +if [ -z "${VID_MYSQL_DBNAME}" ]; then + VID_MYSQL_DBNAME=vid_portal +fi + +if [ -z "${VID_MYSQL_USER}" ]; then + VID_MYSQL_USER=vid_admin +fi + +if [ -z "${VID_MYSQL_MAXCONNECTIONS}" ]; then + VID_MYSQL_MAXCONNECTIONS=5 +fi + +if [ -z "${VID_AAI_HOST}" ]; then + VID_AAI_HOST=aai.api.openecomp.org +fi + +if [ -z "${VID_AAI_PORT}" ]; then + VID_AAI_PORT=8443 +fi + +if [ -z "${VID_APP_DISPLAY_NAME}" ]; then + VID_APP_DISPLAY_NAME=VID +fi + +if [ -z "${VID_ECOMP_SHARED_CONTEXT_REST_URL}" ]; then + VID_ECOMP_SHARED_CONTEXT_REST_URL="https://portal.openecomp.org:8080/ecompportal/context" +fi + +if [ -z "${VID_ECOMP_REDIRECT_URL}" ]; then + VID_ECOMP_REDIRECT_URL=https://portal.openecomp.org/ecompportal/ecompportal/process_csp +fi + +if [ -z "${VID_ECOMP_REST_URL}" ]; then + VID_ECOMP_REST_URL=https://portal.openecomp.org/ecompportal/auxapi +fi + +if [ -z "${VID_MSO_SERVER_URL}" ]; then + VID_MSO_SERVER_URL=https://mso.api.openecomp.org:8443 +fi + +if [ -z "${VID_TRUSTSTORE_FILE}" ]; then + VID_TRUSTSTORE_FILE=${ROOT_DIR}/etc/vid_keystore.jks +fi + +if [ -z "${VID_MYLOGIN_FEED_DIRECTORY}" ]; then + VID_MYLOGIN_FEED_DIRECTORY=/tmp/MyLogins +fi + +if [ -z "${VID_TRUSTSTORE_PASS}" ]; then + echo "ERROR: Missing required parameter VID_TRUSTSTORE_PASS" + exit 1 +fi + +if [ -z "${VID_MSO_USER}" ]; then + echo "ERROR: Missing required parameter VID_MSO_USER" + exit 1 +fi + +if [ -z "${VID_MSO_PASS}" ]; then + echo "ERROR: Missing required parameter VID_MSO_PASS"; + exit 1 +fi + +if [ -z "${VID_MYSQL_PASS}" ]; then + echo "ERROR: Missing required parameter VID_MYSQL_PASS" + exit 1 +fi + +if [ -z "${MSO_DME2_CLIENT_TIMEOUT}" ]; then + echo "ERROR: Missing required parameter MSO_DME2_CLIENT_TIMEOUT" + exit 1 +fi + +if [ -z "${MSO_DME2_CLIENT_READ_TIMEOUT}" ]; then + echo "ERROR: Missing required parameter MSO_DME2_CLIENT_READ_TIMEOUT" + exit 1 +fi + +if [ -z "${MSO_DME2_SERVER_URL}" ]; then + echo "ERROR: Missing required parameter MSO_DME2_SERVER_URL" + exit 1 +fi +if [ -z "${MSO_DME2_ENABLED}" ]; then + echo "ERROR: Missing required parameter MSO_DME2_ENABLED" + exit 1 +fi +if [ -z "${MSO_POLLING_INTERVAL_MSECS}" ]; then + MSO_POLLING_INTERVAL_MSECS=10000 +fi + +if [ -z "${AAI_TRUSTSTORE_FILENAME}" ]; then + AAI_TRUSTSTORE_FILENAME=tomcat_keystore +fi + +if [ -z "${AAI_TRUSTSTORE_PASSWD_X}" ]; then + AAI_TRUSTSTORE_PASSWD_X=70c87528c88dcd9f9c2558d30e817868 +fi + +if [ -z "${AAI_KEYSTORE_FILENAME}" ]; then + AAI_KEYSTORE_FILENAME=aai-client-cert.p12 +fi + +if [ -z "${AAI_KEYSTORE_PASSWD_X}" ]; then + AAI_KEYSTORE_PASSWD_X=70c87528c88dcd9f9c2558d30e817868 +fi + +mkdir -p "${VID_MYLOGIN_FEED_DIRECTORY}" + +#------------------------------------------------------------------------ +#- MAKE A BACKUP OF PREVIOUS BACKUP FILE, IF EXISTS +#------------------------------------------------------------------------ +if [ -f ${BACKUP1_CONFIG_FILE} ]; then + cp -f ${BACKUP1_CONFIG_FILE} ${BACKUP2_CONFIG_FILE} || { + echo "ERROR: Could not copy ${BACKUP1_CONFIG_FILE} to ${BACKUP2_CONFIG_FILE}" + exit 2 + } +fi + +#------------------------------------------------------------------------ +#- MAKE A BACKUP OF CURRENT FILE, IF EXISTS +#------------------------------------------------------------------------ +if [ -f ${FINAL_CONFIG_FILE} ]; then + cp -f ${FINAL_CONFIG_FILE} ${BACKUP1_CONFIG_FILE} || { + echo "ERROR: Could not copy ${FINAL_CONFIG_FILE} to ${BACKUP1_CONFIG_FILE}" + exit 3 + } +fi + +sed -e 's/${VID_MYSQL_HOST}/'${VID_MYSQL_HOST}'/g' \ + -e 's/${VID_MYSQL_PORT}/'${VID_MYSQL_PORT}'/g' \ + -e 's/${VID_MYSQL_DBNAME}/'${VID_MYSQL_DBNAME}'/g' \ + -e 's/${VID_MYSQL_USER}/'${VID_MYSQL_USER}'/g' \ + -e 's/${VID_MYSQL_PASS}/'${VID_MYSQL_PASS}'/g' \ + -e 's/${VID_AAI_HOST}/'${VID_AAI_HOST}'/g' \ + -e 's/${VID_AAI_PORT}/'${VID_AAI_PORT}'/g' \ + -e 's,${AAI_TRUSTSTORE_FILENAME},'${AAI_TRUSTSTORE_FILENAME}',g' \ + -e 's/${AAI_TRUSTSTORE_PASSWD_X}/'${AAI_TRUSTSTORE_PASSWD_X}'/g' \ + -e 's,${AAI_KEYSTORE_FILENAME},'${AAI_KEYSTORE_FILENAME}',g' \ + -e 's/${AAI_KEYSTORE_PASSWD_X}/'${AAI_KEYSTORE_PASSWD_X}'/g' \ + -e 's/${VID_APP_DISPLAY_NAME}/'${VID_APP_DISPLAY_NAME}'/g' \ + -e 's ${VID_ECOMP_SHARED_CONTEXT_REST_URL} '${VID_ECOMP_SHARED_CONTEXT_REST_URL}' g' \ + -e 's ${VID_ECOMP_REDIRECT_URL} '${VID_ECOMP_REDIRECT_URL}' g' \ + -e 's ${VID_ECOMP_REST_URL} '${VID_ECOMP_REST_URL}' g' \ + -e 's ${VID_MSO_SERVER_URL} '${VID_MSO_SERVER_URL}' g' \ + -e 's/${VID_MSO_USER}/'${VID_MSO_USER}'/g' \ + -e 's/${VID_MSO_PASS}/'${VID_MSO_PASS}'/g' \ + -e 's,${VID_MYLOGIN_FEED_DIRECTORY},'${VID_MYLOGIN_FEED_DIRECTORY}',g' \ + -e 's,${MSO_DME2_CLIENT_TIMEOUT},'${MSO_DME2_CLIENT_TIMEOUT}',g' \ + -e 's,${MSO_DME2_CLIENT_READ_TIMEOUT},'${MSO_DME2_CLIENT_READ_TIMEOUT}',g' \ + -e 's,${MSO_DME2_SERVER_URL},'${MSO_DME2_SERVER_URL}',g' \ + -e 's,${MSO_DME2_ENABLED},'${MSO_DME2_ENABLED}',g' \ + -e 's,${MSO_POLLING_INTERVAL_MSECS},'${MSO_POLLING_INTERVAL_MSECS}',g' \ + -e 's,${VID_TRUSTSTORE_FILE},'${VID_TRUSTSTORE_FILE}',g' \ + -e 's/${VID_TRUSTSTORE_PASS}/'${VID_TRUSTSTORE_PASS}'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { + echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" + exit 4 + } + +echo "Localized ${FINAL_CONFIG_FILE} successfully." + + diff --git a/epsdk-app-onap/src/main/swm/deinstall/postproc/post_proc b/epsdk-app-onap/src/main/swm/deinstall/postproc/post_proc new file mode 100755 index 000000000..103d18d38 --- /dev/null +++ b/epsdk-app-onap/src/main/swm/deinstall/postproc/post_proc @@ -0,0 +1,4 @@ +#!/bin/sh + +cd ../../common +exec sh -x ./deinstall_postproc.sh \ No newline at end of file diff --git a/epsdk-app-onap/src/main/swm/deinstall/preproc/pre_proc b/epsdk-app-onap/src/main/swm/deinstall/preproc/pre_proc new file mode 100755 index 000000000..ce87ecffb --- /dev/null +++ b/epsdk-app-onap/src/main/swm/deinstall/preproc/pre_proc @@ -0,0 +1,4 @@ +#!/bin/sh + +cd ../../common +exec sh -x ./deinstall_preproc.sh \ No newline at end of file diff --git a/epsdk-app-onap/src/main/swm/descriptor.xml b/epsdk-app-onap/src/main/swm/descriptor.xml new file mode 100755 index 000000000..7c09ef3a8 --- /dev/null +++ b/epsdk-app-onap/src/main/swm/descriptor.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vid/src/main/swm/fallback/postproc/post_proc b/epsdk-app-onap/src/main/swm/fallback/postproc/post_proc old mode 100644 new mode 100755 similarity index 100% rename from vid/src/main/swm/fallback/postproc/post_proc rename to epsdk-app-onap/src/main/swm/fallback/postproc/post_proc diff --git a/vid/src/main/swm/fallback/preproc/pre_proc b/epsdk-app-onap/src/main/swm/fallback/preproc/pre_proc old mode 100644 new mode 100755 similarity index 100% rename from vid/src/main/swm/fallback/preproc/pre_proc rename to epsdk-app-onap/src/main/swm/fallback/preproc/pre_proc diff --git a/epsdk-app-onap/src/main/swm/initinst/postproc/post_proc b/epsdk-app-onap/src/main/swm/initinst/postproc/post_proc new file mode 100755 index 000000000..a986928c0 --- /dev/null +++ b/epsdk-app-onap/src/main/swm/initinst/postproc/post_proc @@ -0,0 +1,7 @@ +#!/bin/bash + +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +source ${DIR}/../../install/postproc/post_proc || { + echo "INITINST post_proc script failed"; exit 1 +} diff --git a/epsdk-app-onap/src/main/swm/initinst/preproc/pre_proc b/epsdk-app-onap/src/main/swm/initinst/preproc/pre_proc new file mode 100755 index 000000000..983d0c535 --- /dev/null +++ b/epsdk-app-onap/src/main/swm/initinst/preproc/pre_proc @@ -0,0 +1,7 @@ +#!/bin/bash + +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" + +source "${DIR}/../../install/preproc/pre_proc" || { + echo "INITINST pre_proc script failed"; exit 1 +} diff --git a/epsdk-app-onap/src/main/swm/install/postproc/post_proc b/epsdk-app-onap/src/main/swm/install/postproc/post_proc new file mode 100755 index 000000000..370d44b61 --- /dev/null +++ b/epsdk-app-onap/src/main/swm/install/postproc/post_proc @@ -0,0 +1,38 @@ +#!/bin/bash + +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +COMMON_SCRIPT=${DIR}/../../common/common.sh + +source "${COMMON_SCRIPT}" || { + echo "ERROR: Common script failed" + exit 1 +} + +mkdir -p "${TOMCAT_HOME}/temp" + +#Extract the WAR so it can be customized by the localization script +mkdir -p ${ROOT_DIR}/war +cp "${ROOT_DIR}/lib/vid.war" "${ROOT_DIR}/war/${VID_ENDPOINT_NAME}.war" +cd "${ROOT_DIR}/war" +${JAVA_HOME}/bin/jar -xf ${VID_ENDPOINT_NAME}.war +rm ${ROOT_DIR}/war/${VID_ENDPOINT_NAME}.war + +LOCALIZE_SCRIPT=$(dirname "$AFTSWM_ACTIONHANDLER_SCRIPT")/../../common/localize.sh + + +source "${LOCALIZE_SCRIPT}" || { + echo "ERROR: Localization script failed" + exit 2 +} + +#Create the customized WAR and deploy it to Tomcat +mkdir -p "${ROOT_DIR}/deployed" +cd "${ROOT_DIR}/war" +${JAVA_HOME}/bin/jar -cvf "${ROOT_DIR}/deployed/${VID_ENDPOINT_NAME}.war" . +cd +rm -rf "${ROOT_DIR}/war" +mv -f "${ROOT_DIR}/deployed/${VID_ENDPOINT_NAME}.war" "${TOMCAT_HOME}/webapps" + +if [ -f "${TOMCAT_HOME}/bin/startup.sh" ]; then + "${TOMCAT_HOME}/bin/startup.sh" +fi diff --git a/epsdk-app-onap/src/main/swm/install/preproc/pre_proc b/epsdk-app-onap/src/main/swm/install/preproc/pre_proc new file mode 100755 index 000000000..a09a9c46f --- /dev/null +++ b/epsdk-app-onap/src/main/swm/install/preproc/pre_proc @@ -0,0 +1,18 @@ +#!/bin/bash + +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +COMMON_SCRIPT=${DIR}/../../common/common.sh + +source "${COMMON_SCRIPT}" || { + echo "ERROR: Common script failed" + exit 1 +} + +if [ -f "${TOMCAT_HOME}/bin/shutdown.sh" ]; then + "${TOMCAT_HOME}/bin/shutdown.sh" + + if [ -d "${TOMCAT_HOME}/webapps/${VID_ENDPOINT_NAME}" ]; then + rm -r "${TOMCAT_HOME}/webapps/${VID_ENDPOINT_NAME}" + fi +fi + diff --git a/epsdk-app-onap/src/main/swm/notes.txt b/epsdk-app-onap/src/main/swm/notes.txt new file mode 100755 index 000000000..f0a8fa974 --- /dev/null +++ b/epsdk-app-onap/src/main/swm/notes.txt @@ -0,0 +1,52 @@ +This package will install the Virtual Infrastructure Deployment (VID) war to the local tomcat server. +The Tomcat server is marked as a dependency of this package and will be installed automatically on the +target server if it has not already been installed. The current version of Tomcat used by VID +is 8.0.36. MariaDB is also necessary for VID and can be installed by whichever method you choose. + +The following are variables that can be set to customize your installation of VID: + +Variable Default Description + +ASDC_CLIENT_REST_AUTH unset Basic authentication header value (e.g. Basic asdfoijwelkjsg=) +ASDC_CLIENT_REST_HOST unset Host where the SDC Catalog Service is running +ASDC_CLIENT_REST_PORT 8080 Port where the SDC Catalog Service is running +ASDC_CLIENT_TYPE REST Set to IN_MEMORY for testing, REST for connecting with an actual SDC Catalog Service + +MSO_DME2_CLIENT_READ_TIMEOUT unset Time in ms before DME2 MSO read requests timeout +MSO_DME2_CLIENT_TIMEOUT unset Time in ms before DME2 MSO requests timeout +MSO_DME2_ENABLED unset Whether the enable the MSO DME2 client or not +MSO_DME2_SERVER_URL unset The server URL for connecting to the MSO service +MSO_POLLING_INTERVAL_MSECS 10000 The interval at which to poll MSO for orchestration requests +VID_MSO_PASS unset The password for connecting with the MSO service +VID_MSO_SERVER_URL unset The server URL for connecting with the MSO service +VID_MSO_USER unset The user name for connecting with the MSO service + +VID_LOG_DIR ${ROOT_DIR}/logs The directory to store log files in +VID_LOG_LEVEL INFO The level at which to log (follows logback logging levels) +VID_ECOMP_REDIRECT_URL https://portal.openecomp.org/ecompportal/ecompportal/process_csp See ECOMP SDK Documentation +VID_ECOMP_REST_URL https://portal.openecomp.org/ecompportal/auxapi See ECOMP SDK Documentation +VID_ENDPOINT_NAME vid http://{host}:{port}/{VID_ENDPOINT_NAME} + +VID_MYSQL_HOST unset The host where the VID MariaDB instance is running +VID_MYSQL_MAXCONNECTIONS 5 The maximum connections to use to connect to the MariaDB instance +VID_MYSQL_PORT 3306 The port where the VID MariaDB instance is running +VID_MYSQL_DBNAME vid_portal The database name (i.e. CREATE DATABASE ${VID_MYSQL_DBNAME} +VID_MYSQL_USER vidadmin The user to connect as to the MariaDB instance +VID_MYSQL_PASS unset The password for the ${VID_MYSQL_USER} @ ${VID_MYSQL_HOST} + +VID_AAI_HOST unset The host where the A&AI service is running +VID_AAI_PORT 8443 The port where the A&AI service is running +VID_TRUSTSTORE_PASS unset The password for the VID truststore (A&AI client) +VID_TRUSTSTORE_FILE unset The location on the file system of the truststore (A&AI client) +AAI_TRUSTSTORE_FILENAME tomcat_keystore A file name +AAI_TRUSTSTORE_PASSWD_X (dev env creds) A password +AAI_KEYSTORE_FILENAME aai-client-cert.p12 A file name +AAI_KEYSTORE_PASSWD_X (dev env creds) A password + +VID_UEB_URL_LIST ueb.openecomp.org The hosts where UEB is running +VID_UEB_CONSUMER_GROUP VID The UEB consumer group name to use +VID_ECOMP_PORTAL_INBOX_NAME ECOMP-PORTAL-INBOX-DEV-LOCAL A UEB Topic to send messages to the ECOMP portal on +VID_UEB_APP_KEY sYH0NJnsKmJC1B2A The UEB App Key (mandatory) +VID_UEB_APP_SECRET YOtknsT2wVFz9WISlSPDaAtd The UEB App Secret +VID_UEB_APP_MAILBOX_NAME ECOMP-PORTAL-OUTBOX-90 A UEB Topic to listen for messages from the ECOMP portal on +VID_UEB_LISTENERS_ENABLE false Enable the UEB listeners for the specified mailboxes (In 1610, this should always be false) diff --git a/vid/src/main/webapp/WEB-INF/cert/tomcat_keystore b/epsdk-app-onap/src/main/webapp/WEB-INF/cert/tomcat_keystore old mode 100644 new mode 100755 similarity index 100% rename from vid/src/main/webapp/WEB-INF/cert/tomcat_keystore rename to epsdk-app-onap/src/main/webapp/WEB-INF/cert/tomcat_keystore diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/asdc.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/asdc.properties new file mode 100755 index 000000000..14a3b0954 --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/asdc.properties @@ -0,0 +1,6 @@ +asdc.client.type=REST + +asdc.client.rest.protocol=http +asdc.client.rest.host= +asdc.client.rest.port=8080 +asdc.client.rest.auth= diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/asdc_template.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/asdc_template.properties new file mode 100755 index 000000000..4015da4e6 --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/asdc_template.properties @@ -0,0 +1,6 @@ +asdc.client.type=${ASDC_CLIENT_TYPE} + +asdc.client.rest.protocol=${ASDC_CLIENT_REST_PROTOCOL} +asdc.client.rest.host=${ASDC_CLIENT_REST_HOST} +asdc.client.rest.port=${ASDC_CLIENT_REST_PORT} +asdc.client.rest.auth=${ASDC_CLIENT_REST_AUTH} diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/quartz.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/quartz.properties new file mode 100755 index 000000000..a493b6390 --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/quartz.properties @@ -0,0 +1,30 @@ +################################################################################# +# Quartz configurations for Quantum Work Flow # +################################################################################# + +org.quartz.scheduler.instanceId = AUTO + +################################################################################# +# Main configurations +org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool +org.quartz.threadPool.threadCount = 30 + +============================================================================ +# Configure JobStore +#============================================================================ + +org.quartz.jobStore.misfireThreshold = 60000 + +org.quartz.jobStore.class = org.quartz.impl.jdbcjobstore.JobStoreTX +org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.StdJDBCDelegate +org.quartz.jobStore.useProperties = false +#org.quartz.jobStore.dataSource = myDS +org.quartz.jobStore.tablePrefix = FN_QZ_ + +org.quartz.jobStore.isClustered = true +org.quartz.jobStore.clusterCheckinInterval = 20000 + +#============================================================================ +# Configure Datasources +#============================================================================ + diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/quartz_template.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/quartz_template.properties new file mode 100755 index 000000000..b64869f62 --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/quartz_template.properties @@ -0,0 +1,36 @@ +################################################################################# +# Quartz configurations for Quantum Work Flow # +################################################################################# + +org.quartz.scheduler.instanceId = AUTO + +################################################################################# +# Main configurations +org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool +org.quartz.threadPool.threadCount = 30 + +============================================================================ +# Configure JobStore +#============================================================================ + +org.quartz.jobStore.misfireThreshold = 60000 + +org.quartz.jobStore.class = org.quartz.impl.jdbcjobstore.JobStoreTX +org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.StdJDBCDelegate +org.quartz.jobStore.useProperties = false +#org.quartz.jobStore.dataSource = myDS +org.quartz.jobStore.tablePrefix = FN_QZ_ + +org.quartz.jobStore.isClustered = true +org.quartz.jobStore.clusterCheckinInterval = 20000 + +#============================================================================ +# Configure Datasources +#============================================================================ + +org.quartz.dataSource.myDS.driver = com.mysql.jdbc.Driver +org.quartz.dataSource.myDS.URL = jdbc:mysql://${VID_MYSQL_HOST}:${VID_MYSQL_PORT}/${VID_MYSQL_DBNAME} +org.quartz.dataSource.myDS.user = ${VID_MYSQL_USER} +org.quartz.dataSource.myDS.password = ${VID_MYSQL_PASS} +org.quartz.dataSource.myDS.maxConnections = ${VID_MYSQL_MAXCONNECTIONS} +org.quartz.dataSource.myDS.validationQuery=select 0 from dual diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/raptor.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/raptor.properties new file mode 100755 index 000000000..34330a009 --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/raptor.properties @@ -0,0 +1,187 @@ +### +# ================================================================================ +# eCOMP Portal SDK +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ================================================================================ +### +##C## Mention the name of the framework. At present RAPTOR supports FUSION +system=fusion +##C## Determines the priority for the debug message. +debug_level=5 +##C## Determines the number of records can be downloaded in excel when you select "download all" option. +download_limit=65000 +csv_download_limit=10 +##C## Determines the number of records to be displayed in a single page. +default_page_size=50 +##C## Determines the list size in the form field. +form_fields_list_size=99000 +##C## Determines the scheduler interval +#scheduler_interval=0 => disabled +scheduler_interval=0 +##C## System Name +system_name=RAPTOR +##C## This is used for Bread crumbs. +base_title=ANALYSIS +##C## whether to allow SQL-based report definition (security risk); super users are always allowed to create SQL-based reports +allow_sql_based_reports=yes +##C## Determines whether to include disclaimer page at the bottom of each screen +show_disclaimer=yes +disclaimer_positioned_top_in_csvexcel=yes +##C## Determines whether to display the form page as a separate page before running the report +display_form_before_run=yes +##C## Determines whether to include the form page on the report data page +include_form_with_data=yes +##C## Determines whether to cache chart data in the session => faster re-display if the data volume does not get too large +cache_chart_data=yes +##C## Determines whether to cache report data for the currently displayed page in the session => faster re-display + ##C## if the data volume does not get too large +cache_cur_page_data=yes +##C## Determines Chart width +default_chart_width=700 +##C## Determines Chart height +default_chart_height=420 +##C## Determines whether to permit report deletion only by report owner or by everyone with "write" access +delete_only_by_owner=no +##C## Determines whether to log each report execution and update time and user ID +enable_report_log=yes +##C## Determines whether to cache user roles info in memory (saves many DB reads, but does not account for roles + ##C## assigned after the cache was loaded) +cache_user_roles=yes +##C## Determines whether to convert month formats (e.g. MM/YYYY) to the last day of the month (true) or + ##C## first day (false) - like 12/2003 is converted to either 12/31/2003 or 12/01/2003 +month_format_use_last_day=no +##C## Determines whether to print the report title in the download files +print_title_in_download=yes +##C## Determines whether to show report description when the report is run and in the quick links +show_descr_at_runtime=no +##C## Determines whether to skip labels on the Line chart axis when they overlap +#DEPRECATED skip_chart_labels_to_fit=no +##C## Determines whether to show chart types that are purpose and/or data specific +show_nonstandard_charts=yes +##C## Determines whether to allow the user to change the chart type at runtime +allow_runtime_chart_sel=yes +##C## Determines whether to display the report title as chart title as well +display_chart_title=yes +##C## Determines whether to merge/blank multi-level row headings in cross-tab report +merge_crosstab_row_headings=yes +##C## Determines whether to display chart when displaying the report at first or just a "Show Chart" button +display_chart_by_default=yes +##C## Determines whether to print the form field values in the download files +print_params_in_download=yes +##C## Determines the limitation to the characters in chart label. +skip_chart_labels_limit=30 +##C## Determines whether to users with read-only rights for a report can copy it +can_copy_on_read_only=yes +##C## Determines the no of decimals to be displayed in Totals column +#max_decimals_on_totals=-1 => don't truncate, display all decimal digits +max_decimals_on_totals=2 +##C## Determines which JFreeChart to use. +jfree_version=latest +#jfree_version=0.9.11 +# Added this restriction so that heavily used system which contain +# more than 1000 users can enable this feature not to display whole +# users in the drop down menu +display_all_users=yes +##Sheet name +sheet_name=raptor +#shell_script_name=/home/sundar/test.sh +#download_query_folder=/titan/PROJECT3/RAPTOR/raptor/dwnld/query/ +## this directory is mentioned if the flat file is downloaded using shell script +shell_script_dir=/titan/PROJECT3/RAPTOR/raptor/dwnld/ +flat_file_lower_limit=1 +flat_file_upper_limit=200000 +## whatever request mentioned here would be parsed in sql and request parameter would be filled +request_get_params=isEmbedded +print_footer_in_download=yes +## footer mentioned here appears in downloaded excel +footer_first_line=TODO footer first line +footer_second_line=Use Pursuant to Company Instructions +## to run report in popup window +report_in_popup_window=yes +## to run each report in new popup window if the above is selected +popup_in_new_window=yes +## "Yes" allows the request param to be passed to the drill down report +pass_request_param_in_drilldown=yes +## Show PDF download icon +show_pdf_download=yes +# Show Folder Tree +show_folder_tree=no +#Show folder tree only for Admin Users +show_folder_tree_only_to_admin_users=no +#folder tree should be minimized +folder_tree_minimized=yes +## whatever session mentioned here would be parsed in sql and session parameter would be filled +session_params=login_id +display_formfield_info=yes +customize_formfield_info=yes +#schedule limit for end users +schedule_limit=10 +# customized query if you need any restrictions for schedule and security tab for fusion +#schedule_custom_query_for_users=getAllUsersByCustomer +#schedule_custom_query_for_roles=getAllRolesByCustomer +# customized query if you need any restrictions for schedule and security tab for prisms example +#schedule_custom_query_for_users=SELECT au.user_id, au.first_name||' '||au.last_name user_name FROM app_user au order by 2 +schedule_custom_query_for_users=SELECT au.user_id id, au.first_name||' '||au.last_name name FROM app_user au where user_id = 1 order by 2 +#schedule_custom_query_for_roles=SELECT ar.role_id, ar.descr role_name FROM app_role ar order by 2 +schedule_date_pattern=MM/dd/yyyy hh:mm:ss a +## This is used to display in right format in chart timestamp axis as we give in the sql +#chart_yearly_format=yyyy +#chart_monthly_format=MMM-yyyy +#chart_daily_format=MM-dd-yyyy +chart_hourly_format=MM/dd HH +#chart_minute_format=HH:mm +chart_minute_format=MM-dd-yyyy-HH:mm +#chart_second_format=HH:mm:ss +chart_second_format=MM-dd-yyyy +#chart_millisecond_format=HH:mm:ss.S +schedule_help_text=This form is used to schedule a specific Reporting Platform report to be delivered to one or more email addresses associated with your Company's Business Direct user logins. Note that report output delivered via email does not include the capability to drill down/back up to additional data levels. So, select the appropriate data level report for the scheduled report. View the status of scheduled report requests in the My Schedules menu item. +use_loginid_in_schedYN=Y +session_params_for_scheduling=login_id +session_date_formfield_auto_incr=yes +display_session_param_pdfexcel=login_id;Login Id +session_params_for_displaying_in_scheduling=login_id;Login Id +application_server=tomcat +#gmap properties +gmap_key=ABQIAAAAToJSSetKBMjBJx8MiRw4ghQiU0SbbKnm8C5eu25cpyLwgkLzyRShrQTbgZtqnKAqZU9JwcSq1bKwiA +PROJECT-FOLDER=/Users/sundar/git/st_quantum/quantum/target/quantum-1.0 +# +MARKET-SHAPEFILE-FOLDER=resources/files +# output folder for files generated on server side +OUTPUT-FOLDER=resources/temp +# tile size in pixel +TILE-SIZE=256 +#check if map is disabled or not +map_allowed=Y +max_drilldown_level=2 +admin_role_equiv_to_super_role=N +show_loading_during_formfield_chain=Y +show_print_icon=N +globally_nowrap=N +calendar_output_date_format=MM/dd/yyyy +memory_threshold_percentage=99 +print_params_in_csv_download=yes +notitle_in_dashboard=yes +generate_store_sched_reports=yes +show_excel_2007_download=yes +print_excel_in_landscape=yes +show_animated_chart_option=yes +show_animated_chart_only=no +adjust_content_based_on_height=yes +custom_submit_button_text=Run Button +customize_formfield_layout=yes +#db_type=postgresql +#db_type=oracle +db_type=mysql diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/raptor_app_fusion.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/raptor_app_fusion.properties new file mode 100755 index 000000000..28a818025 --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/raptor_app_fusion.properties @@ -0,0 +1,39 @@ +### +# ================================================================================ +# eCOMP Portal SDK +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ================================================================================ +### +temp_folder_path=/demeter/WebApps/dev/ECOMP_PORTAL/temp/ +upload_folder_path=/demeter/WebApps/dev/ECOMP_PORTAL/files/ +excel_template_path=/demeter/WebApps/dev/ECOMP_PORTAL/files/raptor_template/ +temp_folder_url=temp/ +upload_folder_url=upload/ +smtp_server=todo.smtp.com +default_email_sender=email-name@email.com +error_page=error_page.jsp +jsp_context_path=raptor/ +img_folder_url=static/fusion/raptor/images/ +base_folder_url=static/fusion/raptor/ +direct_access_url=http://localhost:8080/quantum/raptor_email_attachment.htm?action=raptor&source_page=report_run&display_content=y +#base_action_url=report.htm#/report_run/ +drill_action_url=report.htm#/report_run/c_master= +base_action_url=report_wizard.htm?action= +base_action_url_ng=report#/ +base_action_param=c_master= +super_role_id=1 +admin_role_ids=1 +quick_links_menu_ids=HOME,CUSTOMER,REPORTS diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/raptor_db_fusion.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/raptor_db_fusion.properties new file mode 100755 index 000000000..783f5bbe3 --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/raptor_db_fusion.properties @@ -0,0 +1,19 @@ +### +# ================================================================================ +# eCOMP Portal SDK +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ================================================================================ +### diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/raptor_pdf.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/raptor_pdf.properties new file mode 100755 index 000000000..504f0822a --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/raptor_pdf.properties @@ -0,0 +1,49 @@ +### +# ================================================================================ +# eCOMP Portal SDK +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ================================================================================ +### +## pdf file specific properties +pdf_data_font_size=9 +pdf_data_font_family=Arial +#reduce the font size from html config +pdf_data_font_size_offset=2 +pdf_data_alternate_color=true +#data row background(white), alternate(light light blue/gray) +pdf_data_background_alternate_hex_code=#EDEDED +pdf_data_default_background_hex_code=#FFFFFF +#header font (white) background (gray) +pdf_data_table_header_font_hex_code=#FFFFFF +pdf_data_table_header_background_hex_code=#8A9BB3 +#footer header +pdf_footer_font_size=9 +pdf_footer_font_family=Arial +pdf_att_proprietary=Proprietary\nUse Pursuant to Company Instructions +pdf_att_proprierary_font_size=7 +pdf_date_timezone=GMT +pdf_date_pattern=MM/dd/yyyy hh:mm:ss a +##page number position at 1 - footer middle, 0 -- header right, 2 - both +pdf_page_number_position=1 +pdf_word_before_page_number=Page +pdf_word_after_page_number= +pdf_coverpage_firstcolumn_size=0.3 +pdf_image_auto_rotate=false +display_create_owner_info=true +#session_info=customer,customerId +display_loginid_for_downloaded_by=false +# please use false if you want landscape to be default. +is_default_orientation_portrait=true diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/sql.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/sql.properties new file mode 100755 index 000000000..aee16cdb8 --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/sql.properties @@ -0,0 +1,322 @@ +### +# ================================================================================ +# eCOMP Portal SDK +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ================================================================================ +### +#SQL Statements for PostgreSQL + +#ReportLoader.java + +load.custom.report.xml = SELECT cr.report_xml FROM cr_report cr WHERE rep_id=? + +# need to copy to oracle +load.remoteDB.schema = SELECT 'local' SCHEMA_ID, 'local' SCHEMA_DESC, null DATASOURCE_TYPE FROM dual union SELECT a.SCHEMA_ID, a.SCHEMA_DESC, DATASOURCE_TYPE FROM SCHEMA_INFO a where schema_id <> 'local' order by schema_id +load.remoteDB.schema.where = SELECT a.SCHEMA_ID, a.SCHEMA_DESC, DATASOURCE_TYPE FROM SCHEMA_INFO a where schema_id = '[schema_id]' +#formfield rendering + +formfield.id.name.sql.prefix=SELECT id, name FROM ( +formfield.id.name.sql=SELECT id, name + +formfield.id.name.sql.suffix= + +report.security.create= SELECT coalesce(cr.owner_id, cr.create_id) AS owner_id, cr.create_id, DATE_FORMAT(cr.create_date, '%m/%d/%Y') create_date, maint_id, DATE_FORMAT(cr.maint_date, '%m/%d/%Y') update_date, cr.public_yn FROM cr_report cr WHERE cr.rep_id = [rw.getReportID()] + +db.update.report.xml = SELECT cr.rep_id, cr.report_xml FROM cr_report cr WHERE rep_id=? FOR UPDATE + +update.custom.report.rec = UPDATE cr_report SET title='[Utils.oracleSafe(rw.getReportName())]', descr='[Utils.oracleSafe(rw.getReportDescr())]', public_yn='[(rw.isPublic()]', menu_id='[rw.getMenuID()]', menu_approved_yn='[(rw.isMenuApproved()]', owner_id=[rw.getOwnerID()], maint_id=[rw.getUpdateID()], maint_date=STR_TO_DATE('[rw.getUpdateDate()]', '[Globals.getOracleTimeFormat()]'), dashboard_type_yn='[(rw.isDashboardType()]', dashboard_yn= '[(rw.getReportType().equals(AppConstants.RT_DASHBOARD)]' WHERE rep_id = [rw.getReportID()] + +is.report.already.scheduled = select rep_id from cr_report_schedule where rep_id = ? + +create.custom.report.rec = INSERT INTO cr_report(rep_id, title, descr, public_yn, menu_id, menu_approved_yn, report_xml, owner_id, create_id, create_date, maint_id, maint_date, dashboard_type_yn, dashboard_yn, folder_id) VALUES([rw.getReportID()], '[Utils.oracleSafe(rw.getReportName())]', '[Utils.oracleSafe(rw.getReportDescr())]', '[rw.isPublic()]', '[rw.getMenuID()]', '[rw.isMenuApproved()]', '', [rw.getOwnerID()], [rw.getCreateID()], STR_TO_DATE('[rw.getCreateDate()]', '[Globals.getOracleTimeFormat()]'), [rw.getUpdateID()], STR_TO_DATE('[rw.getUpdateDate()]', '[Globals.getOracleTimeFormat()]'), '[rw.isDashboardType()]', '[rw.getReportType().equals(AppConstants.RT_DASHBOARD)]',[rw.getFolderId()]) + +get.user.report.names = SELECT cr.rep_id, cr.title FROM cr_report cr WHERE coalesce(cr.owner_id, cr.create_id) = [userID] + +get.report.owner.id = SELECT coalesce(cr.owner_id, cr.create_id) AS owner FROM cr_report cr WHERE rep_id = ? + +delete.report.record.log = DELETE FROM cr_report_log WHERE rep_id = [reportID] + +delete.report.record.users = DELETE FROM cr_report_schedule_users WHERE rep_id = [reportID] + +delete.report.record.schedule = DELETE FROM cr_report_schedule WHERE rep_id = [reportID] + +delete.report.record.access = DELETE FROM cr_report_access WHERE rep_id = [reportID] + +delete.report.record.email = DELETE FROM cr_report_email_sent_log WHERE rep_id = [reportID] + +delete.report.record.favorite = DELETE FROM cr_favorite_reports WHERE rep_id = [reportID] + +delete.report.record.report = DELETE FROM cr_report WHERE rep_id = [reportID] + +load.quick.links = select finalcr.rep_id, finalcr.title, finalcr.descr from (SELECT cr.rep_id, cr.title, cr.descr FROM (SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL (SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra LEFT JOIN cr_report cr ON cr.rep_id = ra.rep_id WHERE cr.menu_id LIKE '%[nvls(menuId)]%' AND cr.menu_approved_yn = 'Y' AND (coalesce(cr.owner_id, cr.create_id) = [userID] OR cr.public_yn = 'Y' OR ra.read_only_yn IS NOT NULL) UNION SELECT cr.rep_id, cr.title, cr.descr FROM cr_report cr WHERE cr.menu_id LIKE '%[nvls(menuId)]%' AND (coalesce(cr.owner_id, cr.create_id) = [userID] OR cr.public_yn = 'Y' or EXISTS (select * from fn_user_role where user_id=[userID] and role_id in (1)))) finalcr ORDER BY finalcr.title + +load.folder.reports = SELECT cr.rep_id, cr.rep_id report_id, concat([rep_title_sql] , (CASE WHEN cr.public_yn = 'Y' THEN '' ELSE '[PRIVATE_ICON]' END),cr.title,'') title, cr.descr, concat(au.first_name,' ',au.last_name) owner_name, DATE_FORMAT(cr.create_date, '%m/%d/%Y') create_date, CASE WHEN coalesce(cr.owner_id, cr.create_id) = [userID] THEN 'N' ELSE coalesce(ra.read_only_yn, 'Y') END read_only_yn, CASE WHEN coalesce(cr.owner_id, cr.create_id) = [userID] THEN 'Y' ELSE 'N' END user_is_owner_yn FROM cr_report cr JOIN app_user au ON coalesce(cr.owner_id, cr.create_id) = au.user_id AND cr.folder_id= '[folderId]' LEFT JOIN (SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL(SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra ON cr.rep_id = ra.rep_id +#If roleList.toString() is '' PostgreSQL returns an error - needs to be null instead of empty + +load.folder.reports.user = AND coalesce(cr.owner_id, cr.create_id) = [userID] + +load.folder.reports.publicsql = AND (coalesce(cr.owner_id, cr.create_id) = [userID] OR cr.public_yn = 'Y' OR ra.read_only_yn IS NOT NULL) + +load.quick.download.links = SELECT a.file_name, b.title,DATE_FORMAT(a.dwnld_start_time, '%W %d-%m-%Y %H:%i:%s') as time, a.dwnld_start_time FROM cr_report_dwnld_log a, cr_report b where a.user_id = [userID] and a.rep_id = b.rep_id and (a.dwnld_start_time) >= STR_TO_DATE(DATE_FORMAT(now() - INTERVAL 1 DAY, '%m/%d/%Y'), '%m/%d/%Y') and a.record_ready_time is not null order by a.dwnld_start_time + +load.reports.to.schedule = SELECT cr.rep_id, Initcap(cr.title), cr.descr FROM cr_report cr LEFT OUTER JOIN (SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL (SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra ON cr.rep_id = ra.rep_id AND (cr.public_yn = 'Y' OR ra.read_only_yn IS NOT NULL or cr.owner_id = [userID] )ORDER BY Initcap(cr.title) + +load.reports.to.add.in.dashboard = SELECT cr.rep_id, cr.title, cr.descr FROM cr_report cr LEFT OUTER JOIN (SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL (SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra ON cr.rep_id = ra.rep_id AND (coalesce(cr.owner_id, cr.create_id) = [userID] OR cr.public_yn = 'Y' OR ra.read_only_yn IS NOT NULL) AND (cr.dashboard_yn = 'N' or cr.dashboard_yn is null) ORDER BY cr.title + +load.my.recent.links = select rep_id, title, descr, form_fields from ( select rep_id, title, descr, form_fields from (select cr.rep_id, cr.title, a.form_fields, cr.descr, a.log_time, a.user_id, a.action, a.action_value from cr_report_log a, cr_report cr where user_id = [userID] AND action = 'Report Execution Time' and a.rep_id = cr.rep_id order by log_time desc) AS x) AS y where LIMIT 1, 6 + +create.report.log.entry = INSERT INTO cr_report_log (rep_id, log_time, user_id, action, action_value, form_fields) VALUES([reportID], now(), [userID], '[action]' , '[executionTime]', '[form_fields]') + +create.report.log.entry.exec.time = INSERT INTO cr_report_log (rep_id, log_time, user_id, action, action_value, form_fields) VALUES([reportID], NOW() + INTERVAL 1 SECOND, [userID], '[action]' , '[executionTime]', '[formFields]') + +clear.report.log.entries = DELETE FROM cr_report_log WHERE rep_id = ? and user_id = ? + +load.report.log.entries = SELECT x.log_time, x.user_id, (CASE WHEN x.action = 'Report Execution Time' THEN concat('',x.action,'') ELSE x.action END) action, (CASE WHEN x.action = 'Report Execution Time' THEN action_value ELSE 'N/A' END) time_taken, (CASE WHEN x.action = 'Report Execution Time' THEN concat('\"Run') ELSE 'N/A' END) run_image, x.name FROM (SELECT rl.rep_id, DATE_FORMAT(rl.log_time, '%m/%d/%Y %h:%i:%s %p') log_time, rl.action_value, concat(fuser.last_name ,', ',fuser.first_name) name, rl.user_id, rl.action, rl.form_fields FROM cr_report_log rl, fn_user fuser WHERE rl.rep_id = [nvls(reportId)] and rl.action != 'Report Run' and fuser.user_id = rl.user_id ORDER BY rl.log_time DESC) x LIMIT 100 + +does.user.can.schedule.report = select crs.sched_user_id, count(*) from cr_report_schedule crs where sched_user_id = [userId] group by crs.sched_user_id having count(*) >= [Globals.getScheduleLimit()] + +does.user.can.schedule = select crs.schedule_id from cr_report_schedule crs where schedule_id = [scheduleId] + +get.system.date.time = select DATE_FORMAT(now(),'%m/%d/%Y %H:%i:%s') + +get.next.day.date.time = select DATE_FORMAT(NOW() + INTERVAL 1 DAY,'%m/%d/%Y %H:%i:%s') + +get.next.fifteen.minutes.date.time = select DATE_FORMAT(NOW() + INTERVAL 15 MINUTES,'%m/%d/%Y %H:%i:%s') + +get.next.thirty.minutes.date.time = select DATE_FORMAT(NOW() + INTERVAL 30 MINUTES,'%m/%d/%Y %H:%i:%s') + +get.template.file = select template_file from cr_report_template_map where report_id = [reportId] + +load.pdf.img.lookup = select image_id, image_loc from cr_raptor_pdf_img + +load.action.img.lookup = select image_id, image_loc from cr_raptor_action_img + + +#ActionHandler.java + +report.values.map.def.a = SELECT x FROM (SELECT DISTINCT + +report.values.map.def.b = TO_CHAR([colName], '[nvl(displayFormat, AppConstants.DEFAULT_DATE_FORMAT)]') + +report.values.map.def.c = [colName] + +report.values.map.def.d = x FROM [rdef.getTableById(tableId).getTableName()] WHERE [colName] IS NOT NULL ORDER BY 1) xx LIMIT <= [Globals.getDefaultPageSize()] + +test.sched.cond.popup = SELECT 1 WHERE EXISTS ([sql]) + +download.all.email.sent = Select user_id, rep_id from CR_REPORT_EMAIL_SENT_LOG where gen_key='[pdfAttachmentKey.trim()]' and log_id =[report_email_sent_log_id.trim()] and (now() - sent_date) < '1 day' limit 1 + +download.all.gen.key = select schedule_id from cr_report_email_sent_log u where U.GEN_KEY = '[pdfAttachmentKey]' + +download.all.retrieve = SELECT au.user_id FROM (SELECT rs.schedule_id, rs.rep_id FROM cr_report_schedule rs WHERE rs.enabled_yn='Y' AND rs.run_date IS NOT NULL AND rs.schedule_id = [scheduleId]) x, cr_report r, app_user au WHERE x.rep_id = r.rep_id AND au.user_id IN (SELECT rsu.user_id FROM cr_report_schedule_users rsu WHERE rsu.schedule_id = x.schedule_id and rsu.schedule_id = [scheduleId] UNION SELECT ur.user_id FROM fn_user_role ur WHERE ur.role_id IN (SELECT rsu2.role_id FROM cr_report_schedule_users rsu2 WHERE rsu2.schedule_id = x.schedule_id and rsu2.schedule_id = [scheduleId])) + +download.all.insert = insert into cr_report_dwnld_log (user_id,rep_id,file_name,dwnld_start_time,filter_params) values (?,?,?,?,?) + +#ReportWrapper.java + +report.wrapper.format = SELECT coalesce(cr.owner_id, cr.create_id) owner_id, cr.create_id, DATE_FORMAT(cr.create_date, '[Globals.getOracleTimeFormat()]') create_date, maint_id, DATE_FORMAT(cr.maint_date, '[Globals.getOracleTimeFormat()]') update_date, cr.menu_id, cr.menu_approved_yn FROM cr_report cr WHERE cr.rep_id= [reportID] + +generate.subset.sql = SELECT [colNames.toString()] FROM (SELECT [colNames.toString()] FROM ([reportSQL]) AS x ) AS y + +report.sql.only.first.part = SELECT [colNames.toString()] FROM (SELECT [colNames.toString()] FROM ( + +report.sql.only.second.part.a = [startRow] + +report.sql.only.second.part.b = [pageSize] +#MYSQL: LIMIT [startRow], [pageSize] +#ORacle: rownum >= [startRow] and rownum <= ([startRow]+[pageSize]) +#Postgre: limit [pageSize] offset [startRow] + +report.sql.only.second.part.b.noorderby = LIMIT [startRow] + +generate.sql.visual.select = SELECT + +generate.sql.visual.count = COUNT(*) cnt + +generate.sql.visual.dual = +#No DUAL table in PostgreSQL so this is blank + +#ReportRuntime.java + +load.crosstab.report.data = SELECT [colNames.toString()] FROM ( [reportSQL] + +#RaptorRunHandler.java + +generate.sql.handler = SELECT x.* from ([sql]) AS x LIMIT 2 + +generate.sql.select = SELECT [colNames.toString()] FROM (SELECT [colNames.toString()] FROM ([sql]) AS y) AS x + +#ReportSchedule.java + +load.schedule.data = SELECT rs.enabled_yn, DATE_FORMAT(rs.start_date, '%m/%d/%Y') start_date, DATE_FORMAT(rs.end_date, '%m/%d/%Y') end_date, DATE_FORMAT(rs.run_date, '%m/%d/%Y') run_date, coalesce(DATE_FORMAT(rs.run_date, '%h'), '12') run_hour, coalesce(DATE_FORMAT(rs.run_date, '%i'), '00') run_min, coalesce(DATE_FORMAT(rs.run_date, '%p'), 'AM') run_ampm, rs.recurrence, rs.conditional_yn, rs.notify_type, rs.max_row, rs.initial_formfields, rs.schedule_id, coalesce(DATE_FORMAT(rs.end_date, '%h'), '11') end_hour, coalesce(DATE_FORMAT(rs.end_date, '%i'), '45') end_min, coalesce(DATE_FORMAT(rs.end_date, '%p'), 'PM') end_ampm, encrypt_yn, attachment_yn FROM cr_report_schedule rs WHERE rs.rep_id = [reportID] + +load.schedule.getid = SELECT rsu.user_id, concat(fuser.last_name,', ',fuser.first_name), fuser.login_id FROM cr_report_schedule_users rsu, fn_user fuser WHERE rsu.rep_id = [reportID] AND rsu.schedule_id = [getScheduleID()] and rsu.user_id IS NOT NULL and rsu.user_id = fuser.user_id + +load.schedule.users = SELECT rsu.role_id FROM cr_report_schedule_users rsu WHERE rsu.rep_id = [reportID] AND rsu.schedule_id = [getScheduleID()] AND rsu.role_id IS NOT NULL + +new.schedule.data = select coalesce(max(schedule_id),0)+1 AS sequence from cr_report_schedule + +new.report.data = select coalesce(max(rep_id),0)+1 AS rep_id from cr_report + +execute.update = DELETE FROM cr_report_schedule_users WHERE rep_id = [reportID] and schedule_id = [getScheduleID()] + +execute.update.users = INSERT INTO cr_report_schedule_users (schedule_id, rep_id, user_id, role_id, order_no) VALUES([getScheduleID()], [reportID], [emailToUsers.get(i)).getId()], NULL, [(i + 1)]) + +execute.update.roles = INSERT INTO cr_report_schedule_users (schedule_id, rep_id, user_id, role_id, order_no) VALUES([getScheduleID()], [reportID], NULL, [emailToRoles.get(i)).getId()], [((emailToUsers.size() + i + 1)]) + +execute.update.activity = INSERT into cr_schedule_activity_log (schedule_id, notes, run_time) values ([getScheduleID()],'Submitted:Schedule',TO_DATE('[getRunDate()] [getRunHour()]:[getRunMin()] [getRunAMPM()]', 'MM/DD/YYYY HH:MI AM')) + +delete.schedule.data = SELECT 1 FROM cr_report_schedule WHERE rep_id = [reportID] and sched_user_id = [getScheduleUserID()] and schedule_id = [getScheduleID()] + +delete.schedule.data.users = DELETE FROM cr_report_schedule_users WHERE rep_id = [reportID] and schedule_id = [getScheduleID()] + +delete.schedule.data.id = DELETE FROM cr_report_schedule where rep_id = [reportID] and sched_user_id = [getScheduleUserID()] and schedule_id = [getScheduleID()] + +load.cond.sql = SELECT condition_large_sql FROM cr_report_schedule WHERE schedule_id=? + +load.cond.sql.select = SELECT condition_sql FROM cr_report_schedule WHERE schedule_id = [scheduleId] + +persist.cond.sql.update = update cr_report_schedule set condition_large_sql = '' where schedule_id = [scheduleId] +#EMPTY CLOB() changed to '' + +persist.cond.sql.large = SELECT condition_large_sql FROM cr_report_schedule cr WHERE schedule_id=? FOR UPDATE + +persist.cond.sql.set = update cr_report_schedule set condition_sql = ? where schedule_id = [scheduleId] + +#DataCache.java + +get.data.view.actions = SELECT ts.web_view_action FROM cr_table_source ts WHERE ts.web_view_action IS NOT NULL + +get.public.report.id.names = SELECT rep_id, title FROM cr_report WHERE public_yn = 'Y' ORDER BY title + +get.private.accessible.names.a = SELECT cr.rep_id, cr.title FROM cr_report cr WHERE cr.rep_id not in (select rep_id from cr_report_access cra where user_id = '[user_id]' + +get.private.accessible.names.if = OR role_id in ( + +get.private.accessible.names.b = ) AND public_yn = 'N' and cr.owner_id = '[user_id]' order by 2 + +get.group.accessible.names.a = SELECT cr.rep_id, cr.title FROM cr_report cr WHERE cr.rep_id in (select rep_id from cr_report_access cra where user_id = '[user_id]' + +get.group.accessible.names.b = ) AND public_yn = 'N' order by 2 + +get.report.table.sources.a = SELECT table_name, display_name, pk_fields, web_view_action, large_data_source_yn, filter_sql FROM cr_table_source + +get.report.table.sources.where = where SOURCE_DB= '[dBInfo]' + +get.report.table.sources.if = where SOURCE_DB is null or SOURCE_DB = '[AppConstants.DB_LOCAL]' + +get.report.table.sources.else = ORDER BY table_name + +grab.report.table.a = SELECT ts.table_name, ts.display_name, ts.pk_fields, ts.web_view_action, ts.large_data_source_yn, ts.filter_sql FROM cr_table_source ts WHERE + +grab.report.table.if = ts.SOURCE_DB= '[dBInfo]' + +grab.report.table.else = (ts.SOURCE_DB is null or ts.SOURCE_DB = '[AppConstants.DB_LOCAL]') + +grab.report.table.b = except SELECT ts.table_name, ts.display_name, ts.pk_fields, ts.web_view_action, ts.large_data_source_yn, ts.filter_sql from cr_table_source ts where table_name in (select table_name from cr_table_role where role_id not IN [sb.toString()]) and + +grab.report.table.c = ORDER BY 1 + +get.report.table.crjoin = SELECT src_table_name, dest_table_name, join_expr FROM cr_table_join + +get.report.table.joins = SELECT tj.src_table_name, tj.dest_table_name, tj.join_expr FROM cr_table_join tj WHERE ((EXISTS (SELECT 1 FROM cr_table_role trs WHERE trs.table_name=tj.src_table_name AND trs.role_id IN [sb.toString()])) OR (NOT EXISTS (SELECT 1 FROM cr_table_role trs WHERE trs.table_name=tj.src_table_name))) AND ((EXISTS (SELECT 1 FROM cr_table_role trd WHERE trd.table_name=tj.dest_table_name AND trd.role_id IN [sb.toString()])) OR (NOT EXISTS (SELECT 1 FROM cr_table_role trd WHERE trd.table_name=tj.dest_table_name))) + +generate.report.table.col = SELECT a.table_name, a.column_name, a.data_type, a.label FROM user_column_def a WHERE a.table_name = '[tableName.toUpperCase()]' ORDER BY a.column_id + +generate.db.user.sql.a = SELECT utc.table_name, utc.column_name, utc.data_type, + +generate.db.user.sql.if = utc.column_name FROM user_tab_columns utc + +generate.db.user.sql.else = coalesce(x.label, utc.column_name) FROM user_tab_columns utc + +generate.db.user.sql.b = WHERE utc.table_name = '[tableName.toUpperCase()]' + +generate.db.user.sql.c = AND utc.table_name = x.table_name AND utc.column_name = x.column_name + +generate.db.user.sql.d = ORDER BY utc.column_id + +#SearchHandler.java + +load.report.search.result = SELECT cr.rep_id, cr.rep_id report_id, [rep_title_sql] title, cr.descr, concat(au.first_name,' ',au.last_name) owner_name, DATE_FORMAT(cr.create_date, '%m/%d/%Y') create_date, CASE WHEN coalesce(cr.owner_id, cr.create_id) = [userID] THEN 'N' ELSE coalesce(ra.read_only_yn, 'Y') END read_only_yn, CASE WHEN coalesce(cr.owner_id, cr.create_id) = [userID] THEN 'Y' ELSE 'N' END user_is_owner_yn, case when report_xml like '%N%' then 'N' when report_xml like '%Y%' or 1 = (select distinct 1 from cr_report_schedule where rep_id = cr.rep_id) then 'Y' else 'N' end FROM cr_report cr JOIN fn_user au ON coalesce (cr.owner_id, cr.create_id) = au.user_id [fReportID] [fReportName] LEFT JOIN(SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL (SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra ON ra.rep_id = cr.rep_id + +load.report.search.instr = WHERE cr.menu_id LIKE '%[menuId]%' + +load.report.search.result.user = WHERE coalesce(cr.owner_id, cr.create_id) = [userID] + +load.report.search.result.public = WHERE (coalesce(cr.owner_id, cr.create_id) = [userID] OR cr.public_yn = 'Y' OR ra.read_only_yn IS NOT NULL) + +load.report.search.result.fav = WHERE cr.rep_id in (select rep_id from cr_favorite_reports where user_id = [userID] + +load.report.search.result.sort = ORDER BY CASE coalesce(cr.owner_id, cr.create_id) WHEN [userID] THEN ' ' WHEN 'upper(concat(au.first_name,' ',au.last_name))' ELSE 'upper(cr.title)' END + +load.folder.report.result = SELECT cr.rep_id, cr.rep_id report_id, concat([rep_title_sql] , (CASE WHEN cr.public_yn = 'Y' THEN '' ELSE '[PRIVATE_ICON]' END),cr.title,'') title, cr.descr, concat(au.first_name,' ',au.last_name) owner_name, TO_CHAR(cr.create_date, 'MM/DD/YYYY') create_date, CASE WHEN coalesce(cr.owner_id, cr.create_id) = [userID] THEN 'N' ELSE coalesce(ra.read_only_yn, 'Y') END read_only_yn, CASE WHEN coalesce(cr.owner_id, cr.create_id) = [userID] THEN 'Y' ELSE 'N' END user_is_owner_yn FROM cr_report cr JOIN fn_user au ON coalesce (cr.owner_id, cr.create_id) = au.user_id AND TO_CHAR(cr.rep_id, 'FM99999999') like coalesce('%[fReportID]%', TO_CHAR(cr.rep_id, 'FM99999999')) AND UPPER(cr.title) LIKE UPPER('%[fReportName]%') LEFT JOIN(SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL (SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra ON ra.rep_id = cr.rep_id + +load.folder.report.result.sort = ORDER BY CASE coalesce(cr.owner_id, cr.create_id) WHEN [userID] THEN ' ' WHEN '(concat(au.first_name,' ',au.last_name))' ELSE 'cr.title' END + +#WizardProcessor.java + +process.filter.add.edit = '[argValue]' + +#ReportDefinition.java + +persist.report.adhoc = SELECT nextval('[Globals.getAdhocReportSequence()]') AS sequence + +#Globals.java + +initialize.roles = SELECT 1 WHERE EXISTS (SELECT 1 FROM cr_table_role) + +initialize.version = SELECT cr_raptor.get_version + +# scheduler + + +scheduler.available.schedules = SELECT x.rep_id, x.schedule_id, x.conditional_yn, x.condition_large_sql, x.notify_type, x.max_row, x.initial_formfields, x.processed_formfields, r.title, x.user_id FROM ( SELECT rs.rep_id, rs.schedule_id, rs.sched_user_id user_id, rs.conditional_yn, rs.condition_large_sql, rs.notify_type, rs.max_row, rs.initial_formfields, rs.processed_formfields FROM cr_report_schedule rs WHERE rs.enabled_yn='Y' AND rs.start_date <= [currentDate] AND (rs.end_date >= [currentDate] or rs.end_date is null ) AND rs.run_date IS NOT NULL ) x, cr_report r WHERE x.rep_id = r.rep_id + +random.string = select ( concat('Z' , round(random() * 1000000000000) ) ) + + +scheduler.user.emails = SELECT au.user_id FROM (SELECT rs.schedule_id, rs.rep_id FROM cr_report_schedule rs WHERE rs.enabled_yn='Y' AND rs.start_date <= now() AND rs.end_date >= now() AND rs.run_date IS NOT NULL AND rs.schedule_id = [p_schedule_id] ) x, cr_report r, fn_user au WHERE x.rep_id = r.rep_id AND au.user_id IN (SELECT rsu.user_id FROM cr_report_schedule_users rsu WHERE rsu.schedule_id = x.schedule_id and rsu.schedule_id = [p_schedule_id] UNION SELECT ur.user_id FROM fn_user_role ur WHERE ur.role_id IN (SELECT rsu2.role_id FROM cr_report_schedule_users rsu2 WHERE rsu2.schedule_id = x.schedule_id and rsu2.schedule_id = [p_schedule_id])) + + +# my logins + +app.query = SELECT APP_ID, ML_APP_NAME, MOTS_ID from fn_app + +user.log.query = SELECT DISTINCT IFNULL(SBCID, '') CUID, '' AWID, CONCAT('"',IFNULL(SBCID, ''),'"') APPLICATIONUSERID, CONCAT('"',IFNULL(FIRST_NAME, ''),'"') FIRST_NAME, CONCAT('"',substr(IFNULL(MIDDLE_NAME, ''), 0, 1),'"') MIDDLE_INITIAL, CONCAT('"',IFNULL(LAST_NAME, ''),'"') LAST_NAME, IFNULL(DATE_FORMAT(LAST_LOGIN_DATE, '%Y/%m/%d'), '') LAST_LOGON_DATE, DATE_FORMAT(CREATED_DATE, '%Y/%m/%d') ACCOUNT_ACTIVATION_DATE, IFNULL(DATE_FORMAT(MODIFIED_DATE, '%Y/%m/%d'), '') LAST_DATE_ACCOUNT_MODIFIED, '' LAST_PASSWORD_CHANGE_DATE, CONCAT('"',IFNULL(FIRST_NAME, ''),' ',IFNULL(MIDDLE_NAME, ''),' ',IFNULL(LAST_NAME, ''),'"') FULL_USER_NAME, '' NT_ID, IFNULL(EMAIL, '') EMAIL FROM FN_USER FU, FN_USER_ROLE FUR WHERE FU.USER_ID \= FUR.USER_ID and FUR.app_id \= ? and ACTIVE_YN \= 'Y' and sbcid is not null order by 1 + +profile.log.query = SELECT DISTINCT CONCAT('"' , ROLE_NAME , '"') PROFILE_NAME, '""' SECURITY_SETTINGS FROM FN_ROLE FR, FN_USER_ROLE FUR WHERE FUR.ROLE_ID \= FR.ROLE_ID and FR.ACTIVE_YN \= 'Y' and ((FUR.APP_ID \= 1 and FR.ROLE_NAME <> 'Standard User') or (FUR.APP_ID \= ? and FUR.APP_ID <> 1)) ORDER BY 1 + +user.profile.log.query = SELECT DISTINCT IFNULL(SBCID, '') CUID, '' AWID, CONCAT('"' , IFNULL(SBCID, '') , '"') APPLICATIONUSERID , CONCAT('"' , ROLE_NAME , '"') PROFILE_NAME FROM FN_USER A, FN_USER_ROLE B, FN_ROLE C WHERE A.USER_ID \= B.USER_ID AND B.ROLE_ID \= C.ROLE_ID AND A.ACTIVE_YN \= 'Y' AND C.ACTIVE_YN \= 'Y' AND a.sbcid is not null AND ((B.APP_ID \= 1 and C.ROLE_NAME <> 'Standard User') or (B.APP_ID \= ? and B.APP_ID <> 1)) ORDER BY 1 + +all.accounts.log.query = SELECT DISTINCT IFNULL(SBCID, '') CUID, (case when A.ACTIVE_YN\='Y' then 'ACTIVE' else 'INACTIVE' end) ACTIVE_YN, CONCAT('"' , IFNULL(SBCID, '') , '"') APPLICATIONUSERID , IFNULL(DATE_FORMAT(LAST_LOGIN_DATE, '%Y/%m/%d'), '') LAST_LOGON_DATE, '' LAST_PASSWORD_CHANGE_DATE, CONCAT('"' , ROLE_NAME , '"') PROFILE_NAME FROM FN_USER A, FN_USER_ROLE B, FN_ROLE C WHERE A.USER_ID \= B.USER_ID AND B.ROLE_ID \= C.ROLE_ID AND a.sbcid is not null AND ((B.APP_ID \= 1 and C.ROLE_NAME <> 'Standard User') or (B.APP_ID \= ? and B.APP_ID <> 1)) ORDER BY 1 + +# basic sql + +seq.next.val = SELECT nextval('[sequenceName]') AS id + +current.date = now() + +nvl = IFNULL + +# report security +report.user.access = SELECT ra.role_id, ra.user_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.rep_id = [reportID] +add.user.access = INSERT INTO cr_report_access (rep_id, order_no, role_id, user_id, read_only_yn) VALUES([reportID], IFNULL((select order_no from (SELECT MAX(order_no) AS order_no FROM cr_report_access WHERE rep_id=[reportID]) AS temp), 0)+1, NULL, [userID], '[readOnlyAccess]') +update.user.access = UPDATE cr_report_access SET read_only_yn='[readOnlyAccess]' WHERE rep_id=[reportID] AND user_id=[userID] +remove.user.access = DELETE FROM cr_report_access WHERE rep_id=[reportID] AND user_id=[userID] +add.role.access = INSERT INTO cr_report_access (rep_id, order_no, role_id, user_id, read_only_yn) VALUES([reportID], IFNULL((select order_no from (SELECT MAX(order_no) AS order_no FROM cr_report_access WHERE rep_id=[reportID]) AS temp), 0)+1, [roleID], NULL, '[readOnlyAccess]') +update.role.access = UPDATE cr_report_access SET read_only_yn='[readOnlyAccess]' WHERE rep_id=[reportID] AND role_id=[roleID] +remove.role.access = DELETE FROM cr_report_access WHERE rep_id=[reportID] AND role_id=[roleID] + diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties new file mode 100755 index 000000000..7ee75e32a --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties @@ -0,0 +1,174 @@ +### +# ================================================================================ +# eCOMP Portal SDK +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ================================================================================ +### +# Properties read by ECOMP Core library, ecompSDK-core.jar +# testing - props 1.0 +########################################################################## +# The following properties should NOT be changed by partner applications. +########################################################################## + +application_user_id = 30000 +post_default_role_id = 16 +clustered = true + +#Enable Fusion Mobile capabilities for the application +mobile_enable = false + +# Cache config file is needed on the classpath +cache_config_file_path = /WEB-INF/classes/cache.ccf +cache_switch = 199 +cache_load_on_startup = false + +user_name = fullName +decryption_key = AGLDdG4D04BKm2IxIWEr8o== + +########################################################################## +# The following properties MAY require changes by partner applications. +########################################################################## + +#Oracle +#db.userName=quantumbd +#db.password=c1syn2yhmr +#db.connectionURL=jdbc:oracle:thin:todo.link +#db.hib.dialect=org.hibernate.dialect.Oracle10gDialect +#db.driver=oracle.jdbc.driver.OracleDriver +#Hibernate +#hb.dialect=org.hibernate.dialect.Oracle10gDialect +#hb.show_sql=true + +#Postgre +#db.userName=XXXX +#db.password=XXXX +#db.connectionURL=jdbc:postgresql://XXXX/XX +#db.hib.dialect=org.hibernate.dialect.PostgreSQLDialect +#db.driver=org.postgresql.Driver +#hb.dialect=org.hibernate.dialect.PostgreSQLDialect +#hb.show_sql=true + +#Mysql +db.driver = com.mysql.jdbc.Driver +db.connectionURL = jdbc:mysql://localhost:3306/vid_openecomp_epsdk +db.userName = euser +db.password = euser +#db.hib.dialect = org.hibernate.dialect.MySQLDialect +db.min_pool_size = 5 +db.max_pool_size = 10 +hb.dialect = org.hibernate.dialect.MySQLDialect +hb.show_sql = true +hb.idle_connection_test_period = 3600 +app_display_name = VID +files_path = /tmp + +# menu settings +#menu_query_name = menuData +#menu_properties_file_location = /WEB-INF/fusion/menu/ +#application_menu_set_name = APP +#application_menu_attribute_name = applicationMenuData +#application_menu_properties_name = menu.properties +#business_direct_menu_set_name = BD +#business_direct_menu_properties_name = bd.menu.properties +#business_direct_menu_attribute_name = businessDirectMenuData + +application_name = Virtual Infrastructure Deployment +application_user_id = 30000 +post_default_role_id = 16 +clustered = true + +#Enable Fusion Mobile capabilities for the application +mobile_enable = false + +# Cache config file is needed on the classpath +cache_config_file_path = /WEB-INF/classes/cache.ccf +cache_switch = 199 +cache_load_on_startup = false + +user_name = fullName +decryption_key = AGLDdG4D04BKm2IxIWEr8o== + +#element map files +element_map_file_path = app/fusionapp/files/ +element_map_icon_path = app/fusionapp/icons/ + +#aai related properties +#aai.server.url.base=https://aai.api.openecomp.org:8443/aai/ +#aai.server.url=https://aai.api.openecomp.org:8443/aai/v8/ +#aai.oldserver.url.base=https://aai.api.openecomp.org:8443/aai/servers/ +#aai.oldserver.url=https://aai.api.openecomp.org:8443/aai/servers/v3/ +aai.server.url.base=https://104.239.249.183:8443/aai/ +aai.server.url=https://104.239.249.183:8443/aai/v8/ +aai.oldserver.url.base=https://104.239.249.183:8443/aai/servers/ +aai.oldserver.url=https://104.239.249.183:8443/aai/servers/v3/ +aai.truststore.filename=tomcat_keystore +aai.truststore.passwd.x=OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp +aai.keystore.filename=tomcat_keystore +aai.keystore.passwd.x=OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp + +aai.vid.username=VID +aai.vid.passwd.x=OBF:1jm91i0v1jl9 + +aai.use.client.cert=false +aai.vnf.provstatus=PREPROV,NVTPROV,PROV,CAPPED +#Cron Schedules +log_cron = 0 0/1 * * * ?; +mylogins_feed_cron = 0 0/60 * * * ?; +#sessiontimeout_feed_cron = 0 * * * * ? * +my_login_feed_output_dir = /tmp/MyLogins + +# ECOMP Portal Shared Context REST API URL +ecomp_shared_context_rest_url= https://www.openecomp.org:8080/ecompportal/context + +# Link shown in Help menu +contact_us_link = https://www.openecomp.org/EcompPortal/ECOMP+Portal+Home + +# An Unique 128-bit value defined to identify a specific version +# of an application deployed on a specific virtual machine. +# This value must be generated and updated by the application +# which is using the ECOMP SDK at the time of its deployment. +# Online Unique UUID generator - https://www.uuidgenerator.net/ +instance_uuid=292b461a-2954-4b63-a3f9-f916c7ad3bc0 + + + +#authenticate user server +authenticate_user_server=http://todo_enter_auth_server_hostname:8383/openid-connect-server-webapp/allUsers + +#MSO related properties +#simulator +#mso.server.url=http://localhost:8089 +#dev2dev +#good +mso.server.url=https://mso.api.simpledemo.openecomp.org:8443/ecomp/mso/infra +mso.polling.interval.msecs=2000 +mso.max.polls=3 +mso.user.name=infraportal +mso.password.x=OBF:1ghz1kfx1j1w1m7w1i271e8q1eas1hzj1m4i1iyy1kch1gdz +mso.restapi.svc.instance=/serviceInstances/v3 +mso.restapi.vnf.instance=/serviceInstances/v3//vnfs +mso.restapi.network.instance=/serviceInstances/v3//networks +mso.restapi.vf.module.instance=/serviceInstances/v3//vnfs//vfModules +mso.restapi.volume.group.instance=/serviceInstances/v3//vnfs//volumeGroups +mso.restapi.get.orc.req=/orchestrationRequests/v3 +mso.restapi.get.orc.reqs=/orchestrationRequests/v3? +vid.truststore.filename=/opt/app/vid/etc/vid_keystore.jks +mso.dme2.client.timeout=30000 +mso.dme2.client.read.timeout=120000 +vid.truststore.filename=vid_keystore.jks +vid.truststore.passwd.x=OBF:1wgg1wfq1uus1uui1x131x0r1x1v1x1j1uvo1uve1wg81wfi + + diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties new file mode 100755 index 000000000..56ec9f306 --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties @@ -0,0 +1,117 @@ +#DB Info +#db.userName=XXXX +#db.password=XXXX +#db.connectionURL=jdbc:oracle:thin:@XXXX/XX +#db.hib.dialect=org.hibernate.dialect.Oracle10gDialect +#db.driver=oracle.jdbc.driver.OracleDriver +#Hibernate +#hb.dialect=org.hibernate.dialect.Oracle10gDialect +#hb.show_sql=true + +#Postgre +#db.userName=XXXX +#db.password=XXXX +#db.connectionURL=jdbc:postgresql://XXXX/XX +#db.hib.dialect=org.hibernate.dialect.PostgreSQLDialect +#db.driver=org.postgresql.Driver +#hb.dialect=org.hibernate.dialect.PostgreSQLDialect +#hb.show_sql=true + +#mysql +db.driver = com.mysql.jdbc.Driver +db.connectionURL = jdbc:mysql://${VID_MYSQL_HOST}:${VID_MYSQL_PORT}/${VID_MYSQL_DBNAME} +db.userName = ${VID_MYSQL_USER} +db.password = ${VID_MYSQL_PASS} +db.hib.dialect = org.hibernate.dialect.MySQLDialect +db.min_pool_size = 5 +db.max_pool_size = 10 +hb.dialect = org.hibernate.dialect.MySQLDialect +hb.show_sql = true +hb.idle_connection_test_period = 3600 +app_display_name = ${VID_APP_DISPLAY_NAME} +files_path = /tmp + +# menu settings +#menu_query_name = menuData +#menu_properties_file_location = /WEB-INF/fusion/menu/ +#application_menu_set_name = APP +#application_menu_attribute_name = applicationMenuData +#application_menu_properties_name = menu.properties +#business_direct_menu_set_name = BD +#business_direct_menu_properties_name = bd.menu.properties +#business_direct_menu_attribute_name = businessDirectMenuData + +application_name = Virtual Infrastructure Design +application_user_id = 30000 +post_default_role_id = 16 +clustered = true + +#Enable Fusion Mobile capabilities for the application +mobile_enable = false + +# Cache config file is needed on the classpath +cache_config_file_path = /WEB-INF/classes/cache.ccf +cache_switch = 199 +cache_load_on_startup = false + +user_name = fullName + +decryption_key = ${VID_DECRYPTION_KEY} + +#element map files +element_map_file_path = /tmp +element_map_icon_path = app/vid/icons/ + +#aai related properties +aai.server.url.base=https://${VID_AAI_HOST}:${VID_AAI_PORT}/aai/ +aai.server.url=https://${VID_AAI_HOST}:${VID_AAI_PORT}/aai/v8/ +aai.oldserver.url.base=https://${VID_AAI_HOST}:${VID_AAI_PORT}/aai/servers/ +aai.oldserver.url=https://${VID_AAI_HOST}:${VID_AAI_PORT}/aai/servers/v3/ +aai.truststore.filename=${AAI_TRUSTSTORE_FILENAME} +aai.truststore.passwd.x=${AAI_TRUSTSTORE_PASSWD_X} +aai.keystore.filename=${AAI_KEYSTORE_FILENAME} +aai.keystore.passwd.x=${AAI_KEYSTORE_PASSWD_X} +aai.vid.username=${AAI_VID_UID} +aai.vid.passwd.x=${AAI_VID_PASSWD_X} +aai.use.client.cert=${AAI_USE_CLIENT_CERT} +aai.vnf.provstatus=${AAI_VNF_PROVSTATUS} + +# ECOMP Portal Shared Context REST API URL +ecomp_shared_context_rest_url=${VID_ECOMP_SHARED_CONTEXT_REST_URL} +# Link shown in Help menu +contact_us_link=${VID_CONTACT_US_LINK} +#Cron Schedules +log_cron = 0 0/1 * * * ?; +mylogins_feed_cron = 0 0/60 * * * ?; +#sessiontimeout_feed_cron = 0 * * * * ? * +my_login_feed_output_dir = ${VID_MYLOGIN_FEED_DIRECTORY} + +# An Unique 128-bit value defined to identify a specific version +# of an application deployed on a specific virtual machine. +# This value must be generated and updated by the application +# which is using the ECOMP SDK at the time of its deployment. +# Online Unique UUID generator - https://www.uuidgenerator.net/ +instance_uuid=292b461a-2954-4b63-a3f9-f916c7ad3bc0 + + +#MSO related properties +#simulator +mso.server.url=${VID_MSO_SERVER_URL} +mso.polling.interval.msecs=${MSO_POLLING_INTERVAL_MSECS} +mso.max.polls=10 +mso.user.name=${VID_MSO_USER} +mso.password.x=${VID_MSO_PASS} +mso.restapi.svc.instance=/ecomp/mso/infra/serviceInstances/v2 +mso.restapi.vnf.instance=/ecomp/mso/infra/serviceInstances/v2//vnfs +mso.restapi.network.instance=/ecomp/mso/infra/serviceInstances/v2//networks +mso.restapi.vf.module.instance=/ecomp/mso/infra/serviceInstances/v2//vnfs//vfModules +mso.restapi.volume.group.instance=/ecomp/mso/infra/serviceInstances/v2//vnfs//volumeGroups +mso.restapi.get.orc.req=/ecomp/mso/infra/orchestrationRequests/v2 +mso.restapi.get.orc.reqs=/ecomp/mso/infra/orchestrationRequests/v2? +vid.truststore.filename=${VID_TRUSTSTORE_FILE} +vid.truststore.passwd.x=${VID_TRUSTSTORE_PASS} +mso.dme2.client.timeout=${MSO_DME2_CLIENT_TIMEOUT} +mso.dme2.client.read.timeout=${MSO_DME2_CLIENT_READ_TIMEOUT} +mso.dme2.server.url=${MSO_DME2_SERVER_URL} +mso.dme2.enabled=${MSO_DME2_ENABLED} + diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/conf/fusion.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/conf/fusion.properties new file mode 100755 index 000000000..97267f60d --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/conf/fusion.properties @@ -0,0 +1,42 @@ +# login settings +login_method_backdoor = backdoor +login_method_attribute_name = login_method + +#login message +login.error.hrid.empty = Login failed, please contact system administrator. +login.error.hrid.not-found = User not found, please contact system administrator. +login.error.user.inactive = Account is disabled, please contact system administrator. + +# User Session settings +user_attribute_name = user +roles_attribute_name = roles +role_functions_attribute_name = role_functions +#client_device_attribute_name = client_device +#client_device_emulation = false + +# Import-user LDAP settings +post_initial_context_factory = com.sun.jndi.ldap.LdapCtxFactory +post_provider_url = ldap://ldap.mycompany.com:389 +post_security_principal = ou=people,o=mycompany,c=us +post_max_result_size = 499 + +# menu settings +menu_query_name = menuData +#menu_properties_file_location = /WEB-INF/fusion/menu/ +application_menu_set_name = APP +application_menu_attribute_name = applicationMenuData +#application_menu_properties_name = menu.properties +business_direct_menu_set_name = BD +#business_direct_menu_properties_name = bd.menu.properties +business_direct_menu_attribute_name = businessDirectMenuData + +# RAPTOR config settings +#raptor_config_file_path = /WEB-INF/conf/ + +# Role settings +sys_admin_role_id = 1 +#sys_admin_role_function_delete_from_ui = true + +# Profile Search settings +#profile_search_report_id=181 +#callable_profile_search_report_id=386 diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/defs/definitions.xml b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/defs/definitions.xml new file mode 100755 index 000000000..f9fdc4317 --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/defs/definitions.xml @@ -0,0 +1,207 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ds2/footer.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ds2/footer.jsp new file mode 100755 index 000000000..33bb38d0e --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ds2/footer.jsp @@ -0,0 +1,17 @@ + + + + +
+
+
+ + +
+ +
+
+
+
\ No newline at end of file diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ds2/header.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ds2/header.jsp new file mode 100755 index 000000000..94213a2a3 --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ds2/header.jsp @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp new file mode 100755 index 000000000..970e6b42b --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp @@ -0,0 +1,688 @@ +<%-- + ================================================================================ + eCOMP Portal SDK + ================================================================================ + Copyright (C) 2017 AT&T Intellectual Property + ================================================================================ + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + ================================================================================ + --%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ page isELIgnored="false"%> +<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> +<%@ page import="org.openecomp.portalsdk.core.onboarding.util.PortalApiProperties"%> +<%@ page import="org.openecomp.portalsdk.core.onboarding.util.PortalApiConstants"%> +<%@ page import="org.openecomp.portalsdk.core.domain.MenuData"%> + + + + + + + + + + + +" /> +" /> + +<% + String contactUsLink = SystemProperties.getProperty(SystemProperties.CONTACT_US_LINK); + String redirectUrl = PortalApiProperties.getProperty(PortalApiConstants.ECOMP_REDIRECT_URL); + String portalUrl = redirectUrl; + String getAccessLink = redirectUrl.substring(0, redirectUrl.lastIndexOf('/')) + "/get_access"; +%> + + + + + + +<%@include file="/WEB-INF/fusion/jsp/ebz/loginSnippet.html" %> + +
+
+ +
+
+
+ + +
+
+
+
+
  • + + ECOMP Portal +
    • +
    +
    + +
    +
    + + +
    + +
    + + +
    +
    + +
    +
    +

    + Manage favorites on ECOMP Portal. +

    +
    +
    + +
    +
    +
    + +

    No Favorites

    +

    Manage favorites on ECOMP Portal.

    +
    +
    +
    +
    + +
    +
    +
    +
    +
  • + Unable to load menus +
    • +
    + +
    +
  • +
    + + +
    +
    • +
  •  
    • +
    + +
    +
    +
    +
    +
    +
    +
    + +
    +
    + + + +     {{app_name}} + +
    +
    +
    +
    + + + + + +
    +
    +
    +
    +
    +
    +
    +
    + + \ No newline at end of file diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml new file mode 100755 index 000000000..de0b6a2fd --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/index.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/index.jsp new file mode 100755 index 000000000..3c82fca19 --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/index.jsp @@ -0,0 +1,24 @@ +<%-- + ================================================================================ + eCOMP Portal SDK + ================================================================================ + Copyright (C) 2017 AT&T Intellectual Property + ================================================================================ + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + ================================================================================ + --%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + +<%-- Redirected because we can't set the welcome page to a virtual URL. --%> +<%-- Forward to the intended start page to reduce frustration for new users. --%> + diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/login.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/login.jsp new file mode 100755 index 000000000..1fa75ed03 --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/login.jsp @@ -0,0 +1,95 @@ +<%@ page import="java.net.URLEncoder"%> +<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> + +<% + // Name is defined by app; do not throw if missing + final String appDisplayName = SystemProperties.containsProperty(SystemProperties.APP_DISPLAY_NAME) + ? SystemProperties.getProperty(SystemProperties.APP_DISPLAY_NAME) + : SystemProperties.APP_DISPLAY_NAME; +%> + + + + + + + Login + + + + +
    +
    +
    ${model.error}
    +
    +
    +
    +
    +
    +
    + + + diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp new file mode 100755 index 000000000..1dbb3c0dd --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%@ page import="org.openecomp.vid.mso.*"%> +<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> +<% + String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS) + + ",msoMaxPollingIntervalMsec:" + + SystemProperties.getProperty(MsoProperties.MSO_POLLING_INTERVAL_MSECS) + "}"; +%> + +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testMso.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testMso.jsp new file mode 100755 index 000000000..8678dcee1 --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testMso.jsp @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%@ page import="org.openecomp.vid.mso.*"%> +<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> +<% + String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS) + + ",msoMaxPollingIntervalMsec:" + + SystemProperties.getProperty(MsoProperties.MSO_POLLING_INTERVAL_MSECS) + "}"; +%> + +
    +
    +
    +
    +
    + +

    +
    Various MSO Tests
    +

    +
    + Use test MSO + controller +
    +
    +

    These actions are expected to return successfully.

    + + + + + + + + + + + +
    +
    +

    These actions are expected to generate errors. These tests assume the above + "Use test MSO controller" checkbox is checked. All tests are base on the Create Service + Instance transaction.

    +
      +
    1. + Initial + response contains policy exception +
      2. +
    2. + Initial + response contains service exception +
      3. +
    3. + Subsequent + getOrchestrationRequest poll response contains MSO failure condition +
      4. +
    4. + Initial + response contains invalid data field +
      5. +
    5. + Subsequent + getOrchestrationRequest poll response contains invalid data field +
      6. +
    6. + + VID controller code generates general exception +
      7. +
    7. + Maximum + poll attempts exceeded +
      8. +
    8. + Timeout + on initial response +
      9. +
    9. + Timeout + on subsequent getOrchestrationRequest poll response +
      10. +
    10. + GUI + front-end specifies invalid URL - HTTP 404 response expected +
      11. +
    11. + GUI + front-end specifies invalid URL - HTTP 405 response expected +
      12. +
    + +
    + + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp new file mode 100755 index 000000000..59c8a317e --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp @@ -0,0 +1,172 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%@ page import="org.openecomp.vid.mso.*"%> +<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> +<% + String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS) + + ",msoMaxPollingIntervalMsec:" + + SystemProperties.getProperty(MsoProperties.MSO_POLLING_INTERVAL_MSECS) + "}"; +%> + +
    + +
    +
    +
    +
    +
    + +

    +
    Test View Edit Page
    +

    +
    + These buttons simulate the add, delete and "show details" (called + "script" in User Stories) icons (or buttons) that are expected on the + view / edit page. +
    +
    + Use test MSO + controller +
    +

    CALLBACK: {{callbackResults}}

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Service + + + + + +
    VNF + + + + + +
    VF Module + + + + + +
    Volume Group + + + + + +
    Network + + + + + +
    +
    + + + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/viewlog.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/viewlog.jsp new file mode 100755 index 000000000..c1bf19c75 --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/viewlog.jsp @@ -0,0 +1,33 @@ + + +
    + +

    View Log - Page under Construction...

    +
    + + +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + + diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/welcome.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/welcome.jsp new file mode 100755 index 000000000..9cb6f85b7 --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/welcome.jsp @@ -0,0 +1,45 @@ + +
    +

    ONAP

    +
    +

    Welcome to VID

    +
    + The Virtual Infrastructure Deployment (VID) application allows infrastructure service deployment operators + to instantiate service instances and their constituent parts for Distributed service models required by the + ONAP service operations that manage them, such as Mobility Network Services, etc. + The models are defined by ONAP component SDC. The service + deployment operator selects the service operations owner and model that they wish to instantiate. After + entry of appropriate data, the operator instructs VID to direct another ONAP component, MSO, to instantiate + the selected service model. Once the service instance has been instantiated, the service operator can instruct + VID to direct MSO to instantiate the service instance's component VNFs, VF Modules, Networks and Volume Groups. + The VID user can also search for, and display, existing service instances and direct the instantiation of + subsequent instance components. +

    + +

    Contact Us

    + Please click here to contact us. + + + +
    + + + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + + diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/web.xml b/epsdk-app-onap/src/main/webapp/WEB-INF/web.xml new file mode 100755 index 000000000..b09fa57d6 --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,17 @@ + + + + ecomp-sdk-app-os + + + + + + 7 + COOKIE + + + \ No newline at end of file diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/angular-animate.js b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/angular-animate.js new file mode 100755 index 000000000..edea5292b --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/angular-animate.js @@ -0,0 +1,3721 @@ +/** + * @license AngularJS v1.4.3 + * (c) 2010-2015 Google, Inc. http://angularjs.org + * License: MIT + */ +(function(window, angular, undefined) {'use strict'; + +/* jshint ignore:start */ +var noop = angular.noop; +var extend = angular.extend; +var jqLite = angular.element; +var forEach = angular.forEach; +var isArray = angular.isArray; +var isString = angular.isString; +var isObject = angular.isObject; +var isUndefined = angular.isUndefined; +var isDefined = angular.isDefined; +var isFunction = angular.isFunction; +var isElement = angular.isElement; + +var ELEMENT_NODE = 1; +var COMMENT_NODE = 8; + +var NG_ANIMATE_CLASSNAME = 'ng-animate'; +var NG_ANIMATE_CHILDREN_DATA = '$$ngAnimateChildren'; + +var isPromiseLike = function(p) { + return p && p.then ? true : false; +} + +function assertArg(arg, name, reason) { + if (!arg) { + throw ngMinErr('areq', "Argument '{0}' is {1}", (name || '?'), (reason || "required")); + } + return arg; +} + +function mergeClasses(a,b) { + if (!a && !b) return ''; + if (!a) return b; + if (!b) return a; + if (isArray(a)) a = a.join(' '); + if (isArray(b)) b = b.join(' '); + return a + ' ' + b; +} + +function packageStyles(options) { + var styles = {}; + if (options && (options.to || options.from)) { + styles.to = options.to; + styles.from = options.from; + } + return styles; +} + +function pendClasses(classes, fix, isPrefix) { + var className = ''; + classes = isArray(classes) + ? classes + : classes && isString(classes) && classes.length + ? classes.split(/\s+/) + : []; + forEach(classes, function(klass, i) { + if (klass && klass.length > 0) { + className += (i > 0) ? ' ' : ''; + className += isPrefix ? fix + klass + : klass + fix; + } + }); + return className; +} + +function removeFromArray(arr, val) { + var index = arr.indexOf(val); + if (val >= 0) { + arr.splice(index, 1); + } +} + +function stripCommentsFromElement(element) { + if (element instanceof jqLite) { + switch (element.length) { + case 0: + return []; + break; + + case 1: + // there is no point of stripping anything if the element + // is the only element within the jqLite wrapper. + // (it's important that we retain the element instance.) + if (element[0].nodeType === ELEMENT_NODE) { + return element; + } + break; + + default: + return jqLite(extractElementNode(element)); + break; + } + } + + if (element.nodeType === ELEMENT_NODE) { + return jqLite(element); + } +} + +function extractElementNode(element) { + if (!element[0]) return element; + for (var i = 0; i < element.length; i++) { + var elm = element[i]; + if (elm.nodeType == ELEMENT_NODE) { + return elm; + } + } +} + +function $$addClass($$jqLite, element, className) { + forEach(element, function(elm) { + $$jqLite.addClass(elm, className); + }); +} + +function $$removeClass($$jqLite, element, className) { + forEach(element, function(elm) { + $$jqLite.removeClass(elm, className); + }); +} + +function applyAnimationClassesFactory($$jqLite) { + return function(element, options) { + if (options.addClass) { + $$addClass($$jqLite, element, options.addClass); + options.addClass = null; + } + if (options.removeClass) { + $$removeClass($$jqLite, element, options.removeClass); + options.removeClass = null; + } + } +} + +function prepareAnimationOptions(options) { + options = options || {}; + if (!options.$$prepared) { + var domOperation = options.domOperation || noop; + options.domOperation = function() { + options.$$domOperationFired = true; + domOperation(); + domOperation = noop; + }; + options.$$prepared = true; + } + return options; +} + +function applyAnimationStyles(element, options) { + applyAnimationFromStyles(element, options); + applyAnimationToStyles(element, options); +} + +function applyAnimationFromStyles(element, options) { + if (options.from) { + element.css(options.from); + options.from = null; + } +} + +function applyAnimationToStyles(element, options) { + if (options.to) { + element.css(options.to); + options.to = null; + } +} + +function mergeAnimationOptions(element, target, newOptions) { + var toAdd = (target.addClass || '') + ' ' + (newOptions.addClass || ''); + var toRemove = (target.removeClass || '') + ' ' + (newOptions.removeClass || ''); + var classes = resolveElementClasses(element.attr('class'), toAdd, toRemove); + + extend(target, newOptions); + + if (classes.addClass) { + target.addClass = classes.addClass; + } else { + target.addClass = null; + } + + if (classes.removeClass) { + target.removeClass = classes.removeClass; + } else { + target.removeClass = null; + } + + return target; +} + +function resolveElementClasses(existing, toAdd, toRemove) { + var ADD_CLASS = 1; + var REMOVE_CLASS = -1; + + var flags = {}; + existing = splitClassesToLookup(existing); + + toAdd = splitClassesToLookup(toAdd); + forEach(toAdd, function(value, key) { + flags[key] = ADD_CLASS; + }); + + toRemove = splitClassesToLookup(toRemove); + forEach(toRemove, function(value, key) { + flags[key] = flags[key] === ADD_CLASS ? null : REMOVE_CLASS; + }); + + var classes = { + addClass: '', + removeClass: '' + }; + + forEach(flags, function(val, klass) { + var prop, allow; + if (val === ADD_CLASS) { + prop = 'addClass'; + allow = !existing[klass]; + } else if (val === REMOVE_CLASS) { + prop = 'removeClass'; + allow = existing[klass]; + } + if (allow) { + if (classes[prop].length) { + classes[prop] += ' '; + } + classes[prop] += klass; + } + }); + + function splitClassesToLookup(classes) { + if (isString(classes)) { + classes = classes.split(' '); + } + + var obj = {}; + forEach(classes, function(klass) { + // sometimes the split leaves empty string values + // incase extra spaces were applied to the options + if (klass.length) { + obj[klass] = true; + } + }); + return obj; + } + + return classes; +} + +function getDomNode(element) { + return (element instanceof angular.element) ? element[0] : element; +} + +var $$rAFSchedulerFactory = ['$$rAF', function($$rAF) { + var tickQueue = []; + var cancelFn; + + function scheduler(tasks) { + // we make a copy since RAFScheduler mutates the state + // of the passed in array variable and this would be difficult + // to track down on the outside code + tickQueue.push([].concat(tasks)); + nextTick(); + } + + /* waitUntilQuiet does two things: + * 1. It will run the FINAL `fn` value only when an uncancelled RAF has passed through + * 2. It will delay the next wave of tasks from running until the quiet `fn` has run. + * + * The motivation here is that animation code can request more time from the scheduler + * before the next wave runs. This allows for certain DOM properties such as classes to + * be resolved in time for the next animation to run. + */ + scheduler.waitUntilQuiet = function(fn) { + if (cancelFn) cancelFn(); + + cancelFn = $$rAF(function() { + cancelFn = null; + fn(); + nextTick(); + }); + }; + + return scheduler; + + function nextTick() { + if (!tickQueue.length) return; + + var updatedQueue = []; + for (var i = 0; i < tickQueue.length; i++) { + var innerQueue = tickQueue[i]; + runNextTask(innerQueue); + if (innerQueue.length) { + updatedQueue.push(innerQueue); + } + } + tickQueue = updatedQueue; + + if (!cancelFn) { + $$rAF(function() { + if (!cancelFn) nextTick(); + }); + } + } + + function runNextTask(tasks) { + var nextTask = tasks.shift(); + nextTask(); + } +}]; + +var $$AnimateChildrenDirective = [function() { + return function(scope, element, attrs) { + var val = attrs.ngAnimateChildren; + if (angular.isString(val) && val.length === 0) { //empty attribute + element.data(NG_ANIMATE_CHILDREN_DATA, true); + } else { + attrs.$observe('ngAnimateChildren', function(value) { + value = value === 'on' || value === 'true'; + element.data(NG_ANIMATE_CHILDREN_DATA, value); + }); + } + }; +}]; + +/** + * @ngdoc service + * @name $animateCss + * @kind object + * + * @description + * The `$animateCss` service is a useful utility to trigger customized CSS-based transitions/keyframes + * from a JavaScript-based animation or directly from a directive. The purpose of `$animateCss` is NOT + * to side-step how `$animate` and ngAnimate work, but the goal is to allow pre-existing animations or + * directives to create more complex animations that can be purely driven using CSS code. + * + * Note that only browsers that support CSS transitions and/or keyframe animations are capable of + * rendering animations triggered via `$animateCss` (bad news for IE9 and lower). + * + * ## Usage + * Once again, `$animateCss` is designed to be used inside of a registered JavaScript animation that + * is powered by ngAnimate. It is possible to use `$animateCss` directly inside of a directive, however, + * any automatic control over cancelling animations and/or preventing animations from being run on + * child elements will not be handled by Angular. For this to work as expected, please use `$animate` to + * trigger the animation and then setup a JavaScript animation that injects `$animateCss` to trigger + * the CSS animation. + * + * The example below shows how we can create a folding animation on an element using `ng-if`: + * + * ```html + * + *
    + * This element will go BOOM + *
    + * + * ``` + * + * Now we create the **JavaScript animation** that will trigger the CSS transition: + * + * ```js + * ngModule.animation('.fold-animation', ['$animateCss', function($animateCss) { + * return { + * enter: function(element, doneFn) { + * var height = element[0].offsetHeight; + * return $animateCss(element, { + * from: { height:'0px' }, + * to: { height:height + 'px' }, + * duration: 1 // one second + * }); + * } + * } + * }]); + * ``` + * + * ## More Advanced Uses + * + * `$animateCss` is the underlying code that ngAnimate uses to power **CSS-based animations** behind the scenes. Therefore CSS hooks + * like `.ng-EVENT`, `.ng-EVENT-active`, `.ng-EVENT-stagger` are all features that can be triggered using `$animateCss` via JavaScript code. + * + * This also means that just about any combination of adding classes, removing classes, setting styles, dynamically setting a keyframe animation, + * applying a hardcoded duration or delay value, changing the animation easing or applying a stagger animation are all options that work with + * `$animateCss`. The service itself is smart enough to figure out the combination of options and examine the element styling properties in order + * to provide a working animation that will run in CSS. + * + * The example below showcases a more advanced version of the `.fold-animation` from the example above: + * + * ```js + * ngModule.animation('.fold-animation', ['$animateCss', function($animateCss) { + * return { + * enter: function(element, doneFn) { + * var height = element[0].offsetHeight; + * return $animateCss(element, { + * addClass: 'red large-text pulse-twice', + * easing: 'ease-out', + * from: { height:'0px' }, + * to: { height:height + 'px' }, + * duration: 1 // one second + * }); + * } + * } + * }]); + * ``` + * + * Since we're adding/removing CSS classes then the CSS transition will also pick those up: + * + * ```css + * /* since a hardcoded duration value of 1 was provided in the JavaScript animation code, + * the CSS classes below will be transitioned despite them being defined as regular CSS classes */ + * .red { background:red; } + * .large-text { font-size:20px; } + * + * /* we can also use a keyframe animation and $animateCss will make it work alongside the transition */ + * .pulse-twice { + * animation: 0.5s pulse linear 2; + * -webkit-animation: 0.5s pulse linear 2; + * } + * + * @keyframes pulse { + * from { transform: scale(0.5); } + * to { transform: scale(1.5); } + * } + * + * @-webkit-keyframes pulse { + * from { -webkit-transform: scale(0.5); } + * to { -webkit-transform: scale(1.5); } + * } + * ``` + * + * Given this complex combination of CSS classes, styles and options, `$animateCss` will figure everything out and make the animation happen. + * + * ## How the Options are handled + * + * `$animateCss` is very versatile and intelligent when it comes to figuring out what configurations to apply to the element to ensure the animation + * works with the options provided. Say for example we were adding a class that contained a keyframe value and we wanted to also animate some inline + * styles using the `from` and `to` properties. + * + * ```js + * var animator = $animateCss(element, { + * from: { background:'red' }, + * to: { background:'blue' } + * }); + * animator.start(); + * ``` + * + * ```css + * .rotating-animation { + * animation:0.5s rotate linear; + * -webkit-animation:0.5s rotate linear; + * } + * + * @keyframes rotate { + * from { transform: rotate(0deg); } + * to { transform: rotate(360deg); } + * } + * + * @-webkit-keyframes rotate { + * from { -webkit-transform: rotate(0deg); } + * to { -webkit-transform: rotate(360deg); } + * } + * ``` + * + * The missing pieces here are that we do not have a transition set (within the CSS code nor within the `$animateCss` options) and the duration of the animation is + * going to be detected from what the keyframe styles on the CSS class are. In this event, `$animateCss` will automatically create an inline transition + * style matching the duration detected from the keyframe style (which is present in the CSS class that is being added) and then prepare both the transition + * and keyframe animations to run in parallel on the element. Then when the animation is underway the provided `from` and `to` CSS styles will be applied + * and spread across the transition and keyframe animation. + * + * ## What is returned + * + * `$animateCss` works in two stages: a preparation phase and an animation phase. Therefore when `$animateCss` is first called it will NOT actually + * start the animation. All that is going on here is that the element is being prepared for the animation (which means that the generated CSS classes are + * added and removed on the element). Once `$animateCss` is called it will return an object with the following properties: + * + * ```js + * var animator = $animateCss(element, { ... }); + * ``` + * + * Now what do the contents of our `animator` variable look like: + * + * ```js + * { + * // starts the animation + * start: Function, + * + * // ends (aborts) the animation + * end: Function + * } + * ``` + * + * To actually start the animation we need to run `animation.start()` which will then return a promise that we can hook into to detect when the animation ends. + * If we choose not to run the animation then we MUST run `animation.end()` to perform a cleanup on the element (since some CSS classes and stlyes may have been + * applied to the element during the preparation phase). Note that all other properties such as duration, delay, transitions and keyframes are just properties + * and that changing them will not reconfigure the parameters of the animation. + * + * ### runner.done() vs runner.then() + * It is documented that `animation.start()` will return a promise object and this is true, however, there is also an additional method available on the + * runner called `.done(callbackFn)`. The done method works the same as `.finally(callbackFn)`, however, it does **not trigger a digest to occur**. + * Therefore, for performance reasons, it's always best to use `runner.done(callback)` instead of `runner.then()`, `runner.catch()` or `runner.finally()` + * unless you really need a digest to kick off afterwards. + * + * Keep in mind that, to make this easier, ngAnimate has tweaked the JS animations API to recognize when a runner instance is returned from $animateCss + * (so there is no need to call `runner.done(doneFn)` inside of your JavaScript animation code). + * Check the {@link ngAnimate.$animateCss#usage animation code above} to see how this works. + * + * @param {DOMElement} element the element that will be animated + * @param {object} options the animation-related options that will be applied during the animation + * + * * `event` - The DOM event (e.g. enter, leave, move). When used, a generated CSS class of `ng-EVENT` and `ng-EVENT-active` will be applied + * to the element during the animation. Multiple events can be provided when spaces are used as a separator. (Note that this will not perform any DOM operation.) + * * `easing` - The CSS easing value that will be applied to the transition or keyframe animation (or both). + * * `transition` - The raw CSS transition style that will be used (e.g. `1s linear all`). + * * `keyframeStyle` - The raw CSS keyframe animation style that will be used (e.g. `1s my_animation linear`). + * * `from` - The starting CSS styles (a key/value object) that will be applied at the start of the animation. + * * `to` - The ending CSS styles (a key/value object) that will be applied across the animation via a CSS transition. + * * `addClass` - A space separated list of CSS classes that will be added to the element and spread across the animation. + * * `removeClass` - A space separated list of CSS classes that will be removed from the element and spread across the animation. + * * `duration` - A number value representing the total duration of the transition and/or keyframe (note that a value of 1 is 1000ms). If a value of `0` + * is provided then the animation will be skipped entirely. + * * `delay` - A number value representing the total delay of the transition and/or keyframe (note that a value of 1 is 1000ms). If a value of `true` is + * used then whatever delay value is detected from the CSS classes will be mirrored on the elements styles (e.g. by setting delay true then the style value + * of the element will be `transition-delay: DETECTED_VALUE`). Using `true` is useful when you want the CSS classes and inline styles to all share the same + * CSS delay value. + * * `stagger` - A numeric time value representing the delay between successively animated elements + * ({@link ngAnimate#css-staggering-animations Click here to learn how CSS-based staggering works in ngAnimate.}) + * * `staggerIndex` - The numeric index representing the stagger item (e.g. a value of 5 is equal to the sixth item in the stagger; therefore when a + * `stagger` option value of `0.1` is used then there will be a stagger delay of `600ms`) + * `applyClassesEarly` - Whether or not the classes being added or removed will be used when detecting the animation. This is set by `$animate` when enter/leave/move animations are fired to ensure that the CSS classes are resolved in time. (Note that this will prevent any transitions from occuring on the classes being added and removed.) + * + * @return {object} an object with start and end methods and details about the animation. + * + * * `start` - The method to start the animation. This will return a `Promise` when called. + * * `end` - This method will cancel the animation and remove all applied CSS classes and styles. + */ + +// Detect proper transitionend/animationend event names. +var CSS_PREFIX = '', TRANSITION_PROP, TRANSITIONEND_EVENT, ANIMATION_PROP, ANIMATIONEND_EVENT; + +// If unprefixed events are not supported but webkit-prefixed are, use the latter. +// Otherwise, just use W3C names, browsers not supporting them at all will just ignore them. +// Note: Chrome implements `window.onwebkitanimationend` and doesn't implement `window.onanimationend` +// but at the same time dispatches the `animationend` event and not `webkitAnimationEnd`. +// Register both events in case `window.onanimationend` is not supported because of that, +// do the same for `transitionend` as Safari is likely to exhibit similar behavior. +// Also, the only modern browser that uses vendor prefixes for transitions/keyframes is webkit +// therefore there is no reason to test anymore for other vendor prefixes: +// http://caniuse.com/#search=transition +if (window.ontransitionend === undefined && window.onwebkittransitionend !== undefined) { + CSS_PREFIX = '-webkit-'; + TRANSITION_PROP = 'WebkitTransition'; + TRANSITIONEND_EVENT = 'webkitTransitionEnd transitionend'; +} else { + TRANSITION_PROP = 'transition'; + TRANSITIONEND_EVENT = 'transitionend'; +} + +if (window.onanimationend === undefined && window.onwebkitanimationend !== undefined) { + CSS_PREFIX = '-webkit-'; + ANIMATION_PROP = 'WebkitAnimation'; + ANIMATIONEND_EVENT = 'webkitAnimationEnd animationend'; +} else { + ANIMATION_PROP = 'animation'; + ANIMATIONEND_EVENT = 'animationend'; +} + +var DURATION_KEY = 'Duration'; +var PROPERTY_KEY = 'Property'; +var DELAY_KEY = 'Delay'; +var TIMING_KEY = 'TimingFunction'; +var ANIMATION_ITERATION_COUNT_KEY = 'IterationCount'; +var ANIMATION_PLAYSTATE_KEY = 'PlayState'; +var ELAPSED_TIME_MAX_DECIMAL_PLACES = 3; +var CLOSING_TIME_BUFFER = 1.5; +var ONE_SECOND = 1000; +var BASE_TEN = 10; + +var SAFE_FAST_FORWARD_DURATION_VALUE = 9999; + +var ANIMATION_DELAY_PROP = ANIMATION_PROP + DELAY_KEY; +var ANIMATION_DURATION_PROP = ANIMATION_PROP + DURATION_KEY; + +var TRANSITION_DELAY_PROP = TRANSITION_PROP + DELAY_KEY; +var TRANSITION_DURATION_PROP = TRANSITION_PROP + DURATION_KEY; + +var DETECT_CSS_PROPERTIES = { + transitionDuration: TRANSITION_DURATION_PROP, + transitionDelay: TRANSITION_DELAY_PROP, + transitionProperty: TRANSITION_PROP + PROPERTY_KEY, + animationDuration: ANIMATION_DURATION_PROP, + animationDelay: ANIMATION_DELAY_PROP, + animationIterationCount: ANIMATION_PROP + ANIMATION_ITERATION_COUNT_KEY +}; + +var DETECT_STAGGER_CSS_PROPERTIES = { + transitionDuration: TRANSITION_DURATION_PROP, + transitionDelay: TRANSITION_DELAY_PROP, + animationDuration: ANIMATION_DURATION_PROP, + animationDelay: ANIMATION_DELAY_PROP +}; + +function computeCssStyles($window, element, properties) { + var styles = Object.create(null); + var detectedStyles = $window.getComputedStyle(element) || {}; + forEach(properties, function(formalStyleName, actualStyleName) { + var val = detectedStyles[formalStyleName]; + if (val) { + var c = val.charAt(0); + + // only numerical-based values have a negative sign or digit as the first value + if (c === '-' || c === '+' || c >= 0) { + val = parseMaxTime(val); + } + + // by setting this to null in the event that the delay is not set or is set directly as 0 + // then we can still allow for zegative values to be used later on and not mistake this + // value for being greater than any other negative value. + if (val === 0) { + val = null; + } + styles[actualStyleName] = val; + } + }); + + return styles; +} + +function parseMaxTime(str) { + var maxValue = 0; + var values = str.split(/\s*,\s*/); + forEach(values, function(value) { + // it's always safe to consider only second values and omit `ms` values since + // getComputedStyle will always handle the conversion for us + if (value.charAt(value.length - 1) == 's') { + value = value.substring(0, value.length - 1); + } + value = parseFloat(value) || 0; + maxValue = maxValue ? Math.max(value, maxValue) : value; + }); + return maxValue; +} + +function truthyTimingValue(val) { + return val === 0 || val != null; +} + +function getCssTransitionDurationStyle(duration, applyOnlyDuration) { + var style = TRANSITION_PROP; + var value = duration + 's'; + if (applyOnlyDuration) { + style += DURATION_KEY; + } else { + value += ' linear all'; + } + return [style, value]; +} + +function getCssKeyframeDurationStyle(duration) { + return [ANIMATION_DURATION_PROP, duration + 's']; +} + +function getCssDelayStyle(delay, isKeyframeAnimation) { + var prop = isKeyframeAnimation ? ANIMATION_DELAY_PROP : TRANSITION_DELAY_PROP; + return [prop, delay + 's']; +} + +function blockTransitions(node, duration) { + // we use a negative delay value since it performs blocking + // yet it doesn't kill any existing transitions running on the + // same element which makes this safe for class-based animations + var value = duration ? '-' + duration + 's' : ''; + applyInlineStyle(node, [TRANSITION_DELAY_PROP, value]); + return [TRANSITION_DELAY_PROP, value]; +} + +function blockKeyframeAnimations(node, applyBlock) { + var value = applyBlock ? 'paused' : ''; + var key = ANIMATION_PROP + ANIMATION_PLAYSTATE_KEY; + applyInlineStyle(node, [key, value]); + return [key, value]; +} + +function applyInlineStyle(node, styleTuple) { + var prop = styleTuple[0]; + var value = styleTuple[1]; + node.style[prop] = value; +} + +function createLocalCacheLookup() { + var cache = Object.create(null); + return { + flush: function() { + cache = Object.create(null); + }, + + count: function(key) { + var entry = cache[key]; + return entry ? entry.total : 0; + }, + + get: function(key) { + var entry = cache[key]; + return entry && entry.value; + }, + + put: function(key, value) { + if (!cache[key]) { + cache[key] = { total: 1, value: value }; + } else { + cache[key].total++; + } + } + }; +} + +var $AnimateCssProvider = ['$animateProvider', function($animateProvider) { + var gcsLookup = createLocalCacheLookup(); + var gcsStaggerLookup = createLocalCacheLookup(); + + this.$get = ['$window', '$$jqLite', '$$AnimateRunner', '$timeout', + '$document', '$sniffer', '$$rAFScheduler', + function($window, $$jqLite, $$AnimateRunner, $timeout, + $document, $sniffer, $$rAFScheduler) { + + var applyAnimationClasses = applyAnimationClassesFactory($$jqLite); + + var parentCounter = 0; + function gcsHashFn(node, extraClasses) { + var KEY = "$$ngAnimateParentKey"; + var parentNode = node.parentNode; + var parentID = parentNode[KEY] || (parentNode[KEY] = ++parentCounter); + return parentID + '-' + node.getAttribute('class') + '-' + extraClasses; + } + + function computeCachedCssStyles(node, className, cacheKey, properties) { + var timings = gcsLookup.get(cacheKey); + + if (!timings) { + timings = computeCssStyles($window, node, properties); + if (timings.animationIterationCount === 'infinite') { + timings.animationIterationCount = 1; + } + } + + // we keep putting this in multiple times even though the value and the cacheKey are the same + // because we're keeping an interal tally of how many duplicate animations are detected. + gcsLookup.put(cacheKey, timings); + return timings; + } + + function computeCachedCssStaggerStyles(node, className, cacheKey, properties) { + var stagger; + + // if we have one or more existing matches of matching elements + // containing the same parent + CSS styles (which is how cacheKey works) + // then staggering is possible + if (gcsLookup.count(cacheKey) > 0) { + stagger = gcsStaggerLookup.get(cacheKey); + + if (!stagger) { + var staggerClassName = pendClasses(className, '-stagger'); + + $$jqLite.addClass(node, staggerClassName); + + stagger = computeCssStyles($window, node, properties); + + // force the conversion of a null value to zero incase not set + stagger.animationDuration = Math.max(stagger.animationDuration, 0); + stagger.transitionDuration = Math.max(stagger.transitionDuration, 0); + + $$jqLite.removeClass(node, staggerClassName); + + gcsStaggerLookup.put(cacheKey, stagger); + } + } + + return stagger || {}; + } + + var bod = getDomNode($document).body; + var rafWaitQueue = []; + function waitUntilQuiet(callback) { + rafWaitQueue.push(callback); + $$rAFScheduler.waitUntilQuiet(function() { + gcsLookup.flush(); + gcsStaggerLookup.flush(); + + //the line below will force the browser to perform a repaint so + //that all the animated elements within the animation frame will + //be properly updated and drawn on screen. This is required to + //ensure that the preparation animation is properly flushed so that + //the active state picks up from there. DO NOT REMOVE THIS LINE. + //DO NOT OPTIMIZE THIS LINE. THE MINIFIER WILL REMOVE IT OTHERWISE WHICH + //WILL RESULT IN AN UNPREDICTABLE BUG THAT IS VERY HARD TO TRACK DOWN AND + //WILL TAKE YEARS AWAY FROM YOUR LIFE. + var width = bod.offsetWidth + 1; + + // we use a for loop to ensure that if the queue is changed + // during this looping then it will consider new requests + for (var i = 0; i < rafWaitQueue.length; i++) { + rafWaitQueue[i](width); + } + rafWaitQueue.length = 0; + }); + } + + return init; + + function computeTimings(node, className, cacheKey) { + var timings = computeCachedCssStyles(node, className, cacheKey, DETECT_CSS_PROPERTIES); + var aD = timings.animationDelay; + var tD = timings.transitionDelay; + timings.maxDelay = aD && tD + ? Math.max(aD, tD) + : (aD || tD); + timings.maxDuration = Math.max( + timings.animationDuration * timings.animationIterationCount, + timings.transitionDuration); + + return timings; + } + + function init(element, options) { + var node = getDomNode(element); + if (!node || !node.parentNode) { + return closeAndReturnNoopAnimator(); + } + + options = prepareAnimationOptions(options); + + var temporaryStyles = []; + var classes = element.attr('class'); + var styles = packageStyles(options); + var animationClosed; + var animationPaused; + var animationCompleted; + var runner; + var runnerHost; + var maxDelay; + var maxDelayTime; + var maxDuration; + var maxDurationTime; + + if (options.duration === 0 || (!$sniffer.animations && !$sniffer.transitions)) { + return closeAndReturnNoopAnimator(); + } + + var method = options.event && isArray(options.event) + ? options.event.join(' ') + : options.event; + + var isStructural = method && options.structural; + var structuralClassName = ''; + var addRemoveClassName = ''; + + if (isStructural) { + structuralClassName = pendClasses(method, 'ng-', true); + } else if (method) { + structuralClassName = method; + } + + if (options.addClass) { + addRemoveClassName += pendClasses(options.addClass, '-add'); + } + + if (options.removeClass) { + if (addRemoveClassName.length) { + addRemoveClassName += ' '; + } + addRemoveClassName += pendClasses(options.removeClass, '-remove'); + } + + // there may be a situation where a structural animation is combined together + // with CSS classes that need to resolve before the animation is computed. + // However this means that there is no explicit CSS code to block the animation + // from happening (by setting 0s none in the class name). If this is the case + // we need to apply the classes before the first rAF so we know to continue if + // there actually is a detected transition or keyframe animation + if (options.applyClassesEarly && addRemoveClassName.length) { + applyAnimationClasses(element, options); + addRemoveClassName = ''; + } + + var setupClasses = [structuralClassName, addRemoveClassName].join(' ').trim(); + var fullClassName = classes + ' ' + setupClasses; + var activeClasses = pendClasses(setupClasses, '-active'); + var hasToStyles = styles.to && Object.keys(styles.to).length > 0; + var containsKeyframeAnimation = (options.keyframeStyle || '').length > 0; + + // there is no way we can trigger an animation if no styles and + // no classes are being applied which would then trigger a transition, + // unless there a is raw keyframe value that is applied to the element. + if (!containsKeyframeAnimation + && !hasToStyles + && !setupClasses) { + return closeAndReturnNoopAnimator(); + } + + var cacheKey, stagger; + if (options.stagger > 0) { + var staggerVal = parseFloat(options.stagger); + stagger = { + transitionDelay: staggerVal, + animationDelay: staggerVal, + transitionDuration: 0, + animationDuration: 0 + }; + } else { + cacheKey = gcsHashFn(node, fullClassName); + stagger = computeCachedCssStaggerStyles(node, setupClasses, cacheKey, DETECT_STAGGER_CSS_PROPERTIES); + } + + $$jqLite.addClass(element, setupClasses); + + var applyOnlyDuration; + + if (options.transitionStyle) { + var transitionStyle = [TRANSITION_PROP, options.transitionStyle]; + applyInlineStyle(node, transitionStyle); + temporaryStyles.push(transitionStyle); + } + + if (options.duration >= 0) { + applyOnlyDuration = node.style[TRANSITION_PROP].length > 0; + var durationStyle = getCssTransitionDurationStyle(options.duration, applyOnlyDuration); + + // we set the duration so that it will be picked up by getComputedStyle later + applyInlineStyle(node, durationStyle); + temporaryStyles.push(durationStyle); + } + + if (options.keyframeStyle) { + var keyframeStyle = [ANIMATION_PROP, options.keyframeStyle]; + applyInlineStyle(node, keyframeStyle); + temporaryStyles.push(keyframeStyle); + } + + var itemIndex = stagger + ? options.staggerIndex >= 0 + ? options.staggerIndex + : gcsLookup.count(cacheKey) + : 0; + + var isFirst = itemIndex === 0; + + // this is a pre-emptive way of forcing the setup classes to be added and applied INSTANTLY + // without causing any combination of transitions to kick in. By adding a negative delay value + // it forces the setup class' transition to end immediately. We later then remove the negative + // transition delay to allow for the transition to naturally do it's thing. The beauty here is + // that if there is no transition defined then nothing will happen and this will also allow + // other transitions to be stacked on top of each other without any chopping them out. + if (isFirst) { + blockTransitions(node, SAFE_FAST_FORWARD_DURATION_VALUE); + } + + var timings = computeTimings(node, fullClassName, cacheKey); + var relativeDelay = timings.maxDelay; + maxDelay = Math.max(relativeDelay, 0); + maxDuration = timings.maxDuration; + + var flags = {}; + flags.hasTransitions = timings.transitionDuration > 0; + flags.hasAnimations = timings.animationDuration > 0; + flags.hasTransitionAll = flags.hasTransitions && timings.transitionProperty == 'all'; + flags.applyTransitionDuration = hasToStyles && ( + (flags.hasTransitions && !flags.hasTransitionAll) + || (flags.hasAnimations && !flags.hasTransitions)); + flags.applyAnimationDuration = options.duration && flags.hasAnimations; + flags.applyTransitionDelay = truthyTimingValue(options.delay) && (flags.applyTransitionDuration || flags.hasTransitions); + flags.applyAnimationDelay = truthyTimingValue(options.delay) && flags.hasAnimations; + flags.recalculateTimingStyles = addRemoveClassName.length > 0; + + if (flags.applyTransitionDuration || flags.applyAnimationDuration) { + maxDuration = options.duration ? parseFloat(options.duration) : maxDuration; + + if (flags.applyTransitionDuration) { + flags.hasTransitions = true; + timings.transitionDuration = maxDuration; + applyOnlyDuration = node.style[TRANSITION_PROP + PROPERTY_KEY].length > 0; + temporaryStyles.push(getCssTransitionDurationStyle(maxDuration, applyOnlyDuration)); + } + + if (flags.applyAnimationDuration) { + flags.hasAnimations = true; + timings.animationDuration = maxDuration; + temporaryStyles.push(getCssKeyframeDurationStyle(maxDuration)); + } + } + + if (maxDuration === 0 && !flags.recalculateTimingStyles) { + return closeAndReturnNoopAnimator(); + } + + // we need to recalculate the delay value since we used a pre-emptive negative + // delay value and the delay value is required for the final event checking. This + // property will ensure that this will happen after the RAF phase has passed. + if (options.duration == null && timings.transitionDuration > 0) { + flags.recalculateTimingStyles = flags.recalculateTimingStyles || isFirst; + } + + maxDelayTime = maxDelay * ONE_SECOND; + maxDurationTime = maxDuration * ONE_SECOND; + if (!options.skipBlocking) { + flags.blockTransition = timings.transitionDuration > 0; + flags.blockKeyframeAnimation = timings.animationDuration > 0 && + stagger.animationDelay > 0 && + stagger.animationDuration === 0; + } + + applyAnimationFromStyles(element, options); + if (!flags.blockTransition) { + blockTransitions(node, false); + } + + applyBlocking(maxDuration); + + // TODO(matsko): for 1.5 change this code to have an animator object for better debugging + return { + $$willAnimate: true, + end: endFn, + start: function() { + if (animationClosed) return; + + runnerHost = { + end: endFn, + cancel: cancelFn, + resume: null, //this will be set during the start() phase + pause: null + }; + + runner = new $$AnimateRunner(runnerHost); + + waitUntilQuiet(start); + + // we don't have access to pause/resume the animation + // since it hasn't run yet. AnimateRunner will therefore + // set noop functions for resume and pause and they will + // later be overridden once the animation is triggered + return runner; + } + }; + + function endFn() { + close(); + } + + function cancelFn() { + close(true); + } + + function close(rejected) { // jshint ignore:line + // if the promise has been called already then we shouldn't close + // the animation again + if (animationClosed || (animationCompleted && animationPaused)) return; + animationClosed = true; + animationPaused = false; + + $$jqLite.removeClass(element, setupClasses); + $$jqLite.removeClass(element, activeClasses); + + blockKeyframeAnimations(node, false); + blockTransitions(node, false); + + forEach(temporaryStyles, function(entry) { + // There is only one way to remove inline style properties entirely from elements. + // By using `removeProperty` this works, but we need to convert camel-cased CSS + // styles down to hyphenated values. + node.style[entry[0]] = ''; + }); + + applyAnimationClasses(element, options); + applyAnimationStyles(element, options); + + // the reason why we have this option is to allow a synchronous closing callback + // that is fired as SOON as the animation ends (when the CSS is removed) or if + // the animation never takes off at all. A good example is a leave animation since + // the element must be removed just after the animation is over or else the element + // will appear on screen for one animation frame causing an overbearing flicker. + if (options.onDone) { + options.onDone(); + } + + // if the preparation function fails then the promise is not setup + if (runner) { + runner.complete(!rejected); + } + } + + function applyBlocking(duration) { + if (flags.blockTransition) { + blockTransitions(node, duration); + } + + if (flags.blockKeyframeAnimation) { + blockKeyframeAnimations(node, !!duration); + } + } + + function closeAndReturnNoopAnimator() { + runner = new $$AnimateRunner({ + end: endFn, + cancel: cancelFn + }); + + close(); + + return { + $$willAnimate: false, + start: function() { + return runner; + }, + end: endFn + }; + } + + function start() { + if (animationClosed) return; + if (!node.parentNode) { + close(); + return; + } + + var startTime, events = []; + + // even though we only pause keyframe animations here the pause flag + // will still happen when transitions are used. Only the transition will + // not be paused since that is not possible. If the animation ends when + // paused then it will not complete until unpaused or cancelled. + var playPause = function(playAnimation) { + if (!animationCompleted) { + animationPaused = !playAnimation; + if (timings.animationDuration) { + var value = blockKeyframeAnimations(node, animationPaused); + animationPaused + ? temporaryStyles.push(value) + : removeFromArray(temporaryStyles, value); + } + } else if (animationPaused && playAnimation) { + animationPaused = false; + close(); + } + }; + + // checking the stagger duration prevents an accidently cascade of the CSS delay style + // being inherited from the parent. If the transition duration is zero then we can safely + // rely that the delay value is an intential stagger delay style. + var maxStagger = itemIndex > 0 + && ((timings.transitionDuration && stagger.transitionDuration === 0) || + (timings.animationDuration && stagger.animationDuration === 0)) + && Math.max(stagger.animationDelay, stagger.transitionDelay); + if (maxStagger) { + $timeout(triggerAnimationStart, + Math.floor(maxStagger * itemIndex * ONE_SECOND), + false); + } else { + triggerAnimationStart(); + } + + // this will decorate the existing promise runner with pause/resume methods + runnerHost.resume = function() { + playPause(true); + }; + + runnerHost.pause = function() { + playPause(false); + }; + + function triggerAnimationStart() { + // just incase a stagger animation kicks in when the animation + // itself was cancelled entirely + if (animationClosed) return; + + applyBlocking(false); + + forEach(temporaryStyles, function(entry) { + var key = entry[0]; + var value = entry[1]; + node.style[key] = value; + }); + + applyAnimationClasses(element, options); + $$jqLite.addClass(element, activeClasses); + + if (flags.recalculateTimingStyles) { + fullClassName = node.className + ' ' + setupClasses; + cacheKey = gcsHashFn(node, fullClassName); + + timings = computeTimings(node, fullClassName, cacheKey); + relativeDelay = timings.maxDelay; + maxDelay = Math.max(relativeDelay, 0); + maxDuration = timings.maxDuration; + + if (maxDuration === 0) { + close(); + return; + } + + flags.hasTransitions = timings.transitionDuration > 0; + flags.hasAnimations = timings.animationDuration > 0; + } + + if (flags.applyTransitionDelay || flags.applyAnimationDelay) { + relativeDelay = typeof options.delay !== "boolean" && truthyTimingValue(options.delay) + ? parseFloat(options.delay) + : relativeDelay; + + maxDelay = Math.max(relativeDelay, 0); + + var delayStyle; + if (flags.applyTransitionDelay) { + timings.transitionDelay = relativeDelay; + delayStyle = getCssDelayStyle(relativeDelay); + temporaryStyles.push(delayStyle); + node.style[delayStyle[0]] = delayStyle[1]; + } + + if (flags.applyAnimationDelay) { + timings.animationDelay = relativeDelay; + delayStyle = getCssDelayStyle(relativeDelay, true); + temporaryStyles.push(delayStyle); + node.style[delayStyle[0]] = delayStyle[1]; + } + } + + maxDelayTime = maxDelay * ONE_SECOND; + maxDurationTime = maxDuration * ONE_SECOND; + + if (options.easing) { + var easeProp, easeVal = options.easing; + if (flags.hasTransitions) { + easeProp = TRANSITION_PROP + TIMING_KEY; + temporaryStyles.push([easeProp, easeVal]); + node.style[easeProp] = easeVal; + } + if (flags.hasAnimations) { + easeProp = ANIMATION_PROP + TIMING_KEY; + temporaryStyles.push([easeProp, easeVal]); + node.style[easeProp] = easeVal; + } + } + + if (timings.transitionDuration) { + events.push(TRANSITIONEND_EVENT); + } + + if (timings.animationDuration) { + events.push(ANIMATIONEND_EVENT); + } + + startTime = Date.now(); + element.on(events.join(' '), onAnimationProgress); + $timeout(onAnimationExpired, maxDelayTime + CLOSING_TIME_BUFFER * maxDurationTime); + + applyAnimationToStyles(element, options); + } + + function onAnimationExpired() { + // although an expired animation is a failed animation, getting to + // this outcome is very easy if the CSS code screws up. Therefore we + // should still continue normally as if the animation completed correctly. + close(); + } + + function onAnimationProgress(event) { + event.stopPropagation(); + var ev = event.originalEvent || event; + var timeStamp = ev.$manualTimeStamp || ev.timeStamp || Date.now(); + + /* Firefox (or possibly just Gecko) likes to not round values up + * when a ms measurement is used for the animation */ + var elapsedTime = parseFloat(ev.elapsedTime.toFixed(ELAPSED_TIME_MAX_DECIMAL_PLACES)); + + /* $manualTimeStamp is a mocked timeStamp value which is set + * within browserTrigger(). This is only here so that tests can + * mock animations properly. Real events fallback to event.timeStamp, + * or, if they don't, then a timeStamp is automatically created for them. + * We're checking to see if the timeStamp surpasses the expected delay, + * but we're using elapsedTime instead of the timeStamp on the 2nd + * pre-condition since animations sometimes close off early */ + if (Math.max(timeStamp - startTime, 0) >= maxDelayTime && elapsedTime >= maxDuration) { + // we set this flag to ensure that if the transition is paused then, when resumed, + // the animation will automatically close itself since transitions cannot be paused. + animationCompleted = true; + close(); + } + } + } + } + }]; +}]; + +var $$AnimateCssDriverProvider = ['$$animationProvider', function($$animationProvider) { + $$animationProvider.drivers.push('$$animateCssDriver'); + + var NG_ANIMATE_SHIM_CLASS_NAME = 'ng-animate-shim'; + var NG_ANIMATE_ANCHOR_CLASS_NAME = 'ng-anchor'; + + var NG_OUT_ANCHOR_CLASS_NAME = 'ng-anchor-out'; + var NG_IN_ANCHOR_CLASS_NAME = 'ng-anchor-in'; + + this.$get = ['$animateCss', '$rootScope', '$$AnimateRunner', '$rootElement', '$document', '$sniffer', + function($animateCss, $rootScope, $$AnimateRunner, $rootElement, $document, $sniffer) { + + // only browsers that support these properties can render animations + if (!$sniffer.animations && !$sniffer.transitions) return noop; + + var bodyNode = getDomNode($document).body; + var rootNode = getDomNode($rootElement); + + var rootBodyElement = jqLite(bodyNode.parentNode === rootNode ? bodyNode : rootNode); + + return function initDriverFn(animationDetails) { + return animationDetails.from && animationDetails.to + ? prepareFromToAnchorAnimation(animationDetails.from, + animationDetails.to, + animationDetails.classes, + animationDetails.anchors) + : prepareRegularAnimation(animationDetails); + }; + + function filterCssClasses(classes) { + //remove all the `ng-` stuff + return classes.replace(/\bng-\S+\b/g, ''); + } + + function getUniqueValues(a, b) { + if (isString(a)) a = a.split(' '); + if (isString(b)) b = b.split(' '); + return a.filter(function(val) { + return b.indexOf(val) === -1; + }).join(' '); + } + + function prepareAnchoredAnimation(classes, outAnchor, inAnchor) { + var clone = jqLite(getDomNode(outAnchor).cloneNode(true)); + var startingClasses = filterCssClasses(getClassVal(clone)); + + outAnchor.addClass(NG_ANIMATE_SHIM_CLASS_NAME); + inAnchor.addClass(NG_ANIMATE_SHIM_CLASS_NAME); + + clone.addClass(NG_ANIMATE_ANCHOR_CLASS_NAME); + + rootBodyElement.append(clone); + + var animatorIn, animatorOut = prepareOutAnimation(); + + // the user may not end up using the `out` animation and + // only making use of the `in` animation or vice-versa. + // In either case we should allow this and not assume the + // animation is over unless both animations are not used. + if (!animatorOut) { + animatorIn = prepareInAnimation(); + if (!animatorIn) { + return end(); + } + } + + var startingAnimator = animatorOut || animatorIn; + + return { + start: function() { + var runner; + + var currentAnimation = startingAnimator.start(); + currentAnimation.done(function() { + currentAnimation = null; + if (!animatorIn) { + animatorIn = prepareInAnimation(); + if (animatorIn) { + currentAnimation = animatorIn.start(); + currentAnimation.done(function() { + currentAnimation = null; + end(); + runner.complete(); + }); + return currentAnimation; + } + } + // in the event that there is no `in` animation + end(); + runner.complete(); + }); + + runner = new $$AnimateRunner({ + end: endFn, + cancel: endFn + }); + + return runner; + + function endFn() { + if (currentAnimation) { + currentAnimation.end(); + } + } + } + }; + + function calculateAnchorStyles(anchor) { + var styles = {}; + + var coords = getDomNode(anchor).getBoundingClientRect(); + + // we iterate directly since safari messes up and doesn't return + // all the keys for the coods object when iterated + forEach(['width','height','top','left'], function(key) { + var value = coords[key]; + switch (key) { + case 'top': + value += bodyNode.scrollTop; + break; + case 'left': + value += bodyNode.scrollLeft; + break; + } + styles[key] = Math.floor(value) + 'px'; + }); + return styles; + } + + function prepareOutAnimation() { + var animator = $animateCss(clone, { + addClass: NG_OUT_ANCHOR_CLASS_NAME, + delay: true, + from: calculateAnchorStyles(outAnchor) + }); + + // read the comment within `prepareRegularAnimation` to understand + // why this check is necessary + return animator.$$willAnimate ? animator : null; + } + + function getClassVal(element) { + return element.attr('class') || ''; + } + + function prepareInAnimation() { + var endingClasses = filterCssClasses(getClassVal(inAnchor)); + var toAdd = getUniqueValues(endingClasses, startingClasses); + var toRemove = getUniqueValues(startingClasses, endingClasses); + + var animator = $animateCss(clone, { + to: calculateAnchorStyles(inAnchor), + addClass: NG_IN_ANCHOR_CLASS_NAME + ' ' + toAdd, + removeClass: NG_OUT_ANCHOR_CLASS_NAME + ' ' + toRemove, + delay: true + }); + + // read the comment within `prepareRegularAnimation` to understand + // why this check is necessary + return animator.$$willAnimate ? animator : null; + } + + function end() { + clone.remove(); + outAnchor.removeClass(NG_ANIMATE_SHIM_CLASS_NAME); + inAnchor.removeClass(NG_ANIMATE_SHIM_CLASS_NAME); + } + } + + function prepareFromToAnchorAnimation(from, to, classes, anchors) { + var fromAnimation = prepareRegularAnimation(from); + var toAnimation = prepareRegularAnimation(to); + + var anchorAnimations = []; + forEach(anchors, function(anchor) { + var outElement = anchor['out']; + var inElement = anchor['in']; + var animator = prepareAnchoredAnimation(classes, outElement, inElement); + if (animator) { + anchorAnimations.push(animator); + } + }); + + // no point in doing anything when there are no elements to animate + if (!fromAnimation && !toAnimation && anchorAnimations.length === 0) return; + + return { + start: function() { + var animationRunners = []; + + if (fromAnimation) { + animationRunners.push(fromAnimation.start()); + } + + if (toAnimation) { + animationRunners.push(toAnimation.start()); + } + + forEach(anchorAnimations, function(animation) { + animationRunners.push(animation.start()); + }); + + var runner = new $$AnimateRunner({ + end: endFn, + cancel: endFn // CSS-driven animations cannot be cancelled, only ended + }); + + $$AnimateRunner.all(animationRunners, function(status) { + runner.complete(status); + }); + + return runner; + + function endFn() { + forEach(animationRunners, function(runner) { + runner.end(); + }); + } + } + }; + } + + function prepareRegularAnimation(animationDetails) { + var element = animationDetails.element; + var options = animationDetails.options || {}; + + if (animationDetails.structural) { + // structural animations ensure that the CSS classes are always applied + // before the detection starts. + options.structural = options.applyClassesEarly = true; + + // we special case the leave animation since we want to ensure that + // the element is removed as soon as the animation is over. Otherwise + // a flicker might appear or the element may not be removed at all + options.event = animationDetails.event; + if (options.event === 'leave') { + options.onDone = options.domOperation; + } + } else { + options.event = null; + } + + var animator = $animateCss(element, options); + + // the driver lookup code inside of $$animation attempts to spawn a + // driver one by one until a driver returns a.$$willAnimate animator object. + // $animateCss will always return an object, however, it will pass in + // a flag as a hint as to whether an animation was detected or not + return animator.$$willAnimate ? animator : null; + } + }]; +}]; + +// TODO(matsko): use caching here to speed things up for detection +// TODO(matsko): add documentation +// by the time... + +var $$AnimateJsProvider = ['$animateProvider', function($animateProvider) { + this.$get = ['$injector', '$$AnimateRunner', '$$rAFMutex', '$$jqLite', + function($injector, $$AnimateRunner, $$rAFMutex, $$jqLite) { + + var applyAnimationClasses = applyAnimationClassesFactory($$jqLite); + // $animateJs(element, 'enter'); + return function(element, event, classes, options) { + // the `classes` argument is optional and if it is not used + // then the classes will be resolved from the element's className + // property as well as options.addClass/options.removeClass. + if (arguments.length === 3 && isObject(classes)) { + options = classes; + classes = null; + } + + options = prepareAnimationOptions(options); + if (!classes) { + classes = element.attr('class') || ''; + if (options.addClass) { + classes += ' ' + options.addClass; + } + if (options.removeClass) { + classes += ' ' + options.removeClass; + } + } + + var classesToAdd = options.addClass; + var classesToRemove = options.removeClass; + + // the lookupAnimations function returns a series of animation objects that are + // matched up with one or more of the CSS classes. These animation objects are + // defined via the module.animation factory function. If nothing is detected then + // we don't return anything which then makes $animation query the next driver. + var animations = lookupAnimations(classes); + var before, after; + if (animations.length) { + var afterFn, beforeFn; + if (event == 'leave') { + beforeFn = 'leave'; + afterFn = 'afterLeave'; // TODO(matsko): get rid of this + } else { + beforeFn = 'before' + event.charAt(0).toUpperCase() + event.substr(1); + afterFn = event; + } + + if (event !== 'enter' && event !== 'move') { + before = packageAnimations(element, event, options, animations, beforeFn); + } + after = packageAnimations(element, event, options, animations, afterFn); + } + + // no matching animations + if (!before && !after) return; + + function applyOptions() { + options.domOperation(); + applyAnimationClasses(element, options); + } + + return { + start: function() { + var closeActiveAnimations; + var chain = []; + + if (before) { + chain.push(function(fn) { + closeActiveAnimations = before(fn); + }); + } + + if (chain.length) { + chain.push(function(fn) { + applyOptions(); + fn(true); + }); + } else { + applyOptions(); + } + + if (after) { + chain.push(function(fn) { + closeActiveAnimations = after(fn); + }); + } + + var animationClosed = false; + var runner = new $$AnimateRunner({ + end: function() { + endAnimations(); + }, + cancel: function() { + endAnimations(true); + } + }); + + $$AnimateRunner.chain(chain, onComplete); + return runner; + + function onComplete(success) { + animationClosed = true; + applyOptions(); + applyAnimationStyles(element, options); + runner.complete(success); + } + + function endAnimations(cancelled) { + if (!animationClosed) { + (closeActiveAnimations || noop)(cancelled); + onComplete(cancelled); + } + } + } + }; + + function executeAnimationFn(fn, element, event, options, onDone) { + var args; + switch (event) { + case 'animate': + args = [element, options.from, options.to, onDone]; + break; + + case 'setClass': + args = [element, classesToAdd, classesToRemove, onDone]; + break; + + case 'addClass': + args = [element, classesToAdd, onDone]; + break; + + case 'removeClass': + args = [element, classesToRemove, onDone]; + break; + + default: + args = [element, onDone]; + break; + } + + args.push(options); + + var value = fn.apply(fn, args); + if (value) { + if (isFunction(value.start)) { + value = value.start(); + } + + if (value instanceof $$AnimateRunner) { + value.done(onDone); + } else if (isFunction(value)) { + // optional onEnd / onCancel callback + return value; + } + } + + return noop; + } + + function groupEventedAnimations(element, event, options, animations, fnName) { + var operations = []; + forEach(animations, function(ani) { + var animation = ani[fnName]; + if (!animation) return; + + // note that all of these animations will run in parallel + operations.push(function() { + var runner; + var endProgressCb; + + var resolved = false; + var onAnimationComplete = function(rejected) { + if (!resolved) { + resolved = true; + (endProgressCb || noop)(rejected); + runner.complete(!rejected); + } + }; + + runner = new $$AnimateRunner({ + end: function() { + onAnimationComplete(); + }, + cancel: function() { + onAnimationComplete(true); + } + }); + + endProgressCb = executeAnimationFn(animation, element, event, options, function(result) { + var cancelled = result === false; + onAnimationComplete(cancelled); + }); + + return runner; + }); + }); + + return operations; + } + + function packageAnimations(element, event, options, animations, fnName) { + var operations = groupEventedAnimations(element, event, options, animations, fnName); + if (operations.length === 0) { + var a,b; + if (fnName === 'beforeSetClass') { + a = groupEventedAnimations(element, 'removeClass', options, animations, 'beforeRemoveClass'); + b = groupEventedAnimations(element, 'addClass', options, animations, 'beforeAddClass'); + } else if (fnName === 'setClass') { + a = groupEventedAnimations(element, 'removeClass', options, animations, 'removeClass'); + b = groupEventedAnimations(element, 'addClass', options, animations, 'addClass'); + } + + if (a) { + operations = operations.concat(a); + } + if (b) { + operations = operations.concat(b); + } + } + + if (operations.length === 0) return; + + // TODO(matsko): add documentation + return function startAnimation(callback) { + var runners = []; + if (operations.length) { + forEach(operations, function(animateFn) { + runners.push(animateFn()); + }); + } + + runners.length ? $$AnimateRunner.all(runners, callback) : callback(); + + return function endFn(reject) { + forEach(runners, function(runner) { + reject ? runner.cancel() : runner.end(); + }); + }; + }; + } + }; + + function lookupAnimations(classes) { + classes = isArray(classes) ? classes : classes.split(' '); + var matches = [], flagMap = {}; + for (var i=0; i < classes.length; i++) { + var klass = classes[i], + animationFactory = $animateProvider.$$registeredAnimations[klass]; + if (animationFactory && !flagMap[klass]) { + matches.push($injector.get(animationFactory)); + flagMap[klass] = true; + } + } + return matches; + } + }]; +}]; + +var $$AnimateJsDriverProvider = ['$$animationProvider', function($$animationProvider) { + $$animationProvider.drivers.push('$$animateJsDriver'); + this.$get = ['$$animateJs', '$$AnimateRunner', function($$animateJs, $$AnimateRunner) { + return function initDriverFn(animationDetails) { + if (animationDetails.from && animationDetails.to) { + var fromAnimation = prepareAnimation(animationDetails.from); + var toAnimation = prepareAnimation(animationDetails.to); + if (!fromAnimation && !toAnimation) return; + + return { + start: function() { + var animationRunners = []; + + if (fromAnimation) { + animationRunners.push(fromAnimation.start()); + } + + if (toAnimation) { + animationRunners.push(toAnimation.start()); + } + + $$AnimateRunner.all(animationRunners, done); + + var runner = new $$AnimateRunner({ + end: endFnFactory(), + cancel: endFnFactory() + }); + + return runner; + + function endFnFactory() { + return function() { + forEach(animationRunners, function(runner) { + // at this point we cannot cancel animations for groups just yet. 1.5+ + runner.end(); + }); + }; + } + + function done(status) { + runner.complete(status); + } + } + }; + } else { + return prepareAnimation(animationDetails); + } + }; + + function prepareAnimation(animationDetails) { + // TODO(matsko): make sure to check for grouped animations and delegate down to normal animations + var element = animationDetails.element; + var event = animationDetails.event; + var options = animationDetails.options; + var classes = animationDetails.classes; + return $$animateJs(element, event, classes, options); + } + }]; +}]; + +var NG_ANIMATE_ATTR_NAME = 'data-ng-animate'; +var NG_ANIMATE_PIN_DATA = '$ngAnimatePin'; +var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) { + var PRE_DIGEST_STATE = 1; + var RUNNING_STATE = 2; + + var rules = this.rules = { + skip: [], + cancel: [], + join: [] + }; + + function isAllowed(ruleType, element, currentAnimation, previousAnimation) { + return rules[ruleType].some(function(fn) { + return fn(element, currentAnimation, previousAnimation); + }); + } + + function hasAnimationClasses(options, and) { + options = options || {}; + var a = (options.addClass || '').length > 0; + var b = (options.removeClass || '').length > 0; + return and ? a && b : a || b; + } + + rules.join.push(function(element, newAnimation, currentAnimation) { + // if the new animation is class-based then we can just tack that on + return !newAnimation.structural && hasAnimationClasses(newAnimation.options); + }); + + rules.skip.push(function(element, newAnimation, currentAnimation) { + // there is no need to animate anything if no classes are being added and + // there is no structural animation that will be triggered + return !newAnimation.structural && !hasAnimationClasses(newAnimation.options); + }); + + rules.skip.push(function(element, newAnimation, currentAnimation) { + // why should we trigger a new structural animation if the element will + // be removed from the DOM anyway? + return currentAnimation.event == 'leave' && newAnimation.structural; + }); + + rules.skip.push(function(element, newAnimation, currentAnimation) { + // if there is a current animation then skip the class-based animation + return currentAnimation.structural && !newAnimation.structural; + }); + + rules.cancel.push(function(element, newAnimation, currentAnimation) { + // there can never be two structural animations running at the same time + return currentAnimation.structural && newAnimation.structural; + }); + + rules.cancel.push(function(element, newAnimation, currentAnimation) { + // if the previous animation is already running, but the new animation will + // be triggered, but the new animation is structural + return currentAnimation.state === RUNNING_STATE && newAnimation.structural; + }); + + rules.cancel.push(function(element, newAnimation, currentAnimation) { + var nO = newAnimation.options; + var cO = currentAnimation.options; + + // if the exact same CSS class is added/removed then it's safe to cancel it + return (nO.addClass && nO.addClass === cO.removeClass) || (nO.removeClass && nO.removeClass === cO.addClass); + }); + + this.$get = ['$$rAF', '$rootScope', '$rootElement', '$document', '$$HashMap', + '$$animation', '$$AnimateRunner', '$templateRequest', '$$jqLite', + function($$rAF, $rootScope, $rootElement, $document, $$HashMap, + $$animation, $$AnimateRunner, $templateRequest, $$jqLite) { + + var activeAnimationsLookup = new $$HashMap(); + var disabledElementsLookup = new $$HashMap(); + + var animationsEnabled = null; + + // Wait until all directive and route-related templates are downloaded and + // compiled. The $templateRequest.totalPendingRequests variable keeps track of + // all of the remote templates being currently downloaded. If there are no + // templates currently downloading then the watcher will still fire anyway. + var deregisterWatch = $rootScope.$watch( + function() { return $templateRequest.totalPendingRequests === 0; }, + function(isEmpty) { + if (!isEmpty) return; + deregisterWatch(); + + // Now that all templates have been downloaded, $animate will wait until + // the post digest queue is empty before enabling animations. By having two + // calls to $postDigest calls we can ensure that the flag is enabled at the + // very end of the post digest queue. Since all of the animations in $animate + // use $postDigest, it's important that the code below executes at the end. + // This basically means that the page is fully downloaded and compiled before + // any animations are triggered. + $rootScope.$$postDigest(function() { + $rootScope.$$postDigest(function() { + // we check for null directly in the event that the application already called + // .enabled() with whatever arguments that it provided it with + if (animationsEnabled === null) { + animationsEnabled = true; + } + }); + }); + } + ); + + var bodyElement = jqLite($document[0].body); + + var callbackRegistry = {}; + + // remember that the classNameFilter is set during the provider/config + // stage therefore we can optimize here and setup a helper function + var classNameFilter = $animateProvider.classNameFilter(); + var isAnimatableClassName = !classNameFilter + ? function() { return true; } + : function(className) { + return classNameFilter.test(className); + }; + + var applyAnimationClasses = applyAnimationClassesFactory($$jqLite); + + function normalizeAnimationOptions(element, options) { + return mergeAnimationOptions(element, options, {}); + } + + function findCallbacks(element, event) { + var targetNode = getDomNode(element); + + var matches = []; + var entries = callbackRegistry[event]; + if (entries) { + forEach(entries, function(entry) { + if (entry.node.contains(targetNode)) { + matches.push(entry.callback); + } + }); + } + + return matches; + } + + function triggerCallback(event, element, phase, data) { + $$rAF(function() { + forEach(findCallbacks(element, event), function(callback) { + callback(element, phase, data); + }); + }); + } + + return { + on: function(event, container, callback) { + var node = extractElementNode(container); + callbackRegistry[event] = callbackRegistry[event] || []; + callbackRegistry[event].push({ + node: node, + callback: callback + }); + }, + + off: function(event, container, callback) { + var entries = callbackRegistry[event]; + if (!entries) return; + + callbackRegistry[event] = arguments.length === 1 + ? null + : filterFromRegistry(entries, container, callback); + + function filterFromRegistry(list, matchContainer, matchCallback) { + var containerNode = extractElementNode(matchContainer); + return list.filter(function(entry) { + var isMatch = entry.node === containerNode && + (!matchCallback || entry.callback === matchCallback); + return !isMatch; + }); + } + }, + + pin: function(element, parentElement) { + assertArg(isElement(element), 'element', 'not an element'); + assertArg(isElement(parentElement), 'parentElement', 'not an element'); + element.data(NG_ANIMATE_PIN_DATA, parentElement); + }, + + push: function(element, event, options, domOperation) { + options = options || {}; + options.domOperation = domOperation; + return queueAnimation(element, event, options); + }, + + // this method has four signatures: + // () - global getter + // (bool) - global setter + // (element) - element getter + // (element, bool) - element setter + enabled: function(element, bool) { + var argCount = arguments.length; + + if (argCount === 0) { + // () - Global getter + bool = !!animationsEnabled; + } else { + var hasElement = isElement(element); + + if (!hasElement) { + // (bool) - Global setter + bool = animationsEnabled = !!element; + } else { + var node = getDomNode(element); + var recordExists = disabledElementsLookup.get(node); + + if (argCount === 1) { + // (element) - Element getter + bool = !recordExists; + } else { + // (element, bool) - Element setter + bool = !!bool; + if (!bool) { + disabledElementsLookup.put(node, true); + } else if (recordExists) { + disabledElementsLookup.remove(node); + } + } + } + } + + return bool; + } + }; + + function queueAnimation(element, event, options) { + var node, parent; + element = stripCommentsFromElement(element); + if (element) { + node = getDomNode(element); + parent = element.parent(); + } + + options = prepareAnimationOptions(options); + + // we create a fake runner with a working promise. + // These methods will become available after the digest has passed + var runner = new $$AnimateRunner(); + + // there are situations where a directive issues an animation for + // a jqLite wrapper that contains only comment nodes... If this + // happens then there is no way we can perform an animation + if (!node) { + close(); + return runner; + } + + if (isArray(options.addClass)) { + options.addClass = options.addClass.join(' '); + } + + if (isArray(options.removeClass)) { + options.removeClass = options.removeClass.join(' '); + } + + if (options.from && !isObject(options.from)) { + options.from = null; + } + + if (options.to && !isObject(options.to)) { + options.to = null; + } + + var className = [node.className, options.addClass, options.removeClass].join(' '); + if (!isAnimatableClassName(className)) { + close(); + return runner; + } + + var isStructural = ['enter', 'move', 'leave'].indexOf(event) >= 0; + + // this is a hard disable of all animations for the application or on + // the element itself, therefore there is no need to continue further + // past this point if not enabled + var skipAnimations = !animationsEnabled || disabledElementsLookup.get(node); + var existingAnimation = (!skipAnimations && activeAnimationsLookup.get(node)) || {}; + var hasExistingAnimation = !!existingAnimation.state; + + // there is no point in traversing the same collection of parent ancestors if a followup + // animation will be run on the same element that already did all that checking work + if (!skipAnimations && (!hasExistingAnimation || existingAnimation.state != PRE_DIGEST_STATE)) { + skipAnimations = !areAnimationsAllowed(element, parent, event); + } + + if (skipAnimations) { + close(); + return runner; + } + + if (isStructural) { + closeChildAnimations(element); + } + + var newAnimation = { + structural: isStructural, + element: element, + event: event, + close: close, + options: options, + runner: runner + }; + + if (hasExistingAnimation) { + var skipAnimationFlag = isAllowed('skip', element, newAnimation, existingAnimation); + if (skipAnimationFlag) { + if (existingAnimation.state === RUNNING_STATE) { + close(); + return runner; + } else { + mergeAnimationOptions(element, existingAnimation.options, options); + return existingAnimation.runner; + } + } + + var cancelAnimationFlag = isAllowed('cancel', element, newAnimation, existingAnimation); + if (cancelAnimationFlag) { + if (existingAnimation.state === RUNNING_STATE) { + // this will end the animation right away and it is safe + // to do so since the animation is already running and the + // runner callback code will run in async + existingAnimation.runner.end(); + } else if (existingAnimation.structural) { + // this means that the animation is queued into a digest, but + // hasn't started yet. Therefore it is safe to run the close + // method which will call the runner methods in async. + existingAnimation.close(); + } else { + // this will merge the existing animation options into this new follow-up animation + mergeAnimationOptions(element, newAnimation.options, existingAnimation.options); + } + } else { + // a joined animation means that this animation will take over the existing one + // so an example would involve a leave animation taking over an enter. Then when + // the postDigest kicks in the enter will be ignored. + var joinAnimationFlag = isAllowed('join', element, newAnimation, existingAnimation); + if (joinAnimationFlag) { + if (existingAnimation.state === RUNNING_STATE) { + normalizeAnimationOptions(element, options); + } else { + event = newAnimation.event = existingAnimation.event; + options = mergeAnimationOptions(element, existingAnimation.options, newAnimation.options); + return runner; + } + } + } + } else { + // normalization in this case means that it removes redundant CSS classes that + // already exist (addClass) or do not exist (removeClass) on the element + normalizeAnimationOptions(element, options); + } + + // when the options are merged and cleaned up we may end up not having to do + // an animation at all, therefore we should check this before issuing a post + // digest callback. Structural animations will always run no matter what. + var isValidAnimation = newAnimation.structural; + if (!isValidAnimation) { + // animate (from/to) can be quickly checked first, otherwise we check if any classes are present + isValidAnimation = (newAnimation.event === 'animate' && Object.keys(newAnimation.options.to || {}).length > 0) + || hasAnimationClasses(newAnimation.options); + } + + if (!isValidAnimation) { + close(); + clearElementAnimationState(element); + return runner; + } + + if (isStructural) { + closeParentClassBasedAnimations(parent); + } + + // the counter keeps track of cancelled animations + var counter = (existingAnimation.counter || 0) + 1; + newAnimation.counter = counter; + + markElementAnimationState(element, PRE_DIGEST_STATE, newAnimation); + + $rootScope.$$postDigest(function() { + var animationDetails = activeAnimationsLookup.get(node); + var animationCancelled = !animationDetails; + animationDetails = animationDetails || {}; + + // if addClass/removeClass is called before something like enter then the + // registered parent element may not be present. The code below will ensure + // that a final value for parent element is obtained + var parentElement = element.parent() || []; + + // animate/structural/class-based animations all have requirements. Otherwise there + // is no point in performing an animation. The parent node must also be set. + var isValidAnimation = parentElement.length > 0 + && (animationDetails.event === 'animate' + || animationDetails.structural + || hasAnimationClasses(animationDetails.options)); + + // this means that the previous animation was cancelled + // even if the follow-up animation is the same event + if (animationCancelled || animationDetails.counter !== counter || !isValidAnimation) { + // if another animation did not take over then we need + // to make sure that the domOperation and options are + // handled accordingly + if (animationCancelled) { + applyAnimationClasses(element, options); + applyAnimationStyles(element, options); + } + + // if the event changed from something like enter to leave then we do + // it, otherwise if it's the same then the end result will be the same too + if (animationCancelled || (isStructural && animationDetails.event !== event)) { + options.domOperation(); + runner.end(); + } + + // in the event that the element animation was not cancelled or a follow-up animation + // isn't allowed to animate from here then we need to clear the state of the element + // so that any future animations won't read the expired animation data. + if (!isValidAnimation) { + clearElementAnimationState(element); + } + + return; + } + + // this combined multiple class to addClass / removeClass into a setClass event + // so long as a structural event did not take over the animation + event = !animationDetails.structural && hasAnimationClasses(animationDetails.options, true) + ? 'setClass' + : animationDetails.event; + + if (animationDetails.structural) { + closeParentClassBasedAnimations(parentElement); + } + + markElementAnimationState(element, RUNNING_STATE); + var realRunner = $$animation(element, event, animationDetails.options); + realRunner.done(function(status) { + close(!status); + var animationDetails = activeAnimationsLookup.get(node); + if (animationDetails && animationDetails.counter === counter) { + clearElementAnimationState(getDomNode(element)); + } + notifyProgress(runner, event, 'close', {}); + }); + + // this will update the runner's flow-control events based on + // the `realRunner` object. + runner.setHost(realRunner); + notifyProgress(runner, event, 'start', {}); + }); + + return runner; + + function notifyProgress(runner, event, phase, data) { + triggerCallback(event, element, phase, data); + runner.progress(event, phase, data); + } + + function close(reject) { // jshint ignore:line + applyAnimationClasses(element, options); + applyAnimationStyles(element, options); + options.domOperation(); + runner.complete(!reject); + } + } + + function closeChildAnimations(element) { + var node = getDomNode(element); + var children = node.querySelectorAll('[' + NG_ANIMATE_ATTR_NAME + ']'); + forEach(children, function(child) { + var state = parseInt(child.getAttribute(NG_ANIMATE_ATTR_NAME)); + var animationDetails = activeAnimationsLookup.get(child); + switch (state) { + case RUNNING_STATE: + animationDetails.runner.end(); + /* falls through */ + case PRE_DIGEST_STATE: + if (animationDetails) { + activeAnimationsLookup.remove(child); + } + break; + } + }); + } + + function clearElementAnimationState(element) { + var node = getDomNode(element); + node.removeAttribute(NG_ANIMATE_ATTR_NAME); + activeAnimationsLookup.remove(node); + } + + function isMatchingElement(nodeOrElmA, nodeOrElmB) { + return getDomNode(nodeOrElmA) === getDomNode(nodeOrElmB); + } + + function closeParentClassBasedAnimations(startingElement) { + var parentNode = getDomNode(startingElement); + do { + if (!parentNode || parentNode.nodeType !== ELEMENT_NODE) break; + + var animationDetails = activeAnimationsLookup.get(parentNode); + if (animationDetails) { + examineParentAnimation(parentNode, animationDetails); + } + + parentNode = parentNode.parentNode; + } while (true); + + // since animations are detected from CSS classes, we need to flush all parent + // class-based animations so that the parent classes are all present for child + // animations to properly function (otherwise any CSS selectors may not work) + function examineParentAnimation(node, animationDetails) { + // enter/leave/move always have priority + if (animationDetails.structural || !hasAnimationClasses(animationDetails.options)) return; + + if (animationDetails.state === RUNNING_STATE) { + animationDetails.runner.end(); + } + clearElementAnimationState(node); + } + } + + function areAnimationsAllowed(element, parentElement, event) { + var bodyElementDetected = false; + var rootElementDetected = false; + var parentAnimationDetected = false; + var animateChildren; + + var parentHost = element.data(NG_ANIMATE_PIN_DATA); + if (parentHost) { + parentElement = parentHost; + } + + while (parentElement && parentElement.length) { + if (!rootElementDetected) { + // angular doesn't want to attempt to animate elements outside of the application + // therefore we need to ensure that the rootElement is an ancestor of the current element + rootElementDetected = isMatchingElement(parentElement, $rootElement); + } + + var parentNode = parentElement[0]; + if (parentNode.nodeType !== ELEMENT_NODE) { + // no point in inspecting the #document element + break; + } + + var details = activeAnimationsLookup.get(parentNode) || {}; + // either an enter, leave or move animation will commence + // therefore we can't allow any animations to take place + // but if a parent animation is class-based then that's ok + if (!parentAnimationDetected) { + parentAnimationDetected = details.structural || disabledElementsLookup.get(parentNode); + } + + if (isUndefined(animateChildren) || animateChildren === true) { + var value = parentElement.data(NG_ANIMATE_CHILDREN_DATA); + if (isDefined(value)) { + animateChildren = value; + } + } + + // there is no need to continue traversing at this point + if (parentAnimationDetected && animateChildren === false) break; + + if (!rootElementDetected) { + // angular doesn't want to attempt to animate elements outside of the application + // therefore we need to ensure that the rootElement is an ancestor of the current element + rootElementDetected = isMatchingElement(parentElement, $rootElement); + if (!rootElementDetected) { + parentHost = parentElement.data(NG_ANIMATE_PIN_DATA); + if (parentHost) { + parentElement = parentHost; + } + } + } + + if (!bodyElementDetected) { + // we also need to ensure that the element is or will be apart of the body element + // otherwise it is pointless to even issue an animation to be rendered + bodyElementDetected = isMatchingElement(parentElement, bodyElement); + } + + parentElement = parentElement.parent(); + } + + var allowAnimation = !parentAnimationDetected || animateChildren; + return allowAnimation && rootElementDetected && bodyElementDetected; + } + + function markElementAnimationState(element, state, details) { + details = details || {}; + details.state = state; + + var node = getDomNode(element); + node.setAttribute(NG_ANIMATE_ATTR_NAME, state); + + var oldValue = activeAnimationsLookup.get(node); + var newValue = oldValue + ? extend(oldValue, details) + : details; + activeAnimationsLookup.put(node, newValue); + } + }]; +}]; + +var $$rAFMutexFactory = ['$$rAF', function($$rAF) { + return function() { + var passed = false; + $$rAF(function() { + passed = true; + }); + return function(fn) { + passed ? fn() : $$rAF(fn); + }; + }; +}]; + +var $$AnimateRunnerFactory = ['$q', '$$rAFMutex', function($q, $$rAFMutex) { + var INITIAL_STATE = 0; + var DONE_PENDING_STATE = 1; + var DONE_COMPLETE_STATE = 2; + + AnimateRunner.chain = function(chain, callback) { + var index = 0; + + next(); + function next() { + if (index === chain.length) { + callback(true); + return; + } + + chain[index](function(response) { + if (response === false) { + callback(false); + return; + } + index++; + next(); + }); + } + }; + + AnimateRunner.all = function(runners, callback) { + var count = 0; + var status = true; + forEach(runners, function(runner) { + runner.done(onProgress); + }); + + function onProgress(response) { + status = status && response; + if (++count === runners.length) { + callback(status); + } + } + }; + + function AnimateRunner(host) { + this.setHost(host); + + this._doneCallbacks = []; + this._runInAnimationFrame = $$rAFMutex(); + this._state = 0; + } + + AnimateRunner.prototype = { + setHost: function(host) { + this.host = host || {}; + }, + + done: function(fn) { + if (this._state === DONE_COMPLETE_STATE) { + fn(); + } else { + this._doneCallbacks.push(fn); + } + }, + + progress: noop, + + getPromise: function() { + if (!this.promise) { + var self = this; + this.promise = $q(function(resolve, reject) { + self.done(function(status) { + status === false ? reject() : resolve(); + }); + }); + } + return this.promise; + }, + + then: function(resolveHandler, rejectHandler) { + return this.getPromise().then(resolveHandler, rejectHandler); + }, + + 'catch': function(handler) { + return this.getPromise()['catch'](handler); + }, + + 'finally': function(handler) { + return this.getPromise()['finally'](handler); + }, + + pause: function() { + if (this.host.pause) { + this.host.pause(); + } + }, + + resume: function() { + if (this.host.resume) { + this.host.resume(); + } + }, + + end: function() { + if (this.host.end) { + this.host.end(); + } + this._resolve(true); + }, + + cancel: function() { + if (this.host.cancel) { + this.host.cancel(); + } + this._resolve(false); + }, + + complete: function(response) { + var self = this; + if (self._state === INITIAL_STATE) { + self._state = DONE_PENDING_STATE; + self._runInAnimationFrame(function() { + self._resolve(response); + }); + } + }, + + _resolve: function(response) { + if (this._state !== DONE_COMPLETE_STATE) { + forEach(this._doneCallbacks, function(fn) { + fn(response); + }); + this._doneCallbacks.length = 0; + this._state = DONE_COMPLETE_STATE; + } + } + }; + + return AnimateRunner; +}]; + +var $$AnimationProvider = ['$animateProvider', function($animateProvider) { + var NG_ANIMATE_REF_ATTR = 'ng-animate-ref'; + + var drivers = this.drivers = []; + + var RUNNER_STORAGE_KEY = '$$animationRunner'; + + function setRunner(element, runner) { + element.data(RUNNER_STORAGE_KEY, runner); + } + + function removeRunner(element) { + element.removeData(RUNNER_STORAGE_KEY); + } + + function getRunner(element) { + return element.data(RUNNER_STORAGE_KEY); + } + + this.$get = ['$$jqLite', '$rootScope', '$injector', '$$AnimateRunner', '$$rAFScheduler', + function($$jqLite, $rootScope, $injector, $$AnimateRunner, $$rAFScheduler) { + + var animationQueue = []; + var applyAnimationClasses = applyAnimationClassesFactory($$jqLite); + + var totalPendingClassBasedAnimations = 0; + var totalActiveClassBasedAnimations = 0; + var classBasedAnimationsQueue = []; + + // TODO(matsko): document the signature in a better way + return function(element, event, options) { + options = prepareAnimationOptions(options); + var isStructural = ['enter', 'move', 'leave'].indexOf(event) >= 0; + + // there is no animation at the current moment, however + // these runner methods will get later updated with the + // methods leading into the driver's end/cancel methods + // for now they just stop the animation from starting + var runner = new $$AnimateRunner({ + end: function() { close(); }, + cancel: function() { close(true); } + }); + + if (!drivers.length) { + close(); + return runner; + } + + setRunner(element, runner); + + var classes = mergeClasses(element.attr('class'), mergeClasses(options.addClass, options.removeClass)); + var tempClasses = options.tempClasses; + if (tempClasses) { + classes += ' ' + tempClasses; + options.tempClasses = null; + } + + var classBasedIndex; + if (!isStructural) { + classBasedIndex = totalPendingClassBasedAnimations; + totalPendingClassBasedAnimations += 1; + } + + animationQueue.push({ + // this data is used by the postDigest code and passed into + // the driver step function + element: element, + classes: classes, + event: event, + classBasedIndex: classBasedIndex, + structural: isStructural, + options: options, + beforeStart: beforeStart, + close: close + }); + + element.on('$destroy', handleDestroyedElement); + + // we only want there to be one function called within the post digest + // block. This way we can group animations for all the animations that + // were apart of the same postDigest flush call. + if (animationQueue.length > 1) return runner; + + $rootScope.$$postDigest(function() { + totalActiveClassBasedAnimations = totalPendingClassBasedAnimations; + totalPendingClassBasedAnimations = 0; + classBasedAnimationsQueue.length = 0; + + var animations = []; + forEach(animationQueue, function(entry) { + // the element was destroyed early on which removed the runner + // form its storage. This means we can't animate this element + // at all and it already has been closed due to destruction. + if (getRunner(entry.element)) { + animations.push(entry); + } + }); + + // now any future animations will be in another postDigest + animationQueue.length = 0; + + forEach(groupAnimations(animations), function(animationEntry) { + if (animationEntry.structural) { + triggerAnimationStart(); + } else { + classBasedAnimationsQueue.push({ + node: getDomNode(animationEntry.element), + fn: triggerAnimationStart + }); + + if (animationEntry.classBasedIndex === totalActiveClassBasedAnimations - 1) { + // we need to sort each of the animations in order of parent to child + // relationships. This ensures that the child classes are applied at the + // right time. + classBasedAnimationsQueue = classBasedAnimationsQueue.sort(function(a,b) { + return b.node.contains(a.node); + }).map(function(entry) { + return entry.fn; + }); + + $$rAFScheduler(classBasedAnimationsQueue); + } + } + + function triggerAnimationStart() { + // it's important that we apply the `ng-animate` CSS class and the + // temporary classes before we do any driver invoking since these + // CSS classes may be required for proper CSS detection. + animationEntry.beforeStart(); + + var startAnimationFn, closeFn = animationEntry.close; + + // in the event that the element was removed before the digest runs or + // during the RAF sequencing then we should not trigger the animation. + var targetElement = animationEntry.anchors + ? (animationEntry.from.element || animationEntry.to.element) + : animationEntry.element; + + if (getRunner(targetElement) && getDomNode(targetElement).parentNode) { + var operation = invokeFirstDriver(animationEntry); + if (operation) { + startAnimationFn = operation.start; + } + } + + if (!startAnimationFn) { + closeFn(); + } else { + var animationRunner = startAnimationFn(); + animationRunner.done(function(status) { + closeFn(!status); + }); + updateAnimationRunners(animationEntry, animationRunner); + } + } + }); + }); + + return runner; + + // TODO(matsko): change to reference nodes + function getAnchorNodes(node) { + var SELECTOR = '[' + NG_ANIMATE_REF_ATTR + ']'; + var items = node.hasAttribute(NG_ANIMATE_REF_ATTR) + ? [node] + : node.querySelectorAll(SELECTOR); + var anchors = []; + forEach(items, function(node) { + var attr = node.getAttribute(NG_ANIMATE_REF_ATTR); + if (attr && attr.length) { + anchors.push(node); + } + }); + return anchors; + } + + function groupAnimations(animations) { + var preparedAnimations = []; + var refLookup = {}; + forEach(animations, function(animation, index) { + var element = animation.element; + var node = getDomNode(element); + var event = animation.event; + var enterOrMove = ['enter', 'move'].indexOf(event) >= 0; + var anchorNodes = animation.structural ? getAnchorNodes(node) : []; + + if (anchorNodes.length) { + var direction = enterOrMove ? 'to' : 'from'; + + forEach(anchorNodes, function(anchor) { + var key = anchor.getAttribute(NG_ANIMATE_REF_ATTR); + refLookup[key] = refLookup[key] || {}; + refLookup[key][direction] = { + animationID: index, + element: jqLite(anchor) + }; + }); + } else { + preparedAnimations.push(animation); + } + }); + + var usedIndicesLookup = {}; + var anchorGroups = {}; + forEach(refLookup, function(operations, key) { + var from = operations.from; + var to = operations.to; + + if (!from || !to) { + // only one of these is set therefore we can't have an + // anchor animation since all three pieces are required + var index = from ? from.animationID : to.animationID; + var indexKey = index.toString(); + if (!usedIndicesLookup[indexKey]) { + usedIndicesLookup[indexKey] = true; + preparedAnimations.push(animations[index]); + } + return; + } + + var fromAnimation = animations[from.animationID]; + var toAnimation = animations[to.animationID]; + var lookupKey = from.animationID.toString(); + if (!anchorGroups[lookupKey]) { + var group = anchorGroups[lookupKey] = { + structural: true, + beforeStart: function() { + fromAnimation.beforeStart(); + toAnimation.beforeStart(); + }, + close: function() { + fromAnimation.close(); + toAnimation.close(); + }, + classes: cssClassesIntersection(fromAnimation.classes, toAnimation.classes), + from: fromAnimation, + to: toAnimation, + anchors: [] // TODO(matsko): change to reference nodes + }; + + // the anchor animations require that the from and to elements both have at least + // one shared CSS class which effictively marries the two elements together to use + // the same animation driver and to properly sequence the anchor animation. + if (group.classes.length) { + preparedAnimations.push(group); + } else { + preparedAnimations.push(fromAnimation); + preparedAnimations.push(toAnimation); + } + } + + anchorGroups[lookupKey].anchors.push({ + 'out': from.element, 'in': to.element + }); + }); + + return preparedAnimations; + } + + function cssClassesIntersection(a,b) { + a = a.split(' '); + b = b.split(' '); + var matches = []; + + for (var i = 0; i < a.length; i++) { + var aa = a[i]; + if (aa.substring(0,3) === 'ng-') continue; + + for (var j = 0; j < b.length; j++) { + if (aa === b[j]) { + matches.push(aa); + break; + } + } + } + + return matches.join(' '); + } + + function invokeFirstDriver(animationDetails) { + // we loop in reverse order since the more general drivers (like CSS and JS) + // may attempt more elements, but custom drivers are more particular + for (var i = drivers.length - 1; i >= 0; i--) { + var driverName = drivers[i]; + if (!$injector.has(driverName)) continue; // TODO(matsko): remove this check + + var factory = $injector.get(driverName); + var driver = factory(animationDetails); + if (driver) { + return driver; + } + } + } + + function beforeStart() { + element.addClass(NG_ANIMATE_CLASSNAME); + if (tempClasses) { + $$jqLite.addClass(element, tempClasses); + } + } + + function updateAnimationRunners(animation, newRunner) { + if (animation.from && animation.to) { + update(animation.from.element); + update(animation.to.element); + } else { + update(animation.element); + } + + function update(element) { + getRunner(element).setHost(newRunner); + } + } + + function handleDestroyedElement() { + var runner = getRunner(element); + if (runner && (event !== 'leave' || !options.$$domOperationFired)) { + runner.end(); + } + } + + function close(rejected) { // jshint ignore:line + element.off('$destroy', handleDestroyedElement); + removeRunner(element); + + applyAnimationClasses(element, options); + applyAnimationStyles(element, options); + options.domOperation(); + + if (tempClasses) { + $$jqLite.removeClass(element, tempClasses); + } + + element.removeClass(NG_ANIMATE_CLASSNAME); + runner.complete(!rejected); + } + }; + }]; +}]; + +/* global angularAnimateModule: true, + + $$rAFMutexFactory, + $$rAFSchedulerFactory, + $$AnimateChildrenDirective, + $$AnimateRunnerFactory, + $$AnimateQueueProvider, + $$AnimationProvider, + $AnimateCssProvider, + $$AnimateCssDriverProvider, + $$AnimateJsProvider, + $$AnimateJsDriverProvider, +*/ + +/** + * @ngdoc module + * @name ngAnimate + * @description + * + * The `ngAnimate` module provides support for CSS-based animations (keyframes and transitions) as well as JavaScript-based animations via + * callback hooks. Animations are not enabled by default, however, by including `ngAnimate` then the animation hooks are enabled for an Angular app. + * + *
    + * + * # Usage + * Simply put, there are two ways to make use of animations when ngAnimate is used: by using **CSS** and **JavaScript**. The former works purely based + * using CSS (by using matching CSS selectors/styles) and the latter triggers animations that are registered via `module.animation()`. For + * both CSS and JS animations the sole requirement is to have a matching `CSS class` that exists both in the registered animation and within + * the HTML element that the animation will be triggered on. + * + * ## Directive Support + * The following directives are "animation aware": + * + * | Directive | Supported Animations | + * |----------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------| + * | {@link ng.directive:ngRepeat#animations ngRepeat} | enter, leave and move | + * | {@link ngRoute.directive:ngView#animations ngView} | enter and leave | + * | {@link ng.directive:ngInclude#animations ngInclude} | enter and leave | + * | {@link ng.directive:ngSwitch#animations ngSwitch} | enter and leave | + * | {@link ng.directive:ngIf#animations ngIf} | enter and leave | + * | {@link ng.directive:ngClass#animations ngClass} | add and remove (the CSS class(es) present) | + * | {@link ng.directive:ngShow#animations ngShow} & {@link ng.directive:ngHide#animations ngHide} | add and remove (the ng-hide class value) | + * | {@link ng.directive:form#animation-hooks form} & {@link ng.directive:ngModel#animation-hooks ngModel} | add and remove (dirty, pristine, valid, invalid & all other validations) | + * | {@link module:ngMessages#animations ngMessages} | add and remove (ng-active & ng-inactive) | + * | {@link module:ngMessages#animations ngMessage} | enter and leave | + * + * (More information can be found by visiting each the documentation associated with each directive.) + * + * ## CSS-based Animations + * + * CSS-based animations with ngAnimate are unique since they require no JavaScript code at all. By using a CSS class that we reference between our HTML + * and CSS code we can create an animation that will be picked up by Angular when an the underlying directive performs an operation. + * + * The example below shows how an `enter` animation can be made possible on a element using `ng-if`: + * + * ```html + *
    + * Fade me in out + *
    + * + * + * ``` + * + * Notice the CSS class **fade**? We can now create the CSS transition code that references this class: + * + * ```css + * /* The starting CSS styles for the enter animation */ + * .fade.ng-enter { + * transition:0.5s linear all; + * opacity:0; + * } + * + * /* The finishing CSS styles for the enter animation */ + * .fade.ng-enter.ng-enter-active { + * opacity:1; + * } + * ``` + * + * The key thing to remember here is that, depending on the animation event (which each of the directives above trigger depending on what's going on) two + * generated CSS classes will be applied to the element; in the example above we have `.ng-enter` and `.ng-enter-active`. For CSS transitions, the transition + * code **must** be defined within the starting CSS class (in this case `.ng-enter`). The destination class is what the transition will animate towards. + * + * If for example we wanted to create animations for `leave` and `move` (ngRepeat triggers move) then we can do so using the same CSS naming conventions: + * + * ```css + * /* now the element will fade out before it is removed from the DOM */ + * .fade.ng-leave { + * transition:0.5s linear all; + * opacity:1; + * } + * .fade.ng-leave.ng-leave-active { + * opacity:0; + * } + * ``` + * + * We can also make use of **CSS Keyframes** by referencing the keyframe animation within the starting CSS class: + * + * ```css + * /* there is no need to define anything inside of the destination + * CSS class since the keyframe will take charge of the animation */ + * .fade.ng-leave { + * animation: my_fade_animation 0.5s linear; + * -webkit-animation: my_fade_animation 0.5s linear; + * } + * + * @keyframes my_fade_animation { + * from { opacity:1; } + * to { opacity:0; } + * } + * + * @-webkit-keyframes my_fade_animation { + * from { opacity:1; } + * to { opacity:0; } + * } + * ``` + * + * Feel free also mix transitions and keyframes together as well as any other CSS classes on the same element. + * + * ### CSS Class-based Animations + * + * Class-based animations (animations that are triggered via `ngClass`, `ngShow`, `ngHide` and some other directives) have a slightly different + * naming convention. Class-based animations are basic enough that a standard transition or keyframe can be referenced on the class being added + * and removed. + * + * For example if we wanted to do a CSS animation for `ngHide` then we place an animation on the `.ng-hide` CSS class: + * + * ```html + *
    + * Show and hide me + *
    + * + * + * + * ``` + * + * All that is going on here with ngShow/ngHide behind the scenes is the `.ng-hide` class is added/removed (when the hidden state is valid). Since + * ngShow and ngHide are animation aware then we can match up a transition and ngAnimate handles the rest. + * + * In addition the addition and removal of the CSS class, ngAnimate also provides two helper methods that we can use to further decorate the animation + * with CSS styles. + * + * ```html + *
    + * Highlight this box + *
    + * + * + * + * ``` + * + * We can also make use of CSS keyframes by placing them within the CSS classes. + * + * + * ### CSS Staggering Animations + * A Staggering animation is a collection of animations that are issued with a slight delay in between each successive operation resulting in a + * curtain-like effect. The ngAnimate module (versions >=1.2) supports staggering animations and the stagger effect can be + * performed by creating a **ng-EVENT-stagger** CSS class and attaching that class to the base CSS class used for + * the animation. The style property expected within the stagger class can either be a **transition-delay** or an + * **animation-delay** property (or both if your animation contains both transitions and keyframe animations). + * + * ```css + * .my-animation.ng-enter { + * /* standard transition code */ + * transition: 1s linear all; + * opacity:0; + * } + * .my-animation.ng-enter-stagger { + * /* this will have a 100ms delay between each successive leave animation */ + * transition-delay: 0.1s; + * + * /* in case the stagger doesn't work then the duration value + * must be set to 0 to avoid an accidental CSS inheritance */ + * transition-duration: 0s; + * } + * .my-animation.ng-enter.ng-enter-active { + * /* standard transition styles */ + * opacity:1; + * } + * ``` + * + * Staggering animations work by default in ngRepeat (so long as the CSS class is defined). Outside of ngRepeat, to use staggering animations + * on your own, they can be triggered by firing multiple calls to the same event on $animate. However, the restrictions surrounding this + * are that each of the elements must have the same CSS className value as well as the same parent element. A stagger operation + * will also be reset if one or more animation frames have passed since the multiple calls to `$animate` were fired. + * + * The following code will issue the **ng-leave-stagger** event on the element provided: + * + * ```js + * var kids = parent.children(); + * + * $animate.leave(kids[0]); //stagger index=0 + * $animate.leave(kids[1]); //stagger index=1 + * $animate.leave(kids[2]); //stagger index=2 + * $animate.leave(kids[3]); //stagger index=3 + * $animate.leave(kids[4]); //stagger index=4 + * + * window.requestAnimationFrame(function() { + * //stagger has reset itself + * $animate.leave(kids[5]); //stagger index=0 + * $animate.leave(kids[6]); //stagger index=1 + * + * $scope.$digest(); + * }); + * ``` + * + * Stagger animations are currently only supported within CSS-defined animations. + * + * ### The `ng-animate` CSS class + * + * When ngAnimate is animating an element it will apply the `ng-animate` CSS class to the element for the duration of the animation. + * This is a temporary CSS class and it will be removed once the animation is over (for both JavaScript and CSS-based animations). + * + * Therefore, animations can be applied to an element using this temporary class directly via CSS. + * + * ```css + * .zipper.ng-animate { + * transition:0.5s linear all; + * } + * .zipper.ng-enter { + * opacity:0; + * } + * .zipper.ng-enter.ng-enter-active { + * opacity:1; + * } + * .zipper.ng-leave { + * opacity:1; + * } + * .zipper.ng-leave.ng-leave-active { + * opacity:0; + * } + * ``` + * + * (Note that the `ng-animate` CSS class is reserved and it cannot be applied on an element directly since ngAnimate will always remove + * the CSS class once an animation has completed.) + * + * + * ## JavaScript-based Animations + * + * ngAnimate also allows for animations to be consumed by JavaScript code. The approach is similar to CSS-based animations (where there is a shared + * CSS class that is referenced in our HTML code) but in addition we need to register the JavaScript animation on the module. By making use of the + * `module.animation()` module function we can register the ainmation. + * + * Let's see an example of a enter/leave animation using `ngRepeat`: + * + * ```html + *
    + * {{ item }} + *
    + * ``` + * + * See the **slide** CSS class? Let's use that class to define an animation that we'll structure in our module code by using `module.animation`: + * + * ```js + * myModule.animation('.slide', [function() { + * return { + * // make note that other events (like addClass/removeClass) + * // have different function input parameters + * enter: function(element, doneFn) { + * jQuery(element).fadeIn(1000, doneFn); + * + * // remember to call doneFn so that angular + * // knows that the animation has concluded + * }, + * + * move: function(element, doneFn) { + * jQuery(element).fadeIn(1000, doneFn); + * }, + * + * leave: function(element, doneFn) { + * jQuery(element).fadeOut(1000, doneFn); + * } + * } + * }] + * ``` + * + * The nice thing about JS-based animations is that we can inject other services and make use of advanced animation libraries such as + * greensock.js and velocity.js. + * + * If our animation code class-based (meaning that something like `ngClass`, `ngHide` and `ngShow` triggers it) then we can still define + * our animations inside of the same registered animation, however, the function input arguments are a bit different: + * + * ```html + *
    + * this box is moody + *
    + * + * + * + * ``` + * + * ```js + * myModule.animation('.colorful', [function() { + * return { + * addClass: function(element, className, doneFn) { + * // do some cool animation and call the doneFn + * }, + * removeClass: function(element, className, doneFn) { + * // do some cool animation and call the doneFn + * }, + * setClass: function(element, addedClass, removedClass, doneFn) { + * // do some cool animation and call the doneFn + * } + * } + * }] + * ``` + * + * ## CSS + JS Animations Together + * + * AngularJS 1.4 and higher has taken steps to make the amalgamation of CSS and JS animations more flexible. However, unlike earlier versions of Angular, + * defining CSS and JS animations to work off of the same CSS class will not work anymore. Therefore the example below will only result in **JS animations taking + * charge of the animation**: + * + * ```html + *
    + * Slide in and out + *
    + * ``` + * + * ```js + * myModule.animation('.slide', [function() { + * return { + * enter: function(element, doneFn) { + * jQuery(element).slideIn(1000, doneFn); + * } + * } + * }] + * ``` + * + * ```css + * .slide.ng-enter { + * transition:0.5s linear all; + * transform:translateY(-100px); + * } + * .slide.ng-enter.ng-enter-active { + * transform:translateY(0); + * } + * ``` + * + * Does this mean that CSS and JS animations cannot be used together? Do JS-based animations always have higher priority? We can make up for the + * lack of CSS animations by using the `$animateCss` service to trigger our own tweaked-out, CSS-based animations directly from + * our own JS-based animation code: + * + * ```js + * myModule.animation('.slide', ['$animateCss', function($animateCss) { + * return { + * enter: function(element, doneFn) { +* // this will trigger `.slide.ng-enter` and `.slide.ng-enter-active`. + * var runner = $animateCss(element, { + * event: 'enter', + * structural: true + * }).start(); +* runner.done(doneFn); + * } + * } + * }] + * ``` + * + * The nice thing here is that we can save bandwidth by sticking to our CSS-based animation code and we don't need to rely on a 3rd-party animation framework. + * + * The `$animateCss` service is very powerful since we can feed in all kinds of extra properties that will be evaluated and fed into a CSS transition or + * keyframe animation. For example if we wanted to animate the height of an element while adding and removing classes then we can do so by providing that + * data into `$animateCss` directly: + * + * ```js + * myModule.animation('.slide', ['$animateCss', function($animateCss) { + * return { + * enter: function(element, doneFn) { + * var runner = $animateCss(element, { + * event: 'enter', + * addClass: 'maroon-setting', + * from: { height:0 }, + * to: { height: 200 } + * }).start(); + * + * runner.done(doneFn); + * } + * } + * }] + * ``` + * + * Now we can fill in the rest via our transition CSS code: + * + * ```css + * /* the transition tells ngAnimate to make the animation happen */ + * .slide.ng-enter { transition:0.5s linear all; } + * + * /* this extra CSS class will be absorbed into the transition + * since the $animateCss code is adding the class */ + * .maroon-setting { background:red; } + * ``` + * + * And `$animateCss` will figure out the rest. Just make sure to have the `done()` callback fire the `doneFn` function to signal when the animation is over. + * + * To learn more about what's possible be sure to visit the {@link ngAnimate.$animateCss $animateCss service}. + * + * ## Animation Anchoring (via `ng-animate-ref`) + * + * ngAnimate in AngularJS 1.4 comes packed with the ability to cross-animate elements between + * structural areas of an application (like views) by pairing up elements using an attribute + * called `ng-animate-ref`. + * + * Let's say for example we have two views that are managed by `ng-view` and we want to show + * that there is a relationship between two components situated in within these views. By using the + * `ng-animate-ref` attribute we can identify that the two components are paired together and we + * can then attach an animation, which is triggered when the view changes. + * + * Say for example we have the following template code: + * + * ```html + * + *
    + *
    + * + * + * + * + * + * + * + * + * ``` + * + * Now, when the view changes (once the link is clicked), ngAnimate will examine the + * HTML contents to see if there is a match reference between any components in the view + * that is leaving and the view that is entering. It will scan both the view which is being + * removed (leave) and inserted (enter) to see if there are any paired DOM elements that + * contain a matching ref value. + * + * The two images match since they share the same ref value. ngAnimate will now create a + * transport element (which is a clone of the first image element) and it will then attempt + * to animate to the position of the second image element in the next view. For the animation to + * work a special CSS class called `ng-anchor` will be added to the transported element. + * + * We can now attach a transition onto the `.banner.ng-anchor` CSS class and then + * ngAnimate will handle the entire transition for us as well as the addition and removal of + * any changes of CSS classes between the elements: + * + * ```css + * .banner.ng-anchor { + * /* this animation will last for 1 second since there are + * two phases to the animation (an `in` and an `out` phase) */ + * transition:0.5s linear all; + * } + * ``` + * + * We also **must** include animations for the views that are being entered and removed + * (otherwise anchoring wouldn't be possible since the new view would be inserted right away). + * + * ```css + * .view-animation.ng-enter, .view-animation.ng-leave { + * transition:0.5s linear all; + * position:fixed; + * left:0; + * top:0; + * width:100%; + * } + * .view-animation.ng-enter { + * transform:translateX(100%); + * } + * .view-animation.ng-leave, + * .view-animation.ng-enter.ng-enter-active { + * transform:translateX(0%); + * } + * .view-animation.ng-leave.ng-leave-active { + * transform:translateX(-100%); + * } + * ``` + * + * Now we can jump back to the anchor animation. When the animation happens, there are two stages that occur: + * an `out` and an `in` stage. The `out` stage happens first and that is when the element is animated away + * from its origin. Once that animation is over then the `in` stage occurs which animates the + * element to its destination. The reason why there are two animations is to give enough time + * for the enter animation on the new element to be ready. + * + * The example above sets up a transition for both the in and out phases, but we can also target the out or + * in phases directly via `ng-anchor-out` and `ng-anchor-in`. + * + * ```css + * .banner.ng-anchor-out { + * transition: 0.5s linear all; + * + * /* the scale will be applied during the out animation, + * but will be animated away when the in animation runs */ + * transform: scale(1.2); + * } + * + * .banner.ng-anchor-in { + * transition: 1s linear all; + * } + * ``` + * + * + * + * + * ### Anchoring Demo + * + + + Home +
    +
    +
    +
    +     + + angular.module('anchoringExample', ['ngAnimate', 'ngRoute']) + .config(['$routeProvider', function($routeProvider) { + $routeProvider.when('/', { + templateUrl: 'home.html', + controller: 'HomeController as home' + }); + $routeProvider.when('/profile/:id', { + templateUrl: 'profile.html', + controller: 'ProfileController as profile' + }); + }]) + .run(['$rootScope', function($rootScope) { + $rootScope.records = [ + { id:1, title: "Miss Beulah Roob" }, + { id:2, title: "Trent Morissette" }, + { id:3, title: "Miss Ava Pouros" }, + { id:4, title: "Rod Pouros" }, + { id:5, title: "Abdul Rice" }, + { id:6, title: "Laurie Rutherford Sr." }, + { id:7, title: "Nakia McLaughlin" }, + { id:8, title: "Jordon Blanda DVM" }, + { id:9, title: "Rhoda Hand" }, + { id:10, title: "Alexandrea Sauer" } + ]; + }]) + .controller('HomeController', [function() { + //empty + }]) + .controller('ProfileController', ['$rootScope', '$routeParams', function($rootScope, $routeParams) { + var index = parseInt($routeParams.id, 10); + var record = $rootScope.records[index - 1]; + + this.title = record.title; + this.id = record.id; + }]); + + +

    Welcome to the home page

    +

    Please click on an element

    + + {{ record.title }} + +     + +
    + {{ profile.title }} +
    +     + + .record { + display:block; + font-size:20px; + } + .profile { + background:black; + color:white; + font-size:100px; + } + .view-container { + position:relative; + } + .view-container > .view.ng-animate { + position:absolute; + top:0; + left:0; + width:100%; + min-height:500px; + } + .view.ng-enter, .view.ng-leave, + .record.ng-anchor { + transition:0.5s linear all; + } + .view.ng-enter { + transform:translateX(100%); + } + .view.ng-enter.ng-enter-active, .view.ng-leave { + transform:translateX(0%); + } + .view.ng-leave.ng-leave-active { + transform:translateX(-100%); + } + .record.ng-anchor-out { + background:red; + } + +     + * + * ### How is the element transported? + * + * When an anchor animation occurs, ngAnimate will clone the starting element and position it exactly where the starting + * element is located on screen via absolute positioning. The cloned element will be placed inside of the root element + * of the application (where ng-app was defined) and all of the CSS classes of the starting element will be applied. The + * element will then animate into the `out` and `in` animations and will eventually reach the coordinates and match + * the dimensions of the destination element. During the entire animation a CSS class of `.ng-animate-shim` will be applied + * to both the starting and destination elements in order to hide them from being visible (the CSS styling for the class + * is: `visibility:hidden`). Once the anchor reaches its destination then it will be removed and the destination element + * will become visible since the shim class will be removed. + * + * ### How is the morphing handled? + * + * CSS Anchoring relies on transitions and keyframes and the internal code is intelligent enough to figure out + * what CSS classes differ between the starting element and the destination element. These different CSS classes + * will be added/removed on the anchor element and a transition will be applied (the transition that is provided + * in the anchor class). Long story short, ngAnimate will figure out what classes to add and remove which will + * make the transition of the element as smooth and automatic as possible. Be sure to use simple CSS classes that + * do not rely on DOM nesting structure so that the anchor element appears the same as the starting element (since + * the cloned element is placed inside of root element which is likely close to the body element). + * + * Note that if the root element is on the `` element then the cloned node will be placed inside of body. + * + * + * ## Using $animate in your directive code + * + * So far we've explored how to feed in animations into an Angular application, but how do we trigger animations within our own directives in our application? + * By injecting the `$animate` service into our directive code, we can trigger structural and class-based hooks which can then be consumed by animations. Let's + * imagine we have a greeting box that shows and hides itself when the data changes + * + * ```html + * Hi there + * ``` + * + * ```js + * ngModule.directive('greetingBox', ['$animate', function($animate) { + * return function(scope, element, attrs) { + * attrs.$observe('active', function(value) { + * value ? $animate.addClass(element, 'on') : $animate.removeClass(element, 'on'); + * }); + * }); + * }]); + * ``` + * + * Now the `on` CSS class is added and removed on the greeting box component. Now if we add a CSS class on top of the greeting box element + * in our HTML code then we can trigger a CSS or JS animation to happen. + * + * ```css + * /* normally we would create a CSS class to reference on the element */ + * greeting-box.on { transition:0.5s linear all; background:green; color:white; } + * ``` + * + * The `$animate` service contains a variety of other methods like `enter`, `leave`, `animate` and `setClass`. To learn more about what's + * possible be sure to visit the {@link ng.$animate $animate service API page}. + * + * + * ### Preventing Collisions With Third Party Libraries + * + * Some third-party frameworks place animation duration defaults across many element or className + * selectors in order to make their code small and reuseable. This can lead to issues with ngAnimate, which + * is expecting actual animations on these elements and has to wait for their completion. + * + * You can prevent this unwanted behavior by using a prefix on all your animation classes: + * + * ```css + * /* prefixed with animate- */ + * .animate-fade-add.animate-fade-add-active { + * transition:1s linear all; + * opacity:0; + * } + * ``` + * + * You then configure `$animate` to enforce this prefix: + * + * ```js + * $animateProvider.classNameFilter(/animate-/); + * ``` + * + * This also may provide your application with a speed boost since only specific elements containing CSS class prefix + * will be evaluated for animation when any DOM changes occur in the application. + * + * ## Callbacks and Promises + * + * When `$animate` is called it returns a promise that can be used to capture when the animation has ended. Therefore if we were to trigger + * an animation (within our directive code) then we can continue performing directive and scope related activities after the animation has + * ended by chaining onto the returned promise that animation method returns. + * + * ```js + * // somewhere within the depths of the directive + * $animate.enter(element, parent).then(function() { + * //the animation has completed + * }); + * ``` + * + * (Note that earlier versions of Angular prior to v1.4 required the promise code to be wrapped using `$scope.$apply(...)`. This is not the case + * anymore.) + * + * In addition to the animation promise, we can also make use of animation-related callbacks within our directives and controller code by registering + * an event listener using the `$animate` service. Let's say for example that an animation was triggered on our view + * routing controller to hook into that: + * + * ```js + * ngModule.controller('HomePageController', ['$animate', function($animate) { + * $animate.on('enter', ngViewElement, function(element) { + * // the animation for this route has completed + * }]); + * }]) + * ``` + * + * (Note that you will need to trigger a digest within the callback to get angular to notice any scope-related changes.) + */ + +/** + * @ngdoc service + * @name $animate + * @kind object + * + * @description + * The ngAnimate `$animate` service documentation is the same for the core `$animate` service. + * + * Click here {@link ng.$animate $animate to learn more about animations with `$animate`}. + */ +angular.module('ngAnimate', []) + .directive('ngAnimateChildren', $$AnimateChildrenDirective) + + .factory('$$rAFMutex', $$rAFMutexFactory) + .factory('$$rAFScheduler', $$rAFSchedulerFactory) + + .factory('$$AnimateRunner', $$AnimateRunnerFactory) + + .provider('$$animateQueue', $$AnimateQueueProvider) + .provider('$$animation', $$AnimationProvider) + + .provider('$animateCss', $AnimateCssProvider) + .provider('$$animateCssDriver', $$AnimateCssDriverProvider) + + .provider('$$animateJs', $$AnimateJsProvider) + .provider('$$animateJsDriver', $$AnimateJsDriverProvider); + + +})(window, window.angular); diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/angular-cookies-1.4.js b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/angular-cookies-1.4.js new file mode 100755 index 000000000..665630d24 --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/angular-cookies-1.4.js @@ -0,0 +1,320 @@ +/** + * @license AngularJS v1.4.0 + * (c) 2010-2015 Google, Inc. http://angularjs.org + * License: MIT + */ +(function(window, angular, undefined) {'use strict'; + +/** + * @ngdoc module + * @name ngCookies + * @description + * + * # ngCookies + * + * The `ngCookies` module provides a convenient wrapper for reading and writing browser cookies. + * + * + *
    + * + * See {@link ngCookies.$cookies `$cookies`} and + * {@link ngCookies.$cookieStore `$cookieStore`} for usage. + */ + + +angular.module('ngCookies', ['ng']). + /** + * @ngdoc provider + * @name $cookiesProvider + * @description + * Use `$cookiesProvider` to change the default behavior of the {@link ngCookies.$cookies $cookies} service. + * */ + provider('$cookies', [function $CookiesProvider() { + /** + * @ngdoc property + * @name $cookiesProvider#defaults + * @description + * + * Object containing default options to pass when setting cookies. + * + * The object may have following properties: + * + * - **path** - `{string}` - The cookie will be available only for this path and its + * sub-paths. By default, this would be the URL that appears in your base tag. + * - **domain** - `{string}` - The cookie will be available only for this domain and + * its sub-domains. For obvious security reasons the user agent will not accept the + * cookie if the current domain is not a sub domain or equals to the requested domain. + * - **expires** - `{string|Date}` - String of the form "Wdy, DD Mon YYYY HH:MM:SS GMT" + * or a Date object indicating the exact date/time this cookie will expire. + * - **secure** - `{boolean}` - The cookie will be available only in secured connection. + * + * Note: by default the address that appears in your tag will be used as path. + * This is import so that cookies will be visible for all routes in case html5mode is enabled + * + **/ + var defaults = this.defaults = {}; + + function calcOptions(options) { + return options ? angular.extend({}, defaults, options) : defaults; + } + + /** + * @ngdoc service + * @name $cookies + * + * @description + * Provides read/write access to browser's cookies. + * + * BREAKING CHANGE: `$cookies` no longer exposes properties that represent the + * current browser cookie values. Now you must use the get/put/remove/etc. methods + * as described below. + * + * Requires the {@link ngCookies `ngCookies`} module to be installed. + * + * @example + * + * ```js + * angular.module('cookiesExample', ['ngCookies']) + * .controller('ExampleController', ['$cookies', function($cookies) { + * // Retrieving a cookie + * var favoriteCookie = $cookies.get('myFavorite'); + * // Setting a cookie + * $cookies.put('myFavorite', 'oatmeal'); + * }]); + * ``` + */ + this.$get = ['$$cookieReader', '$$cookieWriter', function($$cookieReader, $$cookieWriter) { + return { + /** + * @ngdoc method + * @name $cookies#get + * + * @description + * Returns the value of given cookie key + * + * @param {string} key Id to use for lookup. + * @returns {string} Raw cookie value. + */ + get: function(key) { + return $$cookieReader()[key]; + }, + + /** + * @ngdoc method + * @name $cookies#getObject + * + * @description + * Returns the deserialized value of given cookie key + * + * @param {string} key Id to use for lookup. + * @returns {Object} Deserialized cookie value. + */ + getObject: function(key) { + var value = this.get(key); + return value ? angular.fromJson(value) : value; + }, + + /** + * @ngdoc method + * @name $cookies#getAll + * + * @description + * Returns a key value object with all the cookies + * + * @returns {Object} All cookies + */ + getAll: function() { + return $$cookieReader(); + }, + + /** + * @ngdoc method + * @name $cookies#put + * + * @description + * Sets a value for given cookie key + * + * @param {string} key Id for the `value`. + * @param {string} value Raw value to be stored. + * @param {Object=} options Options object. + * See {@link ngCookies.$cookiesProvider#defaults $cookiesProvider.defaults} + */ + put: function(key, value, options) { + $$cookieWriter(key, value, calcOptions(options)); + }, + + /** + * @ngdoc method + * @name $cookies#putObject + * + * @description + * Serializes and sets a value for given cookie key + * + * @param {string} key Id for the `value`. + * @param {Object} value Value to be stored. + * @param {Object=} options Options object. + * See {@link ngCookies.$cookiesProvider#defaults $cookiesProvider.defaults} + */ + putObject: function(key, value, options) { + this.put(key, angular.toJson(value), options); + }, + + /** + * @ngdoc method + * @name $cookies#remove + * + * @description + * Remove given cookie + * + * @param {string} key Id of the key-value pair to delete. + * @param {Object=} options Options object. + * See {@link ngCookies.$cookiesProvider#defaults $cookiesProvider.defaults} + */ + remove: function(key, options) { + $$cookieWriter(key, undefined, calcOptions(options)); + } + }; + }]; + }]); + +angular.module('ngCookies'). +/** + * @ngdoc service + * @name $cookieStore + * @deprecated + * @requires $cookies + * + * @description + * Provides a key-value (string-object) storage, that is backed by session cookies. + * Objects put or retrieved from this storage are automatically serialized or + * deserialized by angular's toJson/fromJson. + * + * Requires the {@link ngCookies `ngCookies`} module to be installed. + * + *
    + * **Note:** The $cookieStore service is deprecated. + * Please use the {@link ngCookies.$cookies `$cookies`} service instead. + *
    + * + * @example + * + * ```js + * angular.module('cookieStoreExample', ['ngCookies']) + * .controller('ExampleController', ['$cookieStore', function($cookieStore) { + * // Put cookie + * $cookieStore.put('myFavorite','oatmeal'); + * // Get cookie + * var favoriteCookie = $cookieStore.get('myFavorite'); + * // Removing a cookie + * $cookieStore.remove('myFavorite'); + * }]); + * ``` + */ + factory('$cookieStore', ['$cookies', function($cookies) { + + return { + /** + * @ngdoc method + * @name $cookieStore#get + * + * @description + * Returns the value of given cookie key + * + * @param {string} key Id to use for lookup. + * @returns {Object} Deserialized cookie value, undefined if the cookie does not exist. + */ + get: function(key) { + return $cookies.getObject(key); + }, + + /** + * @ngdoc method + * @name $cookieStore#put + * + * @description + * Sets a value for given cookie key + * + * @param {string} key Id for the `value`. + * @param {Object} value Value to be stored. + */ + put: function(key, value) { + $cookies.putObject(key, value); + }, + + /** + * @ngdoc method + * @name $cookieStore#remove + * + * @description + * Remove given cookie + * + * @param {string} key Id of the key-value pair to delete. + */ + remove: function(key) { + $cookies.remove(key); + } + }; + + }]); + +/** + * @name $$cookieWriter + * @requires $document + * + * @description + * This is a private service for writing cookies + * + * @param {string} name Cookie name + * @param {string=} value Cookie value (if undefined, cookie will be deleted) + * @param {Object=} options Object with options that need to be stored for the cookie. + */ +function $$CookieWriter($document, $log, $browser) { + var cookiePath = $browser.baseHref(); + var rawDocument = $document[0]; + + function buildCookieString(name, value, options) { + var path, expires; + options = options || {}; + expires = options.expires; + path = angular.isDefined(options.path) ? options.path : cookiePath; + if (value === undefined) { + expires = 'Thu, 01 Jan 1970 00:00:00 GMT'; + value = ''; + } + if (angular.isString(expires)) { + expires = new Date(expires); + } + + var str = encodeURIComponent(name) + '=' + encodeURIComponent(value); + str += path ? ';path=' + path : ''; + str += options.domain ? ';domain=' + options.domain : ''; + str += expires ? ';expires=' + expires.toUTCString() : ''; + str += options.secure ? ';secure' : ''; + + // per http://www.ietf.org/rfc/rfc2109.txt browser must allow at minimum: + // - 300 cookies + // - 20 cookies per unique domain + // - 4096 bytes per cookie + var cookieLength = str.length + 1; + if (cookieLength > 4096) { + $log.warn("Cookie '" + name + + "' possibly not set or overflowed because it was too large (" + + cookieLength + " > 4096 bytes)!"); + } + + return str; + } + + return function(name, value, options) { + rawDocument.cookie = buildCookieString(name, value, options); + }; +} + +$$CookieWriter.$inject = ['$document', '$log', '$browser']; + +angular.module('ngCookies').provider('$$cookieWriter', function $$CookieWriterProvider() { + this.$get = $$CookieWriter; +}); + + +})(window, window.angular); diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/angular-cookies.js b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/angular-cookies.js new file mode 100755 index 000000000..c5d7e4d07 --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/angular-cookies.js @@ -0,0 +1,206 @@ +/** + * @license AngularJS v1.2.25 + * (c) 2010-2014 Google, Inc. http://angularjs.org + * License: MIT + */ +(function(window, angular, undefined) {'use strict'; + +/** + * @ngdoc module + * @name ngCookies + * @description + * + * # ngCookies + * + * The `ngCookies` module provides a convenient wrapper for reading and writing browser cookies. + * + * + *
    + * + * See {@link ngCookies.$cookies `$cookies`} and + * {@link ngCookies.$cookieStore `$cookieStore`} for usage. + */ + + +angular.module('ngCookies', ['ng']). + /** + * @ngdoc service + * @name $cookies + * + * @description + * Provides read/write access to browser's cookies. + * + * Only a simple Object is exposed and by adding or removing properties to/from this object, new + * cookies are created/deleted at the end of current $eval. + * The object's properties can only be strings. + * + * Requires the {@link ngCookies `ngCookies`} module to be installed. + * + * @example + * + * ```js + * angular.module('cookiesExample', ['ngCookies']) + * .controller('ExampleController', ['$cookies', function($cookies) { + * // Retrieving a cookie + * var favoriteCookie = $cookies.myFavorite; + * // Setting a cookie + * $cookies.myFavorite = 'oatmeal'; + * }]); + * ``` + */ + factory('$cookies', ['$rootScope', '$browser', function ($rootScope, $browser) { + var cookies = {}, + lastCookies = {}, + lastBrowserCookies, + runEval = false, + copy = angular.copy, + isUndefined = angular.isUndefined; + + //creates a poller fn that copies all cookies from the $browser to service & inits the service + $browser.addPollFn(function() { + var currentCookies = $browser.cookies(); + if (lastBrowserCookies != currentCookies) { //relies on browser.cookies() impl + lastBrowserCookies = currentCookies; + copy(currentCookies, lastCookies); + copy(currentCookies, cookies); + if (runEval) $rootScope.$apply(); + } + })(); + + runEval = true; + + //at the end of each eval, push cookies + //TODO: this should happen before the "delayed" watches fire, because if some cookies are not + // strings or browser refuses to store some cookies, we update the model in the push fn. + $rootScope.$watch(push); + + return cookies; + + + /** + * Pushes all the cookies from the service to the browser and verifies if all cookies were + * stored. + */ + function push() { + var name, + value, + browserCookies, + updated; + + //delete any cookies deleted in $cookies + for (name in lastCookies) { + if (isUndefined(cookies[name])) { + $browser.cookies(name, undefined); + } + } + + //update all cookies updated in $cookies + for(name in cookies) { + value = cookies[name]; + if (!angular.isString(value)) { + value = '' + value; + cookies[name] = value; + } + if (value !== lastCookies[name]) { + $browser.cookies(name, value); + updated = true; + } + } + + //verify what was actually stored + if (updated){ + updated = false; + browserCookies = $browser.cookies(); + + for (name in cookies) { + if (cookies[name] !== browserCookies[name]) { + //delete or reset all cookies that the browser dropped from $cookies + if (isUndefined(browserCookies[name])) { + delete cookies[name]; + } else { + cookies[name] = browserCookies[name]; + } + updated = true; + } + } + } + } + }]). + + + /** + * @ngdoc service + * @name $cookieStore + * @requires $cookies + * + * @description + * Provides a key-value (string-object) storage, that is backed by session cookies. + * Objects put or retrieved from this storage are automatically serialized or + * deserialized by angular's toJson/fromJson. + * + * Requires the {@link ngCookies `ngCookies`} module to be installed. + * + * @example + * + * ```js + * angular.module('cookieStoreExample', ['ngCookies']) + * .controller('ExampleController', ['$cookieStore', function($cookieStore) { + * // Put cookie + * $cookieStore.put('myFavorite','oatmeal'); + * // Get cookie + * var favoriteCookie = $cookieStore.get('myFavorite'); + * // Removing a cookie + * $cookieStore.remove('myFavorite'); + * }]); + * ``` + */ + factory('$cookieStore', ['$cookies', function($cookies) { + + return { + /** + * @ngdoc method + * @name $cookieStore#get + * + * @description + * Returns the value of given cookie key + * + * @param {string} key Id to use for lookup. + * @returns {Object} Deserialized cookie value. + */ + get: function(key) { + var value = $cookies[key]; + return value ? angular.fromJson(value) : value; + }, + + /** + * @ngdoc method + * @name $cookieStore#put + * + * @description + * Sets a value for given cookie key + * + * @param {string} key Id for the `value`. + * @param {Object} value Value to be stored. + */ + put: function(key, value) { + $cookies[key] = angular.toJson(value); + }, + + /** + * @ngdoc method + * @name $cookieStore#remove + * + * @description + * Remove given cookie + * + * @param {string} key Id of the key-value pair to delete. + */ + remove: function(key) { + delete $cookies[key]; + } + }; + + }]); + + +})(window, window.angular); \ No newline at end of file diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/angular-route.js b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/angular-route.js new file mode 100755 index 000000000..2c9ec0936 --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/angular-route.js @@ -0,0 +1,911 @@ +/** + * @license AngularJS v1.2.5 + * (c) 2010-2014 Google, Inc. http://angularjs.org + * License: MIT + */ +(function(window, angular, undefined) {'use strict'; + +/** + * @ngdoc overview + * @name ngRoute + * @description + * + * # ngRoute + * + * The `ngRoute` module provides routing and deeplinking services and directives for angular apps. + * + * ## Example + * See {@link ngRoute.$route#example $route} for an example of configuring and using `ngRoute`. + * + * {@installModule route} + * + *
    + */ + /* global -ngRouteModule */ +var ngRouteModule = angular.module('ngRoute', ['ng']). + provider('$route', $RouteProvider); + +/** + * @ngdoc object + * @name ngRoute.$routeProvider + * @function + * + * @description + * + * Used for configuring routes. + * + * ## Example + * See {@link ngRoute.$route#example $route} for an example of configuring and using `ngRoute`. + * + * ## Dependencies + * Requires the {@link ngRoute `ngRoute`} module to be installed. + */ +function $RouteProvider(){ + function inherit(parent, extra) { + return angular.extend(new (angular.extend(function() {}, {prototype:parent}))(), extra); + } + + var routes = {}; + + /** + * @ngdoc method + * @name ngRoute.$routeProvider#when + * @methodOf ngRoute.$routeProvider + * + * @param {string} path Route path (matched against `$location.path`). If `$location.path` + * contains redundant trailing slash or is missing one, the route will still match and the + * `$location.path` will be updated to add or drop the trailing slash to exactly match the + * route definition. + * + * * `path` can contain named groups starting with a colon: e.g. `:name`. All characters up + * to the next slash are matched and stored in `$routeParams` under the given `name` + * when the route matches. + * * `path` can contain named groups starting with a colon and ending with a star: + * e.g.`:name*`. All characters are eagerly stored in `$routeParams` under the given `name` + * when the route matches. + * * `path` can contain optional named groups with a question mark: e.g.`:name?`. + * + * For example, routes like `/color/:color/largecode/:largecode*\/edit` will match + * `/color/brown/largecode/code/with/slashs/edit` and extract: + * + * * `color: brown` + * * `largecode: code/with/slashs`. + * + * + * @param {Object} route Mapping information to be assigned to `$route.current` on route + * match. + * + * Object properties: + * + * - `controller` – `{(string|function()=}` – Controller fn that should be associated with + * newly created scope or the name of a {@link angular.Module#controller registered + * controller} if passed as a string. + * - `controllerAs` – `{string=}` – A controller alias name. If present the controller will be + * published to scope under the `controllerAs` name. + * - `template` – `{string=|function()=}` – html template as a string or a function that + * returns an html template as a string which should be used by {@link + * ngRoute.directive:ngView ngView} or {@link ng.directive:ngInclude ngInclude} directives. + * This property takes precedence over `templateUrl`. + * + * If `template` is a function, it will be called with the following parameters: + * + * - `{Array.}` - route parameters extracted from the current + * `$location.path()` by applying the current route + * + * - `templateUrl` – `{string=|function()=}` – path or function that returns a path to an html + * template that should be used by {@link ngRoute.directive:ngView ngView}. + * + * If `templateUrl` is a function, it will be called with the following parameters: + * + * - `{Array.}` - route parameters extracted from the current + * `$location.path()` by applying the current route + * + * - `resolve` - `{Object.=}` - An optional map of dependencies which should + * be injected into the controller. If any of these dependencies are promises, the router + * will wait for them all to be resolved or one to be rejected before the controller is + * instantiated. + * If all the promises are resolved successfully, the values of the resolved promises are + * injected and {@link ngRoute.$route#$routeChangeSuccess $routeChangeSuccess} event is + * fired. If any of the promises are rejected the + * {@link ngRoute.$route#$routeChangeError $routeChangeError} event is fired. The map object + * is: + * + * - `key` – `{string}`: a name of a dependency to be injected into the controller. + * - `factory` - `{string|function}`: If `string` then it is an alias for a service. + * Otherwise if function, then it is {@link api/AUTO.$injector#invoke injected} + * and the return value is treated as the dependency. If the result is a promise, it is + * resolved before its value is injected into the controller. Be aware that + * `ngRoute.$routeParams` will still refer to the previous route within these resolve + * functions. Use `$route.current.params` to access the new route parameters, instead. + * + * - `redirectTo` – {(string|function())=} – value to update + * {@link ng.$location $location} path with and trigger route redirection. + * + * If `redirectTo` is a function, it will be called with the following parameters: + * + * - `{Object.}` - route parameters extracted from the current + * `$location.path()` by applying the current route templateUrl. + * - `{string}` - current `$location.path()` + * - `{Object}` - current `$location.search()` + * + * The custom `redirectTo` function is expected to return a string which will be used + * to update `$location.path()` and `$location.search()`. + * + * - `[reloadOnSearch=true]` - {boolean=} - reload route when only `$location.search()` + * or `$location.hash()` changes. + * + * If the option is set to `false` and url in the browser changes, then + * `$routeUpdate` event is broadcasted on the root scope. + * + * - `[caseInsensitiveMatch=false]` - {boolean=} - match routes without being case sensitive + * + * If the option is set to `true`, then the particular route can be matched without being + * case sensitive + * + * @returns {Object} self + * + * @description + * Adds a new route definition to the `$route` service. + */ + this.when = function(path, route) { + routes[path] = angular.extend( + {reloadOnSearch: true}, + route, + path && pathRegExp(path, route) + ); + + // create redirection for trailing slashes + if (path) { + var redirectPath = (path[path.length-1] == '/') + ? path.substr(0, path.length-1) + : path +'/'; + + routes[redirectPath] = angular.extend( + {redirectTo: path}, + pathRegExp(redirectPath, route) + ); + } + + return this; + }; + + /** + * @param path {string} path + * @param opts {Object} options + * @return {?Object} + * + * @description + * Normalizes the given path, returning a regular expression + * and the original path. + * + * Inspired by pathRexp in visionmedia/express/lib/utils.js. + */ + function pathRegExp(path, opts) { + var insensitive = opts.caseInsensitiveMatch, + ret = { + originalPath: path, + regexp: path + }, + keys = ret.keys = []; + + path = path + .replace(/([().])/g, '\\$1') + .replace(/(\/)?:(\w+)([\?|\*])?/g, function(_, slash, key, option){ + var optional = option === '?' ? option : null; + var star = option === '*' ? option : null; + keys.push({ name: key, optional: !!optional }); + slash = slash || ''; + return '' + + (optional ? '' : slash) + + '(?:' + + (optional ? slash : '') + + (star && '(.+?)' || '([^/]+)') + + (optional || '') + + ')' + + (optional || ''); + }) + .replace(/([\/$\*])/g, '\\$1'); + + ret.regexp = new RegExp('^' + path + '$', insensitive ? 'i' : ''); + return ret; + } + + /** + * @ngdoc method + * @name ngRoute.$routeProvider#otherwise + * @methodOf ngRoute.$routeProvider + * + * @description + * Sets route definition that will be used on route change when no other route definition + * is matched. + * + * @param {Object} params Mapping information to be assigned to `$route.current`. + * @returns {Object} self + */ + this.otherwise = function(params) { + this.when(null, params); + return this; + }; + + + this.$get = ['$rootScope', + '$location', + '$routeParams', + '$q', + '$injector', + '$http', + '$templateCache', + '$sce', + function($rootScope, $location, $routeParams, $q, $injector, $http, $templateCache, $sce) { + + /** + * @ngdoc object + * @name ngRoute.$route + * @requires $location + * @requires $routeParams + * + * @property {Object} current Reference to the current route definition. + * The route definition contains: + * + * - `controller`: The controller constructor as define in route definition. + * - `locals`: A map of locals which is used by {@link ng.$controller $controller} service for + * controller instantiation. The `locals` contain + * the resolved values of the `resolve` map. Additionally the `locals` also contain: + * + * - `$scope` - The current route scope. + * - `$template` - The current route template HTML. + * + * @property {Array.} routes Array of all configured routes. + * + * @description + * `$route` is used for deep-linking URLs to controllers and views (HTML partials). + * It watches `$location.url()` and tries to map the path to an existing route definition. + * + * Requires the {@link ngRoute `ngRoute`} module to be installed. + * + * You can define routes through {@link ngRoute.$routeProvider $routeProvider}'s API. + * + * The `$route` service is typically used in conjunction with the + * {@link ngRoute.directive:ngView `ngView`} directive and the + * {@link ngRoute.$routeParams `$routeParams`} service. + * + * @example + This example shows how changing the URL hash causes the `$route` to match a route against the + URL, and the `ngView` pulls in the partial. + + Note that this example is using {@link ng.directive:script inlined templates} + to get it working on jsfiddle as well. + + + +
    + Choose: + Moby | + Moby: Ch1 | + Gatsby | + Gatsby: Ch4 | + Scarlet Letter
    + +
    +
    + + 
    $location.path() = {{$location.path()}}
    + 
    $route.current.templateUrl = {{$route.current.templateUrl}}
    + 
    $route.current.params = {{$route.current.params}}
    + 
    $route.current.scope.name = {{$route.current.scope.name}}
    + 
    $routeParams = {{$routeParams}}
    +
    +     + + + controller: {{name}}
    + Book Id: {{params.bookId}}
    +     + + + controller: {{name}}
    + Book Id: {{params.bookId}}
    + Chapter Id: {{params.chapterId}} +     + + + angular.module('ngViewExample', ['ngRoute']) + + .config(function($routeProvider, $locationProvider) { + $routeProvider.when('/Book/:bookId', { + templateUrl: 'book.html', + controller: BookCntl, + resolve: { + // I will cause a 1 second delay + delay: function($q, $timeout) { + var delay = $q.defer(); + $timeout(delay.resolve, 1000); + return delay.promise; + } + } + }); + $routeProvider.when('/Book/:bookId/ch/:chapterId', { + templateUrl: 'chapter.html', + controller: ChapterCntl + }); + + // configure html5 to get links working on jsfiddle + $locationProvider.html5Mode(true); + }); + + function MainCntl($scope, $route, $routeParams, $location) { + $scope.$route = $route; + $scope.$location = $location; + $scope.$routeParams = $routeParams; + } + + function BookCntl($scope, $routeParams) { + $scope.name = "BookCntl"; + $scope.params = $routeParams; + } + + function ChapterCntl($scope, $routeParams) { + $scope.name = "ChapterCntl"; + $scope.params = $routeParams; + } + + + + it('should load and compile correct template', function() { + element('a:contains("Moby: Ch1")').click(); + var content = element('.doc-example-live [ng-view]').text(); + expect(content).toMatch(/controller\: ChapterCntl/); + expect(content).toMatch(/Book Id\: Moby/); + expect(content).toMatch(/Chapter Id\: 1/); + + element('a:contains("Scarlet")').click(); + sleep(2); // promises are not part of scenario waiting + content = element('.doc-example-live [ng-view]').text(); + expect(content).toMatch(/controller\: BookCntl/); + expect(content).toMatch(/Book Id\: Scarlet/); + }); + +     + */ + + /** + * @ngdoc event + * @name ngRoute.$route#$routeChangeStart + * @eventOf ngRoute.$route + * @eventType broadcast on root scope + * @description + * Broadcasted before a route change. At this point the route services starts + * resolving all of the dependencies needed for the route change to occurs. + * Typically this involves fetching the view template as well as any dependencies + * defined in `resolve` route property. Once all of the dependencies are resolved + * `$routeChangeSuccess` is fired. + * + * @param {Object} angularEvent Synthetic event object. + * @param {Route} next Future route information. + * @param {Route} current Current route information. + */ + + /** + * @ngdoc event + * @name ngRoute.$route#$routeChangeSuccess + * @eventOf ngRoute.$route + * @eventType broadcast on root scope + * @description + * Broadcasted after a route dependencies are resolved. + * {@link ngRoute.directive:ngView ngView} listens for the directive + * to instantiate the controller and render the view. + * + * @param {Object} angularEvent Synthetic event object. + * @param {Route} current Current route information. + * @param {Route|Undefined} previous Previous route information, or undefined if current is + * first route entered. + */ + + /** + * @ngdoc event + * @name ngRoute.$route#$routeChangeError + * @eventOf ngRoute.$route + * @eventType broadcast on root scope + * @description + * Broadcasted if any of the resolve promises are rejected. + * + * @param {Object} angularEvent Synthetic event object + * @param {Route} current Current route information. + * @param {Route} previous Previous route information. + * @param {Route} rejection Rejection of the promise. Usually the error of the failed promise. + */ + + /** + * @ngdoc event + * @name ngRoute.$route#$routeUpdate + * @eventOf ngRoute.$route + * @eventType broadcast on root scope + * @description + * + * The `reloadOnSearch` property has been set to false, and we are reusing the same + * instance of the Controller. + */ + + var forceReload = false, + $route = { + routes: routes, + + /** + * @ngdoc method + * @name ngRoute.$route#reload + * @methodOf ngRoute.$route + * + * @description + * Causes `$route` service to reload the current route even if + * {@link ng.$location $location} hasn't changed. + * + * As a result of that, {@link ngRoute.directive:ngView ngView} + * creates new scope, reinstantiates the controller. + */ + reload: function() { + forceReload = true; + $rootScope.$evalAsync(updateRoute); + } + }; + + $rootScope.$on('$locationChangeSuccess', updateRoute); + + return $route; + + ///////////////////////////////////////////////////// + + /** + * @param on {string} current url + * @param route {Object} route regexp to match the url against + * @return {?Object} + * + * @description + * Check if the route matches the current url. + * + * Inspired by match in + * visionmedia/express/lib/router/router.js. + */ + function switchRouteMatcher(on, route) { + var keys = route.keys, + params = {}; + + if (!route.regexp) return null; + + var m = route.regexp.exec(on); + if (!m) return null; + + for (var i = 1, len = m.length; i < len; ++i) { + var key = keys[i - 1]; + + var val = 'string' == typeof m[i] + ? decodeURIComponent(m[i]) + : m[i]; + + if (key && val) { + params[key.name] = val; + } + } + return params; + } + + function updateRoute() { + var next = parseRoute(), + last = $route.current; + + if (next && last && next.$$route === last.$$route + && angular.equals(next.pathParams, last.pathParams) + && !next.reloadOnSearch && !forceReload) { + last.params = next.params; + angular.copy(last.params, $routeParams); + $rootScope.$broadcast('$routeUpdate', last); + } else if (next || last) { + forceReload = false; + $rootScope.$broadcast('$routeChangeStart', next, last); + $route.current = next; + if (next) { + if (next.redirectTo) { + if (angular.isString(next.redirectTo)) { + $location.path(interpolate(next.redirectTo, next.params)).search(next.params) + .replace(); + } else { + $location.url(next.redirectTo(next.pathParams, $location.path(), $location.search())) + .replace(); + } + } + } + + $q.when(next). + then(function() { + if (next) { + var locals = angular.extend({}, next.resolve), + template, templateUrl; + + angular.forEach(locals, function(value, key) { + locals[key] = angular.isString(value) ? + $injector.get(value) : $injector.invoke(value); + }); + + if (angular.isDefined(template = next.template)) { + if (angular.isFunction(template)) { + template = template(next.params); + } + } else if (angular.isDefined(templateUrl = next.templateUrl)) { + if (angular.isFunction(templateUrl)) { + templateUrl = templateUrl(next.params); + } + templateUrl = $sce.getTrustedResourceUrl(templateUrl); + if (angular.isDefined(templateUrl)) { + next.loadedTemplateUrl = templateUrl; + template = $http.get(templateUrl, {cache: $templateCache}). + then(function(response) { return response.data; }); + } + } + if (angular.isDefined(template)) { + locals['$template'] = template; + } + return $q.all(locals); + } + }). + // after route change + then(function(locals) { + if (next == $route.current) { + if (next) { + next.locals = locals; + angular.copy(next.params, $routeParams); + } + $rootScope.$broadcast('$routeChangeSuccess', next, last); + } + }, function(error) { + if (next == $route.current) { + $rootScope.$broadcast('$routeChangeError', next, last, error); + } + }); + } + } + + + /** + * @returns the current active route, by matching it against the URL + */ + function parseRoute() { + // Match a route + var params, match; + angular.forEach(routes, function(route, path) { + if (!match && (params = switchRouteMatcher($location.path(), route))) { + match = inherit(route, { + params: angular.extend({}, $location.search(), params), + pathParams: params}); + match.$$route = route; + } + }); + // No route matched; fallback to "otherwise" route + return match || routes[null] && inherit(routes[null], {params: {}, pathParams:{}}); + } + + /** + * @returns interpolation of the redirect path with the parameters + */ + function interpolate(string, params) { + var result = []; + angular.forEach((string||'').split(':'), function(segment, i) { + if (i === 0) { + result.push(segment); + } else { + var segmentMatch = segment.match(/(\w+)(.*)/); + var key = segmentMatch[1]; + result.push(params[key]); + result.push(segmentMatch[2] || ''); + delete params[key]; + } + }); + return result.join(''); + } + }]; +} + +ngRouteModule.provider('$routeParams', $RouteParamsProvider); + + +/** + * @ngdoc object + * @name ngRoute.$routeParams + * @requires $route + * + * @description + * The `$routeParams` service allows you to retrieve the current set of route parameters. + * + * Requires the {@link ngRoute `ngRoute`} module to be installed. + * + * The route parameters are a combination of {@link ng.$location `$location`}'s + * {@link ng.$location#methods_search `search()`} and {@link ng.$location#methods_path `path()`}. + * The `path` parameters are extracted when the {@link ngRoute.$route `$route`} path is matched. + * + * In case of parameter name collision, `path` params take precedence over `search` params. + * + * The service guarantees that the identity of the `$routeParams` object will remain unchanged + * (but its properties will likely change) even when a route change occurs. + * + * Note that the `$routeParams` are only updated *after* a route change completes successfully. + * This means that you cannot rely on `$routeParams` being correct in route resolve functions. + * Instead you can use `$route.current.params` to access the new route's parameters. + * + * @example + * 
    + *  // Given:
+ *  // URL: http://server.com/index.html#/Chapter/1/Section/2?search=moby
+ *  // Route: /Chapter/:chapterId/Section/:sectionId
+ *  //
+ *  // Then
+ *  $routeParams ==> {chapterId:1, sectionId:2, search:'moby'}
+ *
    + */ +function $RouteParamsProvider() { + this.$get = function() { return {}; }; +} + +ngRouteModule.directive('ngView', ngViewFactory); +ngRouteModule.directive('ngView', ngViewFillContentFactory); + + +/** + * @ngdoc directive + * @name ngRoute.directive:ngView + * @restrict ECA + * + * @description + * # Overview + * `ngView` is a directive that complements the {@link ngRoute.$route $route} service by + * including the rendered template of the current route into the main layout (`index.html`) file. + * Every time the current route changes, the included view changes with it according to the + * configuration of the `$route` service. + * + * Requires the {@link ngRoute `ngRoute`} module to be installed. + * + * @animations + * enter - animation is used to bring new content into the browser. + * leave - animation is used to animate existing content away. + * + * The enter and leave animation occur concurrently. + * + * @scope + * @priority 400 + * @example + + +
    + Choose: + Moby | + Moby: Ch1 | + Gatsby | + Gatsby: Ch4 | + Scarlet Letter
    + +
    +
    +
    +
    + + 
    $location.path() = {{main.$location.path()}}
    + 
    $route.current.templateUrl = {{main.$route.current.templateUrl}}
    + 
    $route.current.params = {{main.$route.current.params}}
    + 
    $route.current.scope.name = {{main.$route.current.scope.name}}
    + 
    $routeParams = {{main.$routeParams}}
    +
    +     + + +
    + controller: {{book.name}}
    + Book Id: {{book.params.bookId}}
    +
    +     + + +
    + controller: {{chapter.name}}
    + Book Id: {{chapter.params.bookId}}
    + Chapter Id: {{chapter.params.chapterId}} +
    +     + + + .view-animate-container { + position:relative; + height:100px!important; + position:relative; + background:white; + border:1px solid black; + height:40px; + overflow:hidden; + } + + .view-animate { + padding:10px; + } + + .view-animate.ng-enter, .view-animate.ng-leave { + -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 1.5s; + transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 1.5s; + + display:block; + width:100%; + border-left:1px solid black; + + position:absolute; + top:0; + left:0; + right:0; + bottom:0; + padding:10px; + } + + .view-animate.ng-enter { + left:100%; + } + .view-animate.ng-enter.ng-enter-active { + left:0; + } + .view-animate.ng-leave.ng-leave-active { + left:-100%; + } + + + + angular.module('ngViewExample', ['ngRoute', 'ngAnimate'], + function($routeProvider, $locationProvider) { + $routeProvider.when('/Book/:bookId', { + templateUrl: 'book.html', + controller: BookCntl, + controllerAs: 'book' + }); + $routeProvider.when('/Book/:bookId/ch/:chapterId', { + templateUrl: 'chapter.html', + controller: ChapterCntl, + controllerAs: 'chapter' + }); + + // configure html5 to get links working on jsfiddle + $locationProvider.html5Mode(true); + }); + + function MainCntl($route, $routeParams, $location) { + this.$route = $route; + this.$location = $location; + this.$routeParams = $routeParams; + } + + function BookCntl($routeParams) { + this.name = "BookCntl"; + this.params = $routeParams; + } + + function ChapterCntl($routeParams) { + this.name = "ChapterCntl"; + this.params = $routeParams; + } + + + + it('should load and compile correct template', function() { + element('a:contains("Moby: Ch1")').click(); + var content = element('.doc-example-live [ng-view]').text(); + expect(content).toMatch(/controller\: ChapterCntl/); + expect(content).toMatch(/Book Id\: Moby/); + expect(content).toMatch(/Chapter Id\: 1/); + + element('a:contains("Scarlet")').click(); + content = element('.doc-example-live [ng-view]').text(); + expect(content).toMatch(/controller\: BookCntl/); + expect(content).toMatch(/Book Id\: Scarlet/); + }); + +     + */ + + +/** + * @ngdoc event + * @name ngRoute.directive:ngView#$viewContentLoaded + * @eventOf ngRoute.directive:ngView + * @eventType emit on the current ngView scope + * @description + * Emitted every time the ngView content is reloaded. + */ +ngViewFactory.$inject = ['$route', '$anchorScroll', '$animate']; +function ngViewFactory( $route, $anchorScroll, $animate) { + return { + restrict: 'ECA', + terminal: true, + priority: 400, + transclude: 'element', + link: function(scope, $element, attr, ctrl, $transclude) { + var currentScope, + currentElement, + autoScrollExp = attr.autoscroll, + onloadExp = attr.onload || ''; + + scope.$on('$routeChangeSuccess', update); + update(); + + function cleanupLastView() { + if (currentScope) { + currentScope.$destroy(); + currentScope = null; + } + if(currentElement) { + $animate.leave(currentElement); + currentElement = null; + } + } + + function update() { + var locals = $route.current && $route.current.locals, + template = locals && locals.$template; + + if (template) { + var newScope = scope.$new(); + var current = $route.current; + + // Note: This will also link all children of ng-view that were contained in the original + // html. If that content contains controllers, ... they could pollute/change the scope. + // However, using ng-view on an element with additional content does not make sense... + // Note: We can't remove them in the cloneAttchFn of $transclude as that + // function is called before linking the content, which would apply child + // directives to non existing elements. + var clone = $transclude(newScope, function(clone) { + $animate.enter(clone, null, currentElement || $element, function onNgViewEnter () { + if (angular.isDefined(autoScrollExp) + && (!autoScrollExp || scope.$eval(autoScrollExp))) { + $anchorScroll(); + } + }); + cleanupLastView(); + }); + + currentElement = clone; + currentScope = current.scope = newScope; + currentScope.$emit('$viewContentLoaded'); + currentScope.$eval(onloadExp); + } else { + cleanupLastView(); + } + } + } + }; +} + +// This directive is called during the $transclude call of the first `ngView` directive. +// It will replace and compile the content of the element with the loaded template. +// We need this directive so that the element content is already filled when +// the link function of another directive on the same element as ngView +// is called. +ngViewFillContentFactory.$inject = ['$compile', '$controller', '$route']; +function ngViewFillContentFactory($compile, $controller, $route) { + return { + restrict: 'ECA', + priority: -400, + link: function(scope, $element) { + var current = $route.current, + locals = current.locals; + + $element.html(locals.$template); + + var link = $compile($element.contents()); + + if (current.controller) { + locals.$scope = scope; + var controller = $controller(current.controller, locals); + if (current.controllerAs) { + scope[current.controllerAs] = controller; + } + $element.data('$ngControllerController', controller); + $element.children().data('$ngControllerController', controller); + } + + link(scope); + } + }; +} + + +})(window, window.angular); diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/angular-route.min.js b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/angular-route.min.js new file mode 100755 index 000000000..71c73dbab --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/angular-route.min.js @@ -0,0 +1,14 @@ +/* + AngularJS v1.2.25 + (c) 2010-2014 Google, Inc. http://angularjs.org + License: MIT +*/ +(function(n,e,A){'use strict';function x(s,g,h){return{restrict:"ECA",terminal:!0,priority:400,transclude:"element",link:function(a,c,b,f,w){function y(){p&&(p.remove(),p=null);k&&(k.$destroy(),k=null);l&&(h.leave(l,function(){p=null}),p=l,l=null)}function v(){var b=s.current&&s.current.locals;if(e.isDefined(b&&b.$template)){var b=a.$new(),d=s.current;l=w(b,function(d){h.enter(d,null,l||c,function(){!e.isDefined(t)||t&&!a.$eval(t)||g()});y()});k=d.scope=b;k.$emit("$viewContentLoaded");k.$eval(u)}else y()} +var k,l,p,t=b.autoscroll,u=b.onload||"";a.$on("$routeChangeSuccess",v);v()}}}function z(e,g,h){return{restrict:"ECA",priority:-400,link:function(a,c){var b=h.current,f=b.locals;c.html(f.$template);var w=e(c.contents());b.controller&&(f.$scope=a,f=g(b.controller,f),b.controllerAs&&(a[b.controllerAs]=f),c.data("$ngControllerController",f),c.children().data("$ngControllerController",f));w(a)}}}n=e.module("ngRoute",["ng"]).provider("$route",function(){function s(a,c){return e.extend(new (e.extend(function(){}, +{prototype:a})),c)}function g(a,e){var b=e.caseInsensitiveMatch,f={originalPath:a,regexp:a},h=f.keys=[];a=a.replace(/([().])/g,"\\$1").replace(/(\/)?:(\w+)([\?\*])?/g,function(a,e,b,c){a="?"===c?c:null;c="*"===c?c:null;h.push({name:b,optional:!!a});e=e||"";return""+(a?"":e)+"(?:"+(a?e:"")+(c&&"(.+?)"||"([^/]+)")+(a||"")+")"+(a||"")}).replace(/([\/$\*])/g,"\\$1");f.regexp=RegExp("^"+a+"$",b?"i":"");return f}var h={};this.when=function(a,c){h[a]=e.extend({reloadOnSearch:!0},c,a&&g(a,c));if(a){var b= +"/"==a[a.length-1]?a.substr(0,a.length-1):a+"/";h[b]=e.extend({redirectTo:a},g(b,c))}return this};this.otherwise=function(a){this.when(null,a);return this};this.$get=["$rootScope","$location","$routeParams","$q","$injector","$http","$templateCache","$sce",function(a,c,b,f,g,n,v,k){function l(){var d=p(),m=r.current;if(d&&m&&d.$$route===m.$$route&&e.equals(d.pathParams,m.pathParams)&&!d.reloadOnSearch&&!u)m.params=d.params,e.copy(m.params,b),a.$broadcast("$routeUpdate",m);else if(d||m)u=!1,a.$broadcast("$routeChangeStart", +d,m),(r.current=d)&&d.redirectTo&&(e.isString(d.redirectTo)?c.path(t(d.redirectTo,d.params)).search(d.params).replace():c.url(d.redirectTo(d.pathParams,c.path(),c.search())).replace()),f.when(d).then(function(){if(d){var a=e.extend({},d.resolve),c,b;e.forEach(a,function(d,c){a[c]=e.isString(d)?g.get(d):g.invoke(d)});e.isDefined(c=d.template)?e.isFunction(c)&&(c=c(d.params)):e.isDefined(b=d.templateUrl)&&(e.isFunction(b)&&(b=b(d.params)),b=k.getTrustedResourceUrl(b),e.isDefined(b)&&(d.loadedTemplateUrl= +b,c=n.get(b,{cache:v}).then(function(a){return a.data})));e.isDefined(c)&&(a.$template=c);return f.all(a)}}).then(function(c){d==r.current&&(d&&(d.locals=c,e.copy(d.params,b)),a.$broadcast("$routeChangeSuccess",d,m))},function(c){d==r.current&&a.$broadcast("$routeChangeError",d,m,c)})}function p(){var a,b;e.forEach(h,function(f,h){var q;if(q=!b){var g=c.path();q=f.keys;var l={};if(f.regexp)if(g=f.regexp.exec(g)){for(var k=1,p=g.length;k + * + * See {@link ngSanitize.$sanitize `$sanitize`} for usage. + */ + +/* + * HTML Parser By Misko Hevery (misko@hevery.com) + * based on: HTML Parser By John Resig (ejohn.org) + * Original code by Erik Arvidsson, Mozilla Public License + * http://erik.eae.net/simplehtmlparser/simplehtmlparser.js + * + * // Use like so: + * htmlParser(htmlString, { + * start: function(tag, attrs, unary) {}, + * end: function(tag) {}, + * chars: function(text) {}, + * comment: function(text) {} + * }); + * + */ + + +/** + * @ngdoc service + * @name $sanitize + * @kind function + * + * @description + * The input is sanitized by parsing the html into tokens. All safe tokens (from a whitelist) are + * then serialized back to properly escaped html string. This means that no unsafe input can make + * it into the returned string, however, since our parser is more strict than a typical browser + * parser, it's possible that some obscure input, which would be recognized as valid HTML by a + * browser, won't make it through the sanitizer. + * The whitelist is configured using the functions `aHrefSanitizationWhitelist` and + * `imgSrcSanitizationWhitelist` of {@link ng.$compileProvider `$compileProvider`}. + * + * @param {string} html Html input. + * @returns {string} Sanitized html. + * + * @example + + + +
    + Snippet: + + + + + + + + + + + + + + + + + + + + + + + + + +
    DirectiveHowSourceRendered
    ng-bind-htmlAutomatically uses $sanitize
    <div ng-bind-html="snippet">
    </div>
    ng-bind-htmlBypass $sanitize by explicitly trusting the dangerous value + 
    <div ng-bind-html="deliberatelyTrustDangerousSnippet()">
+</div>
    +
    ng-bindAutomatically escapes
    <div ng-bind="snippet">
    </div>
    +
    +     + + it('should sanitize the html snippet by default', function() { + expect(element(by.css('#bind-html-with-sanitize div')).getInnerHtml()). + toBe('

    an html\nclick here\nsnippet

    '); + }); + + it('should inline raw snippet if bound to a trusted value', function() { + expect(element(by.css('#bind-html-with-trust div')).getInnerHtml()). + toBe("

    an html\n" + + "click here\n" + + "snippet

    "); + }); + + it('should escape snippet without any filter', function() { + expect(element(by.css('#bind-default div')).getInnerHtml()). + toBe("<p style=\"color:blue\">an html\n" + + "<em onmouseover=\"this.textContent='PWN3D!'\">click here</em>\n" + + "snippet</p>"); + }); + + it('should update', function() { + element(by.model('snippet')).clear(); + element(by.model('snippet')).sendKeys('new text'); + expect(element(by.css('#bind-html-with-sanitize div')).getInnerHtml()). + toBe('new text'); + expect(element(by.css('#bind-html-with-trust div')).getInnerHtml()).toBe( + 'new text'); + expect(element(by.css('#bind-default div')).getInnerHtml()).toBe( + "new <b onclick=\"alert(1)\">text</b>"); + }); +     +     + */ +function $SanitizeProvider() { + this.$get = ['$$sanitizeUri', function($$sanitizeUri) { + return function(html) { + var buf = []; + htmlParser(html, htmlSanitizeWriter(buf, function(uri, isImage) { + return !/^unsafe/.test($$sanitizeUri(uri, isImage)); + })); + return buf.join(''); + }; + }]; +} + +function sanitizeText(chars) { + var buf = []; + var writer = htmlSanitizeWriter(buf, angular.noop); + writer.chars(chars); + return buf.join(''); +} + + +// Regular Expressions for parsing tags and attributes +var START_TAG_REGEXP = + /^<((?:[a-zA-Z])[\w:-]*)((?:\s+[\w:-]+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)\s*(>?)/, + END_TAG_REGEXP = /^<\/\s*([\w:-]+)[^>]*>/, + ATTR_REGEXP = /([\w:-]+)(?:\s*=\s*(?:(?:"((?:[^"])*)")|(?:'((?:[^'])*)')|([^>\s]+)))?/g, + BEGIN_TAG_REGEXP = /^/g, + DOCTYPE_REGEXP = /]*?)>/i, + CDATA_REGEXP = //g, + SURROGATE_PAIR_REGEXP = /[\uD800-\uDBFF][\uDC00-\uDFFF]/g, + // Match everything outside of normal chars and " (quote character) + NON_ALPHANUMERIC_REGEXP = /([^\#-~| |!])/g; + + +// Good source of info about elements and attributes +// http://dev.w3.org/html5/spec/Overview.html#semantics +// http://simon.html5.org/html-elements + +// Safe Void Elements - HTML5 +// http://dev.w3.org/html5/spec/Overview.html#void-elements +var voidElements = makeMap("area,br,col,hr,img,wbr"); + +// Elements that you can, intentionally, leave open (and which close themselves) +// http://dev.w3.org/html5/spec/Overview.html#optional-tags +var optionalEndTagBlockElements = makeMap("colgroup,dd,dt,li,p,tbody,td,tfoot,th,thead,tr"), + optionalEndTagInlineElements = makeMap("rp,rt"), + optionalEndTagElements = angular.extend({}, + optionalEndTagInlineElements, + optionalEndTagBlockElements); + +// Safe Block Elements - HTML5 +var blockElements = angular.extend({}, optionalEndTagBlockElements, makeMap("address,article," + + "aside,blockquote,caption,center,del,dir,div,dl,figure,figcaption,footer,h1,h2,h3,h4,h5," + + "h6,header,hgroup,hr,ins,map,menu,nav,ol,pre,script,section,table,ul")); + +// Inline Elements - HTML5 +var inlineElements = angular.extend({}, optionalEndTagInlineElements, makeMap("a,abbr,acronym,b," + + "bdi,bdo,big,br,cite,code,del,dfn,em,font,i,img,ins,kbd,label,map,mark,q,ruby,rp,rt,s," + + "samp,small,span,strike,strong,sub,sup,time,tt,u,var")); + + +// Special Elements (can contain anything) +var specialElements = makeMap("script,style"); + +var validElements = angular.extend({}, + voidElements, + blockElements, + inlineElements, + optionalEndTagElements); + +//Attributes that have href and hence need to be sanitized +var uriAttrs = makeMap("background,cite,href,longdesc,src,usemap"); +var validAttrs = angular.extend({}, uriAttrs, makeMap( + 'abbr,align,alt,axis,bgcolor,border,cellpadding,cellspacing,class,clear,'+ + 'color,cols,colspan,compact,coords,dir,face,headers,height,hreflang,hspace,'+ + 'ismap,lang,language,nohref,nowrap,rel,rev,rows,rowspan,rules,'+ + 'scope,scrolling,shape,size,span,start,summary,target,title,type,'+ + 'valign,value,vspace,width')); + +function makeMap(str) { + var obj = {}, items = str.split(','), i; + for (i = 0; i < items.length; i++) obj[items[i]] = true; + return obj; +} + + +/** + * @example + * htmlParser(htmlString, { + * start: function(tag, attrs, unary) {}, + * end: function(tag) {}, + * chars: function(text) {}, + * comment: function(text) {} + * }); + * + * @param {string} html string + * @param {object} handler + */ +function htmlParser( html, handler ) { + if (typeof html !== 'string') { + if (html === null || typeof html === 'undefined') { + html = ''; + } else { + html = '' + html; + } + } + var index, chars, match, stack = [], last = html, text; + stack.last = function() { return stack[ stack.length - 1 ]; }; + + while ( html ) { + text = ''; + chars = true; + + // Make sure we're not in a script or style element + if ( !stack.last() || !specialElements[ stack.last() ] ) { + + // Comment + if ( html.indexOf("", index) === index) { + if (handler.comment) handler.comment( html.substring( 4, index ) ); + html = html.substring( index + 3 ); + chars = false; + } + // DOCTYPE + } else if ( DOCTYPE_REGEXP.test(html) ) { + match = html.match( DOCTYPE_REGEXP ); + + if ( match ) { + html = html.replace( match[0], ''); + chars = false; + } + // end tag + } else if ( BEGING_END_TAGE_REGEXP.test(html) ) { + match = html.match( END_TAG_REGEXP ); + + if ( match ) { + html = html.substring( match[0].length ); + match[0].replace( END_TAG_REGEXP, parseEndTag ); + chars = false; + } + + // start tag + } else if ( BEGIN_TAG_REGEXP.test(html) ) { + match = html.match( START_TAG_REGEXP ); + + if ( match ) { + // We only have a valid start-tag if there is a '>'. + if ( match[4] ) { + html = html.substring( match[0].length ); + match[0].replace( START_TAG_REGEXP, parseStartTag ); + } + chars = false; + } else { + // no ending tag found --- this piece should be encoded as an entity. + text += '<'; + html = html.substring(1); + } + } + + if ( chars ) { + index = html.indexOf("<"); + + text += index < 0 ? html : html.substring( 0, index ); + html = index < 0 ? "" : html.substring( index ); + + if (handler.chars) handler.chars( decodeEntities(text) ); + } + + } else { + html = html.replace(new RegExp("(.*)<\\s*\\/\\s*" + stack.last() + "[^>]*>", 'i'), + function(all, text){ + text = text.replace(COMMENT_REGEXP, "$1").replace(CDATA_REGEXP, "$1"); + + if (handler.chars) handler.chars( decodeEntities(text) ); + + return ""; + }); + + parseEndTag( "", stack.last() ); + } + + if ( html == last ) { + throw $sanitizeMinErr('badparse', "The sanitizer was unable to parse the following block " + + "of html: {0}", html); + } + last = html; + } + + // Clean up any remaining tags + parseEndTag(); + + function parseStartTag( tag, tagName, rest, unary ) { + tagName = angular.lowercase(tagName); + if ( blockElements[ tagName ] ) { + while ( stack.last() && inlineElements[ stack.last() ] ) { + parseEndTag( "", stack.last() ); + } + } + + if ( optionalEndTagElements[ tagName ] && stack.last() == tagName ) { + parseEndTag( "", tagName ); + } + + unary = voidElements[ tagName ] || !!unary; + + if ( !unary ) + stack.push( tagName ); + + var attrs = {}; + + rest.replace(ATTR_REGEXP, + function(match, name, doubleQuotedValue, singleQuotedValue, unquotedValue) { + var value = doubleQuotedValue + || singleQuotedValue + || unquotedValue + || ''; + + attrs[name] = decodeEntities(value); + }); + if (handler.start) handler.start( tagName, attrs, unary ); + } + + function parseEndTag( tag, tagName ) { + var pos = 0, i; + tagName = angular.lowercase(tagName); + if ( tagName ) + // Find the closest opened tag of the same type + for ( pos = stack.length - 1; pos >= 0; pos-- ) + if ( stack[ pos ] == tagName ) + break; + + if ( pos >= 0 ) { + // Close all the open elements, up the stack + for ( i = stack.length - 1; i >= pos; i-- ) + if (handler.end) handler.end( stack[ i ] ); + + // Remove the open elements from the stack + stack.length = pos; + } + } +} + +var hiddenPre=document.createElement("pre"); +var spaceRe = /^(\s*)([\s\S]*?)(\s*)$/; +/** + * decodes all entities into regular string + * @param value + * @returns {string} A string with decoded entities. + */ +function decodeEntities(value) { + if (!value) { return ''; } + + // Note: IE8 does not preserve spaces at the start/end of innerHTML + // so we must capture them and reattach them afterward + var parts = spaceRe.exec(value); + var spaceBefore = parts[1]; + var spaceAfter = parts[3]; + var content = parts[2]; + if (content) { + hiddenPre.innerHTML=content.replace(//g, '>'); +} + +/** + * create an HTML/XML writer which writes to buffer + * @param {Array} buf use buf.jain('') to get out sanitized html string + * @returns {object} in the form of { + * start: function(tag, attrs, unary) {}, + * end: function(tag) {}, + * chars: function(text) {}, + * comment: function(text) {} + * } + */ +function htmlSanitizeWriter(buf, uriValidator){ + var ignore = false; + var out = angular.bind(buf, buf.push); + return { + start: function(tag, attrs, unary){ + tag = angular.lowercase(tag); + if (!ignore && specialElements[tag]) { + ignore = tag; + } + if (!ignore && validElements[tag] === true) { + out('<'); + out(tag); + angular.forEach(attrs, function(value, key){ + var lkey=angular.lowercase(key); + var isImage = (tag === 'img' && lkey === 'src') || (lkey === 'background'); + if (validAttrs[lkey] === true && + (uriAttrs[lkey] !== true || uriValidator(value, isImage))) { + out(' '); + out(key); + out('="'); + out(encodeEntities(value)); + out('"'); + } + }); + out(unary ? '/>' : '>'); + } + }, + end: function(tag){ + tag = angular.lowercase(tag); + if (!ignore && validElements[tag] === true) { + out(''); + } + if (tag == ignore) { + ignore = false; + } + }, + chars: function(chars){ + if (!ignore) { + out(encodeEntities(chars)); + } + } + }; +} + + +// define ngSanitize module and register $sanitize service +angular.module('ngSanitize', []).provider('$sanitize', $SanitizeProvider); + +/* global sanitizeText: false */ + +/** + * @ngdoc filter + * @name linky + * @kind function + * + * @description + * Finds links in text input and turns them into html links. Supports http/https/ftp/mailto and + * plain email address links. + * + * Requires the {@link ngSanitize `ngSanitize`} module to be installed. + * + * @param {string} text Input text. + * @param {string} target Window (_blank|_self|_parent|_top) or named frame to open links in. + * @returns {string} Html-linkified text. + * + * @usage + + * + * @example + + + +
    + Snippet: + + + + + + + + + + + + + + + + + + + + + +
    FilterSourceRendered
    linky filter + 
    <div ng-bind-html="snippet | linky">
    </div>
    +     		+
    +
    linky target + 
    <div ng-bind-html="snippetWithTarget | linky:'_blank'">
    </div>
    +     		+
    +
    no filter
    <div ng-bind="snippet">
    </div>
    + + + it('should linkify the snippet with urls', function() { + expect(element(by.id('linky-filter')).element(by.binding('snippet | linky')).getText()). + toBe('Pretty text with some links: http://angularjs.org/, us@somewhere.org, ' + + 'another@somewhere.org, and one more: ftp://127.0.0.1/.'); + expect(element.all(by.css('#linky-filter a')).count()).toEqual(4); + }); + + it('should not linkify snippet without the linky filter', function() { + expect(element(by.id('escaped-html')).element(by.binding('snippet')).getText()). + toBe('Pretty text with some links: http://angularjs.org/, mailto:us@somewhere.org, ' + + 'another@somewhere.org, and one more: ftp://127.0.0.1/.'); + expect(element.all(by.css('#escaped-html a')).count()).toEqual(0); + }); + + it('should update', function() { + element(by.model('snippet')).clear(); + element(by.model('snippet')).sendKeys('new http://link.'); + expect(element(by.id('linky-filter')).element(by.binding('snippet | linky')).getText()). + toBe('new http://link.'); + expect(element.all(by.css('#linky-filter a')).count()).toEqual(1); + expect(element(by.id('escaped-html')).element(by.binding('snippet')).getText()) + .toBe('new http://link.'); + }); + + it('should work with the target property', function() { + expect(element(by.id('linky-target')). + element(by.binding("snippetWithTarget | linky:'_blank'")).getText()). + toBe('http://angularjs.org/'); + expect(element(by.css('#linky-target a')).getAttribute('target')).toEqual('_blank'); + }); + + + */ +angular.module('ngSanitize').filter('linky', ['$sanitize', function($sanitize) { + var LINKY_URL_REGEXP = + /((ftp|https?):\/\/|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>"]/, + MAILTO_REGEXP = /^mailto:/; + + return function(text, target) { + if (!text) return text; + var match; + var raw = text; + var html = []; + var url; + var i; + while ((match = raw.match(LINKY_URL_REGEXP))) { + // We can not end in these as they are sometimes found at the end of the sentence + url = match[0]; + // if we did not match ftp/http/mailto then assume mailto + if (match[2] == match[3]) url = 'mailto:' + url; + i = match.index; + addText(raw.substr(0, i)); + addLink(url, match[0].replace(MAILTO_REGEXP, '')); + raw = raw.substring(i + match[0].length); + } + addText(raw); + return $sanitize(html.join('')); + + function addText(text) { + if (!text) { + return; + } + html.push(sanitizeText(text)); + } + + function addLink(url, text) { + html.push(''); + addText(text); + html.push(''); + } + }; +}]); + + +})(window, window.angular); diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/angular-touch.js b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/angular-touch.js new file mode 100755 index 000000000..8934ff6b3 --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/angular-touch.js @@ -0,0 +1,628 @@ +/** + * @license AngularJS v1.4.3 + * (c) 2010-2015 Google, Inc. http://angularjs.org + * License: MIT + */ +(function(window, angular, undefined) {'use strict'; + +/** + * @ngdoc module + * @name ngTouch + * @description + * + * # ngTouch + * + * The `ngTouch` module provides touch events and other helpers for touch-enabled devices. + * The implementation is based on jQuery Mobile touch event handling + * ([jquerymobile.com](http://jquerymobile.com/)). + * + * + * See {@link ngTouch.$swipe `$swipe`} for usage. + * + *
    + * + */ + +// define ngTouch module +/* global -ngTouch */ +var ngTouch = angular.module('ngTouch', []); + +function nodeName_(element) { + return angular.lowercase(element.nodeName || (element[0] && element[0].nodeName)); +} + +/* global ngTouch: false */ + + /** + * @ngdoc service + * @name $swipe + * + * @description + * The `$swipe` service is a service that abstracts the messier details of hold-and-drag swipe + * behavior, to make implementing swipe-related directives more convenient. + * + * Requires the {@link ngTouch `ngTouch`} module to be installed. + * + * `$swipe` is used by the `ngSwipeLeft` and `ngSwipeRight` directives in `ngTouch`, and by + * `ngCarousel` in a separate component. + * + * # Usage + * The `$swipe` service is an object with a single method: `bind`. `bind` takes an element + * which is to be watched for swipes, and an object with four handler functions. See the + * documentation for `bind` below. + */ + +ngTouch.factory('$swipe', [function() { + // The total distance in any direction before we make the call on swipe vs. scroll. + var MOVE_BUFFER_RADIUS = 10; + + var POINTER_EVENTS = { + 'mouse': { + start: 'mousedown', + move: 'mousemove', + end: 'mouseup' + }, + 'touch': { + start: 'touchstart', + move: 'touchmove', + end: 'touchend', + cancel: 'touchcancel' + } + }; + + function getCoordinates(event) { + var originalEvent = event.originalEvent || event; + var touches = originalEvent.touches && originalEvent.touches.length ? originalEvent.touches : [originalEvent]; + var e = (originalEvent.changedTouches && originalEvent.changedTouches[0]) || touches[0]; + + return { + x: e.clientX, + y: e.clientY + }; + } + + function getEvents(pointerTypes, eventType) { + var res = []; + angular.forEach(pointerTypes, function(pointerType) { + var eventName = POINTER_EVENTS[pointerType][eventType]; + if (eventName) { + res.push(eventName); + } + }); + return res.join(' '); + } + + return { + /** + * @ngdoc method + * @name $swipe#bind + * + * @description + * The main method of `$swipe`. It takes an element to be watched for swipe motions, and an + * object containing event handlers. + * The pointer types that should be used can be specified via the optional + * third argument, which is an array of strings `'mouse'` and `'touch'`. By default, + * `$swipe` will listen for `mouse` and `touch` events. + * + * The four events are `start`, `move`, `end`, and `cancel`. `start`, `move`, and `end` + * receive as a parameter a coordinates object of the form `{ x: 150, y: 310 }` and the raw + * `event`. `cancel` receives the raw `event` as its single parameter. + * + * `start` is called on either `mousedown` or `touchstart`. After this event, `$swipe` is + * watching for `touchmove` or `mousemove` events. These events are ignored until the total + * distance moved in either dimension exceeds a small threshold. + * + * Once this threshold is exceeded, either the horizontal or vertical delta is greater. + * - If the horizontal distance is greater, this is a swipe and `move` and `end` events follow. + * - If the vertical distance is greater, this is a scroll, and we let the browser take over. + * A `cancel` event is sent. + * + * `move` is called on `mousemove` and `touchmove` after the above logic has determined that + * a swipe is in progress. + * + * `end` is called when a swipe is successfully completed with a `touchend` or `mouseup`. + * + * `cancel` is called either on a `touchcancel` from the browser, or when we begin scrolling + * as described above. + * + */ + bind: function(element, eventHandlers, pointerTypes) { + // Absolute total movement, used to control swipe vs. scroll. + var totalX, totalY; + // Coordinates of the start position. + var startCoords; + // Last event's position. + var lastPos; + // Whether a swipe is active. + var active = false; + + pointerTypes = pointerTypes || ['mouse', 'touch']; + element.on(getEvents(pointerTypes, 'start'), function(event) { + startCoords = getCoordinates(event); + active = true; + totalX = 0; + totalY = 0; + lastPos = startCoords; + eventHandlers['start'] && eventHandlers['start'](startCoords, event); + }); + var events = getEvents(pointerTypes, 'cancel'); + if (events) { + element.on(events, function(event) { + active = false; + eventHandlers['cancel'] && eventHandlers['cancel'](event); + }); + } + + element.on(getEvents(pointerTypes, 'move'), function(event) { + if (!active) return; + + // Android will send a touchcancel if it thinks we're starting to scroll. + // So when the total distance (+ or - or both) exceeds 10px in either direction, + // we either: + // - On totalX > totalY, we send preventDefault() and treat this as a swipe. + // - On totalY > totalX, we let the browser handle it as a scroll. + + if (!startCoords) return; + var coords = getCoordinates(event); + + totalX += Math.abs(coords.x - lastPos.x); + totalY += Math.abs(coords.y - lastPos.y); + + lastPos = coords; + + if (totalX < MOVE_BUFFER_RADIUS && totalY < MOVE_BUFFER_RADIUS) { + return; + } + + // One of totalX or totalY has exceeded the buffer, so decide on swipe vs. scroll. + if (totalY > totalX) { + // Allow native scrolling to take over. + active = false; + eventHandlers['cancel'] && eventHandlers['cancel'](event); + return; + } else { + // Prevent the browser from scrolling. + event.preventDefault(); + eventHandlers['move'] && eventHandlers['move'](coords, event); + } + }); + + element.on(getEvents(pointerTypes, 'end'), function(event) { + if (!active) return; + active = false; + eventHandlers['end'] && eventHandlers['end'](getCoordinates(event), event); + }); + } + }; +}]); + +/* global ngTouch: false, + nodeName_: false +*/ + +/** + * @ngdoc directive + * @name ngClick + * + * @description + * A more powerful replacement for the default ngClick designed to be used on touchscreen + * devices. Most mobile browsers wait about 300ms after a tap-and-release before sending + * the click event. This version handles them immediately, and then prevents the + * following click event from propagating. + * + * Requires the {@link ngTouch `ngTouch`} module to be installed. + * + * This directive can fall back to using an ordinary click event, and so works on desktop + * browsers as well as mobile. + * + * This directive also sets the CSS class `ng-click-active` while the element is being held + * down (by a mouse click or touch) so you can restyle the depressed element if you wish. + * + * @element ANY + * @param {expression} ngClick {@link guide/expression Expression} to evaluate + * upon tap. (Event object is available as `$event`) + * + * @example + + + + count: {{ count }} + + + angular.module('ngClickExample', ['ngTouch']); + + + */ + +ngTouch.config(['$provide', function($provide) { + $provide.decorator('ngClickDirective', ['$delegate', function($delegate) { + // drop the default ngClick directive + $delegate.shift(); + return $delegate; + }]); +}]); + +ngTouch.directive('ngClick', ['$parse', '$timeout', '$rootElement', + function($parse, $timeout, $rootElement) { + var TAP_DURATION = 750; // Shorter than 750ms is a tap, longer is a taphold or drag. + var MOVE_TOLERANCE = 12; // 12px seems to work in most mobile browsers. + var PREVENT_DURATION = 2500; // 2.5 seconds maximum from preventGhostClick call to click + var CLICKBUSTER_THRESHOLD = 25; // 25 pixels in any dimension is the limit for busting clicks. + + var ACTIVE_CLASS_NAME = 'ng-click-active'; + var lastPreventedTime; + var touchCoordinates; + var lastLabelClickCoordinates; + + + // TAP EVENTS AND GHOST CLICKS + // + // Why tap events? + // Mobile browsers detect a tap, then wait a moment (usually ~300ms) to see if you're + // double-tapping, and then fire a click event. + // + // This delay sucks and makes mobile apps feel unresponsive. + // So we detect touchstart, touchcancel and touchend ourselves and determine when + // the user has tapped on something. + // + // What happens when the browser then generates a click event? + // The browser, of course, also detects the tap and fires a click after a delay. This results in + // tapping/clicking twice. We do "clickbusting" to prevent it. + // + // How does it work? + // We attach global touchstart and click handlers, that run during the capture (early) phase. + // So the sequence for a tap is: + // - global touchstart: Sets an "allowable region" at the point touched. + // - element's touchstart: Starts a touch + // (- touchcancel ends the touch, no click follows) + // - element's touchend: Determines if the tap is valid (didn't move too far away, didn't hold + // too long) and fires the user's tap handler. The touchend also calls preventGhostClick(). + // - preventGhostClick() removes the allowable region the global touchstart created. + // - The browser generates a click event. + // - The global click handler catches the click, and checks whether it was in an allowable region. + // - If preventGhostClick was called, the region will have been removed, the click is busted. + // - If the region is still there, the click proceeds normally. Therefore clicks on links and + // other elements without ngTap on them work normally. + // + // This is an ugly, terrible hack! + // Yeah, tell me about it. The alternatives are using the slow click events, or making our users + // deal with the ghost clicks, so I consider this the least of evils. Fortunately Angular + // encapsulates this ugly logic away from the user. + // + // Why not just put click handlers on the element? + // We do that too, just to be sure. If the tap event caused the DOM to change, + // it is possible another element is now in that position. To take account for these possibly + // distinct elements, the handlers are global and care only about coordinates. + + // Checks if the coordinates are close enough to be within the region. + function hit(x1, y1, x2, y2) { + return Math.abs(x1 - x2) < CLICKBUSTER_THRESHOLD && Math.abs(y1 - y2) < CLICKBUSTER_THRESHOLD; + } + + // Checks a list of allowable regions against a click location. + // Returns true if the click should be allowed. + // Splices out the allowable region from the list after it has been used. + function checkAllowableRegions(touchCoordinates, x, y) { + for (var i = 0; i < touchCoordinates.length; i += 2) { + if (hit(touchCoordinates[i], touchCoordinates[i + 1], x, y)) { + touchCoordinates.splice(i, i + 2); + return true; // allowable region + } + } + return false; // No allowable region; bust it. + } + + // Global click handler that prevents the click if it's in a bustable zone and preventGhostClick + // was called recently. + function onClick(event) { + if (Date.now() - lastPreventedTime > PREVENT_DURATION) { + return; // Too old. + } + + var touches = event.touches && event.touches.length ? event.touches : [event]; + var x = touches[0].clientX; + var y = touches[0].clientY; + // Work around desktop Webkit quirk where clicking a label will fire two clicks (on the label + // and on the input element). Depending on the exact browser, this second click we don't want + // to bust has either (0,0), negative coordinates, or coordinates equal to triggering label + // click event + if (x < 1 && y < 1) { + return; // offscreen + } + if (lastLabelClickCoordinates && + lastLabelClickCoordinates[0] === x && lastLabelClickCoordinates[1] === y) { + return; // input click triggered by label click + } + // reset label click coordinates on first subsequent click + if (lastLabelClickCoordinates) { + lastLabelClickCoordinates = null; + } + // remember label click coordinates to prevent click busting of trigger click event on input + if (nodeName_(event.target) === 'label') { + lastLabelClickCoordinates = [x, y]; + } + + // Look for an allowable region containing this click. + // If we find one, that means it was created by touchstart and not removed by + // preventGhostClick, so we don't bust it. + if (checkAllowableRegions(touchCoordinates, x, y)) { + return; + } + + // If we didn't find an allowable region, bust the click. + event.stopPropagation(); + event.preventDefault(); + + // Blur focused form elements + event.target && event.target.blur && event.target.blur(); + } + + + // Global touchstart handler that creates an allowable region for a click event. + // This allowable region can be removed by preventGhostClick if we want to bust it. + function onTouchStart(event) { + var touches = event.touches && event.touches.length ? event.touches : [event]; + var x = touches[0].clientX; + var y = touches[0].clientY; + touchCoordinates.push(x, y); + + $timeout(function() { + // Remove the allowable region. + for (var i = 0; i < touchCoordinates.length; i += 2) { + if (touchCoordinates[i] == x && touchCoordinates[i + 1] == y) { + touchCoordinates.splice(i, i + 2); + return; + } + } + }, PREVENT_DURATION, false); + } + + // On the first call, attaches some event handlers. Then whenever it gets called, it creates a + // zone around the touchstart where clicks will get busted. + function preventGhostClick(x, y) { + if (!touchCoordinates) { + $rootElement[0].addEventListener('click', onClick, true); + $rootElement[0].addEventListener('touchstart', onTouchStart, true); + touchCoordinates = []; + } + + lastPreventedTime = Date.now(); + + checkAllowableRegions(touchCoordinates, x, y); + } + + // Actual linking function. + return function(scope, element, attr) { + var clickHandler = $parse(attr.ngClick), + tapping = false, + tapElement, // Used to blur the element after a tap. + startTime, // Used to check if the tap was held too long. + touchStartX, + touchStartY; + + function resetState() { + tapping = false; + element.removeClass(ACTIVE_CLASS_NAME); + } + + element.on('touchstart', function(event) { + tapping = true; + tapElement = event.target ? event.target : event.srcElement; // IE uses srcElement. + // Hack for Safari, which can target text nodes instead of containers. + if (tapElement.nodeType == 3) { + tapElement = tapElement.parentNode; + } + + element.addClass(ACTIVE_CLASS_NAME); + + startTime = Date.now(); + + // Use jQuery originalEvent + var originalEvent = event.originalEvent || event; + var touches = originalEvent.touches && originalEvent.touches.length ? originalEvent.touches : [originalEvent]; + var e = touches[0]; + touchStartX = e.clientX; + touchStartY = e.clientY; + }); + + element.on('touchcancel', function(event) { + resetState(); + }); + + element.on('touchend', function(event) { + var diff = Date.now() - startTime; + + // Use jQuery originalEvent + var originalEvent = event.originalEvent || event; + var touches = (originalEvent.changedTouches && originalEvent.changedTouches.length) ? + originalEvent.changedTouches : + ((originalEvent.touches && originalEvent.touches.length) ? originalEvent.touches : [originalEvent]); + var e = touches[0]; + var x = e.clientX; + var y = e.clientY; + var dist = Math.sqrt(Math.pow(x - touchStartX, 2) + Math.pow(y - touchStartY, 2)); + + if (tapping && diff < TAP_DURATION && dist < MOVE_TOLERANCE) { + // Call preventGhostClick so the clickbuster will catch the corresponding click. + preventGhostClick(x, y); + + // Blur the focused element (the button, probably) before firing the callback. + // This doesn't work perfectly on Android Chrome, but seems to work elsewhere. + // I couldn't get anything to work reliably on Android Chrome. + if (tapElement) { + tapElement.blur(); + } + + if (!angular.isDefined(attr.disabled) || attr.disabled === false) { + element.triggerHandler('click', [event]); + } + } + + resetState(); + }); + + // Hack for iOS Safari's benefit. It goes searching for onclick handlers and is liable to click + // something else nearby. + element.onclick = function(event) { }; + + // Actual click handler. + // There are three different kinds of clicks, only two of which reach this point. + // - On desktop browsers without touch events, their clicks will always come here. + // - On mobile browsers, the simulated "fast" click will call this. + // - But the browser's follow-up slow click will be "busted" before it reaches this handler. + // Therefore it's safe to use this directive on both mobile and desktop. + element.on('click', function(event, touchend) { + scope.$apply(function() { + clickHandler(scope, {$event: (touchend || event)}); + }); + }); + + element.on('mousedown', function(event) { + element.addClass(ACTIVE_CLASS_NAME); + }); + + element.on('mousemove mouseup', function(event) { + element.removeClass(ACTIVE_CLASS_NAME); + }); + + }; +}]); + +/* global ngTouch: false */ + +/** + * @ngdoc directive + * @name ngSwipeLeft + * + * @description + * Specify custom behavior when an element is swiped to the left on a touchscreen device. + * A leftward swipe is a quick, right-to-left slide of the finger. + * Though ngSwipeLeft is designed for touch-based devices, it will work with a mouse click and drag + * too. + * + * To disable the mouse click and drag functionality, add `ng-swipe-disable-mouse` to + * the `ng-swipe-left` or `ng-swipe-right` DOM Element. + * + * Requires the {@link ngTouch `ngTouch`} module to be installed. + * + * @element ANY + * @param {expression} ngSwipeLeft {@link guide/expression Expression} to evaluate + * upon left swipe. (Event object is available as `$event`) + * + * @example + + +
    + Some list content, like an email in the inbox +
    +
    + + +
    +     + + angular.module('ngSwipeLeftExample', ['ngTouch']); + +     + */ + +/** + * @ngdoc directive + * @name ngSwipeRight + * + * @description + * Specify custom behavior when an element is swiped to the right on a touchscreen device. + * A rightward swipe is a quick, left-to-right slide of the finger. + * Though ngSwipeRight is designed for touch-based devices, it will work with a mouse click and drag + * too. + * + * Requires the {@link ngTouch `ngTouch`} module to be installed. + * + * @element ANY + * @param {expression} ngSwipeRight {@link guide/expression Expression} to evaluate + * upon right swipe. (Event object is available as `$event`) + * + * @example + + +
    + Some list content, like an email in the inbox +
    +
    + + +
    +     + + angular.module('ngSwipeRightExample', ['ngTouch']); + +     + */ + +function makeSwipeDirective(directiveName, direction, eventName) { + ngTouch.directive(directiveName, ['$parse', '$swipe', function($parse, $swipe) { + // The maximum vertical delta for a swipe should be less than 75px. + var MAX_VERTICAL_DISTANCE = 75; + // Vertical distance should not be more than a fraction of the horizontal distance. + var MAX_VERTICAL_RATIO = 0.3; + // At least a 30px lateral motion is necessary for a swipe. + var MIN_HORIZONTAL_DISTANCE = 30; + + return function(scope, element, attr) { + var swipeHandler = $parse(attr[directiveName]); + + var startCoords, valid; + + function validSwipe(coords) { + // Check that it's within the coordinates. + // Absolute vertical distance must be within tolerances. + // Horizontal distance, we take the current X - the starting X. + // This is negative for leftward swipes and positive for rightward swipes. + // After multiplying by the direction (-1 for left, +1 for right), legal swipes + // (ie. same direction as the directive wants) will have a positive delta and + // illegal ones a negative delta. + // Therefore this delta must be positive, and larger than the minimum. + if (!startCoords) return false; + var deltaY = Math.abs(coords.y - startCoords.y); + var deltaX = (coords.x - startCoords.x) * direction; + return valid && // Short circuit for already-invalidated swipes. + deltaY < MAX_VERTICAL_DISTANCE && + deltaX > 0 && + deltaX > MIN_HORIZONTAL_DISTANCE && + deltaY / deltaX < MAX_VERTICAL_RATIO; + } + + var pointerTypes = ['touch']; + if (!angular.isDefined(attr['ngSwipeDisableMouse'])) { + pointerTypes.push('mouse'); + } + $swipe.bind(element, { + 'start': function(coords, event) { + startCoords = coords; + valid = true; + }, + 'cancel': function(event) { + valid = false; + }, + 'end': function(coords, event) { + if (validSwipe(coords)) { + scope.$apply(function() { + element.triggerHandler(eventName); + swipeHandler(scope, {$event: event}); + }); + } + } + }, pointerTypes); + }; + }]); +} + +// Left is negative X-coordinate, right is positive. +makeSwipeDirective('ngSwipeLeft', -1, 'swipeleft'); +makeSwipeDirective('ngSwipeRight', 1, 'swiperight'); + + + +})(window, window.angular); diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/angular.js b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/angular.js new file mode 100755 index 000000000..ee4f99a45 --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/angular.js @@ -0,0 +1,22024 @@ +/** + * @license AngularJS v1.2.25 + * (c) 2010-2014 Google, Inc. http://angularjs.org + * License: MIT + */ +(function(window, document, undefined) {'use strict'; + +/** + * @description + * + * This object provides a utility for producing rich Error messages within + * Angular. It can be called as follows: + * + * var exampleMinErr = minErr('example'); + * throw exampleMinErr('one', 'This {0} is {1}', foo, bar); + * + * The above creates an instance of minErr in the example namespace. The + * resulting error will have a namespaced error code of example.one. The + * resulting error will replace {0} with the value of foo, and {1} with the + * value of bar. The object is not restricted in the number of arguments it can + * take. + * + * If fewer arguments are specified than necessary for interpolation, the extra + * interpolation markers will be preserved in the final string. + * + * Since data will be parsed statically during a build step, some restrictions + * are applied with respect to how minErr instances are created and called. + * Instances should have names of the form namespaceMinErr for a minErr created + * using minErr('namespace') . Error codes, namespaces and template strings + * should all be static strings, not variables or general expressions. + * + * @param {string} module The namespace to use for the new minErr instance. + * @returns {function(code:string, template:string, ...templateArgs): Error} minErr instance + */ + +function minErr(module) { + return function () { + var code = arguments[0], + prefix = '[' + (module ? module + ':' : '') + code + '] ', + template = arguments[1], + templateArgs = arguments, + stringify = function (obj) { + if (typeof obj === 'function') { + return obj.toString().replace(/ \{[\s\S]*$/, ''); + } else if (typeof obj === 'undefined') { + return 'undefined'; + } else if (typeof obj !== 'string') { + return JSON.stringify(obj); + } + return obj; + }, + message, i; + + message = prefix + template.replace(/\{\d+\}/g, function (match) { + var index = +match.slice(1, -1), arg; + + if (index + 2 < templateArgs.length) { + arg = templateArgs[index + 2]; + if (typeof arg === 'function') { + return arg.toString().replace(/ ?\{[\s\S]*$/, ''); + } else if (typeof arg === 'undefined') { + return 'undefined'; + } else if (typeof arg !== 'string') { + return toJson(arg); + } + return arg; + } + return match; + }); + + message = message + '\nhttp://errors.angularjs.org/1.2.25/' + + (module ? module + '/' : '') + code; + for (i = 2; i < arguments.length; i++) { + message = message + (i == 2 ? '?' : '&') + 'p' + (i-2) + '=' + + encodeURIComponent(stringify(arguments[i])); + } + + return new Error(message); + }; +} + +/* We need to tell jshint what variables are being exported */ +/* global angular: true, + msie: true, + jqLite: true, + jQuery: true, + slice: true, + push: true, + toString: true, + ngMinErr: true, + angularModule: true, + nodeName_: true, + uid: true, + VALIDITY_STATE_PROPERTY: true, + + lowercase: true, + uppercase: true, + manualLowercase: true, + manualUppercase: true, + nodeName_: true, + isArrayLike: true, + forEach: true, + sortedKeys: true, + forEachSorted: true, + reverseParams: true, + nextUid: true, + setHashKey: true, + extend: true, + int: true, + inherit: true, + noop: true, + identity: true, + valueFn: true, + isUndefined: true, + isDefined: true, + isObject: true, + isString: true, + isNumber: true, + isDate: true, + isArray: true, + isFunction: true, + isRegExp: true, + isWindow: true, + isScope: true, + isFile: true, + isBlob: true, + isBoolean: true, + isPromiseLike: true, + trim: true, + isElement: true, + makeMap: true, + map: true, + size: true, + includes: true, + indexOf: true, + arrayRemove: true, + isLeafNode: true, + copy: true, + shallowCopy: true, + equals: true, + csp: true, + concat: true, + sliceArgs: true, + bind: true, + toJsonReplacer: true, + toJson: true, + fromJson: true, + toBoolean: true, + startingTag: true, + tryDecodeURIComponent: true, + parseKeyValue: true, + toKeyValue: true, + encodeUriSegment: true, + encodeUriQuery: true, + angularInit: true, + bootstrap: true, + snake_case: true, + bindJQuery: true, + assertArg: true, + assertArgFn: true, + assertNotHasOwnProperty: true, + getter: true, + getBlockElements: true, + hasOwnProperty: true, +*/ + +//////////////////////////////////// + +/** + * @ngdoc module + * @name ng + * @module ng + * @description + * + * # ng (core module) + * The ng module is loaded by default when an AngularJS application is started. The module itself + * contains the essential components for an AngularJS application to function. The table below + * lists a high level breakdown of each of the services/factories, filters, directives and testing + * components available within this core module. + * + *
    + */ + +// The name of a form control's ValidityState property. +// This is used so that it's possible for internal tests to create mock ValidityStates. +var VALIDITY_STATE_PROPERTY = 'validity'; + +/** + * @ngdoc function + * @name angular.lowercase + * @module ng + * @kind function + * + * @description Converts the specified string to lowercase. + * @param {string} string String to be converted to lowercase. + * @returns {string} Lowercased string. + */ +var lowercase = function(string){return isString(string) ? string.toLowerCase() : string;}; +var hasOwnProperty = Object.prototype.hasOwnProperty; + +/** + * @ngdoc function + * @name angular.uppercase + * @module ng + * @kind function + * + * @description Converts the specified string to uppercase. + * @param {string} string String to be converted to uppercase. + * @returns {string} Uppercased string. + */ +var uppercase = function(string){return isString(string) ? string.toUpperCase() : string;}; + + +var manualLowercase = function(s) { + /* jshint bitwise: false */ + return isString(s) + ? s.replace(/[A-Z]/g, function(ch) {return String.fromCharCode(ch.charCodeAt(0) | 32);}) + : s; +}; +var manualUppercase = function(s) { + /* jshint bitwise: false */ + return isString(s) + ? s.replace(/[a-z]/g, function(ch) {return String.fromCharCode(ch.charCodeAt(0) & ~32);}) + : s; +}; + + +// String#toLowerCase and String#toUpperCase don't produce correct results in browsers with Turkish +// locale, for this reason we need to detect this case and redefine lowercase/uppercase methods +// with correct but slower alternatives. +if ('i' !== 'I'.toLowerCase()) { + lowercase = manualLowercase; + uppercase = manualUppercase; +} + + +var /** holds major version number for IE or NaN for real browsers */ + msie, + jqLite, // delay binding since jQuery could be loaded after us. + jQuery, // delay binding + slice = [].slice, + push = [].push, + toString = Object.prototype.toString, + ngMinErr = minErr('ng'), + + /** @name angular */ + angular = window.angular || (window.angular = {}), + angularModule, + nodeName_, + uid = ['0', '0', '0']; + +/** + * IE 11 changed the format of the UserAgent string. + * See http://msdn.microsoft.com/en-us/library/ms537503.aspx + */ +msie = int((/msie (\d+)/.exec(lowercase(navigator.userAgent)) || [])[1]); +if (isNaN(msie)) { + msie = int((/trident\/.*; rv:(\d+)/.exec(lowercase(navigator.userAgent)) || [])[1]); +} + + +/** + * @private + * @param {*} obj + * @return {boolean} Returns true if `obj` is an array or array-like object (NodeList, Arguments, + * String ...) + */ +function isArrayLike(obj) { + if (obj == null || isWindow(obj)) { + return false; + } + + var length = obj.length; + + if (obj.nodeType === 1 && length) { + return true; + } + + return isString(obj) || isArray(obj) || length === 0 || + typeof length === 'number' && length > 0 && (length - 1) in obj; +} + +/** + * @ngdoc function + * @name angular.forEach + * @module ng + * @kind function + * + * @description + * Invokes the `iterator` function once for each item in `obj` collection, which can be either an + * object or an array. The `iterator` function is invoked with `iterator(value, key)`, where `value` + * is the value of an object property or an array element and `key` is the object property key or + * array element index. Specifying a `context` for the function is optional. + * + * It is worth noting that `.forEach` does not iterate over inherited properties because it filters + * using the `hasOwnProperty` method. + * + ```js + var values = {name: 'misko', gender: 'male'}; + var log = []; + angular.forEach(values, function(value, key) { + this.push(key + ': ' + value); + }, log); + expect(log).toEqual(['name: misko', 'gender: male']); + ``` + * + * @param {Object|Array} obj Object to iterate over. + * @param {Function} iterator Iterator function. + * @param {Object=} context Object to become context (`this`) for the iterator function. + * @returns {Object|Array} Reference to `obj`. + */ +function forEach(obj, iterator, context) { + var key; + if (obj) { + if (isFunction(obj)) { + for (key in obj) { + // Need to check if hasOwnProperty exists, + // as on IE8 the result of querySelectorAll is an object without a hasOwnProperty function + if (key != 'prototype' && key != 'length' && key != 'name' && (!obj.hasOwnProperty || obj.hasOwnProperty(key))) { + iterator.call(context, obj[key], key); + } + } + } else if (isArray(obj) || isArrayLike(obj)) { + for (key = 0; key < obj.length; key++) { + iterator.call(context, obj[key], key); + } + } else if (obj.forEach && obj.forEach !== forEach) { + obj.forEach(iterator, context); + } else { + for (key in obj) { + if (obj.hasOwnProperty(key)) { + iterator.call(context, obj[key], key); + } + } + } + } + return obj; +} + +function sortedKeys(obj) { + var keys = []; + for (var key in obj) { + if (obj.hasOwnProperty(key)) { + keys.push(key); + } + } + return keys.sort(); +} + +function forEachSorted(obj, iterator, context) { + var keys = sortedKeys(obj); + for ( var i = 0; i < keys.length; i++) { + iterator.call(context, obj[keys[i]], keys[i]); + } + return keys; +} + + +/** + * when using forEach the params are value, key, but it is often useful to have key, value. + * @param {function(string, *)} iteratorFn + * @returns {function(*, string)} + */ +function reverseParams(iteratorFn) { + return function(value, key) { iteratorFn(key, value); }; +} + +/** + * A consistent way of creating unique IDs in angular. The ID is a sequence of alpha numeric + * characters such as '012ABC'. The reason why we are not using simply a number counter is that + * the number string gets longer over time, and it can also overflow, where as the nextId + * will grow much slower, it is a string, and it will never overflow. + * + * @returns {string} an unique alpha-numeric string + */ +function nextUid() { + var index = uid.length; + var digit; + + while(index) { + index--; + digit = uid[index].charCodeAt(0); + if (digit == 57 /*'9'*/) { + uid[index] = 'A'; + return uid.join(''); + } + if (digit == 90 /*'Z'*/) { + uid[index] = '0'; + } else { + uid[index] = String.fromCharCode(digit + 1); + return uid.join(''); + } + } + uid.unshift('0'); + return uid.join(''); +} + + +/** + * Set or clear the hashkey for an object. + * @param obj object + * @param h the hashkey (!truthy to delete the hashkey) + */ +function setHashKey(obj, h) { + if (h) { + obj.$$hashKey = h; + } + else { + delete obj.$$hashKey; + } +} + +/** + * @ngdoc function + * @name angular.extend + * @module ng + * @kind function + * + * @description + * Extends the destination object `dst` by copying all of the properties from the `src` object(s) + * to `dst`. You can specify multiple `src` objects. + * + * @param {Object} dst Destination object. + * @param {...Object} src Source object(s). + * @returns {Object} Reference to `dst`. + */ +function extend(dst) { + var h = dst.$$hashKey; + forEach(arguments, function(obj) { + if (obj !== dst) { + forEach(obj, function(value, key) { + dst[key] = value; + }); + } + }); + + setHashKey(dst,h); + return dst; +} + +function int(str) { + return parseInt(str, 10); +} + + +function inherit(parent, extra) { + return extend(new (extend(function() {}, {prototype:parent}))(), extra); +} + +/** + * @ngdoc function + * @name angular.noop + * @module ng + * @kind function + * + * @description + * A function that performs no operations. This function can be useful when writing code in the + * functional style. + ```js + function foo(callback) { + var result = calculateResult(); + (callback || angular.noop)(result); + } + ``` + */ +function noop() {} +noop.$inject = []; + + +/** + * @ngdoc function + * @name angular.identity + * @module ng + * @kind function + * + * @description + * A function that returns its first argument. This function is useful when writing code in the + * functional style. + * + ```js + function transformer(transformationFn, value) { + return (transformationFn || angular.identity)(value); + }; + ``` + */ +function identity($) {return $;} +identity.$inject = []; + + +function valueFn(value) {return function() {return value;};} + +/** + * @ngdoc function + * @name angular.isUndefined + * @module ng + * @kind function + * + * @description + * Determines if a reference is undefined. + * + * @param {*} value Reference to check. + * @returns {boolean} True if `value` is undefined. + */ +function isUndefined(value){return typeof value === 'undefined';} + + +/** + * @ngdoc function + * @name angular.isDefined + * @module ng + * @kind function + * + * @description + * Determines if a reference is defined. + * + * @param {*} value Reference to check. + * @returns {boolean} True if `value` is defined. + */ +function isDefined(value){return typeof value !== 'undefined';} + + +/** + * @ngdoc function + * @name angular.isObject + * @module ng + * @kind function + * + * @description + * Determines if a reference is an `Object`. Unlike `typeof` in JavaScript, `null`s are not + * considered to be objects. Note that JavaScript arrays are objects. + * + * @param {*} value Reference to check. + * @returns {boolean} True if `value` is an `Object` but not `null`. + */ +function isObject(value){return value != null && typeof value === 'object';} + + +/** + * @ngdoc function + * @name angular.isString + * @module ng + * @kind function + * + * @description + * Determines if a reference is a `String`. + * + * @param {*} value Reference to check. + * @returns {boolean} True if `value` is a `String`. + */ +function isString(value){return typeof value === 'string';} + + +/** + * @ngdoc function + * @name angular.isNumber + * @module ng + * @kind function + * + * @description + * Determines if a reference is a `Number`. + * + * @param {*} value Reference to check. + * @returns {boolean} True if `value` is a `Number`. + */ +function isNumber(value){return typeof value === 'number';} + + +/** + * @ngdoc function + * @name angular.isDate + * @module ng + * @kind function + * + * @description + * Determines if a value is a date. + * + * @param {*} value Reference to check. + * @returns {boolean} True if `value` is a `Date`. + */ +function isDate(value) { + return toString.call(value) === '[object Date]'; +} + + +/** + * @ngdoc function + * @name angular.isArray + * @module ng + * @kind function + * + * @description + * Determines if a reference is an `Array`. + * + * @param {*} value Reference to check. + * @returns {boolean} True if `value` is an `Array`. + */ +var isArray = (function() { + if (!isFunction(Array.isArray)) { + return function(value) { + return toString.call(value) === '[object Array]'; + }; + } + return Array.isArray; +})(); + +/** + * @ngdoc function + * @name angular.isFunction + * @module ng + * @kind function + * + * @description + * Determines if a reference is a `Function`. + * + * @param {*} value Reference to check. + * @returns {boolean} True if `value` is a `Function`. + */ +function isFunction(value){return typeof value === 'function';} + + +/** + * Determines if a value is a regular expression object. + * + * @private + * @param {*} value Reference to check. + * @returns {boolean} True if `value` is a `RegExp`. + */ +function isRegExp(value) { + return toString.call(value) === '[object RegExp]'; +} + + +/** + * Checks if `obj` is a window object. + * + * @private + * @param {*} obj Object to check + * @returns {boolean} True if `obj` is a window obj. + */ +function isWindow(obj) { + return obj && obj.document && obj.location && obj.alert && obj.setInterval; +} + + +function isScope(obj) { + return obj && obj.$evalAsync && obj.$watch; +} + + +function isFile(obj) { + return toString.call(obj) === '[object File]'; +} + + +function isBlob(obj) { + return toString.call(obj) === '[object Blob]'; +} + + +function isBoolean(value) { + return typeof value === 'boolean'; +} + + +function isPromiseLike(obj) { + return obj && isFunction(obj.then); +} + + +var trim = (function() { + // native trim is way faster: http://jsperf.com/angular-trim-test + // but IE doesn't have it... :-( + // TODO: we should move this into IE/ES5 polyfill + if (!String.prototype.trim) { + return function(value) { + return isString(value) ? value.replace(/^\s\s*/, '').replace(/\s\s*$/, '') : value; + }; + } + return function(value) { + return isString(value) ? value.trim() : value; + }; +})(); + + +/** + * @ngdoc function + * @name angular.isElement + * @module ng + * @kind function + * + * @description + * Determines if a reference is a DOM element (or wrapped jQuery element). + * + * @param {*} value Reference to check. + * @returns {boolean} True if `value` is a DOM element (or wrapped jQuery element). + */ +function isElement(node) { + return !!(node && + (node.nodeName // we are a direct element + || (node.prop && node.attr && node.find))); // we have an on and find method part of jQuery API +} + +/** + * @param str 'key1,key2,...' + * @returns {object} in the form of {key1:true, key2:true, ...} + */ +function makeMap(str) { + var obj = {}, items = str.split(","), i; + for ( i = 0; i < items.length; i++ ) + obj[ items[i] ] = true; + return obj; +} + + +if (msie < 9) { + nodeName_ = function(element) { + element = element.nodeName ? element : element[0]; + return (element.scopeName && element.scopeName != 'HTML') + ? uppercase(element.scopeName + ':' + element.nodeName) : element.nodeName; + }; +} else { + nodeName_ = function(element) { + return element.nodeName ? element.nodeName : element[0].nodeName; + }; +} + + +function map(obj, iterator, context) { + var results = []; + forEach(obj, function(value, index, list) { + results.push(iterator.call(context, value, index, list)); + }); + return results; +} + + +/** + * @description + * Determines the number of elements in an array, the number of properties an object has, or + * the length of a string. + * + * Note: This function is used to augment the Object type in Angular expressions. See + * {@link angular.Object} for more information about Angular arrays. + * + * @param {Object|Array|string} obj Object, array, or string to inspect. + * @param {boolean} [ownPropsOnly=false] Count only "own" properties in an object + * @returns {number} The size of `obj` or `0` if `obj` is neither an object nor an array. + */ +function size(obj, ownPropsOnly) { + var count = 0, key; + + if (isArray(obj) || isString(obj)) { + return obj.length; + } else if (isObject(obj)) { + for (key in obj) + if (!ownPropsOnly || obj.hasOwnProperty(key)) + count++; + } + + return count; +} + + +function includes(array, obj) { + return indexOf(array, obj) != -1; +} + +function indexOf(array, obj) { + if (array.indexOf) return array.indexOf(obj); + + for (var i = 0; i < array.length; i++) { + if (obj === array[i]) return i; + } + return -1; +} + +function arrayRemove(array, value) { + var index = indexOf(array, value); + if (index >=0) + array.splice(index, 1); + return value; +} + +function isLeafNode (node) { + if (node) { + switch (node.nodeName) { + case "OPTION": + case "PRE": + case "TITLE": + return true; + } + } + return false; +} + +/** + * @ngdoc function + * @name angular.copy + * @module ng + * @kind function + * + * @description + * Creates a deep copy of `source`, which should be an object or an array. + * + * * If no destination is supplied, a copy of the object or array is created. + * * If a destination is provided, all of its elements (for array) or properties (for objects) + * are deleted and then all elements/properties from the source are copied to it. + * * If `source` is not an object or array (inc. `null` and `undefined`), `source` is returned. + * * If `source` is identical to 'destination' an exception will be thrown. + * + * @param {*} source The source that will be used to make a copy. + * Can be any type, including primitives, `null`, and `undefined`. + * @param {(Object|Array)=} destination Destination into which the source is copied. If + * provided, must be of the same type as `source`. + * @returns {*} The copy or updated `destination`, if `destination` was specified. + * + * @example + + +
    +
    + Name:
    + E-mail:
    + Gender: male + female
    + + +
    + 
    form = {{user | json}}
    + 
    master = {{master | json}}
    +
    + + +     +     + */ +function copy(source, destination, stackSource, stackDest) { + if (isWindow(source) || isScope(source)) { + throw ngMinErr('cpws', + "Can't copy! Making copies of Window or Scope instances is not supported."); + } + + if (!destination) { + destination = source; + if (source) { + if (isArray(source)) { + destination = copy(source, [], stackSource, stackDest); + } else if (isDate(source)) { + destination = new Date(source.getTime()); + } else if (isRegExp(source)) { + destination = new RegExp(source.source, source.toString().match(/[^\/]*$/)[0]); + destination.lastIndex = source.lastIndex; + } else if (isObject(source)) { + destination = copy(source, {}, stackSource, stackDest); + } + } + } else { + if (source === destination) throw ngMinErr('cpi', + "Can't copy! Source and destination are identical."); + + stackSource = stackSource || []; + stackDest = stackDest || []; + + if (isObject(source)) { + var index = indexOf(stackSource, source); + if (index !== -1) return stackDest[index]; + + stackSource.push(source); + stackDest.push(destination); + } + + var result; + if (isArray(source)) { + destination.length = 0; + for ( var i = 0; i < source.length; i++) { + result = copy(source[i], null, stackSource, stackDest); + if (isObject(source[i])) { + stackSource.push(source[i]); + stackDest.push(result); + } + destination.push(result); + } + } else { + var h = destination.$$hashKey; + if (isArray(destination)) { + destination.length = 0; + } else { + forEach(destination, function(value, key) { + delete destination[key]; + }); + } + for ( var key in source) { + result = copy(source[key], null, stackSource, stackDest); + if (isObject(source[key])) { + stackSource.push(source[key]); + stackDest.push(result); + } + destination[key] = result; + } + setHashKey(destination,h); + } + + } + return destination; +} + +/** + * Creates a shallow copy of an object, an array or a primitive + */ +function shallowCopy(src, dst) { + if (isArray(src)) { + dst = dst || []; + + for ( var i = 0; i < src.length; i++) { + dst[i] = src[i]; + } + } else if (isObject(src)) { + dst = dst || {}; + + for (var key in src) { + if (hasOwnProperty.call(src, key) && !(key.charAt(0) === '$' && key.charAt(1) === '$')) { + dst[key] = src[key]; + } + } + } + + return dst || src; +} + + +/** + * @ngdoc function + * @name angular.equals + * @module ng + * @kind function + * + * @description + * Determines if two objects or two values are equivalent. Supports value types, regular + * expressions, arrays and objects. + * + * Two objects or values are considered equivalent if at least one of the following is true: + * + * * Both objects or values pass `===` comparison. + * * Both objects or values are of the same type and all of their properties are equal by + * comparing them with `angular.equals`. + * * Both values are NaN. (In JavaScript, NaN == NaN => false. But we consider two NaN as equal) + * * Both values represent the same regular expression (In JavaScript, + * /abc/ == /abc/ => false. But we consider two regular expressions as equal when their textual + * representation matches). + * + * During a property comparison, properties of `function` type and properties with names + * that begin with `$` are ignored. + * + * Scope and DOMWindow objects are being compared only by identify (`===`). + * + * @param {*} o1 Object or value to compare. + * @param {*} o2 Object or value to compare. + * @returns {boolean} True if arguments are equal. + */ +function equals(o1, o2) { + if (o1 === o2) return true; + if (o1 === null || o2 === null) return false; + if (o1 !== o1 && o2 !== o2) return true; // NaN === NaN + var t1 = typeof o1, t2 = typeof o2, length, key, keySet; + if (t1 == t2) { + if (t1 == 'object') { + if (isArray(o1)) { + if (!isArray(o2)) return false; + if ((length = o1.length) == o2.length) { + for(key=0; key 2 ? sliceArgs(arguments, 2) : []; + if (isFunction(fn) && !(fn instanceof RegExp)) { + return curryArgs.length + ? function() { + return arguments.length + ? fn.apply(self, curryArgs.concat(slice.call(arguments, 0))) + : fn.apply(self, curryArgs); + } + : function() { + return arguments.length + ? fn.apply(self, arguments) + : fn.call(self); + }; + } else { + // in IE, native methods are not functions so they cannot be bound (note: they don't need to be) + return fn; + } +} + + +function toJsonReplacer(key, value) { + var val = value; + + if (typeof key === 'string' && key.charAt(0) === '$') { + val = undefined; + } else if (isWindow(value)) { + val = '$WINDOW'; + } else if (value && document === value) { + val = '$DOCUMENT'; + } else if (isScope(value)) { + val = '$SCOPE'; + } + + return val; +} + + +/** + * @ngdoc function + * @name angular.toJson + * @module ng + * @kind function + * + * @description + * Serializes input into a JSON-formatted string. Properties with leading $ characters will be + * stripped since angular uses this notation internally. + * + * @param {Object|Array|Date|string|number} obj Input to be serialized into JSON. + * @param {boolean=} pretty If set to true, the JSON output will contain newlines and whitespace. + * @returns {string|undefined} JSON-ified string representing `obj`. + */ +function toJson(obj, pretty) { + if (typeof obj === 'undefined') return undefined; + return JSON.stringify(obj, toJsonReplacer, pretty ? ' ' : null); +} + + +/** + * @ngdoc function + * @name angular.fromJson + * @module ng + * @kind function + * + * @description + * Deserializes a JSON string. + * + * @param {string} json JSON string to deserialize. + * @returns {Object|Array|string|number} Deserialized thingy. + */ +function fromJson(json) { + return isString(json) + ? JSON.parse(json) + : json; +} + + +function toBoolean(value) { + if (typeof value === 'function') { + value = true; + } else if (value && value.length !== 0) { + var v = lowercase("" + value); + value = !(v == 'f' || v == '0' || v == 'false' || v == 'no' || v == 'n' || v == '[]'); + } else { + value = false; + } + return value; +} + +/** + * @returns {string} Returns the string representation of the element. + */ +function startingTag(element) { + element = jqLite(element).clone(); + try { + // turns out IE does not let you set .html() on elements which + // are not allowed to have children. So we just ignore it. + element.empty(); + } catch(e) {} + // As Per DOM Standards + var TEXT_NODE = 3; + var elemHtml = jqLite('
    ').append(element).html(); + try { + return element[0].nodeType === TEXT_NODE ? lowercase(elemHtml) : + elemHtml. + match(/^(<[^>]+>)/)[1]. + replace(/^<([\w\-]+)/, function(match, nodeName) { return '<' + lowercase(nodeName); }); + } catch(e) { + return lowercase(elemHtml); + } + +} + + +///////////////////////////////////////////////// + +/** + * Tries to decode the URI component without throwing an exception. + * + * @private + * @param str value potential URI component to check. + * @returns {boolean} True if `value` can be decoded + * with the decodeURIComponent function. + */ +function tryDecodeURIComponent(value) { + try { + return decodeURIComponent(value); + } catch(e) { + // Ignore any invalid uri component + } +} + + +/** + * Parses an escaped url query string into key-value pairs. + * @returns {Object.} + */ +function parseKeyValue(/**string*/keyValue) { + var obj = {}, key_value, key; + forEach((keyValue || "").split('&'), function(keyValue) { + if ( keyValue ) { + key_value = keyValue.replace(/\+/g,'%20').split('='); + key = tryDecodeURIComponent(key_value[0]); + if ( isDefined(key) ) { + var val = isDefined(key_value[1]) ? tryDecodeURIComponent(key_value[1]) : true; + if (!hasOwnProperty.call(obj, key)) { + obj[key] = val; + } else if(isArray(obj[key])) { + obj[key].push(val); + } else { + obj[key] = [obj[key],val]; + } + } + } + }); + return obj; +} + +function toKeyValue(obj) { + var parts = []; + forEach(obj, function(value, key) { + if (isArray(value)) { + forEach(value, function(arrayValue) { + parts.push(encodeUriQuery(key, true) + + (arrayValue === true ? '' : '=' + encodeUriQuery(arrayValue, true))); + }); + } else { + parts.push(encodeUriQuery(key, true) + + (value === true ? '' : '=' + encodeUriQuery(value, true))); + } + }); + return parts.length ? parts.join('&') : ''; +} + + +/** + * We need our custom method because encodeURIComponent is too aggressive and doesn't follow + * http://www.ietf.org/rfc/rfc3986.txt with regards to the character set (pchar) allowed in path + * segments: + * segment = *pchar + * pchar = unreserved / pct-encoded / sub-delims / ":" / "@" + * pct-encoded = "%" HEXDIG HEXDIG + * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~" + * sub-delims = "!" / "$" / "&" / "'" / "(" / ")" + * / "*" / "+" / "," / ";" / "=" + */ +function encodeUriSegment(val) { + return encodeUriQuery(val, true). + replace(/%26/gi, '&'). + replace(/%3D/gi, '='). + replace(/%2B/gi, '+'); +} + + +/** + * This method is intended for encoding *key* or *value* parts of query component. We need a custom + * method because encodeURIComponent is too aggressive and encodes stuff that doesn't have to be + * encoded per http://tools.ietf.org/html/rfc3986: + * query = *( pchar / "/" / "?" ) + * pchar = unreserved / pct-encoded / sub-delims / ":" / "@" + * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~" + * pct-encoded = "%" HEXDIG HEXDIG + * sub-delims = "!" / "$" / "&" / "'" / "(" / ")" + * / "*" / "+" / "," / ";" / "=" + */ +function encodeUriQuery(val, pctEncodeSpaces) { + return encodeURIComponent(val). + replace(/%40/gi, '@'). + replace(/%3A/gi, ':'). + replace(/%24/g, '$'). + replace(/%2C/gi, ','). + replace(/%20/g, (pctEncodeSpaces ? '%20' : '+')); +} + + +/** + * @ngdoc directive + * @name ngApp + * @module ng + * + * @element ANY + * @param {angular.Module} ngApp an optional application + * {@link angular.module module} name to load. + * + * @description + * + * Use this directive to **auto-bootstrap** an AngularJS application. The `ngApp` directive + * designates the **root element** of the application and is typically placed near the root element + * of the page - e.g. on the `` or `` tags. + * + * Only one AngularJS application can be auto-bootstrapped per HTML document. The first `ngApp` + * found in the document will be used to define the root element to auto-bootstrap as an + * application. To run multiple applications in an HTML document you must manually bootstrap them using + * {@link angular.bootstrap} instead. AngularJS applications cannot be nested within each other. + * + * You can specify an **AngularJS module** to be used as the root module for the application. This + * module will be loaded into the {@link auto.$injector} when the application is bootstrapped and + * should contain the application code needed or have dependencies on other modules that will + * contain the code. See {@link angular.module} for more information. + * + * In the example below if the `ngApp` directive were not placed on the `html` element then the + * document would not be compiled, the `AppController` would not be instantiated and the `{{ a+b }}` + * would not be resolved to `3`. + * + * `ngApp` is the easiest, and most common, way to bootstrap an application. + * + + +
    + I can add: {{a}} + {{b}} = {{ a+b }} +
    +     + + angular.module('ngAppDemo', []).controller('ngAppDemoController', function($scope) { + $scope.a = 1; + $scope.b = 2; + }); + +     + * + */ +function angularInit(element, bootstrap) { + var elements = [element], + appElement, + module, + names = ['ng:app', 'ng-app', 'x-ng-app', 'data-ng-app'], + NG_APP_CLASS_REGEXP = /\sng[:\-]app(:\s*([\w\d_]+);?)?\s/; + + function append(element) { + element && elements.push(element); + } + + forEach(names, function(name) { + names[name] = true; + append(document.getElementById(name)); + name = name.replace(':', '\\:'); + if (element.querySelectorAll) { + forEach(element.querySelectorAll('.' + name), append); + forEach(element.querySelectorAll('.' + name + '\\:'), append); + forEach(element.querySelectorAll('[' + name + ']'), append); + } + }); + + forEach(elements, function(element) { + if (!appElement) { + var className = ' ' + element.className + ' '; + var match = NG_APP_CLASS_REGEXP.exec(className); + if (match) { + appElement = element; + module = (match[2] || '').replace(/\s+/g, ','); + } else { + forEach(element.attributes, function(attr) { + if (!appElement && names[attr.name]) { + appElement = element; + module = attr.value; + } + }); + } + } + }); + if (appElement) { + bootstrap(appElement, module ? [module] : []); + } +} + +/** + * @ngdoc function + * @name angular.bootstrap + * @module ng + * @description + * Use this function to manually start up angular application. + * + * See: {@link guide/bootstrap Bootstrap} + * + * Note that ngScenario-based end-to-end tests cannot use this function to bootstrap manually. + * They must use {@link ng.directive:ngApp ngApp}. + * + * Angular will detect if it has been loaded into the browser more than once and only allow the + * first loaded script to be bootstrapped and will report a warning to the browser console for + * each of the subsequent scripts. This prevents strange results in applications, where otherwise + * multiple instances of Angular try to work on the DOM. + * + * + * + * + *
    + * + * + * + * + * + * + * + *
    {{heading}}
    {{fill}}
    + *
    + *     + * + * var app = angular.module('multi-bootstrap', []) + * + * .controller('BrokenTable', function($scope) { + * $scope.headings = ['One', 'Two', 'Three']; + * $scope.fillings = [[1, 2, 3], ['A', 'B', 'C'], [7, 8, 9]]; + * }); + * + * + * it('should only insert one table cell for each item in $scope.fillings', function() { + * expect(element.all(by.css('td')).count()) + * .toBe(9); + * }); + * + *     + * + * @param {DOMElement} element DOM element which is the root of angular application. + * @param {Array=} modules an array of modules to load into the application. + * Each item in the array should be the name of a predefined module or a (DI annotated) + * function that will be invoked by the injector as a run block. + * See: {@link angular.module modules} + * @returns {auto.$injector} Returns the newly created injector for this app. + */ +function bootstrap(element, modules) { + var doBootstrap = function() { + element = jqLite(element); + + if (element.injector()) { + var tag = (element[0] === document) ? 'document' : startingTag(element); + //Encode angle brackets to prevent input from being sanitized to empty string #8683 + throw ngMinErr( + 'btstrpd', + "App Already Bootstrapped with this Element '{0}'", + tag.replace(//,'>')); + } + + modules = modules || []; + modules.unshift(['$provide', function($provide) { + $provide.value('$rootElement', element); + }]); + modules.unshift('ng'); + var injector = createInjector(modules); + injector.invoke(['$rootScope', '$rootElement', '$compile', '$injector', '$animate', + function(scope, element, compile, injector, animate) { + scope.$apply(function() { + element.data('$injector', injector); + compile(element)(scope); + }); + }] + ); + return injector; + }; + + var NG_DEFER_BOOTSTRAP = /^NG_DEFER_BOOTSTRAP!/; + + if (window && !NG_DEFER_BOOTSTRAP.test(window.name)) { + return doBootstrap(); + } + + window.name = window.name.replace(NG_DEFER_BOOTSTRAP, ''); + angular.resumeBootstrap = function(extraModules) { + forEach(extraModules, function(module) { + modules.push(module); + }); + doBootstrap(); + }; +} + +var SNAKE_CASE_REGEXP = /[A-Z]/g; +function snake_case(name, separator) { + separator = separator || '_'; + return name.replace(SNAKE_CASE_REGEXP, function(letter, pos) { + return (pos ? separator : '') + letter.toLowerCase(); + }); +} + +function bindJQuery() { + // bind to jQuery if present; + jQuery = window.jQuery; + // Use jQuery if it exists with proper functionality, otherwise default to us. + // Angular 1.2+ requires jQuery 1.7.1+ for on()/off() support. + if (jQuery && jQuery.fn.on) { + jqLite = jQuery; + extend(jQuery.fn, { + scope: JQLitePrototype.scope, + isolateScope: JQLitePrototype.isolateScope, + controller: JQLitePrototype.controller, + injector: JQLitePrototype.injector, + inheritedData: JQLitePrototype.inheritedData + }); + // Method signature: + // jqLitePatchJQueryRemove(name, dispatchThis, filterElems, getterIfNoArguments) + jqLitePatchJQueryRemove('remove', true, true, false); + jqLitePatchJQueryRemove('empty', false, false, false); + jqLitePatchJQueryRemove('html', false, false, true); + } else { + jqLite = JQLite; + } + angular.element = jqLite; +} + +/** + * throw error if the argument is falsy. + */ +function assertArg(arg, name, reason) { + if (!arg) { + throw ngMinErr('areq', "Argument '{0}' is {1}", (name || '?'), (reason || "required")); + } + return arg; +} + +function assertArgFn(arg, name, acceptArrayAnnotation) { + if (acceptArrayAnnotation && isArray(arg)) { + arg = arg[arg.length - 1]; + } + + assertArg(isFunction(arg), name, 'not a function, got ' + + (arg && typeof arg === 'object' ? arg.constructor.name || 'Object' : typeof arg)); + return arg; +} + +/** + * throw error if the name given is hasOwnProperty + * @param {String} name the name to test + * @param {String} context the context in which the name is used, such as module or directive + */ +function assertNotHasOwnProperty(name, context) { + if (name === 'hasOwnProperty') { + throw ngMinErr('badname', "hasOwnProperty is not a valid {0} name", context); + } +} + +/** + * Return the value accessible from the object by path. Any undefined traversals are ignored + * @param {Object} obj starting object + * @param {String} path path to traverse + * @param {boolean} [bindFnToScope=true] + * @returns {Object} value as accessible by path + */ +//TODO(misko): this function needs to be removed +function getter(obj, path, bindFnToScope) { + if (!path) return obj; + var keys = path.split('.'); + var key; + var lastInstance = obj; + var len = keys.length; + + for (var i = 0; i < len; i++) { + key = keys[i]; + if (obj) { + obj = (lastInstance = obj)[key]; + } + } + if (!bindFnToScope && isFunction(obj)) { + return bind(lastInstance, obj); + } + return obj; +} + +/** + * Return the DOM siblings between the first and last node in the given array. + * @param {Array} array like object + * @returns {DOMElement} object containing the elements + */ +function getBlockElements(nodes) { + var startNode = nodes[0], + endNode = nodes[nodes.length - 1]; + if (startNode === endNode) { + return jqLite(startNode); + } + + var element = startNode; + var elements = [element]; + + do { + element = element.nextSibling; + if (!element) break; + elements.push(element); + } while (element !== endNode); + + return jqLite(elements); +} + +/** + * @ngdoc type + * @name angular.Module + * @module ng + * @description + * + * Interface for configuring angular {@link angular.module modules}. + */ + +function setupModuleLoader(window) { + + var $injectorMinErr = minErr('$injector'); + var ngMinErr = minErr('ng'); + + function ensure(obj, name, factory) { + return obj[name] || (obj[name] = factory()); + } + + var angular = ensure(window, 'angular', Object); + + // We need to expose `angular.$$minErr` to modules such as `ngResource` that reference it during bootstrap + angular.$$minErr = angular.$$minErr || minErr; + + return ensure(angular, 'module', function() { + /** @type {Object.} */ + var modules = {}; + + /** + * @ngdoc function + * @name angular.module + * @module ng + * @description + * + * The `angular.module` is a global place for creating, registering and retrieving Angular + * modules. + * All modules (angular core or 3rd party) that should be available to an application must be + * registered using this mechanism. + * + * When passed two or more arguments, a new module is created. If passed only one argument, an + * existing module (the name passed as the first argument to `module`) is retrieved. + * + * + * # Module + * + * A module is a collection of services, directives, controllers, filters, and configuration information. + * `angular.module` is used to configure the {@link auto.$injector $injector}. + * + * ```js + * // Create a new module + * var myModule = angular.module('myModule', []); + * + * // register a new service + * myModule.value('appName', 'MyCoolApp'); + * + * // configure existing services inside initialization blocks. + * myModule.config(['$locationProvider', function($locationProvider) { + * // Configure existing providers + * $locationProvider.hashPrefix('!'); + * }]); + * ``` + * + * Then you can create an injector and load your modules like this: + * + * ```js + * var injector = angular.injector(['ng', 'myModule']) + * ``` + * + * However it's more likely that you'll just use + * {@link ng.directive:ngApp ngApp} or + * {@link angular.bootstrap} to simplify this process for you. + * + * @param {!string} name The name of the module to create or retrieve. + * @param {!Array.=} requires If specified then new module is being created. If + * unspecified then the module is being retrieved for further configuration. + * @param {Function=} configFn Optional configuration function for the module. Same as + * {@link angular.Module#config Module#config()}. + * @returns {module} new module with the {@link angular.Module} api. + */ + return function module(name, requires, configFn) { + var assertNotHasOwnProperty = function(name, context) { + if (name === 'hasOwnProperty') { + throw ngMinErr('badname', 'hasOwnProperty is not a valid {0} name', context); + } + }; + + assertNotHasOwnProperty(name, 'module'); + if (requires && modules.hasOwnProperty(name)) { + modules[name] = null; + } + return ensure(modules, name, function() { + if (!requires) { + throw $injectorMinErr('nomod', "Module '{0}' is not available! You either misspelled " + + "the module name or forgot to load it. If registering a module ensure that you " + + "specify the dependencies as the second argument.", name); + } + + /** @type {!Array.>} */ + var invokeQueue = []; + + /** @type {!Array.} */ + var runBlocks = []; + + var config = invokeLater('$injector', 'invoke'); + + /** @type {angular.Module} */ + var moduleInstance = { + // Private state + _invokeQueue: invokeQueue, + _runBlocks: runBlocks, + + /** + * @ngdoc property + * @name angular.Module#requires + * @module ng + * + * @description + * Holds the list of modules which the injector will load before the current module is + * loaded. + */ + requires: requires, + + /** + * @ngdoc property + * @name angular.Module#name + * @module ng + * + * @description + * Name of the module. + */ + name: name, + + + /** + * @ngdoc method + * @name angular.Module#provider + * @module ng + * @param {string} name service name + * @param {Function} providerType Construction function for creating new instance of the + * service. + * @description + * See {@link auto.$provide#provider $provide.provider()}. + */ + provider: invokeLater('$provide', 'provider'), + + /** + * @ngdoc method + * @name angular.Module#factory + * @module ng + * @param {string} name service name + * @param {Function} providerFunction Function for creating new instance of the service. + * @description + * See {@link auto.$provide#factory $provide.factory()}. + */ + factory: invokeLater('$provide', 'factory'), + + /** + * @ngdoc method + * @name angular.Module#service + * @module ng + * @param {string} name service name + * @param {Function} constructor A constructor function that will be instantiated. + * @description + * See {@link auto.$provide#service $provide.service()}. + */ + service: invokeLater('$provide', 'service'), + + /** + * @ngdoc method + * @name angular.Module#value + * @module ng + * @param {string} name service name + * @param {*} object Service instance object. + * @description + * See {@link auto.$provide#value $provide.value()}. + */ + value: invokeLater('$provide', 'value'), + + /** + * @ngdoc method + * @name angular.Module#constant + * @module ng + * @param {string} name constant name + * @param {*} object Constant value. + * @description + * Because the constant are fixed, they get applied before other provide methods. + * See {@link auto.$provide#constant $provide.constant()}. + */ + constant: invokeLater('$provide', 'constant', 'unshift'), + + /** + * @ngdoc method + * @name angular.Module#animation + * @module ng + * @param {string} name animation name + * @param {Function} animationFactory Factory function for creating new instance of an + * animation. + * @description + * + * **NOTE**: animations take effect only if the **ngAnimate** module is loaded. + * + * + * Defines an animation hook that can be later used with + * {@link ngAnimate.$animate $animate} service and directives that use this service. + * + * ```js + * module.animation('.animation-name', function($inject1, $inject2) { + * return { + * eventName : function(element, done) { + * //code to run the animation + * //once complete, then run done() + * return function cancellationFunction(element) { + * //code to cancel the animation + * } + * } + * } + * }) + * ``` + * + * See {@link ngAnimate.$animateProvider#register $animateProvider.register()} and + * {@link ngAnimate ngAnimate module} for more information. + */ + animation: invokeLater('$animateProvider', 'register'), + + /** + * @ngdoc method + * @name angular.Module#filter + * @module ng + * @param {string} name Filter name. + * @param {Function} filterFactory Factory function for creating new instance of filter. + * @description + * See {@link ng.$filterProvider#register $filterProvider.register()}. + */ + filter: invokeLater('$filterProvider', 'register'), + + /** + * @ngdoc method + * @name angular.Module#controller + * @module ng + * @param {string|Object} name Controller name, or an object map of controllers where the + * keys are the names and the values are the constructors. + * @param {Function} constructor Controller constructor function. + * @description + * See {@link ng.$controllerProvider#register $controllerProvider.register()}. + */ + controller: invokeLater('$controllerProvider', 'register'), + + /** + * @ngdoc method + * @name angular.Module#directive + * @module ng + * @param {string|Object} name Directive name, or an object map of directives where the + * keys are the names and the values are the factories. + * @param {Function} directiveFactory Factory function for creating new instance of + * directives. + * @description + * See {@link ng.$compileProvider#directive $compileProvider.directive()}. + */ + directive: invokeLater('$compileProvider', 'directive'), + + /** + * @ngdoc method + * @name angular.Module#config + * @module ng + * @param {Function} configFn Execute this function on module load. Useful for service + * configuration. + * @description + * Use this method to register work which needs to be performed on module loading. + * For more about how to configure services, see + * {@link providers#providers_provider-recipe Provider Recipe}. + */ + config: config, + + /** + * @ngdoc method + * @name angular.Module#run + * @module ng + * @param {Function} initializationFn Execute this function after injector creation. + * Useful for application initialization. + * @description + * Use this method to register work which should be performed when the injector is done + * loading all modules. + */ + run: function(block) { + runBlocks.push(block); + return this; + } + }; + + if (configFn) { + config(configFn); + } + + return moduleInstance; + + /** + * @param {string} provider + * @param {string} method + * @param {String=} insertMethod + * @returns {angular.Module} + */ + function invokeLater(provider, method, insertMethod) { + return function() { + invokeQueue[insertMethod || 'push']([provider, method, arguments]); + return moduleInstance; + }; + } + }); + }; + }); + +} + +/* global angularModule: true, + version: true, + + $LocaleProvider, + $CompileProvider, + + htmlAnchorDirective, + inputDirective, + inputDirective, + formDirective, + scriptDirective, + selectDirective, + styleDirective, + optionDirective, + ngBindDirective, + ngBindHtmlDirective, + ngBindTemplateDirective, + ngClassDirective, + ngClassEvenDirective, + ngClassOddDirective, + ngCspDirective, + ngCloakDirective, + ngControllerDirective, + ngFormDirective, + ngHideDirective, + ngIfDirective, + ngIncludeDirective, + ngIncludeFillContentDirective, + ngInitDirective, + ngNonBindableDirective, + ngPluralizeDirective, + ngRepeatDirective, + ngShowDirective, + ngStyleDirective, + ngSwitchDirective, + ngSwitchWhenDirective, + ngSwitchDefaultDirective, + ngOptionsDirective, + ngTranscludeDirective, + ngModelDirective, + ngListDirective, + ngChangeDirective, + requiredDirective, + requiredDirective, + ngValueDirective, + ngAttributeAliasDirectives, + ngEventDirectives, + + $AnchorScrollProvider, + $AnimateProvider, + $BrowserProvider, + $CacheFactoryProvider, + $ControllerProvider, + $DocumentProvider, + $ExceptionHandlerProvider, + $FilterProvider, + $InterpolateProvider, + $IntervalProvider, + $HttpProvider, + $HttpBackendProvider, + $LocationProvider, + $LogProvider, + $ParseProvider, + $RootScopeProvider, + $QProvider, + $$SanitizeUriProvider, + $SceProvider, + $SceDelegateProvider, + $SnifferProvider, + $TemplateCacheProvider, + $TimeoutProvider, + $$RAFProvider, + $$AsyncCallbackProvider, + $WindowProvider +*/ + + +/** + * @ngdoc object + * @name angular.version + * @module ng + * @description + * An object that contains information about the current AngularJS version. This object has the + * following properties: + * + * - `full` – `{string}` – Full version string, such as "0.9.18". + * - `major` – `{number}` – Major version number, such as "0". + * - `minor` – `{number}` – Minor version number, such as "9". + * - `dot` – `{number}` – Dot version number, such as "18". + * - `codeName` – `{string}` – Code name of the release, such as "jiggling-armfat". + */ +var version = { + full: '1.2.25', // all of these placeholder strings will be replaced by grunt's + major: 1, // package task + minor: 2, + dot: 25, + codeName: 'hypnotic-gesticulation' +}; + + +function publishExternalAPI(angular){ + extend(angular, { + 'bootstrap': bootstrap, + 'copy': copy, + 'extend': extend, + 'equals': equals, + 'element': jqLite, + 'forEach': forEach, + 'injector': createInjector, + 'noop': noop, + 'bind': bind, + 'toJson': toJson, + 'fromJson': fromJson, + 'identity': identity, + 'isUndefined': isUndefined, + 'isDefined': isDefined, + 'isString': isString, + 'isFunction': isFunction, + 'isObject': isObject, + 'isNumber': isNumber, + 'isElement': isElement, + 'isArray': isArray, + 'version': version, + 'isDate': isDate, + 'lowercase': lowercase, + 'uppercase': uppercase, + 'callbacks': {counter: 0}, + '$$minErr': minErr, + '$$csp': csp + }); + + angularModule = setupModuleLoader(window); + try { + angularModule('ngLocale'); + } catch (e) { + angularModule('ngLocale', []).provider('$locale', $LocaleProvider); + } + + angularModule('ng', ['ngLocale'], ['$provide', + function ngModule($provide) { + // $$sanitizeUriProvider needs to be before $compileProvider as it is used by it. + $provide.provider({ + $$sanitizeUri: $$SanitizeUriProvider + }); + $provide.provider('$compile', $CompileProvider). + directive({ + a: htmlAnchorDirective, + input: inputDirective, + textarea: inputDirective, + form: formDirective, + script: scriptDirective, + select: selectDirective, + style: styleDirective, + option: optionDirective, + ngBind: ngBindDirective, + ngBindHtml: ngBindHtmlDirective, + ngBindTemplate: ngBindTemplateDirective, + ngClass: ngClassDirective, + ngClassEven: ngClassEvenDirective, + ngClassOdd: ngClassOddDirective, + ngCloak: ngCloakDirective, + ngController: ngControllerDirective, + ngForm: ngFormDirective, + ngHide: ngHideDirective, + ngIf: ngIfDirective, + ngInclude: ngIncludeDirective, + ngInit: ngInitDirective, + ngNonBindable: ngNonBindableDirective, + ngPluralize: ngPluralizeDirective, + ngRepeat: ngRepeatDirective, + ngShow: ngShowDirective, + ngStyle: ngStyleDirective, + ngSwitch: ngSwitchDirective, + ngSwitchWhen: ngSwitchWhenDirective, + ngSwitchDefault: ngSwitchDefaultDirective, + ngOptions: ngOptionsDirective, + ngTransclude: ngTranscludeDirective, + ngModel: ngModelDirective, + ngList: ngListDirective, + ngChange: ngChangeDirective, + required: requiredDirective, + ngRequired: requiredDirective, + ngValue: ngValueDirective + }). + directive({ + ngInclude: ngIncludeFillContentDirective + }). + directive(ngAttributeAliasDirectives). + directive(ngEventDirectives); + $provide.provider({ + $anchorScroll: $AnchorScrollProvider, + $animate: $AnimateProvider, + $browser: $BrowserProvider, + $cacheFactory: $CacheFactoryProvider, + $controller: $ControllerProvider, + $document: $DocumentProvider, + $exceptionHandler: $ExceptionHandlerProvider, + $filter: $FilterProvider, + $interpolate: $InterpolateProvider, + $interval: $IntervalProvider, + $http: $HttpProvider, + $httpBackend: $HttpBackendProvider, + $location: $LocationProvider, + $log: $LogProvider, + $parse: $ParseProvider, + $rootScope: $RootScopeProvider, + $q: $QProvider, + $sce: $SceProvider, + $sceDelegate: $SceDelegateProvider, + $sniffer: $SnifferProvider, + $templateCache: $TemplateCacheProvider, + $timeout: $TimeoutProvider, + $window: $WindowProvider, + $$rAF: $$RAFProvider, + $$asyncCallback : $$AsyncCallbackProvider + }); + } + ]); +} + +/* global JQLitePrototype: true, + addEventListenerFn: true, + removeEventListenerFn: true, + BOOLEAN_ATTR: true +*/ + +////////////////////////////////// +//JQLite +////////////////////////////////// + +/** + * @ngdoc function + * @name angular.element + * @module ng + * @kind function + * + * @description + * Wraps a raw DOM element or HTML string as a [jQuery](http://jquery.com) element. + * + * If jQuery is available, `angular.element` is an alias for the + * [jQuery](http://api.jquery.com/jQuery/) function. If jQuery is not available, `angular.element` + * delegates to Angular's built-in subset of jQuery, called "jQuery lite" or "jqLite." + * + *
    jqLite is a tiny, API-compatible subset of jQuery that allows + * Angular to manipulate the DOM in a cross-browser compatible way. **jqLite** implements only the most + * commonly needed functionality with the goal of having a very small footprint.
    + * + * To use jQuery, simply load it before `DOMContentLoaded` event fired. + * + *
    **Note:** all element references in Angular are always wrapped with jQuery or + * jqLite; they are never raw DOM references.
    + * + * ## Angular's jqLite + * jqLite provides only the following jQuery methods: + * + * - [`addClass()`](http://api.jquery.com/addClass/) + * - [`after()`](http://api.jquery.com/after/) + * - [`append()`](http://api.jquery.com/append/) + * - [`attr()`](http://api.jquery.com/attr/) + * - [`bind()`](http://api.jquery.com/bind/) - Does not support namespaces, selectors or eventData + * - [`children()`](http://api.jquery.com/children/) - Does not support selectors + * - [`clone()`](http://api.jquery.com/clone/) + * - [`contents()`](http://api.jquery.com/contents/) + * - [`css()`](http://api.jquery.com/css/) + * - [`data()`](http://api.jquery.com/data/) + * - [`empty()`](http://api.jquery.com/empty/) + * - [`eq()`](http://api.jquery.com/eq/) + * - [`find()`](http://api.jquery.com/find/) - Limited to lookups by tag name + * - [`hasClass()`](http://api.jquery.com/hasClass/) + * - [`html()`](http://api.jquery.com/html/) + * - [`next()`](http://api.jquery.com/next/) - Does not support selectors + * - [`on()`](http://api.jquery.com/on/) - Does not support namespaces, selectors or eventData + * - [`off()`](http://api.jquery.com/off/) - Does not support namespaces or selectors + * - [`one()`](http://api.jquery.com/one/) - Does not support namespaces or selectors + * - [`parent()`](http://api.jquery.com/parent/) - Does not support selectors + * - [`prepend()`](http://api.jquery.com/prepend/) + * - [`prop()`](http://api.jquery.com/prop/) + * - [`ready()`](http://api.jquery.com/ready/) + * - [`remove()`](http://api.jquery.com/remove/) + * - [`removeAttr()`](http://api.jquery.com/removeAttr/) + * - [`removeClass()`](http://api.jquery.com/removeClass/) + * - [`removeData()`](http://api.jquery.com/removeData/) + * - [`replaceWith()`](http://api.jquery.com/replaceWith/) + * - [`text()`](http://api.jquery.com/text/) + * - [`toggleClass()`](http://api.jquery.com/toggleClass/) + * - [`triggerHandler()`](http://api.jquery.com/triggerHandler/) - Passes a dummy event object to handlers. + * - [`unbind()`](http://api.jquery.com/unbind/) - Does not support namespaces + * - [`val()`](http://api.jquery.com/val/) + * - [`wrap()`](http://api.jquery.com/wrap/) + * + * ## jQuery/jqLite Extras + * Angular also provides the following additional methods and events to both jQuery and jqLite: + * + * ### Events + * - `$destroy` - AngularJS intercepts all jqLite/jQuery's DOM destruction apis and fires this event + * on all DOM nodes being removed. This can be used to clean up any 3rd party bindings to the DOM + * element before it is removed. + * + * ### Methods + * - `controller(name)` - retrieves the controller of the current element or its parent. By default + * retrieves controller associated with the `ngController` directive. If `name` is provided as + * camelCase directive name, then the controller for this directive will be retrieved (e.g. + * `'ngModel'`). + * - `injector()` - retrieves the injector of the current element or its parent. + * - `scope()` - retrieves the {@link ng.$rootScope.Scope scope} of the current + * element or its parent. + * - `isolateScope()` - retrieves an isolate {@link ng.$rootScope.Scope scope} if one is attached directly to the + * current element. This getter should be used only on elements that contain a directive which starts a new isolate + * scope. Calling `scope()` on this element always returns the original non-isolate scope. + * - `inheritedData()` - same as `data()`, but walks up the DOM until a value is found or the top + * parent element is reached. + * + * @param {string|DOMElement} element HTML string or DOMElement to be wrapped into jQuery. + * @returns {Object} jQuery object. + */ + +JQLite.expando = 'ng339'; + +var jqCache = JQLite.cache = {}, + jqId = 1, + addEventListenerFn = (window.document.addEventListener + ? function(element, type, fn) {element.addEventListener(type, fn, false);} + : function(element, type, fn) {element.attachEvent('on' + type, fn);}), + removeEventListenerFn = (window.document.removeEventListener + ? function(element, type, fn) {element.removeEventListener(type, fn, false); } + : function(element, type, fn) {element.detachEvent('on' + type, fn); }); + +/* + * !!! This is an undocumented "private" function !!! + */ +var jqData = JQLite._data = function(node) { + //jQuery always returns an object on cache miss + return this.cache[node[this.expando]] || {}; +}; + +function jqNextId() { return ++jqId; } + + +var SPECIAL_CHARS_REGEXP = /([\:\-\_]+(.))/g; +var MOZ_HACK_REGEXP = /^moz([A-Z])/; +var jqLiteMinErr = minErr('jqLite'); + +/** + * Converts snake_case to camelCase. + * Also there is special case for Moz prefix starting with upper case letter. + * @param name Name to normalize + */ +function camelCase(name) { + return name. + replace(SPECIAL_CHARS_REGEXP, function(_, separator, letter, offset) { + return offset ? letter.toUpperCase() : letter; + }). + replace(MOZ_HACK_REGEXP, 'Moz$1'); +} + +///////////////////////////////////////////// +// jQuery mutation patch +// +// In conjunction with bindJQuery intercepts all jQuery's DOM destruction apis and fires a +// $destroy event on all DOM nodes being removed. +// +///////////////////////////////////////////// + +function jqLitePatchJQueryRemove(name, dispatchThis, filterElems, getterIfNoArguments) { + var originalJqFn = jQuery.fn[name]; + originalJqFn = originalJqFn.$original || originalJqFn; + removePatch.$original = originalJqFn; + jQuery.fn[name] = removePatch; + + function removePatch(param) { + // jshint -W040 + var list = filterElems && param ? [this.filter(param)] : [this], + fireEvent = dispatchThis, + set, setIndex, setLength, + element, childIndex, childLength, children; + + if (!getterIfNoArguments || param != null) { + while(list.length) { + set = list.shift(); + for(setIndex = 0, setLength = set.length; setIndex < setLength; setIndex++) { + element = jqLite(set[setIndex]); + if (fireEvent) { + element.triggerHandler('$destroy'); + } else { + fireEvent = !fireEvent; + } + for(childIndex = 0, childLength = (children = element.children()).length; + childIndex < childLength; + childIndex++) { + list.push(jQuery(children[childIndex])); + } + } + } + } + return originalJqFn.apply(this, arguments); + } +} + +var SINGLE_TAG_REGEXP = /^<(\w+)\s*\/?>(?:<\/\1>|)$/; +var HTML_REGEXP = /<|&#?\w+;/; +var TAG_NAME_REGEXP = /<([\w:]+)/; +var XHTML_TAG_REGEXP = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi; + +var wrapMap = { + 'option': [1, ''], + + 'thead': [1, '', '
    '], + 'col': [2, '', '
    '], + 'tr': [2, '', '
    '], + 'td': [3, '', '
    '], + '_default': [0, "", ""] +}; + +wrapMap.optgroup = wrapMap.option; +wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; +wrapMap.th = wrapMap.td; + +function jqLiteIsTextNode(html) { + return !HTML_REGEXP.test(html); +} + +function jqLiteBuildFragment(html, context) { + var elem, tmp, tag, wrap, + fragment = context.createDocumentFragment(), + nodes = [], i, j, jj; + + if (jqLiteIsTextNode(html)) { + // Convert non-html into a text node + nodes.push(context.createTextNode(html)); + } else { + tmp = fragment.appendChild(context.createElement('div')); + // Convert html into DOM nodes + tag = (TAG_NAME_REGEXP.exec(html) || ["", ""])[1].toLowerCase(); + wrap = wrapMap[tag] || wrapMap._default; + tmp.innerHTML = '
     
    ' + + wrap[1] + html.replace(XHTML_TAG_REGEXP, "<$1>") + wrap[2]; + tmp.removeChild(tmp.firstChild); + + // Descend through wrappers to the right content + i = wrap[0]; + while (i--) { + tmp = tmp.lastChild; + } + + for (j=0, jj=tmp.childNodes.length; j -1); +} + +function jqLiteRemoveClass(element, cssClasses) { + if (cssClasses && element.setAttribute) { + forEach(cssClasses.split(' '), function(cssClass) { + element.setAttribute('class', trim( + (" " + (element.getAttribute('class') || '') + " ") + .replace(/[\n\t]/g, " ") + .replace(" " + trim(cssClass) + " ", " ")) + ); + }); + } +} + +function jqLiteAddClass(element, cssClasses) { + if (cssClasses && element.setAttribute) { + var existingClasses = (' ' + (element.getAttribute('class') || '') + ' ') + .replace(/[\n\t]/g, " "); + + forEach(cssClasses.split(' '), function(cssClass) { + cssClass = trim(cssClass); + if (existingClasses.indexOf(' ' + cssClass + ' ') === -1) { + existingClasses += cssClass + ' '; + } + }); + + element.setAttribute('class', trim(existingClasses)); + } +} + +function jqLiteAddNodes(root, elements) { + if (elements) { + elements = (!elements.nodeName && isDefined(elements.length) && !isWindow(elements)) + ? elements + : [ elements ]; + for(var i=0; i < elements.length; i++) { + root.push(elements[i]); + } + } +} + +function jqLiteController(element, name) { + return jqLiteInheritedData(element, '$' + (name || 'ngController' ) + 'Controller'); +} + +function jqLiteInheritedData(element, name, value) { + // if element is the document object work with the html element instead + // this makes $(document).scope() possible + if(element.nodeType == 9) { + element = element.documentElement; + } + var names = isArray(name) ? name : [name]; + + while (element) { + for (var i = 0, ii = names.length; i < ii; i++) { + if ((value = jqLite.data(element, names[i])) !== undefined) return value; + } + + // If dealing with a document fragment node with a host element, and no parent, use the host + // element as the parent. This enables directives within a Shadow DOM or polyfilled Shadow DOM + // to lookup parent controllers. + element = element.parentNode || (element.nodeType === 11 && element.host); + } +} + +function jqLiteEmpty(element) { + for (var i = 0, childNodes = element.childNodes; i < childNodes.length; i++) { + jqLiteDealoc(childNodes[i]); + } + while (element.firstChild) { + element.removeChild(element.firstChild); + } +} + +////////////////////////////////////////// +// Functions which are declared directly. +////////////////////////////////////////// +var JQLitePrototype = JQLite.prototype = { + ready: function(fn) { + var fired = false; + + function trigger() { + if (fired) return; + fired = true; + fn(); + } + + // check if document already is loaded + if (document.readyState === 'complete'){ + setTimeout(trigger); + } else { + this.on('DOMContentLoaded', trigger); // works for modern browsers and IE9 + // we can not use jqLite since we are not done loading and jQuery could be loaded later. + // jshint -W064 + JQLite(window).on('load', trigger); // fallback to window.onload for others + // jshint +W064 + } + }, + toString: function() { + var value = []; + forEach(this, function(e){ value.push('' + e);}); + return '[' + value.join(', ') + ']'; + }, + + eq: function(index) { + return (index >= 0) ? jqLite(this[index]) : jqLite(this[this.length + index]); + }, + + length: 0, + push: push, + sort: [].sort, + splice: [].splice +}; + +////////////////////////////////////////// +// Functions iterating getter/setters. +// these functions return self on setter and +// value on get. +////////////////////////////////////////// +var BOOLEAN_ATTR = {}; +forEach('multiple,selected,checked,disabled,readOnly,required,open'.split(','), function(value) { + BOOLEAN_ATTR[lowercase(value)] = value; +}); +var BOOLEAN_ELEMENTS = {}; +forEach('input,select,option,textarea,button,form,details'.split(','), function(value) { + BOOLEAN_ELEMENTS[uppercase(value)] = true; +}); + +function getBooleanAttrName(element, name) { + // check dom last since we will most likely fail on name + var booleanAttr = BOOLEAN_ATTR[name.toLowerCase()]; + + // booleanAttr is here twice to minimize DOM access + return booleanAttr && BOOLEAN_ELEMENTS[element.nodeName] && booleanAttr; +} + +forEach({ + data: jqLiteData, + removeData: jqLiteRemoveData +}, function(fn, name) { + JQLite[name] = fn; +}); + +forEach({ + data: jqLiteData, + inheritedData: jqLiteInheritedData, + + scope: function(element) { + // Can't use jqLiteData here directly so we stay compatible with jQuery! + return jqLite.data(element, '$scope') || jqLiteInheritedData(element.parentNode || element, ['$isolateScope', '$scope']); + }, + + isolateScope: function(element) { + // Can't use jqLiteData here directly so we stay compatible with jQuery! + return jqLite.data(element, '$isolateScope') || jqLite.data(element, '$isolateScopeNoTemplate'); + }, + + controller: jqLiteController, + + injector: function(element) { + return jqLiteInheritedData(element, '$injector'); + }, + + removeAttr: function(element,name) { + element.removeAttribute(name); + }, + + hasClass: jqLiteHasClass, + + css: function(element, name, value) { + name = camelCase(name); + + if (isDefined(value)) { + element.style[name] = value; + } else { + var val; + + if (msie <= 8) { + // this is some IE specific weirdness that jQuery 1.6.4 does not sure why + val = element.currentStyle && element.currentStyle[name]; + if (val === '') val = 'auto'; + } + + val = val || element.style[name]; + + if (msie <= 8) { + // jquery weirdness :-/ + val = (val === '') ? undefined : val; + } + + return val; + } + }, + + attr: function(element, name, value){ + var lowercasedName = lowercase(name); + if (BOOLEAN_ATTR[lowercasedName]) { + if (isDefined(value)) { + if (!!value) { + element[name] = true; + element.setAttribute(name, lowercasedName); + } else { + element[name] = false; + element.removeAttribute(lowercasedName); + } + } else { + return (element[name] || + (element.attributes.getNamedItem(name)|| noop).specified) + ? lowercasedName + : undefined; + } + } else if (isDefined(value)) { + element.setAttribute(name, value); + } else if (element.getAttribute) { + // the extra argument "2" is to get the right thing for a.href in IE, see jQuery code + // some elements (e.g. Document) don't have get attribute, so return undefined + var ret = element.getAttribute(name, 2); + // normalize non-existing attributes to undefined (as jQuery) + return ret === null ? undefined : ret; + } + }, + + prop: function(element, name, value) { + if (isDefined(value)) { + element[name] = value; + } else { + return element[name]; + } + }, + + text: (function() { + var NODE_TYPE_TEXT_PROPERTY = []; + if (msie < 9) { + NODE_TYPE_TEXT_PROPERTY[1] = 'innerText'; /** Element **/ + NODE_TYPE_TEXT_PROPERTY[3] = 'nodeValue'; /** Text **/ + } else { + NODE_TYPE_TEXT_PROPERTY[1] = /** Element **/ + NODE_TYPE_TEXT_PROPERTY[3] = 'textContent'; /** Text **/ + } + getText.$dv = ''; + return getText; + + function getText(element, value) { + var textProp = NODE_TYPE_TEXT_PROPERTY[element.nodeType]; + if (isUndefined(value)) { + return textProp ? element[textProp] : ''; + } + element[textProp] = value; + } + })(), + + val: function(element, value) { + if (isUndefined(value)) { + if (nodeName_(element) === 'SELECT' && element.multiple) { + var result = []; + forEach(element.options, function (option) { + if (option.selected) { + result.push(option.value || option.text); + } + }); + return result.length === 0 ? null : result; + } + return element.value; + } + element.value = value; + }, + + html: function(element, value) { + if (isUndefined(value)) { + return element.innerHTML; + } + for (var i = 0, childNodes = element.childNodes; i < childNodes.length; i++) { + jqLiteDealoc(childNodes[i]); + } + element.innerHTML = value; + }, + + empty: jqLiteEmpty +}, function(fn, name){ + /** + * Properties: writes return selection, reads return first value + */ + JQLite.prototype[name] = function(arg1, arg2) { + var i, key; + var nodeCount = this.length; + + // jqLiteHasClass has only two arguments, but is a getter-only fn, so we need to special-case it + // in a way that survives minification. + // jqLiteEmpty takes no arguments but is a setter. + if (fn !== jqLiteEmpty && + (((fn.length == 2 && (fn !== jqLiteHasClass && fn !== jqLiteController)) ? arg1 : arg2) === undefined)) { + if (isObject(arg1)) { + + // we are a write, but the object properties are the key/values + for (i = 0; i < nodeCount; i++) { + if (fn === jqLiteData) { + // data() takes the whole object in jQuery + fn(this[i], arg1); + } else { + for (key in arg1) { + fn(this[i], key, arg1[key]); + } + } + } + // return self for chaining + return this; + } else { + // we are a read, so read the first child. + // TODO: do we still need this? + var value = fn.$dv; + // Only if we have $dv do we iterate over all, otherwise it is just the first element. + var jj = (value === undefined) ? Math.min(nodeCount, 1) : nodeCount; + for (var j = 0; j < jj; j++) { + var nodeValue = fn(this[j], arg1, arg2); + value = value ? value + nodeValue : nodeValue; + } + return value; + } + } else { + // we are a write, so apply to all children + for (i = 0; i < nodeCount; i++) { + fn(this[i], arg1, arg2); + } + // return self for chaining + return this; + } + }; +}); + +function createEventHandler(element, events) { + var eventHandler = function (event, type) { + if (!event.preventDefault) { + event.preventDefault = function() { + event.returnValue = false; //ie + }; + } + + if (!event.stopPropagation) { + event.stopPropagation = function() { + event.cancelBubble = true; //ie + }; + } + + if (!event.target) { + event.target = event.srcElement || document; + } + + if (isUndefined(event.defaultPrevented)) { + var prevent = event.preventDefault; + event.preventDefault = function() { + event.defaultPrevented = true; + prevent.call(event); + }; + event.defaultPrevented = false; + } + + event.isDefaultPrevented = function() { + return event.defaultPrevented || event.returnValue === false; + }; + + // Copy event handlers in case event handlers array is modified during execution. + var eventHandlersCopy = shallowCopy(events[type || event.type] || []); + + forEach(eventHandlersCopy, function(fn) { + fn.call(element, event); + }); + + // Remove monkey-patched methods (IE), + // as they would cause memory leaks in IE8. + if (msie <= 8) { + // IE7/8 does not allow to delete property on native object + event.preventDefault = null; + event.stopPropagation = null; + event.isDefaultPrevented = null; + } else { + // It shouldn't affect normal browsers (native methods are defined on prototype). + delete event.preventDefault; + delete event.stopPropagation; + delete event.isDefaultPrevented; + } + }; + eventHandler.elem = element; + return eventHandler; +} + +////////////////////////////////////////// +// Functions iterating traversal. +// These functions chain results into a single +// selector. +////////////////////////////////////////// +forEach({ + removeData: jqLiteRemoveData, + + dealoc: jqLiteDealoc, + + on: function onFn(element, type, fn, unsupported){ + if (isDefined(unsupported)) throw jqLiteMinErr('onargs', 'jqLite#on() does not support the `selector` or `eventData` parameters'); + + var events = jqLiteExpandoStore(element, 'events'), + handle = jqLiteExpandoStore(element, 'handle'); + + if (!events) jqLiteExpandoStore(element, 'events', events = {}); + if (!handle) jqLiteExpandoStore(element, 'handle', handle = createEventHandler(element, events)); + + forEach(type.split(' '), function(type){ + var eventFns = events[type]; + + if (!eventFns) { + if (type == 'mouseenter' || type == 'mouseleave') { + var contains = document.body.contains || document.body.compareDocumentPosition ? + function( a, b ) { + // jshint bitwise: false + var adown = a.nodeType === 9 ? a.documentElement : a, + bup = b && b.parentNode; + return a === bup || !!( bup && bup.nodeType === 1 && ( + adown.contains ? + adown.contains( bup ) : + a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16 + )); + } : + function( a, b ) { + if ( b ) { + while ( (b = b.parentNode) ) { + if ( b === a ) { + return true; + } + } + } + return false; + }; + + events[type] = []; + + // Refer to jQuery's implementation of mouseenter & mouseleave + // Read about mouseenter and mouseleave: + // http://www.quirksmode.org/js/events_mouse.html#link8 + var eventmap = { mouseleave : "mouseout", mouseenter : "mouseover"}; + + onFn(element, eventmap[type], function(event) { + var target = this, related = event.relatedTarget; + // For mousenter/leave call the handler if related is outside the target. + // NB: No relatedTarget if the mouse left/entered the browser window + if ( !related || (related !== target && !contains(target, related)) ){ + handle(event, type); + } + }); + + } else { + addEventListenerFn(element, type, handle); + events[type] = []; + } + eventFns = events[type]; + } + eventFns.push(fn); + }); + }, + + off: jqLiteOff, + + one: function(element, type, fn) { + element = jqLite(element); + + //add the listener twice so that when it is called + //you can remove the original function and still be + //able to call element.off(ev, fn) normally + element.on(type, function onFn() { + element.off(type, fn); + element.off(type, onFn); + }); + element.on(type, fn); + }, + + replaceWith: function(element, replaceNode) { + var index, parent = element.parentNode; + jqLiteDealoc(element); + forEach(new JQLite(replaceNode), function(node){ + if (index) { + parent.insertBefore(node, index.nextSibling); + } else { + parent.replaceChild(node, element); + } + index = node; + }); + }, + + children: function(element) { + var children = []; + forEach(element.childNodes, function(element){ + if (element.nodeType === 1) + children.push(element); + }); + return children; + }, + + contents: function(element) { + return element.contentDocument || element.childNodes || []; + }, + + append: function(element, node) { + forEach(new JQLite(node), function(child){ + if (element.nodeType === 1 || element.nodeType === 11) { + element.appendChild(child); + } + }); + }, + + prepend: function(element, node) { + if (element.nodeType === 1) { + var index = element.firstChild; + forEach(new JQLite(node), function(child){ + element.insertBefore(child, index); + }); + } + }, + + wrap: function(element, wrapNode) { + wrapNode = jqLite(wrapNode)[0]; + var parent = element.parentNode; + if (parent) { + parent.replaceChild(wrapNode, element); + } + wrapNode.appendChild(element); + }, + + remove: function(element) { + jqLiteDealoc(element); + var parent = element.parentNode; + if (parent) parent.removeChild(element); + }, + + after: function(element, newElement) { + var index = element, parent = element.parentNode; + forEach(new JQLite(newElement), function(node){ + parent.insertBefore(node, index.nextSibling); + index = node; + }); + }, + + addClass: jqLiteAddClass, + removeClass: jqLiteRemoveClass, + + toggleClass: function(element, selector, condition) { + if (selector) { + forEach(selector.split(' '), function(className){ + var classCondition = condition; + if (isUndefined(classCondition)) { + classCondition = !jqLiteHasClass(element, className); + } + (classCondition ? jqLiteAddClass : jqLiteRemoveClass)(element, className); + }); + } + }, + + parent: function(element) { + var parent = element.parentNode; + return parent && parent.nodeType !== 11 ? parent : null; + }, + + next: function(element) { + if (element.nextElementSibling) { + return element.nextElementSibling; + } + + // IE8 doesn't have nextElementSibling + var elm = element.nextSibling; + while (elm != null && elm.nodeType !== 1) { + elm = elm.nextSibling; + } + return elm; + }, + + find: function(element, selector) { + if (element.getElementsByTagName) { + return element.getElementsByTagName(selector); + } else { + return []; + } + }, + + clone: jqLiteClone, + + triggerHandler: function(element, event, extraParameters) { + + var dummyEvent, eventFnsCopy, handlerArgs; + var eventName = event.type || event; + var eventFns = (jqLiteExpandoStore(element, 'events') || {})[eventName]; + + if (eventFns) { + + // Create a dummy event to pass to the handlers + dummyEvent = { + preventDefault: function() { this.defaultPrevented = true; }, + isDefaultPrevented: function() { return this.defaultPrevented === true; }, + stopPropagation: noop, + type: eventName, + target: element + }; + + // If a custom event was provided then extend our dummy event with it + if (event.type) { + dummyEvent = extend(dummyEvent, event); + } + + // Copy event handlers in case event handlers array is modified during execution. + eventFnsCopy = shallowCopy(eventFns); + handlerArgs = extraParameters ? [dummyEvent].concat(extraParameters) : [dummyEvent]; + + forEach(eventFnsCopy, function(fn) { + fn.apply(element, handlerArgs); + }); + + } + } +}, function(fn, name){ + /** + * chaining functions + */ + JQLite.prototype[name] = function(arg1, arg2, arg3) { + var value; + for(var i=0; i < this.length; i++) { + if (isUndefined(value)) { + value = fn(this[i], arg1, arg2, arg3); + if (isDefined(value)) { + // any function which returns a value needs to be wrapped + value = jqLite(value); + } + } else { + jqLiteAddNodes(value, fn(this[i], arg1, arg2, arg3)); + } + } + return isDefined(value) ? value : this; + }; + + // bind legacy bind/unbind to on/off + JQLite.prototype.bind = JQLite.prototype.on; + JQLite.prototype.unbind = JQLite.prototype.off; +}); + +/** + * Computes a hash of an 'obj'. + * Hash of a: + * string is string + * number is number as string + * object is either result of calling $$hashKey function on the object or uniquely generated id, + * that is also assigned to the $$hashKey property of the object. + * + * @param obj + * @returns {string} hash string such that the same input will have the same hash string. + * The resulting string key is in 'type:hashKey' format. + */ +function hashKey(obj, nextUidFn) { + var objType = typeof obj, + key; + + if (objType == 'function' || (objType == 'object' && obj !== null)) { + if (typeof (key = obj.$$hashKey) == 'function') { + // must invoke on object to keep the right this + key = obj.$$hashKey(); + } else if (key === undefined) { + key = obj.$$hashKey = (nextUidFn || nextUid)(); + } + } else { + key = obj; + } + + return objType + ':' + key; +} + +/** + * HashMap which can use objects as keys + */ +function HashMap(array, isolatedUid) { + if (isolatedUid) { + var uid = 0; + this.nextUid = function() { + return ++uid; + }; + } + forEach(array, this.put, this); +} +HashMap.prototype = { + /** + * Store key value pair + * @param key key to store can be any type + * @param value value to store can be any type + */ + put: function(key, value) { + this[hashKey(key, this.nextUid)] = value; + }, + + /** + * @param key + * @returns {Object} the value for the key + */ + get: function(key) { + return this[hashKey(key, this.nextUid)]; + }, + + /** + * Remove the key/value pair + * @param key + */ + remove: function(key) { + var value = this[key = hashKey(key, this.nextUid)]; + delete this[key]; + return value; + } +}; + +/** + * @ngdoc function + * @module ng + * @name angular.injector + * @kind function + * + * @description + * Creates an injector function that can be used for retrieving services as well as for + * dependency injection (see {@link guide/di dependency injection}). + * + + * @param {Array.} modules A list of module functions or their aliases. See + * {@link angular.module}. The `ng` module must be explicitly added. + * @returns {function()} Injector function. See {@link auto.$injector $injector}. + * + * @example + * Typical usage + * ```js + * // create an injector + * var $injector = angular.injector(['ng']); + * + * // use the injector to kick off your application + * // use the type inference to auto inject arguments, or use implicit injection + * $injector.invoke(function($rootScope, $compile, $document){ + * $compile($document)($rootScope); + * $rootScope.$digest(); + * }); + * ``` + * + * Sometimes you want to get access to the injector of a currently running Angular app + * from outside Angular. Perhaps, you want to inject and compile some markup after the + * application has been bootstrapped. You can do this using the extra `injector()` added + * to JQuery/jqLite elements. See {@link angular.element}. + * + * *This is fairly rare but could be the case if a third party library is injecting the + * markup.* + * + * In the following example a new block of HTML containing a `ng-controller` + * directive is added to the end of the document body by JQuery. We then compile and link + * it into the current AngularJS scope. + * + * ```js + * var $div = $('
    {{content.label}}
    '); + * $(document.body).append($div); + * + * angular.element(document).injector().invoke(function($compile) { + * var scope = angular.element($div).scope(); + * $compile($div)(scope); + * }); + * ``` + */ + + +/** + * @ngdoc module + * @name auto + * @description + * + * Implicit module which gets automatically added to each {@link auto.$injector $injector}. + */ + +var FN_ARGS = /^function\s*[^\(]*\(\s*([^\)]*)\)/m; +var FN_ARG_SPLIT = /,/; +var FN_ARG = /^\s*(_?)(\S+?)\1\s*$/; +var STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg; +var $injectorMinErr = minErr('$injector'); +function annotate(fn) { + var $inject, + fnText, + argDecl, + last; + + if (typeof fn === 'function') { + if (!($inject = fn.$inject)) { + $inject = []; + if (fn.length) { + fnText = fn.toString().replace(STRIP_COMMENTS, ''); + argDecl = fnText.match(FN_ARGS); + forEach(argDecl[1].split(FN_ARG_SPLIT), function(arg){ + arg.replace(FN_ARG, function(all, underscore, name){ + $inject.push(name); + }); + }); + } + fn.$inject = $inject; + } + } else if (isArray(fn)) { + last = fn.length - 1; + assertArgFn(fn[last], 'fn'); + $inject = fn.slice(0, last); + } else { + assertArgFn(fn, 'fn', true); + } + return $inject; +} + +/////////////////////////////////////// + +/** + * @ngdoc service + * @name $injector + * @kind function + * + * @description + * + * `$injector` is used to retrieve object instances as defined by + * {@link auto.$provide provider}, instantiate types, invoke methods, + * and load modules. + * + * The following always holds true: + * + * ```js + * var $injector = angular.injector(); + * expect($injector.get('$injector')).toBe($injector); + * expect($injector.invoke(function($injector){ + * return $injector; + * }).toBe($injector); + * ``` + * + * # Injection Function Annotation + * + * JavaScript does not have annotations, and annotations are needed for dependency injection. The + * following are all valid ways of annotating function with injection arguments and are equivalent. + * + * ```js + * // inferred (only works if code not minified/obfuscated) + * $injector.invoke(function(serviceA){}); + * + * // annotated + * function explicit(serviceA) {}; + * explicit.$inject = ['serviceA']; + * $injector.invoke(explicit); + * + * // inline + * $injector.invoke(['serviceA', function(serviceA){}]); + * ``` + * + * ## Inference + * + * In JavaScript calling `toString()` on a function returns the function definition. The definition + * can then be parsed and the function arguments can be extracted. *NOTE:* This does not work with + * minification, and obfuscation tools since these tools change the argument names. + * + * ## `$inject` Annotation + * By adding an `$inject` property onto a function the injection parameters can be specified. + * + * ## Inline + * As an array of injection names, where the last item in the array is the function to call. + */ + +/** + * @ngdoc method + * @name $injector#get + * + * @description + * Return an instance of the service. + * + * @param {string} name The name of the instance to retrieve. + * @return {*} The instance. + */ + +/** + * @ngdoc method + * @name $injector#invoke + * + * @description + * Invoke the method and supply the method arguments from the `$injector`. + * + * @param {!Function} fn The function to invoke. Function parameters are injected according to the + * {@link guide/di $inject Annotation} rules. + * @param {Object=} self The `this` for the invoked method. + * @param {Object=} locals Optional object. If preset then any argument names are read from this + * object first, before the `$injector` is consulted. + * @returns {*} the value returned by the invoked `fn` function. + */ + +/** + * @ngdoc method + * @name $injector#has + * + * @description + * Allows the user to query if the particular service exists. + * + * @param {string} Name of the service to query. + * @returns {boolean} returns true if injector has given service. + */ + +/** + * @ngdoc method + * @name $injector#instantiate + * @description + * Create a new instance of JS type. The method takes a constructor function, invokes the new + * operator, and supplies all of the arguments to the constructor function as specified by the + * constructor annotation. + * + * @param {Function} Type Annotated constructor function. + * @param {Object=} locals Optional object. If preset then any argument names are read from this + * object first, before the `$injector` is consulted. + * @returns {Object} new instance of `Type`. + */ + +/** + * @ngdoc method + * @name $injector#annotate + * + * @description + * Returns an array of service names which the function is requesting for injection. This API is + * used by the injector to determine which services need to be injected into the function when the + * function is invoked. There are three ways in which the function can be annotated with the needed + * dependencies. + * + * # Argument names + * + * The simplest form is to extract the dependencies from the arguments of the function. This is done + * by converting the function into a string using `toString()` method and extracting the argument + * names. + * ```js + * // Given + * function MyController($scope, $route) { + * // ... + * } + * + * // Then + * expect(injector.annotate(MyController)).toEqual(['$scope', '$route']); + * ``` + * + * This method does not work with code minification / obfuscation. For this reason the following + * annotation strategies are supported. + * + * # The `$inject` property + * + * If a function has an `$inject` property and its value is an array of strings, then the strings + * represent names of services to be injected into the function. + * ```js + * // Given + * var MyController = function(obfuscatedScope, obfuscatedRoute) { + * // ... + * } + * // Define function dependencies + * MyController['$inject'] = ['$scope', '$route']; + * + * // Then + * expect(injector.annotate(MyController)).toEqual(['$scope', '$route']); + * ``` + * + * # The array notation + * + * It is often desirable to inline Injected functions and that's when setting the `$inject` property + * is very inconvenient. In these situations using the array notation to specify the dependencies in + * a way that survives minification is a better choice: + * + * ```js + * // We wish to write this (not minification / obfuscation safe) + * injector.invoke(function($compile, $rootScope) { + * // ... + * }); + * + * // We are forced to write break inlining + * var tmpFn = function(obfuscatedCompile, obfuscatedRootScope) { + * // ... + * }; + * tmpFn.$inject = ['$compile', '$rootScope']; + * injector.invoke(tmpFn); + * + * // To better support inline function the inline annotation is supported + * injector.invoke(['$compile', '$rootScope', function(obfCompile, obfRootScope) { + * // ... + * }]); + * + * // Therefore + * expect(injector.annotate( + * ['$compile', '$rootScope', function(obfus_$compile, obfus_$rootScope) {}]) + * ).toEqual(['$compile', '$rootScope']); + * ``` + * + * @param {Function|Array.} fn Function for which dependent service names need to + * be retrieved as described above. + * + * @returns {Array.} The names of the services which the function requires. + */ + + + + +/** + * @ngdoc service + * @name $provide + * + * @description + * + * The {@link auto.$provide $provide} service has a number of methods for registering components + * with the {@link auto.$injector $injector}. Many of these functions are also exposed on + * {@link angular.Module}. + * + * An Angular **service** is a singleton object created by a **service factory**. These **service + * factories** are functions which, in turn, are created by a **service provider**. + * The **service providers** are constructor functions. When instantiated they must contain a + * property called `$get`, which holds the **service factory** function. + * + * When you request a service, the {@link auto.$injector $injector} is responsible for finding the + * correct **service provider**, instantiating it and then calling its `$get` **service factory** + * function to get the instance of the **service**. + * + * Often services have no configuration options and there is no need to add methods to the service + * provider. The provider will be no more than a constructor function with a `$get` property. For + * these cases the {@link auto.$provide $provide} service has additional helper methods to register + * services without specifying a provider. + * + * * {@link auto.$provide#provider provider(provider)} - registers a **service provider** with the + * {@link auto.$injector $injector} + * * {@link auto.$provide#constant constant(obj)} - registers a value/object that can be accessed by + * providers and services. + * * {@link auto.$provide#value value(obj)} - registers a value/object that can only be accessed by + * services, not providers. + * * {@link auto.$provide#factory factory(fn)} - registers a service **factory function**, `fn`, + * that will be wrapped in a **service provider** object, whose `$get` property will contain the + * given factory function. + * * {@link auto.$provide#service service(class)} - registers a **constructor function**, `class` + * that will be wrapped in a **service provider** object, whose `$get` property will instantiate + * a new object using the given constructor function. + * + * See the individual methods for more information and examples. + */ + +/** + * @ngdoc method + * @name $provide#provider + * @description + * + * Register a **provider function** with the {@link auto.$injector $injector}. Provider functions + * are constructor functions, whose instances are responsible for "providing" a factory for a + * service. + * + * Service provider names start with the name of the service they provide followed by `Provider`. + * For example, the {@link ng.$log $log} service has a provider called + * {@link ng.$logProvider $logProvider}. + * + * Service provider objects can have additional methods which allow configuration of the provider + * and its service. Importantly, you can configure what kind of service is created by the `$get` + * method, or how that service will act. For example, the {@link ng.$logProvider $logProvider} has a + * method {@link ng.$logProvider#debugEnabled debugEnabled} + * which lets you specify whether the {@link ng.$log $log} service will log debug messages to the + * console or not. + * + * @param {string} name The name of the instance. NOTE: the provider will be available under `name + + 'Provider'` key. + * @param {(Object|function())} provider If the provider is: + * + * - `Object`: then it should have a `$get` method. The `$get` method will be invoked using + * {@link auto.$injector#invoke $injector.invoke()} when an instance needs to be created. + * - `Constructor`: a new instance of the provider will be created using + * {@link auto.$injector#instantiate $injector.instantiate()}, then treated as `object`. + * + * @returns {Object} registered provider instance + + * @example + * + * The following example shows how to create a simple event tracking service and register it using + * {@link auto.$provide#provider $provide.provider()}. + * + * ```js + * // Define the eventTracker provider + * function EventTrackerProvider() { + * var trackingUrl = '/track'; + * + * // A provider method for configuring where the tracked events should been saved + * this.setTrackingUrl = function(url) { + * trackingUrl = url; + * }; + * + * // The service factory function + * this.$get = ['$http', function($http) { + * var trackedEvents = {}; + * return { + * // Call this to track an event + * event: function(event) { + * var count = trackedEvents[event] || 0; + * count += 1; + * trackedEvents[event] = count; + * return count; + * }, + * // Call this to save the tracked events to the trackingUrl + * save: function() { + * $http.post(trackingUrl, trackedEvents); + * } + * }; + * }]; + * } + * + * describe('eventTracker', function() { + * var postSpy; + * + * beforeEach(module(function($provide) { + * // Register the eventTracker provider + * $provide.provider('eventTracker', EventTrackerProvider); + * })); + * + * beforeEach(module(function(eventTrackerProvider) { + * // Configure eventTracker provider + * eventTrackerProvider.setTrackingUrl('/custom-track'); + * })); + * + * it('tracks events', inject(function(eventTracker) { + * expect(eventTracker.event('login')).toEqual(1); + * expect(eventTracker.event('login')).toEqual(2); + * })); + * + * it('saves to the tracking url', inject(function(eventTracker, $http) { + * postSpy = spyOn($http, 'post'); + * eventTracker.event('login'); + * eventTracker.save(); + * expect(postSpy).toHaveBeenCalled(); + * expect(postSpy.mostRecentCall.args[0]).not.toEqual('/track'); + * expect(postSpy.mostRecentCall.args[0]).toEqual('/custom-track'); + * expect(postSpy.mostRecentCall.args[1]).toEqual({ 'login': 1 }); + * })); + * }); + * ``` + */ + +/** + * @ngdoc method + * @name $provide#factory + * @description + * + * Register a **service factory**, which will be called to return the service instance. + * This is short for registering a service where its provider consists of only a `$get` property, + * which is the given service factory function. + * You should use {@link auto.$provide#factory $provide.factory(getFn)} if you do not need to + * configure your service in a provider. + * + * @param {string} name The name of the instance. + * @param {function()} $getFn The $getFn for the instance creation. Internally this is a short hand + * for `$provide.provider(name, {$get: $getFn})`. + * @returns {Object} registered provider instance + * + * @example + * Here is an example of registering a service + * ```js + * $provide.factory('ping', ['$http', function($http) { + * return function ping() { + * return $http.send('/ping'); + * }; + * }]); + * ``` + * You would then inject and use this service like this: + * ```js + * someModule.controller('Ctrl', ['ping', function(ping) { + * ping(); + * }]); + * ``` + */ + + +/** + * @ngdoc method + * @name $provide#service + * @description + * + * Register a **service constructor**, which will be invoked with `new` to create the service + * instance. + * This is short for registering a service where its provider's `$get` property is the service + * constructor function that will be used to instantiate the service instance. + * + * You should use {@link auto.$provide#service $provide.service(class)} if you define your service + * as a type/class. + * + * @param {string} name The name of the instance. + * @param {Function} constructor A class (constructor function) that will be instantiated. + * @returns {Object} registered provider instance + * + * @example + * Here is an example of registering a service using + * {@link auto.$provide#service $provide.service(class)}. + * ```js + * var Ping = function($http) { + * this.$http = $http; + * }; + * + * Ping.$inject = ['$http']; + * + * Ping.prototype.send = function() { + * return this.$http.get('/ping'); + * }; + * $provide.service('ping', Ping); + * ``` + * You would then inject and use this service like this: + * ```js + * someModule.controller('Ctrl', ['ping', function(ping) { + * ping.send(); + * }]); + * ``` + */ + + +/** + * @ngdoc method + * @name $provide#value + * @description + * + * Register a **value service** with the {@link auto.$injector $injector}, such as a string, a + * number, an array, an object or a function. This is short for registering a service where its + * provider's `$get` property is a factory function that takes no arguments and returns the **value + * service**. + * + * Value services are similar to constant services, except that they cannot be injected into a + * module configuration function (see {@link angular.Module#config}) but they can be overridden by + * an Angular + * {@link auto.$provide#decorator decorator}. + * + * @param {string} name The name of the instance. + * @param {*} value The value. + * @returns {Object} registered provider instance + * + * @example + * Here are some examples of creating value services. + * ```js + * $provide.value('ADMIN_USER', 'admin'); + * + * $provide.value('RoleLookup', { admin: 0, writer: 1, reader: 2 }); + * + * $provide.value('halfOf', function(value) { + * return value / 2; + * }); + * ``` + */ + + +/** + * @ngdoc method + * @name $provide#constant + * @description + * + * Register a **constant service**, such as a string, a number, an array, an object or a function, + * with the {@link auto.$injector $injector}. Unlike {@link auto.$provide#value value} it can be + * injected into a module configuration function (see {@link angular.Module#config}) and it cannot + * be overridden by an Angular {@link auto.$provide#decorator decorator}. + * + * @param {string} name The name of the constant. + * @param {*} value The constant value. + * @returns {Object} registered instance + * + * @example + * Here a some examples of creating constants: + * ```js + * $provide.constant('SHARD_HEIGHT', 306); + * + * $provide.constant('MY_COLOURS', ['red', 'blue', 'grey']); + * + * $provide.constant('double', function(value) { + * return value * 2; + * }); + * ``` + */ + + +/** + * @ngdoc method + * @name $provide#decorator + * @description + * + * Register a **service decorator** with the {@link auto.$injector $injector}. A service decorator + * intercepts the creation of a service, allowing it to override or modify the behaviour of the + * service. The object returned by the decorator may be the original service, or a new service + * object which replaces or wraps and delegates to the original service. + * + * @param {string} name The name of the service to decorate. + * @param {function()} decorator This function will be invoked when the service needs to be + * instantiated and should return the decorated service instance. The function is called using + * the {@link auto.$injector#invoke injector.invoke} method and is therefore fully injectable. + * Local injection arguments: + * + * * `$delegate` - The original service instance, which can be monkey patched, configured, + * decorated or delegated to. + * + * @example + * Here we decorate the {@link ng.$log $log} service to convert warnings to errors by intercepting + * calls to {@link ng.$log#error $log.warn()}. + * ```js + * $provide.decorator('$log', ['$delegate', function($delegate) { + * $delegate.warn = $delegate.error; + * return $delegate; + * }]); + * ``` + */ + + +function createInjector(modulesToLoad) { + var INSTANTIATING = {}, + providerSuffix = 'Provider', + path = [], + loadedModules = new HashMap([], true), + providerCache = { + $provide: { + provider: supportObject(provider), + factory: supportObject(factory), + service: supportObject(service), + value: supportObject(value), + constant: supportObject(constant), + decorator: decorator + } + }, + providerInjector = (providerCache.$injector = + createInternalInjector(providerCache, function() { + throw $injectorMinErr('unpr', "Unknown provider: {0}", path.join(' <- ')); + })), + instanceCache = {}, + instanceInjector = (instanceCache.$injector = + createInternalInjector(instanceCache, function(servicename) { + var provider = providerInjector.get(servicename + providerSuffix); + return instanceInjector.invoke(provider.$get, provider); + })); + + + forEach(loadModules(modulesToLoad), function(fn) { instanceInjector.invoke(fn || noop); }); + + return instanceInjector; + + //////////////////////////////////// + // $provider + //////////////////////////////////// + + function supportObject(delegate) { + return function(key, value) { + if (isObject(key)) { + forEach(key, reverseParams(delegate)); + } else { + return delegate(key, value); + } + }; + } + + function provider(name, provider_) { + assertNotHasOwnProperty(name, 'service'); + if (isFunction(provider_) || isArray(provider_)) { + provider_ = providerInjector.instantiate(provider_); + } + if (!provider_.$get) { + throw $injectorMinErr('pget', "Provider '{0}' must define $get factory method.", name); + } + return providerCache[name + providerSuffix] = provider_; + } + + function factory(name, factoryFn) { return provider(name, { $get: factoryFn }); } + + function service(name, constructor) { + return factory(name, ['$injector', function($injector) { + return $injector.instantiate(constructor); + }]); + } + + function value(name, val) { return factory(name, valueFn(val)); } + + function constant(name, value) { + assertNotHasOwnProperty(name, 'constant'); + providerCache[name] = value; + instanceCache[name] = value; + } + + function decorator(serviceName, decorFn) { + var origProvider = providerInjector.get(serviceName + providerSuffix), + orig$get = origProvider.$get; + + origProvider.$get = function() { + var origInstance = instanceInjector.invoke(orig$get, origProvider); + return instanceInjector.invoke(decorFn, null, {$delegate: origInstance}); + }; + } + + //////////////////////////////////// + // Module Loading + //////////////////////////////////// + function loadModules(modulesToLoad){ + var runBlocks = [], moduleFn, invokeQueue, i, ii; + forEach(modulesToLoad, function(module) { + if (loadedModules.get(module)) return; + loadedModules.put(module, true); + + try { + if (isString(module)) { + moduleFn = angularModule(module); + runBlocks = runBlocks.concat(loadModules(moduleFn.requires)).concat(moduleFn._runBlocks); + + for(invokeQueue = moduleFn._invokeQueue, i = 0, ii = invokeQueue.length; i < ii; i++) { + var invokeArgs = invokeQueue[i], + provider = providerInjector.get(invokeArgs[0]); + + provider[invokeArgs[1]].apply(provider, invokeArgs[2]); + } + } else if (isFunction(module)) { + runBlocks.push(providerInjector.invoke(module)); + } else if (isArray(module)) { + runBlocks.push(providerInjector.invoke(module)); + } else { + assertArgFn(module, 'module'); + } + } catch (e) { + if (isArray(module)) { + module = module[module.length - 1]; + } + if (e.message && e.stack && e.stack.indexOf(e.message) == -1) { + // Safari & FF's stack traces don't contain error.message content + // unlike those of Chrome and IE + // So if stack doesn't contain message, we create a new string that contains both. + // Since error.stack is read-only in Safari, I'm overriding e and not e.stack here. + /* jshint -W022 */ + e = e.message + '\n' + e.stack; + } + throw $injectorMinErr('modulerr', "Failed to instantiate module {0} due to:\n{1}", + module, e.stack || e.message || e); + } + }); + return runBlocks; + } + + //////////////////////////////////// + // internal Injector + //////////////////////////////////// + + function createInternalInjector(cache, factory) { + + function getService(serviceName) { + if (cache.hasOwnProperty(serviceName)) { + if (cache[serviceName] === INSTANTIATING) { + throw $injectorMinErr('cdep', 'Circular dependency found: {0}', + serviceName + ' <- ' + path.join(' <- ')); + } + return cache[serviceName]; + } else { + try { + path.unshift(serviceName); + cache[serviceName] = INSTANTIATING; + return cache[serviceName] = factory(serviceName); + } catch (err) { + if (cache[serviceName] === INSTANTIATING) { + delete cache[serviceName]; + } + throw err; + } finally { + path.shift(); + } + } + } + + function invoke(fn, self, locals){ + var args = [], + $inject = annotate(fn), + length, i, + key; + + for(i = 0, length = $inject.length; i < length; i++) { + key = $inject[i]; + if (typeof key !== 'string') { + throw $injectorMinErr('itkn', + 'Incorrect injection token! Expected service name as string, got {0}', key); + } + args.push( + locals && locals.hasOwnProperty(key) + ? locals[key] + : getService(key) + ); + } + if (isArray(fn)) { + fn = fn[length]; + } + + // http://jsperf.com/angularjs-invoke-apply-vs-switch + // #5388 + return fn.apply(self, args); + } + + function instantiate(Type, locals) { + var Constructor = function() {}, + instance, returnedValue; + + // Check if Type is annotated and use just the given function at n-1 as parameter + // e.g. someModule.factory('greeter', ['$window', function(renamed$window) {}]); + Constructor.prototype = (isArray(Type) ? Type[Type.length - 1] : Type).prototype; + instance = new Constructor(); + returnedValue = invoke(Type, instance, locals); + + return isObject(returnedValue) || isFunction(returnedValue) ? returnedValue : instance; + } + + return { + invoke: invoke, + instantiate: instantiate, + get: getService, + annotate: annotate, + has: function(name) { + return providerCache.hasOwnProperty(name + providerSuffix) || cache.hasOwnProperty(name); + } + }; + } +} + +/** + * @ngdoc service + * @name $anchorScroll + * @kind function + * @requires $window + * @requires $location + * @requires $rootScope + * + * @description + * When called, it checks current value of `$location.hash()` and scrolls to the related element, + * according to rules specified in + * [Html5 spec](http://dev.w3.org/html5/spec/Overview.html#the-indicated-part-of-the-document). + * + * It also watches the `$location.hash()` and scrolls whenever it changes to match any anchor. + * This can be disabled by calling `$anchorScrollProvider.disableAutoScrolling()`. + * + * @example + + +
    + Go to bottom + You're at the bottom! +
    +     + + function ScrollCtrl($scope, $location, $anchorScroll) { + $scope.gotoBottom = function (){ + // set the location.hash to the id of + // the element you wish to scroll to. + $location.hash('bottom'); + + // call $anchorScroll() + $anchorScroll(); + }; + } + + + #scrollArea { + height: 350px; + overflow: auto; + } + + #bottom { + display: block; + margin-top: 2000px; + } + +     + */ +function $AnchorScrollProvider() { + + var autoScrollingEnabled = true; + + this.disableAutoScrolling = function() { + autoScrollingEnabled = false; + }; + + this.$get = ['$window', '$location', '$rootScope', function($window, $location, $rootScope) { + var document = $window.document; + + // helper function to get first anchor from a NodeList + // can't use filter.filter, as it accepts only instances of Array + // and IE can't convert NodeList to an array using [].slice + // TODO(vojta): use filter if we change it to accept lists as well + function getFirstAnchor(list) { + var result = null; + forEach(list, function(element) { + if (!result && lowercase(element.nodeName) === 'a') result = element; + }); + return result; + } + + function scroll() { + var hash = $location.hash(), elm; + + // empty hash, scroll to the top of the page + if (!hash) $window.scrollTo(0, 0); + + // element with given id + else if ((elm = document.getElementById(hash))) elm.scrollIntoView(); + + // first anchor with given name :-D + else if ((elm = getFirstAnchor(document.getElementsByName(hash)))) elm.scrollIntoView(); + + // no element and hash == 'top', scroll to the top of the page + else if (hash === 'top') $window.scrollTo(0, 0); + } + + // does not scroll when user clicks on anchor link that is currently on + // (no url change, no $location.hash() change), browser native does scroll + if (autoScrollingEnabled) { + $rootScope.$watch(function autoScrollWatch() {return $location.hash();}, + function autoScrollWatchAction() { + $rootScope.$evalAsync(scroll); + }); + } + + return scroll; + }]; +} + +var $animateMinErr = minErr('$animate'); + +/** + * @ngdoc provider + * @name $animateProvider + * + * @description + * Default implementation of $animate that doesn't perform any animations, instead just + * synchronously performs DOM + * updates and calls done() callbacks. + * + * In order to enable animations the ngAnimate module has to be loaded. + * + * To see the functional implementation check out src/ngAnimate/animate.js + */ +var $AnimateProvider = ['$provide', function($provide) { + + + this.$$selectors = {}; + + + /** + * @ngdoc method + * @name $animateProvider#register + * + * @description + * Registers a new injectable animation factory function. The factory function produces the + * animation object which contains callback functions for each event that is expected to be + * animated. + * + * * `eventFn`: `function(Element, doneFunction)` The element to animate, the `doneFunction` + * must be called once the element animation is complete. If a function is returned then the + * animation service will use this function to cancel the animation whenever a cancel event is + * triggered. + * + * + * ```js + * return { + * eventFn : function(element, done) { + * //code to run the animation + * //once complete, then run done() + * return function cancellationFunction() { + * //code to cancel the animation + * } + * } + * } + * ``` + * + * @param {string} name The name of the animation. + * @param {Function} factory The factory function that will be executed to return the animation + * object. + */ + this.register = function(name, factory) { + var key = name + '-animation'; + if (name && name.charAt(0) != '.') throw $animateMinErr('notcsel', + "Expecting class selector starting with '.' got '{0}'.", name); + this.$$selectors[name.substr(1)] = key; + $provide.factory(key, factory); + }; + + /** + * @ngdoc method + * @name $animateProvider#classNameFilter + * + * @description + * Sets and/or returns the CSS class regular expression that is checked when performing + * an animation. Upon bootstrap the classNameFilter value is not set at all and will + * therefore enable $animate to attempt to perform an animation on any element. + * When setting the classNameFilter value, animations will only be performed on elements + * that successfully match the filter expression. This in turn can boost performance + * for low-powered devices as well as applications containing a lot of structural operations. + * @param {RegExp=} expression The className expression which will be checked against all animations + * @return {RegExp} The current CSS className expression value. If null then there is no expression value + */ + this.classNameFilter = function(expression) { + if(arguments.length === 1) { + this.$$classNameFilter = (expression instanceof RegExp) ? expression : null; + } + return this.$$classNameFilter; + }; + + this.$get = ['$timeout', '$$asyncCallback', function($timeout, $$asyncCallback) { + + function async(fn) { + fn && $$asyncCallback(fn); + } + + /** + * + * @ngdoc service + * @name $animate + * @description The $animate service provides rudimentary DOM manipulation functions to + * insert, remove and move elements within the DOM, as well as adding and removing classes. + * This service is the core service used by the ngAnimate $animator service which provides + * high-level animation hooks for CSS and JavaScript. + * + * $animate is available in the AngularJS core, however, the ngAnimate module must be included + * to enable full out animation support. Otherwise, $animate will only perform simple DOM + * manipulation operations. + * + * To learn more about enabling animation support, click here to visit the {@link ngAnimate + * ngAnimate module page} as well as the {@link ngAnimate.$animate ngAnimate $animate service + * page}. + */ + return { + + /** + * + * @ngdoc method + * @name $animate#enter + * @kind function + * @description Inserts the element into the DOM either after the `after` element or within + * the `parent` element. Once complete, the done() callback will be fired (if provided). + * @param {DOMElement} element the element which will be inserted into the DOM + * @param {DOMElement} parent the parent element which will append the element as + * a child (if the after element is not present) + * @param {DOMElement} after the sibling element which will append the element + * after itself + * @param {Function=} done callback function that will be called after the element has been + * inserted into the DOM + */ + enter : function(element, parent, after, done) { + if (after) { + after.after(element); + } else { + if (!parent || !parent[0]) { + parent = after.parent(); + } + parent.append(element); + } + async(done); + }, + + /** + * + * @ngdoc method + * @name $animate#leave + * @kind function + * @description Removes the element from the DOM. Once complete, the done() callback will be + * fired (if provided). + * @param {DOMElement} element the element which will be removed from the DOM + * @param {Function=} done callback function that will be called after the element has been + * removed from the DOM + */ + leave : function(element, done) { + element.remove(); + async(done); + }, + + /** + * + * @ngdoc method + * @name $animate#move + * @kind function + * @description Moves the position of the provided element within the DOM to be placed + * either after the `after` element or inside of the `parent` element. Once complete, the + * done() callback will be fired (if provided). + * + * @param {DOMElement} element the element which will be moved around within the + * DOM + * @param {DOMElement} parent the parent element where the element will be + * inserted into (if the after element is not present) + * @param {DOMElement} after the sibling element where the element will be + * positioned next to + * @param {Function=} done the callback function (if provided) that will be fired after the + * element has been moved to its new position + */ + move : function(element, parent, after, done) { + // Do not remove element before insert. Removing will cause data associated with the + // element to be dropped. Insert will implicitly do the remove. + this.enter(element, parent, after, done); + }, + + /** + * + * @ngdoc method + * @name $animate#addClass + * @kind function + * @description Adds the provided className CSS class value to the provided element. Once + * complete, the done() callback will be fired (if provided). + * @param {DOMElement} element the element which will have the className value + * added to it + * @param {string} className the CSS class which will be added to the element + * @param {Function=} done the callback function (if provided) that will be fired after the + * className value has been added to the element + */ + addClass : function(element, className, done) { + className = isString(className) ? + className : + isArray(className) ? className.join(' ') : ''; + forEach(element, function (element) { + jqLiteAddClass(element, className); + }); + async(done); + }, + + /** + * + * @ngdoc method + * @name $animate#removeClass + * @kind function + * @description Removes the provided className CSS class value from the provided element. + * Once complete, the done() callback will be fired (if provided). + * @param {DOMElement} element the element which will have the className value + * removed from it + * @param {string} className the CSS class which will be removed from the element + * @param {Function=} done the callback function (if provided) that will be fired after the + * className value has been removed from the element + */ + removeClass : function(element, className, done) { + className = isString(className) ? + className : + isArray(className) ? className.join(' ') : ''; + forEach(element, function (element) { + jqLiteRemoveClass(element, className); + }); + async(done); + }, + + /** + * + * @ngdoc method + * @name $animate#setClass + * @kind function + * @description Adds and/or removes the given CSS classes to and from the element. + * Once complete, the done() callback will be fired (if provided). + * @param {DOMElement} element the element which will have its CSS classes changed + * removed from it + * @param {string} add the CSS classes which will be added to the element + * @param {string} remove the CSS class which will be removed from the element + * @param {Function=} done the callback function (if provided) that will be fired after the + * CSS classes have been set on the element + */ + setClass : function(element, add, remove, done) { + forEach(element, function (element) { + jqLiteAddClass(element, add); + jqLiteRemoveClass(element, remove); + }); + async(done); + }, + + enabled : noop + }; + }]; +}]; + +function $$AsyncCallbackProvider(){ + this.$get = ['$$rAF', '$timeout', function($$rAF, $timeout) { + return $$rAF.supported + ? function(fn) { return $$rAF(fn); } + : function(fn) { + return $timeout(fn, 0, false); + }; + }]; +} + +/** + * ! This is a private undocumented service ! + * + * @name $browser + * @requires $log + * @description + * This object has two goals: + * + * - hide all the global state in the browser caused by the window object + * - abstract away all the browser specific features and inconsistencies + * + * For tests we provide {@link ngMock.$browser mock implementation} of the `$browser` + * service, which can be used for convenient testing of the application without the interaction with + * the real browser apis. + */ +/** + * @param {object} window The global window object. + * @param {object} document jQuery wrapped document. + * @param {function()} XHR XMLHttpRequest constructor. + * @param {object} $log console.log or an object with the same interface. + * @param {object} $sniffer $sniffer service + */ +function Browser(window, document, $log, $sniffer) { + var self = this, + rawDocument = document[0], + location = window.location, + history = window.history, + setTimeout = window.setTimeout, + clearTimeout = window.clearTimeout, + pendingDeferIds = {}; + + self.isMock = false; + + var outstandingRequestCount = 0; + var outstandingRequestCallbacks = []; + + // TODO(vojta): remove this temporary api + self.$$completeOutstandingRequest = completeOutstandingRequest; + self.$$incOutstandingRequestCount = function() { outstandingRequestCount++; }; + + /** + * Executes the `fn` function(supports currying) and decrements the `outstandingRequestCallbacks` + * counter. If the counter reaches 0, all the `outstandingRequestCallbacks` are executed. + */ + function completeOutstandingRequest(fn) { + try { + fn.apply(null, sliceArgs(arguments, 1)); + } finally { + outstandingRequestCount--; + if (outstandingRequestCount === 0) { + while(outstandingRequestCallbacks.length) { + try { + outstandingRequestCallbacks.pop()(); + } catch (e) { + $log.error(e); + } + } + } + } + } + + /** + * @private + * Note: this method is used only by scenario runner + * TODO(vojta): prefix this method with $$ ? + * @param {function()} callback Function that will be called when no outstanding request + */ + self.notifyWhenNoOutstandingRequests = function(callback) { + // force browser to execute all pollFns - this is needed so that cookies and other pollers fire + // at some deterministic time in respect to the test runner's actions. Leaving things up to the + // regular poller would result in flaky tests. + forEach(pollFns, function(pollFn){ pollFn(); }); + + if (outstandingRequestCount === 0) { + callback(); + } else { + outstandingRequestCallbacks.push(callback); + } + }; + + ////////////////////////////////////////////////////////////// + // Poll Watcher API + ////////////////////////////////////////////////////////////// + var pollFns = [], + pollTimeout; + + /** + * @name $browser#addPollFn + * + * @param {function()} fn Poll function to add + * + * @description + * Adds a function to the list of functions that poller periodically executes, + * and starts polling if not started yet. + * + * @returns {function()} the added function + */ + self.addPollFn = function(fn) { + if (isUndefined(pollTimeout)) startPoller(100, setTimeout); + pollFns.push(fn); + return fn; + }; + + /** + * @param {number} interval How often should browser call poll functions (ms) + * @param {function()} setTimeout Reference to a real or fake `setTimeout` function. + * + * @description + * Configures the poller to run in the specified intervals, using the specified + * setTimeout fn and kicks it off. + */ + function startPoller(interval, setTimeout) { + (function check() { + forEach(pollFns, function(pollFn){ pollFn(); }); + pollTimeout = setTimeout(check, interval); + })(); + } + + ////////////////////////////////////////////////////////////// + // URL API + ////////////////////////////////////////////////////////////// + + var lastBrowserUrl = location.href, + baseElement = document.find('base'), + newLocation = null; + + /** + * @name $browser#url + * + * @description + * GETTER: + * Without any argument, this method just returns current value of location.href. + * + * SETTER: + * With at least one argument, this method sets url to new value. + * If html5 history api supported, pushState/replaceState is used, otherwise + * location.href/location.replace is used. + * Returns its own instance to allow chaining + * + * NOTE: this api is intended for use only by the $location service. Please use the + * {@link ng.$location $location service} to change url. + * + * @param {string} url New url (when used as setter) + * @param {boolean=} replace Should new url replace current history record ? + */ + self.url = function(url, replace) { + // Android Browser BFCache causes location, history reference to become stale. + if (location !== window.location) location = window.location; + if (history !== window.history) history = window.history; + + // setter + if (url) { + if (lastBrowserUrl == url) return; + lastBrowserUrl = url; + if ($sniffer.history) { + if (replace) history.replaceState(null, '', url); + else { + history.pushState(null, '', url); + // Crazy Opera Bug: http://my.opera.com/community/forums/topic.dml?id=1185462 + baseElement.attr('href', baseElement.attr('href')); + } + } else { + newLocation = url; + if (replace) { + location.replace(url); + } else { + location.href = url; + } + } + return self; + // getter + } else { + // - newLocation is a workaround for an IE7-9 issue with location.replace and location.href + // methods not updating location.href synchronously. + // - the replacement is a workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=407172 + return newLocation || location.href.replace(/%27/g,"'"); + } + }; + + var urlChangeListeners = [], + urlChangeInit = false; + + function fireUrlChange() { + newLocation = null; + if (lastBrowserUrl == self.url()) return; + + lastBrowserUrl = self.url(); + forEach(urlChangeListeners, function(listener) { + listener(self.url()); + }); + } + + /** + * @name $browser#onUrlChange + * + * @description + * Register callback function that will be called, when url changes. + * + * It's only called when the url is changed from outside of angular: + * - user types different url into address bar + * - user clicks on history (forward/back) button + * - user clicks on a link + * + * It's not called when url is changed by $browser.url() method + * + * The listener gets called with new url as parameter. + * + * NOTE: this api is intended for use only by the $location service. Please use the + * {@link ng.$location $location service} to monitor url changes in angular apps. + * + * @param {function(string)} listener Listener function to be called when url changes. + * @return {function(string)} Returns the registered listener fn - handy if the fn is anonymous. + */ + self.onUrlChange = function(callback) { + // TODO(vojta): refactor to use node's syntax for events + if (!urlChangeInit) { + // We listen on both (hashchange/popstate) when available, as some browsers (e.g. Opera) + // don't fire popstate when user change the address bar and don't fire hashchange when url + // changed by push/replaceState + + // html5 history api - popstate event + if ($sniffer.history) jqLite(window).on('popstate', fireUrlChange); + // hashchange event + if ($sniffer.hashchange) jqLite(window).on('hashchange', fireUrlChange); + // polling + else self.addPollFn(fireUrlChange); + + urlChangeInit = true; + } + + urlChangeListeners.push(callback); + return callback; + }; + + /** + * Checks whether the url has changed outside of Angular. + * Needs to be exported to be able to check for changes that have been done in sync, + * as hashchange/popstate events fire in async. + */ + self.$$checkUrlChange = fireUrlChange; + + ////////////////////////////////////////////////////////////// + // Misc API + ////////////////////////////////////////////////////////////// + + /** + * @name $browser#baseHref + * + * @description + * Returns current + * (always relative - without domain) + * + * @returns {string} The current base href + */ + self.baseHref = function() { + var href = baseElement.attr('href'); + return href ? href.replace(/^(https?\:)?\/\/[^\/]*/, '') : ''; + }; + + ////////////////////////////////////////////////////////////// + // Cookies API + ////////////////////////////////////////////////////////////// + var lastCookies = {}; + var lastCookieString = ''; + var cookiePath = self.baseHref(); + + /** + * @name $browser#cookies + * + * @param {string=} name Cookie name + * @param {string=} value Cookie value + * + * @description + * The cookies method provides a 'private' low level access to browser cookies. + * It is not meant to be used directly, use the $cookie service instead. + * + * The return values vary depending on the arguments that the method was called with as follows: + * + * - cookies() -> hash of all cookies, this is NOT a copy of the internal state, so do not modify + * it + * - cookies(name, value) -> set name to value, if value is undefined delete the cookie + * - cookies(name) -> the same as (name, undefined) == DELETES (no one calls it right now that + * way) + * + * @returns {Object} Hash of all cookies (if called without any parameter) + */ + self.cookies = function(name, value) { + /* global escape: false, unescape: false */ + var cookieLength, cookieArray, cookie, i, index; + + if (name) { + if (value === undefined) { + rawDocument.cookie = escape(name) + "=;path=" + cookiePath + + ";expires=Thu, 01 Jan 1970 00:00:00 GMT"; + } else { + if (isString(value)) { + cookieLength = (rawDocument.cookie = escape(name) + '=' + escape(value) + + ';path=' + cookiePath).length + 1; + + // per http://www.ietf.org/rfc/rfc2109.txt browser must allow at minimum: + // - 300 cookies + // - 20 cookies per unique domain + // - 4096 bytes per cookie + if (cookieLength > 4096) { + $log.warn("Cookie '"+ name + + "' possibly not set or overflowed because it was too large ("+ + cookieLength + " > 4096 bytes)!"); + } + } + } + } else { + if (rawDocument.cookie !== lastCookieString) { + lastCookieString = rawDocument.cookie; + cookieArray = lastCookieString.split("; "); + lastCookies = {}; + + for (i = 0; i < cookieArray.length; i++) { + cookie = cookieArray[i]; + index = cookie.indexOf('='); + if (index > 0) { //ignore nameless cookies + name = unescape(cookie.substring(0, index)); + // the first value that is seen for a cookie is the most + // specific one. values for the same cookie name that + // follow are for less specific paths. + if (lastCookies[name] === undefined) { + lastCookies[name] = unescape(cookie.substring(index + 1)); + } + } + } + } + return lastCookies; + } + }; + + + /** + * @name $browser#defer + * @param {function()} fn A function, who's execution should be deferred. + * @param {number=} [delay=0] of milliseconds to defer the function execution. + * @returns {*} DeferId that can be used to cancel the task via `$browser.defer.cancel()`. + * + * @description + * Executes a fn asynchronously via `setTimeout(fn, delay)`. + * + * Unlike when calling `setTimeout` directly, in test this function is mocked and instead of using + * `setTimeout` in tests, the fns are queued in an array, which can be programmatically flushed + * via `$browser.defer.flush()`. + * + */ + self.defer = function(fn, delay) { + var timeoutId; + outstandingRequestCount++; + timeoutId = setTimeout(function() { + delete pendingDeferIds[timeoutId]; + completeOutstandingRequest(fn); + }, delay || 0); + pendingDeferIds[timeoutId] = true; + return timeoutId; + }; + + + /** + * @name $browser#defer.cancel + * + * @description + * Cancels a deferred task identified with `deferId`. + * + * @param {*} deferId Token returned by the `$browser.defer` function. + * @returns {boolean} Returns `true` if the task hasn't executed yet and was successfully + * canceled. + */ + self.defer.cancel = function(deferId) { + if (pendingDeferIds[deferId]) { + delete pendingDeferIds[deferId]; + clearTimeout(deferId); + completeOutstandingRequest(noop); + return true; + } + return false; + }; + +} + +function $BrowserProvider(){ + this.$get = ['$window', '$log', '$sniffer', '$document', + function( $window, $log, $sniffer, $document){ + return new Browser($window, $document, $log, $sniffer); + }]; +} + +/** + * @ngdoc service + * @name $cacheFactory + * + * @description + * Factory that constructs {@link $cacheFactory.Cache Cache} objects and gives access to + * them. + * + * ```js + * + * var cache = $cacheFactory('cacheId'); + * expect($cacheFactory.get('cacheId')).toBe(cache); + * expect($cacheFactory.get('noSuchCacheId')).not.toBeDefined(); + * + * cache.put("key", "value"); + * cache.put("another key", "another value"); + * + * // We've specified no options on creation + * expect(cache.info()).toEqual({id: 'cacheId', size: 2}); + * + * ``` + * + * + * @param {string} cacheId Name or id of the newly created cache. + * @param {object=} options Options object that specifies the cache behavior. Properties: + * + * - `{number=}` `capacity` — turns the cache into LRU cache. + * + * @returns {object} Newly created cache object with the following set of methods: + * + * - `{object}` `info()` — Returns id, size, and options of cache. + * - `{{*}}` `put({string} key, {*} value)` — Puts a new key-value pair into the cache and returns + * it. + * - `{{*}}` `get({string} key)` — Returns cached value for `key` or undefined for cache miss. + * - `{void}` `remove({string} key)` — Removes a key-value pair from the cache. + * - `{void}` `removeAll()` — Removes all cached values. + * - `{void}` `destroy()` — Removes references to this cache from $cacheFactory. + * + * @example + + +
    + + + + +

    Cached Values

    +
    + + : + +
    + +

    Cache Info

    +
    + + : + +
    +
    +     + + angular.module('cacheExampleApp', []). + controller('CacheController', ['$scope', '$cacheFactory', function($scope, $cacheFactory) { + $scope.keys = []; + $scope.cache = $cacheFactory('cacheId'); + $scope.put = function(key, value) { + if ($scope.cache.get(key) === undefined) { + $scope.keys.push(key); + } + $scope.cache.put(key, value === undefined ? null : value); + }; + }]); + + + p { + margin: 10px 0 3px; + } + +     + */ +function $CacheFactoryProvider() { + + this.$get = function() { + var caches = {}; + + function cacheFactory(cacheId, options) { + if (cacheId in caches) { + throw minErr('$cacheFactory')('iid', "CacheId '{0}' is already taken!", cacheId); + } + + var size = 0, + stats = extend({}, options, {id: cacheId}), + data = {}, + capacity = (options && options.capacity) || Number.MAX_VALUE, + lruHash = {}, + freshEnd = null, + staleEnd = null; + + /** + * @ngdoc type + * @name $cacheFactory.Cache + * + * @description + * A cache object used to store and retrieve data, primarily used by + * {@link $http $http} and the {@link ng.directive:script script} directive to cache + * templates and other data. + * + * ```js + * angular.module('superCache') + * .factory('superCache', ['$cacheFactory', function($cacheFactory) { + * return $cacheFactory('super-cache'); + * }]); + * ``` + * + * Example test: + * + * ```js + * it('should behave like a cache', inject(function(superCache) { + * superCache.put('key', 'value'); + * superCache.put('another key', 'another value'); + * + * expect(superCache.info()).toEqual({ + * id: 'super-cache', + * size: 2 + * }); + * + * superCache.remove('another key'); + * expect(superCache.get('another key')).toBeUndefined(); + * + * superCache.removeAll(); + * expect(superCache.info()).toEqual({ + * id: 'super-cache', + * size: 0 + * }); + * })); + * ``` + */ + return caches[cacheId] = { + + /** + * @ngdoc method + * @name $cacheFactory.Cache#put + * @kind function + * + * @description + * Inserts a named entry into the {@link $cacheFactory.Cache Cache} object to be + * retrieved later, and incrementing the size of the cache if the key was not already + * present in the cache. If behaving like an LRU cache, it will also remove stale + * entries from the set. + * + * It will not insert undefined values into the cache. + * + * @param {string} key the key under which the cached data is stored. + * @param {*} value the value to store alongside the key. If it is undefined, the key + * will not be stored. + * @returns {*} the value stored. + */ + put: function(key, value) { + if (capacity < Number.MAX_VALUE) { + var lruEntry = lruHash[key] || (lruHash[key] = {key: key}); + + refresh(lruEntry); + } + + if (isUndefined(value)) return; + if (!(key in data)) size++; + data[key] = value; + + if (size > capacity) { + this.remove(staleEnd.key); + } + + return value; + }, + + /** + * @ngdoc method + * @name $cacheFactory.Cache#get + * @kind function + * + * @description + * Retrieves named data stored in the {@link $cacheFactory.Cache Cache} object. + * + * @param {string} key the key of the data to be retrieved + * @returns {*} the value stored. + */ + get: function(key) { + if (capacity < Number.MAX_VALUE) { + var lruEntry = lruHash[key]; + + if (!lruEntry) return; + + refresh(lruEntry); + } + + return data[key]; + }, + + + /** + * @ngdoc method + * @name $cacheFactory.Cache#remove + * @kind function + * + * @description + * Removes an entry from the {@link $cacheFactory.Cache Cache} object. + * + * @param {string} key the key of the entry to be removed + */ + remove: function(key) { + if (capacity < Number.MAX_VALUE) { + var lruEntry = lruHash[key]; + + if (!lruEntry) return; + + if (lruEntry == freshEnd) freshEnd = lruEntry.p; + if (lruEntry == staleEnd) staleEnd = lruEntry.n; + link(lruEntry.n,lruEntry.p); + + delete lruHash[key]; + } + + delete data[key]; + size--; + }, + + + /** + * @ngdoc method + * @name $cacheFactory.Cache#removeAll + * @kind function + * + * @description + * Clears the cache object of any entries. + */ + removeAll: function() { + data = {}; + size = 0; + lruHash = {}; + freshEnd = staleEnd = null; + }, + + + /** + * @ngdoc method + * @name $cacheFactory.Cache#destroy + * @kind function + * + * @description + * Destroys the {@link $cacheFactory.Cache Cache} object entirely, + * removing it from the {@link $cacheFactory $cacheFactory} set. + */ + destroy: function() { + data = null; + stats = null; + lruHash = null; + delete caches[cacheId]; + }, + + + /** + * @ngdoc method + * @name $cacheFactory.Cache#info + * @kind function + * + * @description + * Retrieve information regarding a particular {@link $cacheFactory.Cache Cache}. + * + * @returns {object} an object with the following properties: + *
      + *
    • **id**: the id of the cache instance
      • + *
    • **size**: the number of entries kept in the cache instance
      • + *
    • **...**: any additional properties from the options object when creating the + * cache.
      • + *
    + */ + info: function() { + return extend({}, stats, {size: size}); + } + }; + + + /** + * makes the `entry` the freshEnd of the LRU linked list + */ + function refresh(entry) { + if (entry != freshEnd) { + if (!staleEnd) { + staleEnd = entry; + } else if (staleEnd == entry) { + staleEnd = entry.n; + } + + link(entry.n, entry.p); + link(entry, freshEnd); + freshEnd = entry; + freshEnd.n = null; + } + } + + + /** + * bidirectionally links two entries of the LRU linked list + */ + function link(nextEntry, prevEntry) { + if (nextEntry != prevEntry) { + if (nextEntry) nextEntry.p = prevEntry; //p stands for previous, 'prev' didn't minify + if (prevEntry) prevEntry.n = nextEntry; //n stands for next, 'next' didn't minify + } + } + } + + + /** + * @ngdoc method + * @name $cacheFactory#info + * + * @description + * Get information about all the caches that have been created + * + * @returns {Object} - key-value map of `cacheId` to the result of calling `cache#info` + */ + cacheFactory.info = function() { + var info = {}; + forEach(caches, function(cache, cacheId) { + info[cacheId] = cache.info(); + }); + return info; + }; + + + /** + * @ngdoc method + * @name $cacheFactory#get + * + * @description + * Get access to a cache object by the `cacheId` used when it was created. + * + * @param {string} cacheId Name or id of a cache to access. + * @returns {object} Cache object identified by the cacheId or undefined if no such cache. + */ + cacheFactory.get = function(cacheId) { + return caches[cacheId]; + }; + + + return cacheFactory; + }; +} + +/** + * @ngdoc service + * @name $templateCache + * + * @description + * The first time a template is used, it is loaded in the template cache for quick retrieval. You + * can load templates directly into the cache in a `script` tag, or by consuming the + * `$templateCache` service directly. + * + * Adding via the `script` tag: + * + * ```html + * + * ``` + * + * **Note:** the `script` tag containing the template does not need to be included in the `head` of + * the document, but it must be below the `ng-app` definition. + * + * Adding via the $templateCache service: + * + * ```js + * var myApp = angular.module('myApp', []); + * myApp.run(function($templateCache) { + * $templateCache.put('templateId.html', 'This is the content of the template'); + * }); + * ``` + * + * To retrieve the template later, simply use it in your HTML: + * ```html + *
    + * ``` + * + * or get it via Javascript: + * ```js + * $templateCache.get('templateId.html') + * ``` + * + * See {@link ng.$cacheFactory $cacheFactory}. + * + */ +function $TemplateCacheProvider() { + this.$get = ['$cacheFactory', function($cacheFactory) { + return $cacheFactory('templates'); + }]; +} + +/* ! VARIABLE/FUNCTION NAMING CONVENTIONS THAT APPLY TO THIS FILE! + * + * DOM-related variables: + * + * - "node" - DOM Node + * - "element" - DOM Element or Node + * - "$node" or "$element" - jqLite-wrapped node or element + * + * + * Compiler related stuff: + * + * - "linkFn" - linking fn of a single directive + * - "nodeLinkFn" - function that aggregates all linking fns for a particular node + * - "childLinkFn" - function that aggregates all linking fns for child nodes of a particular node + * - "compositeLinkFn" - function that aggregates all linking fns for a compilation root (nodeList) + */ + + +/** + * @ngdoc service + * @name $compile + * @kind function + * + * @description + * Compiles an HTML string or DOM into a template and produces a template function, which + * can then be used to link {@link ng.$rootScope.Scope `scope`} and the template together. + * + * The compilation is a process of walking the DOM tree and matching DOM elements to + * {@link ng.$compileProvider#directive directives}. + * + *
    + * **Note:** This document is an in-depth reference of all directive options. + * For a gentle introduction to directives with examples of common use cases, + * see the {@link guide/directive directive guide}. + *
    + * + * ## Comprehensive Directive API + * + * There are many different options for a directive. + * + * The difference resides in the return value of the factory function. + * You can either return a "Directive Definition Object" (see below) that defines the directive properties, + * or just the `postLink` function (all other properties will have the default values). + * + *
    + * **Best Practice:** It's recommended to use the "directive definition object" form. + *
    + * + * Here's an example directive declared with a Directive Definition Object: + * + * ```js + * var myModule = angular.module(...); + * + * myModule.directive('directiveName', function factory(injectables) { + * var directiveDefinitionObject = { + * priority: 0, + * template: '
    ', // or // function(tElement, tAttrs) { ... }, + * // or + * // templateUrl: 'directive.html', // or // function(tElement, tAttrs) { ... }, + * transclude: false, + * restrict: 'A', + * scope: false, + * controller: function($scope, $element, $attrs, $transclude, otherInjectables) { ... }, + * controllerAs: 'stringAlias', + * require: 'siblingDirectiveName', // or // ['^parentDirectiveName', '?optionalDirectiveName', '?^optionalParent'], + * compile: function compile(tElement, tAttrs, transclude) { + * return { + * pre: function preLink(scope, iElement, iAttrs, controller) { ... }, + * post: function postLink(scope, iElement, iAttrs, controller) { ... } + * } + * // or + * // return function postLink( ... ) { ... } + * }, + * // or + * // link: { + * // pre: function preLink(scope, iElement, iAttrs, controller) { ... }, + * // post: function postLink(scope, iElement, iAttrs, controller) { ... } + * // } + * // or + * // link: function postLink( ... ) { ... } + * }; + * return directiveDefinitionObject; + * }); + * ``` + * + *
    + * **Note:** Any unspecified options will use the default value. You can see the default values below. + *
    + * + * Therefore the above can be simplified as: + * + * ```js + * var myModule = angular.module(...); + * + * myModule.directive('directiveName', function factory(injectables) { + * var directiveDefinitionObject = { + * link: function postLink(scope, iElement, iAttrs) { ... } + * }; + * return directiveDefinitionObject; + * // or + * // return function postLink(scope, iElement, iAttrs) { ... } + * }); + * ``` + * + * + * + * ### Directive Definition Object + * + * The directive definition object provides instructions to the {@link ng.$compile + * compiler}. The attributes are: + * + * #### `priority` + * When there are multiple directives defined on a single DOM element, sometimes it + * is necessary to specify the order in which the directives are applied. The `priority` is used + * to sort the directives before their `compile` functions get called. Priority is defined as a + * number. Directives with greater numerical `priority` are compiled first. Pre-link functions + * are also run in priority order, but post-link functions are run in reverse order. The order + * of directives with the same priority is undefined. The default priority is `0`. + * + * #### `terminal` + * If set to true then the current `priority` will be the last set of directives + * which will execute (any directives at the current priority will still execute + * as the order of execution on same `priority` is undefined). + * + * #### `scope` + * **If set to `true`,** then a new scope will be created for this directive. If multiple directives on the + * same element request a new scope, only one new scope is created. The new scope rule does not + * apply for the root of the template since the root of the template always gets a new scope. + * + * **If set to `{}` (object hash),** then a new "isolate" scope is created. The 'isolate' scope differs from + * normal scope in that it does not prototypically inherit from the parent scope. This is useful + * when creating reusable components, which should not accidentally read or modify data in the + * parent scope. + * + * The 'isolate' scope takes an object hash which defines a set of local scope properties + * derived from the parent scope. These local properties are useful for aliasing values for + * templates. Locals definition is a hash of local scope property to its source: + * + * * `@` or `@attr` - bind a local scope property to the value of DOM attribute. The result is + * always a string since DOM attributes are strings. If no `attr` name is specified then the + * attribute name is assumed to be the same as the local name. + * Given `` and widget definition + * of `scope: { localName:'@myAttr' }`, then widget scope property `localName` will reflect + * the interpolated value of `hello {{name}}`. As the `name` attribute changes so will the + * `localName` property on the widget scope. The `name` is read from the parent scope (not + * component scope). + * + * * `=` or `=attr` - set up bi-directional binding between a local scope property and the + * parent scope property of name defined via the value of the `attr` attribute. If no `attr` + * name is specified then the attribute name is assumed to be the same as the local name. + * Given `` and widget definition of + * `scope: { localModel:'=myAttr' }`, then widget scope property `localModel` will reflect the + * value of `parentModel` on the parent scope. Any changes to `parentModel` will be reflected + * in `localModel` and any changes in `localModel` will reflect in `parentModel`. If the parent + * scope property doesn't exist, it will throw a NON_ASSIGNABLE_MODEL_EXPRESSION exception. You + * can avoid this behavior using `=?` or `=?attr` in order to flag the property as optional. + * + * * `&` or `&attr` - provides a way to execute an expression in the context of the parent scope. + * If no `attr` name is specified then the attribute name is assumed to be the same as the + * local name. Given `` and widget definition of + * `scope: { localFn:'&myAttr' }`, then isolate scope property `localFn` will point to + * a function wrapper for the `count = count + value` expression. Often it's desirable to + * pass data from the isolated scope via an expression to the parent scope, this can be + * done by passing a map of local variable names and values into the expression wrapper fn. + * For example, if the expression is `increment(amount)` then we can specify the amount value + * by calling the `localFn` as `localFn({amount: 22})`. + * + * + * + * #### `controller` + * Controller constructor function. The controller is instantiated before the + * pre-linking phase and it is shared with other directives (see + * `require` attribute). This allows the directives to communicate with each other and augment + * each other's behavior. The controller is injectable (and supports bracket notation) with the following locals: + * + * * `$scope` - Current scope associated with the element + * * `$element` - Current element + * * `$attrs` - Current attributes object for the element + * * `$transclude` - A transclude linking function pre-bound to the correct transclusion scope. + * The scope can be overridden by an optional first argument. + * `function([scope], cloneLinkingFn)`. + * + * + * #### `require` + * Require another directive and inject its controller as the fourth argument to the linking function. The + * `require` takes a string name (or array of strings) of the directive(s) to pass in. If an array is used, the + * injected argument will be an array in corresponding order. If no such directive can be + * found, or if the directive does not have a controller, then an error is raised. The name can be prefixed with: + * + * * (no prefix) - Locate the required controller on the current element. Throw an error if not found. + * * `?` - Attempt to locate the required controller or pass `null` to the `link` fn if not found. + * * `^` - Locate the required controller by searching the element and its parents. Throw an error if not found. + * * `?^` - Attempt to locate the required controller by searching the element and its parents or pass + * `null` to the `link` fn if not found. + * + * + * #### `controllerAs` + * Controller alias at the directive scope. An alias for the controller so it + * can be referenced at the directive template. The directive needs to define a scope for this + * configuration to be used. Useful in the case when directive is used as component. + * + * + * #### `restrict` + * String of subset of `EACM` which restricts the directive to a specific directive + * declaration style. If omitted, the default (attributes only) is used. + * + * * `E` - Element name: `` + * * `A` - Attribute (default): `
    ` + * * `C` - Class: `
    ` + * * `M` - Comment: `` + * + * + * #### `template` + * HTML markup that may: + * * Replace the contents of the directive's element (default). + * * Replace the directive's element itself (if `replace` is true - DEPRECATED). + * * Wrap the contents of the directive's element (if `transclude` is true). + * + * Value may be: + * + * * A string. For example `
    {{delete_str}}
    `. + * * A function which takes two arguments `tElement` and `tAttrs` (described in the `compile` + * function api below) and returns a string value. + * + * + * #### `templateUrl` + * Same as `template` but the template is loaded from the specified URL. Because + * the template loading is asynchronous the compilation/linking is suspended until the template + * is loaded. + * + * You can specify `templateUrl` as a string representing the URL or as a function which takes two + * arguments `tElement` and `tAttrs` (described in the `compile` function api below) and returns + * a string value representing the url. In either case, the template URL is passed through {@link + * api/ng.$sce#getTrustedResourceUrl $sce.getTrustedResourceUrl}. + * + * + * #### `replace` ([*DEPRECATED*!], will be removed in next major release) + * specify what the template should replace. Defaults to `false`. + * + * * `true` - the template will replace the directive's element. + * * `false` - the template will replace the contents of the directive's element. + * + * The replacement process migrates all of the attributes / classes from the old element to the new + * one. See the {@link guide/directive#creating-custom-directives_creating-directives_template-expanding-directive + * Directives Guide} for an example. + * + * #### `transclude` + * compile the content of the element and make it available to the directive. + * Typically used with {@link ng.directive:ngTransclude + * ngTransclude}. The advantage of transclusion is that the linking function receives a + * transclusion function which is pre-bound to the correct scope. In a typical setup the widget + * creates an `isolate` scope, but the transclusion is not a child, but a sibling of the `isolate` + * scope. This makes it possible for the widget to have private state, and the transclusion to + * be bound to the parent (pre-`isolate`) scope. + * + * * `true` - transclude the content of the directive. + * * `'element'` - transclude the whole element including any directives defined at lower priority. + * + *
    + * **Note:** When testing an element transclude directive you must not place the directive at the root of the + * DOM fragment that is being compiled. See {@link guide/unit-testing#testing-transclusion-directives + * Testing Transclusion Directives}. + *
    + * + * #### `compile` + * + * ```js + * function compile(tElement, tAttrs, transclude) { ... } + * ``` + * + * The compile function deals with transforming the template DOM. Since most directives do not do + * template transformation, it is not used often. The compile function takes the following arguments: + * + * * `tElement` - template element - The element where the directive has been declared. It is + * safe to do template transformation on the element and child elements only. + * + * * `tAttrs` - template attributes - Normalized list of attributes declared on this element shared + * between all directive compile functions. + * + * * `transclude` - [*DEPRECATED*!] A transclude linking function: `function(scope, cloneLinkingFn)` + * + *
    + * **Note:** The template instance and the link instance may be different objects if the template has + * been cloned. For this reason it is **not** safe to do anything other than DOM transformations that + * apply to all cloned DOM nodes within the compile function. Specifically, DOM listener registration + * should be done in a linking function rather than in a compile function. + *
    + + *
    + * **Note:** The compile function cannot handle directives that recursively use themselves in their + * own templates or compile functions. Compiling these directives results in an infinite loop and a + * stack overflow errors. + * + * This can be avoided by manually using $compile in the postLink function to imperatively compile + * a directive's template instead of relying on automatic template compilation via `template` or + * `templateUrl` declaration or manual compilation inside the compile function. + *
    + * + *
    + * **Note:** The `transclude` function that is passed to the compile function is deprecated, as it + * e.g. does not know about the right outer scope. Please use the transclude function that is passed + * to the link function instead. + *
    + + * A compile function can have a return value which can be either a function or an object. + * + * * returning a (post-link) function - is equivalent to registering the linking function via the + * `link` property of the config object when the compile function is empty. + * + * * returning an object with function(s) registered via `pre` and `post` properties - allows you to + * control when a linking function should be called during the linking phase. See info about + * pre-linking and post-linking functions below. + * + * + * #### `link` + * This property is used only if the `compile` property is not defined. + * + * ```js + * function link(scope, iElement, iAttrs, controller, transcludeFn) { ... } + * ``` + * + * The link function is responsible for registering DOM listeners as well as updating the DOM. It is + * executed after the template has been cloned. This is where most of the directive logic will be + * put. + * + * * `scope` - {@link ng.$rootScope.Scope Scope} - The scope to be used by the + * directive for registering {@link ng.$rootScope.Scope#$watch watches}. + * + * * `iElement` - instance element - The element where the directive is to be used. It is safe to + * manipulate the children of the element only in `postLink` function since the children have + * already been linked. + * + * * `iAttrs` - instance attributes - Normalized list of attributes declared on this element shared + * between all directive linking functions. + * + * * `controller` - a controller instance - A controller instance if at least one directive on the + * element defines a controller. The controller is shared among all the directives, which allows + * the directives to use the controllers as a communication channel. + * + * * `transcludeFn` - A transclude linking function pre-bound to the correct transclusion scope. + * The scope can be overridden by an optional first argument. This is the same as the `$transclude` + * parameter of directive controllers. + * `function([scope], cloneLinkingFn)`. + * + * + * #### Pre-linking function + * + * Executed before the child elements are linked. Not safe to do DOM transformation since the + * compiler linking function will fail to locate the correct elements for linking. + * + * #### Post-linking function + * + * Executed after the child elements are linked. It is safe to do DOM transformation in the post-linking function. + * + * + * ### Attributes + * + * The {@link ng.$compile.directive.Attributes Attributes} object - passed as a parameter in the + * `link()` or `compile()` functions. It has a variety of uses. + * + * accessing *Normalized attribute names:* + * Directives like 'ngBind' can be expressed in many ways: 'ng:bind', `data-ng-bind`, or 'x-ng-bind'. + * the attributes object allows for normalized access to + * the attributes. + * + * * *Directive inter-communication:* All directives share the same instance of the attributes + * object which allows the directives to use the attributes object as inter directive + * communication. + * + * * *Supports interpolation:* Interpolation attributes are assigned to the attribute object + * allowing other directives to read the interpolated value. + * + * * *Observing interpolated attributes:* Use `$observe` to observe the value changes of attributes + * that contain interpolation (e.g. `src="{{bar}}"`). Not only is this very efficient but it's also + * the only way to easily get the actual value because during the linking phase the interpolation + * hasn't been evaluated yet and so the value is at this time set to `undefined`. + * + * ```js + * function linkingFn(scope, elm, attrs, ctrl) { + * // get the attribute value + * console.log(attrs.ngModel); + * + * // change the attribute + * attrs.$set('ngModel', 'new value'); + * + * // observe changes to interpolated attribute + * attrs.$observe('ngModel', function(value) { + * console.log('ngModel has changed value to ' + value); + * }); + * } + * ``` + * + * Below is an example using `$compileProvider`. + * + *
    + * **Note**: Typically directives are registered with `module.directive`. The example below is + * to illustrate how `$compile` works. + *
    + * + + + +
    +
    +
    +
    +
    +     + + it('should auto compile', function() { + var textarea = $('textarea'); + var output = $('div[compile]'); + // The initial state reads 'Hello Angular'. + expect(output.getText()).toBe('Hello Angular'); + textarea.clear(); + textarea.sendKeys('{{name}}!'); + expect(output.getText()).toBe('Angular!'); + }); + +     + + * + * + * @param {string|DOMElement} element Element or HTML string to compile into a template function. + * @param {function(angular.Scope, cloneAttachFn=)} transclude function available to directives. + * @param {number} maxPriority only apply directives lower than given priority (Only effects the + * root element(s), not their children) + * @returns {function(scope, cloneAttachFn=)} a link function which is used to bind template + * (a DOM element/tree) to a scope. Where: + * + * * `scope` - A {@link ng.$rootScope.Scope Scope} to bind to. + * * `cloneAttachFn` - If `cloneAttachFn` is provided, then the link function will clone the + * `template` and call the `cloneAttachFn` function allowing the caller to attach the + * cloned elements to the DOM document at the appropriate place. The `cloneAttachFn` is + * called as:
    `cloneAttachFn(clonedElement, scope)` where: + * + * * `clonedElement` - is a clone of the original `element` passed into the compiler. + * * `scope` - is the current scope with which the linking function is working with. + * + * Calling the linking function returns the element of the template. It is either the original + * element passed in, or the clone of the element if the `cloneAttachFn` is provided. + * + * After linking the view is not updated until after a call to $digest which typically is done by + * Angular automatically. + * + * If you need access to the bound view, there are two ways to do it: + * + * - If you are not asking the linking function to clone the template, create the DOM element(s) + * before you send them to the compiler and keep this reference around. + * ```js + * var element = $compile('

    {{total}}

    ')(scope); + * ``` + * + * - if on the other hand, you need the element to be cloned, the view reference from the original + * example would not point to the clone, but rather to the original template that was cloned. In + * this case, you can access the clone via the cloneAttachFn: + * ```js + * var templateElement = angular.element('

    {{total}}

    '), + * scope = ....; + * + * var clonedElement = $compile(templateElement)(scope, function(clonedElement, scope) { + * //attach the clone to DOM document at the right place + * }); + * + * //now we have reference to the cloned DOM via `clonedElement` + * ``` + * + * + * For information on how the compiler works, see the + * {@link guide/compiler Angular HTML Compiler} section of the Developer Guide. + */ + +var $compileMinErr = minErr('$compile'); + +/** + * @ngdoc provider + * @name $compileProvider + * @kind function + * + * @description + */ +$CompileProvider.$inject = ['$provide', '$$sanitizeUriProvider']; +function $CompileProvider($provide, $$sanitizeUriProvider) { + var hasDirectives = {}, + Suffix = 'Directive', + COMMENT_DIRECTIVE_REGEXP = /^\s*directive\:\s*([\d\w_\-]+)\s+(.*)$/, + CLASS_DIRECTIVE_REGEXP = /(([\d\w_\-]+)(?:\:([^;]+))?;?)/; + + // Ref: http://developers.whatwg.org/webappapis.html#event-handler-idl-attributes + // The assumption is that future DOM event attribute names will begin with + // 'on' and be composed of only English letters. + var EVENT_HANDLER_ATTR_REGEXP = /^(on[a-z]+|formaction)$/; + + /** + * @ngdoc method + * @name $compileProvider#directive + * @kind function + * + * @description + * Register a new directive with the compiler. + * + * @param {string|Object} name Name of the directive in camel-case (i.e. ngBind which + * will match as ng-bind), or an object map of directives where the keys are the + * names and the values are the factories. + * @param {Function|Array} directiveFactory An injectable directive factory function. See + * {@link guide/directive} for more info. + * @returns {ng.$compileProvider} Self for chaining. + */ + this.directive = function registerDirective(name, directiveFactory) { + assertNotHasOwnProperty(name, 'directive'); + if (isString(name)) { + assertArg(directiveFactory, 'directiveFactory'); + if (!hasDirectives.hasOwnProperty(name)) { + hasDirectives[name] = []; + $provide.factory(name + Suffix, ['$injector', '$exceptionHandler', + function($injector, $exceptionHandler) { + var directives = []; + forEach(hasDirectives[name], function(directiveFactory, index) { + try { + var directive = $injector.invoke(directiveFactory); + if (isFunction(directive)) { + directive = { compile: valueFn(directive) }; + } else if (!directive.compile && directive.link) { + directive.compile = valueFn(directive.link); + } + directive.priority = directive.priority || 0; + directive.index = index; + directive.name = directive.name || name; + directive.require = directive.require || (directive.controller && directive.name); + directive.restrict = directive.restrict || 'A'; + directives.push(directive); + } catch (e) { + $exceptionHandler(e); + } + }); + return directives; + }]); + } + hasDirectives[name].push(directiveFactory); + } else { + forEach(name, reverseParams(registerDirective)); + } + return this; + }; + + + /** + * @ngdoc method + * @name $compileProvider#aHrefSanitizationWhitelist + * @kind function + * + * @description + * Retrieves or overrides the default regular expression that is used for whitelisting of safe + * urls during a[href] sanitization. + * + * The sanitization is a security measure aimed at prevent XSS attacks via html links. + * + * Any url about to be assigned to a[href] via data-binding is first normalized and turned into + * an absolute url. Afterwards, the url is matched against the `aHrefSanitizationWhitelist` + * regular expression. If a match is found, the original url is written into the dom. Otherwise, + * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM. + * + * @param {RegExp=} regexp New regexp to whitelist urls with. + * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for + * chaining otherwise. + */ + this.aHrefSanitizationWhitelist = function(regexp) { + if (isDefined(regexp)) { + $$sanitizeUriProvider.aHrefSanitizationWhitelist(regexp); + return this; + } else { + return $$sanitizeUriProvider.aHrefSanitizationWhitelist(); + } + }; + + + /** + * @ngdoc method + * @name $compileProvider#imgSrcSanitizationWhitelist + * @kind function + * + * @description + * Retrieves or overrides the default regular expression that is used for whitelisting of safe + * urls during img[src] sanitization. + * + * The sanitization is a security measure aimed at prevent XSS attacks via html links. + * + * Any url about to be assigned to img[src] via data-binding is first normalized and turned into + * an absolute url. Afterwards, the url is matched against the `imgSrcSanitizationWhitelist` + * regular expression. If a match is found, the original url is written into the dom. Otherwise, + * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM. + * + * @param {RegExp=} regexp New regexp to whitelist urls with. + * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for + * chaining otherwise. + */ + this.imgSrcSanitizationWhitelist = function(regexp) { + if (isDefined(regexp)) { + $$sanitizeUriProvider.imgSrcSanitizationWhitelist(regexp); + return this; + } else { + return $$sanitizeUriProvider.imgSrcSanitizationWhitelist(); + } + }; + + this.$get = [ + '$injector', '$interpolate', '$exceptionHandler', '$http', '$templateCache', '$parse', + '$controller', '$rootScope', '$document', '$sce', '$animate', '$$sanitizeUri', + function($injector, $interpolate, $exceptionHandler, $http, $templateCache, $parse, + $controller, $rootScope, $document, $sce, $animate, $$sanitizeUri) { + + var Attributes = function(element, attr) { + this.$$element = element; + this.$attr = attr || {}; + }; + + Attributes.prototype = { + $normalize: directiveNormalize, + + + /** + * @ngdoc method + * @name $compile.directive.Attributes#$addClass + * @kind function + * + * @description + * Adds the CSS class value specified by the classVal parameter to the element. If animations + * are enabled then an animation will be triggered for the class addition. + * + * @param {string} classVal The className value that will be added to the element + */ + $addClass : function(classVal) { + if(classVal && classVal.length > 0) { + $animate.addClass(this.$$element, classVal); + } + }, + + /** + * @ngdoc method + * @name $compile.directive.Attributes#$removeClass + * @kind function + * + * @description + * Removes the CSS class value specified by the classVal parameter from the element. If + * animations are enabled then an animation will be triggered for the class removal. + * + * @param {string} classVal The className value that will be removed from the element + */ + $removeClass : function(classVal) { + if(classVal && classVal.length > 0) { + $animate.removeClass(this.$$element, classVal); + } + }, + + /** + * @ngdoc method + * @name $compile.directive.Attributes#$updateClass + * @kind function + * + * @description + * Adds and removes the appropriate CSS class values to the element based on the difference + * between the new and old CSS class values (specified as newClasses and oldClasses). + * + * @param {string} newClasses The current CSS className value + * @param {string} oldClasses The former CSS className value + */ + $updateClass : function(newClasses, oldClasses) { + var toAdd = tokenDifference(newClasses, oldClasses); + var toRemove = tokenDifference(oldClasses, newClasses); + + if(toAdd.length === 0) { + $animate.removeClass(this.$$element, toRemove); + } else if(toRemove.length === 0) { + $animate.addClass(this.$$element, toAdd); + } else { + $animate.setClass(this.$$element, toAdd, toRemove); + } + }, + + /** + * Set a normalized attribute on the element in a way such that all directives + * can share the attribute. This function properly handles boolean attributes. + * @param {string} key Normalized key. (ie ngAttribute) + * @param {string|boolean} value The value to set. If `null` attribute will be deleted. + * @param {boolean=} writeAttr If false, does not write the value to DOM element attribute. + * Defaults to true. + * @param {string=} attrName Optional none normalized name. Defaults to key. + */ + $set: function(key, value, writeAttr, attrName) { + // TODO: decide whether or not to throw an error if "class" + //is set through this function since it may cause $updateClass to + //become unstable. + + var booleanKey = getBooleanAttrName(this.$$element[0], key), + normalizedVal, + nodeName; + + if (booleanKey) { + this.$$element.prop(key, value); + attrName = booleanKey; + } + + this[key] = value; + + // translate normalized key to actual key + if (attrName) { + this.$attr[key] = attrName; + } else { + attrName = this.$attr[key]; + if (!attrName) { + this.$attr[key] = attrName = snake_case(key, '-'); + } + } + + nodeName = nodeName_(this.$$element); + + // sanitize a[href] and img[src] values + if ((nodeName === 'A' && key === 'href') || + (nodeName === 'IMG' && key === 'src')) { + this[key] = value = $$sanitizeUri(value, key === 'src'); + } + + if (writeAttr !== false) { + if (value === null || value === undefined) { + this.$$element.removeAttr(attrName); + } else { + this.$$element.attr(attrName, value); + } + } + + // fire observers + var $$observers = this.$$observers; + $$observers && forEach($$observers[key], function(fn) { + try { + fn(value); + } catch (e) { + $exceptionHandler(e); + } + }); + }, + + + /** + * @ngdoc method + * @name $compile.directive.Attributes#$observe + * @kind function + * + * @description + * Observes an interpolated attribute. + * + * The observer function will be invoked once during the next `$digest` following + * compilation. The observer is then invoked whenever the interpolated value + * changes. + * + * @param {string} key Normalized key. (ie ngAttribute) . + * @param {function(interpolatedValue)} fn Function that will be called whenever + the interpolated value of the attribute changes. + * See the {@link guide/directive#Attributes Directives} guide for more info. + * @returns {function()} the `fn` parameter. + */ + $observe: function(key, fn) { + var attrs = this, + $$observers = (attrs.$$observers || (attrs.$$observers = {})), + listeners = ($$observers[key] || ($$observers[key] = [])); + + listeners.push(fn); + $rootScope.$evalAsync(function() { + if (!listeners.$$inter) { + // no one registered attribute interpolation function, so lets call it manually + fn(attrs[key]); + } + }); + return fn; + } + }; + + var startSymbol = $interpolate.startSymbol(), + endSymbol = $interpolate.endSymbol(), + denormalizeTemplate = (startSymbol == '{{' || endSymbol == '}}') + ? identity + : function denormalizeTemplate(template) { + return template.replace(/\{\{/g, startSymbol).replace(/}}/g, endSymbol); + }, + NG_ATTR_BINDING = /^ngAttr[A-Z]/; + + + return compile; + + //================================ + + function compile($compileNodes, transcludeFn, maxPriority, ignoreDirective, + previousCompileContext) { + if (!($compileNodes instanceof jqLite)) { + // jquery always rewraps, whereas we need to preserve the original selector so that we can + // modify it. + $compileNodes = jqLite($compileNodes); + } + // We can not compile top level text elements since text nodes can be merged and we will + // not be able to attach scope data to them, so we will wrap them in + forEach($compileNodes, function(node, index){ + if (node.nodeType == 3 /* text node */ && node.nodeValue.match(/\S+/) /* non-empty */ ) { + $compileNodes[index] = node = jqLite(node).wrap('').parent()[0]; + } + }); + var compositeLinkFn = + compileNodes($compileNodes, transcludeFn, $compileNodes, + maxPriority, ignoreDirective, previousCompileContext); + safeAddClass($compileNodes, 'ng-scope'); + return function publicLinkFn(scope, cloneConnectFn, transcludeControllers, parentBoundTranscludeFn){ + assertArg(scope, 'scope'); + // important!!: we must call our jqLite.clone() since the jQuery one is trying to be smart + // and sometimes changes the structure of the DOM. + var $linkNode = cloneConnectFn + ? JQLitePrototype.clone.call($compileNodes) // IMPORTANT!!! + : $compileNodes; + + forEach(transcludeControllers, function(instance, name) { + $linkNode.data('$' + name + 'Controller', instance); + }); + + // Attach scope only to non-text nodes. + for(var i = 0, ii = $linkNode.length; i + addDirective(directives, + directiveNormalize(nodeName_(node).toLowerCase()), 'E', maxPriority, ignoreDirective); + + // iterate over the attributes + for (var attr, name, nName, ngAttrName, value, isNgAttr, nAttrs = node.attributes, + j = 0, jj = nAttrs && nAttrs.length; j < jj; j++) { + var attrStartName = false; + var attrEndName = false; + + attr = nAttrs[j]; + if (!msie || msie >= 8 || attr.specified) { + name = attr.name; + value = trim(attr.value); + + // support ngAttr attribute binding + ngAttrName = directiveNormalize(name); + if (isNgAttr = NG_ATTR_BINDING.test(ngAttrName)) { + name = snake_case(ngAttrName.substr(6), '-'); + } + + var directiveNName = ngAttrName.replace(/(Start|End)$/, ''); + if (ngAttrName === directiveNName + 'Start') { + attrStartName = name; + attrEndName = name.substr(0, name.length - 5) + 'end'; + name = name.substr(0, name.length - 6); + } + + nName = directiveNormalize(name.toLowerCase()); + attrsMap[nName] = name; + if (isNgAttr || !attrs.hasOwnProperty(nName)) { + attrs[nName] = value; + if (getBooleanAttrName(node, nName)) { + attrs[nName] = true; // presence means true + } + } + addAttrInterpolateDirective(node, directives, value, nName); + addDirective(directives, nName, 'A', maxPriority, ignoreDirective, attrStartName, + attrEndName); + } + } + + // use class as directive + className = node.className; + if (isString(className) && className !== '') { + while (match = CLASS_DIRECTIVE_REGEXP.exec(className)) { + nName = directiveNormalize(match[2]); + if (addDirective(directives, nName, 'C', maxPriority, ignoreDirective)) { + attrs[nName] = trim(match[3]); + } + className = className.substr(match.index + match[0].length); + } + } + break; + case 3: /* Text Node */ + addTextInterpolateDirective(directives, node.nodeValue); + break; + case 8: /* Comment */ + try { + match = COMMENT_DIRECTIVE_REGEXP.exec(node.nodeValue); + if (match) { + nName = directiveNormalize(match[1]); + if (addDirective(directives, nName, 'M', maxPriority, ignoreDirective)) { + attrs[nName] = trim(match[2]); + } + } + } catch (e) { + // turns out that under some circumstances IE9 throws errors when one attempts to read + // comment's node value. + // Just ignore it and continue. (Can't seem to reproduce in test case.) + } + break; + } + + directives.sort(byPriority); + return directives; + } + + /** + * Given a node with an directive-start it collects all of the siblings until it finds + * directive-end. + * @param node + * @param attrStart + * @param attrEnd + * @returns {*} + */ + function groupScan(node, attrStart, attrEnd) { + var nodes = []; + var depth = 0; + if (attrStart && node.hasAttribute && node.hasAttribute(attrStart)) { + var startNode = node; + do { + if (!node) { + throw $compileMinErr('uterdir', + "Unterminated attribute, found '{0}' but no matching '{1}' found.", + attrStart, attrEnd); + } + if (node.nodeType == 1 /** Element **/) { + if (node.hasAttribute(attrStart)) depth++; + if (node.hasAttribute(attrEnd)) depth--; + } + nodes.push(node); + node = node.nextSibling; + } while (depth > 0); + } else { + nodes.push(node); + } + + return jqLite(nodes); + } + + /** + * Wrapper for linking function which converts normal linking function into a grouped + * linking function. + * @param linkFn + * @param attrStart + * @param attrEnd + * @returns {Function} + */ + function groupElementsLinkFnWrapper(linkFn, attrStart, attrEnd) { + return function(scope, element, attrs, controllers, transcludeFn) { + element = groupScan(element[0], attrStart, attrEnd); + return linkFn(scope, element, attrs, controllers, transcludeFn); + }; + } + + /** + * Once the directives have been collected, their compile functions are executed. This method + * is responsible for inlining directive templates as well as terminating the application + * of the directives if the terminal directive has been reached. + * + * @param {Array} directives Array of collected directives to execute their compile function. + * this needs to be pre-sorted by priority order. + * @param {Node} compileNode The raw DOM node to apply the compile functions to + * @param {Object} templateAttrs The shared attribute function + * @param {function(angular.Scope, cloneAttachFn=)} transcludeFn A linking function, where the + * scope argument is auto-generated to the new + * child of the transcluded parent scope. + * @param {JQLite} jqCollection If we are working on the root of the compile tree then this + * argument has the root jqLite array so that we can replace nodes + * on it. + * @param {Object=} originalReplaceDirective An optional directive that will be ignored when + * compiling the transclusion. + * @param {Array.} preLinkFns + * @param {Array.} postLinkFns + * @param {Object} previousCompileContext Context used for previous compilation of the current + * node + * @returns {Function} linkFn + */ + function applyDirectivesToNode(directives, compileNode, templateAttrs, transcludeFn, + jqCollection, originalReplaceDirective, preLinkFns, postLinkFns, + previousCompileContext) { + previousCompileContext = previousCompileContext || {}; + + var terminalPriority = -Number.MAX_VALUE, + newScopeDirective, + controllerDirectives = previousCompileContext.controllerDirectives, + newIsolateScopeDirective = previousCompileContext.newIsolateScopeDirective, + templateDirective = previousCompileContext.templateDirective, + nonTlbTranscludeDirective = previousCompileContext.nonTlbTranscludeDirective, + hasTranscludeDirective = false, + hasTemplate = false, + hasElementTranscludeDirective = previousCompileContext.hasElementTranscludeDirective, + $compileNode = templateAttrs.$$element = jqLite(compileNode), + directive, + directiveName, + $template, + replaceDirective = originalReplaceDirective, + childTranscludeFn = transcludeFn, + linkFn, + directiveValue; + + // executes all directives on the current element + for(var i = 0, ii = directives.length; i < ii; i++) { + directive = directives[i]; + var attrStart = directive.$$start; + var attrEnd = directive.$$end; + + // collect multiblock sections + if (attrStart) { + $compileNode = groupScan(compileNode, attrStart, attrEnd); + } + $template = undefined; + + if (terminalPriority > directive.priority) { + break; // prevent further processing of directives + } + + if (directiveValue = directive.scope) { + newScopeDirective = newScopeDirective || directive; + + // skip the check for directives with async templates, we'll check the derived sync + // directive when the template arrives + if (!directive.templateUrl) { + assertNoDuplicate('new/isolated scope', newIsolateScopeDirective, directive, + $compileNode); + if (isObject(directiveValue)) { + newIsolateScopeDirective = directive; + } + } + } + + directiveName = directive.name; + + if (!directive.templateUrl && directive.controller) { + directiveValue = directive.controller; + controllerDirectives = controllerDirectives || {}; + assertNoDuplicate("'" + directiveName + "' controller", + controllerDirectives[directiveName], directive, $compileNode); + controllerDirectives[directiveName] = directive; + } + + if (directiveValue = directive.transclude) { + hasTranscludeDirective = true; + + // Special case ngIf and ngRepeat so that we don't complain about duplicate transclusion. + // This option should only be used by directives that know how to safely handle element transclusion, + // where the transcluded nodes are added or replaced after linking. + if (!directive.$$tlb) { + assertNoDuplicate('transclusion', nonTlbTranscludeDirective, directive, $compileNode); + nonTlbTranscludeDirective = directive; + } + + if (directiveValue == 'element') { + hasElementTranscludeDirective = true; + terminalPriority = directive.priority; + $template = $compileNode; + $compileNode = templateAttrs.$$element = + jqLite(document.createComment(' ' + directiveName + ': ' + + templateAttrs[directiveName] + ' ')); + compileNode = $compileNode[0]; + replaceWith(jqCollection, sliceArgs($template), compileNode); + + childTranscludeFn = compile($template, transcludeFn, terminalPriority, + replaceDirective && replaceDirective.name, { + // Don't pass in: + // - controllerDirectives - otherwise we'll create duplicates controllers + // - newIsolateScopeDirective or templateDirective - combining templates with + // element transclusion doesn't make sense. + // + // We need only nonTlbTranscludeDirective so that we prevent putting transclusion + // on the same element more than once. + nonTlbTranscludeDirective: nonTlbTranscludeDirective + }); + } else { + $template = jqLite(jqLiteClone(compileNode)).contents(); + $compileNode.empty(); // clear contents + childTranscludeFn = compile($template, transcludeFn); + } + } + + if (directive.template) { + hasTemplate = true; + assertNoDuplicate('template', templateDirective, directive, $compileNode); + templateDirective = directive; + + directiveValue = (isFunction(directive.template)) + ? directive.template($compileNode, templateAttrs) + : directive.template; + + directiveValue = denormalizeTemplate(directiveValue); + + if (directive.replace) { + replaceDirective = directive; + if (jqLiteIsTextNode(directiveValue)) { + $template = []; + } else { + $template = jqLite(trim(directiveValue)); + } + compileNode = $template[0]; + + if ($template.length != 1 || compileNode.nodeType !== 1) { + throw $compileMinErr('tplrt', + "Template for directive '{0}' must have exactly one root element. {1}", + directiveName, ''); + } + + replaceWith(jqCollection, $compileNode, compileNode); + + var newTemplateAttrs = {$attr: {}}; + + // combine directives from the original node and from the template: + // - take the array of directives for this element + // - split it into two parts, those that already applied (processed) and those that weren't (unprocessed) + // - collect directives from the template and sort them by priority + // - combine directives as: processed + template + unprocessed + var templateDirectives = collectDirectives(compileNode, [], newTemplateAttrs); + var unprocessedDirectives = directives.splice(i + 1, directives.length - (i + 1)); + + if (newIsolateScopeDirective) { + markDirectivesAsIsolate(templateDirectives); + } + directives = directives.concat(templateDirectives).concat(unprocessedDirectives); + mergeTemplateAttributes(templateAttrs, newTemplateAttrs); + + ii = directives.length; + } else { + $compileNode.html(directiveValue); + } + } + + if (directive.templateUrl) { + hasTemplate = true; + assertNoDuplicate('template', templateDirective, directive, $compileNode); + templateDirective = directive; + + if (directive.replace) { + replaceDirective = directive; + } + + nodeLinkFn = compileTemplateUrl(directives.splice(i, directives.length - i), $compileNode, + templateAttrs, jqCollection, hasTranscludeDirective && childTranscludeFn, preLinkFns, postLinkFns, { + controllerDirectives: controllerDirectives, + newIsolateScopeDirective: newIsolateScopeDirective, + templateDirective: templateDirective, + nonTlbTranscludeDirective: nonTlbTranscludeDirective + }); + ii = directives.length; + } else if (directive.compile) { + try { + linkFn = directive.compile($compileNode, templateAttrs, childTranscludeFn); + if (isFunction(linkFn)) { + addLinkFns(null, linkFn, attrStart, attrEnd); + } else if (linkFn) { + addLinkFns(linkFn.pre, linkFn.post, attrStart, attrEnd); + } + } catch (e) { + $exceptionHandler(e, startingTag($compileNode)); + } + } + + if (directive.terminal) { + nodeLinkFn.terminal = true; + terminalPriority = Math.max(terminalPriority, directive.priority); + } + + } + + nodeLinkFn.scope = newScopeDirective && newScopeDirective.scope === true; + nodeLinkFn.transcludeOnThisElement = hasTranscludeDirective; + nodeLinkFn.templateOnThisElement = hasTemplate; + nodeLinkFn.transclude = childTranscludeFn; + + previousCompileContext.hasElementTranscludeDirective = hasElementTranscludeDirective; + + // might be normal or delayed nodeLinkFn depending on if templateUrl is present + return nodeLinkFn; + + //////////////////// + + function addLinkFns(pre, post, attrStart, attrEnd) { + if (pre) { + if (attrStart) pre = groupElementsLinkFnWrapper(pre, attrStart, attrEnd); + pre.require = directive.require; + pre.directiveName = directiveName; + if (newIsolateScopeDirective === directive || directive.$$isolateScope) { + pre = cloneAndAnnotateFn(pre, {isolateScope: true}); + } + preLinkFns.push(pre); + } + if (post) { + if (attrStart) post = groupElementsLinkFnWrapper(post, attrStart, attrEnd); + post.require = directive.require; + post.directiveName = directiveName; + if (newIsolateScopeDirective === directive || directive.$$isolateScope) { + post = cloneAndAnnotateFn(post, {isolateScope: true}); + } + postLinkFns.push(post); + } + } + + + function getControllers(directiveName, require, $element, elementControllers) { + var value, retrievalMethod = 'data', optional = false; + if (isString(require)) { + while((value = require.charAt(0)) == '^' || value == '?') { + require = require.substr(1); + if (value == '^') { + retrievalMethod = 'inheritedData'; + } + optional = optional || value == '?'; + } + value = null; + + if (elementControllers && retrievalMethod === 'data') { + value = elementControllers[require]; + } + value = value || $element[retrievalMethod]('$' + require + 'Controller'); + + if (!value && !optional) { + throw $compileMinErr('ctreq', + "Controller '{0}', required by directive '{1}', can't be found!", + require, directiveName); + } + return value; + } else if (isArray(require)) { + value = []; + forEach(require, function(require) { + value.push(getControllers(directiveName, require, $element, elementControllers)); + }); + } + return value; + } + + + function nodeLinkFn(childLinkFn, scope, linkNode, $rootElement, boundTranscludeFn) { + var attrs, $element, i, ii, linkFn, controller, isolateScope, elementControllers = {}, transcludeFn; + + attrs = (compileNode === linkNode) + ? templateAttrs + : shallowCopy(templateAttrs, new Attributes(jqLite(linkNode), templateAttrs.$attr)); + $element = attrs.$$element; + + if (newIsolateScopeDirective) { + var LOCAL_REGEXP = /^\s*([@=&])(\??)\s*(\w*)\s*$/; + + isolateScope = scope.$new(true); + + if (templateDirective && (templateDirective === newIsolateScopeDirective || + templateDirective === newIsolateScopeDirective.$$originalDirective)) { + $element.data('$isolateScope', isolateScope); + } else { + $element.data('$isolateScopeNoTemplate', isolateScope); + } + + + + safeAddClass($element, 'ng-isolate-scope'); + + forEach(newIsolateScopeDirective.scope, function(definition, scopeName) { + var match = definition.match(LOCAL_REGEXP) || [], + attrName = match[3] || scopeName, + optional = (match[2] == '?'), + mode = match[1], // @, =, or & + lastValue, + parentGet, parentSet, compare; + + isolateScope.$$isolateBindings[scopeName] = mode + attrName; + + switch (mode) { + + case '@': + attrs.$observe(attrName, function(value) { + isolateScope[scopeName] = value; + }); + attrs.$$observers[attrName].$$scope = scope; + if( attrs[attrName] ) { + // If the attribute has been provided then we trigger an interpolation to ensure + // the value is there for use in the link fn + isolateScope[scopeName] = $interpolate(attrs[attrName])(scope); + } + break; + + case '=': + if (optional && !attrs[attrName]) { + return; + } + parentGet = $parse(attrs[attrName]); + if (parentGet.literal) { + compare = equals; + } else { + compare = function(a,b) { return a === b || (a !== a && b !== b); }; + } + parentSet = parentGet.assign || function() { + // reset the change, or we will throw this exception on every $digest + lastValue = isolateScope[scopeName] = parentGet(scope); + throw $compileMinErr('nonassign', + "Expression '{0}' used with directive '{1}' is non-assignable!", + attrs[attrName], newIsolateScopeDirective.name); + }; + lastValue = isolateScope[scopeName] = parentGet(scope); + isolateScope.$watch(function parentValueWatch() { + var parentValue = parentGet(scope); + if (!compare(parentValue, isolateScope[scopeName])) { + // we are out of sync and need to copy + if (!compare(parentValue, lastValue)) { + // parent changed and it has precedence + isolateScope[scopeName] = parentValue; + } else { + // if the parent can be assigned then do so + parentSet(scope, parentValue = isolateScope[scopeName]); + } + } + return lastValue = parentValue; + }, null, parentGet.literal); + break; + + case '&': + parentGet = $parse(attrs[attrName]); + isolateScope[scopeName] = function(locals) { + return parentGet(scope, locals); + }; + break; + + default: + throw $compileMinErr('iscp', + "Invalid isolate scope definition for directive '{0}'." + + " Definition: {... {1}: '{2}' ...}", + newIsolateScopeDirective.name, scopeName, definition); + } + }); + } + transcludeFn = boundTranscludeFn && controllersBoundTransclude; + if (controllerDirectives) { + forEach(controllerDirectives, function(directive) { + var locals = { + $scope: directive === newIsolateScopeDirective || directive.$$isolateScope ? isolateScope : scope, + $element: $element, + $attrs: attrs, + $transclude: transcludeFn + }, controllerInstance; + + controller = directive.controller; + if (controller == '@') { + controller = attrs[directive.name]; + } + + controllerInstance = $controller(controller, locals); + // For directives with element transclusion the element is a comment, + // but jQuery .data doesn't support attaching data to comment nodes as it's hard to + // clean up (http://bugs.jquery.com/ticket/8335). + // Instead, we save the controllers for the element in a local hash and attach to .data + // later, once we have the actual element. + elementControllers[directive.name] = controllerInstance; + if (!hasElementTranscludeDirective) { + $element.data('$' + directive.name + 'Controller', controllerInstance); + } + + if (directive.controllerAs) { + locals.$scope[directive.controllerAs] = controllerInstance; + } + }); + } + + // PRELINKING + for(i = 0, ii = preLinkFns.length; i < ii; i++) { + try { + linkFn = preLinkFns[i]; + linkFn(linkFn.isolateScope ? isolateScope : scope, $element, attrs, + linkFn.require && getControllers(linkFn.directiveName, linkFn.require, $element, elementControllers), transcludeFn); + } catch (e) { + $exceptionHandler(e, startingTag($element)); + } + } + + // RECURSION + // We only pass the isolate scope, if the isolate directive has a template, + // otherwise the child elements do not belong to the isolate directive. + var scopeToChild = scope; + if (newIsolateScopeDirective && (newIsolateScopeDirective.template || newIsolateScopeDirective.templateUrl === null)) { + scopeToChild = isolateScope; + } + childLinkFn && childLinkFn(scopeToChild, linkNode.childNodes, undefined, boundTranscludeFn); + + // POSTLINKING + for(i = postLinkFns.length - 1; i >= 0; i--) { + try { + linkFn = postLinkFns[i]; + linkFn(linkFn.isolateScope ? isolateScope : scope, $element, attrs, + linkFn.require && getControllers(linkFn.directiveName, linkFn.require, $element, elementControllers), transcludeFn); + } catch (e) { + $exceptionHandler(e, startingTag($element)); + } + } + + // This is the function that is injected as `$transclude`. + function controllersBoundTransclude(scope, cloneAttachFn) { + var transcludeControllers; + + // no scope passed + if (arguments.length < 2) { + cloneAttachFn = scope; + scope = undefined; + } + + if (hasElementTranscludeDirective) { + transcludeControllers = elementControllers; + } + + return boundTranscludeFn(scope, cloneAttachFn, transcludeControllers); + } + } + } + + function markDirectivesAsIsolate(directives) { + // mark all directives as needing isolate scope. + for (var j = 0, jj = directives.length; j < jj; j++) { + directives[j] = inherit(directives[j], {$$isolateScope: true}); + } + } + + /** + * looks up the directive and decorates it with exception handling and proper parameters. We + * call this the boundDirective. + * + * @param {string} name name of the directive to look up. + * @param {string} location The directive must be found in specific format. + * String containing any of theses characters: + * + * * `E`: element name + * * `A': attribute + * * `C`: class + * * `M`: comment + * @returns {boolean} true if directive was added. + */ + function addDirective(tDirectives, name, location, maxPriority, ignoreDirective, startAttrName, + endAttrName) { + if (name === ignoreDirective) return null; + var match = null; + if (hasDirectives.hasOwnProperty(name)) { + for(var directive, directives = $injector.get(name + Suffix), + i = 0, ii = directives.length; i directive.priority) && + directive.restrict.indexOf(location) != -1) { + if (startAttrName) { + directive = inherit(directive, {$$start: startAttrName, $$end: endAttrName}); + } + tDirectives.push(directive); + match = directive; + } + } catch(e) { $exceptionHandler(e); } + } + } + return match; + } + + + /** + * When the element is replaced with HTML template then the new attributes + * on the template need to be merged with the existing attributes in the DOM. + * The desired effect is to have both of the attributes present. + * + * @param {object} dst destination attributes (original DOM) + * @param {object} src source attributes (from the directive template) + */ + function mergeTemplateAttributes(dst, src) { + var srcAttr = src.$attr, + dstAttr = dst.$attr, + $element = dst.$$element; + + // reapply the old attributes to the new element + forEach(dst, function(value, key) { + if (key.charAt(0) != '$') { + if (src[key] && src[key] !== value) { + value += (key === 'style' ? ';' : ' ') + src[key]; + } + dst.$set(key, value, true, srcAttr[key]); + } + }); + + // copy the new attributes on the old attrs object + forEach(src, function(value, key) { + if (key == 'class') { + safeAddClass($element, value); + dst['class'] = (dst['class'] ? dst['class'] + ' ' : '') + value; + } else if (key == 'style') { + $element.attr('style', $element.attr('style') + ';' + value); + dst['style'] = (dst['style'] ? dst['style'] + ';' : '') + value; + // `dst` will never contain hasOwnProperty as DOM parser won't let it. + // You will get an "InvalidCharacterError: DOM Exception 5" error if you + // have an attribute like "has-own-property" or "data-has-own-property", etc. + } else if (key.charAt(0) != '$' && !dst.hasOwnProperty(key)) { + dst[key] = value; + dstAttr[key] = srcAttr[key]; + } + }); + } + + + function compileTemplateUrl(directives, $compileNode, tAttrs, + $rootElement, childTranscludeFn, preLinkFns, postLinkFns, previousCompileContext) { + var linkQueue = [], + afterTemplateNodeLinkFn, + afterTemplateChildLinkFn, + beforeTemplateCompileNode = $compileNode[0], + origAsyncDirective = directives.shift(), + // The fact that we have to copy and patch the directive seems wrong! + derivedSyncDirective = extend({}, origAsyncDirective, { + templateUrl: null, transclude: null, replace: null, $$originalDirective: origAsyncDirective + }), + templateUrl = (isFunction(origAsyncDirective.templateUrl)) + ? origAsyncDirective.templateUrl($compileNode, tAttrs) + : origAsyncDirective.templateUrl; + + $compileNode.empty(); + + $http.get($sce.getTrustedResourceUrl(templateUrl), {cache: $templateCache}). + success(function(content) { + var compileNode, tempTemplateAttrs, $template, childBoundTranscludeFn; + + content = denormalizeTemplate(content); + + if (origAsyncDirective.replace) { + if (jqLiteIsTextNode(content)) { + $template = []; + } else { + $template = jqLite(trim(content)); + } + compileNode = $template[0]; + + if ($template.length != 1 || compileNode.nodeType !== 1) { + throw $compileMinErr('tplrt', + "Template for directive '{0}' must have exactly one root element. {1}", + origAsyncDirective.name, templateUrl); + } + + tempTemplateAttrs = {$attr: {}}; + replaceWith($rootElement, $compileNode, compileNode); + var templateDirectives = collectDirectives(compileNode, [], tempTemplateAttrs); + + if (isObject(origAsyncDirective.scope)) { + markDirectivesAsIsolate(templateDirectives); + } + directives = templateDirectives.concat(directives); + mergeTemplateAttributes(tAttrs, tempTemplateAttrs); + } else { + compileNode = beforeTemplateCompileNode; + $compileNode.html(content); + } + + directives.unshift(derivedSyncDirective); + + afterTemplateNodeLinkFn = applyDirectivesToNode(directives, compileNode, tAttrs, + childTranscludeFn, $compileNode, origAsyncDirective, preLinkFns, postLinkFns, + previousCompileContext); + forEach($rootElement, function(node, i) { + if (node == compileNode) { + $rootElement[i] = $compileNode[0]; + } + }); + afterTemplateChildLinkFn = compileNodes($compileNode[0].childNodes, childTranscludeFn); + + while(linkQueue.length) { + var scope = linkQueue.shift(), + beforeTemplateLinkNode = linkQueue.shift(), + linkRootElement = linkQueue.shift(), + boundTranscludeFn = linkQueue.shift(), + linkNode = $compileNode[0]; + + if (beforeTemplateLinkNode !== beforeTemplateCompileNode) { + var oldClasses = beforeTemplateLinkNode.className; + + if (!(previousCompileContext.hasElementTranscludeDirective && + origAsyncDirective.replace)) { + // it was cloned therefore we have to clone as well. + linkNode = jqLiteClone(compileNode); + } + + replaceWith(linkRootElement, jqLite(beforeTemplateLinkNode), linkNode); + + // Copy in CSS classes from original node + safeAddClass(jqLite(linkNode), oldClasses); + } + if (afterTemplateNodeLinkFn.transcludeOnThisElement) { + childBoundTranscludeFn = createBoundTranscludeFn(scope, afterTemplateNodeLinkFn.transclude, boundTranscludeFn); + } else { + childBoundTranscludeFn = boundTranscludeFn; + } + afterTemplateNodeLinkFn(afterTemplateChildLinkFn, scope, linkNode, $rootElement, + childBoundTranscludeFn); + } + linkQueue = null; + }). + error(function(response, code, headers, config) { + throw $compileMinErr('tpload', 'Failed to load template: {0}', config.url); + }); + + return function delayedNodeLinkFn(ignoreChildLinkFn, scope, node, rootElement, boundTranscludeFn) { + var childBoundTranscludeFn = boundTranscludeFn; + if (linkQueue) { + linkQueue.push(scope); + linkQueue.push(node); + linkQueue.push(rootElement); + linkQueue.push(childBoundTranscludeFn); + } else { + if (afterTemplateNodeLinkFn.transcludeOnThisElement) { + childBoundTranscludeFn = createBoundTranscludeFn(scope, afterTemplateNodeLinkFn.transclude, boundTranscludeFn); + } + afterTemplateNodeLinkFn(afterTemplateChildLinkFn, scope, node, rootElement, childBoundTranscludeFn); + } + }; + } + + + /** + * Sorting function for bound directives. + */ + function byPriority(a, b) { + var diff = b.priority - a.priority; + if (diff !== 0) return diff; + if (a.name !== b.name) return (a.name < b.name) ? -1 : 1; + return a.index - b.index; + } + + + function assertNoDuplicate(what, previousDirective, directive, element) { + if (previousDirective) { + throw $compileMinErr('multidir', 'Multiple directives [{0}, {1}] asking for {2} on: {3}', + previousDirective.name, directive.name, what, startingTag(element)); + } + } + + + function addTextInterpolateDirective(directives, text) { + var interpolateFn = $interpolate(text, true); + if (interpolateFn) { + directives.push({ + priority: 0, + compile: function textInterpolateCompileFn(templateNode) { + // when transcluding a template that has bindings in the root + // then we don't have a parent and should do this in the linkFn + var parent = templateNode.parent(), hasCompileParent = parent.length; + if (hasCompileParent) safeAddClass(templateNode.parent(), 'ng-binding'); + + return function textInterpolateLinkFn(scope, node) { + var parent = node.parent(), + bindings = parent.data('$binding') || []; + bindings.push(interpolateFn); + parent.data('$binding', bindings); + if (!hasCompileParent) safeAddClass(parent, 'ng-binding'); + scope.$watch(interpolateFn, function interpolateFnWatchAction(value) { + node[0].nodeValue = value; + }); + }; + } + }); + } + } + + + function getTrustedContext(node, attrNormalizedName) { + if (attrNormalizedName == "srcdoc") { + return $sce.HTML; + } + var tag = nodeName_(node); + // maction[xlink:href] can source SVG. It's not limited to . + if (attrNormalizedName == "xlinkHref" || + (tag == "FORM" && attrNormalizedName == "action") || + (tag != "IMG" && (attrNormalizedName == "src" || + attrNormalizedName == "ngSrc"))) { + return $sce.RESOURCE_URL; + } + } + + + function addAttrInterpolateDirective(node, directives, value, name) { + var interpolateFn = $interpolate(value, true); + + // no interpolation found -> ignore + if (!interpolateFn) return; + + + if (name === "multiple" && nodeName_(node) === "SELECT") { + throw $compileMinErr("selmulti", + "Binding to the 'multiple' attribute is not supported. Element: {0}", + startingTag(node)); + } + + directives.push({ + priority: 100, + compile: function() { + return { + pre: function attrInterpolatePreLinkFn(scope, element, attr) { + var $$observers = (attr.$$observers || (attr.$$observers = {})); + + if (EVENT_HANDLER_ATTR_REGEXP.test(name)) { + throw $compileMinErr('nodomevents', + "Interpolations for HTML DOM event attributes are disallowed. Please use the " + + "ng- versions (such as ng-click instead of onclick) instead."); + } + + // we need to interpolate again, in case the attribute value has been updated + // (e.g. by another directive's compile function) + interpolateFn = $interpolate(attr[name], true, getTrustedContext(node, name)); + + // if attribute was updated so that there is no interpolation going on we don't want to + // register any observers + if (!interpolateFn) return; + + // TODO(i): this should likely be attr.$set(name, iterpolateFn(scope) so that we reset the + // actual attr value + attr[name] = interpolateFn(scope); + ($$observers[name] || ($$observers[name] = [])).$$inter = true; + (attr.$$observers && attr.$$observers[name].$$scope || scope). + $watch(interpolateFn, function interpolateFnWatchAction(newValue, oldValue) { + //special case for class attribute addition + removal + //so that class changes can tap into the animation + //hooks provided by the $animate service. Be sure to + //skip animations when the first digest occurs (when + //both the new and the old values are the same) since + //the CSS classes are the non-interpolated values + if(name === 'class' && newValue != oldValue) { + attr.$updateClass(newValue, oldValue); + } else { + attr.$set(name, newValue); + } + }); + } + }; + } + }); + } + + + /** + * This is a special jqLite.replaceWith, which can replace items which + * have no parents, provided that the containing jqLite collection is provided. + * + * @param {JqLite=} $rootElement The root of the compile tree. Used so that we can replace nodes + * in the root of the tree. + * @param {JqLite} elementsToRemove The jqLite element which we are going to replace. We keep + * the shell, but replace its DOM node reference. + * @param {Node} newNode The new DOM node. + */ + function replaceWith($rootElement, elementsToRemove, newNode) { + var firstElementToRemove = elementsToRemove[0], + removeCount = elementsToRemove.length, + parent = firstElementToRemove.parentNode, + i, ii; + + if ($rootElement) { + for(i = 0, ii = $rootElement.length; i < ii; i++) { + if ($rootElement[i] == firstElementToRemove) { + $rootElement[i++] = newNode; + for (var j = i, j2 = j + removeCount - 1, + jj = $rootElement.length; + j < jj; j++, j2++) { + if (j2 < jj) { + $rootElement[j] = $rootElement[j2]; + } else { + delete $rootElement[j]; + } + } + $rootElement.length -= removeCount - 1; + break; + } + } + } + + if (parent) { + parent.replaceChild(newNode, firstElementToRemove); + } + var fragment = document.createDocumentFragment(); + fragment.appendChild(firstElementToRemove); + newNode[jqLite.expando] = firstElementToRemove[jqLite.expando]; + for (var k = 1, kk = elementsToRemove.length; k < kk; k++) { + var element = elementsToRemove[k]; + jqLite(element).remove(); // must do this way to clean up expando + fragment.appendChild(element); + delete elementsToRemove[k]; + } + + elementsToRemove[0] = newNode; + elementsToRemove.length = 1; + } + + + function cloneAndAnnotateFn(fn, annotation) { + return extend(function() { return fn.apply(null, arguments); }, fn, annotation); + } + }]; +} + +var PREFIX_REGEXP = /^(x[\:\-_]|data[\:\-_])/i; +/** + * Converts all accepted directives format into proper directive name. + * All of these will become 'myDirective': + * my:Directive + * my-directive + * x-my-directive + * data-my:directive + * + * Also there is special case for Moz prefix starting with upper case letter. + * @param name Name to normalize + */ +function directiveNormalize(name) { + return camelCase(name.replace(PREFIX_REGEXP, '')); +} + +/** + * @ngdoc type + * @name $compile.directive.Attributes + * + * @description + * A shared object between directive compile / linking functions which contains normalized DOM + * element attributes. The values reflect current binding state `{{ }}`. The normalization is + * needed since all of these are treated as equivalent in Angular: + * + * ``` + * + * ``` + */ + +/** + * @ngdoc property + * @name $compile.directive.Attributes#$attr + * + * @description + * A map of DOM element attribute names to the normalized name. This is + * needed to do reverse lookup from normalized name back to actual name. + */ + + +/** + * @ngdoc method + * @name $compile.directive.Attributes#$set + * @kind function + * + * @description + * Set DOM element attribute value. + * + * + * @param {string} name Normalized element attribute name of the property to modify. The name is + * reverse-translated using the {@link ng.$compile.directive.Attributes#$attr $attr} + * property to the original name. + * @param {string} value Value to set the attribute to. The value can be an interpolated string. + */ + + + +/** + * Closure compiler type information + */ + +function nodesetLinkingFn( + /* angular.Scope */ scope, + /* NodeList */ nodeList, + /* Element */ rootElement, + /* function(Function) */ boundTranscludeFn +){} + +function directiveLinkingFn( + /* nodesetLinkingFn */ nodesetLinkingFn, + /* angular.Scope */ scope, + /* Node */ node, + /* Element */ rootElement, + /* function(Function) */ boundTranscludeFn +){} + +function tokenDifference(str1, str2) { + var values = '', + tokens1 = str1.split(/\s+/), + tokens2 = str2.split(/\s+/); + + outer: + for(var i = 0; i < tokens1.length; i++) { + var token = tokens1[i]; + for(var j = 0; j < tokens2.length; j++) { + if(token == tokens2[j]) continue outer; + } + values += (values.length > 0 ? ' ' : '') + token; + } + return values; +} + +/** + * @ngdoc provider + * @name $controllerProvider + * @description + * The {@link ng.$controller $controller service} is used by Angular to create new + * controllers. + * + * This provider allows controller registration via the + * {@link ng.$controllerProvider#register register} method. + */ +function $ControllerProvider() { + var controllers = {}, + CNTRL_REG = /^(\S+)(\s+as\s+(\w+))?$/; + + + /** + * @ngdoc method + * @name $controllerProvider#register + * @param {string|Object} name Controller name, or an object map of controllers where the keys are + * the names and the values are the constructors. + * @param {Function|Array} constructor Controller constructor fn (optionally decorated with DI + * annotations in the array notation). + */ + this.register = function(name, constructor) { + assertNotHasOwnProperty(name, 'controller'); + if (isObject(name)) { + extend(controllers, name); + } else { + controllers[name] = constructor; + } + }; + + + this.$get = ['$injector', '$window', function($injector, $window) { + + /** + * @ngdoc service + * @name $controller + * @requires $injector + * + * @param {Function|string} constructor If called with a function then it's considered to be the + * controller constructor function. Otherwise it's considered to be a string which is used + * to retrieve the controller constructor using the following steps: + * + * * check if a controller with given name is registered via `$controllerProvider` + * * check if evaluating the string on the current scope returns a constructor + * * check `window[constructor]` on the global `window` object + * + * @param {Object} locals Injection locals for Controller. + * @return {Object} Instance of given controller. + * + * @description + * `$controller` service is responsible for instantiating controllers. + * + * It's just a simple call to {@link auto.$injector $injector}, but extracted into + * a service, so that one can override this service with [BC version](https://gist.github.com/1649788). + */ + return function(expression, locals) { + var instance, match, constructor, identifier; + + if(isString(expression)) { + match = expression.match(CNTRL_REG), + constructor = match[1], + identifier = match[3]; + expression = controllers.hasOwnProperty(constructor) + ? controllers[constructor] + : getter(locals.$scope, constructor, true) || getter($window, constructor, true); + + assertArgFn(expression, constructor, true); + } + + instance = $injector.instantiate(expression, locals); + + if (identifier) { + if (!(locals && typeof locals.$scope === 'object')) { + throw minErr('$controller')('noscp', + "Cannot export controller '{0}' as '{1}'! No $scope object provided via `locals`.", + constructor || expression.name, identifier); + } + + locals.$scope[identifier] = instance; + } + + return instance; + }; + }]; +} + +/** + * @ngdoc service + * @name $document + * @requires $window + * + * @description + * A {@link angular.element jQuery or jqLite} wrapper for the browser's `window.document` object. + * + * @example + + +
    +

    $document title:

    +

    window.document title:

    +
    +     + + angular.module('documentExample', []) + .controller('ExampleController', ['$scope', '$document', function($scope, $document) { + $scope.title = $document[0].title; + $scope.windowTitle = angular.element(window.document)[0].title; + }]); + +     + */ +function $DocumentProvider(){ + this.$get = ['$window', function(window){ + return jqLite(window.document); + }]; +} + +/** + * @ngdoc service + * @name $exceptionHandler + * @requires ng.$log + * + * @description + * Any uncaught exception in angular expressions is delegated to this service. + * The default implementation simply delegates to `$log.error` which logs it into + * the browser console. + * + * In unit tests, if `angular-mocks.js` is loaded, this service is overridden by + * {@link ngMock.$exceptionHandler mock $exceptionHandler} which aids in testing. + * + * ## Example: + * + * ```js + * angular.module('exceptionOverride', []).factory('$exceptionHandler', function () { + * return function (exception, cause) { + * exception.message += ' (caused by "' + cause + '")'; + * throw exception; + * }; + * }); + * ``` + * + * This example will override the normal action of `$exceptionHandler`, to make angular + * exceptions fail hard when they happen, instead of just logging to the console. + * + * @param {Error} exception Exception associated with the error. + * @param {string=} cause optional information about the context in which + * the error was thrown. + * + */ +function $ExceptionHandlerProvider() { + this.$get = ['$log', function($log) { + return function(exception, cause) { + $log.error.apply($log, arguments); + }; + }]; +} + +/** + * Parse headers into key value object + * + * @param {string} headers Raw headers as a string + * @returns {Object} Parsed headers as key value object + */ +function parseHeaders(headers) { + var parsed = {}, key, val, i; + + if (!headers) return parsed; + + forEach(headers.split('\n'), function(line) { + i = line.indexOf(':'); + key = lowercase(trim(line.substr(0, i))); + val = trim(line.substr(i + 1)); + + if (key) { + parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val; + } + }); + + return parsed; +} + + +/** + * Returns a function that provides access to parsed headers. + * + * Headers are lazy parsed when first requested. + * @see parseHeaders + * + * @param {(string|Object)} headers Headers to provide access to. + * @returns {function(string=)} Returns a getter function which if called with: + * + * - if called with single an argument returns a single header value or null + * - if called with no arguments returns an object containing all headers. + */ +function headersGetter(headers) { + var headersObj = isObject(headers) ? headers : undefined; + + return function(name) { + if (!headersObj) headersObj = parseHeaders(headers); + + if (name) { + return headersObj[lowercase(name)] || null; + } + + return headersObj; + }; +} + + +/** + * Chain all given functions + * + * This function is used for both request and response transforming + * + * @param {*} data Data to transform. + * @param {function(string=)} headers Http headers getter fn. + * @param {(Function|Array.)} fns Function or an array of functions. + * @returns {*} Transformed data. + */ +function transformData(data, headers, fns) { + if (isFunction(fns)) + return fns(data, headers); + + forEach(fns, function(fn) { + data = fn(data, headers); + }); + + return data; +} + + +function isSuccess(status) { + return 200 <= status && status < 300; +} + + +/** + * @ngdoc provider + * @name $httpProvider + * @description + * Use `$httpProvider` to change the default behavior of the {@link ng.$http $http} service. + * */ +function $HttpProvider() { + var JSON_START = /^\s*(\[|\{[^\{])/, + JSON_END = /[\}\]]\s*$/, + PROTECTION_PREFIX = /^\)\]\}',?\n/, + CONTENT_TYPE_APPLICATION_JSON = {'Content-Type': 'application/json;charset=utf-8'}; + + /** + * @ngdoc property + * @name $httpProvider#defaults + * @description + * + * Object containing default values for all {@link ng.$http $http} requests. + * + * - **`defaults.xsrfCookieName`** - {string} - Name of cookie containing the XSRF token. + * Defaults value is `'XSRF-TOKEN'`. + * + * - **`defaults.xsrfHeaderName`** - {string} - Name of HTTP header to populate with the + * XSRF token. Defaults value is `'X-XSRF-TOKEN'`. + * + * - **`defaults.headers`** - {Object} - Default headers for all $http requests. + * Refer to {@link ng.$http#setting-http-headers $http} for documentation on + * setting default headers. + * - **`defaults.headers.common`** + * - **`defaults.headers.post`** + * - **`defaults.headers.put`** + * - **`defaults.headers.patch`** + **/ + var defaults = this.defaults = { + // transform incoming response data + transformResponse: [function(data) { + if (isString(data)) { + // strip json vulnerability protection prefix + data = data.replace(PROTECTION_PREFIX, ''); + if (JSON_START.test(data) && JSON_END.test(data)) + data = fromJson(data); + } + return data; + }], + + // transform outgoing request data + transformRequest: [function(d) { + return isObject(d) && !isFile(d) && !isBlob(d) ? toJson(d) : d; + }], + + // default headers + headers: { + common: { + 'Accept': 'application/json, text/plain, */*' + }, + post: shallowCopy(CONTENT_TYPE_APPLICATION_JSON), + put: shallowCopy(CONTENT_TYPE_APPLICATION_JSON), + patch: shallowCopy(CONTENT_TYPE_APPLICATION_JSON) + }, + + xsrfCookieName: 'XSRF-TOKEN', + xsrfHeaderName: 'X-XSRF-TOKEN' + }; + + /** + * Are ordered by request, i.e. they are applied in the same order as the + * array, on request, but reverse order, on response. + */ + var interceptorFactories = this.interceptors = []; + + /** + * For historical reasons, response interceptors are ordered by the order in which + * they are applied to the response. (This is the opposite of interceptorFactories) + */ + var responseInterceptorFactories = this.responseInterceptors = []; + + this.$get = ['$httpBackend', '$browser', '$cacheFactory', '$rootScope', '$q', '$injector', + function($httpBackend, $browser, $cacheFactory, $rootScope, $q, $injector) { + + var defaultCache = $cacheFactory('$http'); + + /** + * Interceptors stored in reverse order. Inner interceptors before outer interceptors. + * The reversal is needed so that we can build up the interception chain around the + * server request. + */ + var reversedInterceptors = []; + + forEach(interceptorFactories, function(interceptorFactory) { + reversedInterceptors.unshift(isString(interceptorFactory) + ? $injector.get(interceptorFactory) : $injector.invoke(interceptorFactory)); + }); + + forEach(responseInterceptorFactories, function(interceptorFactory, index) { + var responseFn = isString(interceptorFactory) + ? $injector.get(interceptorFactory) + : $injector.invoke(interceptorFactory); + + /** + * Response interceptors go before "around" interceptors (no real reason, just + * had to pick one.) But they are already reversed, so we can't use unshift, hence + * the splice. + */ + reversedInterceptors.splice(index, 0, { + response: function(response) { + return responseFn($q.when(response)); + }, + responseError: function(response) { + return responseFn($q.reject(response)); + } + }); + }); + + + /** + * @ngdoc service + * @kind function + * @name $http + * @requires ng.$httpBackend + * @requires $cacheFactory + * @requires $rootScope + * @requires $q + * @requires $injector + * + * @description + * The `$http` service is a core Angular service that facilitates communication with the remote + * HTTP servers via the browser's [XMLHttpRequest](https://developer.mozilla.org/en/xmlhttprequest) + * object or via [JSONP](http://en.wikipedia.org/wiki/JSONP). + * + * For unit testing applications that use `$http` service, see + * {@link ngMock.$httpBackend $httpBackend mock}. + * + * For a higher level of abstraction, please check out the {@link ngResource.$resource + * $resource} service. + * + * The $http API is based on the {@link ng.$q deferred/promise APIs} exposed by + * the $q service. While for simple usage patterns this doesn't matter much, for advanced usage + * it is important to familiarize yourself with these APIs and the guarantees they provide. + * + * + * # General usage + * The `$http` service is a function which takes a single argument — a configuration object — + * that is used to generate an HTTP request and returns a {@link ng.$q promise} + * with two $http specific methods: `success` and `error`. + * + * ```js + * $http({method: 'GET', url: '/someUrl'}). + * success(function(data, status, headers, config) { + * // this callback will be called asynchronously + * // when the response is available + * }). + * error(function(data, status, headers, config) { + * // called asynchronously if an error occurs + * // or server returns response with an error status. + * }); + * ``` + * + * Since the returned value of calling the $http function is a `promise`, you can also use + * the `then` method to register callbacks, and these callbacks will receive a single argument – + * an object representing the response. See the API signature and type info below for more + * details. + * + * A response status code between 200 and 299 is considered a success status and + * will result in the success callback being called. Note that if the response is a redirect, + * XMLHttpRequest will transparently follow it, meaning that the error callback will not be + * called for such responses. + * + * # Writing Unit Tests that use $http + * When unit testing (using {@link ngMock ngMock}), it is necessary to call + * {@link ngMock.$httpBackend#flush $httpBackend.flush()} to flush each pending + * request using trained responses. + * + * ``` + * $httpBackend.expectGET(...); + * $http.get(...); + * $httpBackend.flush(); + * ``` + * + * # Shortcut methods + * + * Shortcut methods are also available. All shortcut methods require passing in the URL, and + * request data must be passed in for POST/PUT requests. + * + * ```js + * $http.get('/someUrl').success(successCallback); + * $http.post('/someUrl', data).success(successCallback); + * ``` + * + * Complete list of shortcut methods: + * + * - {@link ng.$http#get $http.get} + * - {@link ng.$http#head $http.head} + * - {@link ng.$http#post $http.post} + * - {@link ng.$http#put $http.put} + * - {@link ng.$http#delete $http.delete} + * - {@link ng.$http#jsonp $http.jsonp} + * - {@link ng.$http#patch $http.patch} + * + * + * # Setting HTTP Headers + * + * The $http service will automatically add certain HTTP headers to all requests. These defaults + * can be fully configured by accessing the `$httpProvider.defaults.headers` configuration + * object, which currently contains this default configuration: + * + * - `$httpProvider.defaults.headers.common` (headers that are common for all requests): + * - `Accept: application/json, text/plain, * / *` + * - `$httpProvider.defaults.headers.post`: (header defaults for POST requests) + * - `Content-Type: application/json` + * - `$httpProvider.defaults.headers.put` (header defaults for PUT requests) + * - `Content-Type: application/json` + * + * To add or overwrite these defaults, simply add or remove a property from these configuration + * objects. To add headers for an HTTP method other than POST or PUT, simply add a new object + * with the lowercased HTTP method name as the key, e.g. + * `$httpProvider.defaults.headers.get = { 'My-Header' : 'value' }. + * + * The defaults can also be set at runtime via the `$http.defaults` object in the same + * fashion. For example: + * + * ``` + * module.run(function($http) { + * $http.defaults.headers.common.Authorization = 'Basic YmVlcDpib29w' + * }); + * ``` + * + * In addition, you can supply a `headers` property in the config object passed when + * calling `$http(config)`, which overrides the defaults without changing them globally. + * + * + * # Transforming Requests and Responses + * + * Both requests and responses can be transformed using transform functions. By default, Angular + * applies these transformations: + * + * Request transformations: + * + * - If the `data` property of the request configuration object contains an object, serialize it + * into JSON format. + * + * Response transformations: + * + * - If XSRF prefix is detected, strip it (see Security Considerations section below). + * - If JSON response is detected, deserialize it using a JSON parser. + * + * To globally augment or override the default transforms, modify the + * `$httpProvider.defaults.transformRequest` and `$httpProvider.defaults.transformResponse` + * properties. These properties are by default an array of transform functions, which allows you + * to `push` or `unshift` a new transformation function into the transformation chain. You can + * also decide to completely override any default transformations by assigning your + * transformation functions to these properties directly without the array wrapper. These defaults + * are again available on the $http factory at run-time, which may be useful if you have run-time + * services you wish to be involved in your transformations. + * + * Similarly, to locally override the request/response transforms, augment the + * `transformRequest` and/or `transformResponse` properties of the configuration object passed + * into `$http`. + * + * + * # Caching + * + * To enable caching, set the request configuration `cache` property to `true` (to use default + * cache) or to a custom cache object (built with {@link ng.$cacheFactory `$cacheFactory`}). + * When the cache is enabled, `$http` stores the response from the server in the specified + * cache. The next time the same request is made, the response is served from the cache without + * sending a request to the server. + * + * Note that even if the response is served from cache, delivery of the data is asynchronous in + * the same way that real requests are. + * + * If there are multiple GET requests for the same URL that should be cached using the same + * cache, but the cache is not populated yet, only one request to the server will be made and + * the remaining requests will be fulfilled using the response from the first request. + * + * You can change the default cache to a new object (built with + * {@link ng.$cacheFactory `$cacheFactory`}) by updating the + * {@link ng.$http#properties_defaults `$http.defaults.cache`} property. All requests who set + * their `cache` property to `true` will now use this cache object. + * + * If you set the default cache to `false` then only requests that specify their own custom + * cache object will be cached. + * + * # Interceptors + * + * Before you start creating interceptors, be sure to understand the + * {@link ng.$q $q and deferred/promise APIs}. + * + * For purposes of global error handling, authentication, or any kind of synchronous or + * asynchronous pre-processing of request or postprocessing of responses, it is desirable to be + * able to intercept requests before they are handed to the server and + * responses before they are handed over to the application code that + * initiated these requests. The interceptors leverage the {@link ng.$q + * promise APIs} to fulfill this need for both synchronous and asynchronous pre-processing. + * + * The interceptors are service factories that are registered with the `$httpProvider` by + * adding them to the `$httpProvider.interceptors` array. The factory is called and + * injected with dependencies (if specified) and returns the interceptor. + * + * There are two kinds of interceptors (and two kinds of rejection interceptors): + * + * * `request`: interceptors get called with a http `config` object. The function is free to + * modify the `config` object or create a new one. The function needs to return the `config` + * object directly, or a promise containing the `config` or a new `config` object. + * * `requestError`: interceptor gets called when a previous interceptor threw an error or + * resolved with a rejection. + * * `response`: interceptors get called with http `response` object. The function is free to + * modify the `response` object or create a new one. The function needs to return the `response` + * object directly, or as a promise containing the `response` or a new `response` object. + * * `responseError`: interceptor gets called when a previous interceptor threw an error or + * resolved with a rejection. + * + * + * ```js + * // register the interceptor as a service + * $provide.factory('myHttpInterceptor', function($q, dependency1, dependency2) { + * return { + * // optional method + * 'request': function(config) { + * // do something on success + * return config; + * }, + * + * // optional method + * 'requestError': function(rejection) { + * // do something on error + * if (canRecover(rejection)) { + * return responseOrNewPromise + * } + * return $q.reject(rejection); + * }, + * + * + * + * // optional method + * 'response': function(response) { + * // do something on success + * return response; + * }, + * + * // optional method + * 'responseError': function(rejection) { + * // do something on error + * if (canRecover(rejection)) { + * return responseOrNewPromise + * } + * return $q.reject(rejection); + * } + * }; + * }); + * + * $httpProvider.interceptors.push('myHttpInterceptor'); + * + * + * // alternatively, register the interceptor via an anonymous factory + * $httpProvider.interceptors.push(function($q, dependency1, dependency2) { + * return { + * 'request': function(config) { + * // same as above + * }, + * + * 'response': function(response) { + * // same as above + * } + * }; + * }); + * ``` + * + * # Response interceptors (DEPRECATED) + * + * Before you start creating interceptors, be sure to understand the + * {@link ng.$q $q and deferred/promise APIs}. + * + * For purposes of global error handling, authentication or any kind of synchronous or + * asynchronous preprocessing of received responses, it is desirable to be able to intercept + * responses for http requests before they are handed over to the application code that + * initiated these requests. The response interceptors leverage the {@link ng.$q + * promise apis} to fulfil this need for both synchronous and asynchronous preprocessing. + * + * The interceptors are service factories that are registered with the $httpProvider by + * adding them to the `$httpProvider.responseInterceptors` array. The factory is called and + * injected with dependencies (if specified) and returns the interceptor — a function that + * takes a {@link ng.$q promise} and returns the original or a new promise. + * + * ```js + * // register the interceptor as a service + * $provide.factory('myHttpInterceptor', function($q, dependency1, dependency2) { + * return function(promise) { + * return promise.then(function(response) { + * // do something on success + * return response; + * }, function(response) { + * // do something on error + * if (canRecover(response)) { + * return responseOrNewPromise + * } + * return $q.reject(response); + * }); + * } + * }); + * + * $httpProvider.responseInterceptors.push('myHttpInterceptor'); + * + * + * // register the interceptor via an anonymous factory + * $httpProvider.responseInterceptors.push(function($q, dependency1, dependency2) { + * return function(promise) { + * // same as above + * } + * }); + * ``` + * + * + * # Security Considerations + * + * When designing web applications, consider security threats from: + * + * - [JSON vulnerability](http://haacked.com/archive/2008/11/20/anatomy-of-a-subtle-json-vulnerability.aspx) + * - [XSRF](http://en.wikipedia.org/wiki/Cross-site_request_forgery) + * + * Both server and the client must cooperate in order to eliminate these threats. Angular comes + * pre-configured with strategies that address these issues, but for this to work backend server + * cooperation is required. + * + * ## JSON Vulnerability Protection + * + * A [JSON vulnerability](http://haacked.com/archive/2008/11/20/anatomy-of-a-subtle-json-vulnerability.aspx) + * allows third party website to turn your JSON resource URL into + * [JSONP](http://en.wikipedia.org/wiki/JSONP) request under some conditions. To + * counter this your server can prefix all JSON requests with following string `")]}',\n"`. + * Angular will automatically strip the prefix before processing it as JSON. + * + * For example if your server needs to return: + * ```js + * ['one','two'] + * ``` + * + * which is vulnerable to attack, your server can return: + * ```js + * )]}', + * ['one','two'] + * ``` + * + * Angular will strip the prefix, before processing the JSON. + * + * + * ## Cross Site Request Forgery (XSRF) Protection + * + * [XSRF](http://en.wikipedia.org/wiki/Cross-site_request_forgery) is a technique by which + * an unauthorized site can gain your user's private data. Angular provides a mechanism + * to counter XSRF. When performing XHR requests, the $http service reads a token from a cookie + * (by default, `XSRF-TOKEN`) and sets it as an HTTP header (`X-XSRF-TOKEN`). Since only + * JavaScript that runs on your domain could read the cookie, your server can be assured that + * the XHR came from JavaScript running on your domain. The header will not be set for + * cross-domain requests. + * + * To take advantage of this, your server needs to set a token in a JavaScript readable session + * cookie called `XSRF-TOKEN` on the first HTTP GET request. On subsequent XHR requests the + * server can verify that the cookie matches `X-XSRF-TOKEN` HTTP header, and therefore be sure + * that only JavaScript running on your domain could have sent the request. The token must be + * unique for each user and must be verifiable by the server (to prevent the JavaScript from + * making up its own tokens). We recommend that the token is a digest of your site's + * authentication cookie with a [salt](https://en.wikipedia.org/wiki/Salt_(cryptography)) + * for added security. + * + * The name of the headers can be specified using the xsrfHeaderName and xsrfCookieName + * properties of either $httpProvider.defaults at config-time, $http.defaults at run-time, + * or the per-request config object. + * + * + * @param {object} config Object describing the request to be made and how it should be + * processed. The object has following properties: + * + * - **method** – `{string}` – HTTP method (e.g. 'GET', 'POST', etc) + * - **url** – `{string}` – Absolute or relative URL of the resource that is being requested. + * - **params** – `{Object.}` – Map of strings or objects which will be turned + * to `?key1=value1&key2=value2` after the url. If the value is not a string, it will be + * JSONified. + * - **data** – `{string|Object}` – Data to be sent as the request message data. + * - **headers** – `{Object}` – Map of strings or functions which return strings representing + * HTTP headers to send to the server. If the return value of a function is null, the + * header will not be sent. + * - **xsrfHeaderName** – `{string}` – Name of HTTP header to populate with the XSRF token. + * - **xsrfCookieName** – `{string}` – Name of cookie containing the XSRF token. + * - **transformRequest** – + * `{function(data, headersGetter)|Array.}` – + * transform function or an array of such functions. The transform function takes the http + * request body and headers and returns its transformed (typically serialized) version. + * - **transformResponse** – + * `{function(data, headersGetter)|Array.}` – + * transform function or an array of such functions. The transform function takes the http + * response body and headers and returns its transformed (typically deserialized) version. + * - **cache** – `{boolean|Cache}` – If true, a default $http cache will be used to cache the + * GET request, otherwise if a cache instance built with + * {@link ng.$cacheFactory $cacheFactory}, this cache will be used for + * caching. + * - **timeout** – `{number|Promise}` – timeout in milliseconds, or {@link ng.$q promise} + * that should abort the request when resolved. + * - **withCredentials** - `{boolean}` - whether to set the `withCredentials` flag on the + * XHR object. See [requests with credentials](https://developer.mozilla.org/docs/Web/HTTP/Access_control_CORS#Requests_with_credentials) + * for more information. + * - **responseType** - `{string}` - see + * [requestType](https://developer.mozilla.org/en-US/docs/DOM/XMLHttpRequest#responseType). + * + * @returns {HttpPromise} Returns a {@link ng.$q promise} object with the + * standard `then` method and two http specific methods: `success` and `error`. The `then` + * method takes two arguments a success and an error callback which will be called with a + * response object. The `success` and `error` methods take a single argument - a function that + * will be called when the request succeeds or fails respectively. The arguments passed into + * these functions are destructured representation of the response object passed into the + * `then` method. The response object has these properties: + * + * - **data** – `{string|Object}` – The response body transformed with the transform + * functions. + * - **status** – `{number}` – HTTP status code of the response. + * - **headers** – `{function([headerName])}` – Header getter function. + * - **config** – `{Object}` – The configuration object that was used to generate the request. + * - **statusText** – `{string}` – HTTP status text of the response. + * + * @property {Array.} pendingRequests Array of config objects for currently pending + * requests. This is primarily meant to be used for debugging purposes. + * + * + * @example + + +
    + + +
    + + + + 
    http status code: {{status}}
    + 
    http response data: {{data}}
    +
    +     + + angular.module('httpExample', []) + .controller('FetchController', ['$scope', '$http', '$templateCache', + function($scope, $http, $templateCache) { + $scope.method = 'GET'; + $scope.url = 'http-hello.html'; + + $scope.fetch = function() { + $scope.code = null; + $scope.response = null; + + $http({method: $scope.method, url: $scope.url, cache: $templateCache}). + success(function(data, status) { + $scope.status = status; + $scope.data = data; + }). + error(function(data, status) { + $scope.data = data || "Request failed"; + $scope.status = status; + }); + }; + + $scope.updateModel = function(method, url) { + $scope.method = method; + $scope.url = url; + }; + }]); + + + Hello, $http! + + + var status = element(by.binding('status')); + var data = element(by.binding('data')); + var fetchBtn = element(by.id('fetchbtn')); + var sampleGetBtn = element(by.id('samplegetbtn')); + var sampleJsonpBtn = element(by.id('samplejsonpbtn')); + var invalidJsonpBtn = element(by.id('invalidjsonpbtn')); + + it('should make an xhr GET request', function() { + sampleGetBtn.click(); + fetchBtn.click(); + expect(status.getText()).toMatch('200'); + expect(data.getText()).toMatch(/Hello, \$http!/); + }); + + it('should make a JSONP request to angularjs.org', function() { + sampleJsonpBtn.click(); + fetchBtn.click(); + expect(status.getText()).toMatch('200'); + expect(data.getText()).toMatch(/Super Hero!/); + }); + + it('should make JSONP request to invalid URL and invoke the error handler', + function() { + invalidJsonpBtn.click(); + fetchBtn.click(); + expect(status.getText()).toMatch('0'); + expect(data.getText()).toMatch('Request failed'); + }); + +     + */ + function $http(requestConfig) { + var config = { + method: 'get', + transformRequest: defaults.transformRequest, + transformResponse: defaults.transformResponse + }; + var headers = mergeHeaders(requestConfig); + + extend(config, requestConfig); + config.headers = headers; + config.method = uppercase(config.method); + + var serverRequest = function(config) { + headers = config.headers; + var reqData = transformData(config.data, headersGetter(headers), config.transformRequest); + + // strip content-type if data is undefined + if (isUndefined(reqData)) { + forEach(headers, function(value, header) { + if (lowercase(header) === 'content-type') { + delete headers[header]; + } + }); + } + + if (isUndefined(config.withCredentials) && !isUndefined(defaults.withCredentials)) { + config.withCredentials = defaults.withCredentials; + } + + // send request + return sendReq(config, reqData, headers).then(transformResponse, transformResponse); + }; + + var chain = [serverRequest, undefined]; + var promise = $q.when(config); + + // apply interceptors + forEach(reversedInterceptors, function(interceptor) { + if (interceptor.request || interceptor.requestError) { + chain.unshift(interceptor.request, interceptor.requestError); + } + if (interceptor.response || interceptor.responseError) { + chain.push(interceptor.response, interceptor.responseError); + } + }); + + while(chain.length) { + var thenFn = chain.shift(); + var rejectFn = chain.shift(); + + promise = promise.then(thenFn, rejectFn); + } + + promise.success = function(fn) { + promise.then(function(response) { + fn(response.data, response.status, response.headers, config); + }); + return promise; + }; + + promise.error = function(fn) { + promise.then(null, function(response) { + fn(response.data, response.status, response.headers, config); + }); + return promise; + }; + + return promise; + + function transformResponse(response) { + // make a copy since the response must be cacheable + var resp = extend({}, response, { + data: transformData(response.data, response.headers, config.transformResponse) + }); + return (isSuccess(response.status)) + ? resp + : $q.reject(resp); + } + + function mergeHeaders(config) { + var defHeaders = defaults.headers, + reqHeaders = extend({}, config.headers), + defHeaderName, lowercaseDefHeaderName, reqHeaderName; + + defHeaders = extend({}, defHeaders.common, defHeaders[lowercase(config.method)]); + + // using for-in instead of forEach to avoid unecessary iteration after header has been found + defaultHeadersIteration: + for (defHeaderName in defHeaders) { + lowercaseDefHeaderName = lowercase(defHeaderName); + + for (reqHeaderName in reqHeaders) { + if (lowercase(reqHeaderName) === lowercaseDefHeaderName) { + continue defaultHeadersIteration; + } + } + + reqHeaders[defHeaderName] = defHeaders[defHeaderName]; + } + + // execute if header value is a function for merged headers + execHeaders(reqHeaders); + return reqHeaders; + + function execHeaders(headers) { + var headerContent; + + forEach(headers, function(headerFn, header) { + if (isFunction(headerFn)) { + headerContent = headerFn(); + if (headerContent != null) { + headers[header] = headerContent; + } else { + delete headers[header]; + } + } + }); + } + } + } + + $http.pendingRequests = []; + + /** + * @ngdoc method + * @name $http#get + * + * @description + * Shortcut method to perform `GET` request. + * + * @param {string} url Relative or absolute URL specifying the destination of the request + * @param {Object=} config Optional configuration object + * @returns {HttpPromise} Future object + */ + + /** + * @ngdoc method + * @name $http#delete + * + * @description + * Shortcut method to perform `DELETE` request. + * + * @param {string} url Relative or absolute URL specifying the destination of the request + * @param {Object=} config Optional configuration object + * @returns {HttpPromise} Future object + */ + + /** + * @ngdoc method + * @name $http#head + * + * @description + * Shortcut method to perform `HEAD` request. + * + * @param {string} url Relative or absolute URL specifying the destination of the request + * @param {Object=} config Optional configuration object + * @returns {HttpPromise} Future object + */ + + /** + * @ngdoc method + * @name $http#jsonp + * + * @description + * Shortcut method to perform `JSONP` request. + * + * @param {string} url Relative or absolute URL specifying the destination of the request. + * The name of the callback should be the string `JSON_CALLBACK`. + * @param {Object=} config Optional configuration object + * @returns {HttpPromise} Future object + */ + createShortMethods('get', 'delete', 'head', 'jsonp'); + + /** + * @ngdoc method + * @name $http#post + * + * @description + * Shortcut method to perform `POST` request. + * + * @param {string} url Relative or absolute URL specifying the destination of the request + * @param {*} data Request content + * @param {Object=} config Optional configuration object + * @returns {HttpPromise} Future object + */ + + /** + * @ngdoc method + * @name $http#put + * + * @description + * Shortcut method to perform `PUT` request. + * + * @param {string} url Relative or absolute URL specifying the destination of the request + * @param {*} data Request content + * @param {Object=} config Optional configuration object + * @returns {HttpPromise} Future object + */ + createShortMethodsWithData('post', 'put'); + + /** + * @ngdoc property + * @name $http#defaults + * + * @description + * Runtime equivalent of the `$httpProvider.defaults` property. Allows configuration of + * default headers, withCredentials as well as request and response transformations. + * + * See "Setting HTTP Headers" and "Transforming Requests and Responses" sections above. + */ + $http.defaults = defaults; + + + return $http; + + + function createShortMethods(names) { + forEach(arguments, function(name) { + $http[name] = function(url, config) { + return $http(extend(config || {}, { + method: name, + url: url + })); + }; + }); + } + + + function createShortMethodsWithData(name) { + forEach(arguments, function(name) { + $http[name] = function(url, data, config) { + return $http(extend(config || {}, { + method: name, + url: url, + data: data + })); + }; + }); + } + + + /** + * Makes the request. + * + * !!! ACCESSES CLOSURE VARS: + * $httpBackend, defaults, $log, $rootScope, defaultCache, $http.pendingRequests + */ + function sendReq(config, reqData, reqHeaders) { + var deferred = $q.defer(), + promise = deferred.promise, + cache, + cachedResp, + url = buildUrl(config.url, config.params); + + $http.pendingRequests.push(config); + promise.then(removePendingReq, removePendingReq); + + + if ((config.cache || defaults.cache) && config.cache !== false && + (config.method === 'GET' || config.method === 'JSONP')) { + cache = isObject(config.cache) ? config.cache + : isObject(defaults.cache) ? defaults.cache + : defaultCache; + } + + if (cache) { + cachedResp = cache.get(url); + if (isDefined(cachedResp)) { + if (isPromiseLike(cachedResp)) { + // cached request has already been sent, but there is no response yet + cachedResp.then(removePendingReq, removePendingReq); + return cachedResp; + } else { + // serving from cache + if (isArray(cachedResp)) { + resolvePromise(cachedResp[1], cachedResp[0], shallowCopy(cachedResp[2]), cachedResp[3]); + } else { + resolvePromise(cachedResp, 200, {}, 'OK'); + } + } + } else { + // put the promise for the non-transformed response into cache as a placeholder + cache.put(url, promise); + } + } + + + // if we won't have the response in cache, set the xsrf headers and + // send the request to the backend + if (isUndefined(cachedResp)) { + var xsrfValue = urlIsSameOrigin(config.url) + ? $browser.cookies()[config.xsrfCookieName || defaults.xsrfCookieName] + : undefined; + if (xsrfValue) { + reqHeaders[(config.xsrfHeaderName || defaults.xsrfHeaderName)] = xsrfValue; + } + + $httpBackend(config.method, url, reqData, done, reqHeaders, config.timeout, + config.withCredentials, config.responseType); + } + + return promise; + + + /** + * Callback registered to $httpBackend(): + * - caches the response if desired + * - resolves the raw $http promise + * - calls $apply + */ + function done(status, response, headersString, statusText) { + if (cache) { + if (isSuccess(status)) { + cache.put(url, [status, response, parseHeaders(headersString), statusText]); + } else { + // remove promise from the cache + cache.remove(url); + } + } + + resolvePromise(response, status, headersString, statusText); + if (!$rootScope.$$phase) $rootScope.$apply(); + } + + + /** + * Resolves the raw $http promise. + */ + function resolvePromise(response, status, headers, statusText) { + // normalize internal statuses to 0 + status = Math.max(status, 0); + + (isSuccess(status) ? deferred.resolve : deferred.reject)({ + data: response, + status: status, + headers: headersGetter(headers), + config: config, + statusText : statusText + }); + } + + + function removePendingReq() { + var idx = indexOf($http.pendingRequests, config); + if (idx !== -1) $http.pendingRequests.splice(idx, 1); + } + } + + + function buildUrl(url, params) { + if (!params) return url; + var parts = []; + forEachSorted(params, function(value, key) { + if (value === null || isUndefined(value)) return; + if (!isArray(value)) value = [value]; + + forEach(value, function(v) { + if (isObject(v)) { + if (isDate(v)){ + v = v.toISOString(); + } else { + v = toJson(v); + } + } + parts.push(encodeUriQuery(key) + '=' + + encodeUriQuery(v)); + }); + }); + if(parts.length > 0) { + url += ((url.indexOf('?') == -1) ? '?' : '&') + parts.join('&'); + } + return url; + } + }]; +} + +function createXhr(method) { + //if IE and the method is not RFC2616 compliant, or if XMLHttpRequest + //is not available, try getting an ActiveXObject. Otherwise, use XMLHttpRequest + //if it is available + if (msie <= 8 && (!method.match(/^(get|post|head|put|delete|options)$/i) || + !window.XMLHttpRequest)) { + return new window.ActiveXObject("Microsoft.XMLHTTP"); + } else if (window.XMLHttpRequest) { + return new window.XMLHttpRequest(); + } + + throw minErr('$httpBackend')('noxhr', "This browser does not support XMLHttpRequest."); +} + +/** + * @ngdoc service + * @name $httpBackend + * @requires $window + * @requires $document + * + * @description + * HTTP backend used by the {@link ng.$http service} that delegates to + * XMLHttpRequest object or JSONP and deals with browser incompatibilities. + * + * You should never need to use this service directly, instead use the higher-level abstractions: + * {@link ng.$http $http} or {@link ngResource.$resource $resource}. + * + * During testing this implementation is swapped with {@link ngMock.$httpBackend mock + * $httpBackend} which can be trained with responses. + */ +function $HttpBackendProvider() { + this.$get = ['$browser', '$window', '$document', function($browser, $window, $document) { + return createHttpBackend($browser, createXhr, $browser.defer, $window.angular.callbacks, $document[0]); + }]; +} + +function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDocument) { + var ABORTED = -1; + + // TODO(vojta): fix the signature + return function(method, url, post, callback, headers, timeout, withCredentials, responseType) { + var status; + $browser.$$incOutstandingRequestCount(); + url = url || $browser.url(); + + if (lowercase(method) == 'jsonp') { + var callbackId = '_' + (callbacks.counter++).toString(36); + callbacks[callbackId] = function(data) { + callbacks[callbackId].data = data; + callbacks[callbackId].called = true; + }; + + var jsonpDone = jsonpReq(url.replace('JSON_CALLBACK', 'angular.callbacks.' + callbackId), + callbackId, function(status, text) { + completeRequest(callback, status, callbacks[callbackId].data, "", text); + callbacks[callbackId] = noop; + }); + } else { + + var xhr = createXhr(method); + + xhr.open(method, url, true); + forEach(headers, function(value, key) { + if (isDefined(value)) { + xhr.setRequestHeader(key, value); + } + }); + + // In IE6 and 7, this might be called synchronously when xhr.send below is called and the + // response is in the cache. the promise api will ensure that to the app code the api is + // always async + xhr.onreadystatechange = function() { + // onreadystatechange might get called multiple times with readyState === 4 on mobile webkit caused by + // xhrs that are resolved while the app is in the background (see #5426). + // since calling completeRequest sets the `xhr` variable to null, we just check if it's not null before + // continuing + // + // we can't set xhr.onreadystatechange to undefined or delete it because that breaks IE8 (method=PATCH) and + // Safari respectively. + if (xhr && xhr.readyState == 4) { + var responseHeaders = null, + response = null, + statusText = ''; + + if(status !== ABORTED) { + responseHeaders = xhr.getAllResponseHeaders(); + + // responseText is the old-school way of retrieving response (supported by IE8 & 9) + // response/responseType properties were introduced in XHR Level2 spec (supported by IE10) + response = ('response' in xhr) ? xhr.response : xhr.responseText; + } + + // Accessing statusText on an aborted xhr object will + // throw an 'c00c023f error' in IE9 and lower, don't touch it. + if (!(status === ABORTED && msie < 10)) { + statusText = xhr.statusText; + } + + completeRequest(callback, + status || xhr.status, + response, + responseHeaders, + statusText); + } + }; + + if (withCredentials) { + xhr.withCredentials = true; + } + + if (responseType) { + try { + xhr.responseType = responseType; + } catch (e) { + // WebKit added support for the json responseType value on 09/03/2013 + // https://bugs.webkit.org/show_bug.cgi?id=73648. Versions of Safari prior to 7 are + // known to throw when setting the value "json" as the response type. Other older + // browsers implementing the responseType + // + // The json response type can be ignored if not supported, because JSON payloads are + // parsed on the client-side regardless. + if (responseType !== 'json') { + throw e; + } + } + } + + xhr.send(post || null); + } + + if (timeout > 0) { + var timeoutId = $browserDefer(timeoutRequest, timeout); + } else if (isPromiseLike(timeout)) { + timeout.then(timeoutRequest); + } + + + function timeoutRequest() { + status = ABORTED; + jsonpDone && jsonpDone(); + xhr && xhr.abort(); + } + + function completeRequest(callback, status, response, headersString, statusText) { + // cancel timeout and subsequent timeout promise resolution + timeoutId && $browserDefer.cancel(timeoutId); + jsonpDone = xhr = null; + + // fix status code when it is 0 (0 status is undocumented). + // Occurs when accessing file resources or on Android 4.1 stock browser + // while retrieving files from application cache. + if (status === 0) { + status = response ? 200 : urlResolve(url).protocol == 'file' ? 404 : 0; + } + + // normalize IE bug (http://bugs.jquery.com/ticket/1450) + status = status === 1223 ? 204 : status; + statusText = statusText || ''; + + callback(status, response, headersString, statusText); + $browser.$$completeOutstandingRequest(noop); + } + }; + + function jsonpReq(url, callbackId, done) { + // we can't use jQuery/jqLite here because jQuery does crazy shit with script elements, e.g.: + // - fetches local scripts via XHR and evals them + // - adds and immediately removes script elements from the document + var script = rawDocument.createElement('script'), callback = null; + script.type = "text/javascript"; + script.src = url; + script.async = true; + + callback = function(event) { + removeEventListenerFn(script, "load", callback); + removeEventListenerFn(script, "error", callback); + rawDocument.body.removeChild(script); + script = null; + var status = -1; + var text = "unknown"; + + if (event) { + if (event.type === "load" && !callbacks[callbackId].called) { + event = { type: "error" }; + } + text = event.type; + status = event.type === "error" ? 404 : 200; + } + + if (done) { + done(status, text); + } + }; + + addEventListenerFn(script, "load", callback); + addEventListenerFn(script, "error", callback); + + if (msie <= 8) { + script.onreadystatechange = function() { + if (isString(script.readyState) && /loaded|complete/.test(script.readyState)) { + script.onreadystatechange = null; + callback({ + type: 'load' + }); + } + }; + } + + rawDocument.body.appendChild(script); + return callback; + } +} + +var $interpolateMinErr = minErr('$interpolate'); + +/** + * @ngdoc provider + * @name $interpolateProvider + * @kind function + * + * @description + * + * Used for configuring the interpolation markup. Defaults to `{{` and `}}`. + * + * @example + + + +
    + //demo.label// +
    +     + + it('should interpolate binding with custom symbols', function() { + expect(element(by.binding('demo.label')).getText()).toBe('This binding is brought you by // interpolation symbols.'); + }); + +     + */ +function $InterpolateProvider() { + var startSymbol = '{{'; + var endSymbol = '}}'; + + /** + * @ngdoc method + * @name $interpolateProvider#startSymbol + * @description + * Symbol to denote start of expression in the interpolated string. Defaults to `{{`. + * + * @param {string=} value new value to set the starting symbol to. + * @returns {string|self} Returns the symbol when used as getter and self if used as setter. + */ + this.startSymbol = function(value){ + if (value) { + startSymbol = value; + return this; + } else { + return startSymbol; + } + }; + + /** + * @ngdoc method + * @name $interpolateProvider#endSymbol + * @description + * Symbol to denote the end of expression in the interpolated string. Defaults to `}}`. + * + * @param {string=} value new value to set the ending symbol to. + * @returns {string|self} Returns the symbol when used as getter and self if used as setter. + */ + this.endSymbol = function(value){ + if (value) { + endSymbol = value; + return this; + } else { + return endSymbol; + } + }; + + + this.$get = ['$parse', '$exceptionHandler', '$sce', function($parse, $exceptionHandler, $sce) { + var startSymbolLength = startSymbol.length, + endSymbolLength = endSymbol.length; + + /** + * @ngdoc service + * @name $interpolate + * @kind function + * + * @requires $parse + * @requires $sce + * + * @description + * + * Compiles a string with markup into an interpolation function. This service is used by the + * HTML {@link ng.$compile $compile} service for data binding. See + * {@link ng.$interpolateProvider $interpolateProvider} for configuring the + * interpolation markup. + * + * + * ```js + * var $interpolate = ...; // injected + * var exp = $interpolate('Hello {{name | uppercase}}!'); + * expect(exp({name:'Angular'}).toEqual('Hello ANGULAR!'); + * ``` + * + * + * @param {string} text The text with markup to interpolate. + * @param {boolean=} mustHaveExpression if set to true then the interpolation string must have + * embedded expression in order to return an interpolation function. Strings with no + * embedded expression will return null for the interpolation function. + * @param {string=} trustedContext when provided, the returned function passes the interpolated + * result through {@link ng.$sce#getTrusted $sce.getTrusted(interpolatedResult, + * trustedContext)} before returning it. Refer to the {@link ng.$sce $sce} service that + * provides Strict Contextual Escaping for details. + * @returns {function(context)} an interpolation function which is used to compute the + * interpolated string. The function has these parameters: + * + * * `context`: an object against which any expressions embedded in the strings are evaluated + * against. + * + */ + function $interpolate(text, mustHaveExpression, trustedContext) { + var startIndex, + endIndex, + index = 0, + parts = [], + length = text.length, + hasInterpolation = false, + fn, + exp, + concat = []; + + while(index < length) { + if ( ((startIndex = text.indexOf(startSymbol, index)) != -1) && + ((endIndex = text.indexOf(endSymbol, startIndex + startSymbolLength)) != -1) ) { + (index != startIndex) && parts.push(text.substring(index, startIndex)); + parts.push(fn = $parse(exp = text.substring(startIndex + startSymbolLength, endIndex))); + fn.exp = exp; + index = endIndex + endSymbolLength; + hasInterpolation = true; + } else { + // we did not find anything, so we have to add the remainder to the parts array + (index != length) && parts.push(text.substring(index)); + index = length; + } + } + + if (!(length = parts.length)) { + // we added, nothing, must have been an empty string. + parts.push(''); + length = 1; + } + + // Concatenating expressions makes it hard to reason about whether some combination of + // concatenated values are unsafe to use and could easily lead to XSS. By requiring that a + // single expression be used for iframe[src], object[src], etc., we ensure that the value + // that's used is assigned or constructed by some JS code somewhere that is more testable or + // make it obvious that you bound the value to some user controlled value. This helps reduce + // the load when auditing for XSS issues. + if (trustedContext && parts.length > 1) { + throw $interpolateMinErr('noconcat', + "Error while interpolating: {0}\nStrict Contextual Escaping disallows " + + "interpolations that concatenate multiple expressions when a trusted value is " + + "required. See http://docs.angularjs.org/api/ng.$sce", text); + } + + if (!mustHaveExpression || hasInterpolation) { + concat.length = length; + fn = function(context) { + try { + for(var i = 0, ii = length, part; i + * **Note**: Intervals created by this service must be explicitly destroyed when you are finished + * with them. In particular they are not automatically destroyed when a controller's scope or a + * directive's element are destroyed. + * You should take this into consideration and make sure to always cancel the interval at the + * appropriate moment. See the example below for more details on how and when to do this. + * + * + * @param {function()} fn A function that should be called repeatedly. + * @param {number} delay Number of milliseconds between each function call. + * @param {number=} [count=0] Number of times to repeat. If not set, or 0, will repeat + * indefinitely. + * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise + * will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block. + * @returns {promise} A promise which will be notified on each iteration. + * + * @example + * + * + * + * + *
    + *
    + * Date format:
    + * Current time is: + *
    + * Blood 1 : {{blood_1}} + * Blood 2 : {{blood_2}} + * + * + * + *
    + *
    + * + *     + *     + */ + function interval(fn, delay, count, invokeApply) { + var setInterval = $window.setInterval, + clearInterval = $window.clearInterval, + deferred = $q.defer(), + promise = deferred.promise, + iteration = 0, + skipApply = (isDefined(invokeApply) && !invokeApply); + + count = isDefined(count) ? count : 0; + + promise.then(null, null, fn); + + promise.$$intervalId = setInterval(function tick() { + deferred.notify(iteration++); + + if (count > 0 && iteration >= count) { + deferred.resolve(iteration); + clearInterval(promise.$$intervalId); + delete intervals[promise.$$intervalId]; + } + + if (!skipApply) $rootScope.$apply(); + + }, delay); + + intervals[promise.$$intervalId] = deferred; + + return promise; + } + + + /** + * @ngdoc method + * @name $interval#cancel + * + * @description + * Cancels a task associated with the `promise`. + * + * @param {promise} promise returned by the `$interval` function. + * @returns {boolean} Returns `true` if the task was successfully canceled. + */ + interval.cancel = function(promise) { + if (promise && promise.$$intervalId in intervals) { + intervals[promise.$$intervalId].reject('canceled'); + $window.clearInterval(promise.$$intervalId); + delete intervals[promise.$$intervalId]; + return true; + } + return false; + }; + + return interval; + }]; +} + +/** + * @ngdoc service + * @name $locale + * + * @description + * $locale service provides localization rules for various Angular components. As of right now the + * only public api is: + * + * * `id` – `{string}` – locale id formatted as `languageId-countryId` (e.g. `en-us`) + */ +function $LocaleProvider(){ + this.$get = function() { + return { + id: 'en-us', + + NUMBER_FORMATS: { + DECIMAL_SEP: '.', + GROUP_SEP: ',', + PATTERNS: [ + { // Decimal Pattern + minInt: 1, + minFrac: 0, + maxFrac: 3, + posPre: '', + posSuf: '', + negPre: '-', + negSuf: '', + gSize: 3, + lgSize: 3 + },{ //Currency Pattern + minInt: 1, + minFrac: 2, + maxFrac: 2, + posPre: '\u00A4', + posSuf: '', + negPre: '(\u00A4', + negSuf: ')', + gSize: 3, + lgSize: 3 + } + ], + CURRENCY_SYM: '$' + }, + + DATETIME_FORMATS: { + MONTH: + 'January,February,March,April,May,June,July,August,September,October,November,December' + .split(','), + SHORTMONTH: 'Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec'.split(','), + DAY: 'Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday'.split(','), + SHORTDAY: 'Sun,Mon,Tue,Wed,Thu,Fri,Sat'.split(','), + AMPMS: ['AM','PM'], + medium: 'MMM d, y h:mm:ss a', + short: 'M/d/yy h:mm a', + fullDate: 'EEEE, MMMM d, y', + longDate: 'MMMM d, y', + mediumDate: 'MMM d, y', + shortDate: 'M/d/yy', + mediumTime: 'h:mm:ss a', + shortTime: 'h:mm a' + }, + + pluralCat: function(num) { + if (num === 1) { + return 'one'; + } + return 'other'; + } + }; + }; +} + +var PATH_MATCH = /^([^\?#]*)(\?([^#]*))?(#(.*))?$/, + DEFAULT_PORTS = {'http': 80, 'https': 443, 'ftp': 21}; +var $locationMinErr = minErr('$location'); + + +/** + * Encode path using encodeUriSegment, ignoring forward slashes + * + * @param {string} path Path to encode + * @returns {string} + */ +function encodePath(path) { + var segments = path.split('/'), + i = segments.length; + + while (i--) { + segments[i] = encodeUriSegment(segments[i]); + } + + return segments.join('/'); +} + +function parseAbsoluteUrl(absoluteUrl, locationObj, appBase) { + var parsedUrl = urlResolve(absoluteUrl, appBase); + + locationObj.$$protocol = parsedUrl.protocol; + locationObj.$$host = parsedUrl.hostname; + locationObj.$$port = int(parsedUrl.port) || DEFAULT_PORTS[parsedUrl.protocol] || null; +} + + +function parseAppUrl(relativeUrl, locationObj, appBase) { + var prefixed = (relativeUrl.charAt(0) !== '/'); + if (prefixed) { + relativeUrl = '/' + relativeUrl; + } + var match = urlResolve(relativeUrl, appBase); + locationObj.$$path = decodeURIComponent(prefixed && match.pathname.charAt(0) === '/' ? + match.pathname.substring(1) : match.pathname); + locationObj.$$search = parseKeyValue(match.search); + locationObj.$$hash = decodeURIComponent(match.hash); + + // make sure path starts with '/'; + if (locationObj.$$path && locationObj.$$path.charAt(0) != '/') { + locationObj.$$path = '/' + locationObj.$$path; + } +} + + +/** + * + * @param {string} begin + * @param {string} whole + * @returns {string} returns text from whole after begin or undefined if it does not begin with + * expected string. + */ +function beginsWith(begin, whole) { + if (whole.indexOf(begin) === 0) { + return whole.substr(begin.length); + } +} + + +function stripHash(url) { + var index = url.indexOf('#'); + return index == -1 ? url : url.substr(0, index); +} + + +function stripFile(url) { + return url.substr(0, stripHash(url).lastIndexOf('/') + 1); +} + +/* return the server only (scheme://host:port) */ +function serverBase(url) { + return url.substring(0, url.indexOf('/', url.indexOf('//') + 2)); +} + + +/** + * LocationHtml5Url represents an url + * This object is exposed as $location service when HTML5 mode is enabled and supported + * + * @constructor + * @param {string} appBase application base URL + * @param {string} basePrefix url path prefix + */ +function LocationHtml5Url(appBase, basePrefix) { + this.$$html5 = true; + basePrefix = basePrefix || ''; + var appBaseNoFile = stripFile(appBase); + parseAbsoluteUrl(appBase, this, appBase); + + + /** + * Parse given html5 (regular) url string into properties + * @param {string} newAbsoluteUrl HTML5 url + * @private + */ + this.$$parse = function(url) { + var pathUrl = beginsWith(appBaseNoFile, url); + if (!isString(pathUrl)) { + throw $locationMinErr('ipthprfx', 'Invalid url "{0}", missing path prefix "{1}".', url, + appBaseNoFile); + } + + parseAppUrl(pathUrl, this, appBase); + + if (!this.$$path) { + this.$$path = '/'; + } + + this.$$compose(); + }; + + /** + * Compose url and update `absUrl` property + * @private + */ + this.$$compose = function() { + var search = toKeyValue(this.$$search), + hash = this.$$hash ? '#' + encodeUriSegment(this.$$hash) : ''; + + this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash; + this.$$absUrl = appBaseNoFile + this.$$url.substr(1); // first char is always '/' + }; + + this.$$rewrite = function(url) { + var appUrl, prevAppUrl; + + if ( (appUrl = beginsWith(appBase, url)) !== undefined ) { + prevAppUrl = appUrl; + if ( (appUrl = beginsWith(basePrefix, appUrl)) !== undefined ) { + return appBaseNoFile + (beginsWith('/', appUrl) || appUrl); + } else { + return appBase + prevAppUrl; + } + } else if ( (appUrl = beginsWith(appBaseNoFile, url)) !== undefined ) { + return appBaseNoFile + appUrl; + } else if (appBaseNoFile == url + '/') { + return appBaseNoFile; + } + }; +} + + +/** + * LocationHashbangUrl represents url + * This object is exposed as $location service when developer doesn't opt into html5 mode. + * It also serves as the base class for html5 mode fallback on legacy browsers. + * + * @constructor + * @param {string} appBase application base URL + * @param {string} hashPrefix hashbang prefix + */ +function LocationHashbangUrl(appBase, hashPrefix) { + var appBaseNoFile = stripFile(appBase); + + parseAbsoluteUrl(appBase, this, appBase); + + + /** + * Parse given hashbang url into properties + * @param {string} url Hashbang url + * @private + */ + this.$$parse = function(url) { + var withoutBaseUrl = beginsWith(appBase, url) || beginsWith(appBaseNoFile, url); + var withoutHashUrl = withoutBaseUrl.charAt(0) == '#' + ? beginsWith(hashPrefix, withoutBaseUrl) + : (this.$$html5) + ? withoutBaseUrl + : ''; + + if (!isString(withoutHashUrl)) { + throw $locationMinErr('ihshprfx', 'Invalid url "{0}", missing hash prefix "{1}".', url, + hashPrefix); + } + parseAppUrl(withoutHashUrl, this, appBase); + + this.$$path = removeWindowsDriveName(this.$$path, withoutHashUrl, appBase); + + this.$$compose(); + + /* + * In Windows, on an anchor node on documents loaded from + * the filesystem, the browser will return a pathname + * prefixed with the drive name ('/C:/path') when a + * pathname without a drive is set: + * * a.setAttribute('href', '/foo') + * * a.pathname === '/C:/foo' //true + * + * Inside of Angular, we're always using pathnames that + * do not include drive names for routing. + */ + function removeWindowsDriveName (path, url, base) { + /* + Matches paths for file protocol on windows, + such as /C:/foo/bar, and captures only /foo/bar. + */ + var windowsFilePathExp = /^\/[A-Z]:(\/.*)/; + + var firstPathSegmentMatch; + + //Get the relative path from the input URL. + if (url.indexOf(base) === 0) { + url = url.replace(base, ''); + } + + // The input URL intentionally contains a first path segment that ends with a colon. + if (windowsFilePathExp.exec(url)) { + return path; + } + + firstPathSegmentMatch = windowsFilePathExp.exec(path); + return firstPathSegmentMatch ? firstPathSegmentMatch[1] : path; + } + }; + + /** + * Compose hashbang url and update `absUrl` property + * @private + */ + this.$$compose = function() { + var search = toKeyValue(this.$$search), + hash = this.$$hash ? '#' + encodeUriSegment(this.$$hash) : ''; + + this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash; + this.$$absUrl = appBase + (this.$$url ? hashPrefix + this.$$url : ''); + }; + + this.$$rewrite = function(url) { + if(stripHash(appBase) == stripHash(url)) { + return url; + } + }; +} + + +/** + * LocationHashbangUrl represents url + * This object is exposed as $location service when html5 history api is enabled but the browser + * does not support it. + * + * @constructor + * @param {string} appBase application base URL + * @param {string} hashPrefix hashbang prefix + */ +function LocationHashbangInHtml5Url(appBase, hashPrefix) { + this.$$html5 = true; + LocationHashbangUrl.apply(this, arguments); + + var appBaseNoFile = stripFile(appBase); + + this.$$rewrite = function(url) { + var appUrl; + + if ( appBase == stripHash(url) ) { + return url; + } else if ( (appUrl = beginsWith(appBaseNoFile, url)) ) { + return appBase + hashPrefix + appUrl; + } else if ( appBaseNoFile === url + '/') { + return appBaseNoFile; + } + }; + + this.$$compose = function() { + var search = toKeyValue(this.$$search), + hash = this.$$hash ? '#' + encodeUriSegment(this.$$hash) : ''; + + this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash; + // include hashPrefix in $$absUrl when $$url is empty so IE8 & 9 do not reload page because of removal of '#' + this.$$absUrl = appBase + hashPrefix + this.$$url; + }; + +} + + +LocationHashbangInHtml5Url.prototype = + LocationHashbangUrl.prototype = + LocationHtml5Url.prototype = { + + /** + * Are we in html5 mode? + * @private + */ + $$html5: false, + + /** + * Has any change been replacing ? + * @private + */ + $$replace: false, + + /** + * @ngdoc method + * @name $location#absUrl + * + * @description + * This method is getter only. + * + * Return full url representation with all segments encoded according to rules specified in + * [RFC 3986](http://www.ietf.org/rfc/rfc3986.txt). + * + * @return {string} full url + */ + absUrl: locationGetter('$$absUrl'), + + /** + * @ngdoc method + * @name $location#url + * + * @description + * This method is getter / setter. + * + * Return url (e.g. `/path?a=b#hash`) when called without any parameter. + * + * Change path, search and hash, when called with parameter and return `$location`. + * + * @param {string=} url New url without base prefix (e.g. `/path?a=b#hash`) + * @return {string} url + */ + url: function(url) { + if (isUndefined(url)) + return this.$$url; + + var match = PATH_MATCH.exec(url); + if (match[1]) this.path(decodeURIComponent(match[1])); + if (match[2] || match[1]) this.search(match[3] || ''); + this.hash(match[5] || ''); + + return this; + }, + + /** + * @ngdoc method + * @name $location#protocol + * + * @description + * This method is getter only. + * + * Return protocol of current url. + * + * @return {string} protocol of current url + */ + protocol: locationGetter('$$protocol'), + + /** + * @ngdoc method + * @name $location#host + * + * @description + * This method is getter only. + * + * Return host of current url. + * + * @return {string} host of current url. + */ + host: locationGetter('$$host'), + + /** + * @ngdoc method + * @name $location#port + * + * @description + * This method is getter only. + * + * Return port of current url. + * + * @return {Number} port + */ + port: locationGetter('$$port'), + + /** + * @ngdoc method + * @name $location#path + * + * @description + * This method is getter / setter. + * + * Return path of current url when called without any parameter. + * + * Change path when called with parameter and return `$location`. + * + * Note: Path should always begin with forward slash (/), this method will add the forward slash + * if it is missing. + * + * @param {(string|number)=} path New path + * @return {string} path + */ + path: locationGetterSetter('$$path', function(path) { + path = path ? path.toString() : ''; + return path.charAt(0) == '/' ? path : '/' + path; + }), + + /** + * @ngdoc method + * @name $location#search + * + * @description + * This method is getter / setter. + * + * Return search part (as object) of current url when called without any parameter. + * + * Change search part when called with parameter and return `$location`. + * + * + * ```js + * // given url http://example.com/#/some/path?foo=bar&baz=xoxo + * var searchObject = $location.search(); + * // => {foo: 'bar', baz: 'xoxo'} + * + * + * // set foo to 'yipee' + * $location.search('foo', 'yipee'); + * // => $location + * ``` + * + * @param {string|Object.|Object.>} search New search params - string or + * hash object. + * + * When called with a single argument the method acts as a setter, setting the `search` component + * of `$location` to the specified value. + * + * If the argument is a hash object containing an array of values, these values will be encoded + * as duplicate search parameters in the url. + * + * @param {(string|Number|Array|boolean)=} paramValue If `search` is a string or number, then `paramValue` + * will override only a single search property. + * + * If `paramValue` is an array, it will override the property of the `search` component of + * `$location` specified via the first argument. + * + * If `paramValue` is `null`, the property specified via the first argument will be deleted. + * + * If `paramValue` is `true`, the property specified via the first argument will be added with no + * value nor trailing equal sign. + * + * @return {Object} If called with no arguments returns the parsed `search` object. If called with + * one or more arguments returns `$location` object itself. + */ + search: function(search, paramValue) { + switch (arguments.length) { + case 0: + return this.$$search; + case 1: + if (isString(search) || isNumber(search)) { + search = search.toString(); + this.$$search = parseKeyValue(search); + } else if (isObject(search)) { + // remove object undefined or null properties + forEach(search, function(value, key) { + if (value == null) delete search[key]; + }); + + this.$$search = search; + } else { + throw $locationMinErr('isrcharg', + 'The first argument of the `$location#search()` call must be a string or an object.'); + } + break; + default: + if (isUndefined(paramValue) || paramValue === null) { + delete this.$$search[search]; + } else { + this.$$search[search] = paramValue; + } + } + + this.$$compose(); + return this; + }, + + /** + * @ngdoc method + * @name $location#hash + * + * @description + * This method is getter / setter. + * + * Return hash fragment when called without any parameter. + * + * Change hash fragment when called with parameter and return `$location`. + * + * @param {(string|number)=} hash New hash fragment + * @return {string} hash + */ + hash: locationGetterSetter('$$hash', function(hash) { + return hash ? hash.toString() : ''; + }), + + /** + * @ngdoc method + * @name $location#replace + * + * @description + * If called, all changes to $location during current `$digest` will be replacing current history + * record, instead of adding new one. + */ + replace: function() { + this.$$replace = true; + return this; + } +}; + +function locationGetter(property) { + return function() { + return this[property]; + }; +} + + +function locationGetterSetter(property, preprocess) { + return function(value) { + if (isUndefined(value)) + return this[property]; + + this[property] = preprocess(value); + this.$$compose(); + + return this; + }; +} + + +/** + * @ngdoc service + * @name $location + * + * @requires $rootElement + * + * @description + * The $location service parses the URL in the browser address bar (based on the + * [window.location](https://developer.mozilla.org/en/window.location)) and makes the URL + * available to your application. Changes to the URL in the address bar are reflected into + * $location service and changes to $location are reflected into the browser address bar. + * + * **The $location service:** + * + * - Exposes the current URL in the browser address bar, so you can + * - Watch and observe the URL. + * - Change the URL. + * - Synchronizes the URL with the browser when the user + * - Changes the address bar. + * - Clicks the back or forward button (or clicks a History link). + * - Clicks on a link. + * - Represents the URL object as a set of methods (protocol, host, port, path, search, hash). + * + * For more information see {@link guide/$location Developer Guide: Using $location} + */ + +/** + * @ngdoc provider + * @name $locationProvider + * @description + * Use the `$locationProvider` to configure how the application deep linking paths are stored. + */ +function $LocationProvider(){ + var hashPrefix = '', + html5Mode = false; + + /** + * @ngdoc method + * @name $locationProvider#hashPrefix + * @description + * @param {string=} prefix Prefix for hash part (containing path and search) + * @returns {*} current value if used as getter or itself (chaining) if used as setter + */ + this.hashPrefix = function(prefix) { + if (isDefined(prefix)) { + hashPrefix = prefix; + return this; + } else { + return hashPrefix; + } + }; + + /** + * @ngdoc method + * @name $locationProvider#html5Mode + * @description + * @param {boolean=} mode Use HTML5 strategy if available. + * @returns {*} current value if used as getter or itself (chaining) if used as setter + */ + this.html5Mode = function(mode) { + if (isDefined(mode)) { + html5Mode = mode; + return this; + } else { + return html5Mode; + } + }; + + /** + * @ngdoc event + * @name $location#$locationChangeStart + * @eventType broadcast on root scope + * @description + * Broadcasted before a URL will change. This change can be prevented by calling + * `preventDefault` method of the event. See {@link ng.$rootScope.Scope#$on} for more + * details about event object. Upon successful change + * {@link ng.$location#events_$locationChangeSuccess $locationChangeSuccess} is fired. + * + * @param {Object} angularEvent Synthetic event object. + * @param {string} newUrl New URL + * @param {string=} oldUrl URL that was before it was changed. + */ + + /** + * @ngdoc event + * @name $location#$locationChangeSuccess + * @eventType broadcast on root scope + * @description + * Broadcasted after a URL was changed. + * + * @param {Object} angularEvent Synthetic event object. + * @param {string} newUrl New URL + * @param {string=} oldUrl URL that was before it was changed. + */ + + this.$get = ['$rootScope', '$browser', '$sniffer', '$rootElement', + function( $rootScope, $browser, $sniffer, $rootElement) { + var $location, + LocationMode, + baseHref = $browser.baseHref(), // if base[href] is undefined, it defaults to '' + initialUrl = $browser.url(), + appBase; + + if (html5Mode) { + appBase = serverBase(initialUrl) + (baseHref || '/'); + LocationMode = $sniffer.history ? LocationHtml5Url : LocationHashbangInHtml5Url; + } else { + appBase = stripHash(initialUrl); + LocationMode = LocationHashbangUrl; + } + $location = new LocationMode(appBase, '#' + hashPrefix); + $location.$$parse($location.$$rewrite(initialUrl)); + + var IGNORE_URI_REGEXP = /^\s*(javascript|mailto):/i; + + $rootElement.on('click', function(event) { + // TODO(vojta): rewrite link when opening in new tab/window (in legacy browser) + // currently we open nice url link and redirect then + + if (event.ctrlKey || event.metaKey || event.which == 2) return; + + var elm = jqLite(event.target); + + // traverse the DOM up to find first A tag + while (lowercase(elm[0].nodeName) !== 'a') { + // ignore rewriting if no A tag (reached root element, or no parent - removed from document) + if (elm[0] === $rootElement[0] || !(elm = elm.parent())[0]) return; + } + + var absHref = elm.prop('href'); + + if (isObject(absHref) && absHref.toString() === '[object SVGAnimatedString]') { + // SVGAnimatedString.animVal should be identical to SVGAnimatedString.baseVal, unless during + // an animation. + absHref = urlResolve(absHref.animVal).href; + } + + // Ignore when url is started with javascript: or mailto: + if (IGNORE_URI_REGEXP.test(absHref)) return; + + // Make relative links work in HTML5 mode for legacy browsers (or at least IE8 & 9) + // The href should be a regular url e.g. /link/somewhere or link/somewhere or ../somewhere or + // somewhere#anchor or http://example.com/somewhere + if (LocationMode === LocationHashbangInHtml5Url) { + // get the actual href attribute - see + // http://msdn.microsoft.com/en-us/library/ie/dd347148(v=vs.85).aspx + var href = elm.attr('href') || elm.attr('xlink:href'); + + if (href && href.indexOf('://') < 0) { // Ignore absolute URLs + var prefix = '#' + hashPrefix; + if (href[0] == '/') { + // absolute path - replace old path + absHref = appBase + prefix + href; + } else if (href[0] == '#') { + // local anchor + absHref = appBase + prefix + ($location.path() || '/') + href; + } else { + // relative path - join with current path + var stack = $location.path().split("/"), + parts = href.split("/"); + if (stack.length === 2 && !stack[1]) stack.length = 1; + for (var i=0; i html5 url + if ($location.absUrl() != initialUrl) { + $browser.url($location.absUrl(), true); + } + + // update $location when $browser url changes + $browser.onUrlChange(function(newUrl) { + if ($location.absUrl() != newUrl) { + $rootScope.$evalAsync(function() { + var oldUrl = $location.absUrl(); + + $location.$$parse(newUrl); + if ($rootScope.$broadcast('$locationChangeStart', newUrl, + oldUrl).defaultPrevented) { + $location.$$parse(oldUrl); + $browser.url(oldUrl); + } else { + afterLocationChange(oldUrl); + } + }); + if (!$rootScope.$$phase) $rootScope.$digest(); + } + }); + + // update browser + var changeCounter = 0; + $rootScope.$watch(function $locationWatch() { + var oldUrl = $browser.url(); + var currentReplace = $location.$$replace; + + if (!changeCounter || oldUrl != $location.absUrl()) { + changeCounter++; + $rootScope.$evalAsync(function() { + if ($rootScope.$broadcast('$locationChangeStart', $location.absUrl(), oldUrl). + defaultPrevented) { + $location.$$parse(oldUrl); + } else { + $browser.url($location.absUrl(), currentReplace); + afterLocationChange(oldUrl); + } + }); + } + $location.$$replace = false; + + return changeCounter; + }); + + return $location; + + function afterLocationChange(oldUrl) { + $rootScope.$broadcast('$locationChangeSuccess', $location.absUrl(), oldUrl); + } +}]; +} + +/** + * @ngdoc service + * @name $log + * @requires $window + * + * @description + * Simple service for logging. Default implementation safely writes the message + * into the browser's console (if present). + * + * The main purpose of this service is to simplify debugging and troubleshooting. + * + * The default is to log `debug` messages. You can use + * {@link ng.$logProvider ng.$logProvider#debugEnabled} to change this. + * + * @example + + + angular.module('logExample', []) + .controller('LogController', ['$scope', '$log', function($scope, $log) { + $scope.$log = $log; + $scope.message = 'Hello World!'; + }]); + + +
    +

    Reload this page with open console, enter text and hit the log button...

    + Message: + + + + + +
    +     +     + */ + +/** + * @ngdoc provider + * @name $logProvider + * @description + * Use the `$logProvider` to configure how the application logs messages + */ +function $LogProvider(){ + var debug = true, + self = this; + + /** + * @ngdoc method + * @name $logProvider#debugEnabled + * @description + * @param {boolean=} flag enable or disable debug level messages + * @returns {*} current value if used as getter or itself (chaining) if used as setter + */ + this.debugEnabled = function(flag) { + if (isDefined(flag)) { + debug = flag; + return this; + } else { + return debug; + } + }; + + this.$get = ['$window', function($window){ + return { + /** + * @ngdoc method + * @name $log#log + * + * @description + * Write a log message + */ + log: consoleLog('log'), + + /** + * @ngdoc method + * @name $log#info + * + * @description + * Write an information message + */ + info: consoleLog('info'), + + /** + * @ngdoc method + * @name $log#warn + * + * @description + * Write a warning message + */ + warn: consoleLog('warn'), + + /** + * @ngdoc method + * @name $log#error + * + * @description + * Write an error message + */ + error: consoleLog('error'), + + /** + * @ngdoc method + * @name $log#debug + * + * @description + * Write a debug message + */ + debug: (function () { + var fn = consoleLog('debug'); + + return function() { + if (debug) { + fn.apply(self, arguments); + } + }; + }()) + }; + + function formatError(arg) { + if (arg instanceof Error) { + if (arg.stack) { + arg = (arg.message && arg.stack.indexOf(arg.message) === -1) + ? 'Error: ' + arg.message + '\n' + arg.stack + : arg.stack; + } else if (arg.sourceURL) { + arg = arg.message + '\n' + arg.sourceURL + ':' + arg.line; + } + } + return arg; + } + + function consoleLog(type) { + var console = $window.console || {}, + logFn = console[type] || console.log || noop, + hasApply = false; + + // Note: reading logFn.apply throws an error in IE11 in IE8 document mode. + // The reason behind this is that console.log has type "object" in IE8... + try { + hasApply = !!logFn.apply; + } catch (e) {} + + if (hasApply) { + return function() { + var args = []; + forEach(arguments, function(arg) { + args.push(formatError(arg)); + }); + return logFn.apply(console, args); + }; + } + + // we are IE which either doesn't have window.console => this is noop and we do nothing, + // or we are IE where console.log doesn't have apply so we log at least first 2 args + return function(arg1, arg2) { + logFn(arg1, arg2 == null ? '' : arg2); + }; + } + }]; +} + +var $parseMinErr = minErr('$parse'); +var promiseWarningCache = {}; +var promiseWarning; + +// Sandboxing Angular Expressions +// ------------------------------ +// Angular expressions are generally considered safe because these expressions only have direct +// access to $scope and locals. However, one can obtain the ability to execute arbitrary JS code by +// obtaining a reference to native JS functions such as the Function constructor. +// +// As an example, consider the following Angular expression: +// +// {}.toString.constructor('alert("evil JS code")') +// +// This sandboxing technique is not perfect and doesn't aim to be. The goal is to prevent exploits +// against the expression language, but not to prevent exploits that were enabled by exposing +// sensitive JavaScript or browser apis on Scope. Exposing such objects on a Scope is never a good +// practice and therefore we are not even trying to protect against interaction with an object +// explicitly exposed in this way. +// +// In general, it is not possible to access a Window object from an angular expression unless a +// window or some DOM object that has a reference to window is published onto a Scope. +// Similarly we prevent invocations of function known to be dangerous, as well as assignments to +// native objects. + + +function ensureSafeMemberName(name, fullExpression) { + if (name === "__defineGetter__" || name === "__defineSetter__" + || name === "__lookupGetter__" || name === "__lookupSetter__" + || name === "__proto__") { + throw $parseMinErr('isecfld', + 'Attempting to access a disallowed field in Angular expressions! ' + +'Expression: {0}', fullExpression); + } + return name; +} + +function ensureSafeObject(obj, fullExpression) { + // nifty check if obj is Function that is fast and works across iframes and other contexts + if (obj) { + if (obj.constructor === obj) { + throw $parseMinErr('isecfn', + 'Referencing Function in Angular expressions is disallowed! Expression: {0}', + fullExpression); + } else if (// isWindow(obj) + obj.document && obj.location && obj.alert && obj.setInterval) { + throw $parseMinErr('isecwindow', + 'Referencing the Window in Angular expressions is disallowed! Expression: {0}', + fullExpression); + } else if (// isElement(obj) + obj.children && (obj.nodeName || (obj.prop && obj.attr && obj.find))) { + throw $parseMinErr('isecdom', + 'Referencing DOM nodes in Angular expressions is disallowed! Expression: {0}', + fullExpression); + } else if (// block Object so that we can't get hold of dangerous Object.* methods + obj === Object) { + throw $parseMinErr('isecobj', + 'Referencing Object in Angular expressions is disallowed! Expression: {0}', + fullExpression); + } + } + return obj; +} + +var CALL = Function.prototype.call; +var APPLY = Function.prototype.apply; +var BIND = Function.prototype.bind; + +function ensureSafeFunction(obj, fullExpression) { + if (obj) { + if (obj.constructor === obj) { + throw $parseMinErr('isecfn', + 'Referencing Function in Angular expressions is disallowed! Expression: {0}', + fullExpression); + } else if (obj === CALL || obj === APPLY || (BIND && obj === BIND)) { + throw $parseMinErr('isecff', + 'Referencing call, apply or bind in Angular expressions is disallowed! Expression: {0}', + fullExpression); + } + } +} + +var OPERATORS = { + /* jshint bitwise : false */ + 'null':function(){return null;}, + 'true':function(){return true;}, + 'false':function(){return false;}, + undefined:noop, + '+':function(self, locals, a,b){ + a=a(self, locals); b=b(self, locals); + if (isDefined(a)) { + if (isDefined(b)) { + return a + b; + } + return a; + } + return isDefined(b)?b:undefined;}, + '-':function(self, locals, a,b){ + a=a(self, locals); b=b(self, locals); + return (isDefined(a)?a:0)-(isDefined(b)?b:0); + }, + '*':function(self, locals, a,b){return a(self, locals)*b(self, locals);}, + '/':function(self, locals, a,b){return a(self, locals)/b(self, locals);}, + '%':function(self, locals, a,b){return a(self, locals)%b(self, locals);}, + '^':function(self, locals, a,b){return a(self, locals)^b(self, locals);}, + '=':noop, + '===':function(self, locals, a, b){return a(self, locals)===b(self, locals);}, + '!==':function(self, locals, a, b){return a(self, locals)!==b(self, locals);}, + '==':function(self, locals, a,b){return a(self, locals)==b(self, locals);}, + '!=':function(self, locals, a,b){return a(self, locals)!=b(self, locals);}, + '<':function(self, locals, a,b){return a(self, locals)':function(self, locals, a,b){return a(self, locals)>b(self, locals);}, + '<=':function(self, locals, a,b){return a(self, locals)<=b(self, locals);}, + '>=':function(self, locals, a,b){return a(self, locals)>=b(self, locals);}, + '&&':function(self, locals, a,b){return a(self, locals)&&b(self, locals);}, + '||':function(self, locals, a,b){return a(self, locals)||b(self, locals);}, + '&':function(self, locals, a,b){return a(self, locals)&b(self, locals);}, +// '|':function(self, locals, a,b){return a|b;}, + '|':function(self, locals, a,b){return b(self, locals)(self, locals, a(self, locals));}, + '!':function(self, locals, a){return !a(self, locals);} +}; +/* jshint bitwise: true */ +var ESCAPE = {"n":"\n", "f":"\f", "r":"\r", "t":"\t", "v":"\v", "'":"'", '"':'"'}; + + +///////////////////////////////////////// + + +/** + * @constructor + */ +var Lexer = function (options) { + this.options = options; +}; + +Lexer.prototype = { + constructor: Lexer, + + lex: function (text) { + this.text = text; + + this.index = 0; + this.ch = undefined; + this.lastCh = ':'; // can start regexp + + this.tokens = []; + + while (this.index < this.text.length) { + this.ch = this.text.charAt(this.index); + if (this.is('"\'')) { + this.readString(this.ch); + } else if (this.isNumber(this.ch) || this.is('.') && this.isNumber(this.peek())) { + this.readNumber(); + } else if (this.isIdent(this.ch)) { + this.readIdent(); + } else if (this.is('(){}[].,;:?')) { + this.tokens.push({ + index: this.index, + text: this.ch + }); + this.index++; + } else if (this.isWhitespace(this.ch)) { + this.index++; + continue; + } else { + var ch2 = this.ch + this.peek(); + var ch3 = ch2 + this.peek(2); + var fn = OPERATORS[this.ch]; + var fn2 = OPERATORS[ch2]; + var fn3 = OPERATORS[ch3]; + if (fn3) { + this.tokens.push({index: this.index, text: ch3, fn: fn3}); + this.index += 3; + } else if (fn2) { + this.tokens.push({index: this.index, text: ch2, fn: fn2}); + this.index += 2; + } else if (fn) { + this.tokens.push({ + index: this.index, + text: this.ch, + fn: fn + }); + this.index += 1; + } else { + this.throwError('Unexpected next character ', this.index, this.index + 1); + } + } + this.lastCh = this.ch; + } + return this.tokens; + }, + + is: function(chars) { + return chars.indexOf(this.ch) !== -1; + }, + + was: function(chars) { + return chars.indexOf(this.lastCh) !== -1; + }, + + peek: function(i) { + var num = i || 1; + return (this.index + num < this.text.length) ? this.text.charAt(this.index + num) : false; + }, + + isNumber: function(ch) { + return ('0' <= ch && ch <= '9'); + }, + + isWhitespace: function(ch) { + // IE treats non-breaking space as \u00A0 + return (ch === ' ' || ch === '\r' || ch === '\t' || + ch === '\n' || ch === '\v' || ch === '\u00A0'); + }, + + isIdent: function(ch) { + return ('a' <= ch && ch <= 'z' || + 'A' <= ch && ch <= 'Z' || + '_' === ch || ch === '$'); + }, + + isExpOperator: function(ch) { + return (ch === '-' || ch === '+' || this.isNumber(ch)); + }, + + throwError: function(error, start, end) { + end = end || this.index; + var colStr = (isDefined(start) + ? 's ' + start + '-' + this.index + ' [' + this.text.substring(start, end) + ']' + : ' ' + end); + throw $parseMinErr('lexerr', 'Lexer Error: {0} at column{1} in expression [{2}].', + error, colStr, this.text); + }, + + readNumber: function() { + var number = ''; + var start = this.index; + while (this.index < this.text.length) { + var ch = lowercase(this.text.charAt(this.index)); + if (ch == '.' || this.isNumber(ch)) { + number += ch; + } else { + var peekCh = this.peek(); + if (ch == 'e' && this.isExpOperator(peekCh)) { + number += ch; + } else if (this.isExpOperator(ch) && + peekCh && this.isNumber(peekCh) && + number.charAt(number.length - 1) == 'e') { + number += ch; + } else if (this.isExpOperator(ch) && + (!peekCh || !this.isNumber(peekCh)) && + number.charAt(number.length - 1) == 'e') { + this.throwError('Invalid exponent'); + } else { + break; + } + } + this.index++; + } + number = 1 * number; + this.tokens.push({ + index: start, + text: number, + literal: true, + constant: true, + fn: function() { return number; } + }); + }, + + readIdent: function() { + var parser = this; + + var ident = ''; + var start = this.index; + + var lastDot, peekIndex, methodName, ch; + + while (this.index < this.text.length) { + ch = this.text.charAt(this.index); + if (ch === '.' || this.isIdent(ch) || this.isNumber(ch)) { + if (ch === '.') lastDot = this.index; + ident += ch; + } else { + break; + } + this.index++; + } + + //check if this is not a method invocation and if it is back out to last dot + if (lastDot) { + peekIndex = this.index; + while (peekIndex < this.text.length) { + ch = this.text.charAt(peekIndex); + if (ch === '(') { + methodName = ident.substr(lastDot - start + 1); + ident = ident.substr(0, lastDot - start); + this.index = peekIndex; + break; + } + if (this.isWhitespace(ch)) { + peekIndex++; + } else { + break; + } + } + } + + + var token = { + index: start, + text: ident + }; + + // OPERATORS is our own object so we don't need to use special hasOwnPropertyFn + if (OPERATORS.hasOwnProperty(ident)) { + token.fn = OPERATORS[ident]; + token.literal = true; + token.constant = true; + } else { + var getter = getterFn(ident, this.options, this.text); + token.fn = extend(function(self, locals) { + return (getter(self, locals)); + }, { + assign: function(self, value) { + return setter(self, ident, value, parser.text, parser.options); + } + }); + } + + this.tokens.push(token); + + if (methodName) { + this.tokens.push({ + index:lastDot, + text: '.' + }); + this.tokens.push({ + index: lastDot + 1, + text: methodName + }); + } + }, + + readString: function(quote) { + var start = this.index; + this.index++; + var string = ''; + var rawString = quote; + var escape = false; + while (this.index < this.text.length) { + var ch = this.text.charAt(this.index); + rawString += ch; + if (escape) { + if (ch === 'u') { + var hex = this.text.substring(this.index + 1, this.index + 5); + if (!hex.match(/[\da-f]{4}/i)) + this.throwError('Invalid unicode escape [\\u' + hex + ']'); + this.index += 4; + string += String.fromCharCode(parseInt(hex, 16)); + } else { + var rep = ESCAPE[ch]; + string = string + (rep || ch); + } + escape = false; + } else if (ch === '\\') { + escape = true; + } else if (ch === quote) { + this.index++; + this.tokens.push({ + index: start, + text: rawString, + string: string, + literal: true, + constant: true, + fn: function() { return string; } + }); + return; + } else { + string += ch; + } + this.index++; + } + this.throwError('Unterminated quote', start); + } +}; + + +/** + * @constructor + */ +var Parser = function (lexer, $filter, options) { + this.lexer = lexer; + this.$filter = $filter; + this.options = options; +}; + +Parser.ZERO = extend(function () { + return 0; +}, { + constant: true +}); + +Parser.prototype = { + constructor: Parser, + + parse: function (text) { + this.text = text; + + this.tokens = this.lexer.lex(text); + + var value = this.statements(); + + if (this.tokens.length !== 0) { + this.throwError('is an unexpected token', this.tokens[0]); + } + + value.literal = !!value.literal; + value.constant = !!value.constant; + + return value; + }, + + primary: function () { + var primary; + if (this.expect('(')) { + primary = this.filterChain(); + this.consume(')'); + } else if (this.expect('[')) { + primary = this.arrayDeclaration(); + } else if (this.expect('{')) { + primary = this.object(); + } else { + var token = this.expect(); + primary = token.fn; + if (!primary) { + this.throwError('not a primary expression', token); + } + primary.literal = !!token.literal; + primary.constant = !!token.constant; + } + + var next, context; + while ((next = this.expect('(', '[', '.'))) { + if (next.text === '(') { + primary = this.functionCall(primary, context); + context = null; + } else if (next.text === '[') { + context = primary; + primary = this.objectIndex(primary); + } else if (next.text === '.') { + context = primary; + primary = this.fieldAccess(primary); + } else { + this.throwError('IMPOSSIBLE'); + } + } + return primary; + }, + + throwError: function(msg, token) { + throw $parseMinErr('syntax', + 'Syntax Error: Token \'{0}\' {1} at column {2} of the expression [{3}] starting at [{4}].', + token.text, msg, (token.index + 1), this.text, this.text.substring(token.index)); + }, + + peekToken: function() { + if (this.tokens.length === 0) + throw $parseMinErr('ueoe', 'Unexpected end of expression: {0}', this.text); + return this.tokens[0]; + }, + + peek: function(e1, e2, e3, e4) { + if (this.tokens.length > 0) { + var token = this.tokens[0]; + var t = token.text; + if (t === e1 || t === e2 || t === e3 || t === e4 || + (!e1 && !e2 && !e3 && !e4)) { + return token; + } + } + return false; + }, + + expect: function(e1, e2, e3, e4){ + var token = this.peek(e1, e2, e3, e4); + if (token) { + this.tokens.shift(); + return token; + } + return false; + }, + + consume: function(e1){ + if (!this.expect(e1)) { + this.throwError('is unexpected, expecting [' + e1 + ']', this.peek()); + } + }, + + unaryFn: function(fn, right) { + return extend(function(self, locals) { + return fn(self, locals, right); + }, { + constant:right.constant + }); + }, + + ternaryFn: function(left, middle, right){ + return extend(function(self, locals){ + return left(self, locals) ? middle(self, locals) : right(self, locals); + }, { + constant: left.constant && middle.constant && right.constant + }); + }, + + binaryFn: function(left, fn, right) { + return extend(function(self, locals) { + return fn(self, locals, left, right); + }, { + constant:left.constant && right.constant + }); + }, + + statements: function() { + var statements = []; + while (true) { + if (this.tokens.length > 0 && !this.peek('}', ')', ';', ']')) + statements.push(this.filterChain()); + if (!this.expect(';')) { + // optimize for the common case where there is only one statement. + // TODO(size): maybe we should not support multiple statements? + return (statements.length === 1) + ? statements[0] + : function(self, locals) { + var value; + for (var i = 0; i < statements.length; i++) { + var statement = statements[i]; + if (statement) { + value = statement(self, locals); + } + } + return value; + }; + } + } + }, + + filterChain: function() { + var left = this.expression(); + var token; + while (true) { + if ((token = this.expect('|'))) { + left = this.binaryFn(left, token.fn, this.filter()); + } else { + return left; + } + } + }, + + filter: function() { + var token = this.expect(); + var fn = this.$filter(token.text); + var argsFn = []; + while (true) { + if ((token = this.expect(':'))) { + argsFn.push(this.expression()); + } else { + var fnInvoke = function(self, locals, input) { + var args = [input]; + for (var i = 0; i < argsFn.length; i++) { + args.push(argsFn[i](self, locals)); + } + return fn.apply(self, args); + }; + return function() { + return fnInvoke; + }; + } + } + }, + + expression: function() { + return this.assignment(); + }, + + assignment: function() { + var left = this.ternary(); + var right; + var token; + if ((token = this.expect('='))) { + if (!left.assign) { + this.throwError('implies assignment but [' + + this.text.substring(0, token.index) + '] can not be assigned to', token); + } + right = this.ternary(); + return function(scope, locals) { + return left.assign(scope, right(scope, locals), locals); + }; + } + return left; + }, + + ternary: function() { + var left = this.logicalOR(); + var middle; + var token; + if ((token = this.expect('?'))) { + middle = this.assignment(); + if ((token = this.expect(':'))) { + return this.ternaryFn(left, middle, this.assignment()); + } else { + this.throwError('expected :', token); + } + } else { + return left; + } + }, + + logicalOR: function() { + var left = this.logicalAND(); + var token; + while (true) { + if ((token = this.expect('||'))) { + left = this.binaryFn(left, token.fn, this.logicalAND()); + } else { + return left; + } + } + }, + + logicalAND: function() { + var left = this.equality(); + var token; + if ((token = this.expect('&&'))) { + left = this.binaryFn(left, token.fn, this.logicalAND()); + } + return left; + }, + + equality: function() { + var left = this.relational(); + var token; + if ((token = this.expect('==','!=','===','!=='))) { + left = this.binaryFn(left, token.fn, this.equality()); + } + return left; + }, + + relational: function() { + var left = this.additive(); + var token; + if ((token = this.expect('<', '>', '<=', '>='))) { + left = this.binaryFn(left, token.fn, this.relational()); + } + return left; + }, + + additive: function() { + var left = this.multiplicative(); + var token; + while ((token = this.expect('+','-'))) { + left = this.binaryFn(left, token.fn, this.multiplicative()); + } + return left; + }, + + multiplicative: function() { + var left = this.unary(); + var token; + while ((token = this.expect('*','/','%'))) { + left = this.binaryFn(left, token.fn, this.unary()); + } + return left; + }, + + unary: function() { + var token; + if (this.expect('+')) { + return this.primary(); + } else if ((token = this.expect('-'))) { + return this.binaryFn(Parser.ZERO, token.fn, this.unary()); + } else if ((token = this.expect('!'))) { + return this.unaryFn(token.fn, this.unary()); + } else { + return this.primary(); + } + }, + + fieldAccess: function(object) { + var parser = this; + var field = this.expect().text; + var getter = getterFn(field, this.options, this.text); + + return extend(function(scope, locals, self) { + return getter(self || object(scope, locals)); + }, { + assign: function(scope, value, locals) { + var o = object(scope, locals); + if (!o) object.assign(scope, o = {}); + return setter(o, field, value, parser.text, parser.options); + } + }); + }, + + objectIndex: function(obj) { + var parser = this; + + var indexFn = this.expression(); + this.consume(']'); + + return extend(function(self, locals) { + var o = obj(self, locals), + i = indexFn(self, locals), + v, p; + + ensureSafeMemberName(i, parser.text); + if (!o) return undefined; + v = ensureSafeObject(o[i], parser.text); + if (v && v.then && parser.options.unwrapPromises) { + p = v; + if (!('$$v' in v)) { + p.$$v = undefined; + p.then(function(val) { p.$$v = val; }); + } + v = v.$$v; + } + return v; + }, { + assign: function(self, value, locals) { + var key = ensureSafeMemberName(indexFn(self, locals), parser.text); + // prevent overwriting of Function.constructor which would break ensureSafeObject check + var o = ensureSafeObject(obj(self, locals), parser.text); + if (!o) obj.assign(self, o = {}); + return o[key] = value; + } + }); + }, + + functionCall: function(fn, contextGetter) { + var argsFn = []; + if (this.peekToken().text !== ')') { + do { + argsFn.push(this.expression()); + } while (this.expect(',')); + } + this.consume(')'); + + var parser = this; + + return function(scope, locals) { + var args = []; + var context = contextGetter ? contextGetter(scope, locals) : scope; + + for (var i = 0; i < argsFn.length; i++) { + args.push(ensureSafeObject(argsFn[i](scope, locals), parser.text)); + } + var fnPtr = fn(scope, locals, context) || noop; + + ensureSafeObject(context, parser.text); + ensureSafeFunction(fnPtr, parser.text); + + // IE stupidity! (IE doesn't have apply for some native functions) + var v = fnPtr.apply + ? fnPtr.apply(context, args) + : fnPtr(args[0], args[1], args[2], args[3], args[4]); + + return ensureSafeObject(v, parser.text); + }; + }, + + // This is used with json array declaration + arrayDeclaration: function () { + var elementFns = []; + var allConstant = true; + if (this.peekToken().text !== ']') { + do { + if (this.peek(']')) { + // Support trailing commas per ES5.1. + break; + } + var elementFn = this.expression(); + elementFns.push(elementFn); + if (!elementFn.constant) { + allConstant = false; + } + } while (this.expect(',')); + } + this.consume(']'); + + return extend(function(self, locals) { + var array = []; + for (var i = 0; i < elementFns.length; i++) { + array.push(elementFns[i](self, locals)); + } + return array; + }, { + literal: true, + constant: allConstant + }); + }, + + object: function () { + var keyValues = []; + var allConstant = true; + if (this.peekToken().text !== '}') { + do { + if (this.peek('}')) { + // Support trailing commas per ES5.1. + break; + } + var token = this.expect(), + key = token.string || token.text; + this.consume(':'); + var value = this.expression(); + keyValues.push({key: key, value: value}); + if (!value.constant) { + allConstant = false; + } + } while (this.expect(',')); + } + this.consume('}'); + + return extend(function(self, locals) { + var object = {}; + for (var i = 0; i < keyValues.length; i++) { + var keyValue = keyValues[i]; + object[keyValue.key] = keyValue.value(self, locals); + } + return object; + }, { + literal: true, + constant: allConstant + }); + } +}; + + +////////////////////////////////////////////////// +// Parser helper functions +////////////////////////////////////////////////// + +function setter(obj, path, setValue, fullExp, options) { + ensureSafeObject(obj, fullExp); + + //needed? + options = options || {}; + + var element = path.split('.'), key; + for (var i = 0; element.length > 1; i++) { + key = ensureSafeMemberName(element.shift(), fullExp); + var propertyObj = ensureSafeObject(obj[key], fullExp); + if (!propertyObj) { + propertyObj = {}; + obj[key] = propertyObj; + } + obj = propertyObj; + if (obj.then && options.unwrapPromises) { + promiseWarning(fullExp); + if (!("$$v" in obj)) { + (function(promise) { + promise.then(function(val) { promise.$$v = val; }); } + )(obj); + } + if (obj.$$v === undefined) { + obj.$$v = {}; + } + obj = obj.$$v; + } + } + key = ensureSafeMemberName(element.shift(), fullExp); + ensureSafeObject(obj[key], fullExp); + obj[key] = setValue; + return setValue; +} + +var getterFnCache = {}; + +/** + * Implementation of the "Black Hole" variant from: + * - http://jsperf.com/angularjs-parse-getter/4 + * - http://jsperf.com/path-evaluation-simplified/7 + */ +function cspSafeGetterFn(key0, key1, key2, key3, key4, fullExp, options) { + ensureSafeMemberName(key0, fullExp); + ensureSafeMemberName(key1, fullExp); + ensureSafeMemberName(key2, fullExp); + ensureSafeMemberName(key3, fullExp); + ensureSafeMemberName(key4, fullExp); + + return !options.unwrapPromises + ? function cspSafeGetter(scope, locals) { + var pathVal = (locals && locals.hasOwnProperty(key0)) ? locals : scope; + + if (pathVal == null) return pathVal; + pathVal = pathVal[key0]; + + if (!key1) return pathVal; + if (pathVal == null) return undefined; + pathVal = pathVal[key1]; + + if (!key2) return pathVal; + if (pathVal == null) return undefined; + pathVal = pathVal[key2]; + + if (!key3) return pathVal; + if (pathVal == null) return undefined; + pathVal = pathVal[key3]; + + if (!key4) return pathVal; + if (pathVal == null) return undefined; + pathVal = pathVal[key4]; + + return pathVal; + } + : function cspSafePromiseEnabledGetter(scope, locals) { + var pathVal = (locals && locals.hasOwnProperty(key0)) ? locals : scope, + promise; + + if (pathVal == null) return pathVal; + + pathVal = pathVal[key0]; + if (pathVal && pathVal.then) { + promiseWarning(fullExp); + if (!("$$v" in pathVal)) { + promise = pathVal; + promise.$$v = undefined; + promise.then(function(val) { promise.$$v = val; }); + } + pathVal = pathVal.$$v; + } + + if (!key1) return pathVal; + if (pathVal == null) return undefined; + pathVal = pathVal[key1]; + if (pathVal && pathVal.then) { + promiseWarning(fullExp); + if (!("$$v" in pathVal)) { + promise = pathVal; + promise.$$v = undefined; + promise.then(function(val) { promise.$$v = val; }); + } + pathVal = pathVal.$$v; + } + + if (!key2) return pathVal; + if (pathVal == null) return undefined; + pathVal = pathVal[key2]; + if (pathVal && pathVal.then) { + promiseWarning(fullExp); + if (!("$$v" in pathVal)) { + promise = pathVal; + promise.$$v = undefined; + promise.then(function(val) { promise.$$v = val; }); + } + pathVal = pathVal.$$v; + } + + if (!key3) return pathVal; + if (pathVal == null) return undefined; + pathVal = pathVal[key3]; + if (pathVal && pathVal.then) { + promiseWarning(fullExp); + if (!("$$v" in pathVal)) { + promise = pathVal; + promise.$$v = undefined; + promise.then(function(val) { promise.$$v = val; }); + } + pathVal = pathVal.$$v; + } + + if (!key4) return pathVal; + if (pathVal == null) return undefined; + pathVal = pathVal[key4]; + if (pathVal && pathVal.then) { + promiseWarning(fullExp); + if (!("$$v" in pathVal)) { + promise = pathVal; + promise.$$v = undefined; + promise.then(function(val) { promise.$$v = val; }); + } + pathVal = pathVal.$$v; + } + return pathVal; + }; +} + +function getterFn(path, options, fullExp) { + // Check whether the cache has this getter already. + // We can use hasOwnProperty directly on the cache because we ensure, + // see below, that the cache never stores a path called 'hasOwnProperty' + if (getterFnCache.hasOwnProperty(path)) { + return getterFnCache[path]; + } + + var pathKeys = path.split('.'), + pathKeysLength = pathKeys.length, + fn; + + // http://jsperf.com/angularjs-parse-getter/6 + if (options.csp) { + if (pathKeysLength < 6) { + fn = cspSafeGetterFn(pathKeys[0], pathKeys[1], pathKeys[2], pathKeys[3], pathKeys[4], fullExp, + options); + } else { + fn = function(scope, locals) { + var i = 0, val; + do { + val = cspSafeGetterFn(pathKeys[i++], pathKeys[i++], pathKeys[i++], pathKeys[i++], + pathKeys[i++], fullExp, options)(scope, locals); + + locals = undefined; // clear after first iteration + scope = val; + } while (i < pathKeysLength); + return val; + }; + } + } else { + var code = 'var p;\n'; + forEach(pathKeys, function(key, index) { + ensureSafeMemberName(key, fullExp); + code += 'if(s == null) return undefined;\n' + + 's='+ (index + // we simply dereference 's' on any .dot notation + ? 's' + // but if we are first then we check locals first, and if so read it first + : '((k&&k.hasOwnProperty("' + key + '"))?k:s)') + '["' + key + '"]' + ';\n' + + (options.unwrapPromises + ? 'if (s && s.then) {\n' + + ' pw("' + fullExp.replace(/(["\r\n])/g, '\\$1') + '");\n' + + ' if (!("$$v" in s)) {\n' + + ' p=s;\n' + + ' p.$$v = undefined;\n' + + ' p.then(function(v) {p.$$v=v;});\n' + + '}\n' + + ' s=s.$$v\n' + + '}\n' + : ''); + }); + code += 'return s;'; + + /* jshint -W054 */ + var evaledFnGetter = new Function('s', 'k', 'pw', code); // s=scope, k=locals, pw=promiseWarning + /* jshint +W054 */ + evaledFnGetter.toString = valueFn(code); + fn = options.unwrapPromises ? function(scope, locals) { + return evaledFnGetter(scope, locals, promiseWarning); + } : evaledFnGetter; + } + + // Only cache the value if it's not going to mess up the cache object + // This is more performant that using Object.prototype.hasOwnProperty.call + if (path !== 'hasOwnProperty') { + getterFnCache[path] = fn; + } + return fn; +} + +/////////////////////////////////// + +/** + * @ngdoc service + * @name $parse + * @kind function + * + * @description + * + * Converts Angular {@link guide/expression expression} into a function. + * + * ```js + * var getter = $parse('user.name'); + * var setter = getter.assign; + * var context = {user:{name:'angular'}}; + * var locals = {user:{name:'local'}}; + * + * expect(getter(context)).toEqual('angular'); + * setter(context, 'newValue'); + * expect(context.user.name).toEqual('newValue'); + * expect(getter(context, locals)).toEqual('local'); + * ``` + * + * + * @param {string} expression String expression to compile. + * @returns {function(context, locals)} a function which represents the compiled expression: + * + * * `context` – `{object}` – an object against which any expressions embedded in the strings + * are evaluated against (typically a scope object). + * * `locals` – `{object=}` – local variables context object, useful for overriding values in + * `context`. + * + * The returned function also has the following properties: + * * `literal` – `{boolean}` – whether the expression's top-level node is a JavaScript + * literal. + * * `constant` – `{boolean}` – whether the expression is made entirely of JavaScript + * constant literals. + * * `assign` – `{?function(context, value)}` – if the expression is assignable, this will be + * set to a function to change its value on the given context. + * + */ + + +/** + * @ngdoc provider + * @name $parseProvider + * @kind function + * + * @description + * `$parseProvider` can be used for configuring the default behavior of the {@link ng.$parse $parse} + * service. + */ +function $ParseProvider() { + var cache = {}; + + var $parseOptions = { + csp: false, + unwrapPromises: false, + logPromiseWarnings: true + }; + + + /** + * @deprecated Promise unwrapping via $parse is deprecated and will be removed in the future. + * + * @ngdoc method + * @name $parseProvider#unwrapPromises + * @description + * + * **This feature is deprecated, see deprecation notes below for more info** + * + * If set to true (default is false), $parse will unwrap promises automatically when a promise is + * found at any part of the expression. In other words, if set to true, the expression will always + * result in a non-promise value. + * + * While the promise is unresolved, it's treated as undefined, but once resolved and fulfilled, + * the fulfillment value is used in place of the promise while evaluating the expression. + * + * **Deprecation notice** + * + * This is a feature that didn't prove to be wildly useful or popular, primarily because of the + * dichotomy between data access in templates (accessed as raw values) and controller code + * (accessed as promises). + * + * In most code we ended up resolving promises manually in controllers anyway and thus unifying + * the model access there. + * + * Other downsides of automatic promise unwrapping: + * + * - when building components it's often desirable to receive the raw promises + * - adds complexity and slows down expression evaluation + * - makes expression code pre-generation unattractive due to the amount of code that needs to be + * generated + * - makes IDE auto-completion and tool support hard + * + * **Warning Logs** + * + * If the unwrapping is enabled, Angular will log a warning about each expression that unwraps a + * promise (to reduce the noise, each expression is logged only once). To disable this logging use + * `$parseProvider.logPromiseWarnings(false)` api. + * + * + * @param {boolean=} value New value. + * @returns {boolean|self} Returns the current setting when used as getter and self if used as + * setter. + */ + this.unwrapPromises = function(value) { + if (isDefined(value)) { + $parseOptions.unwrapPromises = !!value; + return this; + } else { + return $parseOptions.unwrapPromises; + } + }; + + + /** + * @deprecated Promise unwrapping via $parse is deprecated and will be removed in the future. + * + * @ngdoc method + * @name $parseProvider#logPromiseWarnings + * @description + * + * Controls whether Angular should log a warning on any encounter of a promise in an expression. + * + * The default is set to `true`. + * + * This setting applies only if `$parseProvider.unwrapPromises` setting is set to true as well. + * + * @param {boolean=} value New value. + * @returns {boolean|self} Returns the current setting when used as getter and self if used as + * setter. + */ + this.logPromiseWarnings = function(value) { + if (isDefined(value)) { + $parseOptions.logPromiseWarnings = value; + return this; + } else { + return $parseOptions.logPromiseWarnings; + } + }; + + + this.$get = ['$filter', '$sniffer', '$log', function($filter, $sniffer, $log) { + $parseOptions.csp = $sniffer.csp; + + promiseWarning = function promiseWarningFn(fullExp) { + if (!$parseOptions.logPromiseWarnings || promiseWarningCache.hasOwnProperty(fullExp)) return; + promiseWarningCache[fullExp] = true; + $log.warn('[$parse] Promise found in the expression `' + fullExp + '`. ' + + 'Automatic unwrapping of promises in Angular expressions is deprecated.'); + }; + + return function(exp) { + var parsedExpression; + + switch (typeof exp) { + case 'string': + + if (cache.hasOwnProperty(exp)) { + return cache[exp]; + } + + var lexer = new Lexer($parseOptions); + var parser = new Parser(lexer, $filter, $parseOptions); + parsedExpression = parser.parse(exp); + + if (exp !== 'hasOwnProperty') { + // Only cache the value if it's not going to mess up the cache object + // This is more performant that using Object.prototype.hasOwnProperty.call + cache[exp] = parsedExpression; + } + + return parsedExpression; + + case 'function': + return exp; + + default: + return noop; + } + }; + }]; +} + +/** + * @ngdoc service + * @name $q + * @requires $rootScope + * + * @description + * A promise/deferred implementation inspired by [Kris Kowal's Q](https://github.com/kriskowal/q). + * + * [The CommonJS Promise proposal](http://wiki.commonjs.org/wiki/Promises) describes a promise as an + * interface for interacting with an object that represents the result of an action that is + * performed asynchronously, and may or may not be finished at any given point in time. + * + * From the perspective of dealing with error handling, deferred and promise APIs are to + * asynchronous programming what `try`, `catch` and `throw` keywords are to synchronous programming. + * + * ```js + * // for the purpose of this example let's assume that variables `$q`, `scope` and `okToGreet` + * // are available in the current lexical scope (they could have been injected or passed in). + * + * function asyncGreet(name) { + * var deferred = $q.defer(); + * + * setTimeout(function() { + * deferred.notify('About to greet ' + name + '.'); + * + * if (okToGreet(name)) { + * deferred.resolve('Hello, ' + name + '!'); + * } else { + * deferred.reject('Greeting ' + name + ' is not allowed.'); + * } + * }, 1000); + * + * return deferred.promise; + * } + * + * var promise = asyncGreet('Robin Hood'); + * promise.then(function(greeting) { + * alert('Success: ' + greeting); + * }, function(reason) { + * alert('Failed: ' + reason); + * }, function(update) { + * alert('Got notification: ' + update); + * }); + * ``` + * + * At first it might not be obvious why this extra complexity is worth the trouble. The payoff + * comes in the way of guarantees that promise and deferred APIs make, see + * https://github.com/kriskowal/uncommonjs/blob/master/promises/specification.md. + * + * Additionally the promise api allows for composition that is very hard to do with the + * traditional callback ([CPS](http://en.wikipedia.org/wiki/Continuation-passing_style)) approach. + * For more on this please see the [Q documentation](https://github.com/kriskowal/q) especially the + * section on serial or parallel joining of promises. + * + * + * # The Deferred API + * + * A new instance of deferred is constructed by calling `$q.defer()`. + * + * The purpose of the deferred object is to expose the associated Promise instance as well as APIs + * that can be used for signaling the successful or unsuccessful completion, as well as the status + * of the task. + * + * **Methods** + * + * - `resolve(value)` – resolves the derived promise with the `value`. If the value is a rejection + * constructed via `$q.reject`, the promise will be rejected instead. + * - `reject(reason)` – rejects the derived promise with the `reason`. This is equivalent to + * resolving it with a rejection constructed via `$q.reject`. + * - `notify(value)` - provides updates on the status of the promise's execution. This may be called + * multiple times before the promise is either resolved or rejected. + * + * **Properties** + * + * - promise – `{Promise}` – promise object associated with this deferred. + * + * + * # The Promise API + * + * A new promise instance is created when a deferred instance is created and can be retrieved by + * calling `deferred.promise`. + * + * The purpose of the promise object is to allow for interested parties to get access to the result + * of the deferred task when it completes. + * + * **Methods** + * + * - `then(successCallback, errorCallback, notifyCallback)` – regardless of when the promise was or + * will be resolved or rejected, `then` calls one of the success or error callbacks asynchronously + * as soon as the result is available. The callbacks are called with a single argument: the result + * or rejection reason. Additionally, the notify callback may be called zero or more times to + * provide a progress indication, before the promise is resolved or rejected. + * + * This method *returns a new promise* which is resolved or rejected via the return value of the + * `successCallback`, `errorCallback`. It also notifies via the return value of the + * `notifyCallback` method. The promise can not be resolved or rejected from the notifyCallback + * method. + * + * - `catch(errorCallback)` – shorthand for `promise.then(null, errorCallback)` + * + * - `finally(callback)` – allows you to observe either the fulfillment or rejection of a promise, + * but to do so without modifying the final value. This is useful to release resources or do some + * clean-up that needs to be done whether the promise was rejected or resolved. See the [full + * specification](https://github.com/kriskowal/q/wiki/API-Reference#promisefinallycallback) for + * more information. + * + * Because `finally` is a reserved word in JavaScript and reserved keywords are not supported as + * property names by ES3, you'll need to invoke the method like `promise['finally'](callback)` to + * make your code IE8 and Android 2.x compatible. + * + * # Chaining promises + * + * Because calling the `then` method of a promise returns a new derived promise, it is easily + * possible to create a chain of promises: + * + * ```js + * promiseB = promiseA.then(function(result) { + * return result + 1; + * }); + * + * // promiseB will be resolved immediately after promiseA is resolved and its value + * // will be the result of promiseA incremented by 1 + * ``` + * + * It is possible to create chains of any length and since a promise can be resolved with another + * promise (which will defer its resolution further), it is possible to pause/defer resolution of + * the promises at any point in the chain. This makes it possible to implement powerful APIs like + * $http's response interceptors. + * + * + * # Differences between Kris Kowal's Q and $q + * + * There are two main differences: + * + * - $q is integrated with the {@link ng.$rootScope.Scope} Scope model observation + * mechanism in angular, which means faster propagation of resolution or rejection into your + * models and avoiding unnecessary browser repaints, which would result in flickering UI. + * - Q has many more features than $q, but that comes at a cost of bytes. $q is tiny, but contains + * all the important functionality needed for common async tasks. + * + * # Testing + * + * ```js + * it('should simulate promise', inject(function($q, $rootScope) { + * var deferred = $q.defer(); + * var promise = deferred.promise; + * var resolvedValue; + * + * promise.then(function(value) { resolvedValue = value; }); + * expect(resolvedValue).toBeUndefined(); + * + * // Simulate resolving of promise + * deferred.resolve(123); + * // Note that the 'then' function does not get called synchronously. + * // This is because we want the promise API to always be async, whether or not + * // it got called synchronously or asynchronously. + * expect(resolvedValue).toBeUndefined(); + * + * // Propagate promise resolution to 'then' functions using $apply(). + * $rootScope.$apply(); + * expect(resolvedValue).toEqual(123); + * })); + * ``` + */ +function $QProvider() { + + this.$get = ['$rootScope', '$exceptionHandler', function($rootScope, $exceptionHandler) { + return qFactory(function(callback) { + $rootScope.$evalAsync(callback); + }, $exceptionHandler); + }]; +} + + +/** + * Constructs a promise manager. + * + * @param {function(Function)} nextTick Function for executing functions in the next turn. + * @param {function(...*)} exceptionHandler Function into which unexpected exceptions are passed for + * debugging purposes. + * @returns {object} Promise manager. + */ +function qFactory(nextTick, exceptionHandler) { + + /** + * @ngdoc method + * @name $q#defer + * @kind function + * + * @description + * Creates a `Deferred` object which represents a task which will finish in the future. + * + * @returns {Deferred} Returns a new instance of deferred. + */ + var defer = function() { + var pending = [], + value, deferred; + + deferred = { + + resolve: function(val) { + if (pending) { + var callbacks = pending; + pending = undefined; + value = ref(val); + + if (callbacks.length) { + nextTick(function() { + var callback; + for (var i = 0, ii = callbacks.length; i < ii; i++) { + callback = callbacks[i]; + value.then(callback[0], callback[1], callback[2]); + } + }); + } + } + }, + + + reject: function(reason) { + deferred.resolve(createInternalRejectedPromise(reason)); + }, + + + notify: function(progress) { + if (pending) { + var callbacks = pending; + + if (pending.length) { + nextTick(function() { + var callback; + for (var i = 0, ii = callbacks.length; i < ii; i++) { + callback = callbacks[i]; + callback[2](progress); + } + }); + } + } + }, + + + promise: { + then: function(callback, errback, progressback) { + var result = defer(); + + var wrappedCallback = function(value) { + try { + result.resolve((isFunction(callback) ? callback : defaultCallback)(value)); + } catch(e) { + result.reject(e); + exceptionHandler(e); + } + }; + + var wrappedErrback = function(reason) { + try { + result.resolve((isFunction(errback) ? errback : defaultErrback)(reason)); + } catch(e) { + result.reject(e); + exceptionHandler(e); + } + }; + + var wrappedProgressback = function(progress) { + try { + result.notify((isFunction(progressback) ? progressback : defaultCallback)(progress)); + } catch(e) { + exceptionHandler(e); + } + }; + + if (pending) { + pending.push([wrappedCallback, wrappedErrback, wrappedProgressback]); + } else { + value.then(wrappedCallback, wrappedErrback, wrappedProgressback); + } + + return result.promise; + }, + + "catch": function(callback) { + return this.then(null, callback); + }, + + "finally": function(callback) { + + function makePromise(value, resolved) { + var result = defer(); + if (resolved) { + result.resolve(value); + } else { + result.reject(value); + } + return result.promise; + } + + function handleCallback(value, isResolved) { + var callbackOutput = null; + try { + callbackOutput = (callback ||defaultCallback)(); + } catch(e) { + return makePromise(e, false); + } + if (isPromiseLike(callbackOutput)) { + return callbackOutput.then(function() { + return makePromise(value, isResolved); + }, function(error) { + return makePromise(error, false); + }); + } else { + return makePromise(value, isResolved); + } + } + + return this.then(function(value) { + return handleCallback(value, true); + }, function(error) { + return handleCallback(error, false); + }); + } + } + }; + + return deferred; + }; + + + var ref = function(value) { + if (isPromiseLike(value)) return value; + return { + then: function(callback) { + var result = defer(); + nextTick(function() { + result.resolve(callback(value)); + }); + return result.promise; + } + }; + }; + + + /** + * @ngdoc method + * @name $q#reject + * @kind function + * + * @description + * Creates a promise that is resolved as rejected with the specified `reason`. This api should be + * used to forward rejection in a chain of promises. If you are dealing with the last promise in + * a promise chain, you don't need to worry about it. + * + * When comparing deferreds/promises to the familiar behavior of try/catch/throw, think of + * `reject` as the `throw` keyword in JavaScript. This also means that if you "catch" an error via + * a promise error callback and you want to forward the error to the promise derived from the + * current promise, you have to "rethrow" the error by returning a rejection constructed via + * `reject`. + * + * ```js + * promiseB = promiseA.then(function(result) { + * // success: do something and resolve promiseB + * // with the old or a new result + * return result; + * }, function(reason) { + * // error: handle the error if possible and + * // resolve promiseB with newPromiseOrValue, + * // otherwise forward the rejection to promiseB + * if (canHandle(reason)) { + * // handle the error and recover + * return newPromiseOrValue; + * } + * return $q.reject(reason); + * }); + * ``` + * + * @param {*} reason Constant, message, exception or an object representing the rejection reason. + * @returns {Promise} Returns a promise that was already resolved as rejected with the `reason`. + */ + var reject = function(reason) { + var result = defer(); + result.reject(reason); + return result.promise; + }; + + var createInternalRejectedPromise = function(reason) { + return { + then: function(callback, errback) { + var result = defer(); + nextTick(function() { + try { + result.resolve((isFunction(errback) ? errback : defaultErrback)(reason)); + } catch(e) { + result.reject(e); + exceptionHandler(e); + } + }); + return result.promise; + } + }; + }; + + + /** + * @ngdoc method + * @name $q#when + * @kind function + * + * @description + * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. + * This is useful when you are dealing with an object that might or might not be a promise, or if + * the promise comes from a source that can't be trusted. + * + * @param {*} value Value or a promise + * @returns {Promise} Returns a promise of the passed value or promise + */ + var when = function(value, callback, errback, progressback) { + var result = defer(), + done; + + var wrappedCallback = function(value) { + try { + return (isFunction(callback) ? callback : defaultCallback)(value); + } catch (e) { + exceptionHandler(e); + return reject(e); + } + }; + + var wrappedErrback = function(reason) { + try { + return (isFunction(errback) ? errback : defaultErrback)(reason); + } catch (e) { + exceptionHandler(e); + return reject(e); + } + }; + + var wrappedProgressback = function(progress) { + try { + return (isFunction(progressback) ? progressback : defaultCallback)(progress); + } catch (e) { + exceptionHandler(e); + } + }; + + nextTick(function() { + ref(value).then(function(value) { + if (done) return; + done = true; + result.resolve(ref(value).then(wrappedCallback, wrappedErrback, wrappedProgressback)); + }, function(reason) { + if (done) return; + done = true; + result.resolve(wrappedErrback(reason)); + }, function(progress) { + if (done) return; + result.notify(wrappedProgressback(progress)); + }); + }); + + return result.promise; + }; + + + function defaultCallback(value) { + return value; + } + + + function defaultErrback(reason) { + return reject(reason); + } + + + /** + * @ngdoc method + * @name $q#all + * @kind function + * + * @description + * Combines multiple promises into a single promise that is resolved when all of the input + * promises are resolved. + * + * @param {Array.|Object.} promises An array or hash of promises. + * @returns {Promise} Returns a single promise that will be resolved with an array/hash of values, + * each value corresponding to the promise at the same index/key in the `promises` array/hash. + * If any of the promises is resolved with a rejection, this resulting promise will be rejected + * with the same rejection value. + */ + function all(promises) { + var deferred = defer(), + counter = 0, + results = isArray(promises) ? [] : {}; + + forEach(promises, function(promise, key) { + counter++; + ref(promise).then(function(value) { + if (results.hasOwnProperty(key)) return; + results[key] = value; + if (!(--counter)) deferred.resolve(results); + }, function(reason) { + if (results.hasOwnProperty(key)) return; + deferred.reject(reason); + }); + }); + + if (counter === 0) { + deferred.resolve(results); + } + + return deferred.promise; + } + + return { + defer: defer, + reject: reject, + when: when, + all: all + }; +} + +function $$RAFProvider(){ //rAF + this.$get = ['$window', '$timeout', function($window, $timeout) { + var requestAnimationFrame = $window.requestAnimationFrame || + $window.webkitRequestAnimationFrame || + $window.mozRequestAnimationFrame; + + var cancelAnimationFrame = $window.cancelAnimationFrame || + $window.webkitCancelAnimationFrame || + $window.mozCancelAnimationFrame || + $window.webkitCancelRequestAnimationFrame; + + var rafSupported = !!requestAnimationFrame; + var raf = rafSupported + ? function(fn) { + var id = requestAnimationFrame(fn); + return function() { + cancelAnimationFrame(id); + }; + } + : function(fn) { + var timer = $timeout(fn, 16.66, false); // 1000 / 60 = 16.666 + return function() { + $timeout.cancel(timer); + }; + }; + + raf.supported = rafSupported; + + return raf; + }]; +} + +/** + * DESIGN NOTES + * + * The design decisions behind the scope are heavily favored for speed and memory consumption. + * + * The typical use of scope is to watch the expressions, which most of the time return the same + * value as last time so we optimize the operation. + * + * Closures construction is expensive in terms of speed as well as memory: + * - No closures, instead use prototypical inheritance for API + * - Internal state needs to be stored on scope directly, which means that private state is + * exposed as $$____ properties + * + * Loop operations are optimized by using while(count--) { ... } + * - this means that in order to keep the same order of execution as addition we have to add + * items to the array at the beginning (unshift) instead of at the end (push) + * + * Child scopes are created and removed often + * - Using an array would be slow since inserts in middle are expensive so we use linked list + * + * There are few watches then a lot of observers. This is why you don't want the observer to be + * implemented in the same way as watch. Watch requires return of initialization function which + * are expensive to construct. + */ + + +/** + * @ngdoc provider + * @name $rootScopeProvider + * @description + * + * Provider for the $rootScope service. + */ + +/** + * @ngdoc method + * @name $rootScopeProvider#digestTtl + * @description + * + * Sets the number of `$digest` iterations the scope should attempt to execute before giving up and + * assuming that the model is unstable. + * + * The current default is 10 iterations. + * + * In complex applications it's possible that the dependencies between `$watch`s will result in + * several digest iterations. However if an application needs more than the default 10 digest + * iterations for its model to stabilize then you should investigate what is causing the model to + * continuously change during the digest. + * + * Increasing the TTL could have performance implications, so you should not change it without + * proper justification. + * + * @param {number} limit The number of digest iterations. + */ + + +/** + * @ngdoc service + * @name $rootScope + * @description + * + * Every application has a single root {@link ng.$rootScope.Scope scope}. + * All other scopes are descendant scopes of the root scope. Scopes provide separation + * between the model and the view, via a mechanism for watching the model for changes. + * They also provide an event emission/broadcast and subscription facility. See the + * {@link guide/scope developer guide on scopes}. + */ +function $RootScopeProvider(){ + var TTL = 10; + var $rootScopeMinErr = minErr('$rootScope'); + var lastDirtyWatch = null; + + this.digestTtl = function(value) { + if (arguments.length) { + TTL = value; + } + return TTL; + }; + + this.$get = ['$injector', '$exceptionHandler', '$parse', '$browser', + function( $injector, $exceptionHandler, $parse, $browser) { + + /** + * @ngdoc type + * @name $rootScope.Scope + * + * @description + * A root scope can be retrieved using the {@link ng.$rootScope $rootScope} key from the + * {@link auto.$injector $injector}. Child scopes are created using the + * {@link ng.$rootScope.Scope#$new $new()} method. (Most scopes are created automatically when + * compiled HTML template is executed.) + * + * Here is a simple scope snippet to show how you can interact with the scope. + * ```html + * + * ``` + * + * # Inheritance + * A scope can inherit from a parent scope, as in this example: + * ```js + var parent = $rootScope; + var child = parent.$new(); + + parent.salutation = "Hello"; + child.name = "World"; + expect(child.salutation).toEqual('Hello'); + + child.salutation = "Welcome"; + expect(child.salutation).toEqual('Welcome'); + expect(parent.salutation).toEqual('Hello'); + * ``` + * + * + * @param {Object.=} providers Map of service factory which need to be + * provided for the current scope. Defaults to {@link ng}. + * @param {Object.=} instanceCache Provides pre-instantiated services which should + * append/override services provided by `providers`. This is handy + * when unit-testing and having the need to override a default + * service. + * @returns {Object} Newly created scope. + * + */ + function Scope() { + this.$id = nextUid(); + this.$$phase = this.$parent = this.$$watchers = + this.$$nextSibling = this.$$prevSibling = + this.$$childHead = this.$$childTail = null; + this['this'] = this.$root = this; + this.$$destroyed = false; + this.$$asyncQueue = []; + this.$$postDigestQueue = []; + this.$$listeners = {}; + this.$$listenerCount = {}; + this.$$isolateBindings = {}; + } + + /** + * @ngdoc property + * @name $rootScope.Scope#$id + * + * @description + * Unique scope ID (monotonically increasing) useful for debugging. + */ + + /** + * @ngdoc property + * @name $rootScope.Scope#$parent + * + * @description + * Reference to the parent scope. + */ + + /** + * @ngdoc property + * @name $rootScope.Scope#$root + * + * @description + * Reference to the root scope. + */ + + Scope.prototype = { + constructor: Scope, + /** + * @ngdoc method + * @name $rootScope.Scope#$new + * @kind function + * + * @description + * Creates a new child {@link ng.$rootScope.Scope scope}. + * + * The parent scope will propagate the {@link ng.$rootScope.Scope#$digest $digest()} event. + * The scope can be removed from the scope hierarchy using {@link ng.$rootScope.Scope#$destroy $destroy()}. + * + * {@link ng.$rootScope.Scope#$destroy $destroy()} must be called on a scope when it is + * desired for the scope and its child scopes to be permanently detached from the parent and + * thus stop participating in model change detection and listener notification by invoking. + * + * @param {boolean} isolate If true, then the scope does not prototypically inherit from the + * parent scope. The scope is isolated, as it can not see parent scope properties. + * When creating widgets, it is useful for the widget to not accidentally read parent + * state. + * + * @returns {Object} The newly created child scope. + * + */ + $new: function(isolate) { + var ChildScope, + child; + + if (isolate) { + child = new Scope(); + child.$root = this.$root; + // ensure that there is just one async queue per $rootScope and its children + child.$$asyncQueue = this.$$asyncQueue; + child.$$postDigestQueue = this.$$postDigestQueue; + } else { + // Only create a child scope class if somebody asks for one, + // but cache it to allow the VM to optimize lookups. + if (!this.$$childScopeClass) { + this.$$childScopeClass = function() { + this.$$watchers = this.$$nextSibling = + this.$$childHead = this.$$childTail = null; + this.$$listeners = {}; + this.$$listenerCount = {}; + this.$id = nextUid(); + this.$$childScopeClass = null; + }; + this.$$childScopeClass.prototype = this; + } + child = new this.$$childScopeClass(); + } + child['this'] = child; + child.$parent = this; + child.$$prevSibling = this.$$childTail; + if (this.$$childHead) { + this.$$childTail.$$nextSibling = child; + this.$$childTail = child; + } else { + this.$$childHead = this.$$childTail = child; + } + return child; + }, + + /** + * @ngdoc method + * @name $rootScope.Scope#$watch + * @kind function + * + * @description + * Registers a `listener` callback to be executed whenever the `watchExpression` changes. + * + * - The `watchExpression` is called on every call to {@link ng.$rootScope.Scope#$digest + * $digest()} and should return the value that will be watched. (Since + * {@link ng.$rootScope.Scope#$digest $digest()} reruns when it detects changes the + * `watchExpression` can execute multiple times per + * {@link ng.$rootScope.Scope#$digest $digest()} and should be idempotent.) + * - The `listener` is called only when the value from the current `watchExpression` and the + * previous call to `watchExpression` are not equal (with the exception of the initial run, + * see below). Inequality is determined according to reference inequality, + * [strict comparison](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Comparison_Operators) + * via the `!==` Javascript operator, unless `objectEquality == true` + * (see next point) + * - When `objectEquality == true`, inequality of the `watchExpression` is determined + * according to the {@link angular.equals} function. To save the value of the object for + * later comparison, the {@link angular.copy} function is used. This therefore means that + * watching complex objects will have adverse memory and performance implications. + * - The watch `listener` may change the model, which may trigger other `listener`s to fire. + * This is achieved by rerunning the watchers until no changes are detected. The rerun + * iteration limit is 10 to prevent an infinite loop deadlock. + * + * + * If you want to be notified whenever {@link ng.$rootScope.Scope#$digest $digest} is called, + * you can register a `watchExpression` function with no `listener`. (Since `watchExpression` + * can execute multiple times per {@link ng.$rootScope.Scope#$digest $digest} cycle when a + * change is detected, be prepared for multiple calls to your listener.) + * + * After a watcher is registered with the scope, the `listener` fn is called asynchronously + * (via {@link ng.$rootScope.Scope#$evalAsync $evalAsync}) to initialize the + * watcher. In rare cases, this is undesirable because the listener is called when the result + * of `watchExpression` didn't change. To detect this scenario within the `listener` fn, you + * can compare the `newVal` and `oldVal`. If these two values are identical (`===`) then the + * listener was called due to initialization. + * + * The example below contains an illustration of using a function as your $watch listener + * + * + * # Example + * ```js + // let's assume that scope was dependency injected as the $rootScope + var scope = $rootScope; + scope.name = 'misko'; + scope.counter = 0; + + expect(scope.counter).toEqual(0); + scope.$watch('name', function(newValue, oldValue) { + scope.counter = scope.counter + 1; + }); + expect(scope.counter).toEqual(0); + + scope.$digest(); + // the listener is always called during the first $digest loop after it was registered + expect(scope.counter).toEqual(1); + + scope.$digest(); + // but now it will not be called unless the value changes + expect(scope.counter).toEqual(1); + + scope.name = 'adam'; + scope.$digest(); + expect(scope.counter).toEqual(2); + + + + // Using a listener function + var food; + scope.foodCounter = 0; + expect(scope.foodCounter).toEqual(0); + scope.$watch( + // This is the listener function + function() { return food; }, + // This is the change handler + function(newValue, oldValue) { + if ( newValue !== oldValue ) { + // Only increment the counter if the value changed + scope.foodCounter = scope.foodCounter + 1; + } + } + ); + // No digest has been run so the counter will be zero + expect(scope.foodCounter).toEqual(0); + + // Run the digest but since food has not changed count will still be zero + scope.$digest(); + expect(scope.foodCounter).toEqual(0); + + // Update food and run digest. Now the counter will increment + food = 'cheeseburger'; + scope.$digest(); + expect(scope.foodCounter).toEqual(1); + + * ``` + * + * + * + * @param {(function()|string)} watchExpression Expression that is evaluated on each + * {@link ng.$rootScope.Scope#$digest $digest} cycle. A change in the return value triggers + * a call to the `listener`. + * + * - `string`: Evaluated as {@link guide/expression expression} + * - `function(scope)`: called with current `scope` as a parameter. + * @param {(function()|string)=} listener Callback called whenever the return value of + * the `watchExpression` changes. + * + * - `string`: Evaluated as {@link guide/expression expression} + * - `function(newValue, oldValue, scope)`: called with current and previous values as + * parameters. + * + * @param {boolean=} objectEquality Compare for object equality using {@link angular.equals} instead of + * comparing for reference equality. + * @returns {function()} Returns a deregistration function for this listener. + */ + $watch: function(watchExp, listener, objectEquality) { + var scope = this, + get = compileToFn(watchExp, 'watch'), + array = scope.$$watchers, + watcher = { + fn: listener, + last: initWatchVal, + get: get, + exp: watchExp, + eq: !!objectEquality + }; + + lastDirtyWatch = null; + + // in the case user pass string, we need to compile it, do we really need this ? + if (!isFunction(listener)) { + var listenFn = compileToFn(listener || noop, 'listener'); + watcher.fn = function(newVal, oldVal, scope) {listenFn(scope);}; + } + + if (typeof watchExp == 'string' && get.constant) { + var originalFn = watcher.fn; + watcher.fn = function(newVal, oldVal, scope) { + originalFn.call(this, newVal, oldVal, scope); + arrayRemove(array, watcher); + }; + } + + if (!array) { + array = scope.$$watchers = []; + } + // we use unshift since we use a while loop in $digest for speed. + // the while loop reads in reverse order. + array.unshift(watcher); + + return function deregisterWatch() { + arrayRemove(array, watcher); + lastDirtyWatch = null; + }; + }, + + + /** + * @ngdoc method + * @name $rootScope.Scope#$watchCollection + * @kind function + * + * @description + * Shallow watches the properties of an object and fires whenever any of the properties change + * (for arrays, this implies watching the array items; for object maps, this implies watching + * the properties). If a change is detected, the `listener` callback is fired. + * + * - The `obj` collection is observed via standard $watch operation and is examined on every + * call to $digest() to see if any items have been added, removed, or moved. + * - The `listener` is called whenever anything within the `obj` has changed. Examples include + * adding, removing, and moving items belonging to an object or array. + * + * + * # Example + * ```js + $scope.names = ['igor', 'matias', 'misko', 'james']; + $scope.dataCount = 4; + + $scope.$watchCollection('names', function(newNames, oldNames) { + $scope.dataCount = newNames.length; + }); + + expect($scope.dataCount).toEqual(4); + $scope.$digest(); + + //still at 4 ... no changes + expect($scope.dataCount).toEqual(4); + + $scope.names.pop(); + $scope.$digest(); + + //now there's been a change + expect($scope.dataCount).toEqual(3); + * ``` + * + * + * @param {string|function(scope)} obj Evaluated as {@link guide/expression expression}. The + * expression value should evaluate to an object or an array which is observed on each + * {@link ng.$rootScope.Scope#$digest $digest} cycle. Any shallow change within the + * collection will trigger a call to the `listener`. + * + * @param {function(newCollection, oldCollection, scope)} listener a callback function called + * when a change is detected. + * - The `newCollection` object is the newly modified data obtained from the `obj` expression + * - The `oldCollection` object is a copy of the former collection data. + * Due to performance considerations, the`oldCollection` value is computed only if the + * `listener` function declares two or more arguments. + * - The `scope` argument refers to the current scope. + * + * @returns {function()} Returns a de-registration function for this listener. When the + * de-registration function is executed, the internal watch operation is terminated. + */ + $watchCollection: function(obj, listener) { + var self = this; + // the current value, updated on each dirty-check run + var newValue; + // a shallow copy of the newValue from the last dirty-check run, + // updated to match newValue during dirty-check run + var oldValue; + // a shallow copy of the newValue from when the last change happened + var veryOldValue; + // only track veryOldValue if the listener is asking for it + var trackVeryOldValue = (listener.length > 1); + var changeDetected = 0; + var objGetter = $parse(obj); + var internalArray = []; + var internalObject = {}; + var initRun = true; + var oldLength = 0; + + function $watchCollectionWatch() { + newValue = objGetter(self); + var newLength, key, bothNaN; + + if (!isObject(newValue)) { // if primitive + if (oldValue !== newValue) { + oldValue = newValue; + changeDetected++; + } + } else if (isArrayLike(newValue)) { + if (oldValue !== internalArray) { + // we are transitioning from something which was not an array into array. + oldValue = internalArray; + oldLength = oldValue.length = 0; + changeDetected++; + } + + newLength = newValue.length; + + if (oldLength !== newLength) { + // if lengths do not match we need to trigger change notification + changeDetected++; + oldValue.length = oldLength = newLength; + } + // copy the items to oldValue and look for changes. + for (var i = 0; i < newLength; i++) { + bothNaN = (oldValue[i] !== oldValue[i]) && + (newValue[i] !== newValue[i]); + if (!bothNaN && (oldValue[i] !== newValue[i])) { + changeDetected++; + oldValue[i] = newValue[i]; + } + } + } else { + if (oldValue !== internalObject) { + // we are transitioning from something which was not an object into object. + oldValue = internalObject = {}; + oldLength = 0; + changeDetected++; + } + // copy the items to oldValue and look for changes. + newLength = 0; + for (key in newValue) { + if (newValue.hasOwnProperty(key)) { + newLength++; + if (oldValue.hasOwnProperty(key)) { + bothNaN = (oldValue[key] !== oldValue[key]) && + (newValue[key] !== newValue[key]); + if (!bothNaN && (oldValue[key] !== newValue[key])) { + changeDetected++; + oldValue[key] = newValue[key]; + } + } else { + oldLength++; + oldValue[key] = newValue[key]; + changeDetected++; + } + } + } + if (oldLength > newLength) { + // we used to have more keys, need to find them and destroy them. + changeDetected++; + for(key in oldValue) { + if (oldValue.hasOwnProperty(key) && !newValue.hasOwnProperty(key)) { + oldLength--; + delete oldValue[key]; + } + } + } + } + return changeDetected; + } + + function $watchCollectionAction() { + if (initRun) { + initRun = false; + listener(newValue, newValue, self); + } else { + listener(newValue, veryOldValue, self); + } + + // make a copy for the next time a collection is changed + if (trackVeryOldValue) { + if (!isObject(newValue)) { + //primitive + veryOldValue = newValue; + } else if (isArrayLike(newValue)) { + veryOldValue = new Array(newValue.length); + for (var i = 0; i < newValue.length; i++) { + veryOldValue[i] = newValue[i]; + } + } else { // if object + veryOldValue = {}; + for (var key in newValue) { + if (hasOwnProperty.call(newValue, key)) { + veryOldValue[key] = newValue[key]; + } + } + } + } + } + + return this.$watch($watchCollectionWatch, $watchCollectionAction); + }, + + /** + * @ngdoc method + * @name $rootScope.Scope#$digest + * @kind function + * + * @description + * Processes all of the {@link ng.$rootScope.Scope#$watch watchers} of the current scope and + * its children. Because a {@link ng.$rootScope.Scope#$watch watcher}'s listener can change + * the model, the `$digest()` keeps calling the {@link ng.$rootScope.Scope#$watch watchers} + * until no more listeners are firing. This means that it is possible to get into an infinite + * loop. This function will throw `'Maximum iteration limit exceeded.'` if the number of + * iterations exceeds 10. + * + * Usually, you don't call `$digest()` directly in + * {@link ng.directive:ngController controllers} or in + * {@link ng.$compileProvider#directive directives}. + * Instead, you should call {@link ng.$rootScope.Scope#$apply $apply()} (typically from within + * a {@link ng.$compileProvider#directive directives}), which will force a `$digest()`. + * + * If you want to be notified whenever `$digest()` is called, + * you can register a `watchExpression` function with + * {@link ng.$rootScope.Scope#$watch $watch()} with no `listener`. + * + * In unit tests, you may need to call `$digest()` to simulate the scope life cycle. + * + * # Example + * ```js + var scope = ...; + scope.name = 'misko'; + scope.counter = 0; + + expect(scope.counter).toEqual(0); + scope.$watch('name', function(newValue, oldValue) { + scope.counter = scope.counter + 1; + }); + expect(scope.counter).toEqual(0); + + scope.$digest(); + // the listener is always called during the first $digest loop after it was registered + expect(scope.counter).toEqual(1); + + scope.$digest(); + // but now it will not be called unless the value changes + expect(scope.counter).toEqual(1); + + scope.name = 'adam'; + scope.$digest(); + expect(scope.counter).toEqual(2); + * ``` + * + */ + $digest: function() { + var watch, value, last, + watchers, + asyncQueue = this.$$asyncQueue, + postDigestQueue = this.$$postDigestQueue, + length, + dirty, ttl = TTL, + next, current, target = this, + watchLog = [], + logIdx, logMsg, asyncTask; + + beginPhase('$digest'); + // Check for changes to browser url that happened in sync before the call to $digest + $browser.$$checkUrlChange(); + + lastDirtyWatch = null; + + do { // "while dirty" loop + dirty = false; + current = target; + + while(asyncQueue.length) { + try { + asyncTask = asyncQueue.shift(); + asyncTask.scope.$eval(asyncTask.expression); + } catch (e) { + clearPhase(); + $exceptionHandler(e); + } + lastDirtyWatch = null; + } + + traverseScopesLoop: + do { // "traverse the scopes" loop + if ((watchers = current.$$watchers)) { + // process our watches + length = watchers.length; + while (length--) { + try { + watch = watchers[length]; + // Most common watches are on primitives, in which case we can short + // circuit it with === operator, only when === fails do we use .equals + if (watch) { + if ((value = watch.get(current)) !== (last = watch.last) && + !(watch.eq + ? equals(value, last) + : (typeof value === 'number' && typeof last === 'number' + && isNaN(value) && isNaN(last)))) { + dirty = true; + lastDirtyWatch = watch; + watch.last = watch.eq ? copy(value, null) : value; + watch.fn(value, ((last === initWatchVal) ? value : last), current); + if (ttl < 5) { + logIdx = 4 - ttl; + if (!watchLog[logIdx]) watchLog[logIdx] = []; + logMsg = (isFunction(watch.exp)) + ? 'fn: ' + (watch.exp.name || watch.exp.toString()) + : watch.exp; + logMsg += '; newVal: ' + toJson(value) + '; oldVal: ' + toJson(last); + watchLog[logIdx].push(logMsg); + } + } else if (watch === lastDirtyWatch) { + // If the most recently dirty watcher is now clean, short circuit since the remaining watchers + // have already been tested. + dirty = false; + break traverseScopesLoop; + } + } + } catch (e) { + clearPhase(); + $exceptionHandler(e); + } + } + } + + // Insanity Warning: scope depth-first traversal + // yes, this code is a bit crazy, but it works and we have tests to prove it! + // this piece should be kept in sync with the traversal in $broadcast + if (!(next = (current.$$childHead || + (current !== target && current.$$nextSibling)))) { + while(current !== target && !(next = current.$$nextSibling)) { + current = current.$parent; + } + } + } while ((current = next)); + + // `break traverseScopesLoop;` takes us to here + + if((dirty || asyncQueue.length) && !(ttl--)) { + clearPhase(); + throw $rootScopeMinErr('infdig', + '{0} $digest() iterations reached. Aborting!\n' + + 'Watchers fired in the last 5 iterations: {1}', + TTL, toJson(watchLog)); + } + + } while (dirty || asyncQueue.length); + + clearPhase(); + + while(postDigestQueue.length) { + try { + postDigestQueue.shift()(); + } catch (e) { + $exceptionHandler(e); + } + } + }, + + + /** + * @ngdoc event + * @name $rootScope.Scope#$destroy + * @eventType broadcast on scope being destroyed + * + * @description + * Broadcasted when a scope and its children are being destroyed. + * + * Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to + * clean up DOM bindings before an element is removed from the DOM. + */ + + /** + * @ngdoc method + * @name $rootScope.Scope#$destroy + * @kind function + * + * @description + * Removes the current scope (and all of its children) from the parent scope. Removal implies + * that calls to {@link ng.$rootScope.Scope#$digest $digest()} will no longer + * propagate to the current scope and its children. Removal also implies that the current + * scope is eligible for garbage collection. + * + * The `$destroy()` is usually used by directives such as + * {@link ng.directive:ngRepeat ngRepeat} for managing the + * unrolling of the loop. + * + * Just before a scope is destroyed, a `$destroy` event is broadcasted on this scope. + * Application code can register a `$destroy` event handler that will give it a chance to + * perform any necessary cleanup. + * + * Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to + * clean up DOM bindings before an element is removed from the DOM. + */ + $destroy: function() { + // we can't destroy the root scope or a scope that has been already destroyed + if (this.$$destroyed) return; + var parent = this.$parent; + + this.$broadcast('$destroy'); + this.$$destroyed = true; + if (this === $rootScope) return; + + forEach(this.$$listenerCount, bind(null, decrementListenerCount, this)); + + // sever all the references to parent scopes (after this cleanup, the current scope should + // not be retained by any of our references and should be eligible for garbage collection) + if (parent.$$childHead == this) parent.$$childHead = this.$$nextSibling; + if (parent.$$childTail == this) parent.$$childTail = this.$$prevSibling; + if (this.$$prevSibling) this.$$prevSibling.$$nextSibling = this.$$nextSibling; + if (this.$$nextSibling) this.$$nextSibling.$$prevSibling = this.$$prevSibling; + + + // All of the code below is bogus code that works around V8's memory leak via optimized code + // and inline caches. + // + // see: + // - https://code.google.com/p/v8/issues/detail?id=2073#c26 + // - https://github.com/angular/angular.js/issues/6794#issuecomment-38648909 + // - https://github.com/angular/angular.js/issues/1313#issuecomment-10378451 + + this.$parent = this.$$nextSibling = this.$$prevSibling = this.$$childHead = + this.$$childTail = this.$root = null; + + // don't reset these to null in case some async task tries to register a listener/watch/task + this.$$listeners = {}; + this.$$watchers = this.$$asyncQueue = this.$$postDigestQueue = []; + + // prevent NPEs since these methods have references to properties we nulled out + this.$destroy = this.$digest = this.$apply = noop; + this.$on = this.$watch = function() { return noop; }; + }, + + /** + * @ngdoc method + * @name $rootScope.Scope#$eval + * @kind function + * + * @description + * Executes the `expression` on the current scope and returns the result. Any exceptions in + * the expression are propagated (uncaught). This is useful when evaluating Angular + * expressions. + * + * # Example + * ```js + var scope = ng.$rootScope.Scope(); + scope.a = 1; + scope.b = 2; + + expect(scope.$eval('a+b')).toEqual(3); + expect(scope.$eval(function(scope){ return scope.a + scope.b; })).toEqual(3); + * ``` + * + * @param {(string|function())=} expression An angular expression to be executed. + * + * - `string`: execute using the rules as defined in {@link guide/expression expression}. + * - `function(scope)`: execute the function with the current `scope` parameter. + * + * @param {(object)=} locals Local variables object, useful for overriding values in scope. + * @returns {*} The result of evaluating the expression. + */ + $eval: function(expr, locals) { + return $parse(expr)(this, locals); + }, + + /** + * @ngdoc method + * @name $rootScope.Scope#$evalAsync + * @kind function + * + * @description + * Executes the expression on the current scope at a later point in time. + * + * The `$evalAsync` makes no guarantees as to when the `expression` will be executed, only + * that: + * + * - it will execute after the function that scheduled the evaluation (preferably before DOM + * rendering). + * - at least one {@link ng.$rootScope.Scope#$digest $digest cycle} will be performed after + * `expression` execution. + * + * Any exceptions from the execution of the expression are forwarded to the + * {@link ng.$exceptionHandler $exceptionHandler} service. + * + * __Note:__ if this function is called outside of a `$digest` cycle, a new `$digest` cycle + * will be scheduled. However, it is encouraged to always call code that changes the model + * from within an `$apply` call. That includes code evaluated via `$evalAsync`. + * + * @param {(string|function())=} expression An angular expression to be executed. + * + * - `string`: execute using the rules as defined in {@link guide/expression expression}. + * - `function(scope)`: execute the function with the current `scope` parameter. + * + */ + $evalAsync: function(expr) { + // if we are outside of an $digest loop and this is the first time we are scheduling async + // task also schedule async auto-flush + if (!$rootScope.$$phase && !$rootScope.$$asyncQueue.length) { + $browser.defer(function() { + if ($rootScope.$$asyncQueue.length) { + $rootScope.$digest(); + } + }); + } + + this.$$asyncQueue.push({scope: this, expression: expr}); + }, + + $$postDigest : function(fn) { + this.$$postDigestQueue.push(fn); + }, + + /** + * @ngdoc method + * @name $rootScope.Scope#$apply + * @kind function + * + * @description + * `$apply()` is used to execute an expression in angular from outside of the angular + * framework. (For example from browser DOM events, setTimeout, XHR or third party libraries). + * Because we are calling into the angular framework we need to perform proper scope life + * cycle of {@link ng.$exceptionHandler exception handling}, + * {@link ng.$rootScope.Scope#$digest executing watches}. + * + * ## Life cycle + * + * # Pseudo-Code of `$apply()` + * ```js + function $apply(expr) { + try { + return $eval(expr); + } catch (e) { + $exceptionHandler(e); + } finally { + $root.$digest(); + } + } + * ``` + * + * + * Scope's `$apply()` method transitions through the following stages: + * + * 1. The {@link guide/expression expression} is executed using the + * {@link ng.$rootScope.Scope#$eval $eval()} method. + * 2. Any exceptions from the execution of the expression are forwarded to the + * {@link ng.$exceptionHandler $exceptionHandler} service. + * 3. The {@link ng.$rootScope.Scope#$watch watch} listeners are fired immediately after the + * expression was executed using the {@link ng.$rootScope.Scope#$digest $digest()} method. + * + * + * @param {(string|function())=} exp An angular expression to be executed. + * + * - `string`: execute using the rules as defined in {@link guide/expression expression}. + * - `function(scope)`: execute the function with current `scope` parameter. + * + * @returns {*} The result of evaluating the expression. + */ + $apply: function(expr) { + try { + beginPhase('$apply'); + return this.$eval(expr); + } catch (e) { + $exceptionHandler(e); + } finally { + clearPhase(); + try { + $rootScope.$digest(); + } catch (e) { + $exceptionHandler(e); + throw e; + } + } + }, + + /** + * @ngdoc method + * @name $rootScope.Scope#$on + * @kind function + * + * @description + * Listens on events of a given type. See {@link ng.$rootScope.Scope#$emit $emit} for + * discussion of event life cycle. + * + * The event listener function format is: `function(event, args...)`. The `event` object + * passed into the listener has the following attributes: + * + * - `targetScope` - `{Scope}`: the scope on which the event was `$emit`-ed or + * `$broadcast`-ed. + * - `currentScope` - `{Scope}`: the current scope which is handling the event. + * - `name` - `{string}`: name of the event. + * - `stopPropagation` - `{function=}`: calling `stopPropagation` function will cancel + * further event propagation (available only for events that were `$emit`-ed). + * - `preventDefault` - `{function}`: calling `preventDefault` sets `defaultPrevented` flag + * to true. + * - `defaultPrevented` - `{boolean}`: true if `preventDefault` was called. + * + * @param {string} name Event name to listen on. + * @param {function(event, ...args)} listener Function to call when the event is emitted. + * @returns {function()} Returns a deregistration function for this listener. + */ + $on: function(name, listener) { + var namedListeners = this.$$listeners[name]; + if (!namedListeners) { + this.$$listeners[name] = namedListeners = []; + } + namedListeners.push(listener); + + var current = this; + do { + if (!current.$$listenerCount[name]) { + current.$$listenerCount[name] = 0; + } + current.$$listenerCount[name]++; + } while ((current = current.$parent)); + + var self = this; + return function() { + namedListeners[indexOf(namedListeners, listener)] = null; + decrementListenerCount(self, 1, name); + }; + }, + + + /** + * @ngdoc method + * @name $rootScope.Scope#$emit + * @kind function + * + * @description + * Dispatches an event `name` upwards through the scope hierarchy notifying the + * registered {@link ng.$rootScope.Scope#$on} listeners. + * + * The event life cycle starts at the scope on which `$emit` was called. All + * {@link ng.$rootScope.Scope#$on listeners} listening for `name` event on this scope get + * notified. Afterwards, the event traverses upwards toward the root scope and calls all + * registered listeners along the way. The event will stop propagating if one of the listeners + * cancels it. + * + * Any exception emitted from the {@link ng.$rootScope.Scope#$on listeners} will be passed + * onto the {@link ng.$exceptionHandler $exceptionHandler} service. + * + * @param {string} name Event name to emit. + * @param {...*} args Optional one or more arguments which will be passed onto the event listeners. + * @return {Object} Event object (see {@link ng.$rootScope.Scope#$on}). + */ + $emit: function(name, args) { + var empty = [], + namedListeners, + scope = this, + stopPropagation = false, + event = { + name: name, + targetScope: scope, + stopPropagation: function() {stopPropagation = true;}, + preventDefault: function() { + event.defaultPrevented = true; + }, + defaultPrevented: false + }, + listenerArgs = concat([event], arguments, 1), + i, length; + + do { + namedListeners = scope.$$listeners[name] || empty; + event.currentScope = scope; + for (i=0, length=namedListeners.length; i= 8 ) { + normalizedVal = urlResolve(uri).href; + if (normalizedVal !== '' && !normalizedVal.match(regex)) { + return 'unsafe:'+normalizedVal; + } + } + return uri; + }; + }; +} + +var $sceMinErr = minErr('$sce'); + +var SCE_CONTEXTS = { + HTML: 'html', + CSS: 'css', + URL: 'url', + // RESOURCE_URL is a subtype of URL used in contexts where a privileged resource is sourced from a + // url. (e.g. ng-include, script src, templateUrl) + RESOURCE_URL: 'resourceUrl', + JS: 'js' +}; + +// Helper functions follow. + +// Copied from: +// http://docs.closure-library.googlecode.com/git/closure_goog_string_string.js.source.html#line962 +// Prereq: s is a string. +function escapeForRegexp(s) { + return s.replace(/([-()\[\]{}+?*.$\^|,:# -1) { + throw $sceMinErr('iwcard', + 'Illegal sequence *** in string matcher. String: {0}', matcher); + } + matcher = escapeForRegexp(matcher). + replace('\\*\\*', '.*'). + replace('\\*', '[^:/.?&;]*'); + return new RegExp('^' + matcher + '$'); + } else if (isRegExp(matcher)) { + // The only other type of matcher allowed is a Regexp. + // Match entire URL / disallow partial matches. + // Flags are reset (i.e. no global, ignoreCase or multiline) + return new RegExp('^' + matcher.source + '$'); + } else { + throw $sceMinErr('imatcher', + 'Matchers may only be "self", string patterns or RegExp objects'); + } +} + + +function adjustMatchers(matchers) { + var adjustedMatchers = []; + if (isDefined(matchers)) { + forEach(matchers, function(matcher) { + adjustedMatchers.push(adjustMatcher(matcher)); + }); + } + return adjustedMatchers; +} + + +/** + * @ngdoc service + * @name $sceDelegate + * @kind function + * + * @description + * + * `$sceDelegate` is a service that is used by the `$sce` service to provide {@link ng.$sce Strict + * Contextual Escaping (SCE)} services to AngularJS. + * + * Typically, you would configure or override the {@link ng.$sceDelegate $sceDelegate} instead of + * the `$sce` service to customize the way Strict Contextual Escaping works in AngularJS. This is + * because, while the `$sce` provides numerous shorthand methods, etc., you really only need to + * override 3 core functions (`trustAs`, `getTrusted` and `valueOf`) to replace the way things + * work because `$sce` delegates to `$sceDelegate` for these operations. + * + * Refer {@link ng.$sceDelegateProvider $sceDelegateProvider} to configure this service. + * + * The default instance of `$sceDelegate` should work out of the box with little pain. While you + * can override it completely to change the behavior of `$sce`, the common case would + * involve configuring the {@link ng.$sceDelegateProvider $sceDelegateProvider} instead by setting + * your own whitelists and blacklists for trusting URLs used for loading AngularJS resources such as + * templates. Refer {@link ng.$sceDelegateProvider#resourceUrlWhitelist + * $sceDelegateProvider.resourceUrlWhitelist} and {@link + * ng.$sceDelegateProvider#resourceUrlBlacklist $sceDelegateProvider.resourceUrlBlacklist} + */ + +/** + * @ngdoc provider + * @name $sceDelegateProvider + * @description + * + * The `$sceDelegateProvider` provider allows developers to configure the {@link ng.$sceDelegate + * $sceDelegate} service. This allows one to get/set the whitelists and blacklists used to ensure + * that the URLs used for sourcing Angular templates are safe. Refer {@link + * ng.$sceDelegateProvider#resourceUrlWhitelist $sceDelegateProvider.resourceUrlWhitelist} and + * {@link ng.$sceDelegateProvider#resourceUrlBlacklist $sceDelegateProvider.resourceUrlBlacklist} + * + * For the general details about this service in Angular, read the main page for {@link ng.$sce + * Strict Contextual Escaping (SCE)}. + * + * **Example**: Consider the following case. + * + * - your app is hosted at url `http://myapp.example.com/` + * - but some of your templates are hosted on other domains you control such as + * `http://srv01.assets.example.com/`,  `http://srv02.assets.example.com/`, etc. + * - and you have an open redirect at `http://myapp.example.com/clickThru?...`. + * + * Here is what a secure configuration for this scenario might look like: + * + * ``` + * angular.module('myApp', []).config(function($sceDelegateProvider) { + * $sceDelegateProvider.resourceUrlWhitelist([ + * // Allow same origin resource loads. + * 'self', + * // Allow loading from our assets domain. Notice the difference between * and **. + * 'http://srv*.assets.example.com/**' + * ]); + * + * // The blacklist overrides the whitelist so the open redirect here is blocked. + * $sceDelegateProvider.resourceUrlBlacklist([ + * 'http://myapp.example.com/clickThru**' + * ]); + * }); + * ``` + */ + +function $SceDelegateProvider() { + this.SCE_CONTEXTS = SCE_CONTEXTS; + + // Resource URLs can also be trusted by policy. + var resourceUrlWhitelist = ['self'], + resourceUrlBlacklist = []; + + /** + * @ngdoc method + * @name $sceDelegateProvider#resourceUrlWhitelist + * @kind function + * + * @param {Array=} whitelist When provided, replaces the resourceUrlWhitelist with the value + * provided. This must be an array or null. A snapshot of this array is used so further + * changes to the array are ignored. + * + * Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items + * allowed in this array. + * + * Note: **an empty whitelist array will block all URLs**! + * + * @return {Array} the currently set whitelist array. + * + * The **default value** when no whitelist has been explicitly set is `['self']` allowing only + * same origin resource requests. + * + * @description + * Sets/Gets the whitelist of trusted resource URLs. + */ + this.resourceUrlWhitelist = function (value) { + if (arguments.length) { + resourceUrlWhitelist = adjustMatchers(value); + } + return resourceUrlWhitelist; + }; + + /** + * @ngdoc method + * @name $sceDelegateProvider#resourceUrlBlacklist + * @kind function + * + * @param {Array=} blacklist When provided, replaces the resourceUrlBlacklist with the value + * provided. This must be an array or null. A snapshot of this array is used so further + * changes to the array are ignored. + * + * Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items + * allowed in this array. + * + * The typical usage for the blacklist is to **block + * [open redirects](http://cwe.mitre.org/data/definitions/601.html)** served by your domain as + * these would otherwise be trusted but actually return content from the redirected domain. + * + * Finally, **the blacklist overrides the whitelist** and has the final say. + * + * @return {Array} the currently set blacklist array. + * + * The **default value** when no whitelist has been explicitly set is the empty array (i.e. there + * is no blacklist.) + * + * @description + * Sets/Gets the blacklist of trusted resource URLs. + */ + + this.resourceUrlBlacklist = function (value) { + if (arguments.length) { + resourceUrlBlacklist = adjustMatchers(value); + } + return resourceUrlBlacklist; + }; + + this.$get = ['$injector', function($injector) { + + var htmlSanitizer = function htmlSanitizer(html) { + throw $sceMinErr('unsafe', 'Attempting to use an unsafe value in a safe context.'); + }; + + if ($injector.has('$sanitize')) { + htmlSanitizer = $injector.get('$sanitize'); + } + + + function matchUrl(matcher, parsedUrl) { + if (matcher === 'self') { + return urlIsSameOrigin(parsedUrl); + } else { + // definitely a regex. See adjustMatchers() + return !!matcher.exec(parsedUrl.href); + } + } + + function isResourceUrlAllowedByPolicy(url) { + var parsedUrl = urlResolve(url.toString()); + var i, n, allowed = false; + // Ensure that at least one item from the whitelist allows this url. + for (i = 0, n = resourceUrlWhitelist.length; i < n; i++) { + if (matchUrl(resourceUrlWhitelist[i], parsedUrl)) { + allowed = true; + break; + } + } + if (allowed) { + // Ensure that no item from the blacklist blocked this url. + for (i = 0, n = resourceUrlBlacklist.length; i < n; i++) { + if (matchUrl(resourceUrlBlacklist[i], parsedUrl)) { + allowed = false; + break; + } + } + } + return allowed; + } + + function generateHolderType(Base) { + var holderType = function TrustedValueHolderType(trustedValue) { + this.$$unwrapTrustedValue = function() { + return trustedValue; + }; + }; + if (Base) { + holderType.prototype = new Base(); + } + holderType.prototype.valueOf = function sceValueOf() { + return this.$$unwrapTrustedValue(); + }; + holderType.prototype.toString = function sceToString() { + return this.$$unwrapTrustedValue().toString(); + }; + return holderType; + } + + var trustedValueHolderBase = generateHolderType(), + byType = {}; + + byType[SCE_CONTEXTS.HTML] = generateHolderType(trustedValueHolderBase); + byType[SCE_CONTEXTS.CSS] = generateHolderType(trustedValueHolderBase); + byType[SCE_CONTEXTS.URL] = generateHolderType(trustedValueHolderBase); + byType[SCE_CONTEXTS.JS] = generateHolderType(trustedValueHolderBase); + byType[SCE_CONTEXTS.RESOURCE_URL] = generateHolderType(byType[SCE_CONTEXTS.URL]); + + /** + * @ngdoc method + * @name $sceDelegate#trustAs + * + * @description + * Returns an object that is trusted by angular for use in specified strict + * contextual escaping contexts (such as ng-bind-html, ng-include, any src + * attribute interpolation, any dom event binding attribute interpolation + * such as for onclick, etc.) that uses the provided value. + * See {@link ng.$sce $sce} for enabling strict contextual escaping. + * + * @param {string} type The kind of context in which this value is safe for use. e.g. url, + * resourceUrl, html, js and css. + * @param {*} value The value that that should be considered trusted/safe. + * @returns {*} A value that can be used to stand in for the provided `value` in places + * where Angular expects a $sce.trustAs() return value. + */ + function trustAs(type, trustedValue) { + var Constructor = (byType.hasOwnProperty(type) ? byType[type] : null); + if (!Constructor) { + throw $sceMinErr('icontext', + 'Attempted to trust a value in invalid context. Context: {0}; Value: {1}', + type, trustedValue); + } + if (trustedValue === null || trustedValue === undefined || trustedValue === '') { + return trustedValue; + } + // All the current contexts in SCE_CONTEXTS happen to be strings. In order to avoid trusting + // mutable objects, we ensure here that the value passed in is actually a string. + if (typeof trustedValue !== 'string') { + throw $sceMinErr('itype', + 'Attempted to trust a non-string value in a content requiring a string: Context: {0}', + type); + } + return new Constructor(trustedValue); + } + + /** + * @ngdoc method + * @name $sceDelegate#valueOf + * + * @description + * If the passed parameter had been returned by a prior call to {@link ng.$sceDelegate#trustAs + * `$sceDelegate.trustAs`}, returns the value that had been passed to {@link + * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}. + * + * If the passed parameter is not a value that had been returned by {@link + * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}, returns it as-is. + * + * @param {*} value The result of a prior {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`} + * call or anything else. + * @returns {*} The `value` that was originally provided to {@link ng.$sceDelegate#trustAs + * `$sceDelegate.trustAs`} if `value` is the result of such a call. Otherwise, returns + * `value` unchanged. + */ + function valueOf(maybeTrusted) { + if (maybeTrusted instanceof trustedValueHolderBase) { + return maybeTrusted.$$unwrapTrustedValue(); + } else { + return maybeTrusted; + } + } + + /** + * @ngdoc method + * @name $sceDelegate#getTrusted + * + * @description + * Takes the result of a {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`} call and + * returns the originally supplied value if the queried context type is a supertype of the + * created type. If this condition isn't satisfied, throws an exception. + * + * @param {string} type The kind of context in which this value is to be used. + * @param {*} maybeTrusted The result of a prior {@link ng.$sceDelegate#trustAs + * `$sceDelegate.trustAs`} call. + * @returns {*} The value the was originally provided to {@link ng.$sceDelegate#trustAs + * `$sceDelegate.trustAs`} if valid in this context. Otherwise, throws an exception. + */ + function getTrusted(type, maybeTrusted) { + if (maybeTrusted === null || maybeTrusted === undefined || maybeTrusted === '') { + return maybeTrusted; + } + var constructor = (byType.hasOwnProperty(type) ? byType[type] : null); + if (constructor && maybeTrusted instanceof constructor) { + return maybeTrusted.$$unwrapTrustedValue(); + } + // If we get here, then we may only take one of two actions. + // 1. sanitize the value for the requested type, or + // 2. throw an exception. + if (type === SCE_CONTEXTS.RESOURCE_URL) { + if (isResourceUrlAllowedByPolicy(maybeTrusted)) { + return maybeTrusted; + } else { + throw $sceMinErr('insecurl', + 'Blocked loading resource from url not allowed by $sceDelegate policy. URL: {0}', + maybeTrusted.toString()); + } + } else if (type === SCE_CONTEXTS.HTML) { + return htmlSanitizer(maybeTrusted); + } + throw $sceMinErr('unsafe', 'Attempting to use an unsafe value in a safe context.'); + } + + return { trustAs: trustAs, + getTrusted: getTrusted, + valueOf: valueOf }; + }]; +} + + +/** + * @ngdoc provider + * @name $sceProvider + * @description + * + * The $sceProvider provider allows developers to configure the {@link ng.$sce $sce} service. + * - enable/disable Strict Contextual Escaping (SCE) in a module + * - override the default implementation with a custom delegate + * + * Read more about {@link ng.$sce Strict Contextual Escaping (SCE)}. + */ + +/* jshint maxlen: false*/ + +/** + * @ngdoc service + * @name $sce + * @kind function + * + * @description + * + * `$sce` is a service that provides Strict Contextual Escaping services to AngularJS. + * + * # Strict Contextual Escaping + * + * Strict Contextual Escaping (SCE) is a mode in which AngularJS requires bindings in certain + * contexts to result in a value that is marked as safe to use for that context. One example of + * such a context is binding arbitrary html controlled by the user via `ng-bind-html`. We refer + * to these contexts as privileged or SCE contexts. + * + * As of version 1.2, Angular ships with SCE enabled by default. + * + * Note: When enabled (the default), IE8 in quirks mode is not supported. In this mode, IE8 allows + * one to execute arbitrary javascript by the use of the expression() syntax. Refer + * to learn more about them. + * You can ensure your document is in standards mode and not quirks mode by adding `` + * to the top of your HTML document. + * + * SCE assists in writing code in way that (a) is secure by default and (b) makes auditing for + * security vulnerabilities such as XSS, clickjacking, etc. a lot easier. + * + * Here's an example of a binding in a privileged context: + * + * ``` + * + *
    + * ``` + * + * Notice that `ng-bind-html` is bound to `userHtml` controlled by the user. With SCE + * disabled, this application allows the user to render arbitrary HTML into the DIV. + * In a more realistic example, one may be rendering user comments, blog articles, etc. via + * bindings. (HTML is just one example of a context where rendering user controlled input creates + * security vulnerabilities.) + * + * For the case of HTML, you might use a library, either on the client side, or on the server side, + * to sanitize unsafe HTML before binding to the value and rendering it in the document. + * + * How would you ensure that every place that used these types of bindings was bound to a value that + * was sanitized by your library (or returned as safe for rendering by your server?) How can you + * ensure that you didn't accidentally delete the line that sanitized the value, or renamed some + * properties/fields and forgot to update the binding to the sanitized value? + * + * To be secure by default, you want to ensure that any such bindings are disallowed unless you can + * determine that something explicitly says it's safe to use a value for binding in that + * context. You can then audit your code (a simple grep would do) to ensure that this is only done + * for those values that you can easily tell are safe - because they were received from your server, + * sanitized by your library, etc. You can organize your codebase to help with this - perhaps + * allowing only the files in a specific directory to do this. Ensuring that the internal API + * exposed by that code doesn't markup arbitrary values as safe then becomes a more manageable task. + * + * In the case of AngularJS' SCE service, one uses {@link ng.$sce#trustAs $sce.trustAs} + * (and shorthand methods such as {@link ng.$sce#trustAsHtml $sce.trustAsHtml}, etc.) to + * obtain values that will be accepted by SCE / privileged contexts. + * + * + * ## How does it work? + * + * In privileged contexts, directives and code will bind to the result of {@link ng.$sce#getTrusted + * $sce.getTrusted(context, value)} rather than to the value directly. Directives use {@link + * ng.$sce#parse $sce.parseAs} rather than `$parse` to watch attribute bindings, which performs the + * {@link ng.$sce#getTrusted $sce.getTrusted} behind the scenes on non-constant literals. + * + * As an example, {@link ng.directive:ngBindHtml ngBindHtml} uses {@link + * ng.$sce#parseAsHtml $sce.parseAsHtml(binding expression)}. Here's the actual code (slightly + * simplified): + * + * ``` + * var ngBindHtmlDirective = ['$sce', function($sce) { + * return function(scope, element, attr) { + * scope.$watch($sce.parseAsHtml(attr.ngBindHtml), function(value) { + * element.html(value || ''); + * }); + * }; + * }]; + * ``` + * + * ## Impact on loading templates + * + * This applies both to the {@link ng.directive:ngInclude `ng-include`} directive as well as + * `templateUrl`'s specified by {@link guide/directive directives}. + * + * By default, Angular only loads templates from the same domain and protocol as the application + * document. This is done by calling {@link ng.$sce#getTrustedResourceUrl + * $sce.getTrustedResourceUrl} on the template URL. To load templates from other domains and/or + * protocols, you may either either {@link ng.$sceDelegateProvider#resourceUrlWhitelist whitelist + * them} or {@link ng.$sce#trustAsResourceUrl wrap it} into a trusted value. + * + * *Please note*: + * The browser's + * [Same Origin Policy](https://code.google.com/p/browsersec/wiki/Part2#Same-origin_policy_for_XMLHttpRequest) + * and [Cross-Origin Resource Sharing (CORS)](http://www.w3.org/TR/cors/) + * policy apply in addition to this and may further restrict whether the template is successfully + * loaded. This means that without the right CORS policy, loading templates from a different domain + * won't work on all browsers. Also, loading templates from `file://` URL does not work on some + * browsers. + * + * ## This feels like too much overhead for the developer? + * + * It's important to remember that SCE only applies to interpolation expressions. + * + * If your expressions are constant literals, they're automatically trusted and you don't need to + * call `$sce.trustAs` on them (remember to include the `ngSanitize` module) (e.g. + * `
    `) just works. + * + * Additionally, `a[href]` and `img[src]` automatically sanitize their URLs and do not pass them + * through {@link ng.$sce#getTrusted $sce.getTrusted}. SCE doesn't play a role here. + * + * The included {@link ng.$sceDelegate $sceDelegate} comes with sane defaults to allow you to load + * templates in `ng-include` from your application's domain without having to even know about SCE. + * It blocks loading templates from other domains or loading templates over http from an https + * served document. You can change these by setting your own custom {@link + * ng.$sceDelegateProvider#resourceUrlWhitelist whitelists} and {@link + * ng.$sceDelegateProvider#resourceUrlBlacklist blacklists} for matching such URLs. + * + * This significantly reduces the overhead. It is far easier to pay the small overhead and have an + * application that's secure and can be audited to verify that with much more ease than bolting + * security onto an application later. + * + * + * ## What trusted context types are supported? + * + * | Context | Notes | + * |---------------------|----------------| + * | `$sce.HTML` | For HTML that's safe to source into the application. The {@link ng.directive:ngBindHtml ngBindHtml} directive uses this context for bindings. If an unsafe value is encountered and the {@link ngSanitize $sanitize} module is present this will sanitize the value instead of throwing an error. | + * | `$sce.CSS` | For CSS that's safe to source into the application. Currently unused. Feel free to use it in your own directives. | + * | `$sce.URL` | For URLs that are safe to follow as links. Currently unused (`
    Note that `$sce.RESOURCE_URL` makes a stronger statement about the URL than `$sce.URL` does and therefore contexts requiring values trusted for `$sce.RESOURCE_URL` can be used anywhere that values trusted for `$sce.URL` are required. | + * | `$sce.JS` | For JavaScript that is safe to execute in your application's context. Currently unused. Feel free to use it in your own directives. | + * + * ## Format of items in {@link ng.$sceDelegateProvider#resourceUrlWhitelist resourceUrlWhitelist}/{@link ng.$sceDelegateProvider#resourceUrlBlacklist Blacklist}     + * + * Each element in these arrays must be one of the following: + * + * - **'self'** + * - The special **string**, `'self'`, can be used to match against all URLs of the **same + * domain** as the application document using the **same protocol**. + * - **String** (except the special value `'self'`) + * - The string is matched against the full *normalized / absolute URL* of the resource + * being tested (substring matches are not good enough.) + * - There are exactly **two wildcard sequences** - `*` and `**`. All other characters + * match themselves. + * - `*`: matches zero or more occurrences of any character other than one of the following 6 + * characters: '`:`', '`/`', '`.`', '`?`', '`&`' and ';'. It's a useful wildcard for use + * in a whitelist. + * - `**`: matches zero or more occurrences of *any* character. As such, it's not + * not appropriate to use in for a scheme, domain, etc. as it would match too much. (e.g. + * http://**.example.com/ would match http://evil.com/?ignore=.example.com/ and that might + * not have been the intention.) Its usage at the very end of the path is ok. (e.g. + * http://foo.example.com/templates/**). + * - **RegExp** (*see caveat below*) + * - *Caveat*: While regular expressions are powerful and offer great flexibility, their syntax + * (and all the inevitable escaping) makes them *harder to maintain*. It's easy to + * accidentally introduce a bug when one updates a complex expression (imho, all regexes should + * have good test coverage.). For instance, the use of `.` in the regex is correct only in a + * small number of cases. A `.` character in the regex used when matching the scheme or a + * subdomain could be matched against a `:` or literal `.` that was likely not intended. It + * is highly recommended to use the string patterns and only fall back to regular expressions + * if they as a last resort. + * - The regular expression must be an instance of RegExp (i.e. not a string.) It is + * matched against the **entire** *normalized / absolute URL* of the resource being tested + * (even when the RegExp did not have the `^` and `$` codes.) In addition, any flags + * present on the RegExp (such as multiline, global, ignoreCase) are ignored. + * - If you are generating your JavaScript from some other templating engine (not + * recommended, e.g. in issue [#4006](https://github.com/angular/angular.js/issues/4006)), + * remember to escape your regular expression (and be aware that you might need more than + * one level of escaping depending on your templating engine and the way you interpolated + * the value.) Do make use of your platform's escaping mechanism as it might be good + * enough before coding your own. e.g. Ruby has + * [Regexp.escape(str)](http://www.ruby-doc.org/core-2.0.0/Regexp.html#method-c-escape) + * and Python has [re.escape](http://docs.python.org/library/re.html#re.escape). + * Javascript lacks a similar built in function for escaping. Take a look at Google + * Closure library's [goog.string.regExpEscape(s)]( + * http://docs.closure-library.googlecode.com/git/closure_goog_string_string.js.source.html#line962). + * + * Refer {@link ng.$sceDelegateProvider $sceDelegateProvider} for an example. + * + * ## Show me an example using SCE. + * + * + * + *
    + *

    + * User comments
    + * By default, HTML that isn't explicitly trusted (e.g. Alice's comment) is sanitized when + * $sanitize is available. If $sanitize isn't available, this results in an error instead of an + * exploit. + *
    + *
    + * {{userComment.name}}: + * + *
    + *
    + *
    + *
    + *     + * + * + * var mySceApp = angular.module('mySceApp', ['ngSanitize']); + * + * mySceApp.controller("myAppController", function myAppController($http, $templateCache, $sce) { + * var self = this; + * $http.get("test_data.json", {cache: $templateCache}).success(function(userComments) { + * self.userComments = userComments; + * }); + * self.explicitlyTrustedHtml = $sce.trustAsHtml( + * 'Hover over this text.'); + * }); + * + * + * + * [ + * { "name": "Alice", + * "htmlComment": + * "Is anyone reading this?" + * }, + * { "name": "Bob", + * "htmlComment": "Yes! Am I the only other one?" + * } + * ] + * + * + * + * describe('SCE doc demo', function() { + * it('should sanitize untrusted values', function() { + * expect(element.all(by.css('.htmlComment')).first().getInnerHtml()) + * .toBe('Is anyone reading this?'); + * }); + * + * it('should NOT sanitize explicitly trusted values', function() { + * expect(element(by.id('explicitlyTrustedHtml')).getInnerHtml()).toBe( + * 'Hover over this text.'); + * }); + * }); + * + *     + * + * + * + * ## Can I disable SCE completely? + * + * Yes, you can. However, this is strongly discouraged. SCE gives you a lot of security benefits + * for little coding overhead. It will be much harder to take an SCE disabled application and + * either secure it on your own or enable SCE at a later stage. It might make sense to disable SCE + * for cases where you have a lot of existing code that was written before SCE was introduced and + * you're migrating them a module at a time. + * + * That said, here's how you can completely disable SCE: + * + * ``` + * angular.module('myAppWithSceDisabledmyApp', []).config(function($sceProvider) { + * // Completely disable SCE. For demonstration purposes only! + * // Do not use in new projects. + * $sceProvider.enabled(false); + * }); + * ``` + * + */ +/* jshint maxlen: 100 */ + +function $SceProvider() { + var enabled = true; + + /** + * @ngdoc method + * @name $sceProvider#enabled + * @kind function + * + * @param {boolean=} value If provided, then enables/disables SCE. + * @return {boolean} true if SCE is enabled, false otherwise. + * + * @description + * Enables/disables SCE and returns the current value. + */ + this.enabled = function (value) { + if (arguments.length) { + enabled = !!value; + } + return enabled; + }; + + + /* Design notes on the default implementation for SCE. + * + * The API contract for the SCE delegate + * ------------------------------------- + * The SCE delegate object must provide the following 3 methods: + * + * - trustAs(contextEnum, value) + * This method is used to tell the SCE service that the provided value is OK to use in the + * contexts specified by contextEnum. It must return an object that will be accepted by + * getTrusted() for a compatible contextEnum and return this value. + * + * - valueOf(value) + * For values that were not produced by trustAs(), return them as is. For values that were + * produced by trustAs(), return the corresponding input value to trustAs. Basically, if + * trustAs is wrapping the given values into some type, this operation unwraps it when given + * such a value. + * + * - getTrusted(contextEnum, value) + * This function should return the a value that is safe to use in the context specified by + * contextEnum or throw and exception otherwise. + * + * NOTE: This contract deliberately does NOT state that values returned by trustAs() must be + * opaque or wrapped in some holder object. That happens to be an implementation detail. For + * instance, an implementation could maintain a registry of all trusted objects by context. In + * such a case, trustAs() would return the same object that was passed in. getTrusted() would + * return the same object passed in if it was found in the registry under a compatible context or + * throw an exception otherwise. An implementation might only wrap values some of the time based + * on some criteria. getTrusted() might return a value and not throw an exception for special + * constants or objects even if not wrapped. All such implementations fulfill this contract. + * + * + * A note on the inheritance model for SCE contexts + * ------------------------------------------------ + * I've used inheritance and made RESOURCE_URL wrapped types a subtype of URL wrapped types. This + * is purely an implementation details. + * + * The contract is simply this: + * + * getTrusted($sce.RESOURCE_URL, value) succeeding implies that getTrusted($sce.URL, value) + * will also succeed. + * + * Inheritance happens to capture this in a natural way. In some future, we + * may not use inheritance anymore. That is OK because no code outside of + * sce.js and sceSpecs.js would need to be aware of this detail. + */ + + this.$get = ['$parse', '$sniffer', '$sceDelegate', function( + $parse, $sniffer, $sceDelegate) { + // Prereq: Ensure that we're not running in IE8 quirks mode. In that mode, IE allows + // the "expression(javascript expression)" syntax which is insecure. + if (enabled && $sniffer.msie && $sniffer.msieDocumentMode < 8) { + throw $sceMinErr('iequirks', + 'Strict Contextual Escaping does not support Internet Explorer version < 9 in quirks ' + + 'mode. You can fix this by adding the text to the top of your HTML ' + + 'document. See http://docs.angularjs.org/api/ng.$sce for more information.'); + } + + var sce = shallowCopy(SCE_CONTEXTS); + + /** + * @ngdoc method + * @name $sce#isEnabled + * @kind function + * + * @return {Boolean} true if SCE is enabled, false otherwise. If you want to set the value, you + * have to do it at module config time on {@link ng.$sceProvider $sceProvider}. + * + * @description + * Returns a boolean indicating if SCE is enabled. + */ + sce.isEnabled = function () { + return enabled; + }; + sce.trustAs = $sceDelegate.trustAs; + sce.getTrusted = $sceDelegate.getTrusted; + sce.valueOf = $sceDelegate.valueOf; + + if (!enabled) { + sce.trustAs = sce.getTrusted = function(type, value) { return value; }; + sce.valueOf = identity; + } + + /** + * @ngdoc method + * @name $sce#parseAs + * + * @description + * Converts Angular {@link guide/expression expression} into a function. This is like {@link + * ng.$parse $parse} and is identical when the expression is a literal constant. Otherwise, it + * wraps the expression in a call to {@link ng.$sce#getTrusted $sce.getTrusted(*type*, + * *result*)} + * + * @param {string} type The kind of SCE context in which this result will be used. + * @param {string} expression String expression to compile. + * @returns {function(context, locals)} a function which represents the compiled expression: + * + * * `context` – `{object}` – an object against which any expressions embedded in the strings + * are evaluated against (typically a scope object). + * * `locals` – `{object=}` – local variables context object, useful for overriding values in + * `context`. + */ + sce.parseAs = function sceParseAs(type, expr) { + var parsed = $parse(expr); + if (parsed.literal && parsed.constant) { + return parsed; + } else { + return function sceParseAsTrusted(self, locals) { + return sce.getTrusted(type, parsed(self, locals)); + }; + } + }; + + /** + * @ngdoc method + * @name $sce#trustAs + * + * @description + * Delegates to {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}. As such, + * returns an object that is trusted by angular for use in specified strict contextual + * escaping contexts (such as ng-bind-html, ng-include, any src attribute + * interpolation, any dom event binding attribute interpolation such as for onclick, etc.) + * that uses the provided value. See * {@link ng.$sce $sce} for enabling strict contextual + * escaping. + * + * @param {string} type The kind of context in which this value is safe for use. e.g. url, + * resource_url, html, js and css. + * @param {*} value The value that that should be considered trusted/safe. + * @returns {*} A value that can be used to stand in for the provided `value` in places + * where Angular expects a $sce.trustAs() return value. + */ + + /** + * @ngdoc method + * @name $sce#trustAsHtml + * + * @description + * Shorthand method. `$sce.trustAsHtml(value)` → + * {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.HTML, value)`} + * + * @param {*} value The value to trustAs. + * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedHtml + * $sce.getTrustedHtml(value)} to obtain the original value. (privileged directives + * only accept expressions that are either literal constants or are the + * return value of {@link ng.$sce#trustAs $sce.trustAs}.) + */ + + /** + * @ngdoc method + * @name $sce#trustAsUrl + * + * @description + * Shorthand method. `$sce.trustAsUrl(value)` → + * {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.URL, value)`} + * + * @param {*} value The value to trustAs. + * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedUrl + * $sce.getTrustedUrl(value)} to obtain the original value. (privileged directives + * only accept expressions that are either literal constants or are the + * return value of {@link ng.$sce#trustAs $sce.trustAs}.) + */ + + /** + * @ngdoc method + * @name $sce#trustAsResourceUrl + * + * @description + * Shorthand method. `$sce.trustAsResourceUrl(value)` → + * {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.RESOURCE_URL, value)`} + * + * @param {*} value The value to trustAs. + * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedResourceUrl + * $sce.getTrustedResourceUrl(value)} to obtain the original value. (privileged directives + * only accept expressions that are either literal constants or are the return + * value of {@link ng.$sce#trustAs $sce.trustAs}.) + */ + + /** + * @ngdoc method + * @name $sce#trustAsJs + * + * @description + * Shorthand method. `$sce.trustAsJs(value)` → + * {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.JS, value)`} + * + * @param {*} value The value to trustAs. + * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedJs + * $sce.getTrustedJs(value)} to obtain the original value. (privileged directives + * only accept expressions that are either literal constants or are the + * return value of {@link ng.$sce#trustAs $sce.trustAs}.) + */ + + /** + * @ngdoc method + * @name $sce#getTrusted + * + * @description + * Delegates to {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted`}. As such, + * takes the result of a {@link ng.$sce#trustAs `$sce.trustAs`}() call and returns the + * originally supplied value if the queried context type is a supertype of the created type. + * If this condition isn't satisfied, throws an exception. + * + * @param {string} type The kind of context in which this value is to be used. + * @param {*} maybeTrusted The result of a prior {@link ng.$sce#trustAs `$sce.trustAs`} + * call. + * @returns {*} The value the was originally provided to + * {@link ng.$sce#trustAs `$sce.trustAs`} if valid in this context. + * Otherwise, throws an exception. + */ + + /** + * @ngdoc method + * @name $sce#getTrustedHtml + * + * @description + * Shorthand method. `$sce.getTrustedHtml(value)` → + * {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.HTML, value)`} + * + * @param {*} value The value to pass to `$sce.getTrusted`. + * @returns {*} The return value of `$sce.getTrusted($sce.HTML, value)` + */ + + /** + * @ngdoc method + * @name $sce#getTrustedCss + * + * @description + * Shorthand method. `$sce.getTrustedCss(value)` → + * {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.CSS, value)`} + * + * @param {*} value The value to pass to `$sce.getTrusted`. + * @returns {*} The return value of `$sce.getTrusted($sce.CSS, value)` + */ + + /** + * @ngdoc method + * @name $sce#getTrustedUrl + * + * @description + * Shorthand method. `$sce.getTrustedUrl(value)` → + * {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.URL, value)`} + * + * @param {*} value The value to pass to `$sce.getTrusted`. + * @returns {*} The return value of `$sce.getTrusted($sce.URL, value)` + */ + + /** + * @ngdoc method + * @name $sce#getTrustedResourceUrl + * + * @description + * Shorthand method. `$sce.getTrustedResourceUrl(value)` → + * {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.RESOURCE_URL, value)`} + * + * @param {*} value The value to pass to `$sceDelegate.getTrusted`. + * @returns {*} The return value of `$sce.getTrusted($sce.RESOURCE_URL, value)` + */ + + /** + * @ngdoc method + * @name $sce#getTrustedJs + * + * @description + * Shorthand method. `$sce.getTrustedJs(value)` → + * {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.JS, value)`} + * + * @param {*} value The value to pass to `$sce.getTrusted`. + * @returns {*} The return value of `$sce.getTrusted($sce.JS, value)` + */ + + /** + * @ngdoc method + * @name $sce#parseAsHtml + * + * @description + * Shorthand method. `$sce.parseAsHtml(expression string)` → + * {@link ng.$sce#parse `$sce.parseAs($sce.HTML, value)`} + * + * @param {string} expression String expression to compile. + * @returns {function(context, locals)} a function which represents the compiled expression: + * + * * `context` – `{object}` – an object against which any expressions embedded in the strings + * are evaluated against (typically a scope object). + * * `locals` – `{object=}` – local variables context object, useful for overriding values in + * `context`. + */ + + /** + * @ngdoc method + * @name $sce#parseAsCss + * + * @description + * Shorthand method. `$sce.parseAsCss(value)` → + * {@link ng.$sce#parse `$sce.parseAs($sce.CSS, value)`} + * + * @param {string} expression String expression to compile. + * @returns {function(context, locals)} a function which represents the compiled expression: + * + * * `context` – `{object}` – an object against which any expressions embedded in the strings + * are evaluated against (typically a scope object). + * * `locals` – `{object=}` – local variables context object, useful for overriding values in + * `context`. + */ + + /** + * @ngdoc method + * @name $sce#parseAsUrl + * + * @description + * Shorthand method. `$sce.parseAsUrl(value)` → + * {@link ng.$sce#parse `$sce.parseAs($sce.URL, value)`} + * + * @param {string} expression String expression to compile. + * @returns {function(context, locals)} a function which represents the compiled expression: + * + * * `context` – `{object}` – an object against which any expressions embedded in the strings + * are evaluated against (typically a scope object). + * * `locals` – `{object=}` – local variables context object, useful for overriding values in + * `context`. + */ + + /** + * @ngdoc method + * @name $sce#parseAsResourceUrl + * + * @description + * Shorthand method. `$sce.parseAsResourceUrl(value)` → + * {@link ng.$sce#parse `$sce.parseAs($sce.RESOURCE_URL, value)`} + * + * @param {string} expression String expression to compile. + * @returns {function(context, locals)} a function which represents the compiled expression: + * + * * `context` – `{object}` – an object against which any expressions embedded in the strings + * are evaluated against (typically a scope object). + * * `locals` – `{object=}` – local variables context object, useful for overriding values in + * `context`. + */ + + /** + * @ngdoc method + * @name $sce#parseAsJs + * + * @description + * Shorthand method. `$sce.parseAsJs(value)` → + * {@link ng.$sce#parse `$sce.parseAs($sce.JS, value)`} + * + * @param {string} expression String expression to compile. + * @returns {function(context, locals)} a function which represents the compiled expression: + * + * * `context` – `{object}` – an object against which any expressions embedded in the strings + * are evaluated against (typically a scope object). + * * `locals` – `{object=}` – local variables context object, useful for overriding values in + * `context`. + */ + + // Shorthand delegations. + var parse = sce.parseAs, + getTrusted = sce.getTrusted, + trustAs = sce.trustAs; + + forEach(SCE_CONTEXTS, function (enumValue, name) { + var lName = lowercase(name); + sce[camelCase("parse_as_" + lName)] = function (expr) { + return parse(enumValue, expr); + }; + sce[camelCase("get_trusted_" + lName)] = function (value) { + return getTrusted(enumValue, value); + }; + sce[camelCase("trust_as_" + lName)] = function (value) { + return trustAs(enumValue, value); + }; + }); + + return sce; + }]; +} + +/** + * !!! This is an undocumented "private" service !!! + * + * @name $sniffer + * @requires $window + * @requires $document + * + * @property {boolean} history Does the browser support html5 history api ? + * @property {boolean} hashchange Does the browser support hashchange event ? + * @property {boolean} transitions Does the browser support CSS transition events ? + * @property {boolean} animations Does the browser support CSS animation events ? + * + * @description + * This is very simple implementation of testing browser's features. + */ +function $SnifferProvider() { + this.$get = ['$window', '$document', function($window, $document) { + var eventSupport = {}, + android = + int((/android (\d+)/.exec(lowercase(($window.navigator || {}).userAgent)) || [])[1]), + boxee = /Boxee/i.test(($window.navigator || {}).userAgent), + document = $document[0] || {}, + documentMode = document.documentMode, + vendorPrefix, + vendorRegex = /^(Moz|webkit|O|ms)(?=[A-Z])/, + bodyStyle = document.body && document.body.style, + transitions = false, + animations = false, + match; + + if (bodyStyle) { + for(var prop in bodyStyle) { + if(match = vendorRegex.exec(prop)) { + vendorPrefix = match[0]; + vendorPrefix = vendorPrefix.substr(0, 1).toUpperCase() + vendorPrefix.substr(1); + break; + } + } + + if(!vendorPrefix) { + vendorPrefix = ('WebkitOpacity' in bodyStyle) && 'webkit'; + } + + transitions = !!(('transition' in bodyStyle) || (vendorPrefix + 'Transition' in bodyStyle)); + animations = !!(('animation' in bodyStyle) || (vendorPrefix + 'Animation' in bodyStyle)); + + if (android && (!transitions||!animations)) { + transitions = isString(document.body.style.webkitTransition); + animations = isString(document.body.style.webkitAnimation); + } + } + + + return { + // Android has history.pushState, but it does not update location correctly + // so let's not use the history API at all. + // http://code.google.com/p/android/issues/detail?id=17471 + // https://github.com/angular/angular.js/issues/904 + + // older webkit browser (533.9) on Boxee box has exactly the same problem as Android has + // so let's not use the history API also + // We are purposefully using `!(android < 4)` to cover the case when `android` is undefined + // jshint -W018 + history: !!($window.history && $window.history.pushState && !(android < 4) && !boxee), + // jshint +W018 + hashchange: 'onhashchange' in $window && + // IE8 compatible mode lies + (!documentMode || documentMode > 7), + hasEvent: function(event) { + // IE9 implements 'input' event it's so fubared that we rather pretend that it doesn't have + // it. In particular the event is not fired when backspace or delete key are pressed or + // when cut operation is performed. + if (event == 'input' && msie == 9) return false; + + if (isUndefined(eventSupport[event])) { + var divElm = document.createElement('div'); + eventSupport[event] = 'on' + event in divElm; + } + + return eventSupport[event]; + }, + csp: csp(), + vendorPrefix: vendorPrefix, + transitions : transitions, + animations : animations, + android: android, + msie : msie, + msieDocumentMode: documentMode + }; + }]; +} + +function $TimeoutProvider() { + this.$get = ['$rootScope', '$browser', '$q', '$exceptionHandler', + function($rootScope, $browser, $q, $exceptionHandler) { + var deferreds = {}; + + + /** + * @ngdoc service + * @name $timeout + * + * @description + * Angular's wrapper for `window.setTimeout`. The `fn` function is wrapped into a try/catch + * block and delegates any exceptions to + * {@link ng.$exceptionHandler $exceptionHandler} service. + * + * The return value of registering a timeout function is a promise, which will be resolved when + * the timeout is reached and the timeout function is executed. + * + * To cancel a timeout request, call `$timeout.cancel(promise)`. + * + * In tests you can use {@link ngMock.$timeout `$timeout.flush()`} to + * synchronously flush the queue of deferred functions. + * + * @param {function()} fn A function, whose execution should be delayed. + * @param {number=} [delay=0] Delay in milliseconds. + * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise + * will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block. + * @returns {Promise} Promise that will be resolved when the timeout is reached. The value this + * promise will be resolved with is the return value of the `fn` function. + * + */ + function timeout(fn, delay, invokeApply) { + var deferred = $q.defer(), + promise = deferred.promise, + skipApply = (isDefined(invokeApply) && !invokeApply), + timeoutId; + + timeoutId = $browser.defer(function() { + try { + deferred.resolve(fn()); + } catch(e) { + deferred.reject(e); + $exceptionHandler(e); + } + finally { + delete deferreds[promise.$$timeoutId]; + } + + if (!skipApply) $rootScope.$apply(); + }, delay); + + promise.$$timeoutId = timeoutId; + deferreds[timeoutId] = deferred; + + return promise; + } + + + /** + * @ngdoc method + * @name $timeout#cancel + * + * @description + * Cancels a task associated with the `promise`. As a result of this, the promise will be + * resolved with a rejection. + * + * @param {Promise=} promise Promise returned by the `$timeout` function. + * @returns {boolean} Returns `true` if the task hasn't executed yet and was successfully + * canceled. + */ + timeout.cancel = function(promise) { + if (promise && promise.$$timeoutId in deferreds) { + deferreds[promise.$$timeoutId].reject('canceled'); + delete deferreds[promise.$$timeoutId]; + return $browser.defer.cancel(promise.$$timeoutId); + } + return false; + }; + + return timeout; + }]; +} + +// NOTE: The usage of window and document instead of $window and $document here is +// deliberate. This service depends on the specific behavior of anchor nodes created by the +// browser (resolving and parsing URLs) that is unlikely to be provided by mock objects and +// cause us to break tests. In addition, when the browser resolves a URL for XHR, it +// doesn't know about mocked locations and resolves URLs to the real document - which is +// exactly the behavior needed here. There is little value is mocking these out for this +// service. +var urlParsingNode = document.createElement("a"); +var originUrl = urlResolve(window.location.href, true); + + +/** + * + * Implementation Notes for non-IE browsers + * ---------------------------------------- + * Assigning a URL to the href property of an anchor DOM node, even one attached to the DOM, + * results both in the normalizing and parsing of the URL. Normalizing means that a relative + * URL will be resolved into an absolute URL in the context of the application document. + * Parsing means that the anchor node's host, hostname, protocol, port, pathname and related + * properties are all populated to reflect the normalized URL. This approach has wide + * compatibility - Safari 1+, Mozilla 1+, Opera 7+,e etc. See + * http://www.aptana.com/reference/html/api/HTMLAnchorElement.html + * + * Implementation Notes for IE + * --------------------------- + * IE >= 8 and <= 10 normalizes the URL when assigned to the anchor node similar to the other + * browsers. However, the parsed components will not be set if the URL assigned did not specify + * them. (e.g. if you assign a.href = "foo", then a.protocol, a.host, etc. will be empty.) We + * work around that by performing the parsing in a 2nd step by taking a previously normalized + * URL (e.g. by assigning to a.href) and assigning it a.href again. This correctly populates the + * properties such as protocol, hostname, port, etc. + * + * IE7 does not normalize the URL when assigned to an anchor node. (Apparently, it does, if one + * uses the inner HTML approach to assign the URL as part of an HTML snippet - + * http://stackoverflow.com/a/472729) However, setting img[src] does normalize the URL. + * Unfortunately, setting img[src] to something like "javascript:foo" on IE throws an exception. + * Since the primary usage for normalizing URLs is to sanitize such URLs, we can't use that + * method and IE < 8 is unsupported. + * + * References: + * http://developer.mozilla.org/en-US/docs/Web/API/HTMLAnchorElement + * http://www.aptana.com/reference/html/api/HTMLAnchorElement.html + * http://url.spec.whatwg.org/#urlutils + * https://github.com/angular/angular.js/pull/2902 + * http://james.padolsey.com/javascript/parsing-urls-with-the-dom/ + * + * @kind function + * @param {string} url The URL to be parsed. + * @description Normalizes and parses a URL. + * @returns {object} Returns the normalized URL as a dictionary. + * + * | member name | Description | + * |---------------|----------------| + * | href | A normalized version of the provided URL if it was not an absolute URL | + * | protocol | The protocol including the trailing colon | + * | host | The host and port (if the port is non-default) of the normalizedUrl | + * | search | The search params, minus the question mark | + * | hash | The hash string, minus the hash symbol + * | hostname | The hostname + * | port | The port, without ":" + * | pathname | The pathname, beginning with "/" + * + */ +function urlResolve(url, base) { + var href = url; + + if (msie) { + // Normalize before parse. Refer Implementation Notes on why this is + // done in two steps on IE. + urlParsingNode.setAttribute("href", href); + href = urlParsingNode.href; + } + + urlParsingNode.setAttribute('href', href); + + // urlParsingNode provides the UrlUtils interface - http://url.spec.whatwg.org/#urlutils + return { + href: urlParsingNode.href, + protocol: urlParsingNode.protocol ? urlParsingNode.protocol.replace(/:$/, '') : '', + host: urlParsingNode.host, + search: urlParsingNode.search ? urlParsingNode.search.replace(/^\?/, '') : '', + hash: urlParsingNode.hash ? urlParsingNode.hash.replace(/^#/, '') : '', + hostname: urlParsingNode.hostname, + port: urlParsingNode.port, + pathname: (urlParsingNode.pathname.charAt(0) === '/') + ? urlParsingNode.pathname + : '/' + urlParsingNode.pathname + }; +} + +/** + * Parse a request URL and determine whether this is a same-origin request as the application document. + * + * @param {string|object} requestUrl The url of the request as a string that will be resolved + * or a parsed URL object. + * @returns {boolean} Whether the request is for the same origin as the application document. + */ +function urlIsSameOrigin(requestUrl) { + var parsed = (isString(requestUrl)) ? urlResolve(requestUrl) : requestUrl; + return (parsed.protocol === originUrl.protocol && + parsed.host === originUrl.host); +} + +/** + * @ngdoc service + * @name $window + * + * @description + * A reference to the browser's `window` object. While `window` + * is globally available in JavaScript, it causes testability problems, because + * it is a global variable. In angular we always refer to it through the + * `$window` service, so it may be overridden, removed or mocked for testing. + * + * Expressions, like the one defined for the `ngClick` directive in the example + * below, are evaluated with respect to the current scope. Therefore, there is + * no risk of inadvertently coding in a dependency on a global value in such an + * expression. + * + * @example + + + +
    + + +
    +     + + it('should display the greeting in the input box', function() { + element(by.model('greeting')).sendKeys('Hello, E2E Tests'); + // If we click the button it will block the test runner + // element(':button').click(); + }); + +     + */ +function $WindowProvider(){ + this.$get = valueFn(window); +} + +/* global currencyFilter: true, + dateFilter: true, + filterFilter: true, + jsonFilter: true, + limitToFilter: true, + lowercaseFilter: true, + numberFilter: true, + orderByFilter: true, + uppercaseFilter: true, + */ + +/** + * @ngdoc provider + * @name $filterProvider + * @description + * + * Filters are just functions which transform input to an output. However filters need to be + * Dependency Injected. To achieve this a filter definition consists of a factory function which is + * annotated with dependencies and is responsible for creating a filter function. + * + * ```js + * // Filter registration + * function MyModule($provide, $filterProvider) { + * // create a service to demonstrate injection (not always needed) + * $provide.value('greet', function(name){ + * return 'Hello ' + name + '!'; + * }); + * + * // register a filter factory which uses the + * // greet service to demonstrate DI. + * $filterProvider.register('greet', function(greet){ + * // return the filter function which uses the greet service + * // to generate salutation + * return function(text) { + * // filters need to be forgiving so check input validity + * return text && greet(text) || text; + * }; + * }); + * } + * ``` + * + * The filter function is registered with the `$injector` under the filter name suffix with + * `Filter`. + * + * ```js + * it('should be the same instance', inject( + * function($filterProvider) { + * $filterProvider.register('reverse', function(){ + * return ...; + * }); + * }, + * function($filter, reverseFilter) { + * expect($filter('reverse')).toBe(reverseFilter); + * }); + * ``` + * + * + * For more information about how angular filters work, and how to create your own filters, see + * {@link guide/filter Filters} in the Angular Developer Guide. + */ + +/** + * @ngdoc service + * @name $filter + * @kind function + * @description + * Filters are used for formatting data displayed to the user. + * + * The general syntax in templates is as follows: + * + * {{ expression [| filter_name[:parameter_value] ... ] }} + * + * @param {String} name Name of the filter function to retrieve + * @return {Function} the filter function + * @example + + +
    +

    {{ originalText }}

    +

    {{ filteredText }}

    +
    +     + + + angular.module('filterExample', []) + .controller('MainCtrl', function($scope, $filter) { + $scope.originalText = 'hello'; + $scope.filteredText = $filter('uppercase')($scope.originalText); + }); + +     + */ +$FilterProvider.$inject = ['$provide']; +function $FilterProvider($provide) { + var suffix = 'Filter'; + + /** + * @ngdoc method + * @name $filterProvider#register + * @param {string|Object} name Name of the filter function, or an object map of filters where + * the keys are the filter names and the values are the filter factories. + * @returns {Object} Registered filter instance, or if a map of filters was provided then a map + * of the registered filter instances. + */ + function register(name, factory) { + if(isObject(name)) { + var filters = {}; + forEach(name, function(filter, key) { + filters[key] = register(key, filter); + }); + return filters; + } else { + return $provide.factory(name + suffix, factory); + } + } + this.register = register; + + this.$get = ['$injector', function($injector) { + return function(name) { + return $injector.get(name + suffix); + }; + }]; + + //////////////////////////////////////// + + /* global + currencyFilter: false, + dateFilter: false, + filterFilter: false, + jsonFilter: false, + limitToFilter: false, + lowercaseFilter: false, + numberFilter: false, + orderByFilter: false, + uppercaseFilter: false, + */ + + register('currency', currencyFilter); + register('date', dateFilter); + register('filter', filterFilter); + register('json', jsonFilter); + register('limitTo', limitToFilter); + register('lowercase', lowercaseFilter); + register('number', numberFilter); + register('orderBy', orderByFilter); + register('uppercase', uppercaseFilter); +} + +/** + * @ngdoc filter + * @name filter + * @kind function + * + * @description + * Selects a subset of items from `array` and returns it as a new array. + * + * @param {Array} array The source array. + * @param {string|Object|function()} expression The predicate to be used for selecting items from + * `array`. + * + * Can be one of: + * + * - `string`: The string is evaluated as an expression and the resulting value is used for substring match against + * the contents of the `array`. All strings or objects with string properties in `array` that contain this string + * will be returned. The predicate can be negated by prefixing the string with `!`. + * + * - `Object`: A pattern object can be used to filter specific properties on objects contained + * by `array`. For example `{name:"M", phone:"1"}` predicate will return an array of items + * which have property `name` containing "M" and property `phone` containing "1". A special + * property name `$` can be used (as in `{$:"text"}`) to accept a match against any + * property of the object. That's equivalent to the simple substring match with a `string` + * as described above. The predicate can be negated by prefixing the string with `!`. + * For Example `{name: "!M"}` predicate will return an array of items which have property `name` + * not containing "M". + * + * - `function(value)`: A predicate function can be used to write arbitrary filters. The function is + * called for each element of `array`. The final result is an array of those elements that + * the predicate returned true for. + * + * @param {function(actual, expected)|true|undefined} comparator Comparator which is used in + * determining if the expected value (from the filter expression) and actual value (from + * the object in the array) should be considered a match. + * + * Can be one of: + * + * - `function(actual, expected)`: + * The function will be given the object value and the predicate value to compare and + * should return true if the item should be included in filtered result. + * + * - `true`: A shorthand for `function(actual, expected) { return angular.equals(expected, actual)}`. + * this is essentially strict comparison of expected and actual. + * + * - `false|undefined`: A short hand for a function which will look for a substring match in case + * insensitive way. + * + * @example + + +
    + + Search: + + + + + + +
    NamePhone
    {{friend.name}}{{friend.phone}}
    +
    + Any:
    + Name only
    + Phone only
    + Equality
    + + + + + + +
    NamePhone
    {{friendObj.name}}{{friendObj.phone}}
    +     + + var expectFriendNames = function(expectedNames, key) { + element.all(by.repeater(key + ' in friends').column(key + '.name')).then(function(arr) { + arr.forEach(function(wd, i) { + expect(wd.getText()).toMatch(expectedNames[i]); + }); + }); + }; + + it('should search across all fields when filtering with a string', function() { + var searchText = element(by.model('searchText')); + searchText.clear(); + searchText.sendKeys('m'); + expectFriendNames(['Mary', 'Mike', 'Adam'], 'friend'); + + searchText.clear(); + searchText.sendKeys('76'); + expectFriendNames(['John', 'Julie'], 'friend'); + }); + + it('should search in specific fields when filtering with a predicate object', function() { + var searchAny = element(by.model('search.$')); + searchAny.clear(); + searchAny.sendKeys('i'); + expectFriendNames(['Mary', 'Mike', 'Julie', 'Juliette'], 'friendObj'); + }); + it('should use a equal comparison when comparator is true', function() { + var searchName = element(by.model('search.name')); + var strict = element(by.model('strict')); + searchName.clear(); + searchName.sendKeys('Julie'); + strict.click(); + expectFriendNames(['Julie'], 'friendObj'); + }); + +     + */ +function filterFilter() { + return function(array, expression, comparator) { + if (!isArray(array)) return array; + + var comparatorType = typeof(comparator), + predicates = []; + + predicates.check = function(value) { + for (var j = 0; j < predicates.length; j++) { + if(!predicates[j](value)) { + return false; + } + } + return true; + }; + + if (comparatorType !== 'function') { + if (comparatorType === 'boolean' && comparator) { + comparator = function(obj, text) { + return angular.equals(obj, text); + }; + } else { + comparator = function(obj, text) { + if (obj && text && typeof obj === 'object' && typeof text === 'object') { + for (var objKey in obj) { + if (objKey.charAt(0) !== '$' && hasOwnProperty.call(obj, objKey) && + comparator(obj[objKey], text[objKey])) { + return true; + } + } + return false; + } + text = (''+text).toLowerCase(); + return (''+obj).toLowerCase().indexOf(text) > -1; + }; + } + } + + var search = function(obj, text){ + if (typeof text == 'string' && text.charAt(0) === '!') { + return !search(obj, text.substr(1)); + } + switch (typeof obj) { + case "boolean": + case "number": + case "string": + return comparator(obj, text); + case "object": + switch (typeof text) { + case "object": + return comparator(obj, text); + default: + for ( var objKey in obj) { + if (objKey.charAt(0) !== '$' && search(obj[objKey], text)) { + return true; + } + } + break; + } + return false; + case "array": + for ( var i = 0; i < obj.length; i++) { + if (search(obj[i], text)) { + return true; + } + } + return false; + default: + return false; + } + }; + switch (typeof expression) { + case "boolean": + case "number": + case "string": + // Set up expression object and fall through + expression = {$:expression}; + // jshint -W086 + case "object": + // jshint +W086 + for (var key in expression) { + (function(path) { + if (typeof expression[path] === 'undefined') return; + predicates.push(function(value) { + return search(path == '$' ? value : (value && value[path]), expression[path]); + }); + })(key); + } + break; + case 'function': + predicates.push(expression); + break; + default: + return array; + } + var filtered = []; + for ( var j = 0; j < array.length; j++) { + var value = array[j]; + if (predicates.check(value)) { + filtered.push(value); + } + } + return filtered; + }; +} + +/** + * @ngdoc filter + * @name currency + * @kind function + * + * @description + * Formats a number as a currency (ie $1,234.56). When no currency symbol is provided, default + * symbol for current locale is used. + * + * @param {number} amount Input to filter. + * @param {string=} symbol Currency symbol or identifier to be displayed. + * @returns {string} Formatted number. + * + * + * @example + + + +
    +
    + default currency symbol ($): {{amount | currency}}
    + custom currency identifier (USD$): {{amount | currency:"USD$"}} +
    +     + + it('should init with 1234.56', function() { + expect(element(by.id('currency-default')).getText()).toBe('$1,234.56'); + expect(element(by.binding('amount | currency:"USD$"')).getText()).toBe('USD$1,234.56'); + }); + it('should update', function() { + if (browser.params.browser == 'safari') { + // Safari does not understand the minus key. See + // https://github.com/angular/protractor/issues/481 + return; + } + element(by.model('amount')).clear(); + element(by.model('amount')).sendKeys('-1234'); + expect(element(by.id('currency-default')).getText()).toBe('($1,234.00)'); + expect(element(by.binding('amount | currency:"USD$"')).getText()).toBe('(USD$1,234.00)'); + }); + +     + */ +currencyFilter.$inject = ['$locale']; +function currencyFilter($locale) { + var formats = $locale.NUMBER_FORMATS; + return function(amount, currencySymbol){ + if (isUndefined(currencySymbol)) currencySymbol = formats.CURRENCY_SYM; + return formatNumber(amount, formats.PATTERNS[1], formats.GROUP_SEP, formats.DECIMAL_SEP, 2). + replace(/\u00A4/g, currencySymbol); + }; +} + +/** + * @ngdoc filter + * @name number + * @kind function + * + * @description + * Formats a number as text. + * + * If the input is not a number an empty string is returned. + * + * @param {number|string} number Number to format. + * @param {(number|string)=} fractionSize Number of decimal places to round the number to. + * If this is not provided then the fraction size is computed from the current locale's number + * formatting pattern. In the case of the default locale, it will be 3. + * @returns {string} Number rounded to decimalPlaces and places a “,” after each third digit. + * + * @example + + + +
    + Enter number:
    + Default formatting: {{val | number}}
    + No fractions: {{val | number:0}}
    + Negative number: {{-val | number:4}} +
    +     + + it('should format numbers', function() { + expect(element(by.id('number-default')).getText()).toBe('1,234.568'); + expect(element(by.binding('val | number:0')).getText()).toBe('1,235'); + expect(element(by.binding('-val | number:4')).getText()).toBe('-1,234.5679'); + }); + + it('should update', function() { + element(by.model('val')).clear(); + element(by.model('val')).sendKeys('3374.333'); + expect(element(by.id('number-default')).getText()).toBe('3,374.333'); + expect(element(by.binding('val | number:0')).getText()).toBe('3,374'); + expect(element(by.binding('-val | number:4')).getText()).toBe('-3,374.3330'); + }); + +     + */ + + +numberFilter.$inject = ['$locale']; +function numberFilter($locale) { + var formats = $locale.NUMBER_FORMATS; + return function(number, fractionSize) { + return formatNumber(number, formats.PATTERNS[0], formats.GROUP_SEP, formats.DECIMAL_SEP, + fractionSize); + }; +} + +var DECIMAL_SEP = '.'; +function formatNumber(number, pattern, groupSep, decimalSep, fractionSize) { + if (number == null || !isFinite(number) || isObject(number)) return ''; + + var isNegative = number < 0; + number = Math.abs(number); + var numStr = number + '', + formatedText = '', + parts = []; + + var hasExponent = false; + if (numStr.indexOf('e') !== -1) { + var match = numStr.match(/([\d\.]+)e(-?)(\d+)/); + if (match && match[2] == '-' && match[3] > fractionSize + 1) { + numStr = '0'; + number = 0; + } else { + formatedText = numStr; + hasExponent = true; + } + } + + if (!hasExponent) { + var fractionLen = (numStr.split(DECIMAL_SEP)[1] || '').length; + + // determine fractionSize if it is not specified + if (isUndefined(fractionSize)) { + fractionSize = Math.min(Math.max(pattern.minFrac, fractionLen), pattern.maxFrac); + } + + // safely round numbers in JS without hitting imprecisions of floating-point arithmetics + // inspired by: + // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/round + number = +(Math.round(+(number.toString() + 'e' + fractionSize)).toString() + 'e' + -fractionSize); + + if (number === 0) { + isNegative = false; + } + + var fraction = ('' + number).split(DECIMAL_SEP); + var whole = fraction[0]; + fraction = fraction[1] || ''; + + var i, pos = 0, + lgroup = pattern.lgSize, + group = pattern.gSize; + + if (whole.length >= (lgroup + group)) { + pos = whole.length - lgroup; + for (i = 0; i < pos; i++) { + if ((pos - i)%group === 0 && i !== 0) { + formatedText += groupSep; + } + formatedText += whole.charAt(i); + } + } + + for (i = pos; i < whole.length; i++) { + if ((whole.length - i)%lgroup === 0 && i !== 0) { + formatedText += groupSep; + } + formatedText += whole.charAt(i); + } + + // format fraction part. + while(fraction.length < fractionSize) { + fraction += '0'; + } + + if (fractionSize && fractionSize !== "0") formatedText += decimalSep + fraction.substr(0, fractionSize); + } else { + + if (fractionSize > 0 && number > -1 && number < 1) { + formatedText = number.toFixed(fractionSize); + } + } + + parts.push(isNegative ? pattern.negPre : pattern.posPre); + parts.push(formatedText); + parts.push(isNegative ? pattern.negSuf : pattern.posSuf); + return parts.join(''); +} + +function padNumber(num, digits, trim) { + var neg = ''; + if (num < 0) { + neg = '-'; + num = -num; + } + num = '' + num; + while(num.length < digits) num = '0' + num; + if (trim) + num = num.substr(num.length - digits); + return neg + num; +} + + +function dateGetter(name, size, offset, trim) { + offset = offset || 0; + return function(date) { + var value = date['get' + name](); + if (offset > 0 || value > -offset) + value += offset; + if (value === 0 && offset == -12 ) value = 12; + return padNumber(value, size, trim); + }; +} + +function dateStrGetter(name, shortForm) { + return function(date, formats) { + var value = date['get' + name](); + var get = uppercase(shortForm ? ('SHORT' + name) : name); + + return formats[get][value]; + }; +} + +function timeZoneGetter(date) { + var zone = -1 * date.getTimezoneOffset(); + var paddedZone = (zone >= 0) ? "+" : ""; + + paddedZone += padNumber(Math[zone > 0 ? 'floor' : 'ceil'](zone / 60), 2) + + padNumber(Math.abs(zone % 60), 2); + + return paddedZone; +} + +function ampmGetter(date, formats) { + return date.getHours() < 12 ? formats.AMPMS[0] : formats.AMPMS[1]; +} + +var DATE_FORMATS = { + yyyy: dateGetter('FullYear', 4), + yy: dateGetter('FullYear', 2, 0, true), + y: dateGetter('FullYear', 1), + MMMM: dateStrGetter('Month'), + MMM: dateStrGetter('Month', true), + MM: dateGetter('Month', 2, 1), + M: dateGetter('Month', 1, 1), + dd: dateGetter('Date', 2), + d: dateGetter('Date', 1), + HH: dateGetter('Hours', 2), + H: dateGetter('Hours', 1), + hh: dateGetter('Hours', 2, -12), + h: dateGetter('Hours', 1, -12), + mm: dateGetter('Minutes', 2), + m: dateGetter('Minutes', 1), + ss: dateGetter('Seconds', 2), + s: dateGetter('Seconds', 1), + // while ISO 8601 requires fractions to be prefixed with `.` or `,` + // we can be just safely rely on using `sss` since we currently don't support single or two digit fractions + sss: dateGetter('Milliseconds', 3), + EEEE: dateStrGetter('Day'), + EEE: dateStrGetter('Day', true), + a: ampmGetter, + Z: timeZoneGetter +}; + +var DATE_FORMATS_SPLIT = /((?:[^yMdHhmsaZE']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z))(.*)/, + NUMBER_STRING = /^\-?\d+$/; + +/** + * @ngdoc filter + * @name date + * @kind function + * + * @description + * Formats `date` to a string based on the requested `format`. + * + * `format` string can be composed of the following elements: + * + * * `'yyyy'`: 4 digit representation of year (e.g. AD 1 => 0001, AD 2010 => 2010) + * * `'yy'`: 2 digit representation of year, padded (00-99). (e.g. AD 2001 => 01, AD 2010 => 10) + * * `'y'`: 1 digit representation of year, e.g. (AD 1 => 1, AD 199 => 199) + * * `'MMMM'`: Month in year (January-December) + * * `'MMM'`: Month in year (Jan-Dec) + * * `'MM'`: Month in year, padded (01-12) + * * `'M'`: Month in year (1-12) + * * `'dd'`: Day in month, padded (01-31) + * * `'d'`: Day in month (1-31) + * * `'EEEE'`: Day in Week,(Sunday-Saturday) + * * `'EEE'`: Day in Week, (Sun-Sat) + * * `'HH'`: Hour in day, padded (00-23) + * * `'H'`: Hour in day (0-23) + * * `'hh'`: Hour in am/pm, padded (01-12) + * * `'h'`: Hour in am/pm, (1-12) + * * `'mm'`: Minute in hour, padded (00-59) + * * `'m'`: Minute in hour (0-59) + * * `'ss'`: Second in minute, padded (00-59) + * * `'s'`: Second in minute (0-59) + * * `'.sss' or ',sss'`: Millisecond in second, padded (000-999) + * * `'a'`: am/pm marker + * * `'Z'`: 4 digit (+sign) representation of the timezone offset (-1200-+1200) + * + * `format` string can also be one of the following predefined + * {@link guide/i18n localizable formats}: + * + * * `'medium'`: equivalent to `'MMM d, y h:mm:ss a'` for en_US locale + * (e.g. Sep 3, 2010 12:05:08 pm) + * * `'short'`: equivalent to `'M/d/yy h:mm a'` for en_US locale (e.g. 9/3/10 12:05 pm) + * * `'fullDate'`: equivalent to `'EEEE, MMMM d,y'` for en_US locale + * (e.g. Friday, September 3, 2010) + * * `'longDate'`: equivalent to `'MMMM d, y'` for en_US locale (e.g. September 3, 2010) + * * `'mediumDate'`: equivalent to `'MMM d, y'` for en_US locale (e.g. Sep 3, 2010) + * * `'shortDate'`: equivalent to `'M/d/yy'` for en_US locale (e.g. 9/3/10) + * * `'mediumTime'`: equivalent to `'h:mm:ss a'` for en_US locale (e.g. 12:05:08 pm) + * * `'shortTime'`: equivalent to `'h:mm a'` for en_US locale (e.g. 12:05 pm) + * + * `format` string can contain literal values. These need to be escaped by surrounding with single quotes (e.g. + * `"h 'in the morning'"`). In order to output a single quote, escape it - i.e., two single quotes in a sequence + * (e.g. `"h 'o''clock'"`). + * + * @param {(Date|number|string)} date Date to format either as Date object, milliseconds (string or + * number) or various ISO 8601 datetime string formats (e.g. yyyy-MM-ddTHH:mm:ss.sssZ and its + * shorter versions like yyyy-MM-ddTHH:mmZ, yyyy-MM-dd or yyyyMMddTHHmmssZ). If no timezone is + * specified in the string input, the time is considered to be in the local timezone. + * @param {string=} format Formatting rules (see Description). If not specified, + * `mediumDate` is used. + * @returns {string} Formatted string or the input if input is not recognized as date/millis. + * + * @example + + + {{1288323623006 | date:'medium'}}: + {{1288323623006 | date:'medium'}}
    + {{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}: + {{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}
    + {{1288323623006 | date:'MM/dd/yyyy @ h:mma'}}: + {{'1288323623006' | date:'MM/dd/yyyy @ h:mma'}}
    + {{1288323623006 | date:"MM/dd/yyyy 'at' h:mma"}}: + {{'1288323623006' | date:"MM/dd/yyyy 'at' h:mma"}}
    +     + + it('should format date', function() { + expect(element(by.binding("1288323623006 | date:'medium'")).getText()). + toMatch(/Oct 2\d, 2010 \d{1,2}:\d{2}:\d{2} (AM|PM)/); + expect(element(by.binding("1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'")).getText()). + toMatch(/2010\-10\-2\d \d{2}:\d{2}:\d{2} (\-|\+)?\d{4}/); + expect(element(by.binding("'1288323623006' | date:'MM/dd/yyyy @ h:mma'")).getText()). + toMatch(/10\/2\d\/2010 @ \d{1,2}:\d{2}(AM|PM)/); + expect(element(by.binding("'1288323623006' | date:\"MM/dd/yyyy 'at' h:mma\"")).getText()). + toMatch(/10\/2\d\/2010 at \d{1,2}:\d{2}(AM|PM)/); + }); + +     + */ +dateFilter.$inject = ['$locale']; +function dateFilter($locale) { + + + var R_ISO8601_STR = /^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/; + // 1 2 3 4 5 6 7 8 9 10 11 + function jsonStringToDate(string) { + var match; + if (match = string.match(R_ISO8601_STR)) { + var date = new Date(0), + tzHour = 0, + tzMin = 0, + dateSetter = match[8] ? date.setUTCFullYear : date.setFullYear, + timeSetter = match[8] ? date.setUTCHours : date.setHours; + + if (match[9]) { + tzHour = int(match[9] + match[10]); + tzMin = int(match[9] + match[11]); + } + dateSetter.call(date, int(match[1]), int(match[2]) - 1, int(match[3])); + var h = int(match[4]||0) - tzHour; + var m = int(match[5]||0) - tzMin; + var s = int(match[6]||0); + var ms = Math.round(parseFloat('0.' + (match[7]||0)) * 1000); + timeSetter.call(date, h, m, s, ms); + return date; + } + return string; + } + + + return function(date, format) { + var text = '', + parts = [], + fn, match; + + format = format || 'mediumDate'; + format = $locale.DATETIME_FORMATS[format] || format; + if (isString(date)) { + date = NUMBER_STRING.test(date) ? int(date) : jsonStringToDate(date); + } + + if (isNumber(date)) { + date = new Date(date); + } + + if (!isDate(date)) { + return date; + } + + while(format) { + match = DATE_FORMATS_SPLIT.exec(format); + if (match) { + parts = concat(parts, match, 1); + format = parts.pop(); + } else { + parts.push(format); + format = null; + } + } + + forEach(parts, function(value){ + fn = DATE_FORMATS[value]; + text += fn ? fn(date, $locale.DATETIME_FORMATS) + : value.replace(/(^'|'$)/g, '').replace(/''/g, "'"); + }); + + return text; + }; +} + + +/** + * @ngdoc filter + * @name json + * @kind function + * + * @description + * Allows you to convert a JavaScript object into JSON string. + * + * This filter is mostly useful for debugging. When using the double curly {{value}} notation + * the binding is automatically converted to JSON. + * + * @param {*} object Any JavaScript object (including arrays and primitive types) to filter. + * @returns {string} JSON string. + * + * + * @example + + + 
    {{ {'name':'value'} | json }}
    +     + + it('should jsonify filtered objects', function() { + expect(element(by.binding("{'name':'value'}")).getText()).toMatch(/\{\n "name": ?"value"\n}/); + }); + +     + * + */ +function jsonFilter() { + return function(object) { + return toJson(object, true); + }; +} + + +/** + * @ngdoc filter + * @name lowercase + * @kind function + * @description + * Converts string to lowercase. + * @see angular.lowercase + */ +var lowercaseFilter = valueFn(lowercase); + + +/** + * @ngdoc filter + * @name uppercase + * @kind function + * @description + * Converts string to uppercase. + * @see angular.uppercase + */ +var uppercaseFilter = valueFn(uppercase); + +/** + * @ngdoc filter + * @name limitTo + * @kind function + * + * @description + * Creates a new array or string containing only a specified number of elements. The elements + * are taken from either the beginning or the end of the source array or string, as specified by + * the value and sign (positive or negative) of `limit`. + * + * @param {Array|string} input Source array or string to be limited. + * @param {string|number} limit The length of the returned array or string. If the `limit` number + * is positive, `limit` number of items from the beginning of the source array/string are copied. + * If the number is negative, `limit` number of items from the end of the source array/string + * are copied. The `limit` will be trimmed if it exceeds `array.length` + * @returns {Array|string} A new sub-array or substring of length `limit` or less if input array + * had less than `limit` elements. + * + * @example + + + +
    + Limit {{numbers}} to: +

    Output numbers: {{ numbers | limitTo:numLimit }}

    + Limit {{letters}} to: +

    Output letters: {{ letters | limitTo:letterLimit }}

    +
    +     + + var numLimitInput = element(by.model('numLimit')); + var letterLimitInput = element(by.model('letterLimit')); + var limitedNumbers = element(by.binding('numbers | limitTo:numLimit')); + var limitedLetters = element(by.binding('letters | limitTo:letterLimit')); + + it('should limit the number array to first three items', function() { + expect(numLimitInput.getAttribute('value')).toBe('3'); + expect(letterLimitInput.getAttribute('value')).toBe('3'); + expect(limitedNumbers.getText()).toEqual('Output numbers: [1,2,3]'); + expect(limitedLetters.getText()).toEqual('Output letters: abc'); + }); + + it('should update the output when -3 is entered', function() { + numLimitInput.clear(); + numLimitInput.sendKeys('-3'); + letterLimitInput.clear(); + letterLimitInput.sendKeys('-3'); + expect(limitedNumbers.getText()).toEqual('Output numbers: [7,8,9]'); + expect(limitedLetters.getText()).toEqual('Output letters: ghi'); + }); + + it('should not exceed the maximum size of input array', function() { + numLimitInput.clear(); + numLimitInput.sendKeys('100'); + letterLimitInput.clear(); + letterLimitInput.sendKeys('100'); + expect(limitedNumbers.getText()).toEqual('Output numbers: [1,2,3,4,5,6,7,8,9]'); + expect(limitedLetters.getText()).toEqual('Output letters: abcdefghi'); + }); + +     + */ +function limitToFilter(){ + return function(input, limit) { + if (!isArray(input) && !isString(input)) return input; + + if (Math.abs(Number(limit)) === Infinity) { + limit = Number(limit); + } else { + limit = int(limit); + } + + if (isString(input)) { + //NaN check on limit + if (limit) { + return limit >= 0 ? input.slice(0, limit) : input.slice(limit, input.length); + } else { + return ""; + } + } + + var out = [], + i, n; + + // if abs(limit) exceeds maximum length, trim it + if (limit > input.length) + limit = input.length; + else if (limit < -input.length) + limit = -input.length; + + if (limit > 0) { + i = 0; + n = limit; + } else { + i = input.length + limit; + n = input.length; + } + + for (; i} expression A predicate to be + * used by the comparator to determine the order of elements. + * + * Can be one of: + * + * - `function`: Getter function. The result of this function will be sorted using the + * `<`, `=`, `>` operator. + * - `string`: An Angular expression. The result of this expression is used to compare elements + * (for example `name` to sort by a property called `name` or `name.substr(0, 3)` to sort by + * 3 first characters of a property called `name`). The result of a constant expression + * is interpreted as a property name to be used in comparisons (for example `"special name"` + * to sort object by the value of their `special name` property). An expression can be + * optionally prefixed with `+` or `-` to control ascending or descending sort order + * (for example, `+name` or `-name`). + * - `Array`: An array of function or string predicates. The first predicate in the array + * is used for sorting, but when two items are equivalent, the next predicate is used. + * + * @param {boolean=} reverse Reverse the order of the array. + * @returns {Array} Sorted copy of the source array. + * + * @example + + + +
    + 
    Sorting predicate = {{predicate}}; reverse = {{reverse}}
    +
    + [ unsorted ] + + + + + + + + + + + +
    Name + (^)Phone NumberAge
    {{friend.name}}{{friend.phone}}{{friend.age}}
    +
    +     +     + * + * It's also possible to call the orderBy filter manually, by injecting `$filter`, retrieving the + * filter routine with `$filter('orderBy')`, and calling the returned filter routine with the + * desired parameters. + * + * Example: + * + * @example + + +
    + + + + + + + + + + + +
    Name + (^)Phone NumberAge
    {{friend.name}}{{friend.phone}}{{friend.age}}
    +
    +     + + + angular.module('orderByExample', []) + .controller('ExampleController', ['$scope', '$filter', function($scope, $filter) { + var orderBy = $filter('orderBy'); + $scope.friends = [ + { name: 'John', phone: '555-1212', age: 10 }, + { name: 'Mary', phone: '555-9876', age: 19 }, + { name: 'Mike', phone: '555-4321', age: 21 }, + { name: 'Adam', phone: '555-5678', age: 35 }, + { name: 'Julie', phone: '555-8765', age: 29 } + ]; + $scope.order = function(predicate, reverse) { + $scope.friends = orderBy($scope.friends, predicate, reverse); + }; + $scope.order('-age',false); + }]); + +     + */ +orderByFilter.$inject = ['$parse']; +function orderByFilter($parse){ + return function(array, sortPredicate, reverseOrder) { + if (!(isArrayLike(array))) return array; + if (!sortPredicate) return array; + sortPredicate = isArray(sortPredicate) ? sortPredicate: [sortPredicate]; + sortPredicate = map(sortPredicate, function(predicate){ + var descending = false, get = predicate || identity; + if (isString(predicate)) { + if ((predicate.charAt(0) == '+' || predicate.charAt(0) == '-')) { + descending = predicate.charAt(0) == '-'; + predicate = predicate.substring(1); + } + get = $parse(predicate); + if (get.constant) { + var key = get(); + return reverseComparator(function(a,b) { + return compare(a[key], b[key]); + }, descending); + } + } + return reverseComparator(function(a,b){ + return compare(get(a),get(b)); + }, descending); + }); + var arrayCopy = []; + for ( var i = 0; i < array.length; i++) { arrayCopy.push(array[i]); } + return arrayCopy.sort(reverseComparator(comparator, reverseOrder)); + + function comparator(o1, o2){ + for ( var i = 0; i < sortPredicate.length; i++) { + var comp = sortPredicate[i](o1, o2); + if (comp !== 0) return comp; + } + return 0; + } + function reverseComparator(comp, descending) { + return toBoolean(descending) + ? function(a,b){return comp(b,a);} + : comp; + } + function compare(v1, v2){ + var t1 = typeof v1; + var t2 = typeof v2; + if (t1 == t2) { + if (isDate(v1) && isDate(v2)) { + v1 = v1.valueOf(); + v2 = v2.valueOf(); + } + if (t1 == "string") { + v1 = v1.toLowerCase(); + v2 = v2.toLowerCase(); + } + if (v1 === v2) return 0; + return v1 < v2 ? -1 : 1; + } else { + return t1 < t2 ? -1 : 1; + } + } + }; +} + +function ngDirective(directive) { + if (isFunction(directive)) { + directive = { + link: directive + }; + } + directive.restrict = directive.restrict || 'AC'; + return valueFn(directive); +} + +/** + * @ngdoc directive + * @name a + * @restrict E + * + * @description + * Modifies the default behavior of the html A tag so that the default action is prevented when + * the href attribute is empty. + * + * This change permits the easy creation of action links with the `ngClick` directive + * without changing the location or causing page reloads, e.g.: + * `Add Item` + */ +var htmlAnchorDirective = valueFn({ + restrict: 'E', + compile: function(element, attr) { + + if (msie <= 8) { + + // turn link into a stylable link in IE + // but only if it doesn't have name attribute, in which case it's an anchor + if (!attr.href && !attr.name) { + attr.$set('href', ''); + } + + // add a comment node to anchors to workaround IE bug that causes element content to be reset + // to new attribute content if attribute is updated with value containing @ and element also + // contains value with @ + // see issue #1949 + element.append(document.createComment('IE fix')); + } + + if (!attr.href && !attr.xlinkHref && !attr.name) { + return function(scope, element) { + // SVGAElement does not use the href attribute, but rather the 'xlinkHref' attribute. + var href = toString.call(element.prop('href')) === '[object SVGAnimatedString]' ? + 'xlink:href' : 'href'; + element.on('click', function(event){ + // if we have no href url, then don't navigate anywhere. + if (!element.attr(href)) { + event.preventDefault(); + } + }); + }; + } + } +}); + +/** + * @ngdoc directive + * @name ngHref + * @restrict A + * @priority 99 + * + * @description + * Using Angular markup like `{{hash}}` in an href attribute will + * make the link go to the wrong URL if the user clicks it before + * Angular has a chance to replace the `{{hash}}` markup with its + * value. Until Angular replaces the markup the link will be broken + * and will most likely return a 404 error. + * + * The `ngHref` directive solves this problem. + * + * The wrong way to write it: + * ```html + * + * ``` + * + * The correct way to write it: + * ```html + * + * ``` + * + * @element A + * @param {template} ngHref any string which can contain `{{}}` markup. + * + * @example + * This example shows various combinations of `href`, `ng-href` and `ng-click` attributes + * in links and their different behaviors: + + +
    +     link 1 (link, don't reload)
    + link 2 (link, don't reload)
    + link 3 (link, reload!)
    + anchor (link, don't reload)
    + anchor (no link)
    + link (link, change location) +     + + it('should execute ng-click but not reload when href without value', function() { + element(by.id('link-1')).click(); + expect(element(by.model('value')).getAttribute('value')).toEqual('1'); + expect(element(by.id('link-1')).getAttribute('href')).toBe(''); + }); + + it('should execute ng-click but not reload when href empty string', function() { + element(by.id('link-2')).click(); + expect(element(by.model('value')).getAttribute('value')).toEqual('2'); + expect(element(by.id('link-2')).getAttribute('href')).toBe(''); + }); + + it('should execute ng-click and change url when ng-href specified', function() { + expect(element(by.id('link-3')).getAttribute('href')).toMatch(/\/123$/); + + element(by.id('link-3')).click(); + + // At this point, we navigate away from an Angular page, so we need + // to use browser.driver to get the base webdriver. + + browser.wait(function() { + return browser.driver.getCurrentUrl().then(function(url) { + return url.match(/\/123$/); + }); + }, 5000, 'page should navigate to /123'); + }); + + xit('should execute ng-click but not reload when href empty string and name specified', function() { + element(by.id('link-4')).click(); + expect(element(by.model('value')).getAttribute('value')).toEqual('4'); + expect(element(by.id('link-4')).getAttribute('href')).toBe(''); + }); + + it('should execute ng-click but not reload when no href but name specified', function() { + element(by.id('link-5')).click(); + expect(element(by.model('value')).getAttribute('value')).toEqual('5'); + expect(element(by.id('link-5')).getAttribute('href')).toBe(null); + }); + + it('should only change url when only ng-href', function() { + element(by.model('value')).clear(); + element(by.model('value')).sendKeys('6'); + expect(element(by.id('link-6')).getAttribute('href')).toMatch(/\/6$/); + + element(by.id('link-6')).click(); + + // At this point, we navigate away from an Angular page, so we need + // to use browser.driver to get the base webdriver. + browser.wait(function() { + return browser.driver.getCurrentUrl().then(function(url) { + return url.match(/\/6$/); + }); + }, 5000, 'page should navigate to /6'); + }); + + + */ + +/** + * @ngdoc directive + * @name ngSrc + * @restrict A + * @priority 99 + * + * @description + * Using Angular markup like `{{hash}}` in a `src` attribute doesn't + * work right: The browser will fetch from the URL with the literal + * text `{{hash}}` until Angular replaces the expression inside + * `{{hash}}`. The `ngSrc` directive solves this problem. + * + * The buggy way to write it: + * ```html + * + * ``` + * + * The correct way to write it: + * ```html + * + * ``` + * + * @element IMG + * @param {template} ngSrc any string which can contain `{{}}` markup. + */ + +/** + * @ngdoc directive + * @name ngSrcset + * @restrict A + * @priority 99 + * + * @description + * Using Angular markup like `{{hash}}` in a `srcset` attribute doesn't + * work right: The browser will fetch from the URL with the literal + * text `{{hash}}` until Angular replaces the expression inside + * `{{hash}}`. The `ngSrcset` directive solves this problem. + * + * The buggy way to write it: + * ```html + * + * ``` + * + * The correct way to write it: + * ```html + * + * ``` + * + * @element IMG + * @param {template} ngSrcset any string which can contain `{{}}` markup. + */ + +/** + * @ngdoc directive + * @name ngDisabled + * @restrict A + * @priority 100 + * + * @description + * + * We shouldn't do this, because it will make the button enabled on Chrome/Firefox but not on IE8 and older IEs: + * ```html + *
    + * + *
    + * ``` + * + * The HTML specification does not require browsers to preserve the values of boolean attributes + * such as disabled. (Their presence means true and their absence means false.) + * If we put an Angular interpolation expression into such an attribute then the + * binding information would be lost when the browser removes the attribute. + * The `ngDisabled` directive solves this problem for the `disabled` attribute. + * This complementary directive is not removed by the browser and so provides + * a permanent reliable place to store the binding information. + * + * @example + + + Click me to toggle:
    + +     + + it('should toggle button', function() { + expect(element(by.css('button')).getAttribute('disabled')).toBeFalsy(); + element(by.model('checked')).click(); + expect(element(by.css('button')).getAttribute('disabled')).toBeTruthy(); + }); + +     + * + * @element INPUT + * @param {expression} ngDisabled If the {@link guide/expression expression} is truthy, + * then special attribute "disabled" will be set on the element + */ + + +/** + * @ngdoc directive + * @name ngChecked + * @restrict A + * @priority 100 + * + * @description + * The HTML specification does not require browsers to preserve the values of boolean attributes + * such as checked. (Their presence means true and their absence means false.) + * If we put an Angular interpolation expression into such an attribute then the + * binding information would be lost when the browser removes the attribute. + * The `ngChecked` directive solves this problem for the `checked` attribute. + * This complementary directive is not removed by the browser and so provides + * a permanent reliable place to store the binding information. + * @example + + + Check me to check both:
    + +     + + it('should check both checkBoxes', function() { + expect(element(by.id('checkSlave')).getAttribute('checked')).toBeFalsy(); + element(by.model('master')).click(); + expect(element(by.id('checkSlave')).getAttribute('checked')).toBeTruthy(); + }); + +     + * + * @element INPUT + * @param {expression} ngChecked If the {@link guide/expression expression} is truthy, + * then special attribute "checked" will be set on the element + */ + + +/** + * @ngdoc directive + * @name ngReadonly + * @restrict A + * @priority 100 + * + * @description + * The HTML specification does not require browsers to preserve the values of boolean attributes + * such as readonly. (Their presence means true and their absence means false.) + * If we put an Angular interpolation expression into such an attribute then the + * binding information would be lost when the browser removes the attribute. + * The `ngReadonly` directive solves this problem for the `readonly` attribute. + * This complementary directive is not removed by the browser and so provides + * a permanent reliable place to store the binding information. + * @example + + + Check me to make text readonly:
    + +     + + it('should toggle readonly attr', function() { + expect(element(by.css('[type="text"]')).getAttribute('readonly')).toBeFalsy(); + element(by.model('checked')).click(); + expect(element(by.css('[type="text"]')).getAttribute('readonly')).toBeTruthy(); + }); + +     + * + * @element INPUT + * @param {expression} ngReadonly If the {@link guide/expression expression} is truthy, + * then special attribute "readonly" will be set on the element + */ + + +/** + * @ngdoc directive + * @name ngSelected + * @restrict A + * @priority 100 + * + * @description + * The HTML specification does not require browsers to preserve the values of boolean attributes + * such as selected. (Their presence means true and their absence means false.) + * If we put an Angular interpolation expression into such an attribute then the + * binding information would be lost when the browser removes the attribute. + * The `ngSelected` directive solves this problem for the `selected` attribute. + * This complementary directive is not removed by the browser and so provides + * a permanent reliable place to store the binding information. + * + * @example + + + Check me to select:
    + +     + + it('should select Greetings!', function() { + expect(element(by.id('greet')).getAttribute('selected')).toBeFalsy(); + element(by.model('selected')).click(); + expect(element(by.id('greet')).getAttribute('selected')).toBeTruthy(); + }); + +     + * + * @element OPTION + * @param {expression} ngSelected If the {@link guide/expression expression} is truthy, + * then special attribute "selected" will be set on the element + */ + +/** + * @ngdoc directive + * @name ngOpen + * @restrict A + * @priority 100 + * + * @description + * The HTML specification does not require browsers to preserve the values of boolean attributes + * such as open. (Their presence means true and their absence means false.) + * If we put an Angular interpolation expression into such an attribute then the + * binding information would be lost when the browser removes the attribute. + * The `ngOpen` directive solves this problem for the `open` attribute. + * This complementary directive is not removed by the browser and so provides + * a permanent reliable place to store the binding information. + * @example + + + Check me check multiple:
    +
    + Show/Hide me +
    +     + + it('should toggle open', function() { + expect(element(by.id('details')).getAttribute('open')).toBeFalsy(); + element(by.model('open')).click(); + expect(element(by.id('details')).getAttribute('open')).toBeTruthy(); + }); + +     + * + * @element DETAILS + * @param {expression} ngOpen If the {@link guide/expression expression} is truthy, + * then special attribute "open" will be set on the element + */ + +var ngAttributeAliasDirectives = {}; + + +// boolean attrs are evaluated +forEach(BOOLEAN_ATTR, function(propName, attrName) { + // binding to multiple is not supported + if (propName == "multiple") return; + + var normalized = directiveNormalize('ng-' + attrName); + ngAttributeAliasDirectives[normalized] = function() { + return { + priority: 100, + link: function(scope, element, attr) { + scope.$watch(attr[normalized], function ngBooleanAttrWatchAction(value) { + attr.$set(attrName, !!value); + }); + } + }; + }; +}); + + +// ng-src, ng-srcset, ng-href are interpolated +forEach(['src', 'srcset', 'href'], function(attrName) { + var normalized = directiveNormalize('ng-' + attrName); + ngAttributeAliasDirectives[normalized] = function() { + return { + priority: 99, // it needs to run after the attributes are interpolated + link: function(scope, element, attr) { + var propName = attrName, + name = attrName; + + if (attrName === 'href' && + toString.call(element.prop('href')) === '[object SVGAnimatedString]') { + name = 'xlinkHref'; + attr.$attr[name] = 'xlink:href'; + propName = null; + } + + attr.$observe(normalized, function(value) { + if (!value) { + if (attrName === 'href') { + attr.$set(name, null); + } + return; + } + + attr.$set(name, value); + + // on IE, if "ng:src" directive declaration is used and "src" attribute doesn't exist + // then calling element.setAttribute('src', 'foo') doesn't do anything, so we need + // to set the property as well to achieve the desired effect. + // we use attr[attrName] value since $set can sanitize the url. + if (msie && propName) element.prop(propName, attr[name]); + }); + } + }; + }; +}); + +/* global -nullFormCtrl */ +var nullFormCtrl = { + $addControl: noop, + $removeControl: noop, + $setValidity: noop, + $setDirty: noop, + $setPristine: noop +}; + +/** + * @ngdoc type + * @name form.FormController + * + * @property {boolean} $pristine True if user has not interacted with the form yet. + * @property {boolean} $dirty True if user has already interacted with the form. + * @property {boolean} $valid True if all of the containing forms and controls are valid. + * @property {boolean} $invalid True if at least one containing control or form is invalid. + * + * @property {Object} $error Is an object hash, containing references to all invalid controls or + * forms, where: + * + * - keys are validation tokens (error names), + * - values are arrays of controls or forms that are invalid for given error name. + * + * + * Built-in validation tokens: + * + * - `email` + * - `max` + * - `maxlength` + * - `min` + * - `minlength` + * - `number` + * - `pattern` + * - `required` + * - `url` + * + * @description + * `FormController` keeps track of all its controls and nested forms as well as the state of them, + * such as being valid/invalid or dirty/pristine. + * + * Each {@link ng.directive:form form} directive creates an instance + * of `FormController`. + * + */ +//asks for $scope to fool the BC controller module +FormController.$inject = ['$element', '$attrs', '$scope', '$animate']; +function FormController(element, attrs, $scope, $animate) { + var form = this, + parentForm = element.parent().controller('form') || nullFormCtrl, + invalidCount = 0, // used to easily determine if we are valid + errors = form.$error = {}, + controls = []; + + // init state + form.$name = attrs.name || attrs.ngForm; + form.$dirty = false; + form.$pristine = true; + form.$valid = true; + form.$invalid = false; + + parentForm.$addControl(form); + + // Setup initial state of the control + element.addClass(PRISTINE_CLASS); + toggleValidCss(true); + + // convenience method for easy toggling of classes + function toggleValidCss(isValid, validationErrorKey) { + validationErrorKey = validationErrorKey ? '-' + snake_case(validationErrorKey, '-') : ''; + $animate.setClass(element, + (isValid ? VALID_CLASS : INVALID_CLASS) + validationErrorKey, + (isValid ? INVALID_CLASS : VALID_CLASS) + validationErrorKey); + } + + /** + * @ngdoc method + * @name form.FormController#$addControl + * + * @description + * Register a control with the form. + * + * Input elements using ngModelController do this automatically when they are linked. + */ + form.$addControl = function(control) { + // Breaking change - before, inputs whose name was "hasOwnProperty" were quietly ignored + // and not added to the scope. Now we throw an error. + assertNotHasOwnProperty(control.$name, 'input'); + controls.push(control); + + if (control.$name) { + form[control.$name] = control; + } + }; + + /** + * @ngdoc method + * @name form.FormController#$removeControl + * + * @description + * Deregister a control from the form. + * + * Input elements using ngModelController do this automatically when they are destroyed. + */ + form.$removeControl = function(control) { + if (control.$name && form[control.$name] === control) { + delete form[control.$name]; + } + forEach(errors, function(queue, validationToken) { + form.$setValidity(validationToken, true, control); + }); + + arrayRemove(controls, control); + }; + + /** + * @ngdoc method + * @name form.FormController#$setValidity + * + * @description + * Sets the validity of a form control. + * + * This method will also propagate to parent forms. + */ + form.$setValidity = function(validationToken, isValid, control) { + var queue = errors[validationToken]; + + if (isValid) { + if (queue) { + arrayRemove(queue, control); + if (!queue.length) { + invalidCount--; + if (!invalidCount) { + toggleValidCss(isValid); + form.$valid = true; + form.$invalid = false; + } + errors[validationToken] = false; + toggleValidCss(true, validationToken); + parentForm.$setValidity(validationToken, true, form); + } + } + + } else { + if (!invalidCount) { + toggleValidCss(isValid); + } + if (queue) { + if (includes(queue, control)) return; + } else { + errors[validationToken] = queue = []; + invalidCount++; + toggleValidCss(false, validationToken); + parentForm.$setValidity(validationToken, false, form); + } + queue.push(control); + + form.$valid = false; + form.$invalid = true; + } + }; + + /** + * @ngdoc method + * @name form.FormController#$setDirty + * + * @description + * Sets the form to a dirty state. + * + * This method can be called to add the 'ng-dirty' class and set the form to a dirty + * state (ng-dirty class). This method will also propagate to parent forms. + */ + form.$setDirty = function() { + $animate.removeClass(element, PRISTINE_CLASS); + $animate.addClass(element, DIRTY_CLASS); + form.$dirty = true; + form.$pristine = false; + parentForm.$setDirty(); + }; + + /** + * @ngdoc method + * @name form.FormController#$setPristine + * + * @description + * Sets the form to its pristine state. + * + * This method can be called to remove the 'ng-dirty' class and set the form to its pristine + * state (ng-pristine class). This method will also propagate to all the controls contained + * in this form. + * + * Setting a form back to a pristine state is often useful when we want to 'reuse' a form after + * saving or resetting it. + */ + form.$setPristine = function () { + $animate.removeClass(element, DIRTY_CLASS); + $animate.addClass(element, PRISTINE_CLASS); + form.$dirty = false; + form.$pristine = true; + forEach(controls, function(control) { + control.$setPristine(); + }); + }; +} + + +/** + * @ngdoc directive + * @name ngForm + * @restrict EAC + * + * @description + * Nestable alias of {@link ng.directive:form `form`} directive. HTML + * does not allow nesting of form elements. It is useful to nest forms, for example if the validity of a + * sub-group of controls needs to be determined. + * + * Note: the purpose of `ngForm` is to group controls, + * but not to be a replacement for the `
    ` tag with all of its capabilities + * (e.g. posting to the server, ...). + * + * @param {string=} ngForm|name Name of the form. If specified, the form controller will be published into + * related scope, under this name. + * + */ + + /** + * @ngdoc directive + * @name form + * @restrict E + * + * @description + * Directive that instantiates + * {@link form.FormController FormController}. + * + * If the `name` attribute is specified, the form controller is published onto the current scope under + * this name. + * + * # Alias: {@link ng.directive:ngForm `ngForm`} + * + * In Angular forms can be nested. This means that the outer form is valid when all of the child + * forms are valid as well. However, browsers do not allow nesting of `` elements, so + * Angular provides the {@link ng.directive:ngForm `ngForm`} directive which behaves identically to + * `` but can be nested. This allows you to have nested forms, which is very useful when + * using Angular validation directives in forms that are dynamically generated using the + * {@link ng.directive:ngRepeat `ngRepeat`} directive. Since you cannot dynamically generate the `name` + * attribute of input elements using interpolation, you have to wrap each set of repeated inputs in an + * `ngForm` directive and nest these in an outer `form` element. + * + * + * # CSS classes + * - `ng-valid` is set if the form is valid. + * - `ng-invalid` is set if the form is invalid. + * - `ng-pristine` is set if the form is pristine. + * - `ng-dirty` is set if the form is dirty. + * + * Keep in mind that ngAnimate can detect each of these classes when added and removed. + * + * + * # Submitting a form and preventing the default action + * + * Since the role of forms in client-side Angular applications is different than in classical + * roundtrip apps, it is desirable for the browser not to translate the form submission into a full + * page reload that sends the data to the server. Instead some javascript logic should be triggered + * to handle the form submission in an application-specific way. + * + * For this reason, Angular prevents the default action (form submission to the server) unless the + * `` element has an `action` attribute specified. + * + * You can use one of the following two ways to specify what javascript method should be called when + * a form is submitted: + * + * - {@link ng.directive:ngSubmit ngSubmit} directive on the form element + * - {@link ng.directive:ngClick ngClick} directive on the first + * button or input field of type submit (input[type=submit]) + * + * To prevent double execution of the handler, use only one of the {@link ng.directive:ngSubmit ngSubmit} + * or {@link ng.directive:ngClick ngClick} directives. + * This is because of the following form submission rules in the HTML specification: + * + * - If a form has only one input field then hitting enter in this field triggers form submit + * (`ngSubmit`) + * - if a form has 2+ input fields and no buttons or input[type=submit] then hitting enter + * doesn't trigger submit + * - if a form has one or more input fields and one or more buttons or input[type=submit] then + * hitting enter in any of the input fields will trigger the click handler on the *first* button or + * input[type=submit] (`ngClick`) *and* a submit handler on the enclosing form (`ngSubmit`) + * + * + * ## Animation Hooks + * + * Animations in ngForm are triggered when any of the associated CSS classes are added and removed. + * These classes are: `.ng-pristine`, `.ng-dirty`, `.ng-invalid` and `.ng-valid` as well as any + * other validations that are performed within the form. Animations in ngForm are similar to how + * they work in ngClass and animations can be hooked into using CSS transitions, keyframes as well + * as JS animations. + * + * The following example shows a simple way to utilize CSS transitions to style a form element + * that has been rendered as invalid after it has been validated: + * + * 
    + * //be sure to include ngAnimate as a module to hook into more
+ * //advanced animations
+ * .my-form {
+ *   transition:0.5s linear all;
+ *   background: white;
+ * }
+ * .my-form.ng-invalid {
+ *   background: red;
+ *   color:white;
+ * }
+ *
    + * + * @example + + + + + + userType: + Required!
    + userType = {{userType}}
    + myForm.input.$valid = {{myForm.input.$valid}}
    + myForm.input.$error = {{myForm.input.$error}}
    + myForm.$valid = {{myForm.$valid}}
    + myForm.$error.required = {{!!myForm.$error.required}}
    + +     + + it('should initialize to model', function() { + var userType = element(by.binding('userType')); + var valid = element(by.binding('myForm.input.$valid')); + + expect(userType.getText()).toContain('guest'); + expect(valid.getText()).toContain('true'); + }); + + it('should be invalid if empty', function() { + var userType = element(by.binding('userType')); + var valid = element(by.binding('myForm.input.$valid')); + var userInput = element(by.model('userType')); + + userInput.clear(); + userInput.sendKeys(''); + + expect(userType.getText()).toEqual('userType ='); + expect(valid.getText()).toContain('false'); + }); + +
    + * + * @param {string=} name Name of the form. If specified, the form controller will be published into + * related scope, under this name. + */ +var formDirectiveFactory = function(isNgForm) { + return ['$timeout', function($timeout) { + var formDirective = { + name: 'form', + restrict: isNgForm ? 'EAC' : 'E', + controller: FormController, + compile: function() { + return { + pre: function(scope, formElement, attr, controller) { + if (!attr.action) { + // we can't use jq events because if a form is destroyed during submission the default + // action is not prevented. see #1238 + // + // IE 9 is not affected because it doesn't fire a submit event and try to do a full + // page reload if the form was destroyed by submission of the form via a click handler + // on a button in the form. Looks like an IE9 specific bug. + var preventDefaultListener = function(event) { + event.preventDefault + ? event.preventDefault() + : event.returnValue = false; // IE + }; + + addEventListenerFn(formElement[0], 'submit', preventDefaultListener); + + // unregister the preventDefault listener so that we don't not leak memory but in a + // way that will achieve the prevention of the default action. + formElement.on('$destroy', function() { + $timeout(function() { + removeEventListenerFn(formElement[0], 'submit', preventDefaultListener); + }, 0, false); + }); + } + + var parentFormCtrl = formElement.parent().controller('form'), + alias = attr.name || attr.ngForm; + + if (alias) { + setter(scope, alias, controller, alias); + } + if (parentFormCtrl) { + formElement.on('$destroy', function() { + parentFormCtrl.$removeControl(controller); + if (alias) { + setter(scope, alias, undefined, alias); + } + extend(controller, nullFormCtrl); //stop propagating child destruction handlers upwards + }); + } + } + }; + } + }; + + return formDirective; + }]; +}; + +var formDirective = formDirectiveFactory(); +var ngFormDirective = formDirectiveFactory(true); + +/* global VALID_CLASS: true, + INVALID_CLASS: true, + PRISTINE_CLASS: true, + DIRTY_CLASS: true +*/ + +var URL_REGEXP = /^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/; +var EMAIL_REGEXP = /^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i; +var NUMBER_REGEXP = /^\s*(\-|\+)?(\d+|(\d*(\.\d*)))\s*$/; + +var inputType = { + + /** + * @ngdoc input + * @name input[text] + * + * @description + * Standard HTML text input with angular data binding, inherited by most of the `input` elements. + * + * *NOTE* Not every feature offered is available for all input types. + * + * @param {string} ngModel Assignable angular expression to data-bind to. + * @param {string=} name Property name of the form under which the control is published. + * @param {string=} required Adds `required` validation error key if the value is not entered. + * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to + * the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of + * `required` when you want to data-bind to the `required` attribute. + * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than + * minlength. + * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than + * maxlength. + * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the + * RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for + * patterns defined as scope expressions. + * @param {string=} ngChange Angular expression to be executed when input changes due to user + * interaction with the input element. + * @param {boolean=} [ngTrim=true] If set to false Angular will not automatically trim the input. + * This parameter is ignored for input[type=password] controls, which will never trim the + * input. + * + * @example + + + +
    + Single word: + + Required! + + Single word only! + + text = {{text}}
    + myForm.input.$valid = {{myForm.input.$valid}}
    + myForm.input.$error = {{myForm.input.$error}}
    + myForm.$valid = {{myForm.$valid}}
    + myForm.$error.required = {{!!myForm.$error.required}}
    +
    +     + + var text = element(by.binding('text')); + var valid = element(by.binding('myForm.input.$valid')); + var input = element(by.model('text')); + + it('should initialize to model', function() { + expect(text.getText()).toContain('guest'); + expect(valid.getText()).toContain('true'); + }); + + it('should be invalid if empty', function() { + input.clear(); + input.sendKeys(''); + + expect(text.getText()).toEqual('text ='); + expect(valid.getText()).toContain('false'); + }); + + it('should be invalid if multi word', function() { + input.clear(); + input.sendKeys('hello world'); + + expect(valid.getText()).toContain('false'); + }); + +     + */ + 'text': textInputType, + + + /** + * @ngdoc input + * @name input[number] + * + * @description + * Text input with number validation and transformation. Sets the `number` validation + * error if not a valid number. + * + * @param {string} ngModel Assignable angular expression to data-bind to. + * @param {string=} name Property name of the form under which the control is published. + * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`. + * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`. + * @param {string=} required Sets `required` validation error key if the value is not entered. + * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to + * the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of + * `required` when you want to data-bind to the `required` attribute. + * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than + * minlength. + * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than + * maxlength. + * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the + * RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for + * patterns defined as scope expressions. + * @param {string=} ngChange Angular expression to be executed when input changes due to user + * interaction with the input element. + * + * @example + + + +
    + Number: + + Required! + + Not valid number! + value = {{value}}
    + myForm.input.$valid = {{myForm.input.$valid}}
    + myForm.input.$error = {{myForm.input.$error}}
    + myForm.$valid = {{myForm.$valid}}
    + myForm.$error.required = {{!!myForm.$error.required}}
    +
    +     + + var value = element(by.binding('value')); + var valid = element(by.binding('myForm.input.$valid')); + var input = element(by.model('value')); + + it('should initialize to model', function() { + expect(value.getText()).toContain('12'); + expect(valid.getText()).toContain('true'); + }); + + it('should be invalid if empty', function() { + input.clear(); + input.sendKeys(''); + expect(value.getText()).toEqual('value ='); + expect(valid.getText()).toContain('false'); + }); + + it('should be invalid if over max', function() { + input.clear(); + input.sendKeys('123'); + expect(value.getText()).toEqual('value ='); + expect(valid.getText()).toContain('false'); + }); + +     + */ + 'number': numberInputType, + + + /** + * @ngdoc input + * @name input[url] + * + * @description + * Text input with URL validation. Sets the `url` validation error key if the content is not a + * valid URL. + * + * @param {string} ngModel Assignable angular expression to data-bind to. + * @param {string=} name Property name of the form under which the control is published. + * @param {string=} required Sets `required` validation error key if the value is not entered. + * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to + * the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of + * `required` when you want to data-bind to the `required` attribute. + * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than + * minlength. + * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than + * maxlength. + * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the + * RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for + * patterns defined as scope expressions. + * @param {string=} ngChange Angular expression to be executed when input changes due to user + * interaction with the input element. + * + * @example + + + +
    + URL: + + Required! + + Not valid url! + text = {{text}}
    + myForm.input.$valid = {{myForm.input.$valid}}
    + myForm.input.$error = {{myForm.input.$error}}
    + myForm.$valid = {{myForm.$valid}}
    + myForm.$error.required = {{!!myForm.$error.required}}
    + myForm.$error.url = {{!!myForm.$error.url}}
    +
    +     + + var text = element(by.binding('text')); + var valid = element(by.binding('myForm.input.$valid')); + var input = element(by.model('text')); + + it('should initialize to model', function() { + expect(text.getText()).toContain('http://google.com'); + expect(valid.getText()).toContain('true'); + }); + + it('should be invalid if empty', function() { + input.clear(); + input.sendKeys(''); + + expect(text.getText()).toEqual('text ='); + expect(valid.getText()).toContain('false'); + }); + + it('should be invalid if not url', function() { + input.clear(); + input.sendKeys('box'); + + expect(valid.getText()).toContain('false'); + }); + +     + */ + 'url': urlInputType, + + + /** + * @ngdoc input + * @name input[email] + * + * @description + * Text input with email validation. Sets the `email` validation error key if not a valid email + * address. + * + * @param {string} ngModel Assignable angular expression to data-bind to. + * @param {string=} name Property name of the form under which the control is published. + * @param {string=} required Sets `required` validation error key if the value is not entered. + * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to + * the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of + * `required` when you want to data-bind to the `required` attribute. + * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than + * minlength. + * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than + * maxlength. + * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the + * RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for + * patterns defined as scope expressions. + * @param {string=} ngChange Angular expression to be executed when input changes due to user + * interaction with the input element. + * + * @example + + + +
    + Email: + + Required! + + Not valid email! + text = {{text}}
    + myForm.input.$valid = {{myForm.input.$valid}}
    + myForm.input.$error = {{myForm.input.$error}}
    + myForm.$valid = {{myForm.$valid}}
    + myForm.$error.required = {{!!myForm.$error.required}}
    + myForm.$error.email = {{!!myForm.$error.email}}
    +
    +     + + var text = element(by.binding('text')); + var valid = element(by.binding('myForm.input.$valid')); + var input = element(by.model('text')); + + it('should initialize to model', function() { + expect(text.getText()).toContain('me@example.com'); + expect(valid.getText()).toContain('true'); + }); + + it('should be invalid if empty', function() { + input.clear(); + input.sendKeys(''); + expect(text.getText()).toEqual('text ='); + expect(valid.getText()).toContain('false'); + }); + + it('should be invalid if not email', function() { + input.clear(); + input.sendKeys('xxx'); + + expect(valid.getText()).toContain('false'); + }); + +     + */ + 'email': emailInputType, + + + /** + * @ngdoc input + * @name input[radio] + * + * @description + * HTML radio button. + * + * @param {string} ngModel Assignable angular expression to data-bind to. + * @param {string} value The value to which the expression should be set when selected. + * @param {string=} name Property name of the form under which the control is published. + * @param {string=} ngChange Angular expression to be executed when input changes due to user + * interaction with the input element. + * @param {string} ngValue Angular expression which sets the value to which the expression should + * be set when selected. + * + * @example + + + +
    + Red
    + Green
    + Blue
    + color = {{color | json}}
    +
    + Note that `ng-value="specialValue"` sets radio item's value to be the value of `$scope.specialValue`. +     + + it('should change state', function() { + var color = element(by.binding('color')); + + expect(color.getText()).toContain('blue'); + + element.all(by.model('color')).get(0).click(); + + expect(color.getText()).toContain('red'); + }); + +     + */ + 'radio': radioInputType, + + + /** + * @ngdoc input + * @name input[checkbox] + * + * @description + * HTML checkbox. + * + * @param {string} ngModel Assignable angular expression to data-bind to. + * @param {string=} name Property name of the form under which the control is published. + * @param {string=} ngTrueValue The value to which the expression should be set when selected. + * @param {string=} ngFalseValue The value to which the expression should be set when not selected. + * @param {string=} ngChange Angular expression to be executed when input changes due to user + * interaction with the input element. + * + * @example + + + +
    + Value1:
    + Value2:
    + value1 = {{value1}}
    + value2 = {{value2}}
    +
    +     + + it('should change state', function() { + var value1 = element(by.binding('value1')); + var value2 = element(by.binding('value2')); + + expect(value1.getText()).toContain('true'); + expect(value2.getText()).toContain('YES'); + + element(by.model('value1')).click(); + element(by.model('value2')).click(); + + expect(value1.getText()).toContain('false'); + expect(value2.getText()).toContain('NO'); + }); + +     + */ + 'checkbox': checkboxInputType, + + 'hidden': noop, + 'button': noop, + 'submit': noop, + 'reset': noop, + 'file': noop +}; + +// A helper function to call $setValidity and return the value / undefined, +// a pattern that is repeated a lot in the input validation logic. +function validate(ctrl, validatorName, validity, value){ + ctrl.$setValidity(validatorName, validity); + return validity ? value : undefined; +} + +function testFlags(validity, flags) { + var i, flag; + if (flags) { + for (i=0; i= minlength, value); + }; + + ctrl.$parsers.push(minLengthValidator); + ctrl.$formatters.push(minLengthValidator); + } + + // max length validator + if (attr.ngMaxlength) { + var maxlength = int(attr.ngMaxlength); + var maxLengthValidator = function(value) { + return validate(ctrl, 'maxlength', ctrl.$isEmpty(value) || value.length <= maxlength, value); + }; + + ctrl.$parsers.push(maxLengthValidator); + ctrl.$formatters.push(maxLengthValidator); + } +} + +var numberBadFlags = ['badInput']; + +function numberInputType(scope, element, attr, ctrl, $sniffer, $browser) { + textInputType(scope, element, attr, ctrl, $sniffer, $browser); + + ctrl.$parsers.push(function(value) { + var empty = ctrl.$isEmpty(value); + if (empty || NUMBER_REGEXP.test(value)) { + ctrl.$setValidity('number', true); + return value === '' ? null : (empty ? value : parseFloat(value)); + } else { + ctrl.$setValidity('number', false); + return undefined; + } + }); + + addNativeHtml5Validators(ctrl, 'number', numberBadFlags, null, ctrl.$$validityState); + + ctrl.$formatters.push(function(value) { + return ctrl.$isEmpty(value) ? '' : '' + value; + }); + + if (attr.min) { + var minValidator = function(value) { + var min = parseFloat(attr.min); + return validate(ctrl, 'min', ctrl.$isEmpty(value) || value >= min, value); + }; + + ctrl.$parsers.push(minValidator); + ctrl.$formatters.push(minValidator); + } + + if (attr.max) { + var maxValidator = function(value) { + var max = parseFloat(attr.max); + return validate(ctrl, 'max', ctrl.$isEmpty(value) || value <= max, value); + }; + + ctrl.$parsers.push(maxValidator); + ctrl.$formatters.push(maxValidator); + } + + ctrl.$formatters.push(function(value) { + return validate(ctrl, 'number', ctrl.$isEmpty(value) || isNumber(value), value); + }); +} + +function urlInputType(scope, element, attr, ctrl, $sniffer, $browser) { + textInputType(scope, element, attr, ctrl, $sniffer, $browser); + + var urlValidator = function(value) { + return validate(ctrl, 'url', ctrl.$isEmpty(value) || URL_REGEXP.test(value), value); + }; + + ctrl.$formatters.push(urlValidator); + ctrl.$parsers.push(urlValidator); +} + +function emailInputType(scope, element, attr, ctrl, $sniffer, $browser) { + textInputType(scope, element, attr, ctrl, $sniffer, $browser); + + var emailValidator = function(value) { + return validate(ctrl, 'email', ctrl.$isEmpty(value) || EMAIL_REGEXP.test(value), value); + }; + + ctrl.$formatters.push(emailValidator); + ctrl.$parsers.push(emailValidator); +} + +function radioInputType(scope, element, attr, ctrl) { + // make the name unique, if not defined + if (isUndefined(attr.name)) { + element.attr('name', nextUid()); + } + + element.on('click', function() { + if (element[0].checked) { + scope.$apply(function() { + ctrl.$setViewValue(attr.value); + }); + } + }); + + ctrl.$render = function() { + var value = attr.value; + element[0].checked = (value == ctrl.$viewValue); + }; + + attr.$observe('value', ctrl.$render); +} + +function checkboxInputType(scope, element, attr, ctrl) { + var trueValue = attr.ngTrueValue, + falseValue = attr.ngFalseValue; + + if (!isString(trueValue)) trueValue = true; + if (!isString(falseValue)) falseValue = false; + + element.on('click', function() { + scope.$apply(function() { + ctrl.$setViewValue(element[0].checked); + }); + }); + + ctrl.$render = function() { + element[0].checked = ctrl.$viewValue; + }; + + // Override the standard `$isEmpty` because a value of `false` means empty in a checkbox. + ctrl.$isEmpty = function(value) { + return value !== trueValue; + }; + + ctrl.$formatters.push(function(value) { + return value === trueValue; + }); + + ctrl.$parsers.push(function(value) { + return value ? trueValue : falseValue; + }); +} + + +/** + * @ngdoc directive + * @name textarea + * @restrict E + * + * @description + * HTML textarea element control with angular data-binding. The data-binding and validation + * properties of this element are exactly the same as those of the + * {@link ng.directive:input input element}. + * + * @param {string} ngModel Assignable angular expression to data-bind to. + * @param {string=} name Property name of the form under which the control is published. + * @param {string=} required Sets `required` validation error key if the value is not entered. + * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to + * the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of + * `required` when you want to data-bind to the `required` attribute. + * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than + * minlength. + * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than + * maxlength. + * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the + * RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for + * patterns defined as scope expressions. + * @param {string=} ngChange Angular expression to be executed when input changes due to user + * interaction with the input element. + * @param {boolean=} [ngTrim=true] If set to false Angular will not automatically trim the input. + */ + + +/** + * @ngdoc directive + * @name input + * @restrict E + * + * @description + * HTML input element control with angular data-binding. Input control follows HTML5 input types + * and polyfills the HTML5 validation behavior for older browsers. + * + * *NOTE* Not every feature offered is available for all input types. + * + * @param {string} ngModel Assignable angular expression to data-bind to. + * @param {string=} name Property name of the form under which the control is published. + * @param {string=} required Sets `required` validation error key if the value is not entered. + * @param {boolean=} ngRequired Sets `required` attribute if set to true + * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than + * minlength. + * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than + * maxlength. + * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the + * RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for + * patterns defined as scope expressions. + * @param {string=} ngChange Angular expression to be executed when input changes due to user + * interaction with the input element. + * @param {boolean=} [ngTrim=true] If set to false Angular will not automatically trim the input. + * This parameter is ignored for input[type=password] controls, which will never trim the + * input. + * + * @example + + + +
    +
    + User name: + + Required!
    + Last name: + + Too short! + + Too long!
    +
    +
    + user = {{user}}
    + myForm.userName.$valid = {{myForm.userName.$valid}}
    + myForm.userName.$error = {{myForm.userName.$error}}
    + myForm.lastName.$valid = {{myForm.lastName.$valid}}
    + myForm.lastName.$error = {{myForm.lastName.$error}}
    + myForm.$valid = {{myForm.$valid}}
    + myForm.$error.required = {{!!myForm.$error.required}}
    + myForm.$error.minlength = {{!!myForm.$error.minlength}}
    + myForm.$error.maxlength = {{!!myForm.$error.maxlength}}
    +
    +     + + var user = element(by.binding('{{user}}')); + var userNameValid = element(by.binding('myForm.userName.$valid')); + var lastNameValid = element(by.binding('myForm.lastName.$valid')); + var lastNameError = element(by.binding('myForm.lastName.$error')); + var formValid = element(by.binding('myForm.$valid')); + var userNameInput = element(by.model('user.name')); + var userLastInput = element(by.model('user.last')); + + it('should initialize to model', function() { + expect(user.getText()).toContain('{"name":"guest","last":"visitor"}'); + expect(userNameValid.getText()).toContain('true'); + expect(formValid.getText()).toContain('true'); + }); + + it('should be invalid if empty when required', function() { + userNameInput.clear(); + userNameInput.sendKeys(''); + + expect(user.getText()).toContain('{"last":"visitor"}'); + expect(userNameValid.getText()).toContain('false'); + expect(formValid.getText()).toContain('false'); + }); + + it('should be valid if empty when min length is set', function() { + userLastInput.clear(); + userLastInput.sendKeys(''); + + expect(user.getText()).toContain('{"name":"guest","last":""}'); + expect(lastNameValid.getText()).toContain('true'); + expect(formValid.getText()).toContain('true'); + }); + + it('should be invalid if less than required min length', function() { + userLastInput.clear(); + userLastInput.sendKeys('xx'); + + expect(user.getText()).toContain('{"name":"guest"}'); + expect(lastNameValid.getText()).toContain('false'); + expect(lastNameError.getText()).toContain('minlength'); + expect(formValid.getText()).toContain('false'); + }); + + it('should be invalid if longer than max length', function() { + userLastInput.clear(); + userLastInput.sendKeys('some ridiculously long name'); + + expect(user.getText()).toContain('{"name":"guest"}'); + expect(lastNameValid.getText()).toContain('false'); + expect(lastNameError.getText()).toContain('maxlength'); + expect(formValid.getText()).toContain('false'); + }); + +     + */ +var inputDirective = ['$browser', '$sniffer', function($browser, $sniffer) { + return { + restrict: 'E', + require: '?ngModel', + link: function(scope, element, attr, ctrl) { + if (ctrl) { + (inputType[lowercase(attr.type)] || inputType.text)(scope, element, attr, ctrl, $sniffer, + $browser); + } + } + }; +}]; + +var VALID_CLASS = 'ng-valid', + INVALID_CLASS = 'ng-invalid', + PRISTINE_CLASS = 'ng-pristine', + DIRTY_CLASS = 'ng-dirty'; + +/** + * @ngdoc type + * @name ngModel.NgModelController + * + * @property {string} $viewValue Actual string value in the view. + * @property {*} $modelValue The value in the model, that the control is bound to. + * @property {Array.} $parsers Array of functions to execute, as a pipeline, whenever + the control reads value from the DOM. Each function is called, in turn, passing the value + through to the next. The last return value is used to populate the model. + Used to sanitize / convert the value as well as validation. For validation, + the parsers should update the validity state using + {@link ngModel.NgModelController#$setValidity $setValidity()}, + and return `undefined` for invalid values. + + * + * @property {Array.} $formatters Array of functions to execute, as a pipeline, whenever + the model value changes. Each function is called, in turn, passing the value through to the + next. Used to format / convert values for display in the control and validation. + * ```js + * function formatter(value) { + * if (value) { + * return value.toUpperCase(); + * } + * } + * ngModel.$formatters.push(formatter); + * ``` + * + * @property {Array.} $viewChangeListeners Array of functions to execute whenever the + * view value has changed. It is called with no arguments, and its return value is ignored. + * This can be used in place of additional $watches against the model value. + * + * @property {Object} $error An object hash with all errors as keys. + * + * @property {boolean} $pristine True if user has not interacted with the control yet. + * @property {boolean} $dirty True if user has already interacted with the control. + * @property {boolean} $valid True if there is no error. + * @property {boolean} $invalid True if at least one error on the control. + * + * @description + * + * `NgModelController` provides API for the `ng-model` directive. The controller contains + * services for data-binding, validation, CSS updates, and value formatting and parsing. It + * purposefully does not contain any logic which deals with DOM rendering or listening to + * DOM events. Such DOM related logic should be provided by other directives which make use of + * `NgModelController` for data-binding. + * + * ## Custom Control Example + * This example shows how to use `NgModelController` with a custom control to achieve + * data-binding. Notice how different directives (`contenteditable`, `ng-model`, and `required`) + * collaborate together to achieve the desired result. + * + * Note that `contenteditable` is an HTML5 attribute, which tells the browser to let the element + * contents be edited in place by the user. This will not work on older browsers. + * + * We are using the {@link ng.service:$sce $sce} service here and include the {@link ngSanitize $sanitize} + * module to automatically remove "bad" content like inline event listener (e.g. ``). + * However, as we are using `$sce` the model can still decide to to provide unsafe content if it marks + * that content using the `$sce` service. + * + * + + [contenteditable] { + border: 1px solid black; + background-color: white; + min-height: 20px; + } + + .ng-invalid { + border: 1px solid red; + } + + + + angular.module('customControl', ['ngSanitize']). + directive('contenteditable', ['$sce', function($sce) { + return { + restrict: 'A', // only activate on element attribute + require: '?ngModel', // get a hold of NgModelController + link: function(scope, element, attrs, ngModel) { + if(!ngModel) return; // do nothing if no ng-model + + // Specify how UI should be updated + ngModel.$render = function() { + element.html($sce.getTrustedHtml(ngModel.$viewValue || '')); + }; + + // Listen for change events to enable binding + element.on('blur keyup change', function() { + scope.$apply(read); + }); + read(); // initialize + + // Write data to the model + function read() { + var html = element.html(); + // When we clear the content editable the browser leaves a
    behind + // If strip-br attribute is provided then we strip this out + if( attrs.stripBr && html == '
    ' ) { + html = ''; + } + ngModel.$setViewValue(html); + } + } + }; + }]); +     + +
    +
    Change me!
    + Required! +
    + +
    +     + + it('should data-bind and become invalid', function() { + if (browser.params.browser == 'safari' || browser.params.browser == 'firefox') { + // SafariDriver can't handle contenteditable + // and Firefox driver can't clear contenteditables very well + return; + } + var contentEditable = element(by.css('[contenteditable]')); + var content = 'Change me!'; + + expect(contentEditable.getText()).toEqual(content); + + contentEditable.clear(); + contentEditable.sendKeys(protractor.Key.BACK_SPACE); + expect(contentEditable.getText()).toEqual(''); + expect(contentEditable.getAttribute('class')).toMatch(/ng-invalid-required/); + }); + + *     + * + * + */ +var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$parse', '$animate', + function($scope, $exceptionHandler, $attr, $element, $parse, $animate) { + this.$viewValue = Number.NaN; + this.$modelValue = Number.NaN; + this.$parsers = []; + this.$formatters = []; + this.$viewChangeListeners = []; + this.$pristine = true; + this.$dirty = false; + this.$valid = true; + this.$invalid = false; + this.$name = $attr.name; + + var ngModelGet = $parse($attr.ngModel), + ngModelSet = ngModelGet.assign; + + if (!ngModelSet) { + throw minErr('ngModel')('nonassign', "Expression '{0}' is non-assignable. Element: {1}", + $attr.ngModel, startingTag($element)); + } + + /** + * @ngdoc method + * @name ngModel.NgModelController#$render + * + * @description + * Called when the view needs to be updated. It is expected that the user of the ng-model + * directive will implement this method. + */ + this.$render = noop; + + /** + * @ngdoc method + * @name ngModel.NgModelController#$isEmpty + * + * @description + * This is called when we need to determine if the value of the input is empty. + * + * For instance, the required directive does this to work out if the input has data or not. + * The default `$isEmpty` function checks whether the value is `undefined`, `''`, `null` or `NaN`. + * + * You can override this for input directives whose concept of being empty is different to the + * default. The `checkboxInputType` directive does this because in its case a value of `false` + * implies empty. + * + * @param {*} value Reference to check. + * @returns {boolean} True if `value` is empty. + */ + this.$isEmpty = function(value) { + return isUndefined(value) || value === '' || value === null || value !== value; + }; + + var parentForm = $element.inheritedData('$formController') || nullFormCtrl, + invalidCount = 0, // used to easily determine if we are valid + $error = this.$error = {}; // keep invalid keys here + + + // Setup initial state of the control + $element.addClass(PRISTINE_CLASS); + toggleValidCss(true); + + // convenience method for easy toggling of classes + function toggleValidCss(isValid, validationErrorKey) { + validationErrorKey = validationErrorKey ? '-' + snake_case(validationErrorKey, '-') : ''; + $animate.removeClass($element, (isValid ? INVALID_CLASS : VALID_CLASS) + validationErrorKey); + $animate.addClass($element, (isValid ? VALID_CLASS : INVALID_CLASS) + validationErrorKey); + } + + /** + * @ngdoc method + * @name ngModel.NgModelController#$setValidity + * + * @description + * Change the validity state, and notifies the form when the control changes validity. (i.e. it + * does not notify form if given validator is already marked as invalid). + * + * This method should be called by validators - i.e. the parser or formatter functions. + * + * @param {string} validationErrorKey Name of the validator. the `validationErrorKey` will assign + * to `$error[validationErrorKey]=!isValid` so that it is available for data-binding. + * The `validationErrorKey` should be in camelCase and will get converted into dash-case + * for class name. Example: `myError` will result in `ng-valid-my-error` and `ng-invalid-my-error` + * class and can be bound to as `{{someForm.someControl.$error.myError}}` . + * @param {boolean} isValid Whether the current state is valid (true) or invalid (false). + */ + this.$setValidity = function(validationErrorKey, isValid) { + // Purposeful use of ! here to cast isValid to boolean in case it is undefined + // jshint -W018 + if ($error[validationErrorKey] === !isValid) return; + // jshint +W018 + + if (isValid) { + if ($error[validationErrorKey]) invalidCount--; + if (!invalidCount) { + toggleValidCss(true); + this.$valid = true; + this.$invalid = false; + } + } else { + toggleValidCss(false); + this.$invalid = true; + this.$valid = false; + invalidCount++; + } + + $error[validationErrorKey] = !isValid; + toggleValidCss(isValid, validationErrorKey); + + parentForm.$setValidity(validationErrorKey, isValid, this); + }; + + /** + * @ngdoc method + * @name ngModel.NgModelController#$setPristine + * + * @description + * Sets the control to its pristine state. + * + * This method can be called to remove the 'ng-dirty' class and set the control to its pristine + * state (ng-pristine class). + */ + this.$setPristine = function () { + this.$dirty = false; + this.$pristine = true; + $animate.removeClass($element, DIRTY_CLASS); + $animate.addClass($element, PRISTINE_CLASS); + }; + + /** + * @ngdoc method + * @name ngModel.NgModelController#$setViewValue + * + * @description + * Update the view value. + * + * This method should be called when the view value changes, typically from within a DOM event handler. + * For example {@link ng.directive:input input} and + * {@link ng.directive:select select} directives call it. + * + * It will update the $viewValue, then pass this value through each of the functions in `$parsers`, + * which includes any validators. The value that comes out of this `$parsers` pipeline, be applied to + * `$modelValue` and the **expression** specified in the `ng-model` attribute. + * + * Lastly, all the registered change listeners, in the `$viewChangeListeners` list, are called. + * + * Note that calling this function does not trigger a `$digest`. + * + * @param {string} value Value from the view. + */ + this.$setViewValue = function(value) { + this.$viewValue = value; + + // change to dirty + if (this.$pristine) { + this.$dirty = true; + this.$pristine = false; + $animate.removeClass($element, PRISTINE_CLASS); + $animate.addClass($element, DIRTY_CLASS); + parentForm.$setDirty(); + } + + forEach(this.$parsers, function(fn) { + value = fn(value); + }); + + if (this.$modelValue !== value) { + this.$modelValue = value; + ngModelSet($scope, value); + forEach(this.$viewChangeListeners, function(listener) { + try { + listener(); + } catch(e) { + $exceptionHandler(e); + } + }); + } + }; + + // model -> value + var ctrl = this; + + $scope.$watch(function ngModelWatch() { + var value = ngModelGet($scope); + + // if scope model value and ngModel value are out of sync + if (ctrl.$modelValue !== value) { + + var formatters = ctrl.$formatters, + idx = formatters.length; + + ctrl.$modelValue = value; + while(idx--) { + value = formatters[idx](value); + } + + if (ctrl.$viewValue !== value) { + ctrl.$viewValue = value; + ctrl.$render(); + } + } + + return value; + }); +}]; + + +/** + * @ngdoc directive + * @name ngModel + * + * @element input + * + * @description + * The `ngModel` directive binds an `input`,`select`, `textarea` (or custom form control) to a + * property on the scope using {@link ngModel.NgModelController NgModelController}, + * which is created and exposed by this directive. + * + * `ngModel` is responsible for: + * + * - Binding the view into the model, which other directives such as `input`, `textarea` or `select` + * require. + * - Providing validation behavior (i.e. required, number, email, url). + * - Keeping the state of the control (valid/invalid, dirty/pristine, validation errors). + * - Setting related css classes on the element (`ng-valid`, `ng-invalid`, `ng-dirty`, `ng-pristine`) including animations. + * - Registering the control with its parent {@link ng.directive:form form}. + * + * Note: `ngModel` will try to bind to the property given by evaluating the expression on the + * current scope. If the property doesn't already exist on this scope, it will be created + * implicitly and added to the scope. + * + * For best practices on using `ngModel`, see: + * + * - [https://github.com/angular/angular.js/wiki/Understanding-Scopes] + * + * For basic examples, how to use `ngModel`, see: + * + * - {@link ng.directive:input input} + * - {@link input[text] text} + * - {@link input[checkbox] checkbox} + * - {@link input[radio] radio} + * - {@link input[number] number} + * - {@link input[email] email} + * - {@link input[url] url} + * - {@link ng.directive:select select} + * - {@link ng.directive:textarea textarea} + * + * # CSS classes + * The following CSS classes are added and removed on the associated input/select/textarea element + * depending on the validity of the model. + * + * - `ng-valid` is set if the model is valid. + * - `ng-invalid` is set if the model is invalid. + * - `ng-pristine` is set if the model is pristine. + * - `ng-dirty` is set if the model is dirty. + * + * Keep in mind that ngAnimate can detect each of these classes when added and removed. + * + * ## Animation Hooks + * + * Animations within models are triggered when any of the associated CSS classes are added and removed + * on the input element which is attached to the model. These classes are: `.ng-pristine`, `.ng-dirty`, + * `.ng-invalid` and `.ng-valid` as well as any other validations that are performed on the model itself. + * The animations that are triggered within ngModel are similar to how they work in ngClass and + * animations can be hooked into using CSS transitions, keyframes as well as JS animations. + * + * The following example shows a simple way to utilize CSS transitions to style an input element + * that has been rendered as invalid after it has been validated: + * + * 
    + * //be sure to include ngAnimate as a module to hook into more
+ * //advanced animations
+ * .my-input {
+ *   transition:0.5s linear all;
+ *   background: white;
+ * }
+ * .my-input.ng-invalid {
+ *   background: red;
+ *   color:white;
+ * }
+ *
    + * + * @example + * + + + + Update input to see transitions when valid/invalid. + Integer is a valid value. +
    + +
    +     + *     + */ +var ngModelDirective = function() { + return { + require: ['ngModel', '^?form'], + controller: NgModelController, + link: function(scope, element, attr, ctrls) { + // notify others, especially parent forms + + var modelCtrl = ctrls[0], + formCtrl = ctrls[1] || nullFormCtrl; + + formCtrl.$addControl(modelCtrl); + + scope.$on('$destroy', function() { + formCtrl.$removeControl(modelCtrl); + }); + } + }; +}; + + +/** + * @ngdoc directive + * @name ngChange + * + * @description + * Evaluate the given expression when the user changes the input. + * The expression is evaluated immediately, unlike the JavaScript onchange event + * which only triggers at the end of a change (usually, when the user leaves the + * form element or presses the return key). + * The expression is not evaluated when the value change is coming from the model. + * + * Note, this directive requires `ngModel` to be present. + * + * @element input + * @param {expression} ngChange {@link guide/expression Expression} to evaluate upon change + * in input value. + * + * @example + * + * + * + *
    + * + * + *
    + * debug = {{confirmed}}
    + * counter = {{counter}}
    + *
    + *     + * + * var counter = element(by.binding('counter')); + * var debug = element(by.binding('confirmed')); + * + * it('should evaluate the expression if changing from view', function() { + * expect(counter.getText()).toContain('0'); + * + * element(by.id('ng-change-example1')).click(); + * + * expect(counter.getText()).toContain('1'); + * expect(debug.getText()).toContain('true'); + * }); + * + * it('should not evaluate the expression if changing from model', function() { + * element(by.id('ng-change-example2')).click(); + + * expect(counter.getText()).toContain('0'); + * expect(debug.getText()).toContain('true'); + * }); + * + *     + */ +var ngChangeDirective = valueFn({ + require: 'ngModel', + link: function(scope, element, attr, ctrl) { + ctrl.$viewChangeListeners.push(function() { + scope.$eval(attr.ngChange); + }); + } +}); + + +var requiredDirective = function() { + return { + require: '?ngModel', + link: function(scope, elm, attr, ctrl) { + if (!ctrl) return; + attr.required = true; // force truthy in case we are on non input element + + var validator = function(value) { + if (attr.required && ctrl.$isEmpty(value)) { + ctrl.$setValidity('required', false); + return; + } else { + ctrl.$setValidity('required', true); + return value; + } + }; + + ctrl.$formatters.push(validator); + ctrl.$parsers.unshift(validator); + + attr.$observe('required', function() { + validator(ctrl.$viewValue); + }); + } + }; +}; + + +/** + * @ngdoc directive + * @name ngList + * + * @description + * Text input that converts between a delimited string and an array of strings. The delimiter + * can be a fixed string (by default a comma) or a regular expression. + * + * @element input + * @param {string=} ngList optional delimiter that should be used to split the value. If + * specified in form `/something/` then the value will be converted into a regular expression. + * + * @example + + + +
    + List: + + Required! +
    + names = {{names}}
    + myForm.namesInput.$valid = {{myForm.namesInput.$valid}}
    + myForm.namesInput.$error = {{myForm.namesInput.$error}}
    + myForm.$valid = {{myForm.$valid}}
    + myForm.$error.required = {{!!myForm.$error.required}}
    +
    +     + + var listInput = element(by.model('names')); + var names = element(by.binding('{{names}}')); + var valid = element(by.binding('myForm.namesInput.$valid')); + var error = element(by.css('span.error')); + + it('should initialize to model', function() { + expect(names.getText()).toContain('["igor","misko","vojta"]'); + expect(valid.getText()).toContain('true'); + expect(error.getCssValue('display')).toBe('none'); + }); + + it('should be invalid if empty', function() { + listInput.clear(); + listInput.sendKeys(''); + + expect(names.getText()).toContain(''); + expect(valid.getText()).toContain('false'); + expect(error.getCssValue('display')).not.toBe('none'); }); + +     + */ +var ngListDirective = function() { + return { + require: 'ngModel', + link: function(scope, element, attr, ctrl) { + var match = /\/(.*)\//.exec(attr.ngList), + separator = match && new RegExp(match[1]) || attr.ngList || ','; + + var parse = function(viewValue) { + // If the viewValue is invalid (say required but empty) it will be `undefined` + if (isUndefined(viewValue)) return; + + var list = []; + + if (viewValue) { + forEach(viewValue.split(separator), function(value) { + if (value) list.push(trim(value)); + }); + } + + return list; + }; + + ctrl.$parsers.push(parse); + ctrl.$formatters.push(function(value) { + if (isArray(value)) { + return value.join(', '); + } + + return undefined; + }); + + // Override the standard $isEmpty because an empty array means the input is empty. + ctrl.$isEmpty = function(value) { + return !value || !value.length; + }; + } + }; +}; + + +var CONSTANT_VALUE_REGEXP = /^(true|false|\d+)$/; +/** + * @ngdoc directive + * @name ngValue + * + * @description + * Binds the given expression to the value of `input[select]` or `input[radio]`, so + * that when the element is selected, the `ngModel` of that element is set to the + * bound value. + * + * `ngValue` is useful when dynamically generating lists of radio buttons using `ng-repeat`, as + * shown below. + * + * @element input + * @param {string=} ngValue angular expression, whose value will be bound to the `value` attribute + * of the `input` element + * + * @example + + + +
    +

    Which is your favorite?

    + +
    You chose {{my.favorite}}
    +
    +     + + var favorite = element(by.binding('my.favorite')); + + it('should initialize to model', function() { + expect(favorite.getText()).toContain('unicorns'); + }); + it('should bind the values to the inputs', function() { + element.all(by.model('my.favorite')).get(0).click(); + expect(favorite.getText()).toContain('pizza'); + }); + +     + */ +var ngValueDirective = function() { + return { + priority: 100, + compile: function(tpl, tplAttr) { + if (CONSTANT_VALUE_REGEXP.test(tplAttr.ngValue)) { + return function ngValueConstantLink(scope, elm, attr) { + attr.$set('value', scope.$eval(attr.ngValue)); + }; + } else { + return function ngValueLink(scope, elm, attr) { + scope.$watch(attr.ngValue, function valueWatchAction(value) { + attr.$set('value', value); + }); + }; + } + } + }; +}; + +/** + * @ngdoc directive + * @name ngBind + * @restrict AC + * + * @description + * The `ngBind` attribute tells Angular to replace the text content of the specified HTML element + * with the value of a given expression, and to update the text content when the value of that + * expression changes. + * + * Typically, you don't use `ngBind` directly, but instead you use the double curly markup like + * `{{ expression }}` which is similar but less verbose. + * + * It is preferable to use `ngBind` instead of `{{ expression }}` if a template is momentarily + * displayed by the browser in its raw state before Angular compiles it. Since `ngBind` is an + * element attribute, it makes the bindings invisible to the user while the page is loading. + * + * An alternative solution to this problem would be using the + * {@link ng.directive:ngCloak ngCloak} directive. + * + * + * @element ANY + * @param {expression} ngBind {@link guide/expression Expression} to evaluate. + * + * @example + * Enter a name in the Live Preview text box; the greeting below the text box changes instantly. + + + +
    + Enter name:
    + Hello ! +
    +     + + it('should check ng-bind', function() { + var nameInput = element(by.model('name')); + + expect(element(by.binding('name')).getText()).toBe('Whirled'); + nameInput.clear(); + nameInput.sendKeys('world'); + expect(element(by.binding('name')).getText()).toBe('world'); + }); + +     + */ +var ngBindDirective = ngDirective({ + compile: function(templateElement) { + templateElement.addClass('ng-binding'); + return function (scope, element, attr) { + element.data('$binding', attr.ngBind); + scope.$watch(attr.ngBind, function ngBindWatchAction(value) { + // We are purposefully using == here rather than === because we want to + // catch when value is "null or undefined" + // jshint -W041 + element.text(value == undefined ? '' : value); + }); + }; + } +}); + + +/** + * @ngdoc directive + * @name ngBindTemplate + * + * @description + * The `ngBindTemplate` directive specifies that the element + * text content should be replaced with the interpolation of the template + * in the `ngBindTemplate` attribute. + * Unlike `ngBind`, the `ngBindTemplate` can contain multiple `{{` `}}` + * expressions. This directive is needed since some HTML elements + * (such as TITLE and OPTION) cannot contain SPAN elements. + * + * @element ANY + * @param {string} ngBindTemplate template of form + * {{ expression }} to eval. + * + * @example + * Try it here: enter text in text box and watch the greeting change. + + + +
    + Salutation:
    + Name:
    + 
    
+       
    
+         
+     
+       it('should check ng-bind', function() {
+         var salutationElem = element(by.binding('salutation'));
+         var salutationInput = element(by.model('salutation'));
+         var nameInput = element(by.model('name'));
+
+         expect(salutationElem.getText()).toBe('Hello World!');
+
+         salutationInput.clear();
+         salutationInput.sendKeys('Greetings');
+         nameInput.clear();
+         nameInput.sendKeys('user');
+
+         expect(salutationElem.getText()).toBe('Greetings user!');
+       });
+     
+       
+ */
+var ngBindTemplateDirective = ['$interpolate', function($interpolate) {
+  return function(scope, element, attr) {
+    // TODO: move this to scenario runner
+    var interpolateFn = $interpolate(element.attr(attr.$attr.ngBindTemplate));
+    element.addClass('ng-binding').data('$binding', interpolateFn);
+    attr.$observe('ngBindTemplate', function(value) {
+      element.text(value);
+    });
+  };
+}];
+
+
+/**
+ * @ngdoc directive
+ * @name ngBindHtml
+ *
+ * @description
+ * Creates a binding that will innerHTML the result of evaluating the `expression` into the current
+ * element in a secure way.  By default, the innerHTML-ed content will be sanitized using the {@link
+ * ngSanitize.$sanitize $sanitize} service.  To utilize this functionality, ensure that `$sanitize`
+ * is available, for example, by including {@link ngSanitize} in your module's dependencies (not in
+ * core Angular.)  You may also bypass sanitization for values you know are safe. To do so, bind to
+ * an explicitly trusted value via {@link ng.$sce#trustAsHtml $sce.trustAsHtml}.  See the example
+ * under {@link ng.$sce#Example Strict Contextual Escaping (SCE)}.
+ *
+ * Note: If a `$sanitize` service is unavailable and the bound value isn't explicitly trusted, you
+ * will have an exception (instead of an exploit.)
+ *
+ * @element ANY
+ * @param {expression} ngBindHtml {@link guide/expression Expression} to evaluate.
+ *
+ * @example
+
+   
+     
+       
    
+        
    
+       
    
+         
+
+     
+       angular.module('bindHtmlExample', ['ngSanitize'])
+         .controller('ExampleController', ['$scope', function($scope) {
+           $scope.myHTML =
+              'I am an HTMLstring with ' +
+              'links! and other stuff';
+         }]);
+     
+
+     
+       it('should check ng-bind-html', function() {
+         expect(element(by.binding('myHTML')).getText()).toBe(
+             'I am an HTMLstring with links! and other stuff');
+       });
+     
+       
+ */
+var ngBindHtmlDirective = ['$sce', '$parse', function($sce, $parse) {
+  return {
+    compile: function (tElement) {
+      tElement.addClass('ng-binding');
+
+      return function (scope, element, attr) {
+        element.data('$binding', attr.ngBindHtml);
+
+        var parsed = $parse(attr.ngBindHtml);
+
+        function getStringValue() {
+          return (parsed(scope) || '').toString();
+        }
+
+        scope.$watch(getStringValue, function ngBindHtmlWatchAction(value) {
+          element.html($sce.getTrustedHtml(parsed(scope)) || '');
+        });
+      };
+    }
+  };
+}];
+
+function classDirective(name, selector) {
+  name = 'ngClass' + name;
+  return ['$animate', function($animate) {
+    return {
+      restrict: 'AC',
+      link: function(scope, element, attr) {
+        var oldVal;
+
+        scope.$watch(attr[name], ngClassWatchAction, true);
+
+        attr.$observe('class', function(value) {
+          ngClassWatchAction(scope.$eval(attr[name]));
+        });
+
+
+        if (name !== 'ngClass') {
+          scope.$watch('$index', function($index, old$index) {
+            // jshint bitwise: false
+            var mod = $index & 1;
+            if (mod !== (old$index & 1)) {
+              var classes = arrayClasses(scope.$eval(attr[name]));
+              mod === selector ?
+                addClasses(classes) :
+                removeClasses(classes);
+            }
+          });
+        }
+
+        function addClasses(classes) {
+          var newClasses = digestClassCounts(classes, 1);
+          attr.$addClass(newClasses);
+        }
+
+        function removeClasses(classes) {
+          var newClasses = digestClassCounts(classes, -1);
+          attr.$removeClass(newClasses);
+        }
+
+        function digestClassCounts (classes, count) {
+          var classCounts = element.data('$classCounts') || {};
+          var classesToUpdate = [];
+          forEach(classes, function (className) {
+            if (count > 0 || classCounts[className]) {
+              classCounts[className] = (classCounts[className] || 0) + count;
+              if (classCounts[className] === +(count > 0)) {
+                classesToUpdate.push(className);
+              }
+            }
+          });
+          element.data('$classCounts', classCounts);
+          return classesToUpdate.join(' ');
+        }
+
+        function updateClasses (oldClasses, newClasses) {
+          var toAdd = arrayDifference(newClasses, oldClasses);
+          var toRemove = arrayDifference(oldClasses, newClasses);
+          toRemove = digestClassCounts(toRemove, -1);
+          toAdd = digestClassCounts(toAdd, 1);
+
+          if (toAdd.length === 0) {
+            $animate.removeClass(element, toRemove);
+          } else if (toRemove.length === 0) {
+            $animate.addClass(element, toAdd);
+          } else {
+            $animate.setClass(element, toAdd, toRemove);
+          }
+        }
+
+        function ngClassWatchAction(newVal) {
+          if (selector === true || scope.$index % 2 === selector) {
+            var newClasses = arrayClasses(newVal || []);
+            if (!oldVal) {
+              addClasses(newClasses);
+            } else if (!equals(newVal,oldVal)) {
+              var oldClasses = arrayClasses(oldVal);
+              updateClasses(oldClasses, newClasses);
+            }
+          }
+          oldVal = shallowCopy(newVal);
+        }
+      }
+    };
+
+    function arrayDifference(tokens1, tokens2) {
+      var values = [];
+
+      outer:
+      for(var i = 0; i < tokens1.length; i++) {
+        var token = tokens1[i];
+        for(var j = 0; j < tokens2.length; j++) {
+          if(token == tokens2[j]) continue outer;
+        }
+        values.push(token);
+      }
+      return values;
+    }
+
+    function arrayClasses (classVal) {
+      if (isArray(classVal)) {
+        return classVal;
+      } else if (isString(classVal)) {
+        return classVal.split(' ');
+      } else if (isObject(classVal)) {
+        var classes = [], i = 0;
+        forEach(classVal, function(v, k) {
+          if (v) {
+            classes = classes.concat(k.split(' '));
+          }
+        });
+        return classes;
+      }
+      return classVal;
+    }
+  }];
+}
+
+/**
+ * @ngdoc directive
+ * @name ngClass
+ * @restrict AC
+ *
+ * @description
+ * The `ngClass` directive allows you to dynamically set CSS classes on an HTML element by databinding
+ * an expression that represents all classes to be added.
+ *
+ * The directive operates in three different ways, depending on which of three types the expression
+ * evaluates to:
+ *
+ * 1. If the expression evaluates to a string, the string should be one or more space-delimited class
+ * names.
+ *
+ * 2. If the expression evaluates to an array, each element of the array should be a string that is
+ * one or more space-delimited class names.
+ *
+ * 3. If the expression evaluates to an object, then for each key-value pair of the
+ * object with a truthy value the corresponding key is used as a class name.
+ *
+ * The directive won't add duplicate classes if a particular class was already set.
+ *
+ * When the expression changes, the previously added classes are removed and only then the
+ * new classes are added.
+ *
+ * @animations
+ * add - happens just before the class is applied to the element
+ * remove - happens just before the class is removed from the element
+ *
+ * @element ANY
+ * @param {expression} ngClass {@link guide/expression Expression} to eval. The result
+ *   of the evaluation can be a string representing space delimited class
+ *   names, an array, or a map of class names to boolean values. In the case of a map, the
+ *   names of the properties whose values are truthy will be added as css classes to the
+ *   element.
+ *
+ * @example Example that demonstrates basic bindings via ngClass directive.
+   
+     
+       
    Map Syntax Example
    
+        deleted (apply "strike" class)
    
+        important (apply "bold" class)
    
+        error (apply "red" class)
+       
    
+       
    Using String Syntax
    
+       
+       
    
+       
    Using Array Syntax
    
+       
    
+       
    
+       
    
+         
+     
+       .strike {
+         text-decoration: line-through;
+       }
+       .bold {
+           font-weight: bold;
+       }
+       .red {
+           color: red;
+       }
+     
+     
+       var ps = element.all(by.css('p'));
+
+       it('should let you toggle the class', function() {
+
+         expect(ps.first().getAttribute('class')).not.toMatch(/bold/);
+         expect(ps.first().getAttribute('class')).not.toMatch(/red/);
+
+         element(by.model('important')).click();
+         expect(ps.first().getAttribute('class')).toMatch(/bold/);
+
+         element(by.model('error')).click();
+         expect(ps.first().getAttribute('class')).toMatch(/red/);
+       });
+
+       it('should let you toggle string example', function() {
+         expect(ps.get(1).getAttribute('class')).toBe('');
+         element(by.model('style')).clear();
+         element(by.model('style')).sendKeys('red');
+         expect(ps.get(1).getAttribute('class')).toBe('red');
+       });
+
+       it('array example should have 3 classes', function() {
+         expect(ps.last().getAttribute('class')).toBe('');
+         element(by.model('style1')).sendKeys('bold');
+         element(by.model('style2')).sendKeys('strike');
+         element(by.model('style3')).sendKeys('red');
+         expect(ps.last().getAttribute('class')).toBe('bold strike red');
+       });
+     
+       
+
+   ## Animations
+
+   The example below demonstrates how to perform animations using ngClass.
+
+   
+     
+      
+      
+      
    
+      Sample Text
+         
+     
+       .base-class {
+         -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
+         transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
+       }
+
+       .base-class.my-class {
+         color: red;
+         font-size:3em;
+       }
+     
+     
+       it('should check ng-class', function() {
+         expect(element(by.css('.base-class')).getAttribute('class')).not.
+           toMatch(/my-class/);
+
+         element(by.id('setbtn')).click();
+
+         expect(element(by.css('.base-class')).getAttribute('class')).
+           toMatch(/my-class/);
+
+         element(by.id('clearbtn')).click();
+
+         expect(element(by.css('.base-class')).getAttribute('class')).not.
+           toMatch(/my-class/);
+       });
+     
+       
+
+
+   ## ngClass and pre-existing CSS3 Transitions/Animations
+   The ngClass directive still supports CSS3 Transitions/Animations even if they do not follow the ngAnimate CSS naming structure.
+   Upon animation ngAnimate will apply supplementary CSS classes to track the start and end of an animation, but this will not hinder
+   any pre-existing CSS transitions already on the element. To get an idea of what happens during a class-based animation, be sure
+   to view the step by step details of {@link ngAnimate.$animate#addclass $animate.addClass} and
+   {@link ngAnimate.$animate#removeclass $animate.removeClass}.
+ */
+var ngClassDirective = classDirective('', true);
+
+/**
+ * @ngdoc directive
+ * @name ngClassOdd
+ * @restrict AC
+ *
+ * @description
+ * The `ngClassOdd` and `ngClassEven` directives work exactly as
+ * {@link ng.directive:ngClass ngClass}, except they work in
+ * conjunction with `ngRepeat` and take effect only on odd (even) rows.
+ *
+ * This directive can be applied only within the scope of an
+ * {@link ng.directive:ngRepeat ngRepeat}.
+ *
+ * @element ANY
+ * @param {expression} ngClassOdd {@link guide/expression Expression} to eval. The result
+ *   of the evaluation can be a string representing space delimited class names or an array.
+ *
+ * @example
+   
+     
+        
      
+          
    1. 
+           
+             {{name}}
+           
+          
      2. 
+        
    
+         
+     
+       .odd {
+         color: red;
+       }
+       .even {
+         color: blue;
+       }
+     
+     
+       it('should check ng-class-odd and ng-class-even', function() {
+         expect(element(by.repeater('name in names').row(0).column('name')).getAttribute('class')).
+           toMatch(/odd/);
+         expect(element(by.repeater('name in names').row(1).column('name')).getAttribute('class')).
+           toMatch(/even/);
+       });
+     
+       
+ */
+var ngClassOddDirective = classDirective('Odd', 0);
+
+/**
+ * @ngdoc directive
+ * @name ngClassEven
+ * @restrict AC
+ *
+ * @description
+ * The `ngClassOdd` and `ngClassEven` directives work exactly as
+ * {@link ng.directive:ngClass ngClass}, except they work in
+ * conjunction with `ngRepeat` and take effect only on odd (even) rows.
+ *
+ * This directive can be applied only within the scope of an
+ * {@link ng.directive:ngRepeat ngRepeat}.
+ *
+ * @element ANY
+ * @param {expression} ngClassEven {@link guide/expression Expression} to eval. The
+ *   result of the evaluation can be a string representing space delimited class names or an array.
+ *
+ * @example
+   
+     
+        
      
+          
    1. 
+           
+             {{name}}      
+           
+          
      2. 
+        
    
+         
+     
+       .odd {
+         color: red;
+       }
+       .even {
+         color: blue;
+       }
+     
+     
+       it('should check ng-class-odd and ng-class-even', function() {
+         expect(element(by.repeater('name in names').row(0).column('name')).getAttribute('class')).
+           toMatch(/odd/);
+         expect(element(by.repeater('name in names').row(1).column('name')).getAttribute('class')).
+           toMatch(/even/);
+       });
+     
+       
+ */
+var ngClassEvenDirective = classDirective('Even', 1);
+
+/**
+ * @ngdoc directive
+ * @name ngCloak
+ * @restrict AC
+ *
+ * @description
+ * The `ngCloak` directive is used to prevent the Angular html template from being briefly
+ * displayed by the browser in its raw (uncompiled) form while your application is loading. Use this
+ * directive to avoid the undesirable flicker effect caused by the html template display.
+ *
+ * The directive can be applied to the `` element, but the preferred usage is to apply
+ * multiple `ngCloak` directives to small portions of the page to permit progressive rendering
+ * of the browser view.
+ *
+ * `ngCloak` works in cooperation with the following css rule embedded within `angular.js` and
+ * `angular.min.js`.
+ * For CSP mode please add `angular-csp.css` to your html file (see {@link ng.directive:ngCsp ngCsp}).
+ *
+ * ```css
+ * [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
+ *   display: none !important;
+ * }
+ * ```
+ *
+ * When this css rule is loaded by the browser, all html elements (including their children) that
+ * are tagged with the `ngCloak` directive are hidden. When Angular encounters this directive
+ * during the compilation of the template it deletes the `ngCloak` element attribute, making
+ * the compiled element visible.
+ *
+ * For the best result, the `angular.js` script must be loaded in the head section of the html
+ * document; alternatively, the css rule above must be included in the external stylesheet of the
+ * application.
+ *
+ * Legacy browsers, like IE7, do not provide attribute selector support (added in CSS 2.1) so they
+ * cannot match the `[ng\:cloak]` selector. To work around this limitation, you must add the css
+ * class `ng-cloak` in addition to the `ngCloak` directive as shown in the example below.
+ *
+ * @element ANY
+ *
+ * @example
+   
+     
+        
    {{ 'hello' }}
    
+        
    {{ 'hello IE7' }}
    
+         
+     
+       it('should remove the template directive and css class', function() {
+         expect($('#template1').getAttribute('ng-cloak')).
+           toBeNull();
+         expect($('#template2').getAttribute('ng-cloak')).
+           toBeNull();
+       });
+     
+       
+ *
+ */
+var ngCloakDirective = ngDirective({
+  compile: function(element, attr) {
+    attr.$set('ngCloak', undefined);
+    element.removeClass('ng-cloak');
+  }
+});
+
+/**
+ * @ngdoc directive
+ * @name ngController
+ *
+ * @description
+ * The `ngController` directive attaches a controller class to the view. This is a key aspect of how angular
+ * supports the principles behind the Model-View-Controller design pattern.
+ *
+ * MVC components in angular:
+ *
+ * * Model — Models are the properties of a scope; scopes are attached to the DOM where scope properties
+ *   are accessed through bindings.
+ * * View — The template (HTML with data bindings) that is rendered into the View.
+ * * Controller — The `ngController` directive specifies a Controller class; the class contains business
+ *   logic behind the application to decorate the scope with functions and values
+ *
+ * Note that you can also attach controllers to the DOM by declaring it in a route definition
+ * via the {@link ngRoute.$route $route} service. A common mistake is to declare the controller
+ * again using `ng-controller` in the template itself.  This will cause the controller to be attached
+ * and executed twice.
+ *
+ * @element ANY
+ * @scope
+ * @param {expression} ngController Name of a globally accessible constructor function or an
+ *     {@link guide/expression expression} that on the current scope evaluates to a
+ *     constructor function. The controller instance can be published into a scope property
+ *     by specifying `as propertyName`.
+ *
+ * @example
+ * Here is a simple form for editing user contact information. Adding, removing, clearing, and
+ * greeting are methods declared on the controller (see source tab). These methods can
+ * easily be called from the angular markup. Any changes to the data are automatically reflected
+ * in the View without the need for a manual update.
+ *
+ * Two different declaration styles are included below:
+ *
+ * * one binds methods and properties directly onto the controller using `this`:
+ * `ng-controller="SettingsController1 as settings"`
+ * * one injects `$scope` into the controller:
+ * `ng-controller="SettingsController2"`
+ *
+ * The second option is more common in the Angular community, and is generally used in boilerplates
+ * and in this guide. However, there are advantages to binding properties directly to the controller
+ * and avoiding scope.
+ *
+ * * Using `controller as` makes it obvious which controller you are accessing in the template when
+ * multiple controllers apply to an element.
+ * * If you are writing your controllers as classes you have easier access to the properties and
+ * methods, which will appear on the scope, from inside the controller code.
+ * * Since there is always a `.` in the bindings, you don't have to worry about prototypal
+ * inheritance masking primitives.
+ *
+ * This example demonstrates the `controller as` syntax.
+ *
+ * 
+ *   
+ *    
    
+ *      Name: 
+ *      [ greet ]
    
+ *      Contact:
+ *      
      
+ *        
    • 
+ *          
+ *          
+ *          [ clear
+ *          | X ]
+ *        
      • 
+ *        
    • [ add ]
      • 
+ *     
    
+ *    
    
+ *       
+ *   
+ *    angular.module('controllerAsExample', [])
+ *      .controller('SettingsController1', SettingsController1);
+ *
+ *    function SettingsController1() {
+ *      this.name = "John Smith";
+ *      this.contacts = [
+ *        {type: 'phone', value: '408 555 1212'},
+ *        {type: 'email', value: 'john.smith@example.org'} ];
+ *    }
+ *
+ *    SettingsController1.prototype.greet = function() {
+ *      alert(this.name);
+ *    };
+ *
+ *    SettingsController1.prototype.addContact = function() {
+ *      this.contacts.push({type: 'email', value: 'yourname@example.org'});
+ *    };
+ *
+ *    SettingsController1.prototype.removeContact = function(contactToRemove) {
+ *     var index = this.contacts.indexOf(contactToRemove);
+ *      this.contacts.splice(index, 1);
+ *    };
+ *
+ *    SettingsController1.prototype.clearContact = function(contact) {
+ *      contact.type = 'phone';
+ *      contact.value = '';
+ *    };
+ *   
+ *   
+ *     it('should check controller as', function() {
+ *       var container = element(by.id('ctrl-as-exmpl'));
+ *         expect(container.element(by.model('settings.name'))
+ *           .getAttribute('value')).toBe('John Smith');
+ *
+ *       var firstRepeat =
+ *           container.element(by.repeater('contact in settings.contacts').row(0));
+ *       var secondRepeat =
+ *           container.element(by.repeater('contact in settings.contacts').row(1));
+ *
+ *       expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
+ *           .toBe('408 555 1212');
+ *
+ *       expect(secondRepeat.element(by.model('contact.value')).getAttribute('value'))
+ *           .toBe('john.smith@example.org');
+ *
+ *       firstRepeat.element(by.linkText('clear')).click();
+ *
+ *       expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
+ *           .toBe('');
+ *
+ *       container.element(by.linkText('add')).click();
+ *
+ *       expect(container.element(by.repeater('contact in settings.contacts').row(2))
+ *           .element(by.model('contact.value'))
+ *           .getAttribute('value'))
+ *           .toBe('yourname@example.org');
+ *     });
+ *   
+ *     
+ *
+ * This example demonstrates the "attach to `$scope`" style of controller.
+ *
+ * 
+ *  
+ *   
    
+ *     Name: 
+ *     [ greet ]
    
+ *     Contact:
+ *     
      
+ *       
    • 
+ *         
+ *         
+ *         [ clear
+ *         | X ]
+ *       
      • 
+ *       
    • [ add ]
      • 
+ *    
    
+ *   
    
+ *      
+ *  
+ *   angular.module('controllerExample', [])
+ *     .controller('SettingsController2', ['$scope', SettingsController2]);
+ *
+ *   function SettingsController2($scope) {
+ *     $scope.name = "John Smith";
+ *     $scope.contacts = [
+ *       {type:'phone', value:'408 555 1212'},
+ *       {type:'email', value:'john.smith@example.org'} ];
+ *
+ *     $scope.greet = function() {
+ *       alert($scope.name);
+ *     };
+ *
+ *     $scope.addContact = function() {
+ *       $scope.contacts.push({type:'email', value:'yourname@example.org'});
+ *     };
+ *
+ *     $scope.removeContact = function(contactToRemove) {
+ *       var index = $scope.contacts.indexOf(contactToRemove);
+ *       $scope.contacts.splice(index, 1);
+ *     };
+ *
+ *     $scope.clearContact = function(contact) {
+ *       contact.type = 'phone';
+ *       contact.value = '';
+ *     };
+ *   }
+ *  
+ *  
+ *    it('should check controller', function() {
+ *      var container = element(by.id('ctrl-exmpl'));
+ *
+ *      expect(container.element(by.model('name'))
+ *          .getAttribute('value')).toBe('John Smith');
+ *
+ *      var firstRepeat =
+ *          container.element(by.repeater('contact in contacts').row(0));
+ *      var secondRepeat =
+ *          container.element(by.repeater('contact in contacts').row(1));
+ *
+ *      expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
+ *          .toBe('408 555 1212');
+ *      expect(secondRepeat.element(by.model('contact.value')).getAttribute('value'))
+ *          .toBe('john.smith@example.org');
+ *
+ *      firstRepeat.element(by.linkText('clear')).click();
+ *
+ *      expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
+ *          .toBe('');
+ *
+ *      container.element(by.linkText('add')).click();
+ *
+ *      expect(container.element(by.repeater('contact in contacts').row(2))
+ *          .element(by.model('contact.value'))
+ *          .getAttribute('value'))
+ *          .toBe('yourname@example.org');
+ *    });
+ *  
+ *    
+
+ */
+var ngControllerDirective = [function() {
+  return {
+    scope: true,
+    controller: '@',
+    priority: 500
+  };
+}];
+
+/**
+ * @ngdoc directive
+ * @name ngCsp
+ *
+ * @element html
+ * @description
+ * Enables [CSP (Content Security Policy)](https://developer.mozilla.org/en/Security/CSP) support.
+ *
+ * This is necessary when developing things like Google Chrome Extensions.
+ *
+ * CSP forbids apps to use `eval` or `Function(string)` generated functions (among other things).
+ * For Angular to be CSP compatible there are only two things that we need to do differently:
+ *
+ * - don't use `Function` constructor to generate optimized value getters
+ * - don't inject custom stylesheet into the document
+ *
+ * AngularJS uses `Function(string)` generated functions as a speed optimization. Applying the `ngCsp`
+ * directive will cause Angular to use CSP compatibility mode. When this mode is on AngularJS will
+ * evaluate all expressions up to 30% slower than in non-CSP mode, but no security violations will
+ * be raised.
+ *
+ * CSP forbids JavaScript to inline stylesheet rules. In non CSP mode Angular automatically
+ * includes some CSS rules (e.g. {@link ng.directive:ngCloak ngCloak}).
+ * To make those directives work in CSP mode, include the `angular-csp.css` manually.
+ *
+ * Angular tries to autodetect if CSP is active and automatically turn on the CSP-safe mode. This
+ * autodetection however triggers a CSP error to be logged in the console:
+ *
+ * ```
+ * Refused to evaluate a string as JavaScript because 'unsafe-eval' is not an allowed source of
+ * script in the following Content Security Policy directive: "default-src 'self'". Note that
+ * 'script-src' was not explicitly set, so 'default-src' is used as a fallback.
+ * ```
+ *
+ * This error is harmless but annoying. To prevent the error from showing up, put the `ngCsp`
+ * directive on the root element of the application or on the `angular.js` script tag, whichever
+ * appears first in the html document.
+ *
+ * *Note: This directive is only available in the `ng-csp` and `data-ng-csp` attribute form.*
+ *
+ * @example
+ * This example shows how to apply the `ngCsp` directive to the `html` tag.
+   ```html
+     
+     
+     ...
+     ...
+     
+   ```
+ */
+
+// ngCsp is not implemented as a proper directive any more, because we need it be processed while we
+// bootstrap the system (before $parse is instantiated), for this reason we just have
+// the csp.isActive() fn that looks for ng-csp attribute anywhere in the current doc
+
+/**
+ * @ngdoc directive
+ * @name ngClick
+ *
+ * @description
+ * The ngClick directive allows you to specify custom behavior when
+ * an element is clicked.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngClick {@link guide/expression Expression} to evaluate upon
+ * click. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   
+     
+      
+      
+        count: {{count}}
+      
+     
+     
+       it('should check ng-click', function() {
+         expect(element(by.binding('count')).getText()).toMatch('0');
+         element(by.css('button')).click();
+         expect(element(by.binding('count')).getText()).toMatch('1');
+       });
+     
+   
+ */
+/*
+ * A directive that allows creation of custom onclick handlers that are defined as angular
+ * expressions and are compiled and executed within the current scope.
+ *
+ * Events that are handled via these handler are always configured not to propagate further.
+ */
+var ngEventDirectives = {};
+
+// For events that might fire synchronously during DOM manipulation
+// we need to execute their event handlers asynchronously using $evalAsync,
+// so that they are not executed in an inconsistent state.
+var forceAsyncEvents = {
+  'blur': true,
+  'focus': true
+};
+forEach(
+  'click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste'.split(' '),
+  function(eventName) {
+    var directiveName = directiveNormalize('ng-' + eventName);
+    ngEventDirectives[directiveName] = ['$parse', '$rootScope', function($parse, $rootScope) {
+      return {
+        compile: function($element, attr) {
+          var fn = $parse(attr[directiveName]);
+          return function ngEventHandler(scope, element) {
+            element.on(eventName, function(event) {
+              var callback = function() {
+                fn(scope, {$event:event});
+              };
+              if (forceAsyncEvents[eventName] && $rootScope.$$phase) {
+                scope.$evalAsync(callback);
+              } else {
+                scope.$apply(callback);
+              }
+            });
+          };
+        }
+      };
+    }];
+  }
+);
+
+/**
+ * @ngdoc directive
+ * @name ngDblclick
+ *
+ * @description
+ * The `ngDblclick` directive allows you to specify custom behavior on a dblclick event.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngDblclick {@link guide/expression Expression} to evaluate upon
+ * a dblclick. (The Event object is available as `$event`)
+ *
+ * @example
+   
+     
+      
+      count: {{count}}
+     
+   
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngMousedown
+ *
+ * @description
+ * The ngMousedown directive allows you to specify custom behavior on mousedown event.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngMousedown {@link guide/expression Expression} to evaluate upon
+ * mousedown. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   
+     
+      
+      count: {{count}}
+     
+   
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngMouseup
+ *
+ * @description
+ * Specify custom behavior on mouseup event.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngMouseup {@link guide/expression Expression} to evaluate upon
+ * mouseup. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   
+     
+      
+      count: {{count}}
+     
+   
+ */
+
+/**
+ * @ngdoc directive
+ * @name ngMouseover
+ *
+ * @description
+ * Specify custom behavior on mouseover event.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngMouseover {@link guide/expression Expression} to evaluate upon
+ * mouseover. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   
+     
+      
+      count: {{count}}
+     
+   
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngMouseenter
+ *
+ * @description
+ * Specify custom behavior on mouseenter event.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngMouseenter {@link guide/expression Expression} to evaluate upon
+ * mouseenter. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   
+     
+      
+      count: {{count}}
+     
+   
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngMouseleave
+ *
+ * @description
+ * Specify custom behavior on mouseleave event.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngMouseleave {@link guide/expression Expression} to evaluate upon
+ * mouseleave. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   
+     
+      
+      count: {{count}}
+     
+   
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngMousemove
+ *
+ * @description
+ * Specify custom behavior on mousemove event.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngMousemove {@link guide/expression Expression} to evaluate upon
+ * mousemove. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   
+     
+      
+      count: {{count}}
+     
+   
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngKeydown
+ *
+ * @description
+ * Specify custom behavior on keydown event.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngKeydown {@link guide/expression Expression} to evaluate upon
+ * keydown. (Event object is available as `$event` and can be interrogated for keyCode, altKey, etc.)
+ *
+ * @example
+   
+     
+      
+      key down count: {{count}}
+     
+   
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngKeyup
+ *
+ * @description
+ * Specify custom behavior on keyup event.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngKeyup {@link guide/expression Expression} to evaluate upon
+ * keyup. (Event object is available as `$event` and can be interrogated for keyCode, altKey, etc.)
+ *
+ * @example
+   
+     
+       
    Typing in the input box below updates the key count
    
+        key up count: {{count}}
+
+       
    Typing in the input box below updates the keycode
    
+       
+       
    event keyCode: {{ event.keyCode }}
    
+       
    event altKey: {{ event.altKey }}
    
+         
+       
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngKeypress
+ *
+ * @description
+ * Specify custom behavior on keypress event.
+ *
+ * @element ANY
+ * @param {expression} ngKeypress {@link guide/expression Expression} to evaluate upon
+ * keypress. ({@link guide/expression#-event- Event object is available as `$event`}
+ * and can be interrogated for keyCode, altKey, etc.)
+ *
+ * @example
+   
+     
+      
+      key press count: {{count}}
+     
+   
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngSubmit
+ *
+ * @description
+ * Enables binding angular expressions to onsubmit events.
+ *
+ * Additionally it prevents the default action (which for form means sending the request to the
+ * server and reloading the current page), but only if the form does not contain `action`,
+ * `data-action`, or `x-action` attributes.
+ *
+ * 
    
+ * **Warning:** Be careful not to cause "double-submission" by using both the `ngClick` and
+ * `ngSubmit` handlers together. See the
+ * {@link form#submitting-a-form-and-preventing-the-default-action `form` directive documentation}
+ * for a detailed discussion of when `ngSubmit` may be triggered.
+ * 
    
+ *
+ * @element form
+ * @priority 0
+ * @param {expression} ngSubmit {@link guide/expression Expression} to eval.
+ * ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   
+     
+      
+      
    
+        Enter text and hit enter:
+        
+        
+        
    list={{list}}
    
+      
    
+         
+     
+       it('should check ng-submit', function() {
+         expect(element(by.binding('list')).getText()).toBe('list=[]');
+         element(by.css('#submit')).click();
+         expect(element(by.binding('list')).getText()).toContain('hello');
+         expect(element(by.model('text')).getAttribute('value')).toBe('');
+       });
+       it('should ignore empty strings', function() {
+         expect(element(by.binding('list')).getText()).toBe('list=[]');
+         element(by.css('#submit')).click();
+         element(by.css('#submit')).click();
+         expect(element(by.binding('list')).getText()).toContain('hello');
+        });
+     
+       
+ */
+
+/**
+ * @ngdoc directive
+ * @name ngFocus
+ *
+ * @description
+ * Specify custom behavior on focus event.
+ *
+ * Note: As the `focus` event is executed synchronously when calling `input.focus()`
+ * AngularJS executes the expression using `scope.$evalAsync` if the event is fired
+ * during an `$apply` to ensure a consistent state.
+ *
+ * @element window, input, select, textarea, a
+ * @priority 0
+ * @param {expression} ngFocus {@link guide/expression Expression} to evaluate upon
+ * focus. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+ * See {@link ng.directive:ngClick ngClick}
+ */
+
+/**
+ * @ngdoc directive
+ * @name ngBlur
+ *
+ * @description
+ * Specify custom behavior on blur event.
+ *
+ * A [blur event](https://developer.mozilla.org/en-US/docs/Web/Events/blur) fires when
+ * an element has lost focus.
+ *
+ * Note: As the `blur` event is executed synchronously also during DOM manipulations
+ * (e.g. removing a focussed input),
+ * AngularJS executes the expression using `scope.$evalAsync` if the event is fired
+ * during an `$apply` to ensure a consistent state.
+ *
+ * @element window, input, select, textarea, a
+ * @priority 0
+ * @param {expression} ngBlur {@link guide/expression Expression} to evaluate upon
+ * blur. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+ * See {@link ng.directive:ngClick ngClick}
+ */
+
+/**
+ * @ngdoc directive
+ * @name ngCopy
+ *
+ * @description
+ * Specify custom behavior on copy event.
+ *
+ * @element window, input, select, textarea, a
+ * @priority 0
+ * @param {expression} ngCopy {@link guide/expression Expression} to evaluate upon
+ * copy. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   
+     
+      
+      copied: {{copied}}
+     
+   
+ */
+
+/**
+ * @ngdoc directive
+ * @name ngCut
+ *
+ * @description
+ * Specify custom behavior on cut event.
+ *
+ * @element window, input, select, textarea, a
+ * @priority 0
+ * @param {expression} ngCut {@link guide/expression Expression} to evaluate upon
+ * cut. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   
+     
+      
+      cut: {{cut}}
+     
+   
+ */
+
+/**
+ * @ngdoc directive
+ * @name ngPaste
+ *
+ * @description
+ * Specify custom behavior on paste event.
+ *
+ * @element window, input, select, textarea, a
+ * @priority 0
+ * @param {expression} ngPaste {@link guide/expression Expression} to evaluate upon
+ * paste. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   
+     
+      
+      pasted: {{paste}}
+     
+   
+ */
+
+/**
+ * @ngdoc directive
+ * @name ngIf
+ * @restrict A
+ *
+ * @description
+ * The `ngIf` directive removes or recreates a portion of the DOM tree based on an
+ * {expression}. If the expression assigned to `ngIf` evaluates to a false
+ * value then the element is removed from the DOM, otherwise a clone of the
+ * element is reinserted into the DOM.
+ *
+ * `ngIf` differs from `ngShow` and `ngHide` in that `ngIf` completely removes and recreates the
+ * element in the DOM rather than changing its visibility via the `display` css property.  A common
+ * case when this difference is significant is when using css selectors that rely on an element's
+ * position within the DOM, such as the `:first-child` or `:last-child` pseudo-classes.
+ *
+ * Note that when an element is removed using `ngIf` its scope is destroyed and a new scope
+ * is created when the element is restored.  The scope created within `ngIf` inherits from
+ * its parent scope using
+ * [prototypal inheritance](https://github.com/angular/angular.js/wiki/The-Nuances-of-Scope-Prototypal-Inheritance).
+ * An important implication of this is if `ngModel` is used within `ngIf` to bind to
+ * a javascript primitive defined in the parent scope. In this case any modifications made to the
+ * variable within the child scope will override (hide) the value in the parent scope.
+ *
+ * Also, `ngIf` recreates elements using their compiled state. An example of this behavior
+ * is if an element's class attribute is directly modified after it's compiled, using something like
+ * jQuery's `.addClass()` method, and the element is later removed. When `ngIf` recreates the element
+ * the added class will be lost because the original compiled state is used to regenerate the element.
+ *
+ * Additionally, you can provide animations via the `ngAnimate` module to animate the `enter`
+ * and `leave` effects.
+ *
+ * @animations
+ * enter - happens just after the ngIf contents change and a new DOM element is created and injected into the ngIf container
+ * leave - happens just before the ngIf contents are removed from the DOM
+ *
+ * @element ANY
+ * @scope
+ * @priority 600
+ * @param {expression} ngIf If the {@link guide/expression expression} is falsy then
+ *     the element is removed from the DOM tree. If it is truthy a copy of the compiled
+ *     element is added to the DOM tree.
+ *
+ * @example
+  
+    
+      Click me: 
    
+      Show when checked:
+      
+        I'm removed when the checkbox is unchecked.
+      
+        
+    
+      .animate-if {
+        background:white;
+        border:1px solid black;
+        padding:10px;
+      }
+
+      .animate-if.ng-enter, .animate-if.ng-leave {
+        -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
+        transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
+      }
+
+      .animate-if.ng-enter,
+      .animate-if.ng-leave.ng-leave-active {
+        opacity:0;
+      }
+
+      .animate-if.ng-leave,
+      .animate-if.ng-enter.ng-enter-active {
+        opacity:1;
+      }
+    
+      
+ */
+var ngIfDirective = ['$animate', function($animate) {
+  return {
+    transclude: 'element',
+    priority: 600,
+    terminal: true,
+    restrict: 'A',
+    $$tlb: true,
+    link: function ($scope, $element, $attr, ctrl, $transclude) {
+        var block, childScope, previousElements;
+        $scope.$watch($attr.ngIf, function ngIfWatchAction(value) {
+
+          if (toBoolean(value)) {
+            if (!childScope) {
+              childScope = $scope.$new();
+              $transclude(childScope, function (clone) {
+                clone[clone.length++] = document.createComment(' end ngIf: ' + $attr.ngIf + ' ');
+                // Note: We only need the first/last node of the cloned nodes.
+                // However, we need to keep the reference to the jqlite wrapper as it might be changed later
+                // by a directive with templateUrl when its template arrives.
+                block = {
+                  clone: clone
+                };
+                $animate.enter(clone, $element.parent(), $element);
+              });
+            }
+          } else {
+            if(previousElements) {
+              previousElements.remove();
+              previousElements = null;
+            }
+            if(childScope) {
+              childScope.$destroy();
+              childScope = null;
+            }
+            if(block) {
+              previousElements = getBlockElements(block.clone);
+              $animate.leave(previousElements, function() {
+                previousElements = null;
+              });
+              block = null;
+            }
+          }
+        });
+    }
+  };
+}];
+
+/**
+ * @ngdoc directive
+ * @name ngInclude
+ * @restrict ECA
+ *
+ * @description
+ * Fetches, compiles and includes an external HTML fragment.
+ *
+ * By default, the template URL is restricted to the same domain and protocol as the
+ * application document. This is done by calling {@link ng.$sce#getTrustedResourceUrl
+ * $sce.getTrustedResourceUrl} on it. To load templates from other domains or protocols
+ * you may either {@link ng.$sceDelegateProvider#resourceUrlWhitelist whitelist them} or
+ * [wrap them](ng.$sce#trustAsResourceUrl) as trusted values. Refer to Angular's {@link
+ * ng.$sce Strict Contextual Escaping}.
+ *
+ * In addition, the browser's
+ * [Same Origin Policy](https://code.google.com/p/browsersec/wiki/Part2#Same-origin_policy_for_XMLHttpRequest)
+ * and [Cross-Origin Resource Sharing (CORS)](http://www.w3.org/TR/cors/)
+ * policy may further restrict whether the template is successfully loaded.
+ * For example, `ngInclude` won't work for cross-domain requests on all browsers and for `file://`
+ * access on some browsers.
+ *
+ * @animations
+ * enter - animation is used to bring new content into the browser.
+ * leave - animation is used to animate existing content away.
+ *
+ * The enter and leave animation occur concurrently.
+ *
+ * @scope
+ * @priority 400
+ *
+ * @param {string} ngInclude|src angular expression evaluating to URL. If the source is a string constant,
+ *                 make sure you wrap it in **single** quotes, e.g. `src="'myPartialTemplate.html'"`.
+ * @param {string=} onload Expression to evaluate when a new partial is loaded.
+ *
+ * @param {string=} autoscroll Whether `ngInclude` should call {@link ng.$anchorScroll
+ *                  $anchorScroll} to scroll the viewport after the content is loaded.
+ *
+ *                  - If the attribute is not set, disable scrolling.
+ *                  - If the attribute is set without value, enable scrolling.
+ *                  - Otherwise enable scrolling only if the expression evaluates to truthy value.
+ *
+ * @example
+  
+    
+     
    
+       
+       url of the template: {{template.url}}
+       
    
+       
    
+         
    
+       
    
+     
    
+        
+    
+      angular.module('includeExample', ['ngAnimate'])
+        .controller('ExampleController', ['$scope', function($scope) {
+          $scope.templates =
+            [ { name: 'template1.html', url: 'template1.html'},
+              { name: 'template2.html', url: 'template2.html'} ];
+          $scope.template = $scope.templates[0];
+        }]);
+     
+    
+      Content of template1.html
+    
+    
+      Content of template2.html
+    
+    
+      .slide-animate-container {
+        position:relative;
+        background:white;
+        border:1px solid black;
+        height:40px;
+        overflow:hidden;
+      }
+
+      .slide-animate {
+        padding:10px;
+      }
+
+      .slide-animate.ng-enter, .slide-animate.ng-leave {
+        -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
+        transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
+
+        position:absolute;
+        top:0;
+        left:0;
+        right:0;
+        bottom:0;
+        display:block;
+        padding:10px;
+      }
+
+      .slide-animate.ng-enter {
+        top:-50px;
+      }
+      .slide-animate.ng-enter.ng-enter-active {
+        top:0;
+      }
+
+      .slide-animate.ng-leave {
+        top:0;
+      }
+      .slide-animate.ng-leave.ng-leave-active {
+        top:50px;
+      }
+    
+    
+      var templateSelect = element(by.model('template'));
+      var includeElem = element(by.css('[ng-include]'));
+
+      it('should load template1.html', function() {
+        expect(includeElem.getText()).toMatch(/Content of template1.html/);
+      });
+
+      it('should load template2.html', function() {
+        if (browser.params.browser == 'firefox') {
+          // Firefox can't handle using selects
+          // See https://github.com/angular/protractor/issues/480
+          return;
+        }
+        templateSelect.click();
+        templateSelect.all(by.css('option')).get(2).click();
+        expect(includeElem.getText()).toMatch(/Content of template2.html/);
+      });
+
+      it('should change to blank', function() {
+        if (browser.params.browser == 'firefox') {
+          // Firefox can't handle using selects
+          return;
+        }
+        templateSelect.click();
+        templateSelect.all(by.css('option')).get(0).click();
+        expect(includeElem.isPresent()).toBe(false);
+      });
+    
+      
+ */
+
+
+/**
+ * @ngdoc event
+ * @name ngInclude#$includeContentRequested
+ * @eventType emit on the scope ngInclude was declared in
+ * @description
+ * Emitted every time the ngInclude content is requested.
+ */
+
+
+/**
+ * @ngdoc event
+ * @name ngInclude#$includeContentLoaded
+ * @eventType emit on the current ngInclude scope
+ * @description
+ * Emitted every time the ngInclude content is reloaded.
+ */
+var ngIncludeDirective = ['$http', '$templateCache', '$anchorScroll', '$animate', '$sce',
+                  function($http,   $templateCache,   $anchorScroll,   $animate,   $sce) {
+  return {
+    restrict: 'ECA',
+    priority: 400,
+    terminal: true,
+    transclude: 'element',
+    controller: angular.noop,
+    compile: function(element, attr) {
+      var srcExp = attr.ngInclude || attr.src,
+          onloadExp = attr.onload || '',
+          autoScrollExp = attr.autoscroll;
+
+      return function(scope, $element, $attr, ctrl, $transclude) {
+        var changeCounter = 0,
+            currentScope,
+            previousElement,
+            currentElement;
+
+        var cleanupLastIncludeContent = function() {
+          if(previousElement) {
+            previousElement.remove();
+            previousElement = null;
+          }
+          if(currentScope) {
+            currentScope.$destroy();
+            currentScope = null;
+          }
+          if(currentElement) {
+            $animate.leave(currentElement, function() {
+              previousElement = null;
+            });
+            previousElement = currentElement;
+            currentElement = null;
+          }
+        };
+
+        scope.$watch($sce.parseAsResourceUrl(srcExp), function ngIncludeWatchAction(src) {
+          var afterAnimation = function() {
+            if (isDefined(autoScrollExp) && (!autoScrollExp || scope.$eval(autoScrollExp))) {
+              $anchorScroll();
+            }
+          };
+          var thisChangeId = ++changeCounter;
+
+          if (src) {
+            $http.get(src, {cache: $templateCache}).success(function(response) {
+              if (thisChangeId !== changeCounter) return;
+              var newScope = scope.$new();
+              ctrl.template = response;
+
+              // Note: This will also link all children of ng-include that were contained in the original
+              // html. If that content contains controllers, ... they could pollute/change the scope.
+              // However, using ng-include on an element with additional content does not make sense...
+              // Note: We can't remove them in the cloneAttchFn of $transclude as that
+              // function is called before linking the content, which would apply child
+              // directives to non existing elements.
+              var clone = $transclude(newScope, function(clone) {
+                cleanupLastIncludeContent();
+                $animate.enter(clone, null, $element, afterAnimation);
+              });
+
+              currentScope = newScope;
+              currentElement = clone;
+
+              currentScope.$emit('$includeContentLoaded');
+              scope.$eval(onloadExp);
+            }).error(function() {
+              if (thisChangeId === changeCounter) cleanupLastIncludeContent();
+            });
+            scope.$emit('$includeContentRequested');
+          } else {
+            cleanupLastIncludeContent();
+            ctrl.template = null;
+          }
+        });
+      };
+    }
+  };
+}];
+
+// This directive is called during the $transclude call of the first `ngInclude` directive.
+// It will replace and compile the content of the element with the loaded template.
+// We need this directive so that the element content is already filled when
+// the link function of another directive on the same element as ngInclude
+// is called.
+var ngIncludeFillContentDirective = ['$compile',
+  function($compile) {
+    return {
+      restrict: 'ECA',
+      priority: -400,
+      require: 'ngInclude',
+      link: function(scope, $element, $attr, ctrl) {
+        $element.html(ctrl.template);
+        $compile($element.contents())(scope);
+      }
+    };
+  }];
+
+/**
+ * @ngdoc directive
+ * @name ngInit
+ * @restrict AC
+ *
+ * @description
+ * The `ngInit` directive allows you to evaluate an expression in the
+ * current scope.
+ *
+ * 
    
+ * The only appropriate use of `ngInit` is for aliasing special properties of
+ * {@link ng.directive:ngRepeat `ngRepeat`}, as seen in the demo below. Besides this case, you
+ * should use {@link guide/controller controllers} rather than `ngInit`
+ * to initialize values on a scope.
+ * 
    
+ * 
    
+ * **Note**: If you have assignment in `ngInit` along with {@link ng.$filter `$filter`}, make
+ * sure you have parenthesis for correct precedence:
+ * 
    + *   
    
+ * 
    
+ * 
    
+ *
+ * @priority 450
+ *
+ * @element ANY
+ * @param {expression} ngInit {@link guide/expression Expression} to eval.
+ *
+ * @example
+   
+     
+   
+   
    
+     
    
+       
    
+          list[ {{outerIndex}} ][ {{innerIndex}} ] = {{value}};
+       
    
+     
    
+   
    
+         
+     
+       it('should alias index positions', function() {
+         var elements = element.all(by.css('.example-init'));
+         expect(elements.get(0).getText()).toBe('list[ 0 ][ 0 ] = a;');
+         expect(elements.get(1).getText()).toBe('list[ 0 ][ 1 ] = b;');
+         expect(elements.get(2).getText()).toBe('list[ 1 ][ 0 ] = c;');
+         expect(elements.get(3).getText()).toBe('list[ 1 ][ 1 ] = d;');
+       });
+     
+       
+ */
+var ngInitDirective = ngDirective({
+  priority: 450,
+  compile: function() {
+    return {
+      pre: function(scope, element, attrs) {
+        scope.$eval(attrs.ngInit);
+      }
+    };
+  }
+});
+
+/**
+ * @ngdoc directive
+ * @name ngNonBindable
+ * @restrict AC
+ * @priority 1000
+ *
+ * @description
+ * The `ngNonBindable` directive tells Angular not to compile or bind the contents of the current
+ * DOM element. This is useful if the element contains what appears to be Angular directives and
+ * bindings but which should be ignored by Angular. This could be the case if you have a site that
+ * displays snippets of code, for instance.
+ *
+ * @element ANY
+ *
+ * @example
+ * In this example there are two locations where a simple interpolation binding (`{{}}`) is present,
+ * but the one wrapped in `ngNonBindable` is left alone.
+ *
+ * @example
+    
+      
+        
    Normal: {{1 + 2}}
    
+        
    Ignored: {{1 + 2}}
    
+          
+      
+       it('should check ng-non-bindable', function() {
+         expect(element(by.binding('1 + 2')).getText()).toContain('3');
+         expect(element.all(by.css('div')).last().getText()).toMatch(/1 \+ 2/);
+       });
+      
+        
+ */
+var ngNonBindableDirective = ngDirective({ terminal: true, priority: 1000 });
+
+/**
+ * @ngdoc directive
+ * @name ngPluralize
+ * @restrict EA
+ *
+ * @description
+ * `ngPluralize` is a directive that displays messages according to en-US localization rules.
+ * These rules are bundled with angular.js, but can be overridden
+ * (see {@link guide/i18n Angular i18n} dev guide). You configure ngPluralize directive
+ * by specifying the mappings between
+ * [plural categories](http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html)
+ * and the strings to be displayed.
+ *
+ * # Plural categories and explicit number rules
+ * There are two
+ * [plural categories](http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html)
+ * in Angular's default en-US locale: "one" and "other".
+ *
+ * While a plural category may match many numbers (for example, in en-US locale, "other" can match
+ * any number that is not 1), an explicit number rule can only match one number. For example, the
+ * explicit number rule for "3" matches the number 3. There are examples of plural categories
+ * and explicit number rules throughout the rest of this documentation.
+ *
+ * # Configuring ngPluralize
+ * You configure ngPluralize by providing 2 attributes: `count` and `when`.
+ * You can also provide an optional attribute, `offset`.
+ *
+ * The value of the `count` attribute can be either a string or an {@link guide/expression
+ * Angular expression}; these are evaluated on the current scope for its bound value.
+ *
+ * The `when` attribute specifies the mappings between plural categories and the actual
+ * string to be displayed. The value of the attribute should be a JSON object.
+ *
+ * The following example shows how to configure ngPluralize:
+ *
+ * ```html
+ * 
+ * 
+ *```
+ *
+ * In the example, `"0: Nobody is viewing."` is an explicit number rule. If you did not
+ * specify this rule, 0 would be matched to the "other" category and "0 people are viewing"
+ * would be shown instead of "Nobody is viewing". You can specify an explicit number rule for
+ * other numbers, for example 12, so that instead of showing "12 people are viewing", you can
+ * show "a dozen people are viewing".
+ *
+ * You can use a set of closed braces (`{}`) as a placeholder for the number that you want substituted
+ * into pluralized strings. In the previous example, Angular will replace `{}` with
+ * `{{personCount}}`. The closed braces `{}` is a placeholder
+ * for {{numberExpression}}.
+ *
+ * # Configuring ngPluralize with offset
+ * The `offset` attribute allows further customization of pluralized text, which can result in
+ * a better user experience. For example, instead of the message "4 people are viewing this document",
+ * you might display "John, Kate and 2 others are viewing this document".
+ * The offset attribute allows you to offset a number by any desired value.
+ * Let's take a look at an example:
+ *
+ * ```html
+ * 
+ * 
+ * ```
+ *
+ * Notice that we are still using two plural categories(one, other), but we added
+ * three explicit number rules 0, 1 and 2.
+ * When one person, perhaps John, views the document, "John is viewing" will be shown.
+ * When three people view the document, no explicit number rule is found, so
+ * an offset of 2 is taken off 3, and Angular uses 1 to decide the plural category.
+ * In this case, plural category 'one' is matched and "John, Mary and one other person are viewing"
+ * is shown.
+ *
+ * Note that when you specify offsets, you must provide explicit number rules for
+ * numbers from 0 up to and including the offset. If you use an offset of 3, for example,
+ * you must provide explicit number rules for 0, 1, 2 and 3. You must also provide plural strings for
+ * plural categories "one" and "other".
+ *
+ * @param {string|expression} count The variable to be bound to.
+ * @param {string} when The mapping between plural category to its corresponding strings.
+ * @param {number=} offset Offset to deduct from the total number.
+ *
+ * @example
+    
+      
+        
+        
    
+          Person 1:
    
+          Person 2:
    
+          Number of People:
    
+
+          
+          Without Offset:
+          
+          
    
+
+          
+          With Offset(2):
+          
+          
+        
    
+          
+      
+        it('should show correct pluralized string', function() {
+          var withoutOffset = element.all(by.css('ng-pluralize')).get(0);
+          var withOffset = element.all(by.css('ng-pluralize')).get(1);
+          var countInput = element(by.model('personCount'));
+
+          expect(withoutOffset.getText()).toEqual('1 person is viewing.');
+          expect(withOffset.getText()).toEqual('Igor is viewing.');
+
+          countInput.clear();
+          countInput.sendKeys('0');
+
+          expect(withoutOffset.getText()).toEqual('Nobody is viewing.');
+          expect(withOffset.getText()).toEqual('Nobody is viewing.');
+
+          countInput.clear();
+          countInput.sendKeys('2');
+
+          expect(withoutOffset.getText()).toEqual('2 people are viewing.');
+          expect(withOffset.getText()).toEqual('Igor and Misko are viewing.');
+
+          countInput.clear();
+          countInput.sendKeys('3');
+
+          expect(withoutOffset.getText()).toEqual('3 people are viewing.');
+          expect(withOffset.getText()).toEqual('Igor, Misko and one other person are viewing.');
+
+          countInput.clear();
+          countInput.sendKeys('4');
+
+          expect(withoutOffset.getText()).toEqual('4 people are viewing.');
+          expect(withOffset.getText()).toEqual('Igor, Misko and 2 other people are viewing.');
+        });
+        it('should show data-bound names', function() {
+          var withOffset = element.all(by.css('ng-pluralize')).get(1);
+          var personCount = element(by.model('personCount'));
+          var person1 = element(by.model('person1'));
+          var person2 = element(by.model('person2'));
+          personCount.clear();
+          personCount.sendKeys('4');
+          person1.clear();
+          person1.sendKeys('Di');
+          person2.clear();
+          person2.sendKeys('Vojta');
+          expect(withOffset.getText()).toEqual('Di, Vojta and 2 other people are viewing.');
+        });
+      
+        
+ */
+var ngPluralizeDirective = ['$locale', '$interpolate', function($locale, $interpolate) {
+  var BRACE = /{}/g;
+  return {
+    restrict: 'EA',
+    link: function(scope, element, attr) {
+      var numberExp = attr.count,
+          whenExp = attr.$attr.when && element.attr(attr.$attr.when), // we have {{}} in attrs
+          offset = attr.offset || 0,
+          whens = scope.$eval(whenExp) || {},
+          whensExpFns = {},
+          startSymbol = $interpolate.startSymbol(),
+          endSymbol = $interpolate.endSymbol(),
+          isWhen = /^when(Minus)?(.+)$/;
+
+      forEach(attr, function(expression, attributeName) {
+        if (isWhen.test(attributeName)) {
+          whens[lowercase(attributeName.replace('when', '').replace('Minus', '-'))] =
+            element.attr(attr.$attr[attributeName]);
+        }
+      });
+      forEach(whens, function(expression, key) {
+        whensExpFns[key] =
+          $interpolate(expression.replace(BRACE, startSymbol + numberExp + '-' +
+            offset + endSymbol));
+      });
+
+      scope.$watch(function ngPluralizeWatch() {
+        var value = parseFloat(scope.$eval(numberExp));
+
+        if (!isNaN(value)) {
+          //if explicit number rule such as 1, 2, 3... is defined, just use it. Otherwise,
+          //check it against pluralization rules in $locale service
+          if (!(value in whens)) value = $locale.pluralCat(value - offset);
+           return whensExpFns[value](scope, element, true);
+        } else {
+          return '';
+        }
+      }, function ngPluralizeWatchAction(newVal) {
+        element.text(newVal);
+      });
+    }
+  };
+}];
+
+/**
+ * @ngdoc directive
+ * @name ngRepeat
+ *
+ * @description
+ * The `ngRepeat` directive instantiates a template once per item from a collection. Each template
+ * instance gets its own scope, where the given loop variable is set to the current collection item,
+ * and `$index` is set to the item index or key.
+ *
+ * Special properties are exposed on the local scope of each template instance, including:
+ *
+ * | Variable  | Type            | Details                                                                     |
+ * |-----------|-----------------|-----------------------------------------------------------------------------|
+ * | `$index`  | {@type number}  | iterator offset of the repeated element (0..length-1)                       |
+ * | `$first`  | {@type boolean} | true if the repeated element is first in the iterator.                      |
+ * | `$middle` | {@type boolean} | true if the repeated element is between the first and last in the iterator. |
+ * | `$last`   | {@type boolean} | true if the repeated element is last in the iterator.                       |
+ * | `$even`   | {@type boolean} | true if the iterator position `$index` is even (otherwise false).           |
+ * | `$odd`    | {@type boolean} | true if the iterator position `$index` is odd (otherwise false).            |
+ *
+ * Creating aliases for these properties is possible with {@link ng.directive:ngInit `ngInit`}.
+ * This may be useful when, for instance, nesting ngRepeats.
+ *
+ * # Special repeat start and end points
+ * To repeat a series of elements instead of just one parent element, ngRepeat (as well as other ng directives) supports extending
+ * the range of the repeater by defining explicit start and end points by using **ng-repeat-start** and **ng-repeat-end** respectively.
+ * The **ng-repeat-start** directive works the same as **ng-repeat**, but will repeat all the HTML code (including the tag it's defined on)
+ * up to and including the ending HTML tag where **ng-repeat-end** is placed.
+ *
+ * The example below makes use of this feature:
+ * ```html
+ *   
    
+ *     Header {{ item }}
+ *   
    
+ *   
    
+ *     Body {{ item }}
+ *   
    
+ *   
    
+ *     Footer {{ item }}
+ *   
    
+ * ```
+ *
+ * And with an input of {@type ['A','B']} for the items variable in the example above, the output will evaluate to:
+ * ```html
+ *   
    
+ *     Header A
+ *   
    
+ *   
    
+ *     Body A
+ *   
    
+ *   
    
+ *     Footer A
+ *   
    
+ *   
    
+ *     Header B
+ *   
    
+ *   
    
+ *     Body B
+ *   
    
+ *   
    
+ *     Footer B
+ *   
    
+ * ```
+ *
+ * The custom start and end points for ngRepeat also support all other HTML directive syntax flavors provided in AngularJS (such
+ * as **data-ng-repeat-start**, **x-ng-repeat-start** and **ng:repeat-start**).
+ *
+ * @animations
+ * **.enter** - when a new item is added to the list or when an item is revealed after a filter
+ *
+ * **.leave** - when an item is removed from the list or when an item is filtered out
+ *
+ * **.move** - when an adjacent item is filtered out causing a reorder or when the item contents are reordered
+ *
+ * @element ANY
+ * @scope
+ * @priority 1000
+ * @param {repeat_expression} ngRepeat The expression indicating how to enumerate a collection. These
+ *   formats are currently supported:
+ *
+ *   * `variable in expression` – where variable is the user defined loop variable and `expression`
+ *     is a scope expression giving the collection to enumerate.
+ *
+ *     For example: `album in artist.albums`.
+ *
+ *   * `(key, value) in expression` – where `key` and `value` can be any user defined identifiers,
+ *     and `expression` is the scope expression giving the collection to enumerate.
+ *
+ *     For example: `(name, age) in {'adam':10, 'amalie':12}`.
+ *
+ *   * `variable in expression track by tracking_expression` – You can also provide an optional tracking function
+ *     which can be used to associate the objects in the collection with the DOM elements. If no tracking function
+ *     is specified the ng-repeat associates elements by identity in the collection. It is an error to have
+ *     more than one tracking function to resolve to the same key. (This would mean that two distinct objects are
+ *     mapped to the same DOM element, which is not possible.)  Filters should be applied to the expression,
+ *     before specifying a tracking expression.
+ *
+ *     For example: `item in items` is equivalent to `item in items track by $id(item)`. This implies that the DOM elements
+ *     will be associated by item identity in the array.
+ *
+ *     For example: `item in items track by $id(item)`. A built in `$id()` function can be used to assign a unique
+ *     `$$hashKey` property to each item in the array. This property is then used as a key to associated DOM elements
+ *     with the corresponding item in the array by identity. Moving the same object in array would move the DOM
+ *     element in the same way in the DOM.
+ *
+ *     For example: `item in items track by item.id` is a typical pattern when the items come from the database. In this
+ *     case the object identity does not matter. Two objects are considered equivalent as long as their `id`
+ *     property is same.
+ *
+ *     For example: `item in items | filter:searchText track by item.id` is a pattern that might be used to apply a filter
+ *     to items in conjunction with a tracking expression.
+ *
+ * @example
+ * This example initializes the scope to a list of names and
+ * then uses `ngRepeat` to display every person:
+  
+    
+      
    
+        I have {{friends.length}} friends. They are:
+        
+        
      
+          
    • 
+            [{{$index + 1}}] {{friend.name}} who is {{friend.age}} years old.
+          
      • 
+        
    
+      
    
+        
+    
+      .example-animate-container {
+        background:white;
+        border:1px solid black;
+        list-style:none;
+        margin:0;
+        padding:0 10px;
+      }
+
+      .animate-repeat {
+        line-height:40px;
+        list-style:none;
+        box-sizing:border-box;
+      }
+
+      .animate-repeat.ng-move,
+      .animate-repeat.ng-enter,
+      .animate-repeat.ng-leave {
+        -webkit-transition:all linear 0.5s;
+        transition:all linear 0.5s;
+      }
+
+      .animate-repeat.ng-leave.ng-leave-active,
+      .animate-repeat.ng-move,
+      .animate-repeat.ng-enter {
+        opacity:0;
+        max-height:0;
+      }
+
+      .animate-repeat.ng-leave,
+      .animate-repeat.ng-move.ng-move-active,
+      .animate-repeat.ng-enter.ng-enter-active {
+        opacity:1;
+        max-height:40px;
+      }
+    
+    
+      var friends = element.all(by.repeater('friend in friends'));
+
+      it('should render initial data set', function() {
+        expect(friends.count()).toBe(10);
+        expect(friends.get(0).getText()).toEqual('[1] John who is 25 years old.');
+        expect(friends.get(1).getText()).toEqual('[2] Jessie who is 30 years old.');
+        expect(friends.last().getText()).toEqual('[10] Samantha who is 60 years old.');
+        expect(element(by.binding('friends.length')).getText())
+            .toMatch("I have 10 friends. They are:");
+      });
+
+       it('should update repeater when filter predicate changes', function() {
+         expect(friends.count()).toBe(10);
+
+         element(by.model('q')).sendKeys('ma');
+
+         expect(friends.count()).toBe(2);
+         expect(friends.get(0).getText()).toEqual('[1] Mary who is 28 years old.');
+         expect(friends.last().getText()).toEqual('[2] Samantha who is 60 years old.');
+       });
+      
+        
+ */
+var ngRepeatDirective = ['$parse', '$animate', function($parse, $animate) {
+  var NG_REMOVED = '$$NG_REMOVED';
+  var ngRepeatMinErr = minErr('ngRepeat');
+  return {
+    transclude: 'element',
+    priority: 1000,
+    terminal: true,
+    $$tlb: true,
+    link: function($scope, $element, $attr, ctrl, $transclude){
+        var expression = $attr.ngRepeat;
+        var match = expression.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?\s*$/),
+          trackByExp, trackByExpGetter, trackByIdExpFn, trackByIdArrayFn, trackByIdObjFn,
+          lhs, rhs, valueIdentifier, keyIdentifier,
+          hashFnLocals = {$id: hashKey};
+
+        if (!match) {
+          throw ngRepeatMinErr('iexp', "Expected expression in form of '_item_ in _collection_[ track by _id_]' but got '{0}'.",
+            expression);
+        }
+
+        lhs = match[1];
+        rhs = match[2];
+        trackByExp = match[3];
+
+        if (trackByExp) {
+          trackByExpGetter = $parse(trackByExp);
+          trackByIdExpFn = function(key, value, index) {
+            // assign key, value, and $index to the locals so that they can be used in hash functions
+            if (keyIdentifier) hashFnLocals[keyIdentifier] = key;
+            hashFnLocals[valueIdentifier] = value;
+            hashFnLocals.$index = index;
+            return trackByExpGetter($scope, hashFnLocals);
+          };
+        } else {
+          trackByIdArrayFn = function(key, value) {
+            return hashKey(value);
+          };
+          trackByIdObjFn = function(key) {
+            return key;
+          };
+        }
+
+        match = lhs.match(/^(?:([\$\w]+)|\(([\$\w]+)\s*,\s*([\$\w]+)\))$/);
+        if (!match) {
+          throw ngRepeatMinErr('iidexp', "'_item_' in '_item_ in _collection_' should be an identifier or '(_key_, _value_)' expression, but got '{0}'.",
+                                                                    lhs);
+        }
+        valueIdentifier = match[3] || match[1];
+        keyIdentifier = match[2];
+
+        // Store a list of elements from previous run. This is a hash where key is the item from the
+        // iterator, and the value is objects with following properties.
+        //   - scope: bound scope
+        //   - element: previous element.
+        //   - index: position
+        var lastBlockMap = {};
+
+        //watch props
+        $scope.$watchCollection(rhs, function ngRepeatAction(collection){
+          var index, length,
+              previousNode = $element[0],     // current position of the node
+              nextNode,
+              // Same as lastBlockMap but it has the current state. It will become the
+              // lastBlockMap on the next iteration.
+              nextBlockMap = {},
+              arrayLength,
+              childScope,
+              key, value, // key/value of iteration
+              trackById,
+              trackByIdFn,
+              collectionKeys,
+              block,       // last object information {scope, element, id}
+              nextBlockOrder = [],
+              elementsToRemove;
+
+
+          if (isArrayLike(collection)) {
+            collectionKeys = collection;
+            trackByIdFn = trackByIdExpFn || trackByIdArrayFn;
+          } else {
+            trackByIdFn = trackByIdExpFn || trackByIdObjFn;
+            // if object, extract keys, sort them and use to determine order of iteration over obj props
+            collectionKeys = [];
+            for (key in collection) {
+              if (collection.hasOwnProperty(key) && key.charAt(0) != '$') {
+                collectionKeys.push(key);
+              }
+            }
+            collectionKeys.sort();
+          }
+
+          arrayLength = collectionKeys.length;
+
+          // locate existing items
+          length = nextBlockOrder.length = collectionKeys.length;
+          for(index = 0; index < length; index++) {
+           key = (collection === collectionKeys) ? index : collectionKeys[index];
+           value = collection[key];
+           trackById = trackByIdFn(key, value, index);
+           assertNotHasOwnProperty(trackById, '`track by` id');
+           if(lastBlockMap.hasOwnProperty(trackById)) {
+             block = lastBlockMap[trackById];
+             delete lastBlockMap[trackById];
+             nextBlockMap[trackById] = block;
+             nextBlockOrder[index] = block;
+           } else if (nextBlockMap.hasOwnProperty(trackById)) {
+             // restore lastBlockMap
+             forEach(nextBlockOrder, function(block) {
+               if (block && block.scope) lastBlockMap[block.id] = block;
+             });
+             // This is a duplicate and we need to throw an error
+             throw ngRepeatMinErr('dupes',
+                  "Duplicates in a repeater are not allowed. Use 'track by' expression to specify unique keys. Repeater: {0}, Duplicate key: {1}, Duplicate value: {2}",
+                  expression, trackById, toJson(value));
+           } else {
+             // new never before seen block
+             nextBlockOrder[index] = { id: trackById };
+             nextBlockMap[trackById] = false;
+           }
+         }
+
+          // remove existing items
+          for (key in lastBlockMap) {
+            // lastBlockMap is our own object so we don't need to use special hasOwnPropertyFn
+            if (lastBlockMap.hasOwnProperty(key)) {
+              block = lastBlockMap[key];
+              elementsToRemove = getBlockElements(block.clone);
+              $animate.leave(elementsToRemove);
+              forEach(elementsToRemove, function(element) { element[NG_REMOVED] = true; });
+              block.scope.$destroy();
+            }
+          }
+
+          // we are not using forEach for perf reasons (trying to avoid #call)
+          for (index = 0, length = collectionKeys.length; index < length; index++) {
+            key = (collection === collectionKeys) ? index : collectionKeys[index];
+            value = collection[key];
+            block = nextBlockOrder[index];
+            if (nextBlockOrder[index - 1]) previousNode = getBlockEnd(nextBlockOrder[index - 1]);
+
+            if (block.scope) {
+              // if we have already seen this object, then we need to reuse the
+              // associated scope/element
+              childScope = block.scope;
+
+              nextNode = previousNode;
+              do {
+                nextNode = nextNode.nextSibling;
+              } while(nextNode && nextNode[NG_REMOVED]);
+
+              if (getBlockStart(block) != nextNode) {
+                // existing item which got moved
+                $animate.move(getBlockElements(block.clone), null, jqLite(previousNode));
+              }
+              previousNode = getBlockEnd(block);
+            } else {
+              // new item which we don't know about
+              childScope = $scope.$new();
+            }
+
+            childScope[valueIdentifier] = value;
+            if (keyIdentifier) childScope[keyIdentifier] = key;
+            childScope.$index = index;
+            childScope.$first = (index === 0);
+            childScope.$last = (index === (arrayLength - 1));
+            childScope.$middle = !(childScope.$first || childScope.$last);
+            // jshint bitwise: false
+            childScope.$odd = !(childScope.$even = (index&1) === 0);
+            // jshint bitwise: true
+
+            if (!block.scope) {
+              $transclude(childScope, function(clone) {
+                clone[clone.length++] = document.createComment(' end ngRepeat: ' + expression + ' ');
+                $animate.enter(clone, null, jqLite(previousNode));
+                previousNode = clone;
+                block.scope = childScope;
+                // Note: We only need the first/last node of the cloned nodes.
+                // However, we need to keep the reference to the jqlite wrapper as it might be changed later
+                // by a directive with templateUrl when its template arrives.
+                block.clone = clone;
+                nextBlockMap[block.id] = block;
+              });
+            }
+          }
+          lastBlockMap = nextBlockMap;
+        });
+    }
+  };
+
+  function getBlockStart(block) {
+    return block.clone[0];
+  }
+
+  function getBlockEnd(block) {
+    return block.clone[block.clone.length - 1];
+  }
+}];
+
+/**
+ * @ngdoc directive
+ * @name ngShow
+ *
+ * @description
+ * The `ngShow` directive shows or hides the given HTML element based on the expression
+ * provided to the `ngShow` attribute. The element is shown or hidden by removing or adding
+ * the `.ng-hide` CSS class onto the element. The `.ng-hide` CSS class is predefined
+ * in AngularJS and sets the display style to none (using an !important flag).
+ * For CSP mode please add `angular-csp.css` to your html file (see {@link ng.directive:ngCsp ngCsp}).
+ *
+ * ```html
+ * 
+ * 
    
+ *
+ * 
+ * 
    
+ * ```
+ *
+ * When the `ngShow` expression evaluates to false then the `.ng-hide` CSS class is added to the class attribute
+ * on the element causing it to become hidden. When true, the `.ng-hide` CSS class is removed
+ * from the element causing the element not to appear hidden.
+ *
+ * 
    
+ * **Note:** Here is a list of values that ngShow will consider as a falsy value (case insensitive):
    
+ * "f" / "0" / "false" / "no" / "n" / "[]"
+ * 
    
+ *
+ * ## Why is !important used?
+ *
+ * You may be wondering why !important is used for the `.ng-hide` CSS class. This is because the `.ng-hide` selector
+ * can be easily overridden by heavier selectors. For example, something as simple
+ * as changing the display style on a HTML list item would make hidden elements appear visible.
+ * This also becomes a bigger issue when dealing with CSS frameworks.
+ *
+ * By using !important, the show and hide behavior will work as expected despite any clash between CSS selector
+ * specificity (when !important isn't used with any conflicting styles). If a developer chooses to override the
+ * styling to change how to hide an element then it is just a matter of using !important in their own CSS code.
+ *
+ * ### Overriding `.ng-hide`
+ *
+ * By default, the `.ng-hide` class will style the element with `display:none!important`. If you wish to change
+ * the hide behavior with ngShow/ngHide then this can be achieved by restating the styles for the `.ng-hide`
+ * class in CSS:
+ *
+ * ```css
+ * .ng-hide {
+ *   //this is just another form of hiding an element
+ *   display:block!important;
+ *   position:absolute;
+ *   top:-9999px;
+ *   left:-9999px;
+ * }
+ * ```
+ *
+ * By default you don't need to override in CSS anything and the animations will work around the display style.
+ *
+ * ## A note about animations with `ngShow`
+ *
+ * Animations in ngShow/ngHide work with the show and hide events that are triggered when the directive expression
+ * is true and false. This system works like the animation system present with ngClass except that
+ * you must also include the !important flag to override the display property
+ * so that you can perform an animation when the element is hidden during the time of the animation.
+ *
+ * ```css
+ * //
+ * //a working example can be found at the bottom of this page
+ * //
+ * .my-element.ng-hide-add, .my-element.ng-hide-remove {
+ *   transition:0.5s linear all;
+ * }
+ *
+ * .my-element.ng-hide-add { ... }
+ * .my-element.ng-hide-add.ng-hide-add-active { ... }
+ * .my-element.ng-hide-remove { ... }
+ * .my-element.ng-hide-remove.ng-hide-remove-active { ... }
+ * ```
+ *
+ * Keep in mind that, as of AngularJS version 1.2.17 (and 1.3.0-beta.11), there is no need to change the display
+ * property to block during animation states--ngAnimate will handle the style toggling automatically for you.
+ *
+ * @animations
+ * addClass: `.ng-hide` - happens after the `ngShow` expression evaluates to a truthy value and the just before contents are set to visible
+ * removeClass: `.ng-hide` - happens after the `ngShow` expression evaluates to a non truthy value and just before the contents are set to hidden
+ *
+ * @element ANY
+ * @param {expression} ngShow If the {@link guide/expression expression} is truthy
+ *     then the element is shown or hidden respectively.
+ *
+ * @example
+  
+    
+      Click me: 
    
+      
    
+        Show:
+        
    
+           I show up when your checkbox is checked.
+        
    
+      
    
+      
    
+        Hide:
+        
    
+           I hide when your checkbox is checked.
+        
    
+      
    
+        
+    
+      @import url(//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-glyphicons.css);
+    
+    
+      .animate-show {
+        -webkit-transition:all linear 0.5s;
+        transition:all linear 0.5s;
+        line-height:20px;
+        opacity:1;
+        padding:10px;
+        border:1px solid black;
+        background:white;
+      }
+
+      .animate-show.ng-hide {
+        line-height:0;
+        opacity:0;
+        padding:0 10px;
+      }
+
+      .check-element {
+        padding:10px;
+        border:1px solid black;
+        background:white;
+      }
+    
+    
+      var thumbsUp = element(by.css('span.glyphicon-thumbs-up'));
+      var thumbsDown = element(by.css('span.glyphicon-thumbs-down'));
+
+      it('should check ng-show / ng-hide', function() {
+        expect(thumbsUp.isDisplayed()).toBeFalsy();
+        expect(thumbsDown.isDisplayed()).toBeTruthy();
+
+        element(by.model('checked')).click();
+
+        expect(thumbsUp.isDisplayed()).toBeTruthy();
+        expect(thumbsDown.isDisplayed()).toBeFalsy();
+      });
+    
+      
+ */
+var ngShowDirective = ['$animate', function($animate) {
+  return function(scope, element, attr) {
+    scope.$watch(attr.ngShow, function ngShowWatchAction(value){
+      $animate[toBoolean(value) ? 'removeClass' : 'addClass'](element, 'ng-hide');
+    });
+  };
+}];
+
+
+/**
+ * @ngdoc directive
+ * @name ngHide
+ *
+ * @description
+ * The `ngHide` directive shows or hides the given HTML element based on the expression
+ * provided to the `ngHide` attribute. The element is shown or hidden by removing or adding
+ * the `ng-hide` CSS class onto the element. The `.ng-hide` CSS class is predefined
+ * in AngularJS and sets the display style to none (using an !important flag).
+ * For CSP mode please add `angular-csp.css` to your html file (see {@link ng.directive:ngCsp ngCsp}).
+ *
+ * ```html
+ * 
+ * 
    
+ *
+ * 
+ * 
    
+ * ```
+ *
+ * When the `.ngHide` expression evaluates to true then the `.ng-hide` CSS class is added to the class attribute
+ * on the element causing it to become hidden. When false, the `.ng-hide` CSS class is removed
+ * from the element causing the element not to appear hidden.
+ *
+ * 
    
+ * **Note:** Here is a list of values that ngHide will consider as a falsy value (case insensitive):
    
+ * "f" / "0" / "false" / "no" / "n" / "[]"
+ * 
    
+ *
+ * ## Why is !important used?
+ *
+ * You may be wondering why !important is used for the `.ng-hide` CSS class. This is because the `.ng-hide` selector
+ * can be easily overridden by heavier selectors. For example, something as simple
+ * as changing the display style on a HTML list item would make hidden elements appear visible.
+ * This also becomes a bigger issue when dealing with CSS frameworks.
+ *
+ * By using !important, the show and hide behavior will work as expected despite any clash between CSS selector
+ * specificity (when !important isn't used with any conflicting styles). If a developer chooses to override the
+ * styling to change how to hide an element then it is just a matter of using !important in their own CSS code.
+ *
+ * ### Overriding `.ng-hide`
+ *
+ * By default, the `.ng-hide` class will style the element with `display:none!important`. If you wish to change
+ * the hide behavior with ngShow/ngHide then this can be achieved by restating the styles for the `.ng-hide`
+ * class in CSS:
+ *
+ * ```css
+ * .ng-hide {
+ *   //this is just another form of hiding an element
+ *   display:block!important;
+ *   position:absolute;
+ *   top:-9999px;
+ *   left:-9999px;
+ * }
+ * ```
+ *
+ * By default you don't need to override in CSS anything and the animations will work around the display style.
+ *
+ * ## A note about animations with `ngHide`
+ *
+ * Animations in ngShow/ngHide work with the show and hide events that are triggered when the directive expression
+ * is true and false. This system works like the animation system present with ngClass, except that the `.ng-hide`
+ * CSS class is added and removed for you instead of your own CSS class.
+ *
+ * ```css
+ * //
+ * //a working example can be found at the bottom of this page
+ * //
+ * .my-element.ng-hide-add, .my-element.ng-hide-remove {
+ *   transition:0.5s linear all;
+ * }
+ *
+ * .my-element.ng-hide-add { ... }
+ * .my-element.ng-hide-add.ng-hide-add-active { ... }
+ * .my-element.ng-hide-remove { ... }
+ * .my-element.ng-hide-remove.ng-hide-remove-active { ... }
+ * ```
+ *
+ * Keep in mind that, as of AngularJS version 1.2.17 (and 1.3.0-beta.11), there is no need to change the display
+ * property to block during animation states--ngAnimate will handle the style toggling automatically for you.
+ *
+ * @animations
+ * removeClass: `.ng-hide` - happens after the `ngHide` expression evaluates to a truthy value and just before the contents are set to hidden
+ * addClass: `.ng-hide` - happens after the `ngHide` expression evaluates to a non truthy value and just before the contents are set to visible
+ *
+ * @element ANY
+ * @param {expression} ngHide If the {@link guide/expression expression} is truthy then
+ *     the element is shown or hidden respectively.
+ *
+ * @example
+  
+    
+      Click me: 
    
+      
    
+        Show:
+        
    
+           I show up when your checkbox is checked.
+        
    
+      
    
+      
    
+        Hide:
+        
    
+           I hide when your checkbox is checked.
+        
    
+      
    
+        
+    
+      @import url(//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-glyphicons.css);
+    
+    
+      .animate-hide {
+        -webkit-transition:all linear 0.5s;
+        transition:all linear 0.5s;
+        line-height:20px;
+        opacity:1;
+        padding:10px;
+        border:1px solid black;
+        background:white;
+      }
+
+      .animate-hide.ng-hide {
+        line-height:0;
+        opacity:0;
+        padding:0 10px;
+      }
+
+      .check-element {
+        padding:10px;
+        border:1px solid black;
+        background:white;
+      }
+    
+    
+      var thumbsUp = element(by.css('span.glyphicon-thumbs-up'));
+      var thumbsDown = element(by.css('span.glyphicon-thumbs-down'));
+
+      it('should check ng-show / ng-hide', function() {
+        expect(thumbsUp.isDisplayed()).toBeFalsy();
+        expect(thumbsDown.isDisplayed()).toBeTruthy();
+
+        element(by.model('checked')).click();
+
+        expect(thumbsUp.isDisplayed()).toBeTruthy();
+        expect(thumbsDown.isDisplayed()).toBeFalsy();
+      });
+    
+      
+ */
+var ngHideDirective = ['$animate', function($animate) {
+  return function(scope, element, attr) {
+    scope.$watch(attr.ngHide, function ngHideWatchAction(value){
+      $animate[toBoolean(value) ? 'addClass' : 'removeClass'](element, 'ng-hide');
+    });
+  };
+}];
+
+/**
+ * @ngdoc directive
+ * @name ngStyle
+ * @restrict AC
+ *
+ * @description
+ * The `ngStyle` directive allows you to set CSS style on an HTML element conditionally.
+ *
+ * @element ANY
+ * @param {expression} ngStyle
+ *
+ * {@link guide/expression Expression} which evals to an
+ * object whose keys are CSS style names and values are corresponding values for those CSS
+ * keys.
+ *
+ * Since some CSS style names are not valid keys for an object, they must be quoted.
+ * See the 'background-color' style in the example below.
+ *
+ * @example
+   
+     
+        
+        
+        
+        
    
+        Sample Text
+        
    myStyle={{myStyle}}
    
+         
+     
+       span {
+         color: black;
+       }
+     
+     
+       var colorSpan = element(by.css('span'));
+
+       it('should check ng-style', function() {
+         expect(colorSpan.getCssValue('color')).toBe('rgba(0, 0, 0, 1)');
+         element(by.css('input[value=\'set color\']')).click();
+         expect(colorSpan.getCssValue('color')).toBe('rgba(255, 0, 0, 1)');
+         element(by.css('input[value=clear]')).click();
+         expect(colorSpan.getCssValue('color')).toBe('rgba(0, 0, 0, 1)');
+       });
+     
+       
+ */
+var ngStyleDirective = ngDirective(function(scope, element, attr) {
+  scope.$watch(attr.ngStyle, function ngStyleWatchAction(newStyles, oldStyles) {
+    if (oldStyles && (newStyles !== oldStyles)) {
+      forEach(oldStyles, function(val, style) { element.css(style, '');});
+    }
+    if (newStyles) element.css(newStyles);
+  }, true);
+});
+
+/**
+ * @ngdoc directive
+ * @name ngSwitch
+ * @restrict EA
+ *
+ * @description
+ * The `ngSwitch` directive is used to conditionally swap DOM structure on your template based on a scope expression.
+ * Elements within `ngSwitch` but without `ngSwitchWhen` or `ngSwitchDefault` directives will be preserved at the location
+ * as specified in the template.
+ *
+ * The directive itself works similar to ngInclude, however, instead of downloading template code (or loading it
+ * from the template cache), `ngSwitch` simply chooses one of the nested elements and makes it visible based on which element
+ * matches the value obtained from the evaluated expression. In other words, you define a container element
+ * (where you place the directive), place an expression on the **`on="..."` attribute**
+ * (or the **`ng-switch="..."` attribute**), define any inner elements inside of the directive and place
+ * a when attribute per element. The when attribute is used to inform ngSwitch which element to display when the on
+ * expression is evaluated. If a matching expression is not found via a when attribute then an element with the default
+ * attribute is displayed.
+ *
+ * 
    
+ * Be aware that the attribute values to match against cannot be expressions. They are interpreted
+ * as literal string values to match against.
+ * For example, **`ng-switch-when="someVal"`** will match against the string `"someVal"` not against the
+ * value of the expression `$scope.someVal`.
+ * 
    
+
+ * @animations
+ * enter - happens after the ngSwitch contents change and the matched child element is placed inside the container
+ * leave - happens just after the ngSwitch contents change and just before the former contents are removed from the DOM
+ *
+ * @usage
+ *
+ * ```
+ * 
+ *   ...
+ *   ...
+ *   ...
+ * 
+ * ```
+ *
+ *
+ * @scope
+ * @priority 800
+ * @param {*} ngSwitch|on expression to match against ng-switch-when.
+ * On child elements add:
+ *
+ * * `ngSwitchWhen`: the case statement to match against. If match then this
+ *   case will be displayed. If the same match appears multiple times, all the
+ *   elements will be displayed.
+ * * `ngSwitchDefault`: the default case when no other case match. If there
+ *   are multiple default cases, all of them will be displayed when no other
+ *   case match.
+ *
+ *
+ * @example
+  
+    
+      
    
+        
+        selection={{selection}}
+        
    
+        
    
+            
    Settings Div
    
+            
    Home Span
    
+            
    default
    
+        
    
+      
    
+        
+    
+      angular.module('switchExample', ['ngAnimate'])
+        .controller('ExampleController', ['$scope', function($scope) {
+          $scope.items = ['settings', 'home', 'other'];
+          $scope.selection = $scope.items[0];
+        }]);
+    
+    
+      .animate-switch-container {
+        position:relative;
+        background:white;
+        border:1px solid black;
+        height:40px;
+        overflow:hidden;
+      }
+
+      .animate-switch {
+        padding:10px;
+      }
+
+      .animate-switch.ng-animate {
+        -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
+        transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
+
+        position:absolute;
+        top:0;
+        left:0;
+        right:0;
+        bottom:0;
+      }
+
+      .animate-switch.ng-leave.ng-leave-active,
+      .animate-switch.ng-enter {
+        top:-50px;
+      }
+      .animate-switch.ng-leave,
+      .animate-switch.ng-enter.ng-enter-active {
+        top:0;
+      }
+    
+    
+      var switchElem = element(by.css('[ng-switch]'));
+      var select = element(by.model('selection'));
+
+      it('should start in settings', function() {
+        expect(switchElem.getText()).toMatch(/Settings Div/);
+      });
+      it('should change to home', function() {
+        select.all(by.css('option')).get(1).click();
+        expect(switchElem.getText()).toMatch(/Home Span/);
+      });
+      it('should select default', function() {
+        select.all(by.css('option')).get(2).click();
+        expect(switchElem.getText()).toMatch(/default/);
+      });
+    
+      
+ */
+var ngSwitchDirective = ['$animate', function($animate) {
+  return {
+    restrict: 'EA',
+    require: 'ngSwitch',
+
+    // asks for $scope to fool the BC controller module
+    controller: ['$scope', function ngSwitchController() {
+     this.cases = {};
+    }],
+    link: function(scope, element, attr, ngSwitchController) {
+      var watchExpr = attr.ngSwitch || attr.on,
+          selectedTranscludes = [],
+          selectedElements = [],
+          previousElements = [],
+          selectedScopes = [];
+
+      scope.$watch(watchExpr, function ngSwitchWatchAction(value) {
+        var i, ii;
+        for (i = 0, ii = previousElements.length; i < ii; ++i) {
+          previousElements[i].remove();
+        }
+        previousElements.length = 0;
+
+        for (i = 0, ii = selectedScopes.length; i < ii; ++i) {
+          var selected = selectedElements[i];
+          selectedScopes[i].$destroy();
+          previousElements[i] = selected;
+          $animate.leave(selected, function() {
+            previousElements.splice(i, 1);
+          });
+        }
+
+        selectedElements.length = 0;
+        selectedScopes.length = 0;
+
+        if ((selectedTranscludes = ngSwitchController.cases['!' + value] || ngSwitchController.cases['?'])) {
+          scope.$eval(attr.change);
+          forEach(selectedTranscludes, function(selectedTransclude) {
+            var selectedScope = scope.$new();
+            selectedScopes.push(selectedScope);
+            selectedTransclude.transclude(selectedScope, function(caseElement) {
+              var anchor = selectedTransclude.element;
+
+              selectedElements.push(caseElement);
+              $animate.enter(caseElement, anchor.parent(), anchor);
+            });
+          });
+        }
+      });
+    }
+  };
+}];
+
+var ngSwitchWhenDirective = ngDirective({
+  transclude: 'element',
+  priority: 800,
+  require: '^ngSwitch',
+  link: function(scope, element, attrs, ctrl, $transclude) {
+    ctrl.cases['!' + attrs.ngSwitchWhen] = (ctrl.cases['!' + attrs.ngSwitchWhen] || []);
+    ctrl.cases['!' + attrs.ngSwitchWhen].push({ transclude: $transclude, element: element });
+  }
+});
+
+var ngSwitchDefaultDirective = ngDirective({
+  transclude: 'element',
+  priority: 800,
+  require: '^ngSwitch',
+  link: function(scope, element, attr, ctrl, $transclude) {
+    ctrl.cases['?'] = (ctrl.cases['?'] || []);
+    ctrl.cases['?'].push({ transclude: $transclude, element: element });
+   }
+});
+
+/**
+ * @ngdoc directive
+ * @name ngTransclude
+ * @restrict AC
+ *
+ * @description
+ * Directive that marks the insertion point for the transcluded DOM of the nearest parent directive that uses transclusion.
+ *
+ * Any existing content of the element that this directive is placed on will be removed before the transcluded content is inserted.
+ *
+ * @element ANY
+ *
+ * @example
+   
+     
+       
+       
    
+         
    
+          
    
+         {{text}}
+       
    
+         
+     
+        it('should have transcluded', function() {
+          var titleElement = element(by.model('title'));
+          titleElement.clear();
+          titleElement.sendKeys('TITLE');
+          var textElement = element(by.model('text'));
+          textElement.clear();
+          textElement.sendKeys('TEXT');
+          expect(element(by.binding('title')).getText()).toEqual('TITLE');
+          expect(element(by.binding('text')).getText()).toEqual('TEXT');
+        });
+     
+       
+ *
+ */
+var ngTranscludeDirective = ngDirective({
+  link: function($scope, $element, $attrs, controller, $transclude) {
+    if (!$transclude) {
+      throw minErr('ngTransclude')('orphan',
+       'Illegal use of ngTransclude directive in the template! ' +
+       'No parent directive that requires a transclusion found. ' +
+       'Element: {0}',
+       startingTag($element));
+    }
+
+    $transclude(function(clone) {
+      $element.empty();
+      $element.append(clone);
+    });
+  }
+});
+
+/**
+ * @ngdoc directive
+ * @name script
+ * @restrict E
+ *
+ * @description
+ * Load the content of a `
+
+      Load inlined template
+      
    
+    
+    
+      it('should load template defined inside script tag', function() {
+        element(by.css('#tpl-link')).click();
+        expect(element(by.css('#tpl-content')).getText()).toMatch(/Content of the template/);
+      });
+    
+  
+ */
+var scriptDirective = ['$templateCache', function($templateCache) {
+  return {
+    restrict: 'E',
+    terminal: true,
+    compile: function(element, attr) {
+      if (attr.type == 'text/ng-template') {
+        var templateUrl = attr.id,
+            // IE is not consistent, in scripts we have to read .text but in other nodes we have to read .textContent
+            text = element[0].text;
+
+        $templateCache.put(templateUrl, text);
+      }
+    }
+  };
+}];
+
+var ngOptionsMinErr = minErr('ngOptions');
+/**
+ * @ngdoc directive
+ * @name select
+ * @restrict E
+ *
+ * @description
+ * HTML `SELECT` element with angular data-binding.
+ *
+ * # `ngOptions`
+ *
+ * The `ngOptions` attribute can be used to dynamically generate a list of ``
+ *      DOM element.
+ *   * `trackexpr`: Used when working with an array of objects. The result of this expression will be
+ *      used to identify the objects in the array. The `trackexpr` will most likely refer to the
+ *     `value` variable (e.g. `value.propertyName`).
+ *
+ * @example
+    
+      
+        
+        
    
+          
      
+            
    • 
+              Name: 
+              [X]
+            
      • 
+            
    • 
+              [add]
+            
      • 
+          
    
+          
    
+          Color (null not allowed):
+          
    
+
+          Color (null allowed):
+          
+            
+          
    
+
+          Color grouped by shade:
+          
    
+
+
+          Select bogus.
    
+          
    
+          Currently selected: {{ {selected_color:myColor}  }}
+          
    
+          
    
+        
    
+          
+      
+         it('should check ng-options', function() {
+           expect(element(by.binding('{selected_color:myColor}')).getText()).toMatch('red');
+           element.all(by.model('myColor')).first().click();
+           element.all(by.css('select[ng-model="myColor"] option')).first().click();
+           expect(element(by.binding('{selected_color:myColor}')).getText()).toMatch('black');
+           element(by.css('.nullable select[ng-model="myColor"]')).click();
+           element.all(by.css('.nullable select[ng-model="myColor"] option')).first().click();
+           expect(element(by.binding('{selected_color:myColor}')).getText()).toMatch('null');
+         });
+      
+        
+ */
+
+var ngOptionsDirective = valueFn({ terminal: true });
+// jshint maxlen: false
+var selectDirective = ['$compile', '$parse', function($compile,   $parse) {
+                         //000011111111110000000000022222222220000000000000000000003333333333000000000000004444444444444440000000005555555555555550000000666666666666666000000000000000777777777700000000000000000008888888888
+  var NG_OPTIONS_REGEXP = /^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w]*)|(?:\(\s*([\$\w][\$\w]*)\s*,\s*([\$\w][\$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/,
+      nullModelCtrl = {$setViewValue: noop};
+// jshint maxlen: 100
+
+  return {
+    restrict: 'E',
+    require: ['select', '?ngModel'],
+    controller: ['$element', '$scope', '$attrs', function($element, $scope, $attrs) {
+      var self = this,
+          optionsMap = {},
+          ngModelCtrl = nullModelCtrl,
+          nullOption,
+          unknownOption;
+
+
+      self.databound = $attrs.ngModel;
+
+
+      self.init = function(ngModelCtrl_, nullOption_, unknownOption_) {
+        ngModelCtrl = ngModelCtrl_;
+        nullOption = nullOption_;
+        unknownOption = unknownOption_;
+      };
+
+
+      self.addOption = function(value) {
+        assertNotHasOwnProperty(value, '"option value"');
+        optionsMap[value] = true;
+
+        if (ngModelCtrl.$viewValue == value) {
+          $element.val(value);
+          if (unknownOption.parent()) unknownOption.remove();
+        }
+      };
+
+
+      self.removeOption = function(value) {
+        if (this.hasOption(value)) {
+          delete optionsMap[value];
+          if (ngModelCtrl.$viewValue == value) {
+            this.renderUnknownOption(value);
+          }
+        }
+      };
+
+
+      self.renderUnknownOption = function(val) {
+        var unknownVal = '? ' + hashKey(val) + ' ?';
+        unknownOption.val(unknownVal);
+        $element.prepend(unknownOption);
+        $element.val(unknownVal);
+        unknownOption.prop('selected', true); // needed for IE
+      };
+
+
+      self.hasOption = function(value) {
+        return optionsMap.hasOwnProperty(value);
+      };
+
+      $scope.$on('$destroy', function() {
+        // disable unknown option so that we don't do work when the whole select is being destroyed
+        self.renderUnknownOption = noop;
+      });
+    }],
+
+    link: function(scope, element, attr, ctrls) {
+      // if ngModel is not defined, we don't need to do anything
+      if (!ctrls[1]) return;
+
+      var selectCtrl = ctrls[0],
+          ngModelCtrl = ctrls[1],
+          multiple = attr.multiple,
+          optionsExp = attr.ngOptions,
+          nullOption = false, // if false, user will not be able to select it (used by ngOptions)
+          emptyOption,
+          // we can't just jqLite('",a.querySelectorAll("[selected]").length||J.push("\\["+eb+"*(?:value|"+db+")"),a.querySelectorAll(":checked").length||J.push(":checked")}),f(function(a){var c=b.createElement("input");c.setAttribute("type","hidden"),a.appendChild(c).setAttribute("t",""),a.querySelectorAll("[t^='']").length&&J.push("[*^$]="+eb+"*(?:''|\"\")"),a.querySelectorAll(":enabled").length||J.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),J.push(",.*:")})),(x.matchesSelector=sb.test(L=H.webkitMatchesSelector||H.mozMatchesSelector||H.oMatchesSelector||H.msMatchesSelector))&&f(function(a){x.disconnectedMatch=L.call(a,"div"),L.call(a,"[s!='']:x"),K.push("!=",ib)}),J=J.length&&new RegExp(J.join("|")),K=K.length&&new RegExp(K.join("|")),M=sb.test(H.contains)||H.compareDocumentPosition?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)for(;b=b.parentNode;)if(b===a)return!0;return!1},V=H.compareDocumentPosition?function(a,c){if(a===c)return U=!0,0;var d=c.compareDocumentPosition&&a.compareDocumentPosition&&a.compareDocumentPosition(c);return d?1&d||!x.sortDetached&&c.compareDocumentPosition(a)===d?a===b||M(O,a)?-1:c===b||M(O,c)?1:E?cb.call(E,a)-cb.call(E,c):0:4&d?-1:1:a.compareDocumentPosition?-1:1}:function(a,c){var d,e=0,f=a.parentNode,g=c.parentNode,i=[a],j=[c];if(a===c)return U=!0,0;if(!f||!g)return a===b?-1:c===b?1:f?-1:g?1:E?cb.call(E,a)-cb.call(E,c):0;if(f===g)return h(a,c);for(d=a;d=d.parentNode;)i.unshift(d);for(d=c;d=d.parentNode;)j.unshift(d);for(;i[e]===j[e];)e++;return e?h(i[e],j[e]):i[e]===O?-1:j[e]===O?1:0},b):G},c.matches=function(a,b){return c(a,null,null,b)},c.matchesSelector=function(a,b){if((a.ownerDocument||a)!==G&&F(a),b=b.replace(ob,"='$1']"),!(!x.matchesSelector||!I||K&&K.test(b)||J&&J.test(b)))try{var d=L.call(a,b);if(d||x.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return c(b,G,null,[a]).length>0},c.contains=function(a,b){return(a.ownerDocument||a)!==G&&F(a),M(a,b)},c.attr=function(a,c){(a.ownerDocument||a)!==G&&F(a);var d=z.attrHandle[c.toLowerCase()],e=d&&Y.call(z.attrHandle,c.toLowerCase())?d(a,c,!I):b;return e===b?x.attributes||!I?a.getAttribute(c):(e=a.getAttributeNode(c))&&e.specified?e.value:null:e},c.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},c.uniqueSort=function(a){var b,c=[],d=0,e=0;if(U=!x.detectDuplicates,E=!x.sortStable&&a.slice(0),a.sort(V),U){for(;b=a[e++];)b===a[e]&&(d=c.push(e));for(;d--;)a.splice(c[d],1)}return a},A=c.getText=function(a){var b,c="",d=0,e=a.nodeType;if(e){if(1===e||9===e||11===e){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=A(a)}else if(3===e||4===e)return a.nodeValue}else for(;b=a[d];d++)c+=A(b);return c},z=c.selectors={cacheLength:50,createPseudo:e,match:rb,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(xb,yb),a[3]=(a[4]||a[5]||"").replace(xb,yb),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||c.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&c.error(a[0]),a},PSEUDO:function(a){var c,d=!a[5]&&a[2];return rb.CHILD.test(a[0])?null:(a[3]&&a[4]!==b?a[2]=a[4]:d&&pb.test(d)&&(c=m(d,!0))&&(c=d.indexOf(")",d.length-c)-d.length)&&(a[0]=a[0].slice(0,c),a[2]=d.slice(0,c)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(xb,yb).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=R[a+" "];return b||(b=new RegExp("(^|"+eb+")"+a+"("+eb+"|$)"))&&R(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==W&&a.getAttribute("class")||"")})},ATTR:function(a,b,d){return function(e){var f=c.attr(e,a);return null==f?"!="===b:b?(f+="","="===b?f===d:"!="===b?f!==d:"^="===b?d&&0===f.indexOf(d):"*="===b?d&&f.indexOf(d)>-1:"$="===b?d&&f.slice(-d.length)===d:"~="===b?(" "+f+" ").indexOf(d)>-1:"|="===b?f===d||f.slice(0,d.length+1)===d+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;
+return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){for(;p;){for(l=b;l=l[p];)if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){for(k=q[N]||(q[N]={}),j=k[a]||[],n=j[0]===P&&j[1],m=j[0]===P&&j[2],l=n&&q.childNodes[n];l=++n&&l&&l[p]||(m=n=0)||o.pop();)if(1===l.nodeType&&++m&&l===b){k[a]=[P,n,m];break}}else if(s&&(j=(b[N]||(b[N]={}))[a])&&j[0]===P)m=j[1];else for(;(l=++n&&l&&l[p]||(m=n=0)||o.pop())&&((h?l.nodeName.toLowerCase()!==r:1!==l.nodeType)||!++m||(s&&((l[N]||(l[N]={}))[a]=[P,m]),l!==b)););return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var d,f=z.pseudos[a]||z.setFilters[a.toLowerCase()]||c.error("unsupported pseudo: "+a);return f[N]?f(b):f.length>1?(d=[a,a,"",b],z.setFilters.hasOwnProperty(a.toLowerCase())?e(function(a,c){for(var d,e=f(a,b),g=e.length;g--;)d=cb.call(a,e[g]),a[d]=!(c[d]=e[g])}):function(a){return f(a,0,d)}):f}},pseudos:{not:e(function(a){var b=[],c=[],d=C(a.replace(jb,"$1"));return d[N]?e(function(a,b,c,e){for(var f,g=d(a,null,e,[]),h=a.length;h--;)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:e(function(a){return function(b){return c(a,b).length>0}}),contains:e(function(a){return function(b){return(b.textContent||b.innerText||A(b)).indexOf(a)>-1}}),lang:e(function(a){return qb.test(a||"")||c.error("unsupported lang: "+a),a=a.replace(xb,yb).toLowerCase(),function(b){var c;do if(c=I?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===H},focus:function(a){return a===G.activeElement&&(!G.hasFocus||G.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeName>"@"||3===a.nodeType||4===a.nodeType)return!1;return!0},parent:function(a){return!z.pseudos.empty(a)},header:function(a){return vb.test(a.nodeName)},input:function(a){return ub.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||b.toLowerCase()===a.type)},first:k(function(){return[0]}),last:k(function(a,b){return[b-1]}),eq:k(function(a,b,c){return[0>c?c+b:c]}),even:k(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:k(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:k(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:k(function(a,b,c){for(var d=0>c?c+b:c;++dh;h++)if(j[h].apply(b[0],b[1])===!1&&a.stopOnFalse){e=!1;break}c=!1,j&&(k?k.length&&l(k.shift()):e?j=[]:m.disable())},m={add:function(){if(j){var b=j.length;!function d(b){kb.each(b,function(b,c){var e=kb.type(c);"function"===e?a.unique&&m.has(c)||j.push(c):c&&c.length&&"string"!==e&&d(c)})}(arguments),c?g=j.length:e&&(i=b,l(e))}return this},remove:function(){return j&&kb.each(arguments,function(a,b){for(var d;(d=kb.inArray(b,j,d))>-1;)j.splice(d,1),c&&(g>=d&&g--,h>=d&&h--)}),this},has:function(a){return a?kb.inArray(a,j)>-1:!(!j||!j.length)},empty:function(){return j=[],g=0,this},disable:function(){return j=k=e=b,this},disabled:function(){return!j},lock:function(){return k=b,e||m.disable(),this},locked:function(){return!k},fireWith:function(a,b){return!j||f&&!k||(b=b||[],b=[a,b.slice?b.slice():b],c?k.push(b):l(b)),this},fire:function(){return m.fireWith(this,arguments),this},fired:function(){return!!f}};return m},kb.extend({Deferred:function(a){var b=[["resolve","done",kb.Callbacks("once memory"),"resolved"],["reject","fail",kb.Callbacks("once memory"),"rejected"],["notify","progress",kb.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return kb.Deferred(function(c){kb.each(b,function(b,f){var g=f[0],h=kb.isFunction(a[b])&&a[b];e[f[1]](function(){var a=h&&h.apply(this,arguments);a&&kb.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[g+"With"](this===d?c.promise():this,h?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?kb.extend(a,d):d}},e={};return d.pipe=d.then,kb.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b,c,d,e=0,f=fb.call(arguments),g=f.length,h=1!==g||a&&kb.isFunction(a.promise)?g:0,i=1===h?a:kb.Deferred(),j=function(a,c,d){return function(e){c[a]=this,d[a]=arguments.length>1?fb.call(arguments):e,d===b?i.notifyWith(c,d):--h||i.resolveWith(c,d)}};if(g>1)for(b=new Array(g),c=new Array(g),d=new Array(g);g>e;e++)f[e]&&kb.isFunction(f[e].promise)?f[e].promise().done(j(e,d,f)).fail(i.reject).progress(j(e,c,b)):--h;return h||i.resolveWith(d,f),i.promise()}}),kb.support=function(b){var c,d,e,f,g,h,i,j,k,l=Y.createElement("div");if(l.setAttribute("className","t"),l.innerHTML="  
    a",c=l.getElementsByTagName("*")||[],d=l.getElementsByTagName("a")[0],!d||!d.style||!c.length)return b;f=Y.createElement("select"),h=f.appendChild(Y.createElement("option")),e=l.getElementsByTagName("input")[0],d.style.cssText="top:1px;float:left;opacity:.5",b.getSetAttribute="t"!==l.className,b.leadingWhitespace=3===l.firstChild.nodeType,b.tbody=!l.getElementsByTagName("tbody").length,b.htmlSerialize=!!l.getElementsByTagName("link").length,b.style=/top/.test(d.getAttribute("style")),b.hrefNormalized="/a"===d.getAttribute("href"),b.opacity=/^0.5/.test(d.style.opacity),b.cssFloat=!!d.style.cssFloat,b.checkOn=!!e.value,b.optSelected=h.selected,b.enctype=!!Y.createElement("form").enctype,b.html5Clone="<:nav>"!==Y.createElement("nav").cloneNode(!0).outerHTML,b.inlineBlockNeedsLayout=!1,b.shrinkWrapBlocks=!1,b.pixelPosition=!1,b.deleteExpando=!0,b.noCloneEvent=!0,b.reliableMarginRight=!0,b.boxSizingReliable=!0,e.checked=!0,b.noCloneChecked=e.cloneNode(!0).checked,f.disabled=!0,b.optDisabled=!h.disabled;try{delete l.test}catch(m){b.deleteExpando=!1}e=Y.createElement("input"),e.setAttribute("value",""),b.input=""===e.getAttribute("value"),e.value="t",e.setAttribute("type","radio"),b.radioValue="t"===e.value,e.setAttribute("checked","t"),e.setAttribute("name","t"),g=Y.createDocumentFragment(),g.appendChild(e),b.appendChecked=e.checked,b.checkClone=g.cloneNode(!0).cloneNode(!0).lastChild.checked,l.attachEvent&&(l.attachEvent("onclick",function(){b.noCloneEvent=!1}),l.cloneNode(!0).click());for(k in{submit:!0,change:!0,focusin:!0})l.setAttribute(i="on"+k,"t"),b[k+"Bubbles"]=i in a||l.attributes[i].expando===!1;l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",b.clearCloneStyle="content-box"===l.style.backgroundClip;for(k in kb(b))break;return b.ownLast="0"!==k,kb(function(){var c,d,e,f="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",g=Y.getElementsByTagName("body")[0];g&&(c=Y.createElement("div"),c.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",g.appendChild(c).appendChild(l),l.innerHTML="
    t
    ",e=l.getElementsByTagName("td"),e[0].style.cssText="padding:0;margin:0;border:0;display:none",j=0===e[0].offsetHeight,e[0].style.display="",e[1].style.display="none",b.reliableHiddenOffsets=j&&0===e[0].offsetHeight,l.innerHTML="",l.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",kb.swap(g,null!=g.style.zoom?{zoom:1}:{},function(){b.boxSizing=4===l.offsetWidth}),a.getComputedStyle&&(b.pixelPosition="1%"!==(a.getComputedStyle(l,null)||{}).top,b.boxSizingReliable="4px"===(a.getComputedStyle(l,null)||{width:"4px"}).width,d=l.appendChild(Y.createElement("div")),d.style.cssText=l.style.cssText=f,d.style.marginRight=d.style.width="0",l.style.width="1px",b.reliableMarginRight=!parseFloat((a.getComputedStyle(d,null)||{}).marginRight)),typeof l.style.zoom!==W&&(l.innerHTML="",l.style.cssText=f+"width:1px;padding:1px;display:inline;zoom:1",b.inlineBlockNeedsLayout=3===l.offsetWidth,l.style.display="block",l.innerHTML="
    ",l.firstChild.style.width="5px",b.shrinkWrapBlocks=3!==l.offsetWidth,b.inlineBlockNeedsLayout&&(g.style.zoom=1)),g.removeChild(c),c=l=e=d=null)}),c=f=g=h=d=e=null,b}({});var Ab=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,Bb=/([A-Z])/g;kb.extend({cache:{},noData:{applet:!0,embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?kb.cache[a[kb.expando]]:a[kb.expando],!!a&&!h(a)},data:function(a,b,c){return e(a,b,c)},removeData:function(a,b){return f(a,b)},_data:function(a,b,c){return e(a,b,c,!0)},_removeData:function(a,b){return f(a,b,!0)},acceptData:function(a){if(a.nodeType&&1!==a.nodeType&&9!==a.nodeType)return!1;var b=a.nodeName&&kb.noData[a.nodeName.toLowerCase()];return!b||b!==!0&&a.getAttribute("classid")===b}}),kb.fn.extend({data:function(a,c){var d,e,f=null,h=0,i=this[0];if(a===b){if(this.length&&(f=kb.data(i),1===i.nodeType&&!kb._data(i,"parsedAttrs"))){for(d=i.attributes;h1?this.each(function(){kb.data(this,a,c)}):i?g(i,a,kb.data(i,a)):null},removeData:function(a){return this.each(function(){kb.removeData(this,a)})}}),kb.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=kb._data(a,b),c&&(!d||kb.isArray(c)?d=kb._data(a,b,kb.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=kb.queue(a,b),d=c.length,e=c.shift(),f=kb._queueHooks(a,b),g=function(){kb.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return kb._data(a,c)||kb._data(a,c,{empty:kb.Callbacks("once memory").add(function(){kb._removeData(a,b+"queue"),kb._removeData(a,c)})})}}),kb.fn.extend({queue:function(a,c){var d=2;return"string"!=typeof a&&(c=a,a="fx",d--),arguments.length1)},removeAttr:function(a){return this.each(function(){kb.removeAttr(this,a)})},prop:function(a,b){return kb.access(this,kb.prop,a,b,arguments.length>1)},removeProp:function(a){return a=kb.propFix[a]||a,this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,f,g=0,h=this.length,i="string"==typeof a&&a;if(kb.isFunction(a))return this.each(function(b){kb(this).addClass(a.call(this,b,this.className))});if(i)for(b=(a||"").match(mb)||[];h>g;g++)if(c=this[g],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(Eb," "):" ")){for(f=0;e=b[f++];)d.indexOf(" "+e+" ")<0&&(d+=e+" ");c.className=kb.trim(d)}return this},removeClass:function(a){var b,c,d,e,f,g=0,h=this.length,i=0===arguments.length||"string"==typeof a&&a;if(kb.isFunction(a))return this.each(function(b){kb(this).removeClass(a.call(this,b,this.className))});if(i)for(b=(a||"").match(mb)||[];h>g;g++)if(c=this[g],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(Eb," "):"")){for(f=0;e=b[f++];)for(;d.indexOf(" "+e+" ")>=0;)d=d.replace(" "+e+" "," ");c.className=a?kb.trim(d):""}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(kb.isFunction(a)?function(c){kb(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c)for(var b,d=0,e=kb(this),f=a.match(mb)||[];b=f[d++];)e.hasClass(b)?e.removeClass(b):e.addClass(b);else(c===W||"boolean"===c)&&(this.className&&kb._data(this,"__className__",this.className),this.className=this.className||a===!1?"":kb._data(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(Eb," ").indexOf(b)>=0)return!0;return!1},val:function(a){var c,d,e,f=this[0];{if(arguments.length)return e=kb.isFunction(a),this.each(function(c){var f;1===this.nodeType&&(f=e?a.call(this,c,kb(this).val()):a,null==f?f="":"number"==typeof f?f+="":kb.isArray(f)&&(f=kb.map(f,function(a){return null==a?"":a+""})),d=kb.valHooks[this.type]||kb.valHooks[this.nodeName.toLowerCase()],d&&"set"in d&&d.set(this,f,"value")!==b||(this.value=f))});if(f)return d=kb.valHooks[f.type]||kb.valHooks[f.nodeName.toLowerCase()],d&&"get"in d&&(c=d.get(f,"value"))!==b?c:(c=f.value,"string"==typeof c?c.replace(Fb,""):null==c?"":c)}}}),kb.extend({valHooks:{option:{get:function(a){var b=kb.find.attr(a,"value");return null!=b?b:a.text}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(kb.support.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&kb.nodeName(c.parentNode,"optgroup"))){if(b=kb(c).val(),f)return b;g.push(b)}return g},set:function(a,b){for(var c,d,e=a.options,f=kb.makeArray(b),g=e.length;g--;)d=e[g],(d.selected=kb.inArray(kb(d).val(),f)>=0)&&(c=!0);return c||(a.selectedIndex=-1),f}}},attr:function(a,c,d){var e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return typeof a.getAttribute===W?kb.prop(a,c,d):(1===g&&kb.isXMLDoc(a)||(c=c.toLowerCase(),e=kb.attrHooks[c]||(kb.expr.match.bool.test(c)?Db:Cb)),d===b?e&&"get"in e&&null!==(f=e.get(a,c))?f:(f=kb.find.attr(a,c),null==f?b:f):null!==d?e&&"set"in e&&(f=e.set(a,d,c))!==b?f:(a.setAttribute(c,d+""),d):void kb.removeAttr(a,c))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(mb);if(f&&1===a.nodeType)for(;c=f[e++];)d=kb.propFix[c]||c,kb.expr.match.bool.test(c)?Kb&&Jb||!Ib.test(c)?a[d]=!1:a[kb.camelCase("default-"+c)]=a[d]=!1:kb.attr(a,c,""),a.removeAttribute(Jb?c:d)},attrHooks:{type:{set:function(a,b){if(!kb.support.radioValue&&"radio"===b&&kb.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(a,c,d){var e,f,g,h=a.nodeType;if(a&&3!==h&&8!==h&&2!==h)return g=1!==h||!kb.isXMLDoc(a),g&&(c=kb.propFix[c]||c,f=kb.propHooks[c]),d!==b?f&&"set"in f&&(e=f.set(a,d,c))!==b?e:a[c]=d:f&&"get"in f&&null!==(e=f.get(a,c))?e:a[c]},propHooks:{tabIndex:{get:function(a){var b=kb.find.attr(a,"tabindex");return b?parseInt(b,10):Gb.test(a.nodeName)||Hb.test(a.nodeName)&&a.href?0:-1}}}}),Db={set:function(a,b,c){return b===!1?kb.removeAttr(a,c):Kb&&Jb||!Ib.test(c)?a.setAttribute(!Jb&&kb.propFix[c]||c,c):a[kb.camelCase("default-"+c)]=a[c]=!0,c}},kb.each(kb.expr.match.bool.source.match(/\w+/g),function(a,c){var d=kb.expr.attrHandle[c]||kb.find.attr;kb.expr.attrHandle[c]=Kb&&Jb||!Ib.test(c)?function(a,c,e){var f=kb.expr.attrHandle[c],g=e?b:(kb.expr.attrHandle[c]=b)!=d(a,c,e)?c.toLowerCase():null;return kb.expr.attrHandle[c]=f,g}:function(a,c,d){return d?b:a[kb.camelCase("default-"+c)]?c.toLowerCase():null}}),Kb&&Jb||(kb.attrHooks.value={set:function(a,b,c){return kb.nodeName(a,"input")?void(a.defaultValue=b):Cb&&Cb.set(a,b,c)}}),Jb||(Cb={set:function(a,c,d){var e=a.getAttributeNode(d);return e||a.setAttributeNode(e=a.ownerDocument.createAttribute(d)),e.value=c+="","value"===d||c===a.getAttribute(d)?c:b}},kb.expr.attrHandle.id=kb.expr.attrHandle.name=kb.expr.attrHandle.coords=function(a,c,d){var e;return d?b:(e=a.getAttributeNode(c))&&""!==e.value?e.value:null},kb.valHooks.button={get:function(a,c){var d=a.getAttributeNode(c);return d&&d.specified?d.value:b},set:Cb.set},kb.attrHooks.contenteditable={set:function(a,b,c){Cb.set(a,""===b?!1:b,c)}},kb.each(["width","height"],function(a,b){kb.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),kb.support.hrefNormalized||kb.each(["href","src"],function(a,b){kb.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),kb.support.style||(kb.attrHooks.style={get:function(a){return a.style.cssText||b},set:function(a,b){return a.style.cssText=b+""}}),kb.support.optSelected||(kb.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}}),kb.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){kb.propFix[this.toLowerCase()]=this}),kb.support.enctype||(kb.propFix.enctype="encoding"),kb.each(["radio","checkbox"],function(){kb.valHooks[this]={set:function(a,b){return kb.isArray(b)?a.checked=kb.inArray(kb(a).val(),b)>=0:void 0}},kb.support.checkOn||(kb.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var Lb=/^(?:input|select|textarea)$/i,Mb=/^key/,Nb=/^(?:mouse|contextmenu)|click/,Ob=/^(?:focusinfocus|focusoutblur)$/,Pb=/^([^.]*)(?:\.(.+)|)$/;kb.event={global:{},add:function(a,c,d,e,f){var g,h,i,j,k,l,m,n,o,p,q,r=kb._data(a);if(r){for(d.handler&&(j=d,d=j.handler,f=j.selector),d.guid||(d.guid=kb.guid++),(h=r.events)||(h=r.events={}),(l=r.handle)||(l=r.handle=function(a){return typeof kb===W||a&&kb.event.triggered===a.type?b:kb.event.dispatch.apply(l.elem,arguments)},l.elem=a),c=(c||"").match(mb)||[""],i=c.length;i--;)g=Pb.exec(c[i])||[],o=q=g[1],p=(g[2]||"").split(".").sort(),o&&(k=kb.event.special[o]||{},o=(f?k.delegateType:k.bindType)||o,k=kb.event.special[o]||{},m=kb.extend({type:o,origType:q,data:e,handler:d,guid:d.guid,selector:f,needsContext:f&&kb.expr.match.needsContext.test(f),namespace:p.join(".")},j),(n=h[o])||(n=h[o]=[],n.delegateCount=0,k.setup&&k.setup.call(a,e,p,l)!==!1||(a.addEventListener?a.addEventListener(o,l,!1):a.attachEvent&&a.attachEvent("on"+o,l))),k.add&&(k.add.call(a,m),m.handler.guid||(m.handler.guid=d.guid)),f?n.splice(n.delegateCount++,0,m):n.push(m),kb.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=kb.hasData(a)&&kb._data(a);if(q&&(k=q.events)){for(b=(b||"").match(mb)||[""],j=b.length;j--;)if(h=Pb.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n){for(l=kb.event.special[n]||{},n=(d?l.delegateType:l.bindType)||n,m=k[n]||[],h=h[2]&&new RegExp("(^|\\.)"+o.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=m.length;f--;)g=m[f],!e&&p!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(m.splice(f,1),g.selector&&m.delegateCount--,l.remove&&l.remove.call(a,g));i&&!m.length&&(l.teardown&&l.teardown.call(a,o,q.handle)!==!1||kb.removeEvent(a,n,q.handle),delete k[n])}else for(n in k)kb.event.remove(a,n+b[j],c,d,!0);kb.isEmptyObject(k)&&(delete q.handle,kb._removeData(a,"events"))}},trigger:function(c,d,e,f){var g,h,i,j,k,l,m,n=[e||Y],o=ib.call(c,"type")?c.type:c,p=ib.call(c,"namespace")?c.namespace.split("."):[];if(i=l=e=e||Y,3!==e.nodeType&&8!==e.nodeType&&!Ob.test(o+kb.event.triggered)&&(o.indexOf(".")>=0&&(p=o.split("."),o=p.shift(),p.sort()),h=o.indexOf(":")<0&&"on"+o,c=c[kb.expando]?c:new kb.Event(o,"object"==typeof c&&c),c.isTrigger=f?2:3,c.namespace=p.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,c.result=b,c.target||(c.target=e),d=null==d?[c]:kb.makeArray(d,[c]),k=kb.event.special[o]||{},f||!k.trigger||k.trigger.apply(e,d)!==!1)){if(!f&&!k.noBubble&&!kb.isWindow(e)){for(j=k.delegateType||o,Ob.test(j+o)||(i=i.parentNode);i;i=i.parentNode)n.push(i),l=i;l===(e.ownerDocument||Y)&&n.push(l.defaultView||l.parentWindow||a)}for(m=0;(i=n[m++])&&!c.isPropagationStopped();)c.type=m>1?j:k.bindType||o,g=(kb._data(i,"events")||{})[c.type]&&kb._data(i,"handle"),g&&g.apply(i,d),g=h&&i[h],g&&kb.acceptData(i)&&g.apply&&g.apply(i,d)===!1&&c.preventDefault();if(c.type=o,!f&&!c.isDefaultPrevented()&&(!k._default||k._default.apply(n.pop(),d)===!1)&&kb.acceptData(e)&&h&&e[o]&&!kb.isWindow(e)){l=e[h],l&&(e[h]=null),kb.event.triggered=o;try{e[o]()}catch(q){}kb.event.triggered=b,l&&(e[h]=l)}return c.result}},dispatch:function(a){a=kb.event.fix(a);var c,d,e,f,g,h=[],i=fb.call(arguments),j=(kb._data(this,"events")||{})[a.type]||[],k=kb.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){for(h=kb.event.handlers.call(this,a,j),c=0;(f=h[c++])&&!a.isPropagationStopped();)for(a.currentTarget=f.elem,g=0;(e=f.handlers[g++])&&!a.isImmediatePropagationStopped();)(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,d=((kb.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),d!==b&&(a.result=d)===!1&&(a.preventDefault(),a.stopPropagation()));return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,c){var d,e,f,g,h=[],i=c.delegateCount,j=a.target;if(i&&j.nodeType&&(!a.button||"click"!==a.type))for(;j!=this;j=j.parentNode||this)if(1===j.nodeType&&(j.disabled!==!0||"click"!==a.type)){for(f=[],g=0;i>g;g++)e=c[g],d=e.selector+" ",f[d]===b&&(f[d]=e.needsContext?kb(d,this).index(j)>=0:kb.find(d,this,null,[j]).length),f[d]&&f.push(e);f.length&&h.push({elem:j,handlers:f})}return ib;b++)if(kb.contains(d[b],this))return!0}));for(b=0;e>b;b++)kb.find(a,d[b],c);return c=this.pushStack(e>1?kb.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},has:function(a){var b,c=kb(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(kb.contains(this,c[b]))return!0})},not:function(a){return this.pushStack(m(this,a||[],!0))},filter:function(a){return this.pushStack(m(this,a||[],!1))},is:function(a){return!!m(this,"string"==typeof a&&Sb.test(a)?kb(a):a||[],!1).length},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=Sb.test(a)||"string"!=typeof a?kb(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&kb.find.matchesSelector(c,a))){c=f.push(c);break}return this.pushStack(f.length>1?kb.unique(f):f)},index:function(a){return a?"string"==typeof a?kb.inArray(this[0],kb(a)):kb.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){var c="string"==typeof a?kb(a,b):kb.makeArray(a&&a.nodeType?[a]:a),d=kb.merge(this.get(),c);return this.pushStack(kb.unique(d))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}}),kb.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null
+},parents:function(a){return kb.dir(a,"parentNode")},parentsUntil:function(a,b,c){return kb.dir(a,"parentNode",c)},next:function(a){return l(a,"nextSibling")},prev:function(a){return l(a,"previousSibling")},nextAll:function(a){return kb.dir(a,"nextSibling")},prevAll:function(a){return kb.dir(a,"previousSibling")},nextUntil:function(a,b,c){return kb.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return kb.dir(a,"previousSibling",c)},siblings:function(a){return kb.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return kb.sibling(a.firstChild)},contents:function(a){return kb.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:kb.merge([],a.childNodes)}},function(a,b){kb.fn[a]=function(c,d){var e=kb.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=kb.filter(d,e)),this.length>1&&(Tb[a]||(e=kb.unique(e)),Rb.test(a)&&(e=e.reverse())),this.pushStack(e)}}),kb.extend({filter:function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?kb.find.matchesSelector(d,a)?[d]:[]:kb.find.matches(a,kb.grep(b,function(a){return 1===a.nodeType}))},dir:function(a,c,d){for(var e=[],f=a[c];f&&9!==f.nodeType&&(d===b||1!==f.nodeType||!kb(f).is(d));)1===f.nodeType&&e.push(f),f=f[c];return e},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}});var Ub="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",Vb=/ jQuery\d+="(?:null|\d+)"/g,Wb=new RegExp("<(?:"+Ub+")[\\s/>]","i"),Xb=/^\s+/,Yb=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,Zb=/<([\w:]+)/,$b=/\s*$/g,gc={option:[1,""],legend:[1,"
    ","
    "],area:[1,"",""],param:[1,"",""],thead:[1,"","
    "],tr:[2,"","
    "],col:[2,"","
    "],td:[3,"","
    "],_default:kb.support.htmlSerialize?[0,"",""]:[1,"X
    ","
    "]},hc=n(Y),ic=hc.appendChild(Y.createElement("div"));gc.optgroup=gc.option,gc.tbody=gc.tfoot=gc.colgroup=gc.caption=gc.thead,gc.th=gc.td,kb.fn.extend({text:function(a){return kb.access(this,function(a){return a===b?kb.text(this):this.empty().append((this[0]&&this[0].ownerDocument||Y).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=o(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=o(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?kb.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||kb.cleanData(u(c)),c.parentNode&&(b&&kb.contains(c.ownerDocument,c)&&r(u(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){for(1===a.nodeType&&kb.cleanData(u(a,!1));a.firstChild;)a.removeChild(a.firstChild);a.options&&kb.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return kb.clone(this,a,b)})},html:function(a){return kb.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return 1===c.nodeType?c.innerHTML.replace(Vb,""):b;if(!("string"!=typeof a||ac.test(a)||!kb.support.htmlSerialize&&Wb.test(a)||!kb.support.leadingWhitespace&&Xb.test(a)||gc[(Zb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(Yb,"<$1>");try{for(;e>d;d++)c=this[d]||{},1===c.nodeType&&(kb.cleanData(u(c,!1)),c.innerHTML=a);c=0}catch(f){}}c&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=kb.map(this,function(a){return[a.nextSibling,a.parentNode]}),b=0;return this.domManip(arguments,function(c){var d=a[b++],e=a[b++];e&&(d&&d.parentNode!==e&&(d=this.nextSibling),kb(this).remove(),e.insertBefore(c,d))},!0),b?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b,c){a=db.apply([],a);var d,e,f,g,h,i,j=0,k=this.length,l=this,m=k-1,n=a[0],o=kb.isFunction(n);if(o||!(1>=k||"string"!=typeof n||kb.support.checkClone)&&cc.test(n))return this.each(function(d){var e=l.eq(d);o&&(a[0]=n.call(this,d,e.html())),e.domManip(a,b,c)});if(k&&(i=kb.buildFragment(a,this[0].ownerDocument,!1,!c&&this),d=i.firstChild,1===i.childNodes.length&&(i=d),d)){for(g=kb.map(u(i,"script"),p),f=g.length;k>j;j++)e=i,j!==m&&(e=kb.clone(e,!0,!0),f&&kb.merge(g,u(e,"script"))),b.call(this[j],e,j);if(f)for(h=g[g.length-1].ownerDocument,kb.map(g,q),j=0;f>j;j++)e=g[j],dc.test(e.type||"")&&!kb._data(e,"globalEval")&&kb.contains(h,e)&&(e.src?kb._evalUrl(e.src):kb.globalEval((e.text||e.textContent||e.innerHTML||"").replace(fc,"")));i=d=null}return this}}),kb.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){kb.fn[a]=function(a){for(var c,d=0,e=[],f=kb(a),g=f.length-1;g>=d;d++)c=d===g?this:this.clone(!0),kb(f[d])[b](c),eb.apply(e,c.get());return this.pushStack(e)}}),kb.extend({clone:function(a,b,c){var d,e,f,g,h,i=kb.contains(a.ownerDocument,a);if(kb.support.html5Clone||kb.isXMLDoc(a)||!Wb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(ic.innerHTML=a.outerHTML,ic.removeChild(f=ic.firstChild)),!(kb.support.noCloneEvent&&kb.support.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||kb.isXMLDoc(a)))for(d=u(f),h=u(a),g=0;null!=(e=h[g]);++g)d[g]&&t(e,d[g]);if(b)if(c)for(h=h||u(a),d=d||u(f),g=0;null!=(e=h[g]);g++)s(e,d[g]);else s(a,f);return d=u(f,"script"),d.length>0&&r(d,!i&&u(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k,l=a.length,m=n(b),o=[],p=0;l>p;p++)if(f=a[p],f||0===f)if("object"===kb.type(f))kb.merge(o,f.nodeType?[f]:f);else if(_b.test(f)){for(h=h||m.appendChild(b.createElement("div")),i=(Zb.exec(f)||["",""])[1].toLowerCase(),k=gc[i]||gc._default,h.innerHTML=k[1]+f.replace(Yb,"<$1>")+k[2],e=k[0];e--;)h=h.lastChild;if(!kb.support.leadingWhitespace&&Xb.test(f)&&o.push(b.createTextNode(Xb.exec(f)[0])),!kb.support.tbody)for(f="table"!==i||$b.test(f)?""!==k[1]||$b.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;e--;)kb.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j);for(kb.merge(o,h.childNodes),h.textContent="";h.firstChild;)h.removeChild(h.firstChild);h=m.lastChild}else o.push(b.createTextNode(f));for(h&&m.removeChild(h),kb.support.appendChecked||kb.grep(u(o,"input"),v),p=0;f=o[p++];)if((!d||-1===kb.inArray(f,d))&&(g=kb.contains(f.ownerDocument,f),h=u(m.appendChild(f),"script"),g&&r(h),c))for(e=0;f=h[e++];)dc.test(f.type||"")&&c.push(f);return h=null,m},cleanData:function(a,b){for(var c,d,e,f,g=0,h=kb.expando,i=kb.cache,j=kb.support.deleteExpando,k=kb.event.special;null!=(c=a[g]);g++)if((b||kb.acceptData(c))&&(e=c[h],f=e&&i[e])){if(f.events)for(d in f.events)k[d]?kb.event.remove(c,d):kb.removeEvent(c,d,f.handle);i[e]&&(delete i[e],j?delete c[h]:typeof c.removeAttribute!==W?c.removeAttribute(h):c[h]=null,bb.push(e))}},_evalUrl:function(a){return kb.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})}}),kb.fn.extend({wrapAll:function(a){if(kb.isFunction(a))return this.each(function(b){kb(this).wrapAll(a.call(this,b))});if(this[0]){var b=kb(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){for(var a=this;a.firstChild&&1===a.firstChild.nodeType;)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return this.each(kb.isFunction(a)?function(b){kb(this).wrapInner(a.call(this,b))}:function(){var b=kb(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=kb.isFunction(a);return this.each(function(c){kb(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){kb.nodeName(this,"body")||kb(this).replaceWith(this.childNodes)}).end()}});var jc,kc,lc,mc=/alpha\([^)]*\)/i,nc=/opacity\s*=\s*([^)]*)/,oc=/^(top|right|bottom|left)$/,pc=/^(none|table(?!-c[ea]).+)/,qc=/^margin/,rc=new RegExp("^("+lb+")(.*)$","i"),sc=new RegExp("^("+lb+")(?!px)[a-z%]+$","i"),tc=new RegExp("^([+-])=("+lb+")","i"),uc={BODY:"block"},vc={position:"absolute",visibility:"hidden",display:"block"},wc={letterSpacing:0,fontWeight:400},xc=["Top","Right","Bottom","Left"],yc=["Webkit","O","Moz","ms"];kb.fn.extend({css:function(a,c){return kb.access(this,function(a,c,d){var e,f,g={},h=0;if(kb.isArray(c)){for(f=kc(a),e=c.length;e>h;h++)g[c[h]]=kb.css(a,c[h],!1,f);return g}return d!==b?kb.style(a,c,d):kb.css(a,c)},a,c,arguments.length>1)},show:function(){return y(this,!0)},hide:function(){return y(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){x(this)?kb(this).show():kb(this).hide()})}}),kb.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=lc(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":kb.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var f,g,h,i=kb.camelCase(c),j=a.style;if(c=kb.cssProps[i]||(kb.cssProps[i]=w(j,i)),h=kb.cssHooks[c]||kb.cssHooks[i],d===b)return h&&"get"in h&&(f=h.get(a,!1,e))!==b?f:j[c];if(g=typeof d,"string"===g&&(f=tc.exec(d))&&(d=(f[1]+1)*f[2]+parseFloat(kb.css(a,c)),g="number"),!(null==d||"number"===g&&isNaN(d)||("number"!==g||kb.cssNumber[i]||(d+="px"),kb.support.clearCloneStyle||""!==d||0!==c.indexOf("background")||(j[c]="inherit"),h&&"set"in h&&(d=h.set(a,d,e))===b)))try{j[c]=d}catch(k){}}},css:function(a,c,d,e){var f,g,h,i=kb.camelCase(c);return c=kb.cssProps[i]||(kb.cssProps[i]=w(a.style,i)),h=kb.cssHooks[c]||kb.cssHooks[i],h&&"get"in h&&(g=h.get(a,!0,d)),g===b&&(g=lc(a,c,e)),"normal"===g&&c in wc&&(g=wc[c]),""===d||d?(f=parseFloat(g),d===!0||kb.isNumeric(f)?f||0:g):g}}),a.getComputedStyle?(kc=function(b){return a.getComputedStyle(b,null)},lc=function(a,c,d){var e,f,g,h=d||kc(a),i=h?h.getPropertyValue(c)||h[c]:b,j=a.style;return h&&(""!==i||kb.contains(a.ownerDocument,a)||(i=kb.style(a,c)),sc.test(i)&&qc.test(c)&&(e=j.width,f=j.minWidth,g=j.maxWidth,j.minWidth=j.maxWidth=j.width=i,i=h.width,j.width=e,j.minWidth=f,j.maxWidth=g)),i}):Y.documentElement.currentStyle&&(kc=function(a){return a.currentStyle},lc=function(a,c,d){var e,f,g,h=d||kc(a),i=h?h[c]:b,j=a.style;return null==i&&j&&j[c]&&(i=j[c]),sc.test(i)&&!oc.test(c)&&(e=j.left,f=a.runtimeStyle,g=f&&f.left,g&&(f.left=a.currentStyle.left),j.left="fontSize"===c?"1em":i,i=j.pixelLeft+"px",j.left=e,g&&(f.left=g)),""===i?"auto":i}),kb.each(["height","width"],function(a,b){kb.cssHooks[b]={get:function(a,c,d){return c?0===a.offsetWidth&&pc.test(kb.css(a,"display"))?kb.swap(a,vc,function(){return B(a,b,d)}):B(a,b,d):void 0},set:function(a,c,d){var e=d&&kc(a);return z(a,c,d?A(a,b,d,kb.support.boxSizing&&"border-box"===kb.css(a,"boxSizing",!1,e),e):0)}}}),kb.support.opacity||(kb.cssHooks.opacity={get:function(a,b){return nc.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=kb.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===kb.trim(f.replace(mc,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=mc.test(f)?f.replace(mc,e):f+" "+e)}}),kb(function(){kb.support.reliableMarginRight||(kb.cssHooks.marginRight={get:function(a,b){return b?kb.swap(a,{display:"inline-block"},lc,[a,"marginRight"]):void 0}}),!kb.support.pixelPosition&&kb.fn.position&&kb.each(["top","left"],function(a,b){kb.cssHooks[b]={get:function(a,c){return c?(c=lc(a,b),sc.test(c)?kb(a).position()[b]+"px":c):void 0}}})}),kb.expr&&kb.expr.filters&&(kb.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0||!kb.support.reliableHiddenOffsets&&"none"===(a.style&&a.style.display||kb.css(a,"display"))},kb.expr.filters.visible=function(a){return!kb.expr.filters.hidden(a)}),kb.each({margin:"",padding:"",border:"Width"},function(a,b){kb.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+xc[d]+b]=f[d]||f[d-2]||f[0];return e}},qc.test(a)||(kb.cssHooks[a+b].set=z)});var zc=/%20/g,Ac=/\[\]$/,Bc=/\r?\n/g,Cc=/^(?:submit|button|image|reset|file)$/i,Dc=/^(?:input|select|textarea|keygen)/i;kb.fn.extend({serialize:function(){return kb.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=kb.prop(this,"elements");return a?kb.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!kb(this).is(":disabled")&&Dc.test(this.nodeName)&&!Cc.test(a)&&(this.checked||!bc.test(a))}).map(function(a,b){var c=kb(this).val();return null==c?null:kb.isArray(c)?kb.map(c,function(a){return{name:b.name,value:a.replace(Bc,"\r\n")}}):{name:b.name,value:c.replace(Bc,"\r\n")}}).get()}}),kb.param=function(a,c){var d,e=[],f=function(a,b){b=kb.isFunction(b)?b():null==b?"":b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(c===b&&(c=kb.ajaxSettings&&kb.ajaxSettings.traditional),kb.isArray(a)||a.jquery&&!kb.isPlainObject(a))kb.each(a,function(){f(this.name,this.value)});else for(d in a)E(d,a[d],c,f);return e.join("&").replace(zc,"+")},kb.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){kb.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),kb.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var Ec,Fc,Gc=kb.now(),Hc=/\?/,Ic=/#.*$/,Jc=/([?&])_=[^&]*/,Kc=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Lc=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Mc=/^(?:GET|HEAD)$/,Nc=/^\/\//,Oc=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Pc=kb.fn.load,Qc={},Rc={},Sc="*/".concat("*");try{Fc=X.href}catch(Tc){Fc=Y.createElement("a"),Fc.href="",Fc=Fc.href}Ec=Oc.exec(Fc.toLowerCase())||[],kb.fn.load=function(a,c,d){if("string"!=typeof a&&Pc)return Pc.apply(this,arguments);var e,f,g,h=this,i=a.indexOf(" ");return i>=0&&(e=a.slice(i,a.length),a=a.slice(0,i)),kb.isFunction(c)?(d=c,c=b):c&&"object"==typeof c&&(g="POST"),h.length>0&&kb.ajax({url:a,type:g,dataType:"html",data:c}).done(function(a){f=arguments,h.html(e?kb("
    ").append(kb.parseHTML(a)).find(e):a)}).complete(d&&function(a,b){h.each(d,f||[a.responseText,b,a])}),this},kb.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){kb.fn[b]=function(a){return this.on(b,a)}}),kb.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Fc,type:"GET",isLocal:Lc.test(Ec[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Sc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":kb.parseJSON,"text xml":kb.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?H(H(a,kb.ajaxSettings),b):H(kb.ajaxSettings,a)},ajaxPrefilter:F(Qc),ajaxTransport:F(Rc),ajax:function(a,c){function d(a,c,d,e){var f,l,s,t,v,x=c;2!==u&&(u=2,i&&clearTimeout(i),k=b,h=e||"",w.readyState=a>0?4:0,f=a>=200&&300>a||304===a,d&&(t=I(m,w,d)),t=J(m,t,w,f),f?(m.ifModified&&(v=w.getResponseHeader("Last-Modified"),v&&(kb.lastModified[g]=v),v=w.getResponseHeader("etag"),v&&(kb.etag[g]=v)),204===a||"HEAD"===m.type?x="nocontent":304===a?x="notmodified":(x=t.state,l=t.data,s=t.error,f=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),w.status=a,w.statusText=(c||x)+"",f?p.resolveWith(n,[l,x,w]):p.rejectWith(n,[w,x,s]),w.statusCode(r),r=b,j&&o.trigger(f?"ajaxSuccess":"ajaxError",[w,m,f?l:s]),q.fireWith(n,[w,x]),j&&(o.trigger("ajaxComplete",[w,m]),--kb.active||kb.event.trigger("ajaxStop")))}"object"==typeof a&&(c=a,a=b),c=c||{};var e,f,g,h,i,j,k,l,m=kb.ajaxSetup({},c),n=m.context||m,o=m.context&&(n.nodeType||n.jquery)?kb(n):kb.event,p=kb.Deferred(),q=kb.Callbacks("once memory"),r=m.statusCode||{},s={},t={},u=0,v="canceled",w={readyState:0,getResponseHeader:function(a){var b;if(2===u){if(!l)for(l={};b=Kc.exec(h);)l[b[1].toLowerCase()]=b[2];b=l[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===u?h:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return u||(a=t[c]=t[c]||a,s[a]=b),this},overrideMimeType:function(a){return u||(m.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>u)for(b in a)r[b]=[r[b],a[b]];else w.always(a[w.status]);return this},abort:function(a){var b=a||v;return k&&k.abort(b),d(0,b),this}};if(p.promise(w).complete=q.add,w.success=w.done,w.error=w.fail,m.url=((a||m.url||Fc)+"").replace(Ic,"").replace(Nc,Ec[1]+"//"),m.type=c.method||c.type||m.method||m.type,m.dataTypes=kb.trim(m.dataType||"*").toLowerCase().match(mb)||[""],null==m.crossDomain&&(e=Oc.exec(m.url.toLowerCase()),m.crossDomain=!(!e||e[1]===Ec[1]&&e[2]===Ec[2]&&(e[3]||("http:"===e[1]?"80":"443"))===(Ec[3]||("http:"===Ec[1]?"80":"443")))),m.data&&m.processData&&"string"!=typeof m.data&&(m.data=kb.param(m.data,m.traditional)),G(Qc,m,c,w),2===u)return w;j=m.global,j&&0===kb.active++&&kb.event.trigger("ajaxStart"),m.type=m.type.toUpperCase(),m.hasContent=!Mc.test(m.type),g=m.url,m.hasContent||(m.data&&(g=m.url+=(Hc.test(g)?"&":"?")+m.data,delete m.data),m.cache===!1&&(m.url=Jc.test(g)?g.replace(Jc,"$1_="+Gc++):g+(Hc.test(g)?"&":"?")+"_="+Gc++)),m.ifModified&&(kb.lastModified[g]&&w.setRequestHeader("If-Modified-Since",kb.lastModified[g]),kb.etag[g]&&w.setRequestHeader("If-None-Match",kb.etag[g])),(m.data&&m.hasContent&&m.contentType!==!1||c.contentType)&&w.setRequestHeader("Content-Type",m.contentType),w.setRequestHeader("Accept",m.dataTypes[0]&&m.accepts[m.dataTypes[0]]?m.accepts[m.dataTypes[0]]+("*"!==m.dataTypes[0]?", "+Sc+"; q=0.01":""):m.accepts["*"]);for(f in m.headers)w.setRequestHeader(f,m.headers[f]);if(m.beforeSend&&(m.beforeSend.call(n,w,m)===!1||2===u))return w.abort();v="abort";for(f in{success:1,error:1,complete:1})w[f](m[f]);if(k=G(Rc,m,c,w)){w.readyState=1,j&&o.trigger("ajaxSend",[w,m]),m.async&&m.timeout>0&&(i=setTimeout(function(){w.abort("timeout")},m.timeout));try{u=1,k.send(s,d)}catch(x){if(!(2>u))throw x;d(-1,x)}}else d(-1,"No Transport");return w},getJSON:function(a,b,c){return kb.get(a,b,c,"json")},getScript:function(a,c){return kb.get(a,b,c,"script")}}),kb.each(["get","post"],function(a,c){kb[c]=function(a,d,e,f){return kb.isFunction(d)&&(f=f||e,e=d,d=b),kb.ajax({url:a,type:c,dataType:f,data:d,success:e})}}),kb.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return kb.globalEval(a),a}}}),kb.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),kb.ajaxTransport("script",function(a){if(a.crossDomain){var c,d=Y.head||kb("head")[0]||Y.documentElement;return{send:function(b,e){c=Y.createElement("script"),c.async=!0,a.scriptCharset&&(c.charset=a.scriptCharset),c.src=a.url,c.onload=c.onreadystatechange=function(a,b){(b||!c.readyState||/loaded|complete/.test(c.readyState))&&(c.onload=c.onreadystatechange=null,c.parentNode&&c.parentNode.removeChild(c),c=null,b||e(200,"success"))},d.insertBefore(c,d.firstChild)},abort:function(){c&&c.onload(b,!0)}}}});var Uc=[],Vc=/(=)\?(?=&|$)|\?\?/;kb.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Uc.pop()||kb.expando+"_"+Gc++;return this[a]=!0,a}}),kb.ajaxPrefilter("json jsonp",function(c,d,e){var f,g,h,i=c.jsonp!==!1&&(Vc.test(c.url)?"url":"string"==typeof c.data&&!(c.contentType||"").indexOf("application/x-www-form-urlencoded")&&Vc.test(c.data)&&"data");return i||"jsonp"===c.dataTypes[0]?(f=c.jsonpCallback=kb.isFunction(c.jsonpCallback)?c.jsonpCallback():c.jsonpCallback,i?c[i]=c[i].replace(Vc,"$1"+f):c.jsonp!==!1&&(c.url+=(Hc.test(c.url)?"&":"?")+c.jsonp+"="+f),c.converters["script json"]=function(){return h||kb.error(f+" was not called"),h[0]},c.dataTypes[0]="json",g=a[f],a[f]=function(){h=arguments},e.always(function(){a[f]=g,c[f]&&(c.jsonpCallback=d.jsonpCallback,Uc.push(f)),h&&kb.isFunction(g)&&g(h[0]),h=g=b}),"script"):void 0});var Wc,Xc,Yc=0,Zc=a.ActiveXObject&&function(){var a;for(a in Wc)Wc[a](b,!0)};kb.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&K()||L()}:K,Xc=kb.ajaxSettings.xhr(),kb.support.cors=!!Xc&&"withCredentials"in Xc,Xc=kb.support.ajax=!!Xc,Xc&&kb.ajaxTransport(function(c){if(!c.crossDomain||kb.support.cors){var d;return{send:function(e,f){var g,h,i=c.xhr();if(c.username?i.open(c.type,c.url,c.async,c.username,c.password):i.open(c.type,c.url,c.async),c.xhrFields)for(h in c.xhrFields)i[h]=c.xhrFields[h];c.mimeType&&i.overrideMimeType&&i.overrideMimeType(c.mimeType),c.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest");try{for(h in e)i.setRequestHeader(h,e[h])}catch(j){}i.send(c.hasContent&&c.data||null),d=function(a,e){var h,j,k,l;try{if(d&&(e||4===i.readyState))if(d=b,g&&(i.onreadystatechange=kb.noop,Zc&&delete Wc[g]),e)4!==i.readyState&&i.abort();else{l={},h=i.status,j=i.getAllResponseHeaders(),"string"==typeof i.responseText&&(l.text=i.responseText);try{k=i.statusText}catch(m){k=""}h||!c.isLocal||c.crossDomain?1223===h&&(h=204):h=l.text?200:404}}catch(n){e||f(-1,n)}l&&f(h,k,l,j)},c.async?4===i.readyState?setTimeout(d):(g=++Yc,Zc&&(Wc||(Wc={},kb(a).unload(Zc)),Wc[g]=d),i.onreadystatechange=d):d()},abort:function(){d&&d(b,!0)}}}});var $c,_c,ad=/^(?:toggle|show|hide)$/,bd=new RegExp("^(?:([+-])=|)("+lb+")([a-z%]*)$","i"),cd=/queueHooks$/,dd=[Q],ed={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=bd.exec(b),f=e&&e[3]||(kb.cssNumber[a]?"":"px"),g=(kb.cssNumber[a]||"px"!==f&&+d)&&bd.exec(kb.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,kb.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};kb.Animation=kb.extend(O,{tweener:function(a,b){kb.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],ed[c]=ed[c]||[],ed[c].unshift(b)},prefilter:function(a,b){b?dd.unshift(a):dd.push(a)}}),kb.Tween=R,R.prototype={constructor:R,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(kb.cssNumber[c]?"":"px")},cur:function(){var a=R.propHooks[this.prop];return a&&a.get?a.get(this):R.propHooks._default.get(this)},run:function(a){var b,c=R.propHooks[this.prop];return this.pos=b=this.options.duration?kb.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):R.propHooks._default.set(this),this}},R.prototype.init.prototype=R.prototype,R.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=kb.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){kb.fx.step[a.prop]?kb.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[kb.cssProps[a.prop]]||kb.cssHooks[a.prop])?kb.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},R.propHooks.scrollTop=R.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},kb.each(["toggle","show","hide"],function(a,b){var c=kb.fn[b];kb.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(S(b,!0),a,d,e)}}),kb.fn.extend({fadeTo:function(a,b,c,d){return this.filter(x).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=kb.isEmptyObject(a),f=kb.speed(b,c,d),g=function(){var b=O(this,kb.extend({},a),f);(e||kb._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,c,d){var e=function(a){var b=a.stop;delete a.stop,b(d)};return"string"!=typeof a&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,c=null!=a&&a+"queueHooks",f=kb.timers,g=kb._data(this);if(c)g[c]&&g[c].stop&&e(g[c]);else for(c in g)g[c]&&g[c].stop&&cd.test(c)&&e(g[c]);for(c=f.length;c--;)f[c].elem!==this||null!=a&&f[c].queue!==a||(f[c].anim.stop(d),b=!1,f.splice(c,1));(b||!d)&&kb.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=kb._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=kb.timers,g=d?d.length:0;for(c.finish=!0,kb.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),kb.each({slideDown:S("show"),slideUp:S("hide"),slideToggle:S("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){kb.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),kb.speed=function(a,b,c){var d=a&&"object"==typeof a?kb.extend({},a):{complete:c||!c&&b||kb.isFunction(a)&&a,duration:a,easing:c&&b||b&&!kb.isFunction(b)&&b};return d.duration=kb.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in kb.fx.speeds?kb.fx.speeds[d.duration]:kb.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){kb.isFunction(d.old)&&d.old.call(this),d.queue&&kb.dequeue(this,d.queue)},d},kb.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},kb.timers=[],kb.fx=R.prototype.init,kb.fx.tick=function(){var a,c=kb.timers,d=0;for($c=kb.now();d-1,l={},m={};k?(m=g.position(),e=m.top,f=m.left):(e=parseFloat(i)||0,f=parseFloat(j)||0),kb.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(l.top=b.top-h.top+e),null!=b.left&&(l.left=b.left-h.left+f),"using"in b?b.using.call(a,l):g.css(l)}},kb.fn.extend({position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===kb.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),kb.nodeName(a[0],"html")||(c=a.offset()),c.top+=kb.css(a[0],"borderTopWidth",!0),c.left+=kb.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-kb.css(d,"marginTop",!0),left:b.left-c.left-kb.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||Z;a&&!kb.nodeName(a,"html")&&"static"===kb.css(a,"position");)a=a.offsetParent;return a||Z})}}),kb.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);kb.fn[a]=function(e){return kb.access(this,function(a,e,f){var g=T(a);return f===b?g?c in g?g[c]:g.document.documentElement[e]:a[e]:void(g?g.scrollTo(d?kb(g).scrollLeft():f,d?f:kb(g).scrollTop()):a[e]=f)},a,e,arguments.length,null)}}),kb.each({Height:"height",Width:"width"},function(a,c){kb.each({padding:"inner"+a,content:c,"":"outer"+a},function(d,e){kb.fn[e]=function(e,f){var g=arguments.length&&(d||"boolean"!=typeof e),h=d||(e===!0||f===!0?"margin":"border");return kb.access(this,function(c,d,e){var f;return kb.isWindow(c)?c.document.documentElement["client"+a]:9===c.nodeType?(f=c.documentElement,Math.max(c.body["scroll"+a],f["scroll"+a],c.body["offset"+a],f["offset"+a],f["client"+a])):e===b?kb.css(c,d,h):kb.style(c,d,e,h)},c,g?e:b,g,null)}})}),kb.fn.size=function(){return this.length},kb.fn.andSelf=kb.fn.addBack,"object"==typeof module&&module&&"object"==typeof module.exports?module.exports=kb:(a.jQuery=a.$=kb,"function"==typeof define&&define.amd&&define("jquery",[],function(){return kb}))}(window),+function(a){"use strict";var b=function(c,d){this.options=a.extend({},b.DEFAULTS,d),this.$window=a(window).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(c),this.affixed=this.unpin=null,this.checkPosition()};b.RESET="affix affix-top affix-bottom",b.DEFAULTS={offset:0},b.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},b.prototype.checkPosition=function(){if(this.$element.is(":visible")){var c=a(document).height(),d=this.$window.scrollTop(),e=this.$element.offset(),f=this.options.offset,g=f.top,h=f.bottom;"object"!=typeof f&&(h=g=f),"function"==typeof g&&(g=f.top()),"function"==typeof h&&(h=f.bottom());var i=null!=this.unpin&&d+this.unpin<=e.top?!1:null!=h&&e.top+this.$element.height()>=c-h?"bottom":null!=g&&g>=d?"top":!1;this.affixed!==i&&(this.unpin&&this.$element.css("top",""),this.affixed=i,this.unpin="bottom"==i?e.top-d:null,this.$element.removeClass(b.RESET).addClass("affix"+(i?"-"+i:"")),"bottom"==i&&this.$element.offset({top:document.body.offsetHeight-h-this.$element.height()}))}};var c=a.fn.affix;a.fn.affix=function(c){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof c&&c;e||d.data("bs.affix",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.affix.Constructor=b,a.fn.affix.noConflict=function(){return a.fn.affix=c,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var b=a(this),c=b.data();c.offset=c.offset||{},c.offsetBottom&&(c.offset.bottom=c.offsetBottom),c.offsetTop&&(c.offset.top=c.offsetTop),b.affix(c)})})}(jQuery),+function(a){"use strict";function b(c,d){var e,f=a.proxy(this.process,this);this.$element=a(a(c).is("body")?window:c),this.$body=a("body"),this.$scrollElement=this.$element.on("scroll.bs.scroll-spy.data-api",f),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||(e=a(c).attr("href"))&&e.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.offsets=a([]),this.targets=a([]),this.activeTarget=null,this.refresh(),this.process()}b.DEFAULTS={offset:10},b.prototype.refresh=function(){var b=this.$element[0]==window?"offset":"position";
+this.offsets=a([]),this.targets=a([]);{var c=this;this.$body.find(this.selector).map(function(){var d=a(this),e=d.data("target")||d.attr("href"),f=/^#\w/.test(e)&&a(e);return f&&f.length&&[[f[b]().top+(!a.isWindow(c.$scrollElement.get(0))&&c.$scrollElement.scrollTop()),e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){c.offsets.push(this[0]),c.targets.push(this[1])})}},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,d=c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(b>=d)return g!=(a=f.last()[0])&&this.activate(a);for(a=e.length;a--;)g!=f[a]&&b>=e[a]&&(!e[a+1]||b<=e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){this.activeTarget=b,a(this.selector).parents(".active").removeClass("active");var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),d.trigger("activate")};var c=a.fn.scrollspy;a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=c,this},a(window).on("load",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(jQuery),function(a){function b(a){return"object"==typeof a?a:{top:a,left:a}}var c=a.scrollTo=function(b,c,d){a(window).scrollTo(b,c,d)};c.defaults={axis:"xy",duration:parseFloat(a.fn.jquery)>=1.3?0:1,limit:!0},c.window=function(){return a(window)._scrollable()},a.fn._scrollable=function(){return this.map(function(){var b=this,c=!b.nodeName||-1!=a.inArray(b.nodeName.toLowerCase(),["iframe","#document","html","body"]);if(!c)return b;var d=(b.contentWindow||b).document||b.ownerDocument||b;return/webkit/i.test(navigator.userAgent)||"BackCompat"==d.compatMode?d.body:d.documentElement})},a.fn.scrollTo=function(d,e,f){return"object"==typeof e&&(f=e,e=0),"function"==typeof f&&(f={onAfter:f}),"max"==d&&(d=9e9),f=a.extend({},c.defaults,f),e=e||f.duration,f.queue=f.queue&&f.axis.length>1,f.queue&&(e/=2),f.offset=b(f.offset),f.over=b(f.over),this._scrollable().each(function(){function g(a){j.animate(l,e,f.easing,a&&function(){a.call(this,k,f)})}if(null!=d){var h,i=this,j=a(i),k=d,l={},m=j.is("html,body");switch(typeof k){case"number":case"string":if(/^([+-]=?)?\d+(\.\d+)?(px|%)?$/.test(k)){k=b(k);break}if(k=a(k,this),!k.length)return;case"object":(k.is||k.style)&&(h=(k=a(k)).offset())}a.each(f.axis.split(""),function(a,b){var d="x"==b?"Left":"Top",e=d.toLowerCase(),n="scroll"+d,o=i[n],p=c.max(i,b);if(h)l[n]=h[e]+(m?0:o-j.offset()[e]),f.margin&&(l[n]-=parseInt(k.css("margin"+d))||0,l[n]-=parseInt(k.css("border"+d+"Width"))||0),l[n]+=f.offset[e]||0,f.over[e]&&(l[n]+=k["x"==b?"width":"height"]()*f.over[e]);else{var q=k[e];l[n]=q.slice&&"%"==q.slice(-1)?parseFloat(q)/100*p:q}f.limit&&/^\d+$/.test(l[n])&&(l[n]=l[n]<=0?0:Math.min(l[n],p)),!a&&f.queue&&(o!=l[n]&&g(f.onAfterFirst),delete l[n])}),g(f.onAfter)}}).end()},c.max=function(b,c){var d="x"==c?"Width":"Height",e="scroll"+d;if(!a(b).is("html,body"))return b[e]-a(b)[d.toLowerCase()]();var f="client"+d,g=b.ownerDocument.documentElement,h=b.ownerDocument.body;return Math.max(g[e],h[e])-Math.min(g[f],h[f])}}(jQuery),function(a){function b(b,c,d){var e=c.hash.slice(1),f=document.getElementById(e)||document.getElementsByName(e)[0];if(f){b&&b.preventDefault();var g=a(d.target);if(!(d.lock&&g.is(":animated")||d.onBefore&&d.onBefore(b,f,g)===!1)){if(d.stop&&g._scrollable().stop(!0),d.hash){var h=d.offset;h=h&&h.top||h||0;var i=f.id==e?"id":"name",j=a(" ").attr(i,e).css({position:"absolute",top:a(window).scrollTop()+h,left:a(window).scrollLeft()});f[i]="",a("body").prepend(j),location=c.hash,j.remove(),f[i]=e}g.scrollTo(f,d).trigger("notify.serialScroll",[f])}}}var c=location.href.replace(/#.*/,""),d=a.localScroll=function(b){a("body").localScroll(b)};d.defaults={duration:1e3,axis:"y",event:"click",stop:!0,target:window,reset:!0},d.hash=function(c){if(location.hash){if(c=a.extend({},d.defaults,c),c.hash=!1,c.reset){var e=c.duration;delete c.duration,a(c.target).scrollTo(0,c),c.duration=e}b(0,location,c)}},a.fn.localScroll=function(e){function f(){return!(!this.href||!this.hash||this.href.replace(this.hash,"")!=c||e.filter&&!a(this).is(e.filter))}return e=a.extend({},d.defaults,e),e.lazy?this.bind(e.event,function(c){var d=a([c.target,c.target.parentNode]).filter(f)[0];d&&b(c,d,e)}):this.find("a,area").filter(f).bind(e.event,function(a){b(a,this,e)}).end().end()}}(jQuery),function(){if(navigator.appVersion.indexOf("MSIE 8")>0){var a=Array.prototype.slice;Array.prototype.slice=function(){if(this instanceof Array)return a.apply(this,arguments);for(var b=[],c=arguments.length>=1?arguments[0]:0,d=arguments.length>=2?arguments[1]:this.length,e=c;d>e;e++)b.push(this[e]);return b},"function"!=typeof Array.prototype.forEach&&(Array.prototype.forEach=function(a){for(var b=0;ba.length)break a;if(!(m instanceof d)){h.lastIndex=0;var n=h.exec(m);if(n){j&&(k=n[1].length);var o=n.index-1+k,n=n[0].slice(k),p=n.length,q=o+p,r=m.slice(0,o+1),s=m.slice(q+1),t=[l,1];r&&t.push(r);var u=new d(g,i?b.tokenize(n,i):n);t.push(u),s&&t.push(s),Array.prototype.splice.apply(e,t)}}}}return e},hooks:{all:{},add:function(a,c){var d=b.hooks.all;d[a]=d[a]||[],d[a].push(c)},run:function(a,c){var d=b.hooks.all[a];if(d&&d.length)for(var e,f=0;e=d[f++];)e(c)}}},c=b.Token=function(a,b){this.type=a,this.content=b};if(c.stringify=function(a,d,e){if("string"==typeof a)return a;if("[object Array]"==Object.prototype.toString.call(a))return a.map(function(b){return c.stringify(b,d,a)}).join("");var f={type:a.type,content:c.stringify(a.content,d,e),tag:"span",classes:["token",a.type],attributes:{},language:d,parent:e};"comment"==f.type&&(f.attributes.spellcheck="true"),b.hooks.run("wrap",f);var g="";for(var h in f.attributes)g+=h+'="'+(f.attributes[h]||"")+'"';return"<"+f.tag+' class="'+f.classes.join(" ")+'" '+g+">"+f.content+""},!self.document)return self.addEventListener?(self.addEventListener("message",function(a){var c=JSON.parse(a.data),d=c.language,e=c.code;self.postMessage(JSON.stringify(b.tokenize(e,b.languages[d]))),self.close()},!1),self.Prism):self.Prism;var d=document.getElementsByTagName("script");return d=d[d.length-1],d&&(b.filename=d.src,document.addEventListener&&!d.hasAttribute("data-manual")&&document.addEventListener("DOMContentLoaded",b.highlightAll)),self.Prism}();"undefined"!=typeof module&&module.exports&&(module.exports=Prism),Prism.languages.markup={comment:/<!--[\w\W]*?-->/g,prolog:/<\?.+?\?>/,doctype:/<!DOCTYPE.+?>/,cdata:/<!\[CDATA\[[\w\W]*?]]>/i,tag:{pattern:/<\/?[\w:-]+\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|[^\s'">=]+))?\s*)*\/?>/gi,inside:{tag:{pattern:/^<\/?[\w:-]+/i,inside:{punctuation:/^<\/?/,namespace:/^[\w-]+?:/}},"attr-value":{pattern:/=(?:('|")[\w\W]*?(\1)|[^\s>]+)/gi,inside:{punctuation:/=|>|"/g}},punctuation:/\/?>/g,"attr-name":{pattern:/[\w:-]+/g,inside:{namespace:/^[\w-]+?:/}}}},entity:/&#?[\da-z]{1,8};/gi},Prism.hooks.add("wrap",function(a){"entity"===a.type&&(a.attributes.title=a.content.replace(/&/,"&"))}),Prism.languages.css={comment:/\/\*[\w\W]*?\*\//g,atrule:{pattern:/@[\w-]+?.*?(;|(?=\s*{))/gi,inside:{punctuation:/[;:]/g}},url:/url\((["']?).*?\1\)/gi,selector:/[^\{\}\s][^\{\};]*(?=\s*\{)/g,property:/(\b|\B)[\w-]+(?=\s*:)/gi,string:/("|')(\\?.)*?\1/g,important:/\B!important\b/gi,ignore:/&(lt|gt|amp);/gi,punctuation:/[\{\};:]/g},Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{style:{pattern:/(<|<)style[\w\W]*?(>|>)[\w\W]*?(<|<)\/style(>|>)/gi,inside:{tag:{pattern:/(<|<)style[\w\W]*?(>|>)|(<|<)\/style(>|>)/gi,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.css}}}),Prism.languages.clike={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|(^|[^:])\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,"class-name":{pattern:/((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/gi,lookbehind:!0,inside:{punctuation:/(\.|\\)/}},keyword:/\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,"function":{pattern:/[a-z0-9_]+\(/gi,inside:{punctuation:/\(/}},number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/g,operator:/[-+]{1,2}|!|<=?|>=?|={1,3}|(&){1,2}|\|?\||\?|\*|\/|\~|\^|\%/g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g},Prism.languages.javascript=Prism.languages.extend("clike",{keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|get|set|new|with|typeof|try|throw|catch|finally|null|break|continue|this)\b/g,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?|NaN|-?Infinity)\b/g}),Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0}}),Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/gi,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/gi,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}}),function(){if(self.Prism&&self.document&&document.querySelector){var a={js:"javascript",html:"markup",svg:"markup"};Array.prototype.slice.call(document.querySelectorAll("pre[data-src]")).forEach(function(b){var c=b.getAttribute("data-src"),d=(c.match(/\.(\w+)$/)||[,""])[1],e=a[d]||d,f=document.createElement("code");f.className="language-"+e,b.textContent="",f.textContent="Loading…",b.appendChild(f);var g=new XMLHttpRequest;g.open("GET",c,!0),g.onreadystatechange=function(){4==g.readyState&&(g.status<400&&g.responseText?(f.textContent=g.responseText,Prism.highlightElement(f)):f.textContent=g.status>=400?"✖ Error "+g.status+" while fetching file: "+g.statusText:"✖ Error: File does not exist or is empty")},g.send(null)})}}(),Prism.hooks.add("after-highlight",function(a){var b=a.element.parentNode;if(b&&/pre/i.test(b.nodeName)&&-1!==b.className.indexOf("line-numbers")){var c,d=1+a.code.split("\n").length;lines=new Array(d),lines=lines.join(""),c=document.createElement("span"),c.className="line-numbers-rows",c.innerHTML=lines,b.hasAttribute("data-start")&&(b.style.counterReset="linenumber "+(parseInt(b.getAttribute("data-start"),10)-1)),a.element.appendChild(c)}}),function(a){function b(){function b(c,d,e){var f,g=a("
  • "),h=a("");if(h.attr({href:"#"+c}),h.text(d.attr("title")?d.attr("title"):d.text()),e&&e.length){f=a("
    • 
+				
+					
+						
+						
+						
+						
+						
+						
+						
+						
+					
+				
+				
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+
+					
+				
+			
    User IDLast NameFirst NameEmailUser IDManager User IDEditActive?
    {{rowData.id}}{{rowData.lastName}}{{rowData.firstName}}{{rowData.email}}{{rowData.orgUserId}}{{rowData.orgManagerUserId}}
+							
    
+								
+							
    
+						
    
+
+			
    
+				
    
+					
    
+				
    
+			
    
+			
+		
+	
+
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/self_profile.html b/epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/self_profile.html
new file mode 100755
index 000000000..54c17233e
--- /dev/null
+++ b/epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/self_profile.html
@@ -0,0 +1,189 @@
+
    
+	
    
+		
    {{pageTitle}}
    
+		
    
+			
+		
    
+		
    	
+			
    Please edit the profile details below:
    
+			
    
+				
    
+					
    
+						
+						
    
+							
+						
    
+					
    
+				
    
+				
    
+					
    
+						
+						
    
+							
+						
    
+					
    
+				
    
+				
    
+					
    
+						
+						
    
+													
+						
    
+					
    
+				
    
+				
    
+					
    
+						
+						
    
+							
+						
    
+					
    
+				
    
+			
    
+			
+			
    
+				
    
+					
    
+						
+						
    
+							
+						
    
+					
    
+				
    
+				
    
+					
    
+						
+						
    
+							
+						
    
+					
    
+				
    
+				
    
+					
    
+						
+						
    
+							
+						
    
+					
    
+				
    
+				
    
+					
    
+						
+						
    
+							
+						
    
+					
    
+				
    
+			
    
+			
+			
    
+				
    
+					
    
+						
+						
    
+							
+						
    
+					
    
+				
    
+				
    
+					
    
+						
+						
    
+							
+						
    
+					
    
+				
    
+				
    
+					
    
+						
+						
    
+							
+						
    
+					
    
+				
    
+				
    
+					
    
+						
+						
    
+							
+						
    
+					
    
+				
    
+			
    
+			
+			
    
+				
    
+					
    
+						
+						
    
+							
+						
    
+					
    
+				
    
+				
    
+					
    
+						
+						  
+					
    
+				
    
+				
    
+					
    
+						
+						
    
+							
+						
    
+					
    
+				
    
+				
    
+					
    
+						
+						  
+					
    
+				
    
+			
    
+			
    
+				
    
+					
+					  
+				
    
+			
    
+			
+			
    
+				
+			
    
+			
    
+			
    
+				Role
+				
+			
    
+			
+			
    
+			  
+					
+						
+											
+							
+						
+					
+					
+						
+							
+							
+							
+						
+					
+				
    NameDelete
    
+								
    
+									
+								
    
+							
    
+			
    
+		
    
+	
    
+
    
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/samplePage.html b/epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/samplePage.html
new file mode 100755
index 000000000..d8ae146d6
--- /dev/null
+++ b/epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/samplePage.html
@@ -0,0 +1,63 @@
+
+
+
+
+	
+	
+	Sample Page
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+		
+	
+	
+	
+	
+	
+	
+	
+	
+		
+			
+		 
+	
+	
+	
+	
+	
+	
+	 
+		
+		 
+	
+		
+	
+	
+	
+	
+		
+		
+		
+		
+			
+	
+	
+	
+
+	
+		
    
+		
+		
    	
+		
    
+	
+
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html b/epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html
new file mode 100755
index 000000000..b59c96c45
--- /dev/null
+++ b/epsdk-app-onap/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html
@@ -0,0 +1,13 @@
+
    
+	
    
+		
    
+			
    
+				
+			
    
+		
    
+	
    
+
     
\ No newline at end of file
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/scripts/utils/page-resource-ds2.js b/epsdk-app-onap/src/main/webapp/app/fusion/scripts/utils/page-resource-ds2.js
new file mode 100755
index 000000000..08ac8a3f8
--- /dev/null
+++ b/epsdk-app-onap/src/main/webapp/app/fusion/scripts/utils/page-resource-ds2.js
@@ -0,0 +1,97 @@
+function loadjscssfile(filename, filetype){
+    if (filetype=="js"){ //if filename is a external JavaScript file
+    	var done = false;
+        var script = document.createElement('script');	
+  		script.src = filename;
+  		script.async = false; 			
+ 		document.head.appendChild(script);
+    }else if (filetype=="css"){ //if filename is an external CSS file
+        var fileref=document.createElement("link")
+        fileref.setAttribute("rel", "stylesheet")
+        fileref.setAttribute("type", "text/css")
+        fileref.setAttribute("async", false)
+        fileref.setAttribute("href", filename)
+        document.head.appendChild(fileref);
+    } 
+}
+
+function loadResource(){
+	/*********************AngularJs***************************/
+	loadjscssfile("./app/fusion/external/angular-1.5/angular.min.js", "js");
+	loadjscssfile("./app/fusion/external/angular-1.5/angular-messages.js", "js");
+	loadjscssfile("./app/fusion/external/angular-1.5/angular-touch.js", "js");
+	loadjscssfile("./app/fusion/external/angular-1.5/angular-sanitize.min.js", "js");	
+	loadjscssfile("./app/fusion/external/angular-1.5/angular-route.min.js", "js");
+	loadjscssfile("./app/fusion/external/angular-1.5/angular-cookies.min.js", "js");
+	
+	loadjscssfile("./app/fusion/external/ds2/js/b2b-angular/b2b-library.min.js", "js");
+/*	loadjscssfile("./app/fusion/external/ds2/js/digital-ng-library/digital.ng.library.min.js", "js");
+*/
+	loadjscssfile("./app/fusion/external/jquery/dist/jquery.min.js", "js");
+	
+	/*********************Angular Gridster***************************/
+	loadjscssfile("./app/fusion/external/angular-gridster/dist/angular-gridster.min.css", "css");	
+	loadjscssfile("./app/fusion/external/angular-bootstrap/ui-bootstrap-csp.css", "css");	
+	loadjscssfile("./app/fusion/external/javascript-detect-element-resize/jquery.resize.js", "js");
+	loadjscssfile("./app/fusion/external/angular-bootstrap/ui-bootstrap-tpls.min.js", "js");
+	loadjscssfile("./app/fusion/external/angular-gridster/dist/angular-gridster.min.js", "js");
+
+	/*********************Angular UI grid***************************/
+	loadjscssfile("./app/fusion/external/angular-ui-grid/ui-grid.js", "js");
+	loadjscssfile("./app/fusion/external/angular-ui-grid/ui-grid.css", "css");
+
+	loadjscssfile("./app/fusion/external/ds2/js/appDS2.js", "js");	
+
+	loadjscssfile("./app/fusion/scripts/DS2-services/headerServiceDS2.js", "js");
+	loadjscssfile("./app/fusion/scripts/DS2-services/leftMenuServiceDS2.js", "js");
+	loadjscssfile("./app/fusion/scripts/DS2-services/manifestService.js", "js");
+	loadjscssfile("./app/fusion/scripts/DS2-directives/footer.js", "js");
+	loadjscssfile("./app/fusion/scripts/DS2-directives/ds2Header.js", "js");
+	loadjscssfile("./app/fusion/scripts/DS2-directives/ds2LeftMenu.js", "js");
+	loadjscssfile("./app/fusion/external/ds2/js/digital-ng-library/digital-design-library.js", "js");	
+
+	/*******DS2 styles*******/
+	loadjscssfile("./app/fusion/external/ds2/css/b2b-angular/b2b-angular.css", "css");	
+	loadjscssfile("./app/fusion/external/ds2/css/digital-ng-library/extras/ds2-accordion.css", "css");	
+	loadjscssfile("./app/fusion/external/ds2/css/digital-ng-library/extras/ds2-bootstrap-datepicker.css", "css");	
+	loadjscssfile("./app/fusion/external/ds2/css/digital-ng-library/extras/ds2-cc-input-field.css", "css");	
+	loadjscssfile("./app/fusion/external/ds2/css/digital-ng-library/extras/ds2-tooltip.css", "css");	
+	loadjscssfile("./app/fusion/external/ds2/css/digital-ng-library/extras/x-tabs-pills.css", "css");	
+	
+	loadjscssfile("./app/fusion/external/ds2/css/digital-ng-library/ds2-accordion.css", "css");	
+	loadjscssfile("./app/fusion/external/ds2/css/digital-ng-library/ds2-bootstrap-datepicker.css", "css");	
+	loadjscssfile("./app/fusion/external/ds2/css/digital-ng-library/ds2-c2c.css", "css");	
+	loadjscssfile("./app/fusion/external/ds2/css/digital-ng-library/ds2-cc-input-field.css", "css");	
+	loadjscssfile("./app/fusion/external/ds2/css/digital-ng-library/ds2-filmstrip.css", "css");
+	loadjscssfile("./app/fusion/external/ds2/css/digital-ng-library/ds2-filters.css", "css");
+	loadjscssfile("./app/fusion/external/ds2/css/digital-ng-library/ds2-legacynav-fix.css", "css");
+	loadjscssfile("./app/fusion/external/ds2/css/digital-ng-library/ds2-marquee.css", "css");
+	loadjscssfile("./app/fusion/external/ds2/css/digital-ng-library/ds2-pagination.css", "css");
+	loadjscssfile("./app/fusion/external/ds2/css/digital-ng-library/ds2-popover.css", "css");
+	loadjscssfile("./app/fusion/external/ds2/css/digital-ng-library/ds2-progressbar.css", "css");
+	loadjscssfile("./app/fusion/external/ds2/css/digital-ng-library/ds2-tooltip.css", "css");
+	loadjscssfile("./app/fusion/external/ds2/css/digital-ng-library/global.css", "css");
+
+	loadjscssfile("./app/fusion/external/ds2/css/digital-ng-library/digital-design-library.css", "css");	
+	/*******DS2 ICONS*******/
+	
+	loadjscssfile("./app/fusion/external/ds2/css/digital-ng-library/ionicons.css", "css");	
+	loadjscssfile("./app/fusion/styles/ecomp.css", "css");
+	loadjscssfile("./app/fusion/external/angular-gridster/dist/angular-gridster.min.css", "css");
+
+}
+
+window.onload = loadResource();
+/*window.onload = function(){
+	var appLoadingInterval = setInterval(function(){ loadApp() }, 10000);
+	var count=0;
+	function loadApp(){	
+		count++
+		if(typeof angular !== 'undefined') {
+			angular.bootstrap(document, ['abs']);
+			clearInterval(appLoadingInterval);
+		}else if(count>10){
+			clearInterval(appLoadingInterval);
+		}
+	}
+}*/
\ No newline at end of file
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/scripts/view-models/footer.html b/epsdk-app-onap/src/main/webapp/app/fusion/scripts/view-models/footer.html
new file mode 100755
index 000000000..99c3cae8c
--- /dev/null
+++ b/epsdk-app-onap/src/main/webapp/app/fusion/scripts/view-models/footer.html
@@ -0,0 +1,17 @@
+
+
+
+
    
+	
    
+		
    
+			
    			
+					
    
+			            
    
+			            	Copyright Open ECOMP and Linux Foundation 2017. 
+			            
    
+			        
    	
+				
    
+			
    
+		
    
+	
    
+
\ No newline at end of file
diff --git a/epsdk-app-onap/src/main/webapp/static/fusion/css/att_angular_gridster/sandbox-gridster.css b/epsdk-app-onap/src/main/webapp/static/fusion/css/att_angular_gridster/sandbox-gridster.css
new file mode 100755
index 000000000..568a9a3a3
--- /dev/null
+++ b/epsdk-app-onap/src/main/webapp/static/fusion/css/att_angular_gridster/sandbox-gridster.css
@@ -0,0 +1,173 @@
+.gridster {
+    position: relative;
+    margin: auto;
+    /* height: 0
+ */}
+
+.gridster>ul {
+    margin: 0;
+    list-style: none;
+    padding: 0
+}
+
+.gridster-item {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    list-style: none;
+    z-index: 2;
+    position: absolute;
+    display: none
+}
+
+.gridster-loaded {
+    -webkit-transition: height .3s;
+    -moz-transition: height .3s;
+    -o-transition: height .3s;
+    transition: height .3s
+}
+
+.gridster-loaded .gridster-item {
+    display: block;
+    position: absolute;
+    -webkit-transition: opacity .3s, left .3s, top .3s, width .3s, height .3s;
+    -moz-transition: opacity .3s, left .3s, top .3s, width .3s, height .3s;
+    -o-transition: opacity .3s, left .3s, top .3s, width .3s, height .3s;
+    transition: opacity .3s, left .3s, top .3s, width .3s, height .3s;
+    -webkit-transition-delay: 50ms;
+    -moz-transition-delay: 50ms;
+    -o-transition-delay: 50ms;
+    transition-delay: 50ms
+}
+
+.gridster-loaded .gridster-preview-holder {
+    display: none;
+    z-index: 1;
+    position: absolute;
+    background-color: #067ab4;
+    /*
+    background-color: rgb(6, 122, 180);
+    -ms-filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#067ab4', endColorstr='#067ab4');  IE 
+    opacity: 0.2;
+    */
+    border-color: #fff;
+    -webkit-transition: width .2s, height .3s;
+    -moz-transition: width .2s, height .3s;
+    -o-transition: width .2s, height .3s;
+    transition: width .2s, height .3s;
+    -webkit-transition-delay: 50ms;
+    -moz-transition-delay: 50ms;
+    -o-transition-delay: 50ms;
+    transition-delay: 50ms
+}
+
+.gridster-loaded .gridster-item.gridster-item-moving {
+    -webkit-transition: none;
+    -moz-transition: none;
+    -o-transition: none;
+    transition: none;
+    opacity: 0.9;
+}
+
+.gridster-mobile {
+    height: auto !important
+}
+
+.gridster-mobile .gridster-item {
+    height: auto;
+    position: static;
+    float: none
+}
+
+.gridster-item.ng-leave.ng-leave-active {
+    opacity: 0
+}
+
+.gridster-item.ng-enter {
+    opacity: 1
+}
+
+.gridster-item-moving {
+    z-index: 3
+}
+
+.gridster-item-resizable-handler {
+    position: absolute;
+    font-size: 1px;
+    display: block
+}
+
+.handle-se {
+    cursor: se-resize;
+    width: 0;
+    height: 0;
+    right: 1px;
+    bottom: 1px;
+    border-style: solid;
+    border-width: 0 0 12px 12px;
+    border-color: transparent
+}
+
+.handle-ne {
+    cursor: ne-resize;
+    width: 12px;
+    height: 12px;
+    right: 1px;
+    top: 1px
+}
+
+.handle-nw {
+    cursor: nw-resize;
+    width: 12px;
+    height: 12px;
+    left: 1px;
+    top: 1px
+}
+
+.handle-sw {
+    cursor: sw-resize;
+    width: 12px;
+    height: 12px;
+    left: 1px;
+    bottom: 1px
+}
+
+.handle-e {
+    cursor: e-resize;
+    width: 12px;
+    bottom: 0;
+    right: 1px;
+    top: 0
+}
+
+.handle-s {
+    cursor: s-resize;
+    height: 12px;
+    right: 0;
+    bottom: 1px;
+    left: 0
+}
+
+.handle-n {
+    cursor: n-resize;
+    height: 12px;
+    right: 0;
+    top: 1px;
+    left: 0
+}
+
+.handle-w {
+    cursor: w-resize;
+    width: 12px;
+    left: 1px;
+    top: 0;
+    bottom: 0
+}
+
+.gridster .gridster-item:hover .gridster-box {
+    border: 1.5px solid #B3B2B3
+}
+
+.gridster .gridster-item:hover .handle-se {
+    border-color: transparent transparent #ccc
+}
diff --git a/epsdk-app-onap/src/main/webapp/static/fusion/css/att_angular_gridster/ui-gridster.css b/epsdk-app-onap/src/main/webapp/static/fusion/css/att_angular_gridster/ui-gridster.css
new file mode 100755
index 000000000..85b7a58c1
--- /dev/null
+++ b/epsdk-app-onap/src/main/webapp/static/fusion/css/att_angular_gridster/ui-gridster.css
@@ -0,0 +1,116 @@
+/* ui-gridster.css */
+.gridster-container {
+  background-color: #EFEFEF;
+  color: #fff;
+  border: 1px dashed;
+  overflow-y: auto;
+  overflow-x: hidden; }
+
+/* app css for attGridtser */
+.gridster-item-container {
+  background-color: #FFFFFF;
+  position: relative;
+  margin-left: auto;
+  margin-right: auto;
+  min-height: 79px;
+  height: 100%; }
+  .gridster-item-container .gridster-item-header {
+    /* gridster-item Header */
+    position: relative;
+    height: 50px !important;
+    border: 1px solid #d3d3d3;
+    border-bottom: 0;
+    background-color: #E5E5E5;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    z-index: 1;
+    -webkit-border-radius: 2px 2px 0 0;
+    -moz-border-radius: 2px 2px 0 0;
+    -ms-border-radius: 2px 2px 0 0;
+    -o-border-radius: 2px 2px 0 0;
+    border-radius: 2px 2px 0 0;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    overflow: hidden;
+    /* IE6-8 */ }
+    .gridster-item-container .gridster-item-header .gridster-item-handle {
+      cursor: move;
+      margin: 12px;
+      position: absolute;
+      top: 0;
+      left: 0;
+      border: 0;
+      vertical-align: middle;
+      -ms-interpolation-mode: bicubic;
+      display: block; }
+    .gridster-item-container .gridster-item-header .gridster-item-header-content {
+      line-height: 44px;
+      margin-left: 26px;
+      font-family: clearviewatt;
+      font-size: 18px;
+      color: #444444;
+      float: left; }
+    .gridster-item-container .gridster-item-header .gridster-item-sub-header-content {
+      position: absolute;
+      top: 29.5px;
+      left: 26px;
+      font-family: clearviewatt;
+      font-size: 12px;
+      color: #444444; }
+    .gridster-item-container .gridster-item-header .gridster-item-header-buttons-container {
+      position: absolute;
+      right: 10px;
+      top: 10px;
+      overflow: hidden;
+      text-align: right;
+      height: 30px;
+      color: #444444; }
+  .gridster-item-container .gridster-item-body {
+    /* gridster-item Body */
+    position: absolute;
+    width: 100%;
+    top: 50px;
+    left: 0;
+    right: 0;
+    bottom: 29px;
+    border: 1px solid #d3d3d3;
+    box-sizing: border-box;
+    overflow: auto;
+    color: #444444;
+    /* text-align: center; */ }
+  .gridster-item-container .gridster-item-footer {
+    /* gridster-item Footer */
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    height: 29px !important;
+    text-align: left;
+    cursor: pointer;
+    border: 1px solid #d3d3d3;
+    border-top: 0;
+    background-color: #F2F2F2;
+    -webkit-border-radius: 0 0 2px 2px;
+    -moz-border-radius: 0 0 2px 2px;
+    -ms-border-radius: 0 0 2px 2px;
+    -o-border-radius: 0 0 2px 2px;
+    border-radius: 0 0 2px 2px;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    text-decoration: none;
+    /* IE6-8 */ }
+    .gridster-item-container .gridster-item-footer:hover {
+      background-color: #E5E5E5;
+      color: #565656;
+      text-decoration: underline; }
+    .gridster-item-container .gridster-item-footer .gridster-item-footer-content {
+      line-height: 30px;
+      font-family: clearviewatt;
+      font-size: 12px;
+      color: #565656;
+      margin: 20px;
+      text-decoration: none; }
+      .gridster-item-container .gridster-item-footer .gridster-item-footer-content:hover {
+        color: #199ddf;
+        text-decoration: underline; }
diff --git a/epsdk-app-onap/src/main/webapp/static/fusion/css/fusion-sunny.css b/epsdk-app-onap/src/main/webapp/static/fusion/css/fusion-sunny.css
new file mode 100755
index 000000000..1f16967ac
--- /dev/null
+++ b/epsdk-app-onap/src/main/webapp/static/fusion/css/fusion-sunny.css
@@ -0,0 +1,362 @@
+  input, textarea, select, div {
+    font-family: Arial;
+    font-size: 11px;
+    font-weight: normal;
+  }
+  
+  form {
+    margin-top: 5px;  
+  }
+  
+
+  .applicationWindow { border-width:  0px 0px 1px 0px;
+                       border-style:  solid;
+                       border-color:  #959595;
+                       box-shadow:    inset 0 0 10px #000000;
+                       margin-top:    10px;
+                       margin-bottom: 10px;
+                       margin-left:   10px;
+                       margin-right:  10px;
+  }  
+
+  .feedbackMessage  { width: 99%;
+  					  font-family: Arial;
+    				  font-size: 11px;
+					  color: #1f1f1f;
+                      padding: 3px;
+                      border: 1px #eeb420 solid;
+                      margin: 3px;
+                      background: #fff9e5;
+                    }                      
+
+  .menubar {
+    border-width: 0px 0px 0px 1px; border-style: solid; border-color: #959595;
+  }
+
+  .footer {
+    /*clear: both;*/
+    border-width: 0px 1px 0px 1px; border-style: solid; border-color: #959595;
+  	font-family: Verdana,Arial,Helvetica, sans-serif;
+    font-size: 9px;    
+    padding:   10px 10px 30px 10px;
+    background: white;
+  }
+
+  .pageTitle {
+    font-family: Arial;
+    font-size: 18px;
+    font-weight: bold;
+    margin-top: 5px;    
+  }
+
+  .content {
+	border-width:  0px 1px 0px 1px;
+    border-style:  solid;
+    border-color:  #959595;
+  	font-family: Arial;
+    font-size: 11px;
+    padding: 5px;
+    background:   white;
+    /*height: 600px;*/
+  }
+
+  .popupContent {
+    font-family: Arial;
+    font-size: 11px;
+    padding: 3px;
+  }
+
+  .logo {
+	border-width:  0px 1px 0px 1px;
+    border-style:  solid;
+    border-color:  #959595;
+  	text-align: right;
+  }
+
+  .sep {
+    border: 1px solid black
+  }
+
+  .attLogo		{  /*position: relative;*/
+                   float:left;
+                   padding-top: 25px;
+                   padding-left: 25px;   
+                }
+
+  .applicationLogo		{ float:right; 
+                          padding-top: 25px;
+                          padding-right: 25px;                          
+                        }
+
+  .applinkWhite		{ font-family: Arial;
+                          font-size: 13px;
+                          font-weight: 900;
+                          color: #FFFFFF;
+                          text-decoration: none; }
+
+  .terms                { font-family: Verdana, Arial, Helvetica, sans-serif;
+                          font-size: 9px;
+                        }
+
+  .broadcastMessage     { color: red; }
+  .broadcastMessageList { color: red; }
+
+  .button               {  
+					      margin: 5px 1px 5px 1px;
+                          padding: 3px; }
+
+  .toolbarbutton:hover {
+    color:#005491;
+  }
+
+  .headerText		{ font-family: Arial;
+                      font-size: 15px;
+			          font-weight: 700;
+                      color: #000000; }
+
+  .headerBackground	{ background: #336699; }
+
+  .errorMessageText { font-family: Arial;
+                      font-size: 11px;
+                      font-weight: bold; 
+                      color: red;   }
+   
+
+  .normalText		{ font-family: Arial;
+                      font-size: 11px;
+                      color: #000000; }
+
+  .normalTextRed	{ font-family: Arial;
+                      font-size: 11px;
+                      color: red; }
+
+
+  .smallNormalText	{ font-family: Arial;
+                      font-size: 9px;
+                      color: #000000; }
+
+  .tableBorder          { border:1px outset teal }
+
+  .validationError      { background: #b9eaff; }
+
+  .templatebody         {  
+  						  background: url(../images/body_graphic.jpg) repeat-x;
+                          /*margin: 40px 80px 40px 80px;*/  						   
+  						}
+
+  /*--------------------- General Content ------------------------------------*/	  
+
+  .relative {
+    position:relative;
+  }
+  
+  .clear{
+    clear:both;
+  } 
+
+  .left {
+    float:      left;
+  } 
+
+  .leftCentered{
+    float:      left;
+    text-align: center;
+  } 
+
+  .right {
+    float:      right;
+  } 
+
+  .rightAligned{
+    text-align: right;
+  } 
+
+  .centered {
+    text-align: center;
+    align:      center;
+  } 
+
+
+  .noWrap{
+  	white-space:nowrap;
+  }
+
+  .disabled {
+	color:gray;
+	cursor:hand;
+  }
+
+  /*--------------------- Tab styles -------------------------------------*/
+  
+  .current {
+	font-weight: bold;
+  	border-width: 1px 1px 1px 1px; 
+  	border-color: silver;
+  	border-style: solid;
+  }
+ 
+  .subTab {
+	font-weight:bold;
+	font-family: Arial;
+	font-size:   11px;
+	color:     #0F3B82;
+  }
+  
+
+  /*--------------------- Grid styles ------------------------------------*/	  
+
+  /* Grid navigation and header styles */
+	.gridFilterLabel {font-size:   7pt;
+	                  font-align:  justify;
+	                  font-weight: bold;
+	                  display:     block;}
+
+    .gridFilterText  {height:     17px;
+	                  font-size:  8pt;
+	                  width:      60%;
+	                  font-align: justify;}
+
+    .gridNavigationBar { font-family:Arial,Verdana;
+		                  font-size:11px;
+		                  font-weight:normal;
+		                  color:#000;
+                          margin: 0px;
+                          width: 100%;
+                          vertical-align: middle;
+    }
+    
+    .gridNavigationBar .navLinks { float: left;
+                                   margin-right:15px;
+                                   padding-top: 2px;
+                                   height:      19px;
+                                   line-height: 19px;                                   
+                                 }
+
+    .gridNavigationBar .pageControls  { float:        left;
+                                        margin-right: 15px;
+                                        height:       19px;  
+                                        line-height:  19px;                                        
+                                      }
+
+    .gridNavigationBar .pageControls input { font-size:      8pt;
+									         height:         17px;
+									         vertical-align: middle;                                    
+                                           }
+
+    .gridNavigationBar .pageInfo {  float:          right; 
+                                    vertical-align: middle;
+                                    height:         19px;
+                                    line-height:    19px;
+                                 }
+
+    .gridNavigationBar .pageInfo input { font-size:      8pt;
+								         height:         17px;
+								         vertical-align: middle;                                    
+                                       }
+
+
+    .gridNavigationBar span { padding: 3px; }
+
+    .gridNavigationBar a {
+	  text-decoration:underline;
+	  color:#000;
+	  font-weight:normal;
+	}
+
+    .gridNavigationBar img { vertical-align: middle; }
+  
+    .gridBulkUpdateRow {
+      height: 35px; 
+      line-height: 35px;
+    } 
+
+    .gridBulkUpdateRow input {
+      vertical-align: middle;
+    } 
+
+
+    /* dummy class used to lock the form elements of a grid - ex. bulk transaction processing */
+    .alwaysEnabled {}
+
+    .hidden {
+	  display: none;
+    }
+  
+    .selectedPage {
+		background-color:#C4DFFB;
+		color:          white;
+        border-style:   solid;
+        border-width:   1px;
+        border-color:  gray;
+        padding-left:   3px;
+        padding-right:  3px;
+		vertical-align: middle;
+	}
+
+    .selectedRow{
+	  /*background-color:#C4DFFB;*/
+	}
+	
+	/* Action Item styles */
+	.actionList {
+	  margin-left:  -20px;
+	  margin-right: -10px;
+	  padding-left:   5px;
+	}
+
+    .actionList li {
+	  float:left;
+	  padding-left:  3px;
+	  padding-right: 3px;
+	}
+	
+	.actionList li a {
+	  text-decoration:none;
+	  color:#000;
+	}
+
+	/* Filter Operator List styles */
+	
+	.filterList {
+	  margin: 0px;
+	}
+
+    .filterList li {
+      list-style-type: none;
+      padding:3px 3px 3px 2px;
+	  cursor:hand;
+	  font-size:11px;
+	}
+
+    .filterList li:hover {
+      background: #404040;      
+    }
+
+    .filterList li a {
+      color: #000;
+	  text-decoration: none;
+    }
+
+    .filterList li:hover a {
+	  color: white;
+    }
+
+    .filterList li a:hover {
+	  text-decoration: none;
+	  color: white;
+    }
+
+	.filterListItem a {
+	  text-decoration:none;
+	  padding:3px 2px 3px 2px;
+	}
+
+
+  /*---------------------- Customized ZK Styles ------------------------------*/
+  
+  .z-datebox input, .z-timebox input {
+    font-family: Arial;
+    font-size: 11px;
+    height: 15px;
+    margin-top:1px;  	
+  }
diff --git a/epsdk-app-onap/src/main/webapp/static/fusion/images/ATT_Labs_Logo.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/ATT_Labs_Logo.png
new file mode 100755
index 0000000000000000000000000000000000000000..b2780a0d2a0d9f3d780c33ae2551435c91d026c7
GIT binary patch
literal 45492
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

literal 0
HcmV?d00001

diff --git a/vid/src/main/webapp/app/fusion/images/backButton.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/backButton.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/backButton.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/backButton.png
diff --git a/vid/src/main/webapp/app/fusion/images/blank.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/blank.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/blank.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/blank.gif
diff --git a/vid/src/main/webapp/app/fusion/images/blueButton.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/blueButton.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/blueButton.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/blueButton.png
diff --git a/vid/src/main/webapp/app/fusion/images/body_graphic.jpg b/epsdk-app-onap/src/main/webapp/static/fusion/images/body_graphic.jpg
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/body_graphic.jpg
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/body_graphic.jpg
diff --git a/vid/src/main/webapp/app/fusion/images/bubble.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/bubble.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/bubble.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/bubble.png
diff --git a/vid/src/main/webapp/app/fusion/images/cache.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/cache.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/cache.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/cache.png
diff --git a/vid/src/main/webapp/app/fusion/images/calendar.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/calendar.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/calendar.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/calendar.gif
diff --git a/vid/src/main/webapp/app/fusion/images/chevron.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/chevron.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/chevron.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/chevron.png
diff --git a/vid/src/main/webapp/app/fusion/images/close_container.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/close_container.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/close_container.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/close_container.gif
diff --git a/vid/src/main/webapp/app/fusion/images/collapsed-icon.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/collapsed-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/collapsed-icon.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/collapsed-icon.png
diff --git a/vid/src/main/webapp/app/fusion/images/column-bg.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/column-bg.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/column-bg.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/column-bg.png
diff --git a/vid/src/main/webapp/app/fusion/images/copyicon-highlighted.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/copyicon-highlighted.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/copyicon-highlighted.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/copyicon-highlighted.png
diff --git a/vid/src/main/webapp/app/fusion/images/copyicon.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/copyicon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/copyicon.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/copyicon.png
diff --git a/vid/src/main/webapp/app/fusion/images/csv_icon.jpg b/epsdk-app-onap/src/main/webapp/static/fusion/images/csv_icon.jpg
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/csv_icon.jpg
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/csv_icon.jpg
diff --git a/vid/src/main/webapp/app/fusion/images/csv_icon.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/csv_icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/csv_icon.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/csv_icon.png
diff --git a/vid/src/main/webapp/app/fusion/images/customers-add.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/customers-add.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/customers-add.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/customers-add.png
diff --git a/vid/src/main/webapp/app/fusion/images/customers-search.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/customers-search.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/customers-search.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/customers-search.png
diff --git a/vid/src/main/webapp/app/fusion/images/customers.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/customers.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/customers.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/customers.png
diff --git a/vid/src/main/webapp/app/fusion/images/decrypted.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/decrypted.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/decrypted.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/decrypted.png
diff --git a/vid/src/main/webapp/app/fusion/images/deleteicon-highlighted.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/deleteicon-highlighted.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/deleteicon-highlighted.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/deleteicon-highlighted.gif
diff --git a/vid/src/main/webapp/app/fusion/images/deleteicon-highlighted.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/deleteicon-highlighted.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/deleteicon-highlighted.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/deleteicon-highlighted.png
diff --git a/vid/src/main/webapp/app/fusion/images/deleteicon.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/deleteicon.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/deleteicon.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/deleteicon.gif
diff --git a/epsdk-app-onap/src/main/webapp/static/fusion/images/ecomp-login-550x360.jpg b/epsdk-app-onap/src/main/webapp/static/fusion/images/ecomp-login-550x360.jpg
new file mode 100755
index 0000000000000000000000000000000000000000..618b1a9248f9f73b98a6a4e7aeabff0e2c91edeb
GIT binary patch
literal 62502
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
bYN(6DL`>pRFEAh?F==!89Uvhc|IGata+6M#

literal 0
HcmV?d00001

diff --git a/epsdk-app-onap/src/main/webapp/static/fusion/images/ecomp-login.jpg b/epsdk-app-onap/src/main/webapp/static/fusion/images/ecomp-login.jpg
new file mode 100755
index 0000000000000000000000000000000000000000..618b20e919c06172537abd356b4fe5e24ab3e6a9
GIT binary patch
literal 21266
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

literal 0
HcmV?d00001

diff --git a/vid/src/main/webapp/static/fusion/images/ecomp.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/ecomp.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/static/fusion/images/ecomp.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/ecomp.png
diff --git a/vid/src/main/webapp/static/fusion/images/ecomp_trans.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/ecomp_trans.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/static/fusion/images/ecomp_trans.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/ecomp_trans.png
diff --git a/vid/src/main/webapp/app/fusion/images/editicon.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/editicon.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/editicon.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/editicon.gif
diff --git a/vid/src/main/webapp/app/fusion/images/error_type.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/error_type.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/error_type.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/error_type.gif
diff --git a/vid/src/main/webapp/app/fusion/images/example-frame.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/example-frame.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/example-frame.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/example-frame.png
diff --git a/vid/src/main/webapp/app/fusion/images/excelicon_multi.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/excelicon_multi.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/excelicon_multi.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/excelicon_multi.gif
diff --git a/vid/src/main/webapp/app/fusion/images/executeicon.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/executeicon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/executeicon.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/executeicon.png
diff --git a/vid/src/main/webapp/app/fusion/images/expanded-icon.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/expanded-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/expanded-icon.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/expanded-icon.png
diff --git a/vid/src/main/webapp/app/fusion/images/file-add.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/file-add.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/file-add.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/file-add.png
diff --git a/vid/src/main/webapp/app/fusion/images/file_import.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/file_import.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/file_import.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/file_import.png
diff --git a/vid/src/main/webapp/app/fusion/images/file_save-all.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/file_save-all.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/file_save-all.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/file_save-all.png
diff --git a/vid/src/main/webapp/app/fusion/images/filter_icon.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/filter_icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/filter_icon.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/filter_icon.png
diff --git a/vid/src/main/webapp/app/fusion/images/folder_add.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/folder_add.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/folder_add.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/folder_add.png
diff --git a/vid/src/main/webapp/app/fusion/images/folder_closed.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/folder_closed.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/folder_closed.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/folder_closed.png
diff --git a/vid/src/main/webapp/app/fusion/images/folder_delete.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/folder_delete.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/folder_delete.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/folder_delete.png
diff --git a/vid/src/main/webapp/app/fusion/images/folder_edit.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/folder_edit.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/folder_edit.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/folder_edit.png
diff --git a/vid/src/main/webapp/app/fusion/images/folder_open.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/folder_open.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/folder_open.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/folder_open.png
diff --git a/vid/src/main/webapp/app/fusion/images/folder_user.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/folder_user.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/folder_user.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/folder_user.png
diff --git a/vid/src/main/webapp/app/fusion/images/funnel.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/funnel.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/funnel.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/funnel.png
diff --git a/vid/src/main/webapp/app/fusion/images/fusion.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/fusion.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/fusion.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/fusion.gif
diff --git a/vid/src/main/webapp/app/fusion/images/grayButton.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/grayButton.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/grayButton.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/grayButton.png
diff --git a/vid/src/main/webapp/app/fusion/images/gray_add_tool_button.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/gray_add_tool_button.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/gray_add_tool_button.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/gray_add_tool_button.png
diff --git a/vid/src/main/webapp/app/fusion/images/headerChatIcon.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/headerChatIcon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/headerChatIcon.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/headerChatIcon.png
diff --git a/vid/src/main/webapp/app/fusion/images/icon_remove_all.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/icon_remove_all.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/icon_remove_all.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/icon_remove_all.gif
diff --git a/vid/src/main/webapp/app/fusion/images/inactive.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/inactive.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/inactive.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/inactive.png
diff --git a/vid/src/main/webapp/app/fusion/images/info_type.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/info_type.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/info_type.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/info_type.gif
diff --git a/vid/src/main/webapp/app/fusion/images/leftButton.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/leftButton.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/leftButton.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/leftButton.png
diff --git a/vid/src/main/webapp/app/fusion/images/loading.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/loading.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/loading.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/loading.gif
diff --git a/vid/src/main/webapp/app/fusion/images/loading_bar.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/loading_bar.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/loading_bar.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/loading_bar.gif
diff --git a/vid/src/main/webapp/app/fusion/images/login_button.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/login_button.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/login_button.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/login_button.gif
diff --git a/vid/src/main/webapp/static/fusion/images/logo_att.jpg b/epsdk-app-onap/src/main/webapp/static/fusion/images/logo_att.jpg
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/static/fusion/images/logo_att.jpg
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/logo_att.jpg
diff --git a/vid/src/main/webapp/static/fusion/images/logo_att_header.jpg b/epsdk-app-onap/src/main/webapp/static/fusion/images/logo_att_header.jpg
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/static/fusion/images/logo_att_header.jpg
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/logo_att_header.jpg
diff --git a/vid/src/main/webapp/static/fusion/images/logo_att_header.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/logo_att_header.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/static/fusion/images/logo_att_header.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/logo_att_header.png
diff --git a/vid/src/main/webapp/static/fusion/images/logo_header.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/logo_header.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/static/fusion/images/logo_header.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/logo_header.png
diff --git a/vid/src/main/webapp/app/fusion/images/m1.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/m1.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/m1.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/m1.gif
diff --git a/vid/src/main/webapp/app/fusion/images/mail.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/mail.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/mail.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/mail.png
diff --git a/vid/src/main/webapp/app/fusion/images/map.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/map.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/map.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/map.png
diff --git a/vid/src/main/webapp/app/fusion/images/menu/bubble.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/menu/bubble.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/menu/bubble.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/menu/bubble.png
diff --git a/vid/src/main/webapp/app/fusion/images/menu/file_import.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/menu/file_import.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/menu/file_import.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/menu/file_import.png
diff --git a/vid/src/main/webapp/app/fusion/images/menu/file_save-all.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/menu/file_save-all.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/menu/file_save-all.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/menu/file_save-all.png
diff --git a/vid/src/main/webapp/app/fusion/images/menu/mail.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/menu/mail.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/menu/mail.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/menu/mail.png
diff --git a/vid/src/main/webapp/app/fusion/images/menu/profile.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/menu/profile.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/menu/profile.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/menu/profile.png
diff --git a/vid/src/main/webapp/app/fusion/images/menu/speechbubble.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/menu/speechbubble.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/menu/speechbubble.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/menu/speechbubble.png
diff --git a/vid/src/main/webapp/app/fusion/images/menu/users.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/menu/users.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/menu/users.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/menu/users.png
diff --git a/vid/src/main/webapp/app/fusion/images/minus.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/minus.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/minus.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/minus.gif
diff --git a/vid/src/main/webapp/app/fusion/images/mobile_logo_att_header_black.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/mobile_logo_att_header_black.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/mobile_logo_att_header_black.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/mobile_logo_att_header_black.png
diff --git a/vid/src/main/webapp/app/fusion/images/mobile_logo_att_header_grey.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/mobile_logo_att_header_grey.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/mobile_logo_att_header_grey.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/mobile_logo_att_header_grey.png
diff --git a/vid/src/main/webapp/app/fusion/images/mobile_logo_att_header_horizontal.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/mobile_logo_att_header_horizontal.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/mobile_logo_att_header_horizontal.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/mobile_logo_att_header_horizontal.png
diff --git a/vid/src/main/webapp/app/fusion/images/mobile_logo_att_header_white.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/mobile_logo_att_header_white.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/mobile_logo_att_header_white.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/mobile_logo_att_header_white.png
diff --git a/vid/src/main/webapp/app/fusion/images/modify_icon.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/modify_icon.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/modify_icon.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/modify_icon.gif
diff --git a/vid/src/main/webapp/static/fusion/images/no_favorites_star.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/no_favorites_star.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/static/fusion/images/no_favorites_star.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/no_favorites_star.png
diff --git a/vid/src/main/webapp/app/fusion/images/note-add.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/note-add.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/note-add.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/note-add.png
diff --git a/vid/src/main/webapp/app/fusion/images/note-search.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/note-search.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/note-search.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/note-search.png
diff --git a/vid/src/main/webapp/app/fusion/images/note.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/note.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/note.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/note.png
diff --git a/vid/src/main/webapp/app/fusion/images/notes.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/notes.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/notes.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/notes.png
diff --git a/vid/src/main/webapp/app/fusion/images/offline.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/offline.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/offline.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/offline.png
diff --git a/vid/src/main/webapp/app/fusion/images/offlineMsg.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/offlineMsg.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/offlineMsg.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/offlineMsg.gif
diff --git a/vid/src/main/webapp/app/fusion/images/online.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/online.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/online.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/online.png
diff --git a/vid/src/main/webapp/app/fusion/images/page.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/page.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/page.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/page.gif
diff --git a/vid/src/main/webapp/app/fusion/images/pagination.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/pagination.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/pagination.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/pagination.png
diff --git a/vid/src/main/webapp/app/fusion/images/layout/panel-e-w-toggle.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/panel-e-w-toggle.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/layout/panel-e-w-toggle.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/panel-e-w-toggle.png
diff --git a/vid/src/main/webapp/app/fusion/images/layout/panel-n-s-toggle.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/panel-n-s-toggle.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/layout/panel-n-s-toggle.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/panel-n-s-toggle.png
diff --git a/vid/src/main/webapp/app/fusion/images/pix.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/pix.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/pix.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/pix.gif
diff --git a/vid/src/main/webapp/app/fusion/images/plus.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/plus.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/plus.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/plus.gif
diff --git a/vid/src/main/webapp/app/fusion/images/printer.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/printer.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/printer.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/printer.gif
diff --git a/vid/src/main/webapp/app/fusion/images/profile.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/profile.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/profile.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/profile.png
diff --git a/vid/src/main/webapp/app/fusion/images/report-add.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/report-add.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/report-add.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/report-add.png
diff --git a/vid/src/main/webapp/app/fusion/images/report-favorite.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/report-favorite.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/report-favorite.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/report-favorite.png
diff --git a/vid/src/main/webapp/app/fusion/images/report-my.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/report-my.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/report-my.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/report-my.png
diff --git a/vid/src/main/webapp/app/fusion/images/report-public.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/report-public.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/report-public.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/report-public.png
diff --git a/vid/src/main/webapp/app/fusion/images/report.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/report.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/report.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/report.png
diff --git a/vid/src/main/webapp/app/fusion/images/reports.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/reports.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/reports.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/reports.png
diff --git a/vid/src/main/webapp/app/fusion/images/results-first-active.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/results-first-active.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/results-first-active.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/results-first-active.png
diff --git a/vid/src/main/webapp/app/fusion/images/results-first-disabled.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/results-first-disabled.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/results-first-disabled.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/results-first-disabled.png
diff --git a/vid/src/main/webapp/app/fusion/images/results-last-active.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/results-last-active.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/results-last-active.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/results-last-active.png
diff --git a/vid/src/main/webapp/app/fusion/images/results-last-disabled.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/results-last-disabled.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/results-last-disabled.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/results-last-disabled.png
diff --git a/vid/src/main/webapp/app/fusion/images/results-next-active.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/results-next-active.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/results-next-active.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/results-next-active.png
diff --git a/vid/src/main/webapp/app/fusion/images/results-next-disabled.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/results-next-disabled.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/results-next-disabled.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/results-next-disabled.png
diff --git a/vid/src/main/webapp/app/fusion/images/results-prev-active.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/results-prev-active.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/results-prev-active.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/results-prev-active.png
diff --git a/vid/src/main/webapp/app/fusion/images/results-prev-disabled.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/results-prev-disabled.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/results-prev-disabled.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/results-prev-disabled.png
diff --git a/vid/src/main/webapp/app/fusion/images/resultset_last.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/resultset_last.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/resultset_last.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/resultset_last.png
diff --git a/vid/src/main/webapp/app/fusion/images/resultset_previous.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/resultset_previous.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/resultset_previous.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/resultset_previous.png
diff --git a/vid/src/main/webapp/app/fusion/images/return_to_top.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/return_to_top.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/return_to_top.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/return_to_top.gif
diff --git a/vid/src/main/webapp/app/fusion/images/rightButton.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/rightButton.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/rightButton.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/rightButton.png
diff --git a/vid/src/main/webapp/app/fusion/images/search.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/search.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/search.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/search.png
diff --git a/vid/src/main/webapp/app/fusion/images/search_profile.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/search_profile.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/search_profile.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/search_profile.png
diff --git a/vid/src/main/webapp/app/fusion/images/sort_asc.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/sort_asc.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/sort_asc.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/sort_asc.gif
diff --git a/vid/src/main/webapp/app/fusion/images/sort_desc.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/sort_desc.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/sort_desc.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/sort_desc.gif
diff --git a/vid/src/main/webapp/app/fusion/images/spacer.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/spacer.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/spacer.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/spacer.gif
diff --git a/vid/src/main/webapp/app/fusion/images/success_type.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/success_type.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/success_type.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/success_type.gif
diff --git a/vid/src/main/webapp/app/fusion/images/swoosh.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/swoosh.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/swoosh.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/swoosh.gif
diff --git a/vid/src/main/webapp/app/fusion/images/tab-hm.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/tab-hm.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/tab-hm.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/tab-hm.png
diff --git a/vid/src/main/webapp/app/fusion/images/tab-v-hm.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/tab-v-hm.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/tab-v-hm.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/tab-v-hm.png
diff --git a/vid/src/main/webapp/app/fusion/images/tab.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/tab.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/tab.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/tab.png
diff --git a/vid/src/main/webapp/app/fusion/images/table-add.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/table-add.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/table-add.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/table-add.png
diff --git a/vid/src/main/webapp/app/fusion/images/table-delete.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/table-delete.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/table-delete.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/table-delete.png
diff --git a/vid/src/main/webapp/app/fusion/images/table-edit.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/table-edit.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/table-edit.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/table-edit.png
diff --git a/vid/src/main/webapp/app/fusion/images/table.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/table.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/table.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/table.png
diff --git a/vid/src/main/webapp/app/fusion/images/tabs-bg.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/tabs-bg.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/tabs-bg.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/tabs-bg.png
diff --git a/vid/src/main/webapp/app/fusion/images/toolButton.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/toolButton.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/toolButton.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/toolButton.gif
diff --git a/vid/src/main/webapp/app/fusion/images/toolButton.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/toolButton.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/toolButton.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/toolButton.png
diff --git a/vid/src/main/webapp/app/fusion/images/toolbar.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/toolbar.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/toolbar.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/toolbar.png
diff --git a/vid/src/main/webapp/app/fusion/images/users.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/users.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/users.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/users.png
diff --git a/vid/src/main/webapp/app/fusion/images/warning_type.gif b/epsdk-app-onap/src/main/webapp/static/fusion/images/warning_type.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/warning_type.gif
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/warning_type.gif
diff --git a/vid/src/main/webapp/app/fusion/images/webphone.ico b/epsdk-app-onap/src/main/webapp/static/fusion/images/webphone.ico
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/webphone.ico
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/webphone.ico
diff --git a/vid/src/main/webapp/app/fusion/images/whiteButton.png b/epsdk-app-onap/src/main/webapp/static/fusion/images/whiteButton.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/images/whiteButton.png
rename to epsdk-app-onap/src/main/webapp/static/fusion/images/whiteButton.png
diff --git a/epsdk-app-onap/src/main/webapp/static/fusion/js/att_angular_gridster/angular-gridster.js b/epsdk-app-onap/src/main/webapp/static/fusion/js/att_angular_gridster/angular-gridster.js
new file mode 100755
index 000000000..20ba0c436
--- /dev/null
+++ b/epsdk-app-onap/src/main/webapp/static/fusion/js/att_angular_gridster/angular-gridster.js
@@ -0,0 +1,2244 @@
+/*global define:true*/
+(function(root, factory) {
+
+	'use strict';
+
+	if (typeof define === 'function' && define.amd) {
+		// AMD
+		define(['angular'], factory);
+	} else if (typeof exports === 'object') {
+		// CommonJS
+		module.exports = factory(require('angular'));
+	} else {
+		// Browser, nothing "exported". Only registered as a module with angular.
+		factory(root.angular);
+	}
+}(this, function(angular) {
+
+   'use strict';
+
+    var ie8 = false;
+
+    var getInternetExplorerVersion = function ()
+        // Returns the version of Internet Explorer >4 or
+        // undefined(indicating the use of another browser).
+        {
+            var isIE10 = (eval("/*@cc_on!@*/false") && document.documentMode === 10);
+            if (isIE10) {
+                return 10;
+            }
+            var v = 3,
+                div = document.createElement('div'),
+                all = div.getElementsByTagName('i');
+            do {
+                div.innerHTML = '';
+            } while (all[0]);
+            return v > 4 ? v : undefined;
+        };
+
+    var browserVersion = getInternetExplorerVersion();
+
+    if (browserVersion && browserVersion < 9) {
+        ie8 = true;
+    }
+        
+	// This returned angular module 'gridster' is what is exported.
+	return angular.module('attGridsterLib', [])
+
+	.constant('gridsterConfig', {
+		columns: 6, // number of columns in the grid
+		pushing: true, // whether to push other items out of the way
+		floating: true, // whether to automatically float items up so they stack
+		swapping: true, // whether or not to have items switch places instead of push down if they are the same size
+		width: 'auto', // width of the grid. "auto" will expand the grid to its parent container
+		colWidth: 'auto', // width of grid columns. "auto" will divide the width of the grid evenly among the columns
+		rowHeight: 'match', // height of grid rows. 'match' will make it the same as the column width, a numeric value will be interpreted as pixels, '/2' is half the column width, '*5' is five times the column width, etc.
+		margins: [10, 10], // margins in between grid items
+		outerMargin: false,
+		isMobile: false, // toggle mobile view
+		mobileBreakPoint: 100, // width threshold to toggle mobile mode
+		mobileModeEnabled: true, // whether or not to toggle mobile mode when screen width is less than mobileBreakPoint
+		minColumns: 1, // minimum amount of columns the grid can scale down to
+		minRows: 1, // minimum amount of rows to show if the grid is empty
+		maxRows: 100, // maximum amount of rows in the grid
+		defaultSizeX: 1, // default width of an item in columns
+		defaultSizeY: 1, // default height of an item in rows
+		minSizeX: 1, // minimum column width of an item
+		maxSizeX: null, // maximum column width of an item
+		minSizeY: 1, // minumum row height of an item
+		maxSizeY: null, // maximum row height of an item
+		saveGridItemCalculatedHeightInMobile: false, // grid item height in mobile display. true- to use the calculated height by sizeY given
+		resizable: { // options to pass to resizable handler
+			enabled: false,
+			handles: ['s', 'e', 'n', 'w', 'se', 'ne', 'sw', 'nw']
+		},
+		draggable: { // options to pass to draggable handler
+			enabled: true,
+			scrollSensitivity: 20, // Distance in pixels from the edge of the viewport after which the viewport should scroll, relative to pointer
+			scrollSpeed: 15 // Speed at which the window should scroll once the mouse pointer gets within scrollSensitivity distance
+		}
+	})
+
+	.controller('GridsterCtrl', ['gridsterConfig', '$timeout',
+		function(gridsterConfig, $timeout) {
+
+			var gridster = this;
+
+			/**
+			 * Create options from gridsterConfig constant
+			 */
+			angular.extend(this, gridsterConfig);
+
+			this.resizable = angular.extend({}, gridsterConfig.resizable || {});
+			this.draggable = angular.extend({}, gridsterConfig.draggable || {});
+
+			var flag = false;
+			this.layoutChanged = function() {
+				if (flag) {
+					return;
+				}
+				flag = true;
+				$timeout(function() {
+					flag = false;
+					if (gridster.loaded) {
+						gridster.floatItemsUp();
+					}
+					gridster.updateHeight(gridster.movingItem ? gridster.movingItem.sizeY : 0);
+				}, 30);
+			};
+
+			/**
+			 * A positional array of the items in the grid
+			 */
+			this.grid = [];
+
+			/**
+			 * Clean up after yourself
+			 */
+			this.destroy = function() {
+				// empty the grid to cut back on the possibility
+				// of circular references
+				if (this.grid) {
+					this.grid = [];
+				}
+				this.$element = null;
+			};
+
+			/**
+			 * Overrides default options
+			 *
+			 * @param {Object} options The options to override
+			 */
+			this.setOptions = function(options) {
+				if (!options) {
+					return;
+				}
+
+				options = angular.extend({}, options);
+
+				// all this to avoid using jQuery...
+				if (options.draggable) {
+					angular.extend(this.draggable, options.draggable);
+					delete(options.draggable);
+				}
+				if (options.resizable) {
+					angular.extend(this.resizable, options.resizable);
+					delete(options.resizable);
+				}
+
+				angular.extend(this, options);
+
+				if (!this.margins || this.margins.length !== 2) {
+					this.margins = [0, 0];
+				} else {
+					for (var x = 0, l = this.margins.length; x < l; ++x) {
+						this.margins[x] = parseInt(this.margins[x], 10);
+						if (isNaN(this.margins[x])) {
+							this.margins[x] = 0;
+						}
+					}
+				}
+			};
+
+			/**
+			 * Check if item can occupy a specified position in the grid
+			 *
+			 * @param {Object} item The item in question
+			 * @param {Number} row The row index
+			 * @param {Number} column The column index
+			 * @returns {Boolean} True if if item fits
+			 */
+			this.canItemOccupy = function(item, row, column) {
+				return row > -1 && column > -1 && item.sizeX + column <= this.columns && item.sizeY + row <= this.maxRows;
+			};
+
+			/**
+			 * Set the item in the first suitable position
+			 *
+			 * @param {Object} item The item to insert
+			 */
+			this.autoSetItemPosition = function(item) {
+				// walk through each row and column looking for a place it will fit
+				for (var rowIndex = 0; rowIndex < this.maxRows; ++rowIndex) {
+					for (var colIndex = 0; colIndex < this.columns; ++colIndex) {
+						// only insert if position is not already taken and it can fit
+						var items = this.getItems(rowIndex, colIndex, item.sizeX, item.sizeY, item);
+						if (items.length === 0 && this.canItemOccupy(item, rowIndex, colIndex)) {
+							this.putItem(item, rowIndex, colIndex);
+							return;
+						}
+					}
+				}
+				throw new Error('Unable to place item!');
+			};
+
+			/**
+			 * Gets items at a specific coordinate
+			 *
+			 * @param {Number} row
+			 * @param {Number} column
+			 * @param {Number} sizeX
+			 * @param {Number} sizeY
+			 * @param {Array} excludeItems An array of items to exclude from selection
+			 * @returns {Array} Items that match the criteria
+			 */
+			this.getItems = function(row, column, sizeX, sizeY, excludeItems) {
+				var items = [];
+				if (!sizeX || !sizeY) {
+					sizeX = sizeY = 1;
+				}
+				if (excludeItems && !(excludeItems instanceof Array)) {
+					excludeItems = [excludeItems];
+				}
+				for (var h = 0; h < sizeY; ++h) {
+					for (var w = 0; w < sizeX; ++w) {
+						var item = this.getItem(row + h, column + w, excludeItems);
+						if (item && (!excludeItems || excludeItems.indexOf(item) === -1) && items.indexOf(item) === -1) {
+							items.push(item);
+						}
+					}
+				}
+				return items;
+			};
+
+			/**
+			 * @param {Array} items
+			 * @returns {Object} An item that represents the bounding box of the items
+			 */
+			this.getBoundingBox = function(items) {
+
+				if (items.length === 0) {
+					return null;
+				}
+				if (items.length === 1) {
+					return {
+						row: items[0].row,
+						col: items[0].col,
+						sizeY: items[0].sizeY,
+						sizeX: items[0].sizeX
+					};
+				}
+
+				var maxRow = 0;
+				var maxCol = 0;
+				var minRow = 9999;
+				var minCol = 9999;
+
+				for (var i = 0, l = items.length; i < l; ++i) {
+					var item = items[i];
+					minRow = Math.min(item.row, minRow);
+					minCol = Math.min(item.col, minCol);
+					maxRow = Math.max(item.row + item.sizeY, maxRow);
+					maxCol = Math.max(item.col + item.sizeX, maxCol);
+				}
+
+				return {
+					row: minRow,
+					col: minCol,
+					sizeY: maxRow - minRow,
+					sizeX: maxCol - minCol
+				};
+			};
+
+
+			/**
+			 * Removes an item from the grid
+			 *
+			 * @param {Object} item
+			 */
+			this.removeItem = function(item) {
+				for (var rowIndex = 0, l = this.grid.length; rowIndex < l; ++rowIndex) {
+					var columns = this.grid[rowIndex];
+					if (!columns) {
+						continue;
+					}
+					var index = columns.indexOf(item);
+					if (index !== -1) {
+						columns[index] = null;
+						break;
+					}
+				}
+				this.layoutChanged();
+			};
+
+			/**
+			 * Returns the item at a specified coordinate
+			 *
+			 * @param {Number} row
+			 * @param {Number} column
+			 * @param {Array} excludeItems Items to exclude from selection
+			 * @returns {Object} The matched item or null
+			 */
+			this.getItem = function(row, column, excludeItems) {
+				if (excludeItems && !(excludeItems instanceof Array)) {
+					excludeItems = [excludeItems];
+				}
+				var sizeY = 1;
+				while (row > -1) {
+					var sizeX = 1,
+						col = column;
+					while (col > -1) {
+						var items = this.grid[row];
+						if (items) {
+							var item = items[col];
+							if (item && (!excludeItems || excludeItems.indexOf(item) === -1) && item.sizeX >= sizeX && item.sizeY >= sizeY) {
+								return item;
+							}
+						}
+						++sizeX;
+						--col;
+					}
+					--row;
+					++sizeY;
+				}
+				return null;
+			};
+
+			/**
+			 * Insert an array of items into the grid
+			 *
+			 * @param {Array} items An array of items to insert
+			 */
+			this.putItems = function(items) {
+				for (var i = 0, l = items.length; i < l; ++i) {
+					this.putItem(items[i]);
+				}
+			};
+
+			/**
+			 * Insert a single item into the grid
+			 *
+			 * @param {Object} item The item to insert
+			 * @param {Number} row (Optional) Specifies the items row index
+			 * @param {Number} column (Optional) Specifies the items column index
+			 * @param {Array} ignoreItems
+			 */
+			this.putItem = function(item, row, column, ignoreItems) {
+				// auto place item if no row specified
+				if (typeof row === 'undefined' || row === null) {
+					row = item.row;
+					column = item.col;
+					if (typeof row === 'undefined' || row === null) {
+						this.autoSetItemPosition(item);
+						return;
+					}
+				}
+
+				// keep item within allowed bounds
+				if (!this.canItemOccupy(item, row, column)) {
+					column = Math.min(this.columns - item.sizeX, Math.max(0, column));
+					row = Math.min(this.maxRows - item.sizeY, Math.max(0, row));
+				}
+
+				// check if item is already in grid
+				if (item.oldRow !== null && typeof item.oldRow !== 'undefined') {
+					var samePosition = item.oldRow === row && item.oldColumn === column;
+					var inGrid = this.grid[row] && this.grid[row][column] === item;
+					if (samePosition && inGrid) {
+						item.row = row;
+						item.col = column;
+						return;
+					} else {
+						// remove from old position
+						var oldRow = this.grid[item.oldRow];
+						if (oldRow && oldRow[item.oldColumn] === item) {
+							delete oldRow[item.oldColumn];
+						}
+					}
+				}
+
+				item.oldRow = item.row = row;
+				item.oldColumn = item.col = column;
+
+				this.moveOverlappingItems(item, ignoreItems);
+
+				if (!this.grid[row]) {
+					this.grid[row] = [];
+				}
+				this.grid[row][column] = item;
+
+				if (this.movingItem === item) {
+					this.floatItemUp(item);
+				}
+				this.layoutChanged();
+			};
+
+			/**
+			 * Trade row and column if item1 with item2
+			 *
+			 * @param {Object} item1
+			 * @param {Object} item2
+			 */
+			this.swapItems = function(item1, item2) {
+				this.grid[item1.row][item1.col] = item2;
+				this.grid[item2.row][item2.col] = item1;
+
+				var item1Row = item1.row;
+				var item1Col = item1.col;
+				item1.row = item2.row;
+				item1.col = item2.col;
+				item2.row = item1Row;
+				item2.col = item1Col;
+			};
+
+			/**
+			 * Prevents items from being overlapped
+			 *
+			 * @param {Object} item The item that should remain
+			 * @param {Array} ignoreItems
+			 */
+			this.moveOverlappingItems = function(item, ignoreItems) {
+				// don't move item, so ignore it
+				if (!ignoreItems) {
+					ignoreItems = [item];
+				} else if (ignoreItems.indexOf(item) === -1) {
+					ignoreItems = ignoreItems.slice(0);
+					ignoreItems.push(item);
+				}
+
+				// get the items in the space occupied by the item's coordinates
+				var overlappingItems = this.getItems(
+					item.row,
+					item.col,
+					item.sizeX,
+					item.sizeY,
+					ignoreItems
+				);
+				this.moveItemsDown(overlappingItems, item.row + item.sizeY, ignoreItems);
+			};
+
+			/**
+			 * Moves an array of items to a specified row
+			 *
+			 * @param {Array} items The items to move
+			 * @param {Number} newRow The target row
+			 * @param {Array} ignoreItems
+			 */
+			this.moveItemsDown = function(items, newRow, ignoreItems) {
+				if (!items || items.length === 0) {
+					return;
+				}
+				items.sort(function(a, b) {
+					return a.row - b.row;
+				});
+
+				ignoreItems = ignoreItems ? ignoreItems.slice(0) : [];
+				var topRows = {},
+					item, i, l;
+
+				// calculate the top rows in each column
+				for (i = 0, l = items.length; i < l; ++i) {
+					item = items[i];
+					var topRow = topRows[item.col];
+					if (typeof topRow === 'undefined' || item.row < topRow) {
+						topRows[item.col] = item.row;
+					}
+				}
+
+				// move each item down from the top row in its column to the row
+				for (i = 0, l = items.length; i < l; ++i) {
+					item = items[i];
+					var rowsToMove = newRow - topRows[item.col];
+					this.moveItemDown(item, item.row + rowsToMove, ignoreItems);
+					ignoreItems.push(item);
+				}
+			};
+
+			/**
+			 * Moves an item down to a specified row
+			 *
+			 * @param {Object} item The item to move
+			 * @param {Number} newRow The target row
+			 * @param {Array} ignoreItems
+			 */
+			this.moveItemDown = function(item, newRow, ignoreItems) {
+				if (item.row >= newRow) {
+					return;
+				}
+				while (item.row < newRow) {
+					++item.row;
+					this.moveOverlappingItems(item, ignoreItems);
+				}
+				this.putItem(item, item.row, item.col, ignoreItems);
+			};
+
+			/**
+			 * Moves all items up as much as possible
+			 */
+			this.floatItemsUp = function() {
+				if (this.floating === false) {
+					return;
+				}
+				for (var rowIndex = 0, l = this.grid.length; rowIndex < l; ++rowIndex) {
+					var columns = this.grid[rowIndex];
+					if (!columns) {
+						continue;
+					}
+					for (var colIndex = 0, len = columns.length; colIndex < len; ++colIndex) {
+						var item = columns[colIndex];
+						if (item) {
+							this.floatItemUp(item);
+						}
+					}
+				}
+			};
+
+			/**
+			 * Float an item up to the most suitable row
+			 *
+			 * @param {Object} item The item to move
+			 */
+			this.floatItemUp = function(item) {
+				if (this.floating === false) {
+					return;
+				}
+				var colIndex = item.col,
+					sizeY = item.sizeY,
+					sizeX = item.sizeX,
+					bestRow = null,
+					bestColumn = null,
+					rowIndex = item.row - 1;
+
+				while (rowIndex > -1) {
+					var items = this.getItems(rowIndex, colIndex, sizeX, sizeY, item);
+					if (items.length !== 0) {
+						break;
+					}
+					bestRow = rowIndex;
+					bestColumn = colIndex;
+					--rowIndex;
+				}
+				if (bestRow !== null) {
+					this.putItem(item, bestRow, bestColumn);
+				}
+			};
+
+			/**
+			 * Update gridsters height
+			 *
+			 * @param {Number} plus (Optional) Additional height to add
+			 */
+			this.updateHeight = function(plus) {
+				var maxHeight = this.minRows;
+				plus = plus || 0;
+				for (var rowIndex = this.grid.length; rowIndex >= 0; --rowIndex) {
+					var columns = this.grid[rowIndex];
+					if (!columns) {
+						continue;
+					}
+					for (var colIndex = 0, len = columns.length; colIndex < len; ++colIndex) {
+						if (columns[colIndex]) {
+							maxHeight = Math.max(maxHeight, rowIndex + plus + columns[colIndex].sizeY);
+						}
+					}
+				}
+				this.gridHeight = this.maxRows - maxHeight > 0 ? Math.min(this.maxRows, maxHeight) : Math.max(this.maxRows, maxHeight);
+			};
+
+			/**
+			 * Returns the number of rows that will fit in given amount of pixels
+			 *
+			 * @param {Number} pixels
+			 * @param {Boolean} ceilOrFloor (Optional) Determines rounding method
+			 */
+			this.pixelsToRows = function(pixels, ceilOrFloor) {
+				if (ceilOrFloor === true) {
+					return Math.ceil(pixels / this.curRowHeight);
+				} else if (ceilOrFloor === false) {
+					return Math.floor(pixels / this.curRowHeight);
+				}
+
+				return Math.round(pixels / this.curRowHeight);
+			};
+
+			/**
+			 * Returns the number of columns that will fit in a given amount of pixels
+			 *
+			 * @param {Number} pixels
+			 * @param {Boolean} ceilOrFloor (Optional) Determines rounding method
+			 * @returns {Number} The number of columns
+			 */
+			this.pixelsToColumns = function(pixels, ceilOrFloor) {
+				if (ceilOrFloor === true) {
+					return Math.ceil(pixels / this.curColWidth);
+				} else if (ceilOrFloor === false) {
+					return Math.floor(pixels / this.curColWidth);
+				}
+
+				return Math.round(pixels / this.curColWidth);
+			};
+		}
+	])
+
+	.directive('gridsterPreview', function() {
+		return {
+			replace: true,
+			scope: true,
+			require: '^gridster',
+			template: '
    ',
+			link: function(scope, $el, attrs, gridster) {
+
+				/**
+				 * @returns {Object} style object for preview element
+				 */
+				scope.previewStyle = function() {
+                                    
+					if (!gridster.movingItem) {
+						return {
+							display: 'none'
+						};
+					}
+
+					return {
+						display: 'block',
+						height: (gridster.movingItem.sizeY * gridster.curRowHeight - gridster.margins[0]) + 'px',
+						width: (gridster.movingItem.sizeX * gridster.curColWidth - gridster.margins[1]) + 'px',
+						top: (gridster.movingItem.row * gridster.curRowHeight + (gridster.outerMargin ? gridster.margins[0] : 0)) + 'px',
+						left: (gridster.movingItem.col * gridster.curColWidth + (gridster.outerMargin ? gridster.margins[1] : 0)) + 'px'
+					};
+				};
+			}
+		};
+	})
+
+	/**
+	 * The gridster directive
+	 *
+	 * @param {Function} $timeout
+	 * @param {Object} $window
+	 * @param {Object} $rootScope
+	 * @param {Function} gridsterDebounce
+	 */
+	.directive('gridster', ['$timeout', '$window', '$rootScope', 'gridsterDebounce',
+		function($timeout, $window, $rootScope, gridsterDebounce) {
+			return {
+				scope: true,
+				restrict: 'EAC',
+				controller: 'GridsterCtrl',
+				controllerAs: 'gridster',
+				compile: function($tplElem) {
+                                        
+                                        $tplElem.prepend('
    ');
+                                        
+                                        return function(scope, $elem, attrs, gridster) {
+						gridster.loaded = false;
+
+						gridster.$element = $elem;
+
+						scope.gridster = gridster;
+
+						$elem.addClass('gridster');
+
+						var isVisible = function(ele) {
+							return ele.style.visibility !== 'hidden' && ele.style.display !== 'none';
+						};
+
+						function refresh(config) {
+							gridster.setOptions(config);
+
+							if (!isVisible($elem[0])) {
+								return;
+							}
+
+							// resolve "auto" & "match" values
+							if (gridster.width === 'auto') {
+								gridster.curWidth = $elem[0].offsetWidth || parseInt($elem.css('width'), 10);
+							} else {
+								gridster.curWidth = gridster.width;
+							}
+
+							if (gridster.colWidth === 'auto') {
+								gridster.curColWidth = (gridster.curWidth + (gridster.outerMargin ? -gridster.margins[1] : gridster.margins[1])) / gridster.columns;
+							} else {
+								gridster.curColWidth = gridster.colWidth;
+							}
+
+							gridster.curRowHeight = gridster.rowHeight;
+							if (typeof gridster.rowHeight === 'string') {
+								if (gridster.rowHeight === 'match') {
+									gridster.curRowHeight = Math.round(gridster.curColWidth);
+								} else if (gridster.rowHeight.indexOf('*') !== -1) {
+									gridster.curRowHeight = Math.round(gridster.curColWidth * gridster.rowHeight.replace('*', '').replace(' ', ''));
+								} else if (gridster.rowHeight.indexOf('/') !== -1) {
+									gridster.curRowHeight = Math.round(gridster.curColWidth / gridster.rowHeight.replace('/', '').replace(' ', ''));
+								}
+							}
+
+							gridster.isMobile = gridster.mobileModeEnabled && gridster.curWidth <= gridster.mobileBreakPoint;
+
+							// loop through all items and reset their CSS
+							for (var rowIndex = 0, l = gridster.grid.length; rowIndex < l; ++rowIndex) {
+								var columns = gridster.grid[rowIndex];
+								if (!columns) {
+									continue;
+								}
+
+								for (var colIndex = 0, len = columns.length; colIndex < len; ++colIndex) {
+									if (columns[colIndex]) {
+										var item = columns[colIndex];
+										item.setElementPosition();
+										item.setElementSizeY();
+										item.setElementSizeX();
+									}
+								}
+							}
+
+							updateHeight();
+						}
+
+						var optionsKey = attrs.gridster;
+						if (optionsKey) {
+							scope.$parent.$watch(optionsKey, function(newConfig) {
+								refresh(newConfig);
+							}, true);
+						} else {
+							refresh({});
+						}
+
+						scope.$watch(function() {
+							return gridster.loaded;
+						}, function() {
+							if (gridster.loaded) {
+								$elem.addClass('gridster-loaded');
+							} else {
+								$elem.removeClass('gridster-loaded');
+							}
+						});
+
+						scope.$watch(function() {
+							return gridster.isMobile;
+						}, function() {
+							if (gridster.isMobile) {
+								$elem.addClass('gridster-mobile').removeClass('gridster-desktop');
+							} else {
+								$elem.removeClass('gridster-mobile').addClass('gridster-desktop');
+							}
+							$rootScope.$broadcast('gridster-mobile-changed', gridster);
+						});
+
+						scope.$watch(function() {
+							return gridster.draggable;
+						}, function() {
+							$rootScope.$broadcast('gridster-draggable-changed', gridster);
+						}, true);
+
+						scope.$watch(function() {
+							return gridster.resizable;
+						}, function() {
+							$rootScope.$broadcast('gridster-resizable-changed', gridster);
+						}, true);
+
+						function updateHeight() {
+                                                    if(gridster.gridHeight){ //need to put this check, otherwise fail in IE8
+							$elem.css('height', (gridster.gridHeight * gridster.curRowHeight) + (gridster.outerMargin ? gridster.margins[0] : -gridster.margins[0]) + 'px');
+                                                    }
+						}
+
+						scope.$watch(function() {
+							return gridster.gridHeight;
+						}, updateHeight);
+
+						scope.$watch(function() {
+							return gridster.movingItem;
+						}, function() {
+							gridster.updateHeight(gridster.movingItem ? gridster.movingItem.sizeY : 0);
+						});
+
+						var prevWidth = $elem[0].offsetWidth || parseInt($elem.css('width'), 10);
+
+						var resize = function() {
+							var width = $elem[0].offsetWidth || parseInt($elem.css('width'), 10);
+
+							if (!width || width === prevWidth || gridster.movingItem) {
+								return;
+							}
+							prevWidth = width;
+
+							if (gridster.loaded) {
+								$elem.removeClass('gridster-loaded');
+							}
+
+							refresh();
+
+							if (gridster.loaded) {
+								$elem.addClass('gridster-loaded');
+							}
+
+							$rootScope.$broadcast('gridster-resized', [width, $elem[0].offsetHeight], gridster);
+						};
+
+						// track element width changes any way we can
+						var onResize = gridsterDebounce(function onResize() {
+							resize();
+							$timeout(function() {
+								scope.$apply();
+							});
+						}, 100);
+
+						scope.$watch(function() {
+							return isVisible($elem[0]);
+						}, onResize);
+
+						// see https://github.com/sdecima/javascript-detect-element-resize
+						if (typeof window.addResizeListener === 'function') {
+							window.addResizeListener($elem[0], onResize);
+						} else {
+							scope.$watch(function() {
+								return $elem[0].offsetWidth || parseInt($elem.css('width'), 10);
+							}, resize);
+						}
+						var $win = angular.element($window);
+						$win.on('resize', onResize);
+
+						// be sure to cleanup
+						scope.$on('$destroy', function() {
+							gridster.destroy();
+							$win.off('resize', onResize);
+							if (typeof window.removeResizeListener === 'function') {
+								window.removeResizeListener($elem[0], onResize);
+							}
+						});
+
+						// allow a little time to place items before floating up
+						$timeout(function() {
+							scope.$watch('gridster.floating', function() {
+								gridster.floatItemsUp();
+							});
+							gridster.loaded = true;
+						}, 100);
+					};
+				}
+			};
+		}
+	])
+
+	.controller('GridsterItemCtrl', function() {
+		this.$element = null;
+		this.gridster = null;
+		this.row = null;
+		this.col = null;
+		this.sizeX = null;
+		this.sizeY = null;
+		this.minSizeX = 0;
+		this.minSizeY = 0;
+		this.maxSizeX = null;
+		this.maxSizeY = null;
+
+		this.init = function($element, gridster) {
+			this.$element = $element;
+			this.gridster = gridster;
+			this.sizeX = gridster.defaultSizeX;
+			this.sizeY = gridster.defaultSizeY;
+		};
+
+		this.destroy = function() {
+			// set these to null to avoid the possibility of circular references
+			this.gridster = null;
+			this.$element = null;
+		};
+
+		/**
+		 * Returns the items most important attributes
+		 */
+		this.toJSON = function() {
+			return {
+				row: this.row,
+				col: this.col,
+				sizeY: this.sizeY,
+				sizeX: this.sizeX
+			};
+		};
+
+		this.isMoving = function() {
+			return this.gridster.movingItem === this;
+		};
+
+		/**
+		 * Set the items position
+		 *
+		 * @param {Number} row
+		 * @param {Number} column
+		 */
+		this.setPosition = function(row, column) {
+			this.gridster.putItem(this, row, column);
+
+			if (!this.isMoving()) {
+				this.setElementPosition();
+			}
+		};
+
+		/**
+		 * Sets a specified size property
+		 *
+		 * @param {String} key Can be either "x" or "y"
+		 * @param {Number} value The size amount
+		 * @param {Boolean} preventMove
+		 */
+		this.setSize = function(key, value, preventMove) {
+			key = key.toUpperCase();
+			var camelCase = 'size' + key,
+				titleCase = 'Size' + key;
+			if (value === '') {
+				return;
+			}
+			value = parseInt(value, 10);
+			if (isNaN(value) || value === 0) {
+				value = this.gridster['default' + titleCase];
+			}
+			var max = key === 'X' ? this.gridster.columns : this.gridster.maxRows;
+			if (this['max' + titleCase]) {
+				max = Math.min(this['max' + titleCase], max);
+			}
+			if (this.gridster['max' + titleCase]) {
+				max = Math.min(this.gridster['max' + titleCase], max);
+			}
+			if (key === 'X' && this.cols) {
+				max -= this.cols;
+			} else if (key === 'Y' && this.rows) {
+				max -= this.rows;
+			}
+
+			var min = 0;
+			if (this['min' + titleCase]) {
+				min = Math.max(this['min' + titleCase], min);
+			}
+			if (this.gridster['min' + titleCase]) {
+				min = Math.max(this.gridster['min' + titleCase], min);
+			}
+
+			value = Math.max(Math.min(value, max), min);
+
+			var changed = (this[camelCase] !== value || (this['old' + titleCase] && this['old' + titleCase] !== value));
+			this['old' + titleCase] = this[camelCase] = value;
+
+			if (!this.isMoving()) {
+				this['setElement' + titleCase]();
+			}
+			if (!preventMove && changed) {
+				this.gridster.moveOverlappingItems(this);
+				this.gridster.layoutChanged();
+			}
+
+			return changed;
+		};
+
+		/**
+		 * Sets the items sizeY property
+		 *
+		 * @param {Number} rows
+		 * @param {Boolean} preventMove
+		 */
+		this.setSizeY = function(rows, preventMove) {
+			return this.setSize('Y', rows, preventMove);
+		};
+
+		/**
+		 * Sets the items sizeX property
+		 *
+		 * @param {Number} columns
+		 * @param {Boolean} preventMove
+		 */
+		this.setSizeX = function(columns, preventMove) {
+			return this.setSize('X', columns, preventMove);
+		};
+
+		/**
+		 * Sets an elements position on the page
+		 */
+		this.setElementPosition = function() {
+			if (this.gridster.isMobile) {
+				this.$element.css({
+					marginLeft: this.gridster.margins[0] + 'px',
+					marginRight: this.gridster.margins[0] + 'px',
+					marginTop: this.gridster.margins[1] + 'px',
+					marginBottom: this.gridster.margins[1] + 'px',
+					top: '',
+					left: ''
+				});
+			} else {
+				this.$element.css({
+					margin: 0,
+					top: (this.row * this.gridster.curRowHeight + (this.gridster.outerMargin ? this.gridster.margins[0] : 0)) + 'px',
+					left: (this.col * this.gridster.curColWidth + (this.gridster.outerMargin ? this.gridster.margins[1] : 0)) + 'px'
+				});
+			}
+		};
+
+		/**
+		 * Sets an elements height
+		 */
+		this.setElementSizeY = function() {
+			if (this.gridster.isMobile && !this.gridster.saveGridItemCalculatedHeightInMobile) {
+				this.$element.css('height', '');
+			} else {
+				var computedHeight = (this.sizeY * this.gridster.curRowHeight - this.gridster.margins[0]) + 'px';
+				//this.$element.css('height', computedHeight);
+                this.$element.attr('style', this.$element.attr('style') + '; ' + 'height: '+computedHeight+' !important;');
+			}
+		};
+
+		/**
+		 * Sets an elements width
+		 */
+		this.setElementSizeX = function() {
+			if (this.gridster.isMobile) {
+				this.$element.css('width', '');
+			} else {
+				this.$element.css('width', (this.sizeX * this.gridster.curColWidth - this.gridster.margins[1]) + 'px');
+			}
+		};
+
+		/**
+		 * Gets an element's width
+		 */
+		this.getElementSizeX = function() {
+			return (this.sizeX * this.gridster.curColWidth - this.gridster.margins[1]);
+		};
+
+		/**
+		 * Gets an element's height
+		 */
+		this.getElementSizeY = function() {
+			return (this.sizeY * this.gridster.curRowHeight - this.gridster.margins[0]);
+		};
+
+	})
+
+	.factory('GridsterTouch', [function() {
+		return function GridsterTouch(target, startEvent, moveEvent, endEvent) {
+			var lastXYById = {};
+
+			//  Opera doesn't have Object.keys so we use this wrapper
+			var numberOfKeys = function(theObject) {
+				if (Object.keys) {
+					return Object.keys(theObject).length;
+				}
+
+				var n = 0,
+					key;
+				for (key in theObject) {
+					++n;
+				}
+
+				return n;
+			};
+
+			//  this calculates the delta needed to convert pageX/Y to offsetX/Y because offsetX/Y don't exist in the TouchEvent object or in Firefox's MouseEvent object
+			var computeDocumentToElementDelta = function(theElement) {
+				var elementLeft = 0;
+				var elementTop = 0;
+				var oldIEUserAgent = navigator.userAgent.match(/\bMSIE\b/);
+
+				for (var offsetElement = theElement; offsetElement != null; offsetElement = offsetElement.offsetParent) {
+					//  the following is a major hack for versions of IE less than 8 to avoid an apparent problem on the IEBlog with double-counting the offsets
+					//  this may not be a general solution to IE7's problem with offsetLeft/offsetParent
+					if (oldIEUserAgent &&
+						(!document.documentMode || document.documentMode < 8) &&
+						offsetElement.currentStyle.position === 'relative' && offsetElement.offsetParent && offsetElement.offsetParent.currentStyle.position === 'relative' && offsetElement.offsetLeft === offsetElement.offsetParent.offsetLeft) {
+						// add only the top
+						elementTop += offsetElement.offsetTop;
+					} else {
+						elementLeft += offsetElement.offsetLeft;
+						elementTop += offsetElement.offsetTop;
+					}
+				}
+
+				return {
+					x: elementLeft,
+					y: elementTop
+				};
+			};
+
+			//  cache the delta from the document to our event target (reinitialized each mousedown/MSPointerDown/touchstart)
+			var documentToTargetDelta = computeDocumentToElementDelta(target);
+
+			//  common event handler for the mouse/pointer/touch models and their down/start, move, up/end, and cancel events
+			var doEvent = function(theEvtObj) {
+
+				if (theEvtObj.type === 'mousemove' && numberOfKeys(lastXYById) === 0) {
+					return;
+				}
+
+				var prevent = true;
+
+				var pointerList = theEvtObj.changedTouches ? theEvtObj.changedTouches : [theEvtObj];
+                                
+				for (var i = 0; i < pointerList.length; ++i) {
+					var pointerObj = pointerList[i];
+					var pointerId = (typeof pointerObj.identifier !== 'undefined') ? pointerObj.identifier : (typeof pointerObj.pointerId !== 'undefined') ? pointerObj.pointerId : 1;
+                                        
+                                        //  use the pageX/Y coordinates to compute target-relative coordinates when we have them (in ie < 9, we need to do a little work to put them there)
+					if (typeof pointerObj.pageX === 'undefined') {
+                                                
+                                                //  initialize assuming our source element is our target
+						if(!ie8){
+                                                    pointerObj.pageX = pointerObj.offsetX + documentToTargetDelta.x;
+                                                    pointerObj.pageY = pointerObj.offsetY + documentToTargetDelta.y;
+                                                }
+                                                else{
+                                                    pointerObj.pageX = pointerObj.clientX;
+                                                    pointerObj.pageY = pointerObj.clientY;
+                                                }
+
+						if (pointerObj.srcElement.offsetParent === target && document.documentMode && document.documentMode === 8 && pointerObj.type === 'mousedown') {
+							//  source element is a child piece of VML, we're in IE8, and we've not called setCapture yet - add the origin of the source element
+							pointerObj.pageX += pointerObj.srcElement.offsetLeft;
+							pointerObj.pageY += pointerObj.srcElement.offsetTop;
+						} else if (pointerObj.srcElement !== target && !document.documentMode || document.documentMode < 8) {
+							//  source element isn't the target (most likely it's a child piece of VML) and we're in a version of IE before IE8 -
+							//  the offsetX/Y values are unpredictable so use the clientX/Y values and adjust by the scroll offsets of its parents
+							//  to get the document-relative coordinates (the same as pageX/Y)
+							var sx = -2,
+								sy = -2; // adjust for old IE's 2-pixel border
+							for (var scrollElement = pointerObj.srcElement; scrollElement !== null; scrollElement = scrollElement.parentNode) {
+								sx += scrollElement.scrollLeft ? scrollElement.scrollLeft : 0;
+								sy += scrollElement.scrollTop ? scrollElement.scrollTop : 0;
+							}
+
+							pointerObj.pageX = pointerObj.clientX + sx;
+							pointerObj.pageY = pointerObj.clientY + sy;
+						}
+					}
+
+
+					var pageX = pointerObj.pageX;
+					var pageY = pointerObj.pageY;
+
+					if (theEvtObj.type.match(/(start|down)$/i)) {
+						//  clause for processing MSPointerDown, touchstart, and mousedown
+
+						//  refresh the document-to-target delta on start in case the target has moved relative to document
+						documentToTargetDelta = computeDocumentToElementDelta(target);
+
+						//  protect against failing to get an up or end on this pointerId
+						if (lastXYById[pointerId]) {
+							if (endEvent) {
+								endEvent({
+									target: theEvtObj.target,
+									which: theEvtObj.which,
+									pointerId: pointerId,
+									pageX: pageX,
+									pageY: pageY
+								});
+							}
+
+							delete lastXYById[pointerId];
+						}
+
+						if (startEvent) {
+							if (prevent) {
+								prevent = startEvent({
+									target: theEvtObj.target,
+									which: theEvtObj.which,
+									pointerId: pointerId,
+									pageX: pageX,
+									pageY: pageY
+								});
+							}
+						}
+
+						//  init last page positions for this pointer
+						lastXYById[pointerId] = {
+							x: pageX,
+							y: pageY
+						};
+
+						// IE pointer model
+						if (target.msSetPointerCapture) {
+							target.msSetPointerCapture(pointerId);
+						} else if (theEvtObj.type === 'mousedown' && numberOfKeys(lastXYById) === 1) {
+							if (useSetReleaseCapture) {
+								target.setCapture(true);
+							} else {
+								document.addEventListener('mousemove', doEvent, false);
+								document.addEventListener('mouseup', doEvent, false);
+							}
+						}
+					} else if (theEvtObj.type.match(/move$/i)) {
+						//  clause handles mousemove, MSPointerMove, and touchmove
+
+						if (lastXYById[pointerId] && !(lastXYById[pointerId].x === pageX && lastXYById[pointerId].y === pageY)) {
+							//  only extend if the pointer is down and it's not the same as the last point
+
+							if (moveEvent && prevent) {
+								prevent = moveEvent({
+									target: theEvtObj.target,
+									which: theEvtObj.which,
+									pointerId: pointerId,
+									pageX: pageX,
+									pageY: pageY
+								});
+							}
+
+							//  update last page positions for this pointer
+							lastXYById[pointerId].x = pageX;
+							lastXYById[pointerId].y = pageY;
+						}
+					} else if (lastXYById[pointerId] && theEvtObj.type.match(/(up|end|cancel)$/i)) {
+						//  clause handles up/end/cancel
+
+						if (endEvent && prevent) {
+							prevent = endEvent({
+								target: theEvtObj.target,
+								which: theEvtObj.which,
+								pointerId: pointerId,
+								pageX: pageX,
+								pageY: pageY
+							});
+						}
+
+						//  delete last page positions for this pointer
+						delete lastXYById[pointerId];
+
+						//  in the Microsoft pointer model, release the capture for this pointer
+						//  in the mouse model, release the capture or remove document-level event handlers if there are no down points
+						//  nothing is required for the iOS touch model because capture is implied on touchstart
+						if (target.msReleasePointerCapture) {
+							target.msReleasePointerCapture(pointerId);
+						} else if (theEvtObj.type === 'mouseup' && numberOfKeys(lastXYById) === 0) {
+							if (useSetReleaseCapture) {
+								target.releaseCapture();
+							} else {
+								document.removeEventListener('mousemove', doEvent, false);
+								document.removeEventListener('mouseup', doEvent, false);
+							}
+						}
+					}
+				}
+
+				if (prevent) {
+					if (theEvtObj.preventDefault) {
+						theEvtObj.preventDefault();
+					}
+
+					if (theEvtObj.preventManipulation) {
+						theEvtObj.preventManipulation();
+					}
+
+					if (theEvtObj.preventMouseEvent) {
+						theEvtObj.preventMouseEvent();
+					}
+				}
+			};
+
+			var useSetReleaseCapture = false;
+			// saving the settings for contentZooming and touchaction before activation
+			var contentZooming, msTouchAction;
+
+			this.enable = function() {
+
+				if (window.navigator.msPointerEnabled) {
+					//  Microsoft pointer model
+					target.addEventListener('MSPointerDown', doEvent, false);
+					target.addEventListener('MSPointerMove', doEvent, false);
+					target.addEventListener('MSPointerUp', doEvent, false);
+					target.addEventListener('MSPointerCancel', doEvent, false);
+
+					//  css way to prevent panning in our target area
+					if (typeof target.style.msContentZooming !== 'undefined') {
+						contentZooming = target.style.msContentZooming;
+						target.style.msContentZooming = 'none';
+					}
+
+					//  new in Windows Consumer Preview: css way to prevent all built-in touch actions on our target
+					//  without this, you cannot touch draw on the element because IE will intercept the touch events
+					if (typeof target.style.msTouchAction !== 'undefined') {
+						msTouchAction = target.style.msTouchAction;
+						target.style.msTouchAction = 'none';
+					}
+				} else if (target.addEventListener) {
+					//  iOS touch model
+					target.addEventListener('touchstart', doEvent, false);
+					target.addEventListener('touchmove', doEvent, false);
+					target.addEventListener('touchend', doEvent, false);
+					target.addEventListener('touchcancel', doEvent, false);
+
+					//  mouse model
+					target.addEventListener('mousedown', doEvent, false);
+
+					//  mouse model with capture
+					//  rejecting gecko because, unlike ie, firefox does not send events to target when the mouse is outside target
+					if (target.setCapture && !window.navigator.userAgent.match(/\bGecko\b/)) {
+						useSetReleaseCapture = true;
+
+						target.addEventListener('mousemove', doEvent, false);
+						target.addEventListener('mouseup', doEvent, false);
+					}
+				} else if (target.attachEvent && target.setCapture) {
+					//  legacy IE mode - mouse with capture
+					useSetReleaseCapture = true;
+					target.attachEvent('onmousedown', function() {
+						doEvent(window.event);
+						window.event.returnValue = false;
+						return false;
+					});
+					target.attachEvent('onmousemove', function() {
+						doEvent(window.event);
+						window.event.returnValue = false;
+						return false;
+					});
+					target.attachEvent('onmouseup', function() {
+						doEvent(window.event);
+						window.event.returnValue = false;
+						return false;
+					});
+				}
+			};
+
+			this.disable = function() {
+				if (window.navigator.msPointerEnabled) {
+					//  Microsoft pointer model
+					target.removeEventListener('MSPointerDown', doEvent, false);
+					target.removeEventListener('MSPointerMove', doEvent, false);
+					target.removeEventListener('MSPointerUp', doEvent, false);
+					target.removeEventListener('MSPointerCancel', doEvent, false);
+
+					//  reset zooming to saved value
+					if (contentZooming) {
+						target.style.msContentZooming = contentZooming;
+					}
+
+					// reset touch action setting
+					if (msTouchAction) {
+						target.style.msTouchAction = msTouchAction;
+					}
+				} else if (target.removeEventListener) {
+					//  iOS touch model
+					target.removeEventListener('touchstart', doEvent, false);
+					target.removeEventListener('touchmove', doEvent, false);
+					target.removeEventListener('touchend', doEvent, false);
+					target.removeEventListener('touchcancel', doEvent, false);
+
+					//  mouse model
+					target.removeEventListener('mousedown', doEvent, false);
+
+					//  mouse model with capture
+					//  rejecting gecko because, unlike ie, firefox does not send events to target when the mouse is outside target
+					if (target.setCapture && !window.navigator.userAgent.match(/\bGecko\b/)) {
+						useSetReleaseCapture = true;
+
+						target.removeEventListener('mousemove', doEvent, false);
+						target.removeEventListener('mouseup', doEvent, false);
+					}
+				} else if (target.detachEvent && target.setCapture) {
+					//  legacy IE mode - mouse with capture
+					useSetReleaseCapture = true;
+					target.detachEvent('onmousedown');
+					target.detachEvent('onmousemove');
+					target.detachEvent('onmouseup');
+				}
+			};
+
+			return this;
+		};
+	}])
+
+	.factory('GridsterDraggable', ['$document', '$timeout', '$window', 'GridsterTouch',
+		function($document, $timeout, $window, GridsterTouch) {
+			function GridsterDraggable($el, scope, gridster, item, itemOptions) {
+
+				var elmX, elmY, elmW, elmH,
+
+					mouseX = 0,
+					mouseY = 0,
+					lastMouseX = 0,
+					lastMouseY = 0,
+					mOffX = 0,
+					mOffY = 0,
+
+					minTop = 0,
+					maxTop = 9999,
+					minLeft = 0,
+					realdocument = $document[0];
+
+				var originalCol, originalRow;
+				var inputTags = ['select', 'input', 'textarea', 'button'];
+                                
+                                var gridsterItemDragElement = $el[0].querySelector('[gridster-item-drag]');
+                                //console.log(gridsterItemDragElement);
+                                var isDraggableAreaDefined = gridsterItemDragElement?true:false;
+                               //console.log(isDraggableAreaDefined);
+                                
+				function mouseDown(e) {
+                                    
+                                    if(ie8){
+                                        e.target = window.event.srcElement;
+                                        e.which = window.event.button;
+                                    }
+                                    
+                                    if(isDraggableAreaDefined && (!gridsterItemDragElement.contains(e.target))){
+                                        return false;
+                                    }
+                                    
+                                        if (inputTags.indexOf(e.target.nodeName.toLowerCase()) !== -1) {
+                                            return false;
+                                        }
+
+					var $target = angular.element(e.target);
+
+					// exit, if a resize handle was hit
+					if ($target.hasClass('gridster-item-resizable-handler')) {
+						return false;
+					}
+
+					// exit, if the target has it's own click event
+					if ($target.attr('onclick') || $target.attr('ng-click')) {
+						return false;
+					}
+
+					// only works if you have jQuery
+					if ($target.closest && $target.closest('.gridster-no-drag').length) {
+						return false;
+					}
+                                        
+					switch (e.which) {
+						case 1:
+							// left mouse button
+							break;
+						case 2:
+						case 3:
+							// right or middle mouse button
+							return;
+					}
+
+					lastMouseX = e.pageX;
+					lastMouseY = e.pageY;
+
+					elmX = parseInt($el.css('left'), 10);
+					elmY = parseInt($el.css('top'), 10);
+					elmW = $el[0].offsetWidth;
+					elmH = $el[0].offsetHeight;
+
+					originalCol = item.col;
+					originalRow = item.row;
+
+					dragStart(e);
+
+					return true;
+				}
+
+				function mouseMove(e) {
+					if (!$el.hasClass('gridster-item-moving') || $el.hasClass('gridster-item-resizing')) {
+						return false;
+					}
+
+					var maxLeft = gridster.curWidth - 1;
+
+					// Get the current mouse position.
+					mouseX = e.pageX;
+					mouseY = e.pageY;
+
+					// Get the deltas
+					var diffX = mouseX - lastMouseX + mOffX;
+					var diffY = mouseY - lastMouseY + mOffY;
+					mOffX = mOffY = 0;
+
+					// Update last processed mouse positions.
+					lastMouseX = mouseX;
+					lastMouseY = mouseY;
+
+					var dX = diffX,
+						dY = diffY;
+					if (elmX + dX < minLeft) {
+						diffX = minLeft - elmX;
+						mOffX = dX - diffX;
+					} else if (elmX + elmW + dX > maxLeft) {
+						diffX = maxLeft - elmX - elmW;
+						mOffX = dX - diffX;
+					}
+
+					if (elmY + dY < minTop) {
+						diffY = minTop - elmY;
+						mOffY = dY - diffY;
+					} else if (elmY + elmH + dY > maxTop) {
+						diffY = maxTop - elmY - elmH;
+						mOffY = dY - diffY;
+					}
+					elmX += diffX;
+					elmY += diffY;
+
+					// set new position
+					$el.css({
+						'top': elmY + 'px',
+						'left': elmX + 'px'
+					});
+
+					drag(e);
+
+					return true;
+				}
+
+				function mouseUp(e) {
+					if (!$el.hasClass('gridster-item-moving') || $el.hasClass('gridster-item-resizing')) {
+						return false;
+					}
+
+					mOffX = mOffY = 0;
+
+					dragStop(e);
+
+					return true;
+				}
+
+				function dragStart(event) {
+					$el.addClass('gridster-item-moving');
+					gridster.movingItem = item;
+
+					gridster.updateHeight(item.sizeY);
+					scope.$apply(function() {
+						if (gridster.draggable && gridster.draggable.start) {
+							gridster.draggable.start(event, $el, itemOptions);
+						}
+					});
+				}
+
+				function drag(event) {
+					var oldRow = item.row,
+						oldCol = item.col,
+						hasCallback = gridster.draggable && gridster.draggable.drag,
+						scrollSensitivity = gridster.draggable.scrollSensitivity,
+						scrollSpeed = gridster.draggable.scrollSpeed;
+                                        
+					var row = gridster.pixelsToRows(elmY);
+					var col = gridster.pixelsToColumns(elmX);
+
+					var itemsInTheWay = gridster.getItems(row, col, item.sizeX, item.sizeY, item);
+					var hasItemsInTheWay = itemsInTheWay.length !== 0;
+                                        
+					if (gridster.swapping === true && hasItemsInTheWay) {
+						var boundingBoxItem = gridster.getBoundingBox(itemsInTheWay),
+							sameSize = boundingBoxItem.sizeX === item.sizeX && boundingBoxItem.sizeY === item.sizeY,
+							sameRow = boundingBoxItem.row === oldRow,
+							sameCol = boundingBoxItem.col === oldCol,
+							samePosition = boundingBoxItem.row === row && boundingBoxItem.col === col,
+							inline = sameRow || sameCol;
+
+						if (sameSize && itemsInTheWay.length === 1) {
+							if (samePosition) {
+								gridster.swapItems(item, itemsInTheWay[0]);
+							} else if (inline) {
+								return;
+							}
+						} else if (boundingBoxItem.sizeX <= item.sizeX && boundingBoxItem.sizeY <= item.sizeY && inline) {
+							var emptyRow = item.row <= row ? item.row : row + item.sizeY,
+								emptyCol = item.col <= col ? item.col : col + item.sizeX,
+								rowOffset = emptyRow - boundingBoxItem.row,
+								colOffset = emptyCol - boundingBoxItem.col;
+
+							for (var i = 0, l = itemsInTheWay.length; i < l; ++i) {
+								var itemInTheWay = itemsInTheWay[i];
+
+								var itemsInFreeSpace = gridster.getItems(
+									itemInTheWay.row + rowOffset,
+									itemInTheWay.col + colOffset,
+									itemInTheWay.sizeX,
+									itemInTheWay.sizeY,
+									item
+								);
+
+								if (itemsInFreeSpace.length === 0) {
+									gridster.putItem(itemInTheWay, itemInTheWay.row + rowOffset, itemInTheWay.col + colOffset);
+								}
+							}
+						}
+					}
+
+					if (gridster.pushing !== false || !hasItemsInTheWay) {
+						item.row = row;
+						item.col = col;
+					}
+                                        
+                                        if(($window.navigator.appName === 'Microsoft Internet Explorer' && !ie8) || $window.navigator.userAgent.indexOf("Firefox")!==-1){
+                                            if (event.pageY - realdocument.documentElement.scrollTop < scrollSensitivity) {
+                                                    realdocument.documentElement.scrollTop = realdocument.documentElement.scrollTop - scrollSpeed;
+                                            } else if ($window.innerHeight - (event.pageY - realdocument.documentElement.scrollTop) < scrollSensitivity) {
+                                                    realdocument.documentElement.scrollTop = realdocument.documentElement.scrollTop + scrollSpeed;
+                                            }
+                                        }
+                                        else{
+                                            if (event.pageY - realdocument.body.scrollTop < scrollSensitivity) {
+                                                    realdocument.body.scrollTop = realdocument.body.scrollTop - scrollSpeed;
+                                            } else if ($window.innerHeight - (event.pageY - realdocument.body.scrollTop) < scrollSensitivity) {
+                                                    realdocument.body.scrollTop = realdocument.body.scrollTop + scrollSpeed;
+                                            }
+                                        }
+                                        
+                                        
+
+					if (event.pageX - realdocument.body.scrollLeft < scrollSensitivity) {
+						realdocument.body.scrollLeft = realdocument.body.scrollLeft - scrollSpeed;
+					} else if ($window.innerWidth - (event.pageX - realdocument.body.scrollLeft) < scrollSensitivity) {
+						realdocument.body.scrollLeft = realdocument.body.scrollLeft + scrollSpeed;
+					}
+
+					if (hasCallback || oldRow !== item.row || oldCol !== item.col) {
+						scope.$apply(function() {
+							if (hasCallback) {
+								gridster.draggable.drag(event, $el, itemOptions);
+							}
+						});
+					}
+				}
+
+				function dragStop(event) {
+					$el.removeClass('gridster-item-moving');
+					var row = gridster.pixelsToRows(elmY);
+					var col = gridster.pixelsToColumns(elmX);
+					if (gridster.pushing !== false || gridster.getItems(row, col, item.sizeX, item.sizeY, item).length === 0) {
+						item.row = row;
+						item.col = col;
+					}
+					gridster.movingItem = null;
+					item.setPosition(item.row, item.col);
+
+					scope.$apply(function() {
+						if (gridster.draggable && gridster.draggable.stop) {
+							gridster.draggable.stop(event, $el, itemOptions);
+						}
+					});
+				}
+
+				var enabled = null;
+				var $dragHandles = null;
+				var unifiedInputs = [];
+
+				this.enable = function() {
+					if (enabled === true) {
+						return;
+					}
+
+					// disable and timeout required for some template rendering
+					$timeout(function() {
+						// disable any existing draghandles
+						for (var u = 0, ul = unifiedInputs.length; u < ul; ++u) {
+							unifiedInputs[u].disable();
+						}
+						unifiedInputs = [];
+
+						if (gridster.draggable && gridster.draggable.handle) {
+							$dragHandles = angular.element($el[0].querySelectorAll(gridster.draggable.handle));
+							if ($dragHandles.length === 0) {
+								// fall back to element if handle not found...
+								$dragHandles = $el;
+							}
+						} else {
+							$dragHandles = $el;
+						}
+
+						for (var h = 0, hl = $dragHandles.length; h < hl; ++h) {
+							unifiedInputs[h] = new GridsterTouch($dragHandles[h], mouseDown, mouseMove, mouseUp);
+							unifiedInputs[h].enable();
+						}
+
+						enabled = true;
+					});
+				};
+
+				this.disable = function() {
+					if (enabled === false) {
+						return;
+					}
+
+					// timeout to avoid race contition with the enable timeout
+					$timeout(function() {
+
+						for (var u = 0, ul = unifiedInputs.length; u < ul; ++u) {
+							unifiedInputs[u].disable();
+						}
+
+						unifiedInputs = [];
+						enabled = false;
+					});
+				};
+
+				this.toggle = function(enabled) {
+					if (enabled) {
+						this.enable();
+					} else {
+						this.disable();
+					}
+				};
+
+				this.destroy = function() {
+					this.disable();
+				};
+			}
+
+			return GridsterDraggable;
+		}
+	])
+
+	.factory('GridsterResizable', ['GridsterTouch', function(GridsterTouch) {
+		function GridsterResizable($el, scope, gridster, item, itemOptions) {
+
+			function ResizeHandle(handleClass) {
+
+				var hClass = handleClass;
+
+				var elmX, elmY, elmW, elmH,
+
+					mouseX = 0,
+					mouseY = 0,
+					lastMouseX = 0,
+					lastMouseY = 0,
+					mOffX = 0,
+					mOffY = 0,
+
+					minTop = 0,
+					maxTop = 9999,
+					minLeft = 0;
+
+				var getMinHeight = function() {
+					return (item.minSizeY ? item.minSizeY : 1) * gridster.curRowHeight - gridster.margins[0];
+				};
+				var getMinWidth = function() {
+					return (item.minSizeX ? item.minSizeX : 1) * gridster.curColWidth - gridster.margins[1];
+				};
+
+				var originalWidth, originalHeight;
+				var savedDraggable;
+
+				function mouseDown(e) {
+					switch (e.which) {
+						case 1:
+							// left mouse button
+							break;
+						case 2:
+						case 3:
+							// right or middle mouse button
+							return;
+					}
+
+					// save the draggable setting to restore after resize
+					savedDraggable = gridster.draggable.enabled;
+					if (savedDraggable) {
+						gridster.draggable.enabled = false;
+						scope.$broadcast('gridster-draggable-changed', gridster);
+					}
+
+					// Get the current mouse position.
+					lastMouseX = e.pageX;
+					lastMouseY = e.pageY;
+
+					// Record current widget dimensions
+					elmX = parseInt($el.css('left'), 10);
+					elmY = parseInt($el.css('top'), 10);
+					elmW = $el[0].offsetWidth;
+					elmH = $el[0].offsetHeight;
+
+					originalWidth = item.sizeX;
+					originalHeight = item.sizeY;
+
+					resizeStart(e);
+
+					return true;
+				}
+
+				function resizeStart(e) {
+					$el.addClass('gridster-item-moving');
+					$el.addClass('gridster-item-resizing');
+
+					gridster.movingItem = item;
+
+					item.setElementSizeX();
+					item.setElementSizeY();
+					item.setElementPosition();
+					gridster.updateHeight(1);
+
+					scope.$apply(function() {
+						// callback
+						if (gridster.resizable && gridster.resizable.start) {
+							gridster.resizable.start(e, $el, itemOptions); // options is the item model
+						}
+					});
+				}
+
+				function mouseMove(e) {
+					var maxLeft = gridster.curWidth - 1;
+
+					// Get the current mouse position.
+					mouseX = e.pageX;
+					mouseY = e.pageY;
+
+					// Get the deltas
+					var diffX = mouseX - lastMouseX + mOffX;
+					var diffY = mouseY - lastMouseY + mOffY;
+					mOffX = mOffY = 0;
+
+					// Update last processed mouse positions.
+					lastMouseX = mouseX;
+					lastMouseY = mouseY;
+
+					var dY = diffY,
+						dX = diffX;
+
+					if (hClass.indexOf('n') >= 0) {
+						if (elmH - dY < getMinHeight()) {
+							diffY = elmH - getMinHeight();
+							mOffY = dY - diffY;
+						} else if (elmY + dY < minTop) {
+							diffY = minTop - elmY;
+							mOffY = dY - diffY;
+						}
+						elmY += diffY;
+						elmH -= diffY;
+					}
+					if (hClass.indexOf('s') >= 0) {
+						if (elmH + dY < getMinHeight()) {
+							diffY = getMinHeight() - elmH;
+							mOffY = dY - diffY;
+						} else if (elmY + elmH + dY > maxTop) {
+							diffY = maxTop - elmY - elmH;
+							mOffY = dY - diffY;
+						}
+						elmH += diffY;
+					}
+					if (hClass.indexOf('w') >= 0) {
+						if (elmW - dX < getMinWidth()) {
+							diffX = elmW - getMinWidth();
+							mOffX = dX - diffX;
+						} else if (elmX + dX < minLeft) {
+							diffX = minLeft - elmX;
+							mOffX = dX - diffX;
+						}
+						elmX += diffX;
+						elmW -= diffX;
+					}
+					if (hClass.indexOf('e') >= 0) {
+						if (elmW + dX < getMinWidth()) {
+							diffX = getMinWidth() - elmW;
+							mOffX = dX - diffX;
+						} else if (elmX + elmW + dX > maxLeft) {
+							diffX = maxLeft - elmX - elmW;
+							mOffX = dX - diffX;
+						}
+						elmW += diffX;
+					}
+
+					// set new position
+					$el.css({
+						'top': elmY + 'px',
+						'left': elmX + 'px',
+						'width': elmW + 'px',
+						'height': elmH + 'px'
+					});
+
+					resize(e);
+
+					return true;
+				}
+
+				function mouseUp(e) {
+					// restore draggable setting to its original state
+					if (gridster.draggable.enabled !== savedDraggable) {
+						gridster.draggable.enabled = savedDraggable;
+						scope.$broadcast('gridster-draggable-changed', gridster);
+					}
+
+					mOffX = mOffY = 0;
+
+					resizeStop(e);
+
+					return true;
+				}
+
+				function resize(e) {
+					var oldRow = item.row,
+						oldCol = item.col,
+						oldSizeX = item.sizeX,
+						oldSizeY = item.sizeY,
+						hasCallback = gridster.resizable && gridster.resizable.resize;
+
+					var col = item.col;
+					// only change column if grabbing left edge
+					if (['w', 'nw', 'sw'].indexOf(handleClass) !== -1) {
+						col = gridster.pixelsToColumns(elmX, false);
+					}
+
+					var row = item.row;
+					// only change row if grabbing top edge
+					if (['n', 'ne', 'nw'].indexOf(handleClass) !== -1) {
+						row = gridster.pixelsToRows(elmY, false);
+					}
+
+					var sizeX = item.sizeX;
+					// only change row if grabbing left or right edge
+					if (['n', 's'].indexOf(handleClass) === -1) {
+						sizeX = gridster.pixelsToColumns(elmW, true);
+					}
+
+					var sizeY = item.sizeY;
+					// only change row if grabbing top or bottom edge
+					if (['e', 'w'].indexOf(handleClass) === -1) {
+						sizeY = gridster.pixelsToRows(elmH, true);
+					}
+
+					if (gridster.pushing !== false || gridster.getItems(row, col, sizeX, sizeY, item).length === 0) {
+						item.row = row;
+						item.col = col;
+						item.sizeX = sizeX;
+						item.sizeY = sizeY;
+					}
+					var isChanged = item.row !== oldRow || item.col !== oldCol || item.sizeX !== oldSizeX || item.sizeY !== oldSizeY;
+
+					if (hasCallback || isChanged) {
+						scope.$apply(function() {
+							if (hasCallback) {
+								gridster.resizable.resize(e, $el, itemOptions); // options is the item model
+							}
+						});
+					}
+				}
+
+				function resizeStop(e) {
+					$el.removeClass('gridster-item-moving');
+					$el.removeClass('gridster-item-resizing');
+
+					gridster.movingItem = null;
+
+					item.setPosition(item.row, item.col);
+					item.setSizeY(item.sizeY);
+					item.setSizeX(item.sizeX);
+
+					scope.$apply(function() {
+						if (gridster.resizable && gridster.resizable.stop) {
+							gridster.resizable.stop(e, $el, itemOptions); // options is the item model
+						}
+					});
+				}
+
+				var $dragHandle = null;
+				var unifiedInput;
+
+				this.enable = function() {
+					if (!$dragHandle) {
+						$dragHandle = angular.element('
    ');
+						$el.append($dragHandle);
+					}
+
+					unifiedInput = new GridsterTouch($dragHandle[0], mouseDown, mouseMove, mouseUp);
+					unifiedInput.enable();
+				};
+
+				this.disable = function() {
+					if ($dragHandle) {
+						$dragHandle.remove();
+						$dragHandle = null;
+					}
+
+					unifiedInput.disable();
+					unifiedInput = undefined;
+				};
+
+				this.destroy = function() {
+					this.disable();
+				};
+			}
+
+			var handles = [];
+			var handlesOpts = gridster.resizable.handles;
+			if (typeof handlesOpts === 'string') {
+				handlesOpts = gridster.resizable.handles.split(',');
+			}
+			var enabled = false;
+
+			for (var c = 0, l = handlesOpts.length; c < l; c++) {
+				handles.push(new ResizeHandle(handlesOpts[c]));
+			}
+
+			this.enable = function() {
+				if (enabled) {
+					return;
+				}
+				for (var c = 0, l = handles.length; c < l; c++) {
+					handles[c].enable();
+				}
+				enabled = true;
+			};
+
+			this.disable = function() {
+				if (!enabled) {
+					return;
+				}
+				for (var c = 0, l = handles.length; c < l; c++) {
+					handles[c].disable();
+				}
+				enabled = false;
+			};
+
+			this.toggle = function(enabled) {
+				if (enabled) {
+					this.enable();
+				} else {
+					this.disable();
+				}
+			};
+
+			this.destroy = function() {
+				for (var c = 0, l = handles.length; c < l; c++) {
+					handles[c].destroy();
+				}
+			};
+		}
+		return GridsterResizable;
+	}])
+
+	.factory('gridsterDebounce', function() {
+		return function gridsterDebounce(func, wait, immediate) {
+			var timeout;
+			return function() {
+				var context = this,
+					args = arguments;
+				var later = function() {
+					timeout = null;
+					if (!immediate) {
+						func.apply(context, args);
+					}
+				};
+				var callNow = immediate && !timeout;
+				clearTimeout(timeout);
+				timeout = setTimeout(later, wait);
+				if (callNow) {
+					func.apply(context, args);
+				}
+			};
+		};
+	})
+
+	/**
+	 * GridsterItem directive
+	 * @param $parse
+	 * @param GridsterDraggable
+	 * @param GridsterResizable
+	 * @param gridsterDebounce
+	 */
+	.directive('gridsterItem', ['$parse', 'GridsterDraggable', 'GridsterResizable', 'gridsterDebounce',
+		function($parse, GridsterDraggable, GridsterResizable, gridsterDebounce) {
+			return {
+				scope: true,
+				restrict: 'EA',
+				controller: 'GridsterItemCtrl',
+				controllerAs: 'gridsterItem',
+				require: ['^gridster', 'gridsterItem'],
+				link: function(scope, $el, attrs, controllers) {
+					var optionsKey = attrs.gridsterItem,
+						options;
+                                        
+                                        var gridster = controllers[0],
+						item = controllers[1];
+
+					scope.gridster = gridster;
+                                        
+
+					// bind the item's position properties
+					// options can be an object specified by gridster-item="object"
+					// or the options can be the element html attributes object
+					if (optionsKey) {
+						var $optionsGetter = $parse(optionsKey);
+						options = $optionsGetter(scope) || {};
+						if (!options && $optionsGetter.assign) {
+							options = {
+								row: item.row,
+								col: item.col,
+								sizeX: item.sizeX,
+								sizeY: item.sizeY,
+								minSizeX: 0,
+								minSizeY: 0,
+								maxSizeX: null,
+								maxSizeY: null
+							};
+							$optionsGetter.assign(scope, options);
+						}
+					} else {
+						options = attrs;
+					}
+                                        
+					item.init($el, gridster);
+
+					$el.addClass('gridster-item');
+
+					var aspects = ['minSizeX', 'maxSizeX', 'minSizeY', 'maxSizeY', 'sizeX', 'sizeY', 'row', 'col'],
+						$getters = {};
+
+					var expressions = [];
+					var aspectFn = function(aspect) {
+						var expression;
+						if (typeof options[aspect] === 'string') {
+							// watch the expression in the scope
+							expression = options[aspect];
+						} else if (typeof options[aspect.toLowerCase()] === 'string') {
+							// watch the expression in the scope
+							expression = options[aspect.toLowerCase()];
+						} else if (optionsKey) {
+							// watch the expression on the options object in the scope
+							expression = optionsKey + '.' + aspect;
+						} else {
+							return;
+						}
+						expressions.push('"' + aspect + '":' + expression);
+						$getters[aspect] = $parse(expression);
+
+						// initial set
+						var val = $getters[aspect](scope);
+						if (typeof val === 'number') {
+							item[aspect] = val;
+						}
+					};
+
+					for (var i = 0, l = aspects.length; i < l; ++i) {
+						aspectFn(aspects[i]);
+					}
+
+					var watchExpressions = '{' + expressions.join(',') + '}';
+                                        
+					// when the value changes externally, update the internal item object
+					scope.$watchCollection(watchExpressions, function(newVals, oldVals) {
+						for (var aspect in newVals) {
+							var newVal = newVals[aspect];
+							var oldVal = oldVals[aspect];
+							if (oldVal === newVal) {
+								continue;
+							}
+							newVal = parseInt(newVal, 10);
+							if (!isNaN(newVal)) {
+								item[aspect] = newVal;
+							}
+						}
+					});
+
+					function positionChanged() {
+						// call setPosition so the element and gridster controller are updated
+						item.setPosition(item.row, item.col);
+
+						// when internal item position changes, update externally bound values
+						if ($getters.row && $getters.row.assign) {
+							$getters.row.assign(scope, item.row);
+						}
+						if ($getters.col && $getters.col.assign) {
+							$getters.col.assign(scope, item.col);
+						}
+					}
+					scope.$watch(function() {
+						return item.row + ',' + item.col;
+					}, positionChanged);
+
+					function sizeChanged() {
+						var changedX = item.setSizeX(item.sizeX, true);
+						if (changedX && $getters.sizeX && $getters.sizeX.assign) {
+							$getters.sizeX.assign(scope, item.sizeX);
+						}
+						var changedY = item.setSizeY(item.sizeY, true);
+						if (changedY && $getters.sizeY && $getters.sizeY.assign) {
+							$getters.sizeY.assign(scope, item.sizeY);
+						}
+
+						if (changedX || changedY) {
+							item.gridster.moveOverlappingItems(item);
+							gridster.layoutChanged();
+							scope.$broadcast('gridster-item-resized', item);
+						}
+					}
+
+					scope.$watch(function() {
+						return item.sizeY + ',' + item.sizeX + ',' + item.minSizeX + ',' + item.maxSizeX + ',' + item.minSizeY + ',' + item.maxSizeY;
+					}, sizeChanged);
+
+					var draggable = new GridsterDraggable($el, scope, gridster, item, options);
+					var resizable = new GridsterResizable($el, scope, gridster, item, options);
+
+					var updateResizable = function() {
+						resizable.toggle(!gridster.isMobile && gridster.resizable && gridster.resizable.enabled);
+					};
+					updateResizable();
+
+					var updateDraggable = function() {
+						draggable.toggle(!gridster.isMobile && gridster.draggable && gridster.draggable.enabled);
+					};
+					updateDraggable();
+
+					scope.$on('gridster-draggable-changed', updateDraggable);
+					scope.$on('gridster-resizable-changed', updateResizable);
+					scope.$on('gridster-resized', updateResizable);
+					scope.$on('gridster-mobile-changed', function() {
+						updateResizable();
+						updateDraggable();
+					});
+
+					function whichTransitionEvent() {
+						var el = document.createElement('div');
+						var transitions = {
+							'transition': 'transitionend',
+							'OTransition': 'oTransitionEnd',
+							'MozTransition': 'transitionend',
+							'WebkitTransition': 'webkitTransitionEnd'
+						};
+						for (var t in transitions) {
+                                                        if (el.style[t] !== undefined) {
+								return transitions[t];
+							}
+						}
+					}
+
+					var debouncedTransitionEndPublisher = gridsterDebounce(function() {
+						scope.$apply(function() {
+							scope.$broadcast('gridster-item-transition-end', item);
+						});
+					}, 50);
+
+					if(whichTransitionEvent()){ //check for IE8, as it evaluates to null
+                                            $el.on(whichTransitionEvent(), debouncedTransitionEndPublisher);
+                                        }
+
+					scope.$broadcast('gridster-item-initialized', item);
+
+					return scope.$on('$destroy', function() {
+						try {
+							resizable.destroy();
+							draggable.destroy();
+						} catch (e) {}
+
+						try {
+							gridster.removeItem(item);
+						} catch (e) {}
+
+						try {
+							item.destroy();
+						} catch (e) {}
+					});
+				}
+			};
+		}
+	])
+
+	.directive('gridsterNoDrag', function() {
+		return {
+			restrict: 'A',
+			link: function(scope, $element) {
+				$element.addClass('gridster-no-drag');
+			}
+		};
+	})
+
+	;
+
+}));
diff --git a/epsdk-app-onap/src/main/webapp/static/fusion/js/att_angular_gridster/ui-gridster-tpls.js b/epsdk-app-onap/src/main/webapp/static/fusion/js/att_angular_gridster/ui-gridster-tpls.js
new file mode 100755
index 000000000..979b64b84
--- /dev/null
+++ b/epsdk-app-onap/src/main/webapp/static/fusion/js/att_angular_gridster/ui-gridster-tpls.js
@@ -0,0 +1,168 @@
+/**
+* FileName ui-gridster
+* Version 0.0.1
+* Build number ad58c6f4f8f8fd7f04ac457f95d76f09
+* Date 08/17/2015
+*/
+
+
+(function(angular, window){
+angular.module("att.gridster", ["att.gridster.tpls", "att.gridster.utilities","att.gridster.gridster"]);
+angular.module("att.gridster.tpls", ["template/gridster/gridster.html","template/gridster/gridsterItem.html","template/gridster/gridsterItemBody.html","template/gridster/gridsterItemFooter.html","template/gridster/gridsterItemHeader.html"]);
+angular.module('att.gridster.utilities', [])
+        .factory('$extendObj', [function() {
+                var _extendDeep = function(dst) {
+                    angular.forEach(arguments, function(obj) {
+                        if (obj !== dst) {
+                            angular.forEach(obj, function(value, key) {
+                                if (dst[key] && dst[key].constructor && dst[key].constructor === Object) {
+                                    _extendDeep(dst[key], value);
+                                } else {
+                                    dst[key] = value;
+                                }
+                            });
+                        }
+                    });
+                    return dst;
+                };
+                return {
+                    extendDeep: _extendDeep
+                };
+            }]);
+
+angular.module('att.gridster.gridster', ['attGridsterLib', 'att.gridster.utilities'])
+        .config(['$compileProvider', function($compileProvider) {
+                $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|javascript):/);
+            }])
+        .constant('attGridsterConfig',
+                {
+                    columns: 3,
+                    margins: [10, 10],
+                    outerMargin: true,
+                    pushing: true,
+                    floating: true,
+                    swapping: true,
+                    draggable: {
+                        enabled: true
+                    }
+                })
+        .directive('attGridster', ['attGridsterConfig', '$extendObj', function(attGridsterConfig, $extendObj) {
+                return {
+                    restrict: 'EA',
+                    scope: {
+                        attGridsterOptions: '=?'
+                    },
+                    templateUrl: 'template/gridster/gridster.html',
+                    replace: false,
+                    transclude: true,
+                    controller: [function() {}],
+                    link: function(scope) {
+                        if (angular.isDefined(scope.attGridsterOptions)) {
+                            attGridsterConfig = $extendObj.extendDeep(attGridsterConfig, scope.attGridsterOptions);
+                        }
+                        scope.attGridsterConfig = attGridsterConfig;
+                    }
+                };
+            }])
+        .directive('attGridsterItem', ['$timeout', function($timeout) {
+                return {
+                    restrict: 'EA',
+                    require: ['^attGridster'],
+                    scope: {
+                        attGridsterItem: '='
+                    },
+                    templateUrl: 'template/gridster/gridsterItem.html',
+                    replace: false,
+                    transclude: true,
+                    controller: [function() {}]
+                };
+            }])
+        .directive('attGridsterItemHeader', [function() {
+                return {
+                    restrict: 'EA',
+                    require: ['^attGridsterItem'],
+                    scope: {
+                        headerText: '@',
+                        subHeaderText: '@?'
+                    },
+                    templateUrl: 'template/gridster/gridsterItemHeader.html',
+                    replace: true,
+                    transclude: true,
+                    link: function(scope, element) {
+                        if (angular.isDefined(scope.subHeaderText) && scope.subHeaderText) {
+                            angular.element(element[0].querySelector('span.gridster-item-sub-header-content')).attr("tabindex", "0");
+                            angular.element(element[0].querySelector('span.gridster-item-sub-header-content')).attr("aria-label", scope.subHeaderText);
+                        }
+                    }
+                };
+            }])
+        .directive('attGridsterItemBody', [function() {
+                return {
+                    restrict: 'EA',
+                    require: ['^attGridsterItem'],
+                    scope: {},
+                    templateUrl: 'template/gridster/gridsterItemBody.html',
+                    replace: true,
+                    transclude: true
+                };
+            }])
+        .directive('attGridsterItemFooter', ['$location', function($location) {
+                return {
+                    restrict: 'EA',
+                    require: ['^attGridsterItem'],
+                    scope: {
+                        attGridsterItemFooterLink: '@?'
+                    },
+                    templateUrl: 'template/gridster/gridsterItemFooter.html',
+                    replace: true,
+                    transclude: true,
+                    controller: ['$scope', function($scope) {
+                            $scope.clickOnFooterLink = function(evt) {
+                                evt.preventDefault();
+                                evt.stopPropagation();
+                                if ($scope.attGridsterItemFooterLink) {
+                                    $location.url($scope.attGridsterItemFooterLink);
+                                }
+                            };
+                        }],
+                    link: function(scope, element) {
+                        if (angular.isDefined(scope.attGridsterItemFooterLink) && scope.attGridsterItemFooterLink) {
+                            element.attr("role", "link");
+                        }
+                    }
+                };
+            }]);
+angular.module("template/gridster/gridster.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/gridster/gridster.html",
+    "
    ");
+}]);
+
+angular.module("template/gridster/gridsterItem.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/gridster/gridsterItem.html",
+    "
    ");
+}]);
+
+angular.module("template/gridster/gridsterItemBody.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/gridster/gridsterItemBody.html",
+    "
    ");
+}]);
+
+angular.module("template/gridster/gridsterItemFooter.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/gridster/gridsterItemFooter.html",
+    "
    \n" +
+    "    \n" +
+    "
    ");
+}]);
+
+angular.module("template/gridster/gridsterItemHeader.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/gridster/gridsterItemHeader.html",
+    "
    \n" +
+    "    \"||\"\n" +
+    "    {{headerText}}\n" +
+    "    {{subHeaderText}}\n" +
+    "    
    \n" +
+    "
    ");
+}]);
+
+return {}
+})(angular, window);
\ No newline at end of file
diff --git a/lf_config/vid-pre-init.sql b/lf_config/vid-pre-init.sql
index ae1b5aaf0..107b582c6 100644
--- a/lf_config/vid-pre-init.sql
+++ b/lf_config/vid-pre-init.sql
@@ -1,32 +1,32 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`schema_info` (
-   `SCHEMA_ID` VARCHAR(25) NOT NULL,
-   `SCHEMA_DESC` VARCHAR(75) NOT NULL,
-   `DATASOURCE_TYPE` VARCHAR(100) NULL DEFAULT NULL,
-   `CONNECTION_URL` VARCHAR(200) NOT NULL,
-   `USER_NAME` VARCHAR(45) NOT NULL,
-   `PASSWORD` VARCHAR(45) NULL DEFAULT NULL,
-   `DRIVER_CLASS` VARCHAR(100) NOT NULL,
-   `MIN_POOL_SIZE` INT(11) NOT NULL,
-   `MAX_POOL_SIZE` INT(11) NOT NULL,
-   `IDLE_CONNECTION_TEST_PERIOD` INT(11) NOT NULL)
-    ENGINE = InnoDB
-    DEFAULT CHARACTER SET = utf8;
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`schema_info` (
+  `SCHEMA_ID` VARCHAR(25) NOT NULL,
+  `SCHEMA_DESC` VARCHAR(75) NOT NULL,
+  `DATASOURCE_TYPE` VARCHAR(100) NULL DEFAULT NULL,
+  `CONNECTION_URL` VARCHAR(200) NOT NULL,
+  `USER_NAME` VARCHAR(45) NOT NULL,
+  `PASSWORD` VARCHAR(45) NULL DEFAULT NULL,
+  `DRIVER_CLASS` VARCHAR(100) NOT NULL,
+  `MIN_POOL_SIZE` INT(11) NOT NULL,
+  `MAX_POOL_SIZE` INT(11) NOT NULL,
+  `IDLE_CONNECTION_TEST_PERIOD` INT(11) NOT NULL)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8;
diff --git a/pom.xml b/pom.xml
index bbb8fd59d..839f53ba4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,198 +1,234 @@
-
-	4.0.0
-	org.openecomp.vid
-	vid-parent
-	pom
-	VID Parent Project
-	
-	
-	  
-	  
-	    default
-	    
-	      true
-	    
-	    
-	      vid
-	    
-	  
-	  
-	  
-	    docker
-	    
-              vid
-              deliveries
-            
-          
-	
-
-	
-		UTF-8
-		UTF-8
-		1.1.0-SNAPSHOT
-		https://nexus.onap.org
-		/content/repositories/snapshots/
-		/content/repositories/releases/
-		/content/repositories/staging/
-                /content/sites/site/org/openecomp/vid/${project.version}
-	
-
-	
-		
-			ecomp-releases
-			VID Release Repository
-			${nexusproxy}/${releaseNexusPath}
-		
-		
-			ecomp-snapshots
-			VID Snapshot Repository
-			${nexusproxy}/${snapshotNexusPath}
-		
-		
-			ecomp-staging
-			VID Staging Repository
-			${nexusproxy}/${stagingNexusPath}
-		
-		
-			
-			oss-snapshots
-			oss Central - Snapshots
-			https://oss.sonatype.org/service/local/repositories/releases/content/
-		
-	
-
-	
-		
-			ecomp-releases
-			VID Release Repository
-			${nexusproxy}/${releaseNexusPath}
-		
-		
-			ecomp-snapshots
-			VID Snapshot Repository
-			${nexusproxy}/${snapshotNexusPath}
-		
-		
-		
-			ecomp-site
-			dav:${nexusproxy}${sitePath}
-		
-	
-
-	
-	  
-	    
-	      org.codehaus.mojo
-	      versions-maven-plugin
-	      1.3.1
-	    
-	    
-	        org.sonatype.plugins
-		nexus-staging-maven-plugin
-		1.6.7
-		true
-		
-		  ${nexusproxy}
-		  176c31dfe190a
-		  ecomp-staging
-		
-	    
-
-		 
-            
-                org.codehaus.mojo
-                license-maven-plugin
-                1.9
-                
-                    apache_v2
-                    2016
-                    AT&T
-                    VID
-                    false 
-     		    ========LICENSE_START===========
-     		    ============LICENSE_END===========
-                    
-                      src/main/java
-                    
-                    
-                        *.png
-                    
-                
-            
-
-	    
-	        org.apache.maven.plugins
-		maven-deploy-plugin
-		2.8
-	    
-
-	    
-	        org.apache.maven.plugins
-	        maven-surefire-plugin
-		2.17
-	    
-	    
-	    
-	        org.apache.maven.plugins
-		maven-compiler-plugin
-		2.3.2
-		
-		
-		  true
-		  -Xlint
-		  true
-		  true
-		  true
-		  1.8
-		  1.8
-		
-	    
-	    
-	        org.apache.maven.plugins
-	        maven-site-plugin
-		3.6
-		
-		  
-		    org.apache.maven.wagon
-		    wagon-webdav-jackrabbit
-		    2.10
-		  
-		
-	    
-	  
-	
-
-	
-
-	
-		
-			
-			
-				org.apache.maven.plugins
-				maven-javadoc-plugin
-				2.10.4
-				
-					false
-					org.umlgraph.doclet.UmlGraphDoc
-					
-						org.umlgraph
-						umlgraph
-						5.6
-					
-					-views
-					true
-				
-			
-		
-	
-	
-		
-			junit
-			junit
-			4.11
-			test
-		
-	
-	1.1.0-SNAPSHOT
-
+
+	4.0.0
+	org.openecomp.vid
+	vid-parent
+	pom
+	VID Parent Project
+
+	
+		
+
+		
+			onap
+			
+				true
+			
+			
+				vid-app-common
+				epsdk-app-onap
+			
+
+			
+				
+					ecomp-releases
+					VID Release Repository
+					${nexusproxy}/${releaseNexusPath}
+				
+				
+					ecomp-snapshots
+					VID Snapshot Repository
+					${nexusproxy}/${snapshotNexusPath}
+				
+				
+					ecomp-staging
+					VID Staging Repository
+					${nexusproxy}/${stagingNexusPath}
+				
+				
+					
+					oss-snapshots
+					oss Central - Snapshots
+					https://oss.sonatype.org/service/local/repositories/releases/content/
+				
+			
+
+			
+				
+					ecomp-releases
+					VID Release Repository
+					${nexusproxy}/${releaseNexusPath}
+				
+				
+					ecomp-snapshots
+					VID Snapshot Repository
+					${nexusproxy}/${snapshotNexusPath}
+				
+				
+				
+					ecomp-site
+					dav:${nexusproxy}${sitePath}
+				
+			
+
+		
+
+		
+			docker
+			
+				vid-app-common
+				epsdk-app-onap
+				deliveries
+			
+		
+	
+
+	
+		UTF-8
+		UTF-8
+		1.1.0-SNAPSHOT
+		https://nexus.onap.org
+		/content/repositories/snapshots/
+		/content/repositories/releases/
+		/content/repositories/staging/
+		/content/sites/site/org/openecomp/vid/${project.version}
+	
+
+	
+		
+			
+				org.codehaus.mojo
+				versions-maven-plugin
+				1.3.1
+			
+			
+				org.sonatype.plugins
+				nexus-staging-maven-plugin
+				1.6.7
+				true
+				
+					${nexusproxy}
+					176c31dfe190a
+					ecomp-staging
+				
+			
+
+			
+			
+				org.codehaus.mojo
+				license-maven-plugin
+				1.9
+				
+					apache_v2
+					2017
+					AT&T
+					VID
+					false
+					========LICENSE_START===========
+					============LICENSE_END===========
+					
+						src/main/java
+					
+					
+						*.png
+					
+				
+			
+
+			
+				org.apache.maven.plugins
+				maven-deploy-plugin
+				2.8
+			
+
+			
+				org.apache.maven.plugins
+				maven-surefire-plugin
+				2.17
+			
+
+			
+				org.apache.maven.plugins
+				maven-compiler-plugin
+				2.3.2
+
+				
+					true
+					-Xlint
+					true
+					true
+					true
+					1.8
+					1.8
+				
+			
+			
+				org.apache.maven.plugins
+				maven-site-plugin
+				3.6
+				
+					
+						org.apache.maven.wagon
+						wagon-webdav-jackrabbit
+						2.10
+					
+				
+			
+			
+				com.blackducksoftware.integration
+				hub-maven-plugin
+				1.4.0
+				false
+				
+					${project.name}
+					${project.basedir}
+				
+				
+					
+						create-bdio-file
+						package
+						
+							createHubOutput
+						
+					
+				
+			
+		
+	
+
+	
+	
+		
+		
+			JCenter
+			JCenter Repository
+			http://jcenter.bintray.com
+		
+
+		
+			Restlet
+			Restlet Repository
+			http://maven.restlet.com
+		
+	
+	
+		
+
+			
+				org.apache.maven.plugins
+				maven-javadoc-plugin
+				2.10.4
+				
+					false
+					org.umlgraph.doclet.UmlGraphDoc
+					
+						org.umlgraph
+						umlgraph
+						5.6
+					
+					-views
+					true
+				
+			
+		
+	
+	
+		
+			junit
+			junit
+			4.11
+			test
+		
+	
+	1.1.0-SNAPSHOT
+
diff --git a/vid-app-common/.classpath b/vid-app-common/.classpath
new file mode 100755
index 000000000..0f8fecb9d
--- /dev/null
+++ b/vid-app-common/.classpath
@@ -0,0 +1,43 @@
+
+
+	
+		
+			
+			
+		
+	
+	
+		
+			
+			
+		
+	
+	
+		
+			
+		
+	
+	
+		
+			
+			
+		
+	
+	
+		
+			
+		
+	
+	
+		
+			
+		
+	
+	
+		
+			
+			
+		
+	
+	
+
diff --git a/vid-app-common/.project b/vid-app-common/.project
new file mode 100755
index 000000000..f0b63c382
--- /dev/null
+++ b/vid-app-common/.project
@@ -0,0 +1,42 @@
+
+
+	vid-app-common
+	
+	
+	
+	
+		
+			org.eclipse.wst.jsdt.core.javascriptValidator
+			
+			
+		
+		
+			org.eclipse.jdt.core.javabuilder
+			
+			
+		
+		
+			org.eclipse.wst.common.project.facet.core.builder
+			
+			
+		
+		
+			org.eclipse.wst.validation.validationbuilder
+			
+			
+		
+		
+			org.eclipse.m2e.core.maven2Builder
+			
+			
+		
+	
+	
+		org.eclipse.jem.workbench.JavaEMFNature
+		org.eclipse.wst.common.modulecore.ModuleCoreNature
+		org.eclipse.jdt.core.javanature
+		org.eclipse.m2e.core.maven2Nature
+		org.eclipse.wst.common.project.facet.core.nature
+		org.eclipse.wst.jsdt.core.jsNature
+	
+
diff --git a/vid-app-common/.settings/.jsdtscope b/vid-app-common/.settings/.jsdtscope
new file mode 100755
index 000000000..c34a33690
--- /dev/null
+++ b/vid-app-common/.settings/.jsdtscope
@@ -0,0 +1,13 @@
+
+
+	
+	
+	
+	
+		
+			
+		
+	
+	
+	
+
diff --git a/vid-app-common/.settings/org.eclipse.core.resources.prefs b/vid-app-common/.settings/org.eclipse.core.resources.prefs
new file mode 100755
index 000000000..1a9f2d22b
--- /dev/null
+++ b/vid-app-common/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
diff --git a/vid-app-common/.settings/org.eclipse.jdt.core.prefs b/vid-app-common/.settings/org.eclipse.jdt.core.prefs
new file mode 100755
index 000000000..1ab2bb53a
--- /dev/null
+++ b/vid-app-common/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/vid-app-common/.settings/org.eclipse.m2e.core.prefs b/vid-app-common/.settings/org.eclipse.m2e.core.prefs
new file mode 100755
index 000000000..14b697b7b
--- /dev/null
+++ b/vid-app-common/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/vid-app-common/.settings/org.eclipse.wst.common.component b/vid-app-common/.settings/org.eclipse.wst.common.component
new file mode 100755
index 000000000..40a2cb3cc
--- /dev/null
+++ b/vid-app-common/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,18 @@
+
+    
+        
+        
+        
+        
+        
+        
+            consumes
+        
+        
+            consumes
+        
+        
+        
+        
+    
+
diff --git a/vid-app-common/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/vid-app-common/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
new file mode 100755
index 000000000..b01fdb78f
--- /dev/null
+++ b/vid-app-common/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
@@ -0,0 +1,7 @@
+
+  
+    
+      
+    
+  
+
diff --git a/vid-app-common/.settings/org.eclipse.wst.common.project.facet.core.xml b/vid-app-common/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100755
index 000000000..91e8c54be
--- /dev/null
+++ b/vid-app-common/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,8 @@
+
+
+  
+  
+  
+  
+  
+
diff --git a/vid-app-common/.settings/org.eclipse.wst.jsdt.ui.superType.container b/vid-app-common/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100755
index 000000000..3bd5d0a48
--- /dev/null
+++ b/vid-app-common/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/vid-app-common/.settings/org.eclipse.wst.jsdt.ui.superType.name b/vid-app-common/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100755
index 000000000..05bd71b6e
--- /dev/null
+++ b/vid-app-common/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
\ No newline at end of file
diff --git a/vid-app-common/.settings/org.eclipse.wst.validation.prefs b/vid-app-common/.settings/org.eclipse.wst.validation.prefs
new file mode 100755
index 000000000..6f1cba68d
--- /dev/null
+++ b/vid-app-common/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
new file mode 100755
index 000000000..5f1a07dea
--- /dev/null
+++ b/vid-app-common/pom.xml
@@ -0,0 +1,392 @@
+
+
+	4.0.0
+
+	
+	org.openecomp.vid
+	vid-app-common
+	1.1.0-SNAPSHOT
+	war
+	VID Common
+	VID Common code for opensource version
+
+	
+	  UTF-8
+	  UTF-8
+	  UTF-8
+	  1.1.0-SNAPSHOT
+	  4.2.0.RELEASE
+	  4.3.11.Final
+	  
+	  true
+	  
+	  true
+	  https://nexus.onap.org
+	  /content/repositories/snapshots/
+	  /content/repositories/releases/
+	  /content/repositories/staging/
+	  /content/sites/site/org/openecomp/vid/${project.version}
+	
+	
+	
+	
+	
+	
+	
+	  
+	    ecomp-releases
+	    VID Release Repository
+	    ${nexusproxy}${releaseNexusPath}
+	  
+	  
+	    ecomp-snapshots
+	    VID Snapshot Repository
+	    ${nexusproxy}${snapshotNexusPath}
+	  
+	  
+	    ecomp-staging
+	    VID Staging Repository
+	    ${nexusproxy}${stagingNexusPath}
+	  
+	  
+	    
+	    oss-snapshots
+	    oss Central - Snapshots
+	    https://oss.sonatype.org/service/local/repositories/releases/content/
+	  
+	
+	
+	
+		vid-common
+		
+			
+				org.codehaus.mojo
+				cobertura-maven-plugin
+				2.7
+				
+					
+						xml
+					
+				
+				
+					
+						package
+						
+							cobertura
+						
+					
+				
+			
+			
+				org.apache.tomcat.maven
+				tomcat6-maven-plugin
+				2.2
+			
+			
+				org.apache.tomcat.maven
+				tomcat7-maven-plugin
+				2.2
+			
+
+			
+			
+				org.jsonschema2pojo
+				jsonschema2pojo-maven-plugin
+				0.4.23
+				
+					${basedir}/src/main/resources/json/mso
+					org.openecomp.vid.domain.mso
+					${project.build.directory}/generated-sources
+				
+				
+					
+						
+							generate
+						
+					
+				
+			
+
+			
+				org.apache.maven.plugins
+				maven-compiler-plugin
+				3.1
+				
+					1.8
+					1.8
+				
+			
+
+			
+				org.apache.maven.plugins
+				maven-surefire-plugin
+				2.19.1
+				
+					${skiptests}
+					
+						**/Test*.java
+						**/*Test.java
+						**/*TestCase.java
+					
+					
+						**/selenium/*.java
+					
+					
+						${basedir}/war
+					
+					
+						classpath:
+					
+				
+			
+
+			
+				maven-assembly-plugin
+				
+					${skipassembly}
+					
+						${basedir}/distribution.xml
+					
+				
+				
+					
+						make-assembly
+						package
+						
+							single
+						
+					
+				
+			
+
+
+			
+				org.apache.maven.plugins
+				maven-war-plugin
+				3.0.0
+				
+					
+					true
+					
+					WEB-INF/lib/*.jar
+				
+			
+
+		
+
+
+	
+
+	
+		
+
+		
+			org.openecomp.ecompsdkos
+			epsdk-app-overlay
+			${epsdk.version}
+			war
+		
+		
+			org.openecomp.ecompsdkos
+			epsdk-app-common
+			${epsdk.version}
+			jar
+		
+		
+		
+			org.openecomp.ecompsdkos
+			epsdk-core
+			${epsdk.version}
+		
+		
+			org.openecomp.ecompsdkos
+			epsdk-analytics
+			${epsdk.version}
+		
+		
+			org.openecomp.ecompsdkos
+			epsdk-workflow
+			${epsdk.version}
+		
+		
+			com.att.eelf
+			eelf-core
+			1.0.0
+		
+
+		
+		
+			com.fasterxml.jackson.core
+			jackson-annotations
+			2.6.3
+		
+		
+			com.fasterxml.jackson.core
+			jackson-core
+			2.6.3
+		
+		
+			com.fasterxml.jackson.core
+			jackson-databind
+			2.6.3
+		
+		
+			org.codehaus.jackson
+			jackson-mapper-asl
+			1.9.13
+		
+		
+			com.mchange
+			c3p0
+			0.9.5.2
+		
+		
+			io.searchbox
+			jest
+			2.0.0
+			
+				
+					commons-logging
+					commons-logging
+				
+			
+		
+		
+			javax.servlet
+			javax.servlet-api
+			3.1.0
+			provided
+		
+		
+			junit
+			junit
+			4.12
+		
+		
+			org.json
+			json
+			20160212
+		
+		
+			org.quartz-scheduler
+			quartz
+			2.2.1
+			
+				
+				
+					c3p0
+					c3p0
+				
+			
+		
+		
+		
+			org.slf4j
+			jcl-over-slf4j
+			1.7.12
+		
+		
+			org.springframework
+			spring-context-support
+			${springframework.version}
+		
+		
+			org.springframework
+			spring-core
+			${springframework.version}
+			
+				
+					commons-logging
+					commons-logging
+				
+			
+		
+		
+			org.springframework
+			spring-test
+			${springframework.version}
+		
+		
+			org.springframework
+			spring-tx
+			${springframework.version}
+		
+		
+			org.springframework
+			spring-web
+			${springframework.version}
+		
+		
+			org.springframework
+			spring-webmvc
+			${springframework.version}
+		
+		
+			org.glassfish.jersey.core
+			jersey-client
+			2.23.1
+		
+		
+			org.glassfish.jersey.connectors
+			jersey-jetty-connector
+			2.23.1
+		
+		
+			com.fasterxml.jackson.jaxrs
+			jackson-jaxrs-json-provider
+			2.6.3
+		
+		
+			commons-beanutils
+			commons-beanutils
+			1.9.3
+		
+		
+			com.googlecode.json-simple
+			json-simple
+			1.1.1
+		
+		
+			org.seleniumhq.selenium
+			selenium-java
+			2.53.1
+			test
+		
+		
+			org.seleniumhq.selenium
+			selenium-api
+			2.53.1
+			test
+		
+		
+			org.testng
+			testng
+			6.8
+			test
+		
+		
+			org.seleniumhq.selenium
+			selenium-firefox-driver
+			2.53.1
+		
+		
+			xml-apis
+			xml-apis
+			1.4.01
+		
+		
+			org.mariadb.jdbc
+			mariadb-java-client
+			1.4.6
+		
+		
+			org.yaml
+			snakeyaml
+			1.16
+		
+	
+
diff --git a/vid-app-common/src/main/java/org/openecomp/aai/util/AAIProperties.java b/vid-app-common/src/main/java/org/openecomp/aai/util/AAIProperties.java
new file mode 100755
index 000000000..ca710f6fc
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/aai/util/AAIProperties.java
@@ -0,0 +1,68 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.aai.util;
+
+
+import org.openecomp.portalsdk.core.util.SystemProperties;
+
+/**
+ * The Class AAIProperties.
+ */
+public class AAIProperties extends SystemProperties {
+
+	/** The Constant AAI_SERVER_URL_BASE. */
+	//VID Specific
+	public static final String AAI_SERVER_URL_BASE = "aai.server.url.base";
+	
+	/** The Constant AAI_SERVER_URL. */
+	public static final String AAI_SERVER_URL = "aai.server.url";
+	
+	/** The Constant AAI_OLDSERVER_URL_BASE. */
+	public static final String AAI_OLDSERVER_URL_BASE = "aai.oldserver.url.base";
+	
+	/** The Constant AAI_OLDSERVER_URL. */
+	public static final String AAI_OLDSERVER_URL = "aai.oldserver.url";
+	
+	/** The Constant AAI_TRUSTSTORE_FILENAME. */
+	public static final String AAI_TRUSTSTORE_FILENAME = "aai.truststore.filename";
+	
+	/** The Constant AAI_TRUSTSTORE_PASSWD_X. */
+	public static final String AAI_TRUSTSTORE_PASSWD_X = "aai.truststore.passwd.x";
+	
+	/** The Constant AAI_KEYSTORE_FILENAME. */
+	public static final String AAI_KEYSTORE_FILENAME = "aai.keystore.filename";
+	
+	/** The Constant AAI_KEYSTORE_PASSWD_X. */
+	public static final String AAI_KEYSTORE_PASSWD_X = "aai.keystore.passwd.x";
+		
+	/** The Constant AAI_VID_USERNAME. */
+	public static final String AAI_VID_USERNAME = "aai.vid.username";
+
+	/** The Constant AAI_VID_PASSWD_X. */
+	public static final String AAI_VID_PASSWD_X = "aai.vid.passwd.x";
+	
+	/** The Constant FILESEPARTOR. */
+	public static final String FILESEPARTOR = (System.getProperty("file.separator") == null) ? "/" : System.getProperty("file.separator");
+
+	/** The Constant AAI_USE_CLIENT_CERT */
+	public static final String AAI_USE_CLIENT_CERT = "aai.use.client.cert";
+	
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/aai/util/AAIRestInterface.java b/vid-app-common/src/main/java/org/openecomp/aai/util/AAIRestInterface.java
new file mode 100755
index 000000000..fa4eefc6c
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/aai/util/AAIRestInterface.java
@@ -0,0 +1,303 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.openecomp.aai.util;
+
+
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.security.KeyManagementException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Base64;
+import java.util.Date;
+import java.util.UUID;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.eclipse.jetty.util.security.Password;
+import org.openecomp.aai.util.AAIProperties;
+import org.openecomp.aai.util.HttpsAuthClient;
+/**
+ * The Class AAIRestInterface.
+ */
+public class AAIRestInterface {
+
+	/** The logger. */
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(AAIRestInterface.class);
+	
+	/** The Constant dateFormat. */
+	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
+	
+	/** The client. */
+	private static Client client = null;
+
+	/** The rest srvr base URL. */
+	private String restSrvrBaseURL;
+	
+	/** The certificate path. */
+	public String certificatePath = "";
+	
+	/**
+	 * Instantiates a new AAI rest interface.
+	 *
+	 * @param certPath the cert path
+	 */
+	public AAIRestInterface(String certPath)
+	{
+		certificatePath = certPath;
+	}
+	
+	/**
+	 * Encode URL.
+	 *
+	 * @param nodeKey the node key
+	 * @return the string
+	 * @throws UnsupportedEncodingException the unsupported encoding exception
+	 */
+	public String encodeURL (String nodeKey) throws UnsupportedEncodingException {
+		return URLEncoder.encode(nodeKey, "UTF-8").replaceAll("\\+", "%20");
+	}
+	
+	/**
+	 * Inits the rest client.
+	 */
+	private void initRestClient()
+	{
+		String methodName = "initRestClient";
+		
+		if (client == null) {
+			try {
+				client = HttpsAuthClient.getClient(certificatePath);
+			}
+			catch (KeyManagementException e){
+				logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== KeyManagementException in " + methodName + e.toString());
+				logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== KeyManagementException in " + methodName + e.toString());
+			} catch (Exception e) {
+				logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== Exception in REST call to DB in initRestClient" + e.toString());
+				logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== Exception in REST call to DB : " + e.toString());
+			}
+		}
+	}
+	
+	/**
+	 * Sets the rest srvr base URL.
+	 *
+	 * @param baseURL the base URL
+	 */
+	public void SetRestSrvrBaseURL(String baseURL)
+	{
+		if (baseURL == null)
+		{
+			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== REST Server base URL cannot be null.");
+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== REST Server base URL cannot be null.");
+		}
+			
+		restSrvrBaseURL = baseURL;
+	}
+	
+	/**
+	 * Gets the rest srvr base URL.
+	 *
+	 * @return the rest srvr base URL
+	 */
+	public String getRestSrvrBaseURL() 
+	{
+		return restSrvrBaseURL;
+	}
+	
+	
+	/**
+	 * Rest get.
+	 *
+	 * @param fromAppId the from app id
+	 * @param transId the trans id
+	 * @param requestUri the request uri
+	 * @param xml the xml
+	 * @return the string
+	 * @throws UnsupportedEncodingException 
+	 */
+	public Response RestGet(String fromAppId, String transId, String requestUri, boolean xml) throws UnsupportedEncodingException  {
+		String methodName = "RestGet";
+		
+		String responseType = "application/json";
+		if (xml)
+          	responseType = "application/xml";
+		  
+		initRestClient();
+
+		String clientCert = SystemProperties.getProperty(AAIProperties.AAI_USE_CLIENT_CERT);
+		
+		boolean useClientCert = false;
+		if (clientCert != null && 
+				SystemProperties.getProperty(AAIProperties.AAI_USE_CLIENT_CERT).equalsIgnoreCase("true")) {
+			useClientCert  = true;
+		}
+		String url = "";
+		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
+	
+		url = SystemProperties.getProperty(AAIProperties.AAI_SERVER_URL) + requestUri;
+		
+	    try {
+	    	// what is the point of this, just to check syntax??
+		    URL urlObj= new URL(url);
+			URI uri = new URI(urlObj.getProtocol(), urlObj.getUserInfo(), urlObj.getHost(), urlObj.getPort(), urlObj.getPath(), urlObj.getQuery(), urlObj.getRef());
+			url = uri.toASCIIString();
+	    } catch (URISyntaxException | MalformedURLException e) {
+	    	 logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " +  methodName + " bad URL");
+	    	 return null;
+		}
+	    logger.debug(dateFormat.format(new Date()) + "<== " + url + " for the get REST API");
+
+	    final Response cres;
+	    if (useClientCert == true) { 
+	    	 cres = client.target(url)
+	    			 .request()
+	    	         .accept(responseType)
+	    	         .header("X-TransactionId", transId)
+	    	         .header("X-FromAppId",  fromAppId)
+	    	         .header("Content-Type", "application/json")
+	    	         .get();
+	    } else { 
+			
+			String vidUsername = SystemProperties.getProperty(AAIProperties.AAI_VID_USERNAME);
+			String vidPassword = Password.deobfuscate(SystemProperties.getProperty(AAIProperties.AAI_VID_PASSWD_X));
+			String encodeThis = vidUsername + ":" + vidPassword;
+			
+			cres = client.target(url)
+					.request()
+					.accept(responseType)
+					.header("X-TransactionId", transId)
+					.header("X-FromAppId",  fromAppId)
+					.header("Content-Type", "application/json")
+					.header("Authorization", "Basic " + Base64.getEncoder().encodeToString(encodeThis.getBytes("utf-8")))
+					.get();
+	    }
+//		String r = cres.readEntity(String.class);
+		if (cres.getStatus() == 200) {
+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " REST api GET was successful!");
+			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + methodName + " REST api GET was successful!");
+		} else {
+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName +" with status="+cres.getStatus()+", url="+url);
+		}
+		return cres;
+//		 logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName +" resp=" + r );
+//		 return r;
+	}
+	
+	
+	/**
+	 * Delete.
+	 *
+	 * @param sourceID the source ID
+	 * @param transId the trans id
+	 * @param path the path
+	 * @return true, if successful
+	 */
+	public boolean Delete(String sourceID,  String transId,  String path) {
+		String methodName = "Delete";
+		String url="";
+		transId += ":" + UUID.randomUUID().toString();
+		logger.debug(dateFormat.format(new Date()) + "<== " +  methodName + " start");
+		
+		initRestClient();
+		String request = "{}";
+		url = SystemProperties.getProperty(AAIProperties.AAI_SERVER_URL) + path;			
+		final Response cres = client.target(url)
+				 .request()
+		         .accept("application/json")
+		         .header("X-TransactionId", transId)
+		         .header("X-FromAppId",  sourceID)
+		         //.entity(request)
+		         .delete();
+		
+		if (cres.getStatus() == 404) { // resource not found
+			String msg = "Resource does not exist...: " + cres.getStatus()
+					+ ":" + cres.readEntity(String.class);
+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + msg);
+			return false;
+		} else if (cres.getStatus() == 200  || cres.getStatus() == 204){
+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + "Resource " + url + " deleted");
+			return true;
+		} else {
+			String msg = "Deleting Resource failed: " + cres.getStatus()
+				+ ":" + cres.readEntity(String.class);
+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + msg);
+		}
+
+		return false;
+	}
+	
+    
+    /**
+     * Rest post.
+     *
+     * @param fromAppId the from app id
+     * @param transId the trans id
+     * @param path the path
+     * @param payload the payload
+     * @param xml the xml
+     * @return the string
+     */
+    public Response RestPost(String fromAppId,  String transId,  String path, String payload, boolean xml) {
+        String methodName = "RestPost";
+        String url="";
+        transId = UUID.randomUUID().toString();
+        logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " +  methodName + " start");       
+        
+        try {
+            
+        	String responseType = "application/json";
+        	if (xml)
+               	responseType = "application/xml";
+        	   
+            initRestClient();    
+    
+            url = SystemProperties.getProperty(AAIProperties.AAI_SERVER_URL_BASE) + path;
+
+            final Response cres = client.target(url)
+                 .request()
+                 .accept(responseType)
+                 .header("X-TransactionId", transId)
+                 .header("X-FromAppId",  fromAppId)
+                 .post(Entity.entity(payload, MediaType.APPLICATION_JSON));
+            
+        	if (cres.getStatus() == 200 && cres.getStatus() <= 299) {
+        		logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + methodName + " REST api POST was successful!");
+    			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " REST api POST was successful!");
+             } else {
+    			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName +" with status="+cres.getStatus()+", url="+url);
+    		}
+    		return cres;
+        } catch (Exception e) {
+        	logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " with url="+url+ ", Exception: " + e.toString());
+        }
+        return null;
+    }
+    
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/aai/util/CustomJacksonJaxBJsonProvider.java b/vid-app-common/src/main/java/org/openecomp/aai/util/CustomJacksonJaxBJsonProvider.java
new file mode 100755
index 000000000..2623d6b6f
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/aai/util/CustomJacksonJaxBJsonProvider.java
@@ -0,0 +1,73 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.aai.util;
+
+
+import javax.ws.rs.ext.Provider;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
+import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
+
+/**
+ * The Class CustomJacksonJaxBJsonProvider.
+ */
+@Provider
+public class CustomJacksonJaxBJsonProvider extends JacksonJaxbJsonProvider {
+
+	    /** The common mapper. */
+    	private static ObjectMapper commonMapper = null;
+
+	    /**
+    	 * Instantiates a new custom jackson jax B json provider.
+    	 */
+    	public CustomJacksonJaxBJsonProvider() {
+	        if (commonMapper == null) {
+	            ObjectMapper mapper = new ObjectMapper();
+
+	            mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+	            
+	            mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
+	            mapper.configure(SerializationFeature.INDENT_OUTPUT, false);
+	            mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, false);
+
+	            mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+	            mapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, false);
+
+	            mapper.registerModule(new JaxbAnnotationModule());
+
+	            commonMapper = mapper;
+	        }
+	        super.setMapper(commonMapper);
+	    }
+	    
+	    /**
+    	 * Gets the mapper.
+    	 *
+    	 * @return the mapper
+    	 */
+    	public ObjectMapper getMapper() {
+	    	return commonMapper;
+	    }
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/aai/util/HttpsAuthClient.java b/vid-app-common/src/main/java/org/openecomp/aai/util/HttpsAuthClient.java
new file mode 100755
index 000000000..8335d15b2
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/aai/util/HttpsAuthClient.java
@@ -0,0 +1,140 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.aai.util;
+
+
+import java.io.FileInputStream;
+import java.security.KeyManagementException;
+import java.security.KeyStore;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+
+import org.eclipse.jetty.util.security.Password;
+import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.client.HttpUrlConnectorProvider;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+/**
+ * The Class HttpsAuthClient.
+ */
+public class HttpsAuthClient{
+	/** The logger. */
+	static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(HttpsAuthClient.class);
+	
+	/**
+	 * Gets the client.
+	 *
+	 * @param certFilePath the cert file path
+	 * @return the client
+	 * @throws KeyManagementException the key management exception
+	 */
+	public static Client getClient(String certFilePath) throws KeyManagementException {
+
+		ClientConfig config = new ClientConfig();
+		//config.getFeatures().put(JSONConfiguration.FEATURE_POJO_MAPPING, Boolean.TRUE);
+		//config.getClasses().add(org.openecomp.aai.util.CustomJacksonJaxBJsonProvider.class);
+
+		try {
+			
+		    config.property(HttpUrlConnectorProvider.SET_METHOD_WORKAROUND, Boolean.TRUE );
+			
+			config.connectorProvider(new HttpUrlConnectorProvider().useSetMethodWorkaround());
+			String truststore_path = certFilePath + AAIProperties.FILESEPARTOR + SystemProperties.getProperty(AAIProperties.AAI_TRUSTSTORE_FILENAME);
+			String truststore_password = SystemProperties.getProperty(AAIProperties.AAI_TRUSTSTORE_PASSWD_X);
+			String decrypted_truststore_password = Password.deobfuscate(truststore_password);
+			
+			boolean useClientCert = false;
+			
+			String keystore_path = certFilePath + AAIProperties.FILESEPARTOR + SystemProperties.getProperty(AAIProperties.AAI_KEYSTORE_FILENAME);
+			String keystore_password = SystemProperties.getProperty(AAIProperties.AAI_KEYSTORE_PASSWD_X);
+			String decrypted_keystore_password = Password.deobfuscate(keystore_password);
+			
+			String clientCert = SystemProperties.getProperty(AAIProperties.AAI_USE_CLIENT_CERT);
+			
+			if (clientCert != null && 
+					SystemProperties.getProperty(AAIProperties.AAI_USE_CLIENT_CERT).equalsIgnoreCase("true")) {
+				useClientCert = true;
+			}
+			
+		    System.setProperty("javax.net.ssl.trustStore", truststore_path);
+		    System.setProperty("javax.net.ssl.trustStorePassword", decrypted_truststore_password);
+			HttpsURLConnection.setDefaultHostnameVerifier( new HostnameVerifier(){
+			    public boolean verify(String string,SSLSession ssls) {
+			        return true;
+			    }
+			});
+	
+			final SSLContext ctx = SSLContext.getInstance("TLS");
+			
+			KeyManagerFactory kmf = null;
+			if (useClientCert) {
+			
+				try {
+					kmf = KeyManagerFactory.getInstance("SunX509");
+					FileInputStream fin = new FileInputStream(keystore_path);
+					KeyStore ks = KeyStore.getInstance("PKCS12");
+					char[] pwd = decrypted_keystore_password.toCharArray();
+					ks.load(fin, pwd);
+					kmf.init(ks, pwd);
+				} catch (Exception e) {
+					//System.out.println("Error setting up kmf: exiting");
+					logger.debug(EELFLoggerDelegate.debugLogger, "Error setting up kmf: exiting");
+					e.printStackTrace();
+					return null;
+				}
+				ctx.init(kmf.getKeyManagers(), null, null);
+			
+				return ClientBuilder.newBuilder()
+						.sslContext(ctx)
+						.hostnameVerifier(new HostnameVerifier() {
+							@Override
+							public boolean verify( String s, SSLSession sslSession ) {
+								return true;
+							}
+						}).withConfig(config)
+						.build()
+						.register(org.openecomp.aai.util.CustomJacksonJaxBJsonProvider.class);
+			} else { 
+				return ClientBuilder.newBuilder()
+						.hostnameVerifier(new HostnameVerifier() {
+							@Override
+							public boolean verify( String s, SSLSession sslSession ) {
+								return true;
+							}
+						}).withConfig(config)
+						.build()
+						.register(org.openecomp.aai.util.CustomJacksonJaxBJsonProvider.class);
+			}
+		} catch (Exception e) {
+			logger.debug(EELFLoggerDelegate.debugLogger, "Error setting up config: exiting");
+			//System.out.println("Error setting up config: exiting");
+			e.printStackTrace();
+			System.exit(1);
+			return null;
+		}
+	}
+}  
diff --git a/vid-app-common/src/main/java/org/openecomp/aai/util/HttpsComponentsClient.java b/vid-app-common/src/main/java/org/openecomp/aai/util/HttpsComponentsClient.java
new file mode 100755
index 000000000..a041c6520
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/aai/util/HttpsComponentsClient.java
@@ -0,0 +1,99 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.aai.util;
+
+import java.io.FileInputStream;
+import java.security.KeyManagementException;
+import java.security.KeyStore;
+
+import javax.net.ssl.SSLContext;
+
+import org.apache.http.conn.ssl.SSLContextBuilder;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.impl.client.HttpClients;
+import org.eclipse.jetty.util.security.Password;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+
+
+/**
+ * The Class HttpsComponentsClient.
+ */
+public class HttpsComponentsClient{
+	
+	/**
+	 * Gets the client.
+	 *
+	 * @param certFilePath the cert file path
+	 * @return the client
+	 * @throws KeyManagementException the key management exception
+	 */
+	public static CloseableHttpClient getClient(String certFilePath) throws Exception {
+		CloseableHttpClient httpclient = null;
+		try {
+			
+			String truststore_path = certFilePath + AAIProperties.FILESEPARTOR + SystemProperties.getProperty(AAIProperties.AAI_TRUSTSTORE_FILENAME);
+			String truststore_password = SystemProperties.getProperty(AAIProperties.AAI_TRUSTSTORE_PASSWD_X);
+			String decrypted_truststore_password = Password.deobfuscate(truststore_password);
+			String keystore_path = certFilePath + AAIProperties.FILESEPARTOR + SystemProperties.getProperty(AAIProperties.AAI_KEYSTORE_FILENAME);
+			String keystore_password = SystemProperties.getProperty(AAIProperties.AAI_KEYSTORE_PASSWD_X);
+			String decrypted_keystore_password = Password.deobfuscate(keystore_password);
+			
+			SSLContextBuilder sslContextB = new SSLContextBuilder();
+			
+			KeyStore ks = KeyStore.getInstance("PKCS12");
+			FileInputStream fin = new FileInputStream(keystore_path);
+			char[] pwd = decrypted_keystore_password.toCharArray();
+			ks.load(fin, pwd);
+			
+			sslContextB.loadKeyMaterial(ks, pwd);
+			
+			KeyStore ts = KeyStore.getInstance("JKS");
+			FileInputStream fin1 = new FileInputStream(truststore_path);
+			char[] pwd1 = decrypted_truststore_password.toCharArray();
+			ts.load(fin1, pwd1);
+			
+			sslContextB.loadTrustMaterial(ts);
+			sslContextB.loadKeyMaterial(ks, pwd);
+			sslContextB.useTLS();
+			
+			SSLContext sslcontext = sslContextB.build();
+			
+			SSLConnectionSocketFactory sslFactory = new SSLConnectionSocketFactory(
+	                sslcontext,
+	                new String[] { "TLSv1.1", "TLSv1.2" },
+	                null,
+	            	SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER );
+		
+			httpclient = HttpClients.custom()
+	                .setSSLSocketFactory(sslFactory)
+	                .build();
+
+
+		} catch (Exception e) {
+			throw e;
+		}
+		return httpclient;
+	}
+
+
+	
+}  
diff --git a/vid-app-common/src/main/java/org/openecomp/aai/util/JettyObfuscationConversionCommandLineUtil.java b/vid-app-common/src/main/java/org/openecomp/aai/util/JettyObfuscationConversionCommandLineUtil.java
new file mode 100755
index 000000000..e4c4bcef1
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/aai/util/JettyObfuscationConversionCommandLineUtil.java
@@ -0,0 +1,78 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.aai.util;
+
+
+import org.apache.commons.cli.BasicParser;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.eclipse.jetty.util.security.Password;
+
+
+public class JettyObfuscationConversionCommandLineUtil {
+	/**
+	 * The main method.
+	 *
+	 * @param args the arguments
+	 */
+	public static void main(String[] args){
+		Options options = new Options();
+		options.addOption("e", true, "obfuscate the given string");
+		options.addOption("d", true, "deobfuscate the given string");
+		
+		CommandLineParser parser = new BasicParser();
+		
+		try {
+			CommandLine cmd = parser.parse(options, args);
+			String toProcess = null;
+			
+			if (cmd.hasOption("e")){
+				toProcess = cmd.getOptionValue("e");
+				String encoded = Password.obfuscate(toProcess);
+				System.out.println(encoded);
+			} else if (cmd.hasOption("d")) {
+				toProcess = cmd.getOptionValue("d");
+				String decoded_str = Password.deobfuscate(toProcess);
+				System.out.println(decoded_str);
+			} else {
+				usage();
+			}
+		} catch (ParseException e) {
+			System.out.println("failed to parse input");
+			System.out.println(e.toString());
+			usage();
+		} catch (Exception e) {
+			System.out.println("exception:" + e.toString());
+		}
+	}
+	
+	/**
+	 * Usage.
+	 */
+	private static void usage(){
+		System.out.println("usage:");;
+		System.out.println("-e [string] to obfuscate");
+		System.out.println("-d [string] to deobfuscate");
+		System.out.println("-h help");
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/AsdcCatalogException.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/AsdcCatalogException.java
new file mode 100755
index 000000000..aafb11cad
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/AsdcCatalogException.java
@@ -0,0 +1,58 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.asdc;
+
+/**
+ * The Class AsdcCatalogException.
+ */
+public class AsdcCatalogException extends Exception {
+	
+	/** The Constant serialVersionUID. */
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * Instantiates a new sdc catalog exception.
+	 *
+	 * @param msg the msg
+	 */
+	public AsdcCatalogException(String msg) {
+		super(msg);
+	}
+	
+	/**
+	 * Instantiates a new sdc catalog exception.
+	 *
+	 * @param cause the cause
+	 */
+	public AsdcCatalogException(Throwable cause) {
+		super(cause);
+	}
+	
+	/**
+	 * Instantiates a new sdc catalog exception.
+	 *
+	 * @param msg the msg
+	 * @param t the t
+	 */
+	public AsdcCatalogException(String msg, Throwable t) {
+		super(msg, t);
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/AsdcClient.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/AsdcClient.java
new file mode 100755
index 000000000..c4a8b1c0c
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/AsdcClient.java
@@ -0,0 +1,128 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.asdc;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+
+import org.openecomp.vid.asdc.beans.Artifact;
+import org.openecomp.vid.asdc.beans.Resource;
+import org.openecomp.vid.asdc.beans.Service;
+import org.openecomp.vid.asdc.beans.tosca.ToscaCsar;
+
+/**
+ * The Interface AsdcClient.
+ */
+public interface AsdcClient {
+	
+	/**
+	 * Gets the resource.
+	 *
+	 * @param uuid the uuid
+	 * @return the resource
+	 * @throws AsdcCatalogException the sdc catalog exception
+	 */
+	public Resource getResource(UUID uuid) throws AsdcCatalogException;
+	
+	/**
+	 * Gets the resources.
+	 *
+	 * @return the resources
+	 * @throws AsdcCatalogException the sdc catalog exception
+	 */
+	public Collection getResources() throws AsdcCatalogException;
+	
+	/**
+	 * Gets the resources.
+	 *
+	 * @param filter the filter
+	 * @return the resources
+	 * @throws AsdcCatalogException the sdc catalog exception
+	 */
+	public Collection getResources(Map filter) throws AsdcCatalogException;
+	
+	/**
+	 * Gets the resource artifact.
+	 *
+	 * @param resourceUuid the resource uuid
+	 * @param artifactUuid the artifact uuid
+	 * @return the resource artifact
+	 * @throws AsdcCatalogException the sdc catalog exception
+	 */
+	public Artifact getResourceArtifact(UUID resourceUuid, UUID artifactUuid) throws AsdcCatalogException;
+	
+	/**
+	 * Gets the resource tosca model.
+	 *
+	 * @param uuid the uuid
+	 * @return the resource tosca model
+	 * @throws AsdcCatalogException the sdc catalog exception
+	 */
+	public ToscaCsar getResourceToscaModel(UUID uuid) throws AsdcCatalogException;
+	
+	/**
+	 * Gets the service.
+	 *
+	 * @param uuid the uuid
+	 * @return the service
+	 * @throws AsdcCatalogException the sdc catalog exception
+	 */
+	public Service getService(UUID uuid) throws AsdcCatalogException;
+	
+	/**
+	 * Gets the services.
+	 *
+	 * @return the services
+	 * @throws AsdcCatalogException the sdc catalog exception
+	 */
+	public Collection getServices() throws AsdcCatalogException;
+	
+	/**
+	 * Gets the services.
+	 *
+	 * @param filter the filter
+	 * @return the services
+	 * @throws AsdcCatalogException the asdc catalog exception
+	 */
+	public Collection getServices(Map filter) throws AsdcCatalogException;
+	
+	/**
+	 * Gets the service artifact.
+	 *
+	 * @param serviceUuid the service uuid
+	 * @param artifactUuid the artifact uuid
+	 * @return the service artifact
+	 * @throws AsdcCatalogException the asdc catalog exception
+	 */
+	public Artifact getServiceArtifact(UUID serviceUuid, UUID artifactUuid) throws AsdcCatalogException;
+	
+	/**
+	 * Gets the service tosca model.
+	 *
+	 * @param uuid the uuid
+	 * @return the service tosca model
+	 * @throws AsdcCatalogException the asdc catalog exception
+	 */
+	public ToscaCsar getServiceToscaModel(UUID uuid) throws AsdcCatalogException;
+	
+	//TODO: Collect TOSCA information from CSAR
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/Artifact.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/Artifact.java
new file mode 100755
index 000000000..d24d1232a
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/Artifact.java
@@ -0,0 +1,314 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.asdc.beans;
+
+import java.util.UUID;
+
+/**
+ * The Class Artifact.
+ */
+public class Artifact {
+
+/*
+ * SDC has widened this to a String type for 1610.
+	public enum Type {
+		HEAT,
+		HEAT_ENV,
+		HEAT_VOL,
+		HEAT_NET,
+		HEAT_NESTED,
+		HEAT_ARTIFACT,
+		YANG_XML,
+		VNF_CATALOG,
+		VF_LICENSE,
+		VENDOR_LICENSE,
+		ASSET_INVENTORY_PROFILE,
+		ASSET_QUERY_SPEC,
+		APPC_CONFIG,
+		VF_MODULES_METADATA,
+		DCAE_TOSCA,
+		DCAE_JSON,
+		DCAE_EMF,
+		DCAE_DOC,
+		DCAE_BLUEPRINT,
+		DCAE_EVENT,
+		DCAE_INVENTORY_TOSCA,
+		DCAE_INVENTORY_JSON,
+		DCAE_INVENTORY_EMF,
+		DCAE_INVENTORY_DOC,
+		DCAE_INVENTORY_BLUEPRINT,
+		DCAE_INVENTORY_EVENT,
+		OTHER,
+		AAI_SERVICE_MODEL //HEY! READ ME! YES, YOU!  I AM A TEMPORARY FIX, PLEASE REMOVE ME BECAUSE I AM A FRAUD.  I DON'T BELONG HERE.
+						  //Warm Regards,
+						  //	*The* Artifact.Type.AAI_SERVICE_MODEL Constant
+	}
+	*/
+	
+	/** The artifact name. */
+	private String artifactName;
+	
+	/** The artifact label. */
+	private String artifactLabel;
+	
+	/** The artifact group type. */
+	private String artifactGroupType;
+	
+	/** The artifact type. */
+	private String artifactType;
+	
+	/** The artifact URL. */
+	private String artifactURL;
+	
+	/** The artifact description. */
+	private String artifactDescription;
+	
+	/** The artifact timeout. */
+	private int artifactTimeout;
+	
+	/** The artifact checksum. */
+	private String artifactChecksum;
+	
+	/** The artifact UUID. */
+	private String artifactUUID;
+	
+	/** The artifact version. */
+	private String artifactVersion;
+	
+	/** The generated from UUID. */
+	private String generatedFromUUID;
+	
+	/**
+	 * Gets the artifact name.
+	 *
+	 * @return the artifact name
+	 */
+	public String getArtifactName() {
+		return artifactName;
+	}
+	
+	/**
+	 * Gets the artifact type.
+	 *
+	 * @return the artifact type
+	 */
+	public String getArtifactType() {
+		return artifactType;
+	}
+	/**
+	 * Gets the artifact group type.
+	 *
+	 * @return the artifact group type
+	 */
+	public String getArtifactGroupType() {
+		return artifactGroupType;
+	}
+	
+	/**
+	 * Gets the artifact label.
+	 *
+	 * @return the artifact label
+	 */
+	public String getArtifactLabel() {
+		return artifactLabel;
+	}
+	/**
+	 * Gets the artifact URL.
+	 *
+	 * @return the artifact URL
+	 */
+	public String getArtifactURL() {
+		return artifactURL;
+	}
+	
+	/**
+	 * Gets the artifact description.
+	 *
+	 * @return the artifact description
+	 */
+	public String getArtifactDescription() {
+		return artifactDescription;
+	}
+	
+	/**
+	 * Gets the artifact timeout.
+	 *
+	 * @return the artifact timeout
+	 */
+	public int getArtifactTimeout() {
+		return artifactTimeout;
+	}
+	
+	/**
+	 * Gets the artifact checksum.
+	 *
+	 * @return the artifact checksum
+	 */
+	public String getArtifactChecksum() {
+		return artifactChecksum;
+	}
+	
+	/**
+	 * Gets the artifact UUID.
+	 *
+	 * @return the artifact UUID
+	 */
+	public String getArtifactUUID() {
+		return artifactUUID;
+	}
+	
+	/**
+	 * Gets the artifact version.
+	 *
+	 * @return the artifact version
+	 */
+	public String getArtifactVersion() {
+		return artifactVersion;
+	}
+	
+	/**
+	 * Gets the generated from UUID.
+	 *
+	 * @return the generated from UUID
+	 */
+	public String getGeneratedFromUUID() {
+		return generatedFromUUID;
+	}
+	
+	/**
+	 * Sets the artifact name.
+	 *
+	 * @param artifactName the new artifact name
+	 */
+	public void setArtifactName(String artifactName) {
+		this.artifactName = artifactName;
+	}
+	
+	/**
+	 * Sets the artifact type.
+	 *
+	 * @param artifactType the new artifact type
+	 */
+	public void setArtifactType(String artifactType) {
+		this.artifactType = artifactType;
+	}
+	/**
+	 * Sets the artifact group type.
+	 *
+	 * @param artifactGroupType the new artifact group type
+	 */
+	public void setArtifactGroupType(String artifactGroupType) {
+		this.artifactGroupType = artifactGroupType;
+	}
+	/**
+	 * Sets the artifact label.
+	 *
+	 * @param artifactGroupType the new artifact label
+	 */
+	public void setArtifactLabel(String artifactLabel) {
+		this.artifactLabel = artifactLabel;
+	}
+	/**
+	 * Sets the artifact URL.
+	 *
+	 * @param artifactURL the new artifact URL
+	 */
+	public void setArtifactURL(String artifactURL) {
+		this.artifactURL = artifactURL;
+	}
+	
+	/**
+	 * Sets the artifact description.
+	 *
+	 * @param artifactDescription the new artifact description
+	 */
+	public void setArtifactDescription(String artifactDescription) {
+		this.artifactDescription = artifactDescription;
+	}
+	
+	/**
+	 * Sets the artifact timeout.
+	 *
+	 * @param artifactTimeout the new artifact timeout
+	 */
+	public void setArtifactTimeout(int artifactTimeout) {
+		this.artifactTimeout = artifactTimeout;
+	}
+	
+	/**
+	 * Sets the artifact checksum.
+	 *
+	 * @param artifactChecksum the new artifact checksum
+	 */
+	public void setArtifactChecksum(String artifactChecksum) {
+		this.artifactChecksum = artifactChecksum;
+	}
+	
+	/**
+	 * Sets the artifact UUID.
+	 *
+	 * @param artifactUUID the new artifact UUID
+	 */
+	public void setArtifactUUID(String artifactUUID) {
+		this.artifactUUID = artifactUUID;
+	}
+	
+	/**
+	 * Sets the artifact version.
+	 *
+	 * @param artifactVersion the new artifact version
+	 */
+	public void setArtifactVersion(String artifactVersion) {
+		this.artifactVersion = artifactVersion;
+	}
+	
+	/**
+	 * Sets the generated from UUID.
+	 *
+	 * @param generatedFromUUID the new generated from UUID
+	 */
+	public void setGeneratedFromUUID(String generatedFromUUID) {
+		this.generatedFromUUID = generatedFromUUID;
+	}
+	
+	/* (non-Javadoc)
+	 * @see java.lang.Object#hashCode()
+	 */
+	@Override
+	public int hashCode() {
+		final UUID uuid = UUID.fromString(getArtifactUUID());
+		
+		return uuid.hashCode();
+	}
+	
+	/* (non-Javadoc)
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	@Override
+	public boolean equals(Object o) {
+		if (o == this) return true;
+		if (!(o instanceof Artifact)) return false;
+		
+		final Artifact artifact = (Artifact) o;
+		
+		return (artifact.getArtifactUUID().equals(getArtifactUUID()));
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/Resource.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/Resource.java
new file mode 100755
index 000000000..3911c699a
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/Resource.java
@@ -0,0 +1,429 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.asdc.beans;
+
+import java.util.Collection;
+import java.util.UUID;
+
+/**
+ * The Class Resource.
+ */
+public class Resource {
+
+	/**
+	 * The Enum Type.
+	 */
+	public enum Type { 
+		
+		/** The vf. */
+		VF, 
+		
+		/** The vfc. */
+		VFC, 
+		
+		/** The cp. */
+		CP, 
+		
+		/** The vl. */
+		VL,
+		
+		/** The vfcmt. */
+		VFCMT
+	}
+	
+	/**
+	 * The Enum LifecycleState.
+	 */
+	public enum LifecycleState {
+		
+		/** The not certified checkout. */
+		NOT_CERTIFIED_CHECKOUT,
+		
+		/** The not certified checkin. */
+		NOT_CERTIFIED_CHECKIN,
+		
+		/** The ready for certification. */
+		READY_FOR_CERTIFICATION,
+		
+		/** The certification in progress. */
+		CERTIFICATION_IN_PROGRESS,
+		
+		/** The certified. */
+		CERTIFIED
+	}
+	
+	/** The uuid. */
+	private String uuid;
+	
+	/** The invariant UUID. */
+	private String invariantUUID;
+	
+	/** The name. */
+	private String name;
+	
+	/** The description. */
+	private String description;
+	
+	/** The version. */
+	private String version;
+	
+	/** The tosca model URL. */
+	private String toscaModelURL;
+	
+	/** The category. */
+	private String category;
+	
+	/** The sub category. */
+	private String subCategory;
+	
+	/** The resource type. */
+	private Resource.Type resourceType;
+	
+	/** The lifecycle state. */
+	private Resource.LifecycleState lifecycleState;
+	
+	/** The last updater user ID. */
+	private String lastUpdaterUserId;
+	
+	/** The last updater full name. */
+	private String lastUpdaterFullName;
+	
+	/** The tosca model. */
+	private String toscaModel;
+	
+	/** The tosca resource name. */
+	private String toscaResourceName;
+	
+	/** The artifacts. */
+	private Collection artifacts;
+	
+	/** The resources. */
+	private Collection resources;
+	
+	/**
+	 * Gets the uuid.
+	 *
+	 * @return the uuid
+	 */
+	public String getUuid() {
+		return uuid;
+	}
+	
+	/**
+	 * Gets the invariant UUID.
+	 *
+	 * @return the invariant UUID
+	 */
+	public String getInvariantUUID() {
+		return invariantUUID;
+	}
+	
+	/**
+	 * Gets the name.
+	 *
+	 * @return the name
+	 */
+	public String getName() {
+		return name;
+	}
+	
+	/**
+	 * Gets the description.
+	 *
+	 * @return the description
+	 */
+	public String getDescription() {
+		return description;
+	}
+	
+	/**
+	 * Gets the version.
+	 *
+	 * @return the version
+	 */
+	public String getVersion() {
+		return version;
+	}
+	
+	/**
+	 * Gets the tosca model URL.
+	 *
+	 * @return the tosca model URL
+	 */
+	public String getToscaModelURL() {
+		return toscaModelURL;
+	}
+	
+	/**
+	 * Gets the category.
+	 *
+	 * @return the category
+	 */
+	public String getCategory() {
+		return category;
+	}
+	
+	/**
+	 * Gets the sub category.
+	 *
+	 * @return the sub category
+	 */
+	public String getSubCategory() {
+		return subCategory;
+	}
+	
+	/**
+	 * Gets the resource type.
+	 *
+	 * @return the resource type
+	 */
+	public Resource.Type getResourceType() {
+		return resourceType;
+	}
+	
+	/**
+	 * Gets the lifecycle state.
+	 *
+	 * @return the lifecycle state
+	 */
+	public Resource.LifecycleState getLifecycleState() {
+		return lifecycleState;
+	}
+	
+	/**
+	 * Gets the last updater user ID.
+	 *
+	 * @return the last updater user ID
+	 */
+	public String getLastUpdaterUserId() {
+		return lastUpdaterUserId;
+	}
+	
+	/**
+	 * Gets the last updater full name.
+	 *
+	 * @return the last updater full name
+	 */
+	public String getLastUpdaterFullName() {
+		return lastUpdaterFullName;
+	}
+	
+	/**
+	 * Gets the tosca model.
+	 *
+	 * @return the tosca model
+	 */
+	public String getToscaModel() {
+		return toscaModel;
+	}
+	
+	/**
+	 * Gets the tosca resource name.
+	 *
+	 * @return the tosca resource name
+	 */
+	public String getToscaResourceName() {
+		return toscaResourceName;
+	}
+	
+	/**
+	 * Gets the artifacts.
+	 *
+	 * @return the artifacts
+	 */
+	public Collection getArtifacts() {
+		return artifacts;
+	}
+	
+	/**
+	 * Gets the resources.
+	 *
+	 * @return the resources
+	 */
+	public Collection getResources() {
+		return resources;
+	}
+	
+	/**
+	 * Sets the uuid.
+	 *
+	 * @param uuid the new uuid
+	 */
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+	
+	/**
+	 * Sets the invariant UUID.
+	 *
+	 * @param invariantUUID the new invariant UUID
+	 */
+	public void setInvariantUUID(String invariantUUID) {
+		this.invariantUUID = invariantUUID;
+	}
+	
+	/**
+	 * Sets the name.
+	 *
+	 * @param name the new name
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+	/**
+	 * Sets the description.
+	 *
+	 * @param name the new description
+	 */
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	/**
+	 * Sets the version.
+	 *
+	 * @param version the new version
+	 */
+	public void setVersion(String version) {
+		this.version = version;
+	}
+	
+	/**
+	 * Sets the tosca model URL.
+	 *
+	 * @param toscaModelURL the new tosca model URL
+	 */
+	public void setToscaModelURL(String toscaModelURL) {
+		this.toscaModelURL = toscaModelURL;
+	}
+	
+	/**
+	 * Sets the category.
+	 *
+	 * @param category the new category
+	 */
+	public void setCategory(String category) {
+		this.category = category;
+	}
+	
+	/**
+	 * Sets the sub category.
+	 *
+	 * @param subCategory the new sub category
+	 */
+	public void setSubCategory(String subCategory) {
+		this.subCategory = subCategory;
+	}
+	
+	/**
+	 * Sets the resource type.
+	 *
+	 * @param resourceType the new resource type
+	 */
+	public void setResourceType(Resource.Type resourceType) {
+		this.resourceType = resourceType;
+	}
+	
+	/**
+	 * Sets the lifecycle state.
+	 *
+	 * @param lifecycleState the new lifecycle state
+	 */
+	public void setLifecycleState(Resource.LifecycleState lifecycleState) {
+		this.lifecycleState = lifecycleState;
+	}
+	
+	/**
+	 * Sets the last updater user ID.
+	 *
+	 * @param lastUpdaterUserId the new last updater user ID
+	 */
+	public void setLastUpdaterUserId(String lastUpdaterUserId) {
+		this.lastUpdaterUserId = lastUpdaterUserId;
+	}
+	
+	/**
+	 * Sets the last updater full name.
+	 *
+	 * @param lastUpdaterFullName the new last updater full name
+	 */
+	public void setLastUpdaterFullName(String lastUpdaterFullName) {
+		this.lastUpdaterFullName = lastUpdaterFullName;
+	}
+	
+	/**
+	 * Sets the tosca model.
+	 *
+	 * @param toscaModel the new tosca model
+	 */
+	public void setToscaModel(String toscaModel) {
+		this.toscaModel = toscaModel;
+	}
+	
+	/**
+	 * Sets the tosca resource name.
+	 *
+	 * @param toscaResourceName the new tosca resource name
+	 */
+	public void setToscaResourceName(String toscaResourceName) {
+		this.toscaResourceName = toscaResourceName;
+	}
+	
+	/**
+	 * Sets the artifacts.
+	 *
+	 * @param artifacts the new artifacts
+	 */
+	public void setArtifacts(Collection artifacts) {
+		this.artifacts = artifacts;
+	}
+	
+	/**
+	 * Sets the resources.
+	 *
+	 * @param resources the new resources
+	 */
+	public void setResources(Collection resources) {
+		this.resources = resources;
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.Object#hashCode()
+	 */
+	@Override
+	public int hashCode() {
+		final UUID uuid = UUID.fromString(getUuid());
+		
+		return uuid.hashCode();
+	}
+	
+	/* (non-Javadoc)
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	@Override
+	public boolean equals(Object o) {
+		if (o == this) return true;
+		if (!(o instanceof Resource)) return false;
+		
+		final Resource resource = (Resource) o;
+		
+		return (resource.getUuid().equals(getUuid()));
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/Service.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/Service.java
new file mode 100755
index 000000000..fa898e56a
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/Service.java
@@ -0,0 +1,351 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.asdc.beans;
+
+import java.util.Collection;
+import java.util.UUID;
+/**
+ * The Class Service.
+ */
+public class Service {
+
+	/**
+	 * The Enum DistributionStatus.
+	 */
+	public enum DistributionStatus { 
+		
+		/** The distribution not approved. */
+		DISTRIBUTION_NOT_APPROVED,
+		
+		/** The distribution approved. */
+		DISTRIBUTION_APPROVED,
+		
+		/** The distributed. */
+		DISTRIBUTED,
+		
+		/** The distribution rejected. */
+		DISTRIBUTION_REJECTED
+	}
+	
+	/**
+	 * The Enum LifecycleState.
+	 */
+	public enum LifecycleState {
+		
+		/** The not certified checkout. */
+		NOT_CERTIFIED_CHECKOUT,
+		
+		/** The not certified checkin. */
+		NOT_CERTIFIED_CHECKIN,
+		
+		/** The ready for certification. */
+		READY_FOR_CERTIFICATION,
+		
+		/** The certification in progress. */
+		CERTIFICATION_IN_PROGRESS,
+		
+		/** The certified. */
+		CERTIFIED
+	}
+	
+	/** The uuid. */
+	private String uuid;
+	
+	/** The invariant UUID. */
+	private String invariantUUID;
+	
+	/** The name. */
+	private String name;
+	
+	/** The version. */
+	private String version;
+	
+	/** The tosca model URL. */
+	private String toscaModelURL;
+	
+	/** The category. */
+	private String category;
+	
+	/** The lifecycle state. */
+	private Service.LifecycleState lifecycleState;
+	
+	/** The last updater user uid. */
+	private String lastUpdaterUserId;
+	
+	/** The last updater full name. */
+	private String lastUpdaterFullName;
+	
+	/** The distribution status. */
+	private Service.DistributionStatus distributionStatus;
+	
+	/** The artifacts. */
+	private Collection artifacts;
+	
+	/** The resources. */
+	private Collection resources;
+	
+	/**
+	 * Gets the uuid.
+	 *
+	 * @return the uuid
+	 */
+	public String getUuid() {
+		return uuid;
+	}
+	
+	/**
+	 * Gets the invariant UUID.
+	 *
+	 * @return the invariant UUID
+	 */
+	public String getInvariantUUID() {
+		return invariantUUID;
+	}
+	
+	/**
+	 * Gets the name.
+	 *
+	 * @return the name
+	 */
+	public String getName() {
+		return name;
+	}
+	
+	/**
+	 * Gets the version.
+	 *
+	 * @return the version
+	 */
+	public String getVersion() {
+		return version;
+	}
+	
+	/**
+	 * Gets the tosca model URL.
+	 *
+	 * @return the tosca model URL
+	 */
+	public String getToscaModelURL() {
+		return toscaModelURL;
+	}
+	
+	/**
+	 * Gets the category.
+	 *
+	 * @return the category
+	 */
+	public String getCategory() {
+		return category;
+	}
+	
+	/**
+	 * Gets the lifecycle state.
+	 *
+	 * @return the lifecycle state
+	 */
+	public Service.LifecycleState getLifecycleState() {
+		return lifecycleState;
+	}
+	
+	/**
+	 * Gets the last updater user uid.
+	 *
+	 * @return the last updater user uid
+	 */
+	public String getLastUpdaterUserId() {
+		return lastUpdaterUserId;
+	}
+	
+	/**
+	 * Gets the last updater full name.
+	 *
+	 * @return the last updater full name
+	 */
+	public String getLastUpdaterFullName() {
+		return lastUpdaterFullName;
+	}
+	
+	/**
+	 * Gets the distribution status.
+	 *
+	 * @return the distribution status
+	 */
+	public Service.DistributionStatus getDistributionStatus() {
+		return distributionStatus;
+	}
+	
+	/**
+	 * Gets the artifacts.
+	 *
+	 * @return the artifacts
+	 */
+	public Collection getArtifacts() {
+		return artifacts;
+	}
+	
+	/**
+	 * Gets the resources.
+	 *
+	 * @return the resources
+	 */
+	public Collection getResources() {
+		return resources;
+	}
+	
+	/**
+	 * Sets the uuid.
+	 *
+	 * @param uuid the new uuid
+	 */
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+	
+	/**
+	 * Sets the invariant UUID.
+	 *
+	 * @param invariantUUID the new invariant UUID
+	 */
+	public void setInvariantUUID(String invariantUUID) {
+		this.invariantUUID = invariantUUID;
+	}
+	
+	/**
+	 * Sets the name.
+	 *
+	 * @param name the new name
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	/**
+	 * Sets the version.
+	 *
+	 * @param version the new version
+	 */
+	public void setVersion(String version) {
+		this.version = version;
+	}
+	
+	/**
+	 * Sets the tosca model URL.
+	 *
+	 * @param toscaModelURL the new tosca model URL
+	 */
+	public void setToscaModelURL(String toscaModelURL) {
+		this.toscaModelURL = toscaModelURL;
+	}
+	
+	/**
+	 * Sets the category.
+	 *
+	 * @param category the new category
+	 */
+	public void setCategory(String category) {
+		this.category = category;
+	}
+	
+	/**
+	 * Sets the lifecycle state.
+	 *
+	 * @param lifecycleState the new lifecycle state
+	 */
+	public void setLifecycleState(Service.LifecycleState lifecycleState) {
+		this.lifecycleState = lifecycleState;
+	}
+	
+	/**
+	 * Sets the last updater user uid.
+	 *
+	 * @param lastUpdaterUserId the new last updater user uid
+	 */
+	public void set(String lastUpdaterUserId) {
+		this.lastUpdaterUserId = lastUpdaterUserId;
+	}
+	
+	/**
+	 * Sets the last updater full name.
+	 *
+	 * @param lastUpdaterFullName the new last updater full name
+	 */
+	public void setLastUpdaterFullName(String lastUpdaterFullName) {
+		this.lastUpdaterFullName = lastUpdaterFullName;
+	}
+	
+	/**
+	 * Sets the distribution status.
+	 *
+	 * @param distributionStatus the new distribution status
+	 */
+	public void setDistributionStatus(Service.DistributionStatus distributionStatus) {
+		this.distributionStatus = distributionStatus;
+	}
+	
+	/**
+	 * Sets the artifacts.
+	 *
+	 * @param artifacts the new artifacts
+	 */
+	public void setArtifacts(Collection artifacts) {
+		this.artifacts = artifacts;
+	}
+	
+	/**
+	 * Sets the resources.
+	 *
+	 * @param resources the new resources
+	 */
+	public void setResources(Collection resources) {
+		this.resources = resources;
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return uuid;
+	}
+	
+	/* (non-Javadoc)
+	 * @see java.lang.Object#hashCode()
+	 */
+	@Override
+	public int hashCode() {
+		final UUID uuid = UUID.fromString(getUuid());
+		
+		return uuid.hashCode();
+	}
+	
+	/* (non-Javadoc)
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	@Override
+	public boolean equals(Object o) {
+		if (o == this) return true;
+		if (!(o instanceof Service)) return false;
+		
+		final Service service = (Service) o;
+		
+		return (service.getUuid().equals(getUuid()));
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/SubResource.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/SubResource.java
new file mode 100755
index 000000000..6d7fb41b1
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/SubResource.java
@@ -0,0 +1,175 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.asdc.beans;
+
+import java.util.Collection;
+/**
+ * The Class SubResource.
+ */
+public class SubResource {
+
+	/** The resource instance name. */
+	private String resourceInstanceName;
+	
+	/** The resource name. */
+	private String resourceName;
+	
+	/** The resource invariant UUID. */
+	private String resourceInvariantUUID;
+	
+	/** The resource version. */
+	private String resourceVersion;
+	
+	/** The resource type. */
+	private String resourceType;
+	
+	/** The resource UUID. */
+	private String resourceUUID;
+	
+	/** The artifacts. */
+	private Collection artifacts;
+	
+	/**
+	 * Gets the resource instance name.
+	 *
+	 * @return the resource instance name
+	 */
+	public String getResourceInstanceName() {
+		return resourceInstanceName;
+	}
+	
+	/**
+	 * Gets the resource name.
+	 *
+	 * @return the resource name
+	 */
+	public String getResourceName() {
+		return resourceName;
+	}
+	
+	/**
+	 * Gets the resource invariant UUID.
+	 *
+	 * @return the resource invariant UUID
+	 */
+	public String getResourceInvariantUUID() {
+		return resourceInvariantUUID;
+	}
+	
+	/**
+	 * Gets the resource version.
+	 *
+	 * @return the resource version
+	 */
+	public String getResourceVersion() {
+		return resourceVersion;
+	}
+	
+	/**
+	 * Gets the resoucre type.
+	 *
+	 * @return the resoucre type
+	 */
+	public String getResoucreType() {
+		return resourceType;
+	}
+	
+	/**
+	 * Gets the resource UUID.
+	 *
+	 * @return the resource UUID
+	 */
+	public String getResourceUUID() {
+		return resourceUUID;
+	}
+	
+	/**
+	 * Gets the artifacts.
+	 *
+	 * @return the artifacts
+	 */
+	public Collection getArtifacts() {
+		return artifacts;
+	}
+	
+	/**
+	 * Sets the resource instance name.
+	 *
+	 * @param resourceInstanceName the new resource instance name
+	 */
+	public void setResourceInstanceName(String resourceInstanceName) {
+		this.resourceInstanceName = resourceInstanceName;
+	}
+	
+	/**
+	 * Sets the resource name.
+	 *
+	 * @param resourceName the new resource name
+	 */
+	public void setResourceName(String resourceName) {
+		this.resourceName = resourceName;
+	}
+	
+	/**
+	 * Sets the resource invariant UUID.
+	 *
+	 * @param resourceInvariantUUID the new resource invariant UUID
+	 */
+	public void setResourceInvariantUUID(String resourceInvariantUUID) {
+		this.resourceInvariantUUID = resourceInvariantUUID;
+	}
+	
+	/**
+	 * Sets the resource version.
+	 *
+	 * @param resourceVersion the new resource version
+	 */
+	public void setResourceVersion(String resourceVersion) {
+		this.resourceVersion = resourceVersion;
+	}
+	
+	/**
+	 * Sets the resoucre type.
+	 *
+	 * @param resourceType the new resoucre type
+	 */
+	public void setResoucreType(String resourceType) {
+		this.resourceType = resourceType;
+	}
+	
+	/**
+	 * Sets the resource UUID.
+	 *
+	 * @param resourceUUID the new resource UUID
+	 */
+	public void setResourceUUID(String resourceUUID) {
+		this.resourceUUID = resourceUUID;
+	}
+	
+	/**
+	 * Sets the artifacts.
+	 *
+	 * @param artifacts the new artifacts
+	 */
+	public void setArtifacts(Collection artifacts) {
+		this.artifacts = artifacts;
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Capability.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Capability.java
new file mode 100755
index 000000000..21a50d3bb
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Capability.java
@@ -0,0 +1,140 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.asdc.beans.tosca;
+
+import java.util.Collection;
+import java.util.Map;
+
+/**
+ * The Class Capability.
+ */
+public class Capability {
+
+	/** The type. */
+	private String type; //FIXME: Make an enumeration?
+	
+	/** The description. */
+	private String description;
+	
+	/** The occurrences. */
+	private Collection occurrences; //FIXME: Make an enumeration?
+	
+	/** The properties. */
+	private Map properties;
+	
+	/** The valid source types. */
+	private Collection valid_source_types; //FIXME: Make an enumeration?
+	
+	/**
+	 * Instantiates a new capability.
+	 */
+	public Capability() {}
+	
+	/**
+	 * Gets the type.
+	 *
+	 * @return the type
+	 */
+	public String getType() {
+		return type;
+	}
+	
+	/**
+	 * Gets the description.
+	 *
+	 * @return the description
+	 */
+	public String getDescription() {
+		return description;
+	}
+	
+	/**
+	 * Gets the occurrences.
+	 *
+	 * @return the occurrences
+	 */
+	public Collection getOccurrences() {
+		return occurrences;
+	}
+	
+	/**
+	 * Gets the properties.
+	 *
+	 * @return the properties
+	 */
+	public Map getProperties() {
+		return properties;
+	}
+	
+	/**
+	 * Gets the valid source types.
+	 *
+	 * @return the valid source types
+	 */
+	public Collection getValid_source_types() {
+		return valid_source_types;
+	}
+	
+	/**
+	 * Sets the type.
+	 *
+	 * @param type the new type
+	 */
+	public void setType(String type) {
+		this.type = type;
+	}
+	
+	/**
+	 * Sets the description.
+	 *
+	 * @param description the new description
+	 */
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	
+	/**
+	 * Sets the occurrences.
+	 *
+	 * @param occurrences the new occurrences
+	 */
+	public void setOccurrences(Collection occurrences) {
+		this.occurrences = occurrences;
+	}
+	
+	/**
+	 * Sets the properties.
+	 *
+	 * @param properties the properties
+	 */
+	public void setProperties(Map properties) {
+		this.properties = properties;
+	}
+	
+	/**
+	 * Sets the valid source types.
+	 *
+	 * @param valid_source_types the new valid source types
+	 */
+	public void setValid_source_types(Collection valid_source_types) {
+		this.valid_source_types = valid_source_types;
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Constraint.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Constraint.java
new file mode 100755
index 000000000..b68b51a09
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Constraint.java
@@ -0,0 +1,199 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.openecomp.vid.asdc.beans.tosca;
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * The Class Constraint.
+ */
+
+public class Constraint {
+	private  List valid_values;  
+	private Object equal;
+	private Object greater_than;
+	private Object greater_or_equal;
+	private Object less_than;
+	private Object less_or_equal;
+	private List in_range;
+	private Object length;
+	private Object min_length;
+	private Object max_length;
+	
+	/**
+	 * Instantiates a new Constraint.
+	 */
+	public Constraint() {
+		valid_values = new ArrayList();
+		in_range = new ArrayList();
+	}
+	
+	/**
+	 * Gets the valid_values.
+	 *
+	 * @return the valid_values
+	 */
+	public List getvalid_values() {
+		return valid_values;
+	}
+	/**
+	 * Gets equal.
+	 *
+	 * @return equal
+	 */
+	public Object getEqual() {
+		return equal;
+	}
+	/**
+	 * Gets greater_than.
+	 *
+	 * @return greater_than
+	 */
+	public Object getGreater_than() {
+		return greater_than;
+	}
+	/**
+	 * Gets greater_or_equal.
+	 *
+	 * @return greater_or_equal
+	 */
+	public Object getGreater_or_equal() {
+		return greater_or_equal;
+	}
+	/**
+	 * Gets less_than.
+	 *
+	 * @return less_than
+	 */
+	public Object getLess_than() {
+		return less_than;
+	}
+	/**
+	 * Gets less_or_equal.
+	 *
+	 * @return less_or_equal
+	 */
+	public Object getLess_or_equal() {
+		return less_or_equal;
+	}
+	/**
+	 * Gets in_range.
+	 *
+	 * @return in_range
+	 */
+	public List getIn_range() {
+		return in_range;
+	}
+	/**
+	 * Gets length.
+	 *
+	 * @return length
+	 */
+	public Object getLength() {
+		return length;
+	}
+	/**
+	 * Gets min_length.
+	 *
+	 * @return min_length
+	 */
+	public Object getMin_length() {
+		return min_length;
+	}
+	/**
+	 * Gets max_length.
+	 *
+	 * @return max_length
+	 */
+	public Object getMax_length() {
+		return max_length;
+	}
+	/**
+	 * Sets the valid_values.
+	 *
+	 * @param op the new valid_values
+	 */
+	public void setvalid_values(List vlist) {
+		this.valid_values = vlist;
+	}
+	/**
+	 * Sets equal.
+	 *
+	 * @param e the new equal
+	 */
+	public void setEqual(Object e) {
+		this.equal = e;
+	}
+	/**
+	 * Sets greater_than.
+	 *
+	 * @param e the new greater_than
+	 */
+	public void setGreater_than(Object e) {
+		this.greater_than = e;
+	}
+	/**
+	 * Sets less_than.
+	 *
+	 * @param e the new less_than
+	 */
+	public void setLess_than(Object e) {
+		this.less_than = e;
+	}
+	/**
+	 * Sets in_range.
+	 *
+	 * @param e the new in_range
+	 */
+	public void setIn_range(List e) {
+		this.in_range = e;
+	}
+	/**
+	 * Sets length.
+	 *
+	 * @param e the length
+	 */
+	public void setLength(Object e) {
+		this.length = e;
+	}
+	/**
+	 * Sets min_length.
+	 *
+	 * @param e the min_length
+	 */
+	public void setMin_length(Object e) {
+		this.min_length = e;
+	}
+	/**
+	 * Sets max_length.
+	 *
+	 * @param e the max_length
+	 */
+	public void setMax_length(Object e) {
+		this.max_length = e;
+	}
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return "valid_values=" + valid_values;
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Group.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Group.java
new file mode 100755
index 000000000..275db3c0d
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Group.java
@@ -0,0 +1,135 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.asdc.beans.tosca;
+
+import java.util.Collection;
+import java.util.Map;
+
+/**
+ * The Class Group.
+ */
+public class Group {
+
+	/** The type. */
+	private String type;
+	
+	/** The members. */
+	private Collection members;
+	
+	/** The metadata. */
+	private ToscaMetadata metadata;
+	
+	/** The vf module type. */
+	private String vf_module_type;
+	
+	/** The properties. */
+	private Map properties;
+	
+	/**
+	 * Gets the metadata.
+	 *
+	 * @return the metadata
+	 */
+	public ToscaMetadata getMetadata() {
+		return metadata;
+	}
+	
+	/**
+	 * Sets the metadata.
+	 *
+	 * @param metadata the new metadata
+	 */
+	public void setMetadata(ToscaMetadata metadata) {
+		this.metadata = metadata;
+	}
+	
+	/**
+	 * Gets the members.
+	 *
+	 * @return the members
+	 */
+	public Collection getMembers() {
+		return members;
+	}
+	
+	/**
+	 * Sets the members.
+	 *
+	 * @param members the new members
+	 */
+	public void setMembers(Collection members) {
+		this.members = members;
+	}
+	
+	/**
+	 * Gets the type.
+	 *
+	 * @return the type
+	 */
+	public String getType() {
+		return type;
+	}
+	
+	/**
+	 * Sets the type.
+	 *
+	 * @param type the new type
+	 */
+	public void setType(String type) {
+		this.type = type;
+	}
+	
+	/**
+	 * Gets the vf module type.
+	 *
+	 * @return the vf module type
+	 */
+	public String getvf_module_type() {
+		return vf_module_type;
+	}
+	
+	/**
+	 * Sets the vf module type.
+	 *
+	 * @param vf_module_type the new vf module type
+	 */
+	public void setvf_module_type(String vf_module_type) {
+		this.vf_module_type = vf_module_type;
+	}
+	
+	/**
+	 * Gets the properties.
+	 *
+	 * @return the properties
+	 */
+	public Map getProperties() {
+		return properties;
+	}
+	
+	/**
+	 * Sets the properties.
+	 *
+	 * @param properties the properties
+	 */
+	public void setProperties(Map properties) {
+		this.properties = properties;
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Import.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Import.java
new file mode 100755
index 000000000..33f317579
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Import.java
@@ -0,0 +1,48 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.asdc.beans.tosca;
+
+/**
+ * The Class Import.
+ */
+public class Import {
+
+	/** The file. */
+	private String file;
+
+	/**
+	 * Gets the file.
+	 *
+	 * @return the file
+	 */
+	public String getFile() {
+		return file;
+	}
+
+	/**
+	 * Sets the file.
+	 *
+	 * @param file the new file
+	 */
+	public void setFile(String file) {
+		this.file = file;
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Input.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Input.java
new file mode 100755
index 000000000..f98820716
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Input.java
@@ -0,0 +1,166 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.asdc.beans.tosca;
+
+import java.util.List;
+import java.util.ArrayList;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class Input.
+ */
+public class Input {
+
+	/** The type. */
+	private String type;
+	
+	/** The description. */
+	private String description;
+	
+	/** The default. */
+	private Object _default;
+	
+	/** The entry schema. */
+	private Input entry_schema;
+	
+	/** The constraints */
+	private List constraints;
+	
+	/** The required field. If not set, the default is true */
+	private boolean required = true;
+	
+	/**
+	 * Instantiates a new input.
+	 */
+	public Input() {
+		constraints = new ArrayList();
+	}
+	
+	/**
+	 * Gets the type.
+	 *
+	 * @return the type
+	 */
+	public String getType() {
+		return type;
+	}
+	
+	/**
+	 * Sets the type.
+	 *
+	 * @param type the new type
+	 */
+	public void setType(String type) {
+		this.type = type;
+	}
+	/**
+	 * Gets the required field.
+	 *
+	 * @return the required field
+	 */
+	public boolean getRequired() {
+		return required;
+	}
+	/**
+	 * Sets the required value.
+	 *
+	 * @param required the new required value
+	 */
+	public void setRequired(boolean required) {
+		this.required = required;
+	}
+	/**
+	 * Gets the description.
+	 *
+	 * @return the description
+	 */
+	public String getDescription() {
+		return description;
+	}
+	
+	/**
+	 * Sets the description.
+	 *
+	 * @param description the new description
+	 */
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	
+	/**
+	 * Gets the default.
+	 *
+	 * @return the default
+	 */
+	public Object getDefault() {
+		return _default;
+	}
+	
+	/**
+	 * Sets the default.
+	 *
+	 * @param _default the new default
+	 */
+	public void setDefault(Object _default) {
+		this._default = _default;
+	}
+	
+	/**
+	 * Gets the entry schema.
+	 *
+	 * @return the entry schema
+	 */
+	public Input getentry_schema() {
+		return entry_schema;
+	}
+	/**
+	 * Sets the entry schema.
+	 *
+	 * @param the entry schema
+	 */
+	public void setentry_schema(Input s) {
+		this.entry_schema = s;
+	}
+	/**
+	 * Sets the constraints.
+	 *
+	 * @param c the new constraints
+	 */
+	public void setConstraints(List c) {
+		this.constraints = c;
+	}
+	/**
+	 * Gets the constraints
+	 *
+	 * @return the constraints
+	 */
+	public List getConstraints() {
+		return constraints;
+	}
+	
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return "type=" + type + ",description=" + description + ",default=" + _default;
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/NodeTemplate.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/NodeTemplate.java
new file mode 100755
index 000000000..73eead93f
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/NodeTemplate.java
@@ -0,0 +1,117 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.asdc.beans.tosca;
+
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * The Class NodeTemplate.
+ */
+public class NodeTemplate {
+
+	/** The type. */
+	private String type;
+	
+	/** The metadata. */
+	private ToscaMetadata metadata;
+	
+	/** The properties. */
+	private Map properties; //HEAT?
+	
+	/** The requirements. */
+	private Object requirements;
+	
+	public NodeTemplate () {
+		properties = new HashMap();
+	}
+	/**
+	 * Gets the type.
+	 *
+	 * @return the type
+	 */
+	public String getType() {
+		return type;
+	}
+	
+	/**
+	 * Sets the type.
+	 *
+	 * @param type the new type
+	 */
+	public void setType(String type) {
+		this.type = type;
+	}
+	
+	/**
+	 * Gets the metadata.
+	 *
+	 * @return the metadata
+	 */
+	public ToscaMetadata getMetadata() {
+		return metadata;
+	}
+	
+	/**
+	 * Sets the metadata.
+	 *
+	 * @param metadata the new metadata
+	 */
+	public void setMetadata(ToscaMetadata metadata) {
+		this.metadata = metadata;
+	}
+	
+	/**
+	 * Gets the properties.
+	 *
+	 * @return the properties
+	 */
+	public Map getProperties() {
+		return properties;
+	}
+	
+	/**
+	 * Sets the properties.
+	 *
+	 * @param properties the properties
+	 */
+	public void setProperties(Map properties) {
+		this.properties = properties;
+	}
+	
+	/**
+	 * Gets the requirements.
+	 *
+	 * @return the requirements
+	 */
+	public Object getRequirements() {
+		return requirements;
+	}
+	
+	/**
+	 * Sets the requirements.
+	 *
+	 * @param requirements the new requirements
+	 */
+	public void setRequirements(Object requirements) {
+		this.requirements = requirements;
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Property.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Property.java
new file mode 100755
index 000000000..c8f048ced
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Property.java
@@ -0,0 +1,157 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.asdc.beans.tosca;
+
+/**
+ * The Class Property.
+ */
+public class Property {
+
+	/** The type. */
+	private String type;
+	
+	/** The description. */
+	private String description;
+	
+	/** The entry schema. */
+	private Schema entry_schema;
+	
+	/** The default. */
+	private String _default;
+	
+	/** The required. */
+	private boolean required;
+	
+	/**
+	 * Instantiates a new property.
+	 */
+	private Property() {}
+	
+	/**
+	 * Gets the type.
+	 *
+	 * @return the type
+	 */
+	public String getType() {
+		return type;
+	}
+
+	/**
+	 * Gets the description.
+	 *
+	 * @return the description
+	 */
+	public String getDescription() {
+		return description;
+	}
+
+	/**
+	 * Gets the entry schema.
+	 *
+	 * @return the entry schema
+	 */
+	public Schema getEntry_schema() {
+		return entry_schema;
+	}
+
+	/**
+	 * Gets the default.
+	 *
+	 * @return the default
+	 */
+	public String get_default() {
+		return _default;
+	}
+
+	/**
+	 * Sets the type.
+	 *
+	 * @param type the new type
+	 */
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	/**
+	 * Sets the description.
+	 *
+	 * @param description the new description
+	 */
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	/**
+	 * Sets the entry schema.
+	 *
+	 * @param entry_schema the new entry schema
+	 */
+	public void setEntry_schema(Schema entry_schema) {
+		this.entry_schema = entry_schema;
+	}
+
+	/**
+	 * Sets the default.
+	 *
+	 * @param _default the new default
+	 */
+	public void set_default(String _default) {
+		this._default = _default;
+	}
+
+	/**
+	 * Gets the default.
+	 *
+	 * @return the default
+	 */
+	public String getDefault() {
+		return _default;
+	}
+	
+	/**
+	 * Checks if is required.
+	 *
+	 * @return true, if is required
+	 */
+	public boolean isRequired() {
+		return required;
+	}
+	
+	/**
+	 * Sets the default.
+	 *
+	 * @param _default the new default
+	 */
+	public void setDefault(String _default) {
+		this._default = _default;
+	}
+	
+	/**
+	 * Sets the required.
+	 *
+	 * @param required the new required
+	 */
+	public void setRequired(boolean required) {
+		this.required = required;
+	}
+	
+	
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Requirement.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Requirement.java
new file mode 100755
index 000000000..fce41ec6e
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Requirement.java
@@ -0,0 +1,120 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.asdc.beans.tosca;
+
+import java.util.Collection;
+
+/**
+ * The Class Requirement.
+ */
+public class Requirement {
+
+	/** The occurrences. */
+	private Collection occurrences;
+	
+	/** The capability. */
+	private String capability;
+	
+	/** The node. */
+	private String node;
+	
+	/** The relationship. */
+	private String relationship;
+	
+	/**
+	 * Instantiates a new requirement.
+	 */
+	private Requirement() {}
+	
+	/**
+	 * Gets the occurrences.
+	 *
+	 * @return the occurrences
+	 */
+	public Collection getOccurrences() {
+		return occurrences;
+	}
+	
+	/**
+	 * Gets the capability.
+	 *
+	 * @return the capability
+	 */
+	public String getCapability() {
+		return capability;
+	}
+	
+	/**
+	 * Gets the node.
+	 *
+	 * @return the node
+	 */
+	public String getNode() {
+		return node;
+	}
+	
+	/**
+	 * Gets the relationship.
+	 *
+	 * @return the relationship
+	 */
+	public String getRelationship() {
+		return relationship;
+	}
+	
+	/**
+	 * Sets the occurrences.
+	 *
+	 * @param occurrences the new occurrences
+	 */
+	public void setOccurrences(Collection occurrences) {
+		this.occurrences = occurrences;
+	}
+	
+	/**
+	 * Sets the capability.
+	 *
+	 * @param capability the new capability
+	 */
+	public void setCapability(String capability) {
+		this.capability = capability;
+	}
+	
+	/**
+	 * Sets the node.
+	 *
+	 * @param node the new node
+	 */
+	public void setNode(String node) {
+		this.node = node;
+	}
+	
+	/**
+	 * Sets the relationship.
+	 *
+	 * @param relationship the new relationship
+	 */
+	public void setRelationship(String relationship) {
+		this.relationship = relationship;
+	}
+	
+	
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Schema.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Schema.java
new file mode 100755
index 000000000..bd3a2f0a5
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/Schema.java
@@ -0,0 +1,53 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.asdc.beans.tosca;
+
+/**
+ * The Class Schema.
+ */
+public class Schema {
+
+	/** The type. */
+	public String type;
+
+	/**
+	 * Instantiates a new schema.
+	 */
+	public Schema() {}
+	
+	/**
+	 * Gets the type.
+	 *
+	 * @return the type
+	 */
+	public String getType() {
+		return type;
+	}
+
+	/**
+	 * Sets the type.
+	 *
+	 * @param type the new type
+	 */
+	public void setType(String type) {
+		this.type = type;
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/SubstitutionMappings.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/SubstitutionMappings.java
new file mode 100755
index 000000000..026f29bbe
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/SubstitutionMappings.java
@@ -0,0 +1,101 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.asdc.beans.tosca;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * The Class SubstitutionMappings.
+ */
+public class SubstitutionMappings {
+
+	/** The node type. */
+	private String node_type;
+	
+	/** The capabilities. */
+	private Map capabilities;
+	
+	/** The requirements. */
+	private Map requirements;
+	
+	/**
+	 * Instantiates a new substitution mappings.
+	 */
+	public SubstitutionMappings() {
+		capabilities = new HashMap ();
+		requirements = new HashMap ();
+	}
+	
+	/**
+	 * Gets the node type.
+	 *
+	 * @return the node type
+	 */
+	public String getnode_type() {
+		return node_type;
+	}
+	
+	/**
+	 * Sets the node type.
+	 *
+	 * @param node_type the new node type
+	 */
+	public void setnode_type(String node_type) {
+		this.node_type = node_type;
+	}
+
+	/**
+	 * Gets the capabilities.
+	 *
+	 * @return the capabilities
+	 */
+	public Map getCapabilities() {
+		return capabilities;
+	}
+
+	/**
+	 * Sets the capabilities.
+	 *
+	 * @param capabilities the capabilities
+	 */
+	public void setCapabilities(Map capabilities) {
+		this.capabilities = capabilities;
+	}
+
+	/**
+	 * Gets the requirements.
+	 *
+	 * @return the requirements
+	 */
+	public Map getRequirements() {
+		return requirements;
+	}
+
+	/**
+	 * Sets the requirements.
+	 *
+	 * @param requirements the requirements
+	 */
+	public void setRequirements(Map requirements) {
+		this.requirements = requirements;
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/TopologyTemplate.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/TopologyTemplate.java
new file mode 100755
index 000000000..ce7ce5755
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/TopologyTemplate.java
@@ -0,0 +1,124 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.asdc.beans.tosca;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * The Class TopologyTemplate.
+ */
+public class TopologyTemplate {
+	
+	/** The substitution mappings. */
+	private SubstitutionMappings substitution_mappings;
+	
+	/** The inputs. */
+	private Map inputs;
+	
+	/** The node templates. */
+	private Map node_templates;
+	
+	/** The groups. */
+	private Map groups;
+	
+	/**
+	 * Instantiates a new topology template.
+	 */
+	public TopologyTemplate() {
+		substitution_mappings = new SubstitutionMappings();
+		inputs = new HashMap ();
+		node_templates = new HashMap ();
+		groups = new HashMap ();
+	}
+	
+	/**
+	 * Gets the substitution mappings.
+	 *
+	 * @return the substitution mappings
+	 */
+	public SubstitutionMappings getsubstitution_mappings() {
+		return this.substitution_mappings;
+	}
+	
+	/**
+	 * Sets the substitution mappings.
+	 *
+	 * @param substitution_mappings the new substitution mappings
+	 */
+	public void setsubstitution_mappings(SubstitutionMappings substitution_mappings) {
+		this.substitution_mappings = substitution_mappings;
+	}
+	
+	/**
+	 * Gets the inputs.
+	 *
+	 * @return the inputs
+	 */
+	public Map getInputs() {
+		return inputs;
+	}
+	
+	/**
+	 * Sets the inputs.
+	 *
+	 * @param inputs the inputs
+	 */
+	public void setInputs(Map inputs) {
+		this.inputs = inputs;
+	}
+	
+	/**
+	 * Gets the node templates.
+	 *
+	 * @return the node templates
+	 */
+	public Map getnode_templates() {
+		return node_templates;
+	}
+	
+	/**
+	 * Setnode templates.
+	 *
+	 * @param node_templates the node templates
+	 */
+	public void setnode_templates(Map node_templates) {
+		this.node_templates = node_templates;
+	}
+
+	/**
+	 * Gets the groups.
+	 *
+	 * @return the groups
+	 */
+	public Map getGroups() {
+		return groups;
+	}
+
+	/**
+	 * Sets the groups.
+	 *
+	 * @param groups the groups
+	 */
+	public void setGroups(Map groups) {
+		this.groups = groups;
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaCsar.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaCsar.java
new file mode 100755
index 000000000..cca4ae7c2
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaCsar.java
@@ -0,0 +1,101 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.asdc.beans.tosca;
+
+import java.util.Collection;
+import java.util.LinkedList;
+
+/**
+ * The Class ToscaCsar.
+ */
+public class ToscaCsar {
+
+	/** The parent. */
+	private final ToscaModel parent;
+	
+	/** The children. */
+	private final Collection children;
+	
+	/**
+	 * The Class Builder.
+	 */
+	public static class Builder {
+		
+		/** The parent. */
+		private final ToscaModel parent;
+		
+		/** The children. */
+		private Collection children = new LinkedList ();
+		
+		/**
+		 * Instantiates a new builder.
+		 *
+		 * @param parent the parent
+		 */
+		public Builder(ToscaModel parent) {
+			this.parent = parent;
+		}
+		
+		/**
+		 * Adds the vnf.
+		 *
+		 * @param child the child
+		 * @return the builder
+		 */
+		public Builder addVnf(ToscaModel child) {
+			children.add(child);
+			return this;
+		}
+		
+		/**
+		 * Builds the.
+		 *
+		 * @return the tosca csar
+		 */
+		public ToscaCsar build() {
+			return new ToscaCsar(this);
+		}
+	}
+	
+	/**
+	 * Instantiates a new tosca csar.
+	 *
+	 * @param builder the builder
+	 */
+	public ToscaCsar(Builder builder) {
+		this.parent = builder.parent;
+		this.children = builder.children;
+	}
+	
+	/**
+	 * Gets the parent.
+	 *
+	 * @return the parent
+	 */
+	public ToscaModel getParent() { return parent; }
+	
+	/**
+	 * Gets the children.
+	 *
+	 * @return the children
+	 */
+	public Collection getChildren() { return children; }
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaMeta.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaMeta.java
new file mode 100755
index 000000000..66938372e
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaMeta.java
@@ -0,0 +1,122 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.asdc.beans.tosca;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.openecomp.vid.asdc.AsdcCatalogException;
+
+/**
+ * The Class ToscaMeta.
+ */
+public class ToscaMeta {
+
+	/** The metadata. */
+	private final Map metadata;
+	
+	/**
+	 * Instantiates a new tosca meta.
+	 *
+	 * @param builder the builder
+	 * @throws IOException Signals that an I/O exception has occurred.
+	 * @throws AsdcCatalogException the asdc catalog exception
+	 */
+	private ToscaMeta(Builder builder) throws IOException, AsdcCatalogException {
+		metadata = new HashMap ();
+		
+		read(builder.inputStream);
+	}
+	
+	/**
+	 * The Class Builder.
+	 */
+	public static class Builder {
+		
+		/** The input stream. */
+		private final InputStream inputStream;
+		
+		/**
+		 * Instantiates a new builder.
+		 *
+		 * @param inputStream the input stream
+		 */
+		public Builder(InputStream inputStream) {
+			this.inputStream = inputStream;
+		}
+		
+		/**
+		 * Builds the.
+		 *
+		 * @return the tosca meta
+		 * @throws IOException Signals that an I/O exception has occurred.
+		 * @throws AsdcCatalogException the asdc catalog exception
+		 */
+		public ToscaMeta build() throws IOException, AsdcCatalogException {
+			return new ToscaMeta(this);
+		}
+	}
+	
+	/**
+	 * Gets the.
+	 *
+	 * @param property the property
+	 * @return the string
+	 */
+	public String get(String property) {
+		return metadata.get(property);
+	}
+	
+	/**
+	 * Read.
+	 *
+	 * @param inputStream the input stream
+	 * @throws IOException Signals that an I/O exception has occurred.
+	 * @throws AsdcCatalogException the asdc catalog exception
+	 */
+	private void read(InputStream inputStream) throws IOException, AsdcCatalogException {
+		
+		final BufferedReader br = new BufferedReader(new InputStreamReader(inputStream));
+		
+		String line;
+		
+		try {
+			while ((line = br.readLine()) != null) {
+				final String[] entry = line.split(":");
+				
+				if (entry.length != 2) throw new AsdcCatalogException("TOSCA.meta file cannot be parsed (more than 1 colon found on a single line");
+				if (!entry[1].startsWith(" ")) throw new AsdcCatalogException("TOSCA.meta file cannot be parsed (: not immediately followed by ' ')");
+				
+				metadata.put(entry[0], entry[1].substring(1));
+			}
+		} catch (IOException e) {
+			metadata.clear();
+			throw e;
+		} catch (AsdcCatalogException e) {
+			metadata.clear();
+			throw e;
+		}
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaMetadata.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaMetadata.java
new file mode 100755
index 000000000..d42c1f150
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaMetadata.java
@@ -0,0 +1,461 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.asdc.beans.tosca;
+
+/**
+ * The Class ToscaMetadata.
+ */
+public class ToscaMetadata {
+
+	/** The template name. */
+	private String template_name;
+	
+	/** The invariant UUID. */
+	private String invariantUUID;
+	
+	/** The customization UUID. */
+	private String customizationUUID;
+	
+	/** The uuid. */
+	private String uuid;
+	
+	/** The version. */
+	private String version;
+	
+	/** The name. */
+	private String name;
+	
+	/** The description. */
+	private String description;
+	
+	/** The category. */
+	private String category;
+	
+	/** The subcategory. */
+	private String subcategory;
+	
+	/** The type. */
+	private String type;
+	
+	/** The resource vendor. */
+	private String resourceVendor;
+	
+	/** The resource vendor release. */
+	private String resourceVendorRelease;
+	
+	/** The service ecomp naming. */
+	private String serviceEcompNaming;
+	
+	/** The ecomp generated naming - duplicate for serviceEcompNaming */
+	private boolean ecompGeneratedNaming;
+	
+	/** The naming policy */
+	private String namingPolicy;
+	
+	/** The service homing. */
+	private boolean serviceHoming;
+	
+	/** The vf module model name. */
+	//ToscaMetadata for VF Modules
+	private String vfModuleModelName;
+	
+	/** The vf module model invariant UUID. */
+	private String vfModuleModelInvariantUUID;
+	
+	/** The vf module model customization UUID. */
+	private String vfModuleModelCustomizationUUID;
+	
+	/** The vf module model UUID. */
+	private String vfModuleModelUUID;
+	
+	/** The vf module model version. */
+	private String vfModuleModelVersion;
+	
+	/**
+	 * Instantiates a new tosca metadata.
+	 */
+	public ToscaMetadata() {}
+	
+	/**
+	 * Gets the type.
+	 *
+	 * @return the type
+	 */
+	public String getType() {
+		return type;
+	}
+	
+	/**
+	 * Gets the invariant UUID.
+	 *
+	 * @return the invariant UUID
+	 */
+	public String getInvariantUUID() {
+		  return invariantUUID;
+	}
+	/**
+	 * Gets the customization UUID.
+	 *
+	 * @return the customization UUID
+	 */
+	public String getCustomizationUUID() {
+		  return customizationUUID;
+	}
+	/**
+	 * Gets the uuid.
+	 *
+	 * @return the uuid
+	 */
+	public String getUUID() {
+		return uuid;
+	}
+
+	/**
+	 * Gets the version.
+	 *
+	 * @return the version
+	 */
+	public String getVersion() {
+		return version;
+	}
+
+	/**
+	 * Gets the name.
+	 *
+	 * @return the name
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * Gets the description.
+	 *
+	 * @return the description
+	 */
+	public String getDescription() {
+		return description;
+	}
+
+	/**
+	 * Gets the category.
+	 *
+	 * @return the category
+	 */
+	public String getCategory() {
+		return category;
+	}
+
+	/**
+	 * Gets the subcategory.
+	 *
+	 * @return the subcategory
+	 */
+	public String getSubcategory() {
+		return subcategory;
+	}
+
+	/**
+	 * Gets the resource vendor.
+	 *
+	 * @return the resource vendor
+	 */
+	public String getResourceVendor() {
+		return resourceVendor;
+	}
+
+	/**
+	 * Gets the resource vendor release.
+	 *
+	 * @return the resource vendor release
+	 */
+	public String getResourceVendorRelease() {
+		return resourceVendorRelease;
+	}
+
+	/**
+	 * Returns the value of service ecomp naming.
+	 *
+	 * @return serviceEcompNaming
+	 */
+	public String getServiceEcompNaming() {
+		return serviceEcompNaming;
+	}
+	/**
+	 * Returns the value of the naming policy.
+	 *
+	 * @return namingPolicy
+	 */
+	public String getNamingPolicy() {
+		return namingPolicy;
+	}
+	/**
+	 * Checks if is service homing.
+	 *
+	 * @return true, if is service homing
+	 */
+	public boolean isServiceHoming() {
+		return serviceHoming;
+	}
+	/**
+	 * Checks if is ecomp generated naming.
+	 *
+	 * @return true, if ecomp generated naming is true
+	 */
+	public boolean isEcompGeneratedNaming() {
+		return ecompGeneratedNaming;
+	}
+	/**
+	 * Sets the type.
+	 *
+	 * @param type the new type
+	 */
+	public void setType(String type) {
+		this.type = type;
+	}
+	
+	/**
+	 * Sets the invariant UUID.
+	 *
+	 * @param invariantUUID the new invariant UUID
+	 */
+	public void setInvariantUUID(String invariantUUID) {
+		this.invariantUUID = invariantUUID;
+	}
+	/**
+	 * Sets the naming policy.
+	 *
+	 * @param namingPolicy the new naming policy
+	 */
+	public void setNamingPolicy(String namingPolicy) {
+		this.namingPolicy = namingPolicy;
+	}
+	/**
+	 * Sets the uuid.
+	 *
+	 * @param uuid the new uuid
+	 */
+	public void setUUID(String uuid) {
+		this.uuid = uuid;
+	}
+	/**
+	 * Sets the customization uuid.
+	 *
+	 * @param u the new customization uuid
+	 */
+	public void setCustomizationUUID(String u) {
+		this.customizationUUID = u;
+	}
+	/**
+	 * Sets the version.
+	 *
+	 * @param version the new version
+	 */
+	public void setVersion(String version) {
+		this.version = version;
+	}
+
+	/**
+	 * Sets the name.
+	 *
+	 * @param name the new name
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	/**
+	 * Sets the description.
+	 *
+	 * @param description the new description
+	 */
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	/**
+	 * Sets the category.
+	 *
+	 * @param category the new category
+	 */
+	public void setCategory(String category) {
+		this.category = category;
+	}
+
+	/**
+	 * Sets the service ecomp naming.
+	 *
+	 * @param serviceEcompNaming the new service ecomp naming
+	 */
+	public void setServiceEcompNaming(String serviceEcompNaming) {
+		this.serviceEcompNaming = serviceEcompNaming;
+	}
+
+	/**
+	 * Sets the service homing.
+	 *
+	 * @param serviceHoming the new service homing
+	 */
+	public void setServiceHoming(boolean serviceHoming) {
+		this.serviceHoming = serviceHoming;
+	}
+	/**
+	 * Sets the ecomp generated naming.
+	 *
+	 * @param ecompGeneratedNaming the new ecomp generated naming
+	 */
+	public void setEcompGeneratedNaming(boolean ecompGeneratedNaming) {
+		this.ecompGeneratedNaming = ecompGeneratedNaming;
+	}
+	/**
+	 * Gets the template name.
+	 *
+	 * @return the template name
+	 */
+	public String gettemplate_name() {
+		return template_name;
+	}
+	
+	/**
+	 * Sets the template name.
+	 *
+	 * @param template_name the new template name
+	 */
+	public void settemplate_name(String template_name) {
+		this.template_name = template_name;
+	}
+	
+	/**
+	 * Sets the subcategory.
+	 *
+	 * @param subcategory the new subcategory
+	 */
+	public void setSubcategory(String subcategory) {
+		this.subcategory = subcategory;
+	}
+	
+	/**
+	 * Sets the resource vendor.
+	 *
+	 * @param resourceVendor the new resource vendor
+	 */
+	public void setResourceVendor(String resourceVendor) {
+		this.resourceVendor = resourceVendor;
+	}
+
+	/**
+	 * Sets the resource vendor release.
+	 *
+	 * @param resourceVendorRelease the new resource vendor release
+	 */
+	public void setResourceVendorRelease(String resourceVendorRelease) {
+		this.resourceVendorRelease = resourceVendorRelease;
+	}
+
+	/**
+	 * Gets the vf module model name.
+	 *
+	 * @return the vf module model name
+	 */
+	public String getVfModuleModelName() {
+		return vfModuleModelName;
+	}
+
+	/**
+	 * Sets the vf module model name.
+	 *
+	 * @param vfModuleModelName the new vf module model name
+	 */
+	public void setVfModuleModelName(String vfModuleModelName) {
+		this.vfModuleModelName = vfModuleModelName;
+	}
+
+	/**
+	 * Gets the vf module model invariant UUID.
+	 *
+	 * @return the vf module model invariant UUID
+	 */
+	public String getVfModuleModelInvariantUUID() {
+		return vfModuleModelInvariantUUID;
+	}
+
+	/**
+	 * Sets the vf module model invariant UUID.
+	 *
+	 * @param vfModuleModelInvariantUUID the new vf module model invariant UUID
+	 */
+	public void setVfModuleModelInvariantUUID(String vfModuleModelInvariantUUID) {
+		this.vfModuleModelInvariantUUID = vfModuleModelInvariantUUID;
+	}
+
+	/**
+	 * Gets the vf module model UUID.
+	 *
+	 * @return the vf module model UUID
+	 */
+	public String getVfModuleModelUUID() {
+		return vfModuleModelUUID;
+	}
+
+	/**
+	 * Sets the vf module model UUID.
+	 *
+	 * @param vfModuleModelUUID the new vf module model UUID
+	 */
+	public void setVfModuleModelUUID(String vfModuleModelUUID) {
+		this.vfModuleModelUUID = vfModuleModelUUID;
+	}
+
+	/**
+	 * Gets the vf module model version.
+	 *
+	 * @return the vf module model version
+	 */
+	public String getVfModuleModelVersion() {
+		return vfModuleModelVersion;
+	}
+
+	/**
+	 * Sets the vf module model version.
+	 *
+	 * @param vfModuleModelVersion the new vf module model version
+	 */
+	public void setVfModuleModelVersion(String vfModuleModelVersion) {
+		this.vfModuleModelVersion = vfModuleModelVersion;
+	}
+	/**
+	 * Sets the vf module customization uuid.
+	 *
+	 * @param u the new vf module model customization uuid
+	 */
+	public void setVfModuleModelCustomizationUUID(String u) {
+		this.vfModuleModelCustomizationUUID = u;
+	}
+	/**
+	 * Gets the vf module model customization uuid.
+	 *
+	 * @return the vf module model customization uuid
+	 */
+	public String getVfModuleModelCustomizationUUID() {
+		
+		return vfModuleModelCustomizationUUID;
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaModel.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaModel.java
new file mode 100755
index 000000000..c9e42f291
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaModel.java
@@ -0,0 +1,166 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.asdc.beans.tosca;
+
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.Map;
+
+/**
+ * The Class ToscaModel.
+ */
+public class ToscaModel {
+
+	/** The tosca definitions version. */
+	private String tosca_definitions_version;
+	
+	/** The description. */
+	private String description;
+	
+	/** The metadata. */
+	private ToscaMetadata metadata;
+	
+	/** The topology template. */
+	private TopologyTemplate topology_template;
+	
+	/** The imports. */
+	private Collection>> imports;
+	
+	/** The node types. */
+	private Map node_types;
+	
+	/**
+	 * Instantiates a new tosca model.
+	 */
+	public ToscaModel() {
+		metadata = new ToscaMetadata();
+		topology_template = new TopologyTemplate();
+		imports = new LinkedList>> ();
+	}
+	
+	/**
+	 * Gets the metadata.
+	 *
+	 * @return the metadata
+	 */
+	public ToscaMetadata getMetadata() {
+		return metadata;
+	}
+	
+	/**
+	 * Sets the metadata.
+	 *
+	 * @param metadata the new metadata
+	 */
+	public void setMetadata(ToscaMetadata metadata) {
+		this.metadata = metadata;
+	}
+	
+	/**
+	 * Gets the tosca definitions version.
+	 *
+	 * @return the tosca definitions version
+	 */
+	public String gettosca_definitions_version() {
+		return tosca_definitions_version;
+	}
+	
+	/**
+	 * Sets the tosca definitions version.
+	 *
+	 * @param tosca_definitions_version the new tosca definitions version
+	 */
+	public void settosca_definitions_version(String tosca_definitions_version) {
+		this.tosca_definitions_version = tosca_definitions_version;
+	}
+	
+	/**
+	 * Gets the topology template.
+	 *
+	 * @return the topology template
+	 */
+	public TopologyTemplate gettopology_template() {
+		return topology_template;
+	}
+	
+	/**
+	 * Sets the topology template.
+	 *
+	 * @param topology_template the new topology template
+	 */
+	public void settopology_template(TopologyTemplate topology_template) {
+		this.topology_template = topology_template;
+	}
+
+	/**
+	 * Gets the description.
+	 *
+	 * @return the description
+	 */
+	public String getDescription() {
+		return description;
+	}
+
+	/**
+	 * Sets the description.
+	 *
+	 * @param description the new description
+	 */
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	/**
+	 * Gets the imports.
+	 *
+	 * @return the imports
+	 */
+	public Collection>> getImports() {
+		return imports;
+	}
+
+	/**
+	 * Sets the imports.
+	 *
+	 * @param imports the imports
+	 */
+	public void setImports(Collection>> imports) {
+		this.imports = imports;
+	}
+	
+	/**
+	 * Gets the node types.
+	 *
+	 * @return the node types
+	 */
+	public Map getnode_types() {
+		return node_types;
+	}
+	
+	/**
+	 * Setnode types.
+	 *
+	 * @param node_types the node types
+	 */
+	public void setnode_types(Map node_types) { 
+		this.node_types = node_types;
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/memory/InMemoryAsdcClient.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/memory/InMemoryAsdcClient.java
new file mode 100755
index 000000000..c5134bfca
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/memory/InMemoryAsdcClient.java
@@ -0,0 +1,372 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.asdc.memory;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.UUID;
+import java.util.zip.ZipFile;
+
+import org.codehaus.jackson.JsonParseException;
+import org.codehaus.jackson.map.JsonMappingException;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.yaml.snakeyaml.Yaml;
+
+import org.openecomp.vid.asdc.AsdcCatalogException;
+import org.openecomp.vid.asdc.AsdcClient;
+import org.openecomp.vid.asdc.beans.Artifact;
+import org.openecomp.vid.asdc.beans.Resource;
+import org.openecomp.vid.asdc.beans.Service;
+import org.openecomp.vid.asdc.beans.tosca.ToscaCsar;
+import org.openecomp.vid.asdc.beans.tosca.ToscaMeta;
+import org.openecomp.vid.asdc.beans.tosca.ToscaModel;
+
+/**
+ * The Class InMemoryAsdcClient.
+ */
+public class InMemoryAsdcClient implements AsdcClient {
+
+	/** The catalog. */
+	private final JSONObject catalog;
+	
+	/** The mapper. */
+	private final ObjectMapper mapper;
+
+	/**
+	 * The Class Builder.
+	 */
+	public static class Builder {
+		
+		/** The catalog. */
+		private JSONObject catalog = new JSONObject()
+										.put("resources", new JSONObject())
+										.put("services", new JSONObject());
+		
+		/** The mapper. */
+		private ObjectMapper mapper = new ObjectMapper();
+
+		/**
+		 * Instantiates a new builder.
+		 */
+		public Builder() {}
+		
+		/**
+		 * Catalog.
+		 *
+		 * @param catalog the catalog
+		 * @return the builder
+		 */
+		public Builder catalog(JSONObject catalog) {
+			this.catalog = catalog;
+			return this;
+		}
+		
+		/**
+		 * Mapper.
+		 *
+		 * @param mapper the mapper
+		 * @return the builder
+		 */
+		public Builder mapper(ObjectMapper mapper) {
+			this.mapper = mapper;
+			return this;
+		}
+		
+		/**
+		 * Builds the.
+		 *
+		 * @return the in memory sdc client
+		 */
+		public InMemoryAsdcClient build() {
+			return new InMemoryAsdcClient(this);
+		}
+	}
+	
+	/**
+	 * Instantiates a new in memory sdc client.
+	 *
+	 * @param builder the builder
+	 */
+	private InMemoryAsdcClient(Builder builder) {
+		catalog = builder.catalog;
+		mapper = builder.mapper;
+	}
+	
+	/**
+	 * Gets the catalog.
+	 *
+	 * @return the catalog
+	 */
+	private JSONObject getCatalog() {
+		return catalog;
+	}
+	
+	/**
+	 * Gets the mapper.
+	 *
+	 * @return the mapper
+	 */
+	private ObjectMapper getMapper() {
+		return mapper;
+	}
+	
+	/**
+	 * Convert.
+	 *
+	 * @param  the generic type
+	 * @param json the json
+	 * @param clazz the clazz
+	 * @return the t
+	 * @throws AsdcCatalogException the sdc catalog exception
+	 */
+	private  T convert(JSONObject json, Class clazz) throws AsdcCatalogException {
+		try {
+			return getMapper().readValue(json.toString(), clazz);
+		} catch (JsonParseException e) {
+			throw new AsdcCatalogException("Failed to parse SDC response (bad data)", e);
+		} catch (JsonMappingException e) {
+			throw new AsdcCatalogException("Failed to map SDC response to internal VID data structure(s)", e);
+		} catch (IOException e) {
+			throw new AsdcCatalogException("Failed to get a response from SDC", e);
+		}
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.openecomp.vid.asdc.AsdcClient#getResource(java.util.UUID)
+	 */
+	public Resource getResource(UUID uuid) throws AsdcCatalogException {
+		final JSONObject resource = getCatalog().getJSONObject("resources")
+										.getJSONObject(uuid.toString());
+		return convert(resource, Resource.class);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.openecomp.vid.asdc.AsdcClient#getResources()
+	 */
+	public Collection getResources() throws AsdcCatalogException {
+		final Collection resources = new LinkedList ();
+		
+		for (String key : getCatalog().getJSONObject("resources").keySet()) {
+			final JSONObject json = getCatalog().getJSONObject("resources").getJSONObject(key);
+			final Resource resource = convert(json, Resource.class);
+			resources.add(resource);
+		}
+		
+		return resources;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.openecomp.vid.asdc.AsdcClient#getResources(java.util.Map)
+	 */
+	public Collection getResources(Map filter) throws AsdcCatalogException {
+		final Collection resources = new LinkedList ();
+		
+		for (String key : getCatalog().getJSONObject("resources").keySet()) {
+			final JSONObject json = getCatalog().getJSONObject("resources").getJSONObject(key);
+			
+			boolean filterMatch = true;
+			
+			for (Entry entry : filter.entrySet()) {
+				for (int i = 0; i < entry.getValue().length; i++) {
+					if (!json.getString(entry.getKey()).equals(entry.getValue()[i])) {
+						filterMatch = false;
+						break;
+					}
+				}
+			}
+			
+			if (filterMatch) resources.add(convert(json, Resource.class));
+		}
+		
+		return resources;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.openecomp.vid.asdc.AsdcClient#getService(java.util.UUID)
+	 */
+	public Service getService(UUID uuid) throws AsdcCatalogException {
+		final JSONObject service = getCatalog().getJSONObject("services")
+				.getJSONObject(uuid.toString());
+		return convert(service, Service.class);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.openecomp.vid.asdc.AsdcClient#getServices()
+	 */
+	public Collection getServices() throws AsdcCatalogException {
+		final Collection services = new LinkedList ();
+		
+		for (String key : getCatalog().getJSONObject("services").keySet()) {
+			final JSONObject json = getCatalog().getJSONObject("services").getJSONObject(key);
+			final Service service = convert(json, Service.class);
+			services.add(service);
+		}
+		
+		return services;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.openecompt.vid.asdc.AsdcClient#getServices(java.util.Map)
+	 */
+	public Collection getServices(Map filter) throws AsdcCatalogException {
+		final Collection services = new LinkedList ();
+		
+		for (String key : getCatalog().getJSONObject("services").keySet()) {
+			final JSONObject json = getCatalog().getJSONObject("services").getJSONObject(key);
+			
+			boolean filterMatch = true;
+			
+			for (Entry entry : filter.entrySet()) {
+				for (int i = 0; i < entry.getValue().length; i++) {
+					if (!json.getString(entry.getKey()).equals(entry.getValue()[i])) {
+						filterMatch = false;
+						break;
+					}
+				}
+			}
+			
+			if (filterMatch) services.add(convert(json, Service.class));
+		}
+		
+		return services;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.openecomp.vid.asdc.AsdcClient#getResourceArtifact(java.util.UUID, java.util.UUID)
+	 */
+	public Artifact getResourceArtifact(UUID resourceUuid, UUID artifactUuid) throws AsdcCatalogException {
+		final JSONArray artifacts = getCatalog().getJSONObject("resources")
+				.getJSONObject(resourceUuid.toString())
+				.getJSONArray("artifacts");
+		
+		for (int i = 0; i < artifacts.length(); i++) {
+			final JSONObject artifact = artifacts.getJSONObject(i);
+			
+			if (artifact.getString("artifactUUID").equals(artifactUuid.toString())) {
+				return convert(artifact, Artifact.class);
+			}
+		}
+		
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.openecomp.vid.asdc.AsdcClient#getServiceArtifact(java.util.UUID, java.util.UUID)
+	 */
+	public Artifact getServiceArtifact(UUID serviceUuid, UUID artifactUuid) throws AsdcCatalogException {
+		final JSONArray artifacts = getCatalog().getJSONObject("services")
+				.getJSONObject(serviceUuid.toString())
+				.getJSONArray("artifacts");
+		
+		for (int i = 0; i < artifacts.length(); i++) {
+			final JSONObject artifact = artifacts.getJSONObject(i);
+			
+			if (artifact.getString("artifactUUID").equals(artifactUuid.toString())) {
+				return convert(artifact, Artifact.class);
+			}
+		}
+		
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.openecomp.vid.asdc.AsdcClient#getResourceToscaModel(java.util.UUID)
+	 */
+	public ToscaCsar getResourceToscaModel(UUID resourceUuid) throws AsdcCatalogException {
+		final String toscaModelURL = getCatalog().getJSONObject("resources")
+				.getJSONObject(resourceUuid.toString())
+				.getString("toscaModelURL");
+
+
+		final InputStream toscaModelStream = getClass().getClassLoader().getResourceAsStream(toscaModelURL);
+		
+		if (toscaModelStream == null) return null;
+		
+		return getToscaModel(toscaModelStream);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.openecomp.vid.asdc.AsdcClient#getServiceToscaModel(java.util.UUID)
+	 */
+	public ToscaCsar getServiceToscaModel(UUID serviceUuid) throws AsdcCatalogException {
+		final String toscaModelURL = getCatalog().getJSONObject("services")
+						.getJSONObject(serviceUuid.toString())
+						.getString("toscaModelURL");
+		
+		final InputStream toscaModelStream = getClass().getClassLoader().getResourceAsStream(toscaModelURL);
+		
+		if (toscaModelStream == null) return null;
+		
+		return getToscaModel(toscaModelStream);
+	}
+
+	/**
+	 * Gets the tosca model.
+	 *
+	 * @param csarInputStream the csar input stream
+	 * @return the tosca model
+	 * @throws AsdcCatalogException the asdc catalog exception
+	 */
+	private ToscaCsar getToscaModel(InputStream csarInputStream) throws AsdcCatalogException {
+		final Path csarFile;
+		
+		try {
+			csarFile = Files.createTempFile("csar", ".zip");
+			Files.copy(csarInputStream, csarFile, StandardCopyOption.REPLACE_EXISTING);
+		} catch (IOException e) {
+			throw new AsdcCatalogException("Caught IOException while creating CSAR", e);
+		}
+		
+		try (final ZipFile csar = new ZipFile(csarFile.toFile())) {
+			
+			final InputStream toscaMetaStream = csar.getInputStream(csar.getEntry("TOSCA-Metadata/TOSCA.meta"));
+			final ToscaMeta toscaMeta = new ToscaMeta.Builder(toscaMetaStream).build();
+			final String entryDefinitions = toscaMeta.get("Entry-Definitions");
+			final InputStream toscaParentEntryYamlStream = csar.getInputStream(csar.getEntry(entryDefinitions));
+			
+			final Yaml yaml = new Yaml();
+			final ToscaModel parentModel = yaml.loadAs(toscaParentEntryYamlStream, ToscaModel.class);
+
+			final ToscaCsar.Builder csarBuilder = new ToscaCsar.Builder(parentModel);
+			
+			for (Map> imports : parentModel.getImports()) {
+				for (Entry> entry : imports.entrySet()) {
+					final InputStream toscaChildEntryYamlStream = csar.getInputStream(csar.getEntry("Definitions/" + entry.getValue().get("file")));
+					final ToscaModel childModel = yaml.loadAs(toscaChildEntryYamlStream, ToscaModel.class);
+					csarBuilder.addVnf(childModel);
+				}
+			}
+			
+			return csarBuilder.build();
+		} catch (IOException e) {
+			throw new AsdcCatalogException("Caught IOException while processing CSAR", e);
+		}
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/rest/RestfulAsdcClient.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/rest/RestfulAsdcClient.java
new file mode 100755
index 000000000..26d45cc7e
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/rest/RestfulAsdcClient.java
@@ -0,0 +1,462 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.asdc.rest;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.UUID;
+import java.util.logging.Logger;
+import java.util.zip.ZipFile;
+
+import javax.ws.rs.NotFoundException;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedHashMap;
+
+import org.openecomp.vid.asdc.AsdcCatalogException;
+import org.openecomp.vid.asdc.AsdcClient;
+import org.openecomp.vid.asdc.beans.Artifact;
+import org.openecomp.vid.asdc.beans.Resource;
+import org.openecomp.vid.asdc.beans.Service;
+import org.openecomp.vid.asdc.beans.tosca.ToscaCsar;
+import org.openecomp.vid.asdc.beans.tosca.ToscaMeta;
+import org.openecomp.vid.asdc.beans.tosca.ToscaModel;
+import org.openecomp.vid.model.ModelConstants;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.error.YAMLException;
+
+import org.openecomp.vid.properties.VidProperties;
+import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+
+/**
+ * The Class RestfulAsdcClient.
+ */
+public class RestfulAsdcClient implements AsdcClient {
+
+	/** The Constant LOGGER. */
+	private static final Logger LOGGER = Logger.getLogger(RestfulAsdcClient.class.getName());
+	
+	/** The client. */
+	private final Client client;
+	
+	/** The uri. */
+	private final URI uri;
+	
+	/** The common headers. */
+	private final MultivaluedHashMap commonHeaders;
+	
+	/** The auth. */
+	private final String auth;
+	
+	/**
+	 * The Class Builder.
+	 */
+	public static class Builder {
+	
+		/** The client. */
+		private final Client client;
+		
+		/** The uri. */
+		private final URI uri;
+		
+		/** The auth. */
+		private String auth = null;
+		
+		/**
+		 * Instantiates a new builder.
+		 *
+		 * @param client the client
+		 * @param uri the uri
+		 */
+		public Builder(Client client, URI uri) {
+			this.client = client;
+			this.client.register(JacksonJsonProvider.class);
+			this.uri = uri;
+		}
+		
+		/**
+		 * Auth.
+		 *
+		 * @param auth the auth
+		 * @return the builder
+		 */
+		public Builder auth(String auth) {
+			this.auth = auth;
+			return this;
+		}
+		
+		/**
+		 * Builds the.
+		 *
+		 * @return the restful asdc client
+		 */
+		public RestfulAsdcClient build() {
+			return new RestfulAsdcClient(this);
+		}
+	}
+	
+	/**
+	 * Instantiates a new restful asdc client.
+	 *
+	 * @param builder the builder
+	 */
+	private RestfulAsdcClient(Builder builder) {
+		client = builder.client;
+		uri = builder.uri;
+		auth = builder.auth;
+		
+		commonHeaders = new MultivaluedHashMap ();
+		commonHeaders.put("X-ECOMP-InstanceID", Collections.singletonList((Object) "VID"));
+		commonHeaders.put("Authorization",  Collections.singletonList((Object) (auth)));
+	}
+	
+	/**
+	 * Gets the client.
+	 *
+	 * @return the client
+	 */
+	private Client getClient() { return client; }
+	
+	/* (non-Javadoc)
+	 * @see org.openecomp.vid.asdc.AsdcClient#getResource(java.util.UUID)
+	 */
+	public Resource getResource(UUID uuid) throws AsdcCatalogException {
+		String path = VidProperties.getPropertyWithDefault(ModelConstants.ASDC_RESOURCE_API_PATH, ModelConstants.DEFAULT_ASDC_RESOURCE_API_PATH);
+		try {
+			return getClient()
+					.target(uri)
+					.path(path + "/" + uuid.toString() + "/metadata")
+					.request(MediaType.APPLICATION_JSON_TYPE)
+					.headers(commonHeaders)
+					.header("Content-Type", MediaType.APPLICATION_JSON)
+					.get(Resource.class);
+		} catch (ResponseProcessingException e) {
+			//Couldn't convert response to Java type
+			throw new AsdcCatalogException("ASDC response could not be processed", e);
+		} catch (ProcessingException e) {
+			//IO problems during request
+			throw new AsdcCatalogException("Failed to get a response from ASDC service", e);
+		} catch (WebApplicationException e) {
+			//Web service returned data, but the response status wasn't a good one (i.e. non 2xx)
+			throw new AsdcCatalogException(e);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.openecomp.vid.asdc.AsdcClient#getResources()
+	 */
+	public Collection getResources() throws AsdcCatalogException {
+		String path = VidProperties.getPropertyWithDefault(ModelConstants.ASDC_RESOURCE_API_PATH, ModelConstants.DEFAULT_ASDC_RESOURCE_API_PATH);
+		try {
+			return getClient()
+					.target(uri)
+					.path(path)
+					.request(MediaType.APPLICATION_JSON_TYPE)
+					.headers(commonHeaders)
+					.header("Content-Type", MediaType.APPLICATION_JSON)
+					.get(new GenericType> () {});
+		} catch (ResponseProcessingException e) {
+			//Couldn't convert response to Java type
+			throw new AsdcCatalogException("ASDC response could not be processed", e);
+		} catch (ProcessingException e) {
+			//IO problems during request
+			throw new AsdcCatalogException("Failed to get a response from ASDC service", e);
+		} catch (WebApplicationException e) {
+			//Web service returned data, but the response status wasn't a good one (i.e. non 2xx)
+			throw new AsdcCatalogException(e);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.openecomp.vid.asdc.AsdcClient#getResources(java.util.Map)
+	 */
+	public Collection getResources(Map filter) throws AsdcCatalogException {
+		String path = VidProperties.getPropertyWithDefault(ModelConstants.ASDC_RESOURCE_API_PATH, ModelConstants.DEFAULT_ASDC_RESOURCE_API_PATH);
+		WebTarget target = getClient()
+				.target(uri)
+				.path(path);
+		
+		for (Entry filterEntry : filter.entrySet()) {
+			target = target.queryParam(filterEntry.getKey(), (Object []) filterEntry.getValue());
+		}
+		
+		try {
+			return target.request()
+					.accept(MediaType.APPLICATION_JSON_TYPE)
+					.headers(commonHeaders)
+					.header("Content-Type", MediaType.APPLICATION_JSON)
+					.get(new GenericType> () {});
+		} catch (ResponseProcessingException e) {
+			//Couldn't convert response to Java type
+			throw new AsdcCatalogException("ASDC response could not be processed", e);
+		} catch (ProcessingException e) {
+			//IO problems during request
+			throw new AsdcCatalogException("Failed to get a response from ASDC service", e);
+		} catch (NotFoundException e) {
+			throw e;
+		} catch (WebApplicationException e) {
+			//Web service returned data, but the response status wasn't a good one (i.e. non 2xx)
+			throw new AsdcCatalogException(e);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.openecomp.vid.asdc.AsdcClient#getResourceArtifact(java.util.UUID, java.util.UUID)
+	 */
+	public Artifact getResourceArtifact(UUID resourceUuid, UUID artifactUuid) throws AsdcCatalogException {
+		String path = VidProperties.getPropertyWithDefault(ModelConstants.ASDC_RESOURCE_API_PATH, ModelConstants.DEFAULT_ASDC_RESOURCE_API_PATH);
+		try {
+			return getClient()
+					.target(uri)
+					.path(path + "/" + resourceUuid + "/artifacts/" + artifactUuid)
+					.request(MediaType.APPLICATION_JSON_TYPE)
+					.headers(commonHeaders)
+					.header("Content-Type", MediaType.APPLICATION_JSON)
+					.get(Artifact.class);
+		} catch (ResponseProcessingException e) {
+			//Couldn't convert response to Java type
+			throw new AsdcCatalogException("ASDC response could not be processed", e);
+		} catch (ProcessingException e) {
+			//IO problems during request
+			throw new AsdcCatalogException("Failed to get a response from ASDC service", e);
+		} catch (WebApplicationException e) {
+			//Web service returned data, but the response status wasn't a good one (i.e. non 2xx)
+			throw new AsdcCatalogException(e);
+		}
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.openecomp.vid.asdc.AsdcClient#getService(java.util.UUID)
+	 */
+	public Service getService(UUID uuid) throws AsdcCatalogException {
+		
+		String path = VidProperties.getPropertyWithDefault(ModelConstants.ASDC_SVC_API_PATH, ModelConstants.DEFAULT_ASDC_SVC_API_PATH);
+		try {
+			return getClient()
+					.target(uri)
+					.path( path + "/" + uuid.toString() + "/metadata")
+					.request(MediaType.APPLICATION_JSON)
+					.headers(commonHeaders)
+					.get(Service.class);
+		} catch (ResponseProcessingException e) {
+			//Couldn't convert response to Java type
+			throw new AsdcCatalogException("ASDC response could not be processed", e);
+		} catch (ProcessingException e) {
+			//IO problems during request
+			throw new AsdcCatalogException("Failed to get a response from ASDC service", e);
+		} catch (WebApplicationException e) {
+			//Web service returned data, but the response status wasn't a good one (i.e. non 2xx)
+			throw new AsdcCatalogException(e);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.openecomp.vid.asdc.AsdcClient#getServices()
+	 */
+	public Collection getServices() throws AsdcCatalogException {
+		String path = VidProperties.getPropertyWithDefault(ModelConstants.ASDC_SVC_API_PATH, ModelConstants.DEFAULT_ASDC_SVC_API_PATH);
+		try {
+			return getClient()
+					.target(uri)
+					.path(path)
+					.request()
+					.accept(MediaType.APPLICATION_JSON_TYPE)
+					.headers(commonHeaders)
+					.header("Content-Type", MediaType.APPLICATION_JSON)
+					.get(new GenericType> () {});
+		} catch (ResponseProcessingException e) {
+			//Couldn't convert response to Java type
+			throw new AsdcCatalogException("ASDC response could not be processed", e);
+		} catch (ProcessingException e) {
+			//IO problems during request
+			throw new AsdcCatalogException("Failed to get a response from ASDC service", e);
+		} catch (WebApplicationException e) {
+			//Web service returned data, but the response status wasn't a good one (i.e. non 2xx)
+			throw new AsdcCatalogException(e);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.openecomp.vid.asdc.AsdcClient#getServices(java.util.Map)
+	 */
+	public Collection getServices(Map filter) throws AsdcCatalogException {
+		
+		String path = VidProperties.getPropertyWithDefault(ModelConstants.ASDC_SVC_API_PATH, ModelConstants.DEFAULT_ASDC_SVC_API_PATH);
+		WebTarget target = getClient()
+				.target(uri)
+				.path(path);
+		
+			
+		for (Entry filterEntry : filter.entrySet()) {
+			target = target.queryParam(filterEntry.getKey(), (Object []) filterEntry.getValue());
+		}
+		
+		try {
+			return target.request()
+					.accept(MediaType.APPLICATION_JSON_TYPE)
+					.headers(commonHeaders)
+					.header("Content-Type", MediaType.APPLICATION_JSON)
+					.get(new GenericType> () {});
+		} catch (ResponseProcessingException e) {
+			//Couldn't convert response to Java type
+			throw new AsdcCatalogException("ASDC response could not be processed", e);
+		} catch (ProcessingException e) {
+			//IO problems during request
+			throw new AsdcCatalogException("Failed to get a response from ASDC service", e);
+		} catch (NotFoundException e) {
+			throw e;
+		} catch (WebApplicationException e) {
+			//Web service returned data, but the response status wasn't a good one (i.e. non 2xx)
+			throw new AsdcCatalogException(e);
+		}
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.openecomp.vid.asdc.AsdcClient#getServiceArtifact(java.util.UUID, java.util.UUID)
+	 */
+	public Artifact getServiceArtifact(UUID serviceUuid, UUID artifactUuid) throws AsdcCatalogException {
+		String path = VidProperties.getPropertyWithDefault(ModelConstants.ASDC_SVC_API_PATH, ModelConstants.DEFAULT_ASDC_SVC_API_PATH);
+		try {
+			return getClient()
+					.target(uri)
+					.path(path + "/" + serviceUuid + "/artifacts/" + artifactUuid)
+					.request(MediaType.APPLICATION_JSON_TYPE)
+					.headers(commonHeaders)
+					.header("Content-Type", MediaType.APPLICATION_JSON)
+					.get(Artifact.class);
+		} catch (ResponseProcessingException e) {
+			//Couldn't convert response to Java type
+			throw new AsdcCatalogException("ASDC response could not be processed", e);
+		} catch (ProcessingException e) {
+			//IO problems during request
+			throw new AsdcCatalogException("Failed to get a response from ASDC service", e);
+		} catch (WebApplicationException e) {
+			//Web service returned data, but the response status wasn't a good one (i.e. non 2xx)
+			throw new AsdcCatalogException(e);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.openecomp.vid.asdc.AsdcClient#getResourceToscaModel(java.util.UUID)
+	 */
+	public ToscaCsar getResourceToscaModel(UUID resourceUuid) throws AsdcCatalogException {
+		String path = VidProperties.getPropertyWithDefault(ModelConstants.ASDC_RESOURCE_API_PATH, ModelConstants.DEFAULT_ASDC_RESOURCE_API_PATH);
+		try (final InputStream csarInputStream = (InputStream) getClient()
+				.target(uri)
+				.path(path + "/" + resourceUuid + "/toscaModel")
+				.request(MediaType.APPLICATION_OCTET_STREAM_TYPE)
+				.headers(commonHeaders)
+				.header("Content-Type", MediaType.APPLICATION_OCTET_STREAM)
+				.get(InputStream.class)) {
+
+			return getToscaModel(csarInputStream);
+		} catch (IOException e) {
+			throw new AsdcCatalogException("Failed to retrieve resource TOSCA model from ASDC", e);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.openecomp.vid.asdc.AsdcClient#getServiceToscaModel(java.util.UUID)
+	 */
+	public ToscaCsar getServiceToscaModel(UUID serviceUuid) throws AsdcCatalogException {
+		String path = VidProperties.getPropertyWithDefault(ModelConstants.ASDC_SVC_API_PATH, ModelConstants.DEFAULT_ASDC_SVC_API_PATH);
+		try {
+			final InputStream csarInputStream = (InputStream) getClient()
+					.target(uri)
+					.path(path + "/" + serviceUuid + "/toscaModel")
+					.request(MediaType.APPLICATION_OCTET_STREAM_TYPE)
+					.headers(commonHeaders)
+					.header("Content-Type", MediaType.APPLICATION_OCTET_STREAM)
+					.get(InputStream.class);
+					
+			return getToscaModel(csarInputStream);
+		} catch (ResponseProcessingException e) {
+			//Couldn't convert response to Java type
+			throw new AsdcCatalogException("ASDC response could not be processed", e);
+		} catch (ProcessingException e) {
+			//IO problems during request
+			throw new AsdcCatalogException("Failed to get a response from ASDC service", e);
+		} catch (WebApplicationException e) {
+			//Web service returned data, but the response status wasn't a good one (i.e. non 2xx)
+			throw new AsdcCatalogException(e);
+		}
+	}
+	
+	/**
+	 * Gets the tosca model.
+	 *
+	 * @param csarInputStream the csar input stream
+	 * @return the tosca model
+	 * @throws AsdcCatalogException the asdc catalog exception
+	 */
+	private ToscaCsar getToscaModel(InputStream csarInputStream) throws AsdcCatalogException {
+		final Path csarFile;
+		
+		try {
+			csarFile = Files.createTempFile("csar", ".zip");
+			Files.copy(csarInputStream, csarFile, StandardCopyOption.REPLACE_EXISTING);
+		} catch (IOException e) {
+			throw new AsdcCatalogException("Caught IOException while creating CSAR", e);
+		}
+		
+		try (final ZipFile csar = new ZipFile(csarFile.toFile())) {
+			
+			final InputStream toscaMetaStream = csar.getInputStream(csar.getEntry("TOSCA-Metadata/TOSCA.meta"));
+			final ToscaMeta toscaMeta = new ToscaMeta.Builder(toscaMetaStream).build();
+			final String entryDefinitions = toscaMeta.get("Entry-Definitions");
+			final InputStream toscaParentEntryYamlStream = csar.getInputStream(csar.getEntry(entryDefinitions));
+			
+			try {
+				final Yaml yaml = new Yaml();
+				final ToscaModel parentModel = yaml.loadAs(toscaParentEntryYamlStream, ToscaModel.class);
+	
+				final ToscaCsar.Builder csarBuilder = new ToscaCsar.Builder(parentModel);
+				
+				for (Map> imports : parentModel.getImports()) {
+					for (Entry> entry : imports.entrySet()) {
+						final InputStream toscaChildEntryYamlStream = csar.getInputStream(csar.getEntry("Definitions/" + entry.getValue().get("file")));
+						final ToscaModel childModel = yaml.loadAs(toscaChildEntryYamlStream, ToscaModel.class);
+						csarBuilder.addVnf(childModel);
+					}
+				}
+				
+				return csarBuilder.build();
+			} catch (YAMLException e) {
+				throw new AsdcCatalogException("Caught exception while processing TOSCA YAML", e);
+			}
+		} catch (IOException e) {
+			throw new AsdcCatalogException("Caught IOException while processing CSAR", e);
+		}
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/client/HttpBasicClient.java b/vid-app-common/src/main/java/org/openecomp/vid/client/HttpBasicClient.java
new file mode 100755
index 000000000..ef2ade914
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/client/HttpBasicClient.java
@@ -0,0 +1,67 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.client;
+
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+
+import javax.servlet.ServletContext;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+
+import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.client.ClientProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+
+/**
+ *  General HTTP client.
+ */
+
+public class HttpBasicClient{
+	
+	/** The servlet context. */
+	@Autowired 
+	private ServletContext servletContext;
+	
+	/** The logger. */
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(HttpBasicClient.class);
+	
+	/** The Constant dateFormat. */
+	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
+	
+	/**
+	 * Obtain a basic HTTP client .
+	 *
+	 * @return Client client object
+	 * @throws Exception the exception
+	 */
+	public static Client getClient() throws Exception {
+		
+		ClientConfig config = new ClientConfig();
+		config.property(ClientProperties.SUPPRESS_HTTP_COMPLIANCE_VALIDATION, true);
+		
+		return ClientBuilder.newClient(config)
+				.register(org.openecomp.aai.util.CustomJacksonJaxBJsonProvider.class);
+	}	
+}  
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/client/HttpsBasicClient.java b/vid-app-common/src/main/java/org/openecomp/vid/client/HttpsBasicClient.java
new file mode 100755
index 000000000..dc0e35590
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/client/HttpsBasicClient.java
@@ -0,0 +1,143 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.client;
+
+import java.io.File;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+
+import org.eclipse.jetty.util.security.Password;
+import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.client.ClientProperties;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.openecomp.vid.properties.VidProperties;
+
+ /**
+  *  General SSL client using the VID tomcat keystore. It doesn't use client certificates.
+  */
+ 
+public class HttpsBasicClient{
+	
+	/** The logger. */
+	static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(HttpsBasicClient.class);
+	
+	/** The Constant dateFormat. */
+	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
+	
+	/**
+	 * Retrieve an SSL client.
+	 *
+	 * @return Client The SSL client
+	 * @throws Exception the exception
+	 */
+	public static Client getClient() throws Exception {
+		String methodName = "getClient";
+		ClientConfig config = new ClientConfig();
+		//config.getFeatures().put(JSONConfiguration.FEATURE_POJO_MAPPING, Boolean.TRUE);
+		//config.getClasses().add(org.openecomp.aai.util.CustomJacksonJaxBJsonProvider.class);
+	
+		SSLContext ctx = null;
+		
+		try {
+			
+			config.property(ClientProperties.SUPPRESS_HTTP_COMPLIANCE_VALIDATION, true);
+			
+			String truststore_path = SystemProperties.getProperty(VidProperties.VID_TRUSTSTORE_FILENAME);
+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + " " + methodName + " truststore_path=" + truststore_path);
+			String truststore_password = SystemProperties.getProperty(VidProperties.VID_TRUSTSTORE_PASSWD_X);
+			
+			
+			String decrypted_truststore_password = Password.deobfuscate(truststore_password);
+			//logger.debug(dateFormat.format(new Date()) + " " + methodName + " decrypted_truststore_password=" + decrypted_truststore_password);
+			
+			File tr = new File (truststore_path);
+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + " " + methodName + " absolute truststore path=" + tr.getAbsolutePath());
+			
+			//String keystore_path = certFilePath + AAIProperties.FILESEPARTOR + SystemProperties.getProperty(AAIProperties.AAI_KEYSTORE_FILENAME);
+			//String keystore_password = SystemProperties.getProperty(AAIProperties.AAI_KEYSTORE_PASSWD_X);
+			//String decrypted_keystore_password = EncryptedPropValue.decryptTriple(keystore_password);
+			
+		    System.setProperty("javax.net.ssl.trustStore", truststore_path);
+		    System.setProperty("javax.net.ssl.trustStorePassword", decrypted_truststore_password);
+			HttpsURLConnection.setDefaultHostnameVerifier( new HostnameVerifier(){
+			    public boolean verify(String string,SSLSession ssls) {
+			        return true;
+			    }
+			});
+	
+			//May need to make the algorithm a parameter. MSO requires TLSv1.1	or TLSv1.2
+			ctx = SSLContext.getInstance("TLSv1.2");
+			
+			/* 
+			KeyManagerFactory kmf = null;
+			try {
+				kmf = KeyManagerFactory.getInstance("SunX509");
+				FileInputStream fin = new FileInputStream(keystore_path);
+				KeyStore ks = KeyStore.getInstance("PKCS12");
+				char[] pwd = decrypted_keystore_password.toCharArray();
+				ks.load(fin, pwd);
+				kmf.init(ks, pwd);
+			} catch (Exception e) {
+				System.out.println("Error setting up kmf: exiting");
+				e.printStackTrace();
+				System.exit(1);
+			}
+
+			ctx.init(kmf.getKeyManagers(), null, null);
+			*/
+			ctx.init(null, null, null);
+			//config.getProperties().put(HTTPSProperties.PROPERTY_HTTPS_PROPERTIES, 
+			//							new HTTPSProperties( , ctx));
+			
+			return ClientBuilder.newBuilder()
+				.sslContext(ctx)
+				.hostnameVerifier(new HostnameVerifier() {
+					@Override
+					public boolean verify( String s, SSLSession sslSession ) {
+						return true;
+					}
+				}).withConfig(config)
+				.build()
+				.register(org.openecomp.aai.util.CustomJacksonJaxBJsonProvider.class);
+			
+		} catch (Exception e) {
+			logger.debug(EELFLoggerDelegate.debugLogger, "Error setting up config: exiting");
+			//System.out.println("Error setting up config: exiting");
+			e.printStackTrace();
+			return null;
+		}
+			
+		//Client client = ClientBuilder.newClient(config);
+		// uncomment this line to get more logging for the request/response
+		// client.addFilter(new LoggingFilter(System.out));
+		
+		//return client;
+	}
+}  
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/controller/AaiController.java b/vid-app-common/src/main/java/org/openecomp/vid/controller/AaiController.java
new file mode 100755
index 000000000..7cb25c264
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/controller/AaiController.java
@@ -0,0 +1,864 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package  org.openecomp.vid.controller;
+
+import java.io.File;
+import java.io.IOException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.UUID;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import javax.ws.rs.BadRequestException;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Response;
+
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.openecomp.aai.util.AAIRestInterface;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
+import org.openecomp.portalsdk.core.domain.User;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+
+/**
+ * Controller to handle a&ai requests.
+ */
+
+@RestController
+public class AaiController extends RestrictedBaseController{
+
+	/** The view name. */
+	String viewName;
+
+	/** The logger. */
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(AaiController.class);
+
+	/** The Constant dateFormat. */
+	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
+
+	/** The from app id. */
+	protected String fromAppId = "VidAaiController";
+
+	/** The model. */
+	private Map model = new HashMap();
+
+	/** The servlet context. */
+	private @Autowired ServletContext servletContext;
+
+	/**
+	 * Welcome method.
+	 *
+	 * @param request the request
+	 * @return ModelAndView The view
+	 */
+	@RequestMapping(value = {"/subscriberSearch" }, method = RequestMethod.GET)
+	public ModelAndView welcome(HttpServletRequest request) {
+		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== AaiController welcome start");
+		return new ModelAndView(getViewName());		
+	}
+
+	/* (non-Javadoc)
+	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#getViewName()
+	 */
+	public String getViewName() {
+		return viewName;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#setViewName(java.lang.String)
+	 */
+	public void setViewName(String viewName) {
+		this.viewName = viewName;
+	}
+
+	/**
+	 * Get services from a&ai.
+	 *
+	 * @return ResponseEntity The response entity with the logged in user uuid.
+	 * @throws IOException Signals that an I/O exception has occurred.
+	 * @throws InterruptedException the interrupted exception
+	 */
+	@RequestMapping(value = {"/getuserID" }, method = RequestMethod.GET)
+	public ResponseEntity getUserID(HttpServletRequest request) throws IOException, InterruptedException {
+
+		String userId = "";
+		HttpSession session = request.getSession();
+		if (session != null)
+		{
+			User user = (User) session.getAttribute(SystemProperties.getProperty(SystemProperties.USER_ATTRIBUTE_NAME));
+			if (user != null)
+			{
+				userId = user.getHrid();
+			}
+		}
+
+		return new ResponseEntity( userId, HttpStatus.OK);
+	}
+
+
+	/**
+	 * Get services from a&ai.
+	 *
+	 * @return ResponseEntity The response entity
+	 * @throws IOException Signals that an I/O exception has occurred.
+	 * @throws InterruptedException the interrupted exception
+	 */
+	@RequestMapping(value="/aai_get_services",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) 
+	public ResponseEntity doGetServices() throws IOException, InterruptedException {	
+		File certiPath = GetCertificatesPath();
+		Response resp = doAaiGet(certiPath.getAbsolutePath(), "service-design-and-creation/services", false);
+
+		return convertResponseToResponseEntity(resp);
+	}
+
+	/**
+	 * Lookup single service instance in a&ai.  Get the service-subscription and customer, too, i guess?
+	 *
+	 * @param serviceInstanceId the service instance Id
+	 * @return ResponseEntity The response entity
+	 * @throws IOException Signals that an I/O exception has occurred.
+	 * @throws InterruptedException the interrupted exception
+	 */
+	@RequestMapping(value="/aai_get_service_instance/{service-instance-id}/{service-instance-type}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) 
+	public ResponseEntity doGetServiceInstance(@PathVariable("service-instance-id") String serviceInstanceId,@PathVariable("service-instance-type") String serviceInstanceType) throws IOException, InterruptedException {	
+		File certiPath = GetCertificatesPath();
+		Response resp=null;
+
+		if(serviceInstanceType.equalsIgnoreCase("Service Instance Id")){
+			resp = doAaiGet( certiPath.getAbsolutePath(), 
+					"search/nodes-query?search-node-type=service-instance&filter=service-instance-id:EQUALS:" 
+							+ serviceInstanceId, false);
+		} else {
+			resp = doAaiGet( certiPath.getAbsolutePath(), 
+					"search/nodes-query?search-node-type=service-instance&filter=service-instance-name:EQUALS:" 
+							+ serviceInstanceId, false);
+		}
+		return convertResponseToResponseEntity(resp);
+	}
+
+
+	/**
+	 * Get services from a&ai.
+	 *
+	 * @param globalCustomerId the global customer id
+	 * @param serviceSubscriptionId the service subscription id
+	 * @return ResponseEntity The response entity
+	 * @throws IOException Signals that an I/O exception has occurred.
+	 * @throws InterruptedException the interrupted exception
+	 */
+	@RequestMapping(value="/aai_get_service_subscription/{global-customer-id}/{service-subscription-id}",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) 
+	public ResponseEntity doGetServices(@PathVariable("global-customer-id") String globalCustomerId,
+			@PathVariable("service-subscription-id") String serviceSubscriptionId) throws IOException, InterruptedException {	
+		File certiPath = GetCertificatesPath();
+		Response resp = doAaiGet(certiPath.getAbsolutePath(), "business/customers/customer/" + globalCustomerId 
+				+ "/service-subscriptions/service-subscription/" + serviceSubscriptionId + "?depth=0", false);
+		return convertResponseToResponseEntity(resp);
+	}
+
+	/**
+	 * Obtain the subscriber list from a&ai.
+	 *
+	 * @param fullSet the full set
+	 * @return ResponseEntity The response entity
+	 * @throws IOException Signals that an I/O exception has occurred.
+	 * @throws InterruptedException the interrupted exception
+	 */
+	@RequestMapping(value="/aai_get_subscribers",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)  	
+	public ResponseEntity doGetSubscriberList(@DefaultValue("n") @QueryParam("fullSet") String fullSet) throws IOException, InterruptedException {
+		Response resp = getSubscribers(false);
+		return convertResponseToResponseEntity(resp);
+	}
+
+	/**
+	 * Obtain the Target Prov Status from the System.Properties file.
+	 *
+	 * @return ResponseEntity The response entity
+	 * @throws IOException Signals that an I/O exception has occurred.
+	 * @throws InterruptedException the interrupted exception
+	 */	
+	@RequestMapping(value="/get_system_prop_vnf_prov_status",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)  	
+	public ResponseEntity getTargetProvStatus() throws IOException, InterruptedException {
+		String p = SystemProperties.getProperty("aai.vnf.provstatus");
+		return new ResponseEntity(p, HttpStatus.OK);
+	}
+
+	/**
+	 * Obtain the full subscriber list from a&ai.
+	 *
+	 * @return ResponseEntity The response entity
+	 * @throws IOException Signals that an I/O exception has occurred.
+	 * @throws InterruptedException the interrupted exception
+	 */
+	@RequestMapping(value="/aai_get_full_subscribers",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)  	
+	public ResponseEntity getFullSubscriberList() throws IOException, InterruptedException {
+		Response resp = getSubscribers(true);
+		return convertResponseToResponseEntity(resp);
+	}
+
+
+	/**
+	 * Refresh the subscriber list from a&ai.
+	 *
+	 * @return ResponseEntity The response entity
+	 * @throws IOException Signals that an I/O exception has occurred.
+	 */
+	@RequestMapping(value="/aai_refresh_subscribers",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)  	
+	public ResponseEntity doRefreshSubscriberList() throws IOException {
+		Response resp = getSubscribers(false);
+		return convertResponseToResponseEntity(resp);
+	}
+
+	/**
+	 * Refresh the full subscriber list from a&ai.
+	 *
+	 * @return ResponseEntity The response entity
+	 * @throws IOException Signals that an I/O exception has occurred.
+	 */
+	@RequestMapping(value="/aai_refresh_full_subscribers",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)  	
+	public ResponseEntity doRefreshFullSubscriberList() throws IOException {
+		Response resp = getSubscribers(false);
+		return convertResponseToResponseEntity(resp);
+	}
+
+	/**
+	 * Get subscriber details from a&ai.
+	 *
+	 * @param subscriberId the subscriber id
+	 * @return ResponseEntity The response entity
+	 */
+	@RequestMapping(value="/aai_sub_details/{subscriberId}", method = RequestMethod.GET)
+	public ResponseEntity GetSubscriber(@PathVariable("subscriberId") String subscriberId) {
+		Response resp = getSubscriberDetails(subscriberId);
+		return convertResponseToResponseEntity(resp);
+	}
+
+	/**
+	 * Issue a named query to a&ai.
+	 *
+	 * @param namedQueryId the named query id
+	 * @param globalCustomerId the global customer id
+	 * @param serviceType the service type
+	 * @param serviceInstance the service instance
+	 * @return ResponseEntity The response entity
+	 */
+	@RequestMapping(value="/aai_sub_viewedit/{namedQueryId}/{globalCustomerId}/{serviceType}/{serviceInstance}", method = RequestMethod.GET)
+	public ResponseEntity viewEditGetComponentList(
+			@PathVariable("namedQueryId") String namedQueryId,
+			@PathVariable("globalCustomerId") String globalCustomerId,
+			@PathVariable("serviceType") String serviceType,
+			@PathVariable("serviceInstance") String serviceInstance) { 
+
+		String componentListPayload = getComponentListPutPayload(namedQueryId, globalCustomerId, serviceType, serviceInstance);
+		File certiPath = GetCertificatesPath();
+
+		Response resp = doAaiPost(certiPath.getAbsolutePath(), "search/named-query", componentListPayload, false); 
+        return convertResponseToResponseEntity(resp);
+	}
+
+	/**
+	 * Issue a named query to a&ai.
+	 *
+	 * @param namedQueryId the named query id
+	 * @param globalCustomerId the global customer id
+	 * @param serviceType the service type
+	 * @param serviceInstance the service instance
+	 * @return ResponseEntity The response entity
+	 */
+	@RequestMapping(value="/aai_get_models_by_service_type/{namedQueryId}/{globalCustomerId}/{serviceType}", method = RequestMethod.GET)
+	public ResponseEntity viewEditGetComponentList(
+			@PathVariable("namedQueryId") String namedQueryId,
+			@PathVariable("globalCustomerId") String globalCustomerId,
+			@PathVariable("serviceType") String serviceType) { 
+
+		String componentListPayload = getModelsByServiceTypePayload(namedQueryId, globalCustomerId, serviceType);
+		File certiPath = GetCertificatesPath();
+
+		Response resp = doAaiPost(certiPath.getAbsolutePath(), "search/named-query", componentListPayload, false); 
+        return convertResponseToResponseEntity(resp);
+	}
+	
+	/**
+	 * Parses the for tenants.
+	 *
+	 * @param resp the resp
+	 * @return the string
+	 */
+	private String parseForTenants(String resp)
+	{
+		String tenantList = "";
+
+		try
+		{
+			JSONParser jsonParser = new JSONParser();
+
+			JSONObject jsonObject = (JSONObject) jsonParser.parse(resp);
+
+			return  parseCustomerObjectForTenants(jsonObject);
+		}
+		catch (Exception ex) {
+
+		}
+
+		return tenantList;
+	}
+
+	/**
+	 * Parses the for tenants by service subscription.
+	 *
+	 * @param resp the resp
+	 * @return the string
+	 */
+	private String parseForTenantsByServiceSubscription(String resp)
+	{
+		String tenantList = "";
+
+		try
+		{
+			JSONParser jsonParser = new JSONParser();
+
+			JSONObject jsonObject = (JSONObject) jsonParser.parse(resp);
+
+			return  parseServiceSubscriptionObjectForTenants(jsonObject);
+		}
+		catch (Exception ex) {
+
+		}
+
+		return tenantList;
+	}
+
+
+	//	@RequestMapping(value="/aai_get_tenants/{global-customer-id}", method = RequestMethod.GET)
+	//	public ResponseEntity viewEditGetComponentList(
+	//			@PathVariable("global-customer-id") String globalCustomerId) {
+	//		return new ResponseEntity(getTenants(globalCustomerId), HttpStatus.OK);
+	//	}
+
+	/**
+	 * Obtain tenants for a given service type.
+	 *
+	 * @param globalCustomerId the global customer id
+	 * @param serviceType the service type
+	 * @return ResponseEntity The response entity
+	 */
+	@RequestMapping(value="/aai_get_tenants/{global-customer-id}/{service-type}", method = RequestMethod.GET)
+	public ResponseEntity viewEditGetTenantsFromServiceType(
+			@PathVariable("global-customer-id") String globalCustomerId, @PathVariable("service-type") String serviceType) {
+        return getTenantsFromServiceType(globalCustomerId, serviceType);
+	}
+
+	private ResponseEntity convertResponseToResponseEntity(Response resp) { 
+		ResponseEntity respEnt;
+		if (resp == null) { 
+			respEnt = new ResponseEntity("Failed to fetch data from A&AI, check server logs for details.", HttpStatus.INTERNAL_SERVER_ERROR);
+		} else { 
+			respEnt = new ResponseEntity((String)resp.readEntity(String.class), HttpStatus.valueOf(resp.getStatus()));
+		}
+		return respEnt;
+	}
+
+	/**
+	 * Gets the tenants.
+	 *
+	 * @param globalCustomerId the global customer id
+	 * @return the tenants
+	 */
+	private ResponseEntity getTenants(String globalCustomerId)
+	{
+		File certiPath = GetCertificatesPath();
+        Response resp = doAaiGet(certiPath.getAbsolutePath(), "business/customers/customer/" + globalCustomerId, false);
+        
+        ResponseEntity respEnt;
+        if (resp.getStatus() >= 200 && resp.getStatus() <= 299) { 
+            respEnt = new ResponseEntity(parseForTenants((String)resp.readEntity(String.class)), HttpStatus.OK);
+        } else {
+            respEnt = new ResponseEntity((String)resp.readEntity(String.class), HttpStatus.valueOf(resp.getStatus()));
+        }
+        return respEnt;
+
+	}
+
+	/**
+	 * Gets the tenants from service type.
+	 *
+	 * @param globalCustomerId the global customer id
+	 * @param serviceType the service type
+	 * @return the tenants from service type
+	 */
+	private ResponseEntity getTenantsFromServiceType(String globalCustomerId, String serviceType)
+	{
+		File certiPath = GetCertificatesPath();
+        String url = "business/customers/customer/" + globalCustomerId + "/service-subscriptions/service-subscription/" + serviceType;
+
+        Response resp = doAaiGet(certiPath.getAbsolutePath(), url, false);
+        
+        ResponseEntity respEnt;
+        if (resp.getStatus() >= 200 && resp.getStatus() <= 299) { 
+            respEnt = new ResponseEntity(parseForTenantsByServiceSubscription((String)resp.readEntity(String.class)), HttpStatus.OK);
+        } else {
+            respEnt = new ResponseEntity((String)resp.readEntity(String.class), HttpStatus.valueOf(resp.getStatus()));
+        }
+        return respEnt;
+
+	}
+
+	/**
+	 * Gets the services.
+	 *
+	 * @return the services
+	 */
+	private Response getServices()
+	{
+		File certiPath = GetCertificatesPath();
+        Response resp  = doAaiGet(certiPath.getAbsolutePath(), "service-design-and-creation/services", false);
+        logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + "getServices() resp=" + resp.getStatusInfo());
+
+		//model.put("aai_get_services", resp);
+		return resp;
+	}
+
+
+	/**
+	 * Gets the subscribers.
+	 *
+	 * @param isFullSet the is full set
+	 * @return the subscribers
+	 */
+	private Response getSubscribers(boolean isFullSet)
+	{
+		File certiPath = GetCertificatesPath();
+		String depth = "0";
+
+        Response resp = doAaiGet(certiPath.getAbsolutePath(), "business/customers?subscriber-type=INFRA&depth=" + depth, false);
+        if (resp != null) { 
+        	logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + "getSubscribers() resp=" + resp.getStatusInfo().toString());
+        }
+		return resp;
+	}
+
+	
+	
+	/**
+	 * Gets the subscriber details.
+	 *
+	 * @param subscriberId the subscriber id
+	 * @return the subscriber details
+	 */
+	private Response getSubscriberDetails(String subscriberId)
+	{
+		File certiPath = GetCertificatesPath();
+		Response resp = doAaiGet(certiPath.getAbsolutePath(), "business/customers/customer/" + subscriberId + "?depth=2", false);
+		//String resp = doAaiGet(certiPath.getAbsolutePath(), "business/customers/customer/" + subscriberId, false);
+		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + "getSubscriberDetails() resp=" + resp.getStatusInfo().toString());
+		return resp;
+	}
+
+	/**
+	 * Gets the certificates path.
+	 *
+	 * @return the file
+	 */
+	private File GetCertificatesPath()
+	{
+		if (servletContext != null)
+			return new File( servletContext.getRealPath("/WEB-INF/cert/") );
+		return null;
+	}
+
+	/**
+	 * Send a GET request to a&ai.
+	 *
+	 * @param certiPath the certi path
+	 * @param uri the uri
+	 * @param xml the xml
+	 * @return String The response
+	 */
+	protected Response doAaiGet(String certiPath, String uri, boolean xml) {
+		String methodName = "getSubscriberList";		
+		String transId = UUID.randomUUID().toString();
+		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
+
+		Response resp = null;
+		try {
+
+			AAIRestInterface restContrller = new AAIRestInterface(certiPath);
+			resp = restContrller.RestGet(fromAppId, transId, uri, xml);
+
+		} catch (WebApplicationException e) {
+			final String message = ((BadRequestException) e).getResponse().readEntity(String.class);
+			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + message);
+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + message);
+		} catch (Exception e) {
+			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
+		}
+
+		return resp;
+	}
+
+	/**
+	 * Send a POST request to a&ai.
+	 *
+	 * @param certiPath the certi path
+	 * @param uri the uri
+	 * @param payload the payload
+	 * @param xml the xml
+	 * @return String The response
+	 */
+	protected Response doAaiPost(String certiPath, String uri, String payload, boolean xml) {
+		String methodName = "getSubscriberList";		
+		String transId = UUID.randomUUID().toString();
+		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
+
+		Response resp = null;
+		try {
+
+			AAIRestInterface restContrller = new AAIRestInterface(certiPath);
+			resp = restContrller.RestPost(fromAppId, transId, uri, payload, xml);
+
+		} catch (Exception e) {
+			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
+		}
+
+		return resp;
+	}
+
+	/**
+	 * Gets the component list put payload.
+	 *
+	 * @param namedQueryId the named query id
+	 * @param globalCustomerId the global customer id
+	 * @param serviceType the service type
+	 * @param serviceInstance the service instance
+	 * @return the component list put payload
+	 */
+	private String getComponentListPutPayload(String namedQueryId, String globalCustomerId, String serviceType, String serviceInstance) {
+		return 
+				"		{" +
+				"    \"instance-filters\": {" +
+				"        \"instance-filter\": [" +
+				"            {" +
+				"                \"customer\": {" +
+				"                    \"global-customer-id\": \"" + globalCustomerId + "\"" +
+				"                }," +
+				"                \"service-instance\": {" +
+				"                    \"service-instance-id\": \"" + serviceInstance + "\"" +
+				"                }," +
+				"                \"service-subscription\": {" +
+				"                    \"service-type\": \"" + serviceType + "\"" +
+				"                }" +
+				"            }" +
+				"        ]" +
+				"    }," +
+				"    \"query-parameters\": {" +
+				"        \"named-query\": {" +
+				"            \"named-query-uuid\": \"" + namedQueryId + "\"" +
+				"        }" +
+				"    }" +
+				"}";
+
+	}
+	private String getModelsByServiceTypePayload(String namedQueryId, String globalCustomerId, String serviceType) {
+		// TODO Auto-generated method stub
+		return 			"		{" +
+		"    \"instance-filters\": {" +
+		"        \"instance-filter\": [" +
+		"            {" +
+		"                \"customer\": {" +
+		"                    \"global-customer-id\": \"" + globalCustomerId + "\"" +
+		"                }," +
+		"                \"service-subscription\": {" +
+		"                    \"service-type\": \"" + serviceType + "\"" +
+		"                }" +
+		"            }" +
+		"        ]" +
+		"    }," +
+		"    \"query-parameters\": {" +
+		"        \"named-query\": {" +
+		"            \"named-query-uuid\": \"" + namedQueryId + "\"" +
+		"        }" +
+		"    }" +
+		"}";
+	
+	}
+
+	/**
+	 * Return tenant details.
+	 *
+	 * @param jsonObject the json object
+	 * @return String The parsing results
+	 */
+	public static String parseCustomerObjectForTenants(JSONObject jsonObject) {
+
+		JSONArray tenantArray = new JSONArray();
+		boolean bconvert = false;
+
+		try {
+
+			JSONObject serviceSubsObj = (JSONObject) jsonObject.get("service-subscriptions");
+
+			if (serviceSubsObj != null)
+			{
+				JSONArray srvcSubArray = (JSONArray) serviceSubsObj.get("service-subscription");
+
+				if (srvcSubArray != null)
+				{
+					Iterator i = srvcSubArray.iterator();
+
+					while (i.hasNext()) {
+
+						JSONObject innerObj = (JSONObject) i.next();
+
+						if (innerObj == null)
+							continue;
+
+						JSONObject relationShipListsObj = (JSONObject) innerObj.get("relationship-list");
+						if (relationShipListsObj != null)
+						{
+							JSONArray rShipArray = (JSONArray) relationShipListsObj.get("relationship");
+							if (rShipArray != null)
+							{
+								Iterator i1 = rShipArray.iterator();
+
+								while (i1.hasNext()) {
+
+									JSONObject inner1Obj = (JSONObject) i1.next();
+
+									if (inner1Obj == null)
+										continue;
+
+									String relatedTo = checkForNull((String)inner1Obj.get("related-to"));
+									if (relatedTo.equalsIgnoreCase("tenant"))
+									{
+										JSONObject tenantNewObj = new JSONObject();
+
+										String relatedLink = checkForNull((String) inner1Obj.get("related-link"));
+										tenantNewObj.put("link", relatedLink);
+
+										JSONArray rDataArray = (JSONArray) inner1Obj.get("relationship-data");
+										if (rDataArray != null)
+										{
+											Iterator i2 = rDataArray.iterator();
+
+											while (i2.hasNext()) {
+												JSONObject inner2Obj = (JSONObject) i2.next();
+
+												if (inner2Obj == null)
+													continue;
+
+												String rShipKey = checkForNull((String)inner2Obj.get("relationship-key"));
+												String rShipVal = checkForNull((String)inner2Obj.get("relationship-value"));
+												if (rShipKey.equalsIgnoreCase("cloud-region.cloud-owner"))
+												{
+													tenantNewObj.put("cloudOwner", rShipVal);
+												}
+												else if (rShipKey.equalsIgnoreCase("cloud-region.cloud-region-id"))
+												{
+													tenantNewObj.put("cloudRegionID", rShipVal);
+												}
+
+												if (rShipKey.equalsIgnoreCase("tenant.tenant-id"))
+												{
+													tenantNewObj.put("tenantID", rShipVal);
+												}
+											}
+										}
+
+										JSONArray relatedTPropArray = (JSONArray) inner1Obj.get("related-to-property");
+										if (relatedTPropArray != null)
+										{
+											Iterator i3 = relatedTPropArray.iterator();
+
+											while (i3.hasNext()) {
+												JSONObject inner3Obj = (JSONObject) i3.next();
+
+												if (inner3Obj == null)
+													continue;
+
+												String propKey = checkForNull((String)inner3Obj.get("property-key"));
+												String propVal = checkForNull((String)inner3Obj.get("property-value"));
+												if (propKey.equalsIgnoreCase("tenant.tenant-name"))
+												{
+													tenantNewObj.put("tenantName", propVal);
+												}
+											}
+										}
+										bconvert = true;
+										tenantArray.add(tenantNewObj);
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		} catch (NullPointerException ex) {
+
+
+		}
+
+		if (bconvert)
+			return tenantArray.toJSONString();
+		else
+			return "";
+
+	}
+
+
+	/**
+	 * Retrieve the service subscription from the jsonObject.
+	 *
+	 * @param jsonObject the json object
+	 * @return String
+	 */
+	public static String parseServiceSubscriptionObjectForTenants(JSONObject jsonObject) {
+
+		JSONArray tenantArray = new JSONArray();
+		boolean bconvert = false;
+
+		try {
+			JSONObject relationShipListsObj = (JSONObject) jsonObject.get("relationship-list");
+			if (relationShipListsObj != null)
+			{
+				JSONArray rShipArray = (JSONArray) relationShipListsObj.get("relationship");
+				if (rShipArray != null)
+				{
+					Iterator i1 = rShipArray.iterator();
+
+					while (i1.hasNext()) {
+
+						JSONObject inner1Obj = (JSONObject) i1.next();
+
+						if (inner1Obj == null)
+							continue;
+
+						String relatedTo = checkForNull((String)inner1Obj.get("related-to"));
+						if (relatedTo.equalsIgnoreCase("tenant"))
+						{
+							JSONObject tenantNewObj = new JSONObject();
+
+							String relatedLink = checkForNull((String) inner1Obj.get("related-link"));
+							tenantNewObj.put("link", relatedLink);
+
+							JSONArray rDataArray = (JSONArray) inner1Obj.get("relationship-data");
+							if (rDataArray != null)
+							{
+								Iterator i2 = rDataArray.iterator();
+
+								while (i2.hasNext()) {
+									JSONObject inner2Obj = (JSONObject) i2.next();
+
+									if (inner2Obj == null)
+										continue;
+
+									String rShipKey = checkForNull((String)inner2Obj.get("relationship-key"));
+									String rShipVal = checkForNull((String)inner2Obj.get("relationship-value"));
+									if (rShipKey.equalsIgnoreCase("cloud-region.cloud-owner"))
+									{
+										tenantNewObj.put("cloudOwner", rShipVal);
+									}
+									else if (rShipKey.equalsIgnoreCase("cloud-region.cloud-region-id"))
+									{
+										tenantNewObj.put("cloudRegionID", rShipVal);
+									}
+
+									if (rShipKey.equalsIgnoreCase("tenant.tenant-id"))
+									{
+										tenantNewObj.put("tenantID", rShipVal);
+									}
+								}
+							}
+
+							JSONArray relatedTPropArray = (JSONArray) inner1Obj.get("related-to-property");
+							if (relatedTPropArray != null)
+							{
+								Iterator i3 = relatedTPropArray.iterator();
+
+								while (i3.hasNext()) {
+									JSONObject inner3Obj = (JSONObject) i3.next();
+
+									if (inner3Obj == null)
+										continue;
+
+									String propKey = checkForNull((String)inner3Obj.get("property-key"));
+									String propVal = checkForNull((String)inner3Obj.get("property-value"));
+									if (propKey.equalsIgnoreCase("tenant.tenant-name"))
+									{
+										tenantNewObj.put("tenantName", propVal);
+									}
+								}
+							}
+							bconvert = true;
+							tenantArray.add(tenantNewObj);
+						}
+					}
+
+				}
+			}
+		} catch (NullPointerException ex) {
+
+
+		}
+
+		if (bconvert)
+			return tenantArray.toJSONString();
+		else
+			return "";
+
+	}
+
+	/**
+	 * Check for null.
+	 *
+	 * @param local the local
+	 * @return the string
+	 */
+	private static String checkForNull(String local)
+	{
+		if (local != null)
+			return local;
+		else
+			return "";
+
+	}
+}
+
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/controller/BrowseServiceTypesController.java b/vid-app-common/src/main/java/org/openecomp/vid/controller/BrowseServiceTypesController.java
new file mode 100755
index 000000000..0698cfd9c
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/controller/BrowseServiceTypesController.java
@@ -0,0 +1,87 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.controller;
+
+
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
+
+
+/**
+ * The Class BrowseServiceTypesController.
+ */
+@RestController
+public class BrowseServiceTypesController extends RestrictedBaseController{
+	
+	/** The view name. */
+	String viewName;
+	
+	/** The logger. */
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(BrowseServiceTypesController.class);
+	
+	/** The Constant dateFormat. */
+	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
+	
+	/** The servlet context. */
+	private @Autowired ServletContext servletContext;
+	
+	/**
+	 * Welcome.
+	 *
+	 * @param request the request
+	 * @return the model and view
+	 */
+	@RequestMapping(value = {"/browseservicetypes" }, method = RequestMethod.GET)
+	public ModelAndView welcome(HttpServletRequest request) {
+		
+ 	return new ModelAndView(getViewName());		
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#getViewName()
+	 */
+	public String getViewName() {
+		return viewName;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#setViewName(java.lang.String)
+	 */
+	public void setViewName(String viewName) {
+		this.viewName = viewName;
+	}
+
+
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/controller/HealthCheckController.java b/vid-app-common/src/main/java/org/openecomp/vid/controller/HealthCheckController.java
new file mode 100755
index 000000000..abef8d62b
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/controller/HealthCheckController.java
@@ -0,0 +1,196 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.controller;
+
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import org.openecomp.portalsdk.core.controller.UnRestrictedBaseController;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.openecomp.vid.dao.FnAppDoaImpl;
+
+/**
+ * Controller for user profile view. The view is restricted to authenticated
+ * users. The view name resolves to page user_profile.jsp which uses Angular.
+ */
+
+@RestController
+@RequestMapping("/")
+public class HealthCheckController extends UnRestrictedBaseController {
+
+
+	/** The logger. */
+		EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(HealthCheckController.class);
+		
+		/** The Constant dateFormat. */
+		final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
+		
+	   private static final String HEALTH_CHECK_PATH = "/healthCheck";
+	   
+	   /**
+		 * Model for JSON response with health-check results.
+		 */
+		public class HealthStatus {
+			// Either 200 or 500
+			public int statusCode;
+			
+			// Additional detail in case of error, empty in case of success.
+			public String message;
+			
+			public String date;
+
+			public HealthStatus(int code, String msg) {
+				this.statusCode = code;
+				this.message = msg;
+			}
+			
+			public HealthStatus(int code,String date, String msg) {
+				this.statusCode = code;
+				this.message = msg;
+				this.date=date;
+			}
+
+			public int getStatusCode() {
+				return statusCode;
+			}
+
+			public void setStatusCode(int code) {
+				this.statusCode = code;
+			}
+
+			public String getMessage() {
+				return message;
+			}
+
+			public void setMessage(String msg) {
+				this.message = msg;
+			}
+			
+			public String getDate() {
+				return date;
+			}
+
+			public void setDate(String date) {
+				this.date = date;
+			}
+
+		}
+  
+	   @SuppressWarnings("unchecked")
+		public int getProfileCount(String driver, String URL, String username, String password) {
+		   FnAppDoaImpl doa= new FnAppDoaImpl();
+		   int count= doa.getProfileCount(driver,URL,username,password);
+			return count;
+		}
+	   
+	   
+	   
+		/**
+		 * Obtain the HealthCheck Status from the System.Properties file.
+		 * Used by IDNS for redundancy
+		 * @return ResponseEntity The response entity
+		 * @throws IOException Signals that an I/O exception has occurred.
+		 * @throws InterruptedException the interrupted exception
+		 */	
+		@RequestMapping(value="/healthCheck",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)  	
+		public HealthStatus gethealthCheckStatusforIDNS() throws IOException, InterruptedException {
+
+			String driver = SystemProperties.getProperty("db.driver");
+			String URL = SystemProperties.getProperty("db.connectionURL");
+			String username = SystemProperties.getProperty("db.userName");
+			String password = SystemProperties.getProperty("db.password");
+			
+			logger.debug(EELFLoggerDelegate.debugLogger, "driver ::" + driver);
+			logger.debug(EELFLoggerDelegate.debugLogger, "URL::" + URL);
+			logger.debug(EELFLoggerDelegate.debugLogger, "username::" + username);
+			logger.debug(EELFLoggerDelegate.debugLogger,"password::" + password);
+			
+			
+			HealthStatus healthStatus = null;   
+			try {
+				logger.debug(EELFLoggerDelegate.debugLogger, "Performing health check");
+				int count=getProfileCount(driver,URL,username,password);
+				logger.debug(EELFLoggerDelegate.debugLogger,"count:::"+count);
+				healthStatus = new HealthStatus(200, "health check succeeded");
+			} catch (Exception ex) {
+			
+				logger.error(EELFLoggerDelegate.errorLogger, "Failed to perform health check", ex);
+				healthStatus = new HealthStatus(500, "health check failed: " + ex.toString());
+			}
+			return healthStatus;
+		}
+		
+		/**
+		 * Obtain the  HealthCheck Status from the System.Properties file.
+		 *
+		 * @return ResponseEntity The response entity
+		 * @throws IOException Signals that an I/O exception has occurred.
+		 * @throws InterruptedException the interrupted exception
+		 * Project :
+		 */	
+		@RequestMapping(value="rest/healthCheck/{User-Agent}/{X-ECOMP-RequestID}",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)  	
+		public HealthStatus getHealthCheck(
+				@PathVariable("User-Agent") String UserAgent,
+				@PathVariable("X-ECOMP-RequestID") String ECOMPRequestID) throws IOException, InterruptedException {
+
+			String driver = SystemProperties.getProperty("db.driver");
+			String URL = SystemProperties.getProperty("db.connectionURL");
+			String username = SystemProperties.getProperty("db.userName");
+			String password = SystemProperties.getProperty("db.password");
+			
+				logger.debug(EELFLoggerDelegate.debugLogger, "driver ::" + driver);
+				logger.debug(EELFLoggerDelegate.debugLogger, "URL::" + URL);
+				logger.debug(EELFLoggerDelegate.debugLogger, "username::" + username);
+				logger.debug(EELFLoggerDelegate.debugLogger,"password::" + password);
+				
+			
+			HealthStatus healthStatus = null;   
+			try {
+				logger.debug(EELFLoggerDelegate.debugLogger, "Performing health check");
+				logger.debug(EELFLoggerDelegate.debugLogger, "User-Agent" + UserAgent);
+				logger.debug(EELFLoggerDelegate.debugLogger, "X-ECOMP-RequestID" + ECOMPRequestID);
+
+				
+				int count=getProfileCount(driver,URL,username,password);
+				
+				logger.debug(EELFLoggerDelegate.debugLogger,"count:::"+count);
+				healthStatus = new HealthStatus(200,dateFormat.format(new Date()) ,"health check succeeded");
+			} catch (Exception ex) {
+			
+				logger.error(EELFLoggerDelegate.errorLogger, "Failed to perform health check", ex);
+				healthStatus = new HealthStatus(500,dateFormat.format(new Date()),"health check failed: " + ex.toString());
+			}
+			return healthStatus;
+		}
+}
+
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/controller/MsoController.java b/vid-app-common/src/main/java/org/openecomp/vid/controller/MsoController.java
new file mode 100755
index 000000000..f051ed389
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/controller/MsoController.java
@@ -0,0 +1,761 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.controller;
+
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+//import java.util.UUID;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Scanner;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.codehaus.jackson.JsonEncoding;
+import org.codehaus.jackson.JsonFactory;
+import org.codehaus.jackson.JsonGenerator;
+import org.codehaus.jackson.JsonParser;
+import org.codehaus.jackson.JsonToken;
+import org.glassfish.jersey.client.ClientResponse;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.openecomp.vid.domain.mso.CloudConfiguration;
+import org.openecomp.vid.domain.mso.ModelInfo;
+import org.openecomp.vid.domain.mso.ModelInfo.ModelType;
+import org.openecomp.vid.domain.mso.RequestInfo;
+import org.openecomp.vid.domain.mso.RequestParameters;
+import org.openecomp.vid.model.ExceptionResponse;
+import org.openecomp.vid.mso.MsoProperties;
+import org.openecomp.vid.mso.MsoResponseWrapper;
+import org.openecomp.vid.mso.MsoRestInterfaceFactory;
+import org.openecomp.vid.mso.MsoRestInterfaceIfc;
+import org.openecomp.vid.mso.MsoUtil;
+import org.openecomp.vid.mso.RestObject;
+import org.openecomp.vid.mso.rest.RelatedModel;
+import org.openecomp.vid.mso.rest.RequestDetails;
+import org.springframework.http.HttpStatus;
+//import org.springframework.http.ResponseEntity;
+//import org.springframework.http.RequestEntity;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectReader;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+
+/**
+ * The Class MsoController.
+ */
+@RestController
+@RequestMapping("mso")
+public class MsoController extends RestrictedBaseController{
+	
+	/** The view name. */
+	String viewName;
+	
+	/** The logger. */
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MsoController.class);
+	
+	/** The Constant dateFormat. */
+	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
+	
+	/** The Constant SVC_INSTANCE_ID. */
+	public final static String SVC_INSTANCE_ID = "";
+	
+	/** The Constant VNF_INSTANCE_ID. */
+	public final static String VNF_INSTANCE_ID = "";
+	
+	/**
+	 * Welcome.
+	 *
+	 * @param request the request
+	 * @return the model and view
+	 
+	public ModelAndView welcome(HttpServletRequest request) {
+		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== MsoController welcome start");
+		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + " MSO_SERVER_URL=" +
+				 SystemProperties.getProperty(MsoProperties.MSO_SERVER_URL) );
+		return new ModelAndView(getViewName());		
+	}
+	*/
+
+	/* (non-Javadoc)
+	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#getViewName()
+	 
+	public String getViewName() {
+		return viewName;
+	}
+	*/
+
+	/* (non-Javadoc)
+	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#setViewName(java.lang.String)
+	 
+	public void setViewName(String viewName) {
+		this.viewName = viewName;
+	}
+	*/
+
+	/**
+	 * Creates the svc instance.
+	 *
+	 * @param request the request
+	 * @return the response entity
+	 * @throws Exception the exception
+	 */
+	@RequestMapping(value = "/mso_create_svc_instance", method = RequestMethod.POST)
+	public ResponseEntity createSvcInstance(HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {
+		String methodName = "createSvcInstance";
+		
+		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start" );
+		
+//		mso_request = retrieveRequestObject (request, mso_request);
+
+		String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_SVC_INSTANCE);
+	    
+		MsoResponseWrapper w = createInstance(mso_request, p);
+		// always return OK, the MSO status code is embedded in the body
+		
+        return ( new ResponseEntity(w.getResponse(), HttpStatus.OK) );
+	
+	}
+	
+	/**
+	 * Creates the vnf.
+	 *
+	 * @param serviceInstanceId the service instance id
+	 * @param request the request
+	 * @return the response entity
+	 * @throws Exception the exception
+	 */
+	@RequestMapping(value="/mso_create_vnf_instance/{serviceInstanceId}", method = RequestMethod.POST)  	
+	public ResponseEntity createVnf(@PathVariable("serviceInstanceId") String serviceInstanceId, HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {
+		
+		String methodName = "createVnf";		
+		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
+		
+		//RequestDetails mso_request = retrieveRequestObject (request);
+	    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_VNF_INSTANCE);
+	    
+	    if ( p == null || p.isEmpty()) {
+	    	throw new Exception ( "Vnf instance path is not defined");
+	    }
+	    // /serviceInstances/v2//vnfs
+	    String vnf_path = p.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId );
+	    MsoResponseWrapper w = createInstance(mso_request, vnf_path);
+
+		// always return OK, the MSO status code is embedded in the body
+		
+        return ( new ResponseEntity(w.getResponse(), HttpStatus.OK) );
+	
+	}
+	
+	/**
+	 * Creates the nw instance.
+	 *
+	 * @param serviceInstanceId the service instance id
+	 * @param request the request
+	 * @return the response entity
+	 * @throws Exception the exception
+	 */
+	@RequestMapping(value = "/mso_create_nw_instance/{serviceInstanceId}", method = RequestMethod.POST)
+	public ResponseEntity createNwInstance(@PathVariable("serviceInstanceId") String serviceInstanceId, HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {
+	
+		String methodName = "createNwInstance";		
+		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start, serviceInstanceId = " + serviceInstanceId  );
+		
+		//RequestDetails mso_request = retrieveRequestObject (request);
+		
+	    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_NETWORK_INSTANCE);
+	    
+	    if ( p == null || p.isEmpty()) {
+	    	throw new Exception ( "Network instance path is not defined");
+	    }
+	    // /serviceInstances/v2//networks/
+	    
+	    String nw_path = p.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId );
+	    MsoResponseWrapper w = createInstance(mso_request, nw_path);
+	   
+		// always return OK, the MSO status code is embedded in the body
+		
+        return ( new ResponseEntity(w.getResponse(), HttpStatus.OK) );
+	
+	}
+	
+	/**
+	 * Creates the volume group instance.
+	 *
+	 * @param serviceInstanceId the service instance id
+	 * @param vnfInstanceId the vnf instance id
+	 * @param request the request
+	 * @return the response entity
+	 * @throws Exception the exception
+	 */
+	@RequestMapping(value = "/mso_create_volumegroup_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}", method = RequestMethod.POST)
+	public ResponseEntity createVolumeGroupInstance(@PathVariable("serviceInstanceId") String serviceInstanceId, @PathVariable("vnfInstanceId") String vnfInstanceId, 
+			HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {
+		String methodName = "createVolumeGroupInstance";
+		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
+		
+		//RequestDetails mso_request = retrieveRequestObject (request);
+		String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_VOLUME_GROUP_INSTANCE);
+	    
+	    if ( p == null || p.isEmpty()) {
+	    	throw new Exception ( "Volume group instance path is not defined");
+	    }
+	    String path = p.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId);
+	    path = path.replaceFirst(VNF_INSTANCE_ID, vnfInstanceId);
+	    
+	    MsoResponseWrapper w = createInstance(mso_request, path);
+        
+		// always return OK, the MSO status code is embedded in the body
+        return ( new ResponseEntity(w.getResponse(), HttpStatus.OK) );
+	}
+	
+	/**
+	 * Creates the vf module instance.
+	 *
+	 * @param serviceInstanceId the service instance id
+	 * @param vnfInstanceId the vnf instance id
+	 * @param request the request
+	 * @return the response entity
+	 * @throws Exception the exception
+	 */
+	@RequestMapping(value = "/mso_create_vfmodule_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}", method = RequestMethod.POST)
+	public ResponseEntity createVfModuleInstance(@PathVariable("serviceInstanceId") String serviceInstanceId, 
+			@PathVariable("vnfInstanceId") String vnfInstanceId, HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {
+		String methodName = "createVfModuleInstance";		
+		
+		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
+		//RequestDetails mso_request = retrieveRequestObject (request);
+	    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_VF_MODULE_INSTANCE);
+	    
+	    if ( p == null || p.isEmpty()) {
+	    	throw new Exception ( "VF module instance path is not defined");
+	    }
+	    // /serviceInstances/v2//vnfs//vfmodules
+	    String path = p.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId);
+	    path = path.replaceFirst(VNF_INSTANCE_ID, vnfInstanceId);
+	    
+	    MsoResponseWrapper w = createInstance(mso_request, path);
+		
+		// always return OK, the MSO status code is embedded in the body
+		
+        return ( new ResponseEntity(w.getResponse(), HttpStatus.OK) );
+	}
+	
+	/**
+	 * Creates the instance.
+	 *
+	 * @param request the request
+	 * @param path the path
+	 * @return the mso response wrapper
+	 * @throws ClientHandlerException the client handler exception
+	 * @throws Exception the exception
+	 */
+	protected MsoResponseWrapper createInstance(RequestDetails request, String path) throws Exception {
+		String methodName = "createInstance";	
+		logger.debug(dateFormat.format(new Date()) + "<== " + methodName + " start");
+		
+		try {
+			MsoRestInterfaceIfc restController = MsoRestInterfaceFactory.getInstance();
+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " calling Post, request = (" + request + ")");	
+			
+			RestObject restObjStr = new RestObject();
+			String str = new String();
+			restObjStr.set(str);
+			restController.Post(str, request, "", path, restObjStr );
+			MsoResponseWrapper w = MsoUtil.wrapResponse (restObjStr);
+			
+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " w=" + w.getResponse());
+			return w;
+		} catch (Exception e) {
+			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
+			throw e;
+		}
+	}
+	
+	/**
+	 * Delete svc instance.
+	 *
+	 * @param serviceInstanceId the service instance id
+	 * @param request the request
+	 * @return the response entity
+	 * @throws Exception the exception
+	 */
+	@RequestMapping(value = "/mso_delete_svc_instance/{serviceInstanceId}", method = RequestMethod.POST)
+	public ResponseEntity deleteSvcInstance(@PathVariable("serviceInstanceId") String serviceInstanceId,
+			HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {
+		
+		String methodName = "deleteSvcInstance";	
+		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
+		
+		//RequestDetails mso_request = retrieveRequestObject (request);
+	    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_SVC_INSTANCE);
+	    String path = p + "/" + serviceInstanceId;
+	    MsoResponseWrapper w = deleteInstance ( mso_request, path );
+	  
+		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " w=" + w.getResponse());
+		// always return OK, the MSO status code is embedded in the body
+  		
+        return ( new ResponseEntity(w.getResponse(), HttpStatus.OK) );
+	    
+	}
+	
+	/**
+	 * Delete vnf.
+	 *
+	 * @param serviceInstanceId the service instance id
+	 * @param vnfInstanceId the vnf instance id
+	 * @param request the request
+	 * @return the response entity
+	 * @throws Exception the exception
+	 */
+	@RequestMapping(value = "/mso_delete_vnf_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}", method = RequestMethod.POST)
+	
+	public ResponseEntity deleteVnf(@PathVariable("serviceInstanceId") String serviceInstanceId, @PathVariable("vnfInstanceId") String vnfInstanceId, 
+			HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {
+		String methodName = "deleteVnf";		
+		
+		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
+		
+		//RequestDetails mso_request = retrieveRequestObject (request);
+	    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_VNF_INSTANCE);
+	    if ( p == null || p.isEmpty()) {
+	    	throw new Exception ( "Vnf instance path is not defined");
+	    }
+	    // /serviceInstances/v2//vnfs/
+	    String vnf_path = p.replaceFirst(SVC_INSTANCE_ID, vnfInstanceId );
+	    MsoResponseWrapper w = deleteInstance ( mso_request, vnf_path + "/" + vnfInstanceId );
+	    
+		// always return OK, the MSO status code is embedded in the body
+        return ( new ResponseEntity(w.getResponse(), HttpStatus.OK) );
+		
+	}
+							  
+  							/**
+  							 * Delete vf module.
+  							 *
+  							 * @param serviceInstanceId the service instance id
+  							 * @param vnfInstanceId the vnf instance id
+  							 * @param vfModuleId the vf module id
+  							 * @param request the request
+  							 * @return the response entity
+  							 * @throws Exception the exception
+  							 */
+  							//mso_delete_vf_module/bc305d54-75b4-431b-adb2-eb6b9e546014/vnfs/fe9000-0009-9999/vfmodules/abeeee-abeeee-abeeee
+	@RequestMapping(value = "/mso_delete_vfmodule_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfModuleId}", method = RequestMethod.POST)
+	public ResponseEntity deleteVfModule (
+			@PathVariable("serviceInstanceId") String serviceInstanceId, @PathVariable("vnfInstanceId") String vnfInstanceId,
+			@PathVariable("vfModuleId") String vfModuleId, HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {
+		
+		String methodName = "deleteVfModule";
+		
+		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
+		
+		//RequestDetails mso_request = new RequestDetails();
+		//mso_request = retrieveRequestObject (request);
+	    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_VF_MODULE_INSTANCE);
+	    if ( p == null || p.isEmpty()) {
+	    	throw new Exception ( "VF Module instance path is not defined");
+	    }
+	    // /serviceInstances/v2//vnfs//vfmodules
+	    String path = p.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId );
+	    path = path.replaceFirst(VNF_INSTANCE_ID, vnfInstanceId );
+	    MsoResponseWrapper w = deleteInstance ( mso_request, path + "/" + vfModuleId);
+	    
+		// always return OK, the MSO status code is embedded in the body
+        return ( new ResponseEntity(w.getResponse(), HttpStatus.OK) );
+
+	}
+
+	/**
+	 * Delete volume group instance.
+	 *
+	 * @param serviceInstanceId the service instance id
+	 * @param vnfInstanceId the vnf instance id
+	 * @param volumeGroupId the volume group id
+	 * @param request the request
+	 * @return the response entity
+	 * @throws Exception the exception
+	 */
+	@RequestMapping(value = "/mso_delete_volumegroup_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups/{volumeGroupId}", method = RequestMethod.POST)
+	public ResponseEntity deleteVolumeGroupInstance (
+			@PathVariable("serviceInstanceId") String serviceInstanceId, @PathVariable("vnfInstanceId") String vnfInstanceId, @PathVariable("volumeGroupId") String volumeGroupId,
+			HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {
+		
+		String methodName = "deleteVolumeGroupInstance";		
+		
+		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
+		//RequestDetails mso_request = retrieveRequestObject (request);
+		
+	    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_VOLUME_GROUP_INSTANCE);
+	    if ( p == null || p.isEmpty()) {
+	    	throw new Exception ( "Volume group instance path is not defined");
+	    }
+	    // /serviceInstances/v2/{serviceInstanceId}/volumeGroups
+	    String path = p.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId );
+	    path = path.replaceFirst(VNF_INSTANCE_ID, vnfInstanceId );
+	    MsoResponseWrapper w = deleteInstance ( mso_request, path + "/" + volumeGroupId);
+	    
+		// always return OK, the MSO status code is embedded in the body
+        return ( new ResponseEntity(w.getResponse(), HttpStatus.OK) );
+	}
+	
+	/**
+	 * Delete nw instance.
+	 *
+	 * @param serviceInstanceId the service instance id
+	 * @param networkInstanceId the network instance id
+	 * @param request the request
+	 * @return the response entity
+	 * @throws Exception the exception
+	 */
+	@RequestMapping(value = "/mso_delete_nw_instance/{serviceInstanceId}/networks/{networkInstanceId}", method = RequestMethod.POST)
+	public ResponseEntity deleteNwInstance(@PathVariable("serviceInstanceId") String serviceInstanceId,
+		@PathVariable("networkInstanceId") String networkInstanceId, HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {
+	
+		String methodName = "deleteNwInstance";		
+		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
+		
+		//RequestDetails mso_request = retrieveRequestObject (request);
+		
+	    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_NETWORK_INSTANCE);
+	    if ( p == null || p.isEmpty()) {
+	    	throw new Exception ( "Network instance path is not defined");
+	    }
+	    // /serviceInstances/v2//networks
+	    String path = p.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId );
+	    MsoResponseWrapper w = deleteInstance ( mso_request, path + "/" + networkInstanceId);
+	    
+		// always return OK, the MSO status code is embedded in the body
+        return ( new ResponseEntity(w.getResponse(), HttpStatus.OK) );
+	    
+	}
+	
+	/**
+	 * Delete instance.
+	 *
+	 * @param request the request
+	 * @param path the path
+	 * @return the mso response wrapper
+	 * @throws Exception the exception
+	 */
+	protected  MsoResponseWrapper deleteInstance(RequestDetails request, String path) throws Exception {
+		String methodName = "deleteInstance";	
+		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
+		
+		try {
+			MsoRestInterfaceIfc restController = MsoRestInterfaceFactory.getInstance();
+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " calling Delete, path =[" + path + "]");
+		
+			RestObject restObjStr = new RestObject();
+			String str = new String();
+			restObjStr.set(str);
+			restController.Delete(str, request, "", path, restObjStr );
+			MsoResponseWrapper w = MsoUtil.wrapResponse (restObjStr);
+			
+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " w=" + w.getResponse());
+			return w;
+
+		} catch (Exception e) {
+			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
+			throw e;
+		}
+		
+	}
+	
+	/**
+	 * Gets the orchestration request.
+	 *
+	 * @param requestId the request id
+	 * @param request the request
+	 * @return the orchestration request
+	 * @throws Exception the exception
+	 */
+	@RequestMapping(value = "/mso_get_orch_req/{requestId}", method = RequestMethod.GET)
+	public ResponseEntity getOrchestrationRequest(@PathVariable("requestId") String requestId,
+			HttpServletRequest request) throws Exception {
+		
+		String methodName = "getOrchestrationRequest";		
+		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
+		MsoResponseWrapper w = null;
+		try {
+			MsoRestInterfaceIfc restController = MsoRestInterfaceFactory.getInstance();
+		    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_GET_ORC_REQ);
+		    String path = p + "/" + requestId;
+		    
+		    RestObject restObjStr = new RestObject();
+			String str = new String();
+			restObjStr.set(str);
+
+		    restController.Get(str, "", path, restObjStr);
+		    
+		    w = MsoUtil.wrapResponse (restObjStr);
+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " w=" + w.getResponse());
+			// always return OK, the MSO status code is embedded in the body
+	  		
+		} catch (Exception e) {
+			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
+			throw e;
+		}
+		// always return OK, the MSO status code is embedded in the body
+  		return ( new ResponseEntity(w.getResponse(), HttpStatus.OK) );
+	}
+	
+	
+	/**
+	 * Gets the orchestration requests.
+	 *
+	 * @param filterString the filter string
+	 * @param request the request
+	 * @return the orchestration requests
+	 * @throws Exception the exception
+	 */
+	@RequestMapping(value = "/mso_get_orch_reqs/{filterString}", method = RequestMethod.GET)
+	public ResponseEntity getOrchestrationRequests(@PathVariable("filterString") String filterString,
+			HttpServletRequest request) throws Exception {
+		
+		String methodName = "getOrchestrationRequests";		
+		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
+		MsoResponseWrapper w = null;
+		try {
+			MsoRestInterfaceIfc restController = MsoRestInterfaceFactory.getInstance();
+		    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_GET_ORC_REQS);
+		    String path = p + filterString;
+		    
+		    RestObject restObjStr = new RestObject();
+			String str = new String();
+			restObjStr.set(str);
+
+		    restController.Get(str, "", path, restObjStr);
+		   
+		    w = MsoUtil.wrapResponse (restObjStr);
+		    logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " w=" + w.getResponse());
+		} catch (Exception e) {
+			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
+			throw e;
+		}
+		// always return OK, the MSO status code is embedded in the body
+  		return ( new ResponseEntity(w.getResponse(), HttpStatus.OK) );
+	}
+	 	
+	/**
+	 * Gets the orchestration requests for svc instance.
+	 *
+	 * @param svc_instance_id the svc instance id
+	 * @return the orchestration requests for svc instance
+	 * @throws Exception the exception
+	 */
+	public MsoResponseWrapper getOrchestrationRequestsForSvcInstance (String svc_instance_id) throws Exception {
+		
+		String methodName = "getOrchestrationRequestsForSvcInstance";		
+		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
+		MsoResponseWrapper w = null;
+		
+		try {
+			MsoRestInterfaceIfc restController = MsoRestInterfaceFactory.getInstance();
+		    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_GET_ORC_REQS);
+		    String path = p + svc_instance_id;
+		    
+		    RestObject restObjStr = new RestObject();
+			String str = new String();
+			restObjStr.set(str);
+			
+			restController.Get(str, "", path, restObjStr);
+			w = MsoUtil.wrapResponse (restObjStr);
+		    logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " w=" + w.getResponse());
+		
+		} catch (Exception e) {
+			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
+			throw e;
+		}
+		return w;
+	}
+	
+	/**
+	 * Exception handler.
+	 *
+	 * @param e the e
+	 * @param response the response
+	 * @throws IOException Signals that an I/O exception has occurred.
+	 */
+	@ExceptionHandler(Exception.class)
+	private void exceptionHandler(Exception e, HttpServletResponse response) throws IOException {
+
+		/*
+		 * The following "logger.error" lines "should" be sufficient for logging the exception.
+		 * However, the console output in my Eclipse environment is NOT showing ANY of the
+		 * logger statements in this class. Thus the temporary "e.printStackTrace" statement
+		 * is also included.
+		 */
+		
+		String methodName = "exceptionHandler";	
+		logger.error(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
+		StringWriter sw = new StringWriter();
+				e.printStackTrace(new PrintWriter(sw));
+		logger.error(EELFLoggerDelegate.errorLogger, sw.toString());
+
+		/*
+		 *  Temporary - IF the above  mentioned "logger.error" glitch is resolved ...
+		 *  this statement could be removed since it would then likely result in duplicate
+		 *  trace output. 
+		 */
+		e.printStackTrace(System.err);
+
+		response.setContentType("application/json; charset=UTF-8");
+		response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+
+		ExceptionResponse exceptionResponse = new ExceptionResponse();
+		exceptionResponse.setException(e.getClass().toString().replaceFirst("^.*\\.", ""));
+		exceptionResponse.setMessage(e.getMessage());
+
+		response.getWriter().write(new ObjectMapper().writeValueAsString(exceptionResponse));
+
+		response.flushBuffer();
+
+	}
+
+	/**
+	 * Parses the orchestration requests for svc instance.
+	 *
+	 * @param resp the resp
+	 * @return the list
+	 * @throws ParseException the parse exception
+	 * @throws Exception the exception
+	 */
+	@SuppressWarnings("unchecked")
+	public List parseOrchestrationRequestsForSvcInstance ( ClientResponse resp ) throws org.json.simple.parser.ParseException, Exception {
+		
+		String methodName = "parseOrchestrationRequestsForSvcInstance";
+		
+		ArrayList json_list = new ArrayList();
+		
+		String rlist_str = resp.readEntity (String.class);
+		logger.debug (EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + " Response string: " + rlist_str);
+		
+		JSONParser parser = new JSONParser();
+		try {
+			Object obj = parser.parse(rlist_str);
+			
+			JSONObject jsonObject = (JSONObject) obj;
+		
+			JSONArray requestList = (JSONArray) jsonObject.get("requestList");
+			
+			if ( requestList != null && ! (requestList.isEmpty()) )
+				for ( Object container : requestList) {
+			
+					JSONObject containerJsonObj = (JSONObject) container;
+					//logger.debug(dateFormat.format(new Date()) +  "<== " + "." + methodName + " reqJsonObj: " + containerJsonObj.toJSONString());
+					JSONObject reqJsonObj = (JSONObject) containerJsonObj.get("request");
+					
+					//logger.debug(dateFormat.format(new Date()) +  "<== " + "." + methodName + " reqJsonObj.requestId: " + 
+						//	reqJsonObj.get("requestId") );
+					JSONObject result = new JSONObject();
+					
+					result.put("requestId", reqJsonObj.get ("requestId"));
+					if ( reqJsonObj.get("requestType") != null ) {
+						result.put("requestType", (reqJsonObj.get("requestType").toString()));
+					}
+					JSONObject req_status = (JSONObject)reqJsonObj.get("requestStatus");
+					if ( req_status != null ) {
+						result.put("timestamp", (req_status.get("timestamp")));
+						result.put("requestState", (req_status.get("requestState")));
+						result.put("statusMessage", (req_status.get("statusMessage")));
+						result.put("percentProgress", (req_status.get("percentProgress")));
+					} 
+					json_list.add (result);
+				}
+		} catch (org.json.simple.parser.ParseException pe) {
+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + " Parse exception: " + pe.toString());
+			throw pe;
+		} catch (Exception e) {
+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + " Exception: " + e.toString());
+			throw e;
+		}
+		return ( json_list );
+	} 
+	
+	/**
+	 * Retrieve request object.
+	 *
+	 * @param request the request
+	 * @return the request details
+	 * @throws Exception the exception
+	 */
+	public RequestDetails retrieveRequestObject ( HttpServletRequest request, @RequestBody RequestDetails mso_request ) throws Exception {
+			
+		String methodName = "retrieveRequestObject";
+		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start" );
+		
+		ObjectMapper mapper = new ObjectMapper();
+		//JSON from String to Object
+		//RequestDetails mso_request;
+		
+		try {
+			//mso_request = new RequestDetails();
+			//mso_request = mapper.readValue(request.getInputStream(), RequestDetails.class);
+		}
+		catch ( Exception e ) {
+			logger.error(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + methodName + " Unable to read json object RequestDetails e=" + e.getMessage());
+			throw e;
+		}
+		if ( mso_request == null) {
+			logger.error(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + methodName + " mso_request is null");
+			throw new Exception ("RequestDetails is missing");
+		}
+		try {
+			String json_req = mapper.writeValueAsString(mso_request);
+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " request=[" + json_req + "]");
+		}
+		catch ( Exception e ) {
+			logger.error(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + methodName + " Unable to convert RequestDetails to json string e=" + e.getMessage());
+			throw e;
+		}
+		return (mso_request);
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/controller/PropertyController.java b/vid-app-common/src/main/java/org/openecomp/vid/controller/PropertyController.java
new file mode 100755
index 000000000..90080769b
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/controller/PropertyController.java
@@ -0,0 +1,122 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.controller;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+
+/**
+ * The Class PropertyController.
+ */
+@RestController
+public class PropertyController extends RestrictedBaseController{
+	
+	/** The view name. */
+	String viewName;
+	
+	/** The logger. */
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(PropertyController.class);
+	
+	/** The Constant dateFormat. */
+	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
+	
+	/**
+	 * Welcome.
+	 *
+	 * @param request the request
+	 * @return the model and view
+	 */
+	@RequestMapping(value = {"/propertyhome" }, method = RequestMethod.GET)
+	public ModelAndView welcome(HttpServletRequest request) {
+		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== PropertyController welcome start");
+		return new ModelAndView(getViewName());		
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#getViewName()
+	 */
+	public String getViewName() {
+		return viewName;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#setViewName(java.lang.String)
+	 */
+	public void setViewName(String _viewName) {
+		this.viewName = _viewName;
+	}
+	
+	/**
+	 * Gets the property.
+	 *
+	 * @param name the name
+	 * @param defaultvalue the defaultvalue
+	 * @param request the request
+	 * @return the property
+	 * @throws Exception the exception
+	 */
+	@RequestMapping(value = "/get_property/{name}/{defaultvalue}", method = RequestMethod.GET)
+	public ResponseEntity getProperty (@PathVariable("name") String name, @PathVariable("defaultvalue") String defaultvalue,
+			HttpServletRequest request) throws Exception {
+		
+		String methodName = "getProperty";	
+		ResponseEntity resp = null;
+		String pvalue = null;
+		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
+		
+		try {
+			// convert "_" to "." in the property name
+			if (name == null || name.length() == 0 ) {
+				return ( new ResponseEntity (defaultvalue, HttpStatus.OK));
+			}
+			// convert "_" to "." in the property name
+			String propertyName = name.replace('_', '.');
+			pvalue = SystemProperties.getProperty(propertyName);
+			if ( ( pvalue == null ) || ( pvalue.length() == 0 ) ) {
+				pvalue = defaultvalue;
+			}
+			resp = new ResponseEntity(pvalue, HttpStatus.OK);
+		}
+		catch (Exception e) {
+			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
+			throw e;
+		}
+		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " returning " + pvalue);
+  		return ( resp );
+	}
+
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/controller/VidController.java b/vid-app-common/src/main/java/org/openecomp/vid/controller/VidController.java
new file mode 100755
index 000000000..e22448aeb
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/controller/VidController.java
@@ -0,0 +1,351 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.controller;
+
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.UUID;
+
+import javax.net.ssl.SSLContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Client;
+
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.openecomp.vid.exceptions.VidServiceUnavailableException;
+import org.openecomp.vid.model.ModelConstants;
+import org.openecomp.vid.model.Network;
+import org.openecomp.vid.model.ServiceModel;
+import org.openecomp.vid.model.VNF;
+import org.openecomp.vid.model.VfModule;
+import org.openecomp.vid.model.VolumeGroup;
+//import org.openecomp.vid.model.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.vid.asdc.AsdcCatalogException;
+import org.openecomp.vid.asdc.AsdcClient;
+import org.openecomp.vid.asdc.beans.Resource;
+import org.openecomp.vid.asdc.beans.Service;
+import org.openecomp.vid.asdc.beans.tosca.Group;
+import org.openecomp.vid.asdc.beans.tosca.NodeTemplate;
+import org.openecomp.vid.asdc.beans.tosca.ToscaCsar;
+import org.openecomp.vid.asdc.beans.tosca.ToscaModel;
+import org.openecomp.vid.asdc.memory.InMemoryAsdcClient;
+import org.openecomp.vid.asdc.rest.RestfulAsdcClient;
+import org.openecomp.vid.properties.AsdcClientConfiguration;
+import org.openecomp.vid.properties.AsdcClientConfiguration.AsdcClientType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.openecomp.vid.properties.VidProperties;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+
+/**
+ * The Class VidController.
+ */
+@RestController
+public class VidController extends RestrictedBaseController {
+	
+	/** The Constant LOG. */
+	private static final EELFLoggerDelegate LOG = EELFLoggerDelegate.getLogger(VidController.class);
+	
+	/** The Constant dateFormat. */
+	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
+
+	/** The app context. */
+	@Autowired
+	private ApplicationContext appContext;
+	
+	/**
+	 * Gets the object mapper.
+	 *
+	 * @return the object mapper
+	 */
+	@Bean
+	public ObjectMapper getObjectMapper() {
+		return new ObjectMapper();
+	}
+	
+	/**
+	 * Gets the asdc client.
+	 *
+	 * @return the asdc client
+	 */
+	@Bean
+	public AsdcClient getAsdcClient() {
+		
+		final AsdcClientConfiguration asdcClientConfig = appContext.getBean(AsdcClientConfiguration.class);
+
+		switch (asdcClientConfig.getAsdcClientType()) {
+		case IN_MEMORY:
+			final InputStream asdcCatalogFile = VidController.class.getClassLoader().getResourceAsStream("catalog.json");
+			final JSONTokener tokener = new JSONTokener(asdcCatalogFile);
+			final JSONObject catalog = new JSONObject(tokener);
+
+			return new InMemoryAsdcClient.Builder().catalog(catalog).build();
+		case REST:
+
+			final String protocol = asdcClientConfig.getAsdcClientProtocol();
+			final String host = asdcClientConfig.getAsdcClientHost();
+			final int port = asdcClientConfig.getAsdcClientPort();
+			final String auth = asdcClientConfig.getAsdcClientAuth();
+			Client cl = null;
+			if ( protocol.equalsIgnoreCase("https") ) {
+				try {
+					SSLContext ctx = SSLContext.getInstance("TLSv1.2");
+					ctx.init(null, null, null);
+					cl = ClientBuilder.newBuilder().sslContext(ctx).build();
+				}
+				catch ( NoSuchAlgorithmException n ) {
+					throw new RuntimeException("SDC Client could not be instantiated due to unsupported protocol TLSv1.2", n);
+				}
+				catch ( KeyManagementException k ) {
+					throw new RuntimeException("SDC Client could not be instantiated due to a key management exception", k);
+				}
+			}
+			else {
+				cl = ClientBuilder.newBuilder().build();
+			}
+			
+			try {
+				final URI uri = new URI(protocol + "://" + host + ":" + port + "/");
+				return new RestfulAsdcClient.Builder(cl, uri)
+								.auth(auth)
+								.build();
+			} catch (URISyntaxException e) {
+				throw new RuntimeException("SDC Client could not be instantiated due to a syntax error in the URI", e);
+			}
+			
+		default:
+			throw new RuntimeException(asdcClientConfig.getAsdcClientType() + " is invalid; must be one of " + Arrays.toString(AsdcClientType.values()));
+		}
+	}
+	
+	/**
+	 * Gets the services.
+	 *
+	 * @param request the request
+	 * @return the services
+	 * @throws VidServiceUnavailableException the vid service unavailable exception
+	 */
+	@RequestMapping(value={"/rest/models/services"}, method = RequestMethod.GET)
+	public Collection getServices(HttpServletRequest request) throws VidServiceUnavailableException {
+		try {
+			return getAsdcClient().getServices(request.getParameterMap());
+		} catch (AsdcCatalogException e) {
+			LOG.error("Failed to retrieve service definitions from SDC", e);
+			throw new VidServiceUnavailableException("Failed to retrieve service definitions from SDC", e);
+		} catch (Throwable t) {
+			LOG.debug("Unexpected error while retrieving service definitions from SDC: " + t.getMessage() + ":", t);
+			t.printStackTrace();
+			throw new VidServiceUnavailableException("Unexpected error while retrieving service definitions from SDC: " + t.getMessage(), t);
+		}
+	}
+	
+	/**
+	 * Gets the services.
+	 *
+	 * @param uuid the uuid
+	 * @return the services
+	 * @throws VidServiceUnavailableException the vid service unavailable exception
+	 */
+	@RequestMapping(value={"/rest/models/services/{uuid}"}, method = RequestMethod.GET)
+	public ServiceModel getServices(@PathVariable("uuid") String uuid) throws VidServiceUnavailableException {
+		String methodName = "getServices";
+        LOG.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + methodName + " start");
+        boolean isNewFlow = false;
+        
+        String asdcModelNamespace = VidProperties.getAsdcModelNamespace();
+        
+        String vnfTag = asdcModelNamespace + ModelConstants.VNF;
+    	String networkTag = asdcModelNamespace + ModelConstants.NETWORK;
+    	String vfModuleTag = asdcModelNamespace + ModelConstants.VF_MODULE;
+    	
+		try {
+			final ServiceModel serviceModel = new ServiceModel();
+			final Map vnfs = new HashMap ();
+			final Map networks = new HashMap ();
+			
+			final ToscaCsar serviceCsar = getAsdcClient().getServiceToscaModel(UUID.fromString(uuid));
+			final Service asdcServiceMetadata = getAsdcClient().getService(UUID.fromString(uuid));
+			final ToscaModel asdcServiceToscaModel = serviceCsar.getParent();
+			
+			serviceModel.setService(ServiceModel.extractService(asdcServiceToscaModel, asdcServiceMetadata));
+			
+			for (Entry component: asdcServiceToscaModel.gettopology_template().getnode_templates().entrySet()) {
+				final String modelCustomizationName = component.getKey();
+				LOG.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + methodName + " model customization name: " + modelCustomizationName);
+				final NodeTemplate nodeTemplate = component.getValue();
+				final String type = nodeTemplate.getType();
+				
+				if (type.startsWith(vnfTag)) {
+                    LOG.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + methodName + " found node template type: " + type);
+
+					final UUID vnfUuid = UUID.fromString(nodeTemplate.getMetadata().getUUID());
+					final VNF vnf = new VNF();
+					vnf.extractVnf(modelCustomizationName, nodeTemplate);
+					
+					if (vnf.getVersion() == null) {
+						// vnf version should always be populated. The call below may not return the correct metadata since
+						// uuid is not unique
+						final Resource vnfMetadata = getAsdcClient().getResource(UUID.fromString(nodeTemplate.getMetadata().getUUID()));
+						vnf.setVersion(vnfMetadata.getVersion());
+					}
+              
+                    LOG.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + methodName + " VNF commands: " + vnf.getCommands());
+					vnfs.put(modelCustomizationName, vnf);
+					if ( (vnf.getCustomizationUuid() != null) && (vnf.getCustomizationUuid().length() > 0 ) ) {
+						isNewFlow = true;
+					}
+				}
+				// Networks
+				if (type.startsWith(networkTag)) {
+					LOG.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + methodName + " found node template type: " + type);
+					final UUID networkUuid = UUID.fromString(nodeTemplate.getMetadata().getUUID());
+					final Network network = new Network();
+					network.extractNetwork(modelCustomizationName, nodeTemplate);
+					
+					if (network.getVersion() == null) {
+						// network version should always be populated. The call below may not return the correct metadata since
+						// uuid is not unique
+						final Resource networkMetadata = getAsdcClient().getResource(UUID.fromString(nodeTemplate.getMetadata().getUUID()));
+						network.setVersion(networkMetadata.getVersion());
+					}
+					if ( (network.getCustomizationUuid() != null) && (network.getCustomizationUuid().length() > 0 ) ) {
+						isNewFlow = true;
+					}
+					networks.put(modelCustomizationName, network);
+					
+				}		
+			}
+			serviceModel.setVnfs(vnfs);
+			serviceModel.setNetworks(networks);
+			// If we see customization uuid under vnf or network, follow 1702 flow
+			if ( isNewFlow ) {
+				return ( getCustomizedServices(asdcServiceToscaModel, serviceModel) );
+			}
+			VNF vnf	= null;
+			for (ToscaModel vnfModel : serviceCsar.getChildren()) {
+				
+				// using uuid to match should only be valid for 1610 models
+				
+				final String vnfUuid = (vnfModel.getMetadata().getUUID());
+				// find the VNF with that uuid, uuid is not the key anymore
+				for ( Entry vnfComp : vnfs.entrySet() ) {
+					if ( ( ( vnfComp.getValue().getUuid() ).equalsIgnoreCase(vnfUuid) ) ) {
+						// found the vnf
+						vnf = vnfComp.getValue();
+					}
+				}
+				final Map vfModules = new HashMap ();
+				final Map volumeGroups = new HashMap ();
+				
+				if (vnf == null) {
+					LOG.warn("Couldn't find VNF object " + vnfUuid + ". Problem with Tosca model?");
+					continue;
+				}
+
+				vnf.setInputs(vnfModel.gettopology_template().getInputs());
+
+				for (Entry component1 : vnfModel.gettopology_template().getGroups().entrySet()) {
+					final Group group = component1.getValue();
+					final String type = group.getType();
+					final String modelCustomizationName = component1.getKey();
+					
+					// VF Module Customization UUID: We may have the complete set of all VF Modules for all VNFs under service and VF Modules under each VNF.
+					// Keep using the VF Modules under VNFs but we need to get the customization uuid from the service level and put them
+					// under each VF module at the VNF level
+					
+					if (type.startsWith(vfModuleTag)) {
+						
+						VfModule vfMod = VfModule.extractVfModule(modelCustomizationName, group);
+						
+						// Add the vf module customization uuid from the service model
+						// The key of the VF Module in the service level will be the VF instance name appended to the VF Module name: 
+						// ..
+						/* String normalizedVnfCustomizationName = VNF.normalizeName (vnf.getModelCustomizationName());
+						org.openecomp.vid.model.Service.extractVfModuleCustomizationUUID (serviceModel.getService(), normalizedVnfCustomizationName, vfMod);*/
+								
+						vfModules.put(modelCustomizationName, vfMod);
+						
+						if ( vfMod.isVolumeGroupAllowed() ) {
+								volumeGroups.put(modelCustomizationName, VolumeGroup.extractVolumeGroup(modelCustomizationName, group));
+						}
+						
+					}
+				}
+				
+				vnf.setVfModules(vfModules);
+				vnf.setVolumeGroups(volumeGroups);
+			}
+			
+			serviceModel.setVnfs(vnfs);
+			serviceModel.setNetworks(networks);
+			
+			return serviceModel;
+		} catch (AsdcCatalogException e) {
+			LOG.error("Failed to retrieve service definitions from SDC", e);
+			throw new VidServiceUnavailableException("Failed to retrieve service definitions from SDC", e);
+		}
+	}
+
+	public ServiceModel getCustomizedServices(ToscaModel asdcServiceToscaModel, ServiceModel serviceModel) {
+		String methodName = "asdcServiceToscaModel";
+        LOG.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + methodName + " start");
+        
+        // asdcServiceToscaModel should have vf modules and vol groups populated at this point but 
+        // they are not associated with the VNFs
+		serviceModel.extractGroups(asdcServiceToscaModel);
+		// Now put the vf modules and volume groups under the VNF they belong too
+		serviceModel.associateGroups();
+		return (serviceModel);
+	}
+
+	/**
+	 * Gets the services view.
+	 *
+	 * @param request the request
+	 * @return the services view
+	 * @throws VidServiceUnavailableException the vid service unavailable exception
+	 */
+	@RequestMapping(value={"/serviceModels"}, method=RequestMethod.GET)
+	public ModelAndView getServicesView(HttpServletRequest request) throws VidServiceUnavailableException {
+		return new ModelAndView("serviceModels");
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/controller/VidHomeController.java b/vid-app-common/src/main/java/org/openecomp/vid/controller/VidHomeController.java
new file mode 100755
index 000000000..cfb915b03
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/controller/VidHomeController.java
@@ -0,0 +1,79 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.controller;
+
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
+
+
+/**
+ * The Class VidHomeController.
+ */
+@RestController
+public class VidHomeController extends RestrictedBaseController{
+	
+	/** The view name. */
+	String viewName;
+	
+	
+	/** The servlet context. */
+	private @Autowired ServletContext servletContext;
+	
+	/**
+	 * Welcome.
+	 *
+	 * @param request the request
+	 * @return the model and view
+	 */
+	@RequestMapping(value = {"/vidhome" }, method = RequestMethod.GET)
+	public ModelAndView welcome(HttpServletRequest request) {
+		
+ 	  return new ModelAndView(getViewName());		
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#getViewName()
+	 */
+	public String getViewName() {
+		return viewName;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#setViewName(java.lang.String)
+	 */
+	public void setViewName(String viewName) {
+		this.viewName = viewName;
+	}
+
+	
+
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/controller/ViewEditSubController.java b/vid-app-common/src/main/java/org/openecomp/vid/controller/ViewEditSubController.java
new file mode 100755
index 000000000..e23b99ba4
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/controller/ViewEditSubController.java
@@ -0,0 +1,107 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.controller;
+
+
+import java.io.File;
+import java.text.DateFormat;
+import java.util.HashMap;
+import java.util.Map;
+
+
+
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
+
+
+/**
+ * The Class ViewEditSubController.
+ */
+@RestController
+public class ViewEditSubController extends RestrictedBaseController{
+	
+	/** The view name. */
+	String viewName;
+	
+	/** The logger. */
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ViewEditSubController.class);
+	
+	/** The model. */
+	private Map model = new HashMap();
+	
+	/** The servlet context. */
+	private @Autowired ServletContext servletContext;
+	
+	/**
+	 * Welcome.
+	 *
+	 * @param request the request
+	 * @return the model and view
+	 */
+	@RequestMapping(value = {"/vieweditsub" }, method = RequestMethod.GET)
+	public ModelAndView welcome(HttpServletRequest request) {
+		return new ModelAndView("vieweditsub","model", model);
+    //	return new ModelAndView(getViewName());		
+	}
+	
+	/**
+	 * Post subscriber.
+	 *
+	 * @param request the request
+	 */
+	@RequestMapping(value="/vieweditsub/subedit", method = RequestMethod.POST)
+	public void PostSubscriber(HttpServletRequest request) {
+		
+		String        subID = request.getParameter("subscriberID");
+		model.put("subInfo", subID);
+		
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#getViewName()
+	 */
+	public String getViewName() {
+		return viewName;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#setViewName(java.lang.String)
+	 */
+	public void setViewName(String viewName) {
+		this.viewName = viewName;
+	}
+
+
+	
+
+}
+
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/controller/ViewLogController.java b/vid-app-common/src/main/java/org/openecomp/vid/controller/ViewLogController.java
new file mode 100755
index 000000000..31e64983e
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/controller/ViewLogController.java
@@ -0,0 +1,84 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.controller;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
+
+
+/**
+ * The Class ViewLogController.
+ */
+@RestController
+public class ViewLogController extends RestrictedBaseController{
+	
+	/** The view name. */
+	String viewName;
+	
+	/** The logger. */
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ViewLogController.class);
+	
+	/** The Constant dateFormat. */
+	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
+	
+	/** The servlet context. */
+	private @Autowired ServletContext servletContext;
+	
+	/**
+	 * Welcome.
+	 *
+	 * @param request the request
+	 * @return the model and view
+	 */
+	@RequestMapping(value = {"/viewlog" }, method = RequestMethod.GET)
+	public ModelAndView welcome(HttpServletRequest request) {
+		
+ 	return new ModelAndView(getViewName());		
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#getViewName()
+	 */
+	public String getViewName() {
+		return viewName;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#setViewName(java.lang.String)
+	 */
+	public void setViewName(String viewName) {
+		this.viewName = viewName;
+	}
+
+
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/controller/test/TestAaiController.java b/vid-app-common/src/main/java/org/openecomp/vid/controller/test/TestAaiController.java
new file mode 100755
index 000000000..79017410c
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/controller/test/TestAaiController.java
@@ -0,0 +1,93 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.controller.test;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.codehaus.jackson.map.ObjectMapper;
+import org.openecomp.vid.model.ExceptionResponse;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
+
+/**
+ * The Class TestAaiController.
+ */
+@RestController
+@RequestMapping("testaai")
+public class TestAaiController extends RestrictedBaseController {
+
+	/**
+	 * Gets the subscription service type list.
+	 *
+	 * @param globalCustomerId the global customer id
+	 * @param request the request
+	 * @return the subscription service type list
+	 * @throws Exception the exception
+	 */
+	@RequestMapping(value = "/getSubscriptionServiceTypeList/{globalCustomerId}", method = RequestMethod.GET)
+	public String getSubscriptionServiceTypeList(@PathVariable("globalCustomerId") String globalCustomerId, HttpServletRequest request)
+			throws Exception {
+
+		System.err.println("GET SUBSCRIPTION SERVICE TYPE LIST: globalCustomerId: " + globalCustomerId);
+
+		return "[\"vMOG\", \"sevice type 2\", \"sevice type 3\", \"sevice type 4\"]";
+	}
+
+	/**
+	 * Exception.
+	 *
+	 * @param e the e
+	 * @param response the response
+	 * @throws IOException Signals that an I/O exception has occurred.
+	 */
+	@ExceptionHandler(Exception.class)
+	private void exception(Exception e, HttpServletResponse response) throws IOException {
+
+		/*
+		 * This logging step should preferably be replaced with an appropriate
+		 * logging method consistent whatever logging mechanism the rest of the
+		 * application code uses.
+		 */
+
+		e.printStackTrace(System.err);
+
+		response.setContentType("application/json; charset=UTF-8");
+		response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+
+		ExceptionResponse exceptionResponse = new ExceptionResponse();
+		exceptionResponse.setException(e.getClass().toString().replaceFirst("^.*\\.", ""));
+		exceptionResponse.setMessage(e.getMessage());
+
+		response.getWriter().write(new ObjectMapper().writeValueAsString(exceptionResponse));
+
+		response.flushBuffer();
+
+	}
+
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/controller/test/TestAsdcController.java b/vid-app-common/src/main/java/org/openecomp/vid/controller/test/TestAsdcController.java
new file mode 100755
index 000000000..84a56b3b2
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/controller/test/TestAsdcController.java
@@ -0,0 +1,112 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package  org.openecomp.vid.controller.test;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.codehaus.jackson.map.ObjectMapper;
+import org.openecomp.vid.model.ExceptionResponse;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
+
+/**
+ * The Class TestAsdcController.
+ */
+@RestController
+@RequestMapping("testasdc")
+public class TestAsdcController extends RestrictedBaseController {
+
+	/**
+	 * Gets the model.
+	 *
+	 * @param modelId the model id
+	 * @param request the request
+	 * @return the model
+	 * @throws Exception the exception
+	 */
+	@RequestMapping(value = "/getModel/{modelId}", method = RequestMethod.GET)
+	public String getModel(@PathVariable("modelId") String modelId, HttpServletRequest request) throws Exception {
+
+		System.err.println("SDC: GET MODEL: modelId: " + modelId);
+
+		// @formatter:off
+		return
+		   "{" +
+		       "\"uuid\": \"5be686dc-fdca-4d54-8548-5d0ed23e962b\"," +
+		       "\"invariantUUID\": \"e5962da9-fe4f-433a-bc99-b43e0d88a9a1\"," +
+		       "\"name\": \"DE220127\"," +
+		       "\"version\": \"0.1\"," +       
+	           "\"inputs\": {" +
+	             "\"defaultGateway\": {" +
+	                    "\"type\": \"String\"," +
+	                    "\"default\": \"192.168.1.1\"," +
+	                    "\"description\": \"Router default gateway - use any valid IPv4 address\"" +
+	             "}," +
+	             "\"subnetMask\": {" +
+	                    "\"type\": \"String\"," +
+	                    "\"default\": \"255.255.255.0\"," +
+	                    "\"description\": \"Router subnet mask - example (255.255.255.0)\"" +
+	             "}" +
+	            "}" +
+			"}";
+		// @formatter:on
+	}
+
+	/**
+	 * Exception.
+	 *
+	 * @param e the e
+	 * @param response the response
+	 * @throws IOException Signals that an I/O exception has occurred.
+	 */
+	@ExceptionHandler(Exception.class)
+	private void exception(Exception e, HttpServletResponse response) throws IOException {
+
+		/*
+		 * This logging step should preferably be replaced with an appropriate
+		 * logging method consistent whatever logging mechanism the rest of the
+		 * application code uses.
+		 */
+
+		e.printStackTrace(System.err);
+
+		response.setContentType("application/json; charset=UTF-8");
+		response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+
+		ExceptionResponse exceptionResponse = new ExceptionResponse();
+		exceptionResponse.setException(e.getClass().toString().replaceFirst("^.*\\.", ""));
+		exceptionResponse.setMessage(e.getMessage());
+
+		response.getWriter().write(new ObjectMapper().writeValueAsString(exceptionResponse));
+
+		response.flushBuffer();
+
+	}
+
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/controller/test/TestMsoController.java b/vid-app-common/src/main/java/org/openecomp/vid/controller/test/TestMsoController.java
new file mode 100755
index 000000000..02c29f678
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/controller/test/TestMsoController.java
@@ -0,0 +1,729 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package  org.openecomp.vid.controller.test;
+
+import java.io.IOException;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.codehaus.jackson.map.ObjectMapper;
+import org.openecomp.vid.model.ExceptionResponse;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
+
+/*
+ * The "TestMsoController" class is primarily designed to help test "msoCommitController.js"
+ * 
+ * This class expects and receives JSON data in the same format as expected
+ * in the "real" application version of this code. However, string versions of JSON are
+ * maintained internally here instead of marshalled / unmarshalled JSON objects.
+ * The primary reasons for this were to encapsulate all the test code in this single file and
+ * minimize the time required to support initial test cases.
+ * 
+ * The non-test equivalent of this controller could alternatively incorporate POJO objects
+ * instead of strings. However, the same data format sent to / received from the browser
+ * JavaScript code would still be expected.
+ * 
+ * Two specific mechanisms used in this test class may be useful to the application version:
+ * 
+ * 		1) The use of "{variable}" elements in @RequestMappings along with the corresponding
+ * 		@PathVariable declarations.
+ * 
+ * 		2) The use of @ExceptionHandler for general purpose exception handler.
+ * 		(See @ExceptionHandler comments)
+ *
+ * This class is intended to be used in either:
+ * 
+ * 		A) Eclipse environments
+ * 	OR
+ * 		B) Linux environments with ONLY a single user running tests.
+ *		The "quick and dirty" error simulation approach used here makes use of static states for some
+ *		scenarios. Thus multiple users simultaneously testing in Linux environments
+ *		may have contention issues.
+ */
+
+/**
+ * The Class TestMsoController.
+ */
+@RestController
+@RequestMapping("testmso")
+public class TestMsoController extends RestrictedBaseController {
+
+	/*
+	 * Artificial delay (in milliseconds) added before responding to create /
+	 * delete requests
+	 */
+
+	/** The Constant TEST_DELAY_SHORT_MSEC. */
+	private final static int TEST_DELAY_SHORT_MSEC = 1000;
+
+	/*
+	 * Long delay to simulate non-responsive server test
+	 */
+
+	/** The Constant TEST_DELAY_LONG_MSEC. */
+	private final static int TEST_DELAY_LONG_MSEC = 15000;
+
+	/*
+	 * Default number of polls expected before transaction complete.
+	 */
+
+	/** The Constant MAXIMUM_POLLS_DEFAULT. */
+	private final static int MAXIMUM_POLLS_DEFAULT = 4;
+
+	/*
+	 * Number of polls to simulate "maximum polls exceeded" test.
+	 */
+
+	/** The Constant MAXIMUM_POLLS_LARGE. */
+	private final static int MAXIMUM_POLLS_LARGE = 10;
+
+	/*
+	 * Simulated error types. The GUI front end is expected to set these values
+	 * in the "modelName" field of the "mso_create_svc_instance" request.
+	 */
+
+	/** The Constant ERROR_POLICY_EXCEPTION. */
+	private final static String ERROR_POLICY_EXCEPTION = "ERROR_POLICY_EXCEPTION";
+	
+	/** The Constant ERROR_SERVICE_EXCEPTION. */
+	private final static String ERROR_SERVICE_EXCEPTION = "ERROR_SERVICE_EXCEPTION";
+	
+	/** The Constant ERROR_POLL_FAILURE. */
+	private final static String ERROR_POLL_FAILURE = "ERROR_POLL_FAILURE";
+	
+	/** The Constant ERROR_INVALID_FIELD_INITIAL. */
+	private final static String ERROR_INVALID_FIELD_INITIAL = "ERROR_INVALID_FIELD_INITIAL";
+	
+	/** The Constant ERROR_INVALID_FIELD_POLL. */
+	private final static String ERROR_INVALID_FIELD_POLL = "ERROR_INVALID_FIELD_POLL";
+	
+	/** The Constant ERROR_GENERAL_SERVER_EXCEPTION. */
+	private final static String ERROR_GENERAL_SERVER_EXCEPTION = "ERROR_GENERAL_SERVER_EXCEPTION";
+	
+	/** The Constant ERROR_MAX_POLLS. */
+	private final static String ERROR_MAX_POLLS = "ERROR_MAX_POLLS";
+	
+	/** The Constant ERROR_SERVER_TIMEOUT_INITIAL. */
+	private final static String ERROR_SERVER_TIMEOUT_INITIAL = "ERROR_SERVER_TIMEOUT_INITIAL";
+	
+	/** The Constant ERROR_SERVER_TIMEOUT_POLL. */
+	private final static String ERROR_SERVER_TIMEOUT_POLL = "ERROR_SERVER_TIMEOUT_POLL";
+
+	/** The simulated error. */
+	private String simulatedError = "";
+	
+	/** The maximum polls. */
+	private int maximumPolls = 0;
+	
+	/** The attempt count. */
+	private int attemptCount = 0;
+
+	/**
+	 * Creates the svc instance.
+	 *
+	 * @param request the request
+	 * @return the response entity
+	 * @throws Exception the exception
+	 */
+	@RequestMapping(value = "/mso_create_svc_instance", method = RequestMethod.POST)
+	public ResponseEntity createSvcInstance(HttpServletRequest request) throws Exception {
+		readAndLogRequest("CREATE SERVICE INSTANCE", request);
+		Thread.sleep(TEST_DELAY_SHORT_MSEC);
+		maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior
+		attemptCount = 0;
+
+		/*
+		 * This block of code simulates various errors and would NOT be expected
+		 * in a non-test method
+		 */
+		System.err.println("simulatedError: " + simulatedError);
+
+		if (simulatedError.equals(ERROR_POLICY_EXCEPTION)) {
+			return new ResponseEntity(policyExceptionResponse, HttpStatus.OK);
+		}
+		if (simulatedError.equals(ERROR_SERVICE_EXCEPTION)) {
+			return new ResponseEntity(serviceExceptionResponse, HttpStatus.OK);
+		}
+		if (simulatedError.equals(ERROR_INVALID_FIELD_INITIAL)) {
+			/*
+			 * Force invalid response field name. Return
+			 * "XXXXXrequestReferences" instead of "requestReferences"
+			 */
+			return new ResponseEntity(acceptResponse.replace("requestReferences", "XXXXXrequestReferences"),
+					HttpStatus.OK);
+		}
+
+		if (simulatedError.equals(ERROR_GENERAL_SERVER_EXCEPTION)) {
+			throw new IOException("an example of an IO exception");
+		}
+
+		if (simulatedError.equals(ERROR_SERVER_TIMEOUT_INITIAL)) {
+			Thread.sleep(TEST_DELAY_LONG_MSEC);
+		}
+
+		if (simulatedError.equals(ERROR_MAX_POLLS)) {
+			maximumPolls = MAXIMUM_POLLS_LARGE;
+		}
+
+		/*
+		 * End of block of simulated error code.
+		 */
+
+		return new ResponseEntity(acceptResponse, HttpStatus.OK);
+	}
+
+	/**
+	 * Delete svc instance.
+	 *
+	 * @param serviceInstanceId the service instance id
+	 * @param request the request
+	 * @return the response entity
+	 * @throws Exception the exception
+	 */
+	@RequestMapping(value = "/mso_delete_svc_instance/{serviceInstanceId}", method = RequestMethod.POST)
+	public ResponseEntity deleteSvcInstance(@PathVariable("serviceInstanceId") String serviceInstanceId,
+			HttpServletRequest request) throws Exception {
+		readAndLogRequest("DELETE SERVICE INSTANCE: serviceInstanceId: " + serviceInstanceId, request);
+		Thread.sleep(TEST_DELAY_SHORT_MSEC);
+		maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior
+		attemptCount = 0;
+		return new ResponseEntity(acceptResponse, HttpStatus.OK);
+	}
+
+	/**
+	 * Creates the vnf instance.
+	 *
+	 * @param serviceInstanceId the service instance id
+	 * @param request the request
+	 * @return the response entity
+	 * @throws Exception the exception
+	 */
+	@RequestMapping(value = "/mso_create_vnf_instance/{serviceInstanceId}", method = RequestMethod.POST)
+	public ResponseEntity createVnfInstance(@PathVariable("serviceInstanceId") String serviceInstanceId,
+			HttpServletRequest request) throws Exception {
+		readAndLogRequest("CREATE VNF INSTANCE: serviceInstanceId: " + serviceInstanceId, request);
+		Thread.sleep(TEST_DELAY_SHORT_MSEC);
+		maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior
+		attemptCount = 0;
+		return new ResponseEntity(acceptResponse, HttpStatus.OK);
+	}
+
+	/**
+	 * Delete vnf instance.
+	 *
+	 * @param serviceInstanceId the service instance id
+	 * @param vnfInstanceId the vnf instance id
+	 * @param request the request
+	 * @return the response entity
+	 * @throws Exception the exception
+	 */
+	@RequestMapping(value = "/mso_delete_vnf_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}", method = RequestMethod.POST)
+	public ResponseEntity deleteVnfInstance(@PathVariable("serviceInstanceId") String serviceInstanceId,
+			@PathVariable("vnfInstanceId") String vnfInstanceId, HttpServletRequest request) throws Exception {
+		readAndLogRequest(
+				"DELETE VNF INSTANCE: serviceInstanceId: " + serviceInstanceId + " vnfInstanceId: " + vnfInstanceId,
+				request);
+		Thread.sleep(TEST_DELAY_SHORT_MSEC);
+		maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior
+		attemptCount = 0;
+		return new ResponseEntity(acceptResponse, HttpStatus.OK);
+	}
+
+	/**
+	 * Creates the vf module instance.
+	 *
+	 * @param serviceInstanceId the service instance id
+	 * @param vnfInstanceId the vnf instance id
+	 * @param request the request
+	 * @return the response entity
+	 * @throws Exception the exception
+	 */
+	// /serviceInstances/v2/ff305d54-75b4-431b-adb2-eb6b9e5ff000/vnfs/ff305d54-75b4-ff1b-adb2-eb6b9e5460ff/vfModules
+	@RequestMapping(value = "/mso_create_vfmodule_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}", method = RequestMethod.POST)
+	public ResponseEntity createVfModuleInstance(@PathVariable("serviceInstanceId") String serviceInstanceId,
+			@PathVariable("vnfInstanceId") String vnfInstanceId, HttpServletRequest request) throws Exception {
+		readAndLogRequest("CREATE VF MODULE INSTANCE: serviceInstanceId: " + serviceInstanceId + " vnfInstanceId: "
+				+ vnfInstanceId, request);
+		Thread.sleep(TEST_DELAY_SHORT_MSEC);
+		maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior
+		attemptCount = 0;
+		return new ResponseEntity(acceptResponse, HttpStatus.OK);
+	}
+
+	/**
+	 * Delete vf module instance.
+	 *
+	 * @param serviceInstanceId the service instance id
+	 * @param vnfInstanceId the vnf instance id
+	 * @param vfModuleInstanceId the vf module instance id
+	 * @param request the request
+	 * @return the response entity
+	 * @throws Exception the exception
+	 */
+	// /serviceInstances/v2/ff305d54-75b4-431b-adb2-eb6b9e5ff000/vnfs/ff305d54-75b4-ff1b-adb2-eb6b9e5460ff/vfModules/ff305d54-75b4-ff1b-bdb2-eb6b9e5460ff
+	@RequestMapping(value = "/mso_delete_vfmodule_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfModuleInstanceId}", method = RequestMethod.POST)
+	public ResponseEntity deleteVfModuleInstance(@PathVariable("serviceInstanceId") String serviceInstanceId,
+			@PathVariable("vnfInstanceId") String vnfInstanceId,
+			@PathVariable("vfModuleInstanceId") String vfModuleInstanceId, HttpServletRequest request)
+			throws Exception {
+		readAndLogRequest("DELETE VF MODULE INSTANCE: serviceInstanceId: " + serviceInstanceId + " vnfInstanceId: "
+				+ vnfInstanceId + " vfModuleInstanceId: " + vfModuleInstanceId, request);
+		Thread.sleep(TEST_DELAY_SHORT_MSEC);
+		maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior
+		attemptCount = 0;
+		return new ResponseEntity(acceptResponse, HttpStatus.OK);
+	}
+
+	// POST
+	/**
+	 * Creates the volume group instance.
+	 *
+	 * @param serviceInstanceId the service instance id
+	 * @param vnfInstanceId the vnf instance id
+	 * @param request the request
+	 * @return the response entity
+	 * @throws Exception the exception
+	 */
+	// /serviceInstances/v2/ff305d54-75b4-431b-adb2-eb6b9e5ff000/volumeGroups
+	@RequestMapping(value = "/mso_create_volumegroup_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}", method = RequestMethod.POST)
+	public ResponseEntity createVolumeGroupInstance(@PathVariable("serviceInstanceId") String serviceInstanceId,
+			@PathVariable("vnfInstanceId") String vnfInstanceId, HttpServletRequest request) throws Exception {
+		readAndLogRequest("CREATE VOLUME GROUP INSTANCE: seviceInstanceId: " + serviceInstanceId + " vnfInstanceId: "
+				+ vnfInstanceId, request);
+		Thread.sleep(TEST_DELAY_SHORT_MSEC);
+		maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior
+		attemptCount = 0;
+		return new ResponseEntity(acceptResponse, HttpStatus.OK);
+	}
+
+	/**
+	 * Delete volume group instance.
+	 *
+	 * @param serviceInstanceId the service instance id
+	 * @param vnfInstanceId the vnf instance id
+	 * @param volumeGroupInstanceId the volume group instance id
+	 * @param request the request
+	 * @return the response entity
+	 * @throws Exception the exception
+	 */
+	// /serviceInstances/v2/ff305d54-75b4-431b-adb2-eb6b9e5ff000/volumeGroups/ff305d54-75b4-ff1b-cdb2-eb6b9e5460ff
+	@RequestMapping(value = "/mso_delete_volumegroup_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups/{volumeGroupInstanceId}", method = RequestMethod.POST)
+	public ResponseEntity deleteVolumeGroupInstance(@PathVariable("serviceInstanceId") String serviceInstanceId,
+			@PathVariable("vnfInstanceId") String vnfInstanceId,
+			@PathVariable("volumeGroupInstanceId") String volumeGroupInstanceId, HttpServletRequest request)
+			throws Exception {
+		readAndLogRequest("DELETE NW INSTANCE: serviceInstanceId: " + serviceInstanceId + " vnfInstanceId: "
+				+ vnfInstanceId + " volumeGroupInstanceId: " + volumeGroupInstanceId, request);
+		Thread.sleep(TEST_DELAY_SHORT_MSEC);
+		maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior
+		attemptCount = 0;
+		return new ResponseEntity(acceptResponse, HttpStatus.OK);
+	}
+
+	/**
+	 * Creates the nw instance.
+	 *
+	 * @param serviceInstanceId the service instance id
+	 * @param request the request
+	 * @return the response entity
+	 * @throws Exception the exception
+	 */
+	@RequestMapping(value = "/mso_create_nw_instance/{serviceInstanceId}", method = RequestMethod.POST)
+	public ResponseEntity createNwInstance(@PathVariable("serviceInstanceId") String serviceInstanceId,
+			HttpServletRequest request) throws Exception {
+		readAndLogRequest("CREATE NW INSTANCE: serviceInstanceId: " + serviceInstanceId, request);
+		Thread.sleep(TEST_DELAY_SHORT_MSEC);
+		maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior
+		attemptCount = 0;
+		return new ResponseEntity(acceptResponse, HttpStatus.OK);
+	}
+
+	/**
+	 * Delete nw instance.
+	 *
+	 * @param serviceInstanceId the service instance id
+	 * @param networkInstanceId the network instance id
+	 * @param request the request
+	 * @return the response entity
+	 * @throws Exception the exception
+	 */
+	@RequestMapping(value = "/mso_delete_nw_instance/{serviceInstanceId}/networks/{networkInstanceId}", method = RequestMethod.POST)
+	public ResponseEntity deleteNwInstance(@PathVariable("serviceInstanceId") String serviceInstanceId,
+			@PathVariable("networkInstanceId") String networkInstanceId, HttpServletRequest request) throws Exception {
+		readAndLogRequest("DELETE NW INSTANCE: serviceInstanceId: " + serviceInstanceId + " networkInstanceId: "
+				+ networkInstanceId, request);
+		Thread.sleep(TEST_DELAY_SHORT_MSEC);
+		maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior
+		attemptCount = 0;
+		return new ResponseEntity(acceptResponse, HttpStatus.OK);
+	}
+
+	/**
+	 * Gets the orchestration request.
+	 *
+	 * @param requestId the request id
+	 * @param request the request
+	 * @return the orchestration request
+	 * @throws Exception the exception
+	 */
+	@RequestMapping(value = "/mso_get_orch_req/{requestId}", method = RequestMethod.GET)
+	public ResponseEntity getOrchestrationRequest(@PathVariable("requestId") String requestId,
+			HttpServletRequest request) throws Exception {
+
+		System.err.println("GET ORCHESTRATION REQUEST: requestId: " + requestId);
+
+		/*
+		 * This block of code simulates various errors and would NOT be expected
+		 * in a non-test method
+		 */
+
+		if (simulatedError.equals(ERROR_INVALID_FIELD_POLL)) {
+			/*
+			 * Force invalid response field name. Return "XXXXXrequestStatus"
+			 * instead of "requestStatus"
+			 */
+			return new ResponseEntity(inProgressResponse.replace("requestStatus", "XXXXXrequestStatus"),
+					HttpStatus.OK);
+		}
+
+		if (simulatedError.equals(ERROR_POLL_FAILURE)) {
+			/*
+			 * Force status field with "Failure"
+			 */
+			return new ResponseEntity(inProgressResponse.replace("InProgress", "Failure"), HttpStatus.OK);
+		}
+
+		if (simulatedError.equals(ERROR_SERVER_TIMEOUT_POLL)) {
+			Thread.sleep(TEST_DELAY_LONG_MSEC);
+		}
+
+		/*
+		 * End of block of simulated error code.
+		 */
+
+		/*
+		 * This logic simulates how MSO might behave ... i.e. return different
+		 * results depending on the value of 'maximumPolls'.
+		 *
+		 */
+		int percentProgress = (++attemptCount * 100) / maximumPolls;
+
+		System.err.println("attempts: " + attemptCount + " max: " + maximumPolls + " percent: " + percentProgress);
+
+		String response = inProgressResponse.replace("\"50\"", "\"" + Integer.toString(percentProgress) + "\"");
+
+		if (attemptCount < maximumPolls) {
+			if (attemptCount > 1) {
+				response = response.replace("vLan setup", "setup step " + Integer.toString(attemptCount));
+			}
+			return new ResponseEntity(response, HttpStatus.OK);
+		} else {
+			return new ResponseEntity(
+					response.replace("InProgress", "Complete").replace("vLan setup complete", ""), HttpStatus.OK);
+		}
+	}
+
+	/**
+	 * Gets the orchestration requests.
+	 *
+	 * @param filterString the filter string
+	 * @param request the request
+	 * @return the orchestration requests
+	 * @throws Exception the exception
+	 */
+	@RequestMapping(value = "/mso_get_orch_reqs/{filterString}", method = RequestMethod.GET)
+	public ResponseEntity getOrchestrationRequests(@PathVariable("filterString") String filterString,
+			HttpServletRequest request) throws Exception {
+
+		System.err.println("GET ORCHESTRATION REQUESTS: filterString: " + filterString);
+
+		return new ResponseEntity(getOrchestrationRequestsResponse, HttpStatus.OK);
+
+	}
+
+	/*
+	 * General purpose exception handler that could be used in application code.
+	 * 
+	 * The method returns exceptions as error code 500. Both the exception type
+	 * and message are written as a JSON object.
+	 * 
+	 * See the following references:
+	 * 
+	 * 1) The ExceptionResponse POJO.
+	 * 
+	 * 2) The "getHttpErrorMessage" function in "utilityService.js" - an example
+	 * of how the browser JavaScript code can interpret this response.
+	 */
+
+	/**
+	 * Exception.
+	 *
+	 * @param e the e
+	 * @param response the response
+	 * @throws IOException Signals that an I/O exception has occurred.
+	 */
+	@ExceptionHandler(Exception.class)
+	private void exception(Exception e, HttpServletResponse response) throws IOException {
+
+		/*
+		 * This logging step should preferably be replaced with an appropriate
+		 * logging method consistent whatever logging mechanism the rest of the
+		 * application code uses.
+		 */
+
+		e.printStackTrace(System.err);
+
+		response.setContentType("application/json; charset=UTF-8");
+		response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+
+		ExceptionResponse exceptionResponse = new ExceptionResponse();
+		exceptionResponse.setException(e.getClass().toString().replaceFirst("^.*\\.", ""));
+		exceptionResponse.setMessage(e.getMessage());
+
+		response.getWriter().write(new ObjectMapper().writeValueAsString(exceptionResponse));
+
+		response.flushBuffer();
+
+	}
+
+	/*
+	 * 'readAndLogRequest' only intended to be used for testing.
+	 * 
+	 * The method reads JSON from the input stream and thus prevents other
+	 * mechanisms from reading the input.
+	 */
+
+	/**
+	 * Read and log request.
+	 *
+	 * @param label the label
+	 * @param request the request
+	 * @throws Exception the exception
+	 */
+	private void readAndLogRequest(String label, HttpServletRequest request) throws Exception {
+		String input = request.getReader().lines().collect(Collectors.joining(System.lineSeparator()));
+
+		ObjectMapper mapper = new ObjectMapper();
+		Object json = mapper.readValue(input, Object.class);
+
+		System.err.println(label + "\n" + mapper.writerWithDefaultPrettyPrinter().writeValueAsString(json));
+
+		/*
+		 * Only needed for error simulation ...
+		 */
+		if (input.matches("^.*modelName.*$")) {
+			simulatedError = input.replaceAll("^.*\"modelName\":\"", "").replaceAll("\".*$", "");
+		}
+	}
+
+	/*
+	 * Various test responses:
+	 */
+
+	// @formatter:off
+
+	/** The accept response. */
+	/*
+	 * Sample responses to initial create / delete transaction
+	 */
+	private String acceptResponse =
+	   "{" +
+	    "  \"status\": 202," +
+	    "  \"entity\": {" +
+	    "      \"requestReferences\": {" +
+	    "         \"instanceId\": \"bc305d54-75b4-431b-adb2-eb6b9e546014\"," +
+	    "         \"requestId\": \"rq1234d1-5a33-55df-13ab-12abad84e331\"" +
+	    "      }" +
+	    "  }" +
+	    "}";
+	
+	/** The policy exception response. */
+	private String policyExceptionResponse = 
+		"{" + 
+		"  \"status\": 400," + 
+		"  \"entity\": { " + 
+		"    \"requestError\": {" + 
+		"      \"policyException\": {" + 
+		"        \"messageId\": \"POL9003\"," + 
+		"        \"text\": \"Message content size exceeds the allowable limit\"" + 
+		"      }" + 
+		"    }" + 
+		"  }" + 
+		"}";
+
+	/** The service exception response. */
+	private String serviceExceptionResponse =
+		"{" + 
+		"  \"status\": 400," + 
+		"  \"entity\": { " + 
+		"    \"requestError\": {" + 
+		"      \"serviceException\": {" + 
+		"        \"messageId\": \"SVC2000\"," + 
+		"        \"text\": \"Missing Parameter: %1. Error code is %2\"," + 
+		"        \"variables\": [" + 
+		"          \"severity\"," + 
+		"          \"400\"" + 
+		"        ]" + 
+		"      }" + 
+		"    }" + 
+		"  }" + 
+		"}" + 
+		"";
+	
+	/** The in progress response. */
+	/*
+	 * Sample response to subsequent getOrchestrationRequest
+	 */
+	private String inProgressResponse =
+		"{" +
+		"   \"status\": 200," +
+		"   \"entity\": {" +
+		"      \"request\": {" +
+		"         \"requestId\": \"rq1234d1-5a33-55df-13ab-12abad84e333\"," +
+		"         \"startTime\": \"Thu, 04 Jun 2009 02:51:59 GMT\"," +
+		"         \"instanceIds\": {" +
+		"            \"serviceInstanceId\": \"bc305d54-75b4-431b-adb2-eb6b9e546014\"" +
+		"         }," +
+		"         \"requestScope\": \"service\"," +
+		"         \"requestType\": \"createInstance\"," +
+		"         \"requestDetails\": {" +
+		"            \"modelInfo\": {" +
+		"               \"modelType\": \"service\"," +
+		"               \"modelId\": \"sn5256d1-5a33-55df-13ab-12abad84e764\"," +
+		"               \"modelNameVersionId\": \"ab6478e4-ea33-3346-ac12-ab121484a333\"," +
+		"               \"modelName\": \"WanBonding\"," +
+		"               \"modelVersion\": \"1\"" +
+		"            }," +
+		"            \"subscriberInfo\": {" +
+		"                \"globalSubscriberId\": \"C12345\"," +
+		"                \"subscriberName\": \"General Electric Division 12\"" +
+		"            }," +
+		"            \"requestParameters\": {" +
+		"               \"vpnId\": \"1a2b3c4d5e6f\"," +
+		"               \"productName\": \"Trinity\"," +
+		"               \"customerId\": \"icore9883749\"" +
+		"            }" +
+		"         }," +
+		"         \"requestStatus\": {" +
+		"            \"timestamp\": \"Thu, 04 Jun 2009 02:53:39 GMT\"," +
+		"            \"requestState\": \"InProgress\"," +
+		"            \"statusMessage\": \"vLan setup complete\"," +
+		"            \"percentProgress\": \"50\"" +
+		"         }" +
+		"      }" +
+		"   }" +
+		"}";
+	
+	/*
+	 * Sample response to subsequent getOrchestrationRequests
+	 */
+	
+	/** The get orchestration requests response. */
+	private String getOrchestrationRequestsResponse = 
+		"{" +
+		"   \"status\": 200," +
+		"   \"entity\": {" +
+		"      \"requestList\": [" +
+		"         {" +
+		"            \"request\": {" +
+		"               \"requestId\": \"rq1234d1-5a33-55df-13ab-12abad84e333\"," +
+		"               \"startTime\": \"Thu, 04 Jun 2009 02:51:59 GMT\"," +
+		"               \"finishTime\": \"Thu, 04 Jun 2009 02:55:59 GMT\"," +
+		"               \"instanceReferences\": {" +
+		"                  \"serviceInstanceId\": \"bc305d54-75b4-431b-adb2-eb6b9e546014\"" +
+		"               }," +
+		"               \"requestScope\": \"service\"," +
+		"               \"requestType\": \"createInstance\"," +
+		"               \"requestDetails\": {" +
+		"                  \"modelInfo\": {" +
+		"                     \"modelType\": \"service\"," +
+		"                     \"modelId\": \"sn5256d1-5a33-55df-13ab-12abad84e764\"," +
+		"                     \"modelNameVersionId\": \"ab6478e4-ea33-3346-ac12-ab121484a333\"," +
+		"                     \"modelName\": \"WanBonding\"," +
+		"                     \"modelVersion\": \"1\"" +
+		"                  }," +
+		"                  \"subscriberInfo\": {" +
+		"                      \"globalSubscriberId\": \"C12345\"," +
+		"                      \"subscriberName\": \"General Electric Division 12\"" +
+		"                  }," +
+		"                  \"requestParameters\": {" +
+		"                     \"vpnId\": \"1a2b3c4d5e6f\"," +
+		"                     \"productName\": \"Trinity\"," +
+		"                     \"customerId\": \"icore9883749\"" +
+		"                  }" +
+		"               }," +
+		"               \"requestStatus\": {" +
+		"                  \"timestamp\": \"Thu, 04 Jun 2009 02:54:49 GMT\"," +
+		"                  \"requestState\": \"complete\"," +
+		"                  \"statusMessage\": \"Resource Created\"," +
+		"                  \"percentProgress\": \"100\"" +
+		"               }" +
+		"            }" +
+		"         }," +
+		"         {" +
+		"            \"request\": {" +
+		"               \"requestId\": \"rq1234d1-5a33-55df-13ab-12abad84e334\"," +
+		"               \"startTime\": \"Thu, 04 Jun 2009 03:52:59 GMT\"," +
+		"               \"instanceReferences\": {" +
+		"                  \"serviceInstanceId\": \"bc305d54-75b4-431b-adb2-eb6b9e546014\"" +
+		"               }," +
+		"               \"requestScope\": \"service\"," +
+		"               \"requestType\": \"updateInstance\"," +
+		"               \"requestDetails\": {" +
+		"                  \"modelInfo\": {" +
+		"                     \"modelType\": \"service\"," +
+		"                     \"modelId\": \"sn5256d1-5a33-55df-13ab-12abad84e764\"," +
+		"                     \"modelNameVersionId\": \"ab6478e4-ea33-3346-ac12-ab121484a333\"," +
+		"                     \"modelName\": \"WanBonding\"," +
+		"                     \"modelVersion\": \"1\"" +
+		"                  }," +
+		"                  \"subscriberInfo\": {" +
+		"                      \"globalSubscriberId\": \"C12345\"," +
+		"                      \"subscriberName\": \"General Electric Division 12\"" +
+		"                  }," +
+		"                  \"requestParameters\": {" +
+		"                     \"vpnId\": \"1a2b3c4d5e70\"," +
+		"                     \"productName\": \"Trinity\"," +
+		"                     \"customerId\": \"icore9883749\"" +
+		"                  }" +
+		"               }," +
+		"               \"requestStatus\": {" +
+		"                  \"timestamp\": \"Thu, 04 Jun 2009 03:53:39 GMT\"," +
+		"                  \"requestState\": \"InProgress\"," +
+		"                  \"statusMessage\": \"vLan setup complete\"," +
+		"                  \"percentProgress\": \"50\"" +
+		"               }" +
+		"            }" +
+		"         }" +
+		"      ]" +
+		"   }" +
+		"}";
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/controller/test/TestPageController.java b/vid-app-common/src/main/java/org/openecomp/vid/controller/test/TestPageController.java
new file mode 100755
index 000000000..92f86f0bd
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/controller/test/TestPageController.java
@@ -0,0 +1,57 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package  org.openecomp.vid.controller.test;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.servlet.ModelAndView;
+
+import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
+
+/**
+ * The Class TestPageController.
+ */
+@Controller
+public class TestPageController extends RestrictedBaseController {
+
+	/**
+	 * Test mso page.
+	 *
+	 * @return the model and view
+	 */
+	@RequestMapping(value = { "testMso.htm" }, method = RequestMethod.GET)
+	public ModelAndView testMsoPage() {
+		return new ModelAndView(getViewName());
+	}
+
+	/**
+	 * Test view edit page.
+	 *
+	 * @return the model and view
+	 */
+	@RequestMapping(value = { "testViewEdit" }, method = RequestMethod.GET)
+	public ModelAndView testViewEditPage() {
+		return new ModelAndView(getViewName());
+	}
+
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/dao/FnAppDoaImpl.java b/vid-app-common/src/main/java/org/openecomp/vid/dao/FnAppDoaImpl.java
new file mode 100755
index 000000000..6d2810aa0
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/dao/FnAppDoaImpl.java
@@ -0,0 +1,112 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.dao;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URL;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Properties;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+
+
+public class FnAppDoaImpl {
+
+	/** The logger. */
+	static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(FnAppDoaImpl.class);
+		
+		public int getProfileCount(String driver, String URL, String username, String password) {
+			Connection dbc = null;
+			PreparedStatement pst = null;
+			ResultSet rs = null;
+			String q = null;
+			int count = 0;
+			try {
+				 	dbc = getConnection(driver,URL,username,password);
+				   logger.debug(EELFLoggerDelegate.debugLogger, "getConnection:::"+ dbc);
+				q = "select count(*) from fn_app";
+					pst = dbc.prepareStatement(q);
+					rs = pst.executeQuery();
+					
+					if (rs.next())
+						count = rs.getInt(1);
+			} catch(Exception ex) {
+				logger.error(EELFLoggerDelegate.errorLogger, "Failed to perform health check", ex);
+			} finally {
+				cleanup(rs,pst,dbc);
+			}
+			logger.debug(EELFLoggerDelegate.debugLogger, "count:::"+ count);
+			return count;
+		}
+
+		public static Connection getConnection(String driver2, String url, String username, String password) throws IOException, SQLException, ClassNotFoundException{
+			java.sql.Connection con=null;
+		
+			if( url!=null && username!=null && password!=null ){
+			    con = DriverManager.getConnection(url, username, password);
+			}
+			
+			   System.out.println("Connection Successful");		    	
+			return con;
+			
+		}
+		
+		public static void cleanup(ResultSet rs, PreparedStatement st, Connection c) {
+			if (rs != null) {
+				try {
+					rs.close();
+				} catch (Exception e) {
+					if (logger != null)
+						logger.error("Error when trying to close result set", e);
+				}
+			}
+			if (st != null) {
+				try {
+					st.close();
+				} catch (Exception e) {
+					if (logger != null)
+						logger.error("Error when trying to close statement", e);
+				}
+			}
+			if (c != null) {
+				try {
+					c.rollback();
+				} catch (Exception e) {
+					if (logger != null)
+						logger.error("Error when trying to rollback connection", e);
+				}
+				try {
+					c.close();
+				} catch (Exception e) {
+					if (logger != null)
+						logger.error("Error when trying to close connection", e);
+				}
+			}
+		}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/dao/ProfileDao.java b/vid-app-common/src/main/java/org/openecomp/vid/dao/ProfileDao.java
new file mode 100755
index 000000000..256a4bd8d
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/dao/ProfileDao.java
@@ -0,0 +1,45 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.dao;
+
+import java.util.List;
+import org.openecomp.portalsdk.core.domain.Profile;
+
+/**
+ * The Interface ProfileDao.
+ */
+public interface ProfileDao {
+	
+	/**
+	 * Find all.
+	 *
+	 * @return the list
+	 */
+	List findAll();
+	
+	/**
+	 * Gets the profile.
+	 *
+	 * @param id the id
+	 * @return the profile
+	 */
+	Profile getProfile(int id);
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/exceptions/VidServiceUnavailableException.java b/vid-app-common/src/main/java/org/openecomp/vid/exceptions/VidServiceUnavailableException.java
new file mode 100755
index 000000000..fcd897f78
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/exceptions/VidServiceUnavailableException.java
@@ -0,0 +1,69 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.exceptions;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+/**
+ * The Class VidServiceUnavailableException.
+ */
+@ResponseStatus(value=HttpStatus.SERVICE_UNAVAILABLE)
+public class VidServiceUnavailableException extends Exception {
+
+	/** The Constant serialVersionUID. */
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * Instantiates a new vid service unavailable exception.
+	 */
+	public VidServiceUnavailableException() {
+		super();
+	}
+	
+	/**
+	 * Instantiates a new vid service unavailable exception.
+	 *
+	 * @param msg the msg
+	 */
+	public VidServiceUnavailableException(String msg) {
+		super(msg);
+	}
+	
+	/**
+	 * Instantiates a new vid service unavailable exception.
+	 *
+	 * @param t the t
+	 */
+	public VidServiceUnavailableException(Throwable t) {
+		super(t);
+	}
+	
+	/**
+	 * Instantiates a new vid service unavailable exception.
+	 *
+	 * @param msg the msg
+	 * @param t the t
+	 */
+	public VidServiceUnavailableException(String msg, Throwable t) {
+		super(msg, t);
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/model/CommandProperty.java b/vid-app-common/src/main/java/org/openecomp/vid/model/CommandProperty.java
new file mode 100755
index 000000000..fe114c380
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/model/CommandProperty.java
@@ -0,0 +1,93 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.model;
+
+import java.util.Map;
+
+/**
+ * The Class Command Property.
+ */
+public class CommandProperty {
+	
+	/** The display name for this input */
+	private String displayName;
+	
+	/** The command, "get_input" */
+	private String command;
+	
+	/** The input name we refer to back under the inputs section */
+	private String inputName;
+
+	/**
+	 * Gets the display name.
+	 *
+	 * @return the displayName
+	 */
+	public String getDisplayName() {
+		return displayName;
+	}
+	/**
+	 * Gets the command.
+	 *
+	 * @return the command
+	 */
+	public String getCommand() {
+		return command;
+	}
+	/**
+	 * Gets the inputName.
+	 *
+	 * @return the inputName
+	 */
+	public String getInputName() {
+		return inputName;
+	}
+	/**
+	 * Sets the display name value.
+	 *
+	 * @param i the new get_input value
+	 */
+	public void setDisplayName(String i) {
+		this.displayName = i;
+	}
+	/**
+	 * Sets the command value.
+	 *
+	 * @param i the new command value
+	 */
+	public void setCommand(String i) {
+		this.command = i;
+	}
+	
+	/**
+	 * Sets the input name value.
+	 *
+	 * @param i the new input name value
+	 */
+	public void setInputName(String i) {
+		this.inputName=i;
+	}
+	
+	public String toString () {
+		String result = "displayName=" + displayName + " command=" + command + " inputName" + inputName;
+		return result;
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/model/ExceptionResponse.java b/vid-app-common/src/main/java/org/openecomp/vid/model/ExceptionResponse.java
new file mode 100755
index 000000000..686971d76
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/model/ExceptionResponse.java
@@ -0,0 +1,70 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.model;
+
+/**
+ * The Class ExceptionResponse.
+ */
+public class ExceptionResponse {
+
+	/** The exception. */
+	private String exception;
+	
+	/** The message. */
+	private String message;
+
+	/**
+	 * Gets the exception.
+	 *
+	 * @return the exception
+	 */
+	public String getException() {
+		return exception;
+	}
+
+	/**
+	 * Sets the exception.
+	 *
+	 * @param exception the new exception
+	 */
+	public void setException(String exception) {
+		this.exception = exception;
+	}
+
+	/**
+	 * Gets the message.
+	 *
+	 * @return the message
+	 */
+	public String getMessage() {
+		return message;
+	}
+
+	/**
+	 * Sets the message.
+	 *
+	 * @param message the new message
+	 */
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/model/ModelConstants.java b/vid-app-common/src/main/java/org/openecomp/vid/model/ModelConstants.java
new file mode 100755
index 000000000..f4e427076
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/model/ModelConstants.java
@@ -0,0 +1,42 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.model;
+/**
+ * The Class ModelConstants
+ */
+public class ModelConstants {
+	
+	/** The Constant GET_INPUT_TAG. */
+	public final static String GET_INPUT_TAG = "get_input";
+	
+	public static final String ASDC_MODEL_NAMESPACE = "asdc.model.namespace";
+	public static final String ASDC_SVC_API_PATH = "sdc.svc.api.path";
+	public static final String ASDC_RESOURCE_API_PATH = "sdc.resource.api.path";
+	
+	public static final String DEFAULT_ASDC_MODEL_NAMESPACE = "org.onap.";
+	public static final String DEFAULT_ASDC_SVC_API_PATH = "sdc/v1/catalog/services";
+	public static final String DEFAULT_ASDC_RESOURCE_API_PATH = "sdc/v1/catalog/resources";
+	
+	public final static String VF_MODULE = "groups.VfModule";
+	public final static String VNF = "resource.vf";
+	public final static String NETWORK = "resource.vl";
+	
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/model/Network.java b/vid-app-common/src/main/java/org/openecomp/vid/model/Network.java
new file mode 100755
index 000000000..5ab55881b
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/model/Network.java
@@ -0,0 +1,62 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.model;
+
+import org.openecomp.vid.asdc.beans.tosca.NodeTemplate;
+
+/**
+ * The Class Network.
+ */
+public class Network extends Node {
+	
+	/** The model customization name. */
+	private String modelCustomizationName;
+	
+	/**
+	 * Instantiates a new network.
+	 */
+	public Network() {
+		super();
+	}
+	/**
+	 * Gets the model customization name.
+	 *
+	 * @return the model customization name
+	 */
+	public String getModelCustomizationName() {
+		return modelCustomizationName;
+	}
+	/**
+	 * Sets the model customization name.
+	 *
+	 * @param modelCustomizationName the new model customization name
+	 */
+	private void setModelCustomizationName(String modelCustomizationName) {
+		this.modelCustomizationName = modelCustomizationName;
+	}
+	
+	public void extractNetwork(String modelCustomizationName, NodeTemplate nodeTemplate) {
+		
+		super.extractNode(nodeTemplate);	
+		setModelCustomizationName(modelCustomizationName);
+		
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/model/Node.java b/vid-app-common/src/main/java/org/openecomp/vid/model/Node.java
new file mode 100755
index 000000000..1352653e1
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/model/Node.java
@@ -0,0 +1,301 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.model;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.openecomp.vid.asdc.beans.tosca.Input;
+import org.openecomp.vid.asdc.beans.tosca.NodeTemplate;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+/**
+ * The Class Node.
+ */
+public class Node {
+	/** The Constant LOG. */
+	private static final EELFLoggerDelegate LOG = EELFLoggerDelegate.getLogger(Node.class);
+	
+	/** The Constant dateFormat. */
+	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
+
+	/** The uuid. */
+	private String uuid;
+	
+	/** The invariant uuid. */
+	private String invariantUuid;
+	
+	/** The description. */
+	private String description;
+	
+	/** The name. */
+	private String name;
+	
+	/** The version. */
+	private String version;
+	
+	/** The model customization uuid. */
+	private String customizationUuid;
+	
+	/** The inputs. */
+	private Map inputs;
+	
+	/** The get_input or other constructs from node template properties. */
+	private Map commands;
+	
+	/** The get_input or other constructs from node template properties. */
+	private Map properties;
+	/**
+	 * Instantiates a new node.
+	 */
+	public Node() {
+		this.commands = new HashMap();
+		this.properties = new HashMap();
+	}
+	
+	/**
+	 * Gets the uuid.
+	 *
+	 * @return the uuid
+	 */
+	public String getUuid() {
+		return uuid;
+	}
+
+	/**
+	 * Gets the invariant uuid.
+	 *
+	 * @return the invariant uuid
+	 */
+	public String getInvariantUuid() {
+		return invariantUuid;
+	}
+
+	/**
+	 * Gets the description.
+	 *
+	 * @return the description
+	 */
+	public String getDescription() {
+		return description;
+	}
+
+	/**
+	 * Gets the name.
+	 *
+	 * @return the name
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * Gets the version.
+	 *
+	 * @return the version
+	 */
+	public String getVersion() {
+		return version;
+	}
+	
+	/**
+	 * Gets the customization uuid.
+	 *
+	 * @return the model customization uuid
+	 */
+	public String getCustomizationUuid() {
+		return customizationUuid;
+	}
+	/**
+	 * Gets the inputs.
+	 *
+	 * @return the inputs
+	 */
+	public Map getInputs() {
+		return inputs;
+	}
+	/**
+	 * Gets the commands.
+	 *
+	 * @return the commands
+	 */
+	public Map getCommands() {
+		return commands;
+	}
+	/**
+	 * Gets the properties.
+	 *
+	 * @return the properties
+	 */
+	public Map getProperties() {
+		return properties;
+	}
+	/**
+	 * Sets the uuid.
+	 *
+	 * @param uuid the new uuid
+	 */
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+
+	/**
+	 * Sets the invariant uuid.
+	 *
+	 * @param invariantUuid the new invariant uuid
+	 */
+	public void setInvariantUuid(String invariantUuid) {
+		this.invariantUuid = invariantUuid;
+	}
+
+	/**
+	 * Sets the description.
+	 *
+	 * @param description the new description
+	 */
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	/**
+	 * Sets the name.
+	 *
+	 * @param name the new name
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	/**
+	 * Sets the version.
+	 *
+	 * @param version the new version
+	 */
+	public void setVersion(String version) {
+		this.version = version;
+	}
+	/**
+	 * Sets the customization uuid.
+	 *
+	 * @param u the new customization uuid
+	 */
+	public void setCustomizationUuid(String u) {
+		this.customizationUuid = u;
+	}
+
+	/**
+	 * Sets the inputs.
+	 *
+	 * @param inputs the inputs
+	 */
+	public void setInputs(Map inputs) {
+		this.inputs = inputs;
+	}
+	/**
+	 * Sets the commands.
+	 *
+	 * @param m the commands
+	 */
+	public void setCommands( Mapm ) {
+		commands = m;
+	}
+	/**
+	 * Sets the properties.
+	 *
+	 * @param p the properties
+	 */
+	public void setProperties( Mapp) {
+		properties = p;
+	}
+	/**
+	 * Extract node.
+	 *
+	 * @param modelCustomizationName the model customization name
+	 * @param nodeTemplate the node template
+	 * @return the node
+	 */
+	public void extractNode (NodeTemplate nodeTemplate) {
+		
+		String methodName = "extractNode";
+		
+		setUuid(nodeTemplate.getMetadata().getUUID());
+		setInvariantUuid(nodeTemplate.getMetadata().getInvariantUUID());
+		setDescription(nodeTemplate.getMetadata().getDescription());
+		setName(nodeTemplate.getMetadata().getName());
+		setVersion(nodeTemplate.getMetadata().getVersion());
+		// add customizationUUID
+		setCustomizationUuid(nodeTemplate.getMetadata().getCustomizationUUID());
+
+		try {
+			// nodeTemplate.getProperties() map of String->Object
+			for (Entry e : nodeTemplate.getProperties().entrySet()) {
+				
+				String k = e.getKey();
+				
+				LOG.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + methodName + " node template property: " + k );
+				
+				if ( e.getValue() != null ) {
+					LOG.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + methodName + "  property: " + 
+							k + "=" + e.getValue());
+					//LOG.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + methodName + " V class name: " +
+					//	 e.getValue().getClass().getName());
+					Class c = e.getValue().getClass();
+					if ( c.getName().equalsIgnoreCase(java.lang.String.class.getName())) {
+						getProperties().put (k, (String)e.getValue());
+					}
+					else {
+						Class[] interfaces = e.getValue().getClass().getInterfaces();
+
+						for(Class ifc: interfaces ) {
+							//LOG.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + methodName + " ifc name: " +
+							//	 ifc.getName());
+							if ( ifc.getName().equalsIgnoreCase(java.util.Map.class.getName()) ) {
+								// only extract get_input for now
+								@SuppressWarnings("unchecked")
+								HashMap v = (HashMap)e.getValue();
+								for (Entry entry : v.entrySet()) {
+									// only include get_input for now
+									if ( ModelConstants.GET_INPUT_TAG.equalsIgnoreCase ( entry.getKey() ) ) {
+										CommandProperty cp = new CommandProperty();
+										cp.setCommand(entry.getKey());
+										cp.setInputName(entry.getValue());
+										cp.setDisplayName(k);
+										getCommands().put(k,cp);
+									}
+								}
+							}
+						}
+
+					}
+				}
+			}
+		}
+		catch ( Exception e ) {
+			LOG.error(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + methodName + " Unable to parse node properties: e=" + 
+					e.toString());
+		}
+	}
+
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/model/Resource.java b/vid-app-common/src/main/java/org/openecomp/vid/model/Resource.java
new file mode 100755
index 000000000..4dcc975b1
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/model/Resource.java
@@ -0,0 +1,28 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.model;
+
+/**
+ * The Class Resource.
+ */
+public class Resource {
+
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/model/Result.java b/vid-app-common/src/main/java/org/openecomp/vid/model/Result.java
new file mode 100755
index 000000000..d8bf6eb64
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/model/Result.java
@@ -0,0 +1,58 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.model;
+
+/**
+ * The Class Result.
+ */
+public class Result {
+	
+	/** The result. */
+	private String result;
+	
+	/**
+	 * Instantiates a new result.
+	 *
+	 * @param result the result
+	 */
+	public Result(String result) {
+		this.result = result;
+	}
+
+	/**
+	 * Gets the result.
+	 *
+	 * @return the result
+	 */
+	public String getResult() {
+		return result;
+	}
+
+	/**
+	 * Sets the result.
+	 *
+	 * @param result the new result
+	 */
+	public void setResult(String result) {
+		this.result = result;
+	}
+	
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/model/Service.java b/vid-app-common/src/main/java/org/openecomp/vid/model/Service.java
new file mode 100755
index 000000000..f3c6e4da4
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/model/Service.java
@@ -0,0 +1,253 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.model;
+
+import java.util.Map;
+import java.util.UUID;
+import java.util.Map.Entry;
+
+import org.openecomp.vid.asdc.beans.tosca.Input;
+
+/**
+ * The Class Service.
+ */
+public class Service {
+
+	/** The uuid. */
+	private String uuid;
+	
+	/** The invariant uuid. */
+	private String invariantUuid;
+	
+	/** The name. */
+	private String name;
+	
+	/** The version. */
+	private String version;
+	
+	/** The tosca model URL. */
+	private String toscaModelURL;
+	
+	/** The category. */
+	private String category;
+	
+	/** The description. */
+	private String description;
+	
+	/** The service ecomp naming flag */
+	private String serviceEcompNaming;
+	
+	/** The inputs. */
+	private Map inputs;
+	
+	/**
+	 * Gets the uuid.
+	 *
+	 * @return the uuid
+	 */
+	public String getUuid() {
+		return uuid;
+	}
+	
+	/**
+	 * Gets the invariant uuid.
+	 *
+	 * @return the invariant uuid
+	 */
+	public String getInvariantUuid() {
+		return invariantUuid;
+	}
+	
+	/**
+	 * Gets the name.
+	 *
+	 * @return the name
+	 */
+	public String getName() {
+		return name;
+	}
+	
+	/**
+	 * Gets the version.
+	 *
+	 * @return the version
+	 */
+	public String getVersion() {
+		return version;
+	}
+	
+	/**
+	 * Gets the tosca model URL.
+	 *
+	 * @return the tosca model URL
+	 */
+	public String getToscaModelURL() {
+		return toscaModelURL;
+	}
+	
+	/**
+	 * Gets the category.
+	 *
+	 * @return the category
+	 */
+	public String getCategory() {
+		return category;
+	}
+	
+	/**
+	 * Gets the description.
+	 *
+	 * @return the description
+	 */
+	public String getDescription() {
+		return description;
+	}
+	
+	/**
+	 * Gets the inputs.
+	 *
+	 * @return the inputs
+	 */
+	public Map getInputs() {
+		return inputs;
+	}
+	/**
+	 * Get the serviceEcompNaming value
+	 *
+	 * @return serviceEcompNaming
+	 */
+	public String getServiceEcompNaming() {
+		return serviceEcompNaming;
+	} 
+	/**
+	 * Sets the uuid.
+	 *
+	 * @param uuid the new uuid
+	 */
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+	
+	/**
+	 * Sets the invariant uuid.
+	 *
+	 * @param invariantUuid the new invariant uuid
+	 */
+	public void setInvariantUuid(String invariantUuid) {
+		this.invariantUuid = invariantUuid;
+	}
+	
+	/**
+	 * Sets the name.
+	 *
+	 * @param name the new name
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	/**
+	 * Sets the version.
+	 *
+	 * @param version the new version
+	 */
+	public void setVersion(String version) {
+		this.version = version;
+	}
+	
+	/**
+	 * Sets the tosca model URL.
+	 *
+	 * @param toscaModelURL the new tosca model URL
+	 */
+	public void setToscaModelURL(String toscaModelURL) {
+		this.toscaModelURL = toscaModelURL;
+	}
+	
+	/**
+	 * Sets the category.
+	 *
+	 * @param category the new category
+	 */
+	public void setCategory(String category) {
+		this.category = category;
+	}
+	
+	/**
+	 * Sets the description.
+	 *
+	 * @param description the new description
+	 */
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	
+	/**
+	 * Sets the inputs.
+	 *
+	 * @param inputs the inputs
+	 */
+	public void setInputs(Map inputs) {
+		this.inputs = inputs;
+	}
+	/**
+	 * Sets the service ecomp naming.
+	 *
+	 * @param serviceEcompNaming the new service ecomp naming
+	 */
+	public void setServiceEcompNaming(String serviceEcompNaming) {
+		this.serviceEcompNaming = serviceEcompNaming;
+	}
+	/* (non-Javadoc)
+	 * @see java.lang.Object#hashCode()
+	 */
+	@Override
+	public int hashCode() {
+		final UUID uuid = UUID.fromString(getUuid());
+		
+		return uuid.hashCode();
+	}
+	
+	/* (non-Javadoc)
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	@Override
+	public boolean equals(Object o) {
+		if (o == this) return true;
+		if (!(o instanceof Service)) return false;
+		
+		final Service service = (Service) o;
+		
+		return (service.getUuid().equals(getUuid()));
+	}
+	/*public static void extractVfModuleCustomizationUUID (Service s, String vnfCustomizationName, VfModule vfMod ) {
+		
+		//Look for vnfCustomizationName..vfModuleCustomizationName
+		String nameToFind = vnfCustomizationName + ".." + vfMod.getModelCustomizationName();
+		for (Entry vfModuleComponent : s.getVfModules().entrySet()) {
+			VfModule xMod = vfModuleComponent.getValue();
+			if ( (xMod.getModelCustomizationName() != null) && (xMod.getModelCustomizationName().equalsIgnoreCase(nameToFind)) ) {
+				vfMod.setCustomizationUuid( xMod.getCustomizationUuid());
+				return;
+			}
+		}
+	}*/
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/model/ServiceModel.java b/vid-app-common/src/main/java/org/openecomp/vid/model/ServiceModel.java
new file mode 100755
index 000000000..140e9edf1
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/model/ServiceModel.java
@@ -0,0 +1,261 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.model;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.openecomp.vid.asdc.beans.tosca.Group;
+import org.openecomp.vid.asdc.beans.tosca.ToscaModel;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.vid.controller.VidController;
+import org.openecomp.vid.properties.VidProperties;
+/**
+ * The Class ServiceModel.
+ */
+public class ServiceModel {
+
+	/** The Constant LOG. */
+	private static final EELFLoggerDelegate LOG = EELFLoggerDelegate.getLogger(ServiceModel.class);
+	
+	/** The Constant dateFormat. */
+	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
+	/** The service. */
+	private Service service;
+	
+	/** The vnfs. */
+	private Map vnfs;
+	
+	/** The networks. */
+	private Map networks;
+
+	/** 
+	 * The vf modules. The VNF also has vfmodules but the vfmodules at the service level may have additional info
+	 * that is not present in the VNF, like the vf module customization String 
+	 */
+	private Map vfModules;
+	/** 
+	 * The volume groups. The VNF also has volume groups but the volume groups will be populated at the service level 
+	 * for newer models 
+	 */
+	private Map volumeGroups;
+	/**
+	 * Instantiates a new service model.
+	 */
+	public ServiceModel() {}
+	
+	/**
+	 * Gets the service.
+	 *
+	 * @return the service
+	 */
+	public Service getService() {
+		return service;
+	}
+
+	/**
+	 * Gets the vnfs.
+	 *
+	 * @return the vnfs
+	 */
+	public Map getVnfs() {
+		return vnfs;
+	}
+
+	/**
+	 * Gets the networks.
+	 *
+	 * @return the networks
+	 */
+	public Map getNetworks() {
+		return networks;
+	}
+
+	/**
+	 * Sets the service.
+	 *
+	 * @param service the new service
+	 */
+	public void setService(Service service) {
+		this.service = service;
+	}
+
+	/**
+	 * Sets the vnfs.
+	 *
+	 * @param vnfs the vnfs
+	 */
+	public void setVnfs(Map vnfs) {
+		this.vnfs = vnfs;
+	}
+
+	/**
+	 * Sets the networks.
+	 *
+	 * @param networks the networks
+	 */
+	public void setNetworks(Map networks) {
+		this.networks = networks;
+	}
+	/**
+	 * Gets the vf modules.
+	 *
+	 * @return the vf modules
+	 */
+	public Map getVfModules() {
+		return vfModules;
+	}
+	/**
+	 * Gets the volume groups.
+	 *
+	 * @return the volume groups
+	 */
+	public Map getVolumeGroups() {
+		return volumeGroups;
+	}
+	/**
+	 * Sets the vf modules.
+	 *
+	 * @param vfModules the vf modules
+	 */
+	public void setVfModules(Map vfModules) {
+		this.vfModules = vfModules;
+	}
+	/**
+	 * Sets the volume groups.
+	 *
+	 * @param volumeGroups the volume groups
+	 */
+	public void setVolumeGroups(Map volumeGroups) {
+		this.volumeGroups = volumeGroups;
+	}
+	/**
+	 * Extract service.
+	 *
+	 * @param serviceToscaModel the service tosca model
+	 * @param asdcServiceMetadata the asdc service metadata
+	 * @return the service
+	 */
+	public static Service extractService(ToscaModel serviceToscaModel, org.openecomp.vid.asdc.beans.Service asdcServiceMetadata) {
+		
+		final Service service = new Service();
+		
+		service.setCategory(serviceToscaModel.getMetadata().getCategory());
+		service.setInvariantUuid(serviceToscaModel.getMetadata().getInvariantUUID());
+		service.setName(serviceToscaModel.getMetadata().getName());
+		service.setUuid(serviceToscaModel.getMetadata().getUUID());
+		service.setDescription(serviceToscaModel.getMetadata().getDescription());
+		service.setServiceEcompNaming(serviceToscaModel.getMetadata().getServiceEcompNaming());
+		service.setInputs(serviceToscaModel.gettopology_template().getInputs());
+		//FIXME: SDC is not sending the Version with the Tosca Model for 1610 - they should send it in 1702
+		//THIS IS A TEMPORARY FIX, AT SOME POINT UNCOMMENT ME
+		//service.setVersion(serviceToscaModel.getMetadata().getVersion());
+		service.setVersion(asdcServiceMetadata.getVersion());
+
+		return service;
+	}
+	public void extractGroups (ToscaModel serviceToscaModel) {
+		// Get the groups. The groups may duplicate the groups that are in the VNF model and have
+		// additional data like the VF module customization String>
+		
+		final Map vfModules = new HashMap ();
+		final Map volumeGroups = new HashMap ();
+		
+		String asdcModelNamespace = VidProperties.getAsdcModelNamespace();
+    	String vfModuleTag = asdcModelNamespace + ModelConstants.VF_MODULE;
+    	
+		for (Entry component : serviceToscaModel.gettopology_template().getGroups().entrySet()) {
+			final Group group = component.getValue();
+			final String type = group.getType();
+			final String customizationName = component.getKey();
+			
+			if (type.startsWith(vfModuleTag)) {
+				VfModule vfMod = VfModule.extractVfModule(customizationName, group);
+				vfModules.put(customizationName, vfMod);
+				if ( vfMod.isVolumeGroupAllowed() ) {
+					//volume groups have the same customization name as the vf module
+					volumeGroups.put(customizationName, VolumeGroup.extractVolumeGroup(customizationName,group));
+				}
+			}
+		}
+		// add this point vfModules and volume groups are disconnected from VNF
+		this.setVfModules (vfModules);
+		this.setVolumeGroups (volumeGroups);
+		
+	}
+	/**
+	 * Populate the vf modules and volume groups that we may have under the service level under each VNF.
+	 */
+	public void associateGroups() {
+		String methodName = "associateGroups()";
+        LOG.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + methodName + " start");
+		// go through the vnfs, get the vnf normalized name and look for a vf module with a customization name that starts
+		// with vnf + ".."
+		String vnfCustomizationName = null;
+		String normalizedVnfCustomizationName = null;
+		String vfModuleCustomizationName = null;
+		VNF tmpVnf = null;
+		
+		if ( ( getVnfs() != null ) && (!(getVnfs().isEmpty())) ) {
+			for (Entry vnfComponent : getVnfs().entrySet()) {
+				vnfCustomizationName = vnfComponent.getValue().getModelCustomizationName();
+				normalizedVnfCustomizationName = VNF.normalizeName(vnfCustomizationName);
+				
+				LOG.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + methodName + 
+						" VNF customizationName=" + vnfCustomizationName + "normalized customization name=" + normalizedVnfCustomizationName);
+				
+				// now check to see if there is a vf module with customization name that starts with normalizedVnfCustomizationName
+				
+				if (( getVfModules() != null ) && (!(getVfModules().isEmpty()))) {
+					for (Entry vfModuleComponent : getVfModules().entrySet()) {
+						vfModuleCustomizationName = vfModuleComponent.getValue().getModelCustomizationName();
+						
+						LOG.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + methodName + 
+								" VF Module customizationName=" + vfModuleCustomizationName );
+						if ( vfModuleCustomizationName.startsWith(normalizedVnfCustomizationName + ".." )) {
+							
+							// this vf module belongs to the VNF
+							tmpVnf = vnfComponent.getValue();
+							(tmpVnf.getVfModules()).put(vfModuleComponent.getKey(), vfModuleComponent.getValue());
+							
+							LOG.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + methodName + 
+									" Associated VF Module customizationName=" + vfModuleComponent.getKey() + " with VNF customization name=" + vnfCustomizationName);
+							
+							// now find if this vf module has volume groups, if so, find the volume group with the same customization name and put it under the VNF
+							if ( vfModuleComponent.getValue().isVolumeGroupAllowed() ) {
+								if (( getVolumeGroups() != null ) && (!(getVolumeGroups().isEmpty()))) {
+									if (getVolumeGroups().containsKey((vfModuleCustomizationName))) {
+										(vnfComponent.getValue().getVolumeGroups()).put(vfModuleCustomizationName, (getVolumeGroups()).get(vfModuleCustomizationName));
+									}
+								}	
+							}
+						}
+					}
+				}
+			}
+		}
+		
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/model/VNF.java b/vid-app-common/src/main/java/org/openecomp/vid/model/VNF.java
new file mode 100755
index 000000000..be37c947b
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/model/VNF.java
@@ -0,0 +1,165 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.model;
+
+import java.util.Map;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map.Entry;
+import java.util.regex.Pattern;
+
+import org.openecomp.vid.asdc.beans.tosca.NodeTemplate;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.vid.controller.VidController;
+
+import org.openecomp.vid.asdc.beans.tosca.Group;
+import org.openecomp.vid.asdc.beans.tosca.Input;
+
+/**
+ * The Class VNF.
+ */
+public class VNF extends Node {
+	
+	/** The Constant LOG. */
+	private static final EELFLoggerDelegate LOG = EELFLoggerDelegate.getLogger(VNF.class);
+	
+	/** The Constant dateFormat. */
+	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
+
+	/** The pattern used to normalize VNF names */
+	final static Pattern COMPONENT_INSTANCE_NAME_DELIMETER_PATTERN = Pattern.compile("[\\.\\-]+");
+	
+	/** The model customization name. */
+	private String modelCustomizationName;
+	
+	/** The vf modules. */
+	private Map vfModules = new HashMap();
+	
+	/** The volume groups. */
+	private Map volumeGroups = new HashMap();
+	
+	/**
+	 * Instantiates a new vnf.
+	 */
+	public VNF() {
+		super();
+	}
+
+	/**
+	 * Gets the model customization name.
+	 *
+	 * @return the model customization name
+	 */
+	public String getModelCustomizationName() {
+		return modelCustomizationName;
+	}
+	
+	/**
+	 * Gets the vf modules.
+	 *
+	 * @return the vf modules
+	 */
+	public Map getVfModules() {
+		return vfModules;
+	}
+
+	/**
+	 * Sets the vf modules.
+	 *
+	 * @param vfModules the vf modules
+	 */
+	public void setVfModules(Map vfModules) {
+		this.vfModules = vfModules;
+	}
+
+	/**
+	 * Gets the volume groups.
+	 *
+	 * @return the volume groups
+	 */
+	public Map getVolumeGroups() {
+		return volumeGroups;
+	}
+
+	/**
+	 * Sets the volume groups.
+	 *
+	 * @param volumeGroups the volume groups
+	 */
+	public void setVolumeGroups(Map volumeGroups) {
+		this.volumeGroups = volumeGroups;
+	}
+
+	/**
+	 * Extract vnf.
+	 *
+	 * @param modelCustomizationName the model customization name
+	 * @param nodeTemplate the node template
+	 * @return the vnf
+	 */
+	public void extractVnf(String modelCustomizationName, NodeTemplate nodeTemplate) {
+		
+		super.extractNode(nodeTemplate);	
+		setModelCustomizationName(modelCustomizationName);
+		
+	}
+
+	/**
+	 * Sets the model customization name.
+	 *
+	 * @param modelCustomizationName the new model customization name
+	 */
+	private void setModelCustomizationName(String modelCustomizationName) {
+		this.modelCustomizationName = modelCustomizationName;
+	}
+	/**
+	 * Normalize the VNF name
+	 * @param originalName
+	 * @return the normalized name
+	 */
+	public static String normalizeName (String originalName) {
+
+		String normalizedName = originalName.toLowerCase();
+		normalizedName = COMPONENT_INSTANCE_NAME_DELIMETER_PATTERN.matcher(normalizedName).replaceAll(" ");
+		String[] splitArr = null;
+		
+		try {
+			splitArr = normalizedName.split(" ");
+		}
+		catch (Exception ex ) {
+			return (normalizedName);
+		}
+		StringBuffer sb = new StringBuffer();
+		if ( splitArr != null ) {
+			for (String splitElement : splitArr) {
+				sb.append(splitElement);
+			}
+			return (sb.toString());
+		}
+		else {
+			return (normalizedName);
+		}
+		
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/model/VfModule.java b/vid-app-common/src/main/java/org/openecomp/vid/model/VfModule.java
new file mode 100755
index 000000000..4a031a6c6
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/model/VfModule.java
@@ -0,0 +1,308 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.model;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import org.openecomp.vid.asdc.beans.tosca.Group;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+
+/**
+ * The Class VfModule.
+ */
+public class VfModule {
+
+	/** The Constant LOG. */
+	private static final EELFLoggerDelegate LOG = EELFLoggerDelegate.getLogger(VfModule.class);
+	
+	/** The Constant dateFormat. */
+	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
+	
+	/** The uuid. */
+	private String uuid;
+	
+	/** The invariant uuid. */
+	private String invariantUuid;
+	
+	/** The customization uuid. */
+	private String customizationUuid;
+	
+	/** The description. */
+	private String description;
+	
+	/** The name. */
+	private String name;
+	
+	/** The version. */
+	private String version;
+	
+	/** The volume group allowed. */
+	private boolean volumeGroupAllowed;
+	
+	/** The get_input or other constructs for VF Module. */
+	private Map commands;
+	
+	/** The model customization name. */
+	private String modelCustomizationName;
+	
+	/**
+	 * Instantiates a new vf module.
+	 */
+	public VfModule() {
+		commands = new HashMap();
+	}
+	/**
+	 * Gets the model customization name.
+	 *
+	 * @return the model customization name
+	 */
+	public String getModelCustomizationName() {
+		return modelCustomizationName;
+	}
+	/**
+	 * Gets the uuid.
+	 *
+	 * @return the uuid
+	 */
+	public String getUuid() {
+		return uuid;
+	}
+
+	/**
+	 * Gets the invariant uuid.
+	 *
+	 * @return the invariant uuid
+	 */
+	public String getInvariantUuid() {
+		return invariantUuid;
+	}
+	/**
+	 * Gets the customization uuid.
+	 *
+	 * @return the invariant uuid
+	 */
+	public String getCustomizationUuid() {
+		return customizationUuid;
+	}
+	/**
+	 * Gets the description.
+	 *
+	 * @return the description
+	 */
+	public String getDescription() {
+		return description;
+	}
+	/**
+	 * Gets the commands.
+	 *
+	 * @return the commands
+	 */
+	public Map getCommands() {
+		return commands;
+	}
+	/**
+	 * Gets the name.
+	 *
+	 * @return the name
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * Gets the version.
+	 *
+	 * @return the version
+	 */
+	public String getVersion() {
+		return version;
+	}
+
+	/**
+	 * Checks if is volume group allowed.
+	 *
+	 * @return true, if is volume group allowed
+	 */
+	public boolean isVolumeGroupAllowed() {
+		return volumeGroupAllowed;
+	}
+	
+	/**
+	 * Sets the uuid.
+	 *
+	 * @param uuid the new uuid
+	 */
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+
+	/**
+	 * Sets the invariant uuid.
+	 *
+	 * @param invariantUuid the new invariant uuid
+	 */
+	public void setInvariantUuid(String invariantUuid) {
+		this.invariantUuid = invariantUuid;
+	}
+	/**
+	 * Sets the customization uuid.
+	 *
+	 * @param customizationUuid the new customization uuid
+	 */
+	public void setCustomizationUuid(String customizationUuid) {
+		this.customizationUuid = customizationUuid;
+	}
+	/**
+	 * Sets the description.
+	 *
+	 * @param description the new description
+	 */
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	/**
+	 * Sets the name.
+	 *
+	 * @param name the new name
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	/**
+	 * Sets the version.
+	 *
+	 * @param version the new version
+	 */
+	public void setVersion(String version) {
+		this.version = version;
+	}
+
+	/**
+	 * Sets the volume group allowed.
+	 *
+	 * @param volumeGroupAllowed the new volume group allowed
+	 */
+	private void setVolumeGroupAllowed(boolean volumeGroupAllowed) {
+		this.volumeGroupAllowed = volumeGroupAllowed;
+	}
+	/**
+	 * Sets the commands.
+	 *
+	 * @param m the commands
+	 */
+	public void setCommands( Mapm ) {
+		commands = m;
+	}
+	/**
+	 * Sets the model customization name.
+	 *
+	 * @param modelCustomizationName the new model customization name
+	 */
+	private void setModelCustomizationName(String modelCustomizationName) {
+		this.modelCustomizationName = modelCustomizationName;
+	}
+	/**
+	 * Extract vf module.
+	 *
+	 * @param group the group
+	 * @return the vf module
+	 */
+	public static  VfModule extractVfModule(String modelCustomizationName, Group group) {
+		
+		String methodName = "extractVfModule";
+
+		final VfModule vfModule = new VfModule();
+		
+		try {
+			vfModule.setUuid(group.getMetadata().getVfModuleModelUUID());
+			vfModule.setInvariantUuid(group.getMetadata().getVfModuleModelInvariantUUID());
+			vfModule.setDescription(group.getMetadata().getDescription());
+			vfModule.setName(group.getMetadata().getVfModuleModelName());
+			vfModule.setVersion(group.getMetadata().getVfModuleModelVersion());
+			vfModule.setCustomizationUuid(group.getMetadata().getVfModuleModelCustomizationUUID());
+			vfModule.setModelCustomizationName (modelCustomizationName);
+			
+			if (group.getProperties().containsKey("volume_group")) {
+				if (group.getProperties().get("volume_group") != null) {
+				
+					Class c = group.getProperties().get("volume_group").getClass();
+					LOG.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + methodName + " class name=" + 
+							c.getName());
+					
+					if ( c.getName().equalsIgnoreCase(Boolean.class.getName()) ) {
+						Boolean b = (Boolean)group.getProperties().get("volume_group");
+						vfModule.setVolumeGroupAllowed( b.booleanValue() );
+					}
+				}
+			} else {
+				vfModule.setVolumeGroupAllowed(false);
+			}
+		}
+		catch ( Exception e ) {
+			LOG.error(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + methodName + " Unable to parse VF Module from group: e=" + 
+					e.toString());
+		}
+		/* Not extracting other types of properties for 1702
+		 try {
+			
+			for (Entry e : group.getProperties().entrySet()) {
+				
+				String k = e.getKey();
+				if ( e.getValue() != null ) {
+					LOG.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + methodName + " property: " + 
+							k + "=" + e.getValue());
+					LOG.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + methodName + " V class name: " +
+							 e.getValue().getClass().getName());
+					 Class[] interfaces = e.getValue().getClass().getInterfaces();
+					 
+					 for(Class ifc: interfaces ){
+						 LOG.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + methodName + " ifc name: " +
+								 ifc.getName());
+				     }
+					 
+					// only extract get_input for now
+					for (Entry entry : v.entrySet()) {
+						// only include get_input for now
+						if ( ModelConstants.GET_INPUT_TAG.equalsIgnoreCase ( entry.getKey() ) ) {
+							CommandProperty cp = new CommandProperty();
+							cp.setDisplayName(entry.getValue());
+							cp.setCommand(entry.getKey());
+							cp.setInputName(k);
+							(vfModule.getCommands()).put(k,cp);
+						}
+					} 
+				}
+			}
+		}
+		catch ( Exception e ) {
+			LOG.error(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + methodName + " Unable to parse VF Module properties: e=" + 
+					e.toString());
+		}*/
+		return vfModule;
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/model/VolumeGroup.java b/vid-app-common/src/main/java/org/openecomp/vid/model/VolumeGroup.java
new file mode 100755
index 000000000..ea8e151d6
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/model/VolumeGroup.java
@@ -0,0 +1,196 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.model;
+
+import org.openecomp.vid.asdc.beans.tosca.Group;
+
+/**
+ * The Class VolumeGroup.
+ */
+public class VolumeGroup {
+
+	/** The uuid. */
+	private String uuid;
+	
+	/** The invariant uuid. */
+	private String invariantUuid;
+	
+	/** The description. */
+	private String description;
+	
+	/** The name. */
+	private String name;
+	
+	/** The version. */
+	private String version;
+	
+	/** The customization uuid. */
+	private String customizationUuid;
+	
+	/** The customization uuid. */
+	private String modelCustomizationName;
+	/**
+	 * Instantiates a new volume group.
+	 */
+	public VolumeGroup() {}
+
+	/**
+	 * Gets the uuid.
+	 *
+	 * @return the uuid
+	 */
+	public String getUuid() {
+		return uuid;
+	}
+	/**
+	 * Gets the customization uuid.
+	 *
+	 * @return the customization uuid
+	 */
+	public String getCustomizationUuid() {
+		return customizationUuid;
+	}
+	/**
+	 * Gets the customization name.
+	 *
+	 * @return the customization name
+	 */
+	public String getModelCustomizationName() {
+		return modelCustomizationName;
+	}
+	/**
+	 * Gets the invariant uuid.
+	 *
+	 * @return the invariant uuid
+	 */
+	public String getInvariantUuid() {
+		return invariantUuid;
+	}
+
+	/**
+	 * Gets the description.
+	 *
+	 * @return the description
+	 */
+	public String getDescription() {
+		return description;
+	}
+
+	/**
+	 * Gets the name.
+	 *
+	 * @return the name
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * Gets the version.
+	 *
+	 * @return the version
+	 */
+	public String getVersion() {
+		return version;
+	}
+
+	/**
+	 * Sets the uuid.
+	 *
+	 * @param uuid the new uuid
+	 */
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+
+	/**
+	 * Sets the invariant uuid.
+	 *
+	 * @param invariantUuid the new invariant uuid
+	 */
+	public void setInvariantUuid(String invariantUuid) {
+		this.invariantUuid = invariantUuid;
+	}
+
+	/**
+	 * Sets the description.
+	 *
+	 * @param description the new description
+	 */
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	/**
+	 * Sets the name.
+	 *
+	 * @param name the new name
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	/**
+	 * Sets the version.
+	 *
+	 * @param version the new version
+	 */
+	public void setVersion(String version) {
+		this.version = version;
+	}
+	/**
+	 * Sets the customization uuid.
+	 *
+	 * @param u the new customization uuid
+	 */
+	private void setCustomizationUuid(String u) {
+		this.customizationUuid = u;
+		
+	}
+	/**
+	 * Sets the customization name.
+	 *
+	 * @param u the new customization name
+	 */
+	private void setModelCustomizationName(String u) {
+		this.modelCustomizationName = u;
+		
+	}
+	/**
+	 * Extract volume group.
+	 *
+	 * @param group the group
+	 * @return the volume group
+	 */
+	public static VolumeGroup extractVolumeGroup(String modelCustomizationName, Group group) {
+		final VolumeGroup volumeGroup = new VolumeGroup();
+		
+		volumeGroup.setUuid(group.getMetadata().getVfModuleModelUUID());
+		volumeGroup.setInvariantUuid(group.getMetadata().getVfModuleModelInvariantUUID());
+		volumeGroup.setDescription(group.getMetadata().getDescription());
+		volumeGroup.setName(group.getMetadata().getVfModuleModelName());
+		volumeGroup.setVersion(group.getMetadata().getVfModuleModelVersion());
+		volumeGroup.setCustomizationUuid(group.getMetadata().getVfModuleModelCustomizationUUID());
+		volumeGroup.setModelCustomizationName(modelCustomizationName);
+		return volumeGroup;
+	}
+
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoProperties.java b/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoProperties.java
new file mode 100755
index 000000000..272a2a2b8
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoProperties.java
@@ -0,0 +1,100 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.mso;
+
+import org.openecomp.portalsdk.core.util.SystemProperties;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+
+/**
+ * The Class MsoProperties.
+ */
+public class MsoProperties extends SystemProperties {
+
+	/** The Constant MSO_SERVER_URL. */
+	//VID Properties related to MSO
+	public static final String MSO_SERVER_URL = "mso.server.url";
+	
+	/** The Constant MSO_DME2_SERVER_URL. */
+	public static final String MSO_DME2_SERVER_URL = "mso.dme2.server.url";
+	
+	/** The Constant MSO_DME2_CLIENT_TIMEOUT. */
+	public static final String MSO_DME2_CLIENT_TIMEOUT = "mso.dme2.client.timeout";
+	
+	/** The Constant MSO_DME2_CLIENT_READ_TIMEOUT. */
+	public static final String MSO_DME2_CLIENT_READ_TIMEOUT = "mso.dme2.client.read.timeout";
+	
+	/** The Constant MSO_SERVER_URL_DEFAULT. */
+	public static final String MSO_SERVER_URL_DEFAULT= "";
+	
+	/** The Constant MSO_POLLING_INTERVAL_MSECS. */
+	// number of msecs to wait between polling requests
+	public static final String MSO_POLLING_INTERVAL_MSECS = "mso.polling.interval.msecs";
+	
+	/** The Constant MSO_POLLING_INTERVAL_MSECS_DEFAULT. */
+	public static final String MSO_POLLING_INTERVAL_MSECS_DEFAULT = "60000";
+	
+	/** The Constant MSO_DME2_ENABLED. */
+	public static final String MSO_DME2_ENABLED = "mso.dme2.enabled";
+	
+	/** The Constant MSO_MAX_POLLS. */
+	public static final String MSO_MAX_POLLS = "mso.max.polls";
+	
+	/** The Constant MSO_MAX_POLLS_DEFAULT. */
+	public static final String MSO_MAX_POLLS_DEFAULT = "10"; //10
+	
+	/** The Constant MSO_USER_NAME. */
+	public static final String MSO_USER_NAME = "mso.user.name"; //m03346
+	
+	/** The Constant MSO_PASSWORD. */
+	public static final String MSO_PASSWORD = "mso.password.x"; 
+	
+	/** The Constant MSO_REST_API_SVC_INSTANCE. */
+	public static final String MSO_REST_API_SVC_INSTANCE = "mso.restapi.svc.instance"; // /serviceInstances/v2 
+	
+	/** The Constant MSO_REST_API_VNF_INSTANCE. */
+	public static final String MSO_REST_API_VNF_INSTANCE = "mso.restapi.vnf.instance"; // /serviceInstances/v2/{service_instance_id}/vnfs
+	
+	/** The Constant MSO_REST_API_NETWORK_INSTANCE. */
+	public static final String MSO_REST_API_NETWORK_INSTANCE = "mso.restapi.network.instance"; // /serviceInstances/v2/{serviceInstanceId}/networks
+	
+	/** The Constant MSO_REST_API_GET_ORC_REQ. */
+	public static final String MSO_REST_API_GET_ORC_REQ = "mso.restapi.get.orc.req";
+	
+	/** The Constant MSO_REST_API_GET_ORC_REQS. */
+	public static final String MSO_REST_API_GET_ORC_REQS = "mso.restapi.get.orc.reqs";
+	
+	/** The Constant MSO_REST_API_VF_MODULE_INSTANCE. */
+	public static final String MSO_REST_API_VF_MODULE_INSTANCE = "mso.restapi.vf.module.instance";
+	
+	/** The Constant MSO_REST_API_VOLUME_GROUP_INSTANCE. */
+	public static final String MSO_REST_API_VOLUME_GROUP_INSTANCE = "mso.restapi.volume.group.instance"; //serviceInstances/v2/{serviceInstanceId}/volumeGroups
+	
+	/** The logger. */
+	public EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MsoProperties.class);
+	
+	/** The Constant dateFormat. */
+	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
+	
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoResponseWrapper.java b/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoResponseWrapper.java
new file mode 100755
index 000000000..d5a4a87ef
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoResponseWrapper.java
@@ -0,0 +1,107 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.mso;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+/**
+ * This wrapper encapsulates the MSO response in the format expected by the pages.
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+	    "status",
+	    "entity"
+})
+
+public class MsoResponseWrapper  {
+	
+	/** The status. */
+	@JsonProperty("status")
+	private int status;
+	
+	/** The entity. */
+	@JsonProperty("entity")
+	private String entity;
+	
+	/**
+	 * Gets the entity.
+	 *
+	 * @return the entity
+	 */
+	@JsonProperty("entity")
+    public String getEntity() {
+        return entity;
+    }
+
+	/**
+	 * Gets the status.
+	 *
+	 * @return the status
+	 */
+	@JsonProperty("status")
+    public int getStatus() {
+        return status;
+    }
+	
+	/**
+	 * Sets the status.
+	 *
+	 * @param v the new status
+	 */
+	@JsonProperty("status")
+    public void setStatus(int v) {
+        this.status = v;
+    }
+	
+	/**
+	 * Sets the entity.
+	 *
+	 * @param v the new entity
+	 */
+	@JsonProperty("entity")
+    public void setEntity(String v) {
+        this.entity = v;
+    }
+    
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+    
+    /**
+     * Gets the response.
+     *
+     * @return the response
+     */
+    public String getResponse () {
+    	
+    	StringBuilder b = new StringBuilder ("{ \"status\": ");
+        b.append(getStatus()).append(", \"entity\": " ).append(this.getEntity()).append("}");
+        return (b.toString());
+    }
+    
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoRestInt.java b/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoRestInt.java
new file mode 100755
index 000000000..b9f2dbcc9
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoRestInt.java
@@ -0,0 +1,71 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.mso;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * The Class MsoRestInt.
+ */
+public class MsoRestInt {
+	
+	/** The logger. */
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MsoRestInterface.class);
+	
+	/** The Constant dateFormat. */
+	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
+	
+	/** The request date format. */
+	public DateFormat requestDateFormat = new SimpleDateFormat("EEE, dd MMM YYYY HH:mm:ss z");
+	
+	/**
+	 * Instantiates a new mso rest int.
+	 */
+	public MsoRestInt() {
+		requestDateFormat.setTimeZone(java.util.TimeZone.getTimeZone("GMT"));
+	}
+	
+	/**
+	 * Log request.
+	 *
+	 * @param r the r
+	 */
+	public void logRequest ( org.openecomp.vid.mso.rest.RequestDetails r ) {
+    	String methodName = "logRequest";
+	    ObjectMapper mapper = new ObjectMapper();
+	    String r_json_str = "";
+	    if ( r != null ) {
+	    	r_json_str = r.toString();
+		    try {
+		    	r_json_str = mapper.writeValueAsString(r);
+		    }
+		    catch ( com.fasterxml.jackson.core.JsonProcessingException j ) {
+		    	logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " +  methodName + " Unable to parse request as json");
+		    }
+	    }
+	    logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " +  methodName + " Request=(" + r_json_str + ")");  
+    }
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoRestInterface.java b/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoRestInterface.java
new file mode 100755
index 000000000..31a762efe
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoRestInterface.java
@@ -0,0 +1,290 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.mso;
+
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Collections;
+import java.util.Date;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.Response;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+
+import org.apache.commons.codec.binary.Base64;
+import org.eclipse.jetty.util.security.Password;
+import org.openecomp.vid.client.HttpBasicClient;
+import org.openecomp.vid.client.HttpsBasicClient;
+import org.openecomp.vid.mso.rest.RequestDetails;
+
+/**
+ * The Class MsoRestInterface.
+ */
+public class MsoRestInterface extends MsoRestInt implements MsoRestInterfaceIfc {
+
+	/** The logger. */
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MsoRestInterface.class);
+	
+	/** The Constant dateFormat. */
+	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
+	
+	/** The client. */
+	private static Client client = null;
+	
+	/** The common headers. */
+	private MultivaluedHashMap commonHeaders;
+	
+	/**
+	 * Instantiates a new mso rest interface.
+	 */
+	public MsoRestInterface() {
+		super();
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.openecomp.vid.mso.MsoRestInterfaceIfc#initRestClient()
+	 */
+	public void initRestClient()
+	{
+		final String methodname = "initRestClient()";
+		
+		final String username = SystemProperties.getProperty(MsoProperties.MSO_USER_NAME);
+		final String password = SystemProperties.getProperty(MsoProperties.MSO_PASSWORD);
+		final String mso_url = SystemProperties.getProperty(MsoProperties.MSO_SERVER_URL);
+		final String decrypted_password = Password.deobfuscate(password);
+		
+		String authString = username + ":" + decrypted_password;
+		
+		byte[] authEncBytes = Base64.encodeBase64(authString.getBytes());
+		String authStringEnc = new String(authEncBytes);
+
+		commonHeaders = new MultivaluedHashMap ();
+		commonHeaders.put("Authorization",  Collections.singletonList((Object) ("Basic " + authStringEnc)));
+		
+		boolean use_ssl = true;
+		if ( (mso_url != null) && ( !(mso_url.isEmpty()) ) ) {
+			if ( mso_url.startsWith("https")) {
+				use_ssl = true;
+			}
+			else {
+				use_ssl = false;
+			}
+		}
+		if (client == null) {
+			
+			try {
+				if ( use_ssl ) { 
+					//logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  methodname + " getting HttpsBasicClient with username=" + username
+					//		+ " password=" + password);
+					client = HttpsBasicClient.getClient();
+				}
+				else {
+					//logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  methodname + " getting HttpsBasicClient with username=" + username
+					//		+ " password=" + password);
+					client = HttpBasicClient.getClient();
+				}
+			} catch (Exception e) {
+				logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  methodname + " Unable to get the SSL client");
+			}
+		}
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.openecomp.vid.mso.MsoRestInterfaceIfc#Get(java.lang.Object, java.lang.String, java.lang.String, org.openecomp.vid.mso.RestObject)
+	 */
+	@SuppressWarnings("unchecked")
+	public  void  Get (T t, String sourceId, String path, RestObject restObject ) throws Exception {
+		String methodName = "Get";
+		
+		logger.debug(EELFLoggerDelegate.debugLogger, methodName + " start");
+		
+		String url="";
+		restObject.set(t);
+		
+		url = SystemProperties.getProperty(MsoProperties.MSO_SERVER_URL) + path;
+        logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " +  methodName + " sending request to url= " + url);
+		
+        initRestClient();
+		
+		final Response cres = client.target(url)
+			 .request()
+	         .accept("application/json")
+	         .headers(commonHeaders)
+	         .get();
+		
+		int status = cres.getStatus();
+		restObject.setStatusCode (status);
+		
+		if (status == 200) {
+			 t = (T) cres.readEntity(t.getClass());
+			 restObject.set(t);
+			 logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + methodName + " REST api was successfull!");
+		    
+		 } else {
+		     throw new Exception(methodName + " with status="+ status + ", url= " + url );
+		 }
+
+		logger.debug(EELFLoggerDelegate.debugLogger,methodName + " received status=" + status );
+		
+		return;
+	}
+   
+   /* (non-Javadoc)
+    * @see org.openecomp.vid.mso.MsoRestInterfaceIfc#Delete(java.lang.Object, org.openecomp.vid.mso.rest.RequestDetails, java.lang.String, java.lang.String, org.openecomp.vid.mso.RestObject)
+    */
+   @SuppressWarnings("unchecked")
+	 public  void Delete(T t, RequestDetails r, String sourceID, String path, RestObject restObject) {
+	 
+		String methodName = "Delete";
+		String url="";
+		Response cres = null;
+		
+		logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " +  methodName + " start");
+		logRequest (r);
+
+		try {
+			initRestClient();
+			
+			url = SystemProperties.getProperty(MsoProperties.MSO_SERVER_URL) + path;
+			logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + " methodName sending request to: " + url);
+	
+			cres = client.target(url)
+					 .request()
+			         .accept("application/json")
+	        		 .headers(commonHeaders)
+			         //.entity(r)
+			         .build("DELETE", Entity.entity(r, MediaType.APPLICATION_JSON)).invoke();
+			       //  .method("DELETE", Entity.entity(r, MediaType.APPLICATION_JSON));
+			         //.delete(Entity.entity(r, MediaType.APPLICATION_JSON));
+			
+			int status = cres.getStatus();
+	    	restObject.setStatusCode (status);
+	    	
+			if (status == 404) { // resource not found
+				String msg = "Resource does not exist...: " + cres.getStatus();
+				logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " + msg);
+			} else if (status == 200  || status == 204){
+				logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " + "Resource " + url + " deleted");
+			} else if (status == 202) {
+				String msg = "Delete in progress: " + status;
+				logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " + msg);
+			}
+			else {
+				String msg = "Deleting Resource failed: " + status;
+					logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " + msg);
+			}
+			
+			try {
+	   			t = (T) cres.readEntity(t.getClass());
+	   			restObject.set(t);
+            }
+            catch ( Exception e ) {
+            	logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " + methodName + " No response entity, this is probably ok, e="
+            			+ e.getMessage());
+            }
+   
+        } 
+		catch (Exception e)
+        {
+        	 logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " + methodName + " with url="+url+ ", Exception: " + e.toString());
+        	 throw e;
+        
+        }
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.openecomp.vid.mso.MsoRestInterfaceIfc#Post(java.lang.Object, org.openecomp.vid.mso.rest.RequestDetails, java.lang.String, java.lang.String, org.openecomp.vid.mso.RestObject)
+	 */
+	@SuppressWarnings("unchecked")
+	public  void Post(T t, RequestDetails r, String sourceID, String path, RestObject restObject) throws Exception {
+
+        String methodName = "Post";
+        String url="";
+        
+        logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " +  methodName + " start");
+       
+        logRequest (r);
+        try {
+            
+            initRestClient();    
+    
+            url = SystemProperties.getProperty(MsoProperties.MSO_SERVER_URL) + path;
+            logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " +  methodName + " sending request to url= " + url);
+            // Change the content length
+            final Response cres = client.target(url)
+            	 .request()
+                 .accept("application/json")
+	        	 .headers(commonHeaders)
+                 //.header("content-length", 201)
+                 //.header("X-FromAppId",  sourceID)
+                 .post(Entity.entity(r, MediaType.APPLICATION_JSON));
+            
+            try {
+	   			t = (T) cres.readEntity(t.getClass());
+	   			restObject.set(t);
+            }
+            catch ( Exception e ) {
+            	logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " + methodName + " No response entity, this is probably ok, e="
+            			+ e.getMessage());
+            }
+
+            int status = cres.getStatus();
+    		restObject.setStatusCode (status);
+    		
+    		if ( status >= 200 && status <= 299 ) {
+    			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + methodName + " REST api POST was successful!");
+    			logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " + methodName + " REST api POST was successful!");
+    		
+             } else {
+            	 logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " + methodName + " with status="+status+", url="+url);
+             }    
+   
+        } catch (Exception e)
+        {
+        	 logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " + methodName + " with url="+url+ ", Exception: " + e.toString());
+        	 throw e;
+        
+        }
+    }
+
+	
+    /**
+     * Gets the single instance of MsoRestInterface.
+     *
+     * @param  the generic type
+     * @param clazz the clazz
+     * @return single instance of MsoRestInterface
+     * @throws IllegalAccessException the illegal access exception
+     * @throws InstantiationException the instantiation exception
+     */
+    public  T getInstance(Class clazz) throws IllegalAccessException, InstantiationException
+	{
+		return clazz.newInstance();
+	} 
+	
+    
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoRestInterfaceFactory.java b/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoRestInterfaceFactory.java
new file mode 100755
index 000000000..8bb3093c1
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoRestInterfaceFactory.java
@@ -0,0 +1,48 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.mso;
+
+import org.openecomp.portalsdk.core.util.SystemProperties;
+
+/**
+ * A factory for creating MsoRestInterface objects.
+ */
+public class MsoRestInterfaceFactory {
+	
+	/**
+	 * Gets the single instance of MsoRestInterfaceFactory.
+	 *
+	 * @return single instance of MsoRestInterfaceFactory
+	 */
+	public static MsoRestInterfaceIfc getInstance () {
+		MsoRestInterfaceIfc obj = null;
+		
+//		String mso_dme2_enabled = SystemProperties.getProperty(MsoProperties.MSO_DME2_ENABLED);
+//		if ( (mso_dme2_enabled != null) && (mso_dme2_enabled.equalsIgnoreCase("true") ) ) {
+//			obj = new MsoDme2RestInterface();
+//		}
+//		else {
+			obj = new MsoRestInterface();
+//		}
+		return ( obj );
+	}
+
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoRestInterfaceIfc.java b/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoRestInterfaceIfc.java
new file mode 100755
index 000000000..b0dc906be
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoRestInterfaceIfc.java
@@ -0,0 +1,79 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.mso;
+
+import org.openecomp.vid.mso.rest.RequestDetails;
+
+/**
+ * The Interface MsoRestInterfaceIfc.
+ */
+public interface MsoRestInterfaceIfc {
+	
+	/**
+	 * Inits the rest client.
+	 */
+	public void initRestClient();
+	
+	/**
+	 * Gets the.
+	 *
+	 * @param  the generic type
+	 * @param t the t
+	 * @param sourceId the source id
+	 * @param path the path
+	 * @param restObject the rest object
+	 * @throws Exception the exception
+	 */
+	public  void Get (T t, String sourceId, String path, RestObject restObject ) throws Exception;
+	
+	/**
+	 * Delete.
+	 *
+	 * @param  the generic type
+	 * @param t the t
+	 * @param r the r
+	 * @param sourceID the source ID
+	 * @param path the path
+	 * @param restObject the rest object
+	 * @throws Exception the exception
+	 */
+	public  void Delete(T t, RequestDetails r, String sourceID, String path, RestObject restObject) throws Exception;
+	
+	/**
+	 * Post.
+	 *
+	 * @param  the generic type
+	 * @param t the t
+	 * @param r the r
+	 * @param sourceID the source ID
+	 * @param path the path
+	 * @param restObject the rest object
+	 * @throws Exception the exception
+	 */
+	public  void Post(T t, RequestDetails r, String sourceID, String path, RestObject restObject) throws Exception;
+	
+	/**
+	 * Log request.
+	 *
+	 * @param r the r
+	 */
+	public void logRequest ( RequestDetails r  );
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoUtil.java b/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoUtil.java
new file mode 100755
index 000000000..2c0148bb7
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoUtil.java
@@ -0,0 +1,125 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.mso;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.glassfish.jersey.client.ClientResponse;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.vid.controller.MsoController;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * The Class MsoUtil.
+ */
+public class MsoUtil {
+	
+	/** The logger. */
+	private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MsoController.class);
+	
+	/** The Constant dateFormat. */
+	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
+	
+	/**
+	 * Wrap response.
+	 *
+	 * @param body the body
+	 * @param statusCode the status code
+	 * @return the mso response wrapper
+	 */
+	public static MsoResponseWrapper wrapResponse ( String body, int statusCode ) {
+		
+		MsoResponseWrapper w = new MsoResponseWrapper();
+		w.setStatus (statusCode);
+		w.setEntity(body);
+		
+		return w;
+	}
+	
+	/**
+	 * Wrap response.
+	 *
+	 * @param cres the cres
+	 * @return the mso response wrapper
+	 */
+	public static MsoResponseWrapper wrapResponse (ClientResponse cres) {	
+		String resp_str = "";
+		if ( cres != null ) {
+			resp_str = cres.readEntity(String.class);
+		}
+		int statuscode = cres.getStatus();
+		MsoResponseWrapper w = MsoUtil.wrapResponse ( resp_str, statuscode );
+		return (w);
+	}
+	
+	/**
+	 * Wrap response.
+	 *
+	 * @param rs the rs
+	 * @return the mso response wrapper
+	 */
+	public static MsoResponseWrapper wrapResponse (RestObject rs) {	
+		String resp_str = "";
+		int status = 0;
+		if ( rs != null ) {
+			resp_str = rs.get();
+			status = rs.getStatusCode();
+		}
+		MsoResponseWrapper w = MsoUtil.wrapResponse ( resp_str, status );
+		return (w);
+	}	
+	
+	/**
+	 * Convert pojo to string.
+	 *
+	 * @param  the generic type
+	 * @param t the t
+	 * @return the string
+	 * @throws JsonProcessingException the json processing exception
+	 */
+	public static  String convertPojoToString ( T t ) throws com.fasterxml.jackson.core.JsonProcessingException {
+		
+		String methodName = "convertPojoToString";
+		ObjectMapper mapper = new ObjectMapper();
+		String r_json_str = "";
+	    if ( t != null ) {
+		    try {
+		    	r_json_str = mapper.writeValueAsString(t);
+		    }
+		    catch ( com.fasterxml.jackson.core.JsonProcessingException j ) {
+		    	logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " +  methodName + " Unable to parse object as json");
+		    }
+	    }
+	    return (r_json_str);
+	}
+	
+	/**
+	 * The main method.
+	 *
+	 * @param args the arguments
+	 */
+	public static void main(String[] args) {
+		// TODO Auto-generated method stub
+
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/mso/RestObject.java b/vid-app-common/src/main/java/org/openecomp/vid/mso/RestObject.java
new file mode 100755
index 000000000..881409e1a
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/mso/RestObject.java
@@ -0,0 +1,68 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.mso;
+
+/**
+ * The Class RestObject.
+ *
+ * @param  the generic type
+ */
+public class RestObject {
+
+	/**
+	 * Generic version of the RestObject class.
+	 *
+	 */
+    // T stands for "Type"
+    private T t;
+    
+    /** The status code. */
+    private int statusCode= 0;
+    
+    /**
+     * Sets the.
+     *
+     * @param t the t
+     */
+    public void set(T t) { this.t = t; }
+    
+    /**
+     * Gets the.
+     *
+     * @return the t
+     */
+    public T get() { return t; }
+	
+    /**
+     * Sets the status code.
+     *
+     * @param v the new status code
+     */
+    public void setStatusCode(int v) { this.statusCode = v; }
+    
+    /**
+     * Gets the status code.
+     *
+     * @return the status code
+     */
+    public int getStatusCode() { return this.statusCode; }
+}
+
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/mso/rest/AsyncRequestStatus.java b/vid-app-common/src/main/java/org/openecomp/vid/mso/rest/AsyncRequestStatus.java
new file mode 100755
index 000000000..1395f9ae3
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/mso/rest/AsyncRequestStatus.java
@@ -0,0 +1,123 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.mso.rest;
+
+//import java.util.HashMap;
+//import java.util.Map;
+//import javax.annotation.Generated;
+
+import org.openecomp.vid.domain.mso.InstanceIds;
+import org.openecomp.vid.domain.mso.RequestStatus;
+//import com.fasterxml.jackson.annotation.JsonAnyGetter;
+//import com.fasterxml.jackson.annotation.JsonAnySetter;
+//import com.fasterxml.jackson.annotation.JsonCreator;
+//import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+//import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+//import com.fasterxml.jackson.annotation.JsonValue;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+
+/**
+ * request structure.
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+
+public class AsyncRequestStatus extends org.openecomp.vid.domain.mso.AsyncRequestStatus {
+
+    
+    /** The instance ids. */
+    private InstanceIds instanceIds;
+   
+    /** The request status. */
+    private RequestStatus requestStatus;
+
+    /* (non-Javadoc)
+     * @see org.openecomp.vid.domain.mso.AsyncRequestStatus#getInstanceIds()
+     */
+    public InstanceIds getInstanceIds() {
+        return instanceIds;
+    }
+
+    /**
+     * Sets the instance ids.
+     *
+     * @param instanceIds the new instance ids
+     */
+    public void setInstanceIds(InstanceIds instanceIds) {
+        this.instanceIds = instanceIds;
+    }
+
+    
+    /**
+     * (Required).
+     *
+     * @return     The requestStatus
+     */
+    @JsonProperty("requestStatus")
+    public RequestStatus getRequestStatus() {
+        return requestStatus;
+    }
+
+    /**
+     * (Required).
+     *
+     * @param requestStatus     The requestStatus
+     */
+    @JsonProperty("requestStatus")
+    public void setRequestStatus(RequestStatus requestStatus) {
+        this.requestStatus = requestStatus;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.openecomp.vid.domain.mso.AsyncRequestStatus#toString()
+     */
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    /* (non-Javadoc)
+     * @see org.openecomp.vid.domain.mso.AsyncRequestStatus#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(getCorrelator()).append(getFinishTime()).append(instanceIds).append(getRequestId()).append(getRequestScope()).append(getRequestStatus()).append(getRequestType()).append(getStartTime()).append(getAdditionalProperties()).toHashCode();
+    }
+
+    /* (non-Javadoc)
+     * @see org.openecomp.vid.domain.mso.AsyncRequestStatus#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+        if ((other instanceof AsyncRequestStatus) == false) {
+            return false;
+        }
+        AsyncRequestStatus rhs = ((AsyncRequestStatus) other);
+        return new EqualsBuilder().append(getCorrelator(), rhs.getCorrelator()).append(getFinishTime(), rhs.getFinishTime()).append(instanceIds, rhs.instanceIds).append(getRequestId(), rhs.getRequestId()).append(getRequestScope(), rhs.getRequestScope()).append(getRequestStatus(), rhs.getRequestStatus()).append(getRequestType(), rhs.getRequestType()).append(getStartTime(), rhs.getStartTime()).append(getAdditionalProperties(), rhs.getAdditionalProperties()).isEquals();
+    }
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/mso/rest/RelatedInstance.java b/vid-app-common/src/main/java/org/openecomp/vid/mso/rest/RelatedInstance.java
new file mode 100755
index 000000000..b68f7c13b
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/mso/rest/RelatedInstance.java
@@ -0,0 +1,125 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.mso.rest;
+
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+
+/**
+ * modelInfo and optional instanceId and instanceName for a model related to the modelInfo being operated on.
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@Generated("org.jsonschema2pojo")
+@JsonPropertyOrder({
+    "instanceName",
+    "instanceId",
+    "modelInfo"
+})
+public class RelatedInstance extends org.openecomp.vid.domain.mso.RelatedInstance{
+
+
+    /** The model info. */
+    @JsonProperty("modelInfo")
+    private org.openecomp.vid.domain.mso.ModelInfo modelInfo;
+    
+    /** The additional properties. */
+    @JsonIgnore
+    private Map additionalProperties = new HashMap();
+
+    /**
+     * (Required).
+     *
+     * @return     The modelInfo
+     */
+    @JsonProperty("modelInfo")
+    public org.openecomp.vid.domain.mso.ModelInfo getModelInfo() {
+        return modelInfo;
+    }
+
+    /**
+     * (Required).
+     *
+     * @param modelInfo     The modelInfo
+     */
+    @JsonProperty("modelInfo")
+    public void setModelInfo(org.openecomp.vid.domain.mso.ModelInfo modelInfo) {
+        this.modelInfo = modelInfo;
+    }
+
+    /* (non-Javadoc)
+     * @see org.openecomp.vid.domain.mso.RelatedInstance#toString()
+     */
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    /* (non-Javadoc)
+     * @see org.openecomp.vid.domain.mso.RelatedInstance#getAdditionalProperties()
+     */
+    @JsonAnyGetter
+    public Map getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    /* (non-Javadoc)
+     * @see org.openecomp.vid.domain.mso.RelatedInstance#setAdditionalProperty(java.lang.String, java.lang.Object)
+     */
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    /* (non-Javadoc)
+     * @see org.openecomp.vid.domain.mso.RelatedInstance#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(getInstanceName()).append(getInstanceId()).append(modelInfo).append(additionalProperties).toHashCode();
+    }
+
+    /* (non-Javadoc)
+     * @see org.openecomp.vid.domain.mso.RelatedInstance#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+        if ((other instanceof RelatedInstance) == false) {
+            return false;
+        }
+        RelatedInstance rhs = ((RelatedInstance) other);
+        return new EqualsBuilder().append(getInstanceName(), rhs.getInstanceName()).append(getInstanceId(), rhs.getInstanceId()).append(modelInfo, rhs.getModelInfo()).append(additionalProperties, rhs.additionalProperties).isEquals();
+    }
+
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/mso/rest/RelatedModel.java b/vid-app-common/src/main/java/org/openecomp/vid/mso/rest/RelatedModel.java
new file mode 100755
index 000000000..dc67a9456
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/mso/rest/RelatedModel.java
@@ -0,0 +1,121 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.mso.rest;
+
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+
+/**
+ * modelInfo and optional instance id for a model related to the modelInfo being operated on.
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "instanceId",
+    "modelInfo"
+})
+public class RelatedModel extends org.openecomp.vid.domain.mso.RelatedModel {
+    
+    /** (Required). */
+    @JsonProperty("modelInfo")
+    private org.openecomp.vid.domain.mso.ModelInfo modelInfo;
+    
+    /** The additional properties. */
+    @JsonIgnore
+    private Map additionalProperties = new HashMap();
+
+    /**
+     * (Required).
+     *
+     * @return     The modelInfo
+     */
+    @JsonProperty("modelInfo")
+    public org.openecomp.vid.domain.mso.ModelInfo getModelInfo() {
+        return modelInfo;
+    }
+
+    /**
+     * (Required).
+     *
+     * @param modelInfo     The modelInfo
+     */
+    @JsonProperty("modelInfo")
+    public void setModelInfo(org.openecomp.vid.domain.mso.ModelInfo modelInfo) {
+        this.modelInfo = modelInfo;
+    }
+
+    /* (non-Javadoc)
+     * @see org.openecomp.vid.domain.mso.RelatedModel#toString()
+     */
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    /* (non-Javadoc)
+     * @see org.openecomp.vid.domain.mso.RelatedModel#getAdditionalProperties()
+     */
+    @JsonAnyGetter
+    public Map getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    /* (non-Javadoc)
+     * @see org.openecomp.vid.domain.mso.RelatedModel#setAdditionalProperty(java.lang.String, java.lang.Object)
+     */
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    /* (non-Javadoc)
+     * @see org.openecomp.vid.domain.mso.RelatedModel#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(getInstanceId()).append(modelInfo).append(additionalProperties).toHashCode();
+    }
+
+    /* (non-Javadoc)
+     * @see org.openecomp.vid.domain.mso.RelatedModel#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+        if ((other instanceof RelatedModel) == false) {
+            return false;
+        }
+        RelatedModel rhs = ((RelatedModel) other);
+        return new EqualsBuilder().append(getInstanceId(), rhs.getInstanceId()).append(modelInfo, rhs.modelInfo).append(additionalProperties, rhs.additionalProperties).isEquals();
+    }
+
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/mso/rest/Request.java b/vid-app-common/src/main/java/org/openecomp/vid/mso/rest/Request.java
new file mode 100755
index 000000000..c8f7b8ba7
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/mso/rest/Request.java
@@ -0,0 +1,140 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.mso.rest;
+
+//import java.util.HashMap;
+//import java.util.Map;
+//import javax.annotation.Generated;
+
+import org.openecomp.vid.domain.mso.InstanceIds;
+import org.openecomp.vid.domain.mso.RequestStatus;
+//import com.fasterxml.jackson.annotation.JsonAnyGetter;
+//import com.fasterxml.jackson.annotation.JsonAnySetter;
+//import com.fasterxml.jackson.annotation.JsonCreator;
+//import com.fasterxml.jackson.annotation.JsonIgnore;
+//import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+//import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+//import com.fasterxml.jackson.annotation.JsonValue;
+import org.apache.commons.lang.builder.EqualsBuilder;
+//import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+
+/**
+ * request structure.
+ */
+public class Request extends org.openecomp.vid.domain.mso.Request {
+
+ 
+    /** The instance ids. */
+    private InstanceIds instanceIds;
+    
+    /** The request details. */
+    private RequestDetails requestDetails;
+    
+    /** The request status. */
+    private RequestStatus requestStatus;
+ 
+    
+    /* (non-Javadoc)
+     * @see org.openecomp.vid.domain.mso.Request#getInstanceIds()
+     */
+    @JsonProperty("instanceIds")
+    public InstanceIds getInstanceIds() {
+        return instanceIds;
+    }
+
+    /**
+     * Sets the instance ids.
+     *
+     * @param instanceIds     The instanceIds
+     */
+    @JsonProperty("instanceIds")
+    public void setInstanceIds(InstanceIds instanceIds) {
+        this.instanceIds = instanceIds;
+    }
+
+    /**
+     * (Required).
+     *
+     * @return     The requestDetails
+     */
+    @JsonProperty("requestDetails")
+    public RequestDetails getRequestDetails() {
+        return requestDetails;
+    }
+
+    /**
+     * (Required).
+     *
+     * @param requestDetails     The requestDetails
+     */
+    @JsonProperty("requestDetails")
+    public void setRequestDetails(RequestDetails requestDetails) {
+        this.requestDetails = requestDetails;
+    }
+
+    
+    /**
+     * Gets the request status.
+     *
+     * @return     The requestStatus
+     */
+    @JsonProperty("requestStatus")
+    public RequestStatus getRequestStatus() {
+        return requestStatus;
+    }
+
+    /**
+     * Sets the request status.
+     *
+     * @param requestStatus     The requestStatus
+     */
+    @JsonProperty("requestStatus")
+    public void setRequestStatus(RequestStatus requestStatus) {
+        this.requestStatus = requestStatus;
+    }
+
+  
+    /* (non-Javadoc)
+     * @see org.openecomp.vid.domain.mso.Request#toString()
+     */
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+    
+    /* (non-Javadoc)
+     * @see org.openecomp.vid.domain.mso.Request#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+        if ((other instanceof Request) == false) {
+            return false;
+        }
+        Request rhs = ((Request) other);
+        return new EqualsBuilder().append(getFinishTime(), rhs.getFinishTime()).append(getInstanceIds(), rhs.getInstanceIds()).append(getRequestDetails(), rhs.getRequestDetails()).append(getRequestId(), rhs.getRequestId()).append(getRequestScope(), rhs.getRequestScope()).append(getRequestStatus(), rhs.getRequestStatus()).append(getRequestType(), rhs.getRequestType()).append(getStartTime(), rhs.getStartTime()).append(getAdditionalProperties(), rhs.getAdditionalProperties()).isEquals();
+    }
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/mso/rest/RequestDetails.java b/vid-app-common/src/main/java/org/openecomp/vid/mso/rest/RequestDetails.java
new file mode 100755
index 000000000..6e7c5af32
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/mso/rest/RequestDetails.java
@@ -0,0 +1,233 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.mso.rest;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.List;
+//import javax.annotation.Generated;
+
+import org.openecomp.vid.domain.mso.CloudConfiguration;
+import org.openecomp.vid.domain.mso.ModelInfo;
+import org.openecomp.vid.domain.mso.RequestInfo;
+import org.openecomp.vid.domain.mso.RequestParameters;
+import org.openecomp.vid.domain.mso.SubscriberInfo;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+
+/**
+ * aggregates the context, configuraiton and detailed parameters associated with the request into a single structure.
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "cloudConfiguration",
+    "modelInfo",
+    "relatedModelList",
+    "requestInfo",
+    "subscriberInfo",
+    "requestParameters"
+})
+public class RequestDetails extends org.openecomp.vid.domain.mso.RequestDetails {
+
+    /** The cloud configuration. */
+    @JsonProperty("cloudConfiguration")
+    private CloudConfiguration cloudConfiguration;
+    
+    /** The model info. */
+    @JsonProperty("modelInfo")
+    private ModelInfo modelInfo;
+    
+    /** The related model list. */
+    @JsonProperty("relatedModelList")
+    private List relatedModelList;
+    
+    /** The request info. */
+    @JsonProperty("requestInfo")
+    private RequestInfo requestInfo;
+    
+    /** The subscriber info. */
+    @JsonProperty("subscriberInfo")
+    private SubscriberInfo subscriberInfo;
+    
+    /** The request parameters. */
+    @JsonProperty("requestParameters")
+    private RequestParameters requestParameters;
+    
+    /** The additional properties. */
+    @JsonIgnore
+    private Map additionalProperties = new HashMap();
+
+    /**
+     * Gets the cloud configuration.
+     *
+     * @return     The cloudConfiguration
+     */
+    @JsonProperty("cloudConfiguration")
+    public CloudConfiguration getCloudConfiguration() {
+        return cloudConfiguration;
+    }
+
+    /**
+     * Sets the cloud configuration.
+     *
+     * @param cloudConfiguration     The cloudConfiguration
+     */
+    @JsonProperty("cloudConfiguration")
+    public void setCloudConfiguration(CloudConfiguration cloudConfiguration) {
+        this.cloudConfiguration = cloudConfiguration;
+    }
+
+    /**
+     * Gets the model info.
+     *
+     * @return     The modelInfo
+     */
+    @JsonProperty("modelInfo")
+    public ModelInfo getModelInfo() {
+        return modelInfo;
+    }
+
+    /**
+     * Sets the model info.
+     *
+     * @param modelInfo     The modelInfo
+     */
+    @JsonProperty("modelInfo")
+    public void setModelInfo(ModelInfo modelInfo) {
+        this.modelInfo = modelInfo;
+    }
+
+    /**
+     * Gets the related model list.
+     *
+     * @return     The relatedModelList
+     */
+    @JsonProperty("relatedModelList")
+    public List getRelatedModelList() {
+        return relatedModelList;
+    }
+
+    /**
+     * Sets the related model list.
+     *
+     * @param relatedModelList     The relatedModelList
+     */
+    @JsonProperty("relatedModelList")
+    public void setRelatedModelList( List relatedModelList) {
+        this.relatedModelList = relatedModelList;
+    }
+
+    /**
+     * Gets the request info.
+     *
+     * @return     The requestInfo
+     */
+    @JsonProperty("requestInfo")
+    public RequestInfo getRequestInfo() {
+        return requestInfo;
+    }
+
+    /**
+     * Sets the request info.
+     *
+     * @param requestInfo     The requestInfo
+     */
+    @JsonProperty("requestInfo")
+    public void setRequestInfo(RequestInfo requestInfo) {
+        this.requestInfo = requestInfo;
+    }
+    
+    /**
+     * Gets the subscriber info.
+     *
+     * @return     The subscriberInfo
+     */
+    @JsonProperty("subscriberInfo")
+    public SubscriberInfo getSubscriberInfo() {
+        return subscriberInfo;
+    }
+
+    /**
+     * Sets the subscriber info.
+     *
+     * @param subscriberInfo     The subscriberInfo
+     */
+    @JsonProperty("subscriberInfo")
+    public void setSubscriberInfo(SubscriberInfo subscriberInfo) {
+        this.subscriberInfo = subscriberInfo;
+    }
+
+    /* (non-Javadoc)
+     * @see org.openecomp.vid.domain.mso.RequestDetails#toString()
+     */
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    /* (non-Javadoc)
+     * @see org.openecomp.vid.domain.mso.RequestDetails#getAdditionalProperties()
+     */
+    @JsonAnyGetter
+    public Map getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    /* (non-Javadoc)
+     * @see org.openecomp.vid.domain.mso.RequestDetails#setAdditionalProperty(java.lang.String, java.lang.Object)
+     */
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    /* (non-Javadoc)
+     * @see org.openecomp.vid.domain.mso.RequestDetails#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(cloudConfiguration).append(modelInfo).append(relatedModelList).append(requestInfo).append(getRequestParameters()).append(subscriberInfo).append(additionalProperties).toHashCode();
+    }
+
+    /* (non-Javadoc)
+     * @see org.openecomp.vid.domain.mso.RequestDetails#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+        if ((other instanceof RequestDetails) == false) {
+            return false;
+        }
+        RequestDetails rhs = ((RequestDetails) other);
+        return new EqualsBuilder().append(cloudConfiguration, rhs.cloudConfiguration).append(modelInfo, rhs.modelInfo).append(relatedModelList, rhs.relatedModelList).append(requestInfo, rhs.requestInfo).append(getRequestParameters(), rhs.getRequestParameters()).append(subscriberInfo, rhs.subscriberInfo).append(additionalProperties, rhs.additionalProperties).isEquals();
+    }
+
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/mso/rest/RequestList.java b/vid-app-common/src/main/java/org/openecomp/vid/mso/rest/RequestList.java
new file mode 100755
index 000000000..7c366ac82
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/mso/rest/RequestList.java
@@ -0,0 +1,137 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.mso.rest;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+//import com.fasterxml.jackson.annotation.JsonInclude;
+//import com.fasterxml.jackson.annotation.JsonProperty;
+//import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import java.util.List;
+
+/**
+ * List of relatedModel structures that are related to a modelInfo being operated on.
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@Generated("org.jsonschema2pojo")
+@JsonPropertyOrder({
+    "finishTime",
+    "instanceIds",
+    "requestDetails",
+    "requestId",
+    "requestScope",
+    "requestStatus",
+    "requestType",
+    "startTime"
+})
+
+public class RequestList {
+    
+    /** The request list. */
+    private List requestList;
+    
+    /** The additional properties. */
+    @JsonIgnore
+    private Map additionalProperties = new HashMap();
+
+    /**
+     * (Required).
+     *
+     * @return     The RelatedModel List
+     */
+    public List getRequestList() {
+        return requestList;
+    }
+
+    /**
+     * Sets the request list.
+     *
+     * @param l the new request list
+     */
+    public void setRequestList(List l) {
+        this.requestList = l;
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    /**
+     * Gets the additional properties.
+     *
+     * @return the additional properties
+     */
+    @JsonAnyGetter
+    public Map getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    /**
+     * Sets the additional property.
+     *
+     * @param name the name
+     * @param value the value
+     */
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(getRequestList()).append(additionalProperties).toHashCode();
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+        if ((other instanceof RequestList) == false) {
+            return false;
+        }
+        RequestList rhs = ((RequestList) other);
+        return new EqualsBuilder().append(getRequestList(), rhs.getRequestList()).append(additionalProperties, rhs.additionalProperties).isEquals();
+    }
+
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/properties/AsdcClientConfiguration.java b/vid-app-common/src/main/java/org/openecomp/vid/properties/AsdcClientConfiguration.java
new file mode 100755
index 000000000..6d5f9522c
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/properties/AsdcClientConfiguration.java
@@ -0,0 +1,116 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.properties;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
+
+/**
+ * The Class AsdcClientConfiguration.
+ */
+@Configuration
+@PropertySource(value="${container.classpath:}/WEB-INF/conf/asdc.properties")
+public class AsdcClientConfiguration {
+	
+    @Bean 
+    public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() { 
+        return new PropertySourcesPlaceholderConfigurer(); 
+    }
+
+	@Value("${asdc.client.type}")
+	private AsdcClientType asdcClientType;
+	
+	/** The asdc client host. */
+	@Value("${asdc.client.rest.host}")
+	private String asdcClientHost;
+	
+	/** The asdc client port. */
+	@Value("${asdc.client.rest.port}")
+	private int asdcClientPort;
+	
+	/** The asdc client auth. */
+	@Value("${asdc.client.rest.auth}")
+	public String asdcClientAuth;
+
+	/** The asdc client protocol. */
+	@Value("${asdc.client.rest.protocol}")
+	public String asdcClientProtocol;
+	
+	/**
+	 * Gets the asdc client type.
+	 *
+	 * @return the asdc client type
+	 */
+	public AsdcClientType getAsdcClientType() {
+		return asdcClientType;
+	}
+
+	/**
+	 * Gets the asdc client host.
+	 *
+	 * @return the asdc client host
+	 */
+	public String getAsdcClientHost() {
+		return asdcClientHost;
+	}
+
+	/**
+	 * Gets the asdc client port.
+	 *
+	 * @return the asdc client port
+	 */
+	public int getAsdcClientPort() {
+		return asdcClientPort;
+	}
+
+	/**
+	 * Gets the asdc client auth.
+	 *
+	 * @return the asdc client auth
+	 */
+	public String getAsdcClientAuth() {
+		return asdcClientAuth;
+	}
+
+	/**
+	 * Gets the asdc client protocol.
+	 *
+	 * @return the asdc client protocol
+	 */
+	public String getAsdcClientProtocol() {
+		return asdcClientProtocol;
+	}
+	
+	/**
+	 * The Enum AsdcClientType.
+	 */
+	public enum AsdcClientType {
+		
+		/** The in memory. */
+		IN_MEMORY,
+		
+		/** The rest. */
+		REST
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/properties/VidProperties.java b/vid-app-common/src/main/java/org/openecomp/vid/properties/VidProperties.java
new file mode 100755
index 000000000..141b9b27c
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/properties/VidProperties.java
@@ -0,0 +1,93 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.vid.properties;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.openecomp.vid.model.ModelConstants;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+
+import org.openecomp.vid.controller.VidController;
+/**
+ * The Class VidProperties.
+ */
+public class VidProperties extends SystemProperties {
+
+	//VID General Properties
+	
+	/** The Constant VID_TRUSTSTORE_FILENAME. */
+	public static final String VID_TRUSTSTORE_FILENAME = "vid.truststore.filename";
+	
+	/** The Constant VID_TRUSTSTORE_PASSWD_X. */
+	public static final String VID_TRUSTSTORE_PASSWD_X = "vid.truststore.passwd.x";
+	
+	/** The Constant FILESEPARATOR. */
+	public static final String FILESEPARATOR = (System.getProperty("file.separator") == null) ? "/" : System.getProperty("file.separator");
+	
+	/** The Constant LOG. */
+	private static final EELFLoggerDelegate LOG = EELFLoggerDelegate.getLogger(VidController.class);
+	
+	/** The Constant dateFormat. */
+	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
+	/**
+	 * Gets the asdc model namespace prefix property
+	 * 
+	 * @return the property value or a default value
+	 */
+	public static String getAsdcModelNamespace() {
+		String methodName = "getAsdcModelNamespace ";
+		String asdcModelNamespace = ModelConstants.DEFAULT_ASDC_MODEL_NAMESPACE;
+	    try {
+	        asdcModelNamespace = SystemProperties.getProperty(ModelConstants.ASDC_MODEL_NAMESPACE);
+	        if ( asdcModelNamespace == null || asdcModelNamespace.isEmpty()) {
+		    	asdcModelNamespace = ModelConstants.DEFAULT_ASDC_MODEL_NAMESPACE;
+		    }
+	    }
+	    catch ( Exception e ) {
+	    	LOG.error (EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + methodName + "unable to find the value, using the default "
+	    			+ ModelConstants.DEFAULT_ASDC_MODEL_NAMESPACE);
+	    	asdcModelNamespace = ModelConstants.DEFAULT_ASDC_MODEL_NAMESPACE;
+	    }
+	    return (asdcModelNamespace);
+	}
+	/**
+	 * Gets the specified property value. If the property is not defined, returns a default value.
+	 * 
+	 * @return the property value or a default value
+	 */
+	public static String getPropertyWithDefault ( String propName, String defaultValue ) {
+		String methodName = "getPropertyWithDefault ";
+		String propValue = defaultValue;
+	    try {
+	        propValue = SystemProperties.getProperty(propName);
+	        if ( propValue == null || propValue.isEmpty()) {
+		    	propValue = defaultValue;
+		    }
+	    }
+	    catch ( Exception e ) {
+	    	LOG.error (EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + methodName + "unable to find the value, using the default "
+	    			+ defaultValue);
+	    	propValue = defaultValue;
+	    }
+	    return (propValue);
+	}
+}
diff --git a/vid-app-common/src/main/resources/json/mso/asyncRequestStatus b/vid-app-common/src/main/resources/json/mso/asyncRequestStatus
new file mode 100755
index 000000000..23d2c2882
--- /dev/null
+++ b/vid-app-common/src/main/resources/json/mso/asyncRequestStatus
@@ -0,0 +1,54 @@
+{
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "description": "request structure",
+    "properties": {
+        "correlator": {
+            "description": "Optional correlation Id originally provided with the request in requestInfo",
+            "type": "string"
+        },
+        "finishTime": {
+            "description": "Date and time the request was finished in GMT with the following sample format: Wed, 15 Oct 2014 13:01:52 GMT",
+            "type": "string"
+        },
+        "instanceIds": {},
+        "requestId": {
+            "description": "UUID for the request generated by the instantiation service",
+            "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$",
+            "type": "string"
+        },
+        "requestScope": {
+            "description": "short description of the entity being operated on",
+            "enum": [
+                "network",
+                "service",
+                "vfModule",
+                "vnf",
+                "volumeGroup"
+            ],
+            "type": "string"
+        },
+        "requestStatus": {},
+        "requestType": {
+            "description": "short description of the action being performed on the requestScope",
+            "enum": [
+                "createInstance",
+                "deleteInstance",
+                "replaceInstance",
+                "updateInstance"
+            ],
+            "type": "string"
+        },
+        "startTime": {
+            "description": "Date and time the request was created in GMT with the following sample format: Wed, 15 Oct 2014 13:01:52 GMT",
+            "type": "string"
+        }
+    },
+    "required": [
+        "requestId",
+        "requestScope",
+        "requestStatus",
+        "requestType",
+        "startTime"
+    ],
+    "type": "object"
+}
diff --git a/vid-app-common/src/main/resources/json/mso/cloudConfiguration b/vid-app-common/src/main/resources/json/mso/cloudConfiguration
new file mode 100755
index 000000000..eb627798f
--- /dev/null
+++ b/vid-app-common/src/main/resources/json/mso/cloudConfiguration
@@ -0,0 +1,19 @@
+{
+    "$schema": "http://json-schema.org/draft-04/schema#",
+	"description": "fields communicating the cloud configuration in a standard way",
+	"type": "object",
+	"properties": {  
+		"nodeLocation": {
+			"description": "Location identifier for the node",
+			"type": "string"
+		},  
+		"lcpCloudRegionId": {
+			"description": "LCP Node Location identifier",
+			"type": "string"
+		},  
+		"tenantId": {
+			"description": "Openstack tenant id",
+			"type": "string"
+		}  
+	}
+}
\ No newline at end of file
diff --git a/vid-app-common/src/main/resources/json/mso/instanceIds b/vid-app-common/src/main/resources/json/mso/instanceIds
new file mode 100755
index 000000000..c20ea9ad1
--- /dev/null
+++ b/vid-app-common/src/main/resources/json/mso/instanceIds
@@ -0,0 +1,29 @@
+{
+    "$schema": "http://json-schema.org/draft-04/schema#",
+			"description": "instanceIds that may be associated with a particular request",
+			"type": "object",
+			"properties": {  
+				"networkInstanceId": {
+					"description": "UUID for the network instance (if any)",
+					"type": "string"
+				},  
+				"serviceInstanceId": {
+					"description": "UUID for the service instance",
+					"type": "string"
+				},  
+				"vfModuleInstanceId": {
+					"description": "UUID for the vfModule instance (if any)",
+					"type": "string"
+				},  
+				"vnfInstanceId": {
+					"description": "UUID for the vnf instance (if any)",
+					"type": "string"
+				},  
+				"volumeGroupInstanceId": {
+					"description": "UUID for the volume group instance (if any)",
+					"type": "string"
+				}  
+		}
+}
+
+			
\ No newline at end of file
diff --git a/vid-app-common/src/main/resources/json/mso/modelInfo b/vid-app-common/src/main/resources/json/mso/modelInfo
new file mode 100755
index 000000000..2504d517b
--- /dev/null
+++ b/vid-app-common/src/main/resources/json/mso/modelInfo
@@ -0,0 +1,41 @@
+{
+	"$schema": "http://json-schema.org/draft-04/schema#",
+	"description": "fields describing the SDC entity being operated on by the request",
+	"type": "object",
+	"properties": {
+		"modelCustomizationName": {
+			"description": "reference to the customized set of parameters associated with a model in a given service context",
+			"type": "string"
+		},
+		"modelInvariantId": {
+			"description": "Invariant UUID for the model name, irrespective of the version, as defined in SDC--authoritative",
+			"type": "string",
+			"pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
+		},
+		"modelName": {
+			"description": "name of the model as defined in SDC--not authoritative",
+			"type": "string"
+		},
+		"modelNameVersionId": {
+			"description": "UUID for the model name and version combination as defined in SDC--authoritative",
+			"type": "string",
+			"pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
+		},
+		"modelType": {
+			"description": "short description of the entity being operated on",
+			"type": "string",
+			"enum": [
+				"network",
+				"service",
+				"vfModule",
+				"vnf",
+				"volumeGroup"
+			]
+		},
+		"modelVersion": {
+			"description": "the version of the model as defined in SDC--not authoritative",
+			"type": "number"
+		}
+	},
+	"required": ["modelType"]
+}
\ No newline at end of file
diff --git a/vid-app-common/src/main/resources/json/mso/relatedInstance b/vid-app-common/src/main/resources/json/mso/relatedInstance
new file mode 100755
index 000000000..89554a54c
--- /dev/null
+++ b/vid-app-common/src/main/resources/json/mso/relatedInstance
@@ -0,0 +1,16 @@
+{
+	"description": "modelInfo and optional instanceId and instanceName for a model related to the modelInfo being operated on",
+	"type": "object",
+	"properties": {
+		"instanceName": {
+			"description": "optional name for the instance Id of the related model",
+			"type": "string"
+		},
+		"instanceId": {
+			"description": "instance Id for the related model",
+			"type": "string"
+		},
+		"modelInfo": {}
+	},
+	"required": ["modelInfo"]
+}
\ No newline at end of file
diff --git a/vid-app-common/src/main/resources/json/mso/relatedModel b/vid-app-common/src/main/resources/json/mso/relatedModel
new file mode 100755
index 000000000..a70a17183
--- /dev/null
+++ b/vid-app-common/src/main/resources/json/mso/relatedModel
@@ -0,0 +1,15 @@
+{
+	"$schema": "http://json-schema.org/draft-04/schema#",
+	"description": "modelInfo and optional instance id for a model related to the modelInfo being operated on",
+	"type": "object",
+	"properties": {			
+		"instanceId": {
+			"description": "instance Id for the related model",
+			"type": "string"
+		},
+		"modelInfo": {}
+	},
+	"required": [ "modelInfo" ]
+}
+
+
diff --git a/vid-app-common/src/main/resources/json/mso/request b/vid-app-common/src/main/resources/json/mso/request
new file mode 100755
index 000000000..3aaadbfbc
--- /dev/null
+++ b/vid-app-common/src/main/resources/json/mso/request
@@ -0,0 +1,45 @@
+{
+	"$schema": "http://json-schema.org/draft-04/schema#",
+	"description": "request structure",
+	"type": "object",
+	"properties": {
+		"finishTime": {
+			"description": "Date and time the request was finished in GMT with the following sample format: Wed, 15 Oct 2014 13:01:52 GMT",
+			"type": "string"
+		},
+		"instanceIds": {},
+		"requestDetails": {},
+		"requestId": {
+			"description": "UUID for the request generated by the instantiation service",
+			"type": "string",
+			"pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
+		},
+		"requestScope": {
+			"description": "short description of the entity being operated on",
+			"type": "string",
+			"enum": [
+				"network",
+				"service",
+				"vfModule",
+				"vnf",
+				"volumeGroup"
+			]
+		},
+		"requestStatus": {},
+		"requestType": {
+			"description": "short description of the action being performed on the requestScope",
+			"type": "string",
+			"enum": [
+				"createInstance",
+				"deleteInstance",
+				"replaceInstance",
+				"updateInstance"
+			]
+		},
+		"startTime": {
+			"description": "Date and time the request was created in GMT with the following sample format: Wed, 15 Oct 2014 13:01:52 GMT",
+			"type": "string"
+		}
+	},
+	"required": ["requestDetails", "requestId", "requestScope", "requestType", "startTime"]
+}
\ No newline at end of file
diff --git a/vid-app-common/src/main/resources/json/mso/requestDetails b/vid-app-common/src/main/resources/json/mso/requestDetails
new file mode 100755
index 000000000..c0ef53044
--- /dev/null
+++ b/vid-app-common/src/main/resources/json/mso/requestDetails
@@ -0,0 +1,13 @@
+{
+    "description": "aggregates the context, configuraiton and detailed parameters associated with the request into a single structure",
+    "properties": {
+        "cloudConfiguration": {},
+        "modelInfo": {},
+        "relatedModelList": {},
+        "requestInfo": {},
+        "requestParameters": {},
+        "subscriberInfo": {}
+    },
+    "type": "object"
+}
+
diff --git a/vid-app-common/src/main/resources/json/mso/requestError b/vid-app-common/src/main/resources/json/mso/requestError
new file mode 100755
index 000000000..497f67192
--- /dev/null
+++ b/vid-app-common/src/main/resources/json/mso/requestError
@@ -0,0 +1,27 @@
+{
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "description": "standard request error data structure",
+    "properties": {
+        "messageId": {
+            "description": "Unique message identifier of the format ABCnnnn where ABC is either SVC for Service Exceptions or POL for Policy Exception",
+            "type": "string"
+        },
+        "text": {
+            "description": "Message text, with replacement variables marked with %n, where n is an index into the list of  elements, starting at 1",
+            "type": "string"
+        },
+        "url": {
+            "description": "Hyperlink to a detailed error resource e.g., an HTML page for browser user agents",
+            "type": "string"
+        },
+        "variables": {
+            "description": "List of zero or more strings that represent the contents of the variables used by the message text",
+            "type": "string"
+        }
+    },
+    "required": [
+        "messageId",
+        "text"
+    ],
+    "type": "object"
+}
diff --git a/vid-app-common/src/main/resources/json/mso/requestInfo b/vid-app-common/src/main/resources/json/mso/requestInfo
new file mode 100755
index 000000000..56db42fce
--- /dev/null
+++ b/vid-app-common/src/main/resources/json/mso/requestInfo
@@ -0,0 +1,44 @@
+{
+	"$schema": "http://json-schema.org/draft-04/schema#",
+	"description": "fields providing general context information for the request",
+	"properties": {
+		"billingAccountNumber": {
+			"description": "billing account associated with the model being operated on",
+			"type": "string"
+		},
+		"callbackUrl": {
+			"description": "client URL to use for asynchronous responses",
+			"type": "string"
+		},
+		"correlator": {
+			"description": "Optional correlationId for async callback requests",
+			"type": "string"
+		},
+		"instanceName": {
+			"description": "Client provided name for the instance being operated on by the operation (note: not guaranteed to be unique)",
+			"type": "string"
+		},
+		"orderNumber": {
+			"description": "reference to an order",
+			"type": "string"
+		},
+		"orderVersion": {
+			"description": "order version number",
+			"type": "number"
+		},
+		"productFamilyId": {
+			"description": "UUID for the product family associated with the model being operated on",
+			"type": "string"
+		},
+		"source": {
+			"description": "source of the request--not authoritative--actual source revealed via authentication",
+			"type": "string"
+		},
+		"suppressRollback": {
+			"description": "true or false boolean indicating whether rollbacks should be suppressed on failures",
+			"type": "boolean"
+		}
+	},
+
+	"type": "object"
+}
\ No newline at end of file
diff --git a/vid-app-common/src/main/resources/json/mso/requestParameters b/vid-app-common/src/main/resources/json/mso/requestParameters
new file mode 100755
index 000000000..010d78713
--- /dev/null
+++ b/vid-app-common/src/main/resources/json/mso/requestParameters
@@ -0,0 +1,23 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+        "subscriptionServiceType": {
+          "type": "string"
+        },
+        "userParams": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string"
+              },
+              "value": {
+                "type": "string"
+              }
+            }
+          }
+        }
+      }
+    }
\ No newline at end of file
diff --git a/vid-app-common/src/main/resources/json/mso/requestReferences b/vid-app-common/src/main/resources/json/mso/requestReferences
new file mode 100755
index 000000000..30f641190
--- /dev/null
+++ b/vid-app-common/src/main/resources/json/mso/requestReferences
@@ -0,0 +1,18 @@
+{
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "description": "provides the instanceId and requestId associated with the request",
+			"type": "object",
+			"properties": { 
+		        "instanceId": {
+			        "description": "UUID for the service instance",
+			        "type": "string",
+					"pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
+				},
+		        "requestId": {
+			        "description": "UUID for the request",
+			        "type": "string",
+					"pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
+				}
+			},
+			"required": [ "instanceId", "requestId" ]
+}
diff --git a/vid-app-common/src/main/resources/json/mso/requestStatus b/vid-app-common/src/main/resources/json/mso/requestStatus
new file mode 100755
index 000000000..9eacb6bb1
--- /dev/null
+++ b/vid-app-common/src/main/resources/json/mso/requestStatus
@@ -0,0 +1,37 @@
+{
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "description": "fields describing the status of a request",
+    "properties": {
+        "percentProgress": {
+            "description": "percentage complete estimate from 0 to 100",
+            "type": "number"
+        },
+        "requestState": {
+            "description": "short description of the instantiation state",
+            "enum": [
+                "complete",
+                "failed",
+                "inProgress"
+            ],
+            "type": "string"
+        },
+        "statusMessage": {
+            "description": "additional descriptive information about the status",
+            "type": "string"
+        },
+        "timestamp": {
+            "description": "GMT Datetime the requestStatus was created e.g.: Wed, 15 Oct 2014 13:01:52 GMT",
+            "type": "string"
+        },
+        "wasRolledBack": {
+			"description": "true or false boolean indicating whether the request was rolled back",
+			"type": "boolean"
+		}
+        
+    },
+    "required": [
+        "requestState",
+        "timestamp"
+    ],
+    "type": "object"
+}
diff --git a/vid-app-common/src/main/resources/json/mso/response b/vid-app-common/src/main/resources/json/mso/response
new file mode 100755
index 000000000..fa37d2db7
--- /dev/null
+++ b/vid-app-common/src/main/resources/json/mso/response
@@ -0,0 +1,13 @@
+{
+	"$schema": "http://json-schema.org/draft-04/schema#",
+	"description": "response structure",
+	"type": "object",
+	"code": {
+			"description": "Return code",
+			"type": "string"
+	},
+	"message": {
+		"description": "Result message",
+			"type": "string"
+	}
+}
\ No newline at end of file
diff --git a/vid-app-common/src/main/resources/json/mso/subscriberInfo b/vid-app-common/src/main/resources/json/mso/subscriberInfo
new file mode 100755
index 000000000..df787378b
--- /dev/null
+++ b/vid-app-common/src/main/resources/json/mso/subscriberInfo
@@ -0,0 +1,19 @@
+{
+	"$schema": "http://json-schema.org/draft-04/schema#",
+	"description": "fields providing information about the subscriber associated with the request",
+	"type": "object",
+	"properties": {
+		"globalSubscriberId": {
+			"description": "global Customer Id understood by A&AI",
+			"type": "string"
+		},
+		"subscriberCommonSiteId": {
+			"description": "id representing the location of the subscriber",
+			"type": "string"
+		},
+		"subscriberName": {
+			"description": "name of the customer or subscriber",
+			"type": "string"
+		}
+	}
+}
\ No newline at end of file
diff --git a/vid-app-common/src/main/webapp/META-INF/MANIFEST.MF b/vid-app-common/src/main/webapp/META-INF/MANIFEST.MF
new file mode 100755
index 000000000..5e9495128
--- /dev/null
+++ b/vid-app-common/src/main/webapp/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+
diff --git a/vid-app-common/src/main/webapp/WEB-INF/defs/definitions.xml b/vid-app-common/src/main/webapp/WEB-INF/defs/definitions.xml
new file mode 100755
index 000000000..0355f66c8
--- /dev/null
+++ b/vid-app-common/src/main/webapp/WEB-INF/defs/definitions.xml
@@ -0,0 +1,53 @@
+
+
+
+      
+	      
+       
+         
+       
+    
+       
+       
+         
+      
+  
+    
+       
+       
+         
+    
+    
+        
+       
+         
+     
+    
+       
+       
+         
+      
+    
+       
+       
+         
+      
+    
+    
+       
+       
+    
+    
+       
+       
+    
+    
+    
+       
+       
+    
+    
+
+
diff --git a/vid-app-common/src/main/webapp/WEB-INF/fusion/defs/definitions.xml b/vid-app-common/src/main/webapp/WEB-INF/fusion/defs/definitions.xml
new file mode 100755
index 000000000..3d4c701a4
--- /dev/null
+++ b/vid-app-common/src/main/webapp/WEB-INF/fusion/defs/definitions.xml
@@ -0,0 +1,279 @@
+
+
+
+
+
+
+
+	
+		
+		
+		
+		
+	
+
+	
+		
+	
+
+	
+		
+	
+
+	
+		
+		
+	
+
+	
+		
+		
+	
+
+	
+		
+	
+
+	
+		
+		
+	
+
+	
+		
+		
+	
+
+	
+		
+		
+	
+
+       
+       
+         
+      
+    
+    
+       
+       
+      
+    
+       
+       
+         
+    
+    
+       
+       
+         
+      
+    
+       
+       
+         
+      
+    
+    
+       
+       
+    
+    
+       
+       
+    
+    
+    
+       
+       
+    
+    
+	
+		
+		
+	
+
+	
+		
+		
+	
+
+	
+		
+		
+	
+
+	
+		
+		
+	
+
+	
+		
+		
+	
+
+	
+		
+	
+
+	
+	
+	
+		
+	
+	 
+	
+	
+	
+		
+		
+	
+
+	
+		
+		
+	
+
+	
+		
+		
+	
+	
+		
+		
+	
+
+
+	
+		
+		
+	
+
+	
+	
+	
+	
+	
+	
+	
+	 
+
+
+	
+		
+		
+	
+	
+		
+		
+	
+
+	
+		
+		
+	
+
+
+	
+		
+	
+	
+		
+	
+	
+		
+	
+	
+		
+	
+	
+		
+	
+	
+		
+	
+	
+		
+	
+	
+		
+	
+	
+		
+	
+	
+		
+	
+	
+		
+	
+	
+		
+	
+	
+		
+	
+	
+		
+		
+	
+		
+	
+	
+
+	
+		
+	
+
+	
+
+
diff --git a/vid-app-common/src/main/webapp/WEB-INF/web.xml b/vid-app-common/src/main/webapp/WEB-INF/web.xml
new file mode 100755
index 000000000..7f0a40ef2
--- /dev/null
+++ b/vid-app-common/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,17 @@
+
+
+
+	vid-common
+
+	
+	
+
+	
+		7
+		COOKIE
+	
+
+
diff --git a/vid/src/main/webapp/app/vid/icons/7450-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/7450-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/7450-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/7450-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/7450-text.png b/vid-app-common/src/main/webapp/app/vid/icons/7450-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/7450-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/7450-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/7750-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/7750-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/7750-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/7750-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/7750-text.png b/vid-app-common/src/main/webapp/app/vid/icons/7750-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/7750-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/7750-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/apn-dns-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/apn-dns-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/apn-dns-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/apn-dns-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/apn-dns-text.png b/vid-app-common/src/main/webapp/app/vid/icons/apn-dns-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/apn-dns-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/apn-dns-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/atcf-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/atcf-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/atcf-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/atcf-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/atcf-text.png b/vid-app-common/src/main/webapp/app/vid/icons/atcf-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/atcf-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/atcf-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/atgw-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/atgw-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/atgw-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/atgw-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/atgw-text.png b/vid-app-common/src/main/webapp/app/vid/icons/atgw-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/atgw-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/atgw-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/bgcf-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/bgcf-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/bgcf-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/bgcf-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/bgcf-text.png b/vid-app-common/src/main/webapp/app/vid/icons/bgcf-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/bgcf-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/bgcf-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/com-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/com-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/com-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/com-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/cpm-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/cpm-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/cpm-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/cpm-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/cpm-text.png b/vid-app-common/src/main/webapp/app/vid/icons/cpm-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/cpm-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/cpm-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/default-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/default-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/default-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/default-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/dra-epc-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/dra-epc-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/dra-epc-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/dra-epc-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/dra-epc-text.png b/vid-app-common/src/main/webapp/app/vid/icons/dra-epc-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/dra-epc-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/dra-epc-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/dra-ims-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/dra-ims-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/dra-ims-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/dra-ims-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/dra-ims-text.png b/vid-app-common/src/main/webapp/app/vid/icons/dra-ims-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/dra-ims-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/dra-ims-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/dslam-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/dslam-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/dslam-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/dslam-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/dslam-text.png b/vid-app-common/src/main/webapp/app/vid/icons/dslam-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/dslam-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/dslam-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/eatf-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/eatf-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/eatf-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/eatf-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/eatf-text.png b/vid-app-common/src/main/webapp/app/vid/icons/eatf-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/eatf-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/eatf-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/ecscf-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/ecscf-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/ecscf-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/ecscf-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/ecscf-text.png b/vid-app-common/src/main/webapp/app/vid/icons/ecscf-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/ecscf-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/ecscf-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/emsc-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/emsc-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/emsc-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/emsc-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/enb-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/enb-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/enb-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/enb-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/enb-text.png b/vid-app-common/src/main/webapp/app/vid/icons/enb-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/enb-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/enb-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/enum-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/enum-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/enum-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/enum-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/enum-text.png b/vid-app-common/src/main/webapp/app/vid/icons/enum-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/enum-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/enum-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/esmlc-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/esmlc-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/esmlc-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/esmlc-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/esmlc-text.png b/vid-app-common/src/main/webapp/app/vid/icons/esmlc-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/esmlc-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/esmlc-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/ettcs-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/ettcs-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/ettcs-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/ettcs-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/ettcs-text.png b/vid-app-common/src/main/webapp/app/vid/icons/ettcs-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/ettcs-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/ettcs-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/gmlc-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/gmlc-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/gmlc-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/gmlc-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/gmlc-text.png b/vid-app-common/src/main/webapp/app/vid/icons/gmlc-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/gmlc-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/gmlc-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/hlr-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/hlr-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/hlr-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/hlr-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/hlr-text.png b/vid-app-common/src/main/webapp/app/vid/icons/hlr-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/hlr-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/hlr-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/hss-epc-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/hss-epc-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/hss-epc-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/hss-epc-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/hss-epc-text.png b/vid-app-common/src/main/webapp/app/vid/icons/hss-epc-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/hss-epc-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/hss-epc-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/hss-ims-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/hss-ims-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/hss-ims-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/hss-ims-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/hss-ims-text.png b/vid-app-common/src/main/webapp/app/vid/icons/hss-ims-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/hss-ims-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/hss-ims-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/icscf-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/icscf-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/icscf-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/icscf-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/icscf-text.png b/vid-app-common/src/main/webapp/app/vid/icons/icscf-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/icscf-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/icscf-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/ipag-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/ipag-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/ipag-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/ipag-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/ipag-text.png b/vid-app-common/src/main/webapp/app/vid/icons/ipag-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/ipag-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/ipag-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/isbc-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/isbc-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/isbc-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/isbc-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/isbc-text.png b/vid-app-common/src/main/webapp/app/vid/icons/isbc-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/isbc-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/isbc-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/iwf-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/iwf-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/iwf-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/iwf-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/iwf-text.png b/vid-app-common/src/main/webapp/app/vid/icons/iwf-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/iwf-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/iwf-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/lrf-rdf-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/lrf-rdf-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/lrf-rdf-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/lrf-rdf-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/lrf-rdf-text.png b/vid-app-common/src/main/webapp/app/vid/icons/lrf-rdf-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/lrf-rdf-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/lrf-rdf-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/lrg-rdf-text.png b/vid-app-common/src/main/webapp/app/vid/icons/lrg-rdf-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/lrg-rdf-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/lrg-rdf-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/mgc8-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/mgc8-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/mgc8-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/mgc8-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/mgc8-text.png b/vid-app-common/src/main/webapp/app/vid/icons/mgc8-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/mgc8-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/mgc8-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/mgcf-emsc-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/mgcf-emsc-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/mgcf-emsc-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/mgcf-emsc-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/mgcf-emsc-text.png b/vid-app-common/src/main/webapp/app/vid/icons/mgcf-emsc-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/mgcf-emsc-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/mgcf-emsc-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/mgw-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/mgw-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/mgw-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/mgw-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/mgw-text.png b/vid-app-common/src/main/webapp/app/vid/icons/mgw-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/mgw-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/mgw-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/mind-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/mind-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/mind-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/mind-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/mind-text.png b/vid-app-common/src/main/webapp/app/vid/icons/mind-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/mind-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/mind-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/mme-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/mme-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/mme-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/mme-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/mme-text.png b/vid-app-common/src/main/webapp/app/vid/icons/mme-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/mme-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/mme-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/mrf-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/mrf-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/mrf-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/mrf-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/mrf-text.png b/vid-app-common/src/main/webapp/app/vid/icons/mrf-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/mrf-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/mrf-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/msc-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/msc-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/msc-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/msc-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/msn-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/msn-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/msn-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/msn-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/msn-text.png b/vid-app-common/src/main/webapp/app/vid/icons/msn-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/msn-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/msn-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/multi-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/multi-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/multi-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/multi-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/n7450-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/n7450-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/n7450-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/n7450-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/n7450-text.png b/vid-app-common/src/main/webapp/app/vid/icons/n7450-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/n7450-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/n7450-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/n7750a-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/n7750a-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/n7750a-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/n7750a-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/n7750a-text.png b/vid-app-common/src/main/webapp/app/vid/icons/n7750a-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/n7750a-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/n7750a-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/n7750b-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/n7750b-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/n7750b-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/n7750b-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/n7750b-text.png b/vid-app-common/src/main/webapp/app/vid/icons/n7750b-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/n7750b-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/n7750b-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/n7750c-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/n7750c-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/n7750c-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/n7750c-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/n7750c-text.png b/vid-app-common/src/main/webapp/app/vid/icons/n7750c-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/n7750c-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/n7750c-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/n7750d-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/n7750d-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/n7750d-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/n7750d-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/n7750d-text.png b/vid-app-common/src/main/webapp/app/vid/icons/n7750d-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/n7750d-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/n7750d-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/nb-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/nb-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/nb-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/nb-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/nb-text.png b/vid-app-common/src/main/webapp/app/vid/icons/nb-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/nb-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/nb-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/pas-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/pas-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/pas-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/pas-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/pas-text.png b/vid-app-common/src/main/webapp/app/vid/icons/pas-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/pas-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/pas-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/pcef-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/pcef-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/pcef-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/pcef-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/pcef-text.png b/vid-app-common/src/main/webapp/app/vid/icons/pcef-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/pcef-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/pcef-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/pcrf-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/pcrf-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/pcrf-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/pcrf-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/pcrf-text.png b/vid-app-common/src/main/webapp/app/vid/icons/pcrf-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/pcrf-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/pcrf-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/pcscf-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/pcscf-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/pcscf-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/pcscf-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/pcscf-text.png b/vid-app-common/src/main/webapp/app/vid/icons/pcscf-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/pcscf-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/pcscf-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/pgw-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/pgw-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/pgw-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/pgw-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/pgw-text.png b/vid-app-common/src/main/webapp/app/vid/icons/pgw-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/pgw-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/pgw-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/plrf-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/plrf-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/plrf-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/plrf-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/plrf-text.png b/vid-app-common/src/main/webapp/app/vid/icons/plrf-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/plrf-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/plrf-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/psap-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/psap-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/psap-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/psap-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/pstn-tdm-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/pstn-tdm-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/pstn-tdm-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/pstn-tdm-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/pstn-tdm-text.png b/vid-app-common/src/main/webapp/app/vid/icons/pstn-tdm-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/pstn-tdm-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/pstn-tdm-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/rg-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/rg-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/rg-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/rg-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/rg-text.png b/vid-app-common/src/main/webapp/app/vid/icons/rg-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/rg-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/rg-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/rnc-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/rnc-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/rnc-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/rnc-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/rnc-text.png b/vid-app-common/src/main/webapp/app/vid/icons/rnc-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/rnc-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/rnc-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/sbc-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/sbc-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/sbc-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/sbc-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/sbc-text.png b/vid-app-common/src/main/webapp/app/vid/icons/sbc-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/sbc-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/sbc-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/sccas-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/sccas-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/sccas-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/sccas-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/sccas-text.png b/vid-app-common/src/main/webapp/app/vid/icons/sccas-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/sccas-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/sccas-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/scscf-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/scscf-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/scscf-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/scscf-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/scscf-text.png b/vid-app-common/src/main/webapp/app/vid/icons/scscf-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/scscf-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/scscf-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/sdg-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/sdg-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/sdg-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/sdg-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/sdg-text.png b/vid-app-common/src/main/webapp/app/vid/icons/sdg-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/sdg-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/sdg-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/sgsns4-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/sgsns4-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/sgsns4-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/sgsns4-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/sgsns4-text.png b/vid-app-common/src/main/webapp/app/vid/icons/sgsns4-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/sgsns4-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/sgsns4-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/sgw-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/sgw-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/sgw-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/sgw-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/sgw-text.png b/vid-app-common/src/main/webapp/app/vid/icons/sgw-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/sgw-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/sgw-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/siad-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/siad-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/siad-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/siad-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/siad-text.png b/vid-app-common/src/main/webapp/app/vid/icons/siad-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/siad-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/siad-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/ss7-gport-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/ss7-gport-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/ss7-gport-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/ss7-gport-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/ss7-gport-text.png b/vid-app-common/src/main/webapp/app/vid/icons/ss7-gport-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/ss7-gport-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/ss7-gport-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/ss7gport-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/ss7gport-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/ss7gport-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/ss7gport-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/ss7gport-text.png b/vid-app-common/src/main/webapp/app/vid/icons/ss7gport-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/ss7gport-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/ss7gport-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/switch-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/switch-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/switch-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/switch-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/tas-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/tas-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/tas-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/tas-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/tas-text.png b/vid-app-common/src/main/webapp/app/vid/icons/tas-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/tas-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/tas-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/transcoder-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/transcoder-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/transcoder-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/transcoder-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/transcoder-text.png b/vid-app-common/src/main/webapp/app/vid/icons/transcoder-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/transcoder-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/transcoder-text.png
diff --git a/vid/src/main/webapp/app/vid/icons/ue-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/ue-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/ue-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/ue-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/uephone-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/uephone-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/uephone-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/uephone-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/usp-dns-icon.png b/vid-app-common/src/main/webapp/app/vid/icons/usp-dns-icon.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/usp-dns-icon.png
rename to vid-app-common/src/main/webapp/app/vid/icons/usp-dns-icon.png
diff --git a/vid/src/main/webapp/app/vid/icons/usp-dns-text.png b/vid-app-common/src/main/webapp/app/vid/icons/usp-dns-text.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/icons/usp-dns-text.png
rename to vid-app-common/src/main/webapp/app/vid/icons/usp-dns-text.png
diff --git a/vid/src/main/webapp/app/vid/images/asterisk.png b/vid-app-common/src/main/webapp/app/vid/images/asterisk.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/images/asterisk.png
rename to vid-app-common/src/main/webapp/app/vid/images/asterisk.png
diff --git a/vid/src/main/webapp/app/fusion/scripts/controllers/dummy.txt b/vid-app-common/src/main/webapp/app/vid/images/dummy.txt
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/scripts/controllers/dummy.txt
rename to vid-app-common/src/main/webapp/app/vid/images/dummy.txt
diff --git a/vid/src/main/webapp/app/vid/images/error.png b/vid-app-common/src/main/webapp/app/vid/images/error.png
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/images/error.png
rename to vid-app-common/src/main/webapp/app/vid/images/error.png
diff --git a/vid/src/main/webapp/app/vid/images/spinner.gif b/vid-app-common/src/main/webapp/app/vid/images/spinner.gif
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/vid/images/spinner.gif
rename to vid-app-common/src/main/webapp/app/vid/images/spinner.gif
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/angular-ui-tree.js b/vid-app-common/src/main/webapp/app/vid/scripts/angular-ui-tree.js
new file mode 100755
index 000000000..6ec907992
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/angular-ui-tree.js
@@ -0,0 +1,1656 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * @license Angular UI Tree v2.17.0
+ * (c) 2010-2016. https://github.com/angular-ui-tree/angular-ui-tree
+ * License: MIT
+ */
+(function () {
+  'use strict';
+
+  angular.module('ui.tree', [])
+    .constant('treeConfig', {
+      treeClass: 'angular-ui-tree',
+      emptyTreeClass: 'angular-ui-tree-empty',
+      hiddenClass: 'angular-ui-tree-hidden',
+      nodesClass: 'angular-ui-tree-nodes',
+      nodeClass: 'angular-ui-tree-node',
+      handleClass: 'angular-ui-tree-handle',
+      placeholderClass: 'angular-ui-tree-placeholder',
+      dragClass: 'angular-ui-tree-drag',
+      dragThreshold: 3,
+      levelThreshold: 30,
+      defaultCollapsed: false
+    });
+
+})();
+
+(function () {
+  'use strict';
+
+  angular.module('ui.tree')
+
+    .controller('TreeHandleController', ['$scope', '$element',
+      function ($scope, $element) {
+        this.scope = $scope;
+
+        $scope.$element = $element;
+        $scope.$nodeScope = null;
+        $scope.$type = 'uiTreeHandle';
+
+      }
+    ]);
+})();
+
+(function () {
+  'use strict';
+
+  angular.module('ui.tree')
+    .controller('TreeNodeController', ['$scope', '$element',
+      function ($scope, $element) {
+        this.scope = $scope;
+
+        $scope.$element = $element;
+        $scope.$modelValue = null; // Model value for node;
+        $scope.$parentNodeScope = null; // uiTreeNode Scope of parent node;
+        $scope.$childNodesScope = null; // uiTreeNodes Scope of child nodes.
+        $scope.$parentNodesScope = null; // uiTreeNodes Scope of parent nodes.
+        $scope.$treeScope = null; // uiTree scope
+        $scope.$handleScope = null; // it's handle scope
+        $scope.$type = 'uiTreeNode';
+        $scope.$$allowNodeDrop = false;
+        $scope.collapsed = false;
+        $scope.expandOnHover = false;
+
+        $scope.init = function (controllersArr) {
+          var treeNodesCtrl = controllersArr[0];
+          $scope.$treeScope = controllersArr[1] ? controllersArr[1].scope : null;
+
+          // find the scope of it's parent node
+          $scope.$parentNodeScope = treeNodesCtrl.scope.$nodeScope;
+          // modelValue for current node
+          $scope.$modelValue = treeNodesCtrl.scope.$modelValue[$scope.$index];
+          $scope.$parentNodesScope = treeNodesCtrl.scope;
+          treeNodesCtrl.scope.initSubNode($scope); // init sub nodes
+
+          $element.on('$destroy', function () {
+            treeNodesCtrl.scope.destroySubNode($scope); // destroy sub nodes
+          });
+        };
+
+        $scope.index = function () {
+          return $scope.$parentNodesScope.$modelValue.indexOf($scope.$modelValue);
+        };
+
+        $scope.dragEnabled = function () {
+          return !($scope.$treeScope && !$scope.$treeScope.dragEnabled);
+        };
+
+        $scope.isSibling = function (targetNode) {
+          return $scope.$parentNodesScope == targetNode.$parentNodesScope;
+        };
+
+        $scope.isChild = function (targetNode) {
+          var nodes = $scope.childNodes();
+          return nodes && nodes.indexOf(targetNode) > -1;
+        };
+
+        $scope.prev = function () {
+          var index = $scope.index();
+          if (index > 0) {
+            return $scope.siblings()[index - 1];
+          }
+          return null;
+        };
+
+        $scope.siblings = function () {
+          return $scope.$parentNodesScope.childNodes();
+        };
+
+        $scope.childNodesCount = function () {
+          return $scope.childNodes() ? $scope.childNodes().length : 0;
+        };
+
+        $scope.hasChild = function () {
+          return $scope.childNodesCount() > 0;
+        };
+
+        $scope.childNodes = function () {
+          return $scope.$childNodesScope && $scope.$childNodesScope.$modelValue ?
+            $scope.$childNodesScope.childNodes() :
+            null;
+        };
+
+        $scope.accept = function (sourceNode, destIndex) {
+          return $scope.$childNodesScope &&
+            $scope.$childNodesScope.$modelValue &&
+            $scope.$childNodesScope.accept(sourceNode, destIndex);
+        };
+
+        $scope.remove = function () {
+          return $scope.$parentNodesScope.removeNode($scope);
+        };
+
+        $scope.toggle = function () {
+          $scope.collapsed = !$scope.collapsed;
+          $scope.$treeScope.$callbacks.toggle($scope.collapsed, $scope);
+        };
+
+        $scope.collapse = function () {
+          $scope.collapsed = true;
+        };
+
+        $scope.expand = function () {
+          $scope.collapsed = false;
+        };
+
+        $scope.depth = function () {
+          var parentNode = $scope.$parentNodeScope;
+          if (parentNode) {
+            return parentNode.depth() + 1;
+          }
+          return 1;
+        };
+
+        /**
+        * Returns the depth of the deepest subtree under this node
+        * @param scope a TreeNodesController scope object
+        * @returns Depth of all nodes *beneath* this node. If scope belongs to a leaf node, the
+        *   result is 0 (it has no subtree).
+        */
+        function countSubTreeDepth(scope) {
+          var thisLevelDepth = 0,
+              childNodes = scope.childNodes(),
+              childNode,
+              childDepth,
+              i;
+          if (!childNodes || childNodes.length === 0) {
+            return 0;
+          }
+          for (i = childNodes.length - 1; i >= 0 ; i--) {
+            childNode = childNodes[i],
+            childDepth = 1 + countSubTreeDepth(childNode);
+            thisLevelDepth = Math.max(thisLevelDepth, childDepth);
+          }
+          return thisLevelDepth;
+        }
+
+        $scope.maxSubDepth = function () {
+          return $scope.$childNodesScope ? countSubTreeDepth($scope.$childNodesScope) : 0;
+        };
+      }
+    ]);
+})();
+
+(function () {
+  'use strict';
+
+  angular.module('ui.tree')
+
+    .controller('TreeNodesController', ['$scope', '$element',
+      function ($scope, $element) {
+        this.scope = $scope;
+
+        $scope.$element = $element;
+        $scope.$modelValue = null;
+        $scope.$nodeScope = null; // the scope of node which the nodes belongs to
+        $scope.$treeScope = null;
+        $scope.$type = 'uiTreeNodes';
+        $scope.$nodesMap = {};
+
+        $scope.nodropEnabled = false;
+        $scope.maxDepth = 0;
+        $scope.cloneEnabled = false;
+
+        $scope.initSubNode = function (subNode) {
+          if (!subNode.$modelValue) {
+            return null;
+          }
+          $scope.$nodesMap[subNode.$modelValue.$$hashKey] = subNode;
+        };
+
+        $scope.destroySubNode = function (subNode) {
+          if (!subNode.$modelValue) {
+            return null;
+          }
+          $scope.$nodesMap[subNode.$modelValue.$$hashKey] = null;
+        };
+
+        $scope.accept = function (sourceNode, destIndex) {
+          return $scope.$treeScope.$callbacks.accept(sourceNode, $scope, destIndex);
+        };
+
+        $scope.beforeDrag = function (sourceNode) {
+          return $scope.$treeScope.$callbacks.beforeDrag(sourceNode);
+        };
+
+        $scope.isParent = function (node) {
+          return node.$parentNodesScope == $scope;
+        };
+
+        $scope.hasChild = function () {
+          return $scope.$modelValue.length > 0;
+        };
+
+        $scope.safeApply = function (fn) {
+          var phase = this.$root.$$phase;
+          if (phase == '$apply' || phase == '$digest') {
+            if (fn && (typeof (fn) === 'function')) {
+              fn();
+            }
+          } else {
+            this.$apply(fn);
+          }
+        };
+
+        $scope.removeNode = function (node) {
+          var index = $scope.$modelValue.indexOf(node.$modelValue);
+          if (index > -1) {
+            $scope.safeApply(function () {
+              $scope.$modelValue.splice(index, 1)[0];
+            });
+            return $scope.$treeScope.$callbacks.removed(node);
+          }
+          return null;
+        };
+
+        $scope.insertNode = function (index, nodeData) {
+          $scope.safeApply(function () {
+            $scope.$modelValue.splice(index, 0, nodeData);
+          });
+        };
+
+        $scope.childNodes = function () {
+          var i, nodes = [];
+          if ($scope.$modelValue) {
+            for (i = 0; i < $scope.$modelValue.length; i++) {
+              nodes.push($scope.$nodesMap[$scope.$modelValue[i].$$hashKey]);
+            }
+          }
+          return nodes;
+        };
+
+        $scope.depth = function () {
+          if ($scope.$nodeScope) {
+            return $scope.$nodeScope.depth();
+          }
+          return 0; // if it has no $nodeScope, it's root
+        };
+
+        // check if depth limit has reached
+        $scope.outOfDepth = function (sourceNode) {
+          var maxDepth = $scope.maxDepth || $scope.$treeScope.maxDepth;
+          if (maxDepth > 0) {
+            return $scope.depth() + sourceNode.maxSubDepth() + 1 > maxDepth;
+          }
+          return false;
+        };
+
+      }
+    ]);
+})();
+
+(function () {
+  'use strict';
+
+  angular.module('ui.tree')
+
+    .controller('TreeController', ['$scope', '$element',
+      function ($scope, $element) {
+        this.scope = $scope;
+
+        $scope.$element = $element;
+        $scope.$nodesScope = null; // root nodes
+        $scope.$type = 'uiTree';
+        $scope.$emptyElm = null;
+        $scope.$callbacks = null;
+
+        $scope.dragEnabled = true;
+        $scope.emptyPlaceholderEnabled = true;
+        $scope.maxDepth = 0;
+        $scope.dragDelay = 0;
+        $scope.cloneEnabled = false;
+        $scope.nodropEnabled = false;
+
+        // Check if it's a empty tree
+        $scope.isEmpty = function () {
+          return ($scope.$nodesScope && $scope.$nodesScope.$modelValue
+          && $scope.$nodesScope.$modelValue.length === 0);
+        };
+
+        // add placeholder to empty tree
+        $scope.place = function (placeElm) {
+          $scope.$nodesScope.$element.append(placeElm);
+          $scope.$emptyElm.remove();
+        };
+
+        this.resetEmptyElement = function () {
+          if ((!$scope.$nodesScope.$modelValue || $scope.$nodesScope.$modelValue.length === 0) &&
+            $scope.emptyPlaceholderEnabled) {
+            $element.append($scope.$emptyElm);
+          } else {
+            $scope.$emptyElm.remove();
+          }
+        };
+
+        $scope.resetEmptyElement = this.resetEmptyElement;
+      }
+    ]);
+})();
+
+(function () {
+  'use strict';
+
+  angular.module('ui.tree')
+    .directive('uiTree', ['treeConfig', '$window',
+      function (treeConfig, $window) {
+        return {
+          restrict: 'A',
+          scope: true,
+          controller: 'TreeController',
+          link: function (scope, element, attrs, ctrl) {
+            var callbacks = {
+              accept: null,
+              beforeDrag: null
+            },
+              config = {},
+              tdElm,
+              $trElm,
+              emptyElmColspan;
+
+            angular.extend(config, treeConfig);
+            if (config.treeClass) {
+              element.addClass(config.treeClass);
+            }
+
+            if (element.prop('tagName').toLowerCase() === 'table') {
+              scope.$emptyElm = angular.element($window.document.createElement('tr'));
+              $trElm = element.find('tr');
+              // If we can find a tr, then we can use its td children as the empty element colspan.
+              if ($trElm.length > 0) {
+                emptyElmColspan = angular.element($trElm).children().length;
+              } else {
+                // If not, by setting a huge colspan we make sure it takes full width.
+                emptyElmColspan = 1000000;
+              }
+              tdElm = angular.element($window.document.createElement('td'))
+                .attr('colspan', emptyElmColspan);
+              scope.$emptyElm.append(tdElm);
+            } else {
+              scope.$emptyElm = angular.element($window.document.createElement('div'));
+            }
+
+            if (config.emptyTreeClass) {
+              scope.$emptyElm.addClass(config.emptyTreeClass);
+            }
+
+            scope.$watch('$nodesScope.$modelValue.length', function (val) {
+              if (!angular.isNumber(val)) {
+                return;
+              }
+
+              ctrl.resetEmptyElement();
+            }, true);
+
+            scope.$watch(attrs.dragEnabled, function (val) {
+              if ((typeof val) == 'boolean') {
+                scope.dragEnabled = val;
+              }
+            });
+
+            scope.$watch(attrs.emptyPlaceholderEnabled, function (val) {
+              if ((typeof val) == 'boolean') {
+                scope.emptyPlaceholderEnabled = val;
+                ctrl.resetEmptyElement();
+              }
+            });
+
+            scope.$watch(attrs.nodropEnabled, function (val) {
+              if ((typeof val) == 'boolean') {
+                scope.nodropEnabled = val;
+              }
+            });
+
+            scope.$watch(attrs.cloneEnabled, function (val) {
+              if ((typeof val) == 'boolean') {
+                scope.cloneEnabled = val;
+              }
+            });
+
+            scope.$watch(attrs.maxDepth, function (val) {
+              if ((typeof val) == 'number') {
+                scope.maxDepth = val;
+              }
+            });
+
+            scope.$watch(attrs.dragDelay, function (val) {
+              if ((typeof val) == 'number') {
+                scope.dragDelay = val;
+              }
+            });
+
+            /**
+             * Callback checks if the destination node can accept the dragged node.
+             * By default, ui-tree will check that 'data-nodrop-enabled' is not set for the
+             * destination ui-tree-nodes, and that the 'max-depth' attribute will not be exceeded
+             * if it is set on the ui-tree or ui-tree-nodes.
+             * This callback can be overridden, but callers must manually enforce nodrop and max-depth
+             * themselves if they need those to be enforced.
+             * @param sourceNodeScope Scope of the ui-tree-node being dragged
+             * @param destNodesScope Scope of the ui-tree-nodes where the node is hovering
+             * @param destIndex Index in the destination nodes array where the source node will drop
+             * @returns {boolean} True if the node is permitted to be dropped here
+             */
+            callbacks.accept = function (sourceNodeScope, destNodesScope, destIndex) {
+              return !(destNodesScope.nodropEnabled || destNodesScope.$treeScope.nodropEnabled || destNodesScope.outOfDepth(sourceNodeScope));
+            };
+
+            callbacks.beforeDrag = function (sourceNodeScope) {
+              return true;
+            };
+
+            callbacks.expandTimeoutStart = function()
+            {
+
+            };
+
+            callbacks.expandTimeoutCancel = function()
+            {
+
+            };
+
+            callbacks.expandTimeoutEnd = function()
+            {
+
+            };
+
+            callbacks.removed = function (node) {
+
+            };
+
+            /**
+             * Callback is fired when a node is successfully dropped in a new location
+             * @param event
+             */
+            callbacks.dropped = function (event) {
+
+            };
+
+            /**
+             * Callback is fired each time the user starts dragging a node
+             * @param event
+             */
+            callbacks.dragStart = function (event) {
+
+            };
+
+            /**
+             * Callback is fired each time a dragged node is moved with the mouse/touch.
+             * @param event
+             */
+            callbacks.dragMove = function (event) {
+
+            };
+
+            /**
+             * Callback is fired when the tree exits drag mode. If the user dropped a node, the drop may have been
+             * accepted or reverted.
+             * @param event
+             */
+            callbacks.dragStop = function (event) {
+
+            };
+
+            /**
+             * Callback is fired when a user drops a node (but prior to processing the drop action)
+             * beforeDrop can return a Promise, truthy, or falsy (returning nothing is falsy).
+             * If it returns falsy, or a resolve Promise, the node move is accepted
+             * If it returns truthy, or a rejected Promise, the node move is reverted
+             * @param event
+             * @returns {Boolean|Promise} Truthy (or rejected Promise) to cancel node move; falsy (or resolved promise)
+             */
+            callbacks.beforeDrop = function (event) {
+
+            };
+
+            /**
+             * Callback is fired when a user toggles node (but after processing the toggle action)
+             * @param sourceNodeScope
+             * @param collapsed
+             */
+            callbacks.toggle = function (collapsed, sourceNodeScope) {
+
+            };
+
+            scope.$watch(attrs.uiTree, function (newVal, oldVal) {
+              angular.forEach(newVal, function (value, key) {
+                if (callbacks[key]) {
+                  if (typeof value === 'function') {
+                    callbacks[key] = value;
+                  }
+                }
+              });
+
+              scope.$callbacks = callbacks;
+            }, true);
+
+
+          }
+        };
+      }
+    ]);
+})();
+
+(function () {
+  'use strict';
+
+  angular.module('ui.tree')
+    .directive('uiTreeHandle', ['treeConfig',
+      function (treeConfig) {
+        return {
+          require: '^uiTreeNode',
+          restrict: 'A',
+          scope: true,
+          controller: 'TreeHandleController',
+          link: function (scope, element, attrs, treeNodeCtrl) {
+            var config = {};
+            angular.extend(config, treeConfig);
+            if (config.handleClass) {
+              element.addClass(config.handleClass);
+            }
+            // connect with the tree node.
+            if (scope != treeNodeCtrl.scope) {
+              scope.$nodeScope = treeNodeCtrl.scope;
+              treeNodeCtrl.scope.$handleScope = scope;
+            }
+          }
+        };
+      }
+    ]);
+})();
+
+(function () {
+  'use strict';
+
+  angular.module('ui.tree')
+
+    .directive('uiTreeNode', ['treeConfig', 'UiTreeHelper', '$window', '$document', '$timeout', '$q',
+      function (treeConfig, UiTreeHelper, $window, $document, $timeout, $q) {
+        return {
+          require: ['^uiTreeNodes', '^uiTree'],
+          restrict: 'A',
+          controller: 'TreeNodeController',
+          link: function (scope, element, attrs, controllersArr) {
+            // todo startPos is unused
+            var config = {},
+              hasTouch = 'ontouchstart' in window,
+              startPos, firstMoving, dragInfo, pos,
+              placeElm, hiddenPlaceElm, dragElm,
+              treeScope = null,
+              elements, // As a parameter for callbacks
+              dragDelaying = true,
+              dragStarted = false,
+              dragTimer = null,
+              body = document.body,
+              html = document.documentElement,
+              document_height,
+              document_width,
+              dragStart,
+              tagName,
+              dragMove,
+              dragEnd,
+              dragStartEvent,
+              dragMoveEvent,
+              dragEndEvent,
+              dragCancelEvent,
+              dragDelay,
+              bindDragStartEvents,
+              bindDragMoveEvents,
+              unbindDragMoveEvents,
+              keydownHandler,
+              outOfBounds,
+              isHandleChild,
+              el;
+
+            angular.extend(config, treeConfig);
+            if (config.nodeClass) {
+              element.addClass(config.nodeClass);
+            }
+            scope.init(controllersArr);
+
+            scope.collapsed = !!UiTreeHelper.getNodeAttribute(scope, 'collapsed') || treeConfig.defaultCollapsed;
+			scope.expandOnHover = !!UiTreeHelper.getNodeAttribute(scope, 'expandOnHover');
+            scope.sourceOnly = scope.nodropEnabled || scope.$treeScope.nodropEnabled;
+
+            scope.$watch(attrs.collapsed, function (val) {
+              if ((typeof val) == 'boolean') {
+                scope.collapsed = val;
+              }
+            });
+
+            scope.$watch('collapsed', function (val) {
+              UiTreeHelper.setNodeAttribute(scope, 'collapsed', val);
+              attrs.$set('collapsed', val);
+            });
+
+            scope.$watch(attrs.expandOnHover, function(val) {
+              if ((typeof val) == 'boolean') {
+                scope.expandOnHover = val;
+              }
+            });
+
+			scope.$watch('expandOnHover', function (val) {
+              UiTreeHelper.setNodeAttribute(scope, 'expandOnHover', val);
+              attrs.$set('expandOnHover', val);
+            });
+
+            scope.$on('angular-ui-tree:collapse-all', function () {
+              scope.collapsed = true;
+            });
+
+            scope.$on('angular-ui-tree:expand-all', function () {
+              scope.collapsed = false;
+            });
+
+            /**
+             * Called when the user has grabbed a node and started dragging it
+             * @param e
+             */
+            dragStart = function (e) {
+              // disable right click
+              if (!hasTouch && (e.button === 2 || e.which === 3)) {
+                return;
+              }
+
+              // event has already fired in other scope
+              if (e.uiTreeDragging || (e.originalEvent && e.originalEvent.uiTreeDragging)) {
+                return;
+              }
+
+              // the node being dragged
+              var eventElm = angular.element(e.target),
+                isHandleChild, cloneElm, eventElmTagName, tagName,
+                eventObj, tdElm, hStyle,
+                isTreeNode,
+                isTreeNodeHandle;
+
+              // if the target element is a child element of a ui-tree-handle,
+              // use the containing handle element as target element
+              isHandleChild = UiTreeHelper.treeNodeHandlerContainerOfElement(eventElm);
+              if (isHandleChild) {
+                eventElm = angular.element(isHandleChild);
+              }
+
+              cloneElm = element.clone();
+              isTreeNode = UiTreeHelper.elementIsTreeNode(eventElm);
+              isTreeNodeHandle = UiTreeHelper.elementIsTreeNodeHandle(eventElm);
+
+              if (!isTreeNode && !isTreeNodeHandle) {
+                return;
+              }
+
+              if (isTreeNode && UiTreeHelper.elementContainsTreeNodeHandler(eventElm)) {
+                return;
+              }
+
+              eventElmTagName = eventElm.prop('tagName').toLowerCase();
+              if (eventElmTagName == 'input' ||
+                eventElmTagName == 'textarea' ||
+                eventElmTagName == 'button' ||
+                eventElmTagName == 'select') { // if it's a input or button, ignore it
+                return;
+              }
+
+              // check if it or it's parents has a 'data-nodrag' attribute
+              el = angular.element(e.target);
+              while (el && el[0] && el[0] !== element) {
+                if (UiTreeHelper.nodrag(el)) { // if the node mark as `nodrag`, DONOT drag it.
+                  return;
+                }
+                el = el.parent();
+              }
+
+              if (!scope.beforeDrag(scope)) {
+                return;
+              }
+
+              e.uiTreeDragging = true; // stop event bubbling
+              if (e.originalEvent) {
+                e.originalEvent.uiTreeDragging = true;
+              }
+              e.preventDefault();
+              eventObj = UiTreeHelper.eventObj(e);
+
+              firstMoving = true;
+              dragInfo = UiTreeHelper.dragInfo(scope);
+
+              tagName = element.prop('tagName');
+
+              if (tagName.toLowerCase() === 'tr') {
+                placeElm = angular.element($window.document.createElement(tagName));
+                tdElm = angular.element($window.document.createElement('td'))
+                  .addClass(config.placeholderClass)
+                  .attr('colspan', element[0].children.length);
+                placeElm.append(tdElm);
+              } else {
+                placeElm = angular.element($window.document.createElement(tagName))
+                  .addClass(config.placeholderClass);
+              }
+              hiddenPlaceElm = angular.element($window.document.createElement(tagName));
+              if (config.hiddenClass) {
+                hiddenPlaceElm.addClass(config.hiddenClass);
+              }
+
+              pos = UiTreeHelper.positionStarted(eventObj, element);
+              placeElm.css('height', UiTreeHelper.height(element) + 'px');
+
+              dragElm = angular.element($window.document.createElement(scope.$parentNodesScope.$element.prop('tagName')))
+                .addClass(scope.$parentNodesScope.$element.attr('class')).addClass(config.dragClass);
+              dragElm.css('width', UiTreeHelper.width(element) + 'px');
+              dragElm.css('z-index', 9999);
+
+              // Prevents cursor to change rapidly in Opera 12.16 and IE when dragging an element
+              hStyle = (element[0].querySelector('.angular-ui-tree-handle') || element[0]).currentStyle;
+              if (hStyle) {
+                document.body.setAttribute('ui-tree-cursor', $document.find('body').css('cursor') || '');
+                $document.find('body').css({'cursor': hStyle.cursor + '!important'});
+              }
+
+              if (scope.sourceOnly) {
+                placeElm.css('display', 'none');
+              }
+              element.after(placeElm);
+              element.after(hiddenPlaceElm);
+              if (dragInfo.isClone() && scope.sourceOnly) {
+                dragElm.append(cloneElm);
+              } else {
+                dragElm.append(element);
+              }
+
+              $document.find('body').append(dragElm);
+
+              dragElm.css({
+                'left': eventObj.pageX - pos.offsetX + 'px',
+                'top': eventObj.pageY - pos.offsetY + 'px'
+              });
+              elements = {
+                placeholder: placeElm,
+                dragging: dragElm
+              };
+
+              bindDragMoveEvents();
+              // Fire dragStart callback
+              scope.$apply(function () {
+                scope.$treeScope.$callbacks.dragStart(dragInfo.eventArgs(elements, pos));
+              });
+
+              document_height = Math.max(body.scrollHeight, body.offsetHeight, html.clientHeight, html.scrollHeight, html.offsetHeight);
+              document_width = Math.max(body.scrollWidth, body.offsetWidth, html.clientWidth, html.scrollWidth, html.offsetWidth);
+            };
+
+            dragMove = function (e) {
+              var eventObj = UiTreeHelper.eventObj(e),
+                prev,
+                next,
+                leftElmPos,
+                topElmPos,
+                top_scroll,
+                bottom_scroll,
+                target,
+                decrease,
+                targetX,
+                targetY,
+                displayElm,
+                targetNode,
+                targetElm,
+                isEmpty,
+                scrollDownBy,
+                targetOffset,
+                targetBefore;
+
+              if (dragElm) {
+                e.preventDefault();
+
+                if ($window.getSelection) {
+                  $window.getSelection().removeAllRanges();
+                } else if ($window.document.selection) {
+                  $window.document.selection.empty();
+                }
+
+                leftElmPos = eventObj.pageX - pos.offsetX;
+                topElmPos = eventObj.pageY - pos.offsetY;
+
+                //dragElm can't leave the screen on the left
+                if (leftElmPos < 0) {
+                  leftElmPos = 0;
+                }
+
+                //dragElm can't leave the screen on the top
+                if (topElmPos < 0) {
+                  topElmPos = 0;
+                }
+
+                //dragElm can't leave the screen on the bottom
+                if ((topElmPos + 10) > document_height) {
+                  topElmPos = document_height - 10;
+                }
+
+                //dragElm can't leave the screen on the right
+                if ((leftElmPos + 10) > document_width) {
+                  leftElmPos = document_width - 10;
+                }
+
+                dragElm.css({
+                  'left': leftElmPos + 'px',
+                  'top': topElmPos + 'px'
+                });
+
+                top_scroll = window.pageYOffset || $window.document.documentElement.scrollTop;
+                bottom_scroll = top_scroll + (window.innerHeight || $window.document.clientHeight || $window.document.clientHeight);
+
+                // to scroll down if cursor y-position is greater than the bottom position the vertical scroll
+                if (bottom_scroll < eventObj.pageY && bottom_scroll < document_height) {
+                  scrollDownBy = Math.min(document_height - bottom_scroll, 10);
+                  window.scrollBy(0, scrollDownBy);
+                }
+
+                // to scroll top if cursor y-position is less than the top position the vertical scroll
+                if (top_scroll > eventObj.pageY) {
+                  window.scrollBy(0, -10);
+                }
+
+                UiTreeHelper.positionMoved(e, pos, firstMoving);
+                if (firstMoving) {
+                  firstMoving = false;
+                  return;
+                }
+
+                // check if add it as a child node first
+                // todo decrease is unused
+                decrease = (UiTreeHelper.offset(dragElm).left - UiTreeHelper.offset(placeElm).left) >= config.threshold;
+
+                targetX = eventObj.pageX - ($window.pageXOffset ||
+                  $window.document.body.scrollLeft ||
+                  $window.document.documentElement.scrollLeft) -
+                  ($window.document.documentElement.clientLeft || 0);
+
+                targetY = eventObj.pageY - ($window.pageYOffset ||
+                  $window.document.body.scrollTop ||
+                  $window.document.documentElement.scrollTop) -
+                  ($window.document.documentElement.clientTop || 0);
+
+                // Select the drag target. Because IE does not support CSS 'pointer-events: none', it will always
+                // pick the drag element itself as the target. To prevent this, we hide the drag element while
+                // selecting the target.
+                if (angular.isFunction(dragElm.hide)) {
+                  dragElm.hide();
+                } else {
+                  displayElm = dragElm[0].style.display;
+                  dragElm[0].style.display = 'none';
+                }
+
+                // when using elementFromPoint() inside an iframe, you have to call
+                // elementFromPoint() twice to make sure IE8 returns the correct value
+                $window.document.elementFromPoint(targetX, targetY);
+
+                targetElm = angular.element($window.document.elementFromPoint(targetX, targetY));
+
+                // if the target element is a child element of a ui-tree-handle,
+                // use the containing handle element as target element
+                isHandleChild = UiTreeHelper.treeNodeHandlerContainerOfElement(targetElm);
+                if (isHandleChild) {
+                  targetElm = angular.element(isHandleChild);
+                }
+
+                if (angular.isFunction(dragElm.show)) {
+                  dragElm.show();
+                } else {
+                  dragElm[0].style.display = displayElm;
+                }
+
+                outOfBounds = !UiTreeHelper.elementIsTreeNodeHandle(targetElm) &&
+                              !UiTreeHelper.elementIsTreeNode(targetElm) &&
+                              !UiTreeHelper.elementIsTreeNodes(targetElm) &&
+                              !UiTreeHelper.elementIsTree(targetElm) &&
+                              !UiTreeHelper.elementIsPlaceholder(targetElm);
+
+                // Detect out of bounds condition, update drop target display, and prevent drop
+                if (outOfBounds) {
+
+                  // Remove the placeholder
+                  placeElm.remove();
+
+                  // If the target was an empty tree, replace the empty element placeholder
+                  if (treeScope) {
+                    treeScope.resetEmptyElement();
+                    treeScope = null;
+                  }
+                }
+
+                // move horizontal
+                if (pos.dirAx && pos.distAxX >= config.levelThreshold) {
+                  pos.distAxX = 0;
+
+                  // increase horizontal level if previous sibling exists and is not collapsed
+                  if (pos.distX > 0) {
+                    prev = dragInfo.prev();
+                    if (prev && !prev.collapsed
+                      && prev.accept(scope, prev.childNodesCount())) {
+                      prev.$childNodesScope.$element.append(placeElm);
+                      dragInfo.moveTo(prev.$childNodesScope, prev.childNodes(), prev.childNodesCount());
+                    }
+                  }
+
+                  // decrease horizontal level
+                  if (pos.distX < 0) {
+                    // we can't decrease a level if an item preceeds the current one
+                    next = dragInfo.next();
+                    if (!next) {
+                      target = dragInfo.parentNode(); // As a sibling of it's parent node
+                      if (target
+                        && target.$parentNodesScope.accept(scope, target.index() + 1)) {
+                        target.$element.after(placeElm);
+                        dragInfo.moveTo(target.$parentNodesScope, target.siblings(), target.index() + 1);
+                      }
+                    }
+                  }
+                }
+
+                // move vertical
+                if (!pos.dirAx) {
+                  if (UiTreeHelper.elementIsTree(targetElm)) {
+                    targetNode = targetElm.controller('uiTree').scope;
+                  } else if (UiTreeHelper.elementIsTreeNodeHandle(targetElm)) {
+                    targetNode = targetElm.controller('uiTreeHandle').scope;
+                  } else if (UiTreeHelper.elementIsTreeNode(targetElm)) {
+                    targetNode = targetElm.controller('uiTreeNode').scope;
+                  } else if (UiTreeHelper.elementIsTreeNodes(targetElm)) {
+                    targetNode = targetElm.controller('uiTreeNodes').scope;
+                  } else if (UiTreeHelper.elementIsPlaceholder(targetElm)) {
+                    targetNode = targetElm.controller('uiTreeNodes').scope;
+                  } else if (targetElm.controller('uiTreeNode')) {
+                    // is a child element of a node
+                    targetNode = targetElm.controller('uiTreeNode').scope;
+                  }
+
+                  // check it's new position
+                  isEmpty = false;
+                  if (!targetNode) {
+                    return;
+                  }
+
+                  // Show the placeholder if it was hidden for nodrop-enabled and this is a new tree
+                  if (targetNode.$treeScope && !targetNode.$parent.nodropEnabled && !targetNode.$treeScope.nodropEnabled) {
+                    placeElm.css('display', '');
+                  }
+
+                  if (targetNode.$type == 'uiTree' && targetNode.dragEnabled) {
+                    isEmpty = targetNode.isEmpty(); // Check if it's empty tree
+                  }
+
+                  if (targetNode.$type == 'uiTreeHandle') {
+                    targetNode = targetNode.$nodeScope;
+                  }
+
+                  if (targetNode.$type != 'uiTreeNode'
+                    && !isEmpty) { // Check if it is a uiTreeNode or it's an empty tree
+                    return;
+                  }
+
+                  // if placeholder move from empty tree, reset it.
+                  if (treeScope && placeElm.parent()[0] != treeScope.$element[0]) {
+                    treeScope.resetEmptyElement();
+                    treeScope = null;
+                  }
+
+                  if (isEmpty) { // it's an empty tree
+                    treeScope = targetNode;
+                    if (targetNode.$nodesScope.accept(scope, 0)) {
+                      targetNode.place(placeElm);
+                      dragInfo.moveTo(targetNode.$nodesScope, targetNode.$nodesScope.childNodes(), 0);
+                    }
+                  } else if (targetNode.dragEnabled()) { // drag enabled
+                      if (angular.isDefined(scope.expandTimeoutOn) && scope.expandTimeoutOn !== targetNode.id) {
+                        $timeout.cancel(scope.expandTimeout);
+                        delete scope.expandTimeout;
+                        delete scope.expandTimeoutOn;
+
+                        scope.$callbacks.expandTimeoutCancel();
+                      }
+
+                      if (targetNode.collapsed) {
+                        if (scope.expandOnHover === true || (angular.isNumber(scope.expandOnHover) && scope.expandOnHover === 0)) {
+                          targetNode.collapsed = false;
+                        } else if (scope.expandOnHover !== false && angular.isNumber(scope.expandOnHover) && scope.expandOnHover > 0) {
+                          if (angular.isUndefined(scope.expandTimeoutOn)) {
+                            scope.expandTimeoutOn = targetNode.$id;
+
+                            scope.$callbacks.expandTimeoutStart();
+                            scope.expandTimeout = $timeout(function()
+                            {
+                              scope.$callbacks.expandTimeoutEnd();
+                              targetNode.collapsed = false;
+                            }, scope.expandOnHover);
+                          }
+                        }
+                      }
+
+                    targetElm = targetNode.$element; // Get the element of ui-tree-node
+                    targetOffset = UiTreeHelper.offset(targetElm);
+                    targetBefore = targetNode.horizontal ? eventObj.pageX < (targetOffset.left + UiTreeHelper.width(targetElm) / 2)
+                      : eventObj.pageY < (targetOffset.top + UiTreeHelper.height(targetElm) / 2);
+
+                    if (targetNode.$parentNodesScope.accept(scope, targetNode.index())) {
+                      if (targetBefore) {
+                        targetElm[0].parentNode.insertBefore(placeElm[0], targetElm[0]);
+                        dragInfo.moveTo(targetNode.$parentNodesScope, targetNode.siblings(), targetNode.index());
+                      } else {
+                        targetElm.after(placeElm);
+                        dragInfo.moveTo(targetNode.$parentNodesScope, targetNode.siblings(), targetNode.index() + 1);
+                      }
+                    } else if (!targetBefore && targetNode.accept(scope, targetNode.childNodesCount())) { // we have to check if it can add the dragging node as a child
+                      targetNode.$childNodesScope.$element.append(placeElm);
+                      dragInfo.moveTo(targetNode.$childNodesScope, targetNode.childNodes(), targetNode.childNodesCount());
+                    } else {
+                      outOfBounds = true;
+                    }
+                  }
+                }
+
+                scope.$apply(function () {
+                  scope.$treeScope.$callbacks.dragMove(dragInfo.eventArgs(elements, pos));
+                });
+              }
+            };
+
+            dragEnd = function (e) {
+              var dragEventArgs = dragInfo.eventArgs(elements, pos);
+              e.preventDefault();
+              unbindDragMoveEvents();
+
+              $timeout.cancel(scope.expandTimeout);
+
+              scope.$treeScope.$apply(function () {
+                $q.when(scope.$treeScope.$callbacks.beforeDrop(dragEventArgs))
+                    // promise resolved (or callback didn't return false)
+                    .then(function (allowDrop) {
+                      if (allowDrop !== false && scope.$$allowNodeDrop && !outOfBounds) { // node drop accepted)
+                        dragInfo.apply();
+                        // fire the dropped callback only if the move was successful
+                        scope.$treeScope.$callbacks.dropped(dragEventArgs);
+                      } else { // drop canceled - revert the node to its original position
+                        bindDragStartEvents();
+                      }
+                    })
+                    // promise rejected - revert the node to its original position
+                    .catch(function () {
+                      bindDragStartEvents();
+                    })
+                    .finally(function () {
+                      hiddenPlaceElm.replaceWith(scope.$element);
+                      placeElm.remove();
+
+                      if (dragElm) { // drag element is attached to the mouse pointer
+                        dragElm.remove();
+                        dragElm = null;
+                      }
+                      scope.$treeScope.$callbacks.dragStop(dragEventArgs);
+                      scope.$$allowNodeDrop = false;
+                      dragInfo = null;
+
+                      // Restore cursor in Opera 12.16 and IE
+                      var oldCur = document.body.getAttribute('ui-tree-cursor');
+                      if (oldCur !== null) {
+                        $document.find('body').css({'cursor': oldCur});
+                        document.body.removeAttribute('ui-tree-cursor');
+                      }
+                    });
+              });
+            };
+
+            dragStartEvent = function (e) {
+              if (scope.dragEnabled()) {
+                dragStart(e);
+              }
+            };
+
+            dragMoveEvent = function (e) {
+              dragMove(e);
+            };
+
+            dragEndEvent = function (e) {
+              scope.$$allowNodeDrop = true;
+              dragEnd(e);
+            };
+
+            dragCancelEvent = function (e) {
+              dragEnd(e);
+            };
+
+            dragDelay = (function () {
+              var to;
+
+              return {
+                exec: function (fn, ms) {
+                  if (!ms) {
+                    ms = 0;
+                  }
+                  this.cancel();
+                  to = $timeout(fn, ms);
+                },
+                cancel: function () {
+                  $timeout.cancel(to);
+                }
+              };
+            })();
+
+            /**
+             * Binds the mouse/touch events to enable drag start for this node
+             */
+            bindDragStartEvents = function () {
+              element.bind('touchstart mousedown', function (e) {
+                dragDelay.exec(function () {
+                  dragStartEvent(e);
+                }, scope.dragDelay || 0);
+              });
+              element.bind('touchend touchcancel mouseup', function () {
+                dragDelay.cancel();
+              });
+            };
+            bindDragStartEvents();
+
+            /**
+             * Binds mouse/touch events that handle moving/dropping this dragged node
+             */
+            bindDragMoveEvents = function () {
+              angular.element($document).bind('touchend', dragEndEvent);
+              angular.element($document).bind('touchcancel', dragEndEvent);
+              angular.element($document).bind('touchmove', dragMoveEvent);
+              angular.element($document).bind('mouseup', dragEndEvent);
+              angular.element($document).bind('mousemove', dragMoveEvent);
+              angular.element($document).bind('mouseleave', dragCancelEvent);
+            };
+
+            /**
+             * Unbinds mouse/touch events that handle moving/dropping this dragged node
+             */
+            unbindDragMoveEvents = function () {
+              angular.element($document).unbind('touchend', dragEndEvent);
+              angular.element($document).unbind('touchcancel', dragEndEvent);
+              angular.element($document).unbind('touchmove', dragMoveEvent);
+              angular.element($document).unbind('mouseup', dragEndEvent);
+              angular.element($document).unbind('mousemove', dragMoveEvent);
+              angular.element($document).unbind('mouseleave', dragCancelEvent);
+            };
+
+            keydownHandler = function (e) {
+              if (e.keyCode == 27) {
+                scope.$$allowNodeDrop = false;
+                dragEnd(e);
+              }
+            };
+
+            angular.element($window.document).bind('keydown', keydownHandler);
+
+            //unbind handler that retains scope
+            scope.$on('$destroy', function () {
+              angular.element($window.document).unbind('keydown', keydownHandler);
+            });
+          }
+        };
+      }
+    ]);
+
+})();
+
+(function () {
+  'use strict';
+
+  angular.module('ui.tree')
+    .directive('uiTreeNodes', ['treeConfig', '$window',
+      function (treeConfig) {
+        return {
+          require: ['ngModel', '?^uiTreeNode', '^uiTree'],
+          restrict: 'A',
+          scope: true,
+          controller: 'TreeNodesController',
+          link: function (scope, element, attrs, controllersArr) {
+
+            var config = {},
+                ngModel = controllersArr[0],
+                treeNodeCtrl = controllersArr[1],
+                treeCtrl = controllersArr[2];
+
+            angular.extend(config, treeConfig);
+            if (config.nodesClass) {
+              element.addClass(config.nodesClass);
+            }
+
+            if (treeNodeCtrl) {
+              treeNodeCtrl.scope.$childNodesScope = scope;
+              scope.$nodeScope = treeNodeCtrl.scope;
+            } else {
+              // find the root nodes if there is no parent node and have a parent ui-tree
+              treeCtrl.scope.$nodesScope = scope;
+            }
+            scope.$treeScope = treeCtrl.scope;
+
+            if (ngModel) {
+              ngModel.$render = function () {
+                scope.$modelValue = ngModel.$modelValue;
+              };
+            }
+
+            scope.$watch(function () {
+              return attrs.maxDepth;
+            }, function (val) {
+              if ((typeof val) == 'number') {
+                scope.maxDepth = val;
+              }
+            });
+
+            scope.$watch(function () {
+              return attrs.nodropEnabled;
+            }, function (newVal) {
+              if ((typeof newVal) != 'undefined') {
+                scope.nodropEnabled = true;
+              }
+            }, true);
+
+            attrs.$observe('horizontal', function (val) {
+              scope.horizontal = ((typeof val) != 'undefined');
+            });
+
+          }
+        };
+      }
+    ]);
+})();
+
+(function () {
+  'use strict';
+
+  angular.module('ui.tree')
+
+  /**
+   * @ngdoc service
+   * @name ui.tree.service:UiTreeHelper
+   * @requires ng.$document
+   * @requires ng.$window
+   *
+   * @description
+   * angular-ui-tree.
+   */
+    .factory('UiTreeHelper', ['$document', '$window', 'treeConfig',
+      function ($document, $window, treeConfig) {
+        return {
+
+          /**
+           * A hashtable used to storage data of nodes
+           * @type {Object}
+           */
+          nodesData: {},
+
+          setNodeAttribute: function (scope, attrName, val) {
+            if (!scope.$modelValue) {
+              return null;
+            }
+            var data = this.nodesData[scope.$modelValue.$$hashKey];
+            if (!data) {
+              data = {};
+              this.nodesData[scope.$modelValue.$$hashKey] = data;
+            }
+            data[attrName] = val;
+          },
+
+          getNodeAttribute: function (scope, attrName) {
+            if (!scope.$modelValue) {
+              return null;
+            }
+            var data = this.nodesData[scope.$modelValue.$$hashKey];
+            if (data) {
+              return data[attrName];
+            }
+            return null;
+          },
+
+          /**
+           * @ngdoc method
+           * @methodOf ui.tree.service:$nodrag
+           * @param  {Object} targetElm angular element
+           * @return {Bool} check if the node can be dragged.
+           */
+          nodrag: function (targetElm) {
+            if (typeof targetElm.attr('data-nodrag') != 'undefined') {
+              return targetElm.attr('data-nodrag') !== 'false';
+            }
+            return false;
+          },
+
+          /**
+           * get the event object for touches
+           * @param  {[type]} e [description]
+           * @return {[type]}   [description]
+           */
+          eventObj: function (e) {
+            var obj = e;
+            if (e.targetTouches !== undefined) {
+              obj = e.targetTouches.item(0);
+            } else if (e.originalEvent !== undefined && e.originalEvent.targetTouches !== undefined) {
+              obj = e.originalEvent.targetTouches.item(0);
+            }
+            return obj;
+          },
+
+          dragInfo: function (node) {
+            return {
+              source: node,
+              sourceInfo: {
+                cloneModel: node.$treeScope.cloneEnabled === true ? angular.copy(node.$modelValue) : undefined,
+                nodeScope: node,
+                index: node.index(),
+                nodesScope: node.$parentNodesScope
+              },
+              index: node.index(),
+              siblings: node.siblings().slice(0),
+              parent: node.$parentNodesScope,
+
+              // Move the node to a new position
+              moveTo: function (parent, siblings, index) {
+                this.parent = parent;
+                this.siblings = siblings.slice(0);
+
+                // If source node is in the target nodes
+                var i = this.siblings.indexOf(this.source);
+                if (i > -1) {
+                  this.siblings.splice(i, 1);
+                  if (this.source.index() < index) {
+                    index--;
+                  }
+                }
+
+                this.siblings.splice(index, 0, this.source);
+                this.index = index;
+              },
+
+              parentNode: function () {
+                return this.parent.$nodeScope;
+              },
+
+              prev: function () {
+                if (this.index > 0) {
+                  return this.siblings[this.index - 1];
+                }
+
+                return null;
+              },
+
+              next: function () {
+                if (this.index < this.siblings.length - 1) {
+                  return this.siblings[this.index + 1];
+                }
+
+                return null;
+              },
+
+              isClone: function () {
+                return this.source.$treeScope.cloneEnabled === true;
+              },
+
+              clonedNode: function (node) {
+                return angular.copy(node);
+              },
+
+              isDirty: function () {
+                return this.source.$parentNodesScope != this.parent ||
+                  this.source.index() != this.index;
+              },
+
+              isForeign: function () {
+                return this.source.$treeScope !== this.parent.$treeScope;
+              },
+
+              eventArgs: function (elements, pos) {
+                return {
+                  source: this.sourceInfo,
+                  dest: {
+                    index: this.index,
+                    nodesScope: this.parent
+                  },
+                  elements: elements,
+                  pos: pos
+                };
+              },
+
+              apply: function () {
+
+                var nodeData = this.source.$modelValue;
+
+                // nodrop enabled on tree or parent
+                if (this.parent.nodropEnabled || this.parent.$treeScope.nodropEnabled) {
+                  return;
+                }
+
+                // node was dropped in the same place - do nothing
+                if (!this.isDirty()) {
+                  return;
+                }
+
+                // cloneEnabled and cross-tree so copy and do not remove from source
+                if (this.isClone() && this.isForeign()) {
+                  this.parent.insertNode(this.index, this.sourceInfo.cloneModel);
+                } else { // Any other case, remove and reinsert
+                  this.source.remove();
+                  this.parent.insertNode(this.index, nodeData);
+                }
+              }
+            };
+          },
+
+          /**
+           * @ngdoc method
+           * @name ui.tree#height
+           * @methodOf ui.tree.service:UiTreeHelper
+           *
+           * @description
+           * Get the height of an element.
+           *
+           * @param {Object} element Angular element.
+           * @returns {String} Height
+           */
+          height: function (element) {
+            return element.prop('scrollHeight');
+          },
+
+          /**
+           * @ngdoc method
+           * @name ui.tree#width
+           * @methodOf ui.tree.service:UiTreeHelper
+           *
+           * @description
+           * Get the width of an element.
+           *
+           * @param {Object} element Angular element.
+           * @returns {String} Width
+           */
+          width: function (element) {
+            return element.prop('scrollWidth');
+          },
+
+          /**
+           * @ngdoc method
+           * @name ui.tree#offset
+           * @methodOf ui.nestedSortable.service:UiTreeHelper
+           *
+           * @description
+           * Get the offset values of an element.
+           *
+           * @param {Object} element Angular element.
+           * @returns {Object} Object with properties width, height, top and left
+           */
+          offset: function (element) {
+            var boundingClientRect = element[0].getBoundingClientRect();
+
+            return {
+              width: element.prop('offsetWidth'),
+              height: element.prop('offsetHeight'),
+              top: boundingClientRect.top + ($window.pageYOffset || $document[0].body.scrollTop || $document[0].documentElement.scrollTop),
+              left: boundingClientRect.left + ($window.pageXOffset || $document[0].body.scrollLeft || $document[0].documentElement.scrollLeft)
+            };
+          },
+
+          /**
+           * @ngdoc method
+           * @name ui.tree#positionStarted
+           * @methodOf ui.tree.service:UiTreeHelper
+           *
+           * @description
+           * Get the start position of the target element according to the provided event properties.
+           *
+           * @param {Object} e Event
+           * @param {Object} target Target element
+           * @returns {Object} Object with properties offsetX, offsetY, startX, startY, nowX and dirX.
+           */
+          positionStarted: function (e, target) {
+            var pos = {},
+              pageX = e.pageX,
+              pageY = e.pageY;
+
+            if (e.originalEvent && e.originalEvent.touches && (e.originalEvent.touches.length > 0)) {
+              pageX = e.originalEvent.touches[0].pageX;
+              pageY = e.originalEvent.touches[0].pageY;
+            }
+            pos.offsetX = pageX - this.offset(target).left;
+            pos.offsetY = pageY - this.offset(target).top;
+            pos.startX = pos.lastX = pageX;
+            pos.startY = pos.lastY = pageY;
+            pos.nowX = pos.nowY = pos.distX = pos.distY = pos.dirAx = 0;
+            pos.dirX = pos.dirY = pos.lastDirX = pos.lastDirY = pos.distAxX = pos.distAxY = 0;
+            return pos;
+          },
+
+          positionMoved: function (e, pos, firstMoving) {
+            var pageX = e.pageX,
+              pageY = e.pageY,
+              newAx;
+            if (e.originalEvent && e.originalEvent.touches && (e.originalEvent.touches.length > 0)) {
+              pageX = e.originalEvent.touches[0].pageX;
+              pageY = e.originalEvent.touches[0].pageY;
+            }
+            // mouse position last events
+            pos.lastX = pos.nowX;
+            pos.lastY = pos.nowY;
+
+            // mouse position this events
+            pos.nowX = pageX;
+            pos.nowY = pageY;
+
+            // distance mouse moved between events
+            pos.distX = pos.nowX - pos.lastX;
+            pos.distY = pos.nowY - pos.lastY;
+
+            // direction mouse was moving
+            pos.lastDirX = pos.dirX;
+            pos.lastDirY = pos.dirY;
+
+            // direction mouse is now moving (on both axis)
+            pos.dirX = pos.distX === 0 ? 0 : pos.distX > 0 ? 1 : -1;
+            pos.dirY = pos.distY === 0 ? 0 : pos.distY > 0 ? 1 : -1;
+
+            // axis mouse is now moving on
+            newAx = Math.abs(pos.distX) > Math.abs(pos.distY) ? 1 : 0;
+
+            // do nothing on first move
+            if (firstMoving) {
+              pos.dirAx = newAx;
+              pos.moving = true;
+              return;
+            }
+
+            // calc distance moved on this axis (and direction)
+            if (pos.dirAx !== newAx) {
+              pos.distAxX = 0;
+              pos.distAxY = 0;
+            } else {
+              pos.distAxX += Math.abs(pos.distX);
+              if (pos.dirX !== 0 && pos.dirX !== pos.lastDirX) {
+                pos.distAxX = 0;
+              }
+
+              pos.distAxY += Math.abs(pos.distY);
+              if (pos.dirY !== 0 && pos.dirY !== pos.lastDirY) {
+                pos.distAxY = 0;
+              }
+            }
+
+            pos.dirAx = newAx;
+          },
+
+          elementIsTreeNode: function (element) {
+            return typeof element.attr('ui-tree-node') !== 'undefined';
+          },
+
+          elementIsTreeNodeHandle: function (element) {
+            return typeof element.attr('ui-tree-handle') !== 'undefined';
+          },
+          elementIsTree: function (element) {
+            return typeof element.attr('ui-tree') !== 'undefined';
+          },
+          elementIsTreeNodes: function (element) {
+            return typeof element.attr('ui-tree-nodes') !== 'undefined';
+          },
+          elementIsPlaceholder: function (element) {
+            return element.hasClass(treeConfig.placeholderClass);
+          },
+          elementContainsTreeNodeHandler: function (element) {
+            return element[0].querySelectorAll('[ui-tree-handle]').length >= 1;
+          },
+          treeNodeHandlerContainerOfElement: function (element) {
+            return findFirstParentElementWithAttribute('ui-tree-handle', element[0]);
+          }
+        };
+      }
+    ]);
+
+  // TODO: optimize this loop
+  function findFirstParentElementWithAttribute(attributeName, childObj) {
+    // undefined if the mouse leaves the browser window
+    if (childObj === undefined) {
+      return null;
+    }
+    var testObj = childObj.parentNode,
+      count = 1,
+      // check for setAttribute due to exception thrown by Firefox when a node is dragged outside the browser window
+      res = (typeof testObj.setAttribute === 'function' && testObj.hasAttribute(attributeName)) ? testObj : null;
+    while (testObj && typeof testObj.setAttribute === 'function' && !testObj.hasAttribute(attributeName)) {
+      testObj = testObj.parentNode;
+      res = testObj;
+      if (testObj === document.documentElement) {
+        res = null;
+        break;
+      }
+      count++;
+    }
+
+    return res;
+  }
+
+})();
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js b/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js
new file mode 100755
index 000000000..855f99087
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js
@@ -0,0 +1,148 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+"use strict";
+
+appDS2.constant("COMPONENT", (function() {
+    return {
+    A_LA_CARTE : "a la carte",
+    CLOUD_REGION_ID : "cloudRegionID",
+    COMPONENT_STATUS : "ComponentStatus",
+    CREATE_COMPONENT : "createComponent",
+    DELETE_COMPONENT : "deleteComponent",
+    ENTITY : "entity",
+    GET_COMPONENT_LIST : "getComponentList",
+    GET_SUBS : "getSubs",
+    GET_SUB_DETAILS : "getSubDetails",
+    GLOBAL_CUSTOMER_ID : "globalCustomerId",
+    MACRO : "Macro",
+	MODEL_VERSION_1 : "1",
+	MSO_CREATE_REQ : "createInstance",
+	MSO_DELETE_REQ : "deleteInstance",
+    NAME : "name",
+	NETWORK : "network",
+	NETWORKS : "networks",
+
+	QUERY_SERVICE_INSTANCE : "queryServiceInstance",
+	REFRESH_PROPERTIES : "refreshProperties",
+	SERVICE : "service",
+	SERVICE_TYPE : "serviceType",
+	SHOW_COMPONENT_DETAILS : "showComponentDetails",
+	STATUS : "status",
+	SUBSCRIBER_NAME : "subscriberName",
+	TENANT_ID : "tenantID",
+	TENANT_NAME : "tenantName",
+	TRUE : "true",
+	
+	VF_MODULE : "vfModule",
+	VNF : "vnf",
+	VNF_CODE : "vnfCode",
+	VNF_FUNCTION : "vnfFunction",
+	VNF_ROLE : "vnfRole",
+	VNF_TYPE : "vnfType",
+	VOLUME_GROUP : "volumeGroup",
+	
+	
+	// IDs
+	CIDR_MASK_1 : "255.255.255.000",
+	//COMPONENT_LIST_NAMED_QUERY_ID : "ed0a0f5b-cf79-4784-88b2-911cd726cd3d",
+	CUSTOMER_ID_1 : "icore9883749",
+	DELETE_INSTANCE_ID_1 : "ff305d54-75b4-ff1b-fff1-eb6b9e5460ff",
+	GATEWAY_ADDRESS_1 : "10.10.125.1",
+	GLOBAL_SUBSCRIBER_ID_1 : "C12345",
+	INSTANCE_ID_1 : "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
+	INSTANCE_ID_2 : "ff305d54-75b4-ff1b-adb2-eb6b9e5460ff",
+	INSTANCE_ID_3 : "ff305d54-75b4-ff1b-bdb2-eb6b9e5460ff",
+	MODEL_ID_1 : "sn5256d1-5a33-55df-13ab-12abad84e764",
+	MODEL_ID_2 : "ff5256d1-5a33-55df-aaaa-12abad84e7ff",
+	MODEL_ID_3 : "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+	MODEL_ID_4 : "ff5256d1-5a33-55df-13ab-12abad84e7ff",
+	MODEL_ID_5 : "ff5256d1-5a33-55df-13ab-22abad84e7ff",
+	MODEL_NAME_VERSION_ID_1 : "ab6478e4-ea33-3346-ac12-ab121484a333",
+	MODEL_NAME_VERSION_ID_2 : "fe6478e4-ea33-3346-aaaa-ab121484a3fe",
+	MODEL_NAME_VERSION_ID_3 : "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+	MODEL_NAME_VERSION_ID_4 : "fe6478e4-ea33-3346-ac12-ab121484a3fe",
+	MODEL_NAME_VERSION_ID_5 : "fe6478e4-ea33-3346-bc12-ab121484a3fe",
+	SERVICE_INSTANCE_ID_1 : "bc305d54-75b4-431b-adb2-eb6b9e546014",
+	SUBSCRIBER_NAME_GED12 : "General Electric Division 12",
+	VNF_INSTANCE_ID : "VNF_INSTANCE_ID_12345",
+	VPN_ID_1 : "1a2b3c4d5e6f",
+	
+	// PATHS
+	ASSIGN : "?r=",
+	AAI_GET_SERVICE_INSTANCE_PATH : "aai_get_service_instance/",
+	AAI_GET_SERVICES : "aai_get_services",
+	AAI_GET_TENANTS : "aai_get_tenants/",
+	AAI_SUB_DETAILS_PATH : "aai_sub_details/",
+	AAI_SUB_VIEWEDIT_PATH : "aai_sub_viewedit",
+	ASDC_GETMODEL_PATH : "asdc/getModel/",
+	CREATE_INSTANCE_PATH : "/models/services/createInstance", 
+	FORWARD_SLASH : "/",
+	GET_SYSTEM_PROP_VNF_PROV_STATUS_PATH : "get_system_prop_vnf_prov_status",
+	GET_USER_ID : "getuserID",
+	INSTANTIATE_ROOT_PATH : "#/instantiate?subscriberId=",
+	INSTANTIATE_PATH : "/instantiate",
+	INVALID_STRING : "/INVALID_STRING/",
+	INVALID_STRING_MSO_CREATE_SVC_INSTANCE : "INVALID_STRING_mso_create_svc_instance",
+	MSO_CREATE_NW_INSTANCE : "mso_create_nw_instance",
+	MSO_CREATE_NW_INSTANCE_PATH : "mso_create_nw_instance/",
+	MSO_CREATE_SVC_INSTANCE : "mso_create_svc_instance",
+	MSO_DELETE_SVC_INSTANCE_PATH : "mso_delete_svc_instance/",
+	SELECTED_SERVICE_SUB_PATH : "#/instances/subdetails?selectedServiceSubscription=",
+	SELECTED_SUB_PATH : "#/instances/subdetails?selectedSubscriber=",
+	SELECTEDSERVICEINSTANCE_SUB_PATH : "&selectedServiceInstance=",
+	SELECTEDSUBSCRIBER_SUB_PATH : "&selectedSubscriber=",
+	SERVICE_TYPE_LIST_PATH : "#/instances/serviceTypes?serviceTypeList=",
+	SERVICE_MODLES_INSTANCES_SUBSCRIBERS_PATH : 'serviceModels.htm#/instances/subscribers',
+	SERVICES_DIST_STATUS_PATH : "rest/models/services?distributionStatus=",
+	SERVICES_PATH : "rest/models/services/",
+	SERVICETYPE_SUB_PATH : "&serviceType=",
+	SERVICEINSTANCEID_SUB_PATH : "&serviceInstanceId=",
+	SERVICEMODELS_INSTANCES_SERVICES_PATH : "serviceModels.htm#/instances/services",
+	SERVICEMODELS_MODELS_SERVICES_PATH : "serviceModels.htm#/models/services",
+	SUBDETAILS_SELECTEDSUBSCRIBER : "#subdetails?selectedSubscriber=",
+	SUBSCRIBERNAME_SUB_PATH : "&subscriberName=",
+	WELCOME_PATH : "welcome.htm",
+	
+	//Template Urls
+	AAI_GET_SUBS_URL : "app/vid/scripts/view-models/aaiGetSubs.htm",
+	AAI_GET_SUBSCRIBER_URL : "app/vid/scripts/view-models/aaiGetSubscriberList.htm",
+	AAI_SERVICE_TYPES_URL : "app/vid/scripts/view-models/aaiServiceTypes.htm",
+	AAI_SUB_DETAILS_URL : "app/vid/scripts/view-models/aaiSubDetails.htm",
+	CREATE_INSTANCE_SERVICE_MODELS_URL : "app/vid/scripts/view-models/createInstanceServiceModels.htm",
+	INSTANTIATE_URL : "app/vid/scripts/view-models/instantiate.htm",
+	SERVICE_MODELS : "app/vid/scripts/view-models/serviceModels.htm",
+	
+	
+	
+	FULL_NAME_MAP : {
+	    "model-invariant-id" : "Model ID",
+	    "model-version-id" : "Model Version ID"
+	},
+	PARTIAL_NAME_MAP : {
+	    "id" : "ID",
+	    "uuid" : "UUID",
+	    "vfmodule" : "VF Module",
+	    "vnf" : "VNF",
+	    "volumegroup" : "Volume Group"
+	}
+	
+    };
+})())
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/constants/fieldConstants.js b/vid-app-common/src/main/webapp/app/vid/scripts/constants/fieldConstants.js
new file mode 100755
index 000000000..6dbcbc2f8
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/constants/fieldConstants.js
@@ -0,0 +1,378 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+"use strict";
+
+appDS2.factory("FIELD", [ "PARAMETER", function(PARAMETER) {
+
+    /*
+     * ID values are typically used internally.
+     */
+    var ID = {
+		AVAILABLE_VOLUME_GROUP : "availableVolumeGroup",
+		INSTANCE_NAME : "instanceName",
+		LCP_REGION : "lcpRegion",
+		LCP_REGION_TEXT : "lcpRegionText",
+		PRODUCT_FAMILY : "productFamily",
+		SERVICE_TYPE : "serviceType",
+		SUBSCRIBER_NAME : "subscriberName",
+		SUPPRESS_ROLLBACK : "suppressRollback",
+		TENANT : "tenant",
+		VNF_TARGETPROVSTATUS : "target",
+		
+		AAI_GET_FULL_SUBSCRIBERS : "aai_get_full_subscribers",
+		AAI_REFRESH_FULL_SUBSCRIBERS : "aai_refresh_full_subscribers",
+		AAI_GET_SERVICES : "aai_get_services",
+		AAI_GET_SUBSCRIBERS : "aai_get_subscribers",
+		AAI_GET_TENTANTS : "aai_get_tenants",
+		AAI_REFRESH_SUBSCRIBERS : "aai_refresh_subscribers",
+		AAI_SUB_DETAILS : "aai_sub_details",
+		AAI_SUB_VIEWEDIT : "aai_sub_viewedit",
+		ANGULAR_UI_TREE_COLLAPSEALL : "angular-ui-tree:collapse-all",
+		ANGULAR_UI_TREE_EXPANDALL : "angular-ui-tree:expand-all",
+		CATEGORY : "category",
+		COLOR_8F8 : "#8F8",
+		COLOR_F88 : "#F88",
+		COLOR_NONE : "none",
+		CUSTOMER : "customer",
+		CUSTOMIZATION_UUID : "customizationUuid",
+		DESCRIPTION : "description",
+		GENERIC_VNF : "generic-vnf",
+		GLOBAL_CUSTOMER_ID : "global-customer-id",
+		GLOBAL_CUST_ID : "globalCustomerId",
+		IN_MAINT : "in-maint",
+		INVENTORY_RESPONSE_ITEMS : "inventory-response-items",
+		INVENTORY_RESPONSE_ITEM : "inventory-response-item",
+		L3_NETWORK : "l3-network",
+		SUB_NET : "subnet",
+		SUBNET_NAME : "subnet-name",
+		SUBNET_ID : "subnet-id",
+		GATEWAY_ADDRESS : "gateway-address",
+		NETWORK_START_ADDRESS : "network-start-address",
+		CIDR_MASK : "cidr-mask",
+		MODEL_CUSTOMIZATION_ID : "model-customization-id",
+		MODEL_CUSTOMIZATION_NAME : "modelCustomizationName",
+		MODEL_INVARIANT_ID : "modelInvariantId",
+		MODEL_INVAR_ID : "model-invariant-id",
+		MODEL_NAME : "modelName",
+		MODEL_NAME_VERSION_ID : "modelNameVersionId",
+		MODEL_VERSION : "modelVersion",
+		MODEL_VERSION_ID : "model-version-id",
+		NETWORK_NAME : "network-name",
+		NETWORK_ID : "network-id",
+		NETWORK_TYPE : "network-type",
+		NETWORKS : "networks",
+		OPERATIONAL_STATUS : "operational-status",
+		ORCHESTRATION_STATUS : "orchestration-status",
+		PERCENT_PROGRESS : "precentProgress",
+		PERSONA_MODEL_ID : "persona-model-id",
+		PERSONA_MODEL_VERSION : "persona-model-version",
+		PERSONA_MODEL_CUSTOMIZATION_ID : "persona-model-customization-id",
+		PROV_STATUS : "prov-status",
+		REQUEST : "request",
+		REQUEST_ID : "requestId",
+		REQUEST_LIST : "requestList",
+		REQUEST_TYPE : "requestType",
+		REQUEST_REFERENCES : "requestReferences",
+		REQUEST_STATE : "requestState",
+		REQUEST_STATUS : "requestStatus",
+		RESOURCE_LINK : "resource-link",
+		RESULT_DATA : "result-data",
+		SERVICE_DESCRIPTION : "service-description",
+		SERVICE_ID : "service-id",
+		SERVICE_INSTANCE : "service-instance",
+		SERVICE_INSTANCES : "service-instances",
+		SERVICE_INSTANCE_ID : "service-instance-id",
+		SERVICE_INSTANCE_NAME : "service-instance-name",
+		SERVICE_SUBSCRIPTION : "service-subscription",
+		SERVICE_SUBSCRIPTIONS : "service-subscriptions",
+		SERVICE_TYPE : "service-type",
+		STATUS_MESSAGE : "statusMessage",
+		SUBNAME : "subscriber-name",
+		TIMESTAMP : "timestamp",
+		VF_MODULE : "vf-module",
+		VF_MODULES : "vfModules",
+		VF_MODULE_ID : "vf-module-id",
+		VF_MODULE_NAME : "vf-module-name",
+		VID : "VID",
+		VNF_ID : "vnf-id",
+		VNF_NAME : "vnf-name",
+		VNF_TYPE : "vnf-type",
+		VNFS : "vnfs",
+		AVAILABLEVOLUMEGROUPS : "availableVolumeGroups",
+		VOLUMEGROUPS : "volumeGroups",
+		VOLUME_GROUP : "volume-group",
+		VOLUME_GROUP_ID : "volume-group-id",
+		VOLUME_GROUP_NAME : "volume-group-name",
+    };
+
+    var KEY = {
+	LCP_REGION_TEXT : "LEGACYREGION"
+    };
+
+    /*
+     * NAME values are displayed on GUI pages.
+     */
+    var NAME = {
+	AVAILABLE_VOLUME_GROUP : "Available Volume Group",
+	INSTANCE_NAME : "Instance Name",
+	CUSTOMER_ID : "Customer ID",
+	LCP_REGION : "LCP Region",
+	LCP_REGION_TEXT : "Legacy Region",
+	MODEL_INVARIANT_UUID: "Model Invariant UUID",
+	MODEL_NAME: "Model Name",
+	MODEL_VERSION: "Model Version",
+	MODEL_UUID: "Model UUID",
+	MODEL_CUSTOMIZATION_UUID: "Model Customization UUID",
+	MODEL_VNF_TYPE: "NF Type",
+	MODEL_VNF_ROLE: "NF Role",
+	MODEL_VNF_FUNCTION: "NF Function",
+	MODEL_VNF_CODE: "NF Code",
+	MODEL_CUSTOMIZATION_NAME: "Resource Name",
+	PRODUCT_FAMILY : "Product Family",
+	RESOURCE_DESCRIPTION : "Resource Description",
+	RESOURCE_NAME : "Resource Name",
+	SERVICE_CATEGORY : "Service Category",
+	SERVICE_DESCRIPTION : "Service Description",
+	SERVICE_INSTANCE_ID : "Service Instance ID",
+	SERVICE_INSTANCE_Id : "Service Instance Id",
+	SERVICE_INSTANCE_NAME : "Service Instance Name",
+	SERVICE_INVARIANT_UUID : "Service Invariant UUID",
+	SERVICE_NAME : "Service Name",
+	SERVICE_TYPE : "Service Type",
+	SERVICE_UUID : "Service UUID",
+	SERVICE_VERSION : "Service Version",
+	SUBSCRIBER_NAME : "Subscriber Name",
+	SUPPRESS_ROLLBACK : "Suppress Rollback on Failure",
+	TENANT : "Tenant",
+	USER_SERVICE_INSTANCE_NAME : "User Service Instance Name",
+	VF_MODULE_DESCRIPTION : "VF Module Description",
+	VF_MODULE_LABEL : "VF Module Label",
+	VF_MODULE_TYPE : "VF Module Type",
+	VNF_ORCHESTRATION_STATUS : "Orchestration Status",
+	VNF_Operational_Status: "Operational Status",
+	VNF_Current_Prov_Status: "Current Prov_Status",
+	VNF_Target_Prov_Status: "Target Prov Status",
+	VNF_VNF_ID : "VNF ID",
+	VNF_VNF_Name: "VNF Name",
+	VNF_VNF_Type: "VNF Type",
+	VNF_Service_ID: "Service ID",
+	VNF_In_Maint: "In Maint",
+	VFMDULE_CUSTOMIZATIONUUID: "VF Module Model Customization UUID",
+	RESOURCE_CUSTOMIZATION_UUID: "Resource Model Customization UUID"
+    };
+
+    /*
+     * PROMPT values are initial values displayed in select lists.
+     */
+    var PROMPT = {
+	AVAILABLE_VOLUME_GROUP : "Select Volume Group",
+	DEFAULT_A : "A default",
+	DEFAULT_B : "B default",
+	LCP_REGION : "Select LCP Region",
+	NO_SERVICE_INSTANCE : "No Service Instance Found",
+	NO_SERVICE_SUB : "No Service Subscription Found",
+	PRODUCT_FAMILY : "Select Product Family",
+	REGION : "Please choose a region",
+	SERVICE_TYPE : "Select Service Type",
+	SUBSCRIBER_NAME : "Select Subscriber Name",
+	TARGETPROVSTATUS : "Select Target Prov Status",
+	TENANT : "Select Tenant Name",
+	TEXT_INPUT : "Enter data",
+	SELECT_SERVICE : "Select a service type",
+	SELECT_SUB : "Select a subscriber name",
+	FETCHING_SUBS : " Fetching subscriber list from A&AI",
+	REFRESH_SUB_LIST : "Refreshing subscriber list from A&AI...",
+	VAR_DESCRIPTION_A : "This variable is 'a'",
+	VAR_DESCRIPTION_B : "This variable is 'b'",
+	
+    };
+    
+    var STATUS = {
+    		// Status
+    		ALL : "ALL",
+    		COMPLETE : "Complete",
+    		DONE : "Done",
+    		ERROR : "Error",
+    		FAILED : "Failed",
+    		FAILED_SERVICE_MODELS_ASDC : "Failed to get service models from SDC.",
+    		FETCHING_SERVICE_TYPES : "Fetching service types list from A&AI", 
+    		FETCHING_SERVICE_CATALOG : "Fetching service catalog from AAI.  Please wait.",
+    		FETCHING_SERVICE_CATALOG_ASDC : "Fetching service catalog from SDC.  Please wait.",
+    		FETCHING_SUB_DETAILS : "Fetching subscriber details from A&AI for ",
+    		FETCHING_SERVICE_INST_DATA : "Fetching service instance data from A&AI for service-instance-id=",
+    		FETCHING_SUBSCRIBER_LIST_AAI : "Fetching subscriber list from A&AI...",
+    		IN_PROGRESS : "In Progress",
+    		IS_SUCCESSFUL : " isSuccessful: ",
+    		MSO_FAILURE : "msoFailure",
+    		NONE : "None",
+    		NOT_FOUND : "Not Found",
+    		NO_SERVICE_SUBSCRIPTION_FOUND : "No Service Subscription Found",
+    		SUBMITTING_REQUEST : "Submitting Request",
+    		SUCCESS_VNF_PROV_STATUS : "Successfully set the VNF's Prov_Status to ",
+    		UNLOCKED : "Unlocked",
+    		
+    };
+    
+    var STYLE = {
+    		TABLE : "width: auto; margin: 0 auto; border-collapse: collapse; border: none;",
+    		NAME : "width: 220px; text-align: left; vertical-align: middle; font-weight: bold; padding: 3px 5px; border: none;",
+		    VALUE : "width: 400px; text-align: left; vertical-align: middle; padding: 3px 5px; border: none;",
+		    CHECKBOX_VALUE : "width: 400px; text-align: center; vertical-align: middle; padding: 3px 5px; border: none;",
+		    TEXT_INPUT : "height: 25px; padding: 2px 5px;",
+		    CHECKBOX_INPUT : "height: 18px; width: 18px; padding: 2px 5px;",
+		    SELECT : "height: 25px; padding: 2px; text-align: center;",
+		    REQUIRED_LABEL : "width: 25px; padding: 5px 10px 10px 5px;",
+		    
+		    DISABLED : "disabled",
+		    BTN_INACTIVE : "button--inactive",
+		    BTN_PRIMARY : "button--primary",
+		    BTN_TYPE : "btn-type",
+		    MSO_CTRL_BTN : "div[ng-controller=msoCommitController] button",
+		    PRIMARY : "primary",
+		    PROGRESS_BAR_INFO : "progress-bar progress-bar-info",
+		    PROGRESS_BAR_SUCCESS : "progress-bar progress-bar-success",
+    }
+    
+    var ERROR = {
+    		AAI : "A&AI failure - see log below for details",
+    		AAI_ERROR : "A&AI Error",
+    		AAI_FETCHING_CUST_DATA : "Failed to fetch customer data from A&AI: Response Code: ",
+    		FETCHING_SERVICE_TYPES : "Failed to fetch service types from A&AI: Response Code: ",
+    		FETCHING_SERVICES : "Failed to fetch services from A&AI: Response Code: ",
+    		FETCHING_SERVICE_INSTANCE_DATA : "Failed to fetch service instance data from A&AI: Response Code: ",
+    		INVALID_INSTANCE_NAME : "Invalid instance name: ",
+    		INSTANCE_NAME_VALIDATE : "The instance name must contain only alphanumeric or \"_-.\" characters, and must start with an alphabetic character",	
+    		MAX_POLLS_EXCEEDED : "Maximum number of poll attempts exceeded",
+    		MISSING_DATA : "Missing data",
+    		MODEL_VERSION_ID_MISSING : "Error: model-version-id is not populated in A&AI",
+    		MSO : "MSO failure - see log below for details",
+    		NO_MATCHING_MODEL : "No matching model found matching the persona Model Id = ",
+    		NO_MATCHING_MODEL_AAI : "No matching model found matching the A&AI model version ID = ",
+    		SELECT : "Please select a subscriber or enter a service instance", 
+    		SERVICE_INST_DNE : "That service instance does not exist.  Please try again.",
+    		SYSTEM_FAILURE : "System failure",
+    		
+    }
+
+    /*
+     * PARAMETER values indicate field configurations that are provided to
+     * parameter block directives.
+     */
+
+    var PARAMETER = {
+	AVAILABLE_VOLUME_GROUP : {
+	    name : NAME.AVAILABLE_VOLUME_GROUP,
+	    id : ID.AVAILABLE_VOLUME_GROUP,
+	    type : PARAMETER.SELECT,
+	    prompt : PROMPT.AVAILABLE_VOLUME_GROUP,
+	    isRequired : true
+	},
+	INSTANCE_NAME : {
+	    name : NAME.INSTANCE_NAME,
+	    id : ID.INSTANCE_NAME,
+	    isRequired : true
+	},
+	LCP_REGION : {
+	    name : NAME.LCP_REGION,
+	    id : ID.LCP_REGION,
+	    type : PARAMETER.SELECT,
+	    prompt : PROMPT.LCP_REGION,
+	    isRequired : true
+	},
+	VNF_TARGET_PROVSTATUS : {
+	    name : NAME.VNF_Target_Prov_Status,
+	    id : ID.VNF_TARGETPROVSTATUS,
+	    type : PARAMETER.SELECT,
+	    prompt : PROMPT.TARGETPROVSTATUS,
+	    isRequired : true
+	},
+	LCP_REGION_TEXT_HIDDEN : {
+	    id : ID.LCP_REGION_TEXT,
+	    isVisible : false
+	},
+	LCP_REGION_TEXT_VISIBLE : {
+	    name : NAME.LCP_REGION_TEXT,
+	    id : ID.LCP_REGION_TEXT,
+	    isRequired : true,
+	    isVisible : true
+	},
+	PRODUCT_FAMILY : {
+	    name : NAME.PRODUCT_FAMILY,
+	    id : ID.PRODUCT_FAMILY,
+	    type : PARAMETER.SELECT,
+	    prompt : PROMPT.PRODUCT_FAMILY,
+	    isRequired : true
+	},
+	SERVICE_TYPE : {
+	    name : NAME.SERVICE_TYPE,
+	    id : ID.SERVICE_TYPE,
+	    type : PARAMETER.SELECT,
+	    prompt : PROMPT.SERVICE_TYPE,
+	    isRequired : true
+	},
+	SERVICE_TYPE_DISABLED : {
+	    name : NAME.SERVICE_TYPE,
+	    id : ID.SERVICE_TYPE,
+	    type : PARAMETER.SELECT,
+	    isEnabled : false,
+	    isRequired : true
+	},
+	SUPPRESS_ROLLBACK : {
+	    name : NAME.SUPPRESS_ROLLBACK,
+	    id : ID.SUPPRESS_ROLLBACK,
+	    type : PARAMETER.BOOLEAN,
+	    value : false
+	},
+	SUBSCRIBER_NAME : {
+		name : NAME.SUBSCRIBER_NAME,
+		id : ID.SUBSCRIBER_NAME,
+	    type : PARAMETER.SELECT,
+	    prompt : PROMPT.SUBSCRIBER_NAME,
+		isRequired : true
+	},
+	TENANT_DISABLED : {
+	    name : NAME.TENANT,
+	    id : ID.TENANT,
+	    type : PARAMETER.SELECT,
+	    isEnabled : false,
+	    isRequired : true
+	},
+	TENANT_ENABLED : {
+	    name : NAME.TENANT,
+	    id : ID.TENANT,
+	    type : PARAMETER.SELECT,
+	    isEnabled : true,
+	    prompt : PROMPT.TENANT,
+	    isRequired : true
+	}
+    };
+
+    return {
+	ID : ID,
+	KEY : KEY,
+	NAME : NAME,
+	PARAMETER : PARAMETER,
+	PROMPT : PROMPT,
+	STATUS : STATUS,
+	STYLE : STYLE,
+	ERROR : ERROR,
+    }
+} ]);
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/constants/parameterConstants.js b/vid-app-common/src/main/webapp/app/vid/scripts/constants/parameterConstants.js
new file mode 100755
index 000000000..4e3ad29d1
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/constants/parameterConstants.js
@@ -0,0 +1,52 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+"use strict";
+
+appDS2.constant("PARAMETER", (function() {
+    return {
+		BOOLEAN : "boolean",
+		SELECT : "select",
+		STRING : "string",
+		NUMBER : "number",
+		VALID_VALUES : "valid_values",
+		EQUAL : "equal",
+		LENGTH : "length",
+		MAX_LENGTH : "max_length",
+		MIN_LENGTH : "min_length",
+		IN_RANGE : "in_range",
+		CONSTRAINTS : "constraints",
+		OPERATOR : "operator",
+		CONSTRAINT_VALUES : "constraintValues",
+		DEFAULT : "default",
+		DESCRIPTION : "description",
+		TYPE: "type",
+		INTEGER: "integer",
+		RANGE: "range",
+		LIST: "list",
+		MAP: "map",
+		REQUIRED: "required",
+		GREATER_THAN: "greater_than",
+		LESS_THAN: "less_than",
+		GREATER_OR_EQUAL: "greater_or_equal",
+		LESS_OR_EQUAL: "less_or_equal"
+		
+    };
+})())
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/constants/vidConfiguration.js b/vid-app-common/src/main/webapp/app/vid/scripts/constants/vidConfiguration.js
new file mode 100755
index 000000000..8fdfd3fcb
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/constants/vidConfiguration.js
@@ -0,0 +1,99 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+"use strict";
+
+appDS2.constant("VIDCONFIGURATION", (function() {
+	/*
+	 * VNF_STATUS_CHECK_ENABLED: Determines whether VID will check the VNF valid status combination list, before allowing VNF updates.
+	 * Set to false, to disable the check.
+	 */
+	var VNF_STATUS_CHECK_ENABLED = false;
+	/*
+	 * List of valid VNF status combinations
+	 */
+	var vnfValidStatusList = [
+			{
+				"provStatus": "preprov",
+				"orchestrationStatus": "pending-create",
+				"inMaint": false,
+				"operationalStatus": null
+			},
+			{
+				"provStatus": "preprov",
+				"orchestrationStatus": "created",
+				"inMaint": false,
+				"operationalStatus": null
+			},
+			{
+				"provStatus": "preprov",
+				"orchestrationStatus": "active",
+				"inMaint": false,
+				"operationalStatus": null
+			},
+			{
+				"provStatus": "nvtprov",
+				"orchestrationStatus": "active",
+				"inMaint": false,
+				"operationalStatus": null
+			},
+			{
+				"provStatus": "prov",
+				"orchestrationStatus": "active",
+				"inMaint": false,
+				"operationalStatus": "out-of-service-path"
+			}
+	];
+	/* 
+	 * The model status VID uses to query SDC for a list of models. The possible values are:
+	 * DISTRIBUTION_NOT_APPROVED,
+	 * DISTRIBUTION_APPROVED,
+	 * DISTRIBUTED,
+	 * DISTRIBUTION_REJECTED,
+	 * ALL,
+	 * In the production env, this should always be set to DISTRIBUTED
+	 */
+	var ASDC_MODEL_STATUS = "DISTRIBUTED";
+	/*
+	 * Max number of times that VID will poll MSO for a given request status
+	 */
+	var MSO_MAX_POLLS = 10;
+	/*
+	 * Number of msecs that VID will wait between MSO polls.
+	 */
+	var MSO_POLLING_INTERVAL_MSECS = 10000;
+	/*
+	 * List of all service model invariant UUIDs that need macro instantiation.
+	 * Example:
+	 * MACRO_SERVICES : ["3cf30cbb-5fe7-4fb3-b049-559a4997b221", "b135a703-bab5-4295-a37f-580a4f2d0961"]
+	 * 
+	 */
+	var COMPONENT_LIST_NAMED_QUERY_ID = "0367193e-c785-4d5f-9cb8-7bc89dc9ddb7";
+	var MACRO_SERVICES = [];
+    return {
+    	ASDC_MODEL_STATUS : ASDC_MODEL_STATUS,
+    	MSO_MAX_POLLS : MSO_MAX_POLLS,
+    	MSO_POLLING_INTERVAL_MSECS : MSO_POLLING_INTERVAL_MSECS,
+    	VNF_STATUS_CHECK_ENABLED : VNF_STATUS_CHECK_ENABLED,
+    	VNF_VALID_STATUS_LIST : vnfValidStatusList,
+    	MACRO_SERVICES : MACRO_SERVICES,
+    	COMPONENT_LIST_NAMED_QUERY_ID : COMPONENT_LIST_NAMED_QUERY_ID
+    };
+})())
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
new file mode 100755
index 000000000..f928f4ec1
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
@@ -0,0 +1,1217 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * The Instantiation (or View/Edit) Controller controls the instantiation/removal of
+ * deployable objects (Services, VNFs, VF-Modules, Networks, and Volume-Groups)
+ */
+(function () {
+	"use strict";
+
+	appDS2.requires.push('ui.tree');
+	
+	appDS2.controller("InstantiationController", function ($scope, $route, $location, $timeout, COMPONENT, VIDCONFIGURATION, FIELD, DataService, PropertyService, UtilityService, VnfService, $http, vidService) {
+		
+		$scope.popup = new Object();
+		$scope.defaultBaseUrl = "";
+		$scope.responseTimeoutMsec = 60000;
+		$scope.properties = UtilityService.getProperties();
+        $scope.init = function() {
+
+            /*
+             * These 2 statements should be included in non-test code.
+             */
+        	// takes a default value, retrieves the prop value from the file system and sets it
+    		var msecs = PropertyService.retrieveMsoMaxPollingIntervalMsec();
+    		PropertyService.setMsoMaxPollingIntervalMsec(msecs);
+    		
+    		// takes a default value, retrieves the prop value from the file system and sets it
+    		var polls = PropertyService.retrieveMsoMaxPolls();
+    		PropertyService.setMsoMaxPolls(polls);
+    		
+    		PropertyService.setServerResponseTimeoutMsec(10000);
+
+            /*
+             * Common parameters that shows an example of how the view edit screen
+             * is expected to pass some common service instance values to the
+             * popups.
+             */
+
+//            DataService.setSubscriberName("Mobility");
+//            DataService.setGlobalCustomerId("CUSTID12345")
+//            DataService.setServiceType("Mobility Type 1");
+//            DataService.setServiceInstanceName("Example Service Instance Name");
+//            DataService.setServiceName("Mobility Service 1");
+//            DataService.setServiceInstanceId("mmsc-test-service-instance");
+//            DataService.setServiceUuid("XXXX-YYYY-ZZZZ");
+//            DataService.setUserServiceInstanceName("USER_SERVICE_INSTANCE_NAME");
+        }
+        
+        //PropertyService.setMsoBaseUrl("testmso");
+
+		$scope.convertModel = function(asdcModel) {
+			if (!asdcModel) return undefined;
+			var convertedAsdcModel = UtilityService.convertModel(asdcModel);
+			return convertedAsdcModel;
+		};
+		
+		$scope.service = {
+			"model": vidService.getModel(),
+			"convertedModel": $scope.convertModel(vidService.getModel()),
+			"instance": vidService.getInstance()
+		};
+		
+		$scope.returnVfModules = function (vnfInstance) {
+			
+			var svcModel = $scope.service.convertedModel;
+			//var vnfModelInvariantUuid = vnfInstance[FIELD.ID.MODEL_INVAR_ID];
+			var vnfModelVersionId = vnfInstance[FIELD.ID.MODEL_VERSION_ID]; // model uuid
+			var vnfModelCustomizationUuid = vnfInstance[FIELD.ID.MODEL_CUSTOMIZATION_ID];
+	
+			var vnfModel = null;
+			
+			if ( (!($scope.isObjectEmpty(svcModel))) && ( !($scope.isObjectEmpty(svcModel.vnfs) ) ) ) {
+				if ( (svcModel.isNewFlow) && (vnfModelCustomizationUuid != null ) ) {
+					vnfModel = svcModel.vnfs[vnfModelCustomizationUuid];
+					if ( !($scope.isObjectEmpty(vnfModel.vfModules) ) )  {
+						//console.log ("vnfModel.vfModules: "); console.log (JSON.stringify(vnfModel.vfModules, null, 4));
+						return (vnfModel.vfModules);
+					}
+				}
+				else {
+					// old flow
+					if ( vnfModelVersionId != null ) {
+						vnfModel = svcModel.vnfs[vnfModelVersionId];
+						if ( !($scope.isObjectEmpty(vnfModel.vfModules) ) )  {
+							//console.log ("vnfModel.vfModules: "); console.log (JSON.stringify(vnfModel.vfModules, null, 4));
+							return (vnfModel.vfModules);
+						}
+					}
+				}
+				
+			}
+			return null;
+		}
+		$scope.hasVfModules = function (vnfInstance) {
+			if ($scope.returnVfModules(vnfInstance) != null ){
+				return true;
+			}
+			return false;
+		}
+		$scope.returnVolumeGroups = function (vnfInstance) {
+			
+			var svcModel = $scope.service.convertedModel;
+
+			//var vnfModelInvariantUuid = vnfInstance[FIELD.ID.MODEL_INVAR_ID];
+			var vnfModelVersionId = vnfInstance[FIELD.ID.MODEL_VERSION_ID];
+			var vnfModelCustomizationUuid = vnfInstance[FIELD.ID.MODEL_CUSTOMIZATION_ID];
+
+			var vnfModel = null;
+			
+			if ( (!($scope.isObjectEmpty(svcModel))) && ( !($scope.isObjectEmpty(svcModel.vnfs) ) ) ) {
+				if ( (svcModel.isNewFlow) && (vnfModelCustomizationUuid != null ) ) {
+					vnfModel = svcModel.vnfs[vnfModelCustomizationUuid];
+					if ( !($scope.isObjectEmpty(vnfModel.volumeGroups) ) )  {
+						//console.log ("vnfModel.volumeGroups: "); console.log (JSON.stringify(vnfModel.volumeGroups, null, 4));
+						return (vnfModel.volumeGroups);
+					}
+				}
+				else {
+					// old flow
+					if ( vnfModelVersionId != null ) {
+						vnfModel = svcModel.vnfs[vnfModelVersionId];
+						if ( !($scope.isObjectEmpty(vnfModel.volumeGroups) ) )  {
+							//console.log ("vnfModel.vfModules: "); console.log (JSON.stringify(vnfModel.volumeGroups, null, 4));
+							return (vnfModel.volumeGroups);
+						}
+					}
+				}
+				
+			}
+			return null;
+		}
+		$scope.hasVolumeGroups = function (vnfInstance) {
+			if ($scope.returnVolumeGroups(vnfInstance) != null ){
+				return true;
+			}
+			return false;
+		}
+		$scope.deleteNetwork = function(serviceObject, network) {
+
+			console.log("Removing Network " + network.name);
+
+			//Send delete network request to MSO
+
+			//var networks = this.service.instance.networks;
+
+			//networks.splice(networks.indexOf(network), 1);
+
+			//Retrieve updated data from A&AI
+            var serviceInstance = serviceObject.object;
+            var svcModel = $scope.service.convertedModel;
+			var netModel;
+			DataService.setInventoryItem(network.object);
+			// set model default and override later if found
+			DataService.setModelInfo(COMPONENT.NETWORK, {});
+			
+			if ( network.object != null ) {
+				
+				//var netModelInvariantUuid = network.object[FIELD.ID.MODEL_INVAR_ID];
+				var netModelVersionId = network.object[FIELD.ID.MODEL_VERSION_ID]; // model uuid
+				var netModelCustomizationUuid = network.object[FIELD.ID.MODEL_CUSTOMIZATION_ID];
+			
+				if ( (!($scope.isObjectEmpty(svcModel))) && ( !($scope.isObjectEmpty(svcModel.networks) ) ) ) {
+					if ( (svcModel.isNewFlow) && (UtilityService.hasContents(netModelCustomizationUuid) ) ) {
+						netModel = svcModel.networks[netModelCustomizationUuid];
+					}
+					else {
+						
+						if ( UtilityService.hasContents(netModelVersionId) ) {
+							netModel = svcModel.networks[netModelVersionId];
+						}
+				
+					}
+				}
+			}
+			if (!($scope.isObjectEmpty(netModel) ) ) {
+				DataService.setModelInfo(COMPONENT.NETWORK, {
+					"modelInvariantId": netModel.invariantUuid,
+					"modelVersion": netModel.version,
+					"modelNameVersionId": netModel.uuid,
+					"modelCustomizationName": netModel.modelCustomizationName,
+					"customizationUuid": netModel.customizationUuid,
+					"modelName": netModel.name,
+					"inputs": ""
+				});
+			}
+			
+			DataService.setSubscriberName(serviceObject[COMPONENT.SUBSCRIBER_NAME]);
+			DataService.setServiceType(serviceObject[COMPONENT.SERVICE_TYPE]);
+			DataService.setServiceInstanceId(serviceInstance[FIELD.ID.SERVICE_INSTANCE_ID]);
+	
+			DataService.setGlobalCustomerId(serviceObject[FIELD.ID.GLOBAL_CUST_ID]);
+			DataService.setServiceInstanceName($scope.service.instance.name);
+			DataService.setServiceName($scope.service.model.service.name);
+			DataService.setServiceUuid($scope.service.model.service.uuid);
+			DataService.setNetworkInstanceId(network.object[FIELD.ID.NETWORK_ID]);
+			
+			$scope.$broadcast(COMPONENT.DELETE_COMPONENT, {
+			    componentId : COMPONENT.NETWORK,
+			    callbackFunction : deleteCallbackFunction
+			});
+		};
+
+		$scope.deleteService = function(serviceObject) {
+
+			var serviceInstance = serviceObject.object;
+			
+			console.log("Removing Service " + $scope.service.instance.name);
+
+			DataService.setALaCarte (true);
+			DataService.setInventoryItem(serviceInstance);
+			
+			DataService.setModelInfo(COMPONENT.SERVICE, {
+				"modelInvariantId": serviceInstance[FIELD.ID.MODEL_INVAR_ID],
+				"modelVersion": $scope.service.model.service.version,
+				"modelNameVersionId": $scope.service.model.service.uuid,
+				"modelName": $scope.service.model.service.name,
+				"inputs": ""
+			});
+			
+			DataService.setSubscriberName(serviceObject[FIELD.ID.SUBSCRIBER_NAME]);
+			DataService.setServiceType(serviceObject[FIELD.ID.SERVICE_TYPE]);
+			DataService.setServiceInstanceId(serviceInstance[FIELD.ID.SERVICE_INSTANCE_ID]);
+	
+			DataService.setGlobalCustomerId(serviceObject[COMPONENT.GLOBAL_CUSTOMER_ID]);
+			DataService.setServiceInstanceName($scope.service.instance.name);
+			
+			DataService.setServiceName($scope.service.model.service.name);
+			
+			DataService.setServiceUuid($scope.service.model.service.uuid);
+			
+			$scope.$broadcast(COMPONENT.DELETE_COMPONENT, {
+			    componentId : COMPONENT.SERVICE,
+			    callbackFunction : deleteServiceInstanceCallbackFunction
+			});
+		
+		};
+
+		$scope.deleteVfModule = function(serviceObject, vfModule, vnf) {
+
+			console.log("Removing VF-Module " + vfModule.name);
+			
+            var serviceInstance = serviceObject.object;
+
+			DataService.setInventoryItem(vfModule.object);
+			
+			var svcModel = $scope.service.convertedModel;
+
+			//var vnfModelInvariantUuid = vnf.object[FIELD.ID.MODEL_INVAR_ID];
+			var vnfModelVersionId = vnf.object[FIELD.ID.MODEL_VERSION_ID];
+			var vnfModelCustomizationUuid = vnf.object[FIELD.ID.MODEL_CUSTOMIZATION_ID];;		
+			var vfModuleInstanceID = vfModule.object[FIELD.ID.VF_MODULE_ID];
+			if (vfModuleInstanceID == null) {
+				vfModuleInstanceID = "";
+			}
+			
+			var vnfModel = null;
+			var vfModuleModel = null;
+			
+			DataService.setModelInfo(COMPONENT.VF_MODULE, {
+				"modelInvariantId": "",
+				"modelVersion": "",
+				"modelNameVersionId": "",
+				"modelCustomizationName": "",
+				"customizationUuid": "",
+				"modelName": "",
+				"inputs": ""
+			});
+			
+			if ( (!($scope.isObjectEmpty(svcModel))) && ( !($scope.isObjectEmpty(svcModel.vnfs) ) ) ) {
+				if ( (svcModel.isNewFlow) && (vnfModelCustomizationUuid != null ) ) {
+					vnfModel = svcModel.vnfs[vnfModelCustomizationUuid];
+					
+					var vfModuleCustomizationUuid = vfModule.object[FIELD.ID.MODEL_CUSTOMIZATION_ID];
+					if ( !($scope.isObjectEmpty(vnfModel.vfModules) ) && UtilityService.hasContents(vfModuleCustomizationUuid) ) {
+						
+						vfModuleModel = vnfModel.vfModules[vfModuleCustomizationUuid];
+						
+					}
+				}
+				else {
+					// old flow
+					if (vnfModelVersionId != null ) {
+						vnfModel = svcModel.vnfs[vnfModelVersionId];
+					}
+					//var vfModuleInvariantUuid = vfModule.object[FIELD.ID.MODEL_INVAR_ID];
+					var vfModuleModelVersionId = vfModule.object[FIELD.ID.MODEL_VERSION_ID];
+					if ( (!($scope.isObjectEmpty(vnfModel))) && (!($scope.isObjectEmpty(vnfModel.vfModules))) && 
+							  UtilityService.hasContents(vfModuleModelVersionId) ) {
+						vfModuleModel = vnfModel.vfModules[vfModuleModelVersionId];
+					}
+				}
+				if ( !($scope.isObjectEmpty(vfModuleModel)) ) {
+					DataService.setModelInfo(COMPONENT.VF_MODULE, {
+						"modelInvariantId": vfModuleModel.invariantUuid,
+						"modelVersion": vfModuleModel.version,
+						"modelNameVersionId": vfModuleModel.uuid,
+						"modelCustomizationName": vfModuleModel.modelCustomizationName,
+						"customizationUuid": vfModuleModel.customizationUuid,
+						"modelName": vfModuleModel.name,
+						"inputs": ""
+					});
+				}
+			}
+
+			DataService.setVnfInstanceId(vnf.object[FIELD.ID.VNF_ID]);
+			DataService.setVfModuleInstanceId(vfModuleInstanceID);
+			
+			DataService.setSubscriberName(serviceObject[COMPONENT.SUBSCRIBER_NAME]);
+			DataService.setServiceType(serviceObject[COMPONENT.SERVICE_TYPE]);
+			DataService.setServiceInstanceId(serviceInstance[FIELD.ID.SERVICE_INSTANCE_ID]);
+	
+			DataService.setGlobalCustomerId(serviceObject[FIELD.ID.GLOBAL_CUST_ID]);
+			DataService.setServiceInstanceName($scope.service.instance.name);
+			
+			DataService.setServiceName($scope.service.model.service.name);
+			
+			DataService.setServiceUuid($scope.service.model.service.uuid);
+			
+			$scope.$broadcast(COMPONENT.DELETE_COMPONENT, {
+			    componentId : COMPONENT.VF_MODULE,
+			    callbackFunction : deleteCallbackFunction
+			});
+			
+			return;
+
+		};
+
+		$scope.deleteVnf = function(serviceObject, vnf) {
+
+			console.log("Removing VNF " + vnf.name);
+			
+			var serviceInstance = serviceObject.object;
+			var svcModel = $scope.service.convertedModel;
+			DataService.setInventoryItem(vnf.object);
+			
+			/*var vnftype = vnf.object['vnf-type'];
+			if (vnftype == null)
+				vnftype = "";
+			else
+			{
+				var n = vnftype.search("/");
+				if (n >= 0)
+					vnftype = vnftype.substring(n+1);
+			}*/
+		
+			var svcModel = $scope.service.convertedModel;
+			var vnfModelInvariantUuid = null;
+			var vnfModelVersion = null;
+			var vnfModelCustomizationUuid = null;
+			var vnfModel = null;
+			
+			vnfModelInvariantUuid = vnf.object[FIELD.ID.MODEL_INVAR_ID];
+			vnfModelVersionId = vnf.object[FIELD.ID.MODEL_VERSION_ID];
+			vnfModelCustomizationUuid = vnf.object[FIELD.ID.MODEL_CUSTOMIZATION_ID];
+			
+			DataService.setModelInfo(COMPONENT.VNF, {
+				"modelInvariantId": vnfModelInvariantUuid,
+				"modelVersion": "",
+				"modelNameVersionId": vnfModelVersionId,
+				"modelCustomizationName": "",
+				"customizationUuid": vnfModelCustomizationUuid,
+				"modelName": "",
+				"inputs": ""
+			});
+			
+			if ( (!($scope.isObjectEmpty(svcModel))) && ( !($scope.isObjectEmpty(svcModel.vnfs) ) ) ) {
+				if ( (svcModel.isNewFlow) && (vnfModelCustomizationUuid != null ) ) {
+					vnfModel = svcModel.vnfs[vnfModelCustomizationUuid];
+				}
+				else {
+					vnfModel = svcModel.vnfs[vnfModelVersionId];
+				}
+				//console.log ( "vnf models: "); console.log ( JSON.stringify ($scope.service.convertedModel.vnfs, null, 4) );
+				if ( !($scope.isObjectEmpty(vnfModel) ) ) {
+						
+					DataService.setModelInfo(COMPONENT.VNF, {
+						"modelInvariantId": vnfModel.invariantUuid,
+						"modelVersion": vnfModel.version,
+						"modelNameVersionId": vnfModel.uuid,
+						"modelCustomizationName": vnfModel.modelCustomizationName,
+						"customizationUuid": vnfModel.customizationUuid,
+						"modelName": vnfModel.name,
+						"inputs": ""
+					});
+				}
+		    } 
+				
+			DataService.setVnfInstanceId(vnf.object[FIELD.ID.VNF_ID]);
+	
+			DataService.setSubscriberName(serviceObject[COMPONENT.SUBSCRIBER_NAME]);
+			DataService.setServiceType(serviceObject[COMPONENT.SERVICE_TYPE]);
+			DataService.setServiceInstanceId(serviceInstance[FIELD.ID.SERVICE_INSTANCE_ID]);
+	
+			DataService.setGlobalCustomerId(serviceObject[FIELD.ID.GLOBAL_CUST_ID]);
+			DataService.setServiceInstanceName($scope.service.instance.name);
+			
+			DataService.setServiceName($scope.service.model.service.name);
+			
+			DataService.setServiceUuid($scope.service.model.service.uuid);
+			
+			$scope.$broadcast(COMPONENT.DELETE_COMPONENT, {
+			    componentId : COMPONENT.VNF,
+			    callbackFunction : deleteCallbackFunction
+			});
+		
+		};
+		
+		
+
+		$scope.deleteVolumeGroup = function(serviceObject, vnf, vfModule, volumeGroup) {
+
+			console.log("Removing Volume Group " + volumeGroup.name);
+			var haveModel = false;
+			var svcModel = $scope.service.convertedModel;
+			
+			var vnfModelInvariantUuid = null;
+			var vnfModelVersion = null;
+			var vnfModelCustomizationUuid = null;
+			var vnfModel = null;
+			
+			vnfModelInvariantUuid = vnf.object[FIELD.ID.MODEL_INVAR_ID];
+			vnfModelVersionId = vnf.object[FIELD.ID.MODEL_VERSION_ID];
+			vnfModelCustomizationUuid = vnf.object[FIELD.ID.MODEL_CUSTOMIZATION_ID];
+		
+			DataService.setModelInfo(COMPONENT.VOLUME_GROUP, {
+				"modelInvariantId": "",
+				"modelVersion": "",
+				"modelNameVersionId": "",
+				"modelCustomizationName": "",
+				"customizationUuid": "",
+				"modelName": "",
+				"inputs": ""
+			});
+	
+			if ( (!($scope.isObjectEmpty(svcModel))) && ( !($scope.isObjectEmpty(svcModel.vnfs) ) ) ) {
+				if ( (svcModel.isNewFlow) && (vnfModelCustomizationUuid != null ) ) {
+					vnfModel = svcModel.vnfs[vnfModelCustomizationUuid];
+				}
+				else {
+					vnfModel = svcModel.vnfs[vnfModelVersionId];
+				}
+			}
+			
+						
+			// volume groups don't have model-invariant-id/version in a&ai.
+			// Their model-invariant-id/version is the one for the associated vfModule
+			
+			var vfModuleInvariantUuid = vfModule.object[FIELD.ID.MODEL_INVAR_ID];
+			var vfModuleModelVersionId = vfModule.object[FIELD.ID.MODEL_VERSION_ID];
+			var vfModuleCustomizationUuid = vfModule.object[FIELD.ID.MODEL_CUSTOMIZATION_ID];
+			var volGroupModel = null;
+				
+			if ( !($scope.isObjectEmpty(vnfModel.volumeGroups) ) ) {
+				if ( ( !($scope.isObjectEmpty(vnfModel) ) ) && ( !($scope.isObjectEmpty(vnfModel.volumeGroups) ) ) ) {
+					if ( (svcModel.isNewFlow) && (UtilityService.hasContents(vfModuleCustomizationUuid) ) ){
+						volGroupModel = vnfModel.volumeGroups[vfModuleCustomizationUuid];
+					}
+					else {
+						volGroupModel = vnfModel.volumeGroups[vfModuleModelVersionId];
+					}
+					if ( !($scope.isObjectEmpty(volGroupModel) ) ) {
+						DataService.setModelInfo(COMPONENT.VOLUME_GROUP, {
+							"modelInvariantId": volGroupModel.invariantUuid,
+							"modelVersion": volGroupModel.version,
+							"modelNameVersionId": volGroupModel.uuid,
+							"modelCustomizationName": volGroupModel.modelCustomizationName,
+							"customizationUuid": volGroupModel.customizationUuid,
+							"modelName": volGroupModel.name,
+							"inputs": ""
+						});
+		
+					}
+				}
+			}
+
+			var serviceInstance = serviceObject.object;
+			
+            DataService.setInventoryItem(volumeGroup.object);
+		
+			DataService.setSubscriberName(serviceObject[COMPONENT.SUBSCRIBER_NAME]);
+			DataService.setServiceType(serviceObject[COMPONENT.SERVICE_TYPE]);
+			DataService.setServiceInstanceId(serviceInstance[FIELD.ID.SERVICE_INSTANCE_ID]);
+			
+			DataService.setGlobalCustomerId(serviceObject[FIELD.ID.GLOBAL_CUST_ID]);
+			DataService.setServiceInstanceName($scope.service.instance.name);
+			
+			DataService.setServiceName($scope.service.model.service.name);
+			
+			DataService.setServiceUuid($scope.service.model.service.uuid);
+			DataService.setVnfInstanceId(vnf.nodeId);
+			DataService.setVolumeGroupInstanceId(volumeGroup.nodeId);
+			
+			$scope.$broadcast(COMPONENT.DELETE_COMPONENT, {
+			    componentId : COMPONENT.VOLUME_GROUP,
+			});
+		};
+		
+		$scope.deleteVnfVolumeGroup = function(serviceObject, vnf, volumeGroup) {
+
+			console.log("Removing Volume Group " + volumeGroup.name);
+            var serviceInstance = serviceObject.object;
+			
+            DataService.setInventoryItem(volumeGroup.object);
+        
+			var svcModel = $scope.service.convertedModel;
+			
+			var vnfModelInvariantUuid = vnf.object[FIELD.ID.MODEL_INVAR_ID];
+			var vnfModelVersionId = vnf.object[FIELD.ID.MODEL_VERSION_ID];
+			var vnfModelCustomizationUuid = vnf.object[FIELD.ID.MODEL_CUSTOMIZATION_ID];
+			
+			var volGroupModelInvariantUuid = volumeGroup.object[FIELD.ID.MODEL_INVAR_ID];
+			var volGroupModelVersionId = volumeGroup.object[FIELD.ID.MODEL_VERSION_ID];
+			var volGroupModelCustomizationUuid = volumeGroup.object[FIELD.ID.MODEL_CUSTOMIZATION_ID];
+			
+			var vnfModel = null;
+			var volGroupModel = null;
+			
+			// send an empty model by default since model is not required for deletes
+			DataService.setModelInfo(COMPONENT.VOLUME_GROUP, {});
+
+			if ( svcModel.isNewFlow ) {
+				vnfModel = svcModel.vnfs[vnfModelCustomizationUuid];
+				if ( UtilityService.hasContents (volGroupModelCustomizationUuid) ) {
+					volGroupModel = vnfModel.volumeGroups[volGroupModelCustomizationUuid];
+				}
+			}
+			else {
+				
+				vnfModel = svcModel.vnfs[vnfModelVersionId];
+				if (  UtilityService.hasContents (volGroupModelVersionId) ) {
+					volGroupModel = vnfModel.volumeGroups[volGroupModelVersionId];
+				}
+			}
+			if ( !($scope.isObjectEmpty(volGroupModel) ) ) {
+				DataService.setModelInfo(COMPONENT.VOLUME_GROUP, {		
+					"modelInvariantId": volGroupModel.invariantUuid,
+					"modelVersion": volGroupModel.version,
+					"modelNameVersionId": volGroupModel.uuid,
+					"modelName": volGroupModel.name,
+					"modelCustomizationName": volGroupModel.modelCustomizationName,
+					"customizationUuid": volGroupModel.customizationUuid,
+					"inputs": ""
+				});
+			}
+				
+			DataService.setVnfInstanceId(vnf.object[FIELD.ID.VNF_ID]);
+		
+			DataService.setSubscriberName(serviceObject[COMPONENT.SUBSCRIBER_NAME]);
+			DataService.setServiceType(serviceObject[COMPONENT.SERVICE_TYPE]);
+			DataService.setServiceInstanceId(serviceInstance[FIELD.ID.SERVICE_INSTANCE_ID]);
+	
+			DataService.setGlobalCustomerId(serviceObject[FIELD.ID.GLOBAL_CUST_ID]);
+			DataService.setServiceInstanceName($scope.service.instance.name);
+			
+			DataService.setServiceName($scope.service.model.service.name);
+			
+			DataService.setServiceUuid($scope.service.model.service.uuid);
+			DataService.setVnfInstanceId(vnf.nodeId);
+			DataService.setVolumeGroupInstanceId(volumeGroup.nodeId);
+		
+			$scope.$broadcast(COMPONENT.DELETE_COMPONENT, {
+			    componentId : COMPONENT.VOLUME_GROUP,
+			    callbackFunction : deleteCallbackFunction
+			});
+		};
+
+		$scope.describeNetwork = function(serviceObject, networkObject) {
+			var serviceInstance = serviceObject.object;
+			var network = networkObject.object;
+			//console.log ("networkObject="); console.log (JSON.stringify(networkObject, null, 4));
+			
+			DataService.setResCustomizationUuid(" ");
+			
+			var svcModel = $scope.service.convertedModel;
+			var netModel = null;
+			
+			if ( !($scope.isObjectEmpty(network) ) ) {
+				
+				var netModelInvariantUuid = network[FIELD.ID.MODEL_INVAR_ID];
+				var netModelVersionId = network[FIELD.ID.MODEL_VERSION_ID];
+				var netModelCustomizationUuid = network[FIELD.ID.MODEL_CUSTOMIZATION_ID];
+				
+				if ( UtilityService.hasContents (netModelCustomizationUuid) ) {
+					// set it to what came from a&ai 
+					DataService.setResCustomizationUuid(netModelCustomizationUuid);
+				}
+				
+				if ( (!($scope.isObjectEmpty(svcModel))) && (!($scope.isObjectEmpty(svcModel.networks))) ) {
+					if ( svcModel.isNewFlow ) {
+						netModel = svcModel.networks[netModelCustomizationUuid];
+					}
+					else {
+						netModel = svcModel.networks[netModelVersionId];
+					}
+					/*
+					 * The details pop-up should use a&ai info
+					 * if ( !($scope.isObjectEmpty(netModel) ) ) {
+						if (UtilityService.hasContents(netModel.customizationUuid)) {
+							DataService.setResCustomizationUuid(netModel.customizationUuid);
+						}
+					}*/
+				}
+			}
+			
+			DataService.setNetworkInstanceId(network[FIELD.ID.NETWORK_ID]);
+			DataService.setInventoryItem(networkObject);
+			DataService.setSubscriberName(serviceObject.subscriberName);
+			DataService.setServiceType(serviceObject[COMPONENT.SERVICE_TYPE]);
+			DataService.setServiceInstanceId(serviceInstance[FIELD.ID.SERVICE_INSTANCE_ID]);
+			
+			$scope.$broadcast(COMPONENT.SHOW_COMPONENT_DETAILS, {
+			    componentId : COMPONENT.NETWORK
+			});
+		};
+
+		// for service instance id - no need for this!
+		$scope.describeService = function(serviceObject) {
+			var serviceInstance = serviceObject.object;
+		
+			DataService.setInventoryItem(serviceInstance);
+			//DataService.setModelInfo(serviceInstance['service-instance-id'], serviceInstance);
+			
+			DataService.setSubscriberName(serviceObject[COMPONENT.SUBSCRIBER_NAME]);
+			DataService.setServiceType(serviceObject[COMPONENT.SERVICE_TYPE]);
+			DataService.setServiceInstanceId(serviceInstance[FIELD.ID.SERVICE_INSTANCE_ID]);
+			
+			//Display popup with additional service information
+			$scope.$broadcast(COMPONENT.SHOW_COMPONENT_DETAILS, {
+			    componentId : COMPONENT.SERVICE
+			});
+			
+		};
+
+		$scope.describeVfModule = function(serviceObject, vfModuleObject, vnf) {
+			var serviceInstance = serviceObject.object;
+			var vfModule = vfModuleObject.object;
+			
+			/*var vfModuleInvariantUuid = vfModule[FIELD.ID.MODEL_INVAR_ID];
+			var vfModuleModelVersionId = vfModule[FIELD.ID.MODEL_VERSION_ID];*/
+			var vfModuleCustomizationUuid = vfModule[FIELD.ID.MODEL_CUSTOMIZATION_ID];
+
+			DataService.setCustomizationUuid(" ");
+			if ( UtilityService.hasContents (vfModuleCustomizationUuid) ) {
+				DataService.setCustomizationUuid(vfModuleCustomizationUuid);
+			}
+		
+			//Display popup with additional VF-Module information
+			DataService.setVfModuleInstanceId(vfModule[FIELD.ID.VF_MODULE_ID]);
+			DataService.setInventoryItem(vfModule)
+			
+			DataService.setSubscriberName(serviceObject[COMPONENT.SUBSCRIBER_NAME]);
+			DataService.setServiceType(serviceObject[COMPONENT.SERVICE_TYPE]);
+			DataService.setServiceInstanceId(serviceInstance[FIELD.ID.SERVICE_INSTANCE_ID]);
+			
+			$scope.$broadcast(COMPONENT.SHOW_COMPONENT_DETAILS, {
+			    componentId : COMPONENT.VF_MODULE
+			});
+		};
+
+		$scope.getStatusOfVnf = function(serviceObject, vnfObject) {
+			var serviceInstance = serviceObject.object;
+			var vnf = vnfObject.object;
+		  
+			DataService.setVnfInstanceId(vnf[FIELD.ID.VNF_ID]);
+			DataService.setInventoryItem(vnf);
+			
+			DataService.setSubscriberName(serviceObject[COMPONENT.SUBSCRIBER_NAME]);
+			DataService.setServiceType(serviceObject[COMPONENT.SERVICE_TYPE]);
+			DataService.setServiceInstanceId(serviceInstance[FIELD.ID.SERVICE_INSTANCE_ID]);
+			DataService.setServiceInstanceName(serviceInstance[FIELD.ID.SERVICE_INSTANCE_NAME]);
+			
+			$scope.$broadcast(COMPONENT.COMPONENT_STATUS, {
+			    componentId : COMPONENT.VNF,
+			    callbackFunction : updateProvStatusVnfCallbackFunction
+			});
+		};
+
+		$scope.describeVnf = function(serviceObject, vnfObject) {
+			var serviceInstance = serviceObject.object;
+			var vnf = vnfObject.object;
+			DataService.setResCustomizationUuid(" ");
+			
+			//var vnfInvariantUuid = vnf[FIELD.ID.MODEL_INVAR_ID];
+			//var vnfVersionId = vnf[FIELD.ID.MODEL_VERSION_ID];
+			var vnfCustomizationUuid = vnf[FIELD.ID.MODEL_CUSTOMIZATION_ID];
+	
+			if ( UtilityService.hasContents (vnfCustomizationUuid) ) {
+				DataService.setResCustomizationUuid(vnfCustomizationUuid);
+		    }
+			//Display popup with additional VNF information
+			DataService.setVnfInstanceId(vnf[FIELD.ID.VNF_ID]);
+			DataService.setInventoryItem(vnf);
+			
+			DataService.setSubscriberName(serviceObject[COMPONENT.SUBSCRIBER_NAME]);
+			DataService.setServiceType(serviceObject[COMPONENT.SERVICE_TYPE]);
+			DataService.setServiceInstanceId(serviceInstance[FIELD.ID.SERVICE_INSTANCE_ID]);
+			
+			$scope.$broadcast(COMPONENT.SHOW_COMPONENT_DETAILS, {
+			    componentId : COMPONENT.VNF
+			});
+		};
+
+		$scope.describeVolumeGroup = function(serviceObject, vnf, volumeGroupObject) {
+			
+			var serviceInstance = serviceObject.object;
+			var volumeGroup = volumeGroupObject.object;
+			
+			//var volGroupInvariantUuid = volumeGroup[FIELD.ID.MODEL_INVAR_ID];
+			//var volGroupVersionId = volumeGroup[FIELD.ID.MODEL_VERSION_ID];
+			var volGroupCustomizationUuid = volumeGroup[FIELD.ID.MODEL_CUSTOMIZATION_ID];
+
+			DataService.setCustomizationUuid(" ");	
+			if ( UtilityService.hasContents(volGroupCustomizationUuid) ) {
+				DataService.setCustomizationUuid(volGroupCustomizationUuid);	 
+		    }
+			DataService.setVolumeGroupInstanceId(volumeGroup[FIELD.ID.VOLUME_GROUP_ID]);
+			DataService.setInventoryItem(volumeGroup);
+		
+			DataService.setSubscriberName(serviceObject[COMPONENT.SUBSCRIBER_NAME]);
+			DataService.setServiceType(serviceObject[COMPONENT.SERVICE_TYPE]);
+			DataService.setServiceInstanceId(serviceInstance[FIELD.ID.SERVICE_INSTANCE_ID]);
+			
+			
+			$scope.$broadcast(COMPONENT.SHOW_COMPONENT_DETAILS, {
+			    componentId : COMPONENT.VOLUME_GROUP
+			});
+		};
+
+		$scope.addNetworkInstance = function(netModel, existingVnfs) {
+			
+			// For networks we assume that we always follow the new flow
+			console.log("Adding network to service instance" + this.service.instance.name);
+			if ( VIDCONFIGURATION.VNF_STATUS_CHECK_ENABLED && (UtilityService.hasContents(existingVnfs)) && (existingVnfs.length > 0) ) {
+				var msg = VnfService.isVnfListStatusValid (existingVnfs);
+				if ( msg != "" ) {
+					alert ( msg );
+					return;
+				}
+			}
+			
+			DataService.setSubscriberName($scope.service.instance.subscriberName);
+			DataService.setGlobalCustomerId($scope.service.instance.globalCustomerId);
+			DataService.setServiceType($scope.service.instance.serviceType);
+			DataService.setServiceInstanceName($scope.service.instance.name);
+			DataService.setServiceInstanceId($scope.service.instance.id);
+			DataService.setServiceName($scope.service.model.service.name);
+			
+			DataService.setModelInfo(COMPONENT.NETWORK, {
+				"modelType": "network",
+				"modelInvariantId": netModel.invariantUuid,
+				"modelVersion": netModel.version,
+				"modelNameVersionId": netModel.uuid,
+				"modelName": netModel.name,
+				"modelCustomizationName": netModel.modelCustomizationName,
+				"customizationUuid": netModel.customizationUuid,
+				"inputs": "",
+				"displayInputs": netModel.displayInputs
+			});
+			
+			DataService.setModelInfo(COMPONENT.SERVICE, {
+				"modelInvariantId": $scope.service.model.service.invariantUuid, 
+				"modelVersion": $scope.service.model.service.version,
+				"modelNameVersionId": $scope.service.model.service.uuid,
+				"modelName": $scope.service.model.service.name,
+				"inputs": ""
+			});
+			
+			$scope.$broadcast(COMPONENT.CREATE_COMPONENT, {
+			    componentId : COMPONENT.NETWORK,
+			    callbackFunction : createVnfCallbackFunction
+			});		
+		};
+
+		$scope.addVnfInstance = function(vnf, existingVnfs) {
+				
+			if ( VIDCONFIGURATION.VNF_STATUS_CHECK_ENABLED && (UtilityService.hasContents(existingVnfs)) && (existingVnfs.length > 0) ) {
+				var msg = VnfService.isVnfListStatusValid (existingVnfs);
+				if ( msg != "" ) {
+					alert ( msg );
+					return;
+				}
+			}
+			DataService.setSubscriberName($scope.service.instance.subscriberName);
+			DataService.setGlobalCustomerId($scope.service.instance.globalCustomerId);
+			DataService.setServiceType($scope.service.instance.serviceType);
+			DataService.setServiceInstanceName($scope.service.instance.name);
+			DataService.setServiceInstanceId($scope.service.instance.id);
+			DataService.setServiceName($scope.service.model.service.name);
+			
+			console.log ( "existingVnfs: " ); console.log (JSON.stringify ( existingVnfs, null, 4));
+			var vnf_type = "";
+			var vnf_role = "";
+			var vnf_function = "";
+			var vnf_code = "";
+			
+			if (UtilityService.hasContents (vnf.nfType) ) {
+				vnf_type = vnf.nfType;
+			}
+			if (UtilityService.hasContents (vnf.nfRole) ) {
+				vnf_role = vnf.nfRole;
+			}
+			if (UtilityService.hasContents (vnf.nfFunction) ) {
+				vnf_function = vnf.nfFunction;
+			}
+			if (UtilityService.hasContents (vnf.nfCode) ) {
+				vnf_code = vnf.nfCode;
+			}
+			DataService.setModelInfo(COMPONENT.VNF, {
+				"modelType": "vnf",
+				"modelInvariantId": vnf.invariantUuid,
+				"modelVersion": vnf.version,
+				"modelNameVersionId": vnf.uuid,
+				"modelName": vnf.name,
+				"modelCustomizationName": vnf.modelCustomizationName,
+				"customizationUuid": vnf.customizationUuid,
+				"inputs": "",
+				"displayInputs": vnf.displayInputs,
+				"vnfType": vnf_type,
+				"vnfRole": vnf_role,
+				"vnfFunction": vnf_function,
+				"vnfCode": vnf_code
+			});
+			
+			DataService.setModelInstanceName($scope.service.model.service.name);
+			
+			DataService.setModelInfo(COMPONENT.SERVICE, {
+				"modelInvariantId": $scope.service.model.service.invariantUuid, 
+				"modelVersion": $scope.service.model.service.version,
+				"modelNameVersionId": $scope.service.model.service.uuid,
+				"modelName": $scope.service.model.service.name,
+				"inputs": ""
+			});
+			
+			$scope.$broadcast(COMPONENT.CREATE_COMPONENT, {
+			    componentId : COMPONENT.VNF,
+			    callbackFunction : createVnfCallbackFunction
+			});		
+		};
+
+		$scope.addVfModuleInstance = function(vnfInstance, vfModuleModel) {
+			
+			if ( VIDCONFIGURATION.VNF_STATUS_CHECK_ENABLED ) {
+				var msg = VnfService.isVnfStatusValid (vnfInstance);
+				if ( msg != "" ) {
+					alert ( msg );
+					return;
+				}
+				
+			}
+			var svcModel = $scope.service.convertedModel;
+			DataService.setSubscriberName($scope.service.instance.subscriberName);
+			DataService.setGlobalCustomerId($scope.service.instance.globalCustomerId);
+			DataService.setServiceType($scope.service.instance.serviceType);
+			DataService.setServiceInstanceName($scope.service.instance.name);
+			DataService.setServiceInstanceId($scope.service.instance.id);
+			DataService.setServiceName($scope.service.model.service.name);
+
+			var vnfModelInvariantUuid = vnfInstance.object[FIELD.ID.MODEL_INVAR_ID];
+			var vnfModelVersionId = vnfInstance.object[FIELD.ID.MODEL_VERSION_ID];
+			var vnfModelCustomizationUuid = vnfInstance.object[FIELD.ID.MODEL_CUSTOMIZATION_ID];
+			var vnfModel = null;
+			if ( svcModel.isNewFlow ) {
+				vnfModel = svcModel.vnfs[vnfModelCustomizationUuid];
+			}
+			else {
+				vnfModel = svcModel.vnfs[vnfModelVersionId];
+			}
+			
+			var availableVolumeGroupList = [];
+			angular.forEach(vnfInstance[FIELD.ID.AVAILABLEVOLUMEGROUPS], function(volumeGroupInstance, key) {
+				availableVolumeGroupList.push({"instance": volumeGroupInstance});
+			});
+			
+			if (vfModuleModel.volumeGroupAllowed) {
+				DataService.setAvailableVolumeGroupList(availableVolumeGroupList);
+			}
+			
+			DataService.setModelInfo(COMPONENT.SERVICE, {
+				"modelInvariantId": $scope.service.model.service.invariantUuid,
+				"modelVersion": $scope.service.model.service.version,
+				"modelNameVersionId": $scope.service.model.service.uuid,
+				"modelName": $scope.service.model.service.name,
+				"inputs": ""
+			});
+
+			DataService.setVnfInstanceId(vnfInstance.object[FIELD.ID.VNF_ID]);
+			
+			DataService.setModelInfo(COMPONENT.VNF, {
+				"modelInvariantId": vnfModel.invariantUuid,
+				"modelVersion": vnfModel.version,
+				"modelNameVersionId": vnfModel.uuid,
+				"modelName": vnfModel.name,
+				"modelCustomizationName": vnfModel.modelCustomizationName,
+				"customizationUuid": vnfModel.customizationUuid,
+				"inputs": ""
+			});
+			
+			DataService.setModelInfo(COMPONENT.VF_MODULE, {
+				"modelInvariantId": vfModuleModel.invariantUuid,
+				"modelVersion": vfModuleModel.version,
+				"modelNameVersionId": vfModuleModel.uuid,
+				"customizationUuid": vfModuleModel.customizationUuid,
+				"modelCustomizationName": vfModuleModel.modelCustomizationName,
+				"modelName": vfModuleModel.name,
+				"inputs": ""
+			});
+			
+			$scope.$broadcast(COMPONENT.CREATE_COMPONENT, {
+			    componentId : COMPONENT.VF_MODULE,
+			    callbackFunction : createVfModuleCallbackFunction
+			});
+		
+		};
+
+		$scope.addVolumeGroupInstance = function(vnfInstance, volumeGroupModel) {
+			if ( VIDCONFIGURATION.VNF_STATUS_CHECK_ENABLED ) {
+				var msg = VnfService.isVnfStatusValid (vnfInstance);
+				if ( msg != "" ) {
+					alert ( msg );
+					return;
+				}
+			}
+			var svcModel = $scope.service.convertedModel;
+			DataService.setSubscriberName($scope.service.instance.subscriberName);
+			DataService.setGlobalCustomerId($scope.service.instance.globalCustomerId);
+			DataService.setServiceType($scope.service.instance.serviceType);
+			DataService.setServiceInstanceName($scope.service.instance.name);
+			DataService.setServiceInstanceId($scope.service.instance.id);
+			DataService.setServiceName($scope.service.model.service.name);
+
+			DataService.setModelInfo(COMPONENT.SERVICE, {
+				"modelInvariantId": $scope.service.model.service.invariantUuid,
+				"modelVersion": $scope.service.model.service.version,
+				"modelNameVersionId": $scope.service.model.service.uuid,
+				"modelName": $scope.service.model.service.name,
+				"inputs": ""
+			});
+
+			DataService.setVnfInstanceId(vnfInstance.object[FIELD.ID.VNF_ID]);
+
+			var vnfModelInvariantUuid = vnfInstance.object[FIELD.ID.MODEL_INVAR_ID];
+			var vnfModelVersionId = vnfInstance.object[FIELD.ID.MODEL_VERSION_ID];
+			var vnfCustomizationUuid = vnfInstance.object[FIELD.ID.MODEL_CUSTOMIZATION_ID];
+			var vnfModel = null;
+			
+			if ( svcModel.isNewFlow ) {
+				vnfModel = svcModel.vnfs[vnfCustomizationUuid];
+			}
+			else {
+				vnfModel = svcModel.vnfs[vnfModelVersionId];
+			}
+			
+			DataService.setModelInfo(COMPONENT.VNF, {
+				"modelInvariantId": vnfModel.invariantUuid,
+				"modelVersion": vnfModel.version,
+				"modelNameVersionId": vnfModel.uuid,
+				"modelName": vnfModel.name,
+				"modelCustomizationName": vnfModel.modelCustomizationName,
+				"customizationUuid": vnfModel.customizationUuid,
+				"inputs": ""
+			});
+			
+			DataService.setModelInfo(COMPONENT.VOLUME_GROUP, {
+				"modelInvariantId": volumeGroupModel.invariantUuid,
+				"modelVersion": volumeGroupModel.version,
+				"modelNameVersionId": volumeGroupModel.uuid,
+				"modelName": volumeGroupModel.name,
+				"modelCustomizationName": volumeGroupModel.modelCustomizationName,
+				"customizationUuid": volumeGroupModel.customizationUuid,
+				"inputs": ""
+			});
+			
+			$scope.$broadcast(COMPONENT.CREATE_COMPONENT, {
+			    componentId : COMPONENT.VOLUME_GROUP,
+			    callbackFunction : createVolumeGroupCallbackFunction
+			});
+		};
+
+		$scope.resetProgress = function() {
+			$scope.percentProgress = 0;
+			$scope.progressClass = FIELD.STYLE.PROGRESS_BAR_INFO;
+		};
+
+		$scope.setProgress = function(percentProgress) {
+			percentProgress = parseInt(percentProgress);
+			if (percentProgress >= 100) {
+				$scope.progressClass = FIELD.STYLE.PROGRESS_BAR_SUCCESS;					
+			}
+
+			if (percentProgress < $scope.percentProgress) {
+				return;
+			}
+
+			$scope.percentProgress = percentProgress;
+			$scope.progressWidth = {width: percentProgress + "%"};
+			if (percentProgress >= 5) {
+				$scope.progressText =  percentProgress + " %";
+			} else {
+				// Hidden since color combination is barely visible when progress portion is narrow.
+				$scope.progressText = "";
+			}
+		};
+		$scope.isObjectEmpty = function(o) {
+			var len = 0;
+			if (UtilityService.hasContents(o)){
+				var keys = Object.keys(o);
+				len = keys.length;
+				if ( len == 0 ) {
+					return true;
+				}
+				else {
+					return false;
+				}
+			}
+			else {
+				return true;
+			}
+		}
+		$scope.isMacro = function() {
+			if (UtilityService.arrayContains (VIDCONFIGURATION.MACRO_SERVICES, $scope.service.model.service.invariantUuid )) {
+				return(true);
+				
+			}
+			else {
+				return (false);
+			}
+		}
+		$scope.reloadRoute = function() {
+			$route.reload();
+		}
+		
+		var updateProvStatusVnfCallbackFunction = function(response) {
+			$scope.callbackResults = "";
+			var color = FIELD.ID.COLOR_NONE;
+			$scope.callbackStyle = {
+					"background-color" : color
+			};
+			$scope.reloadRoute();
+			/*
+			 * This 1/2 delay was only added to visually highlight the status
+			 * change. Probably not needed in the real application code.
+			 */
+			$timeout(function() {
+				$scope.callbackResults = UtilityService.getCurrentTime()
+				+ FIELD.STATUS.IS_SUCCESSFUL + response.isSuccessful;
+				if (response.isSuccessful) {
+					color = FIELD.ID.COLOR_8F8;
+					
+				} else {
+					color = FIELD.ID.COLOR_F88;
+				}
+				$scope.callbackStyle = {
+						"background-color" : color
+				};
+			}, 500);
+		
+		};
+
+		var createVnfCallbackFunction = function(response) {
+			$scope.callbackResults = "";
+			var color = FIELD.ID.COLOR_NONE;
+			$scope.callbackStyle = {
+					"background-color" : color
+			};
+			
+			/*
+			 * This 1/2 delay was only added to visually highlight the status
+			 * change. Probably not needed in the real application code.
+			 */
+			$timeout(function() {
+				$scope.callbackResults = UtilityService.getCurrentTime()
+				+ FIELD.STATUS.IS_SUCCESSFUL + response.isSuccessful;
+				if (response.isSuccessful) {
+					color = FIELD.ID.COLOR_8F8;
+					$scope.reloadRoute();
+				} else {
+					color = FIELD.ID.COLOR_F88;
+				}
+				$scope.callbackStyle = {
+						"background-color" : color
+				};
+			}, 500);
+			
+		
+			
+		};
+		
+		var deleteCallbackFunction = function(response) {
+			$scope.callbackResults = "";
+			var color = FIELD.ID.COLOR_NONE;
+			$scope.callbackStyle = {
+					"background-color" : color
+			};
+			
+			/*
+			 * This 1/2 delay was only added to visually highlight the status
+			 * change. Probably not needed in the real application code.
+			 */
+			$timeout(function() {
+				$scope.callbackResults = UtilityService.getCurrentTime()
+				+ FIELD.STATUS.IS_SUCCESSFUL + response.isSuccessful;
+				if (response.isSuccessful) {
+					color = FIELD.ID.COLOR_8F8;
+					$scope.reloadRoute();
+				} else {
+					color = FIELD.ID.COLOR_F88;
+				}
+				$scope.callbackStyle = {
+						"background-color" : color
+				};
+			}, 500);
+			
+		};
+		
+		var createVfModuleCallbackFunction = function(response) {
+			$scope.callbackResults = "";
+			var color = FIELD.ID.COLOR_NONE;
+			$scope.callbackStyle = {
+					"background-color" : color
+			};
+			
+			/*
+			 * This 1/2 delay was only added to visually highlight the status
+			 * change. Probably not needed in the real application code.
+			 */
+			$timeout(function() {
+				$scope.callbackResults = UtilityService.getCurrentTime()
+				+ FIELD.STATUS.IS_SUCCESSFUL + response.isSuccessful;
+				if (response.isSuccessful) {
+					color = FIELD.ID.COLOR_8F8;
+					$scope.reloadRoute();
+				} else {
+					color = FIELD.ID.COLOR_F88;
+				}
+				$scope.callbackStyle = {
+						"background-color" : color
+				};
+			}, 500);
+
+		};
+			
+		var deleteServiceInstanceCallbackFunction = function(response) {
+			$scope.callbackResults = "";
+			var color = FIELD.ID.COLOR_NONE;
+			$scope.callbackStyle = {
+					"background-color" : color
+			};
+			
+			/*
+			 * This 1/2 delay was only added to visually highlight the status
+			 * change. Probably not needed in the real application code.
+			 */
+			$timeout(function() {
+				$scope.callbackResults = UtilityService.getCurrentTime()
+				+ FIELD.STATUS.IS_SUCCESSFUL + response.isSuccessful;
+				if (response.isSuccessful) {
+					color = FIELD.ID.COLOR_8F8;
+					$location.path(COMPONENT.SERVICEMODELS_MODELS_SERVICES_PATH)
+				} else {
+					color = FIELD.ID.COLOR_F88;
+				}
+				$scope.callbackStyle = {
+						"background-color" : color
+				};
+			}, 500);
+
+		};
+	
+		var createVolumeGroupCallbackFunction = function(response) {
+			$scope.callbackResults = "";
+			var color = FIELD.ID.COLOR_NONE;
+			$scope.callbackStyle = {
+					"background-color" : color
+			};
+			
+			/*
+			 * This 1/2 delay was only added to visually highlight the status
+			 * change. Probably not needed in the real application code.
+			 */
+			$timeout(function() {
+				$scope.callbackResults = UtilityService.getCurrentTime()
+				+ FIELD.STATUS.IS_SUCCESSFUL + response.isSuccessful;
+				if (response.isSuccessful) {
+					color = FIELD.ID.COLOR_8F8;
+					$scope.reloadRoute();
+				} else {
+					color = FIELD.ID.COLOR_F88;
+				}
+				$scope.callbackStyle = {
+						"background-color" : color
+				};
+			}, 500);
+			
+			
+		
+		};
+			
+	});
+})();
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js
new file mode 100755
index 000000000..5d382e9e9
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js
@@ -0,0 +1,227 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+(function () {
+	'use strict';
+
+	appDS2.controller("ServiceModelController", function ($scope, $http, $location, COMPONENT, VIDCONFIGURATION, FIELD, DataService, vidService,
+			PropertyService, UtilityService) {
+
+		$scope.popup = {};
+		
+	//	var baseEndpoint = "vid";
+		var pathQuery = COMPONENT.SERVICES_DIST_STATUS_PATH + VIDCONFIGURATION.ASDC_MODEL_STATUS;
+		
+		if ( VIDCONFIGURATION.ASDC_MODEL_STATUS === FIELD.STATUS.ALL) {
+			pathQuery = COMPONENT.SERVICES_PATH;
+		}
+		
+		$scope.getServiceModels = function() {
+			$scope.status = FIELD.STATUS.FETCHING_SERVICE_CATALOG_ASDC;
+
+			$http.get(pathQuery)
+			.then(function successCallback(response) {
+				$scope.services = [];
+				if (angular.isArray(response.data)) {
+					$scope.services = response.data;
+					$scope.viewPerPage=10;
+					$scope.totalPage=$scope.services.length/$scope.viewPerPage;
+					$scope.sortBy=COMPONENT.NAME;
+					$scope.scrollViewPerPage=2;
+					$scope.currentPage=1;
+					$scope.searchCategory;
+					$scope.searchString="";
+					$scope.currentPageNum=1;
+					$scope.isSpinnerVisible = false;
+					$scope.isProgressVisible = false;
+				} else {
+					$scope.status = FIELD.STATUS.FAILED_SERVICE_MODELS_ASDC;
+					$scope.error = true;
+					$scope.isSpinnerVisible = false;
+				}
+			}, function errorCallback(response) {
+				console.log("Error: " + response);
+			});
+		}
+		
+		$scope.init = function() {
+    		var msecs = PropertyService.retrieveMsoMaxPollingIntervalMsec();
+    		PropertyService.setMsoMaxPollingIntervalMsec(msecs);
+    		
+    		var polls = PropertyService.retrieveMsoMaxPolls();
+    		PropertyService.setMsoMaxPolls(polls);
+    		
+    		//PropertyService.setMsoBaseUrl("testmso");
+    		PropertyService.setServerResponseTimeoutMsec(10000);
+        }
+		
+		$scope.prevPage = function() {
+			$scope.currentPage--;
+		}
+		
+		$scope.nextPage = function() {
+			$scope.currentPage++;
+		}
+		
+		$scope.createType = COMPONENT.A_LA_CARTE;
+		$scope.deployService = function(service) {
+			
+			
+			console.log("Instantiating SDC service " + service.uuid);
+			
+			$http.get(COMPONENT.SERVICES_PATH + service.uuid)
+				.then(function successCallback(getServiceResponse) {
+					
+					var serviceModel = getServiceResponse.data;
+					DataService.setServiceName(serviceModel.service.name);
+					
+					DataService.setModelInfo(COMPONENT.SERVICE, {
+						"modelInvariantId": serviceModel.service.invariantUuid,
+						"modelVersion": serviceModel.service.version,
+						"modelNameVersionId": serviceModel.service.uuid,
+						"modelName": serviceModel.service.name,
+						"description": serviceModel.service.description,
+						"category":serviceModel.service.category
+					});
+					DataService.setALaCarte (true);
+					$scope.createType = COMPONENT.A_LA_CARTE;
+					var broadcastType = COMPONENT.CREATE_COMPONENT;
+					
+					if (UtilityService.arrayContains (VIDCONFIGURATION.MACRO_SERVICES, serviceModel.service.invariantUuid )) {
+						DataService.setALaCarte (false);
+						$scope.createType = COMPONENT.MACRO;
+						var convertedAsdcModel = UtilityService.convertModel(serviceModel);
+						
+						//console.log ("display inputs "); 
+						//console.log (JSON.stringify ( convertedAsdcModel.completeDisplayInputs));
+						
+						DataService.setModelInfo(COMPONENT.SERVICE, {
+							"modelInvariantId": serviceModel.service.invariantUuid,
+							"modelVersion": serviceModel.service.version,
+							"modelNameVersionId": serviceModel.service.uuid,
+							"modelName": serviceModel.service.name,
+							"description": serviceModel.service.description,
+							"category":serviceModel.service.category,
+							"serviceEcompNaming": serviceModel.service.serviceEcompNaming,
+							"inputs": serviceModel.service.inputs,
+							"displayInputs": convertedAsdcModel.completeDisplayInputs
+						});
+					};
+					
+					$scope.$broadcast(broadcastType, {
+					    componentId : COMPONENT.SERVICE,
+					    callbackFunction : function(response) {
+					    	if (response.isSuccessful) {
+								vidService.setModel(serviceModel);
+								
+								var subscriberId = FIELD.STATUS.NOT_FOUND;
+								var serviceType = FIELD.STATUS.NOT_FOUND;
+								
+								var serviceInstanceId = response.instanceId;
+								
+								for (var i = 0; i < response.control.length; i++) {
+									if (response.control[i].id == COMPONENT.SUBSCRIBER_NAME) {
+										subscriberId = response.control[i].value;
+									} else if (response.control[i].id == "service-type") {
+										serviceType = response.control[i].value;
+									}
+								}
+								
+								
+								$scope.refreshSubs(subscriberId,serviceType,serviceInstanceId);
+							
+					    	}
+					    }
+					});
+					
+				}, function errorCallback(response) {
+					console.log("Error: " + response);
+				});
+		};
+		
+		$scope.refreshSubs = function(subscriberId, serviceType, serviceInstanceId) {
+			$scope.status = FIELD.STATUS.FETCHING_SUBSCRIBER_LIST_AAI;
+			$scope.init();
+			$http.get( FIELD.ID.AAI_REFRESH_FULL_SUBSCRIBERS, {
+
+			},{
+				timeout: $scope.responseTimeoutMsec
+			}).then(function(response){
+				
+				if (response.data.status < 200 || response.data.status > 202) {
+					$scope.showError(FIELD.ERROR.MSO)
+					return;
+				}
+
+				$scope.customer = response.data.customer; // get data from json
+
+				$scope.customerList = [];
+
+				$scope.serviceInstanceToCustomer = [];
+				
+				angular.forEach($scope.customer, function(subVal, subKey) {
+					var cust = { "globalCustomerId": subVal[FIELD.ID.GLOBAL_CUSTOMER_ID], "subscriberName": subVal[FIELD.ID.SUBNAME] };
+					$scope.customerList.push(cust);
+					if (subVal[FIELD.ID.SERVICE_SUBSCRIPTIONS] != null) {
+							angular.forEach(subVal[FIELD.ID.SERVICE_SUBSCRIPTIONS][FIELD.ID.SERVICE_SUBSCRIPTION], function(serviceSubscription, key) {
+								$scope.serviceInstanceId = [];
+								if (serviceSubscription[FIELD.ID.SERVICE_TYPE] != null) {
+									$scope.serviceType = serviceSubscription[FIELD.ID.SERVICE_TYPE];
+								} else {
+									$scope.serviceType = FIELD.STATUS.NO_SERVICE_SUBSCRIPTION_FOUND;
+								}
+								if (serviceSubscription[FIELD.ID.SERVICE_INSTANCES] != null) {
+									angular.forEach(serviceSubscription[FIELD.ID.SERVICE_INSTANCES][FIELD.ID.SERVICE_INSTANCE], function(instValue, instKey) {
+										var foo = { "serviceInstanceId": instValue[FIELD.ID.SERVICE_INSTANCE_ID], 
+												"globalCustomerId": subVal[FIELD.ID.GLOBAL_CUSTOMER_ID],
+												"subscriberName": subVal[FIELD.ID.SUBNAME] };
+										$scope.serviceInstanceToCustomer.push(foo);
+									});
+								}
+							});
+					}
+				});	
+				DataService.setServiceInstanceToCustomer($scope.serviceInstanceToCustomer);
+				var serviceIdList = [];
+				$http.get( FIELD.ID.AAI_GET_SERVICES, {
+				},{
+					timeout: $scope.responseTimeoutMsec
+				}).then(function(response) {
+					angular.forEach(response.data, function(value, key) {
+						angular.forEach(value, function(subVal, key) {
+							var newVal = { "id" : subVal[FIELD.ID.SERVICE_ID], "description" : subVal[FIELD.ID.SERVICE_DESCRIPTION] };
+							serviceIdList.push(newVal);
+							DataService.setServiceIdList(serviceIdList);
+							
+							$location.search({
+								"subscriberId": subscriberId,
+								"serviceType": serviceType,
+								"serviceInstanceId": serviceInstanceId
+							});
+							
+							$location.path(COMPONENT.INSTANTIATE_PATH);
+						});
+					});
+				});	
+			})
+			["catch"]($scope.handleServerError);
+		};
+	});
+})();
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/VidApp.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/VidApp.js
new file mode 100755
index 000000000..dcde2ecc6
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/VidApp.js
@@ -0,0 +1,79 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+(function () {
+  'use strict';
+  
+  appDS2.config(['$routeProvider', '$locationProvider', function ($routeProvider) {
+      $routeProvider
+        .when('/models/services', {
+          controller: 'ServiceModelController',
+          templateUrl: 'app/vid/scripts/view-models/serviceModels.htm'
+        })
+        .when('/models/services/createInstance', {
+          controller: 'aaiSubscriberController',
+          templateUrl: 'app/vid/scripts/view-models/createInstanceServiceModels.htm'
+        })
+        .when('/instances/services', {
+    		templateUrl : "app/vid/scripts/view-models/aaiGetSubs.htm", 
+    		controller : "aaiSubscriberController"
+        })
+        .when('/instances/subscribers', {
+    		templateUrl : "app/vid/scripts/view-models/aaiGetSubscriberList.htm", 
+    		controller : "aaiSubscriberController"
+        })
+        .when('/instances/serviceTypes', {
+    		templateUrl : "app/vid/scripts/view-models/aaiServiceTypes.htm", 
+    		controller : "aaiSubscriberController"
+        })
+        .when('/instances/subdetails', {
+    		templateUrl : "app/vid/scripts/view-models/aaiSubDetails.htm", 
+    		controller : "aaiSubscriberController"
+        })
+        .when('/instantiate', {
+          controller: 'InstantiationController',
+          templateUrl: 'app/vid/scripts/view-models/instantiate.htm'
+        })
+        .otherwise({
+        	redirectTo: '/models/services'
+        });
+    }]);
+  
+  appDS2.service('vidService', function() {
+	  var _model = undefined;
+	  var _instance = undefined;
+	  
+	  this.setModel = function(model) {
+		  _model = model;
+	  };
+	  
+	  this.getModel = function() {
+		  return _model;
+	  };
+	  
+	  this.setInstance = function(instance) {
+		  _instance = instance;
+	  };
+	  
+	  this.getInstance = function() {
+		  return _instance;
+	  };
+  });
+})();
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js
new file mode 100755
index 000000000..5caa3298f
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js
@@ -0,0 +1,821 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+"use strict";
+
+appDS2.controller("aaiSubscriberController", [ "COMPONENT", "FIELD", "PARAMETER", "DataService", "PropertyService", "$scope", "$http", "$timeout", "$location", "$log", "$route", "VIDCONFIGURATION", "UtilityService", "vidService","AaiService",
+                                            function(COMPONENT, FIELD, PARAMETER, DataService, PropertyService, $scope, $http, $timeout, $location, $log, $route, VIDCONFIGURATION, UtilityService, vidService, AaiService) {
+
+	$scope.showVnfDetails = function(vnf) {
+		console.log("showVnfDetails");
+		DataService.setVnfInstanceId(COMPONENT.VNF_INSTANCE_ID);
+		DataService
+		.setInventoryItem(aaiResult[FIELD.ID.INVENTORY_RESPONSE_ITEMS][FIELD.ID.INVENTORY_RESPONSE_ITEM][0]);
+
+		$scope.$broadcast(COMPONENT.SHOW_COMPONENT_DETAILS, {
+			componentId : COMPONENT.VNF,
+			callbackFunction : callbackFunction
+		});
+	}
+	$scope.popup = new Object();
+
+
+	$scope.isPopupVisible = false;
+	$scope.defaultBaseUrl = "";
+	$scope.responseTimeoutMsec = 60000;
+
+	$scope.serviceTypes=[ FIELD.PROMPT.SELECT_SERVICE ];
+	$scope.defaultSubscriberName=[ FIELD.PROMPT.SELECT_SUB ];
+
+	var callbackFunction = function(response) {
+		alert(response);
+	};
+
+	$scope.getSubs = function() {
+		$scope.init();
+		$scope.fetchSubs(FIELD.PROMPT.FETCHING_SUBS);
+		$scope.fetchServices();
+
+	};
+	
+	 $scope.cancelCreateSI = function(){
+	 		
+			window.location.href = COMPONENT.WELCOME_PATH;
+			
+		};
+	 
+		$scope.getServiceTypes = function(globalCustomerId){
+			DataService.setGlobalCustomerId(globalCustomerId);
+			DataService.setServiceIdList($scope.customerList)
+
+			if (globalCustomerId !== "" && globalCustomerId !== undefined ) {
+				window.location.href = COMPONENT.SERVICE_TYPE_LIST_PATH + $scope.serviceTypeList;
+			}
+		}
+		
+		$scope.refreshServiceTypes = function(globalCustomerId){
+			DataService.setGlobalCustomerId(globalCustomerId);
+			
+			$scope.getServiceTypesList();
+		}
+		
+		$scope.subId="";
+		$scope.createSubscriberName="";
+		$scope.serviceTypeList={};
+		$scope.custSubList=[];
+		$scope.getServiceTypesList = function(){
+			var notFound = true;
+			var globalCustomerId = DataService.getGlobalCustomerId();
+			$scope.custSubList = DataService.getServiceIdList();
+			if(globalCustomerId !== "" && globalCustomerId !== undefined ){
+				$scope.subId=globalCustomerId;
+				$scope.init();
+				$scope.status = FIELD.PROMPT.FETCHING_SERVICE_TYPES;
+				DataService.setGlobalCustomerId(globalCustomerId);
+				
+				AaiService.getSubscriptionServiceTypeList(DataService
+						.getGlobalCustomerId(), function(response) {
+					notFound = false;
+					$scope.setProgress(100); // done
+					$scope.status = FIELD.STATUS.DONE;
+					$scope.isSpinnerVisible = false;
+					$scope.serviceTypeList = response;
+					for(var i=0; i<$scope.custSubList.length;i++){
+						if(globalCustomerId === $scope.custSubList[i].globalCustomerId){
+							$scope.createSubscriberName = $scope.custSubList[i].subscriberName;
+						}
+					}
+				}, function(response) { // failure
+					$scope.showError(FIELD.ERROR.AAI);
+					$scope.errorMsg = FIELD.ERROR.FETCHING_SERVICE_TYPES + response.status;
+					$scope.errorDetails = response.data;
+				});
+			} else {
+				alert(FIELD.ERROR.SELECT);
+			}
+			
+		};
+		
+		$scope.subList = [];
+		$scope.getAaiServiceModels = function(selectedServicetype,subName){
+			DataService.setGlobalCustomerId(selectedServicetype);
+			DataService.setServiceIdList($scope.serviceTypeList)
+			DataService.setSubscriberName(subName);
+			
+			DataService.setSubscribers($scope.custSubList);
+
+			if (selectedServicetype !== "" && selectedServicetype !== 'undefined') {
+				$location.path(COMPONENT.CREATE_INSTANCE_PATH);
+			}			
+		};
+		
+		$scope.serviceTypeName="";
+		$scope.getAaiServiceModelsList = function(){
+			var globalCustomerId="";
+             var serviceTypeId = DataService.getGlobalCustomerId();			
+			$scope.serviceTypeList = DataService.getServiceIdList();
+			$scope.createSubscriberName = DataService.getSubscriberName();
+			$scope.status = FIELD.STATUS.FETCHING_SERVICE_CATALOG;
+			$scope.custSubList = DataService.getSubscribers();
+			for(var i=0; i<$scope.serviceTypeList.length;i++){
+						if(parseInt(serviceTypeId) === i ){
+							$scope.serviceTypeName = $scope.serviceTypeList[i];
+						}
+					};
+		    for(var i=0; i<$scope.custSubList.length;i++){
+						if($scope.createSubscriberName === $scope.custSubList[i].subscriberName){
+							globalCustomerId = $scope.custSubList[i].globalCustomerId;
+						}
+					};
+			
+			var pathQuery ="";
+			
+			if(null !== globalCustomerId && "" !== globalCustomerId && undefined !== globalCustomerId
+					&& null !== serviceTypeId && "" !== serviceTypeId && undefined !== serviceTypeId){
+				pathQuery = COMPONENT.SERVICES_PATH +globalCustomerId+"/"+$scope.serviceTypeName;
+			}
+			
+			AaiService.getServiceModels(globalCustomerId,$scope.serviceTypeName,function(response) { // success
+				console.log("service models : "+response.data);
+				DataService.setServiceIdList(response);
+			},  function(response) { // failure
+				$scope.showError(FIELD.ERROR.AAI);
+				$scope.errorMsg = FIELD.ERROR.FETCHING_SERVICES+ response.status;
+				$scope.errorDetails = response.data;
+			});
+			
+			/*$http.get('/aai_get_services/'+globalCustomerId+''+$scope.serviceTypeName)
+			.then(function successCallback(response) {
+				$scope.services = [];
+				if (angular.isArray(response.data)) {
+					$scope.services = response.data;
+					$scope.viewPerPage=10;
+					$scope.totalPage=$scope.services.length/$scope.viewPerPage;
+					$scope.sortBy="name";
+					$scope.scrollViewPerPage=2;
+					$scope.currentPage=1;
+					$scope.searchCategory;
+					$scope.searchString="";
+					$scope.currentPageNum=1;
+					$scope.isSpinnerVisible = false;
+					$scope.isProgressVisible = false;
+				} else {
+					$scope.status = "Failed to get service models from SDC.";
+					$scope.error = true;
+					$scope.isSpinnerVisible = false;
+				}
+			}, function errorCallback(response) {
+				console.log("Error: " + response);
+			}); */
+		
+			
+		};
+		
+		 $scope.cancelCreateSIType = function(){
+		 		
+				window.location.href = COMPONENT.SERVICE_MODLES_INSTANCES_SUBSCRIBERS_PATH;
+				
+			}
+
+	$scope.fetchServices = function() { 
+		var serviceIdList = [];
+
+		AaiService.getServices2(function(response) { // success
+			DataService.setServiceIdList(response);
+		},  function(response) { // failure
+			$scope.showError(FIELD.ERROR.AAI);
+			$scope.errorMsg = FIELD.ERROR.FETCHING_SERVICES + response.status;
+			$scope.errorDetails = response.data;
+		});
+	}
+
+	$scope.refreshSubs = function() {
+		$scope.fetchSubs(FIELD.PROMPT.REFRESH_SUB_LIST);
+		$scope.fetchServices();
+	};
+
+	$scope.fetchSubs = function(status) {
+		$scope.status = status;
+
+		AaiService.getSubList(function(response) { // sucesss
+			$scope.setProgress(100); // done
+			$scope.status = FIELD.STATUS.DONE;
+			$scope.isSpinnerVisible = false;
+			$scope.customerList = response;
+		},  function(response) { // failure
+			$scope.showError(FIELD.ERROR.AAI);
+			$scope.errorMsg = FIELD.ERROR.AAI_FETCHING_CUST_DATA + response.status;
+			$scope.errorDetails = response.data;
+		});
+	}
+
+
+	$scope.getSubDetails = function(request) {
+
+		$scope.init();
+		$scope.selectedSubscriber = $location.search().selectedSubscriber;
+		$scope.selectedServiceInstance = $location.search().selectedServiceInstance;
+		$scope.status = FIELD.STATUS.FETCHING_SUB_DETAILS + $scope.selectedSubscriber;
+
+		$scope.displayData = [];
+		AaiService.getSubDetails($scope.selectedSubscriber, $scope.selectedServiceInstance, function(displayData, subscriberName) {
+			$scope.displayData = displayData;
+			$scope.viewPerPage=10;
+			$scope.totalPage=$scope.displayData.length/$scope.viewPerPage;
+			$scope.scrollViewPerPage=2;
+			$scope.currentPage=1;
+			$scope.searchCategory;
+			$scope.searchString="";
+			$scope.currentPageNum=1;
+			$scope.defaultSort=COMPONENT.SUBSCRIBER_NAME;
+				$scope.setProgress(100); // done
+			$scope.status = FIELD.STATUS.DONE;
+			$scope.isSpinnerVisible = false;
+			$scope.subscriberName = subscriberName;
+		}, function(response) { 
+			$scope.showError(FIELD.ERROR.AAI);
+			$scope.errorMsg = FIELD.ERROR.AAI_FETCHING_CUST_DATA + response.status;
+			$scope.errorDetails = response.data;
+		});
+	}
+
+
+	$scope.$on(COMPONENT.MSO_DELETE_REQ, function(event, request) {
+		// $log.debug("deleteInstance: request:");
+		// $log.debug(request);
+		$scope.init();
+
+		$http.post($scope.baseUrl + request.url, {
+			requestDetails: request.requestDetails
+		},{
+			timeout: $scope.responseTimeoutMsec
+		}).then($scope.handleInitialResponse)
+		["catch"]($scope.handleServerError);
+	});
+
+	$scope.init = function() {
+
+		//PropertyService.setAaiBaseUrl("testaai");
+		//PropertyService.setAsdcBaseUrl("testasdc");
+
+		// takes a default value, retrieves the prop value from the file system and sets it
+		var msecs = PropertyService.retrieveMsoMaxPollingIntervalMsec();
+		PropertyService.setMsoMaxPollingIntervalMsec(msecs);
+
+		// takes a default value, retrieves the prop value from the file system and sets it
+		var polls = PropertyService.retrieveMsoMaxPolls();
+		PropertyService.setMsoMaxPolls(polls);
+
+		//PropertyService.setMsoBaseUrl("testmso");
+		PropertyService.setServerResponseTimeoutMsec();
+
+		/*
+		 * Common parameters that would typically be set when the page is
+		 * displayed for a specific service instance id.
+		 */
+
+		$scope.baseUrl = $scope.defaultBaseUrl;
+
+		$scope.isSpinnerVisible = true;
+		$scope.isProgressVisible = true;
+		$scope.isPopupVisible = true;
+		$scope.requestId = "";
+		$scope.error = "";
+		$scope.pollAttempts = 0;
+		$scope.log = "";				
+		$scope.enableCloseButton(false);
+		$scope.resetProgress();
+		$scope.setProgress(2); // Show "a little" progress
+	}
+
+	$scope.getComponentList = function(event, request) {
+
+		$scope.isSpinnerVisible = true;
+		$scope.isProgressVisible = true;
+		$scope.isPopupVisible = true;
+		$scope.requestId = "";
+		$scope.error = "";
+		$scope.pollAttempts = 0;
+		$scope.log = "";				
+
+		$scope.resetProgress();
+		$scope.setProgress(2); // Show "a little" progress
+
+		$scope.globalCustomerId = $location.search().subscriberId;
+		$scope.serviceType = $location.search().serviceType;
+		$scope.serviceInstanceId = $location.search().serviceInstanceId;
+		$scope.subscriberName = $location.search().subscriberName;
+
+		//$scope.getAsdcModel($location.search().modelUuid);
+
+		$scope.namedQueryId = VIDCONFIGURATION.COMPONENT_LIST_NAMED_QUERY_ID;
+		$scope.status = FIELD.STATUS.FETCHING_SERVICE_INST_DATA + $scope.serviceInstanceId;
+
+		AaiService.runNamedQuery($scope.namedQueryId, $scope.globalCustomerId, $scope.serviceType, $scope.serviceInstanceId, 
+				function(response) { //success
+			$scope.handleInitialResponseInventoryItems(response);
+			$scope.setProgress(100); // done
+			$scope.status = FIELD.STATUS.DONE;
+			$scope.isSpinnerVisible = false;
+		}, 
+		function(response){ //failure
+			$scope.showError(FIELD.ERROR.AAI);
+			$scope.errorMsg = FIELD.ERROR.FETCHING_SERVICE_INSTANCE_DATA + response.status;
+			$scope.errorDetails = response.data;
+		}
+		);
+
+	}
+
+	$scope.handleServerError = function(response, status) {				
+		alert(response.statusText);
+	}
+	
+	$scope.getAsdcModel = function(disData) {
+
+		console.log ("disData"); console.log (JSON.stringify (disData, null, 4));
+		
+		if ( !(UtilityService.hasContents (disData.aaiModelVersionId)) ) {
+			$scope.errorMsg = FIELD.ERROR.MODEL_VERSION_ID_MISSING;
+			alert($scope.errorMsg);
+			return;
+		}
+		
+		// aaiModelVersionId is the model uuid
+		var pathQuery = COMPONENT.SERVICES_PATH + disData.aaiModelVersionId;
+		$http({
+			  method: 'GET',
+			  url: pathQuery
+			}).then(function successCallback(response) {
+				vidService.setModel(response.data);
+				window.location.href = COMPONENT.INSTANTIATE_ROOT_PATH + disData.globalCustomerId + COMPONENT.SUBSCRIBERNAME_SUB_PATH + disData.subscriberName + COMPONENT.SERVICETYPE_SUB_PATH + disData.serviceType + COMPONENT.SERVICEINSTANCEID_SUB_PATH + disData.serviceInstanceId;
+				console.log("aaiSubscriber getAsdcModel DONE!!!!");
+			  }, function errorCallback(response) {
+				  console.log("aaiSubscriber getAsdcModel - No matching model found matching the A&AI model version ID = " + disData.aaiModelVersionId);
+					$scope.errorMsg = FIELD.ERROR.NO_MATCHING_MODEL_AAI + disData.aaiModelVersionId;
+					alert($scope.errorMsg);
+			  });
+
+	}
+
+	$scope.getTenants = function(globalCustomerId) {
+		$http.get(FIELD.ID.AAI_GET_TENTANTS + globalCustomerId)
+		.then(function successCallback(response) {
+			return response.data;
+			//$location.path("/instantiate");
+		}, function errorCallback(response) {
+			//TODO
+		});
+	}
+
+	$scope.handleInitialResponseInventoryItems = function(response) {
+
+		$scope.inventoryResponseItemList = response.data[FIELD.ID.INVENTORY_RESPONSE_ITEM]; // get data from json
+		console.log($scope.inventoryResponseItemList.toString());
+
+		$scope.displayData = [];
+		$scope.vnfs = [];
+
+		$scope.counter = 100;
+
+		$scope.subscriberName = "";
+		// just look up the subscriber name in A&AI here...
+		AaiService.getSubscriberName($scope.globalCustomerId, function(response) {
+			$scope.subscriberName = response;
+			DataService.setSubscriberName($scope.subscriberName);
+
+			angular.forEach($scope.inventoryResponseItemList, function(inventoryResponseItem, key) {
+
+				$scope.inventoryResponseItem = inventoryResponseItem;
+
+				$scope.service.instance = {
+						"name": $scope.inventoryResponseItem[FIELD.ID.SERVICE_INSTANCE][FIELD.ID.SERVICE_INSTANCE_NAME],
+						"serviceInstanceId": $scope.serviceInstanceId,
+						"serviceType": $scope.serviceType,
+						"globalCustomerId": $scope.globalCustomerId,
+						"subscriberName": $scope.subscriberName,
+						"id": $scope.serviceInstanceId,
+						"inputs": {
+							"a": {
+								"type": PARAMETER.STRING,
+								"description": FIELD.PROMPT.VAR_DESCRIPTION_A,
+								"default": FIELD.PROMPT.DEFAULT_A
+							},
+							"b": {
+								"type": PARAMETER.STRING,
+								"description": FIELD.PROMPT.VAR_DESCRIPTION_B,
+								"default": FIELD.PROMPT.DEFAULT_B
+							},
+						},
+						"object": $scope.inventoryResponseItem[FIELD.ID.SERVICE_INSTANCE],
+						"vnfs": [],
+						"networks": []
+				}
+
+				if (inventoryResponseItem[FIELD.ID.INVENTORY_RESPONSE_ITEMS] != null) {
+
+					angular.forEach(inventoryResponseItem[FIELD.ID.INVENTORY_RESPONSE_ITEMS][FIELD.ID.INVENTORY_RESPONSE_ITEM], function(subInventoryResponseItem, key) {
+						// i expect to find vnfs now
+
+						if (subInventoryResponseItem[FIELD.ID.L3_NETWORK] != null) { 
+							var l3NetworkObject = subInventoryResponseItem[FIELD.ID.L3_NETWORK];
+							var l3Network = { "id": $scope.counter++, 
+									"name": l3NetworkObject[FIELD.ID.NETWORK_NAME],
+									"itemType": FIELD.ID.L3_NETWORK,
+									"nodeId": l3NetworkObject[FIELD.ID.NETWORK_ID],
+									"nodeType": l3NetworkObject[FIELD.ID.NETWORK_TYPE],
+									"nodeStatus": l3NetworkObject[FIELD.ID.ORCHESTRATION_STATUS],
+									"object": l3NetworkObject,
+									"nodes": [],
+									"subnets": []
+							};
+							if (subInventoryResponseItem[FIELD.ID.INVENTORY_RESPONSE_ITEMS] != null) {
+								//console.log ("subInventoryResponseItem[FIELD.ID.INVENTORY_RESPONSE_ITEMS]=");
+								//console.log (JSON.stringify (subInventoryResponseItem[FIELD.ID.INVENTORY_RESPONSE_ITEMS], null, 4 ));
+								angular.forEach(subInventoryResponseItem[FIELD.ID.INVENTORY_RESPONSE_ITEMS][FIELD.ID.INVENTORY_RESPONSE_ITEM], function(subSubInventoryResponseItem, key) {
+									//console.log (JSON.stringify (subSubInventoryResponseItem, null, 4 ));
+									var subnet = {};
+									var subnetObject;
+									if (subSubInventoryResponseItem[FIELD.ID.SUB_NET] != null) {
+										subnetObject = subSubInventoryResponseItem[FIELD.ID.SUB_NET];
+										subnet = {
+												"subnet-id": subnetObject[FIELD.ID.SUBNET_ID],
+												"subnet-name": subnetObject[FIELD.ID.SUBNET_NAME],
+												"gateway-address": subnetObject[FIELD.ID.GATEWAY_ADDRESS],
+												"network-start-address": subnetObject[FIELD.ID.NETWORK_START_ADDRESS],
+												"cidr-mask": subnetObject[FIELD.ID.CIDR_MASK]
+										};
+										l3Network.subnets.push(subnet);
+									}
+								});
+							}
+							$scope.service.instance[FIELD.ID.NETWORKS].push(l3Network);
+						}
+
+						if (subInventoryResponseItem[FIELD.ID.GENERIC_VNF] != null) {
+							var genericVnfObject = subInventoryResponseItem[FIELD.ID.GENERIC_VNF];
+
+							var genericVnf = {
+									"name": genericVnfObject[FIELD.ID.VNF_NAME],
+									"id": $scope.counter++, 
+									"itemType": COMPONENT.VNF, 
+									"nodeType": genericVnfObject[FIELD.ID.VNF_TYPE],
+									"nodeId": genericVnfObject[FIELD.ID.VNF_ID],
+									"nodeStatus": genericVnfObject[FIELD.ID.ORCHESTRATION_STATUS],
+									"object": genericVnfObject,
+									"vfModules": [],
+									"volumeGroups": [],
+									"availableVolumeGroups": []
+							};
+							$scope.service.instance[FIELD.ID.VNFS].push(genericVnf);
+
+							// look for volume-groups
+							if (subInventoryResponseItem[FIELD.ID.INVENTORY_RESPONSE_ITEMS] != null) {
+								angular.forEach(subInventoryResponseItem[FIELD.ID.INVENTORY_RESPONSE_ITEMS][FIELD.ID.INVENTORY_RESPONSE_ITEM], function(vfmodules, key) {
+
+									if (vfmodules[FIELD.ID.VOLUME_GROUP] != null) { 
+										var volumeGroupObject = vfmodules[FIELD.ID.VOLUME_GROUP];
+										var volumeGroup = { "id": $scope.counter++, 
+												"name": volumeGroupObject[FIELD.ID.VOLUME_GROUP_NAME],
+												"itemType": FIELD.ID.VOLUME_GROUP,
+												"nodeId": volumeGroupObject[FIELD.ID.VOLUME_GROUP_ID],
+												"nodeType": volumeGroupObject[FIELD.ID.VNF_TYPE],
+												"nodeStatus": volumeGroupObject[FIELD.ID.ORCHESTRATION_STATUS],
+												"object": volumeGroupObject,
+												"nodes": []
+										};
+										genericVnf[FIELD.ID.VOLUMEGROUPS].push(volumeGroup);
+										genericVnf[FIELD.ID.AVAILABLEVOLUMEGROUPS].push(volumeGroup);
+									}
+								});
+							}
+							// now we've loaded up the availableVolumeGroups, we can use it
+							if (subInventoryResponseItem[FIELD.ID.INVENTORY_RESPONSE_ITEMS] != null) {
+								angular.forEach(subInventoryResponseItem[FIELD.ID.INVENTORY_RESPONSE_ITEMS][FIELD.ID.INVENTORY_RESPONSE_ITEM], function(vfmodules, key) {
+
+									if (vfmodules[FIELD.ID.VF_MODULE] != null) { 
+										var vfModuleObject = vfmodules[FIELD.ID.VF_MODULE];
+										var vfModule = { "id": $scope.counter++,
+												"name": vfModuleObject[FIELD.ID.VF_MODULE_NAME],
+												"itemType": FIELD.ID.VF_MODULE,
+												"nodeType": FIELD.ID.VF_MODULE, 
+												"nodeStatus": vfModuleObject[FIELD.ID.ORCHESTRATION_STATUS],
+												"volumeGroups": [],
+												"object": vfModuleObject,
+												"networks": []
+										};
+										genericVnf[FIELD.ID.VF_MODULES].push(vfModule);
+										if (vfmodules[FIELD.ID.INVENTORY_RESPONSE_ITEMS] != null) {
+											angular.forEach(vfmodules[FIELD.ID.INVENTORY_RESPONSE_ITEMS][FIELD.ID.INVENTORY_RESPONSE_ITEM], function(networks, key) {
+												if (networks[FIELD.ID.L3_NETWORK] != null) { 
+													var l3NetworkObject = networks[FIELD.ID.L3_NETWORK];
+													var l3Network = { "id": $scope.counter++, 
+															"name": l3NetworkObject[FIELD.ID.NETWORK_NAME],
+															"itemType": FIELD.ID.L3_NETWORK,
+															"nodeId": l3NetworkObject[FIELD.ID.NETWORK_ID],
+															"nodeType": l3NetworkObject[FIELD.ID.NETWORK_TYPE],
+															"nodeStatus": l3NetworkObject[FIELD.ID.ORCHESTRATION_STATUS],
+															"object": l3NetworkObject,
+															"nodes": []
+													};
+													vfModule[FIELD.ID.NETWORKS].push(l3Network);
+												}
+												if (networks[FIELD.ID.VOLUME_GROUP] != null) { 
+													var volumeGroupObject = networks[FIELD.ID.VOLUME_GROUP];
+
+													var volumeGroup = { "id": $scope.counter++, 
+															"name": volumeGroupObject[FIELD.ID.VOLUME_GROUP_NAME],
+															"itemType": FIELD.ID.VOLUME_GROUP,
+															"nodeId": volumeGroupObject[FIELD.ID.VOLUME_GROUP_ID],
+															"nodeType": volumeGroupObject[FIELD.ID.VNF_TYPE],
+															"nodeStatus": volumeGroupObject[FIELD.ID.ORCHESTRATION_STATUS],
+															"object": volumeGroupObject,
+															"nodes": []
+													};
+													var tmpVolGroup = [];
+
+													angular.forEach(genericVnf[FIELD.ID.AVAILABLEVOLUMEGROUPS], function(avgroup, key) {
+														if (avgroup.name != volumeGroup.name) { 
+															tmpVolGroup.push(avgroup);
+														}
+													});
+
+													genericVnf[FIELD.ID.AVAILABLEVOLUMEGROUPS] = tmpVolGroup;
+
+													vfModule[FIELD.ID.VOLUMEGROUPS].push(volumeGroup);
+												}
+
+											});
+										}
+									}
+								});
+							}
+						}
+					});
+				}
+			});
+		});
+	}
+
+	$scope.handleInitialResponse = function(response) {
+		try {
+			$scope.enableCloseButton(true);
+			$scope.updateLog(response);
+			if (response.data.status < 200 || response.data.status > 202) {
+				$scope.showError(FIELD.ERROR.MSO);
+				$scope.status = FIELD.ERROR.AAI_FETCHING_CUST_DATA + response.data.status;
+
+				return;
+			}
+
+			$scope.setProgress(100); // done
+			$scope.status = FIELD.STATUS.DONE;
+			$scope.isSpinnerVisible = false;
+
+			$scope.customer = response.data.customer; // get data from json
+
+			$scope.customerList = [];
+
+			angular.forEach($scope.customer, function(subVal, subKey) {
+				var cust = { "globalCustomerId": subVal[FIELD.ID.GLOBAL_CUSTOMER_ID], "subscriberName": subVal[FIELD.ID.SUBNAME] };
+				$scope.customerList.push(cust);
+			});	
+
+		} catch (error) {
+			$scope.showContentError(error);
+		}
+	}
+
+	$scope.autoGetSubs = function() {
+		/*
+		 * Optionally comment in / out one of these method calls (or add a similar
+		 * entry) to auto-invoke an entry when the test screen is redrawn.
+		 */
+		$scope.getSubs();
+
+	}
+
+	$scope.updateLog = function(response) {
+//		$scope.log = UtilityService.getCurrentTime() + " HTTP Status: " + 
+//		UtilityService.getHttpStatusText(response.data.status) + "\n" +
+//		angular.toJson(response.data.entity, true) + "\n\n" + $scope.log;
+//		UtilityService.checkUndefined("entity", response.data.entity);
+//		UtilityService.checkUndefined("status", response.data.status);				
+	}
+
+	$scope.handleServerError = function(response, status) {				
+		$scope.enableCloseButton(true);
+		var message = UtilityService.getHttpErrorMessage(response);
+		if (message != ""){
+			message = " (" + message + ")";
+		}
+		$scope.showError(FIELD.ERROR.SYSTEM_ERROR + message);
+	}
+
+	$scope.showContentError = function(message) {
+		// $log.debug(message);
+		console.log(message);
+		if (UtilityService.hasContents(message)) {
+			$scope.showError("System failure (" + message + ")");
+		} else {
+			$scope.showError(FIELD.ERROR.SYSTEM_ERROR);
+		}
+	}
+
+	$scope.showError = function(message) {
+		$scope.isSpinnerVisible = false;
+		$scope.isProgressVisible = false;
+		$scope.error = message;
+		$scope.status = FIELD.STATUS.ERROR;
+	}
+
+	$scope.close = function() {
+		if ($scope.timer != undefined) {
+			$timeout.cancel($scope.timer);					
+		}
+		$scope.isPopupVisible = false;
+	}
+
+
+
+	/*
+	 * Consider converting the progress bar mechanism, the disabled button handling
+	 * and the following methods to generic Angular directive(s) and/or approach.
+	 */
+
+	$scope.enableCloseButton = function(isEnabled) {
+		var selector = FIELD.STYLE.MSO_CTRL_BTN;
+
+		$scope.isCloseEnabled = isEnabled;
+
+		if (isEnabled) {
+			$(selector).addClass(FIELD.STYLE.BTN_PRIMARY).removeClass(FIELD.STYLE.BTN_INACTIVE).attr(FIELD.STYLE.BTN_TYPE, FIELD.STYLE.PRIMARY);
+		} else {
+			$(selector).removeClass(FIELD.STYLE.BTN_PRIMARY).addClass(FIELD.STYLE.BTN_INACTIVE).attr(FIELD.STYLE.BTN_TYPE, FIELD.STYLE.DISABLED);					
+		}
+	}
+
+	$scope.resetProgress = function() {
+		$scope.percentProgress = 0;
+		$scope.progressClass = FIELD.STYLE.PROGRESS_BAR_INFO;
+	}
+
+	$scope.setProgress = function(percentProgress) {
+		percentProgress = parseInt(percentProgress);
+		if (percentProgress >= 100) {
+			$scope.progressClass = FIELD.STYLE.PROGRESS_BAR_SUCCESS;					
+		}
+
+		if (percentProgress < $scope.percentProgress) {
+			return;
+		}
+
+		$scope.percentProgress = percentProgress;
+		$scope.progressWidth = {width: percentProgress + "%"};
+		if (percentProgress >= 5) {
+			$scope.progressText =  percentProgress + " %";
+		} else {
+			// Hidden since color combination is barely visible when progress portion is narrow.
+			$scope.progressText = "";
+		}
+	}
+
+	$scope.reloadRoute = function() {
+		$route.reload();
+	}
+
+	$scope.prevPage = function() {
+		$scope.currentPage--;
+	}
+
+	$scope.nextPage = function() {
+		$scope.currentPage++;
+	}
+	$scope.serviceInstanceses = [{"sinstance":FIELD.NAME.SERVICE_INSTANCE_Id},{"sinstance":FIELD.NAME.SERVICE_INSTANCE_NAME}]
+	$scope.getSubscriberDet = function(selectedCustomer,selectedserviceinstancetype,selectedServiceInstance){
+		
+		var sintype =selectedserviceinstancetype;
+		if (selectedServiceInstance != "" && selectedServiceInstance != undefined) {
+			selectedServiceInstance.trim();
+
+			// check with A&AI
+			$http.get(COMPONENT.AAI_GET_SERVICE_INSTANCE_PATH  + selectedServiceInstance+"/"+sintype + "?r=" + Math.random(), {
+
+			},{
+				timeout: $scope.responseTimeoutMsec
+			}).then(function(response) {
+				var notFound = true;
+				if (angular.isArray(response.data[FIELD.ID.RESULT_DATA])) {
+					var item = [];
+					var urlParts = [];
+					item = response.data[FIELD.ID.RESULT_DATA][0];
+					var url = item[FIELD.ID.RESOURCE_LINK];
+					var globalCustomerId = "";
+					var serviceSubscription = "";
+					// split it and find the customer Id and service-subscription
+					urlParts = url.split("/");
+					if (urlParts[7] === FIELD.ID.CUSTOMER) { 
+						globalCustomerId = urlParts[8];
+					}
+					if (urlParts[10] === FIELD.ID.SERVICE_SUBSCRIPTION) { 
+						serviceSubscription = urlParts[11];
+					}
+
+					if (globalCustomerId !== "") {
+						notFound = false;
+						window.location.href = COMPONENT.SELECTED_SERVICE_SUB_PATH + serviceSubscription + COMPONENT.SELECTEDSUBSCRIBER_SUB_PATH + globalCustomerId + COMPONENT.SELECTEDSERVICEINSTANCE_SUB_PATH + selectedServiceInstance;
+					}
+				}
+				if (notFound) {
+					alert(FIELD.ERROR.SERVICE_INST_DNE);
+				}
+			}); // add a failure callback...
+		} else if (selectedCustomer != null) { 
+			window.location.href = COMPONENT.SELECTED_SUB_PATH + selectedCustomer;
+		} else {
+			alert(FIELD.ERROR.SELECT);
+		}
+	};
+  }]).directive('restrictInput', function(){
+		
+		return {
+			
+			restrict: 'A',
+			require: 'ngModel',
+			link: function($scope, element, attr, ctrl){
+				ctrl.$parsers.unshift(function(viewValue){
+					
+					var types = $scope.$eval(attr.restrictInput);
+					if(!types.regex && types.type){
+						
+						switch(types.type){
+							case 'Service Instance Name' : types.regex = '^[a-zA-Z0-9-_]*$'; break;
+							default: types.regex= '';
+						}
+					}
+					var reg = new RegExp(types.regex);
+					if(reg.test(viewValue)){
+						return viewValue;
+					} else {
+						var overrideValue = (reg.test(viewValue) ? viewValue : '');
+						element.val(overrideValue);
+						return overrideValue;
+					}
+				});
+			}
+		};
+
+            });
+appDS2.controller('TreeCtrl', ['$scope', function ($scope) {
+	$scope.remove = function (scope) {
+		scope.remove();
+	};
+
+	$scope.toggle = function (scope) {
+		scope.toggle();
+	};
+
+	$scope.moveLastToTheBeginning = function () {
+		var a = $scope.data.pop();
+		$scope.data.splice(0, 0, a);
+	};
+
+	$scope.newSubItem = function (scope) {
+		var nodeData = scope.$modelValue;
+		nodeData.nodes.push({
+			id: nodeData.id * 10 + nodeData.nodes.length,
+			title: nodeData.title + '.' + (nodeData.nodes.length + 1),
+			nodes: []
+		});
+	};
+
+	$scope.collapseAll = function () {
+		$scope.$broadcast(FIELD.ID.ANGULAR_UI_TREE_COLLAPSEALL);
+	};
+
+	$scope.expandAll = function () {
+		$scope.$broadcast(FIELD.ID.ANGULAR_UI_TREE_EXPANDALL);
+	};
+
+
+}]);
+
+
+
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/creationDialogController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/creationDialogController.js
new file mode 100755
index 000000000..6a1c14c5b
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/creationDialogController.js
@@ -0,0 +1,163 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+"use strict";
+
+var creationDialogController = function( COMPONENT, FIELD, $scope, $http, $timeout, $log,
+		CreationService, UtilityService, DataService) {
+
+	$scope.isDialogVisible = false;
+	$scope.summaryControl = {};
+	$scope.userProvidedControl = {};
+
+	var callbackFunction = undefined;
+	var componentId = undefined;
+
+	$scope.$on(COMPONENT.CREATE_COMPONENT, function(event, request) {
+
+		$scope.isSpinnerVisible = true;
+		$scope.isErrorVisible = false;
+		$scope.isDataVisible = false;
+		$scope.isConfirmEnabled = false;
+		$scope.isDialogVisible = true;
+		$scope.popup.isVisible = true;
+
+		callbackFunction = request.callbackFunction;
+		componentId = request.componentId;
+		CreationService.initializeComponent(request.componentId);
+
+		CreationService.setHttpErrorHandler(function(response) {
+			showError(FIELD.ERROR.SYSTEM_FAILURE, UtilityService
+					.getHttpErrorMessage(response));
+		});
+
+		$scope.componentName = CreationService.getComponentDisplayName();
+
+		CreationService.getParameters(handleGetParametersResponse);
+
+	});
+
+	var handleGetParametersResponse = function(parameters) {
+		$scope.summaryControl.setList(parameters.summaryList);
+		$scope.userProvidedControl.setList(parameters.userProvidedList);
+
+		$scope.isSpinnerVisible = false;
+		$scope.isDataVisible = true;
+		$scope.isConfirmEnabled = true;
+	};
+	
+	var validateInstanceName = function(iname) {
+		var patt1 = /^([a-z])+([0-9a-z\-_\.]*)$/i;
+		
+		if ( iname == null ){
+			return false;
+		}
+		if ( !iname.match(patt1) ) {
+			return false;
+		}
+		return true;
+	}
+
+	$scope.userParameterChanged = function(id) {
+		CreationService.updateUserParameterList(id, $scope.userProvidedControl);
+	}
+
+	$scope.confirm = function() {
+
+		var requiredFields = $scope.userProvidedControl.getRequiredFields();
+		if (requiredFields !== "") {
+			showError(FIELD.ERROR.MISSING_DATA, requiredFields);
+			return;
+		}
+	
+		var paramList = $scope.userProvidedControl.getList();
+		var instanceName = "";
+
+		if ( DataService.getALaCarte() ) {
+			if ( paramList != null ) {
+				for (var i = 0; i < paramList.length; i++) {
+					if (paramList[i].id === FIELD.ID.INSTANCE_NAME) {
+						instanceName = paramList[i].value;
+						break;
+					}
+				}
+			}
+			var isValid = validateInstanceName (instanceName);
+			if ( isValid ) {
+				$scope.isErrorVisible = false;
+			} else {
+				showError(FIELD.ERROR.INVALID_INSTANCE_NAME + instanceName, 
+						FIELD.ERROR.INSTANCE_NAME_VALIDATE);
+				return;
+			}
+		}
+		
+		var requestDetails = CreationService
+				.getMsoRequestDetails($scope.userProvidedControl.getList());
+
+		$scope.isDialogVisible = false;
+
+		$scope.$broadcast(COMPONENT.MSO_CREATE_REQ, {
+			url : CreationService.getMsoUrl(),
+			requestDetails : requestDetails,
+			componentId: componentId,
+			callbackFunction : function(response) {
+				if (response.isSuccessful) {
+					$scope.popup.isVisible = false;
+					runCallback(response);
+				} else {
+					$scope.isDialogVisible = false;
+					$scope.popup.isVisible = false;
+				}
+			}
+		});
+	}
+
+	$scope.cancel = function() {
+		$scope.isDialogVisible = false;
+		$scope.popup.isVisible = false;
+		runCallback(false);
+	}
+
+	var runCallback = function(response) {
+		if (angular.isFunction(callbackFunction)) {
+			callbackFunction({
+				isSuccessful : response.isSuccessful,
+				control : $scope.userProvidedControl.getList(),
+				instanceId : response.instanceId
+			});
+		}
+	}
+
+	var showError = function(summary, details) {
+		var message = summary;
+		if (UtilityService.hasContents(details)) {
+			message += " (" + details + ")";
+		}
+		$scope.isSpinnerVisible = false;
+		$scope.isErrorVisible = true;
+		$scope.error = message;
+	}
+	
+}
+
+appDS2.controller("creationDialogController", [ "COMPONENT", "FIELD", "$scope", "$http",
+				"$timeout", "$log", "CreationService", "UtilityService", "DataService",
+				creationDialogController ]);
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/deletionDialogController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/deletionDialogController.js
new file mode 100755
index 000000000..137673d47
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/deletionDialogController.js
@@ -0,0 +1,119 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+"use strict";
+
+var deletionDialogController = function( COMPONENT, FIELD, $scope, $http, $timeout, $log,
+	DeletionService, UtilityService) {
+
+    $scope.isDialogVisible = false;
+    $scope.summaryControl = {};
+    $scope.userProvidedControl = {};
+    
+    var callbackFunction = undefined;
+    var componentId = undefined;
+
+    $scope.$on(COMPONENT.DELETE_COMPONENT, function(event, request) {
+
+    $scope.isDataVisible = false;
+	$scope.isSpinnerVisible = false;
+	$scope.isErrorVisible = false;
+	$scope.isDialogVisible = true;
+	$scope.popup.isVisible = true;
+	$scope.isConfirmEnabled = false;
+
+	callbackFunction = request.callbackFunction;
+	componentId = request.componentId;
+
+	DeletionService.initializeComponent(request.componentId);
+
+	$scope.componentName = DeletionService.getComponentDisplayName();
+
+	$scope.summaryControl.setList(DeletionService.getSummaryList());
+	
+	DeletionService.getParameters(handleGetParametersResponse);
+
+    });
+    
+    var handleGetParametersResponse = function(parameters, dontshow) {
+		$scope.summaryControl.setList(parameters.summaryList);
+		$scope.userProvidedControl.setList(parameters.userProvidedList);
+
+		$scope.isSpinnerVisible = false;
+		if (dontshow)
+		  $scope.isDataVisible = false;
+		else
+			$scope.isDataVisible = true;
+		$scope.isConfirmEnabled = true;
+	};
+
+	$scope.userParameterChanged = function(id) {
+		DeletionService.updateUserParameterList(id, $scope.userProvidedControl);
+	}
+
+    $scope.confirm = function() {
+
+    	var requiredFields = $scope.userProvidedControl.getRequiredFields();
+		if (requiredFields === "") {
+			$scope.isErrorVisible = false;
+		} else {
+			showError(FIELD.ERROR.MISSING_DATA, requiredFields);
+			return;
+		}
+
+		
+	var requestDetails = DeletionService.getMsoRequestDetails($scope.userProvidedControl.getList());
+
+	$scope.isDialogVisible = false;
+
+	$scope.$broadcast(COMPONENT.MSO_DELETE_REQ, {
+	    url : DeletionService.getMsoUrl(),
+	    requestDetails : requestDetails,
+		componentId: componentId,
+	    callbackFunction : function(isSuccessful) {
+		if (isSuccessful) {
+		    $scope.popup.isVisible = false;
+		    runCallback(true);
+		} else {
+		    $scope.isDialogVisible = true;
+		}
+	    }
+	});
+
+    }
+
+    $scope.cancel = function() {
+	$scope.isDialogVisible = false;
+	$scope.popup.isVisible = false;
+	runCallback(false);
+    }
+
+    var runCallback = function(isSuccessful) {
+	if (angular.isFunction(callbackFunction)) {
+	    callbackFunction({
+		isSuccessful : isSuccessful
+	    });
+	}
+    }
+}
+
+appDS2.controller("deletionDialogController", [ "COMPONENT", "FIELD", "$scope", "$http",
+		"$timeout", "$log", "DeletionService", "UtilityService",
+		deletionDialogController ]);
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/detailsDialogController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/detailsDialogController.js
new file mode 100755
index 000000000..ddb1ac1d5
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/detailsDialogController.js
@@ -0,0 +1,84 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+"use strict";
+
+var detailsDialogController = function($scope, $http, $timeout, $log,
+	MsoService, DetailsService, UtilityService, COMPONENT, FIELD) {
+
+    $scope.isDialogVisible = false;
+    $scope.summaryControl = {};
+    $scope.detailsControl = {};
+
+    $scope.$on(COMPONENT.SHOW_COMPONENT_DETAILS, function(event, request) {
+
+	$scope.log = "";
+	$scope.isSpinnerVisible = true;
+	$scope.isErrorVisible = false;
+	$scope.isDialogVisible = true;
+	$scope.popup.isVisible = true;
+
+	DetailsService.initializeComponent(request.componentId);
+
+	$scope.componentName = DetailsService.getComponentDisplayName();
+
+	$scope.summaryControl.setList(DetailsService.getSummaryList());
+
+	$scope.detailsControl.setList(DetailsService.getDetailsList());
+
+	UtilityService.setHttpErrorHandler(function(response) {
+	    showError(FIELD.ERROR.SYSTEM_FAILURE, UtilityService
+		    .getHttpErrorMessage(response));
+	});
+
+	MsoService.getOrchestrationRequests(
+		DetailsService.getMsoFilterString(), handleGetResponse);
+    });
+
+    var handleGetResponse = function(response) {
+	$scope.isSpinnerVisible = false;
+	try {
+	    $scope.log = MsoService
+		    .getFormattedGetOrchestrationRequestsResponse(response);
+	} catch (error) {
+	    $scope.log = MsoService.getFormattedCommonResponse(response);
+	    MsoService.showResponseContentError(error, showError);
+	}
+    }
+
+    $scope.close = function() {
+	$scope.isDialogVisible = false;
+	$scope.popup.isVisible = false;
+    }
+
+    var showError = function(summary, details) {
+	var message = summary;
+	if (UtilityService.hasContents(details)) {
+	    message += " (" + details + ")";
+	}
+	$scope.isSpinnerVisible = false;
+	$scope.isErrorVisible = true;
+	$scope.error = message;
+    }
+}
+
+appDS2.controller("detailsDialogController", [ "$scope", "$http", "$timeout",
+	"$log", "MsoService", "DetailsService", "UtilityService", "COMPONENT", "FIELD",
+	detailsDialogController ]);
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/msoCommitController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/msoCommitController.js
new file mode 100755
index 000000000..65fac289a
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/msoCommitController.js
@@ -0,0 +1,300 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+"use strict";
+
+/*
+ * "msoCommitController.js" provides controller code to commit MSO requests.
+ * 
+ * HIGHLIGHTS:
+ * 
+ * Parent HTML/JSP code is expected to include "msoCommit.htm" (via
+ * "ng-include") and this file (via "
+
    
+
+	
    
+		
    
+			
+			{{status}}
+		
    
+
+		
    {{errorMsg}}
    {{errorDetails | json}}
    
+		
+		 
    Search Existing Service Instances
    
+     		
    
+    	Please search by the Subscriber name or enter Service Instance Id or Service Instance Name below: 

    
+    	 
+		 
+			
+				
+				
+	 		
+			
+			
+				
+    			
+				
+    		
+    		
+				
+				
+			
+		
    
+				
    	
+					
+				
    
+				    		
+					
    
+						
+					    
+					
    
+				
    
+					
    
+						
+					
    
+				    		
+    				
    
+						
+					
     
+				
    
+				
+					
    	
+						
+					
    
+				
    	
+		
+	
+	
    
+
+
    
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiGetSubscriberList.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiGetSubscriberList.htm
new file mode 100755
index 000000000..6a911be16
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiGetSubscriberList.htm
@@ -0,0 +1,67 @@
+
+
+
+
+
+
    
+
+	
    
+		
    
+			
+			{{status}}
+		
    
+		
+		
    {{errorMsg}}
    {{errorDetails | json}}
    
+		
+		 
    Create New Service Instance
    
+		 
+		 
+			
+				
+				
+	 		
+			
+    		
+				
+				
+			
+		
    
+				
    	
+					
+				
    
+				    		
+					
    
+						
+					    
+					
    
+				
    
+				
+					
    	
+						
+						  
+					
    
+				
    	
+		
+	
+	
    
+
+
    
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiServiceTypes.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiServiceTypes.htm
new file mode 100755
index 000000000..6711bfaf7
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiServiceTypes.htm
@@ -0,0 +1,80 @@
+
+
+
+
+
+
    
+
+	
    
+		
    
+			
+			{{status}}
+		
    
+		
    {{errorMsg}}
    {{errorDetails | json}}
    
+		
    Create New Service Instance
    
+		
+		 
+		
+		
+				
+				
+	 		
+			
+			
+				
+				
+	 		
+			
+    		
+				
+				
+			
+		
    
+				
    	
+					
+				
    
+				    		
+					
    
+					
+						
+					
    
+				
    
+				
    	
+					
+				
    
+				    		
+					
    
+						
+					    
+					
    
+				
    
+				
+					
    	
+						
+						  
+					
    
+				
    	
+		
+	
+	
    
+
+
    
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiSubDetails.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiSubDetails.htm
new file mode 100755
index 000000000..2426f152f
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiSubDetails.htm
@@ -0,0 +1,95 @@
+
+
+	
    
+	
+		
    
+			
    
+				
+					
+				{{status}}
+			
    
+
+			
    {{errorMsg}}
    {{errorDetails | json}}
    
+	
+			 
    Subscriber Details for {{selectedSubscriber}} ({{selectedSubscriberName}})
    
+	     		
    
+		
    
+		         Filter:
+		          
+	    
    
+			
    
+				
+				
    
+					
+	
+						
+							
+								
+								
+								
+								
+								
+								
+							
+						
+						
+							
+								  
+							
+								
+								
+								
+								
+								
+							
+						
+					
    View/EditGlobal Customer IDSubscriber NameService TypeService Instance NameService Instance ID
    
+									
+								
    
+					
+					
+					
+					
+	    			
+					
+					
    
+						
+					
+						Jump to page:
+		          		
+		    			Results per page: 10 
+	    				| 25 
+	    				| 50 
+	    			
+	    			 	
+					
    
+					 
+	    			
+				
    
+	
+			
    
+	
+	
+		
    
+	
+	
    
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiSubViewEdit.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiSubViewEdit.htm
new file mode 100755
index 000000000..a7ea8336f
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiSubViewEdit.htm
@@ -0,0 +1,147 @@
+
+
+
    
+
+	
    
+		
    
+		
    
+		
    
+	
     
+
+	
    
+		
    
+			
+			{{status}}
+		
    
+
+		
    
+			
    VIEW/EDIT SERVICE INSTANCE 
    
+			
    
+			
+		
+		
    
+
+
+		
    
+			
+				
+					
+					
+					
+				
+				
+					
+				
+			
    SUBSCRIBER:
+						{{globalCustomerId}}SERVICE TYPE:
+						{{serviceType}}SERVICE INSTANCE
+						ID: {{serviceInstanceId}}
    Service Instance
+						Name: {{serviceInstanceName || "Not defined"}}
+					
    
+
+		
    
+
+
+		
    
+
+		
    
+			
+			EXISTING
+			
    
+				
    
+					
    
+						
      
+							
    1. 
+						
    
+					
    
+				
    
+
+			
    
+			AVAILABLE
+			
+						
+				
+			
    
+				
    
+					
    
+						
      
+							
    1. 
+						
    
+					
    
+				
    
+			
    
+		
    
+		
    
+		
+		
+		
+			
    +  				{{inventoryResponseItem | json}}
+			
    
+		
    
+	
    
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/createInstanceServiceModels.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/createInstanceServiceModels.htm
new file mode 100755
index 000000000..a78b95eed
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/createInstanceServiceModels.htm
@@ -0,0 +1,125 @@
+
+
+
+
    
+	
    
+
    
+
    
+
+	
+			
+			
+			
+			Error: {{status}}
+		
+	

    
+	
+	
+	 
+		
+		
+				
+				
+	 		
+			
+			
+				
+				
+	 		
+			
+			 
+    
    
+				
    	
+					
+				
    
+				    		
+					
    
+					
+						
+					
    
+				
    
+				
    	
+					
+				
    
+				    		
+					
    
+					
+						
+					
    
+				
    			
+	
+   	
    
+		         Filter:
+		          
+	
    
+
+	
+	
    
+		
+		
+		    
+				
+					
+					
+					
+					
+		            
+		            
+		            
+		            
+		            
+		        
+		    
+		    
+		        
+		        	
+	            	
+	            	
+	            	
+	            	
+	            	
+	            	
+	            	
+	            	
+		             
+		    	  
+		
    ActionUUIDInvariant UUIDNameVersionCategoryDistribution StatusLast Updated ByTosca Model
    
+		
+			
+					
+					
+	    			
+			
+		
    
+						
+					
+						Jump to page:
+		          		
+		    			Results per page: 10 
+	    				| 25 
+	    				| 50 
+	    			
+	    			 	
+					
    
+		
+	
    
+	
    
+
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/creationDialog.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/creationDialog.htm
new file mode 100755
index 000000000..0ac74a9a5
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/creationDialog.htm
@@ -0,0 +1,64 @@
+
+
+
    
+
+	
    
+		
    
+			
+			
    Create {{componentName}} -- {{createType}}
    
+		
    
+
+		
    
+			{{error}}
+		
    
+
+		
    
+			
+			
    
+				User Provided Data ( indicates required field)
+			
    
+			
+
+			
    
+				
    
+					Enter Data and Confirm to
    Create {{componentName}}
+				
    
+				
    
+					Cancel to Return to Previous Page.
    Data entered
+					will be lost
+				
    
+			
    
+
+		
    
+		
    
+			
+			
+		
    
+	
    
+
+	
    
+
+
    
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/deletionDialog.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/deletionDialog.htm
new file mode 100755
index 000000000..b4b93166b
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/deletionDialog.htm
@@ -0,0 +1,70 @@
+
+
+
    
+
+	
    
+		
    
+			
+			
    Delete {{componentName}}
    
+		
    
+
+		
    
+			{{error}}
+		
    
+
+      
+      
+      
    
+		
+        
    
+				User Provided Data ( indicates required field)
+			
    
+			
+
+			
    
+				
    
+					Enter Data and Confirm to
    Delete {{componentName}}
+				
    
+				
    
+					Cancel to Return to Previous Page.
    Data entered
+					will be lost
+				
    
+			
    
+        
    
+
+		
    
+			
+			
+			
+		
    
+	
    
+
+	
    
+
+
    
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/detailsDialog.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/detailsDialog.htm
new file mode 100755
index 000000000..0e72e772c
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/detailsDialog.htm
@@ -0,0 +1,48 @@
+
+
+
    
+
+	
    
+		
+		
    Service Instance Details
     
+	
    
+
+	
    
+		{{error}}
+	
    
+
+	
+
+	
    {{componentName}} Details
    
+
+	
+
+	
    Instantiation Transactions
    
+
+	
    {{log}}
    
+
+	
    
+		
+	
    
+
+
    
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/instantiate.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/instantiate.htm
new file mode 100755
index 000000000..e4bb67ff7
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/instantiate.htm
@@ -0,0 +1,248 @@
+
+
+
    
+
+    
    
+		
    
+		
    
+		
    
+		
    
+	
     
+	
    
+	
    
+			
+			{{status}}
+	
    
+	
+	
    {{errorMsg}}
    {{errorDetails | json}}
    
+	
+			
    View/Edit Service Instance
    
+			
+		
+		
    
+
+		
    
+			
+				
+					
+					
+					
+				
+				
+					
+				
+			
    SUBSCRIBER:
+						{{service.instance.subscriberName}}SERVICE TYPE:
+						{{service.instance.serviceType}}SERVICE INSTANCE
+						ID: {{service.instance.serviceInstanceId}}
    Service Instance
+						Name: {{service.instance.name || "Not defined"}}
+					
    
+
+		
    
+	
+	
    
+		
+		
      
+			
    1. 
+				
      
+					
+						
+					
+					SERVICE INSTANCE: {{aService.instance.name}}
+					
+						
+					
+					
      
+					  
+					  
+					
      
+					
      
+					  
+					  
+					
      
+					 
+					 
      
+					 
+					  
+					  
+					
      
+					
+						
+					
+				
      
+				
        
+					
      1. 
+						
        
+							
+								
+							
+							VNF: {{vnf.name}} | TYPE: {{vnf.nodeType}} | ORCH STATUS: {{vnf.nodeStatus}}
+							
+								
+							
+							
+							
        
+								
+							  
+							  
+							
        
+						
+							
+							
        
+								
+							  
+							  
+								
+							
        
+				
+							
        
+								
+							  
+							  
+							
        
+				
+							
        
+								
+							  
+							  
+								
+							
        
+							
+						    
+							
+								
+							
+						
        
+						
          
+							
        1. 
+								
          
+									
+										
+									
+									VFMODULE: {{vfModule.name}} | TYPE: {{vfModule.nodeType}} | ORCH STATUS: {{vfModule.nodeStatus}}
+									
+									
+										
+									
+									
          
+									
+									
          
+									
+										
+									
+								
          
+								
            
+									
          1. 
+										
            
+											VOLUME GROUP: {{volumeGroup.name}} | TYPE: {{volumeGroup.nodeType}} | ORCH STATUS: {{volumeGroup.nodeStatus}}
+											
+											
+												
+											
+										
            
+									
            2. 
+								
          
+							
          2. 
+						
        
+						
          
+							
        1. 
+								
          
+									VOLUME GROUP: {{volumeGroup.name}} | TYPE: {{volumeGroup.nodeType}} | ORCH STATUS: {{volumeGroup.nodeStatus}}
+									
+										
+									
+									
+										
+									
+								
          
+							
          2. 
+						
        
+					
        2. 
+				
      
+				
        
+					
      1. 
+						
        
+							NETWORK: {{network.name}} | TYPE: {{network.nodeType}} | ORCH	STATUS: {{network.nodeStatus}}
+							
+							
+								
+							 
+							 
+							
+								
+							
+						
        
+					
        2. 
+				
      
+			
      2. 
+		
    
+		
    
+	
    
+
    
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/msoCommit.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/msoCommit.htm
new file mode 100755
index 000000000..e3f415c45
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/msoCommit.htm
@@ -0,0 +1,47 @@
+
+
+
    
+
+	
    
+		  {{status}}
+	
    
+
+	
+
+	
    {{log}}
    
+
+	
    
+		
+	
    
+
    
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/popupWindow.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/popupWindow.htm
new file mode 100755
index 000000000..b932f25d9
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/popupWindow.htm
@@ -0,0 +1,30 @@
+
+
+
    
+
+	
+		
+	
+
    
+
    
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/serviceModels.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/serviceModels.htm
new file mode 100755
index 000000000..c0a8ee54e
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/serviceModels.htm
@@ -0,0 +1,91 @@
+
+
+
+
    
+	
    
+
    
+
    
+
+	
+			
+			
+			
+			Error: {{status}}
+		
+	

    
+
+	
    
+		         Filter:
+		          
+	
    
+
+	
    Browse SDC Service Models
    
+	
    
+		
+		
+		    
+				
+					
+					
+					
+					
+		            
+		            
+		            
+		            
+		            
+		        
+		    
+		    
+		        
+		        	
+	            	
+	            	
+	            	
+	            	
+	            	
+	            	
+	            	
+	            	
+		             
+		    	  
+		
    ActionUUIDInvariant UUIDNameVersionCategoryDistribution StatusLast Updated ByTosca Model
    
+		
+			
+					
+					
+	    			
+			
+		
    
+						
+					
+						Jump to page:
+		          		
+		    			Results per page: 10 
+	    				| 25 
+	    				| 50 
+	    			
+	    			 	
+					
    
+		
+	
    
+	
    
+
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/statusDialog.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/statusDialog.htm
new file mode 100755
index 000000000..914516b89
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/statusDialog.htm
@@ -0,0 +1,66 @@
+
+
+
    
+
+	
    
+		
+		
    VNF Update Prov Status
     
+	
    
+
+	
    
+		{{error}}
+	
    
+
+   
    
+		
    {{success}}
    
+	
    
+	
+	
+
+	
    {{componentName}} Status
    
+
+	
+
+	
    
+				Modify Prov_Status: ( indicates required field)
+			
    
+    
+
+			
    
+				
    
+					Select Target Prov Status and Submit to
    to Change the Prov Status of {{componentName}}
+				
    
+				
    
+					Close to Return to Previous Page.
    
+				
    
+			
    
+			
+   	
    
+			
+			
+		
    
+
+
    
diff --git a/vid-app-common/src/main/webapp/app/vid/styles/aaiGetSubs.css b/vid-app-common/src/main/webapp/app/vid/styles/aaiGetSubs.css
new file mode 100755
index 000000000..feabda8ed
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/styles/aaiGetSubs.css
@@ -0,0 +1,62 @@
+div[ng-controller=aaiSubscriberController] .popupContents {
+	text-align: left;
+}
+
+div[ng-controller=aaiSubscriberController] .statusLine {
+	vertical-align: center;
+}
+
+div[ng-controller=aaiSubscriberController] .statusLine img {
+	width: 20px;
+	margin: 10px;
+}
+
+div[ng-controller=aaiSubscriberController] .status {
+	margin-left: 5px;
+}
+
+div[ng-controller=aaiSubscriberController] .feedback {
+	height: 35px;
+	vertical-align: center;
+}
+
+div[ng-controller=aaiSubscriberController] .progress {
+	margin: 0px 10px;
+	font-weight: bold;
+}
+
+div[ng-controller=aaiSubscriberController] .error {
+	width: 630px;
+	font-weight: bold;
+	font-size: 16px;
+	color: red;
+	margin: 0px 10px 0px 45px;
+}
+
+div[ng-controller=aaiSubscriberController] .error img {
+	width: 25px;
+	margin: 0px 10px;
+}
+
+div[ng-controller=aaiSubscriberController] .buttonRow {
+	text-align: center;
+	margin-bottom: 10px;
+}
+
+div[ng-controller=aaiSubscriberController] .log {
+	width: 700px;
+	height: 500px;
+	border: solid black 1px;
+	text-align: left !important;
+	margin: 10px;
+	padding: 10px;
+	overflow: auto;
+}
+
+div[ng-controller=aaiSubscriberController] .aaiHidden {
+	visibility: hidden;
+}
+
+div[ng-controller=aaiSubscriberController] .aaiVisible {
+	visibility: visible;
+}
\ No newline at end of file
diff --git a/vid-app-common/src/main/webapp/app/vid/styles/aaiSubDetails.css b/vid-app-common/src/main/webapp/app/vid/styles/aaiSubDetails.css
new file mode 100755
index 000000000..feabda8ed
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/styles/aaiSubDetails.css
@@ -0,0 +1,62 @@
+div[ng-controller=aaiSubscriberController] .popupContents {
+	text-align: left;
+}
+
+div[ng-controller=aaiSubscriberController] .statusLine {
+	vertical-align: center;
+}
+
+div[ng-controller=aaiSubscriberController] .statusLine img {
+	width: 20px;
+	margin: 10px;
+}
+
+div[ng-controller=aaiSubscriberController] .status {
+	margin-left: 5px;
+}
+
+div[ng-controller=aaiSubscriberController] .feedback {
+	height: 35px;
+	vertical-align: center;
+}
+
+div[ng-controller=aaiSubscriberController] .progress {
+	margin: 0px 10px;
+	font-weight: bold;
+}
+
+div[ng-controller=aaiSubscriberController] .error {
+	width: 630px;
+	font-weight: bold;
+	font-size: 16px;
+	color: red;
+	margin: 0px 10px 0px 45px;
+}
+
+div[ng-controller=aaiSubscriberController] .error img {
+	width: 25px;
+	margin: 0px 10px;
+}
+
+div[ng-controller=aaiSubscriberController] .buttonRow {
+	text-align: center;
+	margin-bottom: 10px;
+}
+
+div[ng-controller=aaiSubscriberController] .log {
+	width: 700px;
+	height: 500px;
+	border: solid black 1px;
+	text-align: left !important;
+	margin: 10px;
+	padding: 10px;
+	overflow: auto;
+}
+
+div[ng-controller=aaiSubscriberController] .aaiHidden {
+	visibility: hidden;
+}
+
+div[ng-controller=aaiSubscriberController] .aaiVisible {
+	visibility: visible;
+}
\ No newline at end of file
diff --git a/vid-app-common/src/main/webapp/app/vid/styles/aaiSubViewEdit.css b/vid-app-common/src/main/webapp/app/vid/styles/aaiSubViewEdit.css
new file mode 100755
index 000000000..feabda8ed
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/styles/aaiSubViewEdit.css
@@ -0,0 +1,62 @@
+div[ng-controller=aaiSubscriberController] .popupContents {
+	text-align: left;
+}
+
+div[ng-controller=aaiSubscriberController] .statusLine {
+	vertical-align: center;
+}
+
+div[ng-controller=aaiSubscriberController] .statusLine img {
+	width: 20px;
+	margin: 10px;
+}
+
+div[ng-controller=aaiSubscriberController] .status {
+	margin-left: 5px;
+}
+
+div[ng-controller=aaiSubscriberController] .feedback {
+	height: 35px;
+	vertical-align: center;
+}
+
+div[ng-controller=aaiSubscriberController] .progress {
+	margin: 0px 10px;
+	font-weight: bold;
+}
+
+div[ng-controller=aaiSubscriberController] .error {
+	width: 630px;
+	font-weight: bold;
+	font-size: 16px;
+	color: red;
+	margin: 0px 10px 0px 45px;
+}
+
+div[ng-controller=aaiSubscriberController] .error img {
+	width: 25px;
+	margin: 0px 10px;
+}
+
+div[ng-controller=aaiSubscriberController] .buttonRow {
+	text-align: center;
+	margin-bottom: 10px;
+}
+
+div[ng-controller=aaiSubscriberController] .log {
+	width: 700px;
+	height: 500px;
+	border: solid black 1px;
+	text-align: left !important;
+	margin: 10px;
+	padding: 10px;
+	overflow: auto;
+}
+
+div[ng-controller=aaiSubscriberController] .aaiHidden {
+	visibility: hidden;
+}
+
+div[ng-controller=aaiSubscriberController] .aaiVisible {
+	visibility: visible;
+}
\ No newline at end of file
diff --git a/vid-app-common/src/main/webapp/app/vid/styles/angular-ui-tree.css b/vid-app-common/src/main/webapp/app/vid/styles/angular-ui-tree.css
new file mode 100755
index 000000000..8a0ea7873
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/styles/angular-ui-tree.css
@@ -0,0 +1,61 @@
+.angular-ui-tree {
+}
+
+.angular-ui-tree-empty {
+    border: 1px dashed #bbb;
+    min-height: 100px;
+    background-color: #e5e5e5;
+    background-image: -webkit-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff), -webkit-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff);
+    background-image: -moz-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff), -moz-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff);
+    background-image: linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff), linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff);
+    background-size: 60px 60px;
+    background-position: 0 0, 30px 30px;
+    pointer-events: none;
+}
+
+.angular-ui-tree-nodes {
+    position: relative;
+    margin: 0;
+    padding: 0;
+    list-style: none;
+}
+
+.angular-ui-tree-nodes .angular-ui-tree-nodes {
+    padding-left: 20px;
+}
+
+.angular-ui-tree-node, .angular-ui-tree-placeholder {
+    position: relative;
+    margin: 0;
+    padding: 0;
+    min-height: 20px;
+    line-height: 20px;
+}
+
+.angular-ui-tree-hidden {
+    display: none;
+}
+
+.angular-ui-tree-placeholder {
+    margin: 5px 0;
+    padding: 0;
+    min-height: 30px;
+}
+
+.angular-ui-tree-handle {
+    cursor: move;
+    text-decoration: none;
+    font-weight: bold;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    min-height: 20px;
+    line-height: 20px;
+}
+
+.angular-ui-tree-drag {
+    position: absolute;
+    pointer-events: none;
+    z-index: 999;
+    opacity: .8;
+}
diff --git a/vid-app-common/src/main/webapp/app/vid/styles/dialogs.css b/vid-app-common/src/main/webapp/app/vid/styles/dialogs.css
new file mode 100755
index 000000000..f199aaa0d
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/styles/dialogs.css
@@ -0,0 +1,133 @@
+/*
+ * Common style sheet for the pop-up dialogs.
+ */
+
+/*
+ * Common style settings ...
+ */
+.popupContents .titleLine img {
+	float: left;
+	margin: 5px;
+	width: 20px;
+}
+
+.popupContents .titleLine>h3 {
+	display: inline-block;
+	padding-right: 40px;
+}
+
+.popupContents .requiredIndicator {
+	width: 14px;
+	padding-bottom: 5px;
+}
+
+.popupContents div[control=summaryControl] {
+	display: inline-block;
+	width: 600px;
+	margin: 0px 10px 10px 10px;
+}
+
+.popupContents div[control=detailsControl], .popupContents div[control=userProvidedControl]
+	{
+	display: inline-block;
+	border: solid black 1px;
+	margin: 10px;
+	padding: 10px;
+	max-height: 300px;
+	width: 600px;
+	overflow: auto;
+}
+
+.popupContents .prompt {
+	margin: 10px;
+}
+
+.popupContents .prompt p {
+	margin: 5px;
+}
+
+.popupContents .prompt span {
+	font-weight: bold;
+}
+
+.popupContents .statusLine {
+	vertical-align: center;
+}
+
+.popupContents .statusLine img {
+	width: 20px;
+	margin: 10px;
+}
+
+.popupContents .status {
+	margin-left: 5px;
+}
+
+.popupContents .feedback {
+	height: 35px;
+	vertical-align: center;
+}
+
+.popupContents .progress {
+	margin: 0px 10px;
+}
+
+.popupContents .error {
+	width: 630px;
+	text-align: left;
+	font-weight: bold;
+	font-size: 16px;
+	color: red;
+	margin: 0px 10px 0px 45px;
+	font-weight: bold;
+}
+
+.popupContents .error img {
+	width: 25px;
+	margin: 0px 10px;
+}
+
+.popupContents .buttonRow {
+	text-align: center;
+	margin-bottom: 10px;
+}
+
+.popupContents .log {
+	width: 700px;
+	height: 500px;
+	border: solid black 1px;
+	text-align: left !important;
+	margin: 10px;
+	padding: 10px;
+	overflow: auto;
+}
+
+::-webkit-input-placeholder {
+	text-align: center;
+}
+
+::-moz-placeholder {
+	text-align: center;
+}
+
+:-ms-input-placeholder {
+	text-align: center;
+}
+
+/*
+ * Styling for specific screens ...
+ */
+div[ng-controller=detailsDialogController] .log {
+	height: 200px;
+}
+
+/*
+ * Styling for specific screens ...
+ */
+div[ng-controller=statusDialogController] .log {
+	height: 200px;
+}
+
+div[ng-controller=msoCommitController] {
+	text-align: left;
+}
\ No newline at end of file
diff --git a/vid/src/main/webapp/app/fusion/scripts/directives/dummy.txt b/vid-app-common/src/main/webapp/app/vid/styles/dummy.txt
old mode 100644
new mode 100755
similarity index 100%
rename from vid/src/main/webapp/app/fusion/scripts/directives/dummy.txt
rename to vid-app-common/src/main/webapp/app/vid/styles/dummy.txt
diff --git a/vid-app-common/src/main/webapp/app/vid/styles/instantiate.css b/vid-app-common/src/main/webapp/app/vid/styles/instantiate.css
new file mode 100755
index 000000000..13e2cf0a5
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/styles/instantiate.css
@@ -0,0 +1,62 @@
+div[ng-controller=InstantiationController] .popupContents {
+	text-align: left;
+}
+
+div[ng-controller=InstantiationController] .statusLine {
+	vertical-align: center;
+}
+
+div[ng-controller=InstantiationController] .statusLine img {
+	width: 20px;
+	margin: 10px;
+}
+
+div[ng-controller=InstantiationController] .status {
+	margin-left: 5px;
+}
+
+div[ng-controller=InstantiationController] .feedback {
+	height: 35px;
+	vertical-align: center;
+}
+
+div[ng-controller=InstantiationController] .progress {
+	margin: 0px 10px;
+	font-weight: bold;
+}
+
+div[ng-controller=InstantiationController] .error {
+	width: 630px;
+	font-weight: bold;
+	font-size: 16px;
+	color: red;
+	margin: 0px 10px 0px 45px;
+}
+
+div[ng-controller=InstantiationController] .error img {
+	width: 25px;
+	margin: 0px 10px;
+}
+
+div[ng-controller=InstantiationController] .buttonRow {
+	text-align: center;
+	margin-bottom: 10px;
+}
+
+div[ng-controller=InstantiationController] .log {
+	width: 700px;
+	height: 500px;
+	border: solid black 1px;
+	text-align: left !important;
+	margin: 10px;
+	padding: 10px;
+	overflow: auto;
+}
+
+div[ng-controller=InstantiationController] .aaiHidden {
+	visibility: hidden;
+}
+
+div[ng-controller=InstantiationController] .aaiVisible {
+	visibility: visible;
+}
\ No newline at end of file
diff --git a/vid-app-common/src/main/webapp/app/vid/styles/serviceModels.css b/vid-app-common/src/main/webapp/app/vid/styles/serviceModels.css
new file mode 100755
index 000000000..0a642993e
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/styles/serviceModels.css
@@ -0,0 +1,70 @@
+div[ng-controller=ServiceModelController] .popupContents {
+	text-align: left;
+}
+
+div[ng-controller=ServiceModelController] .statusLine {
+	vertical-align: center;
+}
+
+div[ng-controller=ServiceModelController] .statusLine img {
+	width: 20px;
+	margin: 10px;
+}
+
+div[ng-controller=ServiceModelController] .status {
+	margin-left: 5px;
+}
+
+div[ng-controller=ServiceModelController] .feedback {
+	height: 35px;
+	vertical-align: center;
+}
+
+div[ng-controller=ServiceModelController] .progress {
+	margin: 0px 10px;
+	font-weight: bold;
+}
+
+div[ng-controller=ServiceModelController] .error {
+	width: 630px;
+	font-weight: bold;
+	font-size: 16px;
+	color: red;
+	margin: 0px 10px 0px 45px;
+}
+
+div[ng-controller=ServiceModelController] .error img {
+	width: 25px;
+	margin: 0px 10px;
+}
+
+div[ng-controller=ServiceModelController] .buttonRow {
+	text-align: center;
+	margin-bottom: 10px;
+}
+
+div[ng-controller=ServiceModelController] .log {
+	width: 700px;
+	height: 500px;
+	border: solid black 1px;
+	text-align: left !important;
+	margin: 10px;
+	padding: 10px;
+	overflow: auto;
+}
+
+div[ng-controller=ServiceModelController] .smcHidden {
+	visibility: hidden;
+}
+
+div[ng-controller=ServiceModelController] .smcVisible {
+	visibility: visible;
+}
+
+div[ng-controller=ServiceModelController] .progHidden {
+	visibility: hidden;
+}
+
+div[ng-controller=ServiceModelController] .progVisible {
+	visibility: visible;
+}
\ No newline at end of file
diff --git a/vid-app-common/src/main/webapp/app/vid/styles/subscriberSearch.css b/vid-app-common/src/main/webapp/app/vid/styles/subscriberSearch.css
new file mode 100755
index 000000000..461de01a1
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/styles/subscriberSearch.css
@@ -0,0 +1,8 @@
+div[ng-controller=aaiSubscriberSearchController] button {
+	width: 200px;
+	margin: 3px;
+}
+
+h3 {
+	margin-bottom: 5px;
+}
diff --git a/vid-app-common/src/main/webapp/app/vid/styles/vidTree.css b/vid-app-common/src/main/webapp/app/vid/styles/vidTree.css
new file mode 100755
index 000000000..1aec73d81
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/styles/vidTree.css
@@ -0,0 +1,67 @@
+
+.btn {
+    margin-right: 8px;
+}
+
+.angular-ui-tree-handle {
+    background: #f8faff;
+    border: 1px solid #dae2ea;
+    color: #7c9eb2;
+    padding: 10px 10px;
+}
+
+.angular-ui-tree-handle:hover {
+    color: #438eb9;
+    background: #f4f6f7;
+    border-color: #dce2e8;
+}
+
+.angular-ui-tree-placeholder {
+    background: #f0f9ff;
+    border: 2px dashed #bed2db;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+}
+
+tr.angular-ui-tree-empty {
+    height:100px
+}
+
+.group-title {
+    background-color: #687074 !important;
+    color: #FFF !important;
+}
+
+
+/* --- Tree --- */
+.tree-node {
+    border: 1px solid #dae2ea;
+    background: #f8faff;
+    color: #7c9eb2;
+}
+
+.nodrop {
+    background-color: #f2dede;
+}
+
+.tree-node-content {
+    margin: 10px;
+}
+.tree-handle {
+    padding: 10px;
+    background: #428bca;
+    color: #FFF;
+    margin-right: 10px;
+}
+
+.angular-ui-tree-handle:hover {
+}
+
+.angular-ui-tree-placeholder {
+    background: #f0f9ff;
+    border: 2px dashed #bed2db;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+}
\ No newline at end of file
diff --git a/vid-app-common/src/main/webapp/app/vid/test/testAaiData.js b/vid-app-common/src/main/webapp/app/vid/test/testAaiData.js
new file mode 100755
index 000000000..95dd158ff
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/test/testAaiData.js
@@ -0,0 +1,254 @@
+var exampleServiceModelInfo = {
+    modelInvariantId : "SERVICE_INVARIANT_ID_c99-b43e0d88a9a1",
+    modelNameVersionId : "SERVICE_NAME_VERSION_ID-4d54-8548-5d0ed23e962b",
+    modelName : "SERVICE_NAME_DE220127",
+    modelVersion : "SERVICE_VERSION_0.1"
+};
+
+var exampleVnfModelInfo = {
+    modelInvariantId : "VNF_INVARIANT_ID_c99-b43e0d88a9a1",
+    modelNameVersionId : "VNF_NAME_VERSION_ID-4d54-8548-5d0ed23e962b",
+    modelName : "VNF_NAME_DE220127",
+    modelVersion : "VNF_VERSION_0.1"
+};
+
+var exampleVfModuleModelInfo = {
+    modelInvariantId : "VF_MODULE_INVARIANT_ID_c99-b43e0d88a9a1",
+    modelNameVersionId : "VF_MODULE_NAME_VERSION_ID-4d54-8548-5d0ed23e962b",
+    modelName : "VF_MODULE_NAME_DE220127",
+    modelVersion : "VF_MODULE_VERSION_0.1"
+};
+
+var exampleVolumeGroupModelInfo = {
+    modelInvariantId : "VOLUME_GROUP_INVARIANT_ID_c99-b43e0d88a9a1",
+    modelNameVersionId : "VOLUME_GROUP_NAME_VERSION_ID-4d54-8548-5d0ed23e962b",
+    modelName : "VOLUME_GROUP_NAME_DE220127",
+    modelVersion : "VOLUME_GROUP_VERSION_0.1"
+};
+
+var exampleAvailableVolumeGroupList = [ "Volume Group Alpha",
+	"Volume Group Baker", "Volume Group Charlie" ];
+
+var exampleNetworkModelInfo = {
+    modelInvariantId : "NETWORK_INVARIANT_ID_c99-b43e0d88a9a1",
+    modelNameVersionId : "NETWORK_NAME_VERSION_ID-4d54-8548-5d0ed23e962b",
+    modelName : "NETWORK_NAME_DE220127",
+    modelVersion : "NETWORK_VERSION_0.1"
+};
+
+var exampleCloudRegionTenantList = [ {
+    cloudRegionId : "LEGACYREGION",
+    tenantId : "ebe382f38e414b4dbf45b408c7e5bf9f",
+    tenantName : "vMOG-AKRON-123"
+}, {
+    cloudRegionId : "LEGACYREGION",
+    tenantId : "abcdefhi38e414b4dbf45b408c7e5bf9f",
+    tenantName : "tenant 2"
+}, {
+    cloudRegionId : "LEGACYREGION",
+    tenantId : "rstuvwzyx38e414b4dbf45b408c7e5bf9f",
+    tenantName : "tenant 3"
+}, {
+    cloudRegionId : "cloudR2",
+    tenantId : "jklmnop38e414b4dbf45b408c7e5bf9f",
+    tenantName : "tenant4"
+}, {
+    cloudRegionId : "cloudR2",
+    tenantId : "qurstuv38e414b4dbf45b408c7e5bf9f",
+    tenantName : "tenant 5"
+}, {
+    cloudRegionId : "cloudR3",
+    tenantId : "zyxw38e414b4dbf45b408c7e5bf9f",
+    tenantName : "tenant 6"
+} ];
+
+var exampleServiceIdList = [ {
+    id : "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+    description : "Mobility"
+}, {
+    id : "e433710f-9217-458d-a79d-1c7aff376d89",
+    description : "VIRTUAL USP"
+}, {
+    id : "c7611ebe-c324-48f1-8085-94aef0c6ef3d",
+    description : "HOSTED COMMUNICATIONS"
+} ];
+
+var exampleServiceItem = {
+    "generic-service" : {
+	"service-id" : "415d4d6c-19e8-44ed-bd28-28d41c5b5185",
+	"service-name" : "ZRDM1MMSC01",
+	"service-type" : "vMMSC Svc Jul 12/vMMSC VOLUME VF new Jul 12 13",
+	"service-id" : "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+	"orchestration-status" : "active",
+	"in-maint" : false,
+	"is-closed-loop-disabled" : false,
+	"resource-version" : "1469558690",
+	"persona-model-id" : "1fe5c0e1-7ae8-4a3b-bf06-e64b9fa7e7c9",
+	"persona-model-version" : "1.0"
+    }
+};
+
+var exampleVfModuleItem = {
+    "generic-vfModule" : {
+	"vfModule-id" : "415d4d6c-19e8-44ed-bd28-28d41c5b5185",
+	"vfModule-name" : "ZRDM1MMSC01",
+	"vfModule-type" : "vMMSC Svc Jul 12/vMMSC VOLUME VF new Jul 12 13",
+	"vfModule-id" : "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+	"orchestration-status" : "active",
+	"in-maint" : false,
+	"is-closed-loop-disabled" : false,
+	"resource-version" : "1469558690",
+	"persona-model-id" : "1fe5c0e1-7ae8-4a3b-bf06-e64b9fa7e7c9",
+	"persona-model-version" : "1.0"
+    }
+};
+
+var exampleVolumeGroupItem = {
+    "generic-volumeGroup" : {
+	"volumeGroup-id" : "415d4d6c-19e8-44ed-bd28-28d41c5b5185",
+	"volumeGroup-name" : "ZRDM1MMSC01",
+	"volumeGroup-type" : "vMMSC Svc Jul 12/vMMSC VOLUME VF new Jul 12 13",
+	"volumeGroup-id" : "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+	"orchestration-status" : "active",
+	"in-maint" : false,
+	"is-closed-loop-disabled" : false,
+	"resource-version" : "1469558690",
+	"persona-model-id" : "1fe5c0e1-7ae8-4a3b-bf06-e64b9fa7e7c9",
+	"persona-model-version" : "1.0"
+    }
+};
+
+var exampleNetworkItem = {
+    "generic-network" : {
+	"network-id" : "415d4d6c-19e8-44ed-bd28-28d41c5b5185",
+	"network-name" : "ZRDM1MMSC01",
+	"network-type" : "vMMSC Svc Jul 12/vMMSC VOLUME VF new Jul 12 13",
+	"network-id" : "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+	"orchestration-status" : "active",
+	"in-maint" : false,
+	"is-closed-loop-disabled" : false,
+	"resource-version" : "1469558690",
+	"persona-model-id" : "1fe5c0e1-7ae8-4a3b-bf06-e64b9fa7e7c9",
+	"persona-model-version" : "1.0"
+    }
+};
+
+/*
+ * Sample query provided by Jimmy on 8/11/16.
+ */
+
+var exampleAaiResult = {
+    "service-instance" : {
+	"service-instance-id" : "mmsc-test-service-instance",
+	"resource-version" : "1470921501"
+    },
+    "extra-properties" : {},
+    "inventory-response-items" : {
+	"inventory-response-item" : [ {
+	    "generic-vnf" : {
+		"vnf-id" : "415d4d6c-19e8-44ed-bd28-28d41c5b5185",
+		"vnf-name" : "ZRDM1MMSC01",
+		"vnf-type" : "vMMSC Svc Jul 12/vMMSC VOLUME VF new Jul 12 13",
+		"service-id" : "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+		"orchestration-status" : "active",
+		"in-maint" : false,
+		"is-closed-loop-disabled" : false,
+		"resource-version" : "1469558690",
+		"persona-model-id" : "1fe5c0e1-7ae8-4a3b-bf06-e64b9fa7e7c9",
+		"persona-model-version" : "1.0"
+	    },
+	    "extra-properties" : {},
+	    "inventory-response-items" : {
+		"inventory-response-item" : [ {
+		    "vf-module" : {
+			"vf-module-id" : "4dd25057-0b2b-4255-b9cd-669443c9b470",
+			"vf-module-name" : "ZRDM1MMSC01_base",
+			"heat-stack-id" : "ZRDM1MMSC01_base/6261554c-6c34-4604-b91c-68afd148a096",
+			"orchestration-status" : "active",
+			"is-base-vf-module" : true,
+			"resource-version" : "1469559159",
+			"persona-model-id" : "6e3b9ac7-cb21-4f39-99ba-f248ba2a597a",
+			"persona-model-version" : "1"
+		    },
+		    "extra-properties" : {},
+		    "inventory-response-items" : {
+			"inventory-response-item" : [
+				{
+				    "l3-network" : {
+					"network-id" : "b13635a1-5ab8-4dee-9598-768a83eea099",
+					"network-name" : "MMS-24413-LAB-vMMSC-01_int_eca_mgmt_net_1",
+					"network-type" : "CONTRAIL_BASIC",
+					"network-role" : "int_eca_mgmt",
+					"network-technology" : "contrail",
+					"neutron-network-id" : "07919187-754f-49c2-abb3-9888cfd8ec7d",
+					"is-bound-to-vpn" : false,
+					"service-id" : "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+					"network-role-instance" : 0,
+					"resource-version" : "1469558694",
+					"orchestration-status" : "active",
+					"heat-stack-id" : "MMS-24413-LAB-vMMSC-01_int_eca_mgmt_net_1/8d34d139-c95f-4d80-86df-d7d13af01067"
+				    },
+				    "extra-properties" : {},
+				    "inventory-response-items" : {}
+				},
+				{
+				    "l3-network" : {
+					"network-id" : "44e0d9e0-9334-4ec6-9344-07a96dac629f",
+					"network-name" : "dmz_protected_net_0",
+					"network-type" : "CONTRAIL_EXTERNAL",
+					"network-role" : "dmz_protected",
+					"network-technology" : "contrail",
+					"neutron-network-id" : "1ad6b2c5-97d0-4298-b016-7e28939e0baf",
+					"is-bound-to-vpn" : false,
+					"service-id" : "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+					"resource-version" : "1469563787",
+					"orchestration-status" : "active",
+					"heat-stack-id" : "dmz_protected_net_0/3f93df5c-f4f1-484f-a269-12d3a6b1ec82"
+				    },
+				    "extra-properties" : {},
+				    "inventory-response-items" : {}
+				},
+				{
+				    "l3-network" : {
+					"network-id" : "ac49d99b-5daf-4624-9f8e-188b126ea166",
+					"network-name" : "cor_direct_net_0",
+					"network-type" : "CONTRAIL_BASIC",
+					"network-role" : "cor_direct",
+					"network-technology" : "contrail",
+					"neutron-network-id" : "ac49d99b-5daf-4624-9f8e-188b126ea166",
+					"is-bound-to-vpn" : false,
+					"service-id" : "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+					"network-role-instance" : 0,
+					"resource-version" : "1470846979",
+					"orchestration-status" : "active",
+					"heat-stack-id" : "",
+					"mso-catalog-key" : ""
+				    },
+				    "extra-properties" : {},
+				    "inventory-response-items" : {}
+				},
+				{
+				    "l3-network" : {
+					"network-id" : "c597ab81-fece-49f4-a4f5-710cebb13c29",
+					"network-name" : "oam_protected_net_0",
+					"network-type" : "CONTRAIL_BASIC",
+					"network-role" : "oam_protected",
+					"network-technology" : "contrail",
+					"neutron-network-id" : "c597ab81-fece-49f4-a4f5-710cebb13c29",
+					"is-bound-to-vpn" : false,
+					"service-id" : "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+					"network-role-instance" : 0,
+					"resource-version" : "1470846979",
+					"orchestration-status" : "active",
+					"heat-stack-id" : "",
+					"mso-catalog-key" : ""
+				    },
+				    "extra-properties" : {},
+				    "inventory-response-items" : {}
+				} ]
+		    }
+		} ]
+	    }
+	} ]
+    }
+};
diff --git a/vid-app-common/src/main/webapp/app/vid/test/testMso.css b/vid-app-common/src/main/webapp/app/vid/test/testMso.css
new file mode 100755
index 000000000..b0844ee7a
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/test/testMso.css
@@ -0,0 +1,22 @@
+div[ng-controller=testController] button {
+	width: 200px;
+	margin: 3px;
+}
+
+h3 {
+	margin-bottom: 5px;
+}
+
+ol, li {
+	list-style-type: decimal !important;
+}
+
+div[ng-controller=testController]>div>span {
+	font-size: 20px;
+	margin-left: 10px;
+}
+
+div[ng-controller=testController] input[type=checkbox] {
+	height: 20px;
+	width: 20px;
+}
\ No newline at end of file
diff --git a/vid-app-common/src/main/webapp/app/vid/test/testMso.js b/vid-app-common/src/main/webapp/app/vid/test/testMso.js
new file mode 100755
index 000000000..884ba8d87
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/test/testMso.js
@@ -0,0 +1,486 @@
+"use strict";
+
+app.config(function($logProvider){
+    // Optionally set to "false" to disable debug logging.
+    $logProvider.debugEnabled(true);
+});
+
+app.controller("testController", [ "$scope", "$timeout", "$cookieStore", "$log", "COMPONENT", "DataService", "PropertyService",
+    function($scope, $timeout, $cookieStore, $log, COMPONENT, DataService, PropertyService) {
+
+		$scope.popup = new Object();
+		$scope.isTestMode = false;
+
+		$scope.init = function(properties) {
+	    		/*
+	    		 * These 2 statements should be included in non-test code.
+	    		 */
+			PropertyService.setMsoMaxPollingIntervalMsec(properties.msoMaxPollingIntervalMsec);
+			PropertyService.setMsoMaxPolls(properties.msoMaxPolls);
+
+			/*
+			 * "setTestMode" is only used for testing.
+			 */
+
+			setTestMode();
+			
+			DataService.setSubscriberName("Mobility");
+			DataService.setGlobalCustomerId("CUSTID12345")
+			DataService.setServiceType("Mobility Type 1");
+			DataService.setServiceName("Mobility Service 1");
+			DataService.setServiceInstanceId("mmsc-test-service-instance");
+			DataService.setVnfInstanceId("abcd-12345-56789");
+			DataService.setVfModuleInstanceId("xye-99990123213");
+		}
+		
+		var TEST_MODE_COOKIE = "isTestModeEnabled";
+
+		var defaultMsoBaseUrl = PropertyService.getMsoBaseUrl();
+
+		var setTestMode = function() {
+		    setTestMsoMode($cookieStore.get(TEST_MODE_COOKIE));
+		    PropertyService.setMsoMaxPollingIntervalMsec(1000);
+		    PropertyService.setMsoMaxPolls(7);
+		    PropertyService.setServerResponseTimeoutMsec(10000);
+		};
+
+		$scope.testMsoModeChanged = function() {
+		    setTestMsoMode($scope.isTestMsoMode);
+		};
+
+		var setTestMsoMode = function(isEnabled) {
+		    $scope.isTestMsoMode = isEnabled;
+		    $cookieStore.put(TEST_MODE_COOKIE, isEnabled);
+		    if (isEnabled) {
+			PropertyService.setMsoBaseUrl("testmso");
+		    } else {
+			PropertyService.setMsoBaseUrl(defaultMsoBaseUrl);
+		    }
+		}
+		
+		$scope.autoStartCommitTest = function() {
+			/*
+			 * Optionally comment in / out one of these method calls (or add a similar
+			 * entry) to auto-invoke an entry when the test screen is redrawn.
+			 */
+			$timeout(function() {
+				// $scope.createServiceInstance();
+				// $scope.deleteServiceInstance();
+				// $scope.generateInvalidUrl404();			
+			}, 500);
+		}
+		
+		$scope.autoStartQueryTest = function() {
+			/*
+			 * Optionally comment in / out one of these method calls (or add a similar
+			 * entry) to auto-invoke an entry when the test screen is redrawn.
+			 */
+			$timeout(function() {
+				// $scope.queryServiceInstance();
+			}, 500);
+		}
+		
+		$scope.queryServiceInstance = function() {
+			/*
+			 * Example of method call needed to show service instance details.
+			 */
+			$scope.$broadcast("showComponentDetails", {
+			    componentId : COMPONENT.SERVICE
+			});
+		}
+	
+		$scope.createServiceInstance = function() {
+			/*
+			 * Example of method call needed to commit an instance creation request.
+			 */
+			$scope.$broadcast("createInstance", {
+				url : "mso_create_svc_instance",
+				requestDetails : createServiceRequestDetails
+			});
+		}
+	
+		$scope.deleteServiceInstance = function() {
+			/*
+			 * Example of method call needed to commit an instance deletion request.
+			 */
+			$scope.$broadcast("deleteInstance",	{
+				url : "mso_delete_svc_instance/bc305d54-75b4-431b-adb2-eb6b9e546014",
+				requestDetails : deleteServiceRequestDetails
+			});
+		}
+	
+		$scope.createVNFInstance = function() {
+			/*
+			 * Example of method call needed to commit an instance creation request.
+			 */
+			$scope.$broadcast("createInstance", {
+				url : "mso_create_vnf_instance/bc305d54-75b4-431b-adb2-eb6b9e546099",
+				requestDetails : createVnfRequestDetails
+			});
+		}
+	
+		$scope.deleteVNFInstance = function() {
+			/*
+			 * Example of method call needed to commit an instance deletion request.
+			 */
+			$scope.$broadcast("deleteInstance",	{
+				url : "mso_delete_vnf_instance/bc305d54-75b4-431b-adb2-eb6b9e546014/vnfs/ab9000-0009-9999",
+				requestDetails : deleteVnfRequestDetails
+			});
+		}
+		
+		$scope.createVolumeGroupInstance = function() {
+			/*
+			 * Example of method call needed to commit an instance creation request.
+			 */
+			$scope.$broadcast("createInstance", {
+				url : "mso_create_volumegroup_instance/bc305d54-75b4-431b-adb2-eb6b9e546099/vnfs/fe305d54-75b4-431b-adb2-eb6b9e546fea",
+				requestDetails : createVolumeGroupRequestDetails
+			});
+		}
+	
+		$scope.deleteVolumeGroupInstance = function() {
+			/*
+			 * Example of method call needed to commit an instance deletion request.
+			 */
+			$scope.$broadcast("deleteInstance",	{
+				url : "mso_delete_volumegroup_instance/bc305d54-75b4-431b-adb2-eb6b9e546014/vnfs/fe305d54-75b4-431b-adb2-eb6b9e546fea/volumeGroups/fe9000-0009-9999",
+				requestDetails : deleteVolumeGroupRequestDetails
+			});
+		}
+		$scope.createVFModuleInstance = function() {
+			/*
+			 * Example of method call needed to commit an instance creation request.
+			 */
+			$scope.$broadcast("createInstance", {
+				url : "mso_create_vfmodule_instance/bc305d54-75b4-431b-adb2-eb6b9e546099/vnfs/111-111-111-111",
+				requestDetails : createVFModuleRequestDetails
+			});
+		}
+	
+		$scope.deleteVFModuleInstance = function() {
+			/*
+			 * Example of method call needed to commit an instance deletion request.
+			 * 
+			 */
+			$scope.$broadcast("deleteInstance",	{
+				url : "mso_delete_vfmodule_instance/2/vnfs/ab/vfModules/a1",
+				requestDetails : deleteVFModuleRequestDetails
+			});
+		}
+		$scope.createNetworkInstance = function() {
+			$scope.$broadcast("createInstance", {
+				url : "mso_create_nw_instance/789098877777",
+				requestDetails : createNetworkRequestDetails
+			});
+		}
+	
+		$scope.deleteNetworkInstance = function() {
+			$scope.$broadcast("deleteInstance",	{
+				url : "mso_delete_nw_instance/bc305d54-75b4-431b-adb2-eb6b9e546014/networks/ff305d54-75b4-ff1b-fff1-eb6b9e5460ff",
+				requestDetails : deleteNetworkRequestDetails
+			});
+		}
+	
+		$scope.generateError = function(testName) {
+			// Clone example request object
+			var request = JSON.parse(JSON.stringify(createServiceRequestDetails));
+			request.modelInfo.modelName = testName;
+			$scope.$broadcast("createInstance", {
+				url : "mso_create_svc_instance",
+				requestDetails : request
+			});
+		}
+	
+		$scope.generateInvalidUrl404 = function() {
+		    	var baseUrl = PropertyService.getMsoBaseUrl();
+		    	PropertyService.setMsoBaseUrl("/INVALID_STRING/");
+
+			$scope.$broadcast("createInstance", {
+				url : "mso_create_svc_instance",
+				requestDetails : createServiceRequestDetails,
+				callbackFunction : function() {
+				    PropertyService.setMsoBaseUrl(baseUrl);
+				    $scope.popup.isVisible = false;
+				}
+			});	
+		}
+	
+		$scope.generateInvalidUrl405 = function() {
+			$scope.$broadcast("createInstance", {
+				url : "INVALID_STRING_mso_create_svc_instance",
+				requestDetails : createServiceRequestDetails
+			});
+		}
+	
+		/*
+		 * Test data objects:
+		 */
+		/*var requestParameters = {
+				"subscriptionServiceType":"ef5256d1-5a33-aadf-13ab-12abad84e764",
+				"userParams":[{"name":"goldenr","value":"Willie"}, {"name":"lab","value":"Jackson"}, {"name":"goldend","value":"Max"}]} */
+		var requestParameters = { "subscriptionServiceType":"ef5256d1-5a33-aadf-13ab-12abad84e764", userParams:[] };
+		var requestInfo = {
+				instanceName: "sn5256d1-5a33-55df-13ab-12abad84e764",
+				productFamilyId: "sn5256d1-5a33-55df-13ab-12abad84edde",
+				source: "VID",
+				suppressRollback: true
+		};
+		var subscriberInfo = {
+			globalSubscriberId : "C12345",
+			subscriberName : "General Electric Division 12"
+		};
+	
+		var cloudConfiguration = {
+				lcpCloudRegionId: "cloudregion1",
+				tenantId: "df5256d1-5a33-55df-13ab-12abad843456"
+				
+		};
+		var createServiceRequestDetails = {
+			modelInfo : {
+				modelType : "service",
+				modelInvariantId : "sn5256d1-5a33-55df-13ab-12abad84e764",
+				modelNameVersionId : "ab6478e4-ea33-3346-ac12-ab121484adca",
+				modelName : "WanBonding",
+				modelVersion : "1",
+				modelCustomizationName: ""
+			},
+			subscriberInfo : subscriberInfo,
+			requestInfo : requestInfo,
+			requestParameters : requestParameters
+		};
+	
+		var deleteServiceRequestDetails = {
+				modelInfo : {
+					modelType : "service",
+					modelInvariantId : "sn5256d1-5a33-55df-13ab-12abad84e764",
+					modelNameVersionId : "ab6478e4-ea33-3346-ac12-ab121484adca",
+					modelName : "WanBonding",
+					modelVersion : "1",
+					modelCustomizationName: ""
+				},
+				requestInfo : requestInfo
+		};
+		
+		var createVFModuleRequestDetails = {
+				modelInfo : {
+					modelType : "VFModule",
+					modelInvariantId : "ab5256d1-5a33-55df-13ab-12abad84e764",
+					modelNameVersionId : "9b6478e4-ea33-3346-ac12-ab121484adc2",
+					modelName : "model1",
+					modelVersion : "1",
+					modelCustomizationName: ""
+				},
+				cloudConfiguration: cloudConfiguration,
+				requestInfo : requestInfo,
+				relatedInstanceList: [
+										{
+										    relatedInstance: {
+										       instanceId: "c3514e3-5a33-55df-13ab-12abad84e7cc",
+										       modelInfo: {   
+										          modelType: "volumeGroup",
+										          modelInvariantId: "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+										          modelNameVersionId: "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+										          modelName: "parentServiceModelName",
+										          modelVersion: "1.0"
+										       }
+										    }
+										 },
+				                        {
+				                           relatedInstance: {
+				                              instanceId: "c3514e3-5a33-55df-13ab-12abad84e7cc",
+				                              modelInfo: {   
+				                                 modelType: "service",
+				                                 modelInvariantId: "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+				                                 modelNameVersionId: "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+				                                 modelName: "parentServiceModelName",
+				                                 modelVersion: "1.0"
+				                              }
+				                           }
+				                        },
+				                        {
+				                           relatedInstance: {
+				                              instanceId: "fab256d1-5a33-55df-13ab-12abad8445ff34",
+				                              modelInfo: {
+				                                 modelType: "vnf",
+				                                 modelInvariantId: "ff5256d1-5a33-55df-13ab-12abad84e7ff",
+				                                 modelNameVersionId: "fe6478e4-ea33-3346-ac12-ab121484a3fe",
+				                                 modelName: "vSAMP12",
+				                                 modelVersion: "1.0",
+				                                 modelCustomizationName: "vSAMP12 1"
+				                              }
+				                           }
+				                        }
+
+				                     ],
+				                     requestParameters : requestParameters
+			};
+		
+			var deleteVFModuleRequestDetails = {
+					modelInfo : {
+						modelType : "VFModule",
+						modelInvariantId : "ab5256d1-5a33-55df-13ab-12abad84e764",
+						modelNameVersionId : "9b6478e4-ea33-3346-ac12-ab121484adc2",
+						modelName : "model1",
+						modelVersion : "1",
+						modelCustomizationName: ""
+					},
+					cloudConfiguration: cloudConfiguration,
+					requestInfo : requestInfo,
+					
+			};
+			
+		var createVnfRequestDetails = {
+				modelInfo : {
+					modelType : "vnf",
+					modelInvariantId : "ab5256d1-5a33-55df-13ab-12abad84efc2",
+					modelNameVersionId : "9b6478e4-ea33-3346-ac12-ab1214847890",
+					modelName : "model1",
+					modelVersion : "1",
+					modelCustomizationName: ""
+				},
+				requestInfo : requestInfo,
+				cloudConfiguration : cloudConfiguration,
+				relatedInstanceList: [
+					{
+					    relatedInstance: {
+					       instanceId: "c3514e3-5a09-55df-13ab-1babad84e7cc",
+					       modelInfo: {   
+					          modelType: "service",
+					          modelInvariantId: "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+					          modelNameVersionId: "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+					          modelName: "parentServiceModelName",
+					          modelVersion: "1.0"
+					       }
+					    }
+					 }
+					]
+			};
+		
+			var deleteVnfRequestDetails = {
+					modelInfo : {
+						modelType : "vnf",
+						modelInvariantId : "ab5256d1-5a33-55df-13ab-12abad84efc2",
+						modelNameVersionId : "9b6478e4-ea33-3346-ac12-ab1214847890",
+						modelName : "model1",
+						modelVersion : "1",
+						modelCustomizationName: ""
+					},
+					cloudConfiguration : cloudConfiguration,
+					requestInfo : requestInfo	
+			};
+			var createVolumeGroupRequestDetails = {
+				modelInfo : {
+						modelType : "volumeGroup",
+						modelInvariantId : "ab5256d1-5a33-55df-13ab-12abad84efda",
+						modelNameVersionId : "9b6478e4-ea33-3346-ac12-ab12148478fa",
+						modelName : "model1",
+						modelVersion : "1",
+						modelCustomizationName: ""
+					},
+					cloudConfiguration : cloudConfiguration,
+					requestInfo : requestInfo,
+					relatedInstanceList: [
+                      {
+                    	  relatedInstance: {
+                    		  instanceId: "c3514e3-5a33-55df-13ab-12abad84e7cc",
+                    		  modelInfo: {   
+                    			  modelType: "service",
+                    			  modelInvariantId: "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+                    			  modelNameVersionId: "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+                    			  modelName: "parentServiceModelName",
+                    			  modelVersion: "1.0"
+                    		  }
+                    	  }
+                      },
+                      {
+                    	  relatedInstance: {
+                    		  instanceId: "fab256d1-5a33-55df-13ab-12abad8445ff34",
+                    		  modelInfo: {
+                    			  modelType: "vnf",
+                    			  modelInvariantId: "ff5256d1-5a33-55df-13ab-12abad84e7ff",
+                    			  modelNameVersionId: "fe6478e4-ea33-3346-ac12-ab121484a3fe",
+                    			  modelName: "vSAMP12",
+                    			  modelVersion: "1.0",
+                    			  modelCustomizationName: "vSAMP12 1"
+                    		  }
+                    	  }
+                      }
+                      ]
+
+				};
+			
+				var deleteVolumeGroupRequestDetails = {
+					modelInfo : {
+						modelType : "volumeGroup",
+						modelInvariantId : "ab5256d1-5a33-55df-13ab-12abad84efda",
+						modelNameVersionId : "9b6478e4-ea33-3346-ac12-ab12148478fa",
+						modelName : "vIsbcOamNetwork",
+						modelVersion : "1",
+						modelCustomizationName: ""
+					},
+					cloudConfiguration : cloudConfiguration,
+					requestInfo : requestInfo
+				};
+			
+		var createNetworkRequestDetails = {
+			modelInfo : {
+				modelType : "network",
+				modelInvariantId : "ab5256d1-5a33-55df-13ab-12abad84e890",
+				modelNameVersionId : "fe6478e4-ea33-3346-aaaa-ab121484a3fa",
+				modelName : "vIsbcOamNetwork",
+				modelVersion : "1",
+				modelCustomizationName: ""
+			},
+			cloudConfiguration: cloudConfiguration,
+			requestInfo : requestInfo
+		};
+	
+		var deleteNetworkRequestDetails = {
+			modelInfo : {
+				modelType : "network",
+				modelId : "ff5256d1-5a33-55df-aaaa-12abad84e7ff",
+				modelNameVersionId : "fe6478e4-ea33-3346-aaaa-ab121484a3fe",
+				modelName : "vIsbcOamNetwork",
+				modelVersion : "1"
+			},
+			relatedModelList : [
+					{
+						relatedModel : {
+							instanceId : "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
+							modelInfo : {
+								modelType : "service",
+								modelId : "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+								modelNameVersionId : "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+								modelName : "Intercarrier Interconnect Session Border Controller",
+								modelVersion : "1"
+							}
+						}
+					},
+					{
+						relatedModel : {
+							instanceId : "ff305d54-75b4-ff1b-adb2-eb6b9e5460ff",
+							modelInfo : {
+								modelType : "vnf",
+								modelId : "ff5256d1-5a33-55df-13ab-12abad84e7ff",
+								modelNameVersionId : "fe6478e4-ea33-3346-ac12-ab121484a3fe",
+								modelName : "vIsbc",
+								modelVersion : "1"
+							}
+						}
+					},
+					{
+						relatedModel : {
+							instanceId : "ff305d54-75b4-ff1b-bdb2-eb6b9e5460ff",
+							modelInfo : {
+								modelType : "vfModule",
+								modelId : "ff5256d1-5a33-55df-13ab-22abad84e7ff",
+								modelNameVersionId : "fe6478e4-ea33-3346-bc12-ab121484a3fe",
+								modelName : "vIsbcRtpExpansionModule",
+								modelVersion : "1"
+							}
+						}
+					} ]
+		};
+	}
+]);
diff --git a/vid-app-common/src/main/webapp/app/vid/test/testViewEdit.css b/vid-app-common/src/main/webapp/app/vid/test/testViewEdit.css
new file mode 100755
index 000000000..0dfb45071
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/test/testViewEdit.css
@@ -0,0 +1,30 @@
+div[ng-controller=testViewEditController] button {
+	width: 120px;
+}
+
+div[ng-controller=testViewEditController]>table {
+	border: solid black 1px;
+	width: auto;
+}
+
+div[ng-controller=testViewEditController]>table td {
+	border: solid black 1px;
+}
+
+h3 {
+	margin-bottom: 5px;
+}
+
+ol, li {
+	list-style-type: decimal !important;
+}
+
+div[ng-controller=testViewEditController]>div>span {
+	font-size: 20px;
+	margin-left: 10px;
+}
+
+div[ng-controller=testViewEditController] input[type=checkbox] {
+	height: 20px;
+	width: 20px;
+}
\ No newline at end of file
diff --git a/vid-app-common/src/main/webapp/app/vid/test/testViewEdit.js b/vid-app-common/src/main/webapp/app/vid/test/testViewEdit.js
new file mode 100755
index 000000000..73da4db74
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/test/testViewEdit.js
@@ -0,0 +1,376 @@
+"use strict";
+
+app.config(function($logProvider) {
+    // Optionally set to "false" to disable debug logging.
+    $logProvider.debugEnabled(true);
+});
+
+var testViewEditController = function(COMPONENT, DataService, PropertyService,
+	UtilityService, $scope, $timeout, $cookieStore, $log) {
+
+    $scope.popup = new Object();
+    $scope.isTestMode = false;
+
+    $scope.init = function(properties) {
+
+	/*
+	 * These 2 statements should be included in non-test code.
+	 */
+	PropertyService
+		.setMsoMaxPollingIntervalMsec(properties.msoMaxPollingIntervalMsec);
+	PropertyService.setMsoMaxPolls(properties.msoMaxPolls);
+
+	/*
+	 * Common parameters that shows an example of how the view edit screen
+	 * is expected to pass some common service instance values to the
+	 * popups.
+	 */
+
+	DataService.setSubscriberName("Mobility");
+	DataService.setGlobalCustomerId("CUSTID12345")
+	DataService.setServiceType("Mobility Type 1");
+	DataService.setServiceInstanceName("Example Service Instance Name");
+	DataService.setServiceName("Mobility Service 1");
+	DataService.setServiceInstanceId("mmsc-test-service-instance");
+	DataService.setServiceUuid("XXXX-YYYY-ZZZZ");
+	DataService.setUserServiceInstanceName("USER_SERVICE_INSTANCE_NAME");
+
+	/*
+	 * "setTestMode" is only used for testing.
+	 */
+
+	setTestMode();
+
+    }
+
+    $scope.autoStartTest = function() {
+	/*
+	 * Optionally comment in / out one of these method calls (or add a
+	 * similar entry) to auto-invoke an entry as soon as the page is
+	 * refreshed.
+	 */
+	$timeout(function() {
+	    // $scope.showServiceDetails();
+	    // $scope.showVnfDetails();
+	    // $scope.createService();
+	    // $scope.deleteService();
+	    // $scope.createNetwork();
+	    // $scope.createVnf();
+	    // $scope.createVfModule();
+	    // $scope.deleteVnf();
+	    // $scope.createVfModule();
+	}, 500);
+    }
+
+    /*
+     * This block of code is only used for testing.
+     */
+
+    /*
+     * The first 3 functions override default values set in the server
+     * properties file.
+     * 
+     * 1) The URL for the MSO controller is set to either the "real" controller
+     * or the test version depending on the "Use test MSO controller" checkbox.
+     * 
+     * 2) SDC and AAI are set to use test controller versions.
+     * 
+     * 3) Maximum polling and timeout values are set to lower values to lessen
+     * the time required to run tests.
+     * 
+     */
+
+    var TEST_MODE_COOKIE = "isTestModeEnabled";
+
+    var defaultMsoBaseUrl = PropertyService.getMsoBaseUrl();
+
+    var setTestMode = function() {
+	setTestMsoMode($cookieStore.get(TEST_MODE_COOKIE));
+	PropertyService.setAaiBaseUrl("testaai");
+	PropertyService.setAsdcBaseUrl("testasdc");
+	PropertyService.setMsoMaxPollingIntervalMsec(1000);
+	PropertyService.setMsoMaxPolls(7);
+	PropertyService.setServerResponseTimeoutMsec(10000);
+    };
+
+    $scope.testMsoModeChanged = function() {
+	setTestMsoMode($scope.isTestMsoMode);
+    };
+
+    var setTestMsoMode = function(isEnabled) {
+	$scope.isTestMsoMode = isEnabled;
+	$cookieStore.put(TEST_MODE_COOKIE, isEnabled);
+	if (isEnabled) {
+	    PropertyService.setMsoBaseUrl("testmso");
+	} else {
+	    PropertyService.setMsoBaseUrl(defaultMsoBaseUrl);
+	}
+    };
+
+    var callbackFunction = function(response) {
+	$scope.callbackResults = "";
+	var color = "none";
+	$scope.callbackStyle = {
+	    "background-color" : color
+	};
+	/*
+	 * This 1/2 delay was only added to visually highlight the status
+	 * change. Probably not needed in the real application code.
+	 */
+	$timeout(function() {
+	    $scope.callbackResults = UtilityService.getCurrentTime()
+		    + " isSuccessful: " + response.isSuccessful;
+	    if (response.isSuccessful) {
+		color = "#8F8";
+	    } else {
+		color = "#F88";
+	    }
+	    $scope.callbackStyle = {
+		"background-color" : color
+	    };
+	}, 500);
+    };
+
+    /*
+     * End of block of test-specific code
+     */
+
+    /*
+     * Create functions
+     */
+    $scope.createService = function() {
+
+	DataService.setModelId("91238134091820938018230918230989");
+
+	$scope.$broadcast("createComponent", {
+	    componentId : COMPONENT.SERVICE,
+	    callbackFunction : callbackFunction
+	});
+    }
+
+    $scope.createVnf = function() {
+
+	DataService.setModelId("91238134091820938018230918230989");
+	DataService.setModelInstanceName("VNF_MODEL_INSTANCE_NAME");
+
+	DataService.setCloudRegionTenantList(exampleCloudRegionTenantList)
+	DataService.setServiceIdList(exampleServiceIdList);
+
+	// Data used to create MSO "relatedInstanceList" object
+
+	DataService.setModelInfo(COMPONENT.SERVICE, exampleServiceModelInfo);
+
+	$scope.$broadcast("createComponent", {
+	    componentId : COMPONENT.VNF,
+	    callbackFunction : callbackFunction
+	});
+    }
+
+    $scope.createVfModule = function() {
+	DataService
+		.setInventoryItem(exampleAaiResult["inventory-response-items"][0]);
+
+	DataService.setModelId("91238134091820938018230918230989");
+	DataService.setModelInstanceName("VF_MODULE_MODEL_INSTANCE_NAME");
+
+	DataService.setLcpRegion("Region2");
+	DataService.setTenant("Tenant2");
+	// Data used to create MSO "relatedInstanceList" object
+
+	DataService.setModelInfo(COMPONENT.SERVICE, exampleServiceModelInfo);
+
+	DataService.setVnfInstanceId("VNF_INSTANCE_ID_12345");
+	DataService.setModelInfo(COMPONENT.VNF, exampleVnfModelInfo);
+
+	DataService.setVolumeGroupInstanceId("VOLUME_GROUP_INSTANCE_ID_12345");
+	DataService
+		.setAvailableVolumeGroupList(exampleAvailableVolumeGroupList);
+	DataService.setModelInfo(COMPONENT.VOLUME_GROUP,
+		exampleVolumeGroupModelInfo);
+
+	$scope.$broadcast("createComponent", {
+	    componentId : COMPONENT.VF_MODULE,
+	    callbackFunction : callbackFunction
+	});
+    }
+
+    $scope.createVolumeGroup = function() {
+
+	DataService.setModelId("91238134091820938018230918230989");
+	DataService.setModelInstanceName("VOLUME_GROUP_MODEL_INSTANCE_NAME");
+	DataService.setLcpRegion("Region1");
+	DataService.setTenant("Tenant1");
+	// Data used to create MSO "relatedInstanceList" object
+
+	DataService.setModelInfo(COMPONENT.SERVICE, exampleServiceModelInfo);
+
+	DataService.setVnfInstanceId("VNF_INSTANCE_ID_12345");
+	DataService.setModelInfo(COMPONENT.VNF, exampleVnfModelInfo);
+
+	$scope.$broadcast("createComponent", {
+	    componentId : COMPONENT.VOLUME_GROUP,
+	    callbackFunction : callbackFunction
+	});
+    }
+
+    $scope.createNetwork = function() {
+
+	DataService.setModelId("91238134091820938018230918230989");
+	DataService.setModelInstanceName("NETWORK_MODEL_INSTANCE_NAME");
+
+	DataService.setCloudRegionTenantList(exampleCloudRegionTenantList)
+	DataService.setServiceIdList(exampleServiceIdList);
+
+	// Data used to create MSO "relatedInstanceList" object
+
+	DataService.setModelInfo(COMPONENT.SERVICE, exampleServiceModelInfo);
+
+	$scope.$broadcast("createComponent", {
+	    componentId : COMPONENT.NETWORK,
+	    callbackFunction : callbackFunction
+	});
+    }
+
+    /*
+     * Delete functions
+     */
+    $scope.deleteService = function() {
+
+	DataService.setInventoryItem(exampleServiceItem);
+
+	DataService.setModelInfo(COMPONENT.SERVICE, exampleServiceModelInfo);
+
+	$scope.$broadcast("deleteComponent", {
+	    componentId : COMPONENT.SERVICE,
+	    callbackFunction : callbackFunction
+	});
+    }
+
+    $scope.deleteVnf = function() {
+
+	DataService
+		.setInventoryItem(exampleAaiResult["inventory-response-items"]["inventory-response-item"][0]);
+
+	DataService.setVnfInstanceId("VNF_INSTANCE_ID_12345");
+	DataService.setModelInfo(COMPONENT.VNF, exampleVnfModelInfo);
+	DataService.setLcpRegion("Region3");
+	DataService.setTenant("Tenant3");
+
+	$scope.$broadcast("deleteComponent", {
+	    componentId : COMPONENT.VNF,
+	    callbackFunction : callbackFunction
+	});
+    }
+
+    $scope.deleteVfModule = function() {
+
+	DataService.setInventoryItem(exampleVfModuleItem);
+
+	DataService.setVnfInstanceId("VNF_INSTANCE_ID_12345");
+
+	DataService.setVfModuleInstanceId("VF_MODULE_INSTANCE_ID_12345");
+	DataService.setModelInfo(COMPONENT.VF_MODULE, exampleVfModuleModelInfo);
+	DataService.setLcpRegion("Region4");
+	DataService.setTenant("Tenant4");
+
+	$scope.$broadcast("deleteComponent", {
+	    componentId : COMPONENT.VF_MODULE,
+	    callbackFunction : callbackFunction
+	});
+    }
+
+    $scope.deleteVolumeGroup = function() {
+
+	DataService.setInventoryItem(exampleVolumeGroupItem);
+
+	DataService.setVolumeGroupInstanceId("VOLUME_GROUP_INSTANCE_ID_12345");
+	DataService.setModelInfo(COMPONENT.VOLUME_GROUP,
+		exampleVolumeGroupModelInfo);
+	DataService.setLcpRegion("Region3");
+	DataService.setTenant("Tenant3");
+
+
+	$scope.$broadcast("deleteComponent", {
+	    componentId : COMPONENT.VOLUME_GROUP,
+	    callbackFunction : callbackFunction
+	});
+    }
+
+    $scope.deleteNetwork = function() {
+
+	DataService.setInventoryItem(exampleNetworkItem);
+
+	DataService.setNetworkInstanceId("NETWORK_INSTANCE_ID_12345");
+	DataService.setModelInfo(COMPONENT.NETWORK, exampleNetworkModelInfo);
+	DataService.setLcpRegion("Region5");
+	DataService.setTenant("Tenant5");
+
+	$scope.$broadcast("deleteComponent", {
+	    componentId : COMPONENT.NETWORK,
+	    callbackFunction : callbackFunction
+	});
+    }
+
+    /*
+     * Show Details functions
+     */
+    $scope.showServiceDetails = function() {
+
+	DataService.setInventoryItem(exampleServiceItem);
+
+	$scope.$broadcast("showComponentDetails", {
+	    componentId : COMPONENT.SERVICE,
+	    callbackFunction : callbackFunction
+	});
+    }
+
+    $scope.showVnfDetails = function() {
+
+	DataService.setVnfInstanceId("VNF_INSTANCE_ID_12345");
+	DataService
+		.setInventoryItem(exampleAaiResult["inventory-response-items"]["inventory-response-item"][0]);
+
+	$scope.$broadcast("showComponentDetails", {
+	    componentId : COMPONENT.VNF,
+	    callbackFunction : callbackFunction
+	});
+    }
+
+    $scope.showVfModuleDetails = function() {
+
+	DataService.setVnfInstanceId("VNF_INSTANCE_ID_12345");
+	DataService.setVfModuleInstanceId("VF_MODULE_INSTANCE_ID_12345");
+	DataService.setInventoryItem(exampleVfModuleItem);
+
+	$scope.$broadcast("showComponentDetails", {
+	    componentId : COMPONENT.VF_MODULE,
+	    callbackFunction : callbackFunction
+	});
+    }
+
+    $scope.showVolumeGroupDetails = function() {
+
+	DataService.setVolumeGroupInstanceId("VOLUME_GROUP_INSTANCE_ID_12345");
+	DataService.setInventoryItem(exampleVolumeGroupItem);
+
+	$scope.$broadcast("showComponentDetails", {
+	    componentId : COMPONENT.VOLUME_GROUP,
+	    callbackFunction : callbackFunction
+	});
+    }
+
+    $scope.showNetworkDetails = function() {
+
+	DataService.setNetworkInstanceId("NETWORK_INSTANCE_ID_12345");
+	DataService.setInventoryItem(exampleNetworkItem);
+
+	$scope.$broadcast("showComponentDetails", {
+	    componentId : COMPONENT.NETWORK,
+	    callbackFunction : callbackFunction
+	});
+    }
+}
+
+app.controller("testViewEditController", [ "COMPONENT", "DataService",
+	"PropertyService", "UtilityService", "$scope", "$timeout",
+	"$cookieStore", "$log", testViewEditController ]);
\ No newline at end of file
diff --git a/vid-app-common/src/main/webapp/index.jsp b/vid-app-common/src/main/webapp/index.jsp
new file mode 100755
index 000000000..056f209a7
--- /dev/null
+++ b/vid-app-common/src/main/webapp/index.jsp
@@ -0,0 +1,5 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+
+<%-- Redirected because we can't set the welcome page to a virtual URL. --%>
+<%-- Forward to the intended start page to reduce frustration for new users. --%> 
+
diff --git a/vid-app-common/src/main/webapp/test.jsp b/vid-app-common/src/main/webapp/test.jsp
new file mode 100755
index 000000000..1b0c14a42
--- /dev/null
+++ b/vid-app-common/src/main/webapp/test.jsp
@@ -0,0 +1,29 @@
+
+Test VID Properties related to MSO 
+
+
+<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties" %>
+<%@ page import="org.openecomp.vid.controller.MsoController" %>
+<%@ page import="org.openecomp.vid.mso.rest.Request" %>
+<%@ page import="org.openecomp.vid.mso.rest.RequestDetails" %>
+<%@ page import="org.openecomp.vid.mso.rest.RelatedModel" %>
+<%@ page import="org.openecomp.vid.domain.mso.SubscriberInfo" %>
+<%@ page import="org.openecomp.vid.domain.mso.Response" %>
+<%@ page import="org.openecomp.vid.domain.mso.ModelInfo" %>
+<%@ page import="org.openecomp.vid.domain.mso.RequestInfo" %>
+<%@ page import="org.openecomp.vid.domain.mso.CloudConfiguration" %>
+<%@ page import="org.openecomp.vid.mso.MsoProperties" %>
+<%@ page import="java.net.URI" %>
+<%@ page import="com.sun.jersey.api.client.ClientResponse" %>
+  <%
+  String url = SystemProperties.getProperty(MsoProperties.MSO_SERVER_URL);
+  String max_polls = SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS);
+  String max_polling_interval_msecs = SystemProperties.getProperty(MsoProperties.MSO_POLLING_INTERVAL_MSECS);
+  %>
+  	
    VID properties related to MSO:
    
+      
    MSO server URL:
    "<%= url %>"
    
+      
    MSO max number of polls:
    "<%= max_polls %>"
    
+      
    MSO polling interval (msecs):
    "<%= max_polling_interval_msecs %>"
    
+  
    Try Again
    
+
+
diff --git a/vid-app-common/src/test/java/org/openecomp/ecomp/vid/selenium/FirstClass.java b/vid-app-common/src/test/java/org/openecomp/ecomp/vid/selenium/FirstClass.java
new file mode 100755
index 000000000..ed06994aa
--- /dev/null
+++ b/vid-app-common/src/test/java/org/openecomp/ecomp/vid/selenium/FirstClass.java
@@ -0,0 +1,606 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.ecomp.vid.selenium;
+
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterSuite;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.firefox.FirefoxDriver;
+import org.openqa.selenium.ie.InternetExplorerDriver;
+import org.openqa.selenium.support.ui.Select;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+import org.apache.log4j.Logger;
+import org.testng.Assert;
+import org.testng.asserts.*;
+
+/**
+ * The Class FirstClass.
+ */
+public class FirstClass {
+	
+		/** The login button. */
+		WebElement loginButton;
+		
+		/** The eg. */
+		String eg;
+		
+		/** The login. */
+		WebElement login;
+		
+		/** The pwd. */
+		WebElement pwd;
+		
+		/** The log. */
+		Logger log;
+		
+		/** The errormessage. */
+		WebElement errormessage;
+		
+					
+		/** The driver. */
+		WebDriver driver=new FirefoxDriver();
+		
+		
+		
+		/** The config prop. */
+		private final Properties configProp = new Properties();
+		
+		
+		/**
+		 * Instantiates a new first class.
+		 */
+		private  FirstClass() {
+			// TODO Auto-generated constructor stub
+			//
+			try{
+			//	InputStream input =this.getClass().getClassLoader().getResourceAsStream("objectmap.properties");
+			//FileInputStream input1 = new FileInputStream("objectmap.properties");
+				
+			InputStream input =new FileInputStream("objectconfig.properties");
+			System.out.println("Read all properties from file");
+			configProp.load(input);
+			System.out.println("Read all properties from file completed");
+			}
+			catch(IOException e) {
+				
+				e.printStackTrace();
+			}
+		}
+		
+		
+		/*
+		
+		
+		@BeforeClass
+		public void setUp() {
+			System.out.println("*******************");
+			System.out.println("launching IE browser");
+			System.setProperty("webdriver.ie.driver", driverPath+"IEDriverServer.exe");
+			driver = new InternetExplorerDriver();
+			driver.findElement(By.className());
+			driver.manage().window().maximize();
+			
+
+			 login = driver.findElement(By.xpath("//input[@class='fn-ebz-text ng-pristine ng-valid']"));
+			 pwd = driver.findElement(By.xpath("//input[@class='span3 ng-pristine ng-valid']"));
+			 loginButton = driver.findElement(By.id("loginBtn"));
+		}
+		
+		
+	*/
+		/**
+		 * Sets the up.
+		 */
+		// TODO Auto-generated method stub
+		@BeforeClass
+		public void setUp()
+		{
+			
+						
+			//WebDriver driver=new FirefoxDriver();
+			
+			log = Logger.getLogger(FirstClass.class.getName());
+		
+		
+		
+		// Get url
+		driver.get(configProp.getProperty("baseURL"));
+		driver.manage().window().maximize();
+		
+		
+		 login = driver.findElement(By.xpath(configProp.getProperty("login")));
+		 
+		 pwd = driver.findElement(By.xpath(configProp.getProperty("pwd")));
+		 loginButton = driver.findElement(By.id(configProp.getProperty("loginButton")));
+		}
+		
+		
+		/**
+		 * Empty username password.
+		 */
+		@Test(priority=1)
+		public void emptyUsernamePassword()
+		{
+		
+			
+		//User Name and Password field is empty
+		log.info("-----VID-11 TC-8----Username and password empty");
+		loginButton.click();
+		errormessage=driver.findElement(By.xpath("//*[@id='errorInfo']/span"));
+		String errmsg= errormessage.getText();
+		//System.out.println("Error message is"+errmsg);
+		//String expected = "Invaild username or password, Please try again";
+		
+		//Assert.assertEquals(errmsg,expected);
+
+		Boolean str = driver.getPageSource().contains("Invalid username or password, Please try again");
+		System.out.println(driver.getPageSource().contains("Invalid username or password, Please try again"));
+		
+		if(str==true)
+		{
+			log.info("Error message validated");
+			log.info("VID-11 TC-8 PASSED");
+			
+		}else
+			log.error("Failed validation");
+		
+		}
+
+
+		
+		/**
+		 * Invalid user name.
+		 */
+		@Test(priority=2)
+		public void invalidUserName()
+		{
+		
+		log.info("-----VID-11 TC-6----Invalid Username and Valid Password");
+		
+		
+		login.sendKeys("xxx");
+		pwd.sendKeys("abc123");
+		loginButton.click();
+		try {
+			Thread.sleep(5000);
+		} catch (InterruptedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		String errmsg= errormessage.getText();
+		String expected = "Invalid username or password, Please try again";
+		Assert.assertEquals(errmsg,expected);
+		//Boolean str1 = driver.getPageSource().contains("Invalid username or password, Please try again");
+		//System.out.print(str1);
+		
+		log.info("VID-11 TC-6 PASSED");
+				
+		}
+		
+		
+		/**
+		 * Invalid password.
+		 */
+		@Test(priority=3)
+		public void invalidPassword()
+		{
+		log.info("-----VID-11 TC-7----Valid Username and Invalid Password");
+		//  Valid user name and Invalid password.
+				login.clear();
+				pwd.clear();
+				login.sendKeys("testuser");
+				pwd.sendKeys("xxx");
+				loginButton.click();
+				driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
+		
+				
+				String errmsg= errormessage.getText();
+				String expected = "Invalid username or password, Please try again";
+				Assert.assertEquals(errmsg,expected);
+				
+				//Boolean str2 = driver.getPageSource().contains("Invaild username or password, Please try again");
+				//System.out.print(str2);
+				
+				log.info("VID-11 TC-7 PASSED");
+		}
+		
+			
+		/**
+		 * Login successful.
+		 */
+		@Test(priority=4)
+		public void loginSuccessful()
+		{
+		log.info("-----VID-11 TC-1----Valid Username and Valid Password");
+		//Login with valid user name and password.
+		login.clear();
+		login.sendKeys("su");
+		pwd.clear();
+		pwd.sendKeys("fusion");
+		
+				
+		loginButton.click();
+		driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
+		
+		try {
+			Thread.sleep(6000);
+		} catch (InterruptedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		Assert.assertTrue(driver.getPageSource().contains("Search Existing Service Instances"));
+		log.info("VID-11 TC-1 PASSED");
+		
+		}
+		
+		
+		/**
+		 * Verify home page elements left pane.
+		 */
+		@Test(priority=5)
+		public void verifyHomePageElementsLeftPane()
+		
+		{
+			
+			
+			log.info("VID-10 TC 1 ");
+			//VID Home
+			log.info("VID 11 TC-2");
+			driver.findElement(By.xpath("html/body/div[1]/div[1]/div/div/div[2]/div/div/div[1]/div/div/accordion/div/div[1]/a/span")).isDisplayed();
+			//Create New Service Instance
+			driver.findElement(By.xpath("html/body/div[1]/div[1]/div/div/div[2]/div/div/div[1]/div/div/accordion/div/div[2]/a/span")).isDisplayed();
+			
+			//Browse Service Type
+			driver.findElement(By.xpath("html/body/div[1]/div[1]/div/div/div[2]/div/div/div[1]/div/div/accordion/div/div[3]/a/span")).isDisplayed();
+			//View Log		
+			driver.findElement(By.xpath("html/body/div[1]/div[1]/div/div/div[2]/div/div/div[1]/div/div/accordion/div/div[4]/a/span")).isDisplayed();
+			
+			//Profile
+			driver.findElement(By.xpath("html/body/div[1]/div[1]/div/div/div[2]/div/div/div[1]/div/div/accordion/div/div[5]/a/span")).isDisplayed();
+			//Admin
+			driver.findElement(By.xpath("html/body/div[1]/div[1]/div/div/div[2]/div/div/div[1]/div/div/accordion/div/div[6]/a/span")).isDisplayed();
+			//Logout
+			driver.findElement(By.xpath("html/body/div[1]/div[1]/div/div/div[2]/div/div/div[1]/div/div/accordion/div/div[7]/a/span")).isDisplayed();
+			
+			//Infrastructure Subscriber Name
+			driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[1]/td[1]/div/label")).isDisplayed();
+			//Infrastructure Subscriber Name Select Drop down
+			driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[1]/td[2]/div/select")).isDisplayed();
+			//Infrastructure Service Type
+			driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[2]/td[1]/div/label")).isDisplayed();
+			//Infrastructure Service Type Select Drop down
+			driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[2]/td[2]/div/select")).isDisplayed();
+			//Submit button 
+			driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[3]/td/div/button")).isDisplayed();
+			
+			//Login Snippet Icon
+			driver.findElement(By.xpath(".//*[@class='icon-user-small login-snippet-icon']")).isDisplayed();
+			
+			
+			//String bodyText = driver.findElement(By.tagName("body")).getText();
+			//Assert.assertTrue("Text not found!", bodyText.contains("Search Existing Service Instances"));
+			//Assert.IsTrue(driver.getPageSource.Contains("Search Existing Service Instances"));
+			 
+			log.info("VID-12 TC-1");
+			Assert.assertTrue(driver.getPageSource().contains("Search Existing Service Instances"));
+			Assert.assertTrue(driver.getPageSource().contains("Please search by the Subscriber name or Service Type from below:"));
+			log.info("VID-12 TC-1 PASSED");
+			log.info("VID-10 TC 1 PASSED");
+			log.info("VID-11 TC-2 PASSED");
+		}
+		
+		
+		/**
+		 * Disabled submit button.
+		 */
+		@Test(priority=6)
+		public void disabledSubmitButton()
+		{
+			log.info("VID-12 TC-13");
+			//Assert submit button disabled.
+			Assert.assertFalse(driver.findElement(By.xpath(configProp.getProperty("submitButton"))).isEnabled());
+			log.info("VID-12 TC-13 PASSED");
+
+		} 
+		
+		/**
+		 * Default list box value.
+		 */
+		@Test(priority=7)
+		public void defaultListBoxValue()
+		{
+			log.info("VID-12 TC-2");
+			
+			
+			//WebElement subscribername =driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[1]/td[2]/div/select"));
+			
+			Select oSelect = new Select(driver.findElement(By.xpath(configProp.getProperty("subscriberNameDropDown"))));
+			Select iSelect = new Select(driver.findElement(By.xpath(configProp.getProperty("serviceTypeDropDown"))));
+			
+			
+			WebElement ielement=iSelect.getFirstSelectedOption();
+			WebElement oelement=oSelect.getFirstSelectedOption();
+			String defaultsubscribername=oelement.getText();
+			String defaultservicetype=ielement.getText();
+			
+			Assert.assertEquals(defaultsubscribername,"Select Subscriber Name");
+			Assert.assertEquals(defaultservicetype,"Select Service Type");
+			
+		
+			
+			
+		//Verify Select Subscriber Name isDisplayed.
+		//driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[1]/td[2]/div/select/option[1]")).isSelected();
+				
+		//Verify Select Service Type isDisplayed.	
+		//driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[2]/td[2]/div/select/option[1]")).isSelected();
+			
+			
+			log.info("VID-12 TC-2 PASSED");
+
+		}
+
+
+		
+		/**
+		 * Select subscriber name drop down.
+		 *
+		 * @throws InterruptedException the interrupted exception
+		 */
+		@Test(priority=8)
+		public void selectSubscriberNameDropDown() throws InterruptedException
+		{
+			log.info("------------------VID-10 TC-2,VID-12 TC-11, VID-12 TC-9, VID 12 TC-10,VID-12 TC-6, VID 12 TC-5--------------------");
+			
+			
+			driver.findElement(By.xpath(configProp.getProperty("subscriberNameDropDown")));
+			
+			driver.findElement(By.xpath(configProp.getProperty("serviceTypeDropDown")));
+			Thread.sleep(5000);
+			
+			//Infrastructure Subscriber Name
+			Select oSelect = new Select(driver.findElement(By.xpath(configProp.getProperty("subscriberNameDropDown"))));
+			
+			List  elementCount = oSelect.getOptions();
+			log.info("Select Element Count of Service Name");
+			System.out.println(elementCount.size());
+			
+			
+			//Verifying getInfrastructureSubscribersList
+			log.info("VID-29 TC-1");
+			Assert.assertTrue(elementCount.size()>0);
+			log.info("VID-29 TC-1 PASSED");
+			
+			oSelect.selectByIndex(2);
+			String selectedOption = new Select(driver.findElement(By.xpath(configProp.getProperty("subscriberNameDropDown")))).getFirstSelectedOption().getText();
+
+			System.out.println("Service Name selected is " +selectedOption);
+			log.info("VID-10 TC-2 PASSED");
+					
+			//Submit button is clicked
+			driver.findElement(By.xpath(configProp.getProperty("submitButton"))).click();
+			
+			
+			//Verify whether the page header is displayed "Selected Subscriber's Service Instance Details:"
+			driver.findElement(By.xpath(".//*[@id='mContent']/div/div/div/h1")).isDisplayed();
+			//Assert.assertTrue(driver.getPageSource().contains("Selected Subscriber's Service Instance Details:"))
+			
+			
+			//Verify whether the page header is displayed "Global Customer ID"
+			driver.findElement(By.xpath(".//*[@id='mContent']/div/div/div/div/table/thead/tr/th[2]/div")).isDisplayed();
+			Assert.assertTrue(driver.getPageSource().contains("Global Customer ID"));
+			Assert.assertTrue(driver.getPageSource().contains("Subscriber Name"));
+			Assert.assertTrue(driver.getPageSource().contains("Service Type"));
+			Assert.assertTrue(driver.getPageSource().contains("Service Instance ID"));
+			
+			log.info("VID-12 TC-5 PASSED");
+			log.info("VID-12 TC-11 PASSED");
+			
+			WebElement serviceinstancetable =driver.findElement(By.xpath("//table[@class='tablesorter tablesorter-default ng-isolate-scope']"));
+			
+			List rows_table = serviceinstancetable.findElements(By.tagName("tr"));
+			  //To calculate no of rows In table.
+			  int rows_count = rows_table.size();
+			  
+			  //Loop will execute till the last row of table.
+			  for (int row=0; row Columns_row = rows_table.get(row).findElements(By.tagName("td"));
+			   //To calculate no of columns(cells) In that specific row.
+			   int columns_count = Columns_row.size();
+			   //System.out.println("Number of cells In Row "+row+" are "+columns_count);
+			   
+			   //Loop will execute till the last cell of that specific row.
+			   for (int column=0; column exx= rows_table.get(1).findElements(By.tagName("td"));
+			     eg=Columns_row.get(2).getText();
+			   // System.out.println("Cell value of row 1 and column 2 is" +eg);
+			   }
+			  }
+		
+			  
+			
+			
+			//Verify View/Edit isDisplayed and Click
+			
+			driver.findElement(By.xpath("//a[@alt='View/Edit']")).isDisplayed();
+			
+			driver.findElement(By.xpath(".//*[@id='mContent']/div/div/div/div/table/tbody/tr[1]/td[1]/div/a")).click();
+			
+			log.info("User clicked View/Edit");
+			
+			//Verify the Subscriber Name displayed.	
+			String header= driver.findElement(By.xpath("//h1[@class='heading1 ng-binding']")).getText();
+			//System.out.println(header);
+			
+			
+			if(header.contains(eg))
+			{
+				System.out.println("Header contains the subscriber name");
+			}else
+				System.out.println("Header does not contain the subscriber name");
+			
+			
+			
+			Assert.assertTrue(driver.getPageSource().contains("PerfTest Subscriber00020021"));
+			log.info("VID-12 TC-6 PASSED");
+			
+			
+				
+			driver.navigate().back();
+			//Cancel button isDisplayed
+			driver.findElement(By.xpath("//button[@class='button button--small button--primary']")).isDisplayed();
+			log.info("VID-12 TC-9 PASSED");
+			
+			//Cancel button is clicked
+			driver.findElement(By.xpath("//button[@class='button button--small button--primary']")).click();
+			log.info("Cancel button is clicked");
+			
+			//Verifying VID Home page is displayed
+			Assert.assertTrue(driver.getPageSource().contains("Search Existing Service Instances"));
+			log.info("VID-12 TC-10 PASSED");
+			
+			   }
+		
+		
+		/**
+		 * Refresh subscriber name.
+		 */
+		@Test(priority=9)
+		public void refreshSubscriberName()
+		{
+			log.info("VID-10 TC-4");
+			
+			
+			driver.findElement(By.xpath(configProp.getProperty("refreshButtonSubscriberName"))).isDisplayed();
+			
+			log.info("VID-10 TC-4 PASSED");
+			
+			
+		}
+
+		
+		/**
+		 * Select subscriber type drop down.
+		 *
+		 * @throws InterruptedException the interrupted exception
+		 */
+		@Test(priority=9)
+		public void selectSubscriberTypeDropDown() throws InterruptedException
+		{
+			Thread.sleep(5000);
+			log.info("------------------VID-10 TC-3, VID-12 TC-12,--------------------");
+			//Infrastructure Subscriber Type
+			Select iSelect = new Select(driver.findElement(By.xpath(configProp.getProperty("serviceTypeDropDown"))));
+			
+			List  ielementCount = iSelect.getOptions();
+			log.info("Select Element Count of Service type");
+			System.out.println(ielementCount.size());
+			iSelect.selectByIndex(1);
+			
+			log.info("VID-10 TC-3 PASSED");
+			
+						
+			//Submit button is clicked
+			driver.findElement(By.xpath(configProp.getProperty("submitButton"))).click();
+			
+			//Verify whether the page header is displayed "Selected Subscriber's Service Instance Details:"
+			driver.findElement(By.xpath(".//*[@id='mContent']/div/div/div/h1")).isDisplayed();
+			//Assert.assertTrue(driver.getPageSource().contains("Selected Subscriber's Service Instance Details:"))
+			log.info("Page Header: Selected Subscriber's Service Instance Details");
+			
+			
+			//Verify whether the page header is displayed "Global Customer ID"
+			driver.findElement(By.xpath(".//*[@id='mContent']/div/div/div/div/table/thead/tr/th[2]/div")).isDisplayed();
+			
+			//Assert.assertTrue(driver.getPageSource().contains("Global Customer ID"));
+			log.info("Table is displayed");
+			
+			log.info("VID-12 TC-12 PASSED");
+			
+		}
+		
+		
+		
+		/**
+		 * Logout under profile.
+		 */
+		@Test(priority=10)
+		public void logoutUnderProfile()
+		{
+			
+			log.info("-----------VID-11 TC-5---------------------");
+			//driver.findElement(By.partialLinkText("Click here to login")).click();
+			//driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
+			
+		
+			driver.findElement(By.xpath(".//*[@class='icon-user-small login-snippet-icon']")).click();			
+			driver.findElement(By.xpath(".//*[@id='reg-logout-div']/a")).click();
+			//Validate that the user has logged out of VID. Displays "Portal"
+			Assert.assertTrue(driver.getPageSource().contains("Portal"));
+			
+			log.info("VID-11 TC-5 PASSED");
+			
+		}
+
+		
+		
+		/**
+		 * Tear down.
+		 */
+		@AfterClass
+		public void tearDown()
+		{
+			driver.close();
+		
+		}
+		
+		
+		
+	}
+
+
+	
+
diff --git a/vid-app-common/src/test/java/org/openecomp/ecomp/vid/selenium/LogOutLeftPane.java b/vid-app-common/src/test/java/org/openecomp/ecomp/vid/selenium/LogOutLeftPane.java
new file mode 100755
index 000000000..66ea075e2
--- /dev/null
+++ b/vid-app-common/src/test/java/org/openecomp/ecomp/vid/selenium/LogOutLeftPane.java
@@ -0,0 +1,242 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.ecomp.vid.selenium;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.log4j.Logger;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.firefox.FirefoxDriver;
+import org.openqa.selenium.support.ui.Select;
+import org.testng.Assert;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+/**
+ * The Class LogOutLeftPane.
+ */
+@Test(enabled=true)
+public class LogOutLeftPane {
+
+	/** The login button. */
+	WebElement loginButton;
+	
+	/** The login. */
+	WebElement login;
+	
+	/** The pwd. */
+	WebElement pwd;
+	
+	/** The log. */
+	Logger log;
+	
+	/** The errormessage. */
+	WebElement errormessage;
+	
+	/** The driver. */
+	WebDriver driver=new FirefoxDriver();
+	
+	
+	/** The config prop. */
+	private final Properties configProp = new Properties();
+	
+	
+	/**
+	 * Instantiates a new log out left pane.
+	 */
+	private  LogOutLeftPane() {
+		// TODO Auto-generated constructor stub
+		//
+		try{
+		//	InputStream input =this.getClass().getClassLoader().getResourceAsStream("objectmap.properties");
+		//FileInputStream input1 = new FileInputStream("objectmap.properties");
+			
+		InputStream input =new FileInputStream("objectconfig.properties");
+		System.out.println("Read all properties from file");
+		configProp.load(input);
+		System.out.println("Read all properties from file completed");
+		}
+		catch(IOException e) {
+			
+			e.printStackTrace();
+		}
+	}
+	
+	
+	   
+	   
+	/**
+	 * Do before test.
+	 */
+	// TODO Auto-generated method stub
+	@BeforeTest
+	public void doBeforeTest()
+	{
+		//WebDriver driver=new FirefoxDriver();
+		
+		log = Logger.getLogger(LogOutLeftPane.class.getName());
+	
+	
+	
+	// Get url
+	driver.get("http://vid.onap.org:9080/vid/login_external.htm");
+	driver.manage().window().maximize();
+	
+	
+	 login = driver.findElement(By.xpath("//input[@class='fn-ebz-text ng-pristine ng-valid']"));
+	 pwd = driver.findElement(By.xpath("//input[@class='span3 ng-pristine ng-valid']"));
+	 loginButton = driver.findElement(By.id("loginBtn"));
+	}
+	
+	
+	/**
+	 * Expand collapse panel.
+	 *
+	 * @throws InterruptedException the interrupted exception
+	 */
+	@Test(priority=1)
+	public void expandCollapsePanel() throws InterruptedException
+	{
+
+		
+		
+		login.clear();
+		login.sendKeys("su");
+		pwd.clear();
+		pwd.sendKeys("fusion");
+		//driver.findElement(By.partialLinkText("Click here to login")).click();
+		//driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
+		
+		loginButton.click();
+		driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
+		
+		
+		log.info("Clicking Profile link from left pane");
+		Thread.sleep(3000);
+		System.out.println("properties file details --->"+configProp.getProperty("profilelink"));
+		driver.findElement(By.xpath(configProp.getProperty("profilelink"))).click();
+		Thread.sleep(3000);
+		
+		//Verify whether the sub panel is displayed
+		//To verify the following :Search import from webphone and Self 
+		driver.findElement(By.xpath(".//*[@id='panel4']")).isDisplayed();
+		log.info("Expand and collapse passed for Profile link");
+		
+		//For Admin
+		//Verify expand and collapse working for ADMIN
+		log.info("Clicking Admin link from left pane");
+		driver.findElement(By.xpath("html/body/div[1]/div[1]/div/div/div[2]/div/div/div[1]/div/div/accordion/div/div[6]/a/span")).click();
+		//To verify the following: Roles, Roles Functions, Usages
+		driver.findElement(By.xpath(".//*[@id='panel5']")).isDisplayed();
+		
+	
+		log.info("Expand and collapse passed for ADMIN link");
+
+		log.info("VID-11 TC-3 PASSED");
+		
+	}
+	
+	
+	/**
+	 * Drop down list.
+	 *
+	 * @throws InterruptedException the interrupted exception
+	 */
+	@Test(priority=2)
+	public void dropDownList() throws InterruptedException
+	{
+		//VID-12 TC-3
+		log.info("VID-12 TC-3");
+		//driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[1]/td[2]/div/select"));
+		
+		//driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[2]/td[2]/div/select"));
+		Thread.sleep(5000);
+		
+		//Infrastructure Subscriber Name
+		Select oSelect = new Select(driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[1]/td[2]/div/select")));
+		Select iSelect = new Select(driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[2]/td[2]/div/select")));
+		
+		List  elementCount = oSelect.getOptions();
+		log.info("Subscriber Name Drop Down");
+		System.out.println(elementCount.size());
+		oSelect.selectByIndex(1);
+		log.info("Subscriber name selected");
+		//String selectedOption = new Select(driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[1]/td[2]/div/select"))).getFirstSelectedOption().getText();
+		
+		
+		List  count = iSelect.getOptions();
+		log.info("Subscriber type drop down");
+		System.out.println(count.size());
+		oSelect.selectByIndex(1);
+		log.info("Subscriber type selected");
+		
+
+				
+		//Submit button is clicked
+		driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[3]/td/div/button")).click();
+		
+		
+		//Verify whether the page header is displayed "Selected Subscriber's Service Instance Details:"
+		driver.findElement(By.xpath(".//*[@id='mContent']/div/div/div/h1")).isDisplayed();
+		log.info("VID-12 TC-3 PASSED");
+	}
+	
+	
+	
+	
+	/**
+	 * Logout left pane.
+	 */
+	@Test(priority=3)
+	public void logoutLeftPane()
+	{
+		//To Verify if the logout link redirects to Login page when clicked.
+		
+		
+		/*log.info("----------------VID-11 TC-4----------------");
+		login.clear();
+		login.sendKeys("testuser");
+		pwd.clear();
+		pwd.sendKeys("abc123");
+		//driver.findElement(By.partialLinkText("Click here to login")).click();
+		//driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
+		
+		loginButton.click();
+		driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);*/
+		log.info("----------------VID-11 TC-4----------------");
+		driver.findElement(By.xpath("html/body/div[1]/div[1]/div/div/div[2]/div/div/div[1]/div/div/accordion/div/div[7]/a")).click();
+		//Validate that the user has logged out of VID. Displays "Portal"
+		Assert.assertTrue(driver.getPageSource().contains("Portal"));
+		
+		log.info("VID 11 TC-4 PASSED");
+		
+		driver.close();
+		
+	}
+	
+}
diff --git a/vid-app-common/src/test/java/org/openecomp/fusion/core/MockApplicationContextTestSuite.java b/vid-app-common/src/test/java/org/openecomp/fusion/core/MockApplicationContextTestSuite.java
new file mode 100755
index 000000000..64d72abef
--- /dev/null
+++ b/vid-app-common/src/test/java/org/openecomp/fusion/core/MockApplicationContextTestSuite.java
@@ -0,0 +1,176 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.fusion.core;
+
+import java.io.IOException;
+
+import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.AnnotationConfigWebContextLoader;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+
+import org.openecomp.portalsdk.core.conf.AppConfig;
+import org.openecomp.portalsdk.core.objectcache.AbstractCacheManager;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.openecomp.portalsdk.core.util.CacheManager;
+
+/**
+ * 
+ * 
+ * 
+ * In order to write a unit test, 
+ * 1. inherit this class - See SanityTest.java
+ * 2. place the "war" folder on your test class's classpath
+ * 3. run the test with the following VM argument; This is important because when starting the application from Container, the System Properties file (SystemProperties.java) can have the direct path
+ *    but, when running from the Mock Junit container, the path should be prefixed with "classpath" to enable the mock container to search for the file in the classpath  
+ *    -Dcontainer.classpath="classpath:"
+ *
+ */
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@WebAppConfiguration
+@ContextConfiguration(loader = AnnotationConfigWebContextLoader.class, classes = {MockAppConfig.class})
+@ActiveProfiles(value="test")
+public class MockApplicationContextTestSuite {
+		
+	    /** The wac. */
+    	@Autowired
+	    public WebApplicationContext wac;
+
+	    /** The mock mvc. */
+    	private MockMvc mockMvc;
+
+	    /**
+    	 * Setup.
+    	 */
+    	@Before
+	    public void setup() {
+	    	if(mockMvc == null) {
+	    		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+	    		
+	    	}
+	    }
+	    
+	    /**
+    	 * Gets the bean.
+    	 *
+    	 * @param name the name
+    	 * @return the bean
+    	 */
+    	public Object getBean(String name) {
+			return this.wac.getBean(name);
+		}
+
+
+		/**
+		 * Gets the mock mvc.
+		 *
+		 * @return the mock mvc
+		 */
+		public MockMvc getMockMvc() {
+			return mockMvc;
+		}
+
+		/**
+		 * Sets the mock mvc.
+		 *
+		 * @param mockMvc the new mock mvc
+		 */
+		public void setMockMvc(MockMvc mockMvc) {
+			this.mockMvc = mockMvc;
+		}
+		
+		/**
+		 * Gets the web application context.
+		 *
+		 * @return the web application context
+		 */
+		public WebApplicationContext getWebApplicationContext() {
+			return wac;
+		}
+		
+		
+		
+		
+}
+		
+
+		@Configuration
+		@ComponentScan(basePackages = "org.openecomp", 
+				 excludeFilters = {
+								 	// the following source configurations should not be scanned; instead of using Exclusion filter, we can use the @Profile annotation to exclude them
+									// see AppConfig class
+									//@ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openecomp.portalsdk.core.*AppConfig*")//,
+								 	//@ComponentScan.Filter(type = FilterType.REGEX, pattern = org.openecomp.*.*AppConfig*")
+								  }
+		    	)
+		@Profile("test")
+		class MockAppConfig extends AppConfig {
+			
+			@Bean 
+		    public SystemProperties systemProperties(){
+		    	return new MockSystemProperties();
+		    }
+			
+			@Bean
+		    public AbstractCacheManager cacheManager() {
+		        return new CacheManager() {
+		        	
+		        	public void configure() throws IOException {
+		        		 
+		        	}
+		        };
+		    }
+			
+			protected String[] tileDefinitions() {
+				return new String[] {"classpath:/WEB-INF/fusion/defs/definitions.xml", "classpath:/WEB-INF/defs/definitions.xml"};
+			}
+			
+			 @Override
+			public void addInterceptors(InterceptorRegistry registry) {
+			    //registry.addInterceptor(new SessionTimeoutInterceptor()).excludePathPatterns(getExcludeUrlPathsForSessionTimeout());
+			    //registry.addInterceptor(resourceInterceptor());
+			}
+			 
+			 public static class MockSystemProperties extends SystemProperties {
+					
+					public MockSystemProperties() {
+					}
+					
+				}
+					
+		}
+		
+		
+
+
diff --git a/vid-app-common/src/test/java/org/openecomp/fusionapp/controller/NetMapTest.java b/vid-app-common/src/test/java/org/openecomp/fusionapp/controller/NetMapTest.java
new file mode 100755
index 000000000..8c00c3b31
--- /dev/null
+++ b/vid-app-common/src/test/java/org/openecomp/fusionapp/controller/NetMapTest.java
@@ -0,0 +1,48 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.fusionapp.controller;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.test.web.servlet.ResultActions;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+
+import org.openecomp.fusion.core.MockApplicationContextTestSuite;
+
+/**
+ * The Class NetMapTest.
+ */
+public class NetMapTest extends MockApplicationContextTestSuite {
+	
+	/**
+	 * Test get net map.
+	 *
+	 * @throws Exception the exception
+	 */
+	@Test
+	public void testGetNetMap() throws Exception {
+		ResultActions ra =getMockMvc().perform(MockMvcRequestBuilders.get("/net_map"));
+		//Assert.assertEquals(UrlAccessRestrictedException.class,ra.andReturn().getResolvedException().getClass());
+		Assert.assertEquals("net_map_int",ra.andReturn().getModelAndView().getModel().get("frame_int"));
+	}
+	
+
+}
diff --git a/vid-app-common/src/test/java/org/openecomp/fusionapp/service/ProfileServiceTest.java b/vid-app-common/src/test/java/org/openecomp/fusionapp/service/ProfileServiceTest.java
new file mode 100755
index 000000000..43370c709
--- /dev/null
+++ b/vid-app-common/src/test/java/org/openecomp/fusionapp/service/ProfileServiceTest.java
@@ -0,0 +1,69 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.fusionapp.service;
+
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.openecomp.fusion.core.MockApplicationContextTestSuite;
+import org.openecomp.portalsdk.core.domain.Profile;
+import org.openecomp.portalsdk.core.domain.User;
+import org.openecomp.portalsdk.core.service.ProfileService;
+import org.openecomp.portalsdk.core.service.UserProfileService;
+
+
+/**
+ * The Class ProfileServiceTest.
+ */
+public class ProfileServiceTest extends MockApplicationContextTestSuite {
+	
+	/** The service. */
+	@Autowired
+	ProfileService service;
+	
+	/** The user profile service. */
+	@Autowired
+	UserProfileService userProfileService;
+	
+	/**
+	 * Test find all.
+	 */
+	@Test
+	public void testFindAll() {
+		
+		List profiles = service.findAll();
+		Assert.assertTrue(profiles.size() > 0);
+	}
+
+	/**
+	 * Test find all active.
+	 */
+	@Test
+	public void testFindAllActive() {
+				
+		List users = userProfileService.findAllActive();
+		List activeUsers = userProfileService.findAllActive();
+		Assert.assertTrue(users.size() - activeUsers.size() >= 0);
+	}
+}
diff --git a/vid-app-common/src/test/java/org/openecomp/src/main/java/org/vid/dao/FnAppDoaImplTest.java b/vid-app-common/src/test/java/org/openecomp/src/main/java/org/vid/dao/FnAppDoaImplTest.java
new file mode 100755
index 000000000..08fd9f594
--- /dev/null
+++ b/vid-app-common/src/test/java/org/openecomp/src/main/java/org/vid/dao/FnAppDoaImplTest.java
@@ -0,0 +1,45 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.src.main.java.org.vid.dao;
+
+import java.io.IOException;
+import java.sql.SQLException;
+
+import org.junit.Test;
+
+import org.openecomp.vid.dao.FnAppDoaImpl;
+
+public class FnAppDoaImplTest {
+	
+	@Test
+	public void testGetconnection() throws ClassNotFoundException, IOException, SQLException{
+		FnAppDoaImpl impl=new FnAppDoaImpl();
+		impl.getConnection(null,null,null, null);
+		
+	}
+	
+	@Test
+	public void testProfileCount() throws ClassNotFoundException, IOException, SQLException{
+		FnAppDoaImpl impl=new FnAppDoaImpl();
+		impl.getProfileCount(null,null,null, null);	
+	}
+
+}
diff --git a/vid-app-common/src/test/resources/objectconfig.properties b/vid-app-common/src/test/resources/objectconfig.properties
new file mode 100755
index 000000000..312e5bccc
--- /dev/null
+++ b/vid-app-common/src/test/resources/objectconfig.properties
@@ -0,0 +1,16 @@
+baseURL=http://vid.onap.org:9080/vid/login_external.htm
+
+
+
+login=//input[@class='fn-ebz-text ng-pristine ng-valid']
+pwd=//input[@class='span3 ng-pristine ng-valid']
+loginButton=loginBtn
+
+
+profilelink=html/body/div[1]/div[1]/div/div/div[2]/div/div/div[1]/div/div/accordion/div/div[5]/a/span
+refreshButtonSubscriberName=//img[@src='static/fusion/images/refresh.jpg']
+
+subscriberNameDropDown=.//*[@id='mContent']/div/div/table/tbody/tr[1]/td[2]/div/select
+serviceTypeDropDown=.//*[@id='mContent']/div/div/table/tbody/tr[2]/td[2]/div/select
+submitButton=.//*[@id='mContent']/div/div/table/tbody/tr[3]/td/div/button
+
diff --git a/vid/.gitignore b/vid/.gitignore
deleted file mode 100644
index b83d22266..000000000
--- a/vid/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target/
diff --git a/vid/pom.xml b/vid/pom.xml
deleted file mode 100644
index b236314a4..000000000
--- a/vid/pom.xml
+++ /dev/null
@@ -1,462 +0,0 @@
-
-
-	4.0.0
-
-	
-	org.openecomp.vid
-	vid
-	1.1.0-SNAPSHOT
-	war
-	VID Webapp
-	VID Webapp based on the Ecomp SDK
-
-	
-		UTF-8
-		1.0.0
-		4.2.0.RELEASE
-		4.3.11.Final
-		
-		true
-		
-		true
-		
-		
-		https://nexus.onap.org
-		/content/repositories/snapshots/
-		/content/repositories/releases/
-		/content/repositories/staging/
-                /content/sites/site/org/openecomp/vid/${project.version}
-	
-
-	
-		
-			ecomp-releases
-			VID Release Repository
-			${nexusproxy}/${releaseNexusPath}
-		
-		
-			ecomp-snapshots
-			VID Snapshot Repository
-			${nexusproxy}/${snapshotNexusPath}
-		
-		
-			ecomp-staging
-			VID Staging Repository
-			${nexusproxy}/${stagingNexusPath}
-		
-		
-			
-			oss-snapshots
-			oss Central - Snapshots
-			https://oss.sonatype.org/service/local/repositories/releases/content/
-		
-	
-
-
-	
-		
-			ecomp-releases
-			VID Release Repository
-			${nexusproxy}/${releaseNexusPath}
-		
-		
-			ecomp-snapshots
-			VID Snapshot Repository
-			${nexusproxy}/${snapshotNexusPath}
-		
-		
-		
-			ecomp-site
-			dav:${nexusproxy}${sitePath}
-		
-	
-
-	
-	  
-	    
-	      org.apache.maven.plugins
-	      maven-javadoc-plugin
-	      2.10.4
-	      
-		false
-		org.umlgraph.doclet.UmlGraphDoc
-		
-		  org.umlgraph
-		  umlgraph
-		  5.6
-		
-		-views
-		true
-	      
-	    
-	  
-	
-	
-	
-		
-		
-			doclint-java8-disable
-			
-				[1.8,)
-			
-			
-			
-			    	    
-				      org.codehaus.mojo
-				      versions-maven-plugin
-				      1.3.1
-				    
-				    
-				      org.sonatype.plugins
-				      nexus-staging-maven-plugin
-				      1.6.7
-				      true
-				      
-					${nexusproxy}
-					176c31dfe190a
-					ecomp-staging
-				      
-				    
-				    
-				    
-				      org.apache.maven.plugins
-				      maven-site-plugin
-				      3.6
-				      
-					
-					  org.apache.maven.wagon
-					  wagon-webdav-jackrabbit
-					  2.10
-					
-				      
-				    
-				    
-			
-			
-		
-		
-		
-			jenkins
-			
-				
-					env.BUILD_NUMBER
-				
-			
-			
-			
-				
-					
-						org.codehaus.mojo
-						cobertura-maven-plugin
-						2.7
-						
-							
-								xml
-							
-						
-						
-							
-								package
-								
-									cobertura
-								
-							
-						
-					
-				
-			
-		
-		
-	
-
-	
-		vid
-		
-			
-				org.apache.maven.plugins
-				maven-deploy-plugin
-				2.5
-			
-			
-				org.apache.tomcat.maven
-				tomcat6-maven-plugin
-				2.2
-			
-
-			
-				org.apache.tomcat.maven
-				tomcat7-maven-plugin
-				2.2
-			
-
-			
-			
-				org.jsonschema2pojo
-				jsonschema2pojo-maven-plugin
-				0.4.23
-				
-					${basedir}/src/main/resources/json/mso
-					org.openecomp.vid.domain.mso
-					${project.build.directory}/generated-sources
-				
-				
-					
-						
-							generate
-						
-					
-				
-			
-
-			
-				org.apache.maven.plugins
-				maven-compiler-plugin
-				3.1
-				
-					1.8
-					1.8
-				
-			
-
-			
-				org.apache.maven.plugins
-				maven-surefire-plugin
-				2.19.1
-				
-					${skiptests}
-					
-						**/Test*.java
-						**/*Test.java
-						**/*TestCase.java
-					
-					
-						**/selenium/*.java
-					
-					
-						${basedir}/war
-					
-					
-						classpath:
-					
-				
-			
-
-			
-				maven-assembly-plugin
-				
-					${skipassembly}
-					
-						${basedir}/distribution.xml
-					
-				
-				
-					
-						make-assembly
-						package
-						
-							single
-						
-					
-				
-			
-		
-	
-
-	
-		
-		
-			org.openecomp.ecompsdkos
-			ecompSDK-core
-			${epsdk.version}
-		
-		
-			org.openecomp.ecompsdkos
-			ecompSDK-analytics
-			${epsdk.version}
-		
-		
-			org.openecomp.ecompsdkos
-			ecompSDK-workflow
-			${epsdk.version}
-		
-		
-			com.att.eelf
-			eelf-core
-			0.0.1
-		
-		
-		
-			com.fasterxml.jackson.core
-			jackson-annotations
-			2.6.3
-		
-		
-			com.fasterxml.jackson.core
-			jackson-core
-			2.6.3
-		
-		
-			com.fasterxml.jackson.core
-			jackson-databind
-			2.6.3
-		
-		
-			com.mchange
-			c3p0
-			0.9.5.2
-		
-		
-			io.searchbox
-			jest
-			2.0.0
-			
-				
-					commons-logging
-					commons-logging
-				
-			
-		
-		
-			javax.servlet
-			javax.servlet-api
-			3.1.0
-		
-		
-			junit
-			junit
-			4.12
-		
-		
-		
-			org.elasticsearch
-			elasticsearch
-			2.2.0
-		
-		
-			org.json
-			json
-			20160212
-		
-		
-			org.quartz-scheduler
-			quartz
-			2.2.1
-			
-				
-				
-					c3p0
-					c3p0
-				
-			
-		
-		
-		
-			org.slf4j
-			jcl-over-slf4j
-			1.7.12
-		
-		
-			org.springframework
-			spring-context-support
-			${springframework.version}
-		
-		
-			org.springframework
-			spring-core
-			${springframework.version}
-			
-				
-					commons-logging
-					commons-logging
-				
-			
-		
-		
-			org.springframework
-			spring-test
-			${springframework.version}
-		
-		
-			org.springframework
-			spring-tx
-			${springframework.version}
-		
-		
-			org.springframework
-			spring-web
-			${springframework.version}
-		
-		
-			org.springframework
-			spring-webmvc
-			${springframework.version}
-		 
-		
-			org.glassfish.jersey.core
-			jersey-client
-			2.23.1
-		
-		
-			org.glassfish.jersey.connectors
-			jersey-jetty-connector
-			2.23.1
-		
-		
-			com.fasterxml.jackson.jaxrs
-			jackson-jaxrs-json-provider
-			2.6.3
-		
-		
-			commons-beanutils
-			commons-beanutils
-			1.8.3
-		
-		
-			com.googlecode.json-simple
-			json-simple
-			1.1.1
-		
-		
-			org.seleniumhq.selenium
-			selenium-java
-			2.53.1
-			test
-		
-		
-			org.seleniumhq.selenium
-			selenium-api
-			2.53.1
-			test
-		
-		
-			org.testng
-			testng
-			6.8
-			test
-		
-		
-			org.seleniumhq.selenium
-			selenium-firefox-driver
-			2.53.1
-		
-		
-		    xml-apis
-		    xml-apis
-		    1.4.01
-		
-		
-			org.openecomp.vid
-			asdcclient
-			1.0.2-SNAPSHOT
-		
-		
-		    org.mariadb.jdbc
-		    mariadb-java-client
-		    1.4.6
-		
-	
-
diff --git a/vid/src/main/java/org/openecomp/aai/util/AAIProperties.java b/vid/src/main/java/org/openecomp/aai/util/AAIProperties.java
deleted file mode 100644
index c6ec5e175..000000000
--- a/vid/src/main/java/org/openecomp/aai/util/AAIProperties.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.aai.util;
-
-import org.openecomp.portalsdk.core.util.SystemProperties;
-
-/**
- * The Class AAIProperties.
- */
-public class AAIProperties extends SystemProperties {
-
-	/** The Constant AAI_SERVER_URL_BASE. */
-	//VID Specific
-	public static final String AAI_SERVER_URL_BASE = "aai.server.url.base";
-	
-	/** The Constant AAI_SERVER_URL. */
-	public static final String AAI_SERVER_URL = "aai.server.url";
-	
-	/** The Constant AAI_OLDSERVER_URL_BASE. */
-	public static final String AAI_OLDSERVER_URL_BASE = "aai.oldserver.url.base";
-	
-	/** The Constant AAI_OLDSERVER_URL. */
-	public static final String AAI_OLDSERVER_URL = "aai.oldserver.url";
-	
-	/** The Constant AAI_TRUSTSTORE_FILENAME. */
-	public static final String AAI_TRUSTSTORE_FILENAME = "aai.truststore.filename";
-	
-	/** The Constant AAI_TRUSTSTORE_PASSWD_X. */
-	public static final String AAI_TRUSTSTORE_PASSWD_X = "aai.truststore.passwd.x";
-	
-	/** The Constant AAI_KEYSTORE_FILENAME. */
-	public static final String AAI_KEYSTORE_FILENAME = "aai.keystore.filename";
-	
-	/** The Constant AAI_KEYSTORE_PASSWD_X. */
-	public static final String AAI_KEYSTORE_PASSWD_X = "aai.keystore.passwd.x";
-		
-	/** The Constant AAI_VID_USERNAME. */
-	public static final String AAI_VID_USERNAME = "aai.vid.username";
-
-	/** The Constant AAI_VID_PASSWD_X. */
-	public static final String AAI_VID_PASSWD_X = "aai.vid.passwd.x";
-	
-	/** The Constant FILESEPARTOR. */
-	public static final String FILESEPARTOR = (System.getProperty("file.separator") == null) ? "/" : System.getProperty("file.separator");
-	
-}
diff --git a/vid/src/main/java/org/openecomp/aai/util/AAIRestInterface.java b/vid/src/main/java/org/openecomp/aai/util/AAIRestInterface.java
deleted file mode 100644
index ce61fdc7d..000000000
--- a/vid/src/main/java/org/openecomp/aai/util/AAIRestInterface.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.aai.util;
-
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.security.KeyManagementException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Base64;
-import java.util.Date;
-import java.util.UUID;
-
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.openecomp.portalsdk.core.util.SystemProperties;
-import org.openecomp.vid.encryption.EncryptedPropValue;
-
-/**
- * The Class AAIRestInterface.
- */
-public class AAIRestInterface {
-
-	/** The logger. */
-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(AAIRestInterface.class);
-	
-	/** The Constant dateFormat. */
-	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
-	
-	/** The client. */
-	private static Client client = null;
-	
-	/** The rest srvr base URL. */
-	private String restSrvrBaseURL;
-	
-	/** The certificate path. */
-	public String certificatePath = "";
-	
-	/**
-	 * Instantiates a new AAI rest interface.
-	 *
-	 * @param certPath the cert path
-	 */
-	public AAIRestInterface(String certPath)
-	{
-		certificatePath = certPath;
-	}
-	
-	/**
-	 * Encode URL.
-	 *
-	 * @param nodeKey the node key
-	 * @return the string
-	 * @throws UnsupportedEncodingException the unsupported encoding exception
-	 */
-	public String encodeURL (String nodeKey) throws UnsupportedEncodingException {
-		return URLEncoder.encode(nodeKey, "UTF-8").replaceAll("\\+", "%20");
-	}
-	
-	/**
-	 * Inits the rest client.
-	 */
-	private void initRestClient()
-	{
-		String methodName = "initRestClient";
-		
-		if (client == null) {
-			try {
-				client = HttpsAuthClient.getClient(certificatePath);
-			}
-			catch (KeyManagementException e){
-				logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== KeyManagementException in " + methodName + e.toString());
-				logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== KeyManagementException in " + methodName + e.toString());
-			} catch (Exception e) {
-				logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== Exception in REST call to DB in initRestClient" + e.toString());
-				logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== Exception in REST call to DB : " + e.toString());
-			}
-		}
-	}
-	
-	/**
-	 * Sets the rest srvr base URL.
-	 *
-	 * @param baseURL the base URL
-	 */
-	public void SetRestSrvrBaseURL(String baseURL)
-	{
-		if (baseURL == null)
-		{
-			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== REST Server base URL cannot be null.");
-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== REST Server base URL cannot be null.");
-		}
-			
-		restSrvrBaseURL = baseURL;
-	}
-	
-	/**
-	 * Gets the rest srvr base URL.
-	 *
-	 * @return the rest srvr base URL
-	 */
-	public String getRestSrvrBaseURL() 
-	{
-		return restSrvrBaseURL;
-	}
-	
-	
-	/**
-	 * Rest get.
-	 *
-	 * @param fromAppId the from app id
-	 * @param transId the trans id
-	 * @param requestUri the request uri
-	 * @param xml the xml
-	 * @return the string
-	 */
-	public String RestGet(String fromAppId, String transId, String requestUri, boolean xml) throws UnsupportedEncodingException  {
-		String methodName = "RestGet";
-		
-		String responseType = "application/json";
-		if (xml)
-          	responseType = "application/xml";
-		  
-		initRestClient();
-		
-		String url = "";
-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
-	
-		url = SystemProperties.getProperty(AAIProperties.AAI_SERVER_URL) + requestUri;
-		
-	    try {
-	    	// what is the point of this, just to check syntax??
-		    URL urlObj= new URL(url);
-			URI uri = new URI(urlObj.getProtocol(), urlObj.getUserInfo(), urlObj.getHost(), urlObj.getPort(), urlObj.getPath(), urlObj.getQuery(), urlObj.getRef());
-			url = uri.toASCIIString();
-	    } catch (URISyntaxException | MalformedURLException e) {
-	    	 logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " +  methodName + " bad URL");
-	    	 return null;
-		}
-	    logger.debug(dateFormat.format(new Date()) + "<== " + url + " for the get REST API");
-
-		String vidUsername = SystemProperties.getProperty(AAIProperties.AAI_VID_USERNAME);
-		String vidPassword = EncryptedPropValue.decryptTriple(SystemProperties.getProperty(AAIProperties.AAI_VID_PASSWD_X));
-		String encodeThis = vidUsername + ":" + vidPassword;
-	    
-		final Response cres = client.target(url)
-			 .request()
-	         .accept(responseType)
-	         .header("X-TransactionId", transId)
-	         .header("X-FromAppId",  fromAppId)
-	         .header("Authorization", "Basic " + Base64.getEncoder().encodeToString(encodeThis.getBytes("utf-8")))
-	         .header("Content-Type", "application/json")
-	         .get();
-		
-		 if (cres.getStatus() == 200) {
-			 logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " REST api GET was successful!");
-			 logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + methodName + " REST api GET was successful!");
-		 } else {
-			 logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName +" with status="+cres.getStatus()+", url="+url);
-		 }
-		 
-		 return cres.readEntity(String.class);
-	}
-	
-	
-	/**
-	 * Delete.
-	 *
-	 * @param sourceID the source ID
-	 * @param transId the trans id
-	 * @param path the path
-	 * @return true, if successful
-	 */
-	public boolean Delete(String sourceID,  String transId,  String path) throws UnsupportedEncodingException {
-		String methodName = "Delete";
-		String url="";
-		transId += ":" + UUID.randomUUID().toString();
-		logger.debug(dateFormat.format(new Date()) + "<== " +  methodName + " start");
-		
-		initRestClient();
-		String request = "{}";
-		url = SystemProperties.getProperty(AAIProperties.AAI_SERVER_URL) + path;		
-		
-		String vidUsername = SystemProperties.getProperty(AAIProperties.AAI_VID_USERNAME);
-		String vidPassword = EncryptedPropValue.decryptTriple(SystemProperties.getProperty(AAIProperties.AAI_VID_PASSWD_X));
-		String encodeThis = vidUsername + ":" + vidPassword;
-		
-		final Response cres = client.target(url)
-				 .request()
-		         .accept("application/json")
-		         .header("X-TransactionId", transId)
-		         .header("X-FromAppId",  sourceID)
-		         .header("Authorization", "Basic " + Base64.getEncoder().encodeToString(encodeThis.getBytes("utf-8")))
-		         //.entity(request)
-		         .delete();
-		
-		if (cres.getStatus() == 404) { // resource not found
-			String msg = "Resource does not exist...: " + cres.getStatus()
-					+ ":" + cres.readEntity(String.class);
-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + msg);
-			return false;
-		} else if (cres.getStatus() == 200  || cres.getStatus() == 204){
-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + "Resource " + url + " deleted");
-			return true;
-		} else {
-			String msg = "Deleting Resource failed: " + cres.getStatus()
-				+ ":" + cres.readEntity(String.class);
-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + msg);
-		}
-
-		return false;
-	}
-	
-    
-    /**
-     * Rest post.
-     *
-     * @param fromAppId the from app id
-     * @param transId the trans id
-     * @param path the path
-     * @param payload the payload
-     * @param xml the xml
-     * @return the string
-     */
-    public String RestPost(String fromAppId,  String transId,  String path, String payload, boolean xml) throws UnsupportedEncodingException {
-        String methodName = "RestPost";
-        String url="";
-        transId = UUID.randomUUID().toString();
-        logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " +  methodName + " start");       
-        
-        try {
-            
-        	String responseType = "application/json";
-        	if (xml)
-               	responseType = "application/xml";
-        	   
-            initRestClient();    
-    
-            url = SystemProperties.getProperty(AAIProperties.AAI_SERVER_URL_BASE) + path;
-			
-			String vidUsername = SystemProperties.getProperty(AAIProperties.AAI_VID_USERNAME);
-			String vidPassword = EncryptedPropValue.decryptTriple(SystemProperties.getProperty(AAIProperties.AAI_VID_PASSWD_X));
-			String encodeThis = vidUsername + ":" + vidPassword;
-						
-            final Response cres = client.target(url)
-                 .request()
-                 .accept(responseType)
-                 .header("X-TransactionId", transId)
-                 .header("X-FromAppId",  fromAppId)
-                 .header("Authorization", "Basic " + Base64.getEncoder().encodeToString(encodeThis.getBytes("utf-8")))
-                 .post(Entity.entity(payload, MediaType.APPLICATION_JSON));
-            
-            int statuscode = cres.getStatus();
-    		if ( statuscode >= 200 && statuscode <= 299 ) {
-    			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + methodName + " REST api POST was successful!");
-    			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " REST api POST was successful!");
-                return cres.readEntity(String.class);
-             } else {
-            	logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " with status="+statuscode+", url="+url + ", msg=" + cres.readEntity(String.class));
-            	return null;
-             }    
-        
-        } catch (Exception e)
-        {
-        	logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " with url="+url+ ", Exception: " + e.toString());
-        
-        }
-        
-        return null;
-    }
-    
- 
-	
-}
diff --git a/vid/src/main/java/org/openecomp/aai/util/CustomJacksonJaxBJsonProvider.java b/vid/src/main/java/org/openecomp/aai/util/CustomJacksonJaxBJsonProvider.java
deleted file mode 100644
index 12e96b8de..000000000
--- a/vid/src/main/java/org/openecomp/aai/util/CustomJacksonJaxBJsonProvider.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.aai.util;
-
-import javax.ws.rs.ext.Provider;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
-import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
-
-/**
- * The Class CustomJacksonJaxBJsonProvider.
- */
-@Provider
-public class CustomJacksonJaxBJsonProvider extends JacksonJaxbJsonProvider {
-
-	    /** The common mapper. */
-    	private static ObjectMapper commonMapper = null;
-
-	    /**
-    	 * Instantiates a new custom jackson jax B json provider.
-    	 */
-    	public CustomJacksonJaxBJsonProvider() {
-	        if (commonMapper == null) {
-	            ObjectMapper mapper = new ObjectMapper();
-
-	            mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-	            
-	            mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
-	            mapper.configure(SerializationFeature.INDENT_OUTPUT, false);
-	            mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, false);
-
-	            mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-	            mapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, false);
-
-	            mapper.registerModule(new JaxbAnnotationModule());
-
-	            commonMapper = mapper;
-	        }
-	        super.setMapper(commonMapper);
-	    }
-	    
-	    /**
-    	 * Gets the mapper.
-    	 *
-    	 * @return the mapper
-    	 */
-    	public ObjectMapper getMapper() {
-	    	return commonMapper;
-	    }
-}
diff --git a/vid/src/main/java/org/openecomp/aai/util/HttpsAuthClient.java b/vid/src/main/java/org/openecomp/aai/util/HttpsAuthClient.java
deleted file mode 100644
index dec0b8015..000000000
--- a/vid/src/main/java/org/openecomp/aai/util/HttpsAuthClient.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.aai.util;
-
-import java.io.FileInputStream;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSession;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-
-import org.openecomp.vid.encryption.EncryptedPropValue;
-
-import org.openecomp.portalsdk.core.util.SystemProperties;
-
-/**
- * The Class HttpsAuthClient.
- */
-public class HttpsAuthClient{
-	
-	/**
-	 * Gets the client.
-	 *
-	 * @param certFilePath the cert file path
-	 * @return the client
-	 * @throws KeyManagementException the key management exception
-	 */
-	public static Client getClient(String certFilePath) throws KeyManagementException {
-				
-		//config.getFeatures().put(JSONConfiguration.FEATURE_POJO_MAPPING, Boolean.TRUE);
-		//config.getClasses().add(org.openecomp.aai.util.CustomJacksonJaxBJsonProvider.class);
-		
-		try {
-			String truststore_path = certFilePath + AAIProperties.FILESEPARTOR + SystemProperties.getProperty(AAIProperties.AAI_TRUSTSTORE_FILENAME);
-			String truststore_password = SystemProperties.getProperty(AAIProperties.AAI_TRUSTSTORE_PASSWD_X);
-			String decrypted_truststore_password = EncryptedPropValue.decryptTriple(truststore_password);
-//			String keystore_path = certFilePath + AAIProperties.FILESEPARTOR + SystemProperties.getProperty(AAIProperties.AAI_KEYSTORE_FILENAME);
-//			String keystore_password = SystemProperties.getProperty(AAIProperties.AAI_KEYSTORE_PASSWD_X);
-//			String decrypted_keystore_password = EncryptedPropValue.decryptTriple(keystore_password);
-
-			
-			
-			
-		    System.setProperty("javax.net.ssl.trustStore", truststore_path);
-		    System.setProperty("javax.net.ssl.trustStorePassword", decrypted_truststore_password);
-			HttpsURLConnection.setDefaultHostnameVerifier( new HostnameVerifier(){
-			    public boolean verify(String string,SSLSession ssls) {
-			        return true;
-			    }
-			});
-		
-//			final SSLContext ctx = SSLContext.getInstance("TLS");
-//			KeyManagerFactory kmf = null;
-//			try {
-//				kmf = KeyManagerFactory.getInstance("SunX509");
-//				FileInputStream fin = new FileInputStream(keystore_path);
-//				KeyStore ks = KeyStore.getInstance("PKCS12");
-//				char[] pwd = decrypted_keystore_password.toCharArray();
-//				ks.load(fin, pwd);
-//				kmf.init(ks, pwd);
-//			} catch (Exception e) {
-//				System.out.println("Error setting up kmf: exiting");
-//				e.printStackTrace();
-//				System.exit(1);
-//			}
-//
-//			ctx.init(kmf.getKeyManagers(), null, null);
-
-			return ClientBuilder.newBuilder()
-					.hostnameVerifier(new HostnameVerifier() {
-						@Override
-						public boolean verify( String s, SSLSession sslSession ) {
-							return true;
-						}
-					}).build()
-					.register(org.openecomp.aai.util.CustomJacksonJaxBJsonProvider.class);
-			
-		} catch (Exception e) {
-			System.out.println("Error setting up config: exiting");
-			e.printStackTrace();
-			System.exit(1);
-			return null;
-		}
-	}
-
-
-	
-}  
diff --git a/vid/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java b/vid/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java
deleted file mode 100644
index f5f67b895..000000000
--- a/vid/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.portalapp.service;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import org.openecomp.portalsdk.core.domain.User;
-
-/**
- * The Class AdminAuthExtension.
- */
-@Service("adminAuthExtension")
-@Transactional
-public class AdminAuthExtension {
-	
-	/**
-	 * Save user extension.
-	 *
-	 * @param user the user
-	 */
-	public void saveUserExtension(User user){
-		//app's developer implement their own logic here, like updating app's related tables
-	}
-
-}
diff --git a/vid/src/main/java/org/openecomp/portalapp/uebhandler/InitUebHandler.java b/vid/src/main/java/org/openecomp/portalapp/uebhandler/InitUebHandler.java
deleted file mode 100644
index 31c5882c0..000000000
--- a/vid/src/main/java/org/openecomp/portalapp/uebhandler/InitUebHandler.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.portalapp.uebhandler;
-
-import java.util.concurrent.ConcurrentLinkedQueue;
-
-import javax.annotation.PostConstruct;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-
-import org.openecomp.portalsdk.core.logging.format.AlarmSeverityEnum;
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.openecomp.portalsdk.core.onboarding.crossapi.PortalApiConstants;
-import org.openecomp.portalsdk.core.onboarding.crossapi.PortalApiProperties;
-import org.openecomp.portalsdk.core.onboarding.ueb.UebManager;
-import org.openecomp.portalsdk.core.onboarding.ueb.UebMsg;
-import org.openecomp.vid.conf.ExternalAppConfig;
-
-//
-// Adding this class for the sole purpose of insuring that the MainUebHandler really 
-// honors @Async and kicks off a thread.  For more info google @Async and read about
-// @Async only working if called from different class.
-/**
- * The Class InitUebHandler.
- */
-//
-@Configuration
-public class InitUebHandler {
-
-	/** The logger. */
-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(InitUebHandler.class);
-
-	
-	/** The main ueb handler. */
-	@Autowired
-	MainUebHandler mainUebHandler;
-	
-	/**
-	 * Instantiates a new inits the ueb handler.
-	 */
-	public InitUebHandler()	{
-	
-	}
-	
-	/**
-	 * Inits the ueb.
-	 */
-	@PostConstruct
-	public void initUeb()	{
-		
-		try {
-			String enableListenerThread = PortalApiProperties.getProperty(PortalApiConstants.UEB_LISTENERS_ENABLE);
-			if (enableListenerThread.equalsIgnoreCase("true")) {
-                ConcurrentLinkedQueue inboxQueue = new ConcurrentLinkedQueue();
-	    	    UebManager.getInstance().initListener(inboxQueue);
-  		        mainUebHandler.runHandler(inboxQueue);
-				logger.info(EELFLoggerDelegate.debugLogger, ("Returned from initiating mainUebHandler..."));
-  	        }
-		    else {
-				logger.info(EELFLoggerDelegate.debugLogger, ("Not starting UEB listening thread because ueb_listeners_enable is not set to true in the properties file."));
-		    }
-		}
-		catch (Exception e) {
-			logger.error(EELFLoggerDelegate.debugLogger, ("Not starting UEB listening thread because property could not be read " + PortalApiConstants.UEB_LISTENERS_ENABLE),AlarmSeverityEnum.MAJOR);
-		}
-	
-	}
-}
-
diff --git a/vid/src/main/java/org/openecomp/portalapp/uebhandler/MainUebHandler.java b/vid/src/main/java/org/openecomp/portalapp/uebhandler/MainUebHandler.java
deleted file mode 100644
index 5b7f0e4a6..000000000
--- a/vid/src/main/java/org/openecomp/portalapp/uebhandler/MainUebHandler.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.portalapp.uebhandler;
-
-import java.util.concurrent.ConcurrentLinkedQueue;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Component;
-
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.openecomp.portalsdk.core.onboarding.ueb.UebMsg;
-import org.openecomp.portalsdk.core.onboarding.ueb.UebMsgTypes;
-
-//-------------------------------------------------------------------------
-// Listens for received UEB messages and handles the messages
-//
-// Note: To implement a synchronous reply call getMsgId on the request 
-//       and putMsgId on the reply (echoing the request MsgId).
-//       
-/**
- * The Class MainUebHandler.
- */
-//-------------------------------------------------------------------------
-@Component("MainUebHandler")
-public class MainUebHandler {
-
-	/** The logger. */
-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MainUebHandler.class);
-
-
-	/** The inbox queue. */
-	ConcurrentLinkedQueue inboxQueue = null;
-
-	/** The widget notification handler. */
-	@Autowired
-	WidgetNotificationHandler widgetNotificationHandler;
-
-	/**
-	 * Run handler.
-	 *
-	 * @param queue the queue
-	 */
-	@Async
-	public void runHandler(ConcurrentLinkedQueue queue) {
-		inboxQueue = queue;
-
-		logger.info(EELFLoggerDelegate.debugLogger, ("==> MainUebHandler started"));
-
-		while (true) {
-			UebMsg msg = null;
-			while ((msg = inboxQueue.poll()) != null) {
-				if (msg.getMsgType() != null) {
-					logger.debug(EELFLoggerDelegate.debugLogger, ("<== Received UEB message : " + msg.toString()));
-
-					switch (msg.getMsgType()) {
-					/*
-					 * Add your own defined handler objects, use @Component for
-					 * the class. See WidgetNotificationHandler as an example.
-					 *
-					 * Use @Async on methods for performance
-					 *
-					 * For syncronous replies use UebManager publishReply and
-					 * echo back the msgId in your response ie
-					 * msg.putMsgId(requestMsg.getMsgId())
-					 *
-					 * case UebMsgTypes.UEB_MSG_TYPE_XYZ: {
-					 * XYZHandler.handleMsg(msg); break; }
-					 */
-					case UebMsgTypes.UEB_MSG_TYPE_WIDGET_NOTIFICATION: {
-						widgetNotificationHandler.handleWidgetNotification(msg);
-						break;
-					}
-					default: {
-						
-						logger.info(EELFLoggerDelegate.debugLogger, ("Unknown message type [" + msg.getMsgType() + "] from " + msg.getSourceTopicName()));
-
-						break;
-					}
-					}
-				}
-			}
-
-			if (Thread.interrupted()) {
-				
-				logger.info(EELFLoggerDelegate.debugLogger, ("==> UebMainHandler exiting"));
-
-				break;
-			}
-
-			try {
-				Thread.sleep(10);
-			} catch (InterruptedException e) {
-				logger.info(EELFLoggerDelegate.debugLogger, ("UebMainHandler interrupted during sleep" + e.getMessage()));
-
-			}
-		}
-	}
-}
diff --git a/vid/src/main/java/org/openecomp/portalapp/uebhandler/WidgetNotificationHandler.java b/vid/src/main/java/org/openecomp/portalapp/uebhandler/WidgetNotificationHandler.java
deleted file mode 100644
index dba84d4ac..000000000
--- a/vid/src/main/java/org/openecomp/portalapp/uebhandler/WidgetNotificationHandler.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.portalapp.uebhandler;
-
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Component;
-
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.openecomp.portalsdk.core.onboarding.ueb.UebMsg;
-
-
-/**
- * The Class WidgetNotificationHandler.
- */
-@Component
-public class WidgetNotificationHandler {
-
-	/** The logger. */
-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(WidgetNotificationHandler.class);
-
-
-	/**
-	 * Instantiates a new widget notification handler.
-	 */
-	public WidgetNotificationHandler() {
-	}
-
-	/**
-	 * Handle widget notification.
-	 *
-	 * @param requestMsg the request msg
-	 */
-	@Async
-	public void handleWidgetNotification(UebMsg requestMsg) {
-		logger.debug(EELFLoggerDelegate.debugLogger, ("handleWidgetNotification received notification: " + requestMsg.toString()));
-		/*
-		 * Here the notification msg can be handled
-		 *
-		 * requestMsg.getPayload() - returns string that contains the
-		 * Application defined content
-		 */
-	}
-}
diff --git a/vid/src/main/java/org/openecomp/portalapp/util/CustomLoggingFilter.java b/vid/src/main/java/org/openecomp/portalapp/util/CustomLoggingFilter.java
deleted file mode 100644
index e4c877759..000000000
--- a/vid/src/main/java/org/openecomp/portalapp/util/CustomLoggingFilter.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.portalapp.util;
-
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.core.filter.Filter;
-import ch.qos.logback.core.spi.FilterReply;
-
-/**
- * Custom Filter class bind with logback.xml
- * configuration file to strip out certain log messages
- * coming out of special packages or classes.
- *
- */
-public class CustomLoggingFilter extends Filter {
-
-	/**
-	 * Custom Filter is added to strip out the continuous U-EB logging messages
-	 * But make sure we log the ERROR & WARNING Level messages.
-	 *
-	 * @param event the event
-	 * @return the filter reply
-	 */
-	@Override
-	public FilterReply decide(ILoggingEvent event) {
-		try {
-			if ((event.getLevel() != Level.ERROR || event.getLevel() != Level.WARN) && 
-				(event.getThreadName().equalsIgnoreCase("UEBConsumerThread")) &&
-				(event.getLoggerName().contains("org.openecomp.nsa") || event.getLoggerName().contains("org.apache.http"))
-				) {
-				return FilterReply.DENY;
-			} else {
-				return FilterReply.NEUTRAL;
-			}
-		} catch(Exception e) {
-			return FilterReply.NEUTRAL;
-		} 
-	}
-}
diff --git a/vid/src/main/java/org/openecomp/vid/client/HttpBasicClient.java b/vid/src/main/java/org/openecomp/vid/client/HttpBasicClient.java
deleted file mode 100644
index ba82ae052..000000000
--- a/vid/src/main/java/org/openecomp/vid/client/HttpBasicClient.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.client;
-
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-
-import javax.servlet.ServletContext;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-
-import org.glassfish.jersey.client.ClientConfig;
-import org.glassfish.jersey.client.ClientProperties;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-
-/**
- *  General HTTP client.
- */
-
-public class HttpBasicClient{
-	
-	/** The servlet context. */
-	@Autowired 
-	private ServletContext servletContext;
-	
-	/** The logger. */
-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(HttpBasicClient.class);
-	
-	/** The Constant dateFormat. */
-	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
-	
-	/**
-	 * Obtain a basic HTTP client .
-	 *
-	 * @return Client client object
-	 * @throws Exception the exception
-	 */
-	public static Client getClient() throws Exception {
-		
-		ClientConfig config = new ClientConfig();
-		config.property(ClientProperties.SUPPRESS_HTTP_COMPLIANCE_VALIDATION, true);
-		
-		return ClientBuilder.newClient(config)
-				.register(org.openecomp.aai.util.CustomJacksonJaxBJsonProvider.class);
-	}	
-}  
diff --git a/vid/src/main/java/org/openecomp/vid/client/HttpsBasicClient.java b/vid/src/main/java/org/openecomp/vid/client/HttpsBasicClient.java
deleted file mode 100644
index 0519828df..000000000
--- a/vid/src/main/java/org/openecomp/vid/client/HttpsBasicClient.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.client;
-
-import java.io.File;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSession;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-
-import org.glassfish.jersey.client.ClientConfig;
-import org.glassfish.jersey.client.ClientProperties;
-import org.openecomp.vid.encryption.EncryptedPropValue;
-
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.openecomp.portalsdk.core.util.SystemProperties;
-import org.openecomp.vid.properties.VidProperties;
-
- /**
-  *  General SSL client using the VID tomcat keystore. It doesn't use client certificates.
-  */
- 
-public class HttpsBasicClient{
-	
-	/** The logger. */
-	static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(HttpsBasicClient.class);
-	
-	/** The Constant dateFormat. */
-	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
-	
-	/**
-	 * Retrieve an SSL client.
-	 *
-	 * @return Client The SSL client
-	 * @throws Exception the exception
-	 */
-	public static Client getClient() throws Exception {
-		String methodName = "getClient";
-		ClientConfig config = new ClientConfig();
-		//config.getFeatures().put(JSONConfiguration.FEATURE_POJO_MAPPING, Boolean.TRUE);
-		//config.getClasses().add(org.openecomp.aai.util.CustomJacksonJaxBJsonProvider.class);
-	
-		SSLContext ctx = null;
-		
-		try {
-			
-			config.property(ClientProperties.SUPPRESS_HTTP_COMPLIANCE_VALIDATION, true);
-			
-			String truststore_path = SystemProperties.getProperty(VidProperties.VID_TRUSTSTORE_FILENAME);
-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + " " + methodName + " truststore_path=" + truststore_path);
-			String truststore_password = SystemProperties.getProperty(VidProperties.VID_TRUSTSTORE_PASSWD_X);
-			
-			
-			String decrypted_truststore_password = EncryptedPropValue.decryptTriple(truststore_password);
-			//logger.debug(dateFormat.format(new Date()) + " " + methodName + " decrypted_truststore_password=" + decrypted_truststore_password);
-			
-			File tr = new File (truststore_path);
-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + " " + methodName + " absolute truststore path=" + tr.getAbsolutePath());
-			
-			//String keystore_path = certFilePath + AAIProperties.FILESEPARTOR + SystemProperties.getProperty(AAIProperties.AAI_KEYSTORE_FILENAME);
-			//String keystore_password = SystemProperties.getProperty(AAIProperties.AAI_KEYSTORE_PASSWD_X);
-			//String decrypted_keystore_password = EncryptedPropValue.decryptTriple(keystore_password);
-			
-		    System.setProperty("javax.net.ssl.trustStore", truststore_path);
-		    System.setProperty("javax.net.ssl.trustStorePassword", decrypted_truststore_password);
-			HttpsURLConnection.setDefaultHostnameVerifier( new HostnameVerifier(){
-			    public boolean verify(String string,SSLSession ssls) {
-			        return true;
-			    }
-			});
-	
-			//May need to make the algorithm a parameter. MSO requires TLSv1.1	or TLSv1.2
-			ctx = SSLContext.getInstance("TLSv1.2");
-			
-			/* 
-			KeyManagerFactory kmf = null;
-			try {
-				kmf = KeyManagerFactory.getInstance("SunX509");
-				FileInputStream fin = new FileInputStream(keystore_path);
-				KeyStore ks = KeyStore.getInstance("PKCS12");
-				char[] pwd = decrypted_keystore_password.toCharArray();
-				ks.load(fin, pwd);
-				kmf.init(ks, pwd);
-			} catch (Exception e) {
-				System.out.println("Error setting up kmf: exiting");
-				e.printStackTrace();
-				System.exit(1);
-			}
-
-			ctx.init(kmf.getKeyManagers(), null, null);
-			*/
-			ctx.init(null, null, null);
-			//config.getProperties().put(HTTPSProperties.PROPERTY_HTTPS_PROPERTIES, 
-			//							new HTTPSProperties( , ctx));
-			
-			return ClientBuilder.newBuilder()
-				.sslContext(ctx)
-				.hostnameVerifier(new HostnameVerifier() {
-					@Override
-					public boolean verify( String s, SSLSession sslSession ) {
-						return true;
-					}
-				}).withConfig(config)
-				.build()
-				.register(org.openecomp.aai.util.CustomJacksonJaxBJsonProvider.class);
-			
-		} catch (Exception e) {
-			System.out.println("Error setting up config: exiting");
-			e.printStackTrace();
-			return null;
-		}
-			
-		//Client client = ClientBuilder.newClient(config);
-		// uncomment this line to get more logging for the request/response
-		// client.addFilter(new LoggingFilter(System.out));
-		
-		//return client;
-	}
-}  
diff --git a/vid/src/main/java/org/openecomp/vid/conf/ExternalAppConfig.java b/vid/src/main/java/org/openecomp/vid/conf/ExternalAppConfig.java
deleted file mode 100644
index e56c1b187..000000000
--- a/vid/src/main/java/org/openecomp/vid/conf/ExternalAppConfig.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.conf;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.PostConstruct;
-import javax.sql.DataSource;
-
-import org.openecomp.vid.scheduler.RegistryAdapter;
-import org.openecomp.portalapp.uebhandler.InitUebHandler;
-import org.openecomp.portalapp.uebhandler.MainUebHandler;
-import org.openecomp.portalapp.uebhandler.WidgetNotificationHandler;
-import org.openecomp.portalsdk.core.conf.AppConfig;
-import org.openecomp.portalsdk.core.conf.Configurable;
-import org.openecomp.portalsdk.core.objectcache.AbstractCacheManager;
-import org.openecomp.portalsdk.core.service.DataAccessService;
-import org.openecomp.portalsdk.core.util.CacheManager;
-import org.openecomp.portalsdk.core.util.SystemProperties;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.Profile;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
-import org.springframework.core.io.Resource;
-import org.springframework.jdbc.datasource.init.DataSourceInitializer;
-import org.springframework.jdbc.datasource.init.DatabasePopulator;
-import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.quartz.SchedulerFactoryBean;
-import org.springframework.web.servlet.ViewResolver;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-/**
- * Configures Spring features in the ECOMP Portal SDK sample application.
- * Subclasses the ECOMP Portal SDK core AppConfig class to reuse interceptors,
- * view resolvers and other features defined there.
- */
-@Configuration
-@EnableWebMvc
-@ComponentScan(basePackages = "org.openecomp")
-@PropertySource(value = { "${container.classpath:}/WEB-INF/conf/app/test.properties" }, ignoreResourceNotFound = true)
-@Profile("src")
-@EnableAsync
-@EnableScheduling
-public class ExternalAppConfig extends AppConfig implements Configurable {
-	
-	/** The Constant LOG. */
-	private static final EELFLoggerDelegate LOG = EELFLoggerDelegate.getLogger(ExternalAppConfig.class);
-	
-	/** The scheduler registry adapter. */
-	private RegistryAdapter schedulerRegistryAdapter;
-
-	/** The vid schema script. */
-	@Value("classpath:vid-schema.sql")
-	private Resource vidSchemaScript;
-
-	/** The vid data script. */
-	@Value("classpath:vid-data.sql")
-	private Resource vidDataScript;
-	
-	/**
-	 * The Class InnerConfiguration.
-	 */
-	@Configuration
-	@Import(SystemProperties.class)
-	static class InnerConfiguration {
-	}
-
-	/**
-	 * View resolver.
-	 *
-	 * @return the view resolver
-	 * @see org.openecomp.portalsdk.core.conf.AppConfig#viewResolver()
-	 */
-	public ViewResolver viewResolver() {
-		return super.viewResolver();
-	}
-
-	/**
-	 * Adds the resource handlers.
-	 *
-	 * @param registry the registry
-	 * @see org.openecomp.portalsdk.core.conf.AppConfig#addResourceHandlers(ResourceHandlerRegistry)
-	 */
-	public void addResourceHandlers(ResourceHandlerRegistry registry) {
-		super.addResourceHandlers(registry);
-	}
-
-	/**
-	 * Data access service.
-	 *
-	 * @return the data access service
-	 * @see org.openecomp.portalsdk.core.conf.AppConfig#dataAccessService()
-	 */
-	public DataAccessService dataAccessService() {
-		return super.dataAccessService();
-	}
-
-	/**
-	 * Creates a new list with a single entry that is the external app
-	 * definitions.xml path.
-	 * 
-	 * @return List of String, size 1
-	 */
-	public List addTileDefinitions() {
-		List definitions = new ArrayList();
-		definitions.add("/WEB-INF/defs/definitions.xml");
-		return definitions;
-	}
-
-	/**
-	 * Adds request interceptors to the specified registry by calling
-	 * {@link AppConfig#addInterceptors(InterceptorRegistry)}, but excludes
-	 * certain paths from the session timeout interceptor.
-	 *
-	 * @param registry the registry
-	 */
-	@Override
-	public void addInterceptors(InterceptorRegistry registry) {
-		super.setExcludeUrlPathsForSessionTimeout("/login_external", "*/login_external.htm", "login", "/login.htm",
-				"/api*","/single_signon.htm","/single_signon");
-		super.addInterceptors(registry);
-	}
-
-	/**
-	 * Creates and returns a new instance of a {@link CacheManager} class.
-	 * 
-	 * @return New instance of {@link CacheManager}
-	 */
-	@Bean
-	public AbstractCacheManager cacheManager() {
-		return new CacheManager();
-	}
-	
-	/**
-	 * Inits the global local context.
-	 */
-	@PostConstruct
-	public void initGlobalLocalContext() {
-		LOG.init();
-	}
-
-	
-	/**
-	 * Creates and returns a new instance of a {@link MainUebHandler}. 
-	 * 
-	 * @return New instance of {@link MainUebHandler}.
-	 */
-	@Bean
-	public MainUebHandler mainUebHandler() {
-		
-		return new MainUebHandler();
-	}
-	
-	/**
-	 * Creates and returns a new instance of a {@link InitUebHandler}.  
-	 * 
-	 * @return New instance of {@link InitUebHandler}.
-	 */
-	@Bean
-	public InitUebHandler initUebHandler() {
-		
-		return new InitUebHandler();
-	}
-
-	/**
-	 * Creates and returns a new instance of a {@link WidgetNotificationHandler}
-	 * .
-	 * 
-	 * @return New instance of {@link WidgetNotificationHandler}.
-	 */
-	@Bean
-	public WidgetNotificationHandler widgetNotificationHandler() {
-		return new WidgetNotificationHandler();
-	}
-	
-	/**
-	 * Creates and returns a new instance of a {@link SchedulerFactoryBean} and
-	 * populates it with triggers.
-	 *
-	 * @return New instance of {@link SchedulerFactoryBean}
-	 * @throws Exception the exception
-	 */
-	// @Bean // ANNOTATION COMMENTED OUT 
-	// APPLICATIONS REQUIRING QUARTZ SHOULD RESTORE ANNOTATION
-	public SchedulerFactoryBean schedulerFactoryBean() throws Exception {
-		SchedulerFactoryBean scheduler = new SchedulerFactoryBean();
-		scheduler.setTriggers(schedulerRegistryAdapter.getTriggers());
-		scheduler.setConfigLocation(appApplicationContext.getResource("WEB-INF/conf/quartz.properties"));
-		scheduler.setDataSource(dataSource());
-		return scheduler;
-	}
-
-	/**
-	 * Data source initializer.
-	 *
-	 * @param dataSource the data source
-	 * @return the data source initializer
-	 */
-	@Bean
-	public DataSourceInitializer dataSourceInitializer(DataSource dataSource) {
-		
-		LOG.info("Initializing VID data source");
-		
-		final DataSourceInitializer initializer = new DataSourceInitializer();
-		initializer.setDataSource(dataSource);
-		initializer.setDatabasePopulator(databasePopulator());
-		return initializer;
-	}
-	
-	/**
-	 * Database populator.
-	 *
-	 * @return the database populator
-	 */
-	public DatabasePopulator databasePopulator() {
-		LOG.info("Populating VID data source");
-		
-		final ResourceDatabasePopulator populator = new ResourceDatabasePopulator();
-		populator.addScript(vidSchemaScript);
-		populator.addScript(vidDataScript);
-		return populator;
-	}
-	
-	/**
-	 * Sets the scheduler registry adapter.
-	 *
-	 * @param schedulerRegistryAdapter the new scheduler registry adapter
-	 */
-	@Autowired
-	public void setSchedulerRegistryAdapter(final RegistryAdapter schedulerRegistryAdapter) {
-		this.schedulerRegistryAdapter = schedulerRegistryAdapter;
-	}
-	
-	/**
-	 * Property config in dev.
-	 *
-	 * @return the property sources placeholder configurer
-	 */
-	@Bean
-	public static PropertySourcesPlaceholderConfigurer propertyConfigInDev() {
-		return new PropertySourcesPlaceholderConfigurer();
-	}
-}
diff --git a/vid/src/main/java/org/openecomp/vid/conf/ExternalAppInitializer.java b/vid/src/main/java/org/openecomp/vid/conf/ExternalAppInitializer.java
deleted file mode 100644
index 8e26484a3..000000000
--- a/vid/src/main/java/org/openecomp/vid/conf/ExternalAppInitializer.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.conf;
-
-import java.util.Arrays;
-
-import org.openecomp.portalsdk.core.conf.AppInitializer;
-
-/**
- * The Class ExternalAppInitializer.
- */
-public class ExternalAppInitializer extends  AppInitializer{
-	
-	
-	/* (non-Javadoc)
-	 * @see org.openecomp.portalsdk.core.conf.AppInitializer#getRootConfigClasses()
-	 */
-	@Override
-    protected Class[] getRootConfigClasses() {
-    	return super.getRootConfigClasses();
-    }
-  
-    /* (non-Javadoc)
-     * @see org.openecomp.portalsdk.core.conf.AppInitializer#getServletConfigClasses()
-     */
-    @Override
-    protected Class[] getServletConfigClasses() {
-//    	Class[] configClasses =  super.getServletConfigClasses();
-//    	Class[] additionalConfigClasses  = Arrays.copyOf(configClasses, configClasses.length);
-//    	addConfigClass(additionalConfigClasses, ExternalAppConfig.class);
-//    	return additionalConfigClasses;
-//    	
-    	return new Class[] {ExternalAppConfig.class};
-    }
-    
-    /**
-     * Adds the config class.
-     *
-     * @param a the a
-     * @param e the e
-     * @return the class[]
-     */
-    static Class[] addConfigClass(Class[] a, Class e) {
-        a  = Arrays.copyOf(a, a.length + 1);
-        a[a.length - 1] = e;
-        return a;
-    }
-  
-    /* (non-Javadoc)
-     * @see org.openecomp.portalsdk.core.conf.AppInitializer#getServletMappings()
-     */
-    /*
-     * URL request will direct to the Spring dispatcher for processing
-     */
-    @Override
-    protected String[] getServletMappings() {
-       return super.getServletMappings();
-    }
- 
-}
-
-
diff --git a/vid/src/main/java/org/openecomp/vid/conf/HibernateMappingLocations.java b/vid/src/main/java/org/openecomp/vid/conf/HibernateMappingLocations.java
deleted file mode 100644
index 848964bca..000000000
--- a/vid/src/main/java/org/openecomp/vid/conf/HibernateMappingLocations.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.conf;
-
-import org.openecomp.portalsdk.core.conf.HibernateMappingLocatable;
-import org.springframework.context.annotation.Profile;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.springframework.stereotype.Component;
-
-/**
- * The Class HibernateMappingLocations.
- */
-@Component
-@Profile("src")
-public class HibernateMappingLocations implements HibernateMappingLocatable {
-	
-	/* (non-Javadoc)
-	 * @see org.openecomp.portalsdk.core.conf.HibernateMappingLocatable#getMappingLocations()
-	 */
-	public Resource[] getMappingLocations() {
-		return new Resource[]{new ClassPathResource("../fusion/orm/Fusion.hbm.xml"), new ClassPathResource("../fusion/orm/Workflow.hbm.xml"), new ClassPathResource("../fusion/orm/RNoteBookIntegration.hbm.xml")};
-	}
-     
-
-}
diff --git a/vid/src/main/java/org/openecomp/vid/controller/AaiController.java b/vid/src/main/java/org/openecomp/vid/controller/AaiController.java
deleted file mode 100644
index b53b36c0c..000000000
--- a/vid/src/main/java/org/openecomp/vid/controller/AaiController.java
+++ /dev/null
@@ -1,748 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.controller;
-
-import java.io.File;
-import java.io.IOException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.openecomp.aai.util.AAIRestInterface;
-import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.ModelAndView;
-
-/**
- * Controller to handle a&ai requests.
- */
-
-@RestController
-public class AaiController extends RestrictedBaseController{
-	
-	/** The view name. */
-	String viewName;
-	
-	/** The logger. */
-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(AaiController.class);
-	
-	/** The Constant dateFormat. */
-	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
-
-	/** The from app id. */
-	protected String fromAppId = "VidAaiController";
-
-	/** The model. */
-	private Map model = new HashMap();
-
-	/** The servlet context. */
-	private @Autowired ServletContext servletContext;
-	
-	/**
-	 * Welcome method.
-	 *
-	 * @param request the request
-	 * @return ModelAndView The view
-	 */
-	@RequestMapping(value = {"/subscriberSearch" }, method = RequestMethod.GET)
-	public ModelAndView welcome(HttpServletRequest request) {
-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== AaiController welcome start");
-		return new ModelAndView(getViewName());		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#getViewName()
-	 */
-	public String getViewName() {
-		return viewName;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#setViewName(java.lang.String)
-	 */
-	public void setViewName(String viewName) {
-		this.viewName = viewName;
-	}
-
-	/**
-	 * Get services from a&ai.
-	 *
-	 * @return ResponseEntity The response entity
-	 * @throws IOException Signals that an I/O exception has occurred.
-	 * @throws InterruptedException the interrupted exception
-	 */
-@RequestMapping(value="/aai_get_services",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) 
-	public ResponseEntity doGetServices() throws IOException, InterruptedException {	
-		File certiPath = GetCertificatesPath();
-		
-		String resp = doAaiGet(certiPath.getAbsolutePath(), "service-design-and-creation/services?depth=0", false);;
-		
-		return new ResponseEntity(resp, HttpStatus.OK);
-	}
-	
-	
-
-	/**
-	 * Get services from a&ai.
-	 *
-	 * @param globalCustomerId the global customer id
-	 * @param serviceSubscriptionId the service subscription id
-	 * @return ResponseEntity The response entity
-	 * @throws IOException Signals that an I/O exception has occurred.
-	 * @throws InterruptedException the interrupted exception
-	 */
-	@RequestMapping(value="/aai_get_service_subscription/{global-customer-id}/{service-subscription-id}",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) 
-	public ResponseEntity doGetServices(@PathVariable("global-customer-id") String globalCustomerId,
-			@PathVariable("service-subscription-id") String serviceSubscriptionId) throws IOException, InterruptedException {	
-		File certiPath = GetCertificatesPath();
-		String resp = doAaiGet(certiPath.getAbsolutePath(), "/business/customers/customer/" + globalCustomerId 
-				+ "/service-subscriptions/service-subscription/" + serviceSubscriptionId + "?depth=0", false);
-		return new ResponseEntity(resp, HttpStatus.OK);
-	}
-
-	/**
-	 * Obtain the subscriber list from a&ai.
-	 *
-	 * @param fullSet the full set
-	 * @return ResponseEntity The response entity
-	 * @throws IOException Signals that an I/O exception has occurred.
-	 * @throws InterruptedException the interrupted exception
-	 */
-	@RequestMapping(value="/aai_get_subscribers",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)  	
-	public ResponseEntity doGetSubscriberList(@DefaultValue("n") @QueryParam("fullSet") String fullSet) throws IOException, InterruptedException {
-
-		String res1 = getSubscribers(false);
-
-		return new ResponseEntity(res1, HttpStatus.OK);
-
-	}
-
-	/**
-	 * Obtain the full subscriber list from a&ai.
-	 *
-	 * @return ResponseEntity The response entity
-	 * @throws IOException Signals that an I/O exception has occurred.
-	 * @throws InterruptedException the interrupted exception
-	 */
-	@RequestMapping(value="/aai_get_full_subscribers",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)  	
-	public ResponseEntity getFullSubscriberList() throws IOException, InterruptedException {
-
-		String res1 = getSubscribers(true);
-
-		return new ResponseEntity(res1, HttpStatus.OK);
-
-	}
-	
-	/**
-	 * Refresh the subscriber list from a&ai.
-	 *
-	 * @return ResponseEntity The response entity
-	 * @throws IOException Signals that an I/O exception has occurred.
-	 */
-	@RequestMapping(value="/aai_refresh_subscribers",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)  	
-	public ResponseEntity doRefreshSubscriberList() throws IOException {
-		
-		String res1 = getSubscribers(false);
-		
-		// refresh the services too
-		String resp  = getServices();
-		
-		return new ResponseEntity(res1, HttpStatus.OK);
-	}
-	
-	/**
-	 * Refresh the full subscriber list from a&ai.
-	 *
-	 * @return ResponseEntity The response entity
-	 * @throws IOException Signals that an I/O exception has occurred.
-	 */
-	@RequestMapping(value="/aai_refresh_full_subscribers",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)  	
-	public ResponseEntity doRefreshFullSubscriberList() throws IOException {
-		boolean	isFullSet = true;
-	
-		String res1 = getSubscribers(isFullSet);
-
-		// refresh the services too
-		String resp  = getServices();
-	
-		return new ResponseEntity(res1, HttpStatus.OK);
-	}
-
-	/**
-	 * Get subscriber details from a&ai.
-	 *
-	 * @param subscriberId the subscriber id
-	 * @return ResponseEntity The response entity
-	 */
-	@RequestMapping(value="/aai_sub_details/{subscriberId}", method = RequestMethod.GET)
-	public ResponseEntity GetSubscriber(@PathVariable("subscriberId") String subscriberId) {
-		
-		String  res1 = getSubscriberDetails(subscriberId);
-		return new ResponseEntity(res1, HttpStatus.OK);
-
-	}
-
-	/**
-	 * Issue a named query to a&ai.
-	 *
-	 * @param namedQueryId the named query id
-	 * @param globalCustomerId the global customer id
-	 * @param serviceType the service type
-	 * @param serviceInstance the service instance
-	 * @return ResponseEntity The response entity
-	 */
-	@RequestMapping(value="/aai_sub_viewedit/{namedQueryId}/{globalCustomerId}/{serviceType}/{serviceInstance}", method = RequestMethod.GET)
-	public ResponseEntity viewEditGetComponentList(
-			@PathVariable("namedQueryId") String namedQueryId,
-			@PathVariable("globalCustomerId") String globalCustomerId,
-			@PathVariable("serviceType") String serviceType,
-			@PathVariable("serviceInstance") String serviceInstance) { 
-
-		String componentListPayload = getComponentListPutPayload(namedQueryId, globalCustomerId, serviceType, serviceInstance);
-		File certiPath = GetCertificatesPath();
-
-		String getComponentListOutput = doAaiPost(certiPath.getAbsolutePath(), "search/named-query", componentListPayload, false); 
-		System.out.println(getComponentListOutput);
-		return new ResponseEntity(getComponentListOutput, HttpStatus.OK);
-
-	}
-
-	/**
-	 * Parses the for tenants.
-	 *
-	 * @param resp the resp
-	 * @return the string
-	 */
-	private String parseForTenants(String resp)
-	{
-		String tenantList = "";
-
-		try
-		{
-			JSONParser jsonParser = new JSONParser();
-
-			JSONObject jsonObject = (JSONObject) jsonParser.parse(resp);
-
-			return  parseCustomerObjectForTenants(jsonObject);
-		}
-		catch (Exception ex) {
-
-		}
-
-		return tenantList;
-	}
-	
-	/**
-	 * Parses the for tenants by service subscription.
-	 *
-	 * @param resp the resp
-	 * @return the string
-	 */
-	private String parseForTenantsByServiceSubscription(String resp)
-	{
-		String tenantList = "";
-
-		try
-		{
-			JSONParser jsonParser = new JSONParser();
-
-			JSONObject jsonObject = (JSONObject) jsonParser.parse(resp);
-
-			return  parseServiceSubscriptionObjectForTenants(jsonObject);
-		}
-		catch (Exception ex) {
-
-		}
-
-		return tenantList;
-	}
-	
-
-//	@RequestMapping(value="/aai_get_tenants/{global-customer-id}", method = RequestMethod.GET)
-//	public ResponseEntity viewEditGetComponentList(
-//			@PathVariable("global-customer-id") String globalCustomerId) {
-//		return new ResponseEntity(getTenants(globalCustomerId), HttpStatus.OK);
-//	}
-	
-	/**
- * Obtain tenants for a given service type.
- *
- * @param globalCustomerId the global customer id
- * @param serviceType the service type
- * @return ResponseEntity The response entity
- */
-	@RequestMapping(value="/aai_get_tenants/{global-customer-id}/{service-type}", method = RequestMethod.GET)
-	public ResponseEntity viewEditGetTenantsFromServiceType(
-			@PathVariable("global-customer-id") String globalCustomerId, @PathVariable("service-type") String serviceType) {
-		
-		return new ResponseEntity(getTenantsFromServiceType(globalCustomerId, serviceType), HttpStatus.OK);
-	}
-
-	
-
-	/**
-	 * Gets the tenants.
-	 *
-	 * @param globalCustomerId the global customer id
-	 * @return the tenants
-	 */
-	private String getTenants(String globalCustomerId)
-	{
-		File certiPath = GetCertificatesPath();
-		String resp = doAaiGet(certiPath.getAbsolutePath(), "business/customers/customer/" + globalCustomerId, false);
-		resp = parseForTenants(resp);
-		//model.put("tenants", resp);
-		return resp;
-	}
-	
-	/**
-	 * Gets the tenants from service type.
-	 *
-	 * @param globalCustomerId the global customer id
-	 * @param serviceType the service type
-	 * @return the tenants from service type
-	 */
-	private String getTenantsFromServiceType(String globalCustomerId, String serviceType)
-	{
-		File certiPath = GetCertificatesPath();
-		String url = "business/customers/customer/" + globalCustomerId + "/service-subscriptions/service-subscription/" + serviceType;
-		System.out.println("URL: " + url);
-		String resp = doAaiGet(certiPath.getAbsolutePath(), url, false);
-		System.out.println("URL: " + url + "RES: " + resp);
-		resp = parseForTenantsByServiceSubscription(resp);
-		//model.put("tenants", resp);
-		return resp;
-	}
-	
-	/**
-	 * Gets the services.
-	 *
-	 * @return the services
-	 */
-	private String getServices()
-	{
-		File certiPath = GetCertificatesPath();
-		String resp  = doAaiGet(certiPath.getAbsolutePath(), "/service-design-and-creation/services?depth=0", false);
-		//model.put("aai_get_services", resp);
-		return resp;
-	}
-
-
-	/**
-	 * Gets the subscribers.
-	 *
-	 * @param isFullSet the is full set
-	 * @return the subscribers
-	 */
-	private String getSubscribers(boolean isFullSet)
-	{
-		File certiPath = GetCertificatesPath();
-		String depth = "0";
-		if (isFullSet == true) { 
-			depth = "all";
-		}
-		String resp = doAaiGet(certiPath.getAbsolutePath(), "business/customers?subscriber-type=INFRA&depth=" + depth, false);
-		//model.put("subscribernames" + depth, resp);
-		return resp;
-	}
-
-	/**
-	 * Gets the subscriber details.
-	 *
-	 * @param subscriberId the subscriber id
-	 * @return the subscriber details
-	 */
-	private String getSubscriberDetails(String subscriberId)
-	{
-		File certiPath = GetCertificatesPath();
-		String resp = doAaiGet(certiPath.getAbsolutePath(), "business/customers/customer/" + subscriberId, false);
-		return resp;
-	}
-
-	/**
-	 * Gets the certificates path.
-	 *
-	 * @return the file
-	 */
-	private File GetCertificatesPath()
-	{
-		if (servletContext != null)
-			return new File( servletContext.getRealPath("/WEB-INF/cert/") );
-		return null;
-	}
-	
-	/**
-	 * Send a GET request to a&ai.
-	 *
-	 * @param certiPath the certi path
-	 * @param uri the uri
-	 * @param xml the xml
-	 * @return String The response
-	 */
-	protected String doAaiGet(String certiPath, String uri, boolean xml) {
-		String methodName = "getSubscriberList";		
-		String transId = UUID.randomUUID().toString();
-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
-
-		try {
-
-			AAIRestInterface restContrller = new AAIRestInterface(certiPath);
-			return restContrller.RestGet(fromAppId, transId, uri, xml);
-
-		} catch (WebApplicationException e) {
-			final String message = ((BadRequestException) e).getResponse().readEntity(String.class);
-			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + message);
-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + message);
-		} catch (Exception e) {
-			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
-		}
-
-		return null;
-	}
-	
-	/**
-	 * Send a POST request to a&ai.
-	 *
-	 * @param certiPath the certi path
-	 * @param uri the uri
-	 * @param payload the payload
-	 * @param xml the xml
-	 * @return String The response
-	 */
-	protected String doAaiPost(String certiPath, String uri, String payload, boolean xml) {
-		String methodName = "getSubscriberList";		
-		String transId = UUID.randomUUID().toString();
-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
-
-		try {
-
-			AAIRestInterface restContrller = new AAIRestInterface(certiPath);
-			return restContrller.RestPost(fromAppId, transId, uri, payload, xml);
-
-		} catch (Exception e) {
-			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
-		}
-
-		return null;
-	}
-
-	/**
-	 * Gets the component list put payload.
-	 *
-	 * @param namedQueryId the named query id
-	 * @param globalCustomerId the global customer id
-	 * @param serviceType the service type
-	 * @param serviceInstance the service instance
-	 * @return the component list put payload
-	 */
-	private String getComponentListPutPayload(String namedQueryId, String globalCustomerId, String serviceType, String serviceInstance) {
-		return 
-				"		{" +
-				"    \"instance-filters\": {" +
-				"        \"instance-filter\": [" +
-				"            {" +
-//				"                \"customer\": {" +
-//				"                    \"global-customer-id\": \"" + globalCustomerId + "\"" +
-//				"                }," +
-				"                \"service-instance\": {" +
-				"                    \"service-instance-id\": \"" + serviceInstance + "\"" +
-				"                }" + 
-//				"                }," +
-//				"                \"service-subscription\": {" +
-//				"                    \"service-type\": \"" + serviceType + "\"" +
-//				"                }" +
-				"            }" +
-				"        ]" +
-				"    }," +
-				"    \"query-parameters\": {" +
-				"        \"named-query\": {" +
-				"            \"named-query-uuid\": \"" + namedQueryId + "\"" +
-				"        }" +
-				"    }" +
-				"}";
-
-	}
-
-
-	/**
-	 * Return tenant details.
-	 *
-	 * @param jsonObject the json object
-	 * @return String The parsing results
-	 */
-	public static String parseCustomerObjectForTenants(JSONObject jsonObject) {
-
-		JSONArray tenantArray = new JSONArray();
-		boolean bconvert = false;
-
-		try {
-
-			JSONObject serviceSubsObj = (JSONObject) jsonObject.get("service-subscriptions");
-
-			if (serviceSubsObj != null)
-			{
-				JSONArray srvcSubArray = (JSONArray) serviceSubsObj.get("service-subscription");
-
-				if (srvcSubArray != null)
-				{
-					Iterator i = srvcSubArray.iterator();
-
-					while (i.hasNext()) {
-
-						JSONObject innerObj = (JSONObject) i.next();
-
-						if (innerObj == null)
-							continue;
-
-						JSONObject relationShipListsObj = (JSONObject) innerObj.get("relationship-list");
-						if (relationShipListsObj != null)
-						{
-							JSONArray rShipArray = (JSONArray) relationShipListsObj.get("relationship");
-							if (rShipArray != null)
-							{
-								Iterator i1 = rShipArray.iterator();
-
-								while (i1.hasNext()) {
-
-									JSONObject inner1Obj = (JSONObject) i1.next();
-
-									if (inner1Obj == null)
-										continue;
-
-									String relatedTo = checkForNull((String)inner1Obj.get("related-to"));
-									if (relatedTo.equalsIgnoreCase("tenant"))
-									{
-										JSONObject tenantNewObj = new JSONObject();
-
-										String relatedLink = checkForNull((String) inner1Obj.get("related-link"));
-										tenantNewObj.put("link", relatedLink);
-
-										JSONArray rDataArray = (JSONArray) inner1Obj.get("relationship-data");
-										if (rDataArray != null)
-										{
-											Iterator i2 = rDataArray.iterator();
-
-											while (i2.hasNext()) {
-												JSONObject inner2Obj = (JSONObject) i2.next();
-
-												if (inner2Obj == null)
-													continue;
-
-												String rShipKey = checkForNull((String)inner2Obj.get("relationship-key"));
-												String rShipVal = checkForNull((String)inner2Obj.get("relationship-value"));
-												if (rShipKey.equalsIgnoreCase("cloud-region.cloud-owner"))
-												{
-													tenantNewObj.put("cloudOwner", rShipVal);
-												}
-												else if (rShipKey.equalsIgnoreCase("cloud-region.cloud-region-id"))
-												{
-													tenantNewObj.put("cloudRegionID", rShipVal);
-												}
-
-												if (rShipKey.equalsIgnoreCase("tenant.tenant-id"))
-												{
-													tenantNewObj.put("tenantID", rShipVal);
-												}
-											}
-										}
-
-										JSONArray relatedTPropArray = (JSONArray) inner1Obj.get("related-to-property");
-										if (relatedTPropArray != null)
-										{
-											Iterator i3 = relatedTPropArray.iterator();
-
-											while (i3.hasNext()) {
-												JSONObject inner3Obj = (JSONObject) i3.next();
-
-												if (inner3Obj == null)
-													continue;
-
-												String propKey = checkForNull((String)inner3Obj.get("property-key"));
-												String propVal = checkForNull((String)inner3Obj.get("property-value"));
-												if (propKey.equalsIgnoreCase("tenant.tenant-name"))
-												{
-													tenantNewObj.put("tenantName", propVal);
-												}
-											}
-										}
-										bconvert = true;
-										tenantArray.add(tenantNewObj);
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		} catch (NullPointerException ex) {
-
-
-		}
-
-		if (bconvert)
-			return tenantArray.toJSONString();
-		else
-			return "";
-
-	}
-
-	
-	/**
-	 * Retrieve the service subscription from the jsonObject.
-	 *
-	 * @param jsonObject the json object
-	 * @return String
-	 */
-	public static String parseServiceSubscriptionObjectForTenants(JSONObject jsonObject) {
-
-		JSONArray tenantArray = new JSONArray();
-		boolean bconvert = false;
-
-		try {
-			JSONObject relationShipListsObj = (JSONObject) jsonObject.get("relationship-list");
-			if (relationShipListsObj != null)
-			{
-				JSONArray rShipArray = (JSONArray) relationShipListsObj.get("relationship");
-				if (rShipArray != null)
-				{
-					Iterator i1 = rShipArray.iterator();
-
-					while (i1.hasNext()) {
-
-						JSONObject inner1Obj = (JSONObject) i1.next();
-
-						if (inner1Obj == null)
-							continue;
-
-						String relatedTo = checkForNull((String)inner1Obj.get("related-to"));
-						if (relatedTo.equalsIgnoreCase("tenant"))
-						{
-							JSONObject tenantNewObj = new JSONObject();
-
-							String relatedLink = checkForNull((String) inner1Obj.get("related-link"));
-							tenantNewObj.put("link", relatedLink);
-
-							JSONArray rDataArray = (JSONArray) inner1Obj.get("relationship-data");
-							if (rDataArray != null)
-							{
-								Iterator i2 = rDataArray.iterator();
-
-								while (i2.hasNext()) {
-									JSONObject inner2Obj = (JSONObject) i2.next();
-
-									if (inner2Obj == null)
-										continue;
-
-									String rShipKey = checkForNull((String)inner2Obj.get("relationship-key"));
-									String rShipVal = checkForNull((String)inner2Obj.get("relationship-value"));
-									if (rShipKey.equalsIgnoreCase("cloud-region.cloud-owner"))
-									{
-										tenantNewObj.put("cloudOwner", rShipVal);
-									}
-									else if (rShipKey.equalsIgnoreCase("cloud-region.cloud-region-id"))
-									{
-										tenantNewObj.put("cloudRegionID", rShipVal);
-									}
-
-									if (rShipKey.equalsIgnoreCase("tenant.tenant-id"))
-									{
-										tenantNewObj.put("tenantID", rShipVal);
-									}
-								}
-							}
-
-							JSONArray relatedTPropArray = (JSONArray) inner1Obj.get("related-to-property");
-							if (relatedTPropArray != null)
-							{
-								Iterator i3 = relatedTPropArray.iterator();
-
-								while (i3.hasNext()) {
-									JSONObject inner3Obj = (JSONObject) i3.next();
-
-									if (inner3Obj == null)
-										continue;
-
-									String propKey = checkForNull((String)inner3Obj.get("property-key"));
-									String propVal = checkForNull((String)inner3Obj.get("property-value"));
-									if (propKey.equalsIgnoreCase("tenant.tenant-name"))
-									{
-										tenantNewObj.put("tenantName", propVal);
-									}
-								}
-							}
-							bconvert = true;
-							tenantArray.add(tenantNewObj);
-						}
-					}
-
-				}
-			}
-		} catch (NullPointerException ex) {
-
-
-		}
-
-		if (bconvert)
-			return tenantArray.toJSONString();
-		else
-			return "";
-
-	}
-
-	/**
-	 * Check for null.
-	 *
-	 * @param local the local
-	 * @return the string
-	 */
-	private static String checkForNull(String local)
-	{
-		if (local != null)
-			return local;
-		else
-			return "";
-
-	}
-}
\ No newline at end of file
diff --git a/vid/src/main/java/org/openecomp/vid/controller/BrowseServiceTypesController.java b/vid/src/main/java/org/openecomp/vid/controller/BrowseServiceTypesController.java
deleted file mode 100644
index d0867028b..000000000
--- a/vid/src/main/java/org/openecomp/vid/controller/BrowseServiceTypesController.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.controller;
-
-
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.ModelAndView;
-import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
-
-
-/**
- * The Class BrowseServiceTypesController.
- */
-@RestController
-public class BrowseServiceTypesController extends RestrictedBaseController{
-	
-	/** The view name. */
-	String viewName;
-	
-	/** The logger. */
-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(BrowseServiceTypesController.class);
-	
-	/** The Constant dateFormat. */
-	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
-	
-	/** The servlet context. */
-	private @Autowired ServletContext servletContext;
-	
-	/**
-	 * Welcome.
-	 *
-	 * @param request the request
-	 * @return the model and view
-	 */
-	@RequestMapping(value = {"/browseservicetypes" }, method = RequestMethod.GET)
-	public ModelAndView welcome(HttpServletRequest request) {
-		
- 	return new ModelAndView(getViewName());		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#getViewName()
-	 */
-	public String getViewName() {
-		return viewName;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#setViewName(java.lang.String)
-	 */
-	public void setViewName(String viewName) {
-		this.viewName = viewName;
-	}
-
-
-}
diff --git a/vid/src/main/java/org/openecomp/vid/controller/CreateNewServiceInstanceController.java b/vid/src/main/java/org/openecomp/vid/controller/CreateNewServiceInstanceController.java
deleted file mode 100644
index 0418c93c5..000000000
--- a/vid/src/main/java/org/openecomp/vid/controller/CreateNewServiceInstanceController.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.controller;
-
-
-import java.io.File;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-
-import org.openecomp.aai.util.AAIRestInterface;
-import org.openecomp.vid.model.Result;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.ModelAndView;
-
-import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
-
-
-/**
- * The Class CreateNewServiceInstanceController.
- */
-@RestController
-public class CreateNewServiceInstanceController extends RestrictedBaseController{
-	
-	/** The view name. */
-	String viewName;
-	
-	/** The logger. */
-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(CreateNewServiceInstanceController.class);
-	
-	/** The Constant dateFormat. */
-	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
-	
-	/** The trans id. */
-	protected String transId;
-	
-	/** The from app id. */
-	protected String fromAppId = "VID";
-	
-	/** The model. */
-	private Map model = new HashMap();
-	
-	/** The servlet context. */
-	private @Autowired ServletContext servletContext;
-	
-	/**
-	 * Welcome.
-	 *
-	 * @param request the request
-	 * @return the model and view
-	 */
-	@RequestMapping(value = {"/createnewserviceinstance" }, method = RequestMethod.GET)
-	public ModelAndView welcome(HttpServletRequest request) {
-		
- 	return new ModelAndView(getViewName());		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#getViewName()
-	 */
-	public String getViewName() {
-		return viewName;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#setViewName(java.lang.String)
-	 */
-	public void setViewName(String viewName) {
-		this.viewName = viewName;
-	}
-
-	/**
-	 * Do get subscfriber list.
-	 *
-	 * @return the response entity
-	 * @throws IOException Signals that an I/O exception has occurred.
-	 */
-	@RequestMapping(value="/get_subscribers",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)  	
-	public ResponseEntity doGetSubscfriberList() throws IOException {
-	
-	   String  res1 = (String) model.get("subscribernames");
-	   if (res1 == null)
-	   {
-		   res1 = getSubscribers();
-	   }
-		
-	  return new ResponseEntity(new Result(res1),HttpStatus.OK);
-	
-	}
-	
-	/**
-	 * Do refresh subscfriber list.
-	 *
-	 * @return the response entity
-	 * @throws IOException Signals that an I/O exception has occurred.
-	 */
-	@RequestMapping(value="/refresh_subscribers",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)  	
-	public ResponseEntity doRefreshSubscfriberList() throws IOException {
-	
-	   
-      String res1 = getSubscribers();
-	
-	  return new ResponseEntity(new Result(res1),HttpStatus.OK);
-	
-	}
-	
-	/**
-	 * Gets the subscriber.
-	 *
-	 * @param subscriberId the subscriber id
-	 */
-	@RequestMapping(value="/createsubscriber/{subscriberId}", method = RequestMethod.GET)
-	public void GetSubscriber(@PathVariable("subscriberId") String subscriberId) throws UnsupportedEncodingException {
-		 
-		
-		   File certiPath = GetCertificatesPath();
-		   AAIRestInterface restContrller = new AAIRestInterface(certiPath.getAbsolutePath());
-		   try {
-			   subscriberId = restContrller.encodeURL(subscriberId);
-		   }
-		   catch (Exception e)
-		   {
-			   
-		   }
-		   String res1 = restContrller.RestGet(fromAppId, transId, "business/customers/customer/" + subscriberId, false);
-	       model.put("customerInfo", res1);
-	
-	}
-	
-	/**
-	 * Gets the subscribers.
-	 *
-	 * @return the subscribers
-	 */
-	private String getSubscribers() throws UnsupportedEncodingException
-	{
-	     File certiPath = GetCertificatesPath();
-	 	 AAIRestInterface restContrller = new AAIRestInterface(certiPath.getAbsolutePath());
-	 	 String res1 = restContrller.RestGet(fromAppId, transId, "business/customers?depth=0", false);
-	     model.put("subscribernames", res1);
-	     
-	     return res1;
-	}
-	
-	/**
-	 * Gets the certificates path.
-	 *
-	 * @return the file
-	 */
-	private File GetCertificatesPath()
-	{
-		if (servletContext != null)
-			return new File( servletContext.getRealPath("/WEB-INF/cert/") );
-	 
-		
-		return null;
-	}
-
-}
diff --git a/vid/src/main/java/org/openecomp/vid/controller/MsoController.java b/vid/src/main/java/org/openecomp/vid/controller/MsoController.java
deleted file mode 100644
index a1d90abef..000000000
--- a/vid/src/main/java/org/openecomp/vid/controller/MsoController.java
+++ /dev/null
@@ -1,736 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.controller;
-
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-//import java.util.UUID;
-import java.util.Date;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.glassfish.jersey.client.ClientResponse;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.openecomp.vid.model.ExceptionResponse;
-import org.openecomp.vid.mso.MsoProperties;
-import org.openecomp.vid.mso.MsoResponseWrapper;
-import org.openecomp.vid.mso.MsoRestInterfaceFactory;
-import org.openecomp.vid.mso.MsoRestInterfaceIfc;
-import org.openecomp.vid.mso.MsoUtil;
-import org.openecomp.vid.mso.RestObject;
-import org.openecomp.vid.mso.rest.RequestDetails;
-import org.springframework.http.HttpStatus;
-//import org.springframework.http.ResponseEntity;
-//import org.springframework.http.RequestEntity;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.ModelAndView;
-
-import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.openecomp.portalsdk.core.util.SystemProperties;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-/**
- * The Class MsoController.
- */
-@RestController
-@RequestMapping("mso")
-public class MsoController extends RestrictedBaseController{
-	
-	/** The view name. */
-	String viewName;
-	
-	/** The logger. */
-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MsoController.class);
-	
-	/** The Constant dateFormat. */
-	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
-	
-	/** The Constant SVC_INSTANCE_ID. */
-	public final static String SVC_INSTANCE_ID = "";
-	
-	/** The Constant VNF_INSTANCE_ID. */
-	public final static String VNF_INSTANCE_ID = "";
-	
-	/**
-	 * Welcome.
-	 *
-	 * @param request the request
-	 * @return the model and view
-	 */
-	public ModelAndView welcome(HttpServletRequest request) {
-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== MsoController welcome start");
-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + " MSO_SERVER_URL=" +
-				 SystemProperties.getProperty(MsoProperties.MSO_SERVER_URL) );
-		return new ModelAndView(getViewName());		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#getViewName()
-	 */
-	public String getViewName() {
-		return viewName;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#setViewName(java.lang.String)
-	 */
-	public void setViewName(String viewName) {
-		this.viewName = viewName;
-	}
-
-	/**
-	 * Creates the svc instance.
-	 *
-	 * @param request the request
-	 * @return the response entity
-	 * @throws Exception the exception
-	 */
-	@RequestMapping(value = "/mso_create_svc_instance", method = RequestMethod.POST)
-	public ResponseEntity createSvcInstance(HttpServletRequest request) throws Exception {
-		String methodName = "createSvcInstance";
-		
-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start" );
-		
-		RequestDetails mso_request = retrieveRequestObject (request);
-		String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_SVC_INSTANCE);
-	    
-		MsoResponseWrapper w = createInstance(mso_request, p);
-		// always return OK, the MSO status code is embedded in the body
-		
-        return ( new ResponseEntity(w.getResponse(), HttpStatus.OK) );
-	
-	}
-	
-	/**
-	 * Creates the vnf.
-	 *
-	 * @param serviceInstanceId the service instance id
-	 * @param request the request
-	 * @return the response entity
-	 * @throws Exception the exception
-	 */
-	@RequestMapping(value="/mso_create_vnf_instance/{serviceInstanceId}", method = RequestMethod.POST)  	
-	public ResponseEntity createVnf(@PathVariable("serviceInstanceId") String serviceInstanceId, HttpServletRequest request) throws Exception {
-		
-		String methodName = "createVnf";		
-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
-		
-		RequestDetails mso_request = retrieveRequestObject (request);
-	    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_VNF_INSTANCE);
-	    
-	    if ( p == null || p.isEmpty()) {
-	    	throw new Exception ( "Vnf instance path is not defined");
-	    }
-	    // /serviceInstances/v2//vnfs
-	    String vnf_path = p.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId );
-	    MsoResponseWrapper w = createInstance(mso_request, vnf_path);
-
-		// always return OK, the MSO status code is embedded in the body
-		
-        return ( new ResponseEntity(w.getResponse(), HttpStatus.OK) );
-	
-	}
-	
-	/**
-	 * Creates the nw instance.
-	 *
-	 * @param serviceInstanceId the service instance id
-	 * @param request the request
-	 * @return the response entity
-	 * @throws Exception the exception
-	 */
-	@RequestMapping(value = "/mso_create_nw_instance/{serviceInstanceId}", method = RequestMethod.POST)
-	public ResponseEntity createNwInstance(@PathVariable("serviceInstanceId") String serviceInstanceId, HttpServletRequest request) throws Exception {
-	
-		String methodName = "createNwInstance";		
-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start, serviceInstanceId = " + serviceInstanceId  );
-		
-		RequestDetails mso_request = retrieveRequestObject (request);
-		
-	    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_NETWORK_INSTANCE);
-	    
-	    if ( p == null || p.isEmpty()) {
-	    	throw new Exception ( "Network instance path is not defined");
-	    }
-	    // /serviceInstances/v2//networks/
-	    
-	    String nw_path = p.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId );
-	    MsoResponseWrapper w = createInstance(mso_request, nw_path);
-	   
-		// always return OK, the MSO status code is embedded in the body
-		
-        return ( new ResponseEntity(w.getResponse(), HttpStatus.OK) );
-	
-	}
-	
-	/**
-	 * Creates the volume group instance.
-	 *
-	 * @param serviceInstanceId the service instance id
-	 * @param vnfInstanceId the vnf instance id
-	 * @param request the request
-	 * @return the response entity
-	 * @throws Exception the exception
-	 */
-	@RequestMapping(value = "/mso_create_volumegroup_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}", method = RequestMethod.POST)
-	public ResponseEntity createVolumeGroupInstance(@PathVariable("serviceInstanceId") String serviceInstanceId, @PathVariable("vnfInstanceId") String vnfInstanceId, 
-			HttpServletRequest request) throws Exception {
-		String methodName = "createVolumeGroupInstance";
-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
-		
-		RequestDetails mso_request = retrieveRequestObject (request);
-		String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_VOLUME_GROUP_INSTANCE);
-	    
-	    if ( p == null || p.isEmpty()) {
-	    	throw new Exception ( "Volume group instance path is not defined");
-	    }
-	    String path = p.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId);
-	    path = path.replaceFirst(VNF_INSTANCE_ID, vnfInstanceId);
-	    
-	    MsoResponseWrapper w = createInstance(mso_request, path);
-        
-		// always return OK, the MSO status code is embedded in the body
-        return ( new ResponseEntity(w.getResponse(), HttpStatus.OK) );
-	}
-	
-	/**
-	 * Creates the vf module instance.
-	 *
-	 * @param serviceInstanceId the service instance id
-	 * @param vnfInstanceId the vnf instance id
-	 * @param request the request
-	 * @return the response entity
-	 * @throws Exception the exception
-	 */
-	@RequestMapping(value = "/mso_create_vfmodule_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}", method = RequestMethod.POST)
-	public ResponseEntity createVfModuleInstance(@PathVariable("serviceInstanceId") String serviceInstanceId, 
-			@PathVariable("vnfInstanceId") String vnfInstanceId, HttpServletRequest request) throws Exception {
-		String methodName = "createVfModuleInstance";		
-		
-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
-		RequestDetails mso_request = retrieveRequestObject (request);
-	    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_VF_MODULE_INSTANCE);
-	    
-	    if ( p == null || p.isEmpty()) {
-	    	throw new Exception ( "VF module instance path is not defined");
-	    }
-	    // /serviceInstances/v2//vnfs//vfmodules
-	    String path = p.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId);
-	    path = path.replaceFirst(VNF_INSTANCE_ID, vnfInstanceId);
-	    
-	    MsoResponseWrapper w = createInstance(mso_request, path);
-		
-		// always return OK, the MSO status code is embedded in the body
-		
-        return ( new ResponseEntity(w.getResponse(), HttpStatus.OK) );
-	}
-	
-	/**
-	 * Creates the instance.
-	 *
-	 * @param request the request
-	 * @param path the path
-	 * @return the mso response wrapper
-	 * @throws ClientHandlerException the client handler exception
-	 * @throws Exception the exception
-	 */
-	protected MsoResponseWrapper createInstance(RequestDetails request, String path) throws Exception {
-		String methodName = "createInstance";	
-		logger.debug(dateFormat.format(new Date()) + "<== " + methodName + " start");
-		
-		try {
-			MsoRestInterfaceIfc restController = MsoRestInterfaceFactory.getInstance();
-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " calling Post, request = (" + request + ")");	
-			
-			RestObject restObjStr = new RestObject();
-			String str = new String();
-			restObjStr.set(str);
-			restController.Post(str, request, "", path, restObjStr );
-			MsoResponseWrapper w = MsoUtil.wrapResponse (restObjStr);
-			
-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " w=" + w.getResponse());
-			return w;
-		} catch (Exception e) {
-			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
-			throw e;
-		}
-	}
-	
-	/**
-	 * Delete svc instance.
-	 *
-	 * @param serviceInstanceId the service instance id
-	 * @param request the request
-	 * @return the response entity
-	 * @throws Exception the exception
-	 */
-	@RequestMapping(value = "/mso_delete_svc_instance/{serviceInstanceId}", method = RequestMethod.POST)
-	public ResponseEntity deleteSvcInstance(@PathVariable("serviceInstanceId") String serviceInstanceId,
-			HttpServletRequest request) throws Exception {
-		
-		String methodName = "deleteSvcInstance";	
-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
-		
-		RequestDetails mso_request = retrieveRequestObject (request);
-	    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_SVC_INSTANCE);
-	    String path = p + "/" + serviceInstanceId;
-	    MsoResponseWrapper w = deleteInstance ( mso_request, path );
-	  
-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " w=" + w.getResponse());
-		// always return OK, the MSO status code is embedded in the body
-  		
-        return ( new ResponseEntity(w.getResponse(), HttpStatus.OK) );
-	    
-	}
-	
-	/**
-	 * Delete vnf.
-	 *
-	 * @param serviceInstanceId the service instance id
-	 * @param vnfInstanceId the vnf instance id
-	 * @param request the request
-	 * @return the response entity
-	 * @throws Exception the exception
-	 */
-	@RequestMapping(value = "/mso_delete_vnf_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}", method = RequestMethod.POST)
-	
-	public ResponseEntity deleteVnf(@PathVariable("serviceInstanceId") String serviceInstanceId, @PathVariable("vnfInstanceId") String vnfInstanceId, 
-			HttpServletRequest request) throws Exception {
-		String methodName = "deleteVnf";		
-		
-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
-		
-		RequestDetails mso_request = retrieveRequestObject (request);
-	    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_VNF_INSTANCE);
-	    if ( p == null || p.isEmpty()) {
-	    	throw new Exception ( "Vnf instance path is not defined");
-	    }
-	    // /serviceInstances/v2//vnfs/
-	    String vnf_path = p.replaceFirst(SVC_INSTANCE_ID, vnfInstanceId );
-	    MsoResponseWrapper w = deleteInstance ( mso_request, vnf_path + "/" + vnfInstanceId );
-	    
-		// always return OK, the MSO status code is embedded in the body
-        return ( new ResponseEntity(w.getResponse(), HttpStatus.OK) );
-		
-	}
-							  
-  							/**
-  							 * Delete vf module.
-  							 *
-  							 * @param serviceInstanceId the service instance id
-  							 * @param vnfInstanceId the vnf instance id
-  							 * @param vfModuleId the vf module id
-  							 * @param request the request
-  							 * @return the response entity
-  							 * @throws Exception the exception
-  							 */
-  							//mso_delete_vf_module/bc305d54-75b4-431b-adb2-eb6b9e546014/vnfs/fe9000-0009-9999/vfmodules/abeeee-abeeee-abeeee
-	@RequestMapping(value = "/mso_delete_vfmodule_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfModuleId}", method = RequestMethod.POST)
-	public ResponseEntity deleteVfModule (
-			@PathVariable("serviceInstanceId") String serviceInstanceId, @PathVariable("vnfInstanceId") String vnfInstanceId,
-			@PathVariable("vfModuleId") String vfModuleId, HttpServletRequest request) throws Exception {
-		
-		String methodName = "deleteVfModule";
-		
-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
-		
-		RequestDetails mso_request = retrieveRequestObject (request);
-	    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_VF_MODULE_INSTANCE);
-	    if ( p == null || p.isEmpty()) {
-	    	throw new Exception ( "VF Module instance path is not defined");
-	    }
-	    // /serviceInstances/v2//vnfs//vfmodules
-	    String path = p.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId );
-	    path = path.replaceFirst(VNF_INSTANCE_ID, vnfInstanceId );
-	    MsoResponseWrapper w = deleteInstance ( mso_request, path + "/" + vfModuleId);
-	    
-		// always return OK, the MSO status code is embedded in the body
-        return ( new ResponseEntity(w.getResponse(), HttpStatus.OK) );
-
-	}
-
-	/**
-	 * Delete volume group instance.
-	 *
-	 * @param serviceInstanceId the service instance id
-	 * @param vnfInstanceId the vnf instance id
-	 * @param volumeGroupId the volume group id
-	 * @param request the request
-	 * @return the response entity
-	 * @throws Exception the exception
-	 */
-	@RequestMapping(value = "/mso_delete_volumegroup_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups/{volumeGroupId}", method = RequestMethod.POST)
-	public ResponseEntity deleteVolumeGroupInstance (
-			@PathVariable("serviceInstanceId") String serviceInstanceId, @PathVariable("vnfInstanceId") String vnfInstanceId, @PathVariable("volumeGroupId") String volumeGroupId,
-			HttpServletRequest request) throws Exception {
-		
-		String methodName = "deleteVolumeGroupInstance";		
-		
-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
-		RequestDetails mso_request = retrieveRequestObject (request);
-		
-	    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_VOLUME_GROUP_INSTANCE);
-	    if ( p == null || p.isEmpty()) {
-	    	throw new Exception ( "Volume group instance path is not defined");
-	    }
-	    // /serviceInstances/v2/{serviceInstanceId}/volumeGroups
-	    String path = p.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId );
-	    path = path.replaceFirst(VNF_INSTANCE_ID, vnfInstanceId );
-	    MsoResponseWrapper w = deleteInstance ( mso_request, path + "/" + volumeGroupId);
-	    
-		// always return OK, the MSO status code is embedded in the body
-        return ( new ResponseEntity(w.getResponse(), HttpStatus.OK) );
-	}
-	
-	/**
-	 * Delete nw instance.
-	 *
-	 * @param serviceInstanceId the service instance id
-	 * @param networkInstanceId the network instance id
-	 * @param request the request
-	 * @return the response entity
-	 * @throws Exception the exception
-	 */
-	@RequestMapping(value = "/mso_delete_nw_instance/{serviceInstanceId}/networks/{networkInstanceId}", method = RequestMethod.POST)
-	public ResponseEntity deleteNwInstance(@PathVariable("serviceInstanceId") String serviceInstanceId,
-		@PathVariable("networkInstanceId") String networkInstanceId, HttpServletRequest request) throws Exception {
-	
-		String methodName = "deleteNwInstance";		
-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
-		
-		RequestDetails mso_request = retrieveRequestObject (request);
-		
-	    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_NETWORK_INSTANCE);
-	    if ( p == null || p.isEmpty()) {
-	    	throw new Exception ( "Network instance path is not defined");
-	    }
-	    // /serviceInstances/v2//networks
-	    String path = p.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId );
-	    MsoResponseWrapper w = deleteInstance ( mso_request, path + "/" + networkInstanceId);
-	    
-		// always return OK, the MSO status code is embedded in the body
-        return ( new ResponseEntity(w.getResponse(), HttpStatus.OK) );
-	    
-	}
-	
-	/**
-	 * Delete instance.
-	 *
-	 * @param request the request
-	 * @param path the path
-	 * @return the mso response wrapper
-	 * @throws Exception the exception
-	 */
-	protected  MsoResponseWrapper deleteInstance(RequestDetails request, String path) throws Exception {
-		String methodName = "deleteInstance";	
-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
-		
-		try {
-			MsoRestInterfaceIfc restController = MsoRestInterfaceFactory.getInstance();
-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " calling Delete, path =[" + path + "]");
-		
-			RestObject restObjStr = new RestObject();
-			String str = new String();
-			restObjStr.set(str);
-			restController.Delete(str, request, "", path, restObjStr );
-			MsoResponseWrapper w = MsoUtil.wrapResponse (restObjStr);
-			
-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " w=" + w.getResponse());
-			return w;
-
-		} catch (Exception e) {
-			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
-			throw e;
-		}
-		
-	}
-	
-	/**
-	 * Gets the orchestration request.
-	 *
-	 * @param requestId the request id
-	 * @param request the request
-	 * @return the orchestration request
-	 * @throws Exception the exception
-	 */
-	@RequestMapping(value = "/mso_get_orch_req/{requestId}", method = RequestMethod.GET)
-	public ResponseEntity getOrchestrationRequest(@PathVariable("requestId") String requestId,
-			HttpServletRequest request) throws Exception {
-		
-		String methodName = "getOrchestrationRequest";		
-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
-		MsoResponseWrapper w = null;
-		try {
-			MsoRestInterfaceIfc restController = MsoRestInterfaceFactory.getInstance();
-		    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_GET_ORC_REQ);
-		    String path = p + "/" + requestId;
-		    
-		    RestObject restObjStr = new RestObject();
-			String str = new String();
-			restObjStr.set(str);
-
-		    restController.Get(str, "", path, restObjStr);
-		    
-		    w = MsoUtil.wrapResponse (restObjStr);
-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " w=" + w.getResponse());
-			// always return OK, the MSO status code is embedded in the body
-	  		
-		} 
-		catch (Exception e) {
-			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
-			throw e;
-		}
-		// always return OK, the MSO status code is embedded in the body
-  		return ( new ResponseEntity(w.getResponse(), HttpStatus.OK) );
-	}
-	
-	
-	/**
-	 * Gets the orchestration requests.
-	 *
-	 * @param filterString the filter string
-	 * @param request the request
-	 * @return the orchestration requests
-	 * @throws Exception the exception
-	 */
-	@RequestMapping(value = "/mso_get_orch_reqs/{filterString}", method = RequestMethod.GET)
-	public ResponseEntity getOrchestrationRequests(@PathVariable("filterString") String filterString,
-			HttpServletRequest request) throws Exception {
-		
-		String methodName = "getOrchestrationRequests";		
-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
-		MsoResponseWrapper w = null;
-		try {
-			MsoRestInterfaceIfc restController = MsoRestInterfaceFactory.getInstance();
-		    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_GET_ORC_REQS);
-		    String path = p + filterString;
-		    
-		    RestObject restObjStr = new RestObject();
-			String str = new String();
-			restObjStr.set(str);
-
-		    restController.Get(str, "", path, restObjStr);
-		   
-		    w = MsoUtil.wrapResponse (restObjStr);
-		    logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " w=" + w.getResponse());
-		}
-		catch (Exception e) {
-			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
-			throw e;
-		}
-		// always return OK, the MSO status code is embedded in the body
-  		return ( new ResponseEntity(w.getResponse(), HttpStatus.OK) );
-	}
-	 	
-	/**
-	 * Gets the orchestration requests for svc instance.
-	 *
-	 * @param svc_instance_id the svc instance id
-	 * @return the orchestration requests for svc instance
-	 * @throws Exception the exception
-	 */
-	public MsoResponseWrapper getOrchestrationRequestsForSvcInstance (String svc_instance_id) throws Exception {
-		
-		String methodName = "getOrchestrationRequestsForSvcInstance";		
-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
-		MsoResponseWrapper w = null;
-		
-		try {
-			MsoRestInterfaceIfc restController = MsoRestInterfaceFactory.getInstance();
-		    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_GET_ORC_REQS);
-		    String path = p + svc_instance_id;
-		    
-		    RestObject restObjStr = new RestObject();
-			String str = new String();
-			restObjStr.set(str);
-			
-			restController.Get(str, "", path, restObjStr);
-			w = MsoUtil.wrapResponse (restObjStr);
-		    logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " w=" + w.getResponse());
-		
-		}
-		catch (Exception e) {
-			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
-			throw e;
-		}
-		return w;
-	}
-	
-	/**
-	 * Exception handler.
-	 *
-	 * @param e the e
-	 * @param response the response
-	 * @throws IOException Signals that an I/O exception has occurred.
-	 */
-	@ExceptionHandler(Exception.class)
-	private void exceptionHandler(Exception e, HttpServletResponse response) throws IOException {
-
-		/*
-		 * The following "logger.error" lines "should" be sufficient for logging the exception.
-		 * However, the console output in my Eclipse environment is NOT showing ANY of the
-		 * logger statements in this class. Thus the temporary "e.printStackTrace" statement
-		 * is also included.
-		 */
-		
-		String methodName = "exceptionHandler";	
-		logger.error(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
-		StringWriter sw = new StringWriter();
-				e.printStackTrace(new PrintWriter(sw));
-		logger.error(EELFLoggerDelegate.errorLogger, sw.toString());
-
-		/*
-		 *  Temporary - IF the above  mentioned "logger.error" glitch is resolved ...
-		 *  this statement could be removed since it would then likely result in duplicate
-		 *  trace output. 
-		 */
-		e.printStackTrace(System.err);
-
-		response.setContentType("application/json; charset=UTF-8");
-		response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-
-		ExceptionResponse exceptionResponse = new ExceptionResponse();
-		exceptionResponse.setException(e.getClass().toString().replaceFirst("^.*\\.", ""));
-		exceptionResponse.setMessage(e.getMessage());
-
-		response.getWriter().write(new ObjectMapper().writeValueAsString(exceptionResponse));
-
-		response.flushBuffer();
-
-	}
-
-	/**
-	 * Parses the orchestration requests for svc instance.
-	 *
-	 * @param resp the resp
-	 * @return the list
-	 * @throws ParseException the parse exception
-	 * @throws Exception the exception
-	 */
-	@SuppressWarnings("unchecked")
-	public List parseOrchestrationRequestsForSvcInstance ( ClientResponse resp ) throws org.json.simple.parser.ParseException, Exception {
-		
-		String methodName = "parseOrchestrationRequestsForSvcInstance";
-		
-		ArrayList json_list = new ArrayList();
-		
-		String rlist_str = resp.readEntity (String.class);
-		logger.debug (EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + " Response string: " + rlist_str);
-		
-		JSONParser parser = new JSONParser();
-		try {
-			Object obj = parser.parse(rlist_str);
-			
-			JSONObject jsonObject = (JSONObject) obj;
-		
-			JSONArray requestList = (JSONArray) jsonObject.get("requestList");
-			
-			if ( requestList != null && ! (requestList.isEmpty()) )
-				for ( Object container : requestList) {
-			
-					JSONObject containerJsonObj = (JSONObject) container;
-					//logger.debug(dateFormat.format(new Date()) +  "<== " + "." + methodName + " reqJsonObj: " + containerJsonObj.toJSONString());
-					JSONObject reqJsonObj = (JSONObject) containerJsonObj.get("request");
-					
-					//logger.debug(dateFormat.format(new Date()) +  "<== " + "." + methodName + " reqJsonObj.requestId: " + 
-						//	reqJsonObj.get("requestId") );
-					JSONObject result = new JSONObject();
-					
-					result.put("requestId", reqJsonObj.get ("requestId"));
-					if ( reqJsonObj.get("requestType") != null ) {
-						result.put("requestType", (reqJsonObj.get("requestType").toString()));
-					}
-					JSONObject req_status = (JSONObject)reqJsonObj.get("requestStatus");
-					if ( req_status != null ) {
-						result.put("timestamp", (req_status.get("timestamp")));
-						result.put("requestState", (req_status.get("requestState")));
-						result.put("statusMessage", (req_status.get("statusMessage")));
-						result.put("percentProgress", (req_status.get("percentProgress")));
-					} 
-					json_list.add (result);
-				}
-		} catch (org.json.simple.parser.ParseException pe) {
-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + " Parse exception: " + pe.toString());
-			throw pe;
-		} catch (Exception e) {
-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + " Exception: " + e.toString());
-			throw e;
-		}
-		return ( json_list );
-	} 
-	
-	/**
-	 * Retrieve request object.
-	 *
-	 * @param request the request
-	 * @return the request details
-	 * @throws Exception the exception
-	 */
-	public RequestDetails retrieveRequestObject ( HttpServletRequest request ) throws Exception {
-			
-		String methodName = "retrieveRequestObject";
-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start" );
-		
-		ObjectMapper mapper = new ObjectMapper();
-		//JSON from String to Object
-		RequestDetails mso_request;
-		try {
-			mso_request = mapper.readValue(request.getInputStream(), RequestDetails.class);
-		}
-		catch ( Exception e ) {
-			logger.error(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + methodName + " Unable to read json object RequestDetails e=" + e.getMessage());
-			throw e;
-		}
-		if ( mso_request == null) {
-			logger.error(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + methodName + " mso_request is null");
-			throw new Exception ("RequestDetails is missing");
-		}
-		try {
-			String json_req = mapper.writeValueAsString(mso_request);
-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " request=[" + json_req + "]");
-		}
-		catch ( Exception e ) {
-			logger.error(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + methodName + " Unable to convert RequestDetails to json string e=" + e.getMessage());
-			throw e;
-		}
-		return (mso_request);
-	}
-}
diff --git a/vid/src/main/java/org/openecomp/vid/controller/PropertyController.java b/vid/src/main/java/org/openecomp/vid/controller/PropertyController.java
deleted file mode 100644
index e0aa22866..000000000
--- a/vid/src/main/java/org/openecomp/vid/controller/PropertyController.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.controller;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.ModelAndView;
-
-import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.openecomp.portalsdk.core.util.SystemProperties;
-
-/**
- * The Class PropertyController.
- */
-@RestController
-public class PropertyController extends RestrictedBaseController{
-	
-	/** The view name. */
-	String viewName;
-	
-	/** The logger. */
-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(PropertyController.class);
-	
-	/** The Constant dateFormat. */
-	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
-	
-	/**
-	 * Welcome.
-	 *
-	 * @param request the request
-	 * @return the model and view
-	 */
-	public ModelAndView welcome(HttpServletRequest request) {
-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== PropertyController welcome start");
-		return new ModelAndView(getViewName());		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#getViewName()
-	 */
-	public String getViewName() {
-		return viewName;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#setViewName(java.lang.String)
-	 */
-	public void setViewName(String viewName) {
-		this.viewName = viewName;
-	}
-	
-	/**
-	 * Gets the property.
-	 *
-	 * @param name the name
-	 * @param defaultvalue the defaultvalue
-	 * @param request the request
-	 * @return the property
-	 * @throws Exception the exception
-	 */
-	@RequestMapping(value = "/get_property/{name}/{defaultvalue}", method = RequestMethod.GET)
-	public ResponseEntity getProperty (@PathVariable("name") String name, @PathVariable("defaultvalue") String defaultvalue,
-			HttpServletRequest request) throws Exception {
-		
-		String methodName = "getProperty";	
-		ResponseEntity resp = null;
-		String pvalue = null;
-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
-		
-		try {
-			// convert "_" to "." in the property name
-			if (name == null || name.length() == 0 ) {
-				return ( new ResponseEntity (defaultvalue, HttpStatus.OK));
-			}
-			// convert "_" to "." in the property name
-			String propertyName = name.replace('_', '.');
-			pvalue = SystemProperties.getProperty(propertyName);
-			if ( ( pvalue == null ) || ( pvalue.length() == 0 ) ) {
-				pvalue = defaultvalue;
-			}
-			resp = new ResponseEntity(pvalue, HttpStatus.OK);
-		}
-		catch (Exception e) {
-			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
-			throw e;
-		}
-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " returning " + pvalue);
-  		return ( resp );
-	}
-
-}
diff --git a/vid/src/main/java/org/openecomp/vid/controller/SearchExistingSIController.java b/vid/src/main/java/org/openecomp/vid/controller/SearchExistingSIController.java
deleted file mode 100644
index 1bd54fe15..000000000
--- a/vid/src/main/java/org/openecomp/vid/controller/SearchExistingSIController.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.controller;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-
-import org.openecomp.aai.util.AAIRestInterface;
-import org.openecomp.vid.model.Result;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.ModelAndView;
-
-import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-
-/**
- * The Class SearchExistingSIController.
- */
-@RestController
-public class SearchExistingSIController extends RestrictedBaseController{
-	
-	/** The view name. */
-	String viewName;
-	
-	/** The logger. */
-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(SearchExistingSIController.class);
-	
-	/** The Constant dateFormat. */
-	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
-	
-	/** The trans id. */
-	protected String transId;
-	
-	/** The from app id. */
-	protected String fromAppId = "VID";
-	
-	/** The model. */
-	private Map model = new HashMap();
-	
-	/** The servlet context. */
-	private @Autowired ServletContext servletContext;
-	
-	/**
-	 * Welcome.
-	 *
-	 * @param request the request
-	 * @return the model and view
-	 */
-	@RequestMapping(value = {"/searchexistingsi" }, method = RequestMethod.GET)
-	public ModelAndView welcome(HttpServletRequest request) {
-		
- 	return new ModelAndView(getViewName());		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#getViewName()
-	 */
-	public String getViewName() {
-		return viewName;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#setViewName(java.lang.String)
-	 */
-	public void setViewName(String viewName) {
-		this.viewName = viewName;
-	}
-
-	/**
-	 * Do get subscfriber list.
-	 *
-	 * @return the response entity
-	 * @throws IOException Signals that an I/O exception has occurred.
-	 */
-	@RequestMapping(value="/searchexistingsi_get_subscribers",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)  	
-	public ResponseEntity doGetSubscfriberList() throws IOException, UnsupportedEncodingException  {
-	
-	   String  res1 = (String) model.get("subscribernames");
-	   if (res1 == null)
-	   {
-		   res1 = getSubscribers();
-	   }
-		
-	  return new ResponseEntity(new Result(res1),HttpStatus.OK);
-	
-	}
-	
-	/**
-	 * Do refresh subscfriber list.
-	 *
-	 * @return the response entity
-	 * @throws IOException Signals that an I/O exception has occurred.
-	 */
-	@RequestMapping(value="/searchexistingsi_refresh_subscribers",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)  	
-	public ResponseEntity doRefreshSubscfriberList() throws IOException, UnsupportedEncodingException {
-	
-	   
-      String res1 = getSubscribers();
-	
-	  return new ResponseEntity(new Result(res1),HttpStatus.OK);
-	
-	}
-	
-	/**
-	 * Gets the subscribers.
-	 *
-	 * @return the subscribers
-	 */
-	private String getSubscribers() throws UnsupportedEncodingException
-	{
-	     File certiPath = GetCertificatesPath();
-	 	 AAIRestInterface restContrller = new AAIRestInterface(certiPath.getAbsolutePath());
-	 	 String res1 = restContrller.RestGet(fromAppId, transId, "business/customers?depth=0", false);
-	     model.put("subscribernames", res1);
-	     
-	     return res1;
-	}
-	
-	/**
-	 * Gets the certificates path.
-	 *
-	 * @return the file
-	 */
-	private File GetCertificatesPath()
-	{
-		if (servletContext != null)
-			return new File( servletContext.getRealPath("/WEB-INF/cert/") );
-	 
-		
-		return null;
-	}
-	
-
-}
diff --git a/vid/src/main/java/org/openecomp/vid/controller/SubscriberDetailsController.java b/vid/src/main/java/org/openecomp/vid/controller/SubscriberDetailsController.java
deleted file mode 100644
index 222dfe755..000000000
--- a/vid/src/main/java/org/openecomp/vid/controller/SubscriberDetailsController.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.controller;
-
-import java.io.File;
-import java.io.UnsupportedEncodingException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-
-import org.openecomp.aai.util.AAIRestInterface;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.ModelAndView;
-
-import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
-
-
-/**
- * The Class SubscriberDetailsController.
- */
-@RestController
-public class SubscriberDetailsController extends RestrictedBaseController{
-	
-	/** The view name. */
-	String viewName;
-	
-	/** The logger. */
-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(SubscriberDetailsController.class);
-	
-	/** The Constant dateFormat. */
-	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
-	
-	/** The trans id. */
-	protected String transId;
-	
-	/** The from app id. */
-	protected String fromAppId = "VID";
-	
-	/** The model. */
-	private Map model = new HashMap();
-	
-	/** The servlet context. */
-	private @Autowired ServletContext servletContext;
-	
-	/**
-	 * Welcome.
-	 *
-	 * @param request the request
-	 * @return the model and view
-	 */
-	@RequestMapping(value = {"/subscriberdetails" }, method = RequestMethod.GET)
-	public ModelAndView welcome(HttpServletRequest request) {
-	
-		return new ModelAndView("subscriberdetails","model", model);
- 	  //return new ModelAndView(getViewName());		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#getViewName()
-	 */
-	public String getViewName() {
-		return viewName;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#setViewName(java.lang.String)
-	 */
-	public void setViewName(String viewName) {
-		this.viewName = viewName;
-	}
-	
-	/**
-	 * Gets the subscriber.
-	 *
-	 * @param subscriberId the subscriber id
-	 */
-	@RequestMapping(value="/subscriberdetails/{subscriberId}", method = RequestMethod.GET)
-	public void GetSubscriber(@PathVariable("subscriberId") String subscriberId) throws UnsupportedEncodingException  {
-		 
-		
-		   File certiPath = GetCertificatesPath();
-		   AAIRestInterface restContrller = new AAIRestInterface(certiPath.getAbsolutePath());
-		   try {
-			   subscriberId = restContrller.encodeURL(subscriberId);
-		   }
-		   catch (Exception e)
-		   {
-			   
-		   }
-		   String res1 = restContrller.RestGet(fromAppId, transId, "business/customers/customer/" + subscriberId, false);
-	       model.put("customerInfo", res1);
-	
-	}
-	
-	/**
-	 * Gets the certificates path.
-	 *
-	 * @return the file
-	 */
-	private File GetCertificatesPath()
-	{
-		if (servletContext != null)
-			return new File( servletContext.getRealPath("/WEB-INF/cert/") );
-	 
-		
-		return null;
-	}
-}
-
diff --git a/vid/src/main/java/org/openecomp/vid/controller/UserProfileController.java b/vid/src/main/java/org/openecomp/vid/controller/UserProfileController.java
deleted file mode 100644
index cd3e5f73c..000000000
--- a/vid/src/main/java/org/openecomp/vid/controller/UserProfileController.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.controller;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.servlet.ModelAndView;
-
-import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
-import org.openecomp.portalsdk.core.domain.Profile;
-import org.openecomp.portalsdk.core.service.ProfileService;
-import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-/**
- * Controller for user profile view. The view is restricted to authenticated
- * users. The view name resolves to page user_profile.jsp which uses Angular.
- */
-
-@Controller
-@RequestMapping("/")
-public class UserProfileController extends RestrictedBaseController {
-
-   /** The service. */
-   @Autowired
-   ProfileService service;
-
-   /**
-    * Profile search.
-    *
-    * @param request the request
-    * @return the model and view
-    */
-   @RequestMapping(value = {"/user_profile" }, method = RequestMethod.GET)
-   public ModelAndView ProfileSearch(HttpServletRequest request) {
-	   Map model = new HashMap();
-	   ObjectMapper mapper = new ObjectMapper();
-	   List profileList = service.findAll();
-       try {
-		model.put("customerInfo", mapper.writeValueAsString(profileList));
-		} catch (JsonGenerationException e) {
-			e.printStackTrace();
-		} catch (JsonMappingException e) {
-			e.printStackTrace();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-     
-       return new ModelAndView("user_profile","model", model);
-   }
-
-}
diff --git a/vid/src/main/java/org/openecomp/vid/controller/VidController.java b/vid/src/main/java/org/openecomp/vid/controller/VidController.java
deleted file mode 100644
index d6df31c4d..000000000
--- a/vid/src/main/java/org/openecomp/vid/controller/VidController.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.controller;
-
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.UUID;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.client.ClientBuilder;
-
-import org.json.JSONObject;
-import org.json.JSONTokener;
-import org.openecomp.vid.exceptions.VidServiceUnavailableException;
-import org.openecomp.vid.model.Network;
-import org.openecomp.vid.model.ServiceModel;
-import org.openecomp.vid.model.VNF;
-import org.openecomp.vid.model.VfModule;
-import org.openecomp.vid.model.VolumeGroup;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.ModelAndView;
-
-import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.openecomp.vid.asdc.AsdcCatalogException;
-import org.openecomp.vid.asdc.AsdcClient;
-import org.openecomp.vid.asdc.beans.Resource;
-import org.openecomp.vid.asdc.beans.Service;
-import org.openecomp.vid.asdc.beans.tosca.Group;
-import org.openecomp.vid.asdc.beans.tosca.NodeTemplate;
-import org.openecomp.vid.asdc.beans.tosca.ToscaCsar;
-import org.openecomp.vid.asdc.beans.tosca.ToscaModel;
-import org.openecomp.vid.asdc.memory.InMemoryAsdcClient;
-import org.openecomp.vid.asdc.rest.RestfulAsdcClient;
-import org.openecomp.vid.properties.AsdcClientConfiguration;
-import org.openecomp.vid.properties.AsdcClientConfiguration.AsdcClientType;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-/**
- * The Class VidController.
- */
-@RestController
-public class VidController extends RestrictedBaseController {
-	
-	/** The Constant LOG. */
-	private static final EELFLoggerDelegate LOG = EELFLoggerDelegate.getLogger(VidController.class);
-	
-	/** The app context. */
-	@Autowired
-	private ApplicationContext appContext;
-	
-	/**
-	 * Gets the object mapper.
-	 *
-	 * @return the object mapper
-	 */
-	@Bean
-	public ObjectMapper getObjectMapper() {
-		return new ObjectMapper();
-	}
-	
-	/**
-	 * Gets the asdc client.
-	 *
-	 * @return the asdc client
-	 */
-	@Bean
-	public AsdcClient getAsdcClient() {
-		
-		final AsdcClientConfiguration asdcClientConfig = appContext.getBean(AsdcClientConfiguration.class);
-
-		switch (asdcClientConfig.getAsdcClientType()) {
-		case IN_MEMORY:
-			final InputStream asdcCatalogFile = VidController.class.getClassLoader().getResourceAsStream("catalog.json");
-			final JSONTokener tokener = new JSONTokener(asdcCatalogFile);
-			final JSONObject catalog = new JSONObject(tokener);
-
-			return new InMemoryAsdcClient.Builder().catalog(catalog).build();
-		case REST:
-
-			final String protocol = asdcClientConfig.getAsdcClientProtocol();
-			final String host = asdcClientConfig.getAsdcClientHost();
-			final int port = asdcClientConfig.getAsdcClientPort();
-			final String auth = asdcClientConfig.getAsdcClientAuth();
-
-			try {
-				final URI uri = new URI(protocol + "://" + host + ":" + port + "/");
-				return new RestfulAsdcClient.Builder(ClientBuilder.newClient(), uri)
-								.auth(auth)
-								.build();
-			} catch (URISyntaxException e) {
-				throw new RuntimeException("SDC Client could not be instantiated due to a syntax error in the URI", e);
-			}
-			
-		default:
-			throw new RuntimeException(asdcClientConfig.getAsdcClientType() + " is invalid; must be one of " + Arrays.toString(AsdcClientType.values()));
-		}
-	}
-	
-	/**
-	 * Gets the services.
-	 *
-	 * @param request the request
-	 * @return the services
-	 * @throws VidServiceUnavailableException the vid service unavailable exception
-	 */
-	@RequestMapping(value={"/rest/models/services"}, method = RequestMethod.GET)
-	public Collection getServices(HttpServletRequest request) throws VidServiceUnavailableException {
-		try {
-			return getAsdcClient().getServices(request.getParameterMap());
-		} catch (AsdcCatalogException e) {
-			LOG.error("Failed to retrieve service definitions from SDC", e);
-			throw new VidServiceUnavailableException("Failed to retrieve service definitions from SDC", e);
-		} catch (Throwable t) {
-			LOG.debug("Unexpected error while retrieving service definitions from SDC: " + t.getMessage() + ":", t);
-			t.printStackTrace();
-			throw new VidServiceUnavailableException("Unexpected error while retrieving service definitions from SDC: " + t.getMessage(), t);
-		}
-	}
-	
-	/**
-	 * Gets the services.
-	 *
-	 * @param uuid the uuid
-	 * @return the services
-	 * @throws VidServiceUnavailableException the vid service unavailable exception
-	 */
-	@RequestMapping(value={"/rest/models/services/{uuid}"}, method = RequestMethod.GET)
-	public ServiceModel getServices(@PathVariable("uuid") String uuid) throws VidServiceUnavailableException {
-		try {
-			final ServiceModel serviceModel = new ServiceModel();
-			final Map vnfs = new HashMap ();
-			final Map networks = new HashMap ();
-			
-			final ToscaCsar serviceCsar = getAsdcClient().getServiceToscaModel(UUID.fromString(uuid));
-			final Service asdcServiceMetadata = getAsdcClient().getService(UUID.fromString(uuid));
-			final ToscaModel asdcService = serviceCsar.getParent();
-			
-			serviceModel.setService(ServiceModel.extractService(asdcService, asdcServiceMetadata));
-			
-			for (Entry component: asdcService.gettopology_template().getnode_templates().entrySet()) {
-				final String modelCustomizationName = component.getKey();
-				final NodeTemplate nodeTemplate = component.getValue();
-				final String type = nodeTemplate.getType();
-				
-				if (type.startsWith("org.openecomp.resource.vf")) {
-					final UUID vnfUuid = UUID.fromString(nodeTemplate.getMetadata().getUUID());
-					final VNF vnf = VNF.extractVnf(modelCustomizationName, nodeTemplate);
-					
-					if (vnf.getVersion() == null) {
-						final Resource vnfMetadata = getAsdcClient().getResource(UUID.fromString(nodeTemplate.getMetadata().getUUID()));
-						vnf.setVersion(vnfMetadata.getVersion());
-					}
-					
-					vnfs.put(vnfUuid, vnf);
-				}
-			}
-			
-			for (ToscaModel vnfModel : serviceCsar.getChildren()) {
-				final UUID vnfUuid = UUID.fromString(vnfModel.getMetadata().getUUID());
-				final VNF vnf = vnfs.get(vnfUuid);
-				final Map vfModules = new HashMap ();
-				final Map volumeGroups = new HashMap ();
-				
-				if (vnf == null) {
-					LOG.warn("Couldn't find VNF object " + vnfUuid + ". Problem with Tosca model?");
-					continue;
-				}
-
-				vnf.setInputs(vnfModel.gettopology_template().getInputs());
-
-				for (Entry component : vnfModel.gettopology_template().getGroups().entrySet()) {
-					final Group group = component.getValue();
-					final String type = group.getType();
-					
-					if (type.startsWith("org.openecomp.groups.VfModule")) {
-						final UUID vfModuleUuid = UUID.fromString(group.getMetadata().getVfModuleModelUUID());
-						
-						vfModules.put(vfModuleUuid, VfModule.extractVfModule(group));
-						
-						if (Boolean.valueOf(group.getProperties().get("volume_group"))) {
-							volumeGroups.put(vfModuleUuid, VolumeGroup.extractVolumeGroup(group));
-						}
-					}
-				}
-				
-				vnf.setVfModules(vfModules);
-				vnf.setVolumeGroups(volumeGroups);
-			}
-			
-			serviceModel.setVnfs(vnfs);
-			serviceModel.setNetworks(networks);
-			
-			return serviceModel;
-		} catch (AsdcCatalogException e) {
-			LOG.error("Failed to retrieve service definitions from SDC", e);
-			throw new VidServiceUnavailableException("Failed to retrieve service definitions from SDC", e);
-		}
-	}
-
-	/**
-	 * Gets the services view.
-	 *
-	 * @param request the request
-	 * @return the services view
-	 * @throws VidServiceUnavailableException the vid service unavailable exception
-	 */
-	@RequestMapping(value={"/serviceModels"}, method=RequestMethod.GET)
-	public ModelAndView getServicesView(HttpServletRequest request) throws VidServiceUnavailableException {
-		return new ModelAndView("serviceModels");
-	}
-}
diff --git a/vid/src/main/java/org/openecomp/vid/controller/VidHomeController.java b/vid/src/main/java/org/openecomp/vid/controller/VidHomeController.java
deleted file mode 100644
index 6a14542a0..000000000
--- a/vid/src/main/java/org/openecomp/vid/controller/VidHomeController.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.controller;
-
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-
-
-import org.springframework.beans.factory.annotation.Autowired;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.ModelAndView;
-
-import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
-
-
-/**
- * The Class VidHomeController.
- */
-@RestController
-public class VidHomeController extends RestrictedBaseController{
-	
-	/** The view name. */
-	String viewName;
-	
-	
-	/** The servlet context. */
-	private @Autowired ServletContext servletContext;
-	
-	/**
-	 * Welcome.
-	 *
-	 * @param request the request
-	 * @return the model and view
-	 */
-	@RequestMapping(value = {"/vidhome" }, method = RequestMethod.GET)
-	public ModelAndView welcome(HttpServletRequest request) {
-		
- 	  return new ModelAndView(getViewName());		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#getViewName()
-	 */
-	public String getViewName() {
-		return viewName;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#setViewName(java.lang.String)
-	 */
-	public void setViewName(String viewName) {
-		this.viewName = viewName;
-	}
-
-	
-
-}
diff --git a/vid/src/main/java/org/openecomp/vid/controller/ViewEditSubController.java b/vid/src/main/java/org/openecomp/vid/controller/ViewEditSubController.java
deleted file mode 100644
index 87b6b213d..000000000
--- a/vid/src/main/java/org/openecomp/vid/controller/ViewEditSubController.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.controller;
-
-
-import java.io.File;
-import java.text.DateFormat;
-import java.util.HashMap;
-import java.util.Map;
-
-
-
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.ModelAndView;
-
-import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
-
-
-/**
- * The Class ViewEditSubController.
- */
-@RestController
-public class ViewEditSubController extends RestrictedBaseController{
-	
-	/** The view name. */
-	String viewName;
-	
-	/** The logger. */
-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ViewEditSubController.class);
-	
-	/** The model. */
-	private Map model = new HashMap();
-	
-	/** The servlet context. */
-	private @Autowired ServletContext servletContext;
-	
-	/**
-	 * Welcome.
-	 *
-	 * @param request the request
-	 * @return the model and view
-	 */
-	@RequestMapping(value = {"/vieweditsub" }, method = RequestMethod.GET)
-	public ModelAndView welcome(HttpServletRequest request) {
-		return new ModelAndView("vieweditsub","model", model);
-    //	return new ModelAndView(getViewName());		
-	}
-	
-	/**
-	 * Post subscriber.
-	 *
-	 * @param request the request
-	 */
-	@RequestMapping(value="/vieweditsub/subedit", method = RequestMethod.POST)
-	public void PostSubscriber(HttpServletRequest request) {
-		
-		String        subID = request.getParameter("subscriberID");
-		model.put("subInfo", subID);
-		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#getViewName()
-	 */
-	public String getViewName() {
-		return viewName;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#setViewName(java.lang.String)
-	 */
-	public void setViewName(String viewName) {
-		this.viewName = viewName;
-	}
-
-
-	
-
-}
-
diff --git a/vid/src/main/java/org/openecomp/vid/controller/ViewLogController.java b/vid/src/main/java/org/openecomp/vid/controller/ViewLogController.java
deleted file mode 100644
index 99b412aa4..000000000
--- a/vid/src/main/java/org/openecomp/vid/controller/ViewLogController.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.controller;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.ModelAndView;
-import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
-
-
-/**
- * The Class ViewLogController.
- */
-@RestController
-public class ViewLogController extends RestrictedBaseController{
-	
-	/** The view name. */
-	String viewName;
-	
-	/** The logger. */
-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ViewLogController.class);
-	
-	/** The Constant dateFormat. */
-	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
-	
-	/** The servlet context. */
-	private @Autowired ServletContext servletContext;
-	
-	/**
-	 * Welcome.
-	 *
-	 * @param request the request
-	 * @return the model and view
-	 */
-	@RequestMapping(value = {"/viewlog" }, method = RequestMethod.GET)
-	public ModelAndView welcome(HttpServletRequest request) {
-		
- 	return new ModelAndView(getViewName());		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#getViewName()
-	 */
-	public String getViewName() {
-		return viewName;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#setViewName(java.lang.String)
-	 */
-	public void setViewName(String viewName) {
-		this.viewName = viewName;
-	}
-
-
-}
diff --git a/vid/src/main/java/org/openecomp/vid/controller/test/TestAaiController.java b/vid/src/main/java/org/openecomp/vid/controller/test/TestAaiController.java
deleted file mode 100644
index 3bfe0b21e..000000000
--- a/vid/src/main/java/org/openecomp/vid/controller/test/TestAaiController.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.controller.test;
-
-import java.io.IOException;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.codehaus.jackson.map.ObjectMapper;
-import org.openecomp.vid.model.ExceptionResponse;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
-
-/**
- * The Class TestAaiController.
- */
-@RestController
-@RequestMapping("testaai")
-public class TestAaiController extends RestrictedBaseController {
-
-	/**
-	 * Gets the subscription service type list.
-	 *
-	 * @param globalCustomerId the global customer id
-	 * @param request the request
-	 * @return the subscription service type list
-	 * @throws Exception the exception
-	 */
-	@RequestMapping(value = "/getSubscriptionServiceTypeList/{globalCustomerId}", method = RequestMethod.GET)
-	public String getSubscriptionServiceTypeList(@PathVariable("globalCustomerId") String globalCustomerId, HttpServletRequest request)
-			throws Exception {
-
-		System.err.println("GET SUBSCRIPTION SERVICE TYPE LIST: globalCustomerId: " + globalCustomerId);
-
-		return "[\"vMOG\", \"sevice type 2\", \"sevice type 3\", \"sevice type 4\"]";
-	}
-
-	/**
-	 * Exception.
-	 *
-	 * @param e the e
-	 * @param response the response
-	 * @throws IOException Signals that an I/O exception has occurred.
-	 */
-	@ExceptionHandler(Exception.class)
-	private void exception(Exception e, HttpServletResponse response) throws IOException {
-
-		/*
-		 * This logging step should preferably be replaced with an appropriate
-		 * logging method consistent whatever logging mechanism the rest of the
-		 * application code uses.
-		 */
-
-		e.printStackTrace(System.err);
-
-		response.setContentType("application/json; charset=UTF-8");
-		response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-
-		ExceptionResponse exceptionResponse = new ExceptionResponse();
-		exceptionResponse.setException(e.getClass().toString().replaceFirst("^.*\\.", ""));
-		exceptionResponse.setMessage(e.getMessage());
-
-		response.getWriter().write(new ObjectMapper().writeValueAsString(exceptionResponse));
-
-		response.flushBuffer();
-
-	}
-
-}
diff --git a/vid/src/main/java/org/openecomp/vid/controller/test/TestAsdcController.java b/vid/src/main/java/org/openecomp/vid/controller/test/TestAsdcController.java
deleted file mode 100644
index 2702d3673..000000000
--- a/vid/src/main/java/org/openecomp/vid/controller/test/TestAsdcController.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.controller.test;
-
-import java.io.IOException;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.codehaus.jackson.map.ObjectMapper;
-import org.openecomp.vid.model.ExceptionResponse;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
-
-/**
- * The Class TestAsdcController.
- */
-@RestController
-@RequestMapping("testasdc")
-public class TestAsdcController extends RestrictedBaseController {
-
-	/**
-	 * Gets the model.
-	 *
-	 * @param modelId the model id
-	 * @param request the request
-	 * @return the model
-	 * @throws Exception the exception
-	 */
-	@RequestMapping(value = "/getModel/{modelId}", method = RequestMethod.GET)
-	public String getModel(@PathVariable("modelId") String modelId, HttpServletRequest request) throws Exception {
-
-		System.err.println("SDC: GET MODEL: modelId: " + modelId);
-
-		// @formatter:off
-		return
-		   "{" +
-		       "\"uuid\": \"5be686dc-fdca-4d54-8548-5d0ed23e962b\"," +
-		       "\"invariantUUID\": \"e5962da9-fe4f-433a-bc99-b43e0d88a9a1\"," +
-		       "\"name\": \"DE220127\"," +
-		       "\"version\": \"0.1\"," +       
-	           "\"inputs\": {" +
-	             "\"defaultGateway\": {" +
-	                    "\"type\": \"String\"," +
-	                    "\"default\": \"192.168.1.1\"," +
-	                    "\"description\": \"Router default gateway - use any valid IPv4 address\"" +
-	             "}," +
-	             "\"subnetMask\": {" +
-	                    "\"type\": \"String\"," +
-	                    "\"default\": \"255.255.255.0\"," +
-	                    "\"description\": \"Router subnet mask - example (255.255.255.0)\"" +
-	             "}" +
-	            "}" +
-			"}";
-		// @formatter:on
-	}
-
-	/**
-	 * Exception.
-	 *
-	 * @param e the e
-	 * @param response the response
-	 * @throws IOException Signals that an I/O exception has occurred.
-	 */
-	@ExceptionHandler(Exception.class)
-	private void exception(Exception e, HttpServletResponse response) throws IOException {
-
-		/*
-		 * This logging step should preferably be replaced with an appropriate
-		 * logging method consistent whatever logging mechanism the rest of the
-		 * application code uses.
-		 */
-
-		e.printStackTrace(System.err);
-
-		response.setContentType("application/json; charset=UTF-8");
-		response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-
-		ExceptionResponse exceptionResponse = new ExceptionResponse();
-		exceptionResponse.setException(e.getClass().toString().replaceFirst("^.*\\.", ""));
-		exceptionResponse.setMessage(e.getMessage());
-
-		response.getWriter().write(new ObjectMapper().writeValueAsString(exceptionResponse));
-
-		response.flushBuffer();
-
-	}
-
-}
diff --git a/vid/src/main/java/org/openecomp/vid/controller/test/TestMsoController.java b/vid/src/main/java/org/openecomp/vid/controller/test/TestMsoController.java
deleted file mode 100644
index 88ffc6af6..000000000
--- a/vid/src/main/java/org/openecomp/vid/controller/test/TestMsoController.java
+++ /dev/null
@@ -1,729 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.controller.test;
-
-import java.io.IOException;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.codehaus.jackson.map.ObjectMapper;
-import org.openecomp.vid.model.ExceptionResponse;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
-
-/*
- * The "TestMsoController" class is primarily designed to help test "msoCommitController.js"
- * 
- * This class expects and receives JSON data in the same format as expected
- * in the "real" application version of this code. However, string versions of JSON are
- * maintained internally here instead of marshalled / unmarshalled JSON objects.
- * The primary reasons for this were to encapsulate all the test code in this single file and
- * minimize the time required to support initial test cases.
- * 
- * The non-test equivalent of this controller could alternatively incorporate POJO objects
- * instead of strings. However, the same data format sent to / received from the browser
- * JavaScript code would still be expected.
- * 
- * Two specific mechanisms used in this test class may be useful to the application version:
- * 
- * 		1) The use of "{variable}" elements in @RequestMappings along with the corresponding
- * 		@PathVariable declarations.
- * 
- * 		2) The use of @ExceptionHandler for general purpose exception handler.
- * 		(See @ExceptionHandler comments)
- *
- * This class is intended to be used in either:
- * 
- * 		A) Eclipse environments
- * 	OR
- * 		B) Linux environments with ONLY a single user running tests.
- *		The "quick and dirty" error simulation approach used here makes use of static states for some
- *		scenarios. Thus multiple users simultaneously testing in Linux environments
- *		may have contention issues.
- */
-
-/**
- * The Class TestMsoController.
- */
-@RestController
-@RequestMapping("testmso")
-public class TestMsoController extends RestrictedBaseController {
-
-	/*
-	 * Artificial delay (in milliseconds) added before responding to create /
-	 * delete requests
-	 */
-
-	/** The Constant TEST_DELAY_SHORT_MSEC. */
-	private final static int TEST_DELAY_SHORT_MSEC = 1000;
-
-	/*
-	 * Long delay to simulate non-responsive server test
-	 */
-
-	/** The Constant TEST_DELAY_LONG_MSEC. */
-	private final static int TEST_DELAY_LONG_MSEC = 15000;
-
-	/*
-	 * Default number of polls expected before transaction complete.
-	 */
-
-	/** The Constant MAXIMUM_POLLS_DEFAULT. */
-	private final static int MAXIMUM_POLLS_DEFAULT = 4;
-
-	/*
-	 * Number of polls to simulate "maximum polls exceeded" test.
-	 */
-
-	/** The Constant MAXIMUM_POLLS_LARGE. */
-	private final static int MAXIMUM_POLLS_LARGE = 10;
-
-	/*
-	 * Simulated error types. The GUI front end is expected to set these values
-	 * in the "modelName" field of the "mso_create_svc_instance" request.
-	 */
-
-	/** The Constant ERROR_POLICY_EXCEPTION. */
-	private final static String ERROR_POLICY_EXCEPTION = "ERROR_POLICY_EXCEPTION";
-	
-	/** The Constant ERROR_SERVICE_EXCEPTION. */
-	private final static String ERROR_SERVICE_EXCEPTION = "ERROR_SERVICE_EXCEPTION";
-	
-	/** The Constant ERROR_POLL_FAILURE. */
-	private final static String ERROR_POLL_FAILURE = "ERROR_POLL_FAILURE";
-	
-	/** The Constant ERROR_INVALID_FIELD_INITIAL. */
-	private final static String ERROR_INVALID_FIELD_INITIAL = "ERROR_INVALID_FIELD_INITIAL";
-	
-	/** The Constant ERROR_INVALID_FIELD_POLL. */
-	private final static String ERROR_INVALID_FIELD_POLL = "ERROR_INVALID_FIELD_POLL";
-	
-	/** The Constant ERROR_GENERAL_SERVER_EXCEPTION. */
-	private final static String ERROR_GENERAL_SERVER_EXCEPTION = "ERROR_GENERAL_SERVER_EXCEPTION";
-	
-	/** The Constant ERROR_MAX_POLLS. */
-	private final static String ERROR_MAX_POLLS = "ERROR_MAX_POLLS";
-	
-	/** The Constant ERROR_SERVER_TIMEOUT_INITIAL. */
-	private final static String ERROR_SERVER_TIMEOUT_INITIAL = "ERROR_SERVER_TIMEOUT_INITIAL";
-	
-	/** The Constant ERROR_SERVER_TIMEOUT_POLL. */
-	private final static String ERROR_SERVER_TIMEOUT_POLL = "ERROR_SERVER_TIMEOUT_POLL";
-
-	/** The simulated error. */
-	private String simulatedError = "";
-	
-	/** The maximum polls. */
-	private int maximumPolls = 0;
-	
-	/** The attempt count. */
-	private int attemptCount = 0;
-
-	/**
-	 * Creates the svc instance.
-	 *
-	 * @param request the request
-	 * @return the response entity
-	 * @throws Exception the exception
-	 */
-	@RequestMapping(value = "/mso_create_svc_instance", method = RequestMethod.POST)
-	public ResponseEntity createSvcInstance(HttpServletRequest request) throws Exception {
-		readAndLogRequest("CREATE SERVICE INSTANCE", request);
-		Thread.sleep(TEST_DELAY_SHORT_MSEC);
-		maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior
-		attemptCount = 0;
-
-		/*
-		 * This block of code simulates various errors and would NOT be expected
-		 * in a non-test method
-		 */
-		System.err.println("simulatedError: " + simulatedError);
-
-		if (simulatedError.equals(ERROR_POLICY_EXCEPTION)) {
-			return new ResponseEntity(policyExceptionResponse, HttpStatus.OK);
-		}
-		if (simulatedError.equals(ERROR_SERVICE_EXCEPTION)) {
-			return new ResponseEntity(serviceExceptionResponse, HttpStatus.OK);
-		}
-		if (simulatedError.equals(ERROR_INVALID_FIELD_INITIAL)) {
-			/*
-			 * Force invalid response field name. Return
-			 * "XXXXXrequestReferences" instead of "requestReferences"
-			 */
-			return new ResponseEntity(acceptResponse.replace("requestReferences", "XXXXXrequestReferences"),
-					HttpStatus.OK);
-		}
-
-		if (simulatedError.equals(ERROR_GENERAL_SERVER_EXCEPTION)) {
-			throw new IOException("an example of an IO exception");
-		}
-
-		if (simulatedError.equals(ERROR_SERVER_TIMEOUT_INITIAL)) {
-			Thread.sleep(TEST_DELAY_LONG_MSEC);
-		}
-
-		if (simulatedError.equals(ERROR_MAX_POLLS)) {
-			maximumPolls = MAXIMUM_POLLS_LARGE;
-		}
-
-		/*
-		 * End of block of simulated error code.
-		 */
-
-		return new ResponseEntity(acceptResponse, HttpStatus.OK);
-	}
-
-	/**
-	 * Delete svc instance.
-	 *
-	 * @param serviceInstanceId the service instance id
-	 * @param request the request
-	 * @return the response entity
-	 * @throws Exception the exception
-	 */
-	@RequestMapping(value = "/mso_delete_svc_instance/{serviceInstanceId}", method = RequestMethod.POST)
-	public ResponseEntity deleteSvcInstance(@PathVariable("serviceInstanceId") String serviceInstanceId,
-			HttpServletRequest request) throws Exception {
-		readAndLogRequest("DELETE SERVICE INSTANCE: serviceInstanceId: " + serviceInstanceId, request);
-		Thread.sleep(TEST_DELAY_SHORT_MSEC);
-		maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior
-		attemptCount = 0;
-		return new ResponseEntity(acceptResponse, HttpStatus.OK);
-	}
-
-	/**
-	 * Creates the vnf instance.
-	 *
-	 * @param serviceInstanceId the service instance id
-	 * @param request the request
-	 * @return the response entity
-	 * @throws Exception the exception
-	 */
-	@RequestMapping(value = "/mso_create_vnf_instance/{serviceInstanceId}", method = RequestMethod.POST)
-	public ResponseEntity createVnfInstance(@PathVariable("serviceInstanceId") String serviceInstanceId,
-			HttpServletRequest request) throws Exception {
-		readAndLogRequest("CREATE VNF INSTANCE: serviceInstanceId: " + serviceInstanceId, request);
-		Thread.sleep(TEST_DELAY_SHORT_MSEC);
-		maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior
-		attemptCount = 0;
-		return new ResponseEntity(acceptResponse, HttpStatus.OK);
-	}
-
-	/**
-	 * Delete vnf instance.
-	 *
-	 * @param serviceInstanceId the service instance id
-	 * @param vnfInstanceId the vnf instance id
-	 * @param request the request
-	 * @return the response entity
-	 * @throws Exception the exception
-	 */
-	@RequestMapping(value = "/mso_delete_vnf_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}", method = RequestMethod.POST)
-	public ResponseEntity deleteVnfInstance(@PathVariable("serviceInstanceId") String serviceInstanceId,
-			@PathVariable("vnfInstanceId") String vnfInstanceId, HttpServletRequest request) throws Exception {
-		readAndLogRequest(
-				"DELETE VNF INSTANCE: serviceInstanceId: " + serviceInstanceId + " vnfInstanceId: " + vnfInstanceId,
-				request);
-		Thread.sleep(TEST_DELAY_SHORT_MSEC);
-		maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior
-		attemptCount = 0;
-		return new ResponseEntity(acceptResponse, HttpStatus.OK);
-	}
-
-	/**
-	 * Creates the vf module instance.
-	 *
-	 * @param serviceInstanceId the service instance id
-	 * @param vnfInstanceId the vnf instance id
-	 * @param request the request
-	 * @return the response entity
-	 * @throws Exception the exception
-	 */
-	// /serviceInstances/v2/ff305d54-75b4-431b-adb2-eb6b9e5ff000/vnfs/ff305d54-75b4-ff1b-adb2-eb6b9e5460ff/vfModules
-	@RequestMapping(value = "/mso_create_vfmodule_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}", method = RequestMethod.POST)
-	public ResponseEntity createVfModuleInstance(@PathVariable("serviceInstanceId") String serviceInstanceId,
-			@PathVariable("vnfInstanceId") String vnfInstanceId, HttpServletRequest request) throws Exception {
-		readAndLogRequest("CREATE VF MODULE INSTANCE: serviceInstanceId: " + serviceInstanceId + " vnfInstanceId: "
-				+ vnfInstanceId, request);
-		Thread.sleep(TEST_DELAY_SHORT_MSEC);
-		maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior
-		attemptCount = 0;
-		return new ResponseEntity(acceptResponse, HttpStatus.OK);
-	}
-
-	/**
-	 * Delete vf module instance.
-	 *
-	 * @param serviceInstanceId the service instance id
-	 * @param vnfInstanceId the vnf instance id
-	 * @param vfModuleInstanceId the vf module instance id
-	 * @param request the request
-	 * @return the response entity
-	 * @throws Exception the exception
-	 */
-	// /serviceInstances/v2/ff305d54-75b4-431b-adb2-eb6b9e5ff000/vnfs/ff305d54-75b4-ff1b-adb2-eb6b9e5460ff/vfModules/ff305d54-75b4-ff1b-bdb2-eb6b9e5460ff
-	@RequestMapping(value = "/mso_delete_vfmodule_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfModuleInstanceId}", method = RequestMethod.POST)
-	public ResponseEntity deleteVfModuleInstance(@PathVariable("serviceInstanceId") String serviceInstanceId,
-			@PathVariable("vnfInstanceId") String vnfInstanceId,
-			@PathVariable("vfModuleInstanceId") String vfModuleInstanceId, HttpServletRequest request)
-			throws Exception {
-		readAndLogRequest("DELETE VF MODULE INSTANCE: serviceInstanceId: " + serviceInstanceId + " vnfInstanceId: "
-				+ vnfInstanceId + " vfModuleInstanceId: " + vfModuleInstanceId, request);
-		Thread.sleep(TEST_DELAY_SHORT_MSEC);
-		maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior
-		attemptCount = 0;
-		return new ResponseEntity(acceptResponse, HttpStatus.OK);
-	}
-
-	// POST
-	/**
-	 * Creates the volume group instance.
-	 *
-	 * @param serviceInstanceId the service instance id
-	 * @param vnfInstanceId the vnf instance id
-	 * @param request the request
-	 * @return the response entity
-	 * @throws Exception the exception
-	 */
-	// /serviceInstances/v2/ff305d54-75b4-431b-adb2-eb6b9e5ff000/volumeGroups
-	@RequestMapping(value = "/mso_create_volumegroup_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}", method = RequestMethod.POST)
-	public ResponseEntity createVolumeGroupInstance(@PathVariable("serviceInstanceId") String serviceInstanceId,
-			@PathVariable("vnfInstanceId") String vnfInstanceId, HttpServletRequest request) throws Exception {
-		readAndLogRequest("CREATE VOLUME GROUP INSTANCE: seviceInstanceId: " + serviceInstanceId + " vnfInstanceId: "
-				+ vnfInstanceId, request);
-		Thread.sleep(TEST_DELAY_SHORT_MSEC);
-		maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior
-		attemptCount = 0;
-		return new ResponseEntity(acceptResponse, HttpStatus.OK);
-	}
-
-	/**
-	 * Delete volume group instance.
-	 *
-	 * @param serviceInstanceId the service instance id
-	 * @param vnfInstanceId the vnf instance id
-	 * @param volumeGroupInstanceId the volume group instance id
-	 * @param request the request
-	 * @return the response entity
-	 * @throws Exception the exception
-	 */
-	// /serviceInstances/v2/ff305d54-75b4-431b-adb2-eb6b9e5ff000/volumeGroups/ff305d54-75b4-ff1b-cdb2-eb6b9e5460ff
-	@RequestMapping(value = "/mso_delete_volumegroup_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups/{volumeGroupInstanceId}", method = RequestMethod.POST)
-	public ResponseEntity deleteVolumeGroupInstance(@PathVariable("serviceInstanceId") String serviceInstanceId,
-			@PathVariable("vnfInstanceId") String vnfInstanceId,
-			@PathVariable("volumeGroupInstanceId") String volumeGroupInstanceId, HttpServletRequest request)
-			throws Exception {
-		readAndLogRequest("DELETE NW INSTANCE: serviceInstanceId: " + serviceInstanceId + " vnfInstanceId: "
-				+ vnfInstanceId + " volumeGroupInstanceId: " + volumeGroupInstanceId, request);
-		Thread.sleep(TEST_DELAY_SHORT_MSEC);
-		maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior
-		attemptCount = 0;
-		return new ResponseEntity(acceptResponse, HttpStatus.OK);
-	}
-
-	/**
-	 * Creates the nw instance.
-	 *
-	 * @param serviceInstanceId the service instance id
-	 * @param request the request
-	 * @return the response entity
-	 * @throws Exception the exception
-	 */
-	@RequestMapping(value = "/mso_create_nw_instance/{serviceInstanceId}", method = RequestMethod.POST)
-	public ResponseEntity createNwInstance(@PathVariable("serviceInstanceId") String serviceInstanceId,
-			HttpServletRequest request) throws Exception {
-		readAndLogRequest("CREATE NW INSTANCE: serviceInstanceId: " + serviceInstanceId, request);
-		Thread.sleep(TEST_DELAY_SHORT_MSEC);
-		maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior
-		attemptCount = 0;
-		return new ResponseEntity(acceptResponse, HttpStatus.OK);
-	}
-
-	/**
-	 * Delete nw instance.
-	 *
-	 * @param serviceInstanceId the service instance id
-	 * @param networkInstanceId the network instance id
-	 * @param request the request
-	 * @return the response entity
-	 * @throws Exception the exception
-	 */
-	@RequestMapping(value = "/mso_delete_nw_instance/{serviceInstanceId}/networks/{networkInstanceId}", method = RequestMethod.POST)
-	public ResponseEntity deleteNwInstance(@PathVariable("serviceInstanceId") String serviceInstanceId,
-			@PathVariable("networkInstanceId") String networkInstanceId, HttpServletRequest request) throws Exception {
-		readAndLogRequest("DELETE NW INSTANCE: serviceInstanceId: " + serviceInstanceId + " networkInstanceId: "
-				+ networkInstanceId, request);
-		Thread.sleep(TEST_DELAY_SHORT_MSEC);
-		maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior
-		attemptCount = 0;
-		return new ResponseEntity(acceptResponse, HttpStatus.OK);
-	}
-
-	/**
-	 * Gets the orchestration request.
-	 *
-	 * @param requestId the request id
-	 * @param request the request
-	 * @return the orchestration request
-	 * @throws Exception the exception
-	 */
-	@RequestMapping(value = "/mso_get_orch_req/{requestId}", method = RequestMethod.GET)
-	public ResponseEntity getOrchestrationRequest(@PathVariable("requestId") String requestId,
-			HttpServletRequest request) throws Exception {
-
-		System.err.println("GET ORCHESTRATION REQUEST: requestId: " + requestId);
-
-		/*
-		 * This block of code simulates various errors and would NOT be expected
-		 * in a non-test method
-		 */
-
-		if (simulatedError.equals(ERROR_INVALID_FIELD_POLL)) {
-			/*
-			 * Force invalid response field name. Return "XXXXXrequestStatus"
-			 * instead of "requestStatus"
-			 */
-			return new ResponseEntity(inProgressResponse.replace("requestStatus", "XXXXXrequestStatus"),
-					HttpStatus.OK);
-		}
-
-		if (simulatedError.equals(ERROR_POLL_FAILURE)) {
-			/*
-			 * Force status field with "Failure"
-			 */
-			return new ResponseEntity(inProgressResponse.replace("InProgress", "Failure"), HttpStatus.OK);
-		}
-
-		if (simulatedError.equals(ERROR_SERVER_TIMEOUT_POLL)) {
-			Thread.sleep(TEST_DELAY_LONG_MSEC);
-		}
-
-		/*
-		 * End of block of simulated error code.
-		 */
-
-		/*
-		 * This logic simulates how MSO might behave ... i.e. return different
-		 * results depending on the value of 'maximumPolls'.
-		 *
-		 */
-		int percentProgress = (++attemptCount * 100) / maximumPolls;
-
-		System.err.println("attempts: " + attemptCount + " max: " + maximumPolls + " percent: " + percentProgress);
-
-		String response = inProgressResponse.replace("\"50\"", "\"" + Integer.toString(percentProgress) + "\"");
-
-		if (attemptCount < maximumPolls) {
-			if (attemptCount > 1) {
-				response = response.replace("vLan setup", "setup step " + Integer.toString(attemptCount));
-			}
-			return new ResponseEntity(response, HttpStatus.OK);
-		} else {
-			return new ResponseEntity(
-					response.replace("InProgress", "Complete").replace("vLan setup complete", ""), HttpStatus.OK);
-		}
-	}
-
-	/**
-	 * Gets the orchestration requests.
-	 *
-	 * @param filterString the filter string
-	 * @param request the request
-	 * @return the orchestration requests
-	 * @throws Exception the exception
-	 */
-	@RequestMapping(value = "/mso_get_orch_reqs/{filterString}", method = RequestMethod.GET)
-	public ResponseEntity getOrchestrationRequests(@PathVariable("filterString") String filterString,
-			HttpServletRequest request) throws Exception {
-
-		System.err.println("GET ORCHESTRATION REQUESTS: filterString: " + filterString);
-
-		return new ResponseEntity(getOrchestrationRequestsResponse, HttpStatus.OK);
-
-	}
-
-	/*
-	 * General purpose exception handler that could be used in application code.
-	 * 
-	 * The method returns exceptions as error code 500. Both the exception type
-	 * and message are written as a JSON object.
-	 * 
-	 * See the following references:
-	 * 
-	 * 1) The ExceptionResponse POJO.
-	 * 
-	 * 2) The "getHttpErrorMessage" function in "utilityService.js" - an example
-	 * of how the browser JavaScript code can interpret this response.
-	 */
-
-	/**
-	 * Exception.
-	 *
-	 * @param e the e
-	 * @param response the response
-	 * @throws IOException Signals that an I/O exception has occurred.
-	 */
-	@ExceptionHandler(Exception.class)
-	private void exception(Exception e, HttpServletResponse response) throws IOException {
-
-		/*
-		 * This logging step should preferably be replaced with an appropriate
-		 * logging method consistent whatever logging mechanism the rest of the
-		 * application code uses.
-		 */
-
-		e.printStackTrace(System.err);
-
-		response.setContentType("application/json; charset=UTF-8");
-		response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-
-		ExceptionResponse exceptionResponse = new ExceptionResponse();
-		exceptionResponse.setException(e.getClass().toString().replaceFirst("^.*\\.", ""));
-		exceptionResponse.setMessage(e.getMessage());
-
-		response.getWriter().write(new ObjectMapper().writeValueAsString(exceptionResponse));
-
-		response.flushBuffer();
-
-	}
-
-	/*
-	 * 'readAndLogRequest' only intended to be used for testing.
-	 * 
-	 * The method reads JSON from the input stream and thus prevents other
-	 * mechanisms from reading the input.
-	 */
-
-	/**
-	 * Read and log request.
-	 *
-	 * @param label the label
-	 * @param request the request
-	 * @throws Exception the exception
-	 */
-	private void readAndLogRequest(String label, HttpServletRequest request) throws Exception {
-		String input = request.getReader().lines().collect(Collectors.joining(System.lineSeparator()));
-
-		ObjectMapper mapper = new ObjectMapper();
-		Object json = mapper.readValue(input, Object.class);
-
-		System.err.println(label + "\n" + mapper.writerWithDefaultPrettyPrinter().writeValueAsString(json));
-
-		/*
-		 * Only needed for error simulation ...
-		 */
-		if (input.matches("^.*modelName.*$")) {
-			simulatedError = input.replaceAll("^.*\"modelName\":\"", "").replaceAll("\".*$", "");
-		}
-	}
-
-	/*
-	 * Various test responses:
-	 */
-
-	// @formatter:off
-
-	/** The accept response. */
-	/*
-	 * Sample responses to initial create / delete transaction
-	 */
-	private String acceptResponse =
-	   "{" +
-	    "  \"status\": 202," +
-	    "  \"entity\": {" +
-	    "      \"requestReferences\": {" +
-	    "         \"instanceId\": \"bc305d54-75b4-431b-adb2-eb6b9e546014\"," +
-	    "         \"requestId\": \"rq1234d1-5a33-55df-13ab-12abad84e331\"" +
-	    "      }" +
-	    "  }" +
-	    "}";
-	
-	/** The policy exception response. */
-	private String policyExceptionResponse = 
-		"{" + 
-		"  \"status\": 400," + 
-		"  \"entity\": { " + 
-		"    \"requestError\": {" + 
-		"      \"policyException\": {" + 
-		"        \"messageId\": \"POL9003\"," + 
-		"        \"text\": \"Message content size exceeds the allowable limit\"" + 
-		"      }" + 
-		"    }" + 
-		"  }" + 
-		"}";
-
-	/** The service exception response. */
-	private String serviceExceptionResponse =
-		"{" + 
-		"  \"status\": 400," + 
-		"  \"entity\": { " + 
-		"    \"requestError\": {" + 
-		"      \"serviceException\": {" + 
-		"        \"messageId\": \"SVC2000\"," + 
-		"        \"text\": \"Missing Parameter: %1. Error code is %2\"," + 
-		"        \"variables\": [" + 
-		"          \"severity\"," + 
-		"          \"400\"" + 
-		"        ]" + 
-		"      }" + 
-		"    }" + 
-		"  }" + 
-		"}" + 
-		"";
-	
-	/** The in progress response. */
-	/*
-	 * Sample response to subsequent getOrchestrationRequest
-	 */
-	private String inProgressResponse =
-		"{" +
-		"   \"status\": 200," +
-		"   \"entity\": {" +
-		"      \"request\": {" +
-		"         \"requestId\": \"rq1234d1-5a33-55df-13ab-12abad84e333\"," +
-		"         \"startTime\": \"Thu, 04 Jun 2009 02:51:59 GMT\"," +
-		"         \"instanceIds\": {" +
-		"            \"serviceInstanceId\": \"bc305d54-75b4-431b-adb2-eb6b9e546014\"" +
-		"         }," +
-		"         \"requestScope\": \"service\"," +
-		"         \"requestType\": \"createInstance\"," +
-		"         \"requestDetails\": {" +
-		"            \"modelInfo\": {" +
-		"               \"modelType\": \"service\"," +
-		"               \"modelId\": \"sn5256d1-5a33-55df-13ab-12abad84e764\"," +
-		"               \"modelNameVersionId\": \"ab6478e4-ea33-3346-ac12-ab121484a333\"," +
-		"               \"modelName\": \"WanBonding\"," +
-		"               \"modelVersion\": \"1\"" +
-		"            }," +
-		"            \"subscriberInfo\": {" +
-		"                \"globalSubscriberId\": \"C12345\"," +
-		"                \"subscriberName\": \"General Electric Division 12\"" +
-		"            }," +
-		"            \"requestParameters\": {" +
-		"               \"vpnId\": \"1a2b3c4d5e6f\"," +
-		"               \"productName\": \"Trinity\"," +
-		"               \"customerId\": \"icore9883749\"" +
-		"            }" +
-		"         }," +
-		"         \"requestStatus\": {" +
-		"            \"timestamp\": \"Thu, 04 Jun 2009 02:53:39 GMT\"," +
-		"            \"requestState\": \"InProgress\"," +
-		"            \"statusMessage\": \"vLan setup complete\"," +
-		"            \"percentProgress\": \"50\"" +
-		"         }" +
-		"      }" +
-		"   }" +
-		"}";
-	
-	/*
-	 * Sample response to subsequent getOrchestrationRequests
-	 */
-	
-	/** The get orchestration requests response. */
-	private String getOrchestrationRequestsResponse = 
-		"{" +
-		"   \"status\": 200," +
-		"   \"entity\": {" +
-		"      \"requestList\": [" +
-		"         {" +
-		"            \"request\": {" +
-		"               \"requestId\": \"rq1234d1-5a33-55df-13ab-12abad84e333\"," +
-		"               \"startTime\": \"Thu, 04 Jun 2009 02:51:59 GMT\"," +
-		"               \"finishTime\": \"Thu, 04 Jun 2009 02:55:59 GMT\"," +
-		"               \"instanceReferences\": {" +
-		"                  \"serviceInstanceId\": \"bc305d54-75b4-431b-adb2-eb6b9e546014\"" +
-		"               }," +
-		"               \"requestScope\": \"service\"," +
-		"               \"requestType\": \"createInstance\"," +
-		"               \"requestDetails\": {" +
-		"                  \"modelInfo\": {" +
-		"                     \"modelType\": \"service\"," +
-		"                     \"modelId\": \"sn5256d1-5a33-55df-13ab-12abad84e764\"," +
-		"                     \"modelNameVersionId\": \"ab6478e4-ea33-3346-ac12-ab121484a333\"," +
-		"                     \"modelName\": \"WanBonding\"," +
-		"                     \"modelVersion\": \"1\"" +
-		"                  }," +
-		"                  \"subscriberInfo\": {" +
-		"                      \"globalSubscriberId\": \"C12345\"," +
-		"                      \"subscriberName\": \"General Electric Division 12\"" +
-		"                  }," +
-		"                  \"requestParameters\": {" +
-		"                     \"vpnId\": \"1a2b3c4d5e6f\"," +
-		"                     \"productName\": \"Trinity\"," +
-		"                     \"customerId\": \"icore9883749\"" +
-		"                  }" +
-		"               }," +
-		"               \"requestStatus\": {" +
-		"                  \"timestamp\": \"Thu, 04 Jun 2009 02:54:49 GMT\"," +
-		"                  \"requestState\": \"complete\"," +
-		"                  \"statusMessage\": \"Resource Created\"," +
-		"                  \"percentProgress\": \"100\"" +
-		"               }" +
-		"            }" +
-		"         }," +
-		"         {" +
-		"            \"request\": {" +
-		"               \"requestId\": \"rq1234d1-5a33-55df-13ab-12abad84e334\"," +
-		"               \"startTime\": \"Thu, 04 Jun 2009 03:52:59 GMT\"," +
-		"               \"instanceReferences\": {" +
-		"                  \"serviceInstanceId\": \"bc305d54-75b4-431b-adb2-eb6b9e546014\"" +
-		"               }," +
-		"               \"requestScope\": \"service\"," +
-		"               \"requestType\": \"updateInstance\"," +
-		"               \"requestDetails\": {" +
-		"                  \"modelInfo\": {" +
-		"                     \"modelType\": \"service\"," +
-		"                     \"modelId\": \"sn5256d1-5a33-55df-13ab-12abad84e764\"," +
-		"                     \"modelNameVersionId\": \"ab6478e4-ea33-3346-ac12-ab121484a333\"," +
-		"                     \"modelName\": \"WanBonding\"," +
-		"                     \"modelVersion\": \"1\"" +
-		"                  }," +
-		"                  \"subscriberInfo\": {" +
-		"                      \"globalSubscriberId\": \"C12345\"," +
-		"                      \"subscriberName\": \"General Electric Division 12\"" +
-		"                  }," +
-		"                  \"requestParameters\": {" +
-		"                     \"vpnId\": \"1a2b3c4d5e70\"," +
-		"                     \"productName\": \"Trinity\"," +
-		"                     \"customerId\": \"icore9883749\"" +
-		"                  }" +
-		"               }," +
-		"               \"requestStatus\": {" +
-		"                  \"timestamp\": \"Thu, 04 Jun 2009 03:53:39 GMT\"," +
-		"                  \"requestState\": \"InProgress\"," +
-		"                  \"statusMessage\": \"vLan setup complete\"," +
-		"                  \"percentProgress\": \"50\"" +
-		"               }" +
-		"            }" +
-		"         }" +
-		"      ]" +
-		"   }" +
-		"}";
-}
diff --git a/vid/src/main/java/org/openecomp/vid/controller/test/TestPageController.java b/vid/src/main/java/org/openecomp/vid/controller/test/TestPageController.java
deleted file mode 100644
index c2c2b04ff..000000000
--- a/vid/src/main/java/org/openecomp/vid/controller/test/TestPageController.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.controller.test;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.servlet.ModelAndView;
-
-import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
-
-/**
- * The Class TestPageController.
- */
-@Controller
-public class TestPageController extends RestrictedBaseController {
-
-	/**
-	 * Test mso page.
-	 *
-	 * @return the model and view
-	 */
-	@RequestMapping(value = { "testMso.htm" }, method = RequestMethod.GET)
-	public ModelAndView testMsoPage() {
-		return new ModelAndView(getViewName());
-	}
-
-	/**
-	 * Test view edit page.
-	 *
-	 * @return the model and view
-	 */
-	@RequestMapping(value = { "testViewEdit" }, method = RequestMethod.GET)
-	public ModelAndView testViewEditPage() {
-		return new ModelAndView(getViewName());
-	}
-
-}
diff --git a/vid/src/main/java/org/openecomp/vid/dao/ProfileDao.java b/vid/src/main/java/org/openecomp/vid/dao/ProfileDao.java
deleted file mode 100644
index b50b58b7c..000000000
--- a/vid/src/main/java/org/openecomp/vid/dao/ProfileDao.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.dao;
-
-import java.util.List;
-import org.openecomp.portalsdk.core.domain.Profile;
-
-/**
- * The Interface ProfileDao.
- */
-public interface ProfileDao {
-	
-	/**
-	 * Find all.
-	 *
-	 * @return the list
-	 */
-	List findAll();
-	
-	/**
-	 * Gets the profile.
-	 *
-	 * @param id the id
-	 * @return the profile
-	 */
-	Profile getProfile(int id);
-}
diff --git a/vid/src/main/java/org/openecomp/vid/encryption/EncryptConvertor.java b/vid/src/main/java/org/openecomp/vid/encryption/EncryptConvertor.java
deleted file mode 100644
index 51a5ee2e3..000000000
--- a/vid/src/main/java/org/openecomp/vid/encryption/EncryptConvertor.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.encryption;
-
-import java.lang.Character;
-
-/**
- * The Class EncryptConvertor.
- */
-public class EncryptConvertor {
-
-  /** The Constant HEX_CHARS. */
-  private static final char[] HEX_CHARS = "0123456789abcdef".toCharArray();
-
-  /**
-   * toHexString(String) - convert a string into its hex equivalent.
-   *
-   * @param buf the buf
-   * @return the string
-   */
-  public final static String toHexString(String buf) {
-    if (buf == null) return "";
-    return toHexString(buf.getBytes());
-  }
-
-  /**
-   * toHexString(byte[]) - convert a byte-string into its hex equivalent.
-   *
-   * @param buf the buf
-   * @return the string
-   */
-  public final static String toHexString(byte[] buf) {
-
-    if (buf == null) return "";
-    char[] chars = new char[2 * buf.length];
-    for (int i = 0; i < buf.length; ++i) {
-      chars[2 * i] = HEX_CHARS[(buf[i] & 0xF0) >>> 4];
-      chars[2 * i + 1] = HEX_CHARS[buf[i] & 0x0F];
-    }
-    return new String(chars);
-  }   
-
-    // alternate implementation that's slightly slower
-// protected static final byte[] Hexhars = {
-//	'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
-// };
-// public static String encode(byte[] b) {
-//	StringBuilder s = new StringBuilder(2 * b.length);
-//	for (int i = 0; i < b.length; i++) {
-//	    int v = b[i] & 0xff;
-//	    s.append((char)Hexhars[v >> 4]);
-//	    s.append((char)Hexhars[v & 0xf]);
-//	}
-//	return s.toString();
-// }
-
-  /**
-     * Convert a hex string to its equivalent value.
-     *
-     * @param hexString the hex string
-     * @return the string
-     * @throws Exception the exception
-     */
-  public final static String stringFromHex(String hexString) throws Exception
-  {
-    if (hexString == null) return "";
-    return stringFromHex(hexString.toCharArray());
-  }
-
-  /**
-   * String from hex.
-   *
-   * @param hexCharArray the hex char array
-   * @return the string
-   * @throws Exception the exception
-   */
-  public final static String stringFromHex(char[] hexCharArray)
-  throws Exception {
-    if (hexCharArray == null) return "";
-    return new String(bytesFromHex(hexCharArray));
-  }
-
-  /**
-   * Bytes from hex.
-   *
-   * @param hexString the hex string
-   * @return the byte[]
-   * @throws Exception the exception
-   */
-  public final static byte[] bytesFromHex(String hexString) throws Exception
-  {
-    if (hexString == null) return new byte[0];
-    return bytesFromHex(hexString.toCharArray());
-  }
-
-  /**
-   * Bytes from hex.
-   *
-   * @param hexCharArray the hex char array
-   * @return the byte[]
-   * @throws Exception the exception
-   */
-  public final static byte[] bytesFromHex(char[] hexCharArray)
-  throws Exception {
-    if (hexCharArray == null) return new byte[0];
-    int len = hexCharArray.length;
-    if ((len % 2) != 0) throw new Exception("Odd number of characters: '" + String.valueOf(hexCharArray) + "'");
-    byte [] txtInByte = new byte [len / 2];
-    int j = 0;
-    for (int i = 0; i < len; i += 2) {
-      txtInByte[j++] = (byte)(((fromHexDigit(hexCharArray[i], i) << 4) | fromHexDigit(hexCharArray[i+1], i)) & 0xFF);
-    }
-    return txtInByte;
-  }
-
-  /**
-   * From hex digit.
-   *
-   * @param ch the ch
-   * @param index the index
-   * @return the int
-   * @throws Exception the exception
-   */
-  protected final static int fromHexDigit(char ch, int index) throws Exception
-  {
-    int digit = Character.digit(ch, 16);
-    if (digit == -1) throw new Exception("Illegal hex character '" + ch + "' at index " + index);
-      return digit;
-  }
-
-  // UNIT TESTS (same junit, but we want to run from command line
-
-  /**
-   * Check to hex string B.
-   *
-   * @param arg the arg
-   * @param expected the expected
-   * @return true, if successful
-   */
-  public static boolean checkToHexStringB(String arg, String expected) {
-	String ret = toHexString(arg != null ? arg.getBytes() : null);
-	System.out.println("toHexString(" + arg + ")=> " + ret);
-	if (!ret.equals(expected)) System.out.println("\tWRONG, expected: " + expected);
-	return ret.equals(expected);
-  }
-
-  /**
-   * Check to hex string.
-   *
-   * @param arg the arg
-   * @param expected the expected
-   * @return true, if successful
-   */
-  public static boolean checkToHexString(String arg, String expected) {
-	String ret = toHexString(arg);
-	System.out.println("toHexString(" + arg + ")=> " + ret);
-	if (!ret.equals(expected)) System.out.println("\tWRONG, expected: " + expected);
-	return ret.equals(expected);
-  }
-
-  /**
-   * Check from hex string.
-   *
-   * @param arg the arg
-   * @param expected the expected
-   * @return true, if successful
-   */
-  public static boolean checkFromHexString(String arg, String expected) {
-	try {
-	    String ret = stringFromHex(arg);
-	    System.out.println("fromHexString(" + arg + ")=> " + ret);
-	    if (!ret.equals(expected)) System.out.println("\tWRONG, expected: " + expected);
-	    return ret.equals(expected);
-	} catch (Exception e) {
-		System.out.println("Caught exception: " + e.toString());
-	    return false;
-	}
-  }
-
-  /**
-   * Check from hex string B.
-   *
-   * @param arg the arg
-   * @param expected the expected
-   * @return true, if successful
-   */
-  public static boolean checkFromHexStringB(String arg, String expected) {
-	try {
-	    byte[] ret = bytesFromHex(arg);
-	    String sret = new String(ret);
-	    System.out.println("fromHexString(" + arg + ")=> " + sret);
-	    if (!sret.equals(expected)) System.out.println("\tWRONG, expected: " + expected);
-	    return sret.equals(expected);
-	} catch (Exception e) {
-		System.out.println("Caught exception: " + e.toString());
-	    return false;
-	}
-  }
-
-
-  /**
-   * The main method.
-   *
-   * @param args the arguments
-   */
-  public static void main(String[] args) {
-	// TODO Auto-generated method stub
-    int pass = 0, fail = 0;
-    if (checkToHexString("", "")) pass++; else fail++;
-    if (checkToHexString(null, "")) pass++; else fail++;
-    if (checkToHexString("0", "30")) pass++; else fail++;
-    if (checkToHexString("abc", "616263")) pass++; else fail++;
-    if (checkToHexString("!@#$%^&*()", "21402324255e262a2829")) pass++; else fail++;
-    if (checkToHexStringB("", "")) pass++; else fail++;
-    if (checkToHexStringB(null, "")) pass++; else fail++;
-    if (checkToHexStringB("0", "30")) pass++; else fail++;
-    if (checkToHexStringB("abc", "616263")) pass++; else fail++;
-    if (checkToHexStringB("!@#$%^&*()", "21402324255e262a2829")) pass++; else fail++;
-    if (checkFromHexString("", "")) pass++; else fail++;
-    if (checkFromHexString(null, "")) pass++; else fail++;
-    if (checkFromHexString("30", "0")) pass++; else fail++;
-    if (checkFromHexString("616263", "abc")) pass++; else fail++;
-    if (checkFromHexString("21402324255e262a2829", "!@#$%^&*()")) pass++; else fail++;
-    if (checkFromHexStringB("", "")) pass++; else fail++;
-    if (checkFromHexStringB(null, "")) pass++; else fail++;
-    if (checkFromHexStringB("30", "0")) pass++; else fail++;
-    if (checkFromHexStringB("616263", "abc")) pass++; else fail++;
-    if (checkFromHexStringB("21402324255e262a2829", "!@#$%^&*()")) pass++; else fail++;
-    System.out.println("Tests passed: " + Integer.toString(pass));
-    System.out.println("Tests failed: " + Integer.toString(fail));
-    System.out.println("=======");
-    System.out.println("abc toHex = " + toHexString("abc"));
-    System.out.println("123 toHex = " + toHexString("123"));
-    try {
-    System.out.println("616263 FromHex = " + stringFromHex("616263"));
-    System.out.println("313233 FromHex = " + stringFromHex("313233"));
-    //System.out.println("current key FromHex = " + stringFromHex("57ajqe{kJjjarj}G#(3)ea7"));
-    } catch (Exception e) {
-      System.out.println("exception: " + e.toString());
-    }
-  }
-
-}
diff --git a/vid/src/main/java/org/openecomp/vid/encryption/EncryptedConfiguration.java b/vid/src/main/java/org/openecomp/vid/encryption/EncryptedConfiguration.java
deleted file mode 100644
index 30d40812d..000000000
--- a/vid/src/main/java/org/openecomp/vid/encryption/EncryptedConfiguration.java
+++ /dev/null
@@ -1,413 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.encryption;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.MessageDigest;
-import java.util.Properties;
-
-import javax.crypto.Cipher;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-
-
-/**
- *  Class to manage encrypted configuration values.
- */
-public class EncryptedConfiguration {
-	
-	/** The logger. */
-	static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(EncryptedConfiguration.class);
-
-
-	  /** 	Our secret key and method. */
-	  private String encryptionKey;
-	  
-  	/** The encryption method. */
-  	private String encryptionMethod;
-
-	  /**
-  	 * 	Where to log when things go wrong.
-  	 *
-  	 * @param key the key
-  	 * @param method the method
-  	 */
-
-	  public EncryptedConfiguration(String key, String method) {
-	    encryptionKey = key.trim();
-	    encryptionMethod = method;
-	  } 
-
-	  /**
-  	 * Retrieve an encrypted string from the given configuration.
-  	 * The name will have ".x" appended to it.
-  	 * Decoded from hex, it will be "method:hexsalt:hexvalue".
-  	 * The format of the value will be in hex.
-  	 * Method will be "r" to begin with, for "rc4".
-  	 *
-  	 * @param f the f
-  	 * @param name the name
-  	 * @param deflt the deflt
-  	 * @return the string
-  	 * @throws Exception the exception
-  	 */
-	  public String getString(String f, String name, String deflt)
-	  throws Exception {
-	    logger.debug(EELFLoggerDelegate.debugLogger, "==> getString"); 
-	    return getString(f, name, deflt, encryptionKey);
-	  }
-
-	  /**
-  	 * Retrieve an encrypted string from the given configuration.
-  	 * The name will have ".x" appended to it.
-  	 * Decoded from hex, it will be "method:hexsalt:hexvalue".
-  	 * The format of the value will be in hex.
-  	 * Method will be "r" to begin with, for "rc4".
-  	 *
-  	 * @param f the f
-  	 * @param name the name
-  	 * @param deflt the deflt
-  	 * @param key the key
-  	 * @return the string
-  	 * @throws Exception the exception
-  	 */
-	  public String getString(String f, String name, String deflt, String key)
-	   throws Exception {
-
-	    logger.debug(EELFLoggerDelegate.debugLogger, "==> getString"); 
-	    logger.debug(EELFLoggerDelegate.debugLogger, "  key = " + key);
-	    Properties prop = new Properties();
-	    InputStream input = null;
-
-	    try {
-	      input = new FileInputStream(f);
-
-	      prop.load(input);
-
-	      /* for testing, a dump of all key-value pairs
-	      Enumeration e = prop.propertyNames();
-	      while (e.hasMoreElements()) {
-	        String k = (String) e.nextElement();
-	        String value = prop.getProperty(k);
-	        System.out.println("Key : " + k + ", Value : " + value);
-	      }
-	      */
-
-	    } catch (IOException ex) {
-	      ex.printStackTrace(); // TODO: fix
-	    } finally {
-	      input.close();
-	    }
-
-	    String str = prop.getProperty(name + ".x");
-	    logger.debug(EELFLoggerDelegate.debugLogger, "str = " + str);
-
-	    if (str == null) {
-	      // not encrypted version
-	      str = prop.getProperty(name);
-	      if (str == null) {
-	        return deflt;
-	      }
-	      return str;
-	    }
-
-	    String method = encryptionMethod;
-	    logger.debug(EELFLoggerDelegate.debugLogger, "method = " + method);
-	    String salt = EncryptedConfiguration.generateSalt();
-	    logger.debug(EELFLoggerDelegate.debugLogger, "salt = " + salt);
-
-	    return decrypt(str, key, method, salt);
-	  }
-
-	  /**
-  	 * Decrypt a string in 'method:hexsalt:hexvalue' format.
-  	 *
-  	 * @param triple the triple
-  	 * @param key the key
-  	 * @param method the method
-  	 * @param salt the salt
-  	 * @return the string
-  	 * @throws Exception the exception
-  	 */
-	  public static String decrypt(String triple, String key, String method, String salt) throws Exception {
-	    /*
-	    String[] strParts = triple.trim().split(":");
-	    if (strParts.length != 3) throw new Exception("Encrypted value must look like 'x:y:z'");
-	    return decrypt(strParts[0], Convert.stringFromHex(strParts[1]), key, Convert.bytesFromHex(strParts[2]));
-	    */
-
-	    return decrypt(method, salt, key, EncryptConvertor.bytesFromHex(triple)); 
-	  }
-
-	  /**
-  	 * Decrypt a string 'method:hexsalt:hexvalue' format.
-  	 *
-  	 * @param method the method
-  	 * @param salt the salt
-  	 * @param key the key
-  	 * @param bvalue the bvalue
-  	 * @return the string
-  	 * @throws Exception the exception
-  	 */
-	  public static String decrypt(String method, String salt, String key, byte[] bvalue) throws Exception {
-	    logger.debug(EELFLoggerDelegate.debugLogger, "==> decrypt method");
-	    logger.debug(EELFLoggerDelegate.debugLogger, "  method = " + method);
-	    logger.debug(EELFLoggerDelegate.debugLogger, "  salt = " + salt);
-	    logger.debug(EELFLoggerDelegate.debugLogger, "  key = " + key);
-	    byte[] secretKey = runDigest(salt + "." + key);
-
-	    SecretKeySpec skeySpec = new SecretKeySpec(secretKey, method);
-
-	    Cipher cipher = Cipher.getInstance(method);	// "AES"
-	    cipher.init(Cipher.DECRYPT_MODE, skeySpec);
-
-	    byte[] decrypted = cipher.doFinal(bvalue);
-	    return new String(decrypted);
-	  }
-
-	  /**
-  	 * Encrypt a string using the given method, salt and key.
-  	 *
-  	 * @param method the method
-  	 * @param salt the salt
-  	 * @param key the key
-  	 * @param value the value
-  	 * @return the byte[]
-  	 * @throws Exception the exception
-  	 */
-	  public static byte[] encrypt(String method, String salt, String key, String value) throws Exception {
-	    logger.debug(EELFLoggerDelegate.debugLogger, "==> encrypt() method");
-	    byte[] bvalue = value.getBytes();
-	    byte[] secretKey = runDigest(salt + "." + key);
-
-	    SecretKeySpec skeySpec = new SecretKeySpec(secretKey, method);
-
-	    Cipher cipher = Cipher.getInstance(method);	// "AES"
-	    cipher.init(Cipher.ENCRYPT_MODE, skeySpec);
-
-	    byte[] encrypted = cipher.doFinal(bvalue);
-	    return encrypted;
-	  }
-
-	  /**
-  	 * Prepare a secret key by running a digest on it.
-  	 *
-  	 * @param text the text
-  	 * @return the byte[]
-  	 * @throws Exception the exception
-  	 */
-	  private static byte[] runDigest(String text) throws Exception {
-	    logger.debug(EELFLoggerDelegate.debugLogger, "==> runDigest() method");
-	    MessageDigest md = MessageDigest.getInstance("MD5");
-	    md.reset();
-	    md.update(text.getBytes(), 0, text.length());
-	    return md.digest();
-	  }
-
-	  /**
-  	 * Encrypt a string using the given method, salt and key, and return it as a hex-formated triple.
-  	 *
-  	 * @param method the method
-  	 * @param salt the salt
-  	 * @param key the key
-  	 * @param value the value
-  	 * @return the string
-  	 * @throws Exception the exception
-  	 */
-	  public static String encryptToTriple(String method, String salt, String key, String value) throws Exception {
-	    logger.debug(EELFLoggerDelegate.debugLogger, "==> Enter encryptToTriple()");
-	    logger.debug(EELFLoggerDelegate.debugLogger, "method = " + method);
-	    logger.debug(EELFLoggerDelegate.debugLogger, "salt = " + salt);
-	    logger.debug(EELFLoggerDelegate.debugLogger, "key = " + key);
-	    logger.debug(EELFLoggerDelegate.debugLogger, "valye = " + value);
-	   
-	    /* 
-	    StringBuffer sb = new StringBuffer(method);
-	      sb.append(":").append(Convert.toHexString(salt))
-	      .append(":").append(Convert.toHexString(encrypt(method, salt, key, value)));
-	    logger.debug("s = " + sb.toString());
-	    */
-
-	    StringBuffer sb2 = new StringBuffer("");
-	    sb2.append(EncryptConvertor.toHexString(encrypt(method, salt, key, value)));
-	    String s = sb2.toString();
-	    logger.debug(EELFLoggerDelegate.debugLogger, "s = " + s);
-	    return s;
-	  }
-
-	  /**
-  	 * Create a value that can be used as a salt.
-  	 *
-  	 * @return the string
-  	 */
-	  public static String generateSalt() {
-	    logger.debug(EELFLoggerDelegate.debugLogger, "==> generaltSalt");
-
-	    // G2 wants to hard code the value for salt.
-	    // set the value as 123456789
-	    // return Long.toString(System.currentTimeMillis() % 1000) + Pid.getPidStr();
-	    return Long.toString(123456789 % 10000);
-	  }
-
-	  /**
-  	 * Usage.
-  	 */
-  	public static void usage() {
-	    usage(null);
-	  }
-
-	  /**
-  	 * Usage.
-  	 *
-  	 * @param msg the msg
-  	 */
-  	public static void usage(String msg) {
-	    if (msg != null) System.out.println(msg);
-	    System.out.println("Usage: java EncryptedConfiguration -D triple -k key\n" +
-	      "java EncryptedConfiguration -d string -m method [-s salt | -S] -k key\n" +
-	      "java EncryptedConfiguration -e string -m method [-s salt | -S] -k key\n" +
-	      "-D\tdecrypt x:y:z triple\n" +
-		    "-d\tdecrypt string (in hex)\n" +
-		    "-e\tencrypt string\n" +
-		    "-S\tgenerate a salt\n"
-		    );
-	     System.exit(1);
-	  }
-
-
-
-	/**
-	 * The main method.
-	 *
-	 * @param args the arguments
-	 */
-	public static void main(String[] args) {
-
-		Options options = new Options();
-	    options.addOption("s", true, "salt");
-	    options.addOption("S", false, "Generate salt");
-	    options.addOption("k", true, "key");
-	    options.addOption("m", true, "method");
-	    options.addOption("e", true, "encryptString");
-	    options.addOption("d", true, "decryptString");
-	    options.addOption("D", true, "triple x:y:z");
-	    options.addOption("h", false, "show help");
-	    options.addOption("?", false, "show help");
-
-	    String salt = null, key = null, method = null, encStr = null, decStr = null, triple = null;
-	    boolean genSalt = false;
-
-	    CommandLineParser parser = new DefaultParser();
-	    CommandLine cmd = null;
-	    
-	    try {
-	    	cmd = parser.parse(options, args);
-	    	
-	        System.out.println("You picked " + cmd.toString() + "\n");
-	        if (cmd.hasOption("s")) {
-	        	salt = cmd.getOptionValue("s");
-	        }
-	        if (cmd.hasOption("S")) {
-	        	genSalt = true;
-	        	System.out.println("here in S");	        
-	        }
-	        if (cmd.hasOption("k")) {
-	        	key = cmd.getOptionValue("k");
-	        }
-	        if (cmd.hasOption("m")) {
-	        	method = cmd.getOptionValue("m");
-	        }
-	        if (cmd.hasOption("e")) {
-	        	encStr = cmd.getOptionValue("e");
-	        }
-	        if (cmd.hasOption("d")) {
-	        	decStr = cmd.getOptionValue("d");
-	        }
-	        if (cmd.hasOption("D")) {
-	        	triple = cmd.getOptionValue("D");
-	        }
-	        if (cmd.hasOption("?") || cmd.hasOption("h")) {
-	        	usage();
-	        	System.exit(0);
-	        }
-
-	    if (triple == null) {
-	      if ((salt == null) && !genSalt) usage("one of -s or -S must be specified");
-	      if ((salt != null) && genSalt) usage("only one of -s or -S must be specified");
-	      if (key == null) usage("-k must be specified");
-	      if (method == null) usage("-m must be specified");
-	      if ((encStr == null) && (decStr == null)) usage("one of -d or -e must be specified");
-	      if ((encStr != null) && (decStr != null)) usage("only one of -d or -e may be specified");
-	      if (genSalt) {
-	        salt = generateSalt();
-	        System.out.println("salt = " + salt);
-	      }
-
-	      if (encStr != null)
-	        System.out.println(encryptToTriple(method, salt, key, encStr));
-	      if (decStr != null)
-	        System.out.println(decrypt(method, salt, key, EncryptConvertor.bytesFromHex(decStr)));
-	    } else {
-	      if (key == null) {
-	    	  usage("-k not specified");
-	    	  System.exit(0);
-	      }
-		  System.out.println(decrypt(triple, key, method, salt));
-	    }
-	    
-	    } catch (ParseException e) {
-		    System.out.println("Failed to parse command line properties e="+e.toString());
-	    } catch (Exception e) {
-		    System.out.println("Failed to run EncryptedConfiguration main() e="+e.toString());
-	    }
-
-		// http://forums.sun.com/thread.jspa?threadID=5290983
-		// try {
-		//     String message = "Strong Versus Unlimited Strength Cryptography";
-		//     SecretKeySpec skeySpec = new SecretKeySpec("0123456789ABCDEF".getBytes(), "AES"); //AES-128
-
-		//     Cipher cipher = Cipher.getInstance("AES");	// "AES/ECB/NoPadding"
-		//     cipher.init(Cipher.ENCRYPT_MODE, skeySpec);
-
-		//     byte[] encrypted = cipher.doFinal(message.getBytes());
-		//     System.out.println("encrypted string: " + encrypted); //storing into MySQL DB
-		//     System.out.println("in hex: '" + Convert.toHexString(encrypted) + "'");
-
-		//     cipher.init(Cipher.DECRYPT_MODE, skeySpec);
-		//     byte[] original = cipher.doFinal(encrypted);
-		//     String originalString = new String(original);
-		//     System.out.println("Original string: " + originalString);
-		// } catch (Exception e) {
-		//     System.err.println("Exception caught: " + e.toString());
-		// }
-    	System.exit(0);
-
-	}
-
-}
diff --git a/vid/src/main/java/org/openecomp/vid/encryption/EncryptedPropValue.java b/vid/src/main/java/org/openecomp/vid/encryption/EncryptedPropValue.java
deleted file mode 100644
index 651df697c..000000000
--- a/vid/src/main/java/org/openecomp/vid/encryption/EncryptedPropValue.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.encryption;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-
-/**
- * The Class EncryptedPropValue.
- */
-public class EncryptedPropValue {
-
-	/** The encrypted configuration. */
-	private EncryptedConfiguration encryptedConfiguration;
-	
-	/** The encryption key. */
-	private String encryptionKey;
-	
-	/** The encryption method. */
-	private String encryptionMethod;
-
-	/** The logger. */
-	static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(EncryptedPropValue.class);
-	
-	/**
-	 * Instantiates a new encrypted prop value.
-	 */
-	public EncryptedPropValue() {
-		    // encryptionKey = "57ajqe{kJjjarj}G#(3)ea7";
-		    encryptionKey = "aa1adm1n";
-		    encryptionMethod = "AES";
-		    encryptedConfiguration = new EncryptedConfiguration(encryptionKey, encryptionMethod);
-		  }
-
-	/**
-	 * Gets the encrypted string.
-	 *
-	 * @param f the f
-	 * @param name the name
-	 * @param deflt the deflt
-	 * @return the encrypted string
-	 * @throws Exception the exception
-	 */
-	public String getEncryptedString(String f, String name, String deflt) throws Exception {
-		return encryptedConfiguration.getString(f, name, deflt);
-	}
-
-	/**
-	 * Generate encrypted property.
-	 *
-	 * @param name the name
-	 * @param value the value
-	 */
-	public static void generateEncryptedProperty(String name, String value) {
-		logger.debug(EELFLoggerDelegate.debugLogger, "==> generateEncryptedProperty");
-		EncryptedPropValue aaiPropValue = new EncryptedPropValue();
-	    try {
-	      System.out.println(name + ".x=" +
-	        EncryptedConfiguration.encryptToTriple(
-	        		aaiPropValue.encryptionMethod,
-	        		EncryptedConfiguration.generateSalt(),
-	        		aaiPropValue.encryptionKey, value));
-	    } catch (Exception e) {
-	      System.err.println("Cannot encrypt '" + value + "' for property '" + name + "': "+ e.toString());
-	    }
-	}
-
-	/**
-	 * Extract property.
-	 *
-	 * @param f the f
-	 * @param name the name
-	 */
-	public static void extractProperty(String f, String name) {
-		EncryptedPropValue aaiPropValue = new EncryptedPropValue();
-		String val = "";
-		logger.debug(EELFLoggerDelegate.debugLogger, "==> extractProperty");
-		try {
-			val = aaiPropValue.getEncryptedString(f, name, "");
-			System.out.println(val);
-		} catch (Exception e) {
-			System.err.println("Cannot extract '" + name + "' from '" + f + "': " + e.toString());
-		}
-	}
-
-	/**
-	 * Usage.
-	 */
-	public static void usage() {
-		usage(null);
-	}
-
-
-	/**
-	 * Decrypt triple.
-	 *
-	 * @param triple the triple
-	 * @return the string
-	 */
-	public static String decryptTriple(String triple) {
-		EncryptedPropValue aaiPropValue = new EncryptedPropValue();
-		logger.debug(EELFLoggerDelegate.debugLogger, "==> descrptTriple");
-
-		String out = "";
-		try {
-			//System.out.println(dragonPropValue.encryptedConfiguration.decrypt(triple, dragonPropValue.encryptionKey));
-			logger.debug(EELFLoggerDelegate.debugLogger, "calling dragonPropValue.encryptedConfiguration.decrypt()");
-			out = EncryptedConfiguration.decrypt(triple,
-					aaiPropValue.encryptionKey,
-					aaiPropValue.encryptionMethod,
-					EncryptedConfiguration.generateSalt());
-		      //System.out.println("out = " + out);
-		} catch (Exception e) {
-			System.err.println("Cannot decrypt '" + triple + "': " + e.toString());
-		}
-		    
-		return out;
-	}
-
-	/**
-	 * Encrypt input.
-	 */
-	public static void encryptInput() {
-		String s;
-
-		Pattern p = Pattern.compile("^ENCRYPTME[.]([A-Z]*)[.]([^= \t]*)[ \t]*=[ \t]*([^ \t]*)[ \t]*$");
-
-		EncryptedPropValue aaiPropValue = null;
-
-		BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
-		    
-		try {
-			while ((s = in.readLine()) != null) {
-		        Matcher m = p.matcher(s);
-		        if (m.matches()) {
-		          if (aaiPropValue == null)
-		        	  aaiPropValue = new EncryptedPropValue();
-		          String method = m.group(1);
-		          String name = m.group(2);
-		          String value = m.group(3);
-		          try {
-		            System.out.println(name + ".x=" +
-		            EncryptedConfiguration.encryptToTriple(method,
-		              EncryptedConfiguration.generateSalt(),
-		              aaiPropValue.encryptionKey, value));
-		          } catch (Exception e) {
-		            System.err.println("Error: Cannot encrypt '" + value + "', method '" + method + "' for property '" + name + "': " + e.toString());
-		          } // end of try
-		        } else {
-		          System.out.println(s);
-		        }
-		      } // end of while
-		    } catch (IOException e) {
-		      System.err.println("Error: Cannot read from stdin: " + e.toString());
-		    }
-
-		  } 
-
-		  /**
-  		 * Usage.
-  		 *
-  		 * @param msg the msg
-  		 */
-  		public static void usage(String msg) {
-		    if (msg != null) System.err.println(msg);
-		    System.err.println("Usage: java EncryptedPropValue -n property -f property-file");
-		    System.err.println("\tExtract the named value from the given property-file (or full pathname)");
-		    System.err.println("Usage: java EncryptedPropValue -n property -v value");
-		    System.err.println("\tEncrypt the given property with the given name and value");
-		    System.err.println("Usage: java EncryptedPropValue -E");
-		    System.err.println("\tEncrypt all lines that look like ENCRYPTME.METHOD.name=value");
-		    System.err.println("Usage: java EncryptedPropValue -u value");
-		    System.err.println("\tDecrypt the given value, expressed as a single HEXVAL");
-		    System.exit(1);
-		  }
-
-	/**
-	 * The main method.
-	 *
-	 * @param args the arguments
-	 */
-	public static void main(String[] args) {
-		Options options = new Options();
-	    options.addOption("n", true, "name");
-	    options.addOption("f", true, "property-file");
-	    options.addOption("v", true, "value");
-	    options.addOption("E", false, "Encrypt all lines that look like ENCRYPTME.METHOD.name=value");
-	    options.addOption("u", true, "Decrypt the given value, expressed as a single HEXVAL");
-	    options.addOption("h", false, "show help");
-	    options.addOption("?", false, "show help");
-	    
-	    String propfile = null, name = null, value = null, unencrypt = null;
-	    boolean encryptStdin = false;
-
-	    CommandLineParser parser = new DefaultParser();
-	    CommandLine cmd = null;
-	    
-	    try {
-	    	cmd = parser.parse(options, args);
-	    	
-	        System.out.println("You picked " + cmd.toString() + "\n");
-	        if (cmd.hasOption("n")) {
-	        	name = cmd.getOptionValue("n");
-	        }
-	        if (cmd.hasOption("f")) {
-	        	propfile = cmd.getOptionValue("f");
-	        }
-	        if (cmd.hasOption("u")) {
-	        	unencrypt = cmd.getOptionValue("u");
-	        }
-	        if (cmd.hasOption("E")) {
-	        	encryptStdin = true;
-	        }
-	        if (cmd.hasOption("v")) {
-	        	value = cmd.getOptionValue("v");
-	        }
-	        if (cmd.hasOption("?") || cmd.hasOption("h")) {
-	        	usage();
-	        	System.exit(0);
-	        }
-
-		    if (encryptStdin) {
-		      if (name != null || propfile != null || value != null) {
-		        usage("cannot use -E with other options");
-		      }
-		      encryptInput();
-		    } else if (unencrypt == null) {
-		        if (name == null) usage("-n is required");
-		        if (propfile == null) {
-		          if (value == null) usage("-v required"); 
-		          if (value != null) {
-		             generateEncryptedProperty(name, value);
-		          }
-		        } else {
-		          extractProperty(propfile, name);
-		        } 
-		    } else {
-		      String out = decryptTriple(unencrypt);
-		      System.out.println(out);
-		    }
-	    } catch (ParseException e) {
-		    System.out.println("Failed to parse command line properties e="+e.toString());
-	    } catch (Exception e) {
-		    System.out.println("Failed to run EncryptedConfiguration main() e="+e.toString());
-	    }
-	    
-    	System.exit(0);
-    	
-	}
-
-}
diff --git a/vid/src/main/java/org/openecomp/vid/exceptions/VidServiceUnavailableException.java b/vid/src/main/java/org/openecomp/vid/exceptions/VidServiceUnavailableException.java
deleted file mode 100644
index e2fdd6b2d..000000000
--- a/vid/src/main/java/org/openecomp/vid/exceptions/VidServiceUnavailableException.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.exceptions;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-/**
- * The Class VidServiceUnavailableException.
- */
-@ResponseStatus(value=HttpStatus.SERVICE_UNAVAILABLE)
-public class VidServiceUnavailableException extends Exception {
-
-	/** The Constant serialVersionUID. */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * Instantiates a new vid service unavailable exception.
-	 */
-	public VidServiceUnavailableException() {
-		super();
-	}
-	
-	/**
-	 * Instantiates a new vid service unavailable exception.
-	 *
-	 * @param msg the msg
-	 */
-	public VidServiceUnavailableException(String msg) {
-		super(msg);
-	}
-	
-	/**
-	 * Instantiates a new vid service unavailable exception.
-	 *
-	 * @param t the t
-	 */
-	public VidServiceUnavailableException(Throwable t) {
-		super(t);
-	}
-	
-	/**
-	 * Instantiates a new vid service unavailable exception.
-	 *
-	 * @param msg the msg
-	 * @param t the t
-	 */
-	public VidServiceUnavailableException(String msg, Throwable t) {
-		super(msg, t);
-	}
-}
diff --git a/vid/src/main/java/org/openecomp/vid/model/ExceptionResponse.java b/vid/src/main/java/org/openecomp/vid/model/ExceptionResponse.java
deleted file mode 100644
index 6af79927e..000000000
--- a/vid/src/main/java/org/openecomp/vid/model/ExceptionResponse.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.model;
-
-/**
- * The Class ExceptionResponse.
- */
-public class ExceptionResponse {
-
-	/** The exception. */
-	private String exception;
-	
-	/** The message. */
-	private String message;
-
-	/**
-	 * Gets the exception.
-	 *
-	 * @return the exception
-	 */
-	public String getException() {
-		return exception;
-	}
-
-	/**
-	 * Sets the exception.
-	 *
-	 * @param exception the new exception
-	 */
-	public void setException(String exception) {
-		this.exception = exception;
-	}
-
-	/**
-	 * Gets the message.
-	 *
-	 * @return the message
-	 */
-	public String getMessage() {
-		return message;
-	}
-
-	/**
-	 * Sets the message.
-	 *
-	 * @param message the new message
-	 */
-	public void setMessage(String message) {
-		this.message = message;
-	}
-
-}
diff --git a/vid/src/main/java/org/openecomp/vid/model/Network.java b/vid/src/main/java/org/openecomp/vid/model/Network.java
deleted file mode 100644
index 792060149..000000000
--- a/vid/src/main/java/org/openecomp/vid/model/Network.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.model;
-
-import org.openecomp.vid.asdc.beans.tosca.NodeTemplate;
-
-/**
- * The Class Network.
- */
-public class Network {
-
-	/** The uuid. */
-	private String uuid;
-	
-	/** The invariant uuid. */
-	private String invariantUuid;
-	
-	/** The description. */
-	private String description;
-	
-	/** The name. */
-	private String name;
-	
-	/** The version. */
-	private String version;
-	
-	/**
-	 * Instantiates a new network.
-	 */
-	public Network() {}
-
-	/**
-	 * Gets the uuid.
-	 *
-	 * @return the uuid
-	 */
-	public String getUuid() {
-		return uuid;
-	}
-
-	/**
-	 * Gets the invariant uuid.
-	 *
-	 * @return the invariant uuid
-	 */
-	public String getInvariantUuid() {
-		return invariantUuid;
-	}
-
-	/**
-	 * Gets the description.
-	 *
-	 * @return the description
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * Gets the name.
-	 *
-	 * @return the name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Gets the version.
-	 *
-	 * @return the version
-	 */
-	public String getVersion() {
-		return version;
-	}
-
-	/**
-	 * Sets the uuid.
-	 *
-	 * @param uuid the new uuid
-	 */
-	public void setUuid(String uuid) {
-		this.uuid = uuid;
-	}
-
-	/**
-	 * Sets the invariant uuid.
-	 *
-	 * @param invariantUuid the new invariant uuid
-	 */
-	public void setInvariantUuid(String invariantUuid) {
-		this.invariantUuid = invariantUuid;
-	}
-
-	/**
-	 * Sets the description.
-	 *
-	 * @param description the new description
-	 */
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	/**
-	 * Sets the name.
-	 *
-	 * @param name the new name
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * Sets the version.
-	 *
-	 * @param version the new version
-	 */
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	/**
-	 * Extract network.
-	 *
-	 * @param nodeTemplate the node template
-	 * @return the network
-	 */
-	public static Network extractNetwork(NodeTemplate nodeTemplate) {
-		final Network network = new Network();
-		
-		network.setUuid(nodeTemplate.getMetadata().getUUID());
-		network.setInvariantUuid(nodeTemplate.getMetadata().getInvariantUUID());
-		network.setDescription(nodeTemplate.getMetadata().getDescription());
-		network.setName(nodeTemplate.getMetadata().getName());
-		network.setVersion(nodeTemplate.getMetadata().getVersion());
-		
-		return network;
-	}
-}
diff --git a/vid/src/main/java/org/openecomp/vid/model/Resource.java b/vid/src/main/java/org/openecomp/vid/model/Resource.java
deleted file mode 100644
index d2ef634e1..000000000
--- a/vid/src/main/java/org/openecomp/vid/model/Resource.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.model;
-
-/**
- * The Class Resource.
- */
-public class Resource {
-
-}
diff --git a/vid/src/main/java/org/openecomp/vid/model/Result.java b/vid/src/main/java/org/openecomp/vid/model/Result.java
deleted file mode 100644
index b676dbbba..000000000
--- a/vid/src/main/java/org/openecomp/vid/model/Result.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.model;
-
-/**
- * The Class Result.
- */
-public class Result {
-	
-	/** The result. */
-	private String result;
-	
-	/**
-	 * Instantiates a new result.
-	 *
-	 * @param result the result
-	 */
-	public Result(String result) {
-		this.result = result;
-	}
-
-	/**
-	 * Gets the result.
-	 *
-	 * @return the result
-	 */
-	public String getResult() {
-		return result;
-	}
-
-	/**
-	 * Sets the result.
-	 *
-	 * @param result the new result
-	 */
-	public void setResult(String result) {
-		this.result = result;
-	}
-	
-}
diff --git a/vid/src/main/java/org/openecomp/vid/model/Service.java b/vid/src/main/java/org/openecomp/vid/model/Service.java
deleted file mode 100644
index f698cda53..000000000
--- a/vid/src/main/java/org/openecomp/vid/model/Service.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.model;
-
-import java.util.Map;
-import java.util.UUID;
-
-import org.openecomp.vid.asdc.beans.tosca.Input;
-
-/**
- * The Class Service.
- */
-public class Service {
-
-	/** The uuid. */
-	private String uuid;
-	
-	/** The invariant uuid. */
-	private String invariantUuid;
-	
-	/** The name. */
-	private String name;
-	
-	/** The version. */
-	private String version;
-	
-	/** The tosca model URL. */
-	private String toscaModelURL;
-	
-	/** The category. */
-	private String category;
-	
-	/** The description. */
-	private String description;
-	
-	/** The inputs. */
-	private Map inputs;
-	
-	/**
-	 * Gets the uuid.
-	 *
-	 * @return the uuid
-	 */
-	public String getUuid() {
-		return uuid;
-	}
-	
-	/**
-	 * Gets the invariant uuid.
-	 *
-	 * @return the invariant uuid
-	 */
-	public String getInvariantUuid() {
-		return invariantUuid;
-	}
-	
-	/**
-	 * Gets the name.
-	 *
-	 * @return the name
-	 */
-	public String getName() {
-		return name;
-	}
-	
-	/**
-	 * Gets the version.
-	 *
-	 * @return the version
-	 */
-	public String getVersion() {
-		return version;
-	}
-	
-	/**
-	 * Gets the tosca model URL.
-	 *
-	 * @return the tosca model URL
-	 */
-	public String getToscaModelURL() {
-		return toscaModelURL;
-	}
-	
-	/**
-	 * Gets the category.
-	 *
-	 * @return the category
-	 */
-	public String getCategory() {
-		return category;
-	}
-	
-	/**
-	 * Gets the description.
-	 *
-	 * @return the description
-	 */
-	public String getDescription() {
-		return description;
-	}
-	
-	/**
-	 * Gets the inputs.
-	 *
-	 * @return the inputs
-	 */
-	public Map getInputs() {
-		return inputs;
-	}
-	
-	/**
-	 * Sets the uuid.
-	 *
-	 * @param uuid the new uuid
-	 */
-	public void setUuid(String uuid) {
-		this.uuid = uuid;
-	}
-	
-	/**
-	 * Sets the invariant uuid.
-	 *
-	 * @param invariantUuid the new invariant uuid
-	 */
-	public void setInvariantUuid(String invariantUuid) {
-		this.invariantUuid = invariantUuid;
-	}
-	
-	/**
-	 * Sets the name.
-	 *
-	 * @param name the new name
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-	
-	/**
-	 * Sets the version.
-	 *
-	 * @param version the new version
-	 */
-	public void setVersion(String version) {
-		this.version = version;
-	}
-	
-	/**
-	 * Sets the tosca model URL.
-	 *
-	 * @param toscaModelURL the new tosca model URL
-	 */
-	public void setToscaModelURL(String toscaModelURL) {
-		this.toscaModelURL = toscaModelURL;
-	}
-	
-	/**
-	 * Sets the category.
-	 *
-	 * @param category the new category
-	 */
-	public void setCategory(String category) {
-		this.category = category;
-	}
-	
-	/**
-	 * Sets the description.
-	 *
-	 * @param description the new description
-	 */
-	public void setDescription(String description) {
-		this.description = description;
-	}
-	
-	/**
-	 * Sets the inputs.
-	 *
-	 * @param inputs the inputs
-	 */
-	public void setInputs(Map inputs) {
-		this.inputs = inputs;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-		final UUID uuid = UUID.fromString(getUuid());
-		
-		return uuid.hashCode();
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object o) {
-		if (o == this) return true;
-		if (!(o instanceof Service)) return false;
-		
-		final Service service = (Service) o;
-		
-		return (service.getUuid().equals(getUuid()));
-	}
-}
diff --git a/vid/src/main/java/org/openecomp/vid/model/ServiceModel.java b/vid/src/main/java/org/openecomp/vid/model/ServiceModel.java
deleted file mode 100644
index 87c087780..000000000
--- a/vid/src/main/java/org/openecomp/vid/model/ServiceModel.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.model;
-
-import java.util.Map;
-import java.util.UUID;
-
-import org.openecomp.vid.asdc.beans.tosca.ToscaModel;
-
-/**
- * The Class ServiceModel.
- */
-public class ServiceModel {
-
-	/** The service. */
-	private Service service;
-	
-	/** The vnfs. */
-	private Map vnfs;
-	
-	/** The networks. */
-	private Map networks;
-
-	/**
-	 * Instantiates a new service model.
-	 */
-	public ServiceModel() {}
-	
-	/**
-	 * Gets the service.
-	 *
-	 * @return the service
-	 */
-	public Service getService() {
-		return service;
-	}
-
-	/**
-	 * Gets the vnfs.
-	 *
-	 * @return the vnfs
-	 */
-	public Map getVnfs() {
-		return vnfs;
-	}
-
-	/**
-	 * Gets the networks.
-	 *
-	 * @return the networks
-	 */
-	public Map getNetworks() {
-		return networks;
-	}
-
-	/**
-	 * Sets the service.
-	 *
-	 * @param service the new service
-	 */
-	public void setService(Service service) {
-		this.service = service;
-	}
-
-	/**
-	 * Sets the vnfs.
-	 *
-	 * @param vnfs the vnfs
-	 */
-	public void setVnfs(Map vnfs) {
-		this.vnfs = vnfs;
-	}
-
-	/**
-	 * Sets the networks.
-	 *
-	 * @param networks the networks
-	 */
-	public void setNetworks(Map networks) {
-		this.networks = networks;
-	}
-
-	/**
-	 * Extract service.
-	 *
-	 * @param serviceToscaModel the service tosca model
-	 * @param asdcServiceMetadata the asdc service metadata
-	 * @return the service
-	 */
-	public static Service extractService(ToscaModel serviceToscaModel, org.openecomp.vid.asdc.beans.Service asdcServiceMetadata) {
-		
-		final Service service = new Service();
-		
-		service.setCategory(serviceToscaModel.getMetadata().getCategory());
-		service.setInvariantUuid(serviceToscaModel.getMetadata().getInvariantUUID());
-		service.setName(serviceToscaModel.getMetadata().getName());
-		service.setUuid(serviceToscaModel.getMetadata().getUUID());
-		service.setDescription(serviceToscaModel.getMetadata().getDescription());
-		service.setInputs(serviceToscaModel.gettopology_template().getInputs());
-		
-		//FIXME: ASDC is not sending the Version with the Tosca Model for 1610 - they should send it in 1702
-		//THIS IS A TEMPORARY FIX, AT SOME POINT UNCOMMENT ME
-		//service.setVersion(serviceToscaModel.getMetadata().getVersion());
-		service.setVersion(asdcServiceMetadata.getVersion());
-
-		return service;
-	}
-}
diff --git a/vid/src/main/java/org/openecomp/vid/model/VNF.java b/vid/src/main/java/org/openecomp/vid/model/VNF.java
deleted file mode 100644
index fc0aef150..000000000
--- a/vid/src/main/java/org/openecomp/vid/model/VNF.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.model;
-
-import java.util.Map;
-import java.util.UUID;
-
-import org.openecomp.vid.asdc.beans.tosca.Input;
-import org.openecomp.vid.asdc.beans.tosca.NodeTemplate;
-
-/**
- * The Class VNF.
- */
-public class VNF {
-
-	/** The uuid. */
-	private String uuid;
-	
-	/** The invariant uuid. */
-	private String invariantUuid;
-	
-	/** The description. */
-	private String description;
-	
-	/** The name. */
-	private String name;
-	
-	/** The version. */
-	private String version;
-	
-	/** The model customization name. */
-	private String modelCustomizationName;
-	
-	/** The inputs. */
-	private Map inputs;
-	
-	/** The vf modules. */
-	private Map vfModules;
-	
-	/** The volume groups. */
-	private Map volumeGroups;
-	
-	/**
-	 * Instantiates a new vnf.
-	 */
-	public VNF() {}
-	
-	/**
-	 * Gets the uuid.
-	 *
-	 * @return the uuid
-	 */
-	public String getUuid() {
-		return uuid;
-	}
-
-	/**
-	 * Gets the invariant uuid.
-	 *
-	 * @return the invariant uuid
-	 */
-	public String getInvariantUuid() {
-		return invariantUuid;
-	}
-
-	/**
-	 * Gets the description.
-	 *
-	 * @return the description
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * Gets the name.
-	 *
-	 * @return the name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Gets the version.
-	 *
-	 * @return the version
-	 */
-	public String getVersion() {
-		return version;
-	}
-	
-	/**
-	 * Gets the model customization name.
-	 *
-	 * @return the model customization name
-	 */
-	public String getModelCustomizationName() {
-		return modelCustomizationName;
-	}
-
-	/**
-	 * Gets the inputs.
-	 *
-	 * @return the inputs
-	 */
-	public Map getInputs() {
-		return inputs;
-	}
-
-	/**
-	 * Sets the uuid.
-	 *
-	 * @param uuid the new uuid
-	 */
-	public void setUuid(String uuid) {
-		this.uuid = uuid;
-	}
-
-	/**
-	 * Sets the invariant uuid.
-	 *
-	 * @param invariantUuid the new invariant uuid
-	 */
-	public void setInvariantUuid(String invariantUuid) {
-		this.invariantUuid = invariantUuid;
-	}
-
-	/**
-	 * Sets the description.
-	 *
-	 * @param description the new description
-	 */
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	/**
-	 * Sets the name.
-	 *
-	 * @param name the new name
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * Sets the version.
-	 *
-	 * @param version the new version
-	 */
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	/**
-	 * Gets the vf modules.
-	 *
-	 * @return the vf modules
-	 */
-	public Map getVfModules() {
-		return vfModules;
-	}
-
-	/**
-	 * Sets the vf modules.
-	 *
-	 * @param vfModules the vf modules
-	 */
-	public void setVfModules(Map vfModules) {
-		this.vfModules = vfModules;
-	}
-
-	/**
-	 * Gets the volume groups.
-	 *
-	 * @return the volume groups
-	 */
-	public Map getVolumeGroups() {
-		return volumeGroups;
-	}
-
-	/**
-	 * Sets the volume groups.
-	 *
-	 * @param volumeGroups the volume groups
-	 */
-	public void setVolumeGroups(Map volumeGroups) {
-		this.volumeGroups = volumeGroups;
-	}
-
-	/**
-	 * Sets the inputs.
-	 *
-	 * @param inputs the inputs
-	 */
-	public void setInputs(Map inputs) {
-		this.inputs = inputs;
-	}
-
-	/**
-	 * Extract vnf.
-	 *
-	 * @param modelCustomizationName the model customization name
-	 * @param nodeTemplate the node template
-	 * @return the vnf
-	 */
-	public static VNF extractVnf(String modelCustomizationName, NodeTemplate nodeTemplate) {
-		
-		final VNF vnf = new VNF();
-		
-		vnf.setUuid(nodeTemplate.getMetadata().getUUID());
-		vnf.setInvariantUuid(nodeTemplate.getMetadata().getInvariantUUID());
-		vnf.setDescription(nodeTemplate.getMetadata().getDescription());
-		vnf.setName(nodeTemplate.getMetadata().getName());
-		vnf.setModelCustomizationName(modelCustomizationName);
-		vnf.setVersion(nodeTemplate.getMetadata().getVersion());
-		
-		return vnf;
-	}
-
-	/**
-	 * Sets the model customization name.
-	 *
-	 * @param modelCustomizationName the new model customization name
-	 */
-	private void setModelCustomizationName(String modelCustomizationName) {
-		this.modelCustomizationName = modelCustomizationName;
-	}
-}
diff --git a/vid/src/main/java/org/openecomp/vid/model/VfModule.java b/vid/src/main/java/org/openecomp/vid/model/VfModule.java
deleted file mode 100644
index 33008d5af..000000000
--- a/vid/src/main/java/org/openecomp/vid/model/VfModule.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.model;
-
-import org.openecomp.vid.asdc.beans.tosca.Group;
-
-/**
- * The Class VfModule.
- */
-public class VfModule {
-
-	/** The uuid. */
-	private String uuid;
-	
-	/** The invariant uuid. */
-	private String invariantUuid;
-	
-	/** The description. */
-	private String description;
-	
-	/** The name. */
-	private String name;
-	
-	/** The version. */
-	private String version;
-	
-	/** The volume group allowed. */
-	private boolean volumeGroupAllowed;
-	
-	/**
-	 * Instantiates a new vf module.
-	 */
-	public VfModule() {}
-	
-	/**
-	 * Gets the uuid.
-	 *
-	 * @return the uuid
-	 */
-	public String getUuid() {
-		return uuid;
-	}
-
-	/**
-	 * Gets the invariant uuid.
-	 *
-	 * @return the invariant uuid
-	 */
-	public String getInvariantUuid() {
-		return invariantUuid;
-	}
-
-	/**
-	 * Gets the description.
-	 *
-	 * @return the description
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * Gets the name.
-	 *
-	 * @return the name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Gets the version.
-	 *
-	 * @return the version
-	 */
-	public String getVersion() {
-		return version;
-	}
-
-	/**
-	 * Checks if is volume group allowed.
-	 *
-	 * @return true, if is volume group allowed
-	 */
-	public boolean isVolumeGroupAllowed() {
-		return volumeGroupAllowed;
-	}
-	
-	/**
-	 * Sets the uuid.
-	 *
-	 * @param uuid the new uuid
-	 */
-	public void setUuid(String uuid) {
-		this.uuid = uuid;
-	}
-
-	/**
-	 * Sets the invariant uuid.
-	 *
-	 * @param invariantUuid the new invariant uuid
-	 */
-	public void setInvariantUuid(String invariantUuid) {
-		this.invariantUuid = invariantUuid;
-	}
-
-	/**
-	 * Sets the description.
-	 *
-	 * @param description the new description
-	 */
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	/**
-	 * Sets the name.
-	 *
-	 * @param name the new name
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * Sets the version.
-	 *
-	 * @param version the new version
-	 */
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	/**
-	 * Sets the volume group allowed.
-	 *
-	 * @param volumeGroupAllowed the new volume group allowed
-	 */
-	private void setVolumeGroupAllowed(boolean volumeGroupAllowed) {
-		this.volumeGroupAllowed = volumeGroupAllowed;
-	}
-	
-	/**
-	 * Extract vf module.
-	 *
-	 * @param group the group
-	 * @return the vf module
-	 */
-	public static VfModule extractVfModule(Group group) {
-
-		final VfModule vfModule = new VfModule();
-		
-		vfModule.setUuid(group.getMetadata().getVfModuleModelUUID());
-		vfModule.setInvariantUuid(group.getMetadata().getVfModuleModelInvariantUUID());
-		vfModule.setDescription(group.getMetadata().getDescription());
-		vfModule.setName(group.getMetadata().getVfModuleModelName());
-		vfModule.setVersion(group.getMetadata().getVfModuleModelVersion());
-		
-		if (group.getProperties().containsKey("volume_group")) {
-			vfModule.setVolumeGroupAllowed(Boolean.valueOf(group.getProperties().get("volume_group")));
-		} else {
-			vfModule.setVolumeGroupAllowed(false);
-		}
-		
-		return vfModule;
-	}
-}
diff --git a/vid/src/main/java/org/openecomp/vid/model/VolumeGroup.java b/vid/src/main/java/org/openecomp/vid/model/VolumeGroup.java
deleted file mode 100644
index 7e8ea35b2..000000000
--- a/vid/src/main/java/org/openecomp/vid/model/VolumeGroup.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.model;
-
-import org.openecomp.vid.asdc.beans.tosca.Group;
-
-/**
- * The Class VolumeGroup.
- */
-public class VolumeGroup {
-
-	/** The uuid. */
-	private String uuid;
-	
-	/** The invariant uuid. */
-	private String invariantUuid;
-	
-	/** The description. */
-	private String description;
-	
-	/** The name. */
-	private String name;
-	
-	/** The version. */
-	private String version;
-	
-	/**
-	 * Instantiates a new volume group.
-	 */
-	public VolumeGroup() {}
-
-	/**
-	 * Gets the uuid.
-	 *
-	 * @return the uuid
-	 */
-	public String getUuid() {
-		return uuid;
-	}
-
-	/**
-	 * Gets the invariant uuid.
-	 *
-	 * @return the invariant uuid
-	 */
-	public String getInvariantUuid() {
-		return invariantUuid;
-	}
-
-	/**
-	 * Gets the description.
-	 *
-	 * @return the description
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * Gets the name.
-	 *
-	 * @return the name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Gets the version.
-	 *
-	 * @return the version
-	 */
-	public String getVersion() {
-		return version;
-	}
-
-	/**
-	 * Sets the uuid.
-	 *
-	 * @param uuid the new uuid
-	 */
-	public void setUuid(String uuid) {
-		this.uuid = uuid;
-	}
-
-	/**
-	 * Sets the invariant uuid.
-	 *
-	 * @param invariantUuid the new invariant uuid
-	 */
-	public void setInvariantUuid(String invariantUuid) {
-		this.invariantUuid = invariantUuid;
-	}
-
-	/**
-	 * Sets the description.
-	 *
-	 * @param description the new description
-	 */
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	/**
-	 * Sets the name.
-	 *
-	 * @param name the new name
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * Sets the version.
-	 *
-	 * @param version the new version
-	 */
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	/**
-	 * Extract volume group.
-	 *
-	 * @param group the group
-	 * @return the volume group
-	 */
-	public static VolumeGroup extractVolumeGroup(Group group) {
-		final VolumeGroup volumeGroup = new VolumeGroup();
-		
-		volumeGroup.setUuid(group.getMetadata().getVfModuleModelUUID());
-		volumeGroup.setInvariantUuid(group.getMetadata().getVfModuleModelInvariantUUID());
-		volumeGroup.setDescription(group.getMetadata().getDescription());
-		volumeGroup.setName(group.getMetadata().getVfModuleModelName());
-		volumeGroup.setVersion(group.getMetadata().getVfModuleModelVersion());
-		
-		return volumeGroup;
-	}
-}
diff --git a/vid/src/main/java/org/openecomp/vid/mso/MsoProperties.java b/vid/src/main/java/org/openecomp/vid/mso/MsoProperties.java
deleted file mode 100644
index 92177e30b..000000000
--- a/vid/src/main/java/org/openecomp/vid/mso/MsoProperties.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.mso;
-
-import org.openecomp.portalsdk.core.util.SystemProperties;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-
-/**
- * The Class MsoProperties.
- */
-public class MsoProperties extends SystemProperties {
-
-	/** The Constant MSO_SERVER_URL. */
-	//VID Properties related to MSO
-	public static final String MSO_SERVER_URL = "mso.server.url";
-	
-	/** The Constant MSO_DME2_SERVER_URL. */
-	public static final String MSO_DME2_SERVER_URL = "mso.dme2.server.url";
-	
-	/** The Constant MSO_DME2_CLIENT_TIMEOUT. */
-	public static final String MSO_DME2_CLIENT_TIMEOUT = "mso.dme2.client.timeout";
-	
-	/** The Constant MSO_DME2_CLIENT_READ_TIMEOUT. */
-	public static final String MSO_DME2_CLIENT_READ_TIMEOUT = "mso.dme2.client.read.timeout";
-	
-	/** The Constant MSO_SERVER_URL_DEFAULT. */
-	public static final String MSO_SERVER_URL_DEFAULT= "";
-	
-	/** The Constant MSO_POLLING_INTERVAL_MSECS. */
-	// number of msecs to wait between polling requests
-	public static final String MSO_POLLING_INTERVAL_MSECS = "mso.polling.interval.msecs";
-	
-	/** The Constant MSO_POLLING_INTERVAL_MSECS_DEFAULT. */
-	public static final String MSO_POLLING_INTERVAL_MSECS_DEFAULT = "60000";
-	
-	/** The Constant MSO_DME2_ENABLED. */
-	public static final String MSO_DME2_ENABLED = "mso.dme2.enabled";
-	
-	/** The Constant MSO_MAX_POLLS. */
-	public static final String MSO_MAX_POLLS = "mso.max.polls";
-	
-	/** The Constant MSO_MAX_POLLS_DEFAULT. */
-	public static final String MSO_MAX_POLLS_DEFAULT = "10"; //10
-	
-	/** The Constant MSO_USER_NAME. */
-	public static final String MSO_USER_NAME = "mso.user.name"; //m03346
-	
-	/** The Constant MSO_PASSWORD. */
-	public static final String MSO_PASSWORD = "mso.password.x"; 
-	
-	/** The Constant MSO_REST_API_SVC_INSTANCE. */
-	public static final String MSO_REST_API_SVC_INSTANCE = "mso.restapi.svc.instance"; // /serviceInstances/v2 
-	
-	/** The Constant MSO_REST_API_VNF_INSTANCE. */
-	public static final String MSO_REST_API_VNF_INSTANCE = "mso.restapi.vnf.instance"; // /serviceInstances/v2/{service_instance_id}/vnfs
-	
-	/** The Constant MSO_REST_API_NETWORK_INSTANCE. */
-	public static final String MSO_REST_API_NETWORK_INSTANCE = "mso.restapi.network.instance"; // /serviceInstances/v2/{serviceInstanceId}/networks
-	
-	/** The Constant MSO_REST_API_GET_ORC_REQ. */
-	public static final String MSO_REST_API_GET_ORC_REQ = "mso.restapi.get.orc.req";
-	
-	/** The Constant MSO_REST_API_GET_ORC_REQS. */
-	public static final String MSO_REST_API_GET_ORC_REQS = "mso.restapi.get.orc.reqs";
-	
-	/** The Constant MSO_REST_API_VF_MODULE_INSTANCE. */
-	public static final String MSO_REST_API_VF_MODULE_INSTANCE = "mso.restapi.vf.module.instance";
-	
-	/** The Constant MSO_REST_API_VOLUME_GROUP_INSTANCE. */
-	public static final String MSO_REST_API_VOLUME_GROUP_INSTANCE = "mso.restapi.volume.group.instance"; //serviceInstances/v2/{serviceInstanceId}/volumeGroups
-	
-	/** The logger. */
-	public EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MsoProperties.class);
-	
-	/** The Constant dateFormat. */
-	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
-	
-}
diff --git a/vid/src/main/java/org/openecomp/vid/mso/MsoResponseWrapper.java b/vid/src/main/java/org/openecomp/vid/mso/MsoResponseWrapper.java
deleted file mode 100644
index b9fa8f082..000000000
--- a/vid/src/main/java/org/openecomp/vid/mso/MsoResponseWrapper.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.mso;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-/**
- * This wrapper encapsulates the MSO response in the format expected by the pages.
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-	    "status",
-	    "entity"
-})
-
-public class MsoResponseWrapper  {
-	
-	/** The status. */
-	@JsonProperty("status")
-	private int status;
-	
-	/** The entity. */
-	@JsonProperty("entity")
-	private String entity;
-	
-	/**
-	 * Gets the entity.
-	 *
-	 * @return the entity
-	 */
-	@JsonProperty("entity")
-    public String getEntity() {
-        return entity;
-    }
-
-	/**
-	 * Gets the status.
-	 *
-	 * @return the status
-	 */
-	@JsonProperty("status")
-    public int getStatus() {
-        return status;
-    }
-	
-	/**
-	 * Sets the status.
-	 *
-	 * @param v the new status
-	 */
-	@JsonProperty("status")
-    public void setStatus(int v) {
-        this.status = v;
-    }
-	
-	/**
-	 * Sets the entity.
-	 *
-	 * @param v the new entity
-	 */
-	@JsonProperty("entity")
-    public void setEntity(String v) {
-        this.entity = v;
-    }
-    
-    /* (non-Javadoc)
-     * @see java.lang.Object#toString()
-     */
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-    
-    /**
-     * Gets the response.
-     *
-     * @return the response
-     */
-    public String getResponse () {
-    	
-    	StringBuilder b = new StringBuilder ("{ \"status\": ");
-        b.append(getStatus()).append(", \"entity\": " ).append(this.getEntity()).append("}");
-        return (b.toString());
-    }
-    
-}
diff --git a/vid/src/main/java/org/openecomp/vid/mso/MsoRestInt.java b/vid/src/main/java/org/openecomp/vid/mso/MsoRestInt.java
deleted file mode 100644
index 67fe70003..000000000
--- a/vid/src/main/java/org/openecomp/vid/mso/MsoRestInt.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.mso;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-/**
- * The Class MsoRestInt.
- */
-public class MsoRestInt {
-	
-	/** The logger. */
-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MsoRestInterface.class);
-	
-	/** The Constant dateFormat. */
-	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
-	
-	/** The request date format. */
-	public DateFormat requestDateFormat = new SimpleDateFormat("EEE, dd MMM YYYY HH:mm:ss z");
-	
-	/**
-	 * Instantiates a new mso rest int.
-	 */
-	public MsoRestInt() {
-		requestDateFormat.setTimeZone(java.util.TimeZone.getTimeZone("GMT"));
-	}
-	
-	/**
-	 * Log request.
-	 *
-	 * @param r the r
-	 */
-	public void logRequest ( org.openecomp.vid.mso.rest.RequestDetails r ) {
-    	String methodName = "logRequest";
-	    ObjectMapper mapper = new ObjectMapper();
-	    String r_json_str = "";
-	    if ( r != null ) {
-	    	r_json_str = r.toString();
-		    try {
-		    	r_json_str = mapper.writeValueAsString(r);
-		    }
-		    catch ( com.fasterxml.jackson.core.JsonProcessingException j ) {
-		    	logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " +  methodName + " Unable to parse request as json");
-		    }
-	    }
-	    logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " +  methodName + " Request=(" + r_json_str + ")");  
-    }
-}
diff --git a/vid/src/main/java/org/openecomp/vid/mso/MsoRestInterface.java b/vid/src/main/java/org/openecomp/vid/mso/MsoRestInterface.java
deleted file mode 100644
index 064af1061..000000000
--- a/vid/src/main/java/org/openecomp/vid/mso/MsoRestInterface.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.mso;
-
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Collections;
-import java.util.Date;
-
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.Response;
-
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.openecomp.portalsdk.core.util.SystemProperties;
-
-import org.apache.commons.codec.binary.Base64;
-import org.openecomp.vid.client.HttpBasicClient;
-import org.openecomp.vid.client.HttpsBasicClient;
-import org.openecomp.vid.encryption.EncryptedPropValue;
-import org.openecomp.vid.mso.rest.RequestDetails;
-
-/**
- * The Class MsoRestInterface.
- */
-public class MsoRestInterface extends MsoRestInt implements MsoRestInterfaceIfc {
-
-	/** The logger. */
-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MsoRestInterface.class);
-	
-	/** The Constant dateFormat. */
-	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
-	
-	/** The client. */
-	private static Client client = null;
-	
-	/** The common headers. */
-	private MultivaluedHashMap commonHeaders;
-	
-	/**
-	 * Instantiates a new mso rest interface.
-	 */
-	public MsoRestInterface() {
-		super();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.openecomp.vid.mso.MsoRestInterfaceIfc#initRestClient()
-	 */
-	public void initRestClient()
-	{
-		final String methodname = "initRestClient()";
-		
-		final String username = SystemProperties.getProperty(MsoProperties.MSO_USER_NAME);
-		final String password = SystemProperties.getProperty(MsoProperties.MSO_PASSWORD);
-		final String mso_url = SystemProperties.getProperty(MsoProperties.MSO_SERVER_URL);
-		final String decrypted_password = EncryptedPropValue.decryptTriple(password);
-		
-		String authString = username + ":" + decrypted_password;
-		
-		byte[] authEncBytes = Base64.encodeBase64(authString.getBytes());
-		String authStringEnc = new String(authEncBytes);
-
-		commonHeaders = new MultivaluedHashMap ();
-		commonHeaders.put("Authorization",  Collections.singletonList((Object) ("Basic " + authStringEnc)));
-		
-		boolean use_ssl = true;
-		if ( (mso_url != null) && ( !(mso_url.isEmpty()) ) ) {
-			if ( mso_url.startsWith("https")) {
-				use_ssl = true;
-			}
-			else {
-				use_ssl = false;
-			}
-		}
-		if (client == null) {
-			
-			try {
-				if ( use_ssl ) { 
-					//logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  methodname + " getting HttpsBasicClient with username=" + username
-					//		+ " password=" + password);
-					client = HttpsBasicClient.getClient();
-				}
-				else {
-					//logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  methodname + " getting HttpsBasicClient with username=" + username
-					//		+ " password=" + password);
-					client = HttpBasicClient.getClient();
-				}
-			} catch (Exception e) {
-				logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  methodname + " Unable to get the SSL client");
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.openecomp.vid.mso.MsoRestInterfaceIfc#Get(java.lang.Object, java.lang.String, java.lang.String, org.openecomp.vid.mso.RestObject)
-	 */
-	@SuppressWarnings("unchecked")
-	public  void  Get (T t, String sourceId, String path, RestObject restObject ) throws Exception {
-		String methodName = "Get";
-		
-		logger.debug(EELFLoggerDelegate.debugLogger, methodName + " start");
-		
-		String url="";
-		restObject.set(t);
-		
-		url = SystemProperties.getProperty(MsoProperties.MSO_SERVER_URL) + path;
-        logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " +  methodName + " sending request to url= " + url);
-		
-        initRestClient();
-		
-		final Response cres = client.target(url)
-			 .request()
-	         .accept("application/json")
-	         .headers(commonHeaders)
-	         .get();
-		
-		int status = cres.getStatus();
-		restObject.setStatusCode (status);
-		
-		if (status == 200) {
-			 t = (T) cres.readEntity(t.getClass());
-			 restObject.set(t);
-			 logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + methodName + " REST api was successfull!");
-		    
-		 } else {
-		     throw new Exception(methodName + " with status="+ status + ", url= " + url );
-		 }
-
-		logger.debug(EELFLoggerDelegate.debugLogger,methodName + " received status=" + status );
-		
-		return;
-	}
-   
-   /* (non-Javadoc)
-    * @see org.openecomp.vid.mso.MsoRestInterfaceIfc#Delete(java.lang.Object, org.openecomp.vid.mso.rest.RequestDetails, java.lang.String, java.lang.String, org.openecomp.vid.mso.RestObject)
-    */
-   @SuppressWarnings("unchecked")
-	 public  void Delete(T t, RequestDetails r, String sourceID, String path, RestObject restObject) {
-	 
-		String methodName = "Delete";
-		String url="";
-		Response cres = null;
-		
-		logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " +  methodName + " start");
-		logRequest (r);
-
-		try {
-			initRestClient();
-			
-			url = SystemProperties.getProperty(MsoProperties.MSO_SERVER_URL) + path;
-			logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + " methodName sending request to: " + url);
-	
-			cres = client.target(url)
-					 .request()
-			         .accept("application/json")
-	        		 .headers(commonHeaders)
-			         //.entity(r)
-			         .build("DELETE", Entity.entity(r, MediaType.APPLICATION_JSON)).invoke();
-			       //  .method("DELETE", Entity.entity(r, MediaType.APPLICATION_JSON));
-			         //.delete(Entity.entity(r, MediaType.APPLICATION_JSON));
-			
-			int status = cres.getStatus();
-	    	restObject.setStatusCode (status);
-	    	
-			if (status == 404) { // resource not found
-				String msg = "Resource does not exist...: " + cres.getStatus();
-				logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " + msg);
-			} else if (status == 200  || status == 204){
-				logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " + "Resource " + url + " deleted");
-			} else if (status == 202) {
-				String msg = "Delete in progress: " + status;
-				logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " + msg);
-			}
-			else {
-				String msg = "Deleting Resource failed: " + status;
-					logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " + msg);
-			}
-			
-			try {
-	   			t = (T) cres.readEntity(t.getClass());
-	   			restObject.set(t);
-            }
-            catch ( Exception e ) {
-            	logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " + methodName + " No response entity, this is probably ok, e="
-            			+ e.getMessage());
-            }
-   
-        } 
-		catch (Exception e)
-        {
-        	 logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " + methodName + " with url="+url+ ", Exception: " + e.toString());
-        	 throw e;
-        
-        }
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.openecomp.vid.mso.MsoRestInterfaceIfc#Post(java.lang.Object, org.openecomp.vid.mso.rest.RequestDetails, java.lang.String, java.lang.String, org.openecomp.vid.mso.RestObject)
-	 */
-	@SuppressWarnings("unchecked")
-	public  void Post(T t, RequestDetails r, String sourceID, String path, RestObject restObject) throws Exception {
-
-        String methodName = "Post";
-        String url="";
-        
-        logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " +  methodName + " start");
-       
-        logRequest (r);
-        try {
-            
-            initRestClient();    
-    
-            url = SystemProperties.getProperty(MsoProperties.MSO_SERVER_URL) + path;
-            logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " +  methodName + " sending request to url= " + url);
-            // Change the content length
-            final Response cres = client.target(url)
-            	 .request()
-                 .accept("application/json")
-	        	 .headers(commonHeaders)
-                 //.header("content-length", 201)
-                 //.header("X-FromAppId",  sourceID)
-                 .post(Entity.entity(r, MediaType.APPLICATION_JSON));
-            
-            try {
-	   			t = (T) cres.readEntity(t.getClass());
-	   			restObject.set(t);
-            }
-            catch ( Exception e ) {
-            	logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " + methodName + " No response entity, this is probably ok, e="
-            			+ e.getMessage());
-            }
-
-            int status = cres.getStatus();
-    		restObject.setStatusCode (status);
-    		
-    		if ( status >= 200 && status <= 299 ) {
-    			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + methodName + " REST api POST was successful!");
-    			logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " + methodName + " REST api POST was successful!");
-    		
-             } else {
-            	 logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " + methodName + " with status="+status+", url="+url);
-             }    
-   
-        } catch (Exception e)
-        {
-        	 logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " + methodName + " with url="+url+ ", Exception: " + e.toString());
-        	 throw e;
-        
-        }
-    }
-
-	
-    /**
-     * Gets the single instance of MsoRestInterface.
-     *
-     * @param  the generic type
-     * @param clazz the clazz
-     * @return single instance of MsoRestInterface
-     * @throws IllegalAccessException the illegal access exception
-     * @throws InstantiationException the instantiation exception
-     */
-    public  T getInstance(Class clazz) throws IllegalAccessException, InstantiationException
-	{
-		return clazz.newInstance();
-	} 
-	
-    
-}
diff --git a/vid/src/main/java/org/openecomp/vid/mso/MsoRestInterfaceFactory.java b/vid/src/main/java/org/openecomp/vid/mso/MsoRestInterfaceFactory.java
deleted file mode 100644
index 4e15e3fb4..000000000
--- a/vid/src/main/java/org/openecomp/vid/mso/MsoRestInterfaceFactory.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.mso;
-
-import org.openecomp.portalsdk.core.util.SystemProperties;
-
-/**
- * A factory for creating MsoRestInterface objects.
- */
-public class MsoRestInterfaceFactory {
-	
-	/**
-	 * Gets the single instance of MsoRestInterfaceFactory.
-	 *
-	 * @return single instance of MsoRestInterfaceFactory
-	 */
-	public static MsoRestInterfaceIfc getInstance () {
-		MsoRestInterfaceIfc obj = null;
-		
-		String mso_dme2_enabled = SystemProperties.getProperty(MsoProperties.MSO_DME2_ENABLED);
-//		if ( (mso_dme2_enabled != null) && (mso_dme2_enabled.equalsIgnoreCase("true") ) ) {
-//			obj = new MsoDme2RestInterface();
-//		}
-//		else {
-			obj = new MsoRestInterface();
-//		}
-		return ( obj );
-	}
-
-}
diff --git a/vid/src/main/java/org/openecomp/vid/mso/MsoRestInterfaceIfc.java b/vid/src/main/java/org/openecomp/vid/mso/MsoRestInterfaceIfc.java
deleted file mode 100644
index 9a733f9c5..000000000
--- a/vid/src/main/java/org/openecomp/vid/mso/MsoRestInterfaceIfc.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.mso;
-
-import org.openecomp.vid.mso.rest.RequestDetails;
-
-/**
- * The Interface MsoRestInterfaceIfc.
- */
-public interface MsoRestInterfaceIfc {
-	
-	/**
-	 * Inits the rest client.
-	 */
-	public void initRestClient();
-	
-	/**
-	 * Gets the.
-	 *
-	 * @param  the generic type
-	 * @param t the t
-	 * @param sourceId the source id
-	 * @param path the path
-	 * @param restObject the rest object
-	 * @throws Exception the exception
-	 */
-	public  void Get (T t, String sourceId, String path, RestObject restObject ) throws Exception;
-	
-	/**
-	 * Delete.
-	 *
-	 * @param  the generic type
-	 * @param t the t
-	 * @param r the r
-	 * @param sourceID the source ID
-	 * @param path the path
-	 * @param restObject the rest object
-	 * @throws Exception the exception
-	 */
-	public  void Delete(T t, RequestDetails r, String sourceID, String path, RestObject restObject) throws Exception;
-	
-	/**
-	 * Post.
-	 *
-	 * @param  the generic type
-	 * @param t the t
-	 * @param r the r
-	 * @param sourceID the source ID
-	 * @param path the path
-	 * @param restObject the rest object
-	 * @throws Exception the exception
-	 */
-	public  void Post(T t, RequestDetails r, String sourceID, String path, RestObject restObject) throws Exception;
-	
-	/**
-	 * Log request.
-	 *
-	 * @param r the r
-	 */
-	public void logRequest ( RequestDetails r  );
-}
diff --git a/vid/src/main/java/org/openecomp/vid/mso/MsoUtil.java b/vid/src/main/java/org/openecomp/vid/mso/MsoUtil.java
deleted file mode 100644
index 5d46cb07b..000000000
--- a/vid/src/main/java/org/openecomp/vid/mso/MsoUtil.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.mso;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import org.glassfish.jersey.client.ClientResponse;
-
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.openecomp.vid.controller.MsoController;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-/**
- * The Class MsoUtil.
- */
-public class MsoUtil {
-	
-	/** The logger. */
-	private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MsoController.class);
-	
-	/** The Constant dateFormat. */
-	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
-	
-	/**
-	 * Wrap response.
-	 *
-	 * @param body the body
-	 * @param statusCode the status code
-	 * @return the mso response wrapper
-	 */
-	public static MsoResponseWrapper wrapResponse ( String body, int statusCode ) {
-		
-		MsoResponseWrapper w = new MsoResponseWrapper();
-		w.setStatus (statusCode);
-		w.setEntity(body);
-		
-		return w;
-	}
-	
-	/**
-	 * Wrap response.
-	 *
-	 * @param cres the cres
-	 * @return the mso response wrapper
-	 */
-	public static MsoResponseWrapper wrapResponse (ClientResponse cres) {	
-		String resp_str = "";
-		if ( cres != null ) {
-			resp_str = cres.readEntity(String.class);
-		}
-		int statuscode = cres.getStatus();
-		MsoResponseWrapper w = MsoUtil.wrapResponse ( resp_str, statuscode );
-		return (w);
-	}
-	
-	/**
-	 * Wrap response.
-	 *
-	 * @param rs the rs
-	 * @return the mso response wrapper
-	 */
-	public static MsoResponseWrapper wrapResponse (RestObject rs) {	
-		String resp_str = "";
-		int status = 0;
-		if ( rs != null ) {
-			resp_str = rs.get();
-			status = rs.getStatusCode();
-		}
-		MsoResponseWrapper w = MsoUtil.wrapResponse ( resp_str, status );
-		return (w);
-	}	
-	
-	/**
-	 * Convert pojo to string.
-	 *
-	 * @param  the generic type
-	 * @param t the t
-	 * @return the string
-	 * @throws JsonProcessingException the json processing exception
-	 */
-	public static  String convertPojoToString ( T t ) throws com.fasterxml.jackson.core.JsonProcessingException {
-		
-		String methodName = "convertPojoToString";
-		ObjectMapper mapper = new ObjectMapper();
-		String r_json_str = "";
-	    if ( t != null ) {
-		    try {
-		    	r_json_str = mapper.writeValueAsString(t);
-		    }
-		    catch ( com.fasterxml.jackson.core.JsonProcessingException j ) {
-		    	logger.debug(EELFLoggerDelegate.debugLogger,dateFormat.format(new Date()) + "<== " +  methodName + " Unable to parse object as json");
-		    }
-	    }
-	    return (r_json_str);
-	}
-	
-	/**
-	 * The main method.
-	 *
-	 * @param args the arguments
-	 */
-	public static void main(String[] args) {
-		// TODO Auto-generated method stub
-
-	}
-}
diff --git a/vid/src/main/java/org/openecomp/vid/mso/RestObject.java b/vid/src/main/java/org/openecomp/vid/mso/RestObject.java
deleted file mode 100644
index 0e43f126d..000000000
--- a/vid/src/main/java/org/openecomp/vid/mso/RestObject.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.mso;
-
-/**
- * The Class RestObject.
- *
- * @param  the generic type
- */
-public class RestObject {
-
-	/**
-	 * Generic version of the RestObject class.
-	 *
-	 */
-    // T stands for "Type"
-    private T t;
-    
-    /** The status code. */
-    private int statusCode= 0;
-    
-    /**
-     * Sets the.
-     *
-     * @param t the t
-     */
-    public void set(T t) { this.t = t; }
-    
-    /**
-     * Gets the.
-     *
-     * @return the t
-     */
-    public T get() { return t; }
-	
-    /**
-     * Sets the status code.
-     *
-     * @param v the new status code
-     */
-    public void setStatusCode(int v) { this.statusCode = v; }
-    
-    /**
-     * Gets the status code.
-     *
-     * @return the status code
-     */
-    public int getStatusCode() { return this.statusCode; }
-}
-
diff --git a/vid/src/main/java/org/openecomp/vid/mso/rest/AsyncRequestStatus.java b/vid/src/main/java/org/openecomp/vid/mso/rest/AsyncRequestStatus.java
deleted file mode 100644
index 99000748b..000000000
--- a/vid/src/main/java/org/openecomp/vid/mso/rest/AsyncRequestStatus.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.mso.rest;
-
-//import java.util.HashMap;
-//import java.util.Map;
-//import javax.annotation.Generated;
-
-import org.openecomp.vid.domain.mso.InstanceIds;
-import org.openecomp.vid.domain.mso.RequestStatus;
-//import com.fasterxml.jackson.annotation.JsonAnyGetter;
-//import com.fasterxml.jackson.annotation.JsonAnySetter;
-//import com.fasterxml.jackson.annotation.JsonCreator;
-//import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-//import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-//import com.fasterxml.jackson.annotation.JsonValue;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-
-/**
- * request structure
- * 
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-
-public class AsyncRequestStatus extends org.openecomp.vid.domain.mso.AsyncRequestStatus {
-
-    
-    private InstanceIds instanceIds;
-   
-    private RequestStatus requestStatus;
-
-    public InstanceIds getInstanceIds() {
-        return instanceIds;
-    }
-
-    public void setInstanceIds(InstanceIds instanceIds) {
-        this.instanceIds = instanceIds;
-    }
-
-    
-    /**
-     * 
-     * (Required)
-     * 
-     * @return
-     *     The requestStatus
-     */
-    @JsonProperty("requestStatus")
-    public RequestStatus getRequestStatus() {
-        return requestStatus;
-    }
-
-    /**
-     * 
-     * (Required)
-     * 
-     * @param requestStatus
-     *     The requestStatus
-     */
-    @JsonProperty("requestStatus")
-    public void setRequestStatus(RequestStatus requestStatus) {
-        this.requestStatus = requestStatus;
-    }
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(getCorrelator()).append(getFinishTime()).append(instanceIds).append(getRequestId()).append(getRequestScope()).append(getRequestStatus()).append(getRequestType()).append(getStartTime()).append(getAdditionalProperties()).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof AsyncRequestStatus) == false) {
-            return false;
-        }
-        AsyncRequestStatus rhs = ((AsyncRequestStatus) other);
-        return new EqualsBuilder().append(getCorrelator(), rhs.getCorrelator()).append(getFinishTime(), rhs.getFinishTime()).append(instanceIds, rhs.instanceIds).append(getRequestId(), rhs.getRequestId()).append(getRequestScope(), rhs.getRequestScope()).append(getRequestStatus(), rhs.getRequestStatus()).append(getRequestType(), rhs.getRequestType()).append(getStartTime(), rhs.getStartTime()).append(getAdditionalProperties(), rhs.getAdditionalProperties()).isEquals();
-    }
-}
diff --git a/vid/src/main/java/org/openecomp/vid/mso/rest/RelatedInstance.java b/vid/src/main/java/org/openecomp/vid/mso/rest/RelatedInstance.java
deleted file mode 100644
index a0bea6742..000000000
--- a/vid/src/main/java/org/openecomp/vid/mso/rest/RelatedInstance.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.mso.rest;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-
-/**
- * modelInfo and optional instanceId and instanceName for a model related to the modelInfo being operated on
- * 
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@Generated("org.jsonschema2pojo")
-@JsonPropertyOrder({
-    "instanceName",
-    "instanceId",
-    "modelInfo"
-})
-public class RelatedInstance extends org.openecomp.vid.domain.mso.RelatedInstance{
-
-
-    @JsonProperty("modelInfo")
-    private org.openecomp.vid.domain.mso.ModelInfo modelInfo;
-    @JsonIgnore
-    private Map additionalProperties = new HashMap();
-
-    /**
-     * 
-     * (Required)
-     * 
-     * @return
-     *     The modelInfo
-     */
-    @JsonProperty("modelInfo")
-    public org.openecomp.vid.domain.mso.ModelInfo getModelInfo() {
-        return modelInfo;
-    }
-
-    /**
-     * 
-     * (Required)
-     * 
-     * @param modelInfo
-     *     The modelInfo
-     */
-    @JsonProperty("modelInfo")
-    public void setModelInfo(org.openecomp.vid.domain.mso.ModelInfo modelInfo) {
-        this.modelInfo = modelInfo;
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @JsonAnyGetter
-    public Map getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(getInstanceName()).append(getInstanceId()).append(modelInfo).append(additionalProperties).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof RelatedInstance) == false) {
-            return false;
-        }
-        RelatedInstance rhs = ((RelatedInstance) other);
-        return new EqualsBuilder().append(getInstanceName(), rhs.getInstanceName()).append(getInstanceId(), rhs.getInstanceId()).append(modelInfo, rhs.getModelInfo()).append(additionalProperties, rhs.additionalProperties).isEquals();
-    }
-
-}
diff --git a/vid/src/main/java/org/openecomp/vid/mso/rest/RelatedModel.java b/vid/src/main/java/org/openecomp/vid/mso/rest/RelatedModel.java
deleted file mode 100644
index 545b43064..000000000
--- a/vid/src/main/java/org/openecomp/vid/mso/rest/RelatedModel.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.mso.rest;
-
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-
-/**
- * modelInfo and optional instance id for a model related to the modelInfo being operated on
- * 
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "instanceId",
-    "modelInfo"
-})
-public class RelatedModel extends org.openecomp.vid.domain.mso.RelatedModel {
-    /**
-     * 
-     * (Required)
-     * 
-     */
-    @JsonProperty("modelInfo")
-    private org.openecomp.vid.domain.mso.ModelInfo modelInfo;
-    @JsonIgnore
-    private Map additionalProperties = new HashMap();
-
-    /**
-     * 
-     * (Required)
-     * 
-     * @return
-     *     The modelInfo
-     */
-    @JsonProperty("modelInfo")
-    public org.openecomp.vid.domain.mso.ModelInfo getModelInfo() {
-        return modelInfo;
-    }
-
-    /**
-     * 
-     * (Required)
-     * 
-     * @param modelInfo
-     *     The modelInfo
-     */
-    @JsonProperty("modelInfo")
-    public void setModelInfo(org.openecomp.vid.domain.mso.ModelInfo modelInfo) {
-        this.modelInfo = modelInfo;
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @JsonAnyGetter
-    public Map getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(getInstanceId()).append(modelInfo).append(additionalProperties).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof RelatedModel) == false) {
-            return false;
-        }
-        RelatedModel rhs = ((RelatedModel) other);
-        return new EqualsBuilder().append(getInstanceId(), rhs.getInstanceId()).append(modelInfo, rhs.modelInfo).append(additionalProperties, rhs.additionalProperties).isEquals();
-    }
-
-}
diff --git a/vid/src/main/java/org/openecomp/vid/mso/rest/Request.java b/vid/src/main/java/org/openecomp/vid/mso/rest/Request.java
deleted file mode 100644
index 7b234e29c..000000000
--- a/vid/src/main/java/org/openecomp/vid/mso/rest/Request.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.mso.rest;
-
-//import java.util.HashMap;
-//import java.util.Map;
-//import javax.annotation.Generated;
-
-import org.openecomp.vid.domain.mso.InstanceIds;
-import org.openecomp.vid.domain.mso.RequestStatus;
-//import com.fasterxml.jackson.annotation.JsonAnyGetter;
-//import com.fasterxml.jackson.annotation.JsonAnySetter;
-//import com.fasterxml.jackson.annotation.JsonCreator;
-//import com.fasterxml.jackson.annotation.JsonIgnore;
-//import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-//import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-//import com.fasterxml.jackson.annotation.JsonValue;
-import org.apache.commons.lang.builder.EqualsBuilder;
-//import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-
-/**
- * request structure
- * 
- */
-public class Request extends org.openecomp.vid.domain.mso.Request {
-
- 
-    private InstanceIds instanceIds;
-    private RequestDetails requestDetails;
-    private RequestStatus requestStatus;
- 
-    
-    @JsonProperty("instanceIds")
-    public InstanceIds getInstanceIds() {
-        return instanceIds;
-    }
-
-    /**
-     * 
-     * @param instanceIds
-     *     The instanceIds
-     */
-    @JsonProperty("instanceIds")
-    public void setInstanceIds(InstanceIds instanceIds) {
-        this.instanceIds = instanceIds;
-    }
-
-    /**
-     * 
-     * (Required)
-     * 
-     * @return
-     *     The requestDetails
-     */
-    @JsonProperty("requestDetails")
-    public RequestDetails getRequestDetails() {
-        return requestDetails;
-    }
-
-    /**
-     * 
-     * (Required)
-     * 
-     * @param requestDetails
-     *     The requestDetails
-     */
-    @JsonProperty("requestDetails")
-    public void setRequestDetails(RequestDetails requestDetails) {
-        this.requestDetails = requestDetails;
-    }
-
-    
-    /**
-     * 
-     * @return
-     *     The requestStatus
-     */
-    @JsonProperty("requestStatus")
-    public RequestStatus getRequestStatus() {
-        return requestStatus;
-    }
-
-    /**
-     * 
-     * @param requestStatus
-     *     The requestStatus
-     */
-    @JsonProperty("requestStatus")
-    public void setRequestStatus(RequestStatus requestStatus) {
-        this.requestStatus = requestStatus;
-    }
-
-  
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof Request) == false) {
-            return false;
-        }
-        Request rhs = ((Request) other);
-        return new EqualsBuilder().append(getFinishTime(), rhs.getFinishTime()).append(getInstanceIds(), rhs.getInstanceIds()).append(getRequestDetails(), rhs.getRequestDetails()).append(getRequestId(), rhs.getRequestId()).append(getRequestScope(), rhs.getRequestScope()).append(getRequestStatus(), rhs.getRequestStatus()).append(getRequestType(), rhs.getRequestType()).append(getStartTime(), rhs.getStartTime()).append(getAdditionalProperties(), rhs.getAdditionalProperties()).isEquals();
-    }
-}
diff --git a/vid/src/main/java/org/openecomp/vid/mso/rest/RequestDetails.java b/vid/src/main/java/org/openecomp/vid/mso/rest/RequestDetails.java
deleted file mode 100644
index 2896b3b6c..000000000
--- a/vid/src/main/java/org/openecomp/vid/mso/rest/RequestDetails.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.mso.rest;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.List;
-//import javax.annotation.Generated;
-
-import org.openecomp.vid.domain.mso.CloudConfiguration;
-import org.openecomp.vid.domain.mso.ModelInfo;
-import org.openecomp.vid.domain.mso.RequestInfo;
-import org.openecomp.vid.domain.mso.RequestParameters;
-import org.openecomp.vid.domain.mso.SubscriberInfo;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-
-/**
- * aggregates the context, configuraiton and detailed parameters associated with the request into a single structure
- * 
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "cloudConfiguration",
-    "modelInfo",
-    "relatedModelList",
-    "requestInfo",
-    "subscriberInfo",
-    "requestParameters"
-})
-public class RequestDetails extends org.openecomp.vid.domain.mso.RequestDetails {
-
-    @JsonProperty("cloudConfiguration")
-    private CloudConfiguration cloudConfiguration;
-    @JsonProperty("modelInfo")
-    private ModelInfo modelInfo;
-    @JsonProperty("relatedModelList")
-    private List relatedModelList;
-    @JsonProperty("requestInfo")
-    private RequestInfo requestInfo;
-    @JsonProperty("subscriberInfo")
-    private SubscriberInfo subscriberInfo;
-    @JsonProperty("requestParameters")
-    private RequestParameters requestParameters;
-    @JsonIgnore
-    private Map additionalProperties = new HashMap();
-
-    /**
-     * 
-     * @return
-     *     The cloudConfiguration
-     */
-    @JsonProperty("cloudConfiguration")
-    public CloudConfiguration getCloudConfiguration() {
-        return cloudConfiguration;
-    }
-
-    /**
-     * 
-     * @param cloudConfiguration
-     *     The cloudConfiguration
-     */
-    @JsonProperty("cloudConfiguration")
-    public void setCloudConfiguration(CloudConfiguration cloudConfiguration) {
-        this.cloudConfiguration = cloudConfiguration;
-    }
-
-    /**
-     * 
-     * @return
-     *     The modelInfo
-     */
-    @JsonProperty("modelInfo")
-    public ModelInfo getModelInfo() {
-        return modelInfo;
-    }
-
-    /**
-     * 
-     * @param modelInfo
-     *     The modelInfo
-     */
-    @JsonProperty("modelInfo")
-    public void setModelInfo(ModelInfo modelInfo) {
-        this.modelInfo = modelInfo;
-    }
-
-    /**
-     * 
-     * @return
-     *     The relatedModelList
-     */
-    @JsonProperty("relatedModelList")
-    public List getRelatedModelList() {
-        return relatedModelList;
-    }
-
-    /**
-     * 
-     * @param relatedModelList
-     *     The relatedModelList
-     */
-    @JsonProperty("relatedModelList")
-    public void setRelatedModelList( List relatedModelList) {
-        this.relatedModelList = relatedModelList;
-    }
-
-    /**
-     * 
-     * @return
-     *     The requestInfo
-     */
-    @JsonProperty("requestInfo")
-    public RequestInfo getRequestInfo() {
-        return requestInfo;
-    }
-
-    /**
-     * 
-     * @param requestInfo
-     *     The requestInfo
-     */
-    @JsonProperty("requestInfo")
-    public void setRequestInfo(RequestInfo requestInfo) {
-        this.requestInfo = requestInfo;
-    }
-    /**
-     * 
-     * @return
-     *     The subscriberInfo
-     */
-    @JsonProperty("subscriberInfo")
-    public SubscriberInfo getSubscriberInfo() {
-        return subscriberInfo;
-    }
-
-    /**
-     * 
-     * @param subscriberInfo
-     *     The subscriberInfo
-     */
-    @JsonProperty("subscriberInfo")
-    public void setSubscriberInfo(SubscriberInfo subscriberInfo) {
-        this.subscriberInfo = subscriberInfo;
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @JsonAnyGetter
-    public Map getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(cloudConfiguration).append(modelInfo).append(relatedModelList).append(requestInfo).append(getRequestParameters()).append(subscriberInfo).append(additionalProperties).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof RequestDetails) == false) {
-            return false;
-        }
-        RequestDetails rhs = ((RequestDetails) other);
-        return new EqualsBuilder().append(cloudConfiguration, rhs.cloudConfiguration).append(modelInfo, rhs.modelInfo).append(relatedModelList, rhs.relatedModelList).append(requestInfo, rhs.requestInfo).append(getRequestParameters(), rhs.getRequestParameters()).append(subscriberInfo, rhs.subscriberInfo).append(additionalProperties, rhs.additionalProperties).isEquals();
-    }
-
-}
diff --git a/vid/src/main/java/org/openecomp/vid/mso/rest/RequestList.java b/vid/src/main/java/org/openecomp/vid/mso/rest/RequestList.java
deleted file mode 100644
index 64ef82a57..000000000
--- a/vid/src/main/java/org/openecomp/vid/mso/rest/RequestList.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.mso.rest;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.Generated;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-//import com.fasterxml.jackson.annotation.JsonInclude;
-//import com.fasterxml.jackson.annotation.JsonProperty;
-//import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import java.util.List;
-
-/**
- * List of relatedModel structures that are related to a modelInfo being operated on
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@Generated("org.jsonschema2pojo")
-@JsonPropertyOrder({
-    "finishTime",
-    "instanceIds",
-    "requestDetails",
-    "requestId",
-    "requestScope",
-    "requestStatus",
-    "requestType",
-    "startTime"
-})
-
-public class RequestList {
-    
-    private List requestList;
-    @JsonIgnore
-    private Map additionalProperties = new HashMap();
-
-    /**
-     * 
-     * (Required)
-     * 
-     * @return
-     *     The RelatedModel List
-     */
-    public List getRequestList() {
-        return requestList;
-    }
-
-    /**
-     */
-    public void setRequestList(List l) {
-        this.requestList = l;
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @JsonAnyGetter
-    public Map getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(getRequestList()).append(additionalProperties).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof RequestList) == false) {
-            return false;
-        }
-        RequestList rhs = ((RequestList) other);
-        return new EqualsBuilder().append(getRequestList(), rhs.getRequestList()).append(additionalProperties, rhs.additionalProperties).isEquals();
-    }
-
-}
diff --git a/vid/src/main/java/org/openecomp/vid/properties/AsdcClientConfiguration.java b/vid/src/main/java/org/openecomp/vid/properties/AsdcClientConfiguration.java
deleted file mode 100644
index b6a8cfce7..000000000
--- a/vid/src/main/java/org/openecomp/vid/properties/AsdcClientConfiguration.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.properties;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-
-@Configuration
-@PropertySource(value="${container.classpath:}/WEB-INF/conf/asdc.properties")
-public class AsdcClientConfiguration {
-
-	@Value("${asdc.client.type}")
-	private AsdcClientType asdcClientType;
-	
-	@Value("${asdc.client.rest.host}")
-	private String asdcClientHost;
-	
-	@Value("${asdc.client.rest.port}")
-	private int asdcClientPort;
-	
-	@Value("${asdc.client.rest.auth}")
-	public String asdcClientAuth;
-
-	@Value("${asdc.client.rest.protocol}")
-	public String asdcClientProtocol;
-	
-	public AsdcClientType getAsdcClientType() {
-		return asdcClientType;
-	}
-
-	public String getAsdcClientHost() {
-		return asdcClientHost;
-	}
-
-	public int getAsdcClientPort() {
-		return asdcClientPort;
-	}
-
-	public String getAsdcClientAuth() {
-		return asdcClientAuth;
-	}
-
-	public String getAsdcClientProtocol() {
-		return asdcClientProtocol;
-	}
-	
-	public enum AsdcClientType {
-		IN_MEMORY,
-		REST
-	}
-}
diff --git a/vid/src/main/java/org/openecomp/vid/properties/VidProperties.java b/vid/src/main/java/org/openecomp/vid/properties/VidProperties.java
deleted file mode 100644
index fcec7d636..000000000
--- a/vid/src/main/java/org/openecomp/vid/properties/VidProperties.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.properties;
-
-import org.openecomp.portalsdk.core.util.SystemProperties;
-
-public class VidProperties extends SystemProperties {
-
-	//VID General Properties
-	
-	public static final String VID_TRUSTSTORE_FILENAME = "vid.truststore.filename";
-	public static final String VID_TRUSTSTORE_PASSWD_X = "vid.truststore.passwd.x";
-	
-	public static final String FILESEPARATOR = (System.getProperty("file.separator") == null) ? "/" : System.getProperty("file.separator");
-	
-}
diff --git a/vid/src/main/java/org/openecomp/vid/scheduler/LogJob.java b/vid/src/main/java/org/openecomp/vid/scheduler/LogJob.java
deleted file mode 100644
index 05e7f1f96..000000000
--- a/vid/src/main/java/org/openecomp/vid/scheduler/LogJob.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.scheduler;
-
-import org.quartz.DisallowConcurrentExecution;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.quartz.PersistJobDataAfterExecution;
-import org.springframework.scheduling.quartz.QuartzJobBean;
-
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.openecomp.vid.conf.ExternalAppConfig;
-
-@PersistJobDataAfterExecution
-@DisallowConcurrentExecution
-public class LogJob extends QuartzJobBean {
-
-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(LogJob.class);
-
-	
-	@Override
-	protected void executeInternal(JobExecutionContext ctx)
-			throws JobExecutionException {
-	   // JobDataMap dataMap = ctx.getJobDetail().getJobDataMap();
- 	   //int cnt = dataMap.getInt("");
-	   // JobKey jobKey = ctx.getJobDetail().getKey();
-	   logger.info(EELFLoggerDelegate.errorLogger, (Runtime.getRuntime().maxMemory() + " " + Runtime.getRuntime().maxMemory()));
-
-	}
-
-}
diff --git a/vid/src/main/java/org/openecomp/vid/scheduler/LogRegistry.java b/vid/src/main/java/org/openecomp/vid/scheduler/LogRegistry.java
deleted file mode 100644
index 2d52b5868..000000000
--- a/vid/src/main/java/org/openecomp/vid/scheduler/LogRegistry.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.scheduler;
-
-import java.text.ParseException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.context.annotation.DependsOn;
-import org.springframework.scheduling.quartz.CronTriggerFactoryBean;
-import org.springframework.scheduling.quartz.JobDetailFactoryBean;
-import org.springframework.stereotype.Component;
-
-import org.openecomp.portalsdk.core.scheduler.CronRegistry;
-import org.openecomp.portalsdk.core.util.SystemProperties;
-
-@Component
-@DependsOn({ "systemProperties" })
-public class LogRegistry extends CronRegistry {
-
-	private static final String groupName = "AppGroup";
-	private static final String jobName = "LogJob";
-	private static final String triggerName = "LogTrigger";
-
-	// @Autowired
-	// private SystemProperties systemProperties;
-
-	// @Bean
-	public JobDetailFactoryBean jobDetailFactoryBean() {
-		Map map = new HashMap();
-		map.put("units", "bytes");
-		return jobDetailFactoryBean(groupName, jobName, LogJob.class, map);
-	}
-
-	// @Bean
-	public CronTriggerFactoryBean cronTriggerFactoryBean() throws ParseException {
-		// "0 * * * * ? *
-		return cronTriggerFactoryBean(groupName, triggerName, SystemProperties.getProperty(SystemProperties.LOG_CRON));
-	}
-
-}
diff --git a/vid/src/main/java/org/openecomp/vid/scheduler/MyLoginsFeedJob.java b/vid/src/main/java/org/openecomp/vid/scheduler/MyLoginsFeedJob.java
deleted file mode 100644
index 2b94470fe..000000000
--- a/vid/src/main/java/org/openecomp/vid/scheduler/MyLoginsFeedJob.java
+++ /dev/null
@@ -1,434 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.scheduler;
-
-
-
-
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import javax.sql.DataSource;
-
-import org.quartz.DisallowConcurrentExecution;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.quartz.PersistJobDataAfterExecution;
-import org.springframework.scheduling.quartz.QuartzJobBean;
-
-
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.openecomp.portalsdk.core.util.SystemProperties;
-import org.openecomp.vid.conf.ExternalAppConfig;
-
-
-@PersistJobDataAfterExecution
-@DisallowConcurrentExecution
-public class MyLoginsFeedJob extends QuartzJobBean{
-	
-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MyLoginsFeedJob.class);
-
-
-    private Connection connection;
-   
-    private String APP_QUERY ;
-	
-	private String USER_LOG_QUERY ;
-	
-	private String ALL_ACCOUNTS_LOG_QUERY ;
-	
-	private String PROFILE_LOG_QUERY ;
-	
-	private String USER_PROFILE_LOG_QUERY ;
-	
-    
-    class App {
-    	
-    	private Integer appId;
-    	private Integer motsId;
-    	private String mlAppName;
-    	
-		public Integer getAppId() {
-			return appId;
-		}
-		public void setAppId(Integer appId) {
-			this.appId = appId;
-		}
-		public Integer getMotsId() {
-			return motsId;
-		}
-		public void setMotsId(Integer motsId) {
-			this.motsId = motsId;
-		}
-		public String getMlAppName() {
-			return mlAppName;
-		}
-		public void setMlAppName(String mlAppName) {
-			this.mlAppName = mlAppName;
-		}
-    	
-    }
-    
-    
-	
-	
-	private String getOutputFolder(){
-		String outputFolder = SystemProperties.getProperty("my_login_feed_output_dir") +  File.separator;
-		
-		return outputFolder;
-	}
-	
-	
-	public List getApplicationList(Connection conn) {
-		
-		PreparedStatement stmt = null;
-		ResultSet rs = null;
-		List appList = new ArrayList();
-		try{
-			APP_QUERY = SystemProperties.getProperty("app.query");
-			stmt = conn.prepareStatement(this.APP_QUERY);
-			rs = stmt.executeQuery();
-			while(rs.next()) {
-				
-				App app = new App();
-				app.setAppId(rs.getInt("APP_ID"));
-				app.setMotsId(rs.getInt("MOTS_ID"));
-				app.setMlAppName(rs.getString("ML_APP_NAME"));
-				appList.add(app);
-			}
-				
-			}
-		catch (Exception e){
-			logger.error(EELFLoggerDelegate.errorLogger, ("UADM Audit Log. "+ new Date().toString() + ". Error getting connection. " + e.getMessage()));
-		}
-		finally{
-			try {
-				if(rs != null) {
-					rs.close();
-				}
-				if(stmt != null){
-					stmt.close();
-				}
-			}
-			catch (Exception e){
-				logger.error(EELFLoggerDelegate.errorLogger, ("UADM Audit Log. "+ new Date().toString() + ". Error getting connection. " + e.getMessage()));
-
-			}
-		}
-		
-		return appList;
-	}
-	
-
-	
-	public  void generateLogs(){
-		Connection con = null;
-		try{
-			con = getConnection();
-			
-			List appList = getApplicationList(con);
-			
-			for(App app : appList) {
-			
-			this.generateUserLogs(con, app);
-			this.generateProfileLogs(con, app); 
-			this.generateUserProfileLogs(con, app);
-			this.generateAllAccountsLogs(con, app);
-			
-			}
-			
-		} catch (Exception e){
-			logger.error(EELFLoggerDelegate.errorLogger, ("UADM Audit Log. "+ new Date().toString() + ". Error getting connection. " + e.getMessage()));
-		}
-		finally{
-			try {
-				if(con != null){
-					con.close();
-				}
-			} catch (Exception e) {
-				logger.error(EELFLoggerDelegate.errorLogger, ("UADM Audit Log. "+ new Date().toString() + ". Error closing connection"));
-
-			}
-		}
-	}
-	
-	private void generateAllAccountsLogs(Connection con, App app){
-		PreparedStatement stmt = null;
-		ResultSet rs = null;
-		try{
-			
-			ALL_ACCOUNTS_LOG_QUERY = SystemProperties.getProperty("all.accounts.log.query");
-			stmt = con.prepareStatement(ALL_ACCOUNTS_LOG_QUERY);
-			stmt.setInt(1, app.getAppId());
-			rs = stmt.executeQuery();
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-			FileOutputStream fos = new java.io.FileOutputStream(this.getOutputFolder()+app.getMlAppName() + "_AllAccounts_" + sdf.format(new Date()) + ".txt");
-            BufferedOutputStream bout = new BufferedOutputStream(fos);
-            
-			String header = "ATTUID,ACCOUNT_STATUS,APPLICATION_USERID,LAST_LOGON_DATE,LAST_PASSWORD_CHANGE_DATE,PROFILE_NAME";
-			bout.write(header.getBytes());
-			int userCount = 0; //need to include header and footer in the count
-			while (rs.next()){
-				userCount ++;
-				bout.write("\n".getBytes());
-				String CUID = rs.getString("CUID") == null ? "" : rs.getString("CUID");
-				String activeYN = rs.getString("ACTIVE_YN") == null ? "" : rs.getString("ACTIVE_YN");
-				String APPLICATIONUSERID = rs.getString("APPLICATIONUSERID") == null ? "" : rs.getString("APPLICATIONUSERID");
-				String LAST_LOGON_DATE = rs.getString("LAST_LOGON_DATE") == null ? "" : rs.getString("LAST_LOGON_DATE");
-				String LAST_PASSWORD_CHANGE_DATE = rs.getString("LAST_PASSWORD_CHANGE_DATE") == null ? "" : rs.getString("LAST_PASSWORD_CHANGE_DATE");
-				String PROFILE_NAME = rs.getString("PROFILE_NAME") == null ? "" : rs.getString("PROFILE_NAME");
-
-				String dat = 				
-						CUID + "," + activeYN + "," + APPLICATIONUSERID  + "," + 
-								LAST_LOGON_DATE  + "," + LAST_PASSWORD_CHANGE_DATE  + "," + PROFILE_NAME 
-						;
-				bout.write(dat.getBytes());
-			
-			}
-			bout.write("\n".getBytes());
-			bout.write(("TotalRecords," + userCount + "," + (app.getMotsId() != null ? app.getMotsId():app.getMlAppName())).getBytes());
-			bout.close();
-            
-			
-		} catch (Exception e){
-			logger.error(EELFLoggerDelegate.errorLogger, ("UADM Audit Log. "+ new Date().toString() + ". Error While writing user data. " + e.getMessage()));
-
-		}
-		finally{
-			try {
-				if(rs != null){
-					rs.close();
-				}
-				if(stmt != null){
-					stmt.close();
-				}
-			} catch (Exception e) {
-				logger.error(EELFLoggerDelegate.errorLogger, ("UADM Audit Log. "+ new Date().toString() + ". Error closing user rs / stmt"));
-
-			}
-		}
-		
-	}
-	
-	private void generateUserLogs(Connection con, App app){
-		PreparedStatement stmt = null;
-		ResultSet rs = null;
-		try{
-			
-			USER_LOG_QUERY = SystemProperties.getProperty("user.log.query");
-			stmt = con.prepareStatement(USER_LOG_QUERY);
-			stmt.setInt(1, app.getAppId());
-			rs = stmt.executeQuery();
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-			FileOutputStream fos = new java.io.FileOutputStream(this.getOutputFolder()+app.getMlAppName() + "_User_" + sdf.format(new Date()) + ".txt");
-            BufferedOutputStream bout = new BufferedOutputStream(fos);
-            
-			String header = "CUID,AWID,APPLICATIONUSERID,FIRST_NAME,MIDDLE_INITIAL,LAST_NAME,LAST_LOGON_DATE,ACCOUNT_ACTIVATION_DATE,LAST_DATE_ACCOUNT_MODIFIED,LAST_PASSWORD_CHANGE_DATE,FULL_USER_NAME,NT_ID,EMAIL";
-			bout.write(header.getBytes());
-			int userCount = 2; //need to include header and footer in the count
-			while (rs.next()){
-				userCount ++;
-				bout.write("\n".getBytes());
-				String CUID = rs.getString("CUID") == null ? "" : rs.getString("CUID");
-				String AWID = rs.getString("AWID") == null ? "" : rs.getString("AWID");
-				String APPLICATIONUSERID = rs.getString("APPLICATIONUSERID") == null ? "" : rs.getString("APPLICATIONUSERID");
-				String FIRST_NAME = rs.getString("FIRST_NAME") == null ? "" : rs.getString("FIRST_NAME");
-				String MIDDLE_INITIAL = rs.getString("MIDDLE_INITIAL") == null ? "" : rs.getString("MIDDLE_INITIAL");
-				String LAST_NAME = rs.getString("LAST_NAME") == null ? "" : rs.getString("LAST_NAME");
-				String LAST_LOGON_DATE = rs.getString("LAST_LOGON_DATE") == null ? "" : rs.getString("LAST_LOGON_DATE");
-				String ACCOUNT_ACTIVATION_DATE = rs.getString("ACCOUNT_ACTIVATION_DATE") == null ? "" : rs.getString("ACCOUNT_ACTIVATION_DATE");
-				String LAST_DATE_ACCOUNT_MODIFIED = rs.getString("LAST_DATE_ACCOUNT_MODIFIED") == null ? "" : rs.getString("LAST_DATE_ACCOUNT_MODIFIED");
-				String LAST_PASSWORD_CHANGE_DATE = rs.getString("LAST_PASSWORD_CHANGE_DATE") == null ? "" : rs.getString("LAST_PASSWORD_CHANGE_DATE");
-				String FULL_USER_NAME = rs.getString("FULL_USER_NAME") == null ? "" : rs.getString("FULL_USER_NAME");
-				String NT_ID = rs.getString("NT_ID") == null ? "" : rs.getString("NT_ID");
-				String EMAIL = rs.getString("EMAIL") == null ? "" : rs.getString("EMAIL");
-				String dat = 				
-						CUID + "," + AWID + "," + APPLICATIONUSERID  + "," + 
-						FIRST_NAME  + "," + MIDDLE_INITIAL  + "," + LAST_NAME + "," + LAST_LOGON_DATE  + "," +  
-						ACCOUNT_ACTIVATION_DATE  + "," + 
-						LAST_DATE_ACCOUNT_MODIFIED  + "," + LAST_PASSWORD_CHANGE_DATE  + "," + 
-						FULL_USER_NAME + "," +  NT_ID + "," + EMAIL 
-						;
-				bout.write(dat.getBytes());
-			
-			}
-			bout.write("\n".getBytes());
-			bout.write(("TotalRecords," + userCount + ",\"UADM USER DATA STANDARD 2.2\"").getBytes());
-			bout.close();
-            
-			
-		} catch (Exception e){
-			logger.error(EELFLoggerDelegate.errorLogger, ("UADM Audit Log. "+ new Date().toString() + ". Error While writing user data. " + e.getMessage()));
-		}
-		finally{
-			try {
-				if(rs != null){
-					rs.close();
-				}
-				if(stmt != null){
-					stmt.close();
-				}
-			} catch (Exception e) {
-				logger.error(EELFLoggerDelegate.errorLogger, ("UADM Audit Log. "+ new Date().toString() + ". Error closing user rs / stmt"));
-			}
-		}
-		
-	}
-	
-	private void generateProfileLogs(Connection con, App app){
-		PreparedStatement stmt = null;
-		ResultSet rs = null;
-		try{
-			
-			PROFILE_LOG_QUERY = SystemProperties.getProperty("profile.log.query");
-			stmt = con.prepareStatement(PROFILE_LOG_QUERY);
-			stmt.setInt(1, app.getAppId());
-			rs = stmt.executeQuery();
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-			FileOutputStream fos = new java.io.FileOutputStream(this.getOutputFolder()+app.getMlAppName() + "_profile_" + sdf.format(new Date()) + ".txt");
-            BufferedOutputStream bout = new BufferedOutputStream(fos);
-            
-			String header = "PROFILE_NAME,SECURITY_SETTINGS";
-			bout.write(header.getBytes());
-			int userCount = 2; //need to include header and footer in count= count
-			while (rs.next()){
-				userCount ++;
-				bout.write("\n".getBytes());
-				String PROFILE_NAME = rs.getString("PROFILE_NAME") == null ? "" : rs.getString("PROFILE_NAME");
-				String SECURITY_SETTINGS = rs.getString("SECURITY_SETTINGS") == null ? "" : rs.getString("SECURITY_SETTINGS");
-				String dat = 				
-						PROFILE_NAME + "," +  SECURITY_SETTINGS ;
-				bout.write(dat.getBytes());
-			
-			}
-			bout.write("\n".getBytes());
-			bout.write(("TotalRecords," + userCount + ",\"UADM PROFILE DATA STANDARD 2.2\"").getBytes());
-			bout.close();
-            
-			
-		} catch (Exception e){
-			System.out.println("UADM Audit Log. "+ new Date().toString() + ". Error While writing profile data. " + e.getMessage());
-			e.printStackTrace();
-		}
-		finally{
-			try {
-				if(rs != null){
-					rs.close();
-				}
-				if(stmt != null){
-					stmt.close();
-				}
-			} catch (Exception e) {
-				logger.error(EELFLoggerDelegate.errorLogger, ("UADM Audit Log. "+ new Date().toString() + ". Error closing profile rs / stmt"));
-			}
-		}
-		
-	}
-	
-	private void generateUserProfileLogs(Connection con, App app){
-		PreparedStatement stmt = null;
-		ResultSet rs = null;
-		try{
-			USER_PROFILE_LOG_QUERY = SystemProperties.getProperty("user.profile.log.query");
-			stmt = con.prepareStatement(USER_PROFILE_LOG_QUERY);
-			stmt.setInt(1, app.getAppId());
-			rs = stmt.executeQuery();
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-			FileOutputStream fos = new java.io.FileOutputStream(this.getOutputFolder()+app.getMlAppName() + "_userprofiles_" + sdf.format(new Date()) + ".txt");
-            BufferedOutputStream bout = new BufferedOutputStream(fos);
-            
-			String header = "CUID,AWID,APPLICATIONUSERID,PROFILE_NAME";
-			bout.write(header.getBytes());
-			int userCount = 2; //need to include header and footer in count= count
-			while (rs.next()){
-				userCount ++;
-				bout.write("\n".getBytes());
-				String CUID = rs.getString("CUID") == null ? "" : rs.getString("CUID");
-				String AWID = rs.getString("AWID") == null ? "" : rs.getString("AWID");
-				String APPLICATIONUSERID = rs.getString("APPLICATIONUSERID") == null ? "" : rs.getString("APPLICATIONUSERID");
-				String PROFILE_NAME = rs.getString("PROFILE_NAME") == null ? "" : rs.getString("PROFILE_NAME");
-				String dat = 				
-					CUID + "," + AWID + "," +  APPLICATIONUSERID + "," + PROFILE_NAME ;
-				bout.write(dat.getBytes());
-			
-			}
-			bout.write("\n".getBytes());
-			bout.write(("TotalRecords," + userCount + ",\"UADM USER PROFILE DATA STANDARD 2.2\"").getBytes());
-			bout.close();
-            
-			
-		} catch (Exception e){
-			System.out.println("UADM Audit Log. "+ new Date().toString() + ". Error While writing user profile data. " + e.getMessage());
-			e.printStackTrace();
-		}
-		finally{
-			try {
-				if(rs != null){
-					rs.close();
-				}
-				if(stmt != null){
-					stmt.close();
-				}
-			} catch (Exception e) {
-				logger.error(EELFLoggerDelegate.errorLogger, ("UADM Audit Log. "+ new Date().toString() + ". Error closing user profile rs / stmt"));
-			}
-		}
-		
-	}
-
-	@Override
-	protected void executeInternal(JobExecutionContext context)
-			throws JobExecutionException {
-		DataSource dataSource = (DataSource)context.getMergedJobDataMap().get("dataSource");
-		
-		try {
-			setConnection(dataSource.getConnection());
-		} catch (SQLException e) {
-			logger.error(EELFLoggerDelegate.errorLogger, (e.getMessage()));
-
-			return;
-		}
-		logger.info(EELFLoggerDelegate.errorLogger, (" Generate MyLogins feeds"));
-
-		generateLogs();
-		
-	}
-
-	public Connection getConnection() {
-		return connection;
-	}
-
-	public void setConnection(Connection connection) {
-		this.connection = connection;
-	}
-
-
-	
-}
diff --git a/vid/src/main/java/org/openecomp/vid/scheduler/MyLoginsFeedRegistry.java b/vid/src/main/java/org/openecomp/vid/scheduler/MyLoginsFeedRegistry.java
deleted file mode 100644
index ea4583ebc..000000000
--- a/vid/src/main/java/org/openecomp/vid/scheduler/MyLoginsFeedRegistry.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.scheduler;
-
-import java.text.ParseException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.DependsOn;
-import org.springframework.scheduling.quartz.CronTriggerFactoryBean;
-import org.springframework.scheduling.quartz.JobDetailFactoryBean;
-import org.springframework.stereotype.Component;
-
-import org.openecomp.portalsdk.core.scheduler.CronRegistry;
-import org.openecomp.portalsdk.core.util.SystemProperties;
-import com.mchange.v2.c3p0.ComboPooledDataSource;
-
-@Component
-@DependsOn({ "dataSource", "systemProperties" })
-public class MyLoginsFeedRegistry extends CronRegistry {
-
-	// @Autowired
-	// private SystemProperties systemProperties;
-
-	@Autowired
-	public MyLoginsFeedRegistry(ComboPooledDataSource dataSource) {
-		super(dataSource);
-	}
-
-	private static final String groupName = "AppGroup";
-	private static final String jobName = "MyLoginsFeedJob";
-	private static final String triggerName = "MyLoginsFeedTrigger";
-
-	// @Bean
-	public JobDetailFactoryBean jobDetailFactoryBean() {
-		Map map = new HashMap();
-		map.put("dataSource", getDataSource());
-		return jobDetailFactoryBean(groupName, jobName, MyLoginsFeedJob.class, map);
-	}
-
-	// @Bean
-	public CronTriggerFactoryBean cronTriggerFactoryBean() throws ParseException {
-		// "0 * * * * ? *"
-		return cronTriggerFactoryBean(groupName, triggerName,
-				SystemProperties.getProperty(SystemProperties.MYLOGINS_FEED_CRON));
-	}
-
-}
diff --git a/vid/src/main/java/org/openecomp/vid/scheduler/Register.java b/vid/src/main/java/org/openecomp/vid/scheduler/Register.java
deleted file mode 100644
index 6ce4d1b9e..000000000
--- a/vid/src/main/java/org/openecomp/vid/scheduler/Register.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.scheduler;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.quartz.Trigger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.DependsOn;
-import org.springframework.stereotype.Component;
-
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.openecomp.portalsdk.core.scheduler.Registerable;
-import org.openecomp.portalsdk.core.util.SystemProperties;
-
-
-@Component
-@DependsOn({"logRegistry", "myLoginsFeedRegistry", "systemProperties"})
-public class Register implements Registerable {
-
-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(Register.class);
-
-
-	private List scheduleTriggers = new ArrayList();
-	Trigger trigger[] = new Trigger[1];
-
-	
-	@Autowired
-	private LogRegistry logRegistry;
-	
-	@Autowired
-	private MyLoginsFeedRegistry myLoginsFeedRegistry;
-	
-	@Override
-	public Trigger[] getTriggers() {
-		return getScheduleTriggers().toArray(trigger);
-	}
-
-	@Override
-	public void registerTriggers() {
-		// if the property value is not available; the cron will not be added and can be ignored. its safe to ignore the exceptions
-		try {
-			if(SystemProperties.getProperty(SystemProperties.LOG_CRON) != null)
-				getScheduleTriggers().add(logRegistry.getTrigger());
-			
-		} catch(IllegalStateException ies) {
-			logger.info(EELFLoggerDelegate.errorLogger, ("Log Cron not available"));
-		}
-			
-		try {
-			if(SystemProperties.getProperty(SystemProperties.MYLOGINS_FEED_CRON) != null)
-				getScheduleTriggers().add(myLoginsFeedRegistry.getTrigger());
-			
-		} catch(IllegalStateException ies) {
-			logger.info(EELFLoggerDelegate.errorLogger, ("MyLogins Cron not available"));
-		}
-		
-	}
-	
-	
-	public List getScheduleTriggers() {
-		return scheduleTriggers;
-	}
-
-	public void setScheduleTriggers(List scheduleTriggers) {
-		this.scheduleTriggers = scheduleTriggers;
-	}
-	
-	
-
-	
-	
-
-}
diff --git a/vid/src/main/java/org/openecomp/vid/scheduler/RegistryAdapter.java b/vid/src/main/java/org/openecomp/vid/scheduler/RegistryAdapter.java
deleted file mode 100644
index e8068cf8d..000000000
--- a/vid/src/main/java/org/openecomp/vid/scheduler/RegistryAdapter.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.vid.scheduler;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.quartz.Trigger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.quartz.SchedulerFactoryBean;
-import org.springframework.stereotype.Component;
-
-import org.openecomp.portalsdk.core.scheduler.Registerable;
-import org.openecomp.portalsdk.workflow.services.WorkflowScheduleService;
-
-/**
- * TODO REFACTOR
- * moved from org.openecomp.portalsdk.core.scheduler
- * to org.openecomp.portalsdk.scheduler
- *
- */
-@Component
-public class RegistryAdapter {
-	
-	@Autowired
-	private Registerable registry;
-	
-	@Autowired
-	private WorkflowScheduleService workflowScheduleService;
-	
-	private SchedulerFactoryBean schedulerBean;
-	
-	Trigger trigger[] = new Trigger[1];
-	
-	public Trigger[] getTriggers() {
-		
-		registry.registerTriggers();
-		
-		List allTriggers = new ArrayList();
-		
-		List coreTriggers = addCoreTriggers();
-		final Trigger[] extTriggerArray = registry.getTriggers();
-		
-		allTriggers.addAll(Arrays.asList(extTriggerArray));
-		allTriggers.addAll(coreTriggers);
-		
-		return allTriggers.toArray(trigger);
-		
-		
-	}
-	
-	
-	public List addCoreTriggers() {
-		//On startup of the application after crash recovery, invoke workflow schedule trigger
-		List triggers = getWorkflowScheduleService().triggerWorkflowScheduling();
-		return triggers;
-	}
-
-
-	public void setSchedulerBean(SchedulerFactoryBean _schedulerBean) {
-		schedulerBean = _schedulerBean;
-		
-	}
-
-	public SchedulerFactoryBean getSchedulerBean() {
-		return schedulerBean;
-		
-	}
-
-
-	public Registerable getRegistry() {
-		return registry;
-	}
-
-
-	public void setRegistry(Registerable registry) {
-		this.registry = registry;
-	}
-
-
-	public WorkflowScheduleService getWorkflowScheduleService() {
-		return workflowScheduleService;
-	}
-
-
-	public void setWorkflowScheduleService(
-			WorkflowScheduleService workflowScheduleService) {
-		this.workflowScheduleService = workflowScheduleService;
-	}
-	
-}
-
diff --git a/vid/src/main/resources/cache.ccf b/vid/src/main/resources/cache.ccf
deleted file mode 100644
index d21404b09..000000000
--- a/vid/src/main/resources/cache.ccf
+++ /dev/null
@@ -1,30 +0,0 @@
-# DEFAULT CACHE REGION
-jcs.default=DC
-jcs.default.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
-jcs.default.cacheattributes.MaxObjects=1000
-jcs.default.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
-jcs.default.elementattributes=org.apache.jcs.engine.ElementAttributes
-jcs.default.elementattributes.IsEternal=true
-jcs.default.elementattributes.IsSpool=true
-
-
-# MEMORY SHRINKING CONFIGURATION (Commented)
-#jcs.default.cacheattributes.UseMemoryShrinker=true
-#jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600
-#jcs.default.cacheattributes.ShrinkerIntervalSeconds=60
-#jcs.default.cacheattributes.MaxSpoolPerRun=500
-#jcs.default.elementattributes=org.apache.jcs.engine.ElementAttributes
-#jcs.default.elementattributes.IsEternal=false
-
-
-# AUXILLARY CACHE CONFIGURATION
-jcs.auxiliary.DC=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory
-jcs.auxiliary.DC.attributes=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes
-jcs.auxiliary.DC.attributes.DiskPath=/tmp
-
-
-# PRE-DEFINED REGION FOR LOOKUP DATA
-jcs.region.lookUpObjectCache=DC
-jcs.region.lookUpObjectCache.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
-jcs.region.lookUpObjectCache.cacheattributes.MaxObjects=4000
-jcs.region.lookUpObjectCache.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
diff --git a/vid/src/main/resources/cache_template.ccf b/vid/src/main/resources/cache_template.ccf
deleted file mode 100644
index 0ccf45b4e..000000000
--- a/vid/src/main/resources/cache_template.ccf
+++ /dev/null
@@ -1,30 +0,0 @@
-# DEFAULT CACHE REGION
-jcs.default=DC
-jcs.default.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
-jcs.default.cacheattributes.MaxObjects=1000
-jcs.default.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
-jcs.default.elementattributes=org.apache.jcs.engine.ElementAttributes
-jcs.default.elementattributes.IsEternal=true
-jcs.default.elementattributes.IsSpool=true
-
-
-# MEMORY SHRINKING CONFIGURATION (Commented)
-#jcs.default.cacheattributes.UseMemoryShrinker=true
-#jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600
-#jcs.default.cacheattributes.ShrinkerIntervalSeconds=60
-#jcs.default.cacheattributes.MaxSpoolPerRun=500
-#jcs.default.elementattributes=org.apache.jcs.engine.ElementAttributes
-#jcs.default.elementattributes.IsEternal=false
-
-
-# AUXILLARY CACHE CONFIGURATION
-jcs.auxiliary.DC=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory
-jcs.auxiliary.DC.attributes=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes
-jcs.auxiliary.DC.attributes.DiskPath=${CACHE_DIRECTORY}
-
-
-# PRE-DEFINED REGION FOR LOOKUP DATA
-jcs.region.lookUpObjectCache=DC
-jcs.region.lookUpObjectCache.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
-jcs.region.lookUpObjectCache.cacheattributes.MaxObjects=4000
-jcs.region.lookUpObjectCache.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
diff --git a/vid/src/main/resources/catalog.json b/vid/src/main/resources/catalog.json
deleted file mode 100644
index 76dca9cac..000000000
--- a/vid/src/main/resources/catalog.json
+++ /dev/null
@@ -1,174 +0,0 @@
-{
-	"services": {
-		"0346aa9f-57b7-458a-9681-daf5b19d52b0": {
-			"uuid": "0346aa9f-57b7-458a-9681-daf5b19d52b0",
-			"name": "The Worst Service",
-			"version": "1.0",
-			"toscaModelURL": "sampleTosca.csar",
-			"category": "Bad Services",
-			"lifecycleState": "NOT_CERTIFIED_CHECKOUT",
-			"lastUpdaterUserId": "example@example.org",
-			"lastUpdaterFullName": "Example User",
-			"distributionStatus": "DISTRIBUTION_REJECTED",
-			"artifacts": [],
-			"resources": []
-		},
-		"1346aa9f-57b7-458a-9681-daf5b19d52b1": {
-			"uuid": "1346aa9f-57b7-458a-9681-daf5b19d52b1",
-			"name": "The Worst Service",
-			"version": "1.1",
-			"toscaModelURL": "sampleTosca.csar",
-			"category": "Bad Services",
-			"lifecycleState": "CERTIFIED",
-			"lastUpdaterUserId": "example@example.org",
-			"lastUpdaterFullName": "Example User",
-			"distributionStatus": "DISTRIBUTED",
-			"artifacts": [],
-			"resources": []
-		},
-		"3346aa9f-57b7-458a-9681-daf5b19d52b3": {
-			"uuid": "3346aa9f-57b7-458a-9681-daf5b19d52b3",
-			"name": "Bland Service",
-			"version": "1.9",
-			"toscaModelURL": "sampleTosca.csar",
-			"category": "Neutral Services",
-			"lifecycleState": "CERTIFIED",
-			"lastUpdaterUserId": "example@example.org",
-			"lastUpdaterFullName": "Example User",
-			"distributionStatus": "DISTRIBUTION_NOT_APPROVED",
-			"artifacts": [],
-			"resources": []
-		},
-		"2346aa9f-57b7-458a-9681-daf5b19d52b2": {
-			"uuid": "2346aa9f-57b7-458a-9681-daf5b19d52b2",
-			"name": "The Best Service",
-			"version": "1.3",
-			"toscaModelURL": "sampleTosca.csar",
-			"category": "Good Services",
-			"lifecycleState": "CERTIFIED",
-			"lastUpdaterUserId": "example@example.org",
-			"lastUpdaterFullName": "Example User",
-			"distributionStatus": "DISTRIBUTION_APPROVED",
-			"artifacts": [
-					{
-						"artifactUUID": "0cf78c81-1246-45e7-a190-eaa309ee5680",
-						"generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",
-						"artifactName": "The Worst Artifact",
-						"artifactType": "HEAT",
-						"artifactDescription": "This is the worst artifact",
-						"artifactURL": "http://www.openecomp.org/",
-						"artifactTimeout": "60",
-						"artifactChecksum": "A worthy checksum",
-						"artifactVersion": "0.1",
-					},
-					{
-						"artifactUUID": "1cf78c81-1246-45e7-a190-eaa309ee5681",
-						"generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",
-						"artifactName": "The Worst Artifact",
-						"artifactType": "HEAT",
-						"artifactDescription": "This is the worst artifact",
-						"artifactURL": "http://www.openecomp.org/",
-						"artifactTimeout": "60",
-						"artifactChecksum": "A worthy checksum",
-						"artifactVersion": "0.1",
-					},
-					{
-						"artifactUUID": "2cf78c81-1246-45e7-a190-eaa309ee5682",
-						"generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",
-						"artifactName": "The Worst Artifact",
-						"artifactType": "HEAT",
-						"artifactDescription": "This is the worst artifact",
-						"artifactURL": "http://www.openecomp.org/",
-						"artifactTimeout": "60",
-						"artifactChecksum": "A worthy checksum",
-						"artifactVersion": "0.1",
-					}
-			],
-			"resources": []
-		}
-	},
-	"resources": {
-		"2f92b5b0-10ff-4cf4-9531-88546fe88a42": {
-			"uuid": "2f92b5b0-10ff-4cf4-9531-88546fe88a42",
-			"invariantUUID": "df92b5b0-10ff-4cf4-9531-88546fe88a4d",
-			"name": "The Worst Resource",
-			"version": "0.1",
-			"toscaModelURL": "sampleTosca.csar",
-			"toscaModel": "http://www.openecomp.org/",
-			"toscaResourceName": "The Worst Resource (TOSCA)",
-			"category": "Bad Resources",
-			"subCategory": "Really Bad Resources",
-			"resourceType": "VF",
-			"lifecycleState": "CERTIFIED",
-			"lastUpdaterUserId": "example@example.org",
-			"lastUpdaterFullName": "Example User",
-			"artifacts": [
-					{
-						"artifactUUID": "0cf78c81-1246-45e7-a190-eaa309ee5680",
-						"generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",
-						"artifactName": "The Worst Artifact",
-						"artifactType": "HEAT",
-						"artifactDescription": "This is the worst artifact",
-						"artifactURL": "http://www.openecomp.org/",
-						"artifactTimeout": "60",
-						"artifactChecksum": "A worthy checksum",
-						"artifactVersion": "0.1",
-					},
-					{
-						"artifactUUID": "1cf78c81-1246-45e7-a190-eaa309ee5681",
-						"generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",
-						"artifactName": "The Worst Artifact",
-						"artifactType": "HEAT",
-						"artifactDescription": "This is the worst artifact",
-						"artifactURL": "http://www.openecomp.org/",
-						"artifactTimeout": "60",
-						"artifactChecksum": "A worthy checksum",
-						"artifactVersion": "0.1",
-					},
-					{
-						"artifactUUID": "2cf78c81-1246-45e7-a190-eaa309ee5682",
-						"generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",
-						"artifactName": "The Worst Artifact",
-						"artifactType": "HEAT",
-						"artifactDescription": "This is the worst artifact",
-						"artifactURL": "http://www.openecomp.org/",
-						"artifactTimeout": "60",
-						"artifactChecksum": "A worthy checksum",
-						"artifactVersion": "0.1",
-					}
-			]
-		},
-		"0f92b5b0-10ff-4cf4-9531-88546fe88a40": {
-			"uuid": "0f92b5b0-10ff-4cf4-9531-88546fe88a40",
-			"invariantUUID": "df92b5b0-10ff-4cf4-9531-88546fe88a4d",
-			"name": "The Worst Resource",
-			"version": "0.1",
-			"toscaModelURL": "sampleTosca.csar",
-			"toscaModel": "http://www.openecomp.org/",
-			"toscaResourceName": "The Worst Resource (TOSCA)",
-			"category": "Bad Resources",
-			"subCategory": "Really Bad Resources",
-			"resourceType": "VF",
-			"lifecycleState": "CERTIFIED",
-			"lastUpdaterUserId": "example@example.org",
-			"lastUpdaterFullName": "Example User",
-			"artifacts": []
-		},
-		"1f92b5b0-10ff-4cf4-9531-88546fe88a41": {
-			"uuid": "1f92b5b0-10ff-4cf4-9531-88546fe88a41",
-			"invariantUUID": "df92b5b0-10ff-4cf4-9531-88546fe88a4d",
-			"name": "The Worst Resource",
-			"version": "0.1",
-			"toscaModelURL": "sampleTosca.csar",
-			"toscaModel": "http://www.openecomp.org/",
-			"toscaResourceName": "The Worst Resource (TOSCA)",
-			"category": "Bad Resources",
-			"subCategory": "Really Bad Resources",
-			"resourceType": "VF",
-			"lifecycleState": "CERTIFIED",
-			"lastUpdaterUserId": "example@example.org",
-			"lastUpdaterFullName": "Example User",
-			"artifacts": []
-		}
-	}
-}
\ No newline at end of file
diff --git a/vid/src/main/resources/json/mso/asyncRequestStatus b/vid/src/main/resources/json/mso/asyncRequestStatus
deleted file mode 100644
index a7a9f748e..000000000
--- a/vid/src/main/resources/json/mso/asyncRequestStatus
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "request structure",
-    "properties": {
-        "correlator": {
-            "description": "Optional correlation Id originally provided with the request in requestInfo",
-            "type": "string"
-        },
-        "finishTime": {
-            "description": "Date and time the request was finished in GMT with the following sample format: Wed, 15 Oct 2014 13:01:52 GMT",
-            "type": "string"
-        },
-        "instanceIds": {},
-        "requestId": {
-            "description": "UUID for the request generated by the instantiation service",
-            "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$",
-            "type": "string"
-        },
-        "requestScope": {
-            "description": "short description of the entity being operated on",
-            "enum": [
-                "network",
-                "service",
-                "vfModule",
-                "vnf",
-                "volumeGroup"
-            ],
-            "type": "string"
-        },
-        "requestStatus": {},
-        "requestType": {
-            "description": "short description of the action being performed on the requestScope",
-            "enum": [
-                "createInstance",
-                "deleteInstance",
-                "replaceInstance",
-                "updateInstance"
-            ],
-            "type": "string"
-        },
-        "startTime": {
-            "description": "Date and time the request was created in GMT with the following sample format: Wed, 15 Oct 2014 13:01:52 GMT",
-            "type": "string"
-        }
-    },
-    "required": [
-        "requestId",
-        "requestScope",
-        "requestStatus",
-        "requestType",
-        "startTime"
-    ],
-    "type": "object"
-}
diff --git a/vid/src/main/resources/json/mso/cloudConfiguration b/vid/src/main/resources/json/mso/cloudConfiguration
deleted file mode 100644
index ecc21369a..000000000
--- a/vid/src/main/resources/json/mso/cloudConfiguration
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-04/schema#",
-	"description": "fields communicating the cloud configuration in a standard way",
-	"type": "object",
-	"properties": {  
-		"lcpCloudRegionId": {
-			"description": "LCP Node Location identifier",
-			"type": "string"
-		},  
-		"tenantId": {
-			"description": "Openstack tenant id",
-			"type": "string"
-		}  
-	}
-}
\ No newline at end of file
diff --git a/vid/src/main/resources/json/mso/instanceIds b/vid/src/main/resources/json/mso/instanceIds
deleted file mode 100644
index 2ad73ba51..000000000
--- a/vid/src/main/resources/json/mso/instanceIds
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-04/schema#",
-			"description": "instanceIds that may be associated with a particular request",
-			"type": "object",
-			"properties": {  
-				"networkInstanceId": {
-					"description": "UUID for the network instance (if any)",
-					"type": "string"
-				},  
-				"serviceInstanceId": {
-					"description": "UUID for the service instance",
-					"type": "string"
-				},  
-				"vfModuleInstanceId": {
-					"description": "UUID for the vfModule instance (if any)",
-					"type": "string"
-				},  
-				"vnfInstanceId": {
-					"description": "UUID for the vnf instance (if any)",
-					"type": "string"
-				},  
-				"volumeGroupInstanceId": {
-					"description": "UUID for the volume group instance (if any)",
-					"type": "string"
-				}  
-		}
-}
-
-			
\ No newline at end of file
diff --git a/vid/src/main/resources/json/mso/modelInfo b/vid/src/main/resources/json/mso/modelInfo
deleted file mode 100644
index 3fd604feb..000000000
--- a/vid/src/main/resources/json/mso/modelInfo
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"$schema": "http://json-schema.org/draft-04/schema#",
-	"description": "fields describing the SDC entity being operated on by the request",
-	"type": "object",
-	"properties": {
-		"modelCustomizationName": {
-			"description": "reference to the customized set of parameters associated with a model in a given service context",
-			"type": "string"
-		},
-		"modelInvariantId": {
-			"description": "Invariant UUID for the model name, irrespective of the version, as defined in SDC--authoritative",
-			"type": "string",
-			"pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
-		},
-		"modelName": {
-			"description": "name of the model as defined in SDC--not authoritative",
-			"type": "string"
-		},
-		"modelNameVersionId": {
-			"description": "UUID for the model name and version combination as defined in SDC--authoritative",
-			"type": "string",
-			"pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
-		},
-		"modelType": {
-			"description": "short description of the entity being operated on",
-			"type": "string",
-			"enum": [
-				"network",
-				"service",
-				"vfModule",
-				"vnf",
-				"volumeGroup"
-			]
-		},
-		"modelVersion": {
-			"description": "the version of the model as defined in SDC--not authoritative",
-			"type": "number"
-		}
-	},
-	"required": ["modelType"]
-}
\ No newline at end of file
diff --git a/vid/src/main/resources/json/mso/relatedInstance b/vid/src/main/resources/json/mso/relatedInstance
deleted file mode 100644
index eb8999fb0..000000000
--- a/vid/src/main/resources/json/mso/relatedInstance
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"description": "modelInfo and optional instanceId and instanceName for a model related to the modelInfo being operated on",
-	"type": "object",
-	"properties": {
-		"instanceName": {
-			"description": "optional name for the instance Id of the related model",
-			"type": "string"
-		},
-		"instanceId": {
-			"description": "instance Id for the related model",
-			"type": "string"
-		},
-		"modelInfo": {}
-	},
-	"required": ["modelInfo"]
-}
\ No newline at end of file
diff --git a/vid/src/main/resources/json/mso/relatedModel b/vid/src/main/resources/json/mso/relatedModel
deleted file mode 100644
index ffc7b13f9..000000000
--- a/vid/src/main/resources/json/mso/relatedModel
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"$schema": "http://json-schema.org/draft-04/schema#",
-	"description": "modelInfo and optional instance id for a model related to the modelInfo being operated on",
-	"type": "object",
-	"properties": {			
-		"instanceId": {
-			"description": "instance Id for the related model",
-			"type": "string"
-		},
-		"modelInfo": {}
-	},
-	"required": [ "modelInfo" ]
-}
-
-
diff --git a/vid/src/main/resources/json/mso/request b/vid/src/main/resources/json/mso/request
deleted file mode 100644
index 7ea162828..000000000
--- a/vid/src/main/resources/json/mso/request
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-	"$schema": "http://json-schema.org/draft-04/schema#",
-	"description": "request structure",
-	"type": "object",
-	"properties": {
-		"finishTime": {
-			"description": "Date and time the request was finished in GMT with the following sample format: Wed, 15 Oct 2014 13:01:52 GMT",
-			"type": "string"
-		},
-		"instanceIds": {},
-		"requestDetails": {},
-		"requestId": {
-			"description": "UUID for the request generated by the instantiation service",
-			"type": "string",
-			"pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
-		},
-		"requestScope": {
-			"description": "short description of the entity being operated on",
-			"type": "string",
-			"enum": [
-				"network",
-				"service",
-				"vfModule",
-				"vnf",
-				"volumeGroup"
-			]
-		},
-		"requestStatus": {},
-		"requestType": {
-			"description": "short description of the action being performed on the requestScope",
-			"type": "string",
-			"enum": [
-				"createInstance",
-				"deleteInstance",
-				"replaceInstance",
-				"updateInstance"
-			]
-		},
-		"startTime": {
-			"description": "Date and time the request was created in GMT with the following sample format: Wed, 15 Oct 2014 13:01:52 GMT",
-			"type": "string"
-		}
-	},
-	"required": ["requestDetails", "requestId", "requestScope", "requestType", "startTime"]
-}
\ No newline at end of file
diff --git a/vid/src/main/resources/json/mso/requestDetails b/vid/src/main/resources/json/mso/requestDetails
deleted file mode 100644
index 70aa14e3a..000000000
--- a/vid/src/main/resources/json/mso/requestDetails
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "description": "aggregates the context, configuraiton and detailed parameters associated with the request into a single structure",
-    "properties": {
-        "cloudConfiguration": {},
-        "modelInfo": {},
-        "relatedModelList": {},
-        "requestInfo": {},
-        "requestParameters": {},
-        "subscriberInfo": {}
-    },
-    "type": "object"
-}
-
diff --git a/vid/src/main/resources/json/mso/requestError b/vid/src/main/resources/json/mso/requestError
deleted file mode 100644
index daab8055a..000000000
--- a/vid/src/main/resources/json/mso/requestError
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "standard request error data structure",
-    "properties": {
-        "messageId": {
-            "description": "Unique message identifier of the format ABCnnnn where ABC is either SVC for Service Exceptions or POL for Policy Exception",
-            "type": "string"
-        },
-        "text": {
-            "description": "Message text, with replacement variables marked with %n, where n is an index into the list of  elements, starting at 1",
-            "type": "string"
-        },
-        "url": {
-            "description": "Hyperlink to a detailed error resource e.g., an HTML page for browser user agents",
-            "type": "string"
-        },
-        "variables": {
-            "description": "List of zero or more strings that represent the contents of the variables used by the message text",
-            "type": "string"
-        }
-    },
-    "required": [
-        "messageId",
-        "text"
-    ],
-    "type": "object"
-}
diff --git a/vid/src/main/resources/json/mso/requestInfo b/vid/src/main/resources/json/mso/requestInfo
deleted file mode 100644
index 9783b8d94..000000000
--- a/vid/src/main/resources/json/mso/requestInfo
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-	"$schema": "http://json-schema.org/draft-04/schema#",
-	"description": "fields providing general context information for the request",
-	"properties": {
-		"billingAccountNumber": {
-			"description": "billing account associated with the model being operated on",
-			"type": "string"
-		},
-		"callbackUrl": {
-			"description": "client URL to use for asynchronous responses",
-			"type": "string"
-		},
-		"correlator": {
-			"description": "Optional correlationId for async callback requests",
-			"type": "string"
-		},
-		"instanceName": {
-			"description": "Client provided name for the instance being operated on by the operation (note: not guaranteed to be unique)",
-			"type": "string"
-		},
-		"orderNumber": {
-			"description": "reference to an order",
-			"type": "string"
-		},
-		"orderVersion": {
-			"description": "order version number",
-			"type": "number"
-		},
-		"productFamilyId": {
-			"description": "UUID for the product family associated with the model being operated on",
-			"type": "string"
-		},
-		"source": {
-			"description": "source of the request--not authoritative--actual source revealed via authentication",
-			"type": "string"
-		},
-		"suppressRollback": {
-			"description": "true or false boolean indicating whether rollbacks should be suppressed on failures",
-			"type": "boolean"
-		}
-	},
-
-	"type": "object"
-}
\ No newline at end of file
diff --git a/vid/src/main/resources/json/mso/requestParameters b/vid/src/main/resources/json/mso/requestParameters
deleted file mode 100644
index be4e279c6..000000000
--- a/vid/src/main/resources/json/mso/requestParameters
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "type": "object",
-  "properties": {
-        "subscriptionServiceType": {
-          "type": "string"
-        },
-        "userParams": {
-          "type": "array",
-          "items": {
-            "type": "object",
-            "properties": {
-              "name": {
-                "type": "string"
-              },
-              "value": {
-                "type": "string"
-              }
-            }
-          }
-        }
-      }
-    }
\ No newline at end of file
diff --git a/vid/src/main/resources/json/mso/requestReferences b/vid/src/main/resources/json/mso/requestReferences
deleted file mode 100644
index 8a161cda1..000000000
--- a/vid/src/main/resources/json/mso/requestReferences
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "provides the instanceId and requestId associated with the request",
-			"type": "object",
-			"properties": { 
-		        "instanceId": {
-			        "description": "UUID for the service instance",
-			        "type": "string",
-					"pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
-				},
-		        "requestId": {
-			        "description": "UUID for the request",
-			        "type": "string",
-					"pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
-				}
-			},
-			"required": [ "instanceId", "requestId" ]
-}
diff --git a/vid/src/main/resources/json/mso/requestStatus b/vid/src/main/resources/json/mso/requestStatus
deleted file mode 100644
index 7a438b130..000000000
--- a/vid/src/main/resources/json/mso/requestStatus
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "fields describing the status of a request",
-    "properties": {
-        "percentProgress": {
-            "description": "percentage complete estimate from 0 to 100",
-            "type": "number"
-        },
-        "requestState": {
-            "description": "short description of the instantiation state",
-            "enum": [
-                "complete",
-                "failed",
-                "inProgress"
-            ],
-            "type": "string"
-        },
-        "statusMessage": {
-            "description": "additional descriptive information about the status",
-            "type": "string"
-        },
-        "timestamp": {
-            "description": "GMT Datetime the requestStatus was created e.g.: Wed, 15 Oct 2014 13:01:52 GMT",
-            "type": "string"
-        },
-        "wasRolledBack": {
-			"description": "true or false boolean indicating whether the request was rolled back",
-			"type": "boolean"
-		}
-        
-    },
-    "required": [
-        "requestState",
-        "timestamp"
-    ],
-    "type": "object"
-}
diff --git a/vid/src/main/resources/json/mso/response b/vid/src/main/resources/json/mso/response
deleted file mode 100644
index be58b76cb..000000000
--- a/vid/src/main/resources/json/mso/response
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"$schema": "http://json-schema.org/draft-04/schema#",
-	"description": "response structure",
-	"type": "object",
-	"code": {
-			"description": "Return code",
-			"type": "string"
-	},
-	"message": {
-		"description": "Result message",
-			"type": "string"
-	}
-}
\ No newline at end of file
diff --git a/vid/src/main/resources/json/mso/subscriberInfo b/vid/src/main/resources/json/mso/subscriberInfo
deleted file mode 100644
index fc0f02c88..000000000
--- a/vid/src/main/resources/json/mso/subscriberInfo
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"$schema": "http://json-schema.org/draft-04/schema#",
-	"description": "fields providing information about the subscriber associated with the request",
-	"type": "object",
-	"properties": {
-		"globalSubscriberId": {
-			"description": "global Customer Id understood by A&AI",
-			"type": "string"
-		},
-		"subscriberCommonSiteId": {
-			"description": "id representing the location of the subscriber",
-			"type": "string"
-		},
-		"subscriberName": {
-			"description": "name of the customer or subscriber",
-			"type": "string"
-		}
-	}
-}
\ No newline at end of file
diff --git a/vid/src/main/resources/logback.xml b/vid/src/main/resources/logback.xml
deleted file mode 100644
index 0008518ba..000000000
--- a/vid/src/main/resources/logback.xml
+++ /dev/null
@@ -1,369 +0,0 @@
-
-
-
-  
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-   
-  
-
-  
-
-  
-
-  
-
-  
-  
-
-  
-  
-    
-      ${defaultLoggerPattern}
-    
-  
-
-  
-  
-  
-
-  
-    
-    
-  
-    ${logDirectory}/${generalLogName}.log
-     
-       
-      ${logDirectory}/${generalLogName}.%d{yyyy-MM-dd}.log.zip 
- 
-       
-      30 
-      3GB 
- 
-    
-    
-      ${applicationLoggerPattern}
-    
-    
-  
-  
-  
-    256
-    
-    true
-    
-  
-
-  
-  
-   
-  
-  
-
-  
-  
-  
-  
-  
-  
-  
-    
-  
-    ${logDirectory}/${auditLogName}.log
-     
-       
-      ${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.log.zip 
- 
-       
-      30 
-      3GB 
- 
-    
-    
-         ${auditLoggerPattern}
-    
-  
-  
-    256
-    
-  
-
-  
-    ${logDirectory}/${metricsLogName}.log
-     
-       
-      ${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.log.zip 
- 
-       
-      30 
-      3GB 
- 
-    
-    
-      ${metricsLoggerPattern}
-    
-  
-  
-  
-  
-    256
-    
-  
-   
-  
-    ${logDirectory}/${errorLogName}.log
-     
-       
-      ${logDirectory}/${errorLogName}.%d{yyyy-MM-dd}.log.zip 
- 
-       
-      30 
-      3GB 
- 
-    
-    
-      ${errorLoggerPattern}
-    
-  
-  
-  
-    256
-    
-  
-  
-   
-    ${debugLogDirectory}/${debugLogName}.log
-     
-       
-      ${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.log.zip 
- 
-       
-      30 
-      3GB 
- 
-    
-    
-      ${defaultLoggerPattern}
-    
-  
-  
-  
-    256
-    
-  
- 
-  
-  
-  
-  
-  
-    
-  
-  
-  
-  
-  
-    
-  
-  
-  
-        
-  
-    
-  
-  	
-  
-  
-   
-        
-  
-  
-    
-  
-    
-  
-
-
diff --git a/vid/src/main/resources/logback_template.xml b/vid/src/main/resources/logback_template.xml
deleted file mode 100644
index fe26f5448..000000000
--- a/vid/src/main/resources/logback_template.xml
+++ /dev/null
@@ -1,341 +0,0 @@
-
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-   
-  
-  
-  
-  
-  
-  
-    
-      ${defaultPattern}
-    
-  
-
-  
-  
-  
-
-  
-    
-    
-  
-    ${logDirectory}/${generalLogName}.log
-    
-      ${logDirectory}/${generalLogName}.%i.log.zip
-      
-      1
-      9
-    
-    
-      5MB
-    
-    
-      ${defaultPattern}
-    
-    
-  
-  
-  
-    256
-    
-  
-
-  
-  
-   
-  
-  
-
-  
-  
-  
-  
-  
-  
-  
-    
-  
-    ${logDirectory}/${auditLogName}.log
-    
-      ${logDirectory}/${auditLogName}.%i.log.zip
-      
-      1
-      9
-    
-    
-      5MB
-    
-    
-         ${defaultPattern}
-    
-  
-  
-    256
-    
-  
-
-  
-    ${logDirectory}/${metricsLogName}.log
-    
-      ${logDirectory}/${metricsLogName}.%i.log.zip
-      
-      1
-      9
-    
-    
-      5MB
-    
-    
-      
-      ${defaultPattern}
-    
-  
-  
-  
-  
-    256
-    
-  
-   
-  
-    ${logDirectory}/${errorLogName}.log
-    
-      ${logDirectory}/${errorLogName}.%i.log.zip
-      
-      1
-      9
-    
-    
-      5MB
-    
-    
-      ${defaultPattern}
-    
-  
-  
-  
-    256
-    
-  
-  
-   
-    ${debugLogDirectory}/${debugLogName}.log
-    
-      ${debugLogDirectory}/${debugLogName}.%i.log.zip
-      
-      1
-      9
-    
-    
-      5MB
-    
-    
-      ${debugLoggerPattern}
-    
-  
-  
-  
-    256
-    
-    true
-  
- 
-  
-  
-  
-  
-  
-    
-  
-  
-  
-  
-  
-    
-  
-  
-  
-        
-  
-    
-  
-  	
-  
-  
-   
-        
-  
-  
-    
-  
-    
-  
-
-
diff --git a/vid/src/main/resources/mchange-log.properties b/vid/src/main/resources/mchange-log.properties
deleted file mode 100644
index 77e260bbc..000000000
--- a/vid/src/main/resources/mchange-log.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###
-# ================================================================================
-# eCOMP Portal SDK
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#      http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ================================================================================
-###
-# Direct the proprietary logger used by com.mchange.c3p0 to use slf4j
-
-com.mchange.v2.log.MLog=com.mchange.v2.log.FallbackMLog
-com.mchange.v2.log.FallbackMLog.DEFAULT_CUTOFF_LEVEL=OFF
diff --git a/vid/src/main/resources/my.cnf b/vid/src/main/resources/my.cnf
deleted file mode 100644
index 9cee26ed1..000000000
--- a/vid/src/main/resources/my.cnf
+++ /dev/null
@@ -1,192 +0,0 @@
-# MariaDB database server configuration file.
-#
-# You can copy this file to one of:
-# - "/etc/mysql/my.cnf" to set global options,
-# - "~/.my.cnf" to set user-specific options.
-#
-# One can use all long options that the program supports.
-# Run program with --help to get a list of available options and with
-# --print-defaults to see which it would actually understand and use.
-#
-# For explanations see
-# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
-
-# This will be passed to all mysql clients
-# It has been reported that passwords should be enclosed with ticks/quotes
-# escpecially if they contain "#" chars...
-# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
-[client]
-port            = 3306
-socket          = /var/run/mysqld/mysqld.sock
-
-# Here is entries for some specific programs
-# The following values assume you have at least 32M ram
-
-# This was formally known as [safe_mysqld]. Both versions are currently parsed.
-[mysqld_safe]
-socket          = /var/run/mysqld/mysqld.sock
-nice            = 0
-
-[mysqld]
-lower_case_table_names = 1
-skip-host-cache
-skip-name-resolve
-#
-# * Basic Settings
-#
-#user           = mysql
-pid-file        = /var/run/mysqld/mysqld.pid
-socket          = /var/run/mysqld/mysqld.sock
-port            = 3306
-basedir         = /usr
-datadir         = /var/lib/mysql
-tmpdir          = /tmp
-lc_messages_dir = /usr/share/mysql
-lc_messages     = en_US
-skip-external-locking
-#
-# Instead of skip-networking the default is now to listen only on
-# localhost which is more compatible and is not less secure.
-#bind-address           = 127.0.0.1
-#
-# * Fine Tuning
-#
-max_connections         = 100
-connect_timeout         = 5
-wait_timeout            = 600
-max_allowed_packet      = 16M
-thread_cache_size       = 128
-sort_buffer_size        = 4M
-bulk_insert_buffer_size = 16M
-tmp_table_size          = 32M
-max_heap_table_size     = 32M
-#
-# * MyISAM
-#
-# This replaces the startup script and checks MyISAM tables if needed
-# the first time they are touched. On error, make copy and try a repair.
-myisam_recover_options = BACKUP
-key_buffer_size         = 128M
-#open-files-limit       = 2000
-table_open_cache        = 400
-myisam_sort_buffer_size = 512M
-concurrent_insert       = 2
-read_buffer_size        = 2M
-read_rnd_buffer_size    = 1M
-#
-# * Query Cache Configuration
-#
-# Cache only tiny result sets, so we can fit more in the query cache.
-query_cache_limit               = 128K
-query_cache_size                = 64M
-# for more write intensive setups, set to DEMAND or OFF
-#query_cache_type               = DEMAND
-#
-# * Logging and Replication
-#
-# Both location gets rotated by the cronjob.
-# Be aware that this log type is a performance killer.
-# As of 5.1 you can enable the log at runtime!
-#general_log_file        = /var/log/mysql/mysql.log
-#general_log             = 1
-#
-# Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf.
-#
-# we do want to know about network errors and such
-#log_warnings           = 2
-#
-# Enable the slow query log to see queries with especially long duration
-#slow_query_log[={0|1}]
-slow_query_log_file     = /var/log/mysql/mariadb-slow.log
-long_query_time = 10
-#log_slow_rate_limit    = 1000
-#log_slow_verbosity     = query_plan
-
-#log-queries-not-using-indexes
-#log_slow_admin_statements
-#
-# The following can be used as easy to replay backup logs or for replication.
-# note: if you are setting up a replication slave, see README.Debian about
-#       other settings you may need to change.
-#server-id              = 1
-#report_host            = master1
-#auto_increment_increment = 2
-#auto_increment_offset  = 1
-#log_bin                        = /var/log/mysql/mariadb-bin
-#log_bin_index          = /var/log/mysql/mariadb-bin.index
-# not fab for performance, but safer
-#sync_binlog            = 1
-expire_logs_days        = 10
-max_binlog_size         = 100M
-# slaves
-#relay_log              = /var/log/mysql/relay-bin
-#relay_log_index        = /var/log/mysql/relay-bin.index
-#relay_log_info_file    = /var/log/mysql/relay-bin.info
-#log_slave_updates
-#read_only
-#
-# If applications support it, this stricter sql_mode prevents some
-# mistakes like inserting invalid dates etc.
-#sql_mode               = NO_ENGINE_SUBSTITUTION,TRADITIONAL
-#
-# * InnoDB
-#
-# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
-# Read the manual for more InnoDB related options. There are many!
-default_storage_engine  = InnoDB
-# you can't just change log file size, requires special procedure
-#innodb_log_file_size   = 50M
-innodb_buffer_pool_size = 256M
-innodb_log_buffer_size  = 8M
-innodb_file_per_table   = 1
-innodb_open_files       = 400
-innodb_io_capacity      = 400
-innodb_flush_method     = O_DIRECT
-#
-# * Security Features
-#
-# Read the manual, too, if you want chroot!
-# chroot = /var/lib/mysql/
-#
-# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
-#
-# ssl-ca=/etc/mysql/cacert.pem
-# ssl-cert=/etc/mysql/server-cert.pem
-# ssl-key=/etc/mysql/server-key.pem
-
-#
-# * Galera-related settings
-#
-[galera]
-# Mandatory settings
-#wsrep_on=ON
-#wsrep_provider=
-#wsrep_cluster_address=
-#binlog_format=row
-#default_storage_engine=InnoDB
-#innodb_autoinc_lock_mode=2
-#
-# Allow server to accept connections on all interfaces.
-#
-#bind-address=0.0.0.0
-#
-# Optional setting
-#wsrep_slave_threads=1
-#innodb_flush_log_at_trx_commit=0
-
-[mysqldump]
-quick
-quote-names
-max_allowed_packet      = 16M
-
-[mysql]
-#no-auto-rehash # faster start of mysql but no tab completion
-
-[isamchk]
-key_buffer              = 16M
-
-#
-# * IMPORTANT: Additional settings that can override those from this file!
-#   The files must end with '.cnf', otherwise they'll be ignored.
-#
-!includedir /etc/mysql/conf.d/
\ No newline at end of file
diff --git a/vid/src/main/resources/portal.properties b/vid/src/main/resources/portal.properties
deleted file mode 100644
index c5a04db5b..000000000
--- a/vid/src/main/resources/portal.properties
+++ /dev/null
@@ -1,68 +0,0 @@
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#      http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ================================================================================
-###
-# Properties read by ECOMP Framework library, ecompFW.jar
-
-##########################################################################
-# The following properties should NOT be changed by partner applications.
-##########################################################################
-
-portal.api.prefix = /api
-max.idle.time = 5
-user.attribute.name = user_attribute
-
-# CSP settings
-#csp_cookie_name          = attESSec
-#csp_gate_keeper_prod_key = PROD
-#testing=testing
-
-#Use REST API instead of UEB to fetch the functional menu data
-use_rest_for_functional_menu=true
-
-##########################################################################
-# The following properties MUST be changed by partner applications.
-##########################################################################
-
-# Name of java class that implements the OnBoardingApiService interface.
-portal.api.impl.class = org.openecomp.portalsdk.core.onboarding.client.OnBoardingApiServiceImpl
-
-# CSP Global Log On for single sign on
-ecomp_redirect_url = http://portal.openecomp.org:8989/login
-
-# URL of the ECOMP Portal REST API
-
-ecomp_rest_url = http://portal.openecomp.org:8989/login
-
-# Applications do not need to run a UEB listener in 1610.  
-ueb_listeners_enable = false
-
-# UEB Configuration
-# In release 1607, all 6 entries below were required.
-# In release 1610, if key ueb_listeners_enable is set to false,
-# then only the ueb_app_key is required.
-# UEB servers
-ueb_url_list = todo_ueb_url_list
-# ECOMP Portal listens on this UEB topic
-ecomp_portal_inbox_name = ECOMP-PORTAL-INBOX-DEV-LOCAL
-
-# Replace these 3 default values with the ones for your specific App,
-# as shown on the on-boarding page on the ECOMP Portal web application.
-ueb_app_key = oVGikIIFjzjUNtph
-ueb_app_secret = 8xJNPcgKJJgHhfbth6C1yN3e
-ueb_app_mailbox_name = ECOMP-PORTAL-OUTBOX-TEST-77621
-# Consumer group name for UEB topic.
-# Use the special tag to generate a unique one for each sdk-app server.
-ueb_app_consumer_group_name = {UUID}
-
-decryption_key				  = AGLDdG4D04BKm2IxIWEr8o==
diff --git a/vid/src/main/resources/portal_template.properties b/vid/src/main/resources/portal_template.properties
deleted file mode 100644
index d15c199b3..000000000
--- a/vid/src/main/resources/portal_template.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-# Properties read by ECOMP Framework library, ecompFW.jar
-
-portal.api.impl.class = org.openecomp.portalsdk.core.onboarding.client.OnBoardingApiServiceImpl
-portal.api.prefix = /api
-max.idle.time = 5
-user.attribute.name = user_attribute
-
-# CSP Global Log On for single sign on
-ecomp_redirect_url	= ${VID_ECOMP_REDIRECT_URL}
-
-# CSP settings
-csp_cookie_name          = attESSec
-csp_gate_keeper_prod_key = PROD
-testing=testing
-
-# URL of the ECOMP Portal REST API
-ecomp_rest_url = ${VID_ECOMP_REST_URL}
-
-# UEB servers
-ueb_url_list = ${VID_UEB_URL_LIST}
-
-# ECOMP Portal listens here 
-ecomp_portal_inbox_name = ${VID_ECOMP_PORTAL_INBOX_NAME}
-
-# Replace these 3 default values with the ones for your specific App,
-# as shown on the on-boarding page on the ECOMP Portal website.
-ueb_app_key = ${VID_UEB_APP_KEY}
-ueb_app_secret = ${VID_UEB_APP_SECRET}
-ueb_app_mailbox_name = ${VID_UEB_APP_MAILBOX_NAME}
-# Consumer group name for UEB topic.
-# Use the special tag to generate a unique one for each sdk-app server.
-ueb_app_consumer_group_name = ${VID_UEB_CONSUMER_GROUP}
-
-ueb_listeners_enable = ${VID_UEB_LISTENERS_ENABLE}
-ueb_rest_for_function_menu = true
diff --git a/vid/src/main/resources/state-rules.drl b/vid/src/main/resources/state-rules.drl
deleted file mode 100644
index 5a0324980..000000000
--- a/vid/src/main/resources/state-rules.drl
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.openecomp.portalsdk.core.drools;
-global String age
-
-rule "Default"
-when
-$droolsRuleService : DroolsRuleServiceImpl( state != null )
-then
-System.out.println($droolsRuleService.accessLabel() +" "+ $droolsRuleService.getState() +" state legal age is " + getDefaultIfNull(age));
-$droolsRuleService.setResultsString($droolsRuleService.getState()+" state legal age is " + getDefaultIfNull(age));
-end
-
-rule "Drools NJ"
-when
-$droolsRuleService : DroolsRuleServiceImpl( state == "NJ" )
-then
-System.out.println($droolsRuleService.accessLabel() +" "+ "NJ state legal age is " + getDefaultIfNull(age));
-$droolsRuleService.setResultsString("NJ state legal age is " + getDefaultIfNull(age));
-end
-
-rule "Drools KY"
-when
-$droolsRuleService : DroolsRuleServiceImpl( state == "KY" )
-then
-System.out.println($droolsRuleService.accessLabel() +" "+ "KY state legal age is " + getDefaultIfNull("20"));
-$droolsRuleService.setResultsString("KY state legal age is " + getDefaultIfNull("20"));
-end
-
-rule "Drools NY"
-when
-$droolsRuleService : DroolsRuleServiceImpl( state == "NY" )
-then
-System.out.println($droolsRuleService.accessLabel() +" "+ "NY state legal age is " + getDefaultIfNull("21"));
-$droolsRuleService.setResultsString("NY state legal age is " + getDefaultIfNull("21"));
-end
-
-function String getDefaultIfNull(String age) {
-return age == null ? "18" : age;
-}
diff --git a/vid/src/main/resources/vid-data.sql b/vid/src/main/resources/vid-data.sql
deleted file mode 100644
index 986c058e4..000000000
--- a/vid/src/main/resources/vid-data.sql
+++ /dev/null
@@ -1,347 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-USE vid_openecomp;
-
-DELETE FROM `fn_datasource`;
-TRUNCATE `fn_menu`;
-DELETE FROM `fn_role_function`;
-DELETE FROM `fn_restricted_url`;
-DELETE FROM `fn_tab_selected`;
-DELETE FROM `fn_tab`;
-DELETE FROM `fn_function`;
-DELETE FROM `fn_lu_alert_method`;
-DELETE FROM `fn_lu_activity`;
-DELETE FROM `fn_lu_menu_set`;
-DELETE FROM `fn_lu_priority`;
-DELETE FROM `fn_lu_tab_set`;
-
---
--- Dumping data for table `cr_raptor_action_img`
---
-REPLACE INTO `cr_raptor_action_img` VALUES ('CALENDAR','/static/fusion/raptor/img/Calendar-16x16.png');
-REPLACE INTO `cr_raptor_action_img` VALUES ('DELETE','/static/fusion/raptor/img/deleteicon.gif');
-
---
--- Dumping data for table `fn_app`
---
-INSERT IGNORE INTO `fn_app` VALUES (1,'Default',null,'Some Default Description','Some Default Note',null,null,null,'ECPP','?',1,'okYTaDrhzibcbGVq5mjkVQ==','N','N',null,'Default',null,null,'ECOMP-PORTAL-INBOX');
-
-
-
---
--- Dumping data for table `fn_function`
---
-INSERT INTO `fn_function` VALUES ('1','test role function') ON DUPLICATE KEY UPDATE FUNCTION_NAME='test role function';
-INSERT INTO `fn_function` VALUES ('doclib','Document Library') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Document Library';
-INSERT INTO `fn_function` VALUES ('doclib_admin','Document Library Admin') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Document Library Admin';
-INSERT INTO `fn_function` VALUES ('login','Login') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Login';
-INSERT INTO `fn_function` VALUES ('menu_admin','Admin Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Admin Menu';
-INSERT INTO `fn_function` VALUES ('menu_ajax','Ajax Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Ajax Menu';
-INSERT INTO `fn_function` VALUES ('menu_servicemodels','Browse SDC Service Instances') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Browse SDC Service Instances';
-INSERT INTO `fn_function` VALUES ('menu_concept','CoNCEPT') ON DUPLICATE KEY UPDATE FUNCTION_NAME='CoNCEPT';
-INSERT INTO `fn_function` VALUES ('menu_customer','Customer Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Customer Menu';
-INSERT INTO `fn_function` VALUES ('menu_customer_create','Customer Create') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Customer Create';
-INSERT INTO `fn_function` VALUES ('menu_doclib','Document Library Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Document Library Menu';
-INSERT INTO `fn_function` VALUES ('menu_feedback','Feedback Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Feedback Menu';
-INSERT INTO `fn_function` VALUES ('menu_help','Help Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Help Menu';
-INSERT INTO `fn_function` VALUES ('menu_home','Home Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Home Menu';
-INSERT INTO `fn_function` VALUES ('menu_itracker','iTracker Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='iTracker Menu';
-INSERT INTO `fn_function` VALUES ('menu_itracker_admin','Itracker Admin/Support menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Itracker Admin/Support menu';
-INSERT INTO `fn_function` VALUES ('menu_job','Job Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Job Menu';
-INSERT INTO `fn_function` VALUES ('menu_job_create','Job Create') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Job Create';
-INSERT INTO `fn_function` VALUES ('menu_job_designer','Process in Designer view') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Process in Designer view';
-INSERT INTO `fn_function` VALUES ('menu_logout','Logout Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Logout Menu';
-INSERT INTO `fn_function` VALUES ('menu_map','Map Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Map Menu';
-INSERT INTO `fn_function` VALUES ('menu_newserinstance','Create New Service Instance') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Create New Service Instance';
-INSERT INTO `fn_function` VALUES ('menu_notes','Notes Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Notes Menu';
-INSERT INTO `fn_function` VALUES ('menu_process','Process List') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Process List';
-INSERT INTO `fn_function` VALUES ('menu_profile','Profile Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Profile Menu';
-INSERT INTO `fn_function` VALUES ('menu_profile_create','Profile Create') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Profile Create';
-INSERT INTO `fn_function` VALUES ('menu_profile_import','Profile Import') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Profile Import';
-INSERT INTO `fn_function` VALUES ('menu_reports','Reports Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Reports Menu';
-INSERT INTO `fn_function` VALUES ('menu_sample','Sample Pages Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Sample Pages Menu';
-INSERT INTO `fn_function` VALUES ('menu_tab','Sample Tab Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Sample Tab Menu';
-INSERT INTO `fn_function` VALUES ('menu_task','Task Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Task Menu';
-INSERT INTO `fn_function` VALUES ('menu_task_search','Task Search') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Task Search';
-INSERT INTO `fn_function` VALUES ('menu_test','Test Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Test Menu';
-INSERT INTO `fn_function` VALUES ('menu_viewlog','Log Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Log Menu';
-INSERT INTO `fn_function` VALUES ('view_reports','View Raptor reports') ON DUPLICATE KEY UPDATE FUNCTION_NAME='View Raptor reports';
-INSERT INTO `fn_function` VALUES ('menu_searchexisting', 'Search for Existing Service Instances') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Search for Existing Service Instances';
-INSERT INTO `fn_function` VALUES ('menu_servicemodels', 'Browse SDC Service Instances') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Browse SDC Service Instances';
-
---
--- Dumping data for table `fn_lu_activity`
---
-REPLACE INTO `fn_lu_activity` VALUES ('add_child_role','add_child_role');
-REPLACE INTO `fn_lu_activity` VALUES ('add_role','add_role');
-REPLACE INTO `fn_lu_activity` VALUES ('add_role_function','add_role_function');
-REPLACE INTO `fn_lu_activity` VALUES ('add_user_role','add_user_role');
-REPLACE INTO `fn_lu_activity` VALUES ('login','Login');
-REPLACE INTO `fn_lu_activity` VALUES ('logout','Logout');
-REPLACE INTO `fn_lu_activity` VALUES ('mobile_login','Mobile Login');
-REPLACE INTO `fn_lu_activity` VALUES ('mobile_logout','Mobile Logout');
-REPLACE INTO `fn_lu_activity` VALUES ('remove_child_role','remove_child_role');
-REPLACE INTO `fn_lu_activity` VALUES ('remove_role','remove_role');
-REPLACE INTO `fn_lu_activity` VALUES ('remove_role_function','remove_role_function');
-REPLACE INTO `fn_lu_activity` VALUES ('remove_user_role','remove_user_role');
-
---
--- Dumping data for table `fn_lu_alert_method`
---
-REPLACE INTO `fn_lu_alert_method` VALUES ('EMAIL','Email');
-REPLACE INTO `fn_lu_alert_method` VALUES ('FAX','Fax');
-REPLACE INTO `fn_lu_alert_method` VALUES ('PAGER','Pager');
-REPLACE INTO `fn_lu_alert_method` VALUES ('PHONE','Phone');
-REPLACE INTO `fn_lu_alert_method` VALUES ('SMS','SMS');
-
---
--- Dumping data for table `fn_lu_menu_set`
---
-INSERT INTO `fn_lu_menu_set` VALUES ('APP','Application Menu') ON DUPLICATE KEY UPDATE MENU_SET_NAME='Application Menu';
-
---
--- Dumping data for table `fn_lu_priority`
---
-REPLACE INTO `fn_lu_priority` VALUES (10,'Low','Y',10);
-REPLACE INTO `fn_lu_priority` VALUES (20,'Normal','Y',20);
-REPLACE INTO `fn_lu_priority` VALUES (30,'High','Y',30);
-REPLACE INTO `fn_lu_priority` VALUES (40,'Urgent','Y',40);
-REPLACE INTO `fn_lu_priority` VALUES (50,'Fatal','Y',50);
-
-
---
--- Dumping data for table `fn_lu_tab_set`
---
-INSERT INTO `fn_lu_tab_set` VALUES ('APP','Application Tabs') ON DUPLICATE KEY UPDATE TAB_SET_NAME='Application Tabs';
-
---
--- Dumping data for table `fn_lu_timezone`
---
-INSERT INTO `fn_lu_timezone` VALUES (10,'US/Eastern','US/Eastern') ON DUPLICATE KEY UPDATE TIMEZONE_NAME='US/Eastern', TIMEZONE_VALUE='US/Eastern';
-INSERT INTO `fn_lu_timezone` VALUES (20,'US/Central','US/Central') ON DUPLICATE KEY UPDATE TIMEZONE_NAME='US/Central', TIMEZONE_VALUE='US/Central';
-INSERT INTO `fn_lu_timezone` VALUES (30,'US/Mountain','US/Mountain') ON DUPLICATE KEY UPDATE TIMEZONE_NAME='US/Mountain', TIMEZONE_VALUE='US/Mountain';
-INSERT INTO `fn_lu_timezone` VALUES (40,'US/Arizona','America/Phoenix') ON DUPLICATE KEY UPDATE TIMEZONE_NAME='US/Arizona', TIMEZONE_VALUE='America/Phoenix';
-INSERT INTO `fn_lu_timezone` VALUES (50,'US/Pacific','US/Pacific') ON DUPLICATE KEY UPDATE TIMEZONE_NAME='US/Pacific', TIMEZONE_VALUE='US/Pacific';
-INSERT INTO `fn_lu_timezone` VALUES (60,'US/Alaska','US/Alaska') ON DUPLICATE KEY UPDATE TIMEZONE_NAME='US/Alaska', TIMEZONE_VALUE='US/Alaska';
-INSERT INTO `fn_lu_timezone` VALUES (70,'US/Hawaii','US/Hawaii') ON DUPLICATE KEY UPDATE TIMEZONE_NAME='US/Hawaii', TIMEZONE_VALUE='US/Hawaii';
-
---
--- Dumping data for table `fn_menu`
---
-INSERT INTO `fn_menu` VALUES (1,'Root',NULL,10,NULL,'menu_home','N',NULL,NULL,NULL,NULL,'APP','N',NULL) ON DUPLICATE KEY UPDATE LABEL='Root', PARENT_ID=NULL, SORT_ORDER=10, ACTION=NULL, FUNCTION_CD='menu_home', ACTIVE_YN='N', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC=NULL;
-INSERT INTO `fn_menu` VALUES (2,'VID Home',1,10,'vidhome.htm','menu_home','Y',NULL,NULL,NULL,NULL,'APP','N','ion-home') ON DUPLICATE KEY UPDATE LABEL='VID Home', PARENT_ID=1, SORT_ORDER=10, ACTION='vidhome.htm', FUNCTION_CD='menu_home', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='ion-home';
-INSERT INTO `fn_menu` VALUES (3,'Search for Existing Service Instances',1,10,'serviceModels.htm#/instances/services','menu_searchexisting','Y',NULL,NULL,NULL,NULL,'APP','N','ion-android-search') ON DUPLICATE KEY UPDATE LABEL='Search for Existing Service Instances', PARENT_ID=1, SORT_ORDER=10, ACTION='searchexistingsi.htm', FUNCTION_CD='menu_searchexisting', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='ion-android-search';INSERT INTO `fn_menu` VALUES (8,'Reports',1,40,'report.htm','menu_reports','N',NULL,NULL,NULL,NULL,'APP','N','ion-ios-paper') ON DUPLICATE KEY UPDATE LABEL='Reports', PARENT_ID=1, SORT_ORDER=40, ACTION='report.htm', FUNCTION_CD='menu_reports', ACTIVE_YN='N', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='ion-ios-paper';
-INSERT INTO `fn_menu` VALUES (9,'Profile',1,90,'userProfile','menu_profile','N',NULL,NULL,NULL,NULL,'APP','N','ion-person') ON DUPLICATE KEY UPDATE LABEL='Profile', PARENT_ID=1, SORT_ORDER=90, ACTION='userProfile', FUNCTION_CD='menu_profile', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='ion-person';
-INSERT INTO `fn_menu` VALUES (10,'Admin',1,110,'role_list.htm','menu_admin','Y',NULL,NULL,NULL,NULL,'APP','N','ion-gear-a') ON DUPLICATE KEY UPDATE LABEL='Admin', PARENT_ID=1, SORT_ORDER=110, ACTION='role_list.htm', FUNCTION_CD='menu_admin', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='ion-gear-a';
-INSERT INTO `fn_menu` VALUES (13,'VID Logout',1,130,'app_logout.htm','menu_logout','N',NULL,NULL,NULL,NULL,'APP','Y','ion-android-exit') ON DUPLICATE KEY UPDATE LABEL='VID Logout', PARENT_ID=1, SORT_ORDER=130, ACTION='app_logout.htm', FUNCTION_CD='menu_logout', ACTIVE_YN='N', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='Y', IMAGE_SRC='ion-android-exit';
-INSERT INTO `fn_menu` VALUES (42,'Browse SDC Service Models',1,10,'serviceModels.htm','menu_servicemodels','Y',NULL,NULL,NULL,NULL,'APP','N','ion-android-navigate') ON DUPLICATE KEY UPDATE LABEL='Browse SDC Service Instances', PARENT_ID=1, SORT_ORDER=10, ACTION='serviceModels.htm', FUNCTION_CD='menu_servicemodels', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='ion-android-navigate';INSERT INTO `fn_menu` VALUES (43,'View Log',1,10,'viewlog.htm','menu_viewlog','N',NULL,NULL,NULL,NULL,'APP','N','icon-location-pin') ON DUPLICATE KEY UPDATE LABEL='View Log', PARENT_ID=1, SORT_ORDER=10, ACTION='viewlog.htm', FUNCTION_CD='menu_viewlog', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='icon-location-pin';
-INSERT INTO `fn_menu` VALUES (84,'All Reports',8,50,'report','menu_reports','N',null,null,null,null,'APP','N','/static/fusion/images/reports.png') ON DUPLICATE KEY UPDATE LABEL='All Reports', PARENT_ID=8, SORT_ORDER=50, ACTION='report', FUNCTION_CD='menu_reports', ACTIVE_YN='N', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='/static/fusion/images/reports.png';
-INSERT INTO `fn_menu` VALUES (87,'Create Reports',8,120,'report_wizard.htm?r_action=report.create','menu_reports','N',null,'r_action=report.create',null,null,'APP','N',null) ON DUPLICATE KEY UPDATE LABEL='Create Reports', PARENT_ID=8, SORT_ORDER=120, ACTION='report_wizard.htm?r_action=report.create', FUNCTION_CD='menu_reports', ACTIVE_YN='N', SERVLET=NULL, QUERY_STRING='r_action=report.create', EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC=NULL;
-INSERT INTO `fn_menu` VALUES (88,'Sample Dashboard',8,130,'report_sample','menu_reports','N',null,null,null,null,'APP','N',null) ON DUPLICATE KEY UPDATE LABEL='Sample Dashboard', PARENT_ID=8, SORT_ORDER=130, ACTION='report_sample', FUNCTION_CD='menu_reports', ACTIVE_YN='N', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC=NULL;
-INSERT INTO `fn_menu` VALUES (92,'Import User',9,30,'userProfile#/post_search','menu_profile_import','Y',null,null,null,null,'APP','N',NULL) ON DUPLICATE KEY UPDATE LABEL='Import User', PARENT_ID=9, SORT_ORDER=30, ACTION='userProfile#/post_search', FUNCTION_CD='menu_profile_import', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC=NULL;
-INSERT INTO `fn_menu` VALUES (94,'Self',9,40,'userProfile#/self_profile','menu_profile','Y',null,null,null,null,'APP','N','/static/fusion/images/profile.png') ON DUPLICATE KEY UPDATE LABEL='Self', PARENT_ID=9, SORT_ORDER=40, ACTION='userProfile#/self_profile', FUNCTION_CD='menu_profile', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='/static/fusion/images/profile.png';
-INSERT INTO `fn_menu` VALUES (101,'Roles',10,20,'admin','menu_admin','Y',NULL,NULL,NULL,NULL,'APP','N','/static/fusion/images/users.png') ON DUPLICATE KEY UPDATE LABEL='Roles', PARENT_ID=10, SORT_ORDER=20, ACTION='admin', FUNCTION_CD='menu_admin', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='/static/fusion/images/users.png';
-INSERT INTO `fn_menu` VALUES (102,'Role Functions',10,30,'admin#/role_function_list','menu_admin','Y',NULL,NULL,NULL,NULL,'APP','N',NULL) ON DUPLICATE KEY UPDATE LABEL='Role Functions', PARENT_ID=10, SORT_ORDER=30, ACTION='admin#/role_function_list', FUNCTION_CD='menu_admin', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC=NULL;
-INSERT INTO `fn_menu` VALUES (103,'Broadcast Messages',10,50,'admin#/broadcast_list','menu_admin','N',NULL,NULL,NULL,NULL,'APP','N','/static/fusion/images/bubble.png') ON DUPLICATE KEY UPDATE LABEL='Broadcast Messages', PARENT_ID=10, SORT_ORDER=50, ACTION='admin#/broadcast_list', FUNCTION_CD='menu_admin', ACTIVE_YN='N', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='/static/fusion/images/bubble.png';
-INSERT INTO `fn_menu` VALUES (105,'Cache Admin',10,40,'admin#/jcs_admin','menu_admin','N',NULL,NULL,NULL,NULL,'APP','N','/static/fusion/images/cache.png') ON DUPLICATE KEY UPDATE LABEL='Cache Admin', PARENT_ID=10, SORT_ORDER=40, ACTION='admin#/jcs_admin', FUNCTION_CD='menu_admin', ACTIVE_YN='N', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='/static/fusion/images/cache.png';
--- INSERT INTO `fn_menu` VALUES (106,'Lock/Unlock Application',10,60,'application_lockout.htm','menu_admin','N',NULL,NULL,NULL,NULL,'APP','N','/static/fusion/images/decrypted.png') ON DUPLICATE KEY UPDATE LABEL='Lock/Unlock Application', PARENT_ID=10, SORT_ORDER=60, ACTION='application_lockout.htm', FUNCTION_CD='menu_admin', ACTIVE_YN='N', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='/static/fusion/images/decrypted.png';
-INSERT INTO `fn_menu` VALUES (108,'Usage',10,80,'admin#/usage_list','menu_admin','Y',NULL,NULL,NULL,NULL,'APP','N','/static/fusion/images/users.png') ON DUPLICATE KEY UPDATE LABEL='Usage', PARENT_ID=10, SORT_ORDER=80, ACTION='admin#/usage_list', FUNCTION_CD='menu_admin', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='/static/fusion/images/users.png';
-INSERT INTO `fn_menu` VALUES (930,'Search',9,15,'userProfile','menu_admin','Y',NULL,NULL,NULL,NULL,'APP','N','/static/fusion/images/search_profile.png') ON DUPLICATE KEY UPDATE LABEL='Search', PARENT_ID=9, SORT_ORDER=15, ACTION='userProfile', FUNCTION_CD='menu_admin', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='/static/fusion/images/search_profile.png';
---
--- Dumping data for table `fn_restricted_url`
---
-REPLACE INTO `fn_restricted_url` VALUES ('attachment.htm','menu_admin');
-REPLACE INTO `fn_restricted_url` VALUES ('broadcast.htm','menu_admin');
-REPLACE INTO `fn_restricted_url` VALUES ('file_upload.htm','menu_admin');
-REPLACE INTO `fn_restricted_url` VALUES ('job.htm','menu_admin');
-REPLACE INTO `fn_restricted_url` VALUES ('role.htm','menu_admin');
-REPLACE INTO `fn_restricted_url` VALUES ('role_function.htm','menu_admin');
-REPLACE INTO `fn_restricted_url` VALUES ('test.htm','menu_admin');
-REPLACE INTO `fn_restricted_url` VALUES ('serviceModels.htm','menu_servicemodels');
-REPLACE INTO `fn_restricted_url` VALUES ('async_test.htm','menu_home');
-REPLACE INTO `fn_restricted_url` VALUES ('chatWindow.htm','menu_home');
-REPLACE INTO `fn_restricted_url` VALUES ('contact_list.htm','menu_home');
-REPLACE INTO `fn_restricted_url` VALUES ('customer_dynamic_list.htm','menu_home');
-REPLACE INTO `fn_restricted_url` VALUES ('event.htm','menu_home');
-REPLACE INTO `fn_restricted_url` VALUES ('event_list.htm','menu_home');
-REPLACE INTO `fn_restricted_url` VALUES ('mobile_welcome.htm','menu_home');
-REPLACE INTO `fn_restricted_url` VALUES ('sample_map.htm','menu_home');
-REPLACE INTO `fn_restricted_url` VALUES ('template.jsp','menu_home');
-REPLACE INTO `fn_restricted_url` VALUES ('vidhome.htm','menu_home');
-REPLACE INTO `fn_restricted_url` VALUES ('zkau','menu_home');
-REPLACE INTO `fn_restricted_url` VALUES ('itracker_assign.htm','menu_itracker');
-REPLACE INTO `fn_restricted_url` VALUES ('itracker_byassignee.htm','menu_itracker');
-REPLACE INTO `fn_restricted_url` VALUES ('itracker_create.htm','menu_itracker');
-REPLACE INTO `fn_restricted_url` VALUES ('itracker_update.htm','menu_itracker');
-REPLACE INTO `fn_restricted_url` VALUES ('manage_license.htm','menu_itracker');
-REPLACE INTO `fn_restricted_url` VALUES ('support_ticket.htm','menu_itracker');
-REPLACE INTO `fn_restricted_url` VALUES ('jbpm_designer.htm','menu_job_create');
-REPLACE INTO `fn_restricted_url` VALUES ('jbpm_drools.htm','menu_job_create');
-REPLACE INTO `fn_restricted_url` VALUES ('process_job.htm','menu_job_create');
--- REPLACE INTO `fn_restricted_url` VALUES ('novamap_controller.htm','menu_map');
-REPLACE INTO `fn_restricted_url` VALUES ('createnewserviceinstance.htm','menu_newserinstance');
-REPLACE INTO `fn_restricted_url` VALUES ('profile.htm','menu_profile_create');
-REPLACE INTO `fn_restricted_url` VALUES ('raptor.htm','menu_reports');
-REPLACE INTO `fn_restricted_url` VALUES ('raptor2.htm','menu_reports');
-REPLACE INTO `fn_restricted_url` VALUES ('raptor_blob_extract.htm','menu_reports');
-REPLACE INTO `fn_restricted_url` VALUES ('raptor_email_attachment.htm','menu_reports');
-REPLACE INTO `fn_restricted_url` VALUES ('raptor_search.htm','menu_reports');
-REPLACE INTO `fn_restricted_url` VALUES ('report_list.htm','menu_reports');
-REPLACE INTO `fn_restricted_url` VALUES ('gauge.htm','menu_tab');
-REPLACE INTO `fn_restricted_url` VALUES ('gmap_controller.htm','menu_tab');
-REPLACE INTO `fn_restricted_url` VALUES ('gmap_frame.htm','menu_tab');
-REPLACE INTO `fn_restricted_url` VALUES ('map.htm','menu_tab');
-REPLACE INTO `fn_restricted_url` VALUES ('map_download.htm','menu_tab');
-REPLACE INTO `fn_restricted_url` VALUES ('map_grid_search.htm','menu_tab');
-REPLACE INTO `fn_restricted_url` VALUES ('sample_animated_map.htm','menu_tab');
--- REPLACE INTO `fn_restricted_url` VALUES ('sample_heat_map.htm','menu_tab');
--- REPLACE INTO `fn_restricted_url` VALUES ('sample_heat_map_no_header.htm','menu_tab');
-REPLACE INTO `fn_restricted_url` VALUES ('sample_map_2.htm','menu_tab');
-REPLACE INTO `fn_restricted_url` VALUES ('sample_map_3.htm','menu_tab');
-REPLACE INTO `fn_restricted_url` VALUES ('tab2_sub1.htm','menu_tab');
-REPLACE INTO `fn_restricted_url` VALUES ('tab2_sub2_link1.htm','menu_tab');
-REPLACE INTO `fn_restricted_url` VALUES ('tab2_sub2_link2.htm','menu_tab');
-REPLACE INTO `fn_restricted_url` VALUES ('tab2_sub3.htm','menu_tab');
-REPLACE INTO `fn_restricted_url` VALUES ('tab3.htm','menu_tab');
-REPLACE INTO `fn_restricted_url` VALUES ('tab4.htm','menu_tab');
-REPLACE INTO `fn_restricted_url` VALUES ('viewlog.htm','menu_viewlog');
--- REPLACE INTO `fn_restricted_url` VALUES ('bd_optima.htm','quantum_bd');
--- REPLACE INTO `fn_restricted_url` VALUES ('bd_optima_interactive.htm','quantum_bd');
--- REPLACE INTO `fn_restricted_url` VALUES ('bd_p2t.htm','quantum_bd');
--- REPLACE INTO `fn_restricted_url` VALUES ('grid_heatmap.htm','quantum_bd');
--- REPLACE INTO `fn_restricted_url` VALUES ('hive.htm','quantum_bd');
--- REPLACE INTO `fn_restricted_url` VALUES ('hiveconfig.htm','quantum_bd');
--- REPLACE INTO `fn_restricted_url` VALUES ('hiveconfig_popup.htm','quantum_bd');
--- REPLACE INTO `fn_restricted_url` VALUES ('hive_search.htm','quantum_bd');
--- REPLACE INTO `fn_restricted_url` VALUES ('hive_search_popup.htm','quantum_bd');
--- REPLACE INTO `fn_restricted_url` VALUES ('jbpmTestProcess.htm','quantum_bd');
--- REPLACE INTO `fn_restricted_url` VALUES ('job_progress.htm','quantum_bd');
--- REPLACE INTO `fn_restricted_url` VALUES ('mapreduce.htm','quantum_bd');
--- REPLACE INTO `fn_restricted_url` VALUES ('mapreduce_search.htm','quantum_bd');
-REPLACE INTO `fn_restricted_url` VALUES ('raptor.htm','view_reports');
-REPLACE INTO `fn_restricted_url` VALUES ('raptor_blob_extract.htm','view_reports');
-
---
--- Dumping data for table `fn_role`
---
-INSERT INTO `fn_role` VALUES (1,'System Administrator','Y',1) ON DUPLICATE KEY UPDATE ROLE_NAME='System Administrator', ACTIVE_YN='Y', PRIORITY=1;
-INSERT INTO `fn_role` VALUES (16,'Standard User','Y',5) ON DUPLICATE KEY UPDATE ROLE_NAME='Standard User', ACTIVE_YN='Y', PRIORITY=5;
-
---
--- Dumping data for table `fn_role_composite`
---
-REPLACE INTO `fn_role_composite` VALUES (1,16);
-
---
--- Dumping data for table `fn_role_function`
---
-REPLACE INTO `fn_role_function` VALUES (1,'doclib');
-REPLACE INTO `fn_role_function` VALUES (1,'doclib_admin');
-REPLACE INTO `fn_role_function` VALUES (1,'login');
-REPLACE INTO `fn_role_function` VALUES (1,'menu_admin');
-REPLACE INTO `fn_role_function` VALUES (1,'menu_ajax');
-REPLACE INTO `fn_role_function` VALUES (1,'menu_servicemodels');
-REPLACE INTO `fn_role_function` VALUES (1,'menu_customer');
-REPLACE INTO `fn_role_function` VALUES (1,'menu_customer_create');
-REPLACE INTO `fn_role_function` VALUES (1,'menu_feedback');
-REPLACE INTO `fn_role_function` VALUES (1,'menu_help');
--- REPLACE INTO `fn_role_function` VALUES (1,'menu_hiveconfig');
--- REPLACE INTO `fn_role_function` VALUES (1,'menu_hiveconfig_create');
--- REPLACE INTO `fn_role_function` VALUES (1,'menu_hiveconfig_search');
-REPLACE INTO `fn_role_function` VALUES (1,'menu_home');
-REPLACE INTO `fn_role_function` VALUES (1,'menu_itracker');
-REPLACE INTO `fn_role_function` VALUES (1,'menu_itracker_admin');
-REPLACE INTO `fn_role_function` VALUES (1,'menu_job');
-REPLACE INTO `fn_role_function` VALUES (1,'menu_job_create');
-REPLACE INTO `fn_role_function` VALUES (1,'menu_logout');
--- REPLACE INTO `fn_role_function` VALUES (1,'menu_mapreduce');
--- REPLACE INTO `fn_role_function` VALUES (1,'menu_mapreduce_create');
--- REPLACE INTO `fn_role_function` VALUES (1,'menu_mapreduce_search');
-REPLACE INTO `fn_role_function` VALUES (1,'menu_newserinstance');
-REPLACE INTO `fn_role_function` VALUES (1,'menu_notes');
-REPLACE INTO `fn_role_function` VALUES (1,'menu_process');
-REPLACE INTO `fn_role_function` VALUES (1,'menu_profile');
-REPLACE INTO `fn_role_function` VALUES (1,'menu_profile_create');
-REPLACE INTO `fn_role_function` VALUES (1,'menu_profile_import');
-REPLACE INTO `fn_role_function` VALUES (1,'menu_reports');
-REPLACE INTO `fn_role_function` VALUES (1,'menu_sample');
-REPLACE INTO `fn_role_function` VALUES (1,'menu_tab');
-REPLACE INTO `fn_role_function` VALUES (1,'menu_test');
-REPLACE INTO `fn_role_function` VALUES (1,'menu_viewlog');
--- REPLACE INTO `fn_role_function` VALUES (1,'quantum_bd');
-REPLACE INTO `fn_role_function` VALUES (16,'login');
-REPLACE INTO `fn_role_function` VALUES (16,'menu_ajax');
-REPLACE INTO `fn_role_function` VALUES (16,'menu_servicemodels');
-REPLACE INTO `fn_role_function` VALUES (16,'menu_customer');
-REPLACE INTO `fn_role_function` VALUES (16,'menu_customer_create');
-REPLACE INTO `fn_role_function` VALUES (16,'menu_home');
-REPLACE INTO `fn_role_function` VALUES (16,'menu_itracker');
-REPLACE INTO `fn_role_function` VALUES (16,'menu_logout');
-REPLACE INTO `fn_role_function` VALUES (16,'menu_map');
-REPLACE INTO `fn_role_function` VALUES (16,'menu_newserinstance');
-REPLACE INTO `fn_role_function` VALUES (16,'menu_profile');
-REPLACE INTO `fn_role_function` VALUES (16,'menu_reports');
-REPLACE INTO `fn_role_function` VALUES (16,'menu_tab');
-REPLACE INTO `fn_role_function` VALUES (16,'menu_viewlog');
--- REPLACE INTO `fn_role_function` VALUES (16,'quantum_bd');
-REPLACE INTO `fn_role_function` VALUES ('1', 'menu_searchexisting');
-REPLACE INTO `fn_role_function` VALUES ('16', 'menu_searchexisting');
-
---
--- Dumping data for table `fn_tab`
---
-INSERT INTO `fn_tab` VALUES ('TAB1','Tab 1','Tab 1 Information','tab1.htm','menu_tab','Y',10,NULL,'APP') ON DUPLICATE KEY UPDATE TAB_NAME='Tab 1', TAB_DESCR='Tab 1 Information', ACTION='tab1.htm', FUNCTION_CD='menu_tab', ACTIVE_YN='Y', SORT_ORDER=10, PARENT_TAB_CD=NULL, TAB_SET_CD='APP';
-INSERT INTO `fn_tab` VALUES ('TAB2','Tab 2','Tab 2 Information','tab2_sub1.htm','menu_tab','Y',20,NULL,'APP') ON DUPLICATE KEY UPDATE TAB_NAME='Tab 2', TAB_DESCR='Tab 2 Information', ACTION='tab2_sub1.htm', FUNCTION_CD='menu_tab', ACTIVE_YN='Y', SORT_ORDER=20, PARENT_TAB_CD=NULL, TAB_SET_CD='APP';
-INSERT INTO `fn_tab` VALUES ('TAB2_SUB1','Sub Tab 1','Sub Tab 1 Information','tab2_sub1.htm','menu_tab','Y',10,'TAB2','APP') ON DUPLICATE KEY UPDATE TAB_NAME='Sub Tab 1', TAB_DESCR='Sub Tab 1 Information', ACTION='tab2_sub1.htm', FUNCTION_CD='menu_tab', ACTIVE_YN='Y', SORT_ORDER=10, PARENT_TAB_CD='TAB2', TAB_SET_CD='APP';
-INSERT INTO `fn_tab` VALUES ('TAB2_SUB1_S1','Left Tab 1','Sub - Sub Tab 1 Information','tab2_sub1.htm','menu_tab','Y',10,'TAB2_SUB1','APP') ON DUPLICATE KEY UPDATE TAB_NAME='Left Tab 1', TAB_DESCR='Sub - Sub Tab 1 Information', ACTION='tab2_sub1.htm', FUNCTION_CD='menu_tab', ACTIVE_YN='Y', SORT_ORDER=10, PARENT_TAB_CD='TAB2_SUB1', TAB_SET_CD='APP';
-INSERT INTO `fn_tab` VALUES ('TAB2_SUB2','Sub Tab 2','Sub Tab 2 Information','tab2_sub2.htm','menu_tab','Y',20,'TAB2','APP') ON DUPLICATE KEY UPDATE TAB_NAME='Sub Tab 2', TAB_DESCR='Sub Tab 2 Information', ACTION='tab2_sub2.htm', FUNCTION_CD='menu_tab', ACTIVE_YN='Y', SORT_ORDER=20, PARENT_TAB_CD='TAB2', TAB_SET_CD='APP';
-INSERT INTO `fn_tab` VALUES ('TAB2_SUB3','Sub Tab 3','Sub Tab 3 Information','tab2_sub3.htm','menu_tab','Y',30,'TAB2','APP') ON DUPLICATE KEY UPDATE TAB_NAME='Sub Tab 3', TAB_DESCR='Sub Tab 3 Information', ACTION='tab2_sub3.htm', FUNCTION_CD='menu_tab', ACTIVE_YN='Y', SORT_ORDER=30, PARENT_TAB_CD='TAB2', TAB_SET_CD='APP';
-INSERT INTO `fn_tab` VALUES ('TAB3','Tab 3','Tab 3 Information','tab3.htm','menu_tab','Y',30,NULL,'APP') ON DUPLICATE KEY UPDATE TAB_NAME='Tab 3', TAB_DESCR='Tab 3 Information', ACTION='tab3.htm', FUNCTION_CD='menu_tab', ACTIVE_YN='Y', SORT_ORDER=30, PARENT_TAB_CD=NULL, TAB_SET_CD='APP';
-INSERT INTO `fn_tab` VALUES ('TAB4','Tab 4','Tab 4 Information','tab4.htm','menu_tab','Y',40,NULL,'APP') ON DUPLICATE KEY UPDATE TAB_NAME='Tab 4', TAB_DESCR='Tab 4 Information', ACTION='tab4.htm', FUNCTION_CD='menu_tab', ACTIVE_YN='Y', SORT_ORDER=40, PARENT_TAB_CD=NULL, TAB_SET_CD='APP';
-
---
--- Dumping data for table `fn_tab_selected`
---
-REPLACE INTO `fn_tab_selected` VALUES ('TAB1','tab1');
-REPLACE INTO `fn_tab_selected` VALUES ('TAB2','tab2_sub1');
-REPLACE INTO `fn_tab_selected` VALUES ('TAB2','tab2_sub2');
-REPLACE INTO `fn_tab_selected` VALUES ('TAB2','tab2_sub3');
-REPLACE INTO `fn_tab_selected` VALUES ('TAB2_SUB1','tab2_sub1');
-REPLACE INTO `fn_tab_selected` VALUES ('TAB2_SUB1_S1','tab2_sub1');
-REPLACE INTO `fn_tab_selected` VALUES ('TAB2_SUB2','tab2_sub2');
-REPLACE INTO `fn_tab_selected` VALUES ('TAB2_SUB3','tab2_sub3');
-REPLACE INTO `fn_tab_selected` VALUES ('TAB3','tab3');
-REPLACE INTO `fn_tab_selected` VALUES ('TAB4','tab4');
-
-
---
--- Dumping data for table `fn_user`
---
-INSERT IGNORE `fn_user` VALUES (1,null,null,'Demo',null,'User',null,null,null,null,null,null,null,'demo',null,'demo','Kp8bJ4SXszM0WX','2016-11-14 13:24:07','Y',null,'2016-10-17 00:00:00',1,'2016-11-14 13:24:07','N',null,null,null,'NJ',null,'US',null,null,null,null,null,10,null,null,null,null,null,null);
-INSERT IGNORE `fn_user` VALUES (2,null,null,'vid1',null,'User',null,null,null,null,null,null,null,'vid1',null,'vid1','Kp8bJ4SXszM0WX','2016-11-14 13:24:07','Y',null,'2016-10-17 00:00:00',1,'2016-11-14 13:24:07','N',null,null,null,'NJ',null,'US',null,null,null,null,null,10,null,null,null,null,null,null);
-INSERT IGNORE `fn_user` VALUES (3,null,null,'vid2',null,'User',null,null,null,null,null,null,null,'vid2',null,'vid2','Kp8bJ4SXszM0WX','2016-11-14 13:24:07','Y',null,'2016-10-17 00:00:00',1,'2016-11-14 13:24:07','N',null,null,null,'NJ',null,'US',null,null,null,null,null,10,null,null,null,null,null,null);
-INSERT IGNORE `fn_user` VALUES (4,null,null,'vid3',null,'User',null,null,null,null,null,null,null,'vid3',null,'vid3','Kp8bJ4SXszM0WX','2016-11-14 13:24:07','Y',null,'2016-10-17 00:00:00',1,'2016-11-14 13:24:07','N',null,null,null,'NJ',null,'US',null,null,null,null,null,10,null,null,null,null,null,null);
-INSERT IGNORE `fn_user` VALUES (5,null,null,'vid4',null,'User',null,null,null,null,null,null,null,'vid4',null,'vid4','Kp8bJ4SXszM0WX','2016-11-14 13:24:07','Y',null,'2016-10-17 00:00:00',1,'2016-11-14 13:24:07','N',null,null,null,'NJ',null,'US',null,null,null,null,null,10,null,null,null,null,null,null);
-
-INSERT IGNORE `fn_user_role` VALUES (1,1,NULL,1);
-INSERT IGNORE `fn_user_role` VALUES (2,1,NULL,1);
-INSERT IGNORE `fn_user_role` VALUES (3,1,NULL,1);
-INSERT IGNORE `fn_user_role` VALUES (4,1,NULL,1);
-INSERT IGNORE `fn_user_role` VALUES (5,1,NULL,1);
diff --git a/vid/src/main/resources/vid-pre-init.sql b/vid/src/main/resources/vid-pre-init.sql
deleted file mode 100644
index 14bd06bf1..000000000
--- a/vid/src/main/resources/vid-pre-init.sql
+++ /dev/null
@@ -1,32 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`schema_info` (
-  `SCHEMA_ID` VARCHAR(25) NOT NULL,
-  `SCHEMA_DESC` VARCHAR(75) NOT NULL,
-  `DATASOURCE_TYPE` VARCHAR(100) NULL DEFAULT NULL,
-  `CONNECTION_URL` VARCHAR(200) NOT NULL,
-  `USER_NAME` VARCHAR(45) NOT NULL,
-  `PASSWORD` VARCHAR(45) NULL DEFAULT NULL,
-  `DRIVER_CLASS` VARCHAR(100) NOT NULL,
-  `MIN_POOL_SIZE` INT(11) NOT NULL,
-  `MAX_POOL_SIZE` INT(11) NOT NULL,
-  `IDLE_CONNECTION_TEST_PERIOD` INT(11) NOT NULL)
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
diff --git a/vid/src/main/resources/vid-schema.sql b/vid/src/main/resources/vid-schema.sql
deleted file mode 100644
index fd85d94ef..000000000
--- a/vid/src/main/resources/vid-schema.sql
+++ /dev/null
@@ -1,1272 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
--- ----------------------------------------------------------------------------
--- MySQL Workbench Migration
--- Migrated Schemata: vid_openecomp
--- Source Schemata: ecomp_sd
--- Created: Sun Nov 13 08:58:53 2016
--- Workbench Version: 6.3.6
--- ----------------------------------------------------------------------------
-
-SET FOREIGN_KEY_CHECKS = 0;
-
--- ----------------------------------------------------------------------------
--- Schema vid_openecomp
--- ----------------------------------------------------------------------------
-CREATE SCHEMA IF NOT EXISTS `vid_openecomp` ;
-
-USE vid_openecomp;
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.cr_favorite_reports
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`cr_favorite_reports` (
-  `USER_ID` INT(11) NOT NULL,
-  `REP_ID` INT(11) NOT NULL,
-  PRIMARY KEY (`USER_ID`, `REP_ID`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.cr_filehist_log
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`cr_filehist_log` (
-  `SCHEDULE_ID` DECIMAL(11,0) NOT NULL,
-  `URL` VARCHAR(4000) NULL DEFAULT NULL,
-  `NOTES` VARCHAR(3500) NULL DEFAULT NULL,
-  `RUN_TIME` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP)
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.cr_folder
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`cr_folder` (
-  `FOLDER_ID` INT(11) NOT NULL,
-  `FOLDER_NAME` VARCHAR(50) NOT NULL,
-  `DESCR` VARCHAR(500) NULL DEFAULT NULL,
-  `CREATE_ID` INT(11) NOT NULL,
-  `CREATE_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `PARENT_FOLDER_ID` INT(11) NULL DEFAULT NULL,
-  `PUBLIC_YN` VARCHAR(1) NOT NULL DEFAULT 'N',
-  PRIMARY KEY (`FOLDER_ID`),
-  INDEX `fk_parent_key_cr_folder` (`PARENT_FOLDER_ID` ASC),
-  CONSTRAINT `fk_parent_key_cr_folder`
-    FOREIGN KEY (`PARENT_FOLDER_ID`)
-    REFERENCES `vid_openecomp`.`cr_folder` (`FOLDER_ID`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.cr_folder_access
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`cr_folder_access` (
-  `FOLDER_ACCESS_ID` DECIMAL(11,0) NOT NULL,
-  `FOLDER_ID` DECIMAL(11,0) NOT NULL,
-  `ORDER_NO` DECIMAL(11,0) NOT NULL,
-  `ROLE_ID` DECIMAL(11,0) NULL DEFAULT NULL,
-  `USER_ID` DECIMAL(11,0) NULL DEFAULT NULL,
-  `READ_ONLY_YN` VARCHAR(1) NOT NULL DEFAULT 'N',
-  PRIMARY KEY (`FOLDER_ACCESS_ID`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.cr_hist_user_map
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`cr_hist_user_map` (
-  `HIST_ID` INT(11) NOT NULL,
-  `USER_ID` INT(11) NOT NULL,
-  PRIMARY KEY (`HIST_ID`, `USER_ID`),
-  INDEX `sys_c0014617` (`USER_ID` ASC),
-  CONSTRAINT `sys_c0014616`
-    FOREIGN KEY (`HIST_ID`)
-    REFERENCES `vid_openecomp`.`cr_report_file_history` (`HIST_ID`),
-  CONSTRAINT `sys_c0014617`
-    FOREIGN KEY (`USER_ID`)
-    REFERENCES `vid_openecomp`.`fn_user` (`USER_ID`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.cr_lu_file_type
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`cr_lu_file_type` (
-  `LOOKUP_ID` DECIMAL(2,0) NOT NULL,
-  `LOOKUP_DESCR` VARCHAR(255) NOT NULL,
-  `ACTIVE_YN` CHAR(1) NULL DEFAULT 'Y',
-  `ERROR_CODE` DECIMAL(11,0) NULL DEFAULT NULL,
-  PRIMARY KEY (`LOOKUP_ID`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.cr_raptor_action_img
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`cr_raptor_action_img` (
-  `IMAGE_ID` VARCHAR(100) NOT NULL,
-  `IMAGE_LOC` VARCHAR(400) NULL DEFAULT NULL,
-  PRIMARY KEY (`IMAGE_ID`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.cr_raptor_pdf_img
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`cr_raptor_pdf_img` (
-  `IMAGE_ID` VARCHAR(100) NOT NULL,
-  `IMAGE_LOC` VARCHAR(400) NULL DEFAULT NULL,
-  PRIMARY KEY (`IMAGE_ID`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.cr_remote_schema_info
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`cr_remote_schema_info` (
-  `SCHEMA_PREFIX` VARCHAR(5) NOT NULL,
-  `SCHEMA_DESC` VARCHAR(75) NOT NULL,
-  `DATASOURCE_TYPE` VARCHAR(100) NULL DEFAULT NULL,
-  PRIMARY KEY (`SCHEMA_PREFIX`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.cr_report
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`cr_report` (
-  `REP_ID` DECIMAL(11,0) NOT NULL,
-  `TITLE` VARCHAR(100) NOT NULL,
-  `DESCR` VARCHAR(255) NULL DEFAULT NULL,
-  `PUBLIC_YN` VARCHAR(1) NOT NULL DEFAULT 'N',
-  `REPORT_XML` TEXT NULL DEFAULT NULL,
-  `CREATE_ID` DECIMAL(11,0) NULL DEFAULT NULL,
-  `CREATE_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `MAINT_ID` DECIMAL(11,0) NULL DEFAULT NULL,
-  `MAINT_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `MENU_ID` VARCHAR(500) NULL DEFAULT NULL,
-  `MENU_APPROVED_YN` VARCHAR(1) NOT NULL DEFAULT 'N',
-  `OWNER_ID` DECIMAL(11,0) NULL DEFAULT NULL,
-  `FOLDER_ID` INT(11) NULL DEFAULT '0',
-  `DASHBOARD_TYPE_YN` VARCHAR(1) NULL DEFAULT 'N',
-  `DASHBOARD_YN` VARCHAR(1) NULL DEFAULT 'N',
-  PRIMARY KEY (`REP_ID`),
-  INDEX `cr_report_create_idpublic_yntitle` (`CREATE_ID` ASC, `PUBLIC_YN` ASC, `TITLE` ASC))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.cr_report_access
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`cr_report_access` (
-  `REP_ID` DECIMAL(11,0) NOT NULL,
-  `ORDER_NO` DECIMAL(11,0) NOT NULL,
-  `ROLE_ID` DECIMAL(11,0) NULL DEFAULT NULL,
-  `USER_ID` DECIMAL(11,0) NULL DEFAULT NULL,
-  `READ_ONLY_YN` VARCHAR(1) NOT NULL DEFAULT 'N',
-  PRIMARY KEY (`REP_ID`, `ORDER_NO`),
-  CONSTRAINT `fk_cr_repor_ref_8550_cr_repor`
-    FOREIGN KEY (`REP_ID`)
-    REFERENCES `vid_openecomp`.`cr_report` (`REP_ID`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.cr_report_dwnld_log
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`cr_report_dwnld_log` (
-  `USER_ID` DECIMAL(11,0) NOT NULL,
-  `REP_ID` INT(11) NOT NULL,
-  `FILE_NAME` VARCHAR(100) NOT NULL,
-  `DWNLD_START_TIME` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `RECORD_READY_TIME` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `FILTER_PARAMS` VARCHAR(2000) NULL DEFAULT NULL)
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.cr_report_email_sent_log
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`cr_report_email_sent_log` (
-  `LOG_ID` INT(11) NOT NULL,
-  `SCHEDULE_ID` DECIMAL(11,0) NULL DEFAULT NULL,
-  `GEN_KEY` VARCHAR(25) NOT NULL,
-  `REP_ID` DECIMAL(11,0) NOT NULL,
-  `USER_ID` DECIMAL(11,0) NULL DEFAULT NULL,
-  `SENT_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `ACCESS_FLAG` VARCHAR(1) NOT NULL DEFAULT 'Y',
-  `TOUCH_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`LOG_ID`),
-  INDEX `fk_cr_report_rep_id` (`REP_ID` ASC),
-  CONSTRAINT `fk_cr_report_rep_id`
-    FOREIGN KEY (`REP_ID`)
-    REFERENCES `vid_openecomp`.`cr_report` (`REP_ID`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.cr_report_file_history
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`cr_report_file_history` (
-  `HIST_ID` INT(11) NOT NULL,
-  `SCHED_USER_ID` DECIMAL(11,0) NOT NULL,
-  `SCHEDULE_ID` DECIMAL(11,0) NOT NULL,
-  `USER_ID` DECIMAL(11,0) NOT NULL,
-  `REP_ID` DECIMAL(11,0) NULL DEFAULT NULL,
-  `RUN_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `RECURRENCE` VARCHAR(50) NULL DEFAULT NULL,
-  `FILE_TYPE_ID` DECIMAL(2,0) NULL DEFAULT NULL,
-  `FILE_NAME` VARCHAR(80) NULL DEFAULT NULL,
-  `FILE_BLOB` BLOB NULL DEFAULT NULL,
-  `FILE_SIZE` DECIMAL(11,0) NULL DEFAULT NULL,
-  `RAPTOR_URL` VARCHAR(4000) NULL DEFAULT NULL,
-  `ERROR_YN` CHAR(1) NULL DEFAULT 'N',
-  `ERROR_CODE` DECIMAL(11,0) NULL DEFAULT NULL,
-  `DELETED_YN` CHAR(1) NULL DEFAULT 'N',
-  `DELETED_BY` DECIMAL(38,0) NULL DEFAULT NULL,
-  PRIMARY KEY (`HIST_ID`),
-  INDEX `sys_c0014614` (`FILE_TYPE_ID` ASC),
-  INDEX `sys_c0014615` (`REP_ID` ASC),
-  CONSTRAINT `sys_c0014614`
-    FOREIGN KEY (`FILE_TYPE_ID`)
-    REFERENCES `vid_openecomp`.`cr_lu_file_type` (`LOOKUP_ID`),
-  CONSTRAINT `sys_c0014615`
-    FOREIGN KEY (`REP_ID`)
-    REFERENCES `vid_openecomp`.`cr_report` (`REP_ID`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.cr_report_log
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`cr_report_log` (
-  `REP_ID` DECIMAL(11,0) NOT NULL,
-  `LOG_TIME` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `USER_ID` DECIMAL(11,0) NOT NULL,
-  `ACTION` VARCHAR(2000) NOT NULL,
-  `ACTION_VALUE` VARCHAR(50) NULL DEFAULT NULL,
-  `FORM_FIELDS` VARCHAR(4000) NULL DEFAULT NULL,
-  INDEX `fk_cr_repor_ref_17645_cr_repor` (`REP_ID` ASC),
-  CONSTRAINT `fk_cr_repor_ref_17645_cr_repor`
-    FOREIGN KEY (`REP_ID`)
-    REFERENCES `vid_openecomp`.`cr_report` (`REP_ID`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.cr_report_schedule
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`cr_report_schedule` (
-  `SCHEDULE_ID` DECIMAL(11,0) NOT NULL,
-  `SCHED_USER_ID` DECIMAL(11,0) NOT NULL,
-  `REP_ID` DECIMAL(11,0) NOT NULL,
-  `ENABLED_YN` VARCHAR(1) NOT NULL,
-  `START_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `END_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `RUN_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `RECURRENCE` VARCHAR(50) NULL DEFAULT NULL,
-  `CONDITIONAL_YN` VARCHAR(1) NOT NULL,
-  `CONDITION_SQL` VARCHAR(4000) NULL DEFAULT NULL,
-  `NOTIFY_TYPE` INT(11) NULL DEFAULT '0',
-  `MAX_ROW` INT(11) NULL DEFAULT '1000',
-  `INITIAL_FORMFIELDS` VARCHAR(3500) NULL DEFAULT NULL,
-  `PROCESSED_FORMFIELDS` VARCHAR(3500) NULL DEFAULT NULL,
-  `FORMFIELDS` VARCHAR(3500) NULL DEFAULT NULL,
-  `CONDITION_LARGE_SQL` TEXT NULL DEFAULT NULL,
-  `ENCRYPT_YN` CHAR(1) NULL DEFAULT 'N',
-  `ATTACHMENT_YN` CHAR(1) NULL DEFAULT 'Y',
-  PRIMARY KEY (`SCHEDULE_ID`),
-  INDEX `fk_cr_repor_ref_14707_cr_repor` (`REP_ID` ASC),
-  CONSTRAINT `fk_cr_repor_ref_14707_cr_repor`
-    FOREIGN KEY (`REP_ID`)
-    REFERENCES `vid_openecomp`.`cr_report` (`REP_ID`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.cr_report_schedule_users
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`cr_report_schedule_users` (
-  `SCHEDULE_ID` DECIMAL(11,0) NOT NULL,
-  `REP_ID` DECIMAL(11,0) NOT NULL,
-  `USER_ID` DECIMAL(11,0) NOT NULL,
-  `ROLE_ID` DECIMAL(11,0) NULL DEFAULT NULL,
-  `ORDER_NO` DECIMAL(11,0) NOT NULL,
-  PRIMARY KEY (`SCHEDULE_ID`, `REP_ID`, `USER_ID`, `ORDER_NO`),
-  CONSTRAINT `fk_cr_repor_ref_14716_cr_repor`
-    FOREIGN KEY (`SCHEDULE_ID`)
-    REFERENCES `vid_openecomp`.`cr_report_schedule` (`SCHEDULE_ID`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.cr_report_template_map
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`cr_report_template_map` (
-  `REPORT_ID` INT(11) NOT NULL,
-  `TEMPLATE_FILE` VARCHAR(200) NULL DEFAULT NULL,
-  PRIMARY KEY (`REPORT_ID`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.cr_schedule_activity_log
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`cr_schedule_activity_log` (
-  `SCHEDULE_ID` DECIMAL(11,0) NOT NULL,
-  `URL` VARCHAR(4000) NULL DEFAULT NULL,
-  `NOTES` VARCHAR(2000) NULL DEFAULT NULL,
-  `RUN_TIME` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP)
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.cr_table_join
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`cr_table_join` (
-  `SRC_TABLE_NAME` VARCHAR(30) NOT NULL,
-  `DEST_TABLE_NAME` VARCHAR(30) NOT NULL,
-  `JOIN_EXPR` VARCHAR(500) NOT NULL,
-  INDEX `cr_table_join_dest_table_name` (`DEST_TABLE_NAME` ASC),
-  INDEX `cr_table_join_src_table_name` (`SRC_TABLE_NAME` ASC),
-  CONSTRAINT `fk_cr_table_ref_311_cr_tab`
-    FOREIGN KEY (`SRC_TABLE_NAME`)
-    REFERENCES `vid_openecomp`.`cr_table_source` (`TABLE_NAME`),
-  CONSTRAINT `fk_cr_table_ref_315_cr_tab`
-    FOREIGN KEY (`DEST_TABLE_NAME`)
-    REFERENCES `vid_openecomp`.`cr_table_source` (`TABLE_NAME`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.cr_table_role
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`cr_table_role` (
-  `TABLE_NAME` VARCHAR(30) NOT NULL,
-  `ROLE_ID` DECIMAL(11,0) NOT NULL,
-  PRIMARY KEY (`TABLE_NAME`, `ROLE_ID`),
-  CONSTRAINT `fk_cr_table_ref_32384_cr_table`
-    FOREIGN KEY (`TABLE_NAME`)
-    REFERENCES `vid_openecomp`.`cr_table_source` (`TABLE_NAME`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.cr_table_source
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`cr_table_source` (
-  `TABLE_NAME` VARCHAR(30) NOT NULL,
-  `DISPLAY_NAME` VARCHAR(30) NOT NULL,
-  `PK_FIELDS` VARCHAR(200) NULL DEFAULT NULL,
-  `WEB_VIEW_ACTION` VARCHAR(50) NULL DEFAULT NULL,
-  `LARGE_DATA_SOURCE_YN` VARCHAR(1) NOT NULL DEFAULT 'N',
-  `FILTER_SQL` VARCHAR(4000) NULL DEFAULT NULL,
-  `SOURCE_DB` VARCHAR(50) NULL DEFAULT NULL,
-  PRIMARY KEY (`TABLE_NAME`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.demo_bar_chart
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`demo_bar_chart` (
-  `label` VARCHAR(20) NULL DEFAULT NULL,
-  `value` DECIMAL(25,15) NULL DEFAULT NULL)
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.demo_bar_chart_inter
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`demo_bar_chart_inter` (
-  `spam_date` DATE NULL DEFAULT NULL,
-  `num_rpt_sources` DECIMAL(10,0) NULL DEFAULT NULL,
-  `num_det_sources` DECIMAL(10,0) NULL DEFAULT NULL)
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.demo_line_chart
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`demo_line_chart` (
-  `series` VARCHAR(20) NULL DEFAULT NULL,
-  `log_date` DATE NULL DEFAULT NULL,
-  `data_value` DECIMAL(10,5) NULL DEFAULT NULL)
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.demo_pie_chart
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`demo_pie_chart` (
-  `legend` VARCHAR(20) NULL DEFAULT NULL,
-  `data_value` DECIMAL(10,5) NULL DEFAULT NULL)
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.demo_scatter_chart
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`demo_scatter_chart` (
-  `rainfall` DECIMAL(10,2) NULL DEFAULT NULL,
-  `key_value` VARCHAR(20) NULL DEFAULT NULL,
-  `measurements` DECIMAL(10,2) NULL DEFAULT NULL)
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.demo_scatter_plot
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`demo_scatter_plot` (
-  `SERIES` VARCHAR(20) NULL DEFAULT NULL,
-  `VALUEX` DECIMAL(25,15) NULL DEFAULT NULL,
-  `VALUEY` DECIMAL(25,15) NULL DEFAULT NULL)
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.demo_util_chart
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`demo_util_chart` (
-  `traffic_date` DATE NULL DEFAULT NULL,
-  `util_perc` DECIMAL(10,5) NULL DEFAULT NULL)
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_app
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_app` (
-  `APP_ID` INT(11) NOT NULL AUTO_INCREMENT,
-  `APP_NAME` VARCHAR(100) NOT NULL DEFAULT '?',
-  `APP_IMAGE_URL` VARCHAR(256) NULL DEFAULT NULL,
-  `APP_DESCRIPTION` VARCHAR(512) NULL DEFAULT NULL,
-  `APP_NOTES` VARCHAR(4096) NULL DEFAULT NULL,
-  `APP_URL` VARCHAR(256) NULL DEFAULT NULL,
-  `APP_ALTERNATE_URL` VARCHAR(256) NULL DEFAULT NULL,
-  `APP_REST_ENDPOINT` VARCHAR(2000) NULL DEFAULT NULL,
-  `ML_APP_NAME` VARCHAR(50) NOT NULL DEFAULT '?',
-  `ML_APP_ADMIN_ID` VARCHAR(7) NOT NULL DEFAULT '?',
-  `MOTS_ID` INT(11) NULL DEFAULT NULL,
-  `APP_PASSWORD` VARCHAR(256) NOT NULL DEFAULT '?',
-  `OPEN` CHAR(1) NULL DEFAULT 'N',
-  `ENABLED` CHAR(1) NULL DEFAULT 'Y',
-  `THUMBNAIL` MEDIUMBLOB NULL DEFAULT NULL,
-  `APP_USERNAME` VARCHAR(50) NULL DEFAULT NULL,
-  `UEB_KEY` VARCHAR(256) NULL DEFAULT NULL,
-  `UEB_SECRET` VARCHAR(256) NULL DEFAULT NULL,
-  `UEB_TOPIC_NAME` VARCHAR(256) NULL DEFAULT NULL,
-  PRIMARY KEY (`APP_ID`))
-ENGINE = InnoDB
-AUTO_INCREMENT = 2
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_audit_action
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_audit_action` (
-  `AUDIT_ACTION_ID` INT(11) NOT NULL,
-  `CLASS_NAME` VARCHAR(500) NOT NULL,
-  `METHOD_NAME` VARCHAR(50) NOT NULL,
-  `AUDIT_ACTION_CD` VARCHAR(20) NOT NULL,
-  `AUDIT_ACTION_DESC` VARCHAR(200) NULL DEFAULT NULL,
-  `ACTIVE_YN` VARCHAR(1) NULL DEFAULT NULL,
-  PRIMARY KEY (`AUDIT_ACTION_ID`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_audit_action_log
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_audit_action_log` (
-  `AUDIT_LOG_ID` INT(11) NOT NULL AUTO_INCREMENT,
-  `AUDIT_ACTION_CD` VARCHAR(200) NULL DEFAULT NULL,
-  `ACTION_TIME` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `USER_ID` DECIMAL(11,0) NULL DEFAULT NULL,
-  `CLASS_NAME` VARCHAR(100) NULL DEFAULT NULL,
-  `METHOD_NAME` VARCHAR(50) NULL DEFAULT NULL,
-  `SUCCESS_MSG` VARCHAR(20) NULL DEFAULT NULL,
-  `ERROR_MSG` VARCHAR(500) NULL DEFAULT NULL,
-  PRIMARY KEY (`AUDIT_LOG_ID`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_audit_log
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_audit_log` (
-  `LOG_ID` INT(11) NOT NULL AUTO_INCREMENT,
-  `USER_ID` INT(11) NOT NULL,
-  `ACTIVITY_CD` VARCHAR(50) NOT NULL,
-  `AUDIT_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `COMMENTS` VARCHAR(1000) NULL DEFAULT NULL,
-  `AFFECTED_RECORD_ID_BK` VARCHAR(500) NULL DEFAULT NULL,
-  `AFFECTED_RECORD_ID` VARCHAR(4000) NULL DEFAULT NULL,
-  PRIMARY KEY (`LOG_ID`),
-  INDEX `fn_audit_log_activity_cd` (`ACTIVITY_CD` ASC),
-  INDEX `fn_audit_log_user_id` (`USER_ID` ASC),
-  CONSTRAINT `FK_FN_AUDIT_REF_209_FN_USER`
-    FOREIGN KEY (`USER_ID`)
-    REFERENCES `vid_openecomp`.`fn_user` (`USER_ID`),
-  CONSTRAINT `fk_fn_audit_ref_205_fn_lu_ac`
-    FOREIGN KEY (`ACTIVITY_CD`)
-    REFERENCES `vid_openecomp`.`fn_lu_activity` (`ACTIVITY_CD`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_broadcast_message
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_broadcast_message` (
-  `MESSAGE_ID` INT(11) NOT NULL AUTO_INCREMENT,
-  `MESSAGE_TEXT` VARCHAR(1000) NOT NULL,
-  `MESSAGE_LOCATION_ID` DECIMAL(11,0) NOT NULL,
-  `BROADCAST_START_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `BROADCAST_END_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `ACTIVE_YN` CHAR(1) NOT NULL DEFAULT 'Y',
-  `SORT_ORDER` DECIMAL(4,0) NOT NULL,
-  `BROADCAST_SITE_CD` VARCHAR(50) NULL DEFAULT NULL,
-  PRIMARY KEY (`MESSAGE_ID`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_chat_logs
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_chat_logs` (
-  `CHAT_LOG_ID` INT(11) NOT NULL,
-  `CHAT_ROOM_ID` INT(11) NULL DEFAULT NULL,
-  `USER_ID` INT(11) NULL DEFAULT NULL,
-  `MESSAGE` VARCHAR(1000) NULL DEFAULT NULL,
-  `MESSAGE_DATE_TIME` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  PRIMARY KEY (`CHAT_LOG_ID`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_chat_room
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_chat_room` (
-  `CHAT_ROOM_ID` INT(11) NOT NULL,
-  `NAME` VARCHAR(50) NOT NULL,
-  `DESCRIPTION` VARCHAR(500) NULL DEFAULT NULL,
-  `OWNER_ID` INT(11) NULL DEFAULT NULL,
-  `CREATED_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `UPDATED_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`CHAT_ROOM_ID`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_chat_users
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_chat_users` (
-  `CHAT_ROOM_ID` INT(11) NULL DEFAULT NULL,
-  `USER_ID` INT(11) NULL DEFAULT NULL,
-  `LAST_ACTIVITY_DATE_TIME` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `CHAT_STATUS` VARCHAR(20) NULL DEFAULT NULL,
-  `ID` INT(11) NOT NULL,
-  PRIMARY KEY (`ID`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_datasource
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_datasource` (
-  `ID` INT(11) NOT NULL AUTO_INCREMENT,
-  `NAME` VARCHAR(50) NULL DEFAULT NULL,
-  `DRIVER_NAME` VARCHAR(256) NULL DEFAULT NULL,
-  `SERVER` VARCHAR(256) NULL DEFAULT NULL,
-  `PORT` INT(11) NULL DEFAULT NULL,
-  `USER_NAME` VARCHAR(256) NULL DEFAULT NULL,
-  `PASSWORD` VARCHAR(256) NULL DEFAULT NULL,
-  `URL` VARCHAR(256) NULL DEFAULT NULL,
-  `MIN_POOL_SIZE` INT(11) NULL DEFAULT NULL,
-  `MAX_POOL_SIZE` INT(11) NULL DEFAULT NULL,
-  `ADAPTER_ID` INT(11) NULL DEFAULT NULL,
-  `DS_TYPE` VARCHAR(20) NULL DEFAULT NULL,
-  PRIMARY KEY (`ID`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_function
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_function` (
-  `FUNCTION_CD` VARCHAR(30) NOT NULL,
-  `FUNCTION_NAME` VARCHAR(50) NOT NULL,
-  PRIMARY KEY (`FUNCTION_CD`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_lu_activity
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_lu_activity` (
-  `ACTIVITY_CD` VARCHAR(50) NOT NULL,
-  `ACTIVITY` VARCHAR(50) NOT NULL,
-  PRIMARY KEY (`ACTIVITY_CD`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_lu_alert_method
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_lu_alert_method` (
-  `ALERT_METHOD_CD` VARCHAR(10) NOT NULL,
-  `ALERT_METHOD` VARCHAR(50) NOT NULL,
-  PRIMARY KEY (`ALERT_METHOD_CD`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_lu_broadcast_site
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_lu_broadcast_site` (
-  `BROADCAST_SITE_CD` VARCHAR(50) NOT NULL,
-  `BROADCAST_SITE_DESCR` VARCHAR(100) NULL DEFAULT NULL,
-  PRIMARY KEY (`BROADCAST_SITE_CD`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_lu_menu_set
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_lu_menu_set` (
-  `MENU_SET_CD` VARCHAR(10) NOT NULL,
-  `MENU_SET_NAME` VARCHAR(50) NOT NULL,
-  PRIMARY KEY (`MENU_SET_CD`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_lu_message_location
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_lu_message_location` (
-  `message_location_id` DECIMAL(11,0) NOT NULL,
-  `message_location_descr` VARCHAR(30) NOT NULL,
-  PRIMARY KEY (`message_location_id`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_lu_priority
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_lu_priority` (
-  `PRIORITY_ID` DECIMAL(11,0) NOT NULL,
-  `PRIORITY` VARCHAR(50) NOT NULL,
-  `ACTIVE_YN` CHAR(1) NOT NULL,
-  `SORT_ORDER` DECIMAL(5,0) NULL DEFAULT NULL,
-  PRIMARY KEY (`PRIORITY_ID`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_lu_role_type
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_lu_role_type` (
-  `ROLE_TYPE_ID` DECIMAL(11,0) NOT NULL,
-  `ROLE_TYPE` VARCHAR(50) NOT NULL,
-  PRIMARY KEY (`ROLE_TYPE_ID`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_lu_tab_set
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_lu_tab_set` (
-  `TAB_SET_CD` VARCHAR(30) NOT NULL,
-  `TAB_SET_NAME` VARCHAR(50) NOT NULL,
-  PRIMARY KEY (`TAB_SET_CD`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_lu_timezone
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_lu_timezone` (
-  `TIMEZONE_ID` INT(11) NOT NULL,
-  `TIMEZONE_NAME` VARCHAR(100) NOT NULL,
-  `TIMEZONE_VALUE` VARCHAR(100) NOT NULL,
-  PRIMARY KEY (`TIMEZONE_ID`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_menu
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_menu` (
-  `MENU_ID` INT(11) NOT NULL AUTO_INCREMENT,
-  `LABEL` VARCHAR(100) NULL DEFAULT NULL,
-  `PARENT_ID` INT(11) NULL DEFAULT NULL,
-  `SORT_ORDER` DECIMAL(4,0) NULL DEFAULT NULL,
-  `ACTION` VARCHAR(200) NULL DEFAULT NULL,
-  `FUNCTION_CD` VARCHAR(30) NULL DEFAULT NULL,
-  `ACTIVE_YN` VARCHAR(1) NOT NULL DEFAULT 'Y',
-  `SERVLET` VARCHAR(50) NULL DEFAULT NULL,
-  `QUERY_STRING` VARCHAR(200) NULL DEFAULT NULL,
-  `EXTERNAL_URL` VARCHAR(200) NULL DEFAULT NULL,
-  `TARGET` VARCHAR(25) NULL DEFAULT NULL,
-  `MENU_SET_CD` VARCHAR(10) NULL DEFAULT 'APP',
-  `SEPARATOR_YN` CHAR(1) NULL DEFAULT 'N',
-  `IMAGE_SRC` VARCHAR(100) NULL DEFAULT NULL,
-  PRIMARY KEY (`MENU_ID`),
-  INDEX `FK_FN_MENU_REF_196_FN_MENU` (`PARENT_ID` ASC),
-  INDEX `FK_FN_MENU_MENU_SET_CD` (`MENU_SET_CD` ASC),
-  INDEX `fn_menu_function_cd` (`FUNCTION_CD` ASC),
-  CONSTRAINT `FK_FN_MENU_MENU_SET_CD`
-    FOREIGN KEY (`MENU_SET_CD`)
-    REFERENCES `vid_openecomp`.`fn_lu_menu_set` (`MENU_SET_CD`),
-  CONSTRAINT `FK_FN_MENU_REF_196_FN_MENU`
-    FOREIGN KEY (`PARENT_ID`)
-    REFERENCES `vid_openecomp`.`fn_menu` (`MENU_ID`),
-  CONSTRAINT `FK_FN_MENU_REF_223_FN_FUNCT`
-    FOREIGN KEY (`FUNCTION_CD`)
-    REFERENCES `vid_openecomp`.`fn_function` (`FUNCTION_CD`))
-ENGINE = InnoDB
-AUTO_INCREMENT = 150039
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_org
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_org` (
-  `ORG_ID` INT(11) NOT NULL,
-  `ORG_NAME` VARCHAR(50) NOT NULL,
-  `ACCESS_CD` VARCHAR(10) NULL DEFAULT NULL,
-  PRIMARY KEY (`ORG_ID`),
-  INDEX `fn_org_access_cd` (`ACCESS_CD` ASC))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_qz_blob_triggers
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_qz_blob_triggers` (
-  `SCHED_NAME` VARCHAR(120) NOT NULL,
-  `TRIGGER_NAME` VARCHAR(200) NOT NULL,
-  `TRIGGER_GROUP` VARCHAR(200) NOT NULL,
-  `BLOB_DATA` BLOB NULL DEFAULT NULL,
-  PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`),
-  INDEX `SCHED_NAME` (`SCHED_NAME` ASC, `TRIGGER_NAME` ASC, `TRIGGER_GROUP` ASC),
-  CONSTRAINT `fn_qz_blob_triggers_ibfk_1`
-    FOREIGN KEY (`SCHED_NAME` , `TRIGGER_NAME` , `TRIGGER_GROUP`)
-    REFERENCES `vid_openecomp`.`fn_qz_triggers` (`SCHED_NAME` , `TRIGGER_NAME` , `TRIGGER_GROUP`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_qz_calendars
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_qz_calendars` (
-  `SCHED_NAME` VARCHAR(120) NOT NULL,
-  `CALENDAR_NAME` VARCHAR(200) NOT NULL,
-  `CALENDAR` BLOB NOT NULL,
-  PRIMARY KEY (`SCHED_NAME`, `CALENDAR_NAME`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_qz_cron_triggers
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_qz_cron_triggers` (
-  `SCHED_NAME` VARCHAR(120) NOT NULL,
-  `TRIGGER_NAME` VARCHAR(200) NOT NULL,
-  `TRIGGER_GROUP` VARCHAR(200) NOT NULL,
-  `CRON_EXPRESSION` VARCHAR(120) NOT NULL,
-  `TIME_ZONE_ID` VARCHAR(80) NULL DEFAULT NULL,
-  PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`),
-  CONSTRAINT `fn_qz_cron_triggers_ibfk_1`
-    FOREIGN KEY (`SCHED_NAME` , `TRIGGER_NAME` , `TRIGGER_GROUP`)
-    REFERENCES `vid_openecomp`.`fn_qz_triggers` (`SCHED_NAME` , `TRIGGER_NAME` , `TRIGGER_GROUP`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_qz_fired_triggers
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_qz_fired_triggers` (
-  `SCHED_NAME` VARCHAR(120) NOT NULL,
-  `ENTRY_ID` VARCHAR(95) NOT NULL,
-  `TRIGGER_NAME` VARCHAR(200) NOT NULL,
-  `TRIGGER_GROUP` VARCHAR(200) NOT NULL,
-  `INSTANCE_NAME` VARCHAR(200) NOT NULL,
-  `FIRED_TIME` BIGINT(13) NOT NULL,
-  `SCHED_TIME` BIGINT(13) NOT NULL,
-  `PRIORITY` INT(11) NOT NULL,
-  `STATE` VARCHAR(16) NOT NULL,
-  `JOB_NAME` VARCHAR(200) NULL DEFAULT NULL,
-  `JOB_GROUP` VARCHAR(200) NULL DEFAULT NULL,
-  `IS_NONCONCURRENT` VARCHAR(1) NULL DEFAULT NULL,
-  `REQUESTS_RECOVERY` VARCHAR(1) NULL DEFAULT NULL,
-  PRIMARY KEY (`SCHED_NAME`, `ENTRY_ID`),
-  INDEX `idx_fn_qz_ft_trig_inst_name` (`SCHED_NAME` ASC, `INSTANCE_NAME` ASC),
-  INDEX `idx_fn_qz_ft_inst_job_req_rcvry` (`SCHED_NAME` ASC, `INSTANCE_NAME` ASC, `REQUESTS_RECOVERY` ASC),
-  INDEX `idx_fn_qz_ft_j_g` (`SCHED_NAME` ASC, `JOB_NAME` ASC, `JOB_GROUP` ASC),
-  INDEX `idx_fn_qz_ft_jg` (`SCHED_NAME` ASC, `JOB_GROUP` ASC),
-  INDEX `idx_fn_qz_ft_t_g` (`SCHED_NAME` ASC, `TRIGGER_NAME` ASC, `TRIGGER_GROUP` ASC),
-  INDEX `idx_fn_qz_ft_tg` (`SCHED_NAME` ASC, `TRIGGER_GROUP` ASC))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_qz_job_details
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_qz_job_details` (
-  `SCHED_NAME` VARCHAR(120) NOT NULL,
-  `JOB_NAME` VARCHAR(200) NOT NULL,
-  `JOB_GROUP` VARCHAR(200) NOT NULL,
-  `DESCRIPTION` VARCHAR(250) NULL DEFAULT NULL,
-  `JOB_CLASS_NAME` VARCHAR(250) NOT NULL,
-  `IS_DURABLE` VARCHAR(1) NOT NULL,
-  `IS_NONCONCURRENT` VARCHAR(1) NOT NULL,
-  `IS_UPDATE_DATA` VARCHAR(1) NOT NULL,
-  `REQUESTS_RECOVERY` VARCHAR(1) NOT NULL,
-  `JOB_DATA` BLOB NULL DEFAULT NULL,
-  PRIMARY KEY (`SCHED_NAME`, `JOB_NAME`, `JOB_GROUP`),
-  INDEX `idx_fn_qz_j_req_recovery` (`SCHED_NAME` ASC, `REQUESTS_RECOVERY` ASC),
-  INDEX `idx_fn_qz_j_grp` (`SCHED_NAME` ASC, `JOB_GROUP` ASC))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_qz_locks
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_qz_locks` (
-  `SCHED_NAME` VARCHAR(120) NOT NULL,
-  `LOCK_NAME` VARCHAR(40) NOT NULL,
-  PRIMARY KEY (`SCHED_NAME`, `LOCK_NAME`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_qz_paused_trigger_grps
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_qz_paused_trigger_grps` (
-  `SCHED_NAME` VARCHAR(120) NOT NULL,
-  `TRIGGER_GROUP` VARCHAR(200) NOT NULL,
-  PRIMARY KEY (`SCHED_NAME`, `TRIGGER_GROUP`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_qz_scheduler_state
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_qz_scheduler_state` (
-  `SCHED_NAME` VARCHAR(120) NOT NULL,
-  `INSTANCE_NAME` VARCHAR(200) NOT NULL,
-  `LAST_CHECKIN_TIME` BIGINT(13) NOT NULL,
-  `CHECKIN_INTERVAL` BIGINT(13) NOT NULL,
-  PRIMARY KEY (`SCHED_NAME`, `INSTANCE_NAME`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_qz_simple_triggers
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_qz_simple_triggers` (
-  `SCHED_NAME` VARCHAR(120) NOT NULL,
-  `TRIGGER_NAME` VARCHAR(200) NOT NULL,
-  `TRIGGER_GROUP` VARCHAR(200) NOT NULL,
-  `REPEAT_COUNT` BIGINT(7) NOT NULL,
-  `REPEAT_INTERVAL` BIGINT(12) NOT NULL,
-  `TIMES_TRIGGERED` BIGINT(10) NOT NULL,
-  PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`),
-  CONSTRAINT `fn_qz_simple_triggers_ibfk_1`
-    FOREIGN KEY (`SCHED_NAME` , `TRIGGER_NAME` , `TRIGGER_GROUP`)
-    REFERENCES `vid_openecomp`.`fn_qz_triggers` (`SCHED_NAME` , `TRIGGER_NAME` , `TRIGGER_GROUP`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_qz_simprop_triggers
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_qz_simprop_triggers` (
-  `SCHED_NAME` VARCHAR(120) NOT NULL,
-  `TRIGGER_NAME` VARCHAR(200) NOT NULL,
-  `TRIGGER_GROUP` VARCHAR(200) NOT NULL,
-  `STR_PROP_1` VARCHAR(512) NULL DEFAULT NULL,
-  `STR_PROP_2` VARCHAR(512) NULL DEFAULT NULL,
-  `STR_PROP_3` VARCHAR(512) NULL DEFAULT NULL,
-  `INT_PROP_1` INT(11) NULL DEFAULT NULL,
-  `INT_PROP_2` INT(11) NULL DEFAULT NULL,
-  `LONG_PROP_1` BIGINT(20) NULL DEFAULT NULL,
-  `LONG_PROP_2` BIGINT(20) NULL DEFAULT NULL,
-  `DEC_PROP_1` DECIMAL(13,4) NULL DEFAULT NULL,
-  `DEC_PROP_2` DECIMAL(13,4) NULL DEFAULT NULL,
-  `BOOL_PROP_1` VARCHAR(1) NULL DEFAULT NULL,
-  `BOOL_PROP_2` VARCHAR(1) NULL DEFAULT NULL,
-  PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`),
-  CONSTRAINT `fn_qz_simprop_triggers_ibfk_1`
-    FOREIGN KEY (`SCHED_NAME` , `TRIGGER_NAME` , `TRIGGER_GROUP`)
-    REFERENCES `vid_openecomp`.`fn_qz_triggers` (`SCHED_NAME` , `TRIGGER_NAME` , `TRIGGER_GROUP`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_qz_triggers
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_qz_triggers` (
-  `SCHED_NAME` VARCHAR(120) NOT NULL,
-  `TRIGGER_NAME` VARCHAR(200) NOT NULL,
-  `TRIGGER_GROUP` VARCHAR(200) NOT NULL,
-  `JOB_NAME` VARCHAR(200) NOT NULL,
-  `JOB_GROUP` VARCHAR(200) NOT NULL,
-  `DESCRIPTION` VARCHAR(250) NULL DEFAULT NULL,
-  `NEXT_FIRE_TIME` BIGINT(13) NULL DEFAULT NULL,
-  `PREV_FIRE_TIME` BIGINT(13) NULL DEFAULT NULL,
-  `PRIORITY` INT(11) NULL DEFAULT NULL,
-  `TRIGGER_STATE` VARCHAR(16) NOT NULL,
-  `TRIGGER_TYPE` VARCHAR(8) NOT NULL,
-  `START_TIME` BIGINT(13) NOT NULL,
-  `END_TIME` BIGINT(13) NULL DEFAULT NULL,
-  `CALENDAR_NAME` VARCHAR(200) NULL DEFAULT NULL,
-  `MISFIRE_INSTR` SMALLINT(2) NULL DEFAULT NULL,
-  `JOB_DATA` BLOB NULL DEFAULT NULL,
-  PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`),
-  INDEX `idx_fn_qz_t_j` (`SCHED_NAME` ASC, `JOB_NAME` ASC, `JOB_GROUP` ASC),
-  INDEX `idx_fn_qz_t_jg` (`SCHED_NAME` ASC, `JOB_GROUP` ASC),
-  INDEX `idx_fn_qz_t_c` (`SCHED_NAME` ASC, `CALENDAR_NAME` ASC),
-  INDEX `idx_fn_qz_t_g` (`SCHED_NAME` ASC, `TRIGGER_GROUP` ASC),
-  INDEX `idx_fn_qz_t_state` (`SCHED_NAME` ASC, `TRIGGER_STATE` ASC),
-  INDEX `idx_fn_qz_t_n_state` (`SCHED_NAME` ASC, `TRIGGER_NAME` ASC, `TRIGGER_GROUP` ASC, `TRIGGER_STATE` ASC),
-  INDEX `idx_fn_qz_t_n_g_state` (`SCHED_NAME` ASC, `TRIGGER_GROUP` ASC, `TRIGGER_STATE` ASC),
-  INDEX `idx_fn_qz_t_next_fire_time` (`SCHED_NAME` ASC, `NEXT_FIRE_TIME` ASC),
-  INDEX `idx_fn_qz_t_nft_st` (`SCHED_NAME` ASC, `TRIGGER_STATE` ASC, `NEXT_FIRE_TIME` ASC),
-  INDEX `idx_fn_qz_t_nft_misfire` (`SCHED_NAME` ASC, `MISFIRE_INSTR` ASC, `NEXT_FIRE_TIME` ASC),
-  INDEX `idx_fn_qz_t_nft_st_misfire` (`SCHED_NAME` ASC, `MISFIRE_INSTR` ASC, `NEXT_FIRE_TIME` ASC, `TRIGGER_STATE` ASC),
-  INDEX `idx_fn_qz_t_nft_st_misfire_grp` (`SCHED_NAME` ASC, `MISFIRE_INSTR` ASC, `NEXT_FIRE_TIME` ASC, `TRIGGER_GROUP` ASC, 
-
-`TRIGGER_STATE` ASC),
-  CONSTRAINT `fn_qz_triggers_ibfk_1`
-    FOREIGN KEY (`SCHED_NAME` , `JOB_NAME` , `JOB_GROUP`)
-    REFERENCES `vid_openecomp`.`fn_qz_job_details` (`SCHED_NAME` , `JOB_NAME` , `JOB_GROUP`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_restricted_url
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_restricted_url` (
-  `RESTRICTED_URL` VARCHAR(250) NOT NULL,
-  `FUNCTION_CD` VARCHAR(30) NOT NULL,
-  PRIMARY KEY (`RESTRICTED_URL`, `FUNCTION_CD`),
-  INDEX `fk_restricted_url_function_cd` (`FUNCTION_CD` ASC),
-  CONSTRAINT `fk_restricted_url_function_cd`
-    FOREIGN KEY (`FUNCTION_CD`)
-    REFERENCES `vid_openecomp`.`fn_function` (`FUNCTION_CD`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_role
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_role` (
-  `ROLE_ID` INT(11) NOT NULL AUTO_INCREMENT,
-  `ROLE_NAME` VARCHAR(50) NOT NULL,
-  `ACTIVE_YN` VARCHAR(1) NOT NULL DEFAULT 'Y',
-  `PRIORITY` DECIMAL(4,0) NULL DEFAULT NULL,
-  PRIMARY KEY (`ROLE_ID`))
-ENGINE = InnoDB
-AUTO_INCREMENT = 17
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_role_composite
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_role_composite` (
-  `PARENT_ROLE_ID` INT(11) NOT NULL,
-  `CHILD_ROLE_ID` INT(11) NOT NULL,
-  PRIMARY KEY (`PARENT_ROLE_ID`, `CHILD_ROLE_ID`),
-  INDEX `FK_FN_ROLE_COMPOSITE_CHILD` (`CHILD_ROLE_ID` ASC),
-  CONSTRAINT `FK_FN_ROLE_COMPOSITE_CHILD`
-    FOREIGN KEY (`CHILD_ROLE_ID`)
-    REFERENCES `vid_openecomp`.`fn_role` (`ROLE_ID`),
-  CONSTRAINT `FK_FN_ROLE_COMPOSITE_PARENT`
-    FOREIGN KEY (`PARENT_ROLE_ID`)
-    REFERENCES `vid_openecomp`.`fn_role` (`ROLE_ID`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_role_function
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_role_function` (
-  `ROLE_ID` INT(11) NOT NULL,
-  `FUNCTION_CD` VARCHAR(30) NOT NULL,
-  PRIMARY KEY (`ROLE_ID`, `FUNCTION_CD`),
-  INDEX `fn_role_function_function_cd` (`FUNCTION_CD` ASC),
-  INDEX `fn_role_function_role_id` (`ROLE_ID` ASC),
-  CONSTRAINT `FK_FN_ROLE__REF_198_FN_ROLE`
-    FOREIGN KEY (`ROLE_ID`)
-    REFERENCES `vid_openecomp`.`fn_role` (`ROLE_ID`),
-  CONSTRAINT `fk_fn_role__ref_201_fn_funct`
-    FOREIGN KEY (`FUNCTION_CD`)
-    REFERENCES `vid_openecomp`.`fn_function` (`FUNCTION_CD`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_schedule_workflows
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_schedule_workflows` (
-  `id_schedule_workflows` BIGINT(25) NOT NULL AUTO_INCREMENT,
-  `workflow_server_url` VARCHAR(45) NULL DEFAULT NULL,
-  `workflow_key` VARCHAR(45) NOT NULL,
-  `workflow_arguments` VARCHAR(45) NULL DEFAULT NULL,
-  `startDateTimeCron` VARCHAR(45) NULL DEFAULT NULL,
-  `endDateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `start_date_time` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `recurrence` VARCHAR(45) NULL DEFAULT NULL,
-  PRIMARY KEY (`id_schedule_workflows`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_tab
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_tab` (
-  `TAB_CD` VARCHAR(30) NOT NULL,
-  `TAB_NAME` VARCHAR(50) NOT NULL,
-  `TAB_DESCR` VARCHAR(100) NULL DEFAULT NULL,
-  `ACTION` VARCHAR(100) NOT NULL,
-  `FUNCTION_CD` VARCHAR(30) NOT NULL,
-  `ACTIVE_YN` CHAR(1) NOT NULL,
-  `SORT_ORDER` DECIMAL(11,0) NOT NULL,
-  `PARENT_TAB_CD` VARCHAR(30) NULL DEFAULT NULL,
-  `TAB_SET_CD` VARCHAR(30) NULL DEFAULT NULL,
-  PRIMARY KEY (`TAB_CD`),
-  INDEX `fk_fn_tab_function_cd` (`FUNCTION_CD` ASC),
-  INDEX `fk_fn_tab_set_cd` (`TAB_SET_CD` ASC),
-  CONSTRAINT `fk_fn_tab_function_cd`
-    FOREIGN KEY (`FUNCTION_CD`)
-    REFERENCES `vid_openecomp`.`fn_function` (`FUNCTION_CD`),
-  CONSTRAINT `fk_fn_tab_set_cd`
-    FOREIGN KEY (`TAB_SET_CD`)
-    REFERENCES `vid_openecomp`.`fn_lu_tab_set` (`TAB_SET_CD`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_tab_selected
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_tab_selected` (
-  `SELECTED_TAB_CD` VARCHAR(30) NOT NULL,
-  `TAB_URI` VARCHAR(40) NOT NULL,
-  PRIMARY KEY (`SELECTED_TAB_CD`, `TAB_URI`),
-  CONSTRAINT `fk_fn_tab_selected_tab_cd`
-    FOREIGN KEY (`SELECTED_TAB_CD`)
-    REFERENCES `vid_openecomp`.`fn_tab` (`TAB_CD`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_user
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_user` (
-  `USER_ID` INT(11) NOT NULL AUTO_INCREMENT,
-  `ORG_ID` INT(11) NULL DEFAULT NULL,
-  `MANAGER_ID` INT(11) NULL DEFAULT NULL,
-  `FIRST_NAME` VARCHAR(25) NULL DEFAULT NULL,
-  `MIDDLE_NAME` VARCHAR(25) NULL DEFAULT NULL,
-  `LAST_NAME` VARCHAR(25) NULL DEFAULT NULL,
-  `PHONE` VARCHAR(25) NULL DEFAULT NULL,
-  `FAX` VARCHAR(25) NULL DEFAULT NULL,
-  `CELLULAR` VARCHAR(25) NULL DEFAULT NULL,
-  `EMAIL` VARCHAR(50) NULL DEFAULT NULL,
-  `ADDRESS_ID` DECIMAL(11,0) NULL DEFAULT NULL,
-  `ALERT_METHOD_CD` VARCHAR(10) NULL DEFAULT NULL,
-  `HRID` VARCHAR(20) NULL DEFAULT NULL,
-  `ORG_USER_ID` VARCHAR(20) NULL DEFAULT NULL,
-  `ORG_CODE` VARCHAR(30) NULL DEFAULT NULL,
-  `LOGIN_ID` VARCHAR(25) NULL DEFAULT NULL,
-  `LOGIN_PWD` VARCHAR(25) NULL DEFAULT NULL,
-  `LAST_LOGIN_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `ACTIVE_YN` VARCHAR(1) NOT NULL DEFAULT 'Y',
-  `CREATED_ID` INT(11) NULL DEFAULT NULL,
-  `CREATED_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `MODIFIED_ID` INT(11) NULL DEFAULT NULL,
-  `MODIFIED_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `IS_INTERNAL_YN` CHAR(1) NOT NULL DEFAULT 'N',
-  `ADDRESS_LINE_1` VARCHAR(100) NULL DEFAULT NULL,
-  `ADDRESS_LINE_2` VARCHAR(100) NULL DEFAULT NULL,
-  `CITY` VARCHAR(50) NULL DEFAULT NULL,
-  `STATE_CD` VARCHAR(3) NULL DEFAULT NULL,
-  `ZIP_CODE` VARCHAR(11) NULL DEFAULT NULL,
-  `COUNTRY_CD` VARCHAR(3) NULL DEFAULT NULL,
-  `LOCATION_CLLI` VARCHAR(8) NULL DEFAULT NULL,
-  `ORG_MANAGER_USERID` VARCHAR(20) NULL DEFAULT NULL,
-  `COMPANY` VARCHAR(100) NULL DEFAULT NULL,
-  `DEPARTMENT_NAME` VARCHAR(100) NULL DEFAULT NULL,
-  `JOB_TITLE` VARCHAR(100) NULL DEFAULT NULL,
-  `TIMEZONE` INT(11) NULL DEFAULT NULL,
-  `DEPARTMENT` VARCHAR(25) NULL DEFAULT NULL,
-  `BUSINESS_UNIT` VARCHAR(25) NULL DEFAULT NULL,
-  `BUSINESS_UNIT_NAME` VARCHAR(100) NULL DEFAULT NULL,
-  `COST_CENTER` VARCHAR(25) NULL DEFAULT NULL,
-  `FIN_LOC_CODE` VARCHAR(10) NULL DEFAULT NULL,
-  `SILO_STATUS` VARCHAR(10) NULL DEFAULT NULL,
-  PRIMARY KEY (`USER_ID`),
-  UNIQUE INDEX `fn_user_hrid` (`HRID` ASC),
-  UNIQUE INDEX `fn_user_login_id` (`LOGIN_ID` ASC),
-  INDEX `fn_user_address_id` (`ADDRESS_ID` ASC),
-  INDEX `fn_user_alert_method_cd` (`ALERT_METHOD_CD` ASC),
-  INDEX `fn_user_org_id` (`ORG_ID` ASC),
-  INDEX `fk_fn_user_ref_197_fn_user` (`MANAGER_ID` ASC),
-  INDEX `fk_fn_user_ref_198_fn_user` (`CREATED_ID` ASC),
-  INDEX `fk_fn_user_ref_199_fn_user` (`MODIFIED_ID` ASC),
-  INDEX `fk_timezone` (`TIMEZONE` ASC),
-  CONSTRAINT `fk_fn_user_ref_110_fn_org`
-    FOREIGN KEY (`ORG_ID`)
-    REFERENCES `vid_openecomp`.`fn_org` (`ORG_ID`),
-  CONSTRAINT `fk_fn_user_ref_123_fn_lu_al`
-    FOREIGN KEY (`ALERT_METHOD_CD`)
-    REFERENCES `vid_openecomp`.`fn_lu_alert_method` (`ALERT_METHOD_CD`),
-  CONSTRAINT `fk_fn_user_ref_197_fn_user`
-    FOREIGN KEY (`MANAGER_ID`)
-    REFERENCES `vid_openecomp`.`fn_user` (`USER_ID`),
-  CONSTRAINT `fk_fn_user_ref_198_fn_user`
-    FOREIGN KEY (`CREATED_ID`)
-    REFERENCES `vid_openecomp`.`fn_user` (`USER_ID`),
-  CONSTRAINT `fk_fn_user_ref_199_fn_user`
-    FOREIGN KEY (`MODIFIED_ID`)
-    REFERENCES `vid_openecomp`.`fn_user` (`USER_ID`),
-  CONSTRAINT `fk_timezone`
-    FOREIGN KEY (`TIMEZONE`)
-    REFERENCES `vid_openecomp`.`fn_lu_timezone` (`TIMEZONE_ID`))
-ENGINE = InnoDB
-AUTO_INCREMENT = 2
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_user_pseudo_role
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_user_pseudo_role` (
-  `PSEUDO_ROLE_ID` INT(11) NOT NULL,
-  `USER_ID` INT(11) NOT NULL,
-  PRIMARY KEY (`PSEUDO_ROLE_ID`, `USER_ID`),
-  INDEX `fk_pseudo_role_user_id` (`USER_ID` ASC),
-  CONSTRAINT `fk_pseudo_role_pseudo_role_id`
-    FOREIGN KEY (`PSEUDO_ROLE_ID`)
-    REFERENCES `vid_openecomp`.`fn_role` (`ROLE_ID`),
-  CONSTRAINT `fk_pseudo_role_user_id`
-    FOREIGN KEY (`USER_ID`)
-    REFERENCES `vid_openecomp`.`fn_user` (`USER_ID`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_user_role
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_user_role` (
-  `USER_ID` INT(10) NOT NULL,
-  `ROLE_ID` INT(10) NOT NULL,
-  `PRIORITY` DECIMAL(4,0) NULL DEFAULT NULL,
-  `APP_ID` INT(11) NOT NULL DEFAULT '1',
-  PRIMARY KEY (`USER_ID`, `ROLE_ID`, `APP_ID`),
-  INDEX `fn_user_role_role_id` (`ROLE_ID` ASC),
-  INDEX `fn_user_role_user_id` (`USER_ID` ASC),
-  INDEX `fk_fn_user__ref_178_fn_app_IDX` (`APP_ID` ASC),
-  CONSTRAINT `FK_FN_USER__REF_172_FN_USER`
-    FOREIGN KEY (`USER_ID`)
-    REFERENCES `vid_openecomp`.`fn_user` (`USER_ID`),
-  CONSTRAINT `FK_FN_USER__REF_175_FN_ROLE`
-    FOREIGN KEY (`ROLE_ID`)
-    REFERENCES `vid_openecomp`.`fn_role` (`ROLE_ID`),
-  CONSTRAINT `fk_fn_user__ref_178_fn_app`
-    FOREIGN KEY (`APP_ID`)
-    REFERENCES `vid_openecomp`.`fn_app` (`APP_ID`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.fn_workflow
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`fn_workflow` (
-  `id` MEDIUMINT(9) NOT NULL AUTO_INCREMENT,
-  `name` VARCHAR(20) NOT NULL,
-  `description` VARCHAR(500) NULL DEFAULT NULL,
-  `run_link` VARCHAR(300) NULL DEFAULT NULL,
-  `suspend_link` VARCHAR(300) NULL DEFAULT NULL,
-  `modified_link` VARCHAR(300) NULL DEFAULT NULL,
-  `active_yn` VARCHAR(300) NULL DEFAULT NULL,
-  `created` VARCHAR(300) NULL DEFAULT NULL,
-  `created_by` INT(11) NULL DEFAULT NULL,
-  `modified` VARCHAR(300) NULL DEFAULT NULL,
-  `modified_by` INT(11) NULL DEFAULT NULL,
-  `workflow_key` VARCHAR(50) NULL DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `name` (`name` ASC))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.rcloudinvocation
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`rcloudinvocation` (
-  `id` VARCHAR(128) NOT NULL,
-  `created` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `userinfo` VARCHAR(2048) NOT NULL,
-  `notebookid` VARCHAR(128) NOT NULL,
-  `parameters` VARCHAR(2048) NULL DEFAULT NULL,
-  `tokenreaddate` TIMESTAMP NULL DEFAULT NULL,
-  PRIMARY KEY (`id`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.rcloudnotebook
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`rcloudnotebook` (
-  `notebookname` VARCHAR(128) NOT NULL,
-  `notebookid` VARCHAR(128) NOT NULL,
-  PRIMARY KEY (`notebookname`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- Table vid_openecomp.schema_info
--- ----------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`schema_info` (
-  `SCHEMA_ID` VARCHAR(25) NOT NULL,
-  `SCHEMA_DESC` VARCHAR(75) NOT NULL,
-  `DATASOURCE_TYPE` VARCHAR(100) NULL DEFAULT NULL,
-  `CONNECTION_URL` VARCHAR(200) NOT NULL,
-  `USER_NAME` VARCHAR(45) NOT NULL,
-  `PASSWORD` VARCHAR(45) NULL DEFAULT NULL,
-  `DRIVER_CLASS` VARCHAR(100) NOT NULL,
-  `MIN_POOL_SIZE` INT(11) NOT NULL,
-  `MAX_POOL_SIZE` INT(11) NOT NULL,
-  `IDLE_CONNECTION_TEST_PERIOD` INT(11) NOT NULL)
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
--- ----------------------------------------------------------------------------
--- View vid_openecomp.v_url_access
--- ----------------------------------------------------------------------------
-CREATE OR REPLACE ALGORITHM=UNDEFINED SQL SECURITY DEFINER VIEW `v_url_access` AS select distinct `m`.`ACTION` AS 
-
-`URL`,`m`.`FUNCTION_CD` AS `FUNCTION_CD` from `fn_menu` `m` where (`m`.`ACTION` is not null) union select distinct 
-
-`t`.`ACTION` AS `URL`,`t`.`FUNCTION_CD` AS `FUNCTION_CD` from `fn_tab` `t` where (`t`.`ACTION` is not null) union select 
-
-`r`.`RESTRICTED_URL` AS `URL`,`r`.`FUNCTION_CD` AS `FUNCTION_CD` from `fn_restricted_url` `r`;
-SET FOREIGN_KEY_CHECKS = 1;
-
diff --git a/vid/src/main/swm/common/common.sh b/vid/src/main/swm/common/common.sh
deleted file mode 100644
index 7308ffc75..000000000
--- a/vid/src/main/swm/common/common.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-if [[ "${INSTALL_ROOT}" = */ ]]; then
-	export ROOT_DIR=${INSTALL_ROOT}opt/app/vid/portal
-else
-	export ROOT_DIR=${INSTALL_ROOT}/opt/app/vid/portal
-fi
-
-export JAVA_HOME=/opt/app/java/jdk/jdk180
-
-
-OS=`uname`
-
-if [ "${OS}" = "SunOS" ]; then
-    CURRENT_USER=`/usr/xpg4/bin/id -un`
-    CURRENT_GROUP=`/usr/xpg4/bin/id -gn`
-else
-    CURRENT_USER=`id -un`
-    CURRENT_GROUP=`id -gn`
-fi
-
-export CURRENT_USER CURRENT_GROUP
-export TOMCAT_HOME=/opt/app/vid/tomcat
-
-if [ -z "${VID_ENDPOINT_NAME}" ]; then
-	VID_ENDPOINT_NAME="vid"
-fi
-
-# Fail - used to quickly exit with a rc and error message
-fail() {
-    rc=$1
-    shift;
-    echo "ERROR: $@"
-    exit $rc
-}
diff --git a/vid/src/main/swm/common/localize.sh b/vid/src/main/swm/common/localize.sh
deleted file mode 100644
index 9db6c4ec4..000000000
--- a/vid/src/main/swm/common/localize.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-COMMON_DIR="$(dirname "$AFTSWM_ACTIONHANDLER_SCRIPT")/../../common"
-
-source "${COMMON_DIR}/localize_logback.sh" || {
-	echo "ERROR: Localizing logback.xml failed"
-	exit 1
-}
-
-source "${COMMON_DIR}/localize_portal.sh" || {
-	echo "ERROR: Localizing portal.properties failed"
-	exit 1
-}
-
-source "${COMMON_DIR}/localize_quartz.sh" || {
-	echo "ERROR: Localizing quartz.properties failed"
-	exit 1
-}
-
-source "${COMMON_DIR}/localize_system.sh" || {
-	echo "ERROR: Localizing system.properties failed"
-	exit 1
-}
-
-source "${COMMON_DIR}/localize_cache.sh" || {
-	echo "ERROR: Localizing cache.ccf failed"
-	exit 1
-}
-
-source "${COMMON_DIR}/localize_asdc.sh" || {
-	echo "ERROR: Localizing asdc.properties failed"
-	exit 1
-}
diff --git a/vid/src/main/swm/common/localize_asdc.sh b/vid/src/main/swm/common/localize_asdc.sh
deleted file mode 100644
index 8af7662e8..000000000
--- a/vid/src/main/swm/common/localize_asdc.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-FINAL_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/asdc.properties
-TEMPLATE_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/asdc_template.properties
-BACKUP1_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/asdc.properties.bk.1
-BACKUP2_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/asdc.properties.bk.2
-
-echo "Localizing the ASDC client configuration"
-
-if [ -z "${ASDC_CLIENT_TYPE}" ]; then
-	ASDC_CLIENT_TYPE=REST
-fi
-
-if [ "${ASDC_CLIENT_TYPE}" = "REST" ]; then
-	if [ -z "${ASDC_CLIENT_REST_HOST}" ]; then
-		echo 'ASDC_CLIENT_REST_HOST must be provided when ASDC_CLIENT_TYPE=REST'
-		exit 1
-	fi
-
-	if [ -z "${ASDC_CLIENT_REST_AUTH}" ]; then
-		echo 'ASDC_CLIENT_REST_AUTH must be provided when ASDC_CLIENT_TYPE=REST'
-		exit 2
-	fi
-
-	if [ -z "${ASDC_CLIENT_REST_PROTOCOL}" ]; then
-		ASDC_CLIENT_REST_PROTOCOL=http
-	fi
-
-	if [ -z "${ASDC_CLIENT_REST_PORT}" ]; then
-		ASDC_CLIENT_REST_PORT=8080
-	fi
-else
-	ASDC_CLIENT_REST_HOST=""
-	ASDC_CLIENT_REST_AUTH=""
-	ASDC_CLIENT_REST_PROTOCOL="http"
-	ASDC_CLIENT_REST_PORT="8080"
-fi
-
-#------------------------------------------------------------------------
-#- MAKE A BACKUP OF PREVIOUS BACKUP FILE, IF EXISTS
-#------------------------------------------------------------------------
-if [ -f ${BACKUP1_CONFIG_FILE} ]; then
-    cp -f ${BACKUP1_CONFIG_FILE} ${BACKUP2_CONFIG_FILE} || {
-        echo "ERROR: Could not copy ${BACKUP1_CONFIG_FILE} to ${BACKUP2_CONFIG_FILE}"
-        exit 2
-    }
-fi
- 
-#------------------------------------------------------------------------
-#- MAKE A BACKUP OF CURRENT FILE, IF EXISTS
-#------------------------------------------------------------------------
-if [ -f ${FINAL_CONFIG_FILE} ]; then
-    cp -f ${FINAL_CONFIG_FILE} ${BACKUP1_CONFIG_FILE} || {
-        echo "ERROR: Could not copy ${FINAL_CONFIG_FILE} to ${BACKUP1_CONFIG_FILE}"
-        exit 3
-    }
-fi
-
-sed -e 's ${ASDC_CLIENT_TYPE} '${ASDC_CLIENT_TYPE}' g' \
-	-e 's ${ASDC_CLIENT_REST_HOST} '${ASDC_CLIENT_REST_HOST}' g' \
-	-e 's ${ASDC_CLIENT_REST_PORT} '${ASDC_CLIENT_REST_PORT}' g' \
-	-e 's ${ASDC_CLIENT_REST_PROTOCOL} '${ASDC_CLIENT_REST_PROTOCOL}' g' \
-	-e 's/${ASDC_CLIENT_REST_AUTH}/'"${ASDC_CLIENT_REST_AUTH}"'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || {
-		echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}"
-		exit 4
-	}
-
-echo "Localized ${FINAL_CONFIG_FILE} successfully."
diff --git a/vid/src/main/swm/common/localize_cache.sh b/vid/src/main/swm/common/localize_cache.sh
deleted file mode 100644
index 218d8a830..000000000
--- a/vid/src/main/swm/common/localize_cache.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-FINAL_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/cache.ccf
-TEMPLATE_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/cache_template.ccf
-BACKUP1_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/cache.ccf.bk.1
-BACKUP2_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/cache.ccf.bk.2
-
-echo "Localizing the VID cache configuration"
-
-if [ -z "${CACHE_DIRECTORY}" ]; then
-	CACHE_DIRECTORY=${ROOT_DIR}/cache
-fi
-
-mkdir -p "${CACHE_DIRECTORY}"
-
-#------------------------------------------------------------------------
-#- MAKE A BACKUP OF PREVIOUS BACKUP FILE, IF EXISTS
-#------------------------------------------------------------------------
-if [ -f ${BACKUP1_CONFIG_FILE} ]; then
-    cp -f ${BACKUP1_CONFIG_FILE} ${BACKUP2_CONFIG_FILE} || {
-        echo "ERROR: Could not copy ${BACKUP1_CONFIG_FILE} to ${BACKUP2_CONFIG_FILE}"
-        exit 1
-    }
-fi
- 
-#------------------------------------------------------------------------
-#- MAKE A BACKUP OF CURRENT FILE, IF EXISTS
-#------------------------------------------------------------------------
-if [ -f ${FINAL_CONFIG_FILE} ]; then
-    cp -f ${FINAL_CONFIG_FILE} ${BACKUP1_CONFIG_FILE} || {
-        echo "ERROR: Could not copy ${FINAL_CONFIG_FILE} to ${BACKUP1_CONFIG_FILE}"
-        exit 2
-    }
-fi
-
-sed -e 's,${CACHE_DIRECTORY},'${CACHE_DIRECTORY}',g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || {
-		echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}"
-		exit 3
-	}
-
-echo "Localized ${FINAL_CONFIG_FILE} successfully."
diff --git a/vid/src/main/swm/common/localize_log4j.sh b/vid/src/main/swm/common/localize_log4j.sh
deleted file mode 100644
index af1175908..000000000
--- a/vid/src/main/swm/common/localize_log4j.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-FINAL_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/log4j.properties
-TEMPLATE_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/log4j_template.properties
-BACKUP1_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/log4j.properties.bk.1
-BACKUP2_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/log4j.properties.bk.2
-
-echo "Localizing the VID log4j configuration"
-
-if [ -z "${LOG4J_LOGLEVEL}" ]; then
-	LOG4J_LOGLEVEL=INFO
-fi
-
-
-if [ -z "${LOG4J_APPENDER}" ]; then
-	LOG4J_APPENDER=rollingfile
-fi
-
-if [ -z "${LOG4J_LOGS_DIRECTORY}" ]; then
-	LOG4J_LOGS_DIRECTORY=${ROOT_DIR}/logs
-fi
-
-mkdir -p ${LOG4J_LOGS_DIRECTORY}
-
-#------------------------------------------------------------------------
-#- MAKE A BACKUP OF PREVIOUS BACKUP FILE, IF EXISTS
-#------------------------------------------------------------------------
-if [ -f ${BACKUP1_CONFIG_FILE} ]; then
-    cp -f ${BACKUP1_CONFIG_FILE} ${BACKUP2_CONFIG_FILE} || {
-        echo "ERROR: Could not copy ${BACKUP1_CONFIG_FILE} to ${BACKUP2_CONFIG_FILE}"
-        exit 1
-    }
-fi
- 
-#------------------------------------------------------------------------
-#- MAKE A BACKUP OF CURRENT FILE, IF EXISTS
-#------------------------------------------------------------------------
-if [ -f ${FINAL_CONFIG_FILE} ]; then
-    cp -f ${FINAL_CONFIG_FILE} ${BACKUP1_CONFIG_FILE} || {
-        echo "ERROR: Could not copy ${FINAL_CONFIG_FILE} to ${BACKUP1_CONFIG_FILE}"
-        exit 2
-    }
-fi
-
-sed -e 's/${LOG4J_LOGLEVEL}/'${LOG4J_LOGLEVEL}'/g' \
-	-e 's/${LOG4J_APPENDER}/'${LOG4J_APPENDER}'/g' \
-	-e 's,${LOG4J_LOGS_DIRECTORY},'${LOG4J_LOGS_DIRECTORY}',g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || {
-		echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}"
-		exit 3
-	}
-
-echo "Localized ${FINAL_CONFIG_FILE} successfully."
-
-
diff --git a/vid/src/main/swm/common/localize_logback.sh b/vid/src/main/swm/common/localize_logback.sh
deleted file mode 100644
index b38d7d527..000000000
--- a/vid/src/main/swm/common/localize_logback.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-FINAL_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/logback.xml
-TEMPLATE_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/logback_template.xml
-BACKUP1_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/logback.xml.bk.1
-BACKUP2_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/logback.xml.bk.2
-
-echo "Localizing the VID logback configuration"
-
-if [ -z "${VID_LOG_DIR}" ]; then
-	VID_LOG_DIR="${ROOT_DIR}/logs"
-fi
-
-if [ -z "${VID_LOG_LEVEL}" ]; then
-	VID_LOG_LEVEL="INFO"
-fi
-
-mkdir -p "${VID_LOG_DIR}"
-
-#------------------------------------------------------------------------
-#- MAKE A BACKUP OF PREVIOUS BACKUP FILE, IF EXISTS
-#------------------------------------------------------------------------
-if [ -f ${BACKUP1_CONFIG_FILE} ]; then
-    cp -f ${BACKUP1_CONFIG_FILE} ${BACKUP2_CONFIG_FILE} || {
-        echo "ERROR: Could not copy ${BACKUP1_CONFIG_FILE} to ${BACKUP2_CONFIG_FILE}"
-        exit 1
-    }
-fi
- 
-#------------------------------------------------------------------------
-#- MAKE A BACKUP OF CURRENT FILE, IF EXISTS
-#------------------------------------------------------------------------
-if [ -f ${FINAL_CONFIG_FILE} ]; then
-    cp -f ${FINAL_CONFIG_FILE} ${BACKUP1_CONFIG_FILE} || {
-        echo "ERROR: Could not copy ${FINAL_CONFIG_FILE} to ${BACKUP1_CONFIG_FILE}"
-        exit 2
-    }
-fi
-
-sed -e 's/${VID_LOG_LEVEL}/'${VID_LOG_LEVEL}'/g' \
-	-e 's,${VID_LOG_DIR},'${VID_LOG_DIR}',g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || {
-		echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}"
-		exit 3
-	}
-
-echo "Localized ${FINAL_CONFIG_FILE} successfully."
diff --git a/vid/src/main/swm/common/localize_portal.sh b/vid/src/main/swm/common/localize_portal.sh
deleted file mode 100644
index c1341fe50..000000000
--- a/vid/src/main/swm/common/localize_portal.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash
-
-FINAL_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/portal.properties
-TEMPLATE_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/portal_template.properties
-BACKUP1_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/portal.properties.bk.1
-BACKUP2_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/portal.properties.bk.2
-
-echo "Localizing the VID portal configuration"
-
-if [ -z "${VID_ECOMP_REDIRECT_URL}" ]; then
-	VID_ECOMP_REDIRECT_URL=https://portal.openecomp.org/ecompportal/ecompportal/process_csp
-fi
-
-if [ -z "${VID_WJ_LOGOUT_URL}" ]; then
-	VID_WJ_LOGOUT_URL=https://portal.openecomp.org/ecompportal/ecompportal/process_csp
-fi
-
-if [ -z "${VID_ECOMP_REST_URL}" ]; then
-	VID_ECOMP_REST_URL=https://portal.openecomp.org/ecompportal/auxapi
-fi
-
-if [ -z "${VID_UEB_URL_LIST}" ]; then
-	VID_UEB_URL_LIST=ueb.openecomp.org
-fi
-
-if [ -z "${VID_UEB_CONSUMER_GROUP}" ]; then
-	VID_UEB_CONSUMER_GROUP=VID
-fi
-
-if [ -z "${VID_ECOMP_PORTAL_INBOX_NAME}" ]; then
-	VID_ECOMP_PORTAL_INBOX_NAME=ECOMP-PORTAL-INBOX-DEV-LOCAL
-fi
-
-if [ -z "${VID_UEB_APP_KEY}" ]; then
-	VID_UEB_APP_KEY=sYH0NJnsKmJC1B2A
-fi
-
-if [ -z "${VID_UEB_APP_SECRET}" ]; then
-	VID_UEB_APP_SECRET=YOtknsT2wVFz9WISlSPDaAtd
-fi
-
-if [ -z "${VID_UEB_APP_MAILBOX_NAME}" ]; then
-	VID_UEB_APP_MAILBOX_NAME="ECOMP-PORTAL-OUTBOX-90"
-fi
-
-if [ -z "${VID_UEB_LISTENERS_ENABLE}" ]; then
-	VID_UEB_LISTENERS_ENABLE="false"
-fi
-
-#------------------------------------------------------------------------
-#- MAKE A BACKUP OF PREVIOUS BACKUP FILE, IF EXISTS
-#------------------------------------------------------------------------
-if [ -f ${BACKUP1_CONFIG_FILE} ]; then
-    cp -f ${BACKUP1_CONFIG_FILE} ${BACKUP2_CONFIG_FILE} || {
-        echo "ERROR: Could not copy ${BACKUP1_CONFIG_FILE} to ${BACKUP2_CONFIG_FILE}"
-        exit 2
-    }
-fi
- 
-#------------------------------------------------------------------------
-#- MAKE A BACKUP OF CURRENT FILE, IF EXISTS
-#------------------------------------------------------------------------
-if [ -f ${FINAL_CONFIG_FILE} ]; then
-    cp -f ${FINAL_CONFIG_FILE} ${BACKUP1_CONFIG_FILE} || {
-        echo "ERROR: Could not copy ${FINAL_CONFIG_FILE} to ${BACKUP1_CONFIG_FILE}"
-        exit 3
-    }
-fi
-
-sed -e 's ${VID_WJ_LOGOUT_URL} '${VID_WJ_LOGOUT_URL}' g' \
-	-e 's ${VID_ECOMP_REDIRECT_URL} '${VID_ECOMP_REDIRECT_URL}' g' \
-	-e 's ${VID_ECOMP_REST_URL} '${VID_ECOMP_REST_URL}' g' \
-	-e 's ${VID_UEB_URL_LIST} '${VID_UEB_URL_LIST}' g' \
-	-e 's ${VID_ECOMP_PORTAL_INBOX_NAME} '${VID_ECOMP_PORTAL_INBOX_NAME}' g' \
-	-e 's ${VID_UEB_APP_KEY} '${VID_UEB_APP_KEY}' g' \
-	-e 's ${VID_UEB_APP_SECRET} '${VID_UEB_APP_SECRET}' g' \
-	-e 's ${VID_UEB_APP_MAILBOX_NAME} '${VID_UEB_APP_MAILBOX_NAME}' g' \
-	-e 's ${VID_UEB_LISTENERS_ENABLE} '${VID_UEB_LISTENERS_ENABLE}' g' \
-	-e 's/${VID_UEB_CONSUMER_GROUP}/'${VID_UEB_CONSUMER_GROUP}'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || {
-		echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}"
-		exit 4
-	}
-
-echo "Localized ${FINAL_CONFIG_FILE} successfully."
diff --git a/vid/src/main/swm/common/localize_quartz.sh b/vid/src/main/swm/common/localize_quartz.sh
deleted file mode 100644
index 30e37954b..000000000
--- a/vid/src/main/swm/common/localize_quartz.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-FINAL_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/quartz.properties
-TEMPLATE_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/quartz_template.properties
-BACKUP1_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/quartz.properties.bk.1
-BACKUP2_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/quartz.properties.bk.2
-
-echo "Localizing the VID quartz configuration"
-
-if [ -z "${VID_MYSQL_HOST}" ]; then
-	VID_MYSQL_HOST=localhost
-fi
-
-if [ -z "${VID_MYSQL_PORT}" ]; then
-	VID_MYSQL_PORT=3306
-fi
-
-if [ -z "${VID_MYSQL_DBNAME}" ]; then
-	VID_MYSQL_DBNAME=vid_portal
-fi
-
-if [ -z "${VID_MYSQL_USER}" ]; then
-	VID_MYSQL_USER=$(id -un)
-fi
-
-if [ -z "${VID_MYSQL_MAXCONNECTIONS}" ]; then
-	VID_MYSQL_MAXCONNECTIONS=5
-fi
-
-if [ -z "${VID_MYSQL_PASS}" ]; then
-	echo "Missing required parameter VID_MYSQL_PASS"
-	exit 1
-fi
-
-#------------------------------------------------------------------------
-#- MAKE A BACKUP OF PREVIOUS BACKUP FILE, IF EXISTS
-#------------------------------------------------------------------------
-if [ -f ${BACKUP1_CONFIG_FILE} ]; then
-    cp -f ${BACKUP1_CONFIG_FILE} ${BACKUP2_CONFIG_FILE} || {
-        echo "ERROR: Could not copy ${BACKUP1_CONFIG_FILE} to ${BACKUP2_CONFIG_FILE}"
-        exit 2
-    }
-fi
- 
-#------------------------------------------------------------------------
-#- MAKE A BACKUP OF CURRENT FILE, IF EXISTS
-#------------------------------------------------------------------------
-if [ -f ${FINAL_CONFIG_FILE} ]; then
-    cp -f ${FINAL_CONFIG_FILE} ${BACKUP1_CONFIG_FILE} || {
-        echo "ERROR: Could not copy ${FINAL_CONFIG_FILE} to ${BACKUP1_CONFIG_FILE}"
-        exit 3
-    }
-fi
-
-sed -e 's/${VID_MYSQL_HOST}/'${VID_MYSQL_HOST}'/g' \
-	-e 's/${VID_MYSQL_PORT}/'${VID_MYSQL_PORT}'/g' \
-	-e 's/${VID_MYSQL_DBNAME}/'${VID_MYSQL_DBNAME}'/g' \
-	-e 's/${VID_MYSQL_USER}/'${VID_MYSQL_USER}'/g' \
-	-e 's/${VID_MYSQL_PASS}/'${VID_MYSQL_PASS}'/g' \
-	-e 's/${VID_MYSQL_MAXCONNECTIONS}/'${VID_MYSQL_MAXCONNECTIONS}'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || {
-		echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}"
-		exit 4
-	}
-
-echo "Localized ${FINAL_CONFIG_FILE} successfully."
-
-
diff --git a/vid/src/main/swm/common/localize_system.sh b/vid/src/main/swm/common/localize_system.sh
deleted file mode 100644
index ebd710763..000000000
--- a/vid/src/main/swm/common/localize_system.sh
+++ /dev/null
@@ -1,178 +0,0 @@
-#!/bin/bash
-
-FINAL_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/system.properties
-TEMPLATE_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/system_template.properties
-BACKUP1_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/system.properties.bk.1
-BACKUP2_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/system.properties.bk.2
-
-echo "Localizing the VID system configuration"
-
-if [ -z "${VID_MYSQL_HOST}" ]; then
-	VID_MYSQL_HOST=localhost
-fi
-
-if [ -z "${VID_MYSQL_PORT}" ]; then
-	VID_MYSQL_PORT=3306
-fi
-
-if [ -z "${VID_MYSQL_DBNAME}" ]; then
-	VID_MYSQL_DBNAME=vid_portal
-fi
-
-if [ -z "${VID_MYSQL_USER}" ]; then
-	VID_MYSQL_USER=vid_admin
-fi
-
-if [ -z "${VID_MYSQL_MAXCONNECTIONS}" ]; then
-	VID_MYSQL_MAXCONNECTIONS=5
-fi
-
-if [ -z "${VID_AAI_HOST}" ]; then
-	VID_AAI_HOST=aai.api.openecomp.org
-fi
-
-if [ -z "${VID_AAI_PORT}" ]; then
-	VID_AAI_PORT=8443
-fi
-
-if [ -z "${VID_APP_DISPLAY_NAME}" ]; then
-	VID_APP_DISPLAY_NAME=VID
-fi
-
-if [ -z "${VID_ECOMP_SHARED_CONTEXT_REST_URL}" ]; then
-	VID_ECOMP_SHARED_CONTEXT_REST_URL="https://portal.openecomp.org:8080/ecompportal/context"
-fi
-
-if [ -z "${VID_ECOMP_REDIRECT_URL}" ]; then
-	VID_ECOMP_REDIRECT_URL=https://portal.openecomp.org/ecompportal/ecompportal/process_csp
-fi
-
-if [ -z "${VID_ECOMP_REST_URL}" ]; then
-	VID_ECOMP_REST_URL=https://portal.openecomp.org/ecompportal/auxapi
-fi
-
-if [ -z "${VID_MSO_SERVER_URL}" ]; then
-	VID_MSO_SERVER_URL=https://mso.api.openecomp.org:8443
-fi
-
-if [ -z "${VID_TRUSTSTORE_FILE}" ]; then
-	VID_TRUSTSTORE_FILE=${ROOT_DIR}/etc/vid_keystore.jks
-fi
-
-if [ -z "${VID_MYLOGIN_FEED_DIRECTORY}" ]; then
-	VID_MYLOGIN_FEED_DIRECTORY=/tmp/MyLogins
-fi
-
-if [ -z "${VID_TRUSTSTORE_PASS}" ]; then
-	echo "ERROR: Missing required parameter VID_TRUSTSTORE_PASS"
-	exit 1
-fi
-
-if [ -z "${VID_MSO_USER}" ]; then
-	echo "ERROR: Missing required parameter VID_MSO_USER"
-	exit 1
-fi
-
-if [ -z "${VID_MSO_PASS}" ]; then
-	echo "ERROR: Missing required parameter VID_MSO_PASS";
-	exit 1
-fi
-
-if [ -z "${VID_MYSQL_PASS}" ]; then
-	echo "ERROR: Missing required parameter VID_MYSQL_PASS"
-	exit 1
-fi
-
-if [ -z "${MSO_DME2_CLIENT_TIMEOUT}" ]; then
-	echo "ERROR: Missing required parameter MSO_DME2_CLIENT_TIMEOUT"
-	exit 1
-fi
-
-if [ -z "${MSO_DME2_CLIENT_READ_TIMEOUT}" ]; then
-	echo "ERROR: Missing required parameter MSO_DME2_CLIENT_READ_TIMEOUT"
-	exit 1
-fi
-
-if [ -z "${MSO_DME2_SERVER_URL}" ]; then
-	echo "ERROR: Missing required parameter MSO_DME2_SERVER_URL"
-	exit 1
-fi
-if [ -z "${MSO_DME2_ENABLED}" ]; then
-	echo "ERROR: Missing required parameter MSO_DME2_ENABLED"
-	exit 1
-fi
-if [ -z "${MSO_POLLING_INTERVAL_MSECS}" ]; then
-	MSO_POLLING_INTERVAL_MSECS=10000
-fi
-
-if [ -z "${AAI_TRUSTSTORE_FILENAME}" ]; then
-	AAI_TRUSTSTORE_FILENAME=tomcat_keystore
-fi
-
-if [ -z "${AAI_TRUSTSTORE_PASSWD_X}" ]; then
-	AAI_TRUSTSTORE_PASSWD_X=70c87528c88dcd9f9c2558d30e817868
-fi
-
-if [ -z "${AAI_KEYSTORE_FILENAME}" ]; then
-	AAI_KEYSTORE_FILENAME=aai-client-cert.p12
-fi
-
-if [ -z "${AAI_KEYSTORE_PASSWD_X}" ]; then
-	AAI_KEYSTORE_PASSWD_X=70c87528c88dcd9f9c2558d30e817868
-fi
-
-mkdir -p "${VID_MYLOGIN_FEED_DIRECTORY}"
-
-#------------------------------------------------------------------------
-#- MAKE A BACKUP OF PREVIOUS BACKUP FILE, IF EXISTS
-#------------------------------------------------------------------------
-if [ -f ${BACKUP1_CONFIG_FILE} ]; then
-    cp -f ${BACKUP1_CONFIG_FILE} ${BACKUP2_CONFIG_FILE} || {
-        echo "ERROR: Could not copy ${BACKUP1_CONFIG_FILE} to ${BACKUP2_CONFIG_FILE}"
-        exit 2
-    }
-fi
- 
-#------------------------------------------------------------------------
-#- MAKE A BACKUP OF CURRENT FILE, IF EXISTS
-#------------------------------------------------------------------------
-if [ -f ${FINAL_CONFIG_FILE} ]; then
-    cp -f ${FINAL_CONFIG_FILE} ${BACKUP1_CONFIG_FILE} || {
-        echo "ERROR: Could not copy ${FINAL_CONFIG_FILE} to ${BACKUP1_CONFIG_FILE}"
-        exit 3
-    }
-fi
-
-sed -e 's/${VID_MYSQL_HOST}/'${VID_MYSQL_HOST}'/g' \
-	-e 's/${VID_MYSQL_PORT}/'${VID_MYSQL_PORT}'/g' \
-	-e 's/${VID_MYSQL_DBNAME}/'${VID_MYSQL_DBNAME}'/g' \
-	-e 's/${VID_MYSQL_USER}/'${VID_MYSQL_USER}'/g' \
-	-e 's/${VID_MYSQL_PASS}/'${VID_MYSQL_PASS}'/g' \
-	-e 's/${VID_AAI_HOST}/'${VID_AAI_HOST}'/g' \
-	-e 's/${VID_AAI_PORT}/'${VID_AAI_PORT}'/g' \
-	-e 's,${AAI_TRUSTSTORE_FILENAME},'${AAI_TRUSTSTORE_FILENAME}',g' \
-	-e 's/${AAI_TRUSTSTORE_PASSWD_X}/'${AAI_TRUSTSTORE_PASSWD_X}'/g' \
-	-e 's,${AAI_KEYSTORE_FILENAME},'${AAI_KEYSTORE_FILENAME}',g' \
-	-e 's/${AAI_KEYSTORE_PASSWD_X}/'${AAI_KEYSTORE_PASSWD_X}'/g' \
-	-e 's/${VID_APP_DISPLAY_NAME}/'${VID_APP_DISPLAY_NAME}'/g' \
-	-e 's ${VID_ECOMP_SHARED_CONTEXT_REST_URL} '${VID_ECOMP_SHARED_CONTEXT_REST_URL}' g' \
-	-e 's ${VID_ECOMP_REDIRECT_URL} '${VID_ECOMP_REDIRECT_URL}' g' \
-	-e 's ${VID_ECOMP_REST_URL} '${VID_ECOMP_REST_URL}' g' \
-	-e 's ${VID_MSO_SERVER_URL} '${VID_MSO_SERVER_URL}' g' \
-	-e 's/${VID_MSO_USER}/'${VID_MSO_USER}'/g' \
-	-e 's/${VID_MSO_PASS}/'${VID_MSO_PASS}'/g' \
-	-e 's,${VID_MYLOGIN_FEED_DIRECTORY},'${VID_MYLOGIN_FEED_DIRECTORY}',g' \
-	-e 's,${MSO_DME2_CLIENT_TIMEOUT},'${MSO_DME2_CLIENT_TIMEOUT}',g' \
-	-e 's,${MSO_DME2_CLIENT_READ_TIMEOUT},'${MSO_DME2_CLIENT_READ_TIMEOUT}',g' \
-	-e 's,${MSO_DME2_SERVER_URL},'${MSO_DME2_SERVER_URL}',g' \
-	-e 's,${MSO_DME2_ENABLED},'${MSO_DME2_ENABLED}',g' \
-	-e 's,${MSO_POLLING_INTERVAL_MSECS},'${MSO_POLLING_INTERVAL_MSECS}',g' \
-	-e 's,${VID_TRUSTSTORE_FILE},'${VID_TRUSTSTORE_FILE}',g' \
-	-e 's/${VID_TRUSTSTORE_PASS}/'${VID_TRUSTSTORE_PASS}'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || {
-		echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}"
-		exit 4
-	}
-
-echo "Localized ${FINAL_CONFIG_FILE} successfully."
-
-
diff --git a/vid/src/main/swm/deinstall/postproc/post_proc b/vid/src/main/swm/deinstall/postproc/post_proc
deleted file mode 100644
index 97b54ac7a..000000000
--- a/vid/src/main/swm/deinstall/postproc/post_proc
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cd ../../common
-exec sh -x ./deinstall_postproc.sh
\ No newline at end of file
diff --git a/vid/src/main/swm/deinstall/preproc/pre_proc b/vid/src/main/swm/deinstall/preproc/pre_proc
deleted file mode 100644
index 7127ba335..000000000
--- a/vid/src/main/swm/deinstall/preproc/pre_proc
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cd ../../common
-exec sh -x ./deinstall_preproc.sh
\ No newline at end of file
diff --git a/vid/src/main/swm/descriptor.xml b/vid/src/main/swm/descriptor.xml
deleted file mode 100644
index 2ff5a92ba..000000000
--- a/vid/src/main/swm/descriptor.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-    
-		
-    
-    
-    
-        
-    
-    
-    
-        
-            
-            
-        
-        
-            
-            
-        
-        
-            
-            
-        
-        
-            
-            
-        
-    
-    
-    
-		
-		
-    
-
diff --git a/vid/src/main/swm/initinst/postproc/post_proc b/vid/src/main/swm/initinst/postproc/post_proc
deleted file mode 100644
index 1cb743faf..000000000
--- a/vid/src/main/swm/initinst/postproc/post_proc
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source ${DIR}/../../install/postproc/post_proc || {
-	echo "INITINST post_proc script failed"; exit 1
-}
diff --git a/vid/src/main/swm/initinst/preproc/pre_proc b/vid/src/main/swm/initinst/preproc/pre_proc
deleted file mode 100644
index 3bccb3eb7..000000000
--- a/vid/src/main/swm/initinst/preproc/pre_proc
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-source "${DIR}/../../install/preproc/pre_proc" || {
-	echo "INITINST pre_proc script failed"; exit 1
-}
diff --git a/vid/src/main/swm/install/postproc/post_proc b/vid/src/main/swm/install/postproc/post_proc
deleted file mode 100644
index b4c83459f..000000000
--- a/vid/src/main/swm/install/postproc/post_proc
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-COMMON_SCRIPT=${DIR}/../../common/common.sh
-
-source "${COMMON_SCRIPT}" || {
-	echo "ERROR: Common script failed"
-	exit 1
-}
-
-mkdir -p "${TOMCAT_HOME}/temp"
-
-#Extract the WAR so it can be customized by the localization script
-mkdir -p ${ROOT_DIR}/war
-cp "${ROOT_DIR}/lib/vid.war" "${ROOT_DIR}/war/${VID_ENDPOINT_NAME}.war"
-cd "${ROOT_DIR}/war"
-${JAVA_HOME}/bin/jar -xf ${VID_ENDPOINT_NAME}.war
-rm ${ROOT_DIR}/war/${VID_ENDPOINT_NAME}.war
-
-LOCALIZE_SCRIPT=$(dirname "$AFTSWM_ACTIONHANDLER_SCRIPT")/../../common/localize.sh
-
-
-source "${LOCALIZE_SCRIPT}" || {
-	echo "ERROR: Localization script failed"
-	exit 2
-}
-
-#Create the customized WAR and deploy it to Tomcat
-mkdir -p "${ROOT_DIR}/deployed"
-cd "${ROOT_DIR}/war"
-${JAVA_HOME}/bin/jar -cvf "${ROOT_DIR}/deployed/${VID_ENDPOINT_NAME}.war" .
-cd
-rm -rf "${ROOT_DIR}/war"
-mv -f "${ROOT_DIR}/deployed/${VID_ENDPOINT_NAME}.war" "${TOMCAT_HOME}/webapps"
-
-if [ -f "${TOMCAT_HOME}/bin/startup.sh" ]; then
-	"${TOMCAT_HOME}/bin/startup.sh"
-fi
diff --git a/vid/src/main/swm/install/preproc/pre_proc b/vid/src/main/swm/install/preproc/pre_proc
deleted file mode 100644
index f4eb9b11d..000000000
--- a/vid/src/main/swm/install/preproc/pre_proc
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-COMMON_SCRIPT=${DIR}/../../common/common.sh
-
-source "${COMMON_SCRIPT}" || {
-	echo "ERROR: Common script failed"
-	exit 1
-}
-
-if [ -f "${TOMCAT_HOME}/bin/shutdown.sh" ]; then
-	"${TOMCAT_HOME}/bin/shutdown.sh"
-
-	if [ -d "${TOMCAT_HOME}/webapps/${VID_ENDPOINT_NAME}" ]; then
-		rm -r "${TOMCAT_HOME}/webapps/${VID_ENDPOINT_NAME}"
-	fi
-fi
-
diff --git a/vid/src/main/swm/notes.txt b/vid/src/main/swm/notes.txt
deleted file mode 100644
index 6881cdbcc..000000000
--- a/vid/src/main/swm/notes.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-This package will install the Virtual Infrastructure Deployment (VID) war to the local tomcat server.
-The Tomcat server is marked as a dependency of this package and will be installed automatically on the
-target server if it has not already been installed.  The current version of Tomcat used by VID
-is 8.0.36.  MariaDB is also necessary for VID and can be installed by whichever method you choose.
-
-The following are variables that can be set to customize your installation of VID:
-
-Variable			Default			Description
-
-ASDC_CLIENT_REST_AUTH		unset			Basic authentication header value (e.g. Basic asdfoijwelkjsg=)
-ASDC_CLIENT_REST_HOST		unset			Host where the ASDC Catalog Service is running
-ASDC_CLIENT_REST_PORT		8080			Port where the ASDC Catalog Service is running
-ASDC_CLIENT_TYPE		REST			Set to IN_MEMORY for testing, REST for connecting with an actual ASDC Catalog Service
-
-MSO_DME2_CLIENT_READ_TIMEOUT	unset			Time in ms before DME2 MSO read requests timeout
-MSO_DME2_CLIENT_TIMEOUT		unset			Time in ms before DME2 MSO requests timeout
-MSO_DME2_ENABLED		unset			Whether the enable the MSO DME2 client or not
-MSO_DME2_SERVER_URL		unset			The server URL for connecting to the MSO service
-MSO_POLLING_INTERVAL_MSECS	10000			The interval at which to poll MSO for orchestration requests
-VID_MSO_PASS			unset			The password for connecting with the MSO service
-VID_MSO_SERVER_URL		unset			The server URL for connecting with the MSO service
-VID_MSO_USER			unset			The user name for connecting with the MSO service
-
-VID_LOG_DIR			${ROOT_DIR}/logs	The directory to store log files in 
-VID_LOG_LEVEL			INFO			The level at which to log (follows logback logging levels)
-VID_ECOMP_REDIRECT_URL		https://portal.openecomp.org/ecompportal/ecompportal/process_csp		See ECOMP SDK Documentation
-VID_ECOMP_REST_URL		https://portal.openecomp.org/ecompportal/auxapi		See ECOMP SDK Documentation
-VID_ENDPOINT_NAME		vid			http://{host}:{port}/{VID_ENDPOINT_NAME}
-
-VID_MYSQL_HOST			unset			The host where the VID MariaDB instance is running
-VID_MYSQL_MAXCONNECTIONS	5			The maximum connections to use to connect to the MariaDB instance
-VID_MYSQL_PORT			3306			The port where the VID MariaDB instance is running
-VID_MYSQL_DBNAME		vid_portal		The database name (i.e. CREATE DATABASE ${VID_MYSQL_DBNAME}
-VID_MYSQL_USER			vidadmin		The user to connect as to the MariaDB instance
-VID_MYSQL_PASS			unset			The password for the ${VID_MYSQL_USER} @ ${VID_MYSQL_HOST}
-
-VID_AAI_HOST			unset			The host where the A&AI service is running
-VID_AAI_PORT			8443			The port where the A&AI service is running
-VID_TRUSTSTORE_PASS		unset			The password for the VID truststore (A&AI client)
-VID_TRUSTSTORE_FILE		unset			The location on the file system of the truststore (A&AI client)
-AAI_TRUSTSTORE_FILENAME		tomcat_keystore		A file name
-AAI_TRUSTSTORE_PASSWD_X		(dev env creds)		A password
-AAI_KEYSTORE_FILENAME		aai-client-cert.p12	A file name
-AAI_KEYSTORE_PASSWD_X		(dev env creds)		A password
-
-VID_UEB_URL_LIST		ueb.openecomp.org		The hosts where UEB is running
-VID_UEB_CONSUMER_GROUP		VID			The UEB consumer group name to use
-VID_ECOMP_PORTAL_INBOX_NAME	ECOMP-PORTAL-INBOX-DEV-LOCAL		A UEB Topic to send messages to the ECOMP portal on
-VID_UEB_APP_KEY			sYH0NJnsKmJC1B2A			The UEB App Key (mandatory)
-VID_UEB_APP_SECRET		YOtknsT2wVFz9WISlSPDaAtd		The UEB App Secret
-VID_UEB_APP_MAILBOX_NAME	ECOMP-PORTAL-OUTBOX-90			A UEB Topic to listen for messages from the ECOMP portal on
-VID_UEB_LISTENERS_ENABLE	false			Enable the UEB listeners for the specified mailboxes (In 1610, this should always be false)
diff --git a/vid/src/main/webapp/WEB-INF/conf/asdc.properties b/vid/src/main/webapp/WEB-INF/conf/asdc.properties
deleted file mode 100644
index b97443520..000000000
--- a/vid/src/main/webapp/WEB-INF/conf/asdc.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-asdc.client.type=REST
-
-asdc.client.rest.protocol=http
-asdc.client.rest.host=
-asdc.client.rest.port=8080
-asdc.client.rest.auth=
diff --git a/vid/src/main/webapp/WEB-INF/conf/asdc_template.properties b/vid/src/main/webapp/WEB-INF/conf/asdc_template.properties
deleted file mode 100644
index e795687da..000000000
--- a/vid/src/main/webapp/WEB-INF/conf/asdc_template.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-asdc.client.type=${ASDC_CLIENT_TYPE}
-
-asdc.client.rest.protocol=${ASDC_CLIENT_REST_PROTOCOL}
-asdc.client.rest.host=${ASDC_CLIENT_REST_HOST}
-asdc.client.rest.port=${ASDC_CLIENT_REST_PORT}
-asdc.client.rest.auth=${ASDC_CLIENT_REST_AUTH}
diff --git a/vid/src/main/webapp/WEB-INF/conf/quartz.properties b/vid/src/main/webapp/WEB-INF/conf/quartz.properties
deleted file mode 100644
index 23340ddc1..000000000
--- a/vid/src/main/webapp/WEB-INF/conf/quartz.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-#################################################################################
-# Quartz configurations for Quantum Work Flow									#
-#################################################################################
-
-org.quartz.scheduler.instanceId = AUTO
-
-#################################################################################
-# Main configurations
-org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
-org.quartz.threadPool.threadCount = 30
-
-============================================================================
-# Configure JobStore  
-#============================================================================
-
-org.quartz.jobStore.misfireThreshold = 60000
-
-org.quartz.jobStore.class = org.quartz.impl.jdbcjobstore.JobStoreTX
-org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.StdJDBCDelegate
-org.quartz.jobStore.useProperties = false
-#org.quartz.jobStore.dataSource = myDS
-org.quartz.jobStore.tablePrefix = FN_QZ_
-
-org.quartz.jobStore.isClustered = true
-org.quartz.jobStore.clusterCheckinInterval = 20000
-
-#============================================================================
-# Configure Datasources  
-#============================================================================
-
diff --git a/vid/src/main/webapp/WEB-INF/conf/quartz_template.properties b/vid/src/main/webapp/WEB-INF/conf/quartz_template.properties
deleted file mode 100644
index 7b1ff1a58..000000000
--- a/vid/src/main/webapp/WEB-INF/conf/quartz_template.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-#################################################################################
-# Quartz configurations for Quantum Work Flow									#
-#################################################################################
-
-org.quartz.scheduler.instanceId = AUTO
-
-#################################################################################
-# Main configurations
-org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
-org.quartz.threadPool.threadCount = 30
-
-============================================================================
-# Configure JobStore  
-#============================================================================
-
-org.quartz.jobStore.misfireThreshold = 60000
-
-org.quartz.jobStore.class = org.quartz.impl.jdbcjobstore.JobStoreTX
-org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.StdJDBCDelegate
-org.quartz.jobStore.useProperties = false
-#org.quartz.jobStore.dataSource = myDS
-org.quartz.jobStore.tablePrefix = FN_QZ_
-
-org.quartz.jobStore.isClustered = true
-org.quartz.jobStore.clusterCheckinInterval = 20000
-
-#============================================================================
-# Configure Datasources  
-#============================================================================
-
-org.quartz.dataSource.myDS.driver = com.mysql.jdbc.Driver
-org.quartz.dataSource.myDS.URL = jdbc:mysql://${VID_MYSQL_HOST}:${VID_MYSQL_PORT}/${VID_MYSQL_DBNAME}
-org.quartz.dataSource.myDS.user = ${VID_MYSQL_USER}
-org.quartz.dataSource.myDS.password = ${VID_MYSQL_PASS}
-org.quartz.dataSource.myDS.maxConnections = ${VID_MYSQL_MAXCONNECTIONS}
-org.quartz.dataSource.myDS.validationQuery=select 0 from dual
diff --git a/vid/src/main/webapp/WEB-INF/conf/raptor.properties b/vid/src/main/webapp/WEB-INF/conf/raptor.properties
deleted file mode 100644
index 68b1f707e..000000000
--- a/vid/src/main/webapp/WEB-INF/conf/raptor.properties
+++ /dev/null
@@ -1,187 +0,0 @@
-###
-# ================================================================================
-# eCOMP Portal SDK
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#      http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ================================================================================
-###
-##C## Mention the name of the framework. At present RAPTOR supports FUSION
-system=fusion
-##C## Determines the priority for the debug message.
-debug_level=5
-##C## Determines the number of records can be downloaded in excel when you select "download all" option.
-download_limit=65000
-csv_download_limit=10
-##C## Determines the number of records to be displayed in a single page.
-default_page_size=50
-##C## Determines the list size in the form field.
-form_fields_list_size=99000
-##C## Determines the scheduler interval
-#scheduler_interval=0 => disabled
-scheduler_interval=0
-##C## System Name
-system_name=RAPTOR
-##C## This is used for Bread crumbs.
-base_title=ANALYSIS
-##C## whether to allow SQL-based report definition (security risk); super users are always allowed to create SQL-based reports
-allow_sql_based_reports=yes
-##C## Determines whether to include disclaimer page at the bottom of each screen
-show_disclaimer=yes
-disclaimer_positioned_top_in_csvexcel=yes
-##C## Determines whether to display the form page as a separate page before running the report
-display_form_before_run=yes
-##C## Determines whether to include the form page on the report data page
-include_form_with_data=yes
-##C## Determines whether to cache chart data in the session => faster re-display if the data volume does not get too large
-cache_chart_data=yes
-##C## Determines whether to cache report data for the currently displayed page in the session => faster re-display
-	##C## if the data volume does not get too large
-cache_cur_page_data=yes
-##C## Determines Chart width
-default_chart_width=700
-##C## Determines Chart height
-default_chart_height=420
-##C## Determines whether to permit report deletion only by report owner or by everyone with "write" access
-delete_only_by_owner=no
-##C## Determines whether to log each report execution and update time and user ID
-enable_report_log=yes
-##C## Determines whether to cache user roles info in memory (saves many DB reads, but does not account for roles
-	##C## assigned after the cache was loaded)
-cache_user_roles=yes
-##C## Determines whether to convert month formats (e.g. MM/YYYY) to the last day of the month (true) or
-        ##C## first day (false) - like 12/2003 is converted to either 12/31/2003 or 12/01/2003
-month_format_use_last_day=no
-##C## Determines whether to print the report title in the download files
-print_title_in_download=yes
-##C## Determines whether to show report description when the report is run and in the quick links
-show_descr_at_runtime=no
-##C## Determines whether to skip labels on the Line chart axis when they overlap
-#DEPRECATED skip_chart_labels_to_fit=no
-##C## Determines whether to show chart types that are purpose and/or data specific
-show_nonstandard_charts=yes
-##C## Determines whether to allow the user to change the chart type at runtime
-allow_runtime_chart_sel=yes
-##C## Determines whether to display the report title as chart title as well
-display_chart_title=yes
-##C## Determines whether to merge/blank multi-level row headings in cross-tab report
-merge_crosstab_row_headings=yes
-##C## Determines whether to display chart when displaying the report at first or just a "Show Chart" button
-display_chart_by_default=yes
-##C## Determines whether to print the form field values in the download files
-print_params_in_download=yes
-##C## Determines the limitation to the characters in chart label.
-skip_chart_labels_limit=30
-##C## Determines whether to users with read-only rights for a report can copy it
-can_copy_on_read_only=yes
-##C## Determines the no of decimals to be displayed in Totals column
-#max_decimals_on_totals=-1 => don't truncate, display all decimal digits
-max_decimals_on_totals=2
-##C## Determines which JFreeChart to use.
-jfree_version=latest
-#jfree_version=0.9.11
-# Added this restriction so that heavily used system which contain
-# more than 1000 users can enable this feature not to display whole
-# users in the drop down menu
-display_all_users=yes
-##Sheet name
-sheet_name=raptor
-#shell_script_name=/home/sundar/test.sh
-#download_query_folder=/titan/PROJECT3/RAPTOR/raptor/dwnld/query/
-## this directory is mentioned if the flat file is downloaded using shell script
-shell_script_dir=/titan/PROJECT3/RAPTOR/raptor/dwnld/
-flat_file_lower_limit=1
-flat_file_upper_limit=200000
-## whatever request mentioned here would be parsed in sql and request parameter would be filled
-request_get_params=isEmbedded
-print_footer_in_download=yes
-## footer mentioned here appears in downloaded excel
-footer_first_line=TODO footer first line
-footer_second_line=Use Pursuant to Company Instructions
-## to run report in popup window
-report_in_popup_window=yes
-## to run each report in new popup window if the above is selected
-popup_in_new_window=yes
-## "Yes" allows the request param to be passed to the drill down report
-pass_request_param_in_drilldown=yes
-## Show PDF download icon
-show_pdf_download=yes
-# Show Folder Tree
-show_folder_tree=no
-#Show folder tree only for Admin Users
-show_folder_tree_only_to_admin_users=no
-#folder tree should be minimized
-folder_tree_minimized=yes
-## whatever session mentioned here would be parsed in sql and session parameter would be filled
-session_params=login_id
-display_formfield_info=yes
-customize_formfield_info=yes
-#schedule limit for end users
-schedule_limit=10
-# customized query if you need any restrictions for schedule and security tab for fusion
-#schedule_custom_query_for_users=getAllUsersByCustomer
-#schedule_custom_query_for_roles=getAllRolesByCustomer
-# customized query if you need any restrictions for schedule and security tab for prisms example
-#schedule_custom_query_for_users=SELECT au.user_id, au.first_name||' '||au.last_name user_name FROM app_user au order by 2
-schedule_custom_query_for_users=SELECT au.user_id id, au.first_name||' '||au.last_name name FROM app_user au where user_id = 1 order by 2
-#schedule_custom_query_for_roles=SELECT ar.role_id, ar.descr role_name FROM app_role ar order by 2
-schedule_date_pattern=MM/dd/yyyy hh:mm:ss a
-## This is used to display in right format in chart timestamp axis as we give in the sql
-#chart_yearly_format=yyyy
-#chart_monthly_format=MMM-yyyy
-#chart_daily_format=MM-dd-yyyy
-chart_hourly_format=MM/dd HH
-#chart_minute_format=HH:mm
-chart_minute_format=MM-dd-yyyy-HH:mm
-#chart_second_format=HH:mm:ss
-chart_second_format=MM-dd-yyyy
-#chart_millisecond_format=HH:mm:ss.S
-schedule_help_text=This form is used to schedule a specific Reporting Platform report to be delivered to one or more email addresses associated with your Company's Business Direct user logins.  Note that report output delivered via email does not include the capability to drill down/back up to additional data levels.  So, select the appropriate data level report for the scheduled report.  View the status of scheduled report requests in the My Schedules menu item.
-use_loginid_in_schedYN=Y
-session_params_for_scheduling=login_id
-session_date_formfield_auto_incr=yes
-display_session_param_pdfexcel=login_id;Login Id
-session_params_for_displaying_in_scheduling=login_id;Login Id
-application_server=tomcat
-#gmap properties
-gmap_key=ABQIAAAAToJSSetKBMjBJx8MiRw4ghQiU0SbbKnm8C5eu25cpyLwgkLzyRShrQTbgZtqnKAqZU9JwcSq1bKwiA
-PROJECT-FOLDER=/Users/sundar/git/st_quantum/quantum/target/quantum-1.0
-# 
-MARKET-SHAPEFILE-FOLDER=resources/files
-# output folder for files generated on server side
-OUTPUT-FOLDER=resources/temp
-# tile size in pixel
-TILE-SIZE=256
-#check if map is disabled or not
-map_allowed=Y
-max_drilldown_level=2
-admin_role_equiv_to_super_role=N
-show_loading_during_formfield_chain=Y
-show_print_icon=N
-globally_nowrap=N
-calendar_output_date_format=MM/dd/yyyy
-memory_threshold_percentage=99
-print_params_in_csv_download=yes
-notitle_in_dashboard=yes
-generate_store_sched_reports=yes
-show_excel_2007_download=yes
-print_excel_in_landscape=yes
-show_animated_chart_option=yes
-show_animated_chart_only=no
-adjust_content_based_on_height=yes
-custom_submit_button_text=Run Button
-customize_formfield_layout=yes
-#db_type=postgresql
-#db_type=oracle
-db_type=mysql
diff --git a/vid/src/main/webapp/WEB-INF/conf/raptor_app_fusion.properties b/vid/src/main/webapp/WEB-INF/conf/raptor_app_fusion.properties
deleted file mode 100644
index ce9d57c37..000000000
--- a/vid/src/main/webapp/WEB-INF/conf/raptor_app_fusion.properties
+++ /dev/null
@@ -1,39 +0,0 @@
-###
-# ================================================================================
-# eCOMP Portal SDK
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#      http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ================================================================================
-###
-temp_folder_path=/demeter/WebApps/dev/ECOMP_PORTAL/temp/
-upload_folder_path=/demeter/WebApps/dev/ECOMP_PORTAL/files/
-excel_template_path=/demeter/WebApps/dev/ECOMP_PORTAL/files/raptor_template/
-temp_folder_url=temp/
-upload_folder_url=upload/
-smtp_server=todo.smtp.com
-default_email_sender=email-name@email.com
-error_page=error_page.jsp
-jsp_context_path=raptor/
-img_folder_url=static/fusion/raptor/images/
-base_folder_url=static/fusion/raptor/
-direct_access_url=http://localhost:8080/quantum/raptor_email_attachment.htm?action=raptor&source_page=report_run&display_content=y
-#base_action_url=report.htm#/report_run/
-drill_action_url=report.htm#/report_run/c_master=
-base_action_url=report_wizard.htm?action=
-base_action_url_ng=report#/
-base_action_param=c_master=
-super_role_id=1
-admin_role_ids=1
-quick_links_menu_ids=HOME,CUSTOMER,REPORTS
diff --git a/vid/src/main/webapp/WEB-INF/conf/raptor_db_fusion.properties b/vid/src/main/webapp/WEB-INF/conf/raptor_db_fusion.properties
deleted file mode 100644
index 8b9870686..000000000
--- a/vid/src/main/webapp/WEB-INF/conf/raptor_db_fusion.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###
-# ================================================================================
-# eCOMP Portal SDK
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#      http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ================================================================================
-###
diff --git a/vid/src/main/webapp/WEB-INF/conf/raptor_pdf.properties b/vid/src/main/webapp/WEB-INF/conf/raptor_pdf.properties
deleted file mode 100644
index d98a47cd6..000000000
--- a/vid/src/main/webapp/WEB-INF/conf/raptor_pdf.properties
+++ /dev/null
@@ -1,49 +0,0 @@
-###
-# ================================================================================
-# eCOMP Portal SDK
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#      http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ================================================================================
-###
-## pdf file specific properties
-pdf_data_font_size=9
-pdf_data_font_family=Arial
-#reduce the font size from html config
-pdf_data_font_size_offset=2
-pdf_data_alternate_color=true
-#data row background(white), alternate(light light blue/gray)
-pdf_data_background_alternate_hex_code=#EDEDED
-pdf_data_default_background_hex_code=#FFFFFF
-#header font (white)  background (gray)
-pdf_data_table_header_font_hex_code=#FFFFFF
-pdf_data_table_header_background_hex_code=#8A9BB3
-#footer header
-pdf_footer_font_size=9
-pdf_footer_font_family=Arial
-pdf_att_proprietary=Proprietary\nUse Pursuant to Company Instructions
-pdf_att_proprierary_font_size=7
-pdf_date_timezone=GMT
-pdf_date_pattern=MM/dd/yyyy hh:mm:ss a
-##page number position at 1 - footer middle, 0 -- header right, 2 - both
-pdf_page_number_position=1
-pdf_word_before_page_number=Page
-pdf_word_after_page_number=
-pdf_coverpage_firstcolumn_size=0.3
-pdf_image_auto_rotate=false
-display_create_owner_info=true
-#session_info=customer,customerId
-display_loginid_for_downloaded_by=false
-# please use false if you want landscape to be default.
-is_default_orientation_portrait=true
diff --git a/vid/src/main/webapp/WEB-INF/conf/sql.properties b/vid/src/main/webapp/WEB-INF/conf/sql.properties
deleted file mode 100644
index ac52f3c95..000000000
--- a/vid/src/main/webapp/WEB-INF/conf/sql.properties
+++ /dev/null
@@ -1,322 +0,0 @@
-###
-# ================================================================================
-# eCOMP Portal SDK
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#      http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ================================================================================
-###
-#SQL Statements for PostgreSQL
-
-#ReportLoader.java
-
-load.custom.report.xml = SELECT cr.report_xml FROM cr_report cr WHERE rep_id=?
-
-# need to copy to oracle
-load.remoteDB.schema = SELECT 'local' SCHEMA_ID, 'local' SCHEMA_DESC, null DATASOURCE_TYPE  FROM dual union SELECT a.SCHEMA_ID, a.SCHEMA_DESC, DATASOURCE_TYPE  FROM SCHEMA_INFO a  where schema_id <> 'local' order by schema_id
-load.remoteDB.schema.where = SELECT a.SCHEMA_ID, a.SCHEMA_DESC, DATASOURCE_TYPE  FROM SCHEMA_INFO a where schema_id = '[schema_id]'
-#formfield rendering
-
-formfield.id.name.sql.prefix=SELECT id, name FROM (
-formfield.id.name.sql=SELECT id, name
-
-formfield.id.name.sql.suffix=
-
-report.security.create= SELECT coalesce(cr.owner_id, cr.create_id) AS owner_id, cr.create_id,  DATE_FORMAT(cr.create_date, '%m/%d/%Y') create_date, maint_id,  DATE_FORMAT(cr.maint_date, '%m/%d/%Y')  update_date, cr.public_yn FROM cr_report cr WHERE cr.rep_id = [rw.getReportID()]
-
-db.update.report.xml = SELECT cr.rep_id, cr.report_xml FROM cr_report cr WHERE rep_id=? FOR UPDATE
-
-update.custom.report.rec = UPDATE cr_report SET title='[Utils.oracleSafe(rw.getReportName())]', descr='[Utils.oracleSafe(rw.getReportDescr())]', public_yn='[(rw.isPublic()]', menu_id='[rw.getMenuID()]', menu_approved_yn='[(rw.isMenuApproved()]', owner_id=[rw.getOwnerID()], maint_id=[rw.getUpdateID()], maint_date=STR_TO_DATE('[rw.getUpdateDate()]', '[Globals.getOracleTimeFormat()]'), dashboard_type_yn='[(rw.isDashboardType()]', dashboard_yn= '[(rw.getReportType().equals(AppConstants.RT_DASHBOARD)]' WHERE rep_id = [rw.getReportID()]
-
-is.report.already.scheduled = select rep_id from cr_report_schedule where rep_id = ?
-
-create.custom.report.rec = INSERT INTO cr_report(rep_id, title, descr, public_yn, menu_id, menu_approved_yn, report_xml, owner_id, create_id, create_date, maint_id, maint_date, dashboard_type_yn, dashboard_yn, folder_id) VALUES([rw.getReportID()], '[Utils.oracleSafe(rw.getReportName())]', '[Utils.oracleSafe(rw.getReportDescr())]', '[rw.isPublic()]', '[rw.getMenuID()]', '[rw.isMenuApproved()]', '', [rw.getOwnerID()], [rw.getCreateID()], STR_TO_DATE('[rw.getCreateDate()]', '[Globals.getOracleTimeFormat()]'), [rw.getUpdateID()], STR_TO_DATE('[rw.getUpdateDate()]', '[Globals.getOracleTimeFormat()]'), '[rw.isDashboardType()]', '[rw.getReportType().equals(AppConstants.RT_DASHBOARD)]',[rw.getFolderId()]) 
-
-get.user.report.names = SELECT cr.rep_id, cr.title FROM cr_report cr WHERE coalesce(cr.owner_id, cr.create_id) = [userID]							
-								
-get.report.owner.id = SELECT coalesce(cr.owner_id, cr.create_id) AS owner FROM cr_report cr WHERE rep_id = ?						
-
-delete.report.record.log = DELETE FROM cr_report_log WHERE rep_id = [reportID]
-
-delete.report.record.users = DELETE FROM cr_report_schedule_users WHERE rep_id = [reportID]
-
-delete.report.record.schedule = DELETE FROM cr_report_schedule WHERE rep_id = [reportID]
-
-delete.report.record.access = DELETE FROM cr_report_access WHERE rep_id = [reportID]
-
-delete.report.record.email = DELETE FROM cr_report_email_sent_log WHERE rep_id = [reportID]
-
-delete.report.record.favorite = DELETE FROM cr_favorite_reports WHERE rep_id = [reportID]
-
-delete.report.record.report = DELETE FROM cr_report WHERE rep_id = [reportID]
-																						
-load.quick.links =  select finalcr.rep_id, finalcr.title, finalcr.descr from (SELECT cr.rep_id, cr.title, cr.descr FROM (SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL (SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra LEFT JOIN cr_report cr ON cr.rep_id = ra.rep_id WHERE cr.menu_id LIKE '%[nvls(menuId)]%' AND cr.menu_approved_yn = 'Y' AND (coalesce(cr.owner_id, cr.create_id) = [userID] OR cr.public_yn = 'Y' OR ra.read_only_yn IS NOT NULL) UNION SELECT cr.rep_id, cr.title, cr.descr FROM cr_report cr WHERE cr.menu_id LIKE '%[nvls(menuId)]%' AND (coalesce(cr.owner_id, cr.create_id) = [userID] OR cr.public_yn = 'Y' or EXISTS (select * from fn_user_role where user_id=[userID] and role_id in (1)))) finalcr ORDER BY finalcr.title
-
-load.folder.reports = SELECT cr.rep_id, cr.rep_id report_id, concat([rep_title_sql] , (CASE WHEN cr.public_yn = 'Y' THEN '' ELSE '[PRIVATE_ICON]' END),cr.title,'') title, cr.descr, concat(au.first_name,' ',au.last_name) owner_name, DATE_FORMAT(cr.create_date, '%m/%d/%Y') create_date, CASE WHEN coalesce(cr.owner_id, cr.create_id) = [userID] THEN 'N' ELSE coalesce(ra.read_only_yn, 'Y') END read_only_yn, CASE WHEN coalesce(cr.owner_id, cr.create_id) = [userID] THEN 'Y' ELSE 'N' END user_is_owner_yn FROM cr_report cr JOIN app_user au ON coalesce(cr.owner_id, cr.create_id) = au.user_id AND cr.folder_id= '[folderId]' LEFT JOIN (SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL(SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra ON cr.rep_id = ra.rep_id
-#If roleList.toString() is '' PostgreSQL returns an error - needs to be null instead of empty
-
-load.folder.reports.user = AND coalesce(cr.owner_id, cr.create_id) = [userID]	
-
-load.folder.reports.publicsql = AND (coalesce(cr.owner_id, cr.create_id) = [userID] OR cr.public_yn = 'Y' OR ra.read_only_yn IS NOT NULL)
-
-load.quick.download.links = SELECT a.file_name, b.title,DATE_FORMAT(a.dwnld_start_time, '%W %d-%m-%Y %H:%i:%s') as time, a.dwnld_start_time FROM cr_report_dwnld_log a, cr_report b where a.user_id = [userID] and a.rep_id = b.rep_id and (a.dwnld_start_time) >= STR_TO_DATE(DATE_FORMAT(now() -  INTERVAL 1 DAY, '%m/%d/%Y'), '%m/%d/%Y') and a.record_ready_time is not null order by a.dwnld_start_time
-
-load.reports.to.schedule = SELECT cr.rep_id, Initcap(cr.title), cr.descr FROM cr_report cr LEFT OUTER JOIN (SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL (SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra ON cr.rep_id = ra.rep_id AND (cr.public_yn = 'Y' OR ra.read_only_yn IS NOT NULL or cr.owner_id = [userID] )ORDER BY Initcap(cr.title)
-		
-load.reports.to.add.in.dashboard = SELECT cr.rep_id, cr.title, cr.descr FROM cr_report cr LEFT OUTER JOIN (SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL (SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra ON cr.rep_id = ra.rep_id AND (coalesce(cr.owner_id, cr.create_id) = [userID] OR cr.public_yn = 'Y' OR ra.read_only_yn IS NOT NULL) AND (cr.dashboard_yn = 'N' or cr.dashboard_yn is null) ORDER BY cr.title
-
-load.my.recent.links = select rep_id, title, descr, form_fields from ( select rep_id, title, descr, form_fields from  (select cr.rep_id, cr.title, a.form_fields,  cr.descr, a.log_time, a.user_id, a.action, a.action_value from cr_report_log a, cr_report cr where user_id = [userID] AND action = 'Report Execution Time' and a.rep_id = cr.rep_id order by log_time desc) AS x) AS y where LIMIT 1, 6
-
-create.report.log.entry = INSERT INTO cr_report_log (rep_id, log_time, user_id, action, action_value, form_fields) VALUES([reportID], now(), [userID], '[action]' , '[executionTime]', '[form_fields]')
-
-create.report.log.entry.exec.time = INSERT INTO cr_report_log (rep_id, log_time, user_id, action, action_value, form_fields) VALUES([reportID], NOW() + INTERVAL 1 SECOND, [userID], '[action]' , '[executionTime]', '[formFields]')
-
-clear.report.log.entries = DELETE FROM cr_report_log WHERE rep_id = ? and user_id = ?
-
-load.report.log.entries = SELECT x.log_time, x.user_id, (CASE WHEN x.action = 'Report Execution Time' THEN  concat('',x.action,'') ELSE x.action END) action, (CASE WHEN x.action = 'Report Execution Time' THEN  action_value  ELSE 'N/A' END) time_taken, (CASE WHEN x.action = 'Report Execution Time' THEN concat('\"Run') ELSE 'N/A' END) run_image, x.name FROM  (SELECT rl.rep_id, DATE_FORMAT(rl.log_time, '%m/%d/%Y %h:%i:%s %p') log_time, rl.action_value, concat(fuser.last_name ,', ',fuser.first_name) name, rl.user_id, rl.action, rl.form_fields FROM cr_report_log rl, fn_user fuser WHERE rl.rep_id = [nvls(reportId)] and rl.action != 'Report Run' and fuser.user_id = rl.user_id ORDER BY rl.log_time DESC) x  LIMIT 100
-
-does.user.can.schedule.report = select crs.sched_user_id, count(*) from cr_report_schedule crs where sched_user_id = [userId] group by crs.sched_user_id having count(*) >= [Globals.getScheduleLimit()]
-
-does.user.can.schedule = select crs.schedule_id from cr_report_schedule crs where schedule_id = [scheduleId]
-
-get.system.date.time = select DATE_FORMAT(now(),'%m/%d/%Y %H:%i:%s')
-
-get.next.day.date.time = select DATE_FORMAT(NOW() + INTERVAL 1 DAY,'%m/%d/%Y %H:%i:%s')
-
-get.next.fifteen.minutes.date.time = select DATE_FORMAT(NOW() + INTERVAL 15 MINUTES,'%m/%d/%Y %H:%i:%s')
-
-get.next.thirty.minutes.date.time = select DATE_FORMAT(NOW() + INTERVAL 30 MINUTES,'%m/%d/%Y %H:%i:%s')
-
-get.template.file = select template_file from cr_report_template_map where report_id = [reportId]
-
-load.pdf.img.lookup = select image_id, image_loc from cr_raptor_pdf_img
-
-load.action.img.lookup = select image_id, image_loc from cr_raptor_action_img
-
-
-#ActionHandler.java
-
-report.values.map.def.a = SELECT x FROM (SELECT DISTINCT 
-
-report.values.map.def.b = TO_CHAR([colName], '[nvl(displayFormat, AppConstants.DEFAULT_DATE_FORMAT)]')
-
-report.values.map.def.c = [colName] 
-
-report.values.map.def.d =  x FROM [rdef.getTableById(tableId).getTableName()] WHERE [colName] IS NOT NULL ORDER BY 1) xx LIMIT <= [Globals.getDefaultPageSize()]
-
-test.sched.cond.popup = SELECT 1 WHERE EXISTS ([sql])
-
-download.all.email.sent = Select user_id, rep_id from CR_REPORT_EMAIL_SENT_LOG where gen_key='[pdfAttachmentKey.trim()]' and log_id =[report_email_sent_log_id.trim()] and (now() - sent_date) < '1 day' limit 1
-
-download.all.gen.key = select schedule_id from cr_report_email_sent_log u where U.GEN_KEY = '[pdfAttachmentKey]'
-
-download.all.retrieve = SELECT au.user_id FROM (SELECT rs.schedule_id, rs.rep_id FROM cr_report_schedule rs WHERE rs.enabled_yn='Y' AND rs.run_date IS NOT NULL  AND rs.schedule_id = [scheduleId]) x, cr_report r, app_user au WHERE x.rep_id = r.rep_id  AND au.user_id IN (SELECT rsu.user_id FROM cr_report_schedule_users rsu WHERE rsu.schedule_id = x.schedule_id and rsu.schedule_id = [scheduleId]  UNION SELECT ur.user_id FROM fn_user_role ur WHERE ur.role_id IN (SELECT rsu2.role_id FROM cr_report_schedule_users rsu2 WHERE rsu2.schedule_id = x.schedule_id and  rsu2.schedule_id = [scheduleId]))
-
-download.all.insert = insert into cr_report_dwnld_log (user_id,rep_id,file_name,dwnld_start_time,filter_params) values (?,?,?,?,?)
-
-#ReportWrapper.java
-
-report.wrapper.format = SELECT coalesce(cr.owner_id, cr.create_id) owner_id, cr.create_id, DATE_FORMAT(cr.create_date, '[Globals.getOracleTimeFormat()]') create_date, maint_id, DATE_FORMAT(cr.maint_date, '[Globals.getOracleTimeFormat()]') update_date, cr.menu_id, cr.menu_approved_yn FROM cr_report cr WHERE cr.rep_id= [reportID]
-
-generate.subset.sql = SELECT [colNames.toString()] FROM (SELECT  [colNames.toString()] FROM ([reportSQL]) AS x ) AS y 
-
-report.sql.only.first.part = SELECT [colNames.toString()] FROM (SELECT [colNames.toString()] FROM (
-
-report.sql.only.second.part.a = [startRow] 
-
-report.sql.only.second.part.b = [pageSize]
-#MYSQL: LIMIT [startRow], [pageSize]
-#ORacle: rownum >= [startRow] and rownum <= ([startRow]+[pageSize])
-#Postgre: limit [pageSize] offset [startRow] 
-
-report.sql.only.second.part.b.noorderby =  LIMIT [startRow]
-
-generate.sql.visual.select = SELECT
-
-generate.sql.visual.count = COUNT(*) cnt
-
-generate.sql.visual.dual = 
-#No DUAL table in PostgreSQL so this is blank
-
-#ReportRuntime.java
-
-load.crosstab.report.data = SELECT  [colNames.toString()] FROM ( [reportSQL] 
-
-#RaptorRunHandler.java
-
-generate.sql.handler = SELECT  x.* from ([sql]) AS x LIMIT 2
-
-generate.sql.select = SELECT [colNames.toString()] FROM (SELECT  [colNames.toString()] FROM ([sql]) AS y) AS x 
-			
-#ReportSchedule.java
-
-load.schedule.data = SELECT rs.enabled_yn, DATE_FORMAT(rs.start_date, '%m/%d/%Y') start_date, DATE_FORMAT(rs.end_date, '%m/%d/%Y') end_date, DATE_FORMAT(rs.run_date, '%m/%d/%Y') run_date, coalesce(DATE_FORMAT(rs.run_date, '%h'), '12') run_hour, coalesce(DATE_FORMAT(rs.run_date, '%i'), '00') run_min, coalesce(DATE_FORMAT(rs.run_date, '%p'), 'AM') run_ampm, rs.recurrence, rs.conditional_yn, rs.notify_type, rs.max_row, rs.initial_formfields, rs.schedule_id, coalesce(DATE_FORMAT(rs.end_date, '%h'), '11') end_hour, coalesce(DATE_FORMAT(rs.end_date, '%i'), '45') end_min, coalesce(DATE_FORMAT(rs.end_date, '%p'), 'PM') end_ampm, encrypt_yn, attachment_yn FROM cr_report_schedule rs WHERE rs.rep_id = [reportID]
-
-load.schedule.getid = SELECT rsu.user_id, concat(fuser.last_name,', ',fuser.first_name), fuser.login_id FROM cr_report_schedule_users rsu, fn_user fuser WHERE rsu.rep_id = [reportID]  AND rsu.schedule_id = [getScheduleID()] and rsu.user_id IS NOT NULL and rsu.user_id = fuser.user_id
-
-load.schedule.users = SELECT rsu.role_id FROM cr_report_schedule_users rsu WHERE rsu.rep_id = [reportID] AND rsu.schedule_id = [getScheduleID()] AND rsu.role_id IS NOT NULL
-
-new.schedule.data = select coalesce(max(schedule_id),0)+1  AS sequence from cr_report_schedule
-
-new.report.data = select coalesce(max(rep_id),0)+1  AS rep_id from cr_report
-
-execute.update = DELETE FROM cr_report_schedule_users WHERE rep_id = [reportID] and schedule_id = [getScheduleID()]
-
-execute.update.users = INSERT INTO cr_report_schedule_users (schedule_id, rep_id, user_id, role_id, order_no) VALUES([getScheduleID()], [reportID], [emailToUsers.get(i)).getId()], NULL, [(i + 1)])
-
-execute.update.roles = INSERT INTO cr_report_schedule_users (schedule_id, rep_id, user_id, role_id, order_no) VALUES([getScheduleID()], [reportID], NULL, [emailToRoles.get(i)).getId()], [((emailToUsers.size() + i + 1)])
-
-execute.update.activity = INSERT into cr_schedule_activity_log (schedule_id, notes, run_time) values ([getScheduleID()],'Submitted:Schedule',TO_DATE('[getRunDate()] [getRunHour()]:[getRunMin()] [getRunAMPM()]', 'MM/DD/YYYY HH:MI AM'))
- 
-delete.schedule.data = SELECT 1 FROM cr_report_schedule WHERE rep_id = [reportID] and sched_user_id = [getScheduleUserID()] and schedule_id = [getScheduleID()]
- 
-delete.schedule.data.users = DELETE FROM cr_report_schedule_users WHERE rep_id = [reportID]  and schedule_id = [getScheduleID()]
- 
-delete.schedule.data.id = DELETE FROM cr_report_schedule where rep_id = [reportID] and sched_user_id = [getScheduleUserID()] and schedule_id = [getScheduleID()]
-
-load.cond.sql = SELECT condition_large_sql FROM cr_report_schedule WHERE schedule_id=?
-
-load.cond.sql.select = SELECT condition_sql FROM cr_report_schedule WHERE schedule_id = [scheduleId]
-
-persist.cond.sql.update = update cr_report_schedule set condition_large_sql = '' where  schedule_id = [scheduleId]
-#EMPTY CLOB() changed to ''
-
-persist.cond.sql.large = SELECT condition_large_sql FROM cr_report_schedule cr WHERE schedule_id=? FOR UPDATE
-
-persist.cond.sql.set = update cr_report_schedule set condition_sql = ? where schedule_id = [scheduleId]
-
-#DataCache.java
-
-get.data.view.actions = SELECT ts.web_view_action FROM cr_table_source ts WHERE ts.web_view_action IS NOT NULL
-
-get.public.report.id.names = SELECT rep_id, title FROM cr_report WHERE public_yn = 'Y' ORDER BY title
-
-get.private.accessible.names.a = SELECT cr.rep_id, cr.title FROM cr_report cr WHERE cr.rep_id not in (select rep_id from cr_report_access cra where user_id =  '[user_id]' 
-
-get.private.accessible.names.if =  OR role_id in (
-
-get.private.accessible.names.b =  ) AND public_yn = 'N' and cr.owner_id = '[user_id]' order by 2 
-
-get.group.accessible.names.a = SELECT cr.rep_id, cr.title FROM cr_report cr  WHERE cr.rep_id  in (select rep_id from cr_report_access cra where user_id =  '[user_id]'
-
-get.group.accessible.names.b =  )  AND public_yn = 'N' order by 2 
-
-get.report.table.sources.a = SELECT table_name, display_name, pk_fields, web_view_action, large_data_source_yn, filter_sql FROM cr_table_source 
-
-get.report.table.sources.where =  where SOURCE_DB= '[dBInfo]'
-
-get.report.table.sources.if =  where SOURCE_DB is null or SOURCE_DB = '[AppConstants.DB_LOCAL]'
-
-get.report.table.sources.else =  ORDER BY table_name
-
-grab.report.table.a = SELECT ts.table_name, ts.display_name, ts.pk_fields, ts.web_view_action, ts.large_data_source_yn, ts.filter_sql FROM cr_table_source ts  WHERE 
-
-grab.report.table.if = ts.SOURCE_DB= '[dBInfo]'
-
-grab.report.table.else = (ts.SOURCE_DB is null or ts.SOURCE_DB = '[AppConstants.DB_LOCAL]')
-
-grab.report.table.b =  except SELECT ts.table_name, ts.display_name, ts.pk_fields,  ts.web_view_action,  ts.large_data_source_yn, ts.filter_sql from cr_table_source ts where table_name in (select table_name from  cr_table_role where role_id not IN [sb.toString()]) and 
-
-grab.report.table.c =  ORDER BY 1 
-
-get.report.table.crjoin = SELECT src_table_name, dest_table_name, join_expr FROM cr_table_join
-
-get.report.table.joins = SELECT tj.src_table_name, tj.dest_table_name, tj.join_expr FROM cr_table_join tj WHERE ((EXISTS (SELECT 1 FROM cr_table_role trs WHERE trs.table_name=tj.src_table_name AND trs.role_id IN [sb.toString()])) OR (NOT EXISTS (SELECT 1 FROM cr_table_role trs WHERE trs.table_name=tj.src_table_name))) AND ((EXISTS (SELECT 1 FROM cr_table_role trd WHERE trd.table_name=tj.dest_table_name AND trd.role_id IN [sb.toString()])) OR (NOT EXISTS (SELECT 1 FROM cr_table_role trd WHERE trd.table_name=tj.dest_table_name)))
-
-generate.report.table.col = SELECT a.table_name, a.column_name, a.data_type, a.label FROM user_column_def a WHERE a.table_name = '[tableName.toUpperCase()]' ORDER BY a.column_id
-
-generate.db.user.sql.a = SELECT utc.table_name, utc.column_name, utc.data_type, 
-
-generate.db.user.sql.if = utc.column_name FROM user_tab_columns utc 
-
-generate.db.user.sql.else = coalesce(x.label, utc.column_name) FROM user_tab_columns utc 
-
-generate.db.user.sql.b = WHERE utc.table_name = '[tableName.toUpperCase()]' 
-
-generate.db.user.sql.c = AND utc.table_name = x.table_name AND utc.column_name = x.column_name 
-
-generate.db.user.sql.d = ORDER BY utc.column_id 
-
-#SearchHandler.java
-
-load.report.search.result = SELECT cr.rep_id, cr.rep_id report_id, [rep_title_sql] title, cr.descr, concat(au.first_name,' ',au.last_name) owner_name, DATE_FORMAT(cr.create_date, '%m/%d/%Y') create_date, CASE WHEN coalesce(cr.owner_id, cr.create_id) = [userID] THEN 'N' ELSE coalesce(ra.read_only_yn, 'Y') END read_only_yn, CASE WHEN coalesce(cr.owner_id, cr.create_id) = [userID] THEN 'Y' ELSE 'N' END user_is_owner_yn, case when report_xml like '%N%' then 'N' when report_xml like '%Y%' or 1 = (select distinct 1 from cr_report_schedule where rep_id = cr.rep_id) then 'Y' else 'N' end FROM cr_report cr JOIN fn_user au ON coalesce (cr.owner_id, cr.create_id) = au.user_id [fReportID] [fReportName] LEFT JOIN(SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL (SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra ON ra.rep_id = cr.rep_id
-
-load.report.search.instr = WHERE cr.menu_id LIKE '%[menuId]%'
-
-load.report.search.result.user = WHERE coalesce(cr.owner_id, cr.create_id) = [userID]
-
-load.report.search.result.public = WHERE (coalesce(cr.owner_id, cr.create_id) = [userID] OR cr.public_yn = 'Y' OR ra.read_only_yn IS NOT NULL)
-
-load.report.search.result.fav =  WHERE cr.rep_id in (select rep_id from cr_favorite_reports where user_id = [userID]
-
-load.report.search.result.sort = ORDER BY CASE coalesce(cr.owner_id, cr.create_id) WHEN [userID] THEN ' ' WHEN 'upper(concat(au.first_name,' ',au.last_name))' ELSE 'upper(cr.title)' END
-
-load.folder.report.result = SELECT cr.rep_id, cr.rep_id report_id, concat([rep_title_sql] , (CASE WHEN cr.public_yn = 'Y' THEN '' ELSE '[PRIVATE_ICON]' END),cr.title,'') title, cr.descr, concat(au.first_name,' ',au.last_name) owner_name, TO_CHAR(cr.create_date, 'MM/DD/YYYY') create_date, CASE WHEN coalesce(cr.owner_id, cr.create_id) = [userID] THEN 'N' ELSE coalesce(ra.read_only_yn, 'Y') END read_only_yn, CASE WHEN coalesce(cr.owner_id, cr.create_id) = [userID] THEN 'Y' ELSE 'N' END user_is_owner_yn FROM cr_report cr JOIN fn_user au ON coalesce (cr.owner_id, cr.create_id) = au.user_id AND TO_CHAR(cr.rep_id, 'FM99999999') like coalesce('%[fReportID]%', TO_CHAR(cr.rep_id, 'FM99999999')) AND UPPER(cr.title) LIKE UPPER('%[fReportName]%') LEFT JOIN(SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL (SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra ON ra.rep_id = cr.rep_id
-
-load.folder.report.result.sort =  ORDER BY CASE coalesce(cr.owner_id, cr.create_id) WHEN [userID] THEN ' ' WHEN '(concat(au.first_name,' ',au.last_name))' ELSE 'cr.title' END
-
-#WizardProcessor.java
-
-process.filter.add.edit = '[argValue]'
-
-#ReportDefinition.java
-
-persist.report.adhoc = SELECT nextval('[Globals.getAdhocReportSequence()]') AS sequence
-
-#Globals.java
-
-initialize.roles = SELECT 1 WHERE EXISTS (SELECT 1 FROM cr_table_role)
-
-initialize.version = SELECT cr_raptor.get_version
-
-# scheduler
-
-
-scheduler.available.schedules = SELECT x.rep_id, x.schedule_id, x.conditional_yn, x.condition_large_sql, x.notify_type, x.max_row, x.initial_formfields, x.processed_formfields, r.title, x.user_id FROM ( SELECT rs.rep_id, rs.schedule_id, rs.sched_user_id user_id, rs.conditional_yn, rs.condition_large_sql, rs.notify_type, rs.max_row, rs.initial_formfields, rs.processed_formfields  FROM cr_report_schedule rs  WHERE rs.enabled_yn='Y'  AND rs.start_date <= [currentDate]  AND  (rs.end_date >= [currentDate] or rs.end_date is null )  AND rs.run_date IS NOT NULL  ) x, cr_report r  WHERE x.rep_id = r.rep_id
-
-random.string = select ( concat('Z' , round(random() * 1000000000000) ) )
-
-
-scheduler.user.emails = SELECT au.user_id FROM (SELECT rs.schedule_id, rs.rep_id FROM cr_report_schedule rs WHERE rs.enabled_yn='Y' AND rs.start_date <= now() AND rs.end_date  >= now() AND rs.run_date IS NOT NULL AND rs.schedule_id = [p_schedule_id] ) x, cr_report r, fn_user au WHERE x.rep_id = r.rep_id AND au.user_id IN (SELECT rsu.user_id FROM cr_report_schedule_users rsu WHERE rsu.schedule_id = x.schedule_id and rsu.schedule_id = [p_schedule_id] UNION SELECT ur.user_id FROM fn_user_role ur WHERE ur.role_id IN (SELECT rsu2.role_id FROM cr_report_schedule_users rsu2 WHERE rsu2.schedule_id = x.schedule_id and rsu2.schedule_id = [p_schedule_id]))  
-
-
-# my logins
-
-app.query = SELECT APP_ID, ML_APP_NAME, MOTS_ID from fn_app
-
-user.log.query = SELECT DISTINCT  IFNULL(SBCID, '') CUID, '' AWID, CONCAT('"',IFNULL(SBCID, ''),'"') APPLICATIONUSERID,  CONCAT('"',IFNULL(FIRST_NAME, ''),'"') FIRST_NAME, CONCAT('"',substr(IFNULL(MIDDLE_NAME, ''), 0, 1),'"') MIDDLE_INITIAL, CONCAT('"',IFNULL(LAST_NAME, ''),'"') LAST_NAME, IFNULL(DATE_FORMAT(LAST_LOGIN_DATE, '%Y/%m/%d'), '') LAST_LOGON_DATE, DATE_FORMAT(CREATED_DATE, '%Y/%m/%d') ACCOUNT_ACTIVATION_DATE, IFNULL(DATE_FORMAT(MODIFIED_DATE, '%Y/%m/%d'), '') LAST_DATE_ACCOUNT_MODIFIED,  '' LAST_PASSWORD_CHANGE_DATE, CONCAT('"',IFNULL(FIRST_NAME, ''),' ',IFNULL(MIDDLE_NAME, ''),' ',IFNULL(LAST_NAME, ''),'"')  FULL_USER_NAME, '' NT_ID, IFNULL(EMAIL, '') EMAIL   FROM FN_USER FU, FN_USER_ROLE FUR WHERE FU.USER_ID \= FUR.USER_ID and FUR.app_id \= ? and ACTIVE_YN \= 'Y' and sbcid is not null order by 1
-
-profile.log.query = SELECT DISTINCT CONCAT('"' , ROLE_NAME , '"') PROFILE_NAME, '""' SECURITY_SETTINGS FROM FN_ROLE FR, FN_USER_ROLE FUR WHERE FUR.ROLE_ID \= FR.ROLE_ID and FR.ACTIVE_YN \= 'Y' and ((FUR.APP_ID \= 1 and FR.ROLE_NAME <> 'Standard User') or (FUR.APP_ID \= ? and FUR.APP_ID <> 1))  ORDER BY 1
-
-user.profile.log.query = SELECT DISTINCT IFNULL(SBCID, '') CUID, '' AWID, CONCAT('"' , IFNULL(SBCID, '') , '"') APPLICATIONUSERID , CONCAT('"' , ROLE_NAME , '"')  PROFILE_NAME  FROM FN_USER A, FN_USER_ROLE B, FN_ROLE C WHERE A.USER_ID \= B.USER_ID AND B.ROLE_ID \= C.ROLE_ID AND A.ACTIVE_YN \= 'Y' AND C.ACTIVE_YN \= 'Y' AND a.sbcid is not null  AND ((B.APP_ID \= 1 and C.ROLE_NAME <> 'Standard User') or (B.APP_ID \= ? and B.APP_ID <> 1)) ORDER BY 1
-
-all.accounts.log.query = SELECT DISTINCT IFNULL(SBCID, '') CUID, (case when A.ACTIVE_YN\='Y' then 'ACTIVE' else 'INACTIVE' end) ACTIVE_YN, CONCAT('"' , IFNULL(SBCID, '') , '"') APPLICATIONUSERID , IFNULL(DATE_FORMAT(LAST_LOGIN_DATE, '%Y/%m/%d'), '') LAST_LOGON_DATE, '' LAST_PASSWORD_CHANGE_DATE, CONCAT('"' , ROLE_NAME , '"')  PROFILE_NAME  FROM FN_USER A, FN_USER_ROLE B, FN_ROLE C WHERE A.USER_ID \= B.USER_ID AND B.ROLE_ID \= C.ROLE_ID AND a.sbcid is not null  AND ((B.APP_ID \= 1 and C.ROLE_NAME <> 'Standard User') or (B.APP_ID \= ? and B.APP_ID <> 1)) ORDER BY 1
-
-# basic sql
-
-seq.next.val = SELECT nextval('[sequenceName]') AS id
-
-current.date = now()
-
-nvl = IFNULL
-
-# report security
-report.user.access = SELECT ra.role_id, ra.user_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.rep_id = [reportID]
-add.user.access = INSERT INTO cr_report_access (rep_id, order_no, role_id, user_id, read_only_yn) VALUES([reportID], IFNULL((select order_no from (SELECT MAX(order_no) AS order_no FROM cr_report_access WHERE rep_id=[reportID]) AS temp), 0)+1, NULL, [userID], '[readOnlyAccess]')
-update.user.access = UPDATE cr_report_access SET read_only_yn='[readOnlyAccess]' WHERE rep_id=[reportID] AND user_id=[userID]
-remove.user.access = DELETE FROM cr_report_access WHERE rep_id=[reportID] AND user_id=[userID]
-add.role.access = INSERT INTO cr_report_access (rep_id, order_no, role_id, user_id, read_only_yn) VALUES([reportID], IFNULL((select order_no from (SELECT MAX(order_no) AS order_no FROM cr_report_access WHERE rep_id=[reportID]) AS temp), 0)+1, [roleID], NULL, '[readOnlyAccess]')
-update.role.access = UPDATE cr_report_access SET read_only_yn='[readOnlyAccess]' WHERE rep_id=[reportID] AND role_id=[roleID]
-remove.role.access = DELETE FROM cr_report_access WHERE rep_id=[reportID] AND role_id=[roleID]
-
diff --git a/vid/src/main/webapp/WEB-INF/conf/system.properties b/vid/src/main/webapp/WEB-INF/conf/system.properties
deleted file mode 100644
index b55ce6493..000000000
--- a/vid/src/main/webapp/WEB-INF/conf/system.properties
+++ /dev/null
@@ -1,171 +0,0 @@
-###
-# ================================================================================
-# eCOMP Portal SDK
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#      http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ================================================================================
-###
-# Properties read by ECOMP Core library, ecompSDK-core.jar
-# testing - props 1.0
-##########################################################################
-# The following properties should NOT be changed by partner applications.
-##########################################################################
-
-application_user_id           = 30000
-post_default_role_id          = 16
-clustered                     = true
-
-#Enable Fusion Mobile capabilities for the application
-mobile_enable			  	  = false
-
-# Cache config file is needed on the classpath
-cache_config_file_path        = /WEB-INF/classes/cache.ccf
-cache_switch                  = 199
-cache_load_on_startup         = false
-
-user_name					  = fullName
-decryption_key				  = AGLDdG4D04BKm2IxIWEr8o==
-
-##########################################################################
-# The following properties MAY require changes by partner applications.
-##########################################################################
-
-#Oracle
-#db.userName=quantumbd
-#db.password=c1syn2yhmr
-#db.connectionURL=jdbc:oracle:thin:todo.link
-#db.hib.dialect=org.hibernate.dialect.Oracle10gDialect
-#db.driver=oracle.jdbc.driver.OracleDriver
-#Hibernate 
-#hb.dialect=org.hibernate.dialect.Oracle10gDialect
-#hb.show_sql=true
-
-#Postgre
-#db.userName=XXXX
-#db.password=XXXX
-#db.connectionURL=jdbc:postgresql://XXXX/XX
-#db.hib.dialect=org.hibernate.dialect.PostgreSQLDialect
-#db.driver=org.postgresql.Driver
-#hb.dialect=org.hibernate.dialect.PostgreSQLDialect
-#hb.show_sql=true
-
-#Mysql
-db.driver = com.mysql.jdbc.Driver
-db.connectionURL = jdbc:mysql://localhost:3306/vid_openecomp
-db.userName = euser
-db.password = euser
-#db.hib.dialect = org.hibernate.dialect.MySQLDialect
-db.min_pool_size = 5
-db.max_pool_size = 10
-hb.dialect = org.hibernate.dialect.MySQLDialect
-hb.show_sql = true
-hb.idle_connection_test_period = 3600
-app_display_name					  = VID
-files_path = /tmp
-
-# menu settings
-#menu_query_name                      = menuData
-#menu_properties_file_location        = /WEB-INF/fusion/menu/
-#application_menu_set_name            = APP
-#application_menu_attribute_name      = applicationMenuData
-#application_menu_properties_name     = menu.properties
-#business_direct_menu_set_name        = BD
-#business_direct_menu_properties_name = bd.menu.properties
-#business_direct_menu_attribute_name  = businessDirectMenuData
-
-application_name              = Virtual Infrastructure Deployment
-application_user_id           = 30000
-post_default_role_id          = 16
-clustered                     = true
-
-#Enable Fusion Mobile capabilities for the application
-mobile_enable			  	  = false
-
-# Cache config file is needed on the classpath
-cache_config_file_path        = /WEB-INF/classes/cache.ccf
-cache_switch                  = 199
-cache_load_on_startup         = false
-
-user_name					  = fullName
-decryption_key				  = AGLDdG4D04BKm2IxIWEr8o==
-
-#element map files
-element_map_file_path = /tmp
-element_map_icon_path = app/vid/icons/
-
-#aai related properties
-aai.server.url.base=https://aai.api.openecomp.org:8443/aai/
-aai.server.url=https://aai.api.openecomp.org:8443/aai/v8/
-aai.oldserver.url.base=https://aai.api.openecomp.org:8443/aai/servers/
-aai.oldserver.url=https://aai.api.openecomp.org:8443/aai/servers/v3/
-aai.truststore.filename=tomcat_keystore
-aai.truststore.passwd.x=5c84906b14912dbe96154e09b1e1db90e31f8dedb08e3e6c9f17da3f926cb67b33e4229cc1fe0f59c996d2e38b8ded42
-aai.keystore.filename=tomcat_keystore
-aai.keystore.passwd.x=5c84906b14912dbe96154e09b1e1db90e31f8dedb08e3e6c9f17da3f926cb67b33e4229cc1fe0f59c996d2e38b8ded42
-
-aai.vid.username=VID
-aai.vid.passwd.x=b78b4808b37a8aadf02a5cc0004f1ad0
-
-#Cron Schedules
-log_cron                      = 0 0/1 * * * ?;
-mylogins_feed_cron            = 0 0/60 * * * ?;
-#sessiontimeout_feed_cron	  = 0 * * * * ? *
-my_login_feed_output_dir      = /tmp/MyLogins
-
-# ECOMP Portal Shared Context REST API URL
-ecomp_shared_context_rest_url= http://todo_enter_be_hostname:9000/ecompportal/context
-# Link shown in Help menu
-contact_us_link = https://todo_contact_us_link.com
-
-# An Unique 128-bit value defined to identify a specific version
-# of an application deployed on a specific virtual machine.
-# This value must be generated and updated by the application 
-# which is using the ECOMP SDK at the time of its deployment.
-# Online Unique UUID generator - https://www.uuidgenerator.net/
-instance_uuid=292b461a-2954-4b63-a3f9-f916c7ad3bc0
-
-# R Cloud feature - configure this property to enable notebook feature - for more details on RCloud please visit https://rcloud.social/index.html
-guard_notebook_url=
-
-#authenticate user server
-authenticate_user_server=http://todo_enter_auth_server_hostname:8383/openid-connect-server-webapp/allUsers
-
-#MSO related properties
-#simulator
-#mso.server.url=http://localhost:8089
-#dev2dev
-#good
-mso.server.url=http://mso.api.openecomp.org:8080/ecomp/mso/infra
-
-mso.polling.interval.msecs=2000
-mso.max.polls=3
-mso.user.name=infraportal
-mso.password.x=3a2149041dc0dea3c1f81cfc43a2763c
-mso.restapi.svc.instance=/serviceInstances/v2
-mso.restapi.vnf.instance=/serviceInstances/v2//vnfs
-mso.restapi.network.instance=/serviceInstances/v2//networks
-mso.restapi.vf.module.instance=/serviceInstances/v2//vnfs//vfModules
-mso.restapi.volume.group.instance=/serviceInstances/v2//vnfs//volumeGroups
-mso.restapi.get.orc.req=/orchestrationRequests/v2
-mso.restapi.get.orc.reqs=/orchestrationRequests/v2?
-vid.truststore.filename=/opt/app/vid/etc/vid_keystore.jks
-mso.dme2.client.timeout=30000
-mso.dme2.client.read.timeout=120000
-vid.truststore.filename=C:\\Temp\\vid_keystore.jks
-vid.truststore.passwd.x=2d62e3c5650609e65716a957b6fed983
-mso.dme2.server.url=http://mso.api.openecomp.org/services/ecomp/mso?version=1607&envContext=TEST&routeOffer=st_mtsnj
-mso.dme2.enabled=false
-
-
diff --git a/vid/src/main/webapp/WEB-INF/conf/system_template.properties b/vid/src/main/webapp/WEB-INF/conf/system_template.properties
deleted file mode 100644
index 019118f17..000000000
--- a/vid/src/main/webapp/WEB-INF/conf/system_template.properties
+++ /dev/null
@@ -1,115 +0,0 @@
-#DB Info
-#db.userName=XXXX
-#db.password=XXXX
-#db.connectionURL=jdbc:oracle:thin:@XXXX/XX
-#db.hib.dialect=org.hibernate.dialect.Oracle10gDialect
-#db.driver=oracle.jdbc.driver.OracleDriver
-#Hibernate 
-#hb.dialect=org.hibernate.dialect.Oracle10gDialect
-#hb.show_sql=true
-
-#Postgre
-#db.userName=XXXX
-#db.password=XXXX
-#db.connectionURL=jdbc:postgresql://XXXX/XX
-#db.hib.dialect=org.hibernate.dialect.PostgreSQLDialect
-#db.driver=org.postgresql.Driver
-#hb.dialect=org.hibernate.dialect.PostgreSQLDialect
-#hb.show_sql=true
-
-#mysql
-db.driver = com.mysql.jdbc.Driver
-db.connectionURL = jdbc:mysql://${VID_MYSQL_HOST}:${VID_MYSQL_PORT}/${VID_MYSQL_DBNAME}
-db.userName = ${VID_MYSQL_USER}
-db.password = ${VID_MYSQL_PASS}
-db.hib.dialect = org.hibernate.dialect.MySQLDialect
-db.min_pool_size = 5
-db.max_pool_size = 10
-hb.dialect = org.hibernate.dialect.MySQLDialect
-hb.show_sql = true
-hb.idle_connection_test_period = 3600
-app_display_name = ${VID_APP_DISPLAY_NAME}
-files_path = /tmp
-
-# menu settings
-#menu_query_name                      = menuData
-#menu_properties_file_location        = /WEB-INF/fusion/menu/
-#application_menu_set_name            = APP
-#application_menu_attribute_name      = applicationMenuData
-#application_menu_properties_name     = menu.properties
-#business_direct_menu_set_name        = BD
-#business_direct_menu_properties_name = bd.menu.properties
-#business_direct_menu_attribute_name  = businessDirectMenuData
-
-application_name              = Virtual Infrastructure Design
-application_user_id           = 30000
-post_default_role_id          = 16
-clustered                     = true
-
-#Enable Fusion Mobile capabilities for the application
-mobile_enable = false
-
-# Cache config file is needed on the classpath
-cache_config_file_path        = /WEB-INF/classes/cache.ccf
-cache_switch                  = 199
-cache_load_on_startup         = false
-
-user_name = fullName
-
-decryption_key = ${VID_DECRYPTION_KEY}
-
-#element map files
-element_map_file_path = /tmp
-element_map_icon_path = app/vid/icons/
-
-#aai related properties
-aai.server.url.base=https://${VID_AAI_HOST}:${VID_AAI_PORT}/aai/
-aai.server.url=https://${VID_AAI_HOST}:${VID_AAI_PORT}/aai/v8/
-aai.oldserver.url.base=https://${VID_AAI_HOST}:${VID_AAI_PORT}/aai/servers/
-aai.oldserver.url=https://${VID_AAI_HOST}:${VID_AAI_PORT}/aai/servers/v3/
-aai.truststore.filename=${AAI_TRUSTSTORE_FILENAME}
-aai.truststore.passwd.x=${AAI_TRUSTSTORE_PASSWD_X}
-aai.keystore.filename=${AAI_KEYSTORE_FILENAME}
-aai.keystore.passwd.x=${AAI_KEYSTORE_PASSWD_X}
-aai.vid.username=${AAI_VID_UID}
-aai.vid.passwd.x=${AAI_VID_PASSWD_X}
-
-# ECOMP Portal Shared Context REST API URL
-ecomp_shared_context_rest_url=${VID_ECOMP_SHARED_CONTEXT_REST_URL}
-# Link shown in Help menu
-contact_us_link=${VID_CONTACT_US_LINK}
-#Cron Schedules
-log_cron                      = 0 0/1 * * * ?;
-mylogins_feed_cron            = 0 0/60 * * * ?;
-#sessiontimeout_feed_cron	  = 0 * * * * ? *
-my_login_feed_output_dir      = ${VID_MYLOGIN_FEED_DIRECTORY}
-
-# An Unique 128-bit value defined to identify a specific version
-# of an application deployed on a specific virtual machine.
-# This value must be generated and updated by the application 
-# which is using the ECOMP SDK at the time of its deployment.
-# Online Unique UUID generator - https://www.uuidgenerator.net/
-instance_uuid=292b461a-2954-4b63-a3f9-f916c7ad3bc0
-
-
-#MSO related properties
-#simulator
-mso.server.url=${VID_MSO_SERVER_URL}
-mso.polling.interval.msecs=${MSO_POLLING_INTERVAL_MSECS}
-mso.max.polls=10
-mso.user.name=${VID_MSO_USER}
-mso.password.x=${VID_MSO_PASS}
-mso.restapi.svc.instance=/ecomp/mso/infra/serviceInstances/v2
-mso.restapi.vnf.instance=/ecomp/mso/infra/serviceInstances/v2//vnfs
-mso.restapi.network.instance=/ecomp/mso/infra/serviceInstances/v2//networks
-mso.restapi.vf.module.instance=/ecomp/mso/infra/serviceInstances/v2//vnfs//vfModules
-mso.restapi.volume.group.instance=/ecomp/mso/infra/serviceInstances/v2//vnfs//volumeGroups
-mso.restapi.get.orc.req=/ecomp/mso/infra/orchestrationRequests/v2
-mso.restapi.get.orc.reqs=/ecomp/mso/infra/orchestrationRequests/v2?
-vid.truststore.filename=${VID_TRUSTSTORE_FILE}
-vid.truststore.passwd.x=${VID_TRUSTSTORE_PASS}
-mso.dme2.client.timeout=${MSO_DME2_CLIENT_TIMEOUT}
-mso.dme2.client.read.timeout=${MSO_DME2_CLIENT_READ_TIMEOUT}
-mso.dme2.server.url=${MSO_DME2_SERVER_URL}
-mso.dme2.enabled=${MSO_DME2_ENABLED}
-
diff --git a/vid/src/main/webapp/WEB-INF/defs/definitions.xml b/vid/src/main/webapp/WEB-INF/defs/definitions.xml
deleted file mode 100644
index 6c5827775..000000000
--- a/vid/src/main/webapp/WEB-INF/defs/definitions.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-       
-
-
-
-
-	
-		
-	
-
-	
-
-	
-
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/conf/fusion.properties b/vid/src/main/webapp/WEB-INF/fusion/conf/fusion.properties
deleted file mode 100644
index b2cef9f89..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/conf/fusion.properties
+++ /dev/null
@@ -1,61 +0,0 @@
-###
-# ================================================================================
-# eCOMP Portal SDK
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#      http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ================================================================================
-###
-
-
-# validator settings
-#default_error_message = Default error message
-
-#login message
-login.error.hrid.empty = Login failed, please contact system administrator. 
-login.error.hrid.not-found = User not found, please contact system administrator.
-login.error.user.inactive = Account is disabled, please contact system administrator.
-
-authentication_mechanism = BOTH
-
-user_attribute_name      = user
-
-# User Session settings
-#user_attribute_name           = user
-roles_attribute_name          = roles
-role_functions_attribute_name = role_functions
-#client_device_attribute_name  = client_device
-#client_device_emulation       = false
-
-
-# menu settings
-menu_query_name                      = menuData
-#menu_properties_file_location        = /WEB-INF/fusion/menu/
-application_menu_set_name            = APP
-application_menu_attribute_name      = applicationMenuData
-#application_menu_properties_name     = menu.properties
-business_direct_menu_set_name        = BD
-#business_direct_menu_properties_name = bd.menu.properties
-business_direct_menu_attribute_name  = businessDirectMenuData
-
-# RAPTOR config settings
-#raptor_config_file_path = /WEB-INF/conf/
-
-# Role settings
-sys_admin_role_id = 1
-#sys_admin_role_function_delete_from_ui = true
-
-# Profile Search settings
-#profile_search_report_id=181
-#callable_profile_search_report_id=386
diff --git a/vid/src/main/webapp/WEB-INF/fusion/defs/definitions.xml b/vid/src/main/webapp/WEB-INF/fusion/defs/definitions.xml
deleted file mode 100644
index 6b0ca7b90..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/defs/definitions.xml
+++ /dev/null
@@ -1,241 +0,0 @@
-
-
-
-
-      
-        
-        
-      
-        
-    
-    
-      
-      
-      
-      
-      
-      
-      
-
-       
-       
-     	  
-      
-     
-        
-       
-     	  
-       
-      
-       
-     	
-      
-    
-       
-     	
-     	  
-    
-    
-       
-     	
-     	  
-       
-    
-	   
-     	
-     	  
-      
-   
-       
-       
-         
-      
-    
-    
-       
-       
-      
-    
-       
-       
-         
-    
-    
-        
-       
-         
-     
-    
-       
-       
-         
-      
-    
-       
-       
-         
-      
-    
-    
-       
-       
-    
-    
-       
-       
-    
-    
-    
-       
-       
-    
-    
-       
-       
-         
-     
-    
-       
-       
-         
-        
-     
-       
-       
-         
-         
-     
-       
-       
-         
-     
-    
-        
-       
-         
-     
-
-    
-       
-       
-     
-    
-       
-       
-        
-    
-    
-       
-       
-        
-    
-       
-       
-        
-    
-       
-       
-        
-    
-    
-    
-      
-     	
-    	
-     
-    
-    
-    
-    
-    
-    
-    
-    
-           
-       
-         
-    
-           
-       
-         
-    
-         
-        
-       
-         
-    
-
-
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-
-	
-		
-	
-
-     
-
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/jsp/broadcast.jsp b/vid/src/main/webapp/WEB-INF/fusion/jsp/broadcast.jsp
deleted file mode 100644
index d4e7810c1..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/jsp/broadcast.jsp
+++ /dev/null
@@ -1,137 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.core.web.support.UserUtils" %>
-<%@ page import="org.openecomp.portalsdk.core.web.support.ControllerProperties" %>
-<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties" %>
-
-<%-- <%@ include file="/WEB-INF/fusion/jsp/include.jsp" %> --%>
-<%@ taglib prefix="c"      uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fmt"    uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="fn"     uri="http://java.sun.com/jsp/jstl/functions" %>
-
-
-  "/>
-
-  
-  
-  
    
-   
    
-	
-		
-			
    Broadcast Message Edit
    
-		    
-		
-			
    Broadcast Message Create
    
-		    
-	    
-   
    
-  
    
-
-
        
-		 Please edit the broadcast message details below: 

    
-	
    
-	        
    
-	        
-	
    
-	
    
-	
    
-	          
    
-	          
-	          
-	
    
-	
-	
    
-	          
    
-	          
-	          
-	
    
-
-	
    
-		
    
-		 
-	
    
-	
-          
-          			
    	
-						
    
-						
    
-					
    
-              
-		
    
-	
    
-		
-	
    
-
    
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/jsp/broadcast_list.jsp b/vid/src/main/webapp/WEB-INF/fusion/jsp/broadcast_list.jsp
deleted file mode 100644
index f0f1a1d53..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/jsp/broadcast_list.jsp
+++ /dev/null
@@ -1,201 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-<%@ page import="com.fasterxml.jackson.databind.ObjectMapper" %>
-<%@ page import="org.json.JSONObject" %>
-<%@ page import="java.io.StringWriter" %>
-<%@ page import="org.openecomp.portalsdk.core.web.support.ControllerProperties" %>
-<%@ taglib prefix="c"      uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fmt"    uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="fn"     uri="http://java.sun.com/jsp/jstl/functions" %>
-
-  
-  
-
-  
    
-  
    
-    Broadcast Messages
-    
    
-  
    
-
-  <%-- Display a table for the broadcast messages of each message location --%>
-
     	
-
-	
    
-		{{location.label}} Messages
-		
    
-
-		  	
-			  	
-			  		
-			  			
-			  			
-			  			
-			  			
-			  			
-			  			
-			  			
-			  			
-			  		
-			  	
-			  	
-				  
-				   {{message.id}}
-				    
-				    
-				    
-				    
-				    
-				    
-				    
-				     
-				  
-				 
-				
-			
    No.Message TextStart DateEnd DateSort OrderServerActive?Delete?
    {{$index+1}}{{message.messageText}}
-				    	{{message.displayStartDate}}
-				    {{message.displayEndDate}}{{message.sortOrder}}{{message.siteCd}}
-				    	
    
-				    		
-				    	
    
-				        		
-					    
    
-				     
    
-		
    
-		
-  	  


    
-	
    
-
    
-
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/jsp/collaborateList.jsp b/vid/src/main/webapp/WEB-INF/fusion/jsp/collaborateList.jsp
deleted file mode 100644
index b1fbfab14..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/jsp/collaborateList.jsp
+++ /dev/null
@@ -1,146 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ include file="/WEB-INF/fusion/jsp/popup_modal.html" %>
-
-
    
-	
    
-		
    User List
    
-		
    
-			
-
-			    
-					
-						
-			                    
-			                
-			            
-			                    
-			                     
-			        
-			    
-			    
-			        
-		            	
-		            	
-		            	
-		            	
-		            	
-		        		
-			             
-			    	  
-			
    User IDLast NameFirst NameEmailUserIdOnline/Offline
    
-		        		   Offline
-						   Online				
-		        	   
    
-		
    
-	
    	
-	
    
-	          Rows Per Page:
-	          
-    
    
-	
    
-	          Current Page:
-	          
-    
    
-    
    
-	          Total Page(s):
-	          
-    
    
-	
-
-
    
-
-
-
-   
-  
-  
- 
-
-
-
- 
-  
     
    
diff --git a/vid/src/main/webapp/WEB-INF/fusion/jsp/data_out.jsp b/vid/src/main/webapp/WEB-INF/fusion/jsp/data_out.jsp
deleted file mode 100644
index f3fb7a747..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/jsp/data_out.jsp
+++ /dev/null
@@ -1,20 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-${model.output_string}
diff --git a/vid/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_footer.jsp b/vid/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_footer.jsp
deleted file mode 100644
index 5a33314f2..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_footer.jsp
+++ /dev/null
@@ -1,46 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-
-
- 
-
-
-
    
-	
    
-
-			
    
-		
-			
    
-		
    
-			
    
-				
-				
-					
    
-					
    
-					
    
-				
    
-			
    
-		
    
-	
    
-
    
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp b/vid/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp
deleted file mode 100644
index 05c07f0d2..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp
+++ /dev/null
@@ -1,799 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
-<%@ page isELIgnored="false"%>
-<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%>
-<%@ page import="org.openecomp.portalsdk.core.onboarding.crossapi.PortalApiProperties"%>
-<%@ page import="org.openecomp.portalsdk.core.onboarding.crossapi.PortalApiConstants"%>
-<%@ page import="org.openecomp.portalsdk.core.domain.MenuData"%>
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-" />
-" />
-
-<% 
-	String contactUsLink = SystemProperties.getProperty(SystemProperties.CONTACT_US_LINK);
-	String redirectUrl = PortalApiProperties.getProperty(PortalApiConstants.ECOMP_REDIRECT_URL);
-	String portalUrl = redirectUrl.substring(0, redirectUrl.lastIndexOf('/')) + "/processSingleSignOn";
-	String getAccessLink = redirectUrl.substring(0, redirectUrl.lastIndexOf('/')) + "/get_access";	
-%>
-
-
-
-
-<%@include  file="/WEB-INF/fusion/jsp/ebz/loginSnippet.html" %>
-
-
    
-	
    
-	
-		 
    
-			
    
-				
    
-					
-					
-					
    
-						
    
-			                
    
-								
    
-									
  • 
-										
-										ECOMP Portal
-									
    • 										
-									
    
-				                        
    
-							
-									
    
-										
    
-                                                
-                                                
-										
    
-	                                                                                 	
-			                                
    
-			                                	
-			           
-												
    
-													
    
-														
-														
    
-															
    
-															
    
-																Manage favorites on ECOMP Portal.
-															
    
-														
    
-													
    
-								  
-														
    
-			                                                
    
-			                                                    
    
-			                                                        
-			                                                        
    No Favorites
    
-																	
    Manage favorites on ECOMP Portal.
    
-			                                                    
    
-			                                                
    
-														
    
-													
    
-					                                
-				                                
    
-				                            
    
-				                        
     
-				                    
    
-				                    
  • 
-										Unable to load menus
-									
    • 
-									
    
-								
-								
    
-									
  • 
-										
    
-											
-											
-										
    
-									
    • 
-									
  •  
    • 
-								
    
-								
-							
    		
-						
    
-						
    
-					
    
-					
    
-				
    
-			
    
-
-		
    
-			
    		
-				
-					
-						
-					    {{app_name}}
-				
-				
    
-				    
    
-					    
       
-					    	
    
-						    	
-				                    
-				                    	
-				                    
-				                
-							
    						
-					    
    
-				    
    
-				
    
-			
    		
-		
    
-	
    
-
    
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/jsp/ebz/loginSnippet.html b/vid/src/main/webapp/WEB-INF/fusion/jsp/ebz/loginSnippet.html
deleted file mode 100644
index 0f29ee776..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/jsp/ebz/loginSnippet.html
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-           
-
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/jsp/ebz_template.jsp b/vid/src/main/webapp/WEB-INF/fusion/jsp/ebz_template.jsp
deleted file mode 100644
index 59b61d198..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/jsp/ebz_template.jsp
+++ /dev/null
@@ -1,45 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles"%>
-
-
-
-    
-		<%@ include file="/WEB-INF/fusion/jsp/meta.jsp" %>
-		
-	
-	
-		
    
-			
    
-				
-			
    
-			
    
-			
    
-				
    
-					
-				
    
-			
    
-			
    
-			
    
-				 
-			
    
-		
    
-	
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/jsp/ebz_template_noheader_nofooter.jsp b/vid/src/main/webapp/WEB-INF/fusion/jsp/ebz_template_noheader_nofooter.jsp
deleted file mode 100644
index 98dccb4c0..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/jsp/ebz_template_noheader_nofooter.jsp
+++ /dev/null
@@ -1,35 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles"%>
-
-
-    <%@ include file="/WEB-INF/fusion/jsp/meta.jsp" %>
-	
-		
    
-		
-			
    
-				
    
-					
-				
    
-			
    
-			
-		
    
-	
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/jsp/ebz_template_report_embedded.jsp b/vid/src/main/webapp/WEB-INF/fusion/jsp/ebz_template_report_embedded.jsp
deleted file mode 100644
index 4281a0636..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/jsp/ebz_template_report_embedded.jsp
+++ /dev/null
@@ -1,48 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles"%>
-
-
-    <%@ include file="/WEB-INF/fusion/jsp/meta.jsp" %>
-		
- 
-
-
-
-
-
-
-
-
-
-
-
-
-		
-
-    
-	
-		
    
-			
    
-					
-			
    
-		
    
-	
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/jsp/es_search_demo.jsp b/vid/src/main/webapp/WEB-INF/fusion/jsp/es_search_demo.jsp
deleted file mode 100644
index dbf9eefb4..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/jsp/es_search_demo.jsp
+++ /dev/null
@@ -1,97 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-
-
-
-
    
- 	
    Elastic Search - Corporate Location Data System
    
-	
    
-		
    
-           
-            
-        
    
-        
-        
-		     
-		        
-		         	  
-		              
-		              
-		              
-		              
-		            
-		              
-		        
-			 
-		    
-		        
-		     	  	
-					
-					
-					
-					
-						
-								
-				     
-		    
-		
    Customer NamePhoneStreetCityStateZIPCLLI
    {{options._source.name}}{{options._source.suggest.payload.tn}}{{options._source.suggest.payload.addr}}{{options._source.suggest.payload.city}}{{options._source.suggest.payload.st}}{{options._source.suggest.payload.zip}}{{options._source.suggest.payload.clli}}
    
-	
    
-
    
diff --git a/vid/src/main/webapp/WEB-INF/fusion/jsp/es_suggest_demo.jsp b/vid/src/main/webapp/WEB-INF/fusion/jsp/es_suggest_demo.jsp
deleted file mode 100644
index 05cfaf552..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/jsp/es_suggest_demo.jsp
+++ /dev/null
@@ -1,97 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-
-
-
-
    
- 	
    Elastic Search - Corporate Location Data System
    
-	
    
-		
    
-           
-            
-        
    
-        
-        
-		     
-		        
-		         	  
-		              
-		              
-		              
-		              
-		            
-		              
-		        
-			 
-		    
-		        
-		     	  	
-					
-					
-					
-					
-						
-								
-				     
-		    
-		
    Customer NamePhoneStreetCityStateZIPCLLI
    {{options.text}}{{options.payload.tn}}{{options.payload.addr}}{{options.payload.city}}{{options.payload.st}}{{options.payload.zip}}{{options.payload.clli}}
    
-	
    
-
    
diff --git a/vid/src/main/webapp/WEB-INF/fusion/jsp/frame_insert.jsp b/vid/src/main/webapp/WEB-INF/fusion/jsp/frame_insert.jsp
deleted file mode 100644
index 5f550c683..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/jsp/frame_insert.jsp
+++ /dev/null
@@ -1,44 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-
-
-   
diff --git a/vid/src/main/webapp/WEB-INF/fusion/jsp/include.jsp b/vid/src/main/webapp/WEB-INF/fusion/jsp/include.jsp
deleted file mode 100644
index cd6a5e09e..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/jsp/include.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties" %>
-<%@ page import="org.openecomp.portalsdk.core.web.support.AppUtils" %>
-
-<%@ page import="java.util.LinkedHashMap" %>
-
-
-<%@ taglib prefix="c"      uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fmt"    uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="fn"     uri="http://java.sun.com/jsp/jstl/functions" %>
-
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/jsp/jcs_admin.jsp b/vid/src/main/webapp/WEB-INF/fusion/jsp/jcs_admin.jsp
deleted file mode 100644
index ba18a7f6c..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/jsp/jcs_admin.jsp
+++ /dev/null
@@ -1,144 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%-- <%@ include file="/WEB-INF/fusion/jsp/include.jsp"%> --%>
-<%@ taglib prefix="c"      uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fmt"    uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="fn"     uri="http://java.sun.com/jsp/jstl/functions" %>
-
-<%@ include file="/WEB-INF/fusion/jsp/popup_modal.html" %>
-
-
    
-	
    Cache Regions
    
-	These are the regions which are currently defined in the cache. 'Items'	and 'Bytes' refer to the elements currently in memory (not spooled).
-	You can clear all items for a region by clicking on the Clear icon next	to the desired region below. You can also clear all regions which
-	empties the entire cache. 

    
-
-	
    
-		
    
-			
    Cache Name
    
-			
    # of Items
    
-			
    Bytes
    
-			
    Status
    
-			
    Memory Hits
    
-			
    Aux Hits
    
-			
    Not Found Misses
    
-			
    Expired Misses
    
-			
    Clear?
    
-			
    Items
    
-		
    
-		
    
-			
    
-				
    {{region.cacheName}}
    
-				
    {{region.size}}
    
-				
    {{region.byteCount}}
    
-				
    {{region.status}}
    
-				
    {{region.hitCountRam}}
    
-				
    {{region.hitCountAux}}
    
-				
    {{region.missCountNotFound}}
    
-				
    {{region.missCountExpired}}
    
-				
    
-					
    
-				
    
-				
    
-			
    
-			
    
-				
-				
    Key
    
-				
    Eternal?
    
-				
    Created
    
-				
    Max Life
    
-				
    Expires
    
-				
    Clear?
    
-			
    
-			
    
-				
    
-					
-					
    {{item.key}}
    
-					
    {{item.eternal}}
    
-					
    {{item.createTime}}
    
-					
    {{item.maxLifeSeconds}}
    
-					
    {{item.expiresInSeconds}}
    
-					
    
-						
    
-					
    
-				
    
-			
    
-			
    
-		
    
-	
    
-
    
-
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/jsp/meta.jsp b/vid/src/main/webapp/WEB-INF/fusion/jsp/meta.jsp
deleted file mode 100644
index 3c4ff52ae..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/jsp/meta.jsp
+++ /dev/null
@@ -1,36 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-
-		
-		
-		 
-	
-		
-		
-	 	
-		
-		
-		
-		
-		
-		 		
-		
-		
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/jsp/popup_modal.html b/vid/src/main/webapp/WEB-INF/fusion/jsp/popup_modal.html
deleted file mode 100644
index 0766cecdc..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/jsp/popup_modal.html
+++ /dev/null
@@ -1,324 +0,0 @@
-
-
-
-   
-   
-   
-    
-   
-    
-     
-    
-     
-    
-    
-    
-   
-    
-   
-   
-    
-    
-
-
-    
-    
-     
-     
-
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/jsp/popup_modal_role.html b/vid/src/main/webapp/WEB-INF/fusion/jsp/popup_modal_role.html
deleted file mode 100644
index c163002d9..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/jsp/popup_modal_role.html
+++ /dev/null
@@ -1,274 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/jsp/popup_modal_rolefunction.html b/vid/src/main/webapp/WEB-INF/fusion/jsp/popup_modal_rolefunction.html
deleted file mode 100644
index ee0b51215..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/jsp/popup_modal_rolefunction.html
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/jsp/post_search.jsp b/vid/src/main/webapp/WEB-INF/fusion/jsp/post_search.jsp
deleted file mode 100644
index 94d4b0bf6..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/jsp/post_search.jsp
+++ /dev/null
@@ -1,356 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-<%@ page import="com.fasterxml.jackson.databind.ObjectMapper" %>
-<%@ page import="org.json.JSONObject" %>
-<%@ taglib prefix="c"      uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fmt"    uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="fn"     uri="http://java.sun.com/jsp/jstl/functions" %>
-<%@ include file="/WEB-INF/fusion/jsp/popup_modal.html" %>
-<%@ include file="/WEB-INF/fusion/jsp/popup_modal_rolefunction.html" %>
-<%@ include file="/WEB-INF/fusion/jsp/popup_modal_role.html" %>
-
-
-
    
-
-
    WEBPHONE Search
    
-      
    
-  		Please enter search criteria below:
    
-
-            
    
-	          Last Name:
    
-	          
-            
    
-          
-            
    
-	          First Name:
    
-	          
-            
    
-         
-            
    
-	          UserId:
    
-	          
-            
    
-           
-            
    
-	          Manager OrgUserId:
    
-	          
-            
    
-           
    
-            
    
-	          Organization:
    
-	          
-            
    
-           
-            
    
-	          Email:
    
-	          
-            
    
-     
    
-
-		
    
-		 	
-		
-		     
-		
    
-		
    
-		{{noResultsString}}
-      
    
-  	    
-		  
-		    
-  			
-  			
-  			
-  			
-  			
-  			
-  			
-  			
-		  
-         	
-            	
-              
-              	
-            	
-            	
-            	
-            	
-            	
-                
-            	
-              
-              
-	    
    NoNameOrgUserIdOrganizationPhoneEmailImport?
    
-                {{$index + 1}}
-                                	
-	              
    
-        	          {{profile.lastName}}, {{profile.firstName}}
-            	  
    
-	              
-               
-                    		
-                {{profile.orgUserId}}
-                
-                {{profile.orgCode}}
-                
-                {{profile.phone}}
-                
-                {{profile.email}}
-                
-		            
    
-		            	
    
-		                
-		                
    
-		             
    
-		             
    
-		                Exists
-		             
    
-                
    
-	    
    
-	          Rows Per Page:
-	          
-        
    
-		
    
-	          Current Page:
-	          
-        
    
-        
    
-	          Total Page(s):
-	          
-        
    
-		
-        
    
-          
-        
    
-
-      
    
-
-
-
-
-
    
- 
diff --git a/vid/src/main/webapp/WEB-INF/fusion/jsp/profile.jsp b/vid/src/main/webapp/WEB-INF/fusion/jsp/profile.jsp
deleted file mode 100644
index e5349c6ae..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/jsp/profile.jsp
+++ /dev/null
@@ -1,442 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.core.domain.User"%>
-<%@ page import="org.openecomp.portalsdk.core.web.support.UserUtils"%>
-
-<%@page import="org.openecomp.portalsdk.core.web.support.ControllerProperties"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-
-
-
-<%@ include file="/WEB-INF/fusion/jsp/popup_modal.html" %>
-
-<%@ include file="/WEB-INF/fusion/jsp/include.jsp"%>
-
-
    
-	
    
-	
-		
-			
    Profile Edit
    
-		    
-		
-			
    Profile Edit
    
-		    
-	    
-	
    
-
    
-
-
    
-
-     Please edit the profile details below: 

    
-
-	
    
-		
    
-		 
-	
    
-
-	
    
-		
    
-		 
-	
    
-     
-	
    
-		
    
-		 
-	
    
-
-	
    
-	
    
-		 
-	
    
-
    
-	
    
-		
    
-		 
-	
    
-
-	
    
-		
    
-		 
-	
    
-
-	
    
-		
    
-		 
-	
    
-
-	
    
-	
    
-		 
-	
    
-
    
-	
    
-	
    
-		 
-	
    
-
-	
    
-		
    
-		 
-	
    
-
-	
    
-		
    
-		 
-	
    
-
-	
    
-		
    
-		 
-	
    
-
    
-	
    
-	
    
-		 
-	
    
-
-	
    	
-		
    
-		
    
-	
    
-
-	
    
-		
    
-		 
-	
    
-
-	
    	
-		
    
-		
    
-	
    
-	
    
-	
    	
-		
    
-		
    
-	
    
-	
-	
    
-		
-	
    
-	
-
    
-	
    
-		
-		
-   
-	
    
-
-	
-
-	     
-  		
-  			
-  			
-  		
-  		 
-  		 
-
-		  
-		    
-		    
-		  
-		 
-	
    NameRemove?
    {{ role.name }}
-		    	
-		     
    
-	
-	
    
-            
    
-                
    Select Roles
    
-            
    
-            
-            
      
-            
               	 	
-				
-			        
-				  		
-				  			
-				  			
-				  		
-			  		
-				  
-				    
-				  	  
-					  	
-					    
-				  	  
-				    
-		        
     Role
    
-					  		
    
-					    	
-					    	
    
-					        		{{ availableRole.name }}
    
-            
    
-    
    
-	
-
    
-
-
-
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/jsp/profile_search.jsp b/vid/src/main/webapp/WEB-INF/fusion/jsp/profile_search.jsp
deleted file mode 100644
index 21e274f7b..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/jsp/profile_search.jsp
+++ /dev/null
@@ -1,104 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ include file="/WEB-INF/fusion/jsp/popup_modal.html" %>
-
    
-	
    
-		
    Profile Search
    
-		
    
-			
-
-			    
-					
-						
-			                    
-			                
-			            
-			                    
-			             
-			            
-			                     
-			        
-			    
-			    
-			        
-		            	
-		            	
-		            	
-		            	
-		            	
-		            	
-		            	
-		        		
-			             
-			    	  
-			
    User IDLast NameFirst NameEmailOrgUserIdManager OrgUserIdEditActive?
    {{rowData.id}}{{rowData.lastName}}{{rowData.firstName}}{{rowData.email}}{{rowData.orgUserId}}{{rowData.managerId}}
-		        		   
    
-		        		     
-		        		   
    
-		        	   
    
-		
    
-	
    	
-	
    
-	          Rows Per Page:
-	          
-    
    
-	
    
-	          Current Page:
-	          
-    
    
-    
    
-	          Total Page(s):
-	          
-    
    
-
    
-	
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/jsp/role.jsp b/vid/src/main/webapp/WEB-INF/fusion/jsp/role.jsp
deleted file mode 100644
index 9e944aa47..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/jsp/role.jsp
+++ /dev/null
@@ -1,286 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ taglib prefix="c"      uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fmt"    uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="fn"     uri="http://java.sun.com/jsp/jstl/functions" %>
-
-<%@ include file="/WEB-INF/fusion/jsp/popup_modal.html" %>
-<%@ include file="/WEB-INF/fusion/jsp/popup_modal_rolefunction.html" %>
-<%@ include file="/WEB-INF/fusion/jsp/popup_modal_role.html" %>
-
-
    
-    
-
    
-
    
-
    
-	
-		
-			
    Role Edit
    
-		    
-		
-			
    Role Create
    
-		    
-	    
-	
    
-
    
-
-
    
-
-	
    
-     Please edit the role details below: 
    
-
-	
    
-		
    
-		 
-	
    
-
-	
    
-		
    
-		 
-	
    
-	
-	
    
-		
-	
    
-	
-	
    
-	
    
-		
-		
-	
    
-
-	
-	     
-  		
-  			
-  			
-  		
-  		 
-  		 
-		  
-		    
-		    
-		  
-		 
-	
    NameRemove?
    {{ roleFunction.name }}
-		    	
    
-		     
    
-	Manage Role Functions

    
-	
-	
    
-		
-		
-	
    
-	
-	
-	     
-  		
-  			
-  			
-  		
-  		 
-  		 
-		  
-		    
-		    
-		  
-		 
-	
    NameRemove?
    {{ role.name }}
-		    	
    
-		     
    
-	
-	
    
-	  
-	  	
-	  		
-	  			
-	  			
-	  		
-	  		
-	  		
-		  	
-		  	
-		    
-		    
-		  
-		  
-		
     Role
    
-		  		
    
-		    	
-		    	
    
-		        		{{ availableRole.name }}
    
-	
    
-
    
-
-
-
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/jsp/role_function_list.jsp b/vid/src/main/webapp/WEB-INF/fusion/jsp/role_function_list.jsp
deleted file mode 100644
index d34a1fbf4..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/jsp/role_function_list.jsp
+++ /dev/null
@@ -1,213 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-
-<%-- <%@ include file="/WEB-INF/fusion/jsp/include.jsp" %> --%>
-      
-<%@ taglib prefix="c"      uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fmt"    uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="fn"     uri="http://java.sun.com/jsp/jstl/functions" %>
-
-<%@ include file="/WEB-INF/fusion/jsp/popup_modal_rolefunction.html" %>
-<%@ include file="/WEB-INF/fusion/jsp/popup_modal.html" %>
-
     	
-	
    
-
-	        
    Role Functions
    
-	        
-	        
-	 

    
-	        
-	
    
-	 
-	
    
-	Click on the edit icon to update a role function, the plus icon to add additional role functions, or the delete icon to remove them.
-	
    
-	
    
-	  
-	  	
-	  		
-	  			
-	  			
-	  			
-	  			
-	  		
-	  	
-	  	
-		  
-		    
-		    
-		    
-		     
-		  
-		
-		
    NameCodeEdit?Delete?
    {{ availableRoleFunction.name }}{{ availableRoleFunction.code }}
-		    
-		    
    
-		        		
-		    	
-		    	
    
-		     
    
-	
    
-	
-
-
-
-
-	
-	
    
-	   	
-	   	
    
-		
    
-		 
-		
    
-	   	
    
-	   	
    
-		
    
-		 
-		
    
-		
    
-		
-		
-	
    
-	
-
    
-
-
-
-
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/jsp/role_list.jsp b/vid/src/main/webapp/WEB-INF/fusion/jsp/role_list.jsp
deleted file mode 100644
index 37919c8e7..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/jsp/role_list.jsp
+++ /dev/null
@@ -1,139 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-
-<%-- <%@ include file="/WEB-INF/fusion/jsp/include.jsp" %> --%>
-
-<%@ taglib prefix="c"      uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fmt"    uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="fn"     uri="http://java.sun.com/jsp/jstl/functions" %>
-<%@ include file="/WEB-INF/fusion/jsp/popup_modal.html" %>
-
-
    
-	
    Roles
    
-
    
-
    
-Click on a Role to view its details.
-     
-
     	
-	
    
-	  
-	  	
-	  		
-	  			
-	  			
-	  			
-	  			
-	  		
-	  	
-	  	
-
-		  
-		    
-		    
-		    
-		     
-		  
-		
-		
    NamePriorityActive?Delete?
    {{ availableRole.name }}{{ availableRole.priority }}
-		    	
    
-		    	
-		    	
    
-		        		
-		    	
    
-		     
    
-	
    
-	
-	
    
-		
-	
    
-	
-
    
-
-
-
-
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/jsp/sequence/details.jsp b/vid/src/main/webapp/WEB-INF/fusion/jsp/sequence/details.jsp
deleted file mode 100644
index eacdfbe07..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/jsp/sequence/details.jsp
+++ /dev/null
@@ -1 +0,0 @@
- 
\ No newline at end of file
diff --git a/vid/src/main/webapp/WEB-INF/fusion/jsp/usage_list.jsp b/vid/src/main/webapp/WEB-INF/fusion/jsp/usage_list.jsp
deleted file mode 100644
index 4e45ffb37..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/jsp/usage_list.jsp
+++ /dev/null
@@ -1,87 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-
-<%-- <%@ include file="/WEB-INF/fusion/jsp/include.jsp" %> --%>
-<%@ taglib prefix="c"      uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fmt"    uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="fn"     uri="http://java.sun.com/jsp/jstl/functions" %>
-<%@ include file="/WEB-INF/fusion/jsp/popup_modal.html" %>
-
-
     	
-	
    
-		
    
-          Usage
-		
    
-    
    
-    
    
-		The following shows all users currently logged into the application. Click the icon to expel a user from the application.
-    
-	
    
-	  
-	  	
-	  	
-	  		
-	  			
-	  			
-	  			
-	  			
-	  			
-	  			
-	  		
-	  		
-	  			
-	  			
-	  			
-	  			
-	  			
-	  			
-	  		
-	  	
-	  	 
-		  
-		    
-		    
-		    
-		    
-		    
-		    
-		  
-		
-		
    Current User Sessions
    User IdUser NameEmailLast Access Time (minutes)Time Remaining (minutes)Expel?
    {{user.id}}{{user.lastName}}{{user.email}}{{user.lastAccess}}{{user.remaining}}
    Current Session
    
-		    	
    
-		    
    
-	
    
-
    
-
-
-
-
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/jsp/webrtc/collaboration.jsp b/vid/src/main/webapp/WEB-INF/fusion/jsp/webrtc/collaboration.jsp
deleted file mode 100644
index ff6c985e3..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/jsp/webrtc/collaboration.jsp
+++ /dev/null
@@ -1,492 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-
-
-
-
-
-
-    
-    
-	
-    
-    
-		
-
-
-	
-	
-	
-	
-	
-    
-	
-	
-	
-
-	 
-	
-	
-	
-	
-	
-	<%@ include file="/WEB-INF/fusion/jsp/popup_modal.html" %>
-	
-	
-	
-	
-	
-	
-
-	
-
-
-
-
-
-    
- 
-
    
-	
    
-	
-	
-	
-	
-	
-	
-				
-                    
-    
-                
-            
-	
-                
-                    
-                    
-                
-            
-    
    
-                        
-    				    
-    					       
-	
-                    
    
-                         
-                         
    
-                    
    
-	
-		
-	
    
-	
    
-		
    
-		
    
- 		
-	
    
-
    
-
-
    
-   
    
-   
    
-   
    
-   
    
-
    
-
-
-
-
-
-
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/orm/Fusion.hbm.xml b/vid/src/main/webapp/WEB-INF/fusion/orm/Fusion.hbm.xml
deleted file mode 100644
index 28060a7c4..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/orm/Fusion.hbm.xml
+++ /dev/null
@@ -1,352 +0,0 @@
-
-
-
-
-
-
-
-     
-    
-         
-          
-             seq_fn_user 
-          
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-        
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
-        
-
-        
-        
-
-        
-        
-		
-		
-        
-            
-            
-        
-
-        
-            
-            
-        
-    
-
-     
-    
-         
-			
-        	
-        
-        
-        
-        
-        
-        
-   	
-	
- 	
-        
-            
-                
-            
-        	
-        	
-        
-        
-            
-        
-    
-
-    
-    
-        
-        
-        
-        
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-    
-
-
-	
-    
-        
-          
-          
-			seq_fn_audit_log
-		  
-        
-        
-        
-        
-        
-    
-    
-    
-    
-        
-           
-             seq_fn_role 
-          
-        
-
-        
-        
-        
-
-        
-            
-            
-        
-
-        
-            
-            
-        
-        
-        
-            
-            
-        
-
-    
-    
- 
-
-    
-    
-        
-        
-    
-    
-    
-    
-        
-          
-             seq_fn_menu 
-          
-        
-
-         
-         
-         
-         
-         
-         
-         
-         
-         
-         
-         
-         
-         
-         
-    
-
-    
-        
-        
-          
-             seq_fn_menu 
-          
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
-
-        
-            
-            
-        
-    
-    
-    
-    
-        
-            
-              seq_fn_broadcast_message
-            
-        
-        
-        
-
-        
-        
-
-        
-        
-
-        
-    
-    
-    
-    
-        
-        
-    
-    
-    
-    
-        
-        
-        
-        
-    
-    
-    
-        
-        
-        
-    
-
-
-    
-    
-        
-          
-          
-        
-    
-
-	
-      
-    	
-    	
-      
-    
-
-
-	
-      select distinct md.parentMenu.id from MenuData as md where md.label = :paramLabel and md.label is not null
-    
-    
-	
-      select distinct md.id from MenuData as md where md.label = :paramLabel
-        
-    
-	
-      select distinct md.id, md.label, md.parentMenu.id from MenuData as md where md.label is not null
-    
-    	
-	
-      select distinct functionCd from MenuData 
-    
-
-	
-      select distinct code from RoleFunction 
-       
-     
-	
-      from MenuData where menuSetCode = :menu_set_cd and parentMenu is null
-    
-	
-      FROM UrlsAccessible A where upper(A.urlsAccessibleKey.url) = upper(:current_url)
-    
-
-    
-      select firstName, lastName from User where id = :user_id
-    
-
-    
-      select email from User where id = :user_id
-    
-
-    
-      select id, firstName, lastName from User where active = true order by lastName, firstName
-    
-	
-    
-      select name from Role where id = :role_id
-    
-
-    
-      select id, name from Role order by name
-    	
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml b/vid/src/main/webapp/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml
deleted file mode 100644
index 6638b4bc7..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
-
-
-    
-	 
-    
-         
-          
-        
-        
-        
-        
-        
-        
-        
-	
-	
-	
-	
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/orm/Workflow.hbm.xml b/vid/src/main/webapp/WEB-INF/fusion/orm/Workflow.hbm.xml
deleted file mode 100644
index 3d8852cb3..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/orm/Workflow.hbm.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
-
-
-    
-	 
-    
-         
-          
-          
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-	
-	
-	
-	
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/custom_header_include.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/custom_header_include.jsp
deleted file mode 100644
index 0bd373b75..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/custom_header_include.jsp
+++ /dev/null
@@ -1,135 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-
-<%@ page import="java.net.*" %>
-
-
-
-
-
-
-<%@ include file="/WEB-INF/fusion/jsp/include.jsp" %>
-
-<%
-   String url = request.getParameter("returnUrl");
-
-   if (url != null) {
-     request.setAttribute("returnUrl", URLDecoder.decode(url, "UTF-8"));
-   }
-
-%>
-
-
-
    " method="POST" target="_parent">
-  
-
    
-
-
-
-
-  
-
-
-
-
-
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/custom_js_include.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/custom_js_include.jsp
deleted file mode 100644
index 5abbb5ad0..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/custom_js_include.jsp
+++ /dev/null
@@ -1,31 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%-- 
-
-
---%>   
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/date_end_field_run_sql.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/date_end_field_run_sql.jsp
deleted file mode 100644
index fd2f9c366..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/date_end_field_run_sql.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-
-
-
-
    
-  
-  
-  
-
    
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/date_start_field_run_sql.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/date_start_field_run_sql.jsp
deleted file mode 100644
index 698272621..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/date_start_field_run_sql.jsp
+++ /dev/null
@@ -1,39 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-
-
-
-
    
-  
-  
-  
-
    
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/default_field_run_sql.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/default_field_run_sql.jsp
deleted file mode 100644
index 95c99f378..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/default_field_run_sql.jsp
+++ /dev/null
@@ -1,39 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-
-
-
-
    
-  
-  
-  
-
    
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/disclaimer.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/disclaimer.jsp
deleted file mode 100644
index d5d252492..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/disclaimer.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<% if(org.openecomp.portalsdk.analytics.system.Globals.getShowDisclaimer()) { %>
-
-  
-     
-     <%if(!org.openecomp.portalsdk.analytics.system.Globals.hideRaptorFooter()) { %>
-     
-     
-     	  
-     	 
-     <% } %>	 
-     
-        
-       
-     
-     
-  
     
       
       
     
    
-
-<% } %>
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/error_include.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/error_include.jsp
deleted file mode 100644
index 8158e6046..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/error_include.jsp
+++ /dev/null
@@ -1,58 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-
-<%	ArrayList alErrorList = (ArrayList) request.getAttribute(AppConstants.RI_ERROR_LIST);
-	if((alErrorList!=null)&&(alErrorList.size()>0)) { %>
-
    
-
-	
-		
-	
-<%		for(int i=0; i=0)
-				sErrorMsg = sErrorMsg.substring(sErrorMsg.indexOf("|")+1);
-			if((i%2)==0) { %>
-	
-<%			} %>
-		
-<%			if((i%2)==1) { %>
-	
-<%			}
-		}	// for
-%>		
-<%		if((alErrorList.size()%2)==1) { %>
-	 
-		
-	
-<%		} %>
-
    
-			Validation Errors Found
    
-			Following errors need to be corrected to continue:
-		
    
-			
  • <%= sErrorMsg %>
-		
    • 
-			 
-		
    
-<%	}	// if 
-%>
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/error_page.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/error_page.jsp
deleted file mode 100644
index 8ee73be01..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/error_page.jsp
+++ /dev/null
@@ -1,229 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="java.io.*" %>
-<%@ page import="java.util.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.error.UserAccessException"%>
-<%@ page import="org.openecomp.portalsdk.analytics.error.RaptorException"%>
-<%@ page import="org.openecomp.portalsdk.analytics.error.UserDefinedException"%>
-<%@ page isErrorPage="true" %>
-
-
-<% java.lang.Exception ex = (Exception) request.getAttribute(AppConstants.RI_EXCEPTION); %>
-<%	boolean showEditLink = false;
-	if(AppUtils.getRequestNvlValue(request, "r_action").equals("report.run")) {
-		ReportRuntime rr = (ReportRuntime) request.getSession().getAttribute(AppConstants.SI_REPORT_RUNTIME);
-		if(rr!=null)
-			try {
-				rr.checkUserWriteAccess(request);
-				showEditLink = true;
-			} catch(Exception e) {}
-	}	// if
-%>
-
-
-
-
-
-
-	
-	
-	
-	
-	Application Error
-	
-
-
-<%-- jsp:include page="custom_header_include.jsp" flush="true" /--%>
-
-
    
-	
-	
-	">
-	
-
-
    
-
-	
-		
-	
-<% if(ex!=null) { %>
-    <% if(ex instanceof org.openecomp.portalsdk.analytics.error.RaptorSchedularException)  { %>
-     <% if(AppUtils.isAdminUser(request)) { %>
-	
-		
-	
-	<% } %>
-	
-		
-	
-	<% }  %>
-		<% if(ex!=null) ex.printStackTrace(); %>
-			<%		if(AppUtils.isAdminUser(request)) {
-					if ((ex instanceof org.openecomp.portalsdk.analytics.error.ReportSQLException)||
-						(request.getAttribute("c_error_sql")!=null && !((String) request.getAttribute("c_error_sql")).trim().equals(""))) { 
-						String sql = "";
-						if(ex instanceof org.openecomp.portalsdk.analytics.error.ReportSQLException)
-							sql = ((org.openecomp.portalsdk.analytics.error.ReportSQLException) ex).getReportSQL(); 
-						else
-							sql = (String) request.getAttribute("c_error_sql"); %>
-						<% if (sql!=null && sql.length() > 0) { %>	
-						
-							
-						
-						
-							
-						
-			<% 			request.setAttribute("c_error_sql", sql);
-				%>
-				        <% }  %>
-				
-					
-				
-			<%		if(request.getAttribute("c_error_url")!=null && !((String) request.getAttribute("c_error_url")).trim().equals("")) { %>
-				
-					
-				
-			<%		} // if %>
-			<% } else { // reportSQLException 
-				if (ex instanceof RaptorException) { %>
-					
-					
-					                 
-			<%} %>
-			<% } %>
-			<% } else { 
-				if (ex instanceof UserAccessException) { %>
-					
-					
-									
-			<%	} else if (ex instanceof UserDefinedException) { %>
-				
-					
-					
-			<%	}
-			 } %>
-				
-					
-						
-<% } else { %>
-<% if(exception instanceof org.openecomp.portalsdk.analytics.error.RaptorSchedularException)  { %>
-     <% if(AppUtils.isAdminUser(request)) { %>
-	
-	
-
-   <% } %>
-
-	
-		<% if(exception!=null) exception.printStackTrace(); %>
-	
-<% } %>
-<%		if(AppUtils.isAdminUser(request)) {
-		if ((exception instanceof org.openecomp.portalsdk.analytics.error.ReportSQLException)||
-			(request.getAttribute("c_error_sql")!=null && !((String) request.getAttribute("c_error_sql")).trim().equals(""))) { 
-			String sql = "";
-			if(exception instanceof org.openecomp.portalsdk.analytics.error.ReportSQLException)
-				sql = ((org.openecomp.portalsdk.analytics.error.ReportSQLException) ex).getReportSQL(); 
-			else
-				sql = (String) request.getAttribute("c_error_sql"); %>
-				       <% if (sql!=null && sql.length() > 0) { %>					
-	
-		
-	
-	
-		
-	
-<% 			request.setAttribute("c_error_sql", sql);
-	%>
-				       <% } %> 
-	
-		
-	
-<%		if(request.getAttribute("c_error_url")!=null && !((String) request.getAttribute("c_error_url")).trim().equals("")) { %>
-	
-		
-	
-<%		} %>
-<% } %>
-<% } %>
-	
-		
-	
-<% if(AppUtils.isAdminUser(request))  { %>	
-
-<% } %>
-<% if(exception!=null) exception.printStackTrace(); %>
-
-<%	}	// else 
-%>
-
    
-<% if(showEditLink) { %>
-			
-<% } %>
-			Error/User-Alert Message:
-		
    
-			Exception Class: <%= (ex!=null && ex instanceof org.openecomp.portalsdk.analytics.error.RaptorSchedularException)?ex.getClass().toString():"" %>
-		
    Message: <%= (ex!=null && ex instanceof org.openecomp.portalsdk.analytics.error.RaptorSchedularException)?ex.getMessage():"" %>
-		
    
-								SQL Execution Error:
-							
    
-								<%= sql %>
-							
    
-						Error Message:
    
-						<%= AppUtils.getRequestNvlValue(request, "error_extra_msg") %><%= ex.getMessage() %>
-					
    
-						Please ">click here to edit report definition.
-					
    
-						Error Message:
    
-						<%= AppUtils.getRequestNvlValue(request, "error_extra_msg") %><%= ex.getMessage() %>
-					
    
-						Error Message:
    
-						<%= AppUtils.getRequestNvlValue(request, "error_extra_msg") %><%= ex.getMessage() %>
-					
    
-						Error Message:
    
-						<%= AppUtils.getRequestNvlValue(request, "error_extra_msg") %><%= ex.getMessage() %>
-					
    
-						** The system administrator has been notified for this error.
-					
    
-		Exception Class: <%= (exception!=null && exception instanceof org.openecomp.portalsdk.analytics.error.RaptorSchedularException)?exception.getClass().toString():"" %>
-	
    Message: <%= (exception!=null && exception instanceof org.openecomp.portalsdk.analytics.error.RaptorSchedularException)?exception.getMessage():"" %>
-		
    
-										SQL Execution Error:
-		
    
-			<%= sql %>
-		
    
-			Error Message:
    
-			<%= AppUtils.getRequestNvlValue(request, "error_extra_msg") %><%= ex.getMessage() %>
-		
    
-			Please ">click here to edit report definition.
-		
    
-			** The system administrator has been notified for this error.
-		
    
-
-
    
-
-
-
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/footer.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/footer.jsp
deleted file mode 100644
index c4fbe9e84..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/footer.jsp
+++ /dev/null
@@ -1,25 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
- 
- 
- 
-
-
-<%----%>
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/popup_drill_down_report.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/popup_drill_down_report.jsp
deleted file mode 100644
index 53959482c..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/popup_drill_down_report.jsp
+++ /dev/null
@@ -1,601 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-
-<%	ReportDefinition rdef = (ReportDefinition) request.getSession().getAttribute(AppConstants.SI_REPORT_DEFINITION); 
-	List reportCols  = rdef.getAllColumns();
-	List rFormFields = null;
-	if(rdef.getFormFieldList()!=null&&rdef.getFormFieldList().getFormField().size()>0)
-		rFormFields = rdef.getFormFieldList().getFormField();
-	
-	ReportFormFields ddReportFormFields = (ReportFormFields) request.getAttribute(AppConstants.RI_FORM_FIELDS); 
-	
-	String drillDownSuppress = AppUtils.getRequestNvlValue(request, "drillDownSuppress");
-	String drillDownParams   = AppUtils.getRequestNvlValue(request, "drillDownParams");
-	String drillDownRequest   = AppUtils.getRequestNvlValue(request, "drillDownRequest");
-	
-	Hashtable paramDefinitions = new Hashtable();
-	StringTokenizer st = new StringTokenizer(drillDownParams, "&");
-	//Added for passing request parameters in Drill Down
-    String[] reqParameters = Globals.getRequestParams().split(",");	
-    int icnt=0;
-    //
-	while(st.hasMoreTokens()) {
-		String param = st.nextToken();
-		DrillDownParamDef paramDef = new DrillDownParamDef(param);
-		if(paramDef.getFieldName().length()>0)
-			paramDefinitions.put(paramDef.getFieldName(), paramDef);
-	}	// while
-%>
-
-
-
-	Drill-down Parameters Configuration
-	
-
-
-
-
-
-
-
    
-
-	
-		
-	
-
-<%	if(ddReportFormFields!=null)
-		for(ddReportFormFields.resetNext(); ddReportFormFields.hasNext(); ) {
-			FormField ff = ddReportFormFields.getNext(); 
-			if(!ff.getFieldType().equals(FormField.FFT_BLANK)) {
-			
-			DrillDownParamDef paramDef = (DrillDownParamDef) paramDefinitions.get(ff.getFieldName());
-			if(paramDef==null)
-				paramDef = new DrillDownParamDef(""); %>
-             
-            <% if (ff!=null && (ff.getValidationType().equals(FormField.VT_TIMESTAMP_HR) || ff.getValidationType().equals(FormField.VT_TIMESTAMP_MIN) || ff.getValidationType().equals(FormField.VT_TIMESTAMP_SEC)) ) {
-            %>
-	
-		 
-	
-	
-		
-		
-	
-	
-		
-		
-	
-	
-		
-		
-	
-<%			if(rFormFields!=null) { %>
-	
-		
-		
-	
-	
-		
-		
-	
-<%					}	// if
-					
-%>
-
-				<%
-				paramDef = (DrillDownParamDef) paramDefinitions.get(ff.getFieldName()+"_Hr");
-				if(paramDef==null)
-					paramDef = new DrillDownParamDef("");
-				%>
-            	
-        		 
-        		
-				
-					
-					
-				
-				
-					
-					
-			
-<%
- 				  if (ff.getValidationType().equals(FormField.VT_TIMESTAMP_MIN) || ff.getValidationType().equals(FormField.VT_TIMESTAMP_SEC)) {
-%>
-				<%
-				paramDef = (DrillDownParamDef) paramDefinitions.get(ff.getFieldName()+"_Min");
-				if(paramDef==null)
-					paramDef = new DrillDownParamDef("");
-				%>
-            	
-        		 
-        		
-				
-					
-					
-				
-				
-					
-					
-			
-<% 					  
- 				  }
-				  if(ff.getValidationType().equals(FormField.VT_TIMESTAMP_SEC)) {
-%>
-				<%
-				paramDef = (DrillDownParamDef) paramDefinitions.get(ff.getFieldName()+"_Sec");
-				if(paramDef==null)
-					paramDef = new DrillDownParamDef("");
-				%>
-            	
-        		 
-        		
-				
-					
-					
-				
-				
-					
-					
-			
-<% 					  
- 		
-				  }
-				  	                  
-               } else { 	
-%> 
-	
-		 
-	
-	
-		
-		
-	
-	
-		
-		
-	
-	
-		
-		
-	
-<%			if(rFormFields!=null) { %>
-	
-		
-		
-	
-	
-		
-		
-	
-<%			}	// if
-               } // else
-			} // if BLANK 	   
-		}   // for 
-%>
-
-
-
-	
-		 
-	
-	
-		 
-	
-	
-		
-		
-	
-	
-		 
-	
-	<% if(!Globals.getPassRequestParamInDrilldown() && (!(reqParameters.length==1 && reqParameters[0].length()<=0))) { 
-		%>
-	
-		 
-	
-	
-		<%
-        icnt=0;
- 
-        for (int i = 0; i < reqParameters.length; i++) { 
-          icnt++;
-                       
-        %>
-        >
-		
-		
-		
-		
-		<%
-		} //for
-		%>
-		 
-		<%
-		} // if requestParam 
-		%>
-         
-			
-		
-
-	
-		
-	
-
    
-			DRILL-DOWN PARAMETERS CONFIGURATION
-		
    
-			 <%= ff.getFieldDisplayName() %>
-			
    
-			     
-			>No value 
-		
-			Accept default
-		
    
-			     
-			>Fixed value 
-		
-			" onChange="document.dataform.r_<%= ff.getFieldName() %>[1].click();">
-		
    
-			     
-			>Value of column 
-		
-			
-		
    
-			     
-			>Value of form field 
-		
-			
-		
    
-			     
-			>Value set 
-		
-			Pass the value of the selected column if not empty,
    
-			otherwise pass the value of the selected form field    
-		
    
-        			 <%= ff.getFieldDisplayName() %> (Hour)
-        			
    
-						     
-						>No value 
-					
-						Accept default
-					
    
-						     
-						 >Value of column 
-					
-						
-							
-					
-					
    
-        			 <%= ff.getFieldDisplayName() %> (Minutes)
-        			
    
-						     
-						>No value 
-					
-						Accept default
-					
    
-						     
-						>Value of column 
-					
-						
-							
-					
-					
    
-        			 <%= ff.getFieldDisplayName() %> (Seconds)
-        			
    
-						     
-						>No value 
-					
-						Accept default
-					
    
-						     
-						>Value of column 
-					
-						
-							
-					
-					
    
-			 <%= ff.getFieldDisplayName() %>
-			
    
-			     
-			>No value 
-		
-			Accept default
-		
    
-			     
-			>Fixed value 
-		
-			" onChange="document.dataform.r_<%= ff.getFieldName() %>[1].click();">
-		
    
-			     
-			>Value of column 
-		
-			
-		
    
-			     
-			>Value of form field 
-		
-			
-		
    
-			     
-			>Value set 
-		
-			Pass the value of the selected column if not empty,
    
-			otherwise pass the value of the selected form field    
-		
     
    
-			 Parameter values not to be passed to the drill-down report
    
-			     
-			Suppress values 
-		
-			
-			
    separate by | if multiple values    
-		
     
    
-			 Request Parameter values to be passed to the drill-down report
    <%= reqParameters[i]%>
-          >
-		
    
-          		 Show Drilled Down Report In Popup Window: 
-			
    
-
    
-	

    
- 
-
-
-
-<%!	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } %>
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/popup_import_semaphore.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/popup_import_semaphore.jsp
deleted file mode 100644
index d73a7fe25..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/popup_import_semaphore.jsp
+++ /dev/null
@@ -1,80 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-
-<%	ArrayList importedList = (ArrayList) request.getAttribute(AppConstants.RI_DATA_SET); %>
-
-
-
-	Advanced Display Formatting
-	
-	
-
-	
-
-
-
    
-
-
-	
-		
-	
-	
-		
-	
-	
-		
-	
-
     Advanced Display Formatting Import
    
-<%	if(importedList!=null&&importedList.size()>0) { %>
-			<%= importedList.size() %> Advanced Display Formattings successfully imported.
-<%	} else { %>
-			The selected report does not have Advanced Display Formattings 
    
-			defined. No Advanced Display Formattings were imported.
-<%	} %>
-			
    
-			
    
-			
-		
    
-
-
-
-
-
-
-<%!	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } %>
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/popup_semaphore.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/popup_semaphore.jsp
deleted file mode 100644
index 39eafb249..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/popup_semaphore.jsp
+++ /dev/null
@@ -1,419 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-
-<%	ReportDefinition rdef = (ReportDefinition) request.getSession().getAttribute(AppConstants.SI_REPORT_DEFINITION); 
-	
-	String semaphoreId = AppUtils.getRequestNvlValue(request, "semaphoreId");
-	String semaphoreType = AppUtils.getRequestNvlValue(request, "semaphoreType");	
-	SemaphoreType semaphore = rdef.getSemaphoreById(semaphoreId);
-	String semaphoreName = null;
-	List listColumns = rdef.getAllColumns();
-	if(semaphore!=null)
-		semaphoreName = semaphore.getSemaphoreName();
-	else
-		if(rdef.getSemaphoreList()!=null)
-			semaphoreName = "Display Formatting "+(rdef.getSemaphoreList().getSemaphore().size()+1);
-		else
-			semaphoreName = "Display Formatting 1";	
-	
-	String submitBtn = AppUtils.getRequestNvlValue(request, "submit_btn"); %>
-
-
-
-	Advanced Display Formatting
-	
-	
-<% if(submitBtn.startsWith("Save")) { %>
-
-<% } %>
-	
-<% if(submitBtn.equals("Save")) { %>
-
-
-	Please wait...
-<% } else { %>
-
-
-
-
-
-
-
    
-	
-	
-
-
-	
-		
-	
-	
-		 
-		
-	
-	
-		 
-		
-	
-	
-		
-	
-	
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-	
-<%	for(int i = 0; i<3+((semaphore==null)?2:semaphore.getFormatList().getFormat().size()); i++) { 
-		FormatType ft = null;
-		if(semaphore!=null&&i
-	>
-		<% if(i==0) { %>
-		
-		<% } else { %>
-		
-		
-		
-		<% } %>
-		
-		
-		
-		
-		
-		
-		
-		
-		
-	
-<%	}	// for 
-%>
-	
-		
-	
-
     Advanced Display Formatting Definition
    Display Name: 
-			
-			
    Apply Formatting To: 
-			<%	String sValue = AppConstants.ST_CELL; 
-				if(semaphore!=null)
-					sValue = nvl(semaphore.getSemaphoreType(), AppConstants.ST_CELL); %>
-			
     
    Column Value IsBold?Italic?Under-
    line?    		Background ColorFont ColorFont FaceFont Size     Preview     
    
-			Any Other
-			">
-			
-			
-			
-		
-			">
-			<%	sValue = "="; 
-				if(ft!=null)
-					sValue = nvl(ft.getExpression(), "="); %>
-			
-		
-			">
-		
-			<%	boolean bValue = false; 
-				if(ft!=null)
-					bValue = ft.isBold(); %>
-			">
-			 onClick="setBold(<%= i %>)">
-		
-			<%	bValue = false; 
-				if(ft!=null)
-					bValue = ft.isItalic(); %>
-			">
-			 onClick="setItalic(<%= i %>)">
-		
-			<%	bValue = false; 
-				if(ft!=null)
-					bValue = ft.isUnderline(); %>
-			">
-			 onClick="setUnderline(<%= i %>)">
-		
-			<%	sValue = ""; 
-				if(ft!=null)
-					sValue = nvl(ft.getBgColor()); %>
-			
-		
-			<%	sValue = ""; 
-				if(ft!=null)
-					sValue = nvl(ft.getFontColor()); %>
-			
-		
-			<%	sValue = ""; 
-				if(ft!=null)
-					sValue = nvl(ft.getFontFace()); %>
-			
-		
-			<%	sValue = "11"; 
-				if(ft!=null)
-					sValue = nvl(ft.getFontSize(), "11"); %>
-			
-		
-			Sample
-		
    
-			
    
-			
-			
-			
-		
    
-
-
    
-
-<% }	// if(submitBtn.equals("Save")) { ... } else { 
-%>
-
-
-
-
-<%!	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } %>
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/popup_sql.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/popup_sql.jsp
deleted file mode 100644
index c685bb138..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/popup_sql.jsp
+++ /dev/null
@@ -1,55 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-
-
-
-	<%= nvl((String) request.getAttribute(AppConstants.RI_PAGE_TITLE)) %>
-	
-
-
-
-	
-		
-	
-	
-		
-	
-	
-		
-	
-
    
-			<%= nvl((String) request.getAttribute(AppConstants.RI_PAGE_SUBTITLE), nvl((String) request.getAttribute(AppConstants.RI_PAGE_TITLE))) %>
-		
    >
-			<%= nvl((String) request.getAttribute(AppConstants.RI_FORMATTED_SQL)) %>
-		
    
-			
    
-			
-		
    
-
    
-
-
-
-<%!	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } %>
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/popup_table_cols.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/popup_table_cols.jsp
deleted file mode 100644
index 9dec6a53a..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/popup_table_cols.jsp
+++ /dev/null
@@ -1,171 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-
-<%	String tableName = AppUtils.getRequestValue(request, AppConstants.RI_TABLE_NAME);
-	String remoteDbPrefix = (String) session.getAttribute("remoteDB");
-	Vector tableSources = null;
-	Vector dbColumns = null;
-	if(tableName==null) {
-		tableSources = DataCache.getReportTableSources(remoteDbPrefix);
-		if(tableSources.size()>0)
-		tableName = ((TableSource) DataCache.getReportTableSources(remoteDbPrefix).get(0)).getTableName();
-	}
-	    if(tableName!=null)  
-			dbColumns = DataCache.getReportTableDbColumns(tableName.toUpperCase(),remoteDbPrefix); 
-	
-	
-	boolean isSingleValueChoice      = AppUtils.getRequestFlag(request, "single_value");
-	boolean includeTableNameInResult = AppUtils.getRequestFlag(request, "return_table_name");
-	boolean includeColTypeInResult   = AppUtils.getRequestFlag(request, "return_col_type"); %>
-
-
-
-	Table Columns
-	
-	
-
-
-
-
-
-
-<% if(! isSingleValueChoice) { %>
-
-<% }	// if 
-%>
-
-
-
    
-	
-	
-<% if(isSingleValueChoice) { %>
-	
-<% } %>
-<% if(includeTableNameInResult) { %>
-	
-<% } %>
-<% if(includeColTypeInResult) { %>
-	
-<% } %>
-
-
-	
-		
-		
-	
-	<%	int rNum = 0;
-		if(dbColumns!=null)
-			for(rNum=0; rNum
-	>
-		
-	<%			if(isSingleValueChoice) { %>
-		
-	<%			} else { %>
-		
-		
-	<%			}	// else 
-	%>
-	
-	<%		}	// for 
-		if(rNum==0) { %>
-	
-		
-	
-	<%	} else {	// if
-	%>
-	
-		
-		
-	<%	
-	}
-	%>
-	
-		
-		
-	
-
     
-		<% if(! isSingleValueChoice) { %>
-			 
-		<% } %>
-		
-			
-			 DB Table Columns
-		
    <%= (rNum+1) %><%= sDisplay %>
-			
-		<%= sDisplay %>
    No columns found for table [<%= tableName %>]
    <%= "CLEAR VALUE" %>
     
-		<% if(! isSingleValueChoice) { %>
-			 
-		<% } %>
-		 
    
-
-	
-	
-
    
-
-
-
-
-<%!	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } %>
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/popup_testrun_sql.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/popup_testrun_sql.jsp
deleted file mode 100644
index a5dbd5026..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/popup_testrun_sql.jsp
+++ /dev/null
@@ -1,103 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="java.io.*" %>
-<%@ page import="java.util.*" %>
-
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-
-<%	Exception ex = (Exception) request.getAttribute(AppConstants.RI_EXCEPTION);
-	DataSet   ds = (DataSet)   request.getAttribute(AppConstants.RI_DATA_SET); %>
-
-
-
-SQL Statement Test Run
-
-
-
-
-
-	
-		
-	
-<% if(ex!=null) { %>
-	
-		
-	
-<% } else if(ds!=null) { %>
-	
-		
-	<%	for(int c=0; c
-		
-	<%	} %>
-	
-	<%	for(int r=0; r
-	>
-		
-		<%	for(int c=0; c
-		
-		<%	} %>
-	
-	<%	}	// for r 
-		if(ds.getRowCount()>Globals.getDefaultPageSize()) {	%>
-	>
-		
-		
-	
-	<%	} else if(ds.getRowCount()==0) { %>
-	
-		
-	
-	<%	}	// else if
-	}	// else if 
-%>
-	
-		
-	
-
    
-		
    
-			
    
-			<%= nvl(ex.getMessage(), " ") %>
-			

    
-
-		
     <%= ds.getColumnName(c) %>
    <%= (r+1) %><%= nvl(ds.getString(r, c), " ") %>
    <%= (Globals.getDefaultPageSize()+1) %>...
    No data found
    
-		
    
-
    
-
-
-
-<%!	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } %>
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/report_download_csv.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/report_download_csv.jsp
deleted file mode 100644
index 811580474..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/report_download_csv.jsp
+++ /dev/null
@@ -1,89 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page trimDirectiveWhitespaces="true" %>
-<%@ page import="java.util.*" %><%@ page import="java.text.*" %><%@ page import="java.io.*" %><%@ page import="org.openecomp.portalsdk.analytics.model.*" %><%@ page import="org.openecomp.portalsdk.analytics.model.runtime.*" %><%@ page import="org.openecomp.portalsdk.analytics.view.*" %><%@ page import="org.openecomp.portalsdk.analytics.system.*" %><%@ page import="org.openecomp.portalsdk.analytics.util.*" %><%
-	ReportRuntime rr = null;
-	ReportData    rd = null;
-	String parent = "";
-	int parentFlag = 0;
-	if(!nvl(request.getParameter("parent"), "").equals("N")) parent = nvl(request.getParameter("parent"), "");
-	if(parent.startsWith("parent_")) parentFlag = 1;
-	if(parentFlag == 1) {
-		rr = (ReportRuntime) request.getSession().getAttribute(parent+"_rr");
-		rd = (ReportData) request.getSession().getAttribute(parent+"_rd");
-	}
-	if(rr==null) rr = (ReportRuntime) request.getSession().getAttribute(AppConstants.SI_REPORT_RUNTIME);
-	if(rd==null) rd = (ReportData)    request.getSession().getAttribute(AppConstants.RI_REPORT_DATA);
-    String formattedReportName = new HtmlStripper().stripSpecialCharacters(rr.getReportName());
-    String formattedDate = new SimpleDateFormat("MMddyyyyHHmm").format(new Date());
-	String fName = formattedReportName+formattedDate+AppUtils.getUserID(request);
-	boolean raw = AppUtils.getRequestFlag(request, "raw");
-	if(true && !raw) 
-		response.setContentType("application/octet-stream");
-	else
-		response.setContentType("application/csv");
-	String fileName = fName+".csv";
-	String sql_whole = (String) request.getAttribute(AppConstants.RI_REPORT_SQL_WHOLE);
-	if(true && !raw) 
-	 	response.setHeader("Content-disposition","attachment;filename="+fName+".zip");
-	else
-		 response.setHeader("Content-disposition","attachment;filename="+fName+".csv");
-	try {(new ReportHandler()).createCSVFileContent(out, rd, rr, sql_whole, request,fName);
-	//out.flush();
-	//out.close();
-	    if(true) {
-	    //	response.reset();
-	    	ServletOutputStream outS = response.getOutputStream();
-			java.io.File file = null;
-			if(true && !raw) {
-				response.setContentType("application/octet-stream");
-				response.setHeader("Content-disposition","attachment;filename="+fName+".zip");
-				file = new java.io.File(AppUtils.getTempFolderPath()+""+fName+".zip");
-			} else {
-				response.setContentType("application/csv");
-				response.setHeader("Content-disposition","attachment;filename="+fName+".csv");
-				file = new java.io.File(AppUtils.getTempFolderPath()+""+fName+".csv");
-			}
-	    	FileInputStream fileIn = new FileInputStream(file);
-	    	int c;
-			while((c=fileIn.read()) != -1){
-	    		outS.write(c);
-	    		}
-	    		outS.flush();
-	    		outS.close();
-	    		fileIn.close();
-
-	    	 
-	    	/*byte[] outputByte = new byte[4096];
-	    	//copy binary contect to output stream
-	    	while(fileIn.read(outputByte, 0, 4096) != -1) {
-	    		outS.write(outputByte, 0, 4096);
-	    	}
-	    	fileIn.close();
-	    	outS.flush();
-	    	outS.close();*/
-	    }
-	} catch(Exception e) {
-		e.printStackTrace();
-		Log.write("Fatal error [report_download_csv.jsp]: "+e.getMessage());
-	}
-%>
-<%!	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } %>
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/report_download_pdf.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/report_download_pdf.jsp
deleted file mode 100644
index e5ae9ddef..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/report_download_pdf.jsp
+++ /dev/null
@@ -1,40 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page trimDirectiveWhitespaces="true" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.pdf.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.view.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-<%
-	ReportRuntime rr = (ReportRuntime) request.getSession().getAttribute(AppConstants.SI_REPORT_RUNTIME);
-	ReportData    rd = (ReportData)     request.getSession().getAttribute(AppConstants.RI_REPORT_DATA);
-	try {
-		new PdfReportHandler().createPdfFileContent(request,response, 3);
-	} catch(Exception e) {
-		Log.write("Fatal error [report_download_pdf.jsp]: "+e.getMessage());
-		e.printStackTrace();
-	}
-	out.clear();
-	out = pageContext.pushBody(); 
-%>
-
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/report_download_xls.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/report_download_xls.jsp
deleted file mode 100644
index a82470d81..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/report_download_xls.jsp
+++ /dev/null
@@ -1,64 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.model.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.view.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-<%
-ReportRuntime rr = null;
-ReportData    rd = null;
-String parent = "";
-int parentFlag = 0;
-if(!nvl(request.getParameter("parent"), "").equals("N")) parent = nvl(request.getParameter("parent"), "");
-if(parent.startsWith("parent_")) parentFlag = 1;
-if(parentFlag == 1) {
-	rr = (ReportRuntime) request.getSession().getAttribute(parent+"_rr");
-	rd = (ReportData) request.getSession().getAttribute(parent+"_rd");
-}
-if(rr==null) rr = (ReportRuntime) request.getSession().getAttribute(AppConstants.SI_REPORT_RUNTIME);
-if(rd==null) rd = (ReportData)    request.getSession().getAttribute(AppConstants.RI_REPORT_DATA);
-
-	if(rr != null && rr.getReportType().equals(AppConstants.RT_DASHBOARD)) {
-		//rr = (ReportRuntime) request.getSession().getAttribute("FirstDashReport");
-	} else if (rr == null)
-		rr = (ReportRuntime) request.getSession().getAttribute("FirstDashReport");
-	//rd = (ReportData)    request.getSession().getAttribute(AppConstants.RI_REPORT_DATA);
-	
-	//response.setContentType("application/vnd.ms-excel");
-	//response.setHeader("Content-disposition","attachment;filename=download_all_"+AppUtils.getUserID(request)+".xls");
-	String user_id = AppUtils.getUserID(request);
-	try {
-/*		if (rr.getReportType().equals(AppConstants.RT_CROSSTAB))  {
-			int downloadLimit = (rr.getMaxRowsInExcelDownload()>0)?rr.getMaxRowsInExcelDownload():Globals.getDownloadLimit();
-			rd 		= rr.loadReportData(-1, AppUtils.getUserID(request), downloadLimit,request);
-		}
-*/
-		new ReportHandler().createExcelFileContent(out, rd, rr, request, response, user_id, 3); //3 whole
-	} catch(Exception e) {
-		e.printStackTrace();
-		Log.write("Fatal error [report_download_xls.jsp]: "+e.getMessage());
-	}
-	out.clear();
-	out = pageContext.pushBody(); 
-%>
-<%!	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } %>
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/report_ebz.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/report_ebz.jsp
deleted file mode 100644
index 8d42b65ba..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/report_ebz.jsp
+++ /dev/null
@@ -1,179 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-	
    Loading...
    
-	
    
-
    
-
    
-
-
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/report_import.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/report_import.jsp
deleted file mode 100644
index 014f98ac5..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/report_import.jsp
+++ /dev/null
@@ -1,69 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-
-
-
-	Import
-	
-	
-
-
-

    
-
-
    
-	
-	
-
-
-	
-		
-	
-	
-		
-	
-	
-		
-	
-
    
-			<%= Globals.getBaseTitle() %> > IMPORT REPORT XML
-		
    
-			
-			
-			
-		
    
-			
    
-			
-		
    	
-	
-	
-
-
    
-
-
-
-
-
-
-<%!	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } %>
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/report_sample.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/report_sample.jsp
deleted file mode 100644
index cfbfad14e..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/report_sample.jsp
+++ /dev/null
@@ -1,40 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-
    Customizable Analytics Dashboard
    
-	
-
-	
-
-
-	
-
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/report_search.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/report_search.jsp
deleted file mode 100644
index 480bdbcb9..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/report_search.jsp
+++ /dev/null
@@ -1,2432 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-
-
-
-
-
-
-
-
    
-		
    
-
    
-	
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/report_wizard.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/report_wizard.jsp
deleted file mode 100644
index cdfe943a5..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/report_wizard.jsp
+++ /dev/null
@@ -1,309 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%--
- Name: report_wizard.jsp
- Use : Master JSP which navigates to specific JSP when different tab is selected. Default it navigates to the wizard_definition.jsp 
- 
- Change Log
- ==========
- 
- 22-Jun-2009 : Version 8.4 (Sundar); 
- 				
- 				
       
- 				
    •  Save button is suppressed from showing when wizard is in the last page (Run page).
      • 
- 				
    •  width of the content_iframe is changed back to default one when navigated from >100% report's run page.
      • 
- 				
    
---%>
-<%@ page import="java.util.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-
-<%@ page errorPage="error_page.jsp" %>
-
- 
-
-
-
-
-<%	ReportDefinition rdef = (ReportDefinition) request.getSession().getAttribute(AppConstants.SI_REPORT_DEFINITION);
-	
-	String reportID   = rdef.getReportID();
-	WizardSequence ws = rdef.getWizardSequence();
-	
-	String curStep    = ws.getCurrentStep();
-	String curSubStep = ws.getCurrentSubStep();
-    
-	String dbInfo = null;
-	dbInfo = rdef.getDBInfo();
-	int sessionflag = 0;
-	if(dbInfo == null  || dbInfo.length() == 0) {
-	   dbInfo = (String) session.getAttribute("remoteDB");
-       sessionflag = 1; 
-	}
-       session.setAttribute("remoteDB", dbInfo);
-	if((dbInfo == null) && (request.getParameter("dataSource")!=null)) 
-	   session.setAttribute("remoteDB", request.getParameter("dataSource"));
-
-	String title = (reportID.equals("-1")?"Create Report":"Edit Report");
-	String navTitle = Globals.getBaseTitle()+" > " + title;
-	
-	boolean isCrossTab = rdef.getReportType().equals(AppConstants.RT_CROSSTAB);
-	boolean isSQLBased = rdef.getReportDefType().equals(AppConstants.RD_SQL_BASED); 
-%>
-	
-<%
-	request.setAttribute(AppConstants.SI_REPORT_DEFINITION,rdef);
-%>	
-
- 
- 
- 
- 
-
- 
-
-
-
-
-
-
-
    
-		
-	
    
-    		
-
    
-
-
    
-	
-	
-	
-	
-	
-	
-	
-
-
-
-
    
-	
-		
-<%		for(ws.resetNext(); ws.hasNext(); ) { 
-			String sTab = ws.getNext(); %>
-			
-			
-			
-<%		}	// for 
-%>
-			
-		
-	
    " width="9" height="24"> align="center" valign="middle">
-			<%	if(sTab.equals(curStep)) { %>
-				 <%= clearSpaces(sTab) %> 
-			<%	} else if(reportID.equals("-1")) { %>	
-				 <%= clearSpaces(sTab) %> 
-			<%	} else { %>	
-				 <%= clearSpaces(sTab) %> 
-			<%	} %>
-			" width="9" height="24"> 
    
-
    
-	
-		
-			
-		
-	
    <%= navTitle %>
    
-
    <%	if(curStep.equals(AppConstants.WS_DEFINITION)) { %>
-        <% if(sessionflag == 1) dbInfo = ""; %>
-		   
-<%	} else if(curStep.equals(AppConstants.WS_SQL)) { %>
-		 
-<%	} else if(curStep.equals(AppConstants.WS_TABLES)&&curSubStep.equals("")) { %>
-		 
-<%	} else if(curStep.equals(AppConstants.WS_TABLES)&&(curSubStep.equals(AppConstants.WSS_ADD)||curSubStep.equals(AppConstants.WSS_EDIT))) { %>
-		 
-<%	} else if(curStep.equals(AppConstants.WS_COLUMNS)&&curSubStep.equals("")) { %>
-		 
-<%	} else if(curStep.equals(AppConstants.WS_COLUMNS)&&curSubStep.equals(AppConstants.WSS_ADD_MULTI)) { %>
-		 
-<%	} else if(curStep.equals(AppConstants.WS_COLUMNS)&&curSubStep.equals(AppConstants.WSS_ORDER_ALL)) { %>
-		 
-<%	} else if(curStep.equals(AppConstants.WS_COLUMNS)&&(curSubStep.equals(AppConstants.WSS_ADD)||curSubStep.equals(AppConstants.WSS_EDIT) ||curSubStep.equals(AppConstants.WA_MODIFY))) { %>
-		 
-<%	} else if(curStep.equals(AppConstants.WS_FORM_FIELDS)&&curSubStep.equals("")||curSubStep.equals(AppConstants.WSS_ADD_BLANK)) { %>
-		 
-<%	} else if(curStep.equals(AppConstants.WS_FORM_FIELDS)&&(curSubStep.equals(AppConstants.WSS_ADD)||curSubStep.equals(AppConstants.WSS_EDIT))) { %>
-		 
-<%	} else if(curStep.equals(AppConstants.WS_FILTERS)&&curSubStep.equals("")) { %>
-		
-<%	} else if(curStep.equals(AppConstants.WS_FILTERS)&&(curSubStep.equals(AppConstants.WSS_ADD)||curSubStep.equals(AppConstants.WSS_EDIT))) { %>
-		  
-<%	} else if(curStep.equals(AppConstants.WS_SORTING)&&curSubStep.equals("")) { %>
-		 
-<%	} else if(curStep.equals(AppConstants.WS_SORTING)&&curSubStep.equals(AppConstants.WSS_ORDER_ALL)) { %>
-		
-<%	} else if(curStep.equals(AppConstants.WS_SORTING)&&(curSubStep.equals(AppConstants.WSS_ADD)||curSubStep.equals(AppConstants.WSS_EDIT))) { %>
-		 
-<%	} else if(curStep.equals(AppConstants.WS_JAVASCRIPT)) { %>
-		 		 
-<%	} else if(curStep.equals(AppConstants.WS_CHART)) { %>
-		 
-<%	} else if(curStep.equals(AppConstants.WS_USER_ACCESS)) { %>
-		 
-<%	} else if(curStep.equals(AppConstants.WS_SCHEDULE)) { %>
-		 
-<%	} else if(curStep.equals(AppConstants.WS_REPORT_LOG)) { %>
-		 
-<%	} else if(curStep.equals(AppConstants.WS_MAP)) { %>
-		 
-<%	} else if(curStep.equals(AppConstants.WS_DATA_FORECASTING)) { %>
-		 
-<%	} else { %>	
-		 
-<%	} %>
-	
-
    
-	
-		
-			
-			
-		
-	
    
-				 
-			
-				<% if(! ws.isInitialStep()) { %>
-				
-				<% } %>
-				
-				<% if(! ws.isFinalStep()) { %>
-				
-				
-				<% } %>
-			
    	
-
    	
-
-
    
-
-
-
- 
-
-
    
-
    
-<%----%>
-
-<%!	private String HTMLEncode(String value) {
-		StringBuffer sb = new StringBuffer(value);
-		
-		for(int i=0; i')
-				sb.replace(i, i+1, ">");
-			else if(sb.charAt(i)=='"')
-				sb.replace(i, i+1, """);
-   		
-		return sb.toString();
-	}   // HTMLEncode
-	
-	private String clearSpaces(String value) {
-		StringBuffer sb = new StringBuffer(value);
-		
-		for(int i=0; i
-
- 
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/test_field_run_sql.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/test_field_run_sql.jsp
deleted file mode 100644
index 2fdcee46e..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/test_field_run_sql.jsp
+++ /dev/null
@@ -1,39 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-
-
-
-
    
-  
-  
-  
-
    
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/test_run_sql.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/test_run_sql.jsp
deleted file mode 100644
index 1c30437bc..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/test_run_sql.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-
-
-
-
    
-  
-  
-  
-
    
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/tree/folderNav.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/tree/folderNav.jsp
deleted file mode 100644
index ca091bab5..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/tree/folderNav.jsp
+++ /dev/null
@@ -1,483 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@page import="org.openecomp.portalsdk.analytics.model.runtime.ReportRuntime"%>
-<%@page import="org.openecomp.portalsdk.analytics.util.AppConstants"%>
-<%@page import="org.openecomp.portalsdk.analytics.system.Globals"%>
-
-<%
-	boolean isFolderAllowed = false;
-	ReportRuntime rr = (ReportRuntime) request.getSession().getAttribute(AppConstants.SI_REPORT_RUNTIME);
-	boolean adminUser = AppUtils.isAdminUser(request);
-	if (Globals.isFolderTreeAllowed()) {
-		if(adminUser) {
-			isFolderAllowed = true;
-		} else if (!Globals.isFolderTreeAllowedOnlyForAdminUsers()) { 
-			isFolderAllowed = true; 
-		} else isFolderAllowed = false;
-	}
-	
-    
-	
-%>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
-	
-	
-	
-	
-	
-	
-	
-		
-	
-	
-	
-	<% if(isFolderAllowed) { %>
-		
-		<% } %>
-		
-
-	
-	<% if(isFolderAllowed) { %>
-	
    
-		Show Folder Tree 
-	
    
-	<% } %>
-	
-
-
-
    
-
-
-
-					
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/tree/testTree.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/tree/testTree.jsp
deleted file mode 100644
index 951bf379c..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/tree/testTree.jsp
+++ /dev/null
@@ -1,248 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-
-
-
-
- 	
-
-	
-	Folder tree with Drag and Drop capabilities
-	
-	
-	
-	
-	
-	
-	
-		
-	
-	
-	
-
-
-	
    
-	
-	
-	
-	
-	
-	
-		
-	
-	
-	
    
-		
-	
      
-		
    
-		
-			
-				
-			
-		
    
-					Hide Folder Tree
-					   
-					
-					Create Folder | 
-					Delete Fodler | 
-					Run Report | 
-					Edit Report  					
-				
    
-		
    
-	
    
-			
    
-			
-				
-	
-				
-				
-					
-				
-			
    
-					
    
-						
-							
-								
-							
-						
    
-									<%=request.getAttribute("folderList")%>
-								
    
-					
    
-				    		
-					
-						
-									
-					
    
-							Collapse all | 
-							Expand all		
-						
    
-							
-							
-						
    
-					
-				
    
-			
    
-		
    
-	
    
-		
-	
    
-	
    
-	
    
-	
-	
-	
-	
    
-		
-		
-		
-		
-	
    
-
-
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_adhoc_schedule.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_adhoc_schedule.jsp
deleted file mode 100644
index 76fe7a58c..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_adhoc_schedule.jsp
+++ /dev/null
@@ -1,733 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%--
- Name: wizard_adhoc_schedule.jsp
- Use : This JSP is used for accepting user parameters for scheduling the report.
- 
- Change Log
- ==========
- 
- 28-Aug-2009 : Version 8.4 (Sundar);  initFormFields function is removed as it is handled in back end.
- 23-Jun-2009 : Version 8.4 (Sundar); 
- 				
- 				
       
- 				
    •  Bug related to creating startDate variable (in Javascript) for the Validation purpose is fixed.
      • 
- 				
    
- 				         
-
---%>
-
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.Globals" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="java.util.List" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.DataCache" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataSourceType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.DBColumnInfo" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.TableSource" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.IdNameValue" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.SemaphoreType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.FormFieldType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportSchedule" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.Utils" %>
-
-<% 
-  ReportSchedule reportSchedule = (ReportSchedule) request.getSession().getAttribute(AppConstants.SI_REPORT_SCHEDULE);
-  ReportDefinition rdefRecurrance = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-  session.setAttribute("login_id", AppUtils.getUserBackdoorLoginId(request));
-  if(reportSchedule==null) reportSchedule = (ReportSchedule) request.getAttribute(AppConstants.SI_REPORT_SCHEDULE);
-  String remoteDbPrefix = (String) session.getAttribute("remoteDB");
-  boolean isSQLAllowed = Globals.getAllowSQLBasedReports();
-%>
-<%@page import="java.util.Calendar"%>
-<%@page import="java.text.DateFormat"%>
-<%@page import="java.text.SimpleDateFormat"%>
-<%@page import="java.util.TimeZone"%>
-<%@page import="java.util.Date"%>
-<%@page import="org.openecomp.portalsdk.analytics.model.ReportLoader"%>
-
-
- 
-
-
-
-
-	
-
-
-
- 
    
- <%
- Calendar startCalendarDate = Calendar.getInstance();
- startCalendarDate.add(Calendar.DAY_OF_MONTH, - 540); 
- Calendar endCalendarDate = Calendar.getInstance();
- endCalendarDate.add(Calendar.DAY_OF_MONTH, 540);
- SimpleDateFormat dtf = new SimpleDateFormat("MM/dd/yyyy");
- SimpleDateFormat oracleDateFormat = new SimpleDateFormat("MM/dd/yyyy kk:mm:ss");
- Date sysdate = oracleDateFormat.parse(ReportLoader.getSystemDateTime());
- SimpleDateFormat dtimestamp = new SimpleDateFormat(Globals.getScheduleDatePattern());
- Calendar systemCalendar = Calendar.getInstance();
- systemCalendar.setTime(sysdate);
- Date sysNext15date = oracleDateFormat.parse(ReportLoader.getNext15MinutesOfSystemDateTime());
- //dtimestamp = new SimpleDateFormat(Globals.getScheduleDatePattern());
- Calendar systemNext15Calendar = Calendar.getInstance();
- systemNext15Calendar.setTime(sysNext15date);
- Date sysNext30date = oracleDateFormat.parse(ReportLoader.getNext30MinutesOfSystemDateTime());
- //dtimestamp = new SimpleDateFormat(Globals.getScheduleDatePattern());
- Calendar systemNext30Calendar = Calendar.getInstance();
- systemNext30Calendar.setTime(sysNext30date);
-
- System.out.println(" systemNext15Calendar " + systemNext15Calendar);
- System.out.println(" systemNext30Calendar " + systemNext30Calendar);
-
- //dtimestamp.setTimeZone(TimeZone.getTimeZone(Globals.getTimeZone()));
- 
-%>
-
- 
-	 
-
-	
-
-	
-		
-	      
-		
-	
-	<%if(nvl(Globals.getScheduleHelpMessage()).length()>0) {	%>
-	   
-	   		   	
-	   
-	<% } %>	
-	
-	
-		 
-		
-	
-	
-		 
-		
-	
-	
-		 
-		
-	
-	
-		 
-		
-	
-             			
-	
-		 
-		
-	
-
-		
-
-	<% if(AppUtils.isAdminUser(request) || isSQLAllowed ) { %>
-	
-		 
-		
-	 
-	
-		 
-		
-	 
-	<% } %>	
-
-	
-		 
-		
-	
-	
-		
-		      
-	
-	
-	
-		
-	
-	
-	
-<% 	List emailToUsers = reportSchedule.getEmailToUsers();
-	for(int i=0; i
-	
-		 
-		
-	
-<%	}	// for 
-	List emailToRoles = reportSchedule.getEmailToRoles();
-	for(int i=0; i
-	
-		 
-		
-	
-<%	}	// for 
-	
-	Vector remainingUsers = Utils.getUsersNotInList(emailToUsers,request);
-	Vector remainingRoles = Utils.getRolesNotInList(emailToRoles,request);
-	if((emailToUsers.size()+emailToRoles.size()==0)||(remainingUsers.size()>0)||(remainingRoles.size()>0)) { %>
-	
-	  	  
-	
-<%	}	// if 
-%>
-
    
-	      	<%if(nvl(Globals.getScheduleHelpMessage()).trim().length()>0) {	%>
-			
-		<% } %>
-	      	Please enter Time in <%= Globals.getTimeZone()%>. The Current System Time is <%=dtimestamp.format(sysdate)%> <%=Globals.getTimeZone()%>
-	      
    
-	   	
    
-	   		
    Report Desc:
-	   		<%= Globals.getScheduleHelpMessage() %>
    
-	   	
    
-	   	
    Schedule Emails: 
-			 toolTipText="This is used for the enabling or disabling the scheduling feature for this report."/>Yes
-			 
-			 toolTipText="This is used for the enabling or disabling the scheduling feature for this report."/>No
-			
-		
    Email Attachment:
-			
-			<%if(!rdefRecurrance.getReportType().equals(AppConstants.RT_HIVE)) {%>
-			 toolTipText="Provides the capability to attach reports as PDF format to the email."/>PDF Attachment
-			  
-			 toolTipText="Provides the capability to attach reports as Excel format to the email."/>Excel Attachment
-			  
-			<% } %>
-			 toolTipText="Provides the capability to attach reports as Excel format to the email."/>Excelx Attachment
-			  
-			 toolTipText="Provides the capability to attach reports as CSV format to the email."/>CSV Attachment
-			<%if(!rdefRecurrance.getReportType().equals(AppConstants.RT_HIVE)) {%>
-  	         <% if(nvl(Globals.getShellScriptDir()).length()>1) { %>
-  	        	  toolTipText="Provides the capability to send only links to the generated report in the email."/>Link to Generated report
-  	         <% }  %>	 
-			 <% } %>
-			
-			
-	    
    Recurrence: 
-			
-	  
    First Schedule Date: 
-			
-			
-			
-			     
-			
-			
-			
-            <%= Globals.getTimeZone()%>
-
-			
-		
    Last Schedule Date: 
-			
-			
-			
-			     
-			
-			
-			
-            <%= Globals.getTimeZone()%>
-
-			
-		
    Use Condition:
-			> Send Emails Only When Condition Is Met
-			
    Condition SQL:
-			
-			
-			 
-			
    Max rows in attachment:
-			
-			
-		
    
-		Form Fields
-		
    <%= (i==0)?"Email To: ":" " %>
-			<%= userValue.getName() %>
-			     
-			
-			
    <%= (emailToUsers.size()==0&&i==0)?"Email To: ":" " %>Everyone With Role: 
-			<%= roleValue.getName() %>
-			     
-			
-			
    
-		
-		 
-		
-	  <% if ( nvl(Globals.getEncryptedSMTPServer(),"").length() > 0 ) { %>
-	  
-	  <% } %>
-	  <% if (Globals.generateSchedReportsInFileSystem()) { %>
-	  
-	  <% } %>
-	   
-		
     
    <%= (emailToUsers.size()+emailToRoles.size()==0)?"Email To: ":" " %>
-<%		if(remainingUsers.size()>0) { %>
-			
-<%		} else { %>
-			No user emails available
-<%		} %>
-			     
-<%		if(remainingRoles.size()>0) { %>
-			
-<%		} else { %>
-			No roles available
-<%		} %>
-			
-	  Encrypt Attachment
-			 toolTipText="Choose the encryption mode."/>Yes
-			  
-			 toolTipText="Choose the encryption mode."/>No
-	  Send as Attachment
-			 toolTipText="Send As Attachment"/>Yes
-			  
-			 toolTipText="Store it in file system."/>No
-	  
    
-		
    
-
-
-
    
-
-
-
-
-
-
-<%!
-	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } 
-%>
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_chart.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_chart.jsp
deleted file mode 100644
index 959adc230..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_chart.jsp
+++ /dev/null
@@ -1,1335 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%--
- Name: wizard_chart.jsp
- Use : This JSP is invoked when chart tab is selected. This is used for creating chart configuration for the report. 
- 
- Change Log
- ==========
- 
- 12-Aug-2009 : Version 8.5 (Sundar);
- 				
       
- 				
    •  For Line Chart Category can be configured. For this UI is added.
      • 
- 				
    •  Line Chart can be displayed as 3D or 2D.
      • 
- 				
    
- 29-Jun-2009 : Version 8.4 (Sundar);
- 				
       
- 				
    •  For Bar Chart Last Series/Category can be configured as Line Chart or Bar Chart. For this UI is added.
      • 
- 				
    •  UI options for compare to prev year chart has been added. 
      • 
- 				
    
-
- 23-Jun-2009 : Version 8.4 (Sundar);
- 				
       
- 				
    •  Hiding/ Unhiding parameters based on chart type is checked throughly and missing elements were added.
      • 
- 				
    •  Table width is made 100% for special input parameters 
      • 
- 				
    
- 
- 22-Jun-2009 : Version 8.4 (Sundar); 
- 				
- 				
       
- 				
    •  Calendar JS and CSS were added to this page as it is used in customizable input parameters for Time Difference Chart. 
      • 
- 				
    •  JS method and configurable input parameters were added for Multiple Pie Chart, Bar Chart 3D, Pareto, Time Difference Chart and Multiple
- 				     Time Series Chart. 
      • 
- 				
    
---%>
-<%@page import="org.openecomp.portalsdk.analytics.model.runtime.FormField"%>
-<%@page import="org.openecomp.portalsdk.analytics.model.runtime.ReportFormFields"%>
-<%@page import="org.openecomp.portalsdk.analytics.model.runtime.ReportRuntime"%>
-<%@page import="org.openecomp.portalsdk.analytics.model.base.IdNameValue"%>
-<%@page import="org.openecomp.portalsdk.analytics.model.DataCache"%>
-<%@page import="org.openecomp.portalsdk.analytics.model.ReportHandler"%>
-<%@page import="java.util.Vector"%>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.ArrayList" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.Globals" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.Reports"%>
-
-<% 	
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();    
-   	boolean isCrossTab = rdef.getReportType().equals(AppConstants.RT_CROSSTAB);
-	boolean isSQLBased = rdef.getReportDefType().equals(AppConstants.RD_SQL_BASED) || rdef.getReportDefType().equals(AppConstants.RD_SQL_BASED_DATAMIN);
-
- 	String legendColId = null;
-	String valueColId = null;
-	
-	//String firstColId = null;
-	//String firstNumColId = null;
-	
-	List reportCols     = rdef.getAllColumns();
-	List chartValueCols = rdef.getChartValueColumnsList(AppConstants.CHART_ALL_COLUMNS, null);
-	
-	ArrayList unusedNumCols = new ArrayList(reportCols.size());
-	int  numColsCount = 0;
-	for(Iterator iter=reportCols.iterator(); iter.hasNext(); ) { 
-		DataColumnType dct = (DataColumnType) iter.next();
-		
-		if(nvl(dct.getColOnChart()).equals(AppConstants.GC_LEGEND))
-			legendColId = dct.getColId();
-		
-		if(isSQLBased||nvl(dct.getColType()).equals(AppConstants.CT_NUMBER)) {
-			numColsCount++;
-			if(nvl(dct.getColOnChart()).length()==0)	//dct.getChartSeq()<0)
-				unusedNumCols.add(dct);
-		}	// if
-		
-/*		if(dct.getChartSeq()>0)
-			valueColId = dct.getColId();
-		
-		if(firstColId==null)
-			firstColId = dct.getColId();
-		if(firstNumColId==null)
-			if(isSQLBased)
-				firstNumColId = dct.getColId();
-			else
-				if(nvl(dct.getColType()).equals(AppConstants.CT_NUMBER))
-					firstNumColId = dct.getColId();*/
-	}   // for
-	
-	String chartType = nvl(rdef.getChartType()); %>
-
- 
-
-
-
-
-
-
- 
    
- 
-
-
-	
-		
-	
-<%	if(numColsCount==0) { %>
-	
-		
-	
-	
-	
-	
-	
-<%	} else { %>
-
-	
-	  	   
-	
-	
-		 
-		
-	
-	
-		 
-		
-	
-	
-		 
-		
-	
-	
-		
-				
-    		 
-	
-		
-			
-	
-
-	
-		
-			
-	
-
-	
-		
-		
-    
-<%		if(chartValueCols.size()==0) { %>
-	
-		 
-		
-		
-	
-<%		} else { 
-			int count = 1;
-			String colIdx = "";
-			for(Iterator iterV=chartValueCols.iterator(); iterV.hasNext(); count++) { 
-				colIdx = "";
-				DataColumnType dctV = (DataColumnType) iterV.next();
-				colIdx = dctV.getColId();
-				int colAxisIdx = 0;
-				boolean newChart = false;
-				try {
-					colAxisIdx = Integer.parseInt(dctV.getColOnChart());
-				} catch(Exception e) {} 
-				newChart = (dctV.isCreateInNewChart()!=null)?dctV.isCreateInNewChart().booleanValue():false;
-				%>
-
-	
-		 
-		
-		
-		
-		
-	
-<%			}	// for 
-		}	// else (chartValueCols.size()==0)
-		if(unusedNumCols.size()>0) { %>
-	
-		 
-		
-		
-		
-	
-<%		}	// if(unusedNumCols.size()==0)
-		if(chartValueCols.size()>1 || rdef.hasSeriesColumn()) { %>
-	
-		 
-		
-	
-	
-		 
-		
-	
-<%		}	// if(chartValueCols.size()>1)
-%>
-	
-		 
-		
-	
-	
-	    
-	
-<%!
-	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } 
-%>
-
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_log.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_log.jsp
deleted file mode 100644
index 2b1703852..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_log.jsp
+++ /dev/null
@@ -1,109 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.Globals" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.Utils" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.ReportLoader" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.IdNameValue" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.FormFieldType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.ReportWrapper" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.DataCache" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.FormField" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.Log" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportLogEntry" %>
-<%	
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-    String curSubStep = ws.getCurrentSubStep();
-   	String reportID   = rdef.getReportID();
-	boolean isCrossTab = rdef.getReportType().equals(AppConstants.RT_CROSSTAB);
-	boolean isSQLBased = rdef.getReportDefType().equals(AppConstants.RD_SQL_BASED); 
-   	
-%>
-
-<%	String errorMsg = null;
-	Vector reportLogEntries = null; 
-	try {
-		reportLogEntries = ReportLoader.loadReportLogEntries(reportID);
-	} catch(Exception e) { 
-		Log.write("ERROR [wizard_log.jsp] Unable to load report log entries. Exception: "+e.getMessage());
-		errorMsg = "ERROR: Unable to load report log entries from the database ";
-	} %>
-
-
    Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %>
    No numeric columns found - chart not available
    
-	    
-		
-		
-			
-		
-       
-       
    Chart Type: 
-			
-			>
-			 Do NOT allow user to change chart type at runtime
-		
    
-       
    Chart Width (px): 
-			" size="10" maxlength="4">
    Chart Height (px): 
-			" size="10" maxlength="4">
    Domain Axis: 
-			
    Category:
-			
     last Category display As Line Chart
-		
-			>
-		
     last Category display As Bar Chart
-		
-			>
-		
    Multi Series
-			0? (AppUtils.getRequestNvlValue(request, "multiSeries").equals("Y")? " checked ":""): (rdef.isMultiSeries() ? " checked ":" checked ")) %>>Yes
-			0? (AppUtils.getRequestNvlValue(request, "multiSeries").equals("N")? " checked ":""): (!rdef.isMultiSeries() ? " checked":"")) %>>No
-    
    Range Axis:
-			
-			<%	String sValue = ""; %>
-			
-			
    Range Axis <%= count %>:
-			
-			<%	if(count>1) { %>
-			 
-			
-			<%	} %>
-			 
-			
-		<%
-		  String chartGroupOrg = dctV.getChartGroup();
-		  String yAxisGroup = dctV.getYAxis();	
-		  String chartGroup = (chartGroupOrg!=null && chartGroupOrg.length()>0 && chartGroupOrg.indexOf("|")!= -1)?chartGroupOrg.substring(0,chartGroupOrg.lastIndexOf("|")):""; 
-		  String yAxis 		= (yAxisGroup!=null && yAxisGroup.length()>0 && yAxisGroup.indexOf("|")!= -1)?yAxisGroup.substring(0,yAxisGroup.lastIndexOf("|")):""; 
-		%>
-             
    
-		     Chart Title:"/>
-		     YAxis:"/>
-            
    
-              
-                    		
-			<%	String sValue = nvl(dctV.getChartColor()); %>
-			
-			
-			<%	if(count>1) { %>
-                   
    
-		    >
-			 Create in New Chart			
-                    
    
-			0)?" checked":"" %>>
-			 Use secondary axis (Line chart only)
-			<%	} %>
-			 
    Add Values Column:
-			
-			
-			<%	String sValue = ""; %>
-			
-			
-			
-			 Use secondary axis (Line chart only)
-			
    Primary Axis Label:
-			
-			 (Multi-series Chart Only)
    Secondary Axis Label:
-			
-			 (Multi-series Chart Only)
     
-			Note: Some chart types (like Pie) will only display Series 1 Values.
    
-	   
-	
-	
-		
-
-	
-
-	
-	
-	
-	
-	
-
-	
-	
-
-	
-	
-	
    
-	
-		
-	
-	
-		
-		
-		
-		
-	    				
-	    	    
-	
-<%	int iCount = 0;
-	if(reportLogEntries!=null)
-		for(Iterator iter=reportLogEntries.iterator(); iter.hasNext(); iCount++) { 
-			ReportLogEntry logEntry = (ReportLogEntry) iter.next(); %>
-	>
-		
-		
-		
-		
-        				
-                
-        		
-	
-<%	}   // for
-	if(errorMsg!=null) { %>
-	
-		
-	
-<%	} else if(iCount==0) { %>
-	
-		
-	
-<%	} else { %>
-	
-		
-	
-<%	}	// if 
-%>
-
    Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %>
      No  Date/TimeUser NameActionExecution TimeRun
    <%= iCount+1 %><%= logEntry.getLogTime() %><%= logEntry.getUserName() %><%= logEntry.getAction() %><%= logEntry.getTimeTaken() %><%= logEntry.getRunIcon() %>
    <%= errorMsg %>
    No log entries found
    
-			
-		
    
-
    
-
-
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_map.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_map.jsp
deleted file mode 100644
index 50fe1da68..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_map.jsp
+++ /dev/null
@@ -1,424 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Iterator" %>
-<%@page import="org.openecomp.portalsdk.analytics.xmlobj.ReportMap"%>
-<%
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-   	boolean isCrossTab = rdef.getReportType().equals(AppConstants.RT_CROSSTAB);
-	boolean isSQLBased = rdef.getReportDefType().equals(AppConstants.RD_SQL_BASED);    
-	ReportMap repMap = rdef.getReportMap();
-	String addressColumn = "";
-	String latColumn = "";
-	String longColumn = "";
-	String legendColumn = "";
-	String colorColumn = "";
-	String dataColumn = "";
-	String isMapAllowed = "";
-	String addAddress = "N";
-	String useDefaultSize = "";
-	String width = "";
-	String height = "";
-
-	int reportMapSize = 0;
-	if (repMap != null){
-		if (repMap.getAddressColumn() != null)
-			addressColumn = repMap.getAddressColumn();
-		
-		if (repMap.getDataColumn() != null)
-			dataColumn = repMap.getDataColumn();
-		if (repMap.getIsMapAllowedYN() != null)
-			isMapAllowed = repMap.getIsMapAllowedYN();
-		if (repMap.getAddAddressInDataYN() != null)
-			addAddress = repMap.getAddAddressInDataYN();
-		if (repMap.getLatColumn() != null)
-			latColumn = repMap.getLatColumn();
-		if (repMap.getLongColumn() != null)
-			longColumn = repMap.getLongColumn();
-		if (repMap.getColorColumn() != null)
-			colorColumn = repMap.getColorColumn();
-		if (repMap.getLegendColumn() != null)
-			legendColumn = repMap.getLegendColumn();
-		if (repMap.getUseDefaultSize() != null)
-			useDefaultSize = repMap.getUseDefaultSize();
-		if (repMap.getHeight() != null)
-			height = repMap.getHeight();
-		if (repMap.getWidth() != null)
-			width = repMap.getWidth();
-		
-		reportMapSize = repMap.getMarkers().size();
-	}
-	
-%>
-<%@page import="org.openecomp.portalsdk.analytics.xmlobj.Marker"%>
-
-
-
-	
-		
-	
-	
-		
-	
-	
-		
-		
-	
-	
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-	
-	
-	
-	
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-	
-	
-		
-		
-	
-	
-	
-				  	
-		
-		
-		
-				
-		
-	    
-	
-	
-	
-<%		for (int i = 1; repMap != null && i < repMap.getMarkers().size(); i ++){ 
-		Marker marker = (Marker) repMap.getMarkers().get(i);
-%>
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		<%}%>
-
-	
-	
-
    Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %>
    Map Enabled ?
-			 checked <%} %>/>
-		
    Default Size ?
-			 checked <%} %>/>
-		Height 
-			
-			
-			 
-		Width 
-			
-		 
    Lat Column
-			
-		
-		
-		Long Column
-			
-		
-		
-		Color Column
-			
-		
-		
-		Legend Column
-			
-		
-		
-		
     
-			
-		
    Data Header
-			
-		Display Column
-			
-		
-		
-		
-			Remove
-		 
    
-
    
-
-
-
-
-
-
-<%!
-	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } 
-%>
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_run.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_run.jsp
deleted file mode 100644
index 688e7ff74..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_run.jsp
+++ /dev/null
@@ -1,74 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Iterator" %>
-<%	
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-%>
-
-
-
-	
-		
-	
-	
-		
-	
-
    Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %>
    
-			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-			
    
-						
-						    SQL Click here to view the generated SQL 
-						
-					
    
-						
-							Report definition successfully completed.
    
-							
    
-							
-							
-							Run
-						    
-					
     
    
-		
    
-
    
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule.jsp
deleted file mode 100644
index b8d1ad1ca..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule.jsp
+++ /dev/null
@@ -1,376 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.Globals" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="java.util.List" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.DataCache" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataSourceType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.DBColumnInfo" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.TableSource" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.IdNameValue" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.SemaphoreType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.FormFieldType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportSchedule" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.Utils" %>
-
-<% 
-  ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-  WizardSequence ws = rdef.getWizardSequence();
-  ReportSchedule reportSchedule = rdef.getReportSchedule(); 
-  String remoteDbPrefix = (String) session.getAttribute("remoteDB");
-  boolean isSQLAllowed = Globals.getAllowSQLBasedReports();
-  
-%>
-<%@page import="java.util.Calendar"%>
-<%@page import="java.text.DateFormat"%>
-<%@page import="java.text.SimpleDateFormat"%>
-<%@page import="java.util.TimeZone"%>
-<%@page import="java.util.Date"%>
-<%@page import="org.openecomp.portalsdk.analytics.model.ReportLoader"%>
-
-
- 
-
- 
- 
- <%
- Calendar startCalendarDate = Calendar.getInstance();
- startCalendarDate.add(Calendar.DAY_OF_MONTH, - 540); 
- Calendar endCalendarDate = Calendar.getInstance();
- endCalendarDate.add(Calendar.DAY_OF_MONTH, 540);
- SimpleDateFormat dtf = new SimpleDateFormat("MM/dd/yyyy");
- SimpleDateFormat oracleDateFormat = new SimpleDateFormat("MM/dd/yyyy kk:mm:ss");
- Date sysdate = oracleDateFormat.parse(ReportLoader.getSystemDateTime());
- SimpleDateFormat dtimestamp = new SimpleDateFormat(Globals.getScheduleDatePattern());
- //dtimestamp.setTimeZone(TimeZone.getTimeZone(Globals.getTimeZone())); 
- 
-
- 
-	 
- %>
-
-	
-
-   <% if(request.getAttribute("schedule_only")!=null) { %>
-	
-		
-	
-   <% } %>	
-	
-		
-	
-	
-			
-		
-	
-	
-		 
-		
-	 
-	
-		 
-		
-	
-	
-		 
-		
-	
-	
-		 
-		
-	 
-	
-		 
-		
-	
-
-        <% if(AppUtils.isAdminUser(request) || isSQLAllowed ) { %>
-	
-		 
-		
-	 
-	
-		 
-		
-	
-        <% } %>	 	
-
-	
-		 
-		
-	 			
-	
-	
-		
-	
-<% 	List emailToUsers = reportSchedule.getEmailToUsers();
-	for(int i=0; i
-	
-		 
-		
-	
-<%	}	// for 
-	List emailToRoles = reportSchedule.getEmailToRoles();
-	for(int i=0; i
-	
-		 
-		
-	
-<%	}	// for 
-	
-	Vector remainingUsers = Utils.getUsersNotInList(emailToUsers,request);
-	Vector remainingRoles = Utils.getRolesNotInList(emailToRoles,request);
-	if((emailToUsers.size()+emailToRoles.size()==0)||(remainingUsers.size()>0)||(remainingRoles.size()>0)) { %>
-	
-		 
-		
-	
-<%	}	// if 
-%>
-
    Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %>
    Please enter Time in <%= Globals.getTimeZone()%>. The Current System Time is <%=dtimestamp.format(sysdate)%> <%=Globals.getTimeZone()%>
    
-				
    
-					
    Quick Help:
-						
    
-				
    
-			
    Schedule Emails: 
-			 />Yes
-			 
-			 />No
-			
    Email Attachment:
-			
-			 />PDF Attachment
-			  
-			 />Excel Attachment
-			
-			
-	    
    Recurrence: 
-			
    Start Date: 
-			
-			
-			
-			     
-			
-			
-			
-			
-			
    End Date: 
-			
-			
-			
-			
    Use Condition:
-			> Send Emails Only When Condition Is Met
-			
    Condition SQL:SELECT 1 FROM DUAL WHERE EXISTS (
    
-			
-			)
-			    
-			
-			 
-			
    Max rows in attachment:
-			
-	   
    <%= (i==0)?"Email To: ":" " %>
-			<%= userValue.getName() %>
-			     
-			
-			
    <%= (emailToUsers.size()==0&&i==0)?"Email To: ":" " %>Everyone With Role: 
-			<%= roleValue.getName() %>
-			     
-			
-			
    <%= (emailToUsers.size()+emailToRoles.size()==0)?"Email To: ":" " %>
-<%		if(remainingUsers.size()>0) { %>
-			
-<%		} else { %>
-			No user emails available
-<%		} %>
-			     
-<%		if(remainingRoles.size()>0) { %>
-			
-<%		} else { %>
-			No roles available
-<%		} %>
-		
    
-
    
-
-
-
-<%!
-	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } 
-%>
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule_formfield_include.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule_formfield_include.jsp
deleted file mode 100644
index 206e23de1..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule_formfield_include.jsp
+++ /dev/null
@@ -1,754 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%--
- Name: wizard_schedule_formfield_include.jsp
- Use : Shows formfield of the report in the schedule page. 
- 
- Change Log
- ==========
- 
- 28-Aug-2009 : Version 8.5.1 (Sundar); Checkbox and Radio button are also handled. 
- 18-Aug-2009 : Version 8.5.1 (Sundar); 
- 				
-				a) ajax.js is loaded in startup for AJAX functionality.
-				b) showArgPopupNew is modified as per report_form.jsp
-				c) Ajax function is added very similiar to report_form.jsp
-				d) "auto" bug is resolved.
-
-14-Jul-2009 : Version 8.4 (Sundar); 
- 				
- 				
       
- 				
    •  Shows the form field of the first Dashboard report in schedule page if the report is dashboard.
      • 
- 				
    
---%>
-<%@ page import="java.io.*" %>
-<%@ page import="java.util.*" %>
-<%@ page import="java.text.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.ReportHandler" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.JavascriptItemType"%>
-<%@ page import="java.util.regex.*"%>
-<%@ page import="javax.servlet.http.*"%>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportSchedule" %>
-
-
-<%	
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    ReportHandler rh = new ReportHandler();
-    ReportRuntime rr = rh.loadReportRuntime(request, rdef.getReportID());
-    request.getSession().setAttribute(AppConstants.SI_REPORT_RUNTIME, rr);
-    boolean isDashboard =  rr.isDashboardType();
-    ReportFormFields rff = rr.getReportFormFields();
-	ReportFormFields rff1 = (ReportFormFields) rff.clone();
-	ReportFormFields rff2 = (ReportFormFields) rff.clone();
-	ReportFormFields rff5 = (ReportFormFields) rff.clone();
-	boolean isFirstTime = nvl(request.getParameter("refresh")).toUpperCase().startsWith("Y");
-	ReportSchedule reportSchedule = (ReportSchedule) request.getSession().getAttribute(AppConstants.SI_REPORT_SCHEDULE);
-
-    int dashboardFlag = 0;
-	ReportRuntime rr1 = null;
-	java.text.SimpleDateFormat sdf = null;
-
-%>
-
-
-
-<%--=(rr.getJavascriptElement()!=null && rr.getJavascriptElement().length()>0)?rr.getJavascriptElement().replaceAll("formd","forma"):""--%>
-
-	<%
-  if(rr.getReportType().equals(AppConstants.RT_DASHBOARD)) {
-	  dashboardFlag = 1;
-      String strHTML = rr.getDashboardLayoutHTML(); //getdashboardLayoutHTML();
-      String rep_id = parseAndGetFirstReportID(strHTML);
-      ReportHandler rh1 = new ReportHandler();
-	  rr1 = null;
-	  int requestFlag = 1;
-	  try {
-			rr1 = rh1.loadReportRuntime(request, rep_id, true, requestFlag);
-	  } catch(Exception e) {
-      }
-	  rff = rr1.getReportFormFields();
-  }
-  %>	
-	<%if((dashboardFlag == 0 && rr.needFormInput()) || (dashboardFlag == 1 && rr1.needFormInput())) { %>
-	
-		
-		
-			Please input values into the Form Fields for email attachment. Note those fields user must provide value can not leave as blank.
-			
-			
-				<%
-				int colidx = 0;
-				java.util.HashMap paramsMap = Globals.getRequestParamtersMap(request, false);
-				java.util.HashMap getScheduleMap = getFormFieldsHashMap (request, reportSchedule.getFormFields());
-				java.util.HashMap paramsScheduleMap = Globals.getRequestParametersMap(request, getScheduleMap); 
-				for (int i = 0; i < rff.size(); i ++){
-					FormField ff = (FormField) rff.get(i);
-					ff.setDbInfo(rr.getDbInfo());
-					ff.setUserId(AppUtils.getUserID(request));					
-					if(ff.getFieldType().equals(FormField.FFT_HIDDEN)) {
-						%>
-									<%
-									  if(nvl(reportSchedule.getFormFields()).length() <= 0)
-									  	out.println(ff.getHtml(rr.getParamValue(ff.getFieldName()), paramsMap, rr, true));
-									  else
-										out.println(ff.getHtml(getParameterString(request, ff.getFieldName(), getScheduleMap), paramsScheduleMap, rr, true).replaceAll("formd","forma"));  
-									  	
-									  
-									%>
-						<%		}					
-					if(!ff.getFieldType().equals(FormField.FFT_HIDDEN) && ff.isVisible()) {
-
- 				%>
-		 		<%if (colidx == 0){%><%}%>
-					 
-					
-					
-					<%colidx++;%>
-				<%if (colidx == rr.getNumFormColsAsInt()){%><%colidx=0;}%>
-			<%    }	
-				}   //for  %>
-			
    
-						
-							<%if (!ff.getFieldType().equals(FormField.FFT_BLANK)){%> 
-								<%= ff.getDisplayNameHtml() %>:
-							<%}%>
-						
-					
-						<%-- ff.getHtml(rr.getParamValue(ff.getFieldName()), paramsMap,rr, true).replaceAll("formd","forma") --%>
-						<%
-									  if(nvl(reportSchedule.getFormFields()).length() <= 0)
-									  	out.println(ff.getHtml(rr.getParamValue(ff.getFieldName()), paramsMap, rr, true).replaceAll("formd","forma"));
-									  else
-										out.println(ff.getHtml(getParameterString(request, ff.getFieldName(), getScheduleMap), paramsScheduleMap, rr, true).replaceAll("formd","forma"));  
-						%>
-					
    
-		
-	 		
-<% 	} //if(rr.needFormInput()) %>
-
-
-
-
-<% /* if(request.getAttribute(AppConstants.RI_REPORT_DATA) == null){  */ %>
-
-
-<%!	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } 
-	private String getCallableJavascriptForSubmit(ReportRuntime rr) {
-		JavascriptItemType javascriptItemType = null;
-		StringBuffer callJavascriptText = new StringBuffer("");
-		if(rr.getJavascriptList()!=null) {
-			for (Iterator iter = rr.getJavascriptList().getJavascriptItem().iterator(); iter.hasNext();) {
-				javascriptItemType  = (JavascriptItemType)iter.next();
-				if(javascriptItemType.getFieldId().equals("os1")) {
-					callJavascriptText.append(" "+javascriptItemType.getCallText());
-					break;
-				}
-			}
-		}
-		return callJavascriptText.toString();
-	}    
-
-	private HashMap getFormFieldsHashMap (HttpServletRequest request, String formFieldsString) {
-		String splitName[] = null;
-		ArrayList keyValue = new ArrayList();
-		HashMap keyValueMap = new HashMap();
-        String newValue = "";
-        //System.out.println("Request Str "+ formFieldsString);
-        StringTokenizer st = null;
-        StringTokenizer st2 = null;
-        String key1 = "";
-        String value = "";
-        
-		if(formFieldsString.length() > 0) {
-			st = new StringTokenizer(formFieldsString, "&");
-			while (st.hasMoreTokens()) {
-				keyValue.add(st.nextToken());
-			}
-			if(keyValue.size() > 0) {
-				
-				for (int num = 0; num < keyValue.size(); num++) {
-					st2 = new StringTokenizer((String) keyValue.get(num), "=");
-					while(st2.hasMoreTokens()) {
-						key1 = ""; value = "";
-						key1 = st2.nextToken();
-						key1 = Utils.replaceInString(key1, "_auto", "");
-						try {
-							value = st2.nextToken();
-						}catch (NoSuchElementException ex) { value  = "";}
-							if(!keyValueMap.containsKey(key1)) 
-								keyValueMap.put(key1,value);
-							else {
-								String value1 = (String) keyValueMap.get(key1);
-								value = value+"|"+value1;
-								keyValueMap.put(key1,value);
-							}
-					}
-				}
-		
-	        }
-		}
-		return keyValueMap;
-	}
-	
-	private String getParameterString (HttpServletRequest request, String key, HashMap keyValueMap) {
-        String newValue = "";
-				if(keyValueMap.containsKey(key)) {
-					//System.out.println("VALUE IN MAP IS " +key+ " "+ (String) keyValueMap.get(key));
-					newValue = XSSFilter.filterRequestOnlyScript((String) keyValueMap.get(key));
-					if(nvl(newValue).length()<=0) {
-						newValue = XSSFilter.filterRequestOnlyScript((String) keyValueMap.get(key+"_auto"));
-					}
-				}
-		return newValue;
-	}
-	private String parseAndGetFirstReportID(String strHTML) {
-		  String sourcestring = strHTML;
-		  //System.out.println("String HTML1 " + strHTML);
-		  Pattern re = Pattern.compile("\\[(.*?)\\]");   //\\[(.*?)\\]
-		  Matcher m = re.matcher(sourcestring);
-		  int mIdx = 0;
-		    while (m.find()){
-		      for( int groupIdx = 0; groupIdx < m.groupCount(); groupIdx++ ){
-		    	String str = m.group(groupIdx);
-		    	//System.out.println("REP ID1 " + str.substring(str.indexOf("#")+1, str.length()-1)) ;
-              return str.substring(str.indexOf("#")+1, str.length()-1);
-		      }
-		      mIdx++;
-		      
-		    }return "";
-	}	
-%>
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule_multiple.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule_multiple.jsp
deleted file mode 100644
index 70c9812a8..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule_multiple.jsp
+++ /dev/null
@@ -1,157 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-
-<%@ page errorPage="error_page.jsp" %>
-<%! 
-class ValueComparator implements Comparator {
-	  public int compare(Object o1, Object o2) {
-	    Map.Entry e1 = (Map.Entry) o1;
-	    Map.Entry e2 = (Map.Entry) o2;
-	    Comparable c1 = (Comparable)e1.getValue();
-	    Comparable c2 = (Comparable)e2.getValue();
-	    return c1.compareTo(c2);
-	  }
-}
-%>
-<%
-HashMap hashMap = ReportLoader.loadReportsToSchedule(request);
-ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-if(rdef ==null) rdef = (ReportDefinition) request.getSession().getAttribute(AppConstants.SI_REPORT_DEFINITION);
-Set mapSet = hashMap.entrySet();
-List entrylist = new ArrayList(mapSet);
-Collections.sort(entrylist, new ValueComparator());
-Map.Entry me;
-session.removeAttribute(AppConstants.SI_REPORT_SCHEDULE);
-session.removeAttribute(AppConstants.SI_REPORT_DEFINITION);
-ReportSchedule reportSchedule = (ReportSchedule) session.getAttribute(AppConstants.SI_REPORT_SCHEDULE);
-%>
- 
- 
-
- 
-
-
-


    
-<% if (rdef == null || request.getSession().getAttribute(AppConstants.SI_REPORT_SCHEDULE) == null) {%>
-
-
    
-	
-	
-
-
-
-
-
-
-
    
-	
-
-		
-			
-		
-		<% if(request.getAttribute("message")!=null) { %>
-		
-			
-		
-		<% } %>
-	
    <%= "Scheduling Report" %>
    <%= (String) request.getAttribute("message") %>
    
-
       Reports:  
-  		         <% if (rdef !=null && request.getSession().getAttribute(AppConstants.SI_REPORT_SCHEDULE) != null ) {%>  		       
-                   <%= rdef.getReportName()%>
-                   <% } else { %> 		
-  		       
-  		       <% } %>
-		
- 
    	
-
    
-<% } %>
-<% if(reportSchedule!=null)  { %> 
-  
-<% } %>  
- 
-
    
-
-
-
-<%----%>
-
-<%!	private String HTMLEncode(String value) {
-		StringBuffer sb = new StringBuffer(value);
-		
-		for(int i=0; i')
-				sb.replace(i, i+1, ">");
-			else if(sb.charAt(i)=='"')
-				sb.replace(i, i+1, """);
-   		
-		return sb.toString();
-	}   // HTMLEncode
-	
-	private String clearSpaces(String value) {
-		StringBuffer sb = new StringBuffer(value);
-		
-		for(int i=0; i
-
- 
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule_only.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule_only.jsp
deleted file mode 100644
index ad3c612ee..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule_only.jsp
+++ /dev/null
@@ -1,172 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-
-<%@ page errorPage="error_page.jsp" %>
-
-
-
-<%	ReportDefinition rdef = (ReportDefinition) request.getSession().getAttribute(AppConstants.SI_REPORT_DEFINITION);
-	
-	String reportID   = rdef.getReportID();
-	
-
-    
-	String dbInfo = null;
-	dbInfo = rdef.getDBInfo();
-	int sessionflag = 0;
-	if(dbInfo == null  || dbInfo.length() == 0) {
-	   dbInfo = (String) session.getAttribute("remoteDB");
-       sessionflag = 1; 
-	}
-       session.setAttribute("remoteDB", dbInfo);
-	if((dbInfo == null) && (request.getParameter("dataSource")!=null)) 
-	   session.setAttribute("remoteDB", request.getParameter("dataSource"));
-
-	StringBuffer title = new StringBuffer("");
-	title.append(Globals.getBaseTitle()+" > "+(reportID.equals("-1")?"Create Report":"Schedule Report"));
-	title.append(" > "+rdef.getReportName());
-	
-	boolean isCrossTab = rdef.getReportType().equals(AppConstants.RT_CROSSTAB);
-	boolean isSQLBased = rdef.getReportDefType().equals(AppConstants.RD_SQL_BASED); 
-%>
-	
-<%
-	request.setAttribute(AppConstants.SI_REPORT_DEFINITION,rdef);
-%>	
-
- 
- 
-
- 
-
-
-
-
-
-
-
-
    
-		
-	
    
-    		
-
    
-
    
-	
-	
-	
-	
-	
-	
-	
-
-
-
-
-
    
-	
-		
-			
-		
-		<% if(request.getAttribute("message")!=null) { %>
-		
-			
-		
-		<% } %>
-	
    <%= title.toString() %>
    <%= (String) request.getAttribute("message") %>
    
-
    
-		 
-
    
-	
-		
-			
-			
-		
-	
    
-				 
-			
-					
-					<%----%>
-					
-			
    	
-
    	
-
    
-
- 
-
    
-
    
-<%----%>
-
-<%!	private String HTMLEncode(String value) {
-		StringBuffer sb = new StringBuffer(value);
-		
-		for(int i=0; i')
-				sb.replace(i, i+1, ">");
-			else if(sb.charAt(i)=='"')
-				sb.replace(i, i+1, """);
-   		
-		return sb.toString();
-	}   // HTMLEncode
-	
-	private String clearSpaces(String value) {
-		StringBuffer sb = new StringBuffer(value);
-		
-		for(int i=0; i
-
- 
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule_only_from_search.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule_only_from_search.jsp
deleted file mode 100644
index af951cc23..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule_only_from_search.jsp
+++ /dev/null
@@ -1,173 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-
-<%@ page errorPage="error_page.jsp" %>
-
-
-
-<%	ReportDefinition rdef = (ReportDefinition) request.getSession().getAttribute(AppConstants.SI_REPORT_DEFINITION);
-	
-	String reportID   = rdef.getReportID();
-	
-
-    
-	String dbInfo = null;
-	dbInfo = rdef.getDBInfo();
-	int sessionflag = 0;
-	if(dbInfo == null  || dbInfo.length() == 0) {
-	   dbInfo = (String) session.getAttribute("remoteDB");
-       sessionflag = 1; 
-	}
-       session.setAttribute("remoteDB", dbInfo);
-	if((dbInfo == null) && (request.getParameter("dataSource")!=null)) 
-	   session.setAttribute("remoteDB", request.getParameter("dataSource"));
-
-	StringBuffer title = new StringBuffer("");
-	title.append(Globals.getBaseTitle()+" > "+(reportID.equals("-1")?"Create Report":"Schedule Report"));
-	title.append(" > "+rdef.getReportName());
-	
-	boolean isCrossTab = rdef.getReportType().equals(AppConstants.RT_CROSSTAB);
-	boolean isSQLBased = rdef.getReportDefType().equals(AppConstants.RD_SQL_BASED); 
-%>
-	
-<%
-	request.setAttribute(AppConstants.SI_REPORT_DEFINITION,rdef);
-%>	
-
- 
- 
-
- 
-
-
-
-
-
-
-
-
    
-		
-	
    
-    		
-
    
-
    
-	
-	
-	
-	
-	
-	
-	
-
-
-
-
-
    
-	
-		<% if(request.getAttribute("message")!=null) { %>
-		
-			
-		
-		<% } %>
-		
-			
-		
-		
-	
    <%= (String) request.getAttribute("message") %>
    <%= title.toString() %>
    
-
    
-		 
-
    
-	
-		
-			
-			
-		
-	
    
-				 
-			
-					
-					<%----%>
-					
-			
    	
-
    	
-
    
-
- 
-
    
-
    
-<%----%>
-
-<%!	private String HTMLEncode(String value) {
-		StringBuffer sb = new StringBuffer(value);
-		
-		for(int i=0; i')
-				sb.replace(i, i+1, ">");
-			else if(sb.charAt(i)=='"')
-				sb.replace(i, i+1, """);
-   		
-		return sb.toString();
-	}   // HTMLEncode
-	
-	private String clearSpaces(String value) {
-		StringBuffer sb = new StringBuffer(value);
-		
-		for(int i=0; i
-
- 
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_sorting_edit.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_sorting_edit.jsp
deleted file mode 100644
index 18c450ba9..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_sorting_edit.jsp
+++ /dev/null
@@ -1,86 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Iterator" %>
-<%	
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-    String curSubStep = ws.getCurrentSubStep();
-	boolean isEdit = curSubStep.equals(AppConstants.WSS_EDIT);
-	DataColumnType currColumn = null;
-	if(isEdit)
-		currColumn = rdef.getColumnById(AppUtils.getRequestNvlValue(request, AppConstants.RI_DETAIL_ID)); %>
-
-
-	
-		
-	
-	
-		 
-		
-	 
-	
-		 
-		
-	
-
    Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %><%= curSubStep.equals(AppConstants.WSS_EDIT)?"Edit Sorting":(curSubStep.equals(AppConstants.WSS_ADD)?"Add Sorting":"") %>
    
-			Sort By Column: 
-		
-		<% if(isEdit) { %>
-			<%= currColumn.getDisplayName() %>
-		<% } else { %>
-			
-		<% }	// else 
-		%>
-		
    Sort Type: 
-			
-		
    
-
    
-
-
-
-<%!
-	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } 
-%>
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_sorting_list.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_sorting_list.jsp
deleted file mode 100644
index 63bf9cd32..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_sorting_list.jsp
+++ /dev/null
@@ -1,116 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.Globals" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.Utils" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.ReportLoader" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.IdNameValue" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.FormFieldType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.ReportWrapper" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.DataCache" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.FormField" %>
-<%@ page import="java.util.Collections" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.OrderSeqComparator" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.OrderBySeqComparator" %>
-
-<%	
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-    String curSubStep = ws.getCurrentSubStep();
-   	String reportID   = rdef.getReportID();
-	boolean isCrossTab = rdef.getReportType().equals(AppConstants.RT_CROSSTAB);
-	boolean isSQLBased = rdef.getReportDefType().equals(AppConstants.RD_SQL_BASED); 
-	List reportCols = rdef.getAllColumns();
-	Collections.sort(reportCols, new OrderSeqComparator());
-	int numSortCols = rdef.getNumSortColumns(); %>
-
-	
-		
-	
-	
-		
-		
-		
-		
-		
-	
-<%	int iCount = 0;
-        Collections.sort(reportCols,new OrderBySeqComparator());
-	for(Iterator iter=reportCols.iterator(); iter.hasNext(); ) { 
-		DataColumnType dct = (DataColumnType) iter.next();
-		if(dct.getOrderBySeq()>0) { %>
-         >
-		
-		
-		
-		
-		
-		
-	
-<%
-			iCount++;
-		}   // if
-	}   // for
-	Collections.sort(reportCols, new OrderSeqComparator());
-%>
-<%	if(numSortCols==0) { %>
-	
-		
-	
-<%	} %>
-
    Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %>
    Sort OrderSort By ColumnSort TypeRe-order
-		<% if(numSortCols
-			
-				
-			
    
-		<% } %>
-				
-		<% if(numSortCols
-			
    
-		<% } %>
-		
    <%= iCount+1 %><%= dct.getDisplayName() %><%= dct.getOrderByAscDesc().equals(AppConstants.SO_ASC)?"Ascending":"Descending" %>
-<% 			if(iCount==0) { %>
-				
-<% 			} else { %>
-				
-<% 			} %>
-<% 			if(iCount==numSortCols-1) { %>
-				
-<% 			} else { %>
-				
-<% 			} %>
-		
    No sorting defined
    
-
    
-
-
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_sorting_order_all.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_sorting_order_all.jsp
deleted file mode 100644
index 9e04f2b84..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_sorting_order_all.jsp
+++ /dev/null
@@ -1,112 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.Globals" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.Utils" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.ReportLoader" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.IdNameValue" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.FormFieldType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.ReportWrapper" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.DataCache" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.FormField" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.OrderBySeqComparator" %>
-<%@ page import="java.util.Collections" %>
-<%	
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-    String curSubStep = ws.getCurrentSubStep();
-   	String reportID   = rdef.getReportID();
-	boolean isCrossTab = rdef.getReportType().equals(AppConstants.RT_CROSSTAB);
-	boolean isSQLBased = rdef.getReportDefType().equals(AppConstants.RD_SQL_BASED); 
-   	
-%>
-
-	
-		
-	
-	
-		
-		
-		
-		
-	
-<%  int icnt = 0;
-	for(Iterator iter=rdef.getAllColumns().iterator(); iter.hasNext(); icnt++) { 
-		DataColumnType dct = (DataColumnType) iter.next(); %>
-	>
-		
-		
-		
-		
-	
-<%	}   // for 
-%>
-
    Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %> - <%= curSubStep %>
      No  ColumnSort OrderSort Type
    <%= icnt+1 %><%= dct.getDisplayName() %>
-			
-			">
-		
-			
-		
    
-			
-			
-
    
-
-
-
-<%!
-	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } 
-%>
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_sql_def.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_sql_def.jsp
deleted file mode 100644
index d8152c05f..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_sql_def.jsp
+++ /dev/null
@@ -1,226 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.Globals" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.Utils" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.ReportLoader" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.IdNameValue" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.FormFieldType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.ReportWrapper" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.DataCache" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.FormField" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.OrderBySeqComparator" %>
-<%@ page import="java.util.Collections" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.TableSource" %>
-<%	
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-    String curSubStep = ws.getCurrentSubStep();
-   	String reportID   = rdef.getReportID();
-	boolean isCrossTab = rdef.getReportType().equals(AppConstants.RT_CROSSTAB);
-	boolean isSQLBased = rdef.getReportDefType().equals(AppConstants.RD_SQL_BASED); 
-   	
-%>
-
-
-
-	
-		
-	
-	
-		
-		 
-	
-	
-		
-		
-	
-	
-		
-	
-
    Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %>
    
-			 Report SQL: 
    
-			<%	boolean sqlValidated = (nvl(AppUtils.getRequestValue(request, "sqlValidated"), nvl(rdef.getReportSQL())).length()>0); 
-				if(request.getAttribute(AppConstants.RI_ERROR_LIST)!=null)
-					sqlValidated = false;
-					
-				String  sql = nvl(rdef.getReportSQL(), "SELECT ");
-				if(! sqlValidated) 
-					sql = nvl(AppUtils.getRequestValue(request, "reportSQL"), sql);	%>
-			">
-			 
-		    		
-			 Keyword Assistance 
    
-			
-				      SELECT  DISTINCT 
    
-				      FROM 
    
-				      WHERE 
    
-				      GROUP BY 
    
-				      HAVING 
    
-				      ORDER BY  ASC  DESC 
    
-				
    
-				      UNION  ALL  INTERSECT  MINUS 
    
-				
    
-				      AND  OR  NOT  EXISTS 
    
-				      IS  NULL  IN  BETWEEN 
    
-				
    
-				      COUNT(  SUM(  AVG(  MAX(  MIN( 
    
-				
    
-				      NVL(  DECODE(  SYSDATE 
    
-				      TO_CHAR(  TO_NUMBER(  TO_DATE( 
    
-				      TRUNC(  ROUND(  ABS( 
    
-				      SUBSTR(  REPLACE(  LOWER(  UPPER( 
    
-				      LTRIM(  RTRIM(  LPAD(  RPAD( 
    
-			    
-		
    
-			
-		
-			 
-				
-				 
-				
-				 
-			
-		
    You need to click the "Validate SQL" button in order to store the SQL before going forward
    
-
    
-
-
-
-<%!
-	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } 
-%>
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_tables_edit.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_tables_edit.jsp
deleted file mode 100644
index 88ecda311..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_tables_edit.jsp
+++ /dev/null
@@ -1,369 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="java.util.List" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.DataCache" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataSourceType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.DBColumnInfo" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.TableSource" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.IdNameValue" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.SemaphoreType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.FormFieldType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.TableJoin" %>
-<%@ page import="org.openecomp.portalsdk.analytics.error.UserDefinedException"%>
-
-<%	
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-    String curSubStep = ws.getCurrentSubStep();
-	boolean isEdit = curSubStep.equals(AppConstants.WSS_EDIT);
-	DataSourceType currTable = null;
-	if(isEdit)
-		currTable = rdef.getTableById(AppUtils.getRequestNvlValue(request, AppConstants.RI_DETAIL_ID));
-	Vector reportTableSources = (isEdit)?DataCache.getReportTableSources((String) session.getAttribute("remoteDB")):DataCache.getReportTableSources(AppUtils.getUserRoles(request),((String) session.getAttribute("remoteDB")), AppUtils.getUserID(request), request);
-	if(reportTableSources.size()<=0) {
-        request.setAttribute(AppConstants.RI_EXCEPTION, new Exception("Please add table name to the raptor table for generating report"));
-		throw new UserDefinedException("Please add table name to the raptor table for generating report");
-	}
-	Vector reportTableJoins   = (isEdit)?DataCache.getReportTableJoins():DataCache.getReportTableJoins(AppUtils.getUserRoles(request)); %>
-
-<% if(! isEdit) { %>
-
-<% } %>
-
-
-
-
-	
-		
-	
-	
-		 
-		
-	 
-	
-		 
-		
-	
-<% if(rdef.getDataSourceList().getDataSource().size()>(isEdit?1:0)) { 
-		String outerJoinType = (isEdit?rdef.getOuterJoinType(currTable):""); %>
-	
-		 
-		
-	 
-	
-	
-		 
-		
-	
-	<% if(isEdit) { %>
-	
-	<%} %>
-	
-	
-		 
-		
-	 
-<% } %>
-
    Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %> - <%= curSubStep %>
    Table Name 
-		<% if(isEdit) { 
-				String tName = null;
-				for(int i=0; i
-				<%= nvl(tName, currTable.getTableName()) %>
-				
-		<% } else { %>
-			
-		<% } %>
-			
-		
    Display Name 
-			
    Join To Table 
-		<% if(isEdit) { %>
-			<% if(currTable.getRefTableId()==null){%>
-					--- Table Not Joined ---
-			<%} else { %>
-					<%=rdef.getTableById(currTable.getRefTableId()).getDisplayName() %>
-					
    on : <%=currTable.getRefDefinition() %>
-			<%} %>
-			
-			
-		<% } else { %>
-			
-		<% } %>
-		
    All availabe Join Options 
-			
-		
    Join Type 
-			
-		
    
-
    
-
-
-
-<%!
-	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } 
-%>
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_tables_list.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_tables_list.jsp
deleted file mode 100644
index 47fd435ff..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_tables_list.jsp
+++ /dev/null
@@ -1,85 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="java.util.List" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.DataCache" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataSourceType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.DBColumnInfo" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.TableSource" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.IdNameValue" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.SemaphoreType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.FormFieldType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.TableJoin" %>
-
-<%	
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-    String curSubStep = ws.getCurrentSubStep();
-%>
-
-	
-		
-	
-	
-		
-		
-		
-	
-<% 	int iCount = 0;
-	for(Iterator iter=rdef.getDataSourceList().getDataSource().iterator(); iter.hasNext(); iCount++) { 
-		DataSourceType dst = (DataSourceType) iter.next(); %>
-	>
-		
-		
-		
-		
-	
-<%	} %>
-<%	if(iCount==0) { %>
-	
-		
-	
-<%	} %>
-
    Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %>
      No  Table
    <%= iCount+1 %><%= nvl(dst.getDisplayName()).length()>0?dst.getDisplayName():dst.getTableName()%>
    No tables defined
    
-
    
-
-
-
-<%!	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } 
-%>    
-
diff --git a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_user_access.jsp b/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_user_access.jsp
deleted file mode 100644
index b5c68045f..000000000
--- a/vid/src/main/webapp/WEB-INF/fusion/raptor/wizard_user_access.jsp
+++ /dev/null
@@ -1,184 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="java.util.List" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.DataCache" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataSourceType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.DBColumnInfo" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.TableSource" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.IdNameValue" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.SemaphoreType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.FormFieldType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.TableJoin" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.SecurityEntry" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.Utils" %>
-
-<%	
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-    String curSubStep = ws.getCurrentSubStep();
-%>  
-
-	
-		
-	
-	
-		 
-		
-		 
-		
-	 
-	
-		 
-		
-		 
-		
-	 
-	
-		 
-		
-		 
-		
-	
-
    Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %>
    Created By: <%= AppUtils.getUserName(rdef.getCreateID()) %>Created Date: <%= rdef.getCreateDate() %>
    Last Updated By: <%= AppUtils.getUserName(rdef.getUpdateID()) %>Last Updated: <%= rdef.getUpdateDate() %>
    Report Owner: 
-			
-		Public? (All users can run the report)
-			
-		
    
-
    
-
-
-	
-		
-	
-	
-		
-		
-		
-		
-		
-	
-<%	int iCount = 0;
-	Vector reportUsers = rdef.getReportUsers(request);
-	for(Iterator iter=reportUsers.iterator(); iter.hasNext(); iCount++) { 
-		SecurityEntry rUser = (SecurityEntry) iter.next(); %>
-	">
-		
-		
-		
-		
-		
-	
-<%	}   // for
-//	if(iCount==0) { %>
-	
-<%	//}
-	Vector remainingUsers = Utils.getUsersNotInList(reportUsers,request);
-	if(remainingUsers.size()>0) { %>
-	
-		
-<%	}	// if 
-%>
-	
-
    Report Users
      No  User NameRun AccessEdit AccessRemove
    <%= iCount+1 %><%= rUser.getName() %>" alt="<%= rUser.isReadOnly()?"Grant":"Revoke" %> edit access" width="16" height="16" border="0" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= rUser.isReadOnly()?AppConstants.WA_GRANT_USER:AppConstants.WA_REVOKE_USER %>'; document.forma.<%= AppConstants.RI_DETAIL_ID %>.value='<%= rUser.getId() %>';">
    Grant Access To 
-			
-		
    
-
    
-
-
-	
-		
-	
-	
-		
-		
-		
-		
-		
-	
-<%	iCount = 0;
-	Vector reportRoles = rdef.getReportRoles(request);
-	for(Iterator iter=reportRoles.iterator(); iter.hasNext(); iCount++) { 
-		SecurityEntry rRole = (SecurityEntry) iter.next(); %>
-	">
-		
-		
-		
-		
-		
-	
-<%	}   // for
-//	if(iCount==0) { %>
-	
-<%	//}
-	Vector remainingRoles = Utils.getRolesNotInList(reportRoles,request); 
-	if(remainingRoles.size()>0) { %>
-	
-		
-<%	}	// if 
-%>
-	
-
    Report Roles
      No  Role NameRun AccessEdit AccessRemove
    <%= iCount+1 %><%= rRole.getName() %>" alt="<%= rRole.isReadOnly()?"Grant":"Revoke" %> edit access" width="16" height="16" border="0" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= rRole.isReadOnly()?AppConstants.WA_GRANT_ROLE:AppConstants.WA_REVOKE_ROLE %>'; document.forma.<%= AppConstants.RI_DETAIL_ID %>.value='<%= rRole.getId() %>';">
    Grant Access To 
-			
-		
    
-
    
-
-
-
diff --git a/vid/src/main/webapp/WEB-INF/jsp/createnewserviceinstance.jsp b/vid/src/main/webapp/WEB-INF/jsp/createnewserviceinstance.jsp
deleted file mode 100644
index f5a9b6cb9..000000000
--- a/vid/src/main/webapp/WEB-INF/jsp/createnewserviceinstance.jsp
+++ /dev/null
@@ -1,146 +0,0 @@
-
-
-
    
-     
-     
    Create New Service Instance
    
-	
-
-
    
- 
-   
-   
-   
-	
-	
-	 
-	
-	
-
-    
-	
-	
-	
-    
-    
     
    
-	
-  
-   
    	
-		
-		
     
    
-		
-	
    		
-		  
-       
-
-    
-	
    	
-		
-	
     
    
-		
-	
         		 
    
- 
-	
    
-		
-	
    
-	
-
-
-
    
-
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
-
diff --git a/vid/src/main/webapp/WEB-INF/jsp/error.jsp b/vid/src/main/webapp/WEB-INF/jsp/error.jsp
deleted file mode 100644
index 2a48507c9..000000000
--- a/vid/src/main/webapp/WEB-INF/jsp/error.jsp
+++ /dev/null
@@ -1,20 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-${errMsg}
diff --git a/vid/src/main/webapp/WEB-INF/jsp/leafletMap.jsp b/vid/src/main/webapp/WEB-INF/jsp/leafletMap.jsp
deleted file mode 100644
index 77981f736..000000000
--- a/vid/src/main/webapp/WEB-INF/jsp/leafletMap.jsp
+++ /dev/null
@@ -1,288 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-
-
-
-
-    
-    
-
-    
-    
-    
-
-    
-
-    
-   
-    
-
-
-  
    
-  
-  
-  
    
-    
-      
-        
-          
-                  
-        
-      
-      
-      	  
-    
    SiteUsage
    
-    
-      
-        
-          
-                  
-        
-      
-      
-      	  
-    
    LinkUsage
    
-  
    
-
-  
-
-
-
diff --git a/vid/src/main/webapp/WEB-INF/jsp/login_external.jsp b/vid/src/main/webapp/WEB-INF/jsp/login_external.jsp
deleted file mode 100644
index 839c8d5db..000000000
--- a/vid/src/main/webapp/WEB-INF/jsp/login_external.jsp
+++ /dev/null
@@ -1,154 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles"%>
-<%@ taglib prefix="c"      uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fmt"    uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties" %>
-
-" />
-
-
-
-	
-
-	    
-	      VID Login
-        
-		
-		
-		 
-	
-		
-        
-		
-		 
-		
-		
-		
-		
-		
-			
-		
-		
-		
-		
-		
-	
-		
-	
-	
-	
    
-		
    
-			
-			
    
-			
    
-          		
-				
     VID ECOMP Portal 
    
-				
-				
-				
    
-				
    
-				
-				 
-				
    
-				
    
-				              
-				
-				
    
-			
    
-		
    
-		






    
-		
-    
    
-    
-
-
diff --git a/vid/src/main/webapp/WEB-INF/jsp/net_map.jsp b/vid/src/main/webapp/WEB-INF/jsp/net_map.jsp
deleted file mode 100644
index 2a341467f..000000000
--- a/vid/src/main/webapp/WEB-INF/jsp/net_map.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
- 
- 
- 
-  	
-
-
-
-
-
-
    
-	
-
    
-
-
-
-
-
-
-
diff --git a/vid/src/main/webapp/WEB-INF/jsp/searchexistingsi.jsp b/vid/src/main/webapp/WEB-INF/jsp/searchexistingsi.jsp
deleted file mode 100644
index a017cf614..000000000
--- a/vid/src/main/webapp/WEB-INF/jsp/searchexistingsi.jsp
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<%@ page import="org.openecomp.vid.mso.*"%>
-<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%>
-<%
-	String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS)
-			+ ",msoMaxPollingIntervalMsec:"
-			+ SystemProperties.getProperty(MsoProperties.MSO_POLLING_INTERVAL_MSECS) + "}";
-%>
-
-
    
-
-
- 
-	
    
-	
-
    
-
-
-
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
-		
\ No newline at end of file
diff --git a/vid/src/main/webapp/WEB-INF/jsp/serviceModels.jsp b/vid/src/main/webapp/WEB-INF/jsp/serviceModels.jsp
deleted file mode 100644
index 10507bc57..000000000
--- a/vid/src/main/webapp/WEB-INF/jsp/serviceModels.jsp
+++ /dev/null
@@ -1,68 +0,0 @@
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<%@ page import="org.openecomp.vid.mso.*"%>
-<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%>
-<%
-	String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS)
-			+ ",msoMaxPollingIntervalMsec:"
-			+ SystemProperties.getProperty(MsoProperties.MSO_POLLING_INTERVAL_MSECS) + "}";
-%>
-
-
    
-	
    
-
    
-
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
diff --git a/vid/src/main/webapp/WEB-INF/jsp/subscriberdetails.jsp b/vid/src/main/webapp/WEB-INF/jsp/subscriberdetails.jsp
deleted file mode 100644
index ca92b1529..000000000
--- a/vid/src/main/webapp/WEB-INF/jsp/subscriberdetails.jsp
+++ /dev/null
@@ -1,184 +0,0 @@
-<%@ include file="/WEB-INF/fusion/jsp/popup_modal.html" %>
-
    
-	
    
-		
    Selected Subscriber's Service Instance Details:
    
-		
    
-		 	
-
-			    
-					
-					    
-						
-			                    
-			                
-			            
-			        
-			    
-			    
-			        
-			        
-		            	
-		            	
-		            	
-		            	
-			             
-			    	  
-			
    View/EditGlobal Customer IDSubscriber NameService TypeService Instance ID
    
-			         
-            	   {{disData.globalCustomerId}}{{disData.subscriberName}}{{disData.serviceType}}{{disData.serviceInstanceId}}
     
-		
    
-	
    	
-	
-	
-	
-	
    
-	
    
-		
-	
    
-	
    
-	
-
    
-
-
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-		
-
-
-    
diff --git a/vid/src/main/webapp/WEB-INF/jsp/testMso.jsp b/vid/src/main/webapp/WEB-INF/jsp/testMso.jsp
deleted file mode 100644
index 7e9f6dee3..000000000
--- a/vid/src/main/webapp/WEB-INF/jsp/testMso.jsp
+++ /dev/null
@@ -1,172 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<%@ page import="org.openecomp.vid.mso.*"%>
-<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%>
-<%
-	String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS)
-			+ ",msoMaxPollingIntervalMsec:"
-			+ SystemProperties.getProperty(MsoProperties.MSO_POLLING_INTERVAL_MSECS) + "}";
-%>
-
-
    
-	
    
-		
    
-		
    
-	
    
-
-	
    
-		
    Various MSO Tests
    
-	
    
-	
    
-		 Use test MSO
-			controller
-	
    
-	
    
-		
    These actions are expected to return successfully.
    
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-	
    
-	
    
-	
    These actions are expected to generate errors. These tests assume the above
-		"Use test MSO controller" checkbox is checked. All tests are base on the Create Service
-		Instance transaction.
    
-	
      
-		
    1. 
-			 Initial
-				response contains policy exception
-		
      2. 
-		
    2. 
-			 Initial
-				response contains service exception
-		
      3. 
-		
    3. 
-			 Subsequent
-				getOrchestrationRequest poll response contains MSO failure condition
-		
      4. 
-		
    4. 
-			 Initial
-				response contains invalid data field
-		
      5. 
-		
    5. 
-			 Subsequent
-				getOrchestrationRequest poll response contains invalid data field
-		
      6. 
-		
    6. 
-			
-			VID controller code generates general exception
-		
      7. 
-		
    7. 
-			 Maximum
-				poll attempts exceeded
-		
      8. 
-		
    8. 
-			 Timeout
-				on initial response
-		
      9. 
-		
    9. 
-			 Timeout
-				on subsequent getOrchestrationRequest poll response
-		
      10. 
-		
    10. 
-			 GUI
-				front-end specifies invalid URL - HTTP 404 response expected
-		
      11. 
-		
    11. 
-			 GUI
-				front-end specifies invalid URL - HTTP 405 response expected
-		
      12. 
-	
    
-
-
    
-
-
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
diff --git a/vid/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp b/vid/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp
deleted file mode 100644
index 78ea553a0..000000000
--- a/vid/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp
+++ /dev/null
@@ -1,170 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<%@ page import="org.openecomp.vid.mso.*"%>
-<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%>
-<%
-	String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS)
-			+ ",msoMaxPollingIntervalMsec:"
-			+ SystemProperties.getProperty(MsoProperties.MSO_POLLING_INTERVAL_MSECS) + "}";
-%>
-
-
    
-
-	
    
-		
    
-		
    
-		
    
-	
    
-
-	
    
-		
    Test View Edit Page
    
-	
    
-	
    
-	These buttons simulate the add, delete and "show details" (called
-	"script" in User Stories) icons (or buttons) that are expected on the
-	view / edit page.
-	
    
-	
    
-		 Use test MSO
-			controller
-	
    
-	
    CALLBACK: {{callbackResults}}
    
-	
-		
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-		
-	
    Service
-				
-			
-				
-			
-				
-			
    VNF
-				
-			
-				
-			
-				
-			
    VF Module
-				
-			
-				
-			
-				
-			
    Volume Group
-				
-			
-				
-			
-				
-			
    Network
-				
-			
-				
-			
-				
-			
    
-
    
-
-
-
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
diff --git a/vid/src/main/webapp/WEB-INF/jsp/user_profile.jsp b/vid/src/main/webapp/WEB-INF/jsp/user_profile.jsp
deleted file mode 100644
index cb5c4e3bf..000000000
--- a/vid/src/main/webapp/WEB-INF/jsp/user_profile.jsp
+++ /dev/null
@@ -1,84 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ include file="/WEB-INF/fusion/jsp/popup_modal.html" %>
-
    
-	
    
-		
    Profile Search
    
-		
    
-			
-
-			    
-					
-						
-			                    
-			                
-			            
-			                    
-			             
-			        
-			    
-			    
-			        
-		            	
-		            	
-		            	
-		            	
-		            	
-		            	
-			             
-			    	  
-			
    User IDLast NameFirst NameEmailOrgUserIdManager OrgUserId
    {{rowData.id}}{{rowData.last_name}}{{rowData.first_name}}{{rowData.email}}{{rowData.orgUserId}}{{rowData.org_manager_userid}}
    
-		
    
-	
    	
-	
    
-	          Rows Per Page:
-	          
-    
    
-	
    
-	          Current Page:
-	          
-    
    
-    
    
-	          Total Page(s):
-	          
-    
    
-
    
-	
-
diff --git a/vid/src/main/webapp/WEB-INF/jsp/vidhome.jsp b/vid/src/main/webapp/WEB-INF/jsp/vidhome.jsp
deleted file mode 100644
index 0cd983593..000000000
--- a/vid/src/main/webapp/WEB-INF/jsp/vidhome.jsp
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
    
-     
    OpenECOMP
    
-     
    
-     
    Welcome to VID
    
-     
    
-   The Virtual Infrastructure Deployment (VID) application allows infrastructure service deployment operators 
-   to instantiate service instances and their constituent parts for Distributed service models required by the 
-   OpenECOMP service operations that manage them, such as Mobility Network Services, etc. 
-   The models are defined by OpenECOMP component SDC. The service 
-   deployment operator selects the service operations owner and model that they wish to instantiate. After 
-   entry of appropriate data, the operator instructs VID to direct another OpenECOMP component, MSO, to instantiate 
-   the selected service model. Once the service instance has been instantiated, the service operator can instruct 
-   VID to direct MSO to instantiate the service instance's component VNFs, VF Modules, Networks and Volume Groups. 
-   The VID user can also search for, and display, existing service instances and direct the instantiation of 
-   subsequent instance components.
-     

    
-  
-    
    Contact Us
    
-    Please click here to contact us.
-
-	
-
-
    
-
-
-
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
-
diff --git a/vid/src/main/webapp/WEB-INF/jsp/viewlog.jsp b/vid/src/main/webapp/WEB-INF/jsp/viewlog.jsp
deleted file mode 100644
index 920298e18..000000000
--- a/vid/src/main/webapp/WEB-INF/jsp/viewlog.jsp
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
    
-     
-     
    View Log - Page under Construction...
    
-     
    
-    
-
-
    
-
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
    
-
-
diff --git a/vid/src/main/webapp/WEB-INF/jsp/welcome.jsp b/vid/src/main/webapp/WEB-INF/jsp/welcome.jsp
deleted file mode 100644
index d7d3b8967..000000000
--- a/vid/src/main/webapp/WEB-INF/jsp/welcome.jsp
+++ /dev/null
@@ -1,629 +0,0 @@
-<%--
-  ================================================================================
-  eCOMP Portal SDK
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  --%>
-<%@ taglib prefix="c"      uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fmt"    uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="fn"     uri="http://java.sun.com/jsp/jstl/functions" %>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
- 
-
-
-
-
-
-			
-				
-				
-
-
-
-
-	
-
-
    
-	 
-	
    
-	  	Welcome ${sessionScope.user.firstName} ${sessionScope.user.lastName} 
-	(Last Login:  ${lastLogin})
-	
    
-  		
-  	
    
-        
    
-            
    
-                
    
-                    
    
-                            
-                            
    
-								
-									
-									
-								
-							
    
-                            
-                    
    
-               	 	
    
-		                
-			                
    
-			               		
    
-			               			
    
-					              	
-			               		
    
-			               		
    
-					              	
-			               		
    
-			               		
    
-				               		
    
-				               			
      
     
-			               				
-			               			
    			               		
-					              	
-			               		
    
-			               		
    
-					              	
-			               		
    
-			               		
    
-				               		
    
-				               			
      
     
-			               				
-			               			
    
-
-
-			               		
    
-			               		
    
-					              	
-			               		
    
-			               		
-			               		
    
-  					    			
    
- 					    				
      
-					    					
    • {{Daytab.title}}
      • 
-					    				
     
-					    				
    
-						    				
    
-					    				
    
-					    				
-										
-										
-										
-										
-										
-										
-							        
    
-			               		
    
-
-			               		
    
- 					    			
    
-					    				
      
-					    					
    • {{TrafficTab.title}}
      • 
-					    				
    
-					    				
    
-						    				
    
-					    				
    
-					    				
-										
-										
-										
-										
-									
     
-			               		
    
-
-			               		
    
-					              					          		 
-						    		
-							    
-										  
-										  
-										    
-											
-										  
-										
-										
-										  
-										  	
-											
-										  
-										  
-										  	
-											
-										  
-									
    JQuery
-										    	
-										     
    Animated Map
-										    	
-										     
    Chat Session
-										    	
-										     
    
-			               		
    
-			               		
    
-					              	
    
-			               		
    
-
-							
    
-								
-								           
-										         	
-								          
-								                       	
-						              			
-								          
-						           	
-
-							
    
-
-						
    
-
-						
-					
    
-					
-				
    
-			
    
-		
    
-	
     
-
-
    
-
-
-
-
-  
diff --git a/vid/src/main/webapp/WEB-INF/web.xml b/vid/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index b78579e01..000000000
--- a/vid/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-	ecomp-sdk-app
-
-	
-	
-
-	
-		15
-		COOKIE
-	
-
-
diff --git a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-animate.js b/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-animate.js
deleted file mode 100644
index 2778fc564..000000000
--- a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-animate.js
+++ /dev/null
@@ -1,4121 +0,0 @@
-/**
- * @license AngularJS v1.5.0
- * (c) 2010-2016 Google, Inc. http://angularjs.org
- * License: MIT
- */
-(function(window, angular, undefined) {'use strict';
-
-/* jshint ignore:start */
-var noop        = angular.noop;
-var copy        = angular.copy;
-var extend      = angular.extend;
-var jqLite      = angular.element;
-var forEach     = angular.forEach;
-var isArray     = angular.isArray;
-var isString    = angular.isString;
-var isObject    = angular.isObject;
-var isUndefined = angular.isUndefined;
-var isDefined   = angular.isDefined;
-var isFunction  = angular.isFunction;
-var isElement   = angular.isElement;
-
-var ELEMENT_NODE = 1;
-var COMMENT_NODE = 8;
-
-var ADD_CLASS_SUFFIX = '-add';
-var REMOVE_CLASS_SUFFIX = '-remove';
-var EVENT_CLASS_PREFIX = 'ng-';
-var ACTIVE_CLASS_SUFFIX = '-active';
-var PREPARE_CLASS_SUFFIX = '-prepare';
-
-var NG_ANIMATE_CLASSNAME = 'ng-animate';
-var NG_ANIMATE_CHILDREN_DATA = '$$ngAnimateChildren';
-
-// Detect proper transitionend/animationend event names.
-var CSS_PREFIX = '', TRANSITION_PROP, TRANSITIONEND_EVENT, ANIMATION_PROP, ANIMATIONEND_EVENT;
-
-// If unprefixed events are not supported but webkit-prefixed are, use the latter.
-// Otherwise, just use W3C names, browsers not supporting them at all will just ignore them.
-// Note: Chrome implements `window.onwebkitanimationend` and doesn't implement `window.onanimationend`
-// but at the same time dispatches the `animationend` event and not `webkitAnimationEnd`.
-// Register both events in case `window.onanimationend` is not supported because of that,
-// do the same for `transitionend` as Safari is likely to exhibit similar behavior.
-// Also, the only modern browser that uses vendor prefixes for transitions/keyframes is webkit
-// therefore there is no reason to test anymore for other vendor prefixes:
-// http://caniuse.com/#search=transition
-if (isUndefined(window.ontransitionend) && isDefined(window.onwebkittransitionend)) {
-  CSS_PREFIX = '-webkit-';
-  TRANSITION_PROP = 'WebkitTransition';
-  TRANSITIONEND_EVENT = 'webkitTransitionEnd transitionend';
-} else {
-  TRANSITION_PROP = 'transition';
-  TRANSITIONEND_EVENT = 'transitionend';
-}
-
-if (isUndefined(window.onanimationend) && isDefined(window.onwebkitanimationend)) {
-  CSS_PREFIX = '-webkit-';
-  ANIMATION_PROP = 'WebkitAnimation';
-  ANIMATIONEND_EVENT = 'webkitAnimationEnd animationend';
-} else {
-  ANIMATION_PROP = 'animation';
-  ANIMATIONEND_EVENT = 'animationend';
-}
-
-var DURATION_KEY = 'Duration';
-var PROPERTY_KEY = 'Property';
-var DELAY_KEY = 'Delay';
-var TIMING_KEY = 'TimingFunction';
-var ANIMATION_ITERATION_COUNT_KEY = 'IterationCount';
-var ANIMATION_PLAYSTATE_KEY = 'PlayState';
-var SAFE_FAST_FORWARD_DURATION_VALUE = 9999;
-
-var ANIMATION_DELAY_PROP = ANIMATION_PROP + DELAY_KEY;
-var ANIMATION_DURATION_PROP = ANIMATION_PROP + DURATION_KEY;
-var TRANSITION_DELAY_PROP = TRANSITION_PROP + DELAY_KEY;
-var TRANSITION_DURATION_PROP = TRANSITION_PROP + DURATION_KEY;
-
-var isPromiseLike = function(p) {
-  return p && p.then ? true : false;
-};
-
-var ngMinErr = angular.$$minErr('ng');
-function assertArg(arg, name, reason) {
-  if (!arg) {
-    throw ngMinErr('areq', "Argument '{0}' is {1}", (name || '?'), (reason || "required"));
-  }
-  return arg;
-}
-
-function mergeClasses(a,b) {
-  if (!a && !b) return '';
-  if (!a) return b;
-  if (!b) return a;
-  if (isArray(a)) a = a.join(' ');
-  if (isArray(b)) b = b.join(' ');
-  return a + ' ' + b;
-}
-
-function packageStyles(options) {
-  var styles = {};
-  if (options && (options.to || options.from)) {
-    styles.to = options.to;
-    styles.from = options.from;
-  }
-  return styles;
-}
-
-function pendClasses(classes, fix, isPrefix) {
-  var className = '';
-  classes = isArray(classes)
-      ? classes
-      : classes && isString(classes) && classes.length
-          ? classes.split(/\s+/)
-          : [];
-  forEach(classes, function(klass, i) {
-    if (klass && klass.length > 0) {
-      className += (i > 0) ? ' ' : '';
-      className += isPrefix ? fix + klass
-                            : klass + fix;
-    }
-  });
-  return className;
-}
-
-function removeFromArray(arr, val) {
-  var index = arr.indexOf(val);
-  if (val >= 0) {
-    arr.splice(index, 1);
-  }
-}
-
-function stripCommentsFromElement(element) {
-  if (element instanceof jqLite) {
-    switch (element.length) {
-      case 0:
-        return [];
-        break;
-
-      case 1:
-        // there is no point of stripping anything if the element
-        // is the only element within the jqLite wrapper.
-        // (it's important that we retain the element instance.)
-        if (element[0].nodeType === ELEMENT_NODE) {
-          return element;
-        }
-        break;
-
-      default:
-        return jqLite(extractElementNode(element));
-        break;
-    }
-  }
-
-  if (element.nodeType === ELEMENT_NODE) {
-    return jqLite(element);
-  }
-}
-
-function extractElementNode(element) {
-  if (!element[0]) return element;
-  for (var i = 0; i < element.length; i++) {
-    var elm = element[i];
-    if (elm.nodeType == ELEMENT_NODE) {
-      return elm;
-    }
-  }
-}
-
-function $$addClass($$jqLite, element, className) {
-  forEach(element, function(elm) {
-    $$jqLite.addClass(elm, className);
-  });
-}
-
-function $$removeClass($$jqLite, element, className) {
-  forEach(element, function(elm) {
-    $$jqLite.removeClass(elm, className);
-  });
-}
-
-function applyAnimationClassesFactory($$jqLite) {
-  return function(element, options) {
-    if (options.addClass) {
-      $$addClass($$jqLite, element, options.addClass);
-      options.addClass = null;
-    }
-    if (options.removeClass) {
-      $$removeClass($$jqLite, element, options.removeClass);
-      options.removeClass = null;
-    }
-  }
-}
-
-function prepareAnimationOptions(options) {
-  options = options || {};
-  if (!options.$$prepared) {
-    var domOperation = options.domOperation || noop;
-    options.domOperation = function() {
-      options.$$domOperationFired = true;
-      domOperation();
-      domOperation = noop;
-    };
-    options.$$prepared = true;
-  }
-  return options;
-}
-
-function applyAnimationStyles(element, options) {
-  applyAnimationFromStyles(element, options);
-  applyAnimationToStyles(element, options);
-}
-
-function applyAnimationFromStyles(element, options) {
-  if (options.from) {
-    element.css(options.from);
-    options.from = null;
-  }
-}
-
-function applyAnimationToStyles(element, options) {
-  if (options.to) {
-    element.css(options.to);
-    options.to = null;
-  }
-}
-
-function mergeAnimationDetails(element, oldAnimation, newAnimation) {
-  var target = oldAnimation.options || {};
-  var newOptions = newAnimation.options || {};
-
-  var toAdd = (target.addClass || '') + ' ' + (newOptions.addClass || '');
-  var toRemove = (target.removeClass || '') + ' ' + (newOptions.removeClass || '');
-  var classes = resolveElementClasses(element.attr('class'), toAdd, toRemove);
-
-  if (newOptions.preparationClasses) {
-    target.preparationClasses = concatWithSpace(newOptions.preparationClasses, target.preparationClasses);
-    delete newOptions.preparationClasses;
-  }
-
-  // noop is basically when there is no callback; otherwise something has been set
-  var realDomOperation = target.domOperation !== noop ? target.domOperation : null;
-
-  extend(target, newOptions);
-
-  // TODO(matsko or sreeramu): proper fix is to maintain all animation callback in array and call at last,but now only leave has the callback so no issue with this.
-  if (realDomOperation) {
-    target.domOperation = realDomOperation;
-  }
-
-  if (classes.addClass) {
-    target.addClass = classes.addClass;
-  } else {
-    target.addClass = null;
-  }
-
-  if (classes.removeClass) {
-    target.removeClass = classes.removeClass;
-  } else {
-    target.removeClass = null;
-  }
-
-  oldAnimation.addClass = target.addClass;
-  oldAnimation.removeClass = target.removeClass;
-
-  return target;
-}
-
-function resolveElementClasses(existing, toAdd, toRemove) {
-  var ADD_CLASS = 1;
-  var REMOVE_CLASS = -1;
-
-  var flags = {};
-  existing = splitClassesToLookup(existing);
-
-  toAdd = splitClassesToLookup(toAdd);
-  forEach(toAdd, function(value, key) {
-    flags[key] = ADD_CLASS;
-  });
-
-  toRemove = splitClassesToLookup(toRemove);
-  forEach(toRemove, function(value, key) {
-    flags[key] = flags[key] === ADD_CLASS ? null : REMOVE_CLASS;
-  });
-
-  var classes = {
-    addClass: '',
-    removeClass: ''
-  };
-
-  forEach(flags, function(val, klass) {
-    var prop, allow;
-    if (val === ADD_CLASS) {
-      prop = 'addClass';
-      allow = !existing[klass];
-    } else if (val === REMOVE_CLASS) {
-      prop = 'removeClass';
-      allow = existing[klass];
-    }
-    if (allow) {
-      if (classes[prop].length) {
-        classes[prop] += ' ';
-      }
-      classes[prop] += klass;
-    }
-  });
-
-  function splitClassesToLookup(classes) {
-    if (isString(classes)) {
-      classes = classes.split(' ');
-    }
-
-    var obj = {};
-    forEach(classes, function(klass) {
-      // sometimes the split leaves empty string values
-      // incase extra spaces were applied to the options
-      if (klass.length) {
-        obj[klass] = true;
-      }
-    });
-    return obj;
-  }
-
-  return classes;
-}
-
-function getDomNode(element) {
-  return (element instanceof angular.element) ? element[0] : element;
-}
-
-function applyGeneratedPreparationClasses(element, event, options) {
-  var classes = '';
-  if (event) {
-    classes = pendClasses(event, EVENT_CLASS_PREFIX, true);
-  }
-  if (options.addClass) {
-    classes = concatWithSpace(classes, pendClasses(options.addClass, ADD_CLASS_SUFFIX));
-  }
-  if (options.removeClass) {
-    classes = concatWithSpace(classes, pendClasses(options.removeClass, REMOVE_CLASS_SUFFIX));
-  }
-  if (classes.length) {
-    options.preparationClasses = classes;
-    element.addClass(classes);
-  }
-}
-
-function clearGeneratedClasses(element, options) {
-  if (options.preparationClasses) {
-    element.removeClass(options.preparationClasses);
-    options.preparationClasses = null;
-  }
-  if (options.activeClasses) {
-    element.removeClass(options.activeClasses);
-    options.activeClasses = null;
-  }
-}
-
-function blockTransitions(node, duration) {
-  // we use a negative delay value since it performs blocking
-  // yet it doesn't kill any existing transitions running on the
-  // same element which makes this safe for class-based animations
-  var value = duration ? '-' + duration + 's' : '';
-  applyInlineStyle(node, [TRANSITION_DELAY_PROP, value]);
-  return [TRANSITION_DELAY_PROP, value];
-}
-
-function blockKeyframeAnimations(node, applyBlock) {
-  var value = applyBlock ? 'paused' : '';
-  var key = ANIMATION_PROP + ANIMATION_PLAYSTATE_KEY;
-  applyInlineStyle(node, [key, value]);
-  return [key, value];
-}
-
-function applyInlineStyle(node, styleTuple) {
-  var prop = styleTuple[0];
-  var value = styleTuple[1];
-  node.style[prop] = value;
-}
-
-function concatWithSpace(a,b) {
-  if (!a) return b;
-  if (!b) return a;
-  return a + ' ' + b;
-}
-
-var $$rAFSchedulerFactory = ['$$rAF', function($$rAF) {
-  var queue, cancelFn;
-
-  function scheduler(tasks) {
-    // we make a copy since RAFScheduler mutates the state
-    // of the passed in array variable and this would be difficult
-    // to track down on the outside code
-    queue = queue.concat(tasks);
-    nextTick();
-  }
-
-  queue = scheduler.queue = [];
-
-  /* waitUntilQuiet does two things:
-   * 1. It will run the FINAL `fn` value only when an uncanceled RAF has passed through
-   * 2. It will delay the next wave of tasks from running until the quiet `fn` has run.
-   *
-   * The motivation here is that animation code can request more time from the scheduler
-   * before the next wave runs. This allows for certain DOM properties such as classes to
-   * be resolved in time for the next animation to run.
-   */
-  scheduler.waitUntilQuiet = function(fn) {
-    if (cancelFn) cancelFn();
-
-    cancelFn = $$rAF(function() {
-      cancelFn = null;
-      fn();
-      nextTick();
-    });
-  };
-
-  return scheduler;
-
-  function nextTick() {
-    if (!queue.length) return;
-
-    var items = queue.shift();
-    for (var i = 0; i < items.length; i++) {
-      items[i]();
-    }
-
-    if (!cancelFn) {
-      $$rAF(function() {
-        if (!cancelFn) nextTick();
-      });
-    }
-  }
-}];
-
-/**
- * @ngdoc directive
- * @name ngAnimateChildren
- * @restrict AE
- * @element ANY
- *
- * @description
- *
- * ngAnimateChildren allows you to specify that children of this element should animate even if any
- * of the children's parents are currently animating. By default, when an element has an active `enter`, `leave`, or `move`
- * (structural) animation, child elements that also have an active structural animation are not animated.
- *
- * Note that even if `ngAnimteChildren` is set, no child animations will run when the parent element is removed from the DOM (`leave` animation).
- *
- *
- * @param {string} ngAnimateChildren If the value is empty, `true` or `on`,
- *     then child animations are allowed. If the value is `false`, child animations are not allowed.
- *
- * @example
- * 
-     
-       
    
-         
-         
-         
    
-         
    
-           
    
-             List of items:
-             
    Item {{item}}
    
-           
    
-         
    
-       
    
-         
-     
-
-      .container.ng-enter,
-      .container.ng-leave {
-        transition: all ease 1.5s;
-      }
-
-      .container.ng-enter,
-      .container.ng-leave-active {
-        opacity: 0;
-      }
-
-      .container.ng-leave,
-      .container.ng-enter-active {
-        opacity: 1;
-      }
-
-      .item {
-        background: firebrick;
-        color: #FFF;
-        margin-bottom: 10px;
-      }
-
-      .item.ng-enter,
-      .item.ng-leave {
-        transition: transform 1.5s ease;
-      }
-
-      .item.ng-enter {
-        transform: translateX(50px);
-      }
-
-      .item.ng-enter-active {
-        transform: translateX(0);
-      }
-    
-    
-      angular.module('ngAnimateChildren', ['ngAnimate'])
-        .controller('mainController', function() {
-          this.animateChildren = false;
-          this.enterElement = false;
-        });
-    
-      
- */
-var $$AnimateChildrenDirective = ['$interpolate', function($interpolate) {
-  return {
-    link: function(scope, element, attrs) {
-      var val = attrs.ngAnimateChildren;
-      if (angular.isString(val) && val.length === 0) { //empty attribute
-        element.data(NG_ANIMATE_CHILDREN_DATA, true);
-      } else {
-        // Interpolate and set the value, so that it is available to
-        // animations that run right after compilation
-        setData($interpolate(val)(scope));
-        attrs.$observe('ngAnimateChildren', setData);
-      }
-
-      function setData(value) {
-        value = value === 'on' || value === 'true';
-        element.data(NG_ANIMATE_CHILDREN_DATA, value);
-      }
-    }
-  };
-}];
-
-var ANIMATE_TIMER_KEY = '$$animateCss';
-
-/**
- * @ngdoc service
- * @name $animateCss
- * @kind object
- *
- * @description
- * The `$animateCss` service is a useful utility to trigger customized CSS-based transitions/keyframes
- * from a JavaScript-based animation or directly from a directive. The purpose of `$animateCss` is NOT
- * to side-step how `$animate` and ngAnimate work, but the goal is to allow pre-existing animations or
- * directives to create more complex animations that can be purely driven using CSS code.
- *
- * Note that only browsers that support CSS transitions and/or keyframe animations are capable of
- * rendering animations triggered via `$animateCss` (bad news for IE9 and lower).
- *
- * ## Usage
- * Once again, `$animateCss` is designed to be used inside of a registered JavaScript animation that
- * is powered by ngAnimate. It is possible to use `$animateCss` directly inside of a directive, however,
- * any automatic control over cancelling animations and/or preventing animations from being run on
- * child elements will not be handled by Angular. For this to work as expected, please use `$animate` to
- * trigger the animation and then setup a JavaScript animation that injects `$animateCss` to trigger
- * the CSS animation.
- *
- * The example below shows how we can create a folding animation on an element using `ng-if`:
- *
- * ```html
- * 
- * 
    
- *   This element will go BOOM
- * 
    
- * 
- * ```
- *
- * Now we create the **JavaScript animation** that will trigger the CSS transition:
- *
- * ```js
- * ngModule.animation('.fold-animation', ['$animateCss', function($animateCss) {
- *   return {
- *     enter: function(element, doneFn) {
- *       var height = element[0].offsetHeight;
- *       return $animateCss(element, {
- *         from: { height:'0px' },
- *         to: { height:height + 'px' },
- *         duration: 1 // one second
- *       });
- *     }
- *   }
- * }]);
- * ```
- *
- * ## More Advanced Uses
- *
- * `$animateCss` is the underlying code that ngAnimate uses to power **CSS-based animations** behind the scenes. Therefore CSS hooks
- * like `.ng-EVENT`, `.ng-EVENT-active`, `.ng-EVENT-stagger` are all features that can be triggered using `$animateCss` via JavaScript code.
- *
- * This also means that just about any combination of adding classes, removing classes, setting styles, dynamically setting a keyframe animation,
- * applying a hardcoded duration or delay value, changing the animation easing or applying a stagger animation are all options that work with
- * `$animateCss`. The service itself is smart enough to figure out the combination of options and examine the element styling properties in order
- * to provide a working animation that will run in CSS.
- *
- * The example below showcases a more advanced version of the `.fold-animation` from the example above:
- *
- * ```js
- * ngModule.animation('.fold-animation', ['$animateCss', function($animateCss) {
- *   return {
- *     enter: function(element, doneFn) {
- *       var height = element[0].offsetHeight;
- *       return $animateCss(element, {
- *         addClass: 'red large-text pulse-twice',
- *         easing: 'ease-out',
- *         from: { height:'0px' },
- *         to: { height:height + 'px' },
- *         duration: 1 // one second
- *       });
- *     }
- *   }
- * }]);
- * ```
- *
- * Since we're adding/removing CSS classes then the CSS transition will also pick those up:
- *
- * ```css
- * /* since a hardcoded duration value of 1 was provided in the JavaScript animation code,
- * the CSS classes below will be transitioned despite them being defined as regular CSS classes */
- * .red { background:red; }
- * .large-text { font-size:20px; }
- *
- * /* we can also use a keyframe animation and $animateCss will make it work alongside the transition */
- * .pulse-twice {
- *   animation: 0.5s pulse linear 2;
- *   -webkit-animation: 0.5s pulse linear 2;
- * }
- *
- * @keyframes pulse {
- *   from { transform: scale(0.5); }
- *   to { transform: scale(1.5); }
- * }
- *
- * @-webkit-keyframes pulse {
- *   from { -webkit-transform: scale(0.5); }
- *   to { -webkit-transform: scale(1.5); }
- * }
- * ```
- *
- * Given this complex combination of CSS classes, styles and options, `$animateCss` will figure everything out and make the animation happen.
- *
- * ## How the Options are handled
- *
- * `$animateCss` is very versatile and intelligent when it comes to figuring out what configurations to apply to the element to ensure the animation
- * works with the options provided. Say for example we were adding a class that contained a keyframe value and we wanted to also animate some inline
- * styles using the `from` and `to` properties.
- *
- * ```js
- * var animator = $animateCss(element, {
- *   from: { background:'red' },
- *   to: { background:'blue' }
- * });
- * animator.start();
- * ```
- *
- * ```css
- * .rotating-animation {
- *   animation:0.5s rotate linear;
- *   -webkit-animation:0.5s rotate linear;
- * }
- *
- * @keyframes rotate {
- *   from { transform: rotate(0deg); }
- *   to { transform: rotate(360deg); }
- * }
- *
- * @-webkit-keyframes rotate {
- *   from { -webkit-transform: rotate(0deg); }
- *   to { -webkit-transform: rotate(360deg); }
- * }
- * ```
- *
- * The missing pieces here are that we do not have a transition set (within the CSS code nor within the `$animateCss` options) and the duration of the animation is
- * going to be detected from what the keyframe styles on the CSS class are. In this event, `$animateCss` will automatically create an inline transition
- * style matching the duration detected from the keyframe style (which is present in the CSS class that is being added) and then prepare both the transition
- * and keyframe animations to run in parallel on the element. Then when the animation is underway the provided `from` and `to` CSS styles will be applied
- * and spread across the transition and keyframe animation.
- *
- * ## What is returned
- *
- * `$animateCss` works in two stages: a preparation phase and an animation phase. Therefore when `$animateCss` is first called it will NOT actually
- * start the animation. All that is going on here is that the element is being prepared for the animation (which means that the generated CSS classes are
- * added and removed on the element). Once `$animateCss` is called it will return an object with the following properties:
- *
- * ```js
- * var animator = $animateCss(element, { ... });
- * ```
- *
- * Now what do the contents of our `animator` variable look like:
- *
- * ```js
- * {
- *   // starts the animation
- *   start: Function,
- *
- *   // ends (aborts) the animation
- *   end: Function
- * }
- * ```
- *
- * To actually start the animation we need to run `animation.start()` which will then return a promise that we can hook into to detect when the animation ends.
- * If we choose not to run the animation then we MUST run `animation.end()` to perform a cleanup on the element (since some CSS classes and styles may have been
- * applied to the element during the preparation phase). Note that all other properties such as duration, delay, transitions and keyframes are just properties
- * and that changing them will not reconfigure the parameters of the animation.
- *
- * ### runner.done() vs runner.then()
- * It is documented that `animation.start()` will return a promise object and this is true, however, there is also an additional method available on the
- * runner called `.done(callbackFn)`. The done method works the same as `.finally(callbackFn)`, however, it does **not trigger a digest to occur**.
- * Therefore, for performance reasons, it's always best to use `runner.done(callback)` instead of `runner.then()`, `runner.catch()` or `runner.finally()`
- * unless you really need a digest to kick off afterwards.
- *
- * Keep in mind that, to make this easier, ngAnimate has tweaked the JS animations API to recognize when a runner instance is returned from $animateCss
- * (so there is no need to call `runner.done(doneFn)` inside of your JavaScript animation code).
- * Check the {@link ngAnimate.$animateCss#usage animation code above} to see how this works.
- *
- * @param {DOMElement} element the element that will be animated
- * @param {object} options the animation-related options that will be applied during the animation
- *
- * * `event` - The DOM event (e.g. enter, leave, move). When used, a generated CSS class of `ng-EVENT` and `ng-EVENT-active` will be applied
- * to the element during the animation. Multiple events can be provided when spaces are used as a separator. (Note that this will not perform any DOM operation.)
- * * `structural` - Indicates that the `ng-` prefix will be added to the event class. Setting to `false` or omitting will turn `ng-EVENT` and
- * `ng-EVENT-active` in `EVENT` and `EVENT-active`. Unused if `event` is omitted.
- * * `easing` - The CSS easing value that will be applied to the transition or keyframe animation (or both).
- * * `transitionStyle` - The raw CSS transition style that will be used (e.g. `1s linear all`).
- * * `keyframeStyle` - The raw CSS keyframe animation style that will be used (e.g. `1s my_animation linear`).
- * * `from` - The starting CSS styles (a key/value object) that will be applied at the start of the animation.
- * * `to` - The ending CSS styles (a key/value object) that will be applied across the animation via a CSS transition.
- * * `addClass` - A space separated list of CSS classes that will be added to the element and spread across the animation.
- * * `removeClass` - A space separated list of CSS classes that will be removed from the element and spread across the animation.
- * * `duration` - A number value representing the total duration of the transition and/or keyframe (note that a value of 1 is 1000ms). If a value of `0`
- * is provided then the animation will be skipped entirely.
- * * `delay` - A number value representing the total delay of the transition and/or keyframe (note that a value of 1 is 1000ms). If a value of `true` is
- * used then whatever delay value is detected from the CSS classes will be mirrored on the elements styles (e.g. by setting delay true then the style value
- * of the element will be `transition-delay: DETECTED_VALUE`). Using `true` is useful when you want the CSS classes and inline styles to all share the same
- * CSS delay value.
- * * `stagger` - A numeric time value representing the delay between successively animated elements
- * ({@link ngAnimate#css-staggering-animations Click here to learn how CSS-based staggering works in ngAnimate.})
- * * `staggerIndex` - The numeric index representing the stagger item (e.g. a value of 5 is equal to the sixth item in the stagger; therefore when a
- *   `stagger` option value of `0.1` is used then there will be a stagger delay of `600ms`)
- * * `applyClassesEarly` - Whether or not the classes being added or removed will be used when detecting the animation. This is set by `$animate` when enter/leave/move animations are fired to ensure that the CSS classes are resolved in time. (Note that this will prevent any transitions from occurring on the classes being added and removed.)
- * * `cleanupStyles` - Whether or not the provided `from` and `to` styles will be removed once
- *    the animation is closed. This is useful for when the styles are used purely for the sake of
- *    the animation and do not have a lasting visual effect on the element (e.g. a collapse and open animation).
- *    By default this value is set to `false`.
- *
- * @return {object} an object with start and end methods and details about the animation.
- *
- * * `start` - The method to start the animation. This will return a `Promise` when called.
- * * `end` - This method will cancel the animation and remove all applied CSS classes and styles.
- */
-var ONE_SECOND = 1000;
-var BASE_TEN = 10;
-
-var ELAPSED_TIME_MAX_DECIMAL_PLACES = 3;
-var CLOSING_TIME_BUFFER = 1.5;
-
-var DETECT_CSS_PROPERTIES = {
-  transitionDuration:      TRANSITION_DURATION_PROP,
-  transitionDelay:         TRANSITION_DELAY_PROP,
-  transitionProperty:      TRANSITION_PROP + PROPERTY_KEY,
-  animationDuration:       ANIMATION_DURATION_PROP,
-  animationDelay:          ANIMATION_DELAY_PROP,
-  animationIterationCount: ANIMATION_PROP + ANIMATION_ITERATION_COUNT_KEY
-};
-
-var DETECT_STAGGER_CSS_PROPERTIES = {
-  transitionDuration:      TRANSITION_DURATION_PROP,
-  transitionDelay:         TRANSITION_DELAY_PROP,
-  animationDuration:       ANIMATION_DURATION_PROP,
-  animationDelay:          ANIMATION_DELAY_PROP
-};
-
-function getCssKeyframeDurationStyle(duration) {
-  return [ANIMATION_DURATION_PROP, duration + 's'];
-}
-
-function getCssDelayStyle(delay, isKeyframeAnimation) {
-  var prop = isKeyframeAnimation ? ANIMATION_DELAY_PROP : TRANSITION_DELAY_PROP;
-  return [prop, delay + 's'];
-}
-
-function computeCssStyles($window, element, properties) {
-  var styles = Object.create(null);
-  var detectedStyles = $window.getComputedStyle(element) || {};
-  forEach(properties, function(formalStyleName, actualStyleName) {
-    var val = detectedStyles[formalStyleName];
-    if (val) {
-      var c = val.charAt(0);
-
-      // only numerical-based values have a negative sign or digit as the first value
-      if (c === '-' || c === '+' || c >= 0) {
-        val = parseMaxTime(val);
-      }
-
-      // by setting this to null in the event that the delay is not set or is set directly as 0
-      // then we can still allow for negative values to be used later on and not mistake this
-      // value for being greater than any other negative value.
-      if (val === 0) {
-        val = null;
-      }
-      styles[actualStyleName] = val;
-    }
-  });
-
-  return styles;
-}
-
-function parseMaxTime(str) {
-  var maxValue = 0;
-  var values = str.split(/\s*,\s*/);
-  forEach(values, function(value) {
-    // it's always safe to consider only second values and omit `ms` values since
-    // getComputedStyle will always handle the conversion for us
-    if (value.charAt(value.length - 1) == 's') {
-      value = value.substring(0, value.length - 1);
-    }
-    value = parseFloat(value) || 0;
-    maxValue = maxValue ? Math.max(value, maxValue) : value;
-  });
-  return maxValue;
-}
-
-function truthyTimingValue(val) {
-  return val === 0 || val != null;
-}
-
-function getCssTransitionDurationStyle(duration, applyOnlyDuration) {
-  var style = TRANSITION_PROP;
-  var value = duration + 's';
-  if (applyOnlyDuration) {
-    style += DURATION_KEY;
-  } else {
-    value += ' linear all';
-  }
-  return [style, value];
-}
-
-function createLocalCacheLookup() {
-  var cache = Object.create(null);
-  return {
-    flush: function() {
-      cache = Object.create(null);
-    },
-
-    count: function(key) {
-      var entry = cache[key];
-      return entry ? entry.total : 0;
-    },
-
-    get: function(key) {
-      var entry = cache[key];
-      return entry && entry.value;
-    },
-
-    put: function(key, value) {
-      if (!cache[key]) {
-        cache[key] = { total: 1, value: value };
-      } else {
-        cache[key].total++;
-      }
-    }
-  };
-}
-
-// we do not reassign an already present style value since
-// if we detect the style property value again we may be
-// detecting styles that were added via the `from` styles.
-// We make use of `isDefined` here since an empty string
-// or null value (which is what getPropertyValue will return
-// for a non-existing style) will still be marked as a valid
-// value for the style (a falsy value implies that the style
-// is to be removed at the end of the animation). If we had a simple
-// "OR" statement then it would not be enough to catch that.
-function registerRestorableStyles(backup, node, properties) {
-  forEach(properties, function(prop) {
-    backup[prop] = isDefined(backup[prop])
-        ? backup[prop]
-        : node.style.getPropertyValue(prop);
-  });
-}
-
-var $AnimateCssProvider = ['$animateProvider', function($animateProvider) {
-  var gcsLookup = createLocalCacheLookup();
-  var gcsStaggerLookup = createLocalCacheLookup();
-
-  this.$get = ['$window', '$$jqLite', '$$AnimateRunner', '$timeout',
-               '$$forceReflow', '$sniffer', '$$rAFScheduler', '$$animateQueue',
-       function($window,   $$jqLite,   $$AnimateRunner,   $timeout,
-                $$forceReflow,   $sniffer,   $$rAFScheduler, $$animateQueue) {
-
-    var applyAnimationClasses = applyAnimationClassesFactory($$jqLite);
-
-    var parentCounter = 0;
-    function gcsHashFn(node, extraClasses) {
-      var KEY = "$$ngAnimateParentKey";
-      var parentNode = node.parentNode;
-      var parentID = parentNode[KEY] || (parentNode[KEY] = ++parentCounter);
-      return parentID + '-' + node.getAttribute('class') + '-' + extraClasses;
-    }
-
-    function computeCachedCssStyles(node, className, cacheKey, properties) {
-      var timings = gcsLookup.get(cacheKey);
-
-      if (!timings) {
-        timings = computeCssStyles($window, node, properties);
-        if (timings.animationIterationCount === 'infinite') {
-          timings.animationIterationCount = 1;
-        }
-      }
-
-      // we keep putting this in multiple times even though the value and the cacheKey are the same
-      // because we're keeping an internal tally of how many duplicate animations are detected.
-      gcsLookup.put(cacheKey, timings);
-      return timings;
-    }
-
-    function computeCachedCssStaggerStyles(node, className, cacheKey, properties) {
-      var stagger;
-
-      // if we have one or more existing matches of matching elements
-      // containing the same parent + CSS styles (which is how cacheKey works)
-      // then staggering is possible
-      if (gcsLookup.count(cacheKey) > 0) {
-        stagger = gcsStaggerLookup.get(cacheKey);
-
-        if (!stagger) {
-          var staggerClassName = pendClasses(className, '-stagger');
-
-          $$jqLite.addClass(node, staggerClassName);
-
-          stagger = computeCssStyles($window, node, properties);
-
-          // force the conversion of a null value to zero incase not set
-          stagger.animationDuration = Math.max(stagger.animationDuration, 0);
-          stagger.transitionDuration = Math.max(stagger.transitionDuration, 0);
-
-          $$jqLite.removeClass(node, staggerClassName);
-
-          gcsStaggerLookup.put(cacheKey, stagger);
-        }
-      }
-
-      return stagger || {};
-    }
-
-    var cancelLastRAFRequest;
-    var rafWaitQueue = [];
-    function waitUntilQuiet(callback) {
-      rafWaitQueue.push(callback);
-      $$rAFScheduler.waitUntilQuiet(function() {
-        gcsLookup.flush();
-        gcsStaggerLookup.flush();
-
-        // DO NOT REMOVE THIS LINE OR REFACTOR OUT THE `pageWidth` variable.
-        // PLEASE EXAMINE THE `$$forceReflow` service to understand why.
-        var pageWidth = $$forceReflow();
-
-        // we use a for loop to ensure that if the queue is changed
-        // during this looping then it will consider new requests
-        for (var i = 0; i < rafWaitQueue.length; i++) {
-          rafWaitQueue[i](pageWidth);
-        }
-        rafWaitQueue.length = 0;
-      });
-    }
-
-    function computeTimings(node, className, cacheKey) {
-      var timings = computeCachedCssStyles(node, className, cacheKey, DETECT_CSS_PROPERTIES);
-      var aD = timings.animationDelay;
-      var tD = timings.transitionDelay;
-      timings.maxDelay = aD && tD
-          ? Math.max(aD, tD)
-          : (aD || tD);
-      timings.maxDuration = Math.max(
-          timings.animationDuration * timings.animationIterationCount,
-          timings.transitionDuration);
-
-      return timings;
-    }
-
-    return function init(element, initialOptions) {
-      // all of the animation functions should create
-      // a copy of the options data, however, if a
-      // parent service has already created a copy then
-      // we should stick to using that
-      var options = initialOptions || {};
-      if (!options.$$prepared) {
-        options = prepareAnimationOptions(copy(options));
-      }
-
-      var restoreStyles = {};
-      var node = getDomNode(element);
-      if (!node
-          || !node.parentNode
-          || !$$animateQueue.enabled()) {
-        return closeAndReturnNoopAnimator();
-      }
-
-      var temporaryStyles = [];
-      var classes = element.attr('class');
-      var styles = packageStyles(options);
-      var animationClosed;
-      var animationPaused;
-      var animationCompleted;
-      var runner;
-      var runnerHost;
-      var maxDelay;
-      var maxDelayTime;
-      var maxDuration;
-      var maxDurationTime;
-      var startTime;
-      var events = [];
-
-      if (options.duration === 0 || (!$sniffer.animations && !$sniffer.transitions)) {
-        return closeAndReturnNoopAnimator();
-      }
-
-      var method = options.event && isArray(options.event)
-            ? options.event.join(' ')
-            : options.event;
-
-      var isStructural = method && options.structural;
-      var structuralClassName = '';
-      var addRemoveClassName = '';
-
-      if (isStructural) {
-        structuralClassName = pendClasses(method, EVENT_CLASS_PREFIX, true);
-      } else if (method) {
-        structuralClassName = method;
-      }
-
-      if (options.addClass) {
-        addRemoveClassName += pendClasses(options.addClass, ADD_CLASS_SUFFIX);
-      }
-
-      if (options.removeClass) {
-        if (addRemoveClassName.length) {
-          addRemoveClassName += ' ';
-        }
-        addRemoveClassName += pendClasses(options.removeClass, REMOVE_CLASS_SUFFIX);
-      }
-
-      // there may be a situation where a structural animation is combined together
-      // with CSS classes that need to resolve before the animation is computed.
-      // However this means that there is no explicit CSS code to block the animation
-      // from happening (by setting 0s none in the class name). If this is the case
-      // we need to apply the classes before the first rAF so we know to continue if
-      // there actually is a detected transition or keyframe animation
-      if (options.applyClassesEarly && addRemoveClassName.length) {
-        applyAnimationClasses(element, options);
-      }
-
-      var preparationClasses = [structuralClassName, addRemoveClassName].join(' ').trim();
-      var fullClassName = classes + ' ' + preparationClasses;
-      var activeClasses = pendClasses(preparationClasses, ACTIVE_CLASS_SUFFIX);
-      var hasToStyles = styles.to && Object.keys(styles.to).length > 0;
-      var containsKeyframeAnimation = (options.keyframeStyle || '').length > 0;
-
-      // there is no way we can trigger an animation if no styles and
-      // no classes are being applied which would then trigger a transition,
-      // unless there a is raw keyframe value that is applied to the element.
-      if (!containsKeyframeAnimation
-           && !hasToStyles
-           && !preparationClasses) {
-        return closeAndReturnNoopAnimator();
-      }
-
-      var cacheKey, stagger;
-      if (options.stagger > 0) {
-        var staggerVal = parseFloat(options.stagger);
-        stagger = {
-          transitionDelay: staggerVal,
-          animationDelay: staggerVal,
-          transitionDuration: 0,
-          animationDuration: 0
-        };
-      } else {
-        cacheKey = gcsHashFn(node, fullClassName);
-        stagger = computeCachedCssStaggerStyles(node, preparationClasses, cacheKey, DETECT_STAGGER_CSS_PROPERTIES);
-      }
-
-      if (!options.$$skipPreparationClasses) {
-        $$jqLite.addClass(element, preparationClasses);
-      }
-
-      var applyOnlyDuration;
-
-      if (options.transitionStyle) {
-        var transitionStyle = [TRANSITION_PROP, options.transitionStyle];
-        applyInlineStyle(node, transitionStyle);
-        temporaryStyles.push(transitionStyle);
-      }
-
-      if (options.duration >= 0) {
-        applyOnlyDuration = node.style[TRANSITION_PROP].length > 0;
-        var durationStyle = getCssTransitionDurationStyle(options.duration, applyOnlyDuration);
-
-        // we set the duration so that it will be picked up by getComputedStyle later
-        applyInlineStyle(node, durationStyle);
-        temporaryStyles.push(durationStyle);
-      }
-
-      if (options.keyframeStyle) {
-        var keyframeStyle = [ANIMATION_PROP, options.keyframeStyle];
-        applyInlineStyle(node, keyframeStyle);
-        temporaryStyles.push(keyframeStyle);
-      }
-
-      var itemIndex = stagger
-          ? options.staggerIndex >= 0
-              ? options.staggerIndex
-              : gcsLookup.count(cacheKey)
-          : 0;
-
-      var isFirst = itemIndex === 0;
-
-      // this is a pre-emptive way of forcing the setup classes to be added and applied INSTANTLY
-      // without causing any combination of transitions to kick in. By adding a negative delay value
-      // it forces the setup class' transition to end immediately. We later then remove the negative
-      // transition delay to allow for the transition to naturally do it's thing. The beauty here is
-      // that if there is no transition defined then nothing will happen and this will also allow
-      // other transitions to be stacked on top of each other without any chopping them out.
-      if (isFirst && !options.skipBlocking) {
-        blockTransitions(node, SAFE_FAST_FORWARD_DURATION_VALUE);
-      }
-
-      var timings = computeTimings(node, fullClassName, cacheKey);
-      var relativeDelay = timings.maxDelay;
-      maxDelay = Math.max(relativeDelay, 0);
-      maxDuration = timings.maxDuration;
-
-      var flags = {};
-      flags.hasTransitions          = timings.transitionDuration > 0;
-      flags.hasAnimations           = timings.animationDuration > 0;
-      flags.hasTransitionAll        = flags.hasTransitions && timings.transitionProperty == 'all';
-      flags.applyTransitionDuration = hasToStyles && (
-                                        (flags.hasTransitions && !flags.hasTransitionAll)
-                                         || (flags.hasAnimations && !flags.hasTransitions));
-      flags.applyAnimationDuration  = options.duration && flags.hasAnimations;
-      flags.applyTransitionDelay    = truthyTimingValue(options.delay) && (flags.applyTransitionDuration || flags.hasTransitions);
-      flags.applyAnimationDelay     = truthyTimingValue(options.delay) && flags.hasAnimations;
-      flags.recalculateTimingStyles = addRemoveClassName.length > 0;
-
-      if (flags.applyTransitionDuration || flags.applyAnimationDuration) {
-        maxDuration = options.duration ? parseFloat(options.duration) : maxDuration;
-
-        if (flags.applyTransitionDuration) {
-          flags.hasTransitions = true;
-          timings.transitionDuration = maxDuration;
-          applyOnlyDuration = node.style[TRANSITION_PROP + PROPERTY_KEY].length > 0;
-          temporaryStyles.push(getCssTransitionDurationStyle(maxDuration, applyOnlyDuration));
-        }
-
-        if (flags.applyAnimationDuration) {
-          flags.hasAnimations = true;
-          timings.animationDuration = maxDuration;
-          temporaryStyles.push(getCssKeyframeDurationStyle(maxDuration));
-        }
-      }
-
-      if (maxDuration === 0 && !flags.recalculateTimingStyles) {
-        return closeAndReturnNoopAnimator();
-      }
-
-      if (options.delay != null) {
-        var delayStyle;
-        if (typeof options.delay !== "boolean") {
-          delayStyle = parseFloat(options.delay);
-          // number in options.delay means we have to recalculate the delay for the closing timeout
-          maxDelay = Math.max(delayStyle, 0);
-        }
-
-        if (flags.applyTransitionDelay) {
-          temporaryStyles.push(getCssDelayStyle(delayStyle));
-        }
-
-        if (flags.applyAnimationDelay) {
-          temporaryStyles.push(getCssDelayStyle(delayStyle, true));
-        }
-      }
-
-      // we need to recalculate the delay value since we used a pre-emptive negative
-      // delay value and the delay value is required for the final event checking. This
-      // property will ensure that this will happen after the RAF phase has passed.
-      if (options.duration == null && timings.transitionDuration > 0) {
-        flags.recalculateTimingStyles = flags.recalculateTimingStyles || isFirst;
-      }
-
-      maxDelayTime = maxDelay * ONE_SECOND;
-      maxDurationTime = maxDuration * ONE_SECOND;
-      if (!options.skipBlocking) {
-        flags.blockTransition = timings.transitionDuration > 0;
-        flags.blockKeyframeAnimation = timings.animationDuration > 0 &&
-                                       stagger.animationDelay > 0 &&
-                                       stagger.animationDuration === 0;
-      }
-
-      if (options.from) {
-        if (options.cleanupStyles) {
-          registerRestorableStyles(restoreStyles, node, Object.keys(options.from));
-        }
-        applyAnimationFromStyles(element, options);
-      }
-
-      if (flags.blockTransition || flags.blockKeyframeAnimation) {
-        applyBlocking(maxDuration);
-      } else if (!options.skipBlocking) {
-        blockTransitions(node, false);
-      }
-
-      // TODO(matsko): for 1.5 change this code to have an animator object for better debugging
-      return {
-        $$willAnimate: true,
-        end: endFn,
-        start: function() {
-          if (animationClosed) return;
-
-          runnerHost = {
-            end: endFn,
-            cancel: cancelFn,
-            resume: null, //this will be set during the start() phase
-            pause: null
-          };
-
-          runner = new $$AnimateRunner(runnerHost);
-
-          waitUntilQuiet(start);
-
-          // we don't have access to pause/resume the animation
-          // since it hasn't run yet. AnimateRunner will therefore
-          // set noop functions for resume and pause and they will
-          // later be overridden once the animation is triggered
-          return runner;
-        }
-      };
-
-      function endFn() {
-        close();
-      }
-
-      function cancelFn() {
-        close(true);
-      }
-
-      function close(rejected) { // jshint ignore:line
-        // if the promise has been called already then we shouldn't close
-        // the animation again
-        if (animationClosed || (animationCompleted && animationPaused)) return;
-        animationClosed = true;
-        animationPaused = false;
-
-        if (!options.$$skipPreparationClasses) {
-          $$jqLite.removeClass(element, preparationClasses);
-        }
-        $$jqLite.removeClass(element, activeClasses);
-
-        blockKeyframeAnimations(node, false);
-        blockTransitions(node, false);
-
-        forEach(temporaryStyles, function(entry) {
-          // There is only one way to remove inline style properties entirely from elements.
-          // By using `removeProperty` this works, but we need to convert camel-cased CSS
-          // styles down to hyphenated values.
-          node.style[entry[0]] = '';
-        });
-
-        applyAnimationClasses(element, options);
-        applyAnimationStyles(element, options);
-
-        if (Object.keys(restoreStyles).length) {
-          forEach(restoreStyles, function(value, prop) {
-            value ? node.style.setProperty(prop, value)
-                  : node.style.removeProperty(prop);
-          });
-        }
-
-        // the reason why we have this option is to allow a synchronous closing callback
-        // that is fired as SOON as the animation ends (when the CSS is removed) or if
-        // the animation never takes off at all. A good example is a leave animation since
-        // the element must be removed just after the animation is over or else the element
-        // will appear on screen for one animation frame causing an overbearing flicker.
-        if (options.onDone) {
-          options.onDone();
-        }
-
-        if (events && events.length) {
-          // Remove the transitionend / animationend listener(s)
-          element.off(events.join(' '), onAnimationProgress);
-        }
-
-        //Cancel the fallback closing timeout and remove the timer data
-        var animationTimerData = element.data(ANIMATE_TIMER_KEY);
-        if (animationTimerData) {
-          $timeout.cancel(animationTimerData[0].timer);
-          element.removeData(ANIMATE_TIMER_KEY);
-        }
-
-        // if the preparation function fails then the promise is not setup
-        if (runner) {
-          runner.complete(!rejected);
-        }
-      }
-
-      function applyBlocking(duration) {
-        if (flags.blockTransition) {
-          blockTransitions(node, duration);
-        }
-
-        if (flags.blockKeyframeAnimation) {
-          blockKeyframeAnimations(node, !!duration);
-        }
-      }
-
-      function closeAndReturnNoopAnimator() {
-        runner = new $$AnimateRunner({
-          end: endFn,
-          cancel: cancelFn
-        });
-
-        // should flush the cache animation
-        waitUntilQuiet(noop);
-        close();
-
-        return {
-          $$willAnimate: false,
-          start: function() {
-            return runner;
-          },
-          end: endFn
-        };
-      }
-
-      function onAnimationProgress(event) {
-        event.stopPropagation();
-        var ev = event.originalEvent || event;
-
-        // we now always use `Date.now()` due to the recent changes with
-        // event.timeStamp in Firefox, Webkit and Chrome (see #13494 for more info)
-        var timeStamp = ev.$manualTimeStamp || Date.now();
-
-        /* Firefox (or possibly just Gecko) likes to not round values up
-         * when a ms measurement is used for the animation */
-        var elapsedTime = parseFloat(ev.elapsedTime.toFixed(ELAPSED_TIME_MAX_DECIMAL_PLACES));
-
-        /* $manualTimeStamp is a mocked timeStamp value which is set
-         * within browserTrigger(). This is only here so that tests can
-         * mock animations properly. Real events fallback to event.timeStamp,
-         * or, if they don't, then a timeStamp is automatically created for them.
-         * We're checking to see if the timeStamp surpasses the expected delay,
-         * but we're using elapsedTime instead of the timeStamp on the 2nd
-         * pre-condition since animationPauseds sometimes close off early */
-        if (Math.max(timeStamp - startTime, 0) >= maxDelayTime && elapsedTime >= maxDuration) {
-          // we set this flag to ensure that if the transition is paused then, when resumed,
-          // the animation will automatically close itself since transitions cannot be paused.
-          animationCompleted = true;
-          close();
-        }
-      }
-
-      function start() {
-        if (animationClosed) return;
-        if (!node.parentNode) {
-          close();
-          return;
-        }
-
-        // even though we only pause keyframe animations here the pause flag
-        // will still happen when transitions are used. Only the transition will
-        // not be paused since that is not possible. If the animation ends when
-        // paused then it will not complete until unpaused or cancelled.
-        var playPause = function(playAnimation) {
-          if (!animationCompleted) {
-            animationPaused = !playAnimation;
-            if (timings.animationDuration) {
-              var value = blockKeyframeAnimations(node, animationPaused);
-              animationPaused
-                  ? temporaryStyles.push(value)
-                  : removeFromArray(temporaryStyles, value);
-            }
-          } else if (animationPaused && playAnimation) {
-            animationPaused = false;
-            close();
-          }
-        };
-
-        // checking the stagger duration prevents an accidentally cascade of the CSS delay style
-        // being inherited from the parent. If the transition duration is zero then we can safely
-        // rely that the delay value is an intentional stagger delay style.
-        var maxStagger = itemIndex > 0
-                         && ((timings.transitionDuration && stagger.transitionDuration === 0) ||
-                            (timings.animationDuration && stagger.animationDuration === 0))
-                         && Math.max(stagger.animationDelay, stagger.transitionDelay);
-        if (maxStagger) {
-          $timeout(triggerAnimationStart,
-                   Math.floor(maxStagger * itemIndex * ONE_SECOND),
-                   false);
-        } else {
-          triggerAnimationStart();
-        }
-
-        // this will decorate the existing promise runner with pause/resume methods
-        runnerHost.resume = function() {
-          playPause(true);
-        };
-
-        runnerHost.pause = function() {
-          playPause(false);
-        };
-
-        function triggerAnimationStart() {
-          // just incase a stagger animation kicks in when the animation
-          // itself was cancelled entirely
-          if (animationClosed) return;
-
-          applyBlocking(false);
-
-          forEach(temporaryStyles, function(entry) {
-            var key = entry[0];
-            var value = entry[1];
-            node.style[key] = value;
-          });
-
-          applyAnimationClasses(element, options);
-          $$jqLite.addClass(element, activeClasses);
-
-          if (flags.recalculateTimingStyles) {
-            fullClassName = node.className + ' ' + preparationClasses;
-            cacheKey = gcsHashFn(node, fullClassName);
-
-            timings = computeTimings(node, fullClassName, cacheKey);
-            relativeDelay = timings.maxDelay;
-            maxDelay = Math.max(relativeDelay, 0);
-            maxDuration = timings.maxDuration;
-
-            if (maxDuration === 0) {
-              close();
-              return;
-            }
-
-            flags.hasTransitions = timings.transitionDuration > 0;
-            flags.hasAnimations = timings.animationDuration > 0;
-          }
-
-          if (flags.applyAnimationDelay) {
-            relativeDelay = typeof options.delay !== "boolean" && truthyTimingValue(options.delay)
-                  ? parseFloat(options.delay)
-                  : relativeDelay;
-
-            maxDelay = Math.max(relativeDelay, 0);
-            timings.animationDelay = relativeDelay;
-            delayStyle = getCssDelayStyle(relativeDelay, true);
-            temporaryStyles.push(delayStyle);
-            node.style[delayStyle[0]] = delayStyle[1];
-          }
-
-          maxDelayTime = maxDelay * ONE_SECOND;
-          maxDurationTime = maxDuration * ONE_SECOND;
-
-          if (options.easing) {
-            var easeProp, easeVal = options.easing;
-            if (flags.hasTransitions) {
-              easeProp = TRANSITION_PROP + TIMING_KEY;
-              temporaryStyles.push([easeProp, easeVal]);
-              node.style[easeProp] = easeVal;
-            }
-            if (flags.hasAnimations) {
-              easeProp = ANIMATION_PROP + TIMING_KEY;
-              temporaryStyles.push([easeProp, easeVal]);
-              node.style[easeProp] = easeVal;
-            }
-          }
-
-          if (timings.transitionDuration) {
-            events.push(TRANSITIONEND_EVENT);
-          }
-
-          if (timings.animationDuration) {
-            events.push(ANIMATIONEND_EVENT);
-          }
-
-          startTime = Date.now();
-          var timerTime = maxDelayTime + CLOSING_TIME_BUFFER * maxDurationTime;
-          var endTime = startTime + timerTime;
-
-          var animationsData = element.data(ANIMATE_TIMER_KEY) || [];
-          var setupFallbackTimer = true;
-          if (animationsData.length) {
-            var currentTimerData = animationsData[0];
-            setupFallbackTimer = endTime > currentTimerData.expectedEndTime;
-            if (setupFallbackTimer) {
-              $timeout.cancel(currentTimerData.timer);
-            } else {
-              animationsData.push(close);
-            }
-          }
-
-          if (setupFallbackTimer) {
-            var timer = $timeout(onAnimationExpired, timerTime, false);
-            animationsData[0] = {
-              timer: timer,
-              expectedEndTime: endTime
-            };
-            animationsData.push(close);
-            element.data(ANIMATE_TIMER_KEY, animationsData);
-          }
-
-          if (events.length) {
-            element.on(events.join(' '), onAnimationProgress);
-          }
-
-          if (options.to) {
-            if (options.cleanupStyles) {
-              registerRestorableStyles(restoreStyles, node, Object.keys(options.to));
-            }
-            applyAnimationToStyles(element, options);
-          }
-        }
-
-        function onAnimationExpired() {
-          var animationsData = element.data(ANIMATE_TIMER_KEY);
-
-          // this will be false in the event that the element was
-          // removed from the DOM (via a leave animation or something
-          // similar)
-          if (animationsData) {
-            for (var i = 1; i < animationsData.length; i++) {
-              animationsData[i]();
-            }
-            element.removeData(ANIMATE_TIMER_KEY);
-          }
-        }
-      }
-    };
-  }];
-}];
-
-var $$AnimateCssDriverProvider = ['$$animationProvider', function($$animationProvider) {
-  $$animationProvider.drivers.push('$$animateCssDriver');
-
-  var NG_ANIMATE_SHIM_CLASS_NAME = 'ng-animate-shim';
-  var NG_ANIMATE_ANCHOR_CLASS_NAME = 'ng-anchor';
-
-  var NG_OUT_ANCHOR_CLASS_NAME = 'ng-anchor-out';
-  var NG_IN_ANCHOR_CLASS_NAME = 'ng-anchor-in';
-
-  function isDocumentFragment(node) {
-    return node.parentNode && node.parentNode.nodeType === 11;
-  }
-
-  this.$get = ['$animateCss', '$rootScope', '$$AnimateRunner', '$rootElement', '$sniffer', '$$jqLite', '$document',
-       function($animateCss,   $rootScope,   $$AnimateRunner,   $rootElement,   $sniffer,   $$jqLite,   $document) {
-
-    // only browsers that support these properties can render animations
-    if (!$sniffer.animations && !$sniffer.transitions) return noop;
-
-    var bodyNode = $document[0].body;
-    var rootNode = getDomNode($rootElement);
-
-    var rootBodyElement = jqLite(
-      // this is to avoid using something that exists outside of the body
-      // we also special case the doc fragment case because our unit test code
-      // appends the $rootElement to the body after the app has been bootstrapped
-      isDocumentFragment(rootNode) || bodyNode.contains(rootNode) ? rootNode : bodyNode
-    );
-
-    var applyAnimationClasses = applyAnimationClassesFactory($$jqLite);
-
-    return function initDriverFn(animationDetails) {
-      return animationDetails.from && animationDetails.to
-          ? prepareFromToAnchorAnimation(animationDetails.from,
-                                         animationDetails.to,
-                                         animationDetails.classes,
-                                         animationDetails.anchors)
-          : prepareRegularAnimation(animationDetails);
-    };
-
-    function filterCssClasses(classes) {
-      //remove all the `ng-` stuff
-      return classes.replace(/\bng-\S+\b/g, '');
-    }
-
-    function getUniqueValues(a, b) {
-      if (isString(a)) a = a.split(' ');
-      if (isString(b)) b = b.split(' ');
-      return a.filter(function(val) {
-        return b.indexOf(val) === -1;
-      }).join(' ');
-    }
-
-    function prepareAnchoredAnimation(classes, outAnchor, inAnchor) {
-      var clone = jqLite(getDomNode(outAnchor).cloneNode(true));
-      var startingClasses = filterCssClasses(getClassVal(clone));
-
-      outAnchor.addClass(NG_ANIMATE_SHIM_CLASS_NAME);
-      inAnchor.addClass(NG_ANIMATE_SHIM_CLASS_NAME);
-
-      clone.addClass(NG_ANIMATE_ANCHOR_CLASS_NAME);
-
-      rootBodyElement.append(clone);
-
-      var animatorIn, animatorOut = prepareOutAnimation();
-
-      // the user may not end up using the `out` animation and
-      // only making use of the `in` animation or vice-versa.
-      // In either case we should allow this and not assume the
-      // animation is over unless both animations are not used.
-      if (!animatorOut) {
-        animatorIn = prepareInAnimation();
-        if (!animatorIn) {
-          return end();
-        }
-      }
-
-      var startingAnimator = animatorOut || animatorIn;
-
-      return {
-        start: function() {
-          var runner;
-
-          var currentAnimation = startingAnimator.start();
-          currentAnimation.done(function() {
-            currentAnimation = null;
-            if (!animatorIn) {
-              animatorIn = prepareInAnimation();
-              if (animatorIn) {
-                currentAnimation = animatorIn.start();
-                currentAnimation.done(function() {
-                  currentAnimation = null;
-                  end();
-                  runner.complete();
-                });
-                return currentAnimation;
-              }
-            }
-            // in the event that there is no `in` animation
-            end();
-            runner.complete();
-          });
-
-          runner = new $$AnimateRunner({
-            end: endFn,
-            cancel: endFn
-          });
-
-          return runner;
-
-          function endFn() {
-            if (currentAnimation) {
-              currentAnimation.end();
-            }
-          }
-        }
-      };
-
-      function calculateAnchorStyles(anchor) {
-        var styles = {};
-
-        var coords = getDomNode(anchor).getBoundingClientRect();
-
-        // we iterate directly since safari messes up and doesn't return
-        // all the keys for the coords object when iterated
-        forEach(['width','height','top','left'], function(key) {
-          var value = coords[key];
-          switch (key) {
-            case 'top':
-              value += bodyNode.scrollTop;
-              break;
-            case 'left':
-              value += bodyNode.scrollLeft;
-              break;
-          }
-          styles[key] = Math.floor(value) + 'px';
-        });
-        return styles;
-      }
-
-      function prepareOutAnimation() {
-        var animator = $animateCss(clone, {
-          addClass: NG_OUT_ANCHOR_CLASS_NAME,
-          delay: true,
-          from: calculateAnchorStyles(outAnchor)
-        });
-
-        // read the comment within `prepareRegularAnimation` to understand
-        // why this check is necessary
-        return animator.$$willAnimate ? animator : null;
-      }
-
-      function getClassVal(element) {
-        return element.attr('class') || '';
-      }
-
-      function prepareInAnimation() {
-        var endingClasses = filterCssClasses(getClassVal(inAnchor));
-        var toAdd = getUniqueValues(endingClasses, startingClasses);
-        var toRemove = getUniqueValues(startingClasses, endingClasses);
-
-        var animator = $animateCss(clone, {
-          to: calculateAnchorStyles(inAnchor),
-          addClass: NG_IN_ANCHOR_CLASS_NAME + ' ' + toAdd,
-          removeClass: NG_OUT_ANCHOR_CLASS_NAME + ' ' + toRemove,
-          delay: true
-        });
-
-        // read the comment within `prepareRegularAnimation` to understand
-        // why this check is necessary
-        return animator.$$willAnimate ? animator : null;
-      }
-
-      function end() {
-        clone.remove();
-        outAnchor.removeClass(NG_ANIMATE_SHIM_CLASS_NAME);
-        inAnchor.removeClass(NG_ANIMATE_SHIM_CLASS_NAME);
-      }
-    }
-
-    function prepareFromToAnchorAnimation(from, to, classes, anchors) {
-      var fromAnimation = prepareRegularAnimation(from, noop);
-      var toAnimation = prepareRegularAnimation(to, noop);
-
-      var anchorAnimations = [];
-      forEach(anchors, function(anchor) {
-        var outElement = anchor['out'];
-        var inElement = anchor['in'];
-        var animator = prepareAnchoredAnimation(classes, outElement, inElement);
-        if (animator) {
-          anchorAnimations.push(animator);
-        }
-      });
-
-      // no point in doing anything when there are no elements to animate
-      if (!fromAnimation && !toAnimation && anchorAnimations.length === 0) return;
-
-      return {
-        start: function() {
-          var animationRunners = [];
-
-          if (fromAnimation) {
-            animationRunners.push(fromAnimation.start());
-          }
-
-          if (toAnimation) {
-            animationRunners.push(toAnimation.start());
-          }
-
-          forEach(anchorAnimations, function(animation) {
-            animationRunners.push(animation.start());
-          });
-
-          var runner = new $$AnimateRunner({
-            end: endFn,
-            cancel: endFn // CSS-driven animations cannot be cancelled, only ended
-          });
-
-          $$AnimateRunner.all(animationRunners, function(status) {
-            runner.complete(status);
-          });
-
-          return runner;
-
-          function endFn() {
-            forEach(animationRunners, function(runner) {
-              runner.end();
-            });
-          }
-        }
-      };
-    }
-
-    function prepareRegularAnimation(animationDetails) {
-      var element = animationDetails.element;
-      var options = animationDetails.options || {};
-
-      if (animationDetails.structural) {
-        options.event = animationDetails.event;
-        options.structural = true;
-        options.applyClassesEarly = true;
-
-        // we special case the leave animation since we want to ensure that
-        // the element is removed as soon as the animation is over. Otherwise
-        // a flicker might appear or the element may not be removed at all
-        if (animationDetails.event === 'leave') {
-          options.onDone = options.domOperation;
-        }
-      }
-
-      // We assign the preparationClasses as the actual animation event since
-      // the internals of $animateCss will just suffix the event token values
-      // with `-active` to trigger the animation.
-      if (options.preparationClasses) {
-        options.event = concatWithSpace(options.event, options.preparationClasses);
-      }
-
-      var animator = $animateCss(element, options);
-
-      // the driver lookup code inside of $$animation attempts to spawn a
-      // driver one by one until a driver returns a.$$willAnimate animator object.
-      // $animateCss will always return an object, however, it will pass in
-      // a flag as a hint as to whether an animation was detected or not
-      return animator.$$willAnimate ? animator : null;
-    }
-  }];
-}];
-
-// TODO(matsko): use caching here to speed things up for detection
-// TODO(matsko): add documentation
-//  by the time...
-
-var $$AnimateJsProvider = ['$animateProvider', function($animateProvider) {
-  this.$get = ['$injector', '$$AnimateRunner', '$$jqLite',
-       function($injector,   $$AnimateRunner,   $$jqLite) {
-
-    var applyAnimationClasses = applyAnimationClassesFactory($$jqLite);
-         // $animateJs(element, 'enter');
-    return function(element, event, classes, options) {
-      var animationClosed = false;
-
-      // the `classes` argument is optional and if it is not used
-      // then the classes will be resolved from the element's className
-      // property as well as options.addClass/options.removeClass.
-      if (arguments.length === 3 && isObject(classes)) {
-        options = classes;
-        classes = null;
-      }
-
-      options = prepareAnimationOptions(options);
-      if (!classes) {
-        classes = element.attr('class') || '';
-        if (options.addClass) {
-          classes += ' ' + options.addClass;
-        }
-        if (options.removeClass) {
-          classes += ' ' + options.removeClass;
-        }
-      }
-
-      var classesToAdd = options.addClass;
-      var classesToRemove = options.removeClass;
-
-      // the lookupAnimations function returns a series of animation objects that are
-      // matched up with one or more of the CSS classes. These animation objects are
-      // defined via the module.animation factory function. If nothing is detected then
-      // we don't return anything which then makes $animation query the next driver.
-      var animations = lookupAnimations(classes);
-      var before, after;
-      if (animations.length) {
-        var afterFn, beforeFn;
-        if (event == 'leave') {
-          beforeFn = 'leave';
-          afterFn = 'afterLeave'; // TODO(matsko): get rid of this
-        } else {
-          beforeFn = 'before' + event.charAt(0).toUpperCase() + event.substr(1);
-          afterFn = event;
-        }
-
-        if (event !== 'enter' && event !== 'move') {
-          before = packageAnimations(element, event, options, animations, beforeFn);
-        }
-        after  = packageAnimations(element, event, options, animations, afterFn);
-      }
-
-      // no matching animations
-      if (!before && !after) return;
-
-      function applyOptions() {
-        options.domOperation();
-        applyAnimationClasses(element, options);
-      }
-
-      function close() {
-        animationClosed = true;
-        applyOptions();
-        applyAnimationStyles(element, options);
-      }
-
-      var runner;
-
-      return {
-        $$willAnimate: true,
-        end: function() {
-          if (runner) {
-            runner.end();
-          } else {
-            close();
-            runner = new $$AnimateRunner();
-            runner.complete(true);
-          }
-          return runner;
-        },
-        start: function() {
-          if (runner) {
-            return runner;
-          }
-
-          runner = new $$AnimateRunner();
-          var closeActiveAnimations;
-          var chain = [];
-
-          if (before) {
-            chain.push(function(fn) {
-              closeActiveAnimations = before(fn);
-            });
-          }
-
-          if (chain.length) {
-            chain.push(function(fn) {
-              applyOptions();
-              fn(true);
-            });
-          } else {
-            applyOptions();
-          }
-
-          if (after) {
-            chain.push(function(fn) {
-              closeActiveAnimations = after(fn);
-            });
-          }
-
-          runner.setHost({
-            end: function() {
-              endAnimations();
-            },
-            cancel: function() {
-              endAnimations(true);
-            }
-          });
-
-          $$AnimateRunner.chain(chain, onComplete);
-          return runner;
-
-          function onComplete(success) {
-            close(success);
-            runner.complete(success);
-          }
-
-          function endAnimations(cancelled) {
-            if (!animationClosed) {
-              (closeActiveAnimations || noop)(cancelled);
-              onComplete(cancelled);
-            }
-          }
-        }
-      };
-
-      function executeAnimationFn(fn, element, event, options, onDone) {
-        var args;
-        switch (event) {
-          case 'animate':
-            args = [element, options.from, options.to, onDone];
-            break;
-
-          case 'setClass':
-            args = [element, classesToAdd, classesToRemove, onDone];
-            break;
-
-          case 'addClass':
-            args = [element, classesToAdd, onDone];
-            break;
-
-          case 'removeClass':
-            args = [element, classesToRemove, onDone];
-            break;
-
-          default:
-            args = [element, onDone];
-            break;
-        }
-
-        args.push(options);
-
-        var value = fn.apply(fn, args);
-        if (value) {
-          if (isFunction(value.start)) {
-            value = value.start();
-          }
-
-          if (value instanceof $$AnimateRunner) {
-            value.done(onDone);
-          } else if (isFunction(value)) {
-            // optional onEnd / onCancel callback
-            return value;
-          }
-        }
-
-        return noop;
-      }
-
-      function groupEventedAnimations(element, event, options, animations, fnName) {
-        var operations = [];
-        forEach(animations, function(ani) {
-          var animation = ani[fnName];
-          if (!animation) return;
-
-          // note that all of these animations will run in parallel
-          operations.push(function() {
-            var runner;
-            var endProgressCb;
-
-            var resolved = false;
-            var onAnimationComplete = function(rejected) {
-              if (!resolved) {
-                resolved = true;
-                (endProgressCb || noop)(rejected);
-                runner.complete(!rejected);
-              }
-            };
-
-            runner = new $$AnimateRunner({
-              end: function() {
-                onAnimationComplete();
-              },
-              cancel: function() {
-                onAnimationComplete(true);
-              }
-            });
-
-            endProgressCb = executeAnimationFn(animation, element, event, options, function(result) {
-              var cancelled = result === false;
-              onAnimationComplete(cancelled);
-            });
-
-            return runner;
-          });
-        });
-
-        return operations;
-      }
-
-      function packageAnimations(element, event, options, animations, fnName) {
-        var operations = groupEventedAnimations(element, event, options, animations, fnName);
-        if (operations.length === 0) {
-          var a,b;
-          if (fnName === 'beforeSetClass') {
-            a = groupEventedAnimations(element, 'removeClass', options, animations, 'beforeRemoveClass');
-            b = groupEventedAnimations(element, 'addClass', options, animations, 'beforeAddClass');
-          } else if (fnName === 'setClass') {
-            a = groupEventedAnimations(element, 'removeClass', options, animations, 'removeClass');
-            b = groupEventedAnimations(element, 'addClass', options, animations, 'addClass');
-          }
-
-          if (a) {
-            operations = operations.concat(a);
-          }
-          if (b) {
-            operations = operations.concat(b);
-          }
-        }
-
-        if (operations.length === 0) return;
-
-        // TODO(matsko): add documentation
-        return function startAnimation(callback) {
-          var runners = [];
-          if (operations.length) {
-            forEach(operations, function(animateFn) {
-              runners.push(animateFn());
-            });
-          }
-
-          runners.length ? $$AnimateRunner.all(runners, callback) : callback();
-
-          return function endFn(reject) {
-            forEach(runners, function(runner) {
-              reject ? runner.cancel() : runner.end();
-            });
-          };
-        };
-      }
-    };
-
-    function lookupAnimations(classes) {
-      classes = isArray(classes) ? classes : classes.split(' ');
-      var matches = [], flagMap = {};
-      for (var i=0; i < classes.length; i++) {
-        var klass = classes[i],
-            animationFactory = $animateProvider.$$registeredAnimations[klass];
-        if (animationFactory && !flagMap[klass]) {
-          matches.push($injector.get(animationFactory));
-          flagMap[klass] = true;
-        }
-      }
-      return matches;
-    }
-  }];
-}];
-
-var $$AnimateJsDriverProvider = ['$$animationProvider', function($$animationProvider) {
-  $$animationProvider.drivers.push('$$animateJsDriver');
-  this.$get = ['$$animateJs', '$$AnimateRunner', function($$animateJs, $$AnimateRunner) {
-    return function initDriverFn(animationDetails) {
-      if (animationDetails.from && animationDetails.to) {
-        var fromAnimation = prepareAnimation(animationDetails.from);
-        var toAnimation = prepareAnimation(animationDetails.to);
-        if (!fromAnimation && !toAnimation) return;
-
-        return {
-          start: function() {
-            var animationRunners = [];
-
-            if (fromAnimation) {
-              animationRunners.push(fromAnimation.start());
-            }
-
-            if (toAnimation) {
-              animationRunners.push(toAnimation.start());
-            }
-
-            $$AnimateRunner.all(animationRunners, done);
-
-            var runner = new $$AnimateRunner({
-              end: endFnFactory(),
-              cancel: endFnFactory()
-            });
-
-            return runner;
-
-            function endFnFactory() {
-              return function() {
-                forEach(animationRunners, function(runner) {
-                  // at this point we cannot cancel animations for groups just yet. 1.5+
-                  runner.end();
-                });
-              };
-            }
-
-            function done(status) {
-              runner.complete(status);
-            }
-          }
-        };
-      } else {
-        return prepareAnimation(animationDetails);
-      }
-    };
-
-    function prepareAnimation(animationDetails) {
-      // TODO(matsko): make sure to check for grouped animations and delegate down to normal animations
-      var element = animationDetails.element;
-      var event = animationDetails.event;
-      var options = animationDetails.options;
-      var classes = animationDetails.classes;
-      return $$animateJs(element, event, classes, options);
-    }
-  }];
-}];
-
-var NG_ANIMATE_ATTR_NAME = 'data-ng-animate';
-var NG_ANIMATE_PIN_DATA = '$ngAnimatePin';
-var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {
-  var PRE_DIGEST_STATE = 1;
-  var RUNNING_STATE = 2;
-  var ONE_SPACE = ' ';
-
-  var rules = this.rules = {
-    skip: [],
-    cancel: [],
-    join: []
-  };
-
-  function makeTruthyCssClassMap(classString) {
-    if (!classString) {
-      return null;
-    }
-
-    var keys = classString.split(ONE_SPACE);
-    var map = Object.create(null);
-
-    forEach(keys, function(key) {
-      map[key] = true;
-    });
-    return map;
-  }
-
-  function hasMatchingClasses(newClassString, currentClassString) {
-    if (newClassString && currentClassString) {
-      var currentClassMap = makeTruthyCssClassMap(currentClassString);
-      return newClassString.split(ONE_SPACE).some(function(className) {
-        return currentClassMap[className];
-      });
-    }
-  }
-
-  function isAllowed(ruleType, element, currentAnimation, previousAnimation) {
-    return rules[ruleType].some(function(fn) {
-      return fn(element, currentAnimation, previousAnimation);
-    });
-  }
-
-  function hasAnimationClasses(animation, and) {
-    var a = (animation.addClass || '').length > 0;
-    var b = (animation.removeClass || '').length > 0;
-    return and ? a && b : a || b;
-  }
-
-  rules.join.push(function(element, newAnimation, currentAnimation) {
-    // if the new animation is class-based then we can just tack that on
-    return !newAnimation.structural && hasAnimationClasses(newAnimation);
-  });
-
-  rules.skip.push(function(element, newAnimation, currentAnimation) {
-    // there is no need to animate anything if no classes are being added and
-    // there is no structural animation that will be triggered
-    return !newAnimation.structural && !hasAnimationClasses(newAnimation);
-  });
-
-  rules.skip.push(function(element, newAnimation, currentAnimation) {
-    // why should we trigger a new structural animation if the element will
-    // be removed from the DOM anyway?
-    return currentAnimation.event == 'leave' && newAnimation.structural;
-  });
-
-  rules.skip.push(function(element, newAnimation, currentAnimation) {
-    // if there is an ongoing current animation then don't even bother running the class-based animation
-    return currentAnimation.structural && currentAnimation.state === RUNNING_STATE && !newAnimation.structural;
-  });
-
-  rules.cancel.push(function(element, newAnimation, currentAnimation) {
-    // there can never be two structural animations running at the same time
-    return currentAnimation.structural && newAnimation.structural;
-  });
-
-  rules.cancel.push(function(element, newAnimation, currentAnimation) {
-    // if the previous animation is already running, but the new animation will
-    // be triggered, but the new animation is structural
-    return currentAnimation.state === RUNNING_STATE && newAnimation.structural;
-  });
-
-  rules.cancel.push(function(element, newAnimation, currentAnimation) {
-    var nA = newAnimation.addClass;
-    var nR = newAnimation.removeClass;
-    var cA = currentAnimation.addClass;
-    var cR = currentAnimation.removeClass;
-
-    // early detection to save the global CPU shortage :)
-    if ((isUndefined(nA) && isUndefined(nR)) || (isUndefined(cA) && isUndefined(cR))) {
-      return false;
-    }
-
-    return hasMatchingClasses(nA, cR) || hasMatchingClasses(nR, cA);
-  });
-
-  this.$get = ['$$rAF', '$rootScope', '$rootElement', '$document', '$$HashMap',
-               '$$animation', '$$AnimateRunner', '$templateRequest', '$$jqLite', '$$forceReflow',
-       function($$rAF,   $rootScope,   $rootElement,   $document,   $$HashMap,
-                $$animation,   $$AnimateRunner,   $templateRequest,   $$jqLite,   $$forceReflow) {
-
-    var activeAnimationsLookup = new $$HashMap();
-    var disabledElementsLookup = new $$HashMap();
-    var animationsEnabled = null;
-
-    function postDigestTaskFactory() {
-      var postDigestCalled = false;
-      return function(fn) {
-        // we only issue a call to postDigest before
-        // it has first passed. This prevents any callbacks
-        // from not firing once the animation has completed
-        // since it will be out of the digest cycle.
-        if (postDigestCalled) {
-          fn();
-        } else {
-          $rootScope.$$postDigest(function() {
-            postDigestCalled = true;
-            fn();
-          });
-        }
-      };
-    }
-
-    // Wait until all directive and route-related templates are downloaded and
-    // compiled. The $templateRequest.totalPendingRequests variable keeps track of
-    // all of the remote templates being currently downloaded. If there are no
-    // templates currently downloading then the watcher will still fire anyway.
-    var deregisterWatch = $rootScope.$watch(
-      function() { return $templateRequest.totalPendingRequests === 0; },
-      function(isEmpty) {
-        if (!isEmpty) return;
-        deregisterWatch();
-
-        // Now that all templates have been downloaded, $animate will wait until
-        // the post digest queue is empty before enabling animations. By having two
-        // calls to $postDigest calls we can ensure that the flag is enabled at the
-        // very end of the post digest queue. Since all of the animations in $animate
-        // use $postDigest, it's important that the code below executes at the end.
-        // This basically means that the page is fully downloaded and compiled before
-        // any animations are triggered.
-        $rootScope.$$postDigest(function() {
-          $rootScope.$$postDigest(function() {
-            // we check for null directly in the event that the application already called
-            // .enabled() with whatever arguments that it provided it with
-            if (animationsEnabled === null) {
-              animationsEnabled = true;
-            }
-          });
-        });
-      }
-    );
-
-    var callbackRegistry = {};
-
-    // remember that the classNameFilter is set during the provider/config
-    // stage therefore we can optimize here and setup a helper function
-    var classNameFilter = $animateProvider.classNameFilter();
-    var isAnimatableClassName = !classNameFilter
-              ? function() { return true; }
-              : function(className) {
-                return classNameFilter.test(className);
-              };
-
-    var applyAnimationClasses = applyAnimationClassesFactory($$jqLite);
-
-    function normalizeAnimationDetails(element, animation) {
-      return mergeAnimationDetails(element, animation, {});
-    }
-
-    // IE9-11 has no method "contains" in SVG element and in Node.prototype. Bug #10259.
-    var contains = Node.prototype.contains || function(arg) {
-      // jshint bitwise: false
-      return this === arg || !!(this.compareDocumentPosition(arg) & 16);
-      // jshint bitwise: true
-    };
-
-    function findCallbacks(parent, element, event) {
-      var targetNode = getDomNode(element);
-      var targetParentNode = getDomNode(parent);
-
-      var matches = [];
-      var entries = callbackRegistry[event];
-      if (entries) {
-        forEach(entries, function(entry) {
-          if (contains.call(entry.node, targetNode)) {
-            matches.push(entry.callback);
-          } else if (event === 'leave' && contains.call(entry.node, targetParentNode)) {
-            matches.push(entry.callback);
-          }
-        });
-      }
-
-      return matches;
-    }
-
-    return {
-      on: function(event, container, callback) {
-        var node = extractElementNode(container);
-        callbackRegistry[event] = callbackRegistry[event] || [];
-        callbackRegistry[event].push({
-          node: node,
-          callback: callback
-        });
-      },
-
-      off: function(event, container, callback) {
-        var entries = callbackRegistry[event];
-        if (!entries) return;
-
-        callbackRegistry[event] = arguments.length === 1
-            ? null
-            : filterFromRegistry(entries, container, callback);
-
-        function filterFromRegistry(list, matchContainer, matchCallback) {
-          var containerNode = extractElementNode(matchContainer);
-          return list.filter(function(entry) {
-            var isMatch = entry.node === containerNode &&
-                            (!matchCallback || entry.callback === matchCallback);
-            return !isMatch;
-          });
-        }
-      },
-
-      pin: function(element, parentElement) {
-        assertArg(isElement(element), 'element', 'not an element');
-        assertArg(isElement(parentElement), 'parentElement', 'not an element');
-        element.data(NG_ANIMATE_PIN_DATA, parentElement);
-      },
-
-      push: function(element, event, options, domOperation) {
-        options = options || {};
-        options.domOperation = domOperation;
-        return queueAnimation(element, event, options);
-      },
-
-      // this method has four signatures:
-      //  () - global getter
-      //  (bool) - global setter
-      //  (element) - element getter
-      //  (element, bool) - element setter
-      enabled: function(element, bool) {
-        var argCount = arguments.length;
-
-        if (argCount === 0) {
-          // () - Global getter
-          bool = !!animationsEnabled;
-        } else {
-          var hasElement = isElement(element);
-
-          if (!hasElement) {
-            // (bool) - Global setter
-            bool = animationsEnabled = !!element;
-          } else {
-            var node = getDomNode(element);
-            var recordExists = disabledElementsLookup.get(node);
-
-            if (argCount === 1) {
-              // (element) - Element getter
-              bool = !recordExists;
-            } else {
-              // (element, bool) - Element setter
-              disabledElementsLookup.put(node, !bool);
-            }
-          }
-        }
-
-        return bool;
-      }
-    };
-
-    function queueAnimation(element, event, initialOptions) {
-      // we always make a copy of the options since
-      // there should never be any side effects on
-      // the input data when running `$animateCss`.
-      var options = copy(initialOptions);
-
-      var node, parent;
-      element = stripCommentsFromElement(element);
-      if (element) {
-        node = getDomNode(element);
-        parent = element.parent();
-      }
-
-      options = prepareAnimationOptions(options);
-
-      // we create a fake runner with a working promise.
-      // These methods will become available after the digest has passed
-      var runner = new $$AnimateRunner();
-
-      // this is used to trigger callbacks in postDigest mode
-      var runInNextPostDigestOrNow = postDigestTaskFactory();
-
-      if (isArray(options.addClass)) {
-        options.addClass = options.addClass.join(' ');
-      }
-
-      if (options.addClass && !isString(options.addClass)) {
-        options.addClass = null;
-      }
-
-      if (isArray(options.removeClass)) {
-        options.removeClass = options.removeClass.join(' ');
-      }
-
-      if (options.removeClass && !isString(options.removeClass)) {
-        options.removeClass = null;
-      }
-
-      if (options.from && !isObject(options.from)) {
-        options.from = null;
-      }
-
-      if (options.to && !isObject(options.to)) {
-        options.to = null;
-      }
-
-      // there are situations where a directive issues an animation for
-      // a jqLite wrapper that contains only comment nodes... If this
-      // happens then there is no way we can perform an animation
-      if (!node) {
-        close();
-        return runner;
-      }
-
-      var className = [node.className, options.addClass, options.removeClass].join(' ');
-      if (!isAnimatableClassName(className)) {
-        close();
-        return runner;
-      }
-
-      var isStructural = ['enter', 'move', 'leave'].indexOf(event) >= 0;
-
-      // this is a hard disable of all animations for the application or on
-      // the element itself, therefore  there is no need to continue further
-      // past this point if not enabled
-      // Animations are also disabled if the document is currently hidden (page is not visible
-      // to the user), because browsers slow down or do not flush calls to requestAnimationFrame
-      var skipAnimations = !animationsEnabled || $document[0].hidden || disabledElementsLookup.get(node);
-      var existingAnimation = (!skipAnimations && activeAnimationsLookup.get(node)) || {};
-      var hasExistingAnimation = !!existingAnimation.state;
-
-      // there is no point in traversing the same collection of parent ancestors if a followup
-      // animation will be run on the same element that already did all that checking work
-      if (!skipAnimations && (!hasExistingAnimation || existingAnimation.state != PRE_DIGEST_STATE)) {
-        skipAnimations = !areAnimationsAllowed(element, parent, event);
-      }
-
-      if (skipAnimations) {
-        close();
-        return runner;
-      }
-
-      if (isStructural) {
-        closeChildAnimations(element);
-      }
-
-      var newAnimation = {
-        structural: isStructural,
-        element: element,
-        event: event,
-        addClass: options.addClass,
-        removeClass: options.removeClass,
-        close: close,
-        options: options,
-        runner: runner
-      };
-
-      if (hasExistingAnimation) {
-        var skipAnimationFlag = isAllowed('skip', element, newAnimation, existingAnimation);
-        if (skipAnimationFlag) {
-          if (existingAnimation.state === RUNNING_STATE) {
-            close();
-            return runner;
-          } else {
-            mergeAnimationDetails(element, existingAnimation, newAnimation);
-            return existingAnimation.runner;
-          }
-        }
-        var cancelAnimationFlag = isAllowed('cancel', element, newAnimation, existingAnimation);
-        if (cancelAnimationFlag) {
-          if (existingAnimation.state === RUNNING_STATE) {
-            // this will end the animation right away and it is safe
-            // to do so since the animation is already running and the
-            // runner callback code will run in async
-            existingAnimation.runner.end();
-          } else if (existingAnimation.structural) {
-            // this means that the animation is queued into a digest, but
-            // hasn't started yet. Therefore it is safe to run the close
-            // method which will call the runner methods in async.
-            existingAnimation.close();
-          } else {
-            // this will merge the new animation options into existing animation options
-            mergeAnimationDetails(element, existingAnimation, newAnimation);
-
-            return existingAnimation.runner;
-          }
-        } else {
-          // a joined animation means that this animation will take over the existing one
-          // so an example would involve a leave animation taking over an enter. Then when
-          // the postDigest kicks in the enter will be ignored.
-          var joinAnimationFlag = isAllowed('join', element, newAnimation, existingAnimation);
-          if (joinAnimationFlag) {
-            if (existingAnimation.state === RUNNING_STATE) {
-              normalizeAnimationDetails(element, newAnimation);
-            } else {
-              applyGeneratedPreparationClasses(element, isStructural ? event : null, options);
-
-              event = newAnimation.event = existingAnimation.event;
-              options = mergeAnimationDetails(element, existingAnimation, newAnimation);
-
-              //we return the same runner since only the option values of this animation will
-              //be fed into the `existingAnimation`.
-              return existingAnimation.runner;
-            }
-          }
-        }
-      } else {
-        // normalization in this case means that it removes redundant CSS classes that
-        // already exist (addClass) or do not exist (removeClass) on the element
-        normalizeAnimationDetails(element, newAnimation);
-      }
-
-      // when the options are merged and cleaned up we may end up not having to do
-      // an animation at all, therefore we should check this before issuing a post
-      // digest callback. Structural animations will always run no matter what.
-      var isValidAnimation = newAnimation.structural;
-      if (!isValidAnimation) {
-        // animate (from/to) can be quickly checked first, otherwise we check if any classes are present
-        isValidAnimation = (newAnimation.event === 'animate' && Object.keys(newAnimation.options.to || {}).length > 0)
-                            || hasAnimationClasses(newAnimation);
-      }
-
-      if (!isValidAnimation) {
-        close();
-        clearElementAnimationState(element);
-        return runner;
-      }
-
-      // the counter keeps track of cancelled animations
-      var counter = (existingAnimation.counter || 0) + 1;
-      newAnimation.counter = counter;
-
-      markElementAnimationState(element, PRE_DIGEST_STATE, newAnimation);
-
-      $rootScope.$$postDigest(function() {
-        var animationDetails = activeAnimationsLookup.get(node);
-        var animationCancelled = !animationDetails;
-        animationDetails = animationDetails || {};
-
-        // if addClass/removeClass is called before something like enter then the
-        // registered parent element may not be present. The code below will ensure
-        // that a final value for parent element is obtained
-        var parentElement = element.parent() || [];
-
-        // animate/structural/class-based animations all have requirements. Otherwise there
-        // is no point in performing an animation. The parent node must also be set.
-        var isValidAnimation = parentElement.length > 0
-                                && (animationDetails.event === 'animate'
-                                    || animationDetails.structural
-                                    || hasAnimationClasses(animationDetails));
-
-        // this means that the previous animation was cancelled
-        // even if the follow-up animation is the same event
-        if (animationCancelled || animationDetails.counter !== counter || !isValidAnimation) {
-          // if another animation did not take over then we need
-          // to make sure that the domOperation and options are
-          // handled accordingly
-          if (animationCancelled) {
-            applyAnimationClasses(element, options);
-            applyAnimationStyles(element, options);
-          }
-
-          // if the event changed from something like enter to leave then we do
-          // it, otherwise if it's the same then the end result will be the same too
-          if (animationCancelled || (isStructural && animationDetails.event !== event)) {
-            options.domOperation();
-            runner.end();
-          }
-
-          // in the event that the element animation was not cancelled or a follow-up animation
-          // isn't allowed to animate from here then we need to clear the state of the element
-          // so that any future animations won't read the expired animation data.
-          if (!isValidAnimation) {
-            clearElementAnimationState(element);
-          }
-
-          return;
-        }
-
-        // this combined multiple class to addClass / removeClass into a setClass event
-        // so long as a structural event did not take over the animation
-        event = !animationDetails.structural && hasAnimationClasses(animationDetails, true)
-            ? 'setClass'
-            : animationDetails.event;
-
-        markElementAnimationState(element, RUNNING_STATE);
-        var realRunner = $$animation(element, event, animationDetails.options);
-
-        realRunner.done(function(status) {
-          close(!status);
-          var animationDetails = activeAnimationsLookup.get(node);
-          if (animationDetails && animationDetails.counter === counter) {
-            clearElementAnimationState(getDomNode(element));
-          }
-          notifyProgress(runner, event, 'close', {});
-        });
-
-        // this will update the runner's flow-control events based on
-        // the `realRunner` object.
-        runner.setHost(realRunner);
-        notifyProgress(runner, event, 'start', {});
-      });
-
-      return runner;
-
-      function notifyProgress(runner, event, phase, data) {
-        runInNextPostDigestOrNow(function() {
-          var callbacks = findCallbacks(parent, element, event);
-          if (callbacks.length) {
-            // do not optimize this call here to RAF because
-            // we don't know how heavy the callback code here will
-            // be and if this code is buffered then this can
-            // lead to a performance regression.
-            $$rAF(function() {
-              forEach(callbacks, function(callback) {
-                callback(element, phase, data);
-              });
-            });
-          }
-        });
-        runner.progress(event, phase, data);
-      }
-
-      function close(reject) { // jshint ignore:line
-        clearGeneratedClasses(element, options);
-        applyAnimationClasses(element, options);
-        applyAnimationStyles(element, options);
-        options.domOperation();
-        runner.complete(!reject);
-      }
-    }
-
-    function closeChildAnimations(element) {
-      var node = getDomNode(element);
-      var children = node.querySelectorAll('[' + NG_ANIMATE_ATTR_NAME + ']');
-      forEach(children, function(child) {
-        var state = parseInt(child.getAttribute(NG_ANIMATE_ATTR_NAME));
-        var animationDetails = activeAnimationsLookup.get(child);
-        if (animationDetails) {
-          switch (state) {
-            case RUNNING_STATE:
-              animationDetails.runner.end();
-              /* falls through */
-            case PRE_DIGEST_STATE:
-              activeAnimationsLookup.remove(child);
-              break;
-          }
-        }
-      });
-    }
-
-    function clearElementAnimationState(element) {
-      var node = getDomNode(element);
-      node.removeAttribute(NG_ANIMATE_ATTR_NAME);
-      activeAnimationsLookup.remove(node);
-    }
-
-    function isMatchingElement(nodeOrElmA, nodeOrElmB) {
-      return getDomNode(nodeOrElmA) === getDomNode(nodeOrElmB);
-    }
-
-    /**
-     * This fn returns false if any of the following is true:
-     * a) animations on any parent element are disabled, and animations on the element aren't explicitly allowed
-     * b) a parent element has an ongoing structural animation, and animateChildren is false
-     * c) the element is not a child of the body
-     * d) the element is not a child of the $rootElement
-     */
-    function areAnimationsAllowed(element, parentElement, event) {
-      var bodyElement = jqLite($document[0].body);
-      var bodyElementDetected = isMatchingElement(element, bodyElement) || element[0].nodeName === 'HTML';
-      var rootElementDetected = isMatchingElement(element, $rootElement);
-      var parentAnimationDetected = false;
-      var animateChildren;
-      var elementDisabled = disabledElementsLookup.get(getDomNode(element));
-
-      var parentHost = element.data(NG_ANIMATE_PIN_DATA);
-      if (parentHost) {
-        parentElement = parentHost;
-      }
-
-      while (parentElement && parentElement.length) {
-        if (!rootElementDetected) {
-          // angular doesn't want to attempt to animate elements outside of the application
-          // therefore we need to ensure that the rootElement is an ancestor of the current element
-          rootElementDetected = isMatchingElement(parentElement, $rootElement);
-        }
-
-        var parentNode = parentElement[0];
-        if (parentNode.nodeType !== ELEMENT_NODE) {
-          // no point in inspecting the #document element
-          break;
-        }
-
-        var details = activeAnimationsLookup.get(parentNode) || {};
-        // either an enter, leave or move animation will commence
-        // therefore we can't allow any animations to take place
-        // but if a parent animation is class-based then that's ok
-        if (!parentAnimationDetected) {
-          var parentElementDisabled = disabledElementsLookup.get(parentNode);
-
-          if (parentElementDisabled === true && elementDisabled !== false) {
-            // disable animations if the user hasn't explicitly enabled animations on the
-            // current element
-            elementDisabled = true;
-            // element is disabled via parent element, no need to check anything else
-            break;
-          } else if (parentElementDisabled === false) {
-            elementDisabled = false;
-          }
-          parentAnimationDetected = details.structural;
-        }
-
-        if (isUndefined(animateChildren) || animateChildren === true) {
-          var value = parentElement.data(NG_ANIMATE_CHILDREN_DATA);
-          if (isDefined(value)) {
-            animateChildren = value;
-          }
-        }
-
-        // there is no need to continue traversing at this point
-        if (parentAnimationDetected && animateChildren === false) break;
-
-        if (!bodyElementDetected) {
-          // we also need to ensure that the element is or will be a part of the body element
-          // otherwise it is pointless to even issue an animation to be rendered
-          bodyElementDetected = isMatchingElement(parentElement, bodyElement);
-        }
-
-        if (bodyElementDetected && rootElementDetected) {
-          // If both body and root have been found, any other checks are pointless,
-          // as no animation data should live outside the application
-          break;
-        }
-
-        if (!rootElementDetected) {
-          // If no rootElement is detected, check if the parentElement is pinned to another element
-          parentHost = parentElement.data(NG_ANIMATE_PIN_DATA);
-          if (parentHost) {
-            // The pin target element becomes the next parent element
-            parentElement = parentHost;
-            continue;
-          }
-        }
-
-        parentElement = parentElement.parent();
-      }
-
-      var allowAnimation = (!parentAnimationDetected || animateChildren) && elementDisabled !== true;
-      return allowAnimation && rootElementDetected && bodyElementDetected;
-    }
-
-    function markElementAnimationState(element, state, details) {
-      details = details || {};
-      details.state = state;
-
-      var node = getDomNode(element);
-      node.setAttribute(NG_ANIMATE_ATTR_NAME, state);
-
-      var oldValue = activeAnimationsLookup.get(node);
-      var newValue = oldValue
-          ? extend(oldValue, details)
-          : details;
-      activeAnimationsLookup.put(node, newValue);
-    }
-  }];
-}];
-
-var $$AnimationProvider = ['$animateProvider', function($animateProvider) {
-  var NG_ANIMATE_REF_ATTR = 'ng-animate-ref';
-
-  var drivers = this.drivers = [];
-
-  var RUNNER_STORAGE_KEY = '$$animationRunner';
-
-  function setRunner(element, runner) {
-    element.data(RUNNER_STORAGE_KEY, runner);
-  }
-
-  function removeRunner(element) {
-    element.removeData(RUNNER_STORAGE_KEY);
-  }
-
-  function getRunner(element) {
-    return element.data(RUNNER_STORAGE_KEY);
-  }
-
-  this.$get = ['$$jqLite', '$rootScope', '$injector', '$$AnimateRunner', '$$HashMap', '$$rAFScheduler',
-       function($$jqLite,   $rootScope,   $injector,   $$AnimateRunner,   $$HashMap,   $$rAFScheduler) {
-
-    var animationQueue = [];
-    var applyAnimationClasses = applyAnimationClassesFactory($$jqLite);
-
-    function sortAnimations(animations) {
-      var tree = { children: [] };
-      var i, lookup = new $$HashMap();
-
-      // this is done first beforehand so that the hashmap
-      // is filled with a list of the elements that will be animated
-      for (i = 0; i < animations.length; i++) {
-        var animation = animations[i];
-        lookup.put(animation.domNode, animations[i] = {
-          domNode: animation.domNode,
-          fn: animation.fn,
-          children: []
-        });
-      }
-
-      for (i = 0; i < animations.length; i++) {
-        processNode(animations[i]);
-      }
-
-      return flatten(tree);
-
-      function processNode(entry) {
-        if (entry.processed) return entry;
-        entry.processed = true;
-
-        var elementNode = entry.domNode;
-        var parentNode = elementNode.parentNode;
-        lookup.put(elementNode, entry);
-
-        var parentEntry;
-        while (parentNode) {
-          parentEntry = lookup.get(parentNode);
-          if (parentEntry) {
-            if (!parentEntry.processed) {
-              parentEntry = processNode(parentEntry);
-            }
-            break;
-          }
-          parentNode = parentNode.parentNode;
-        }
-
-        (parentEntry || tree).children.push(entry);
-        return entry;
-      }
-
-      function flatten(tree) {
-        var result = [];
-        var queue = [];
-        var i;
-
-        for (i = 0; i < tree.children.length; i++) {
-          queue.push(tree.children[i]);
-        }
-
-        var remainingLevelEntries = queue.length;
-        var nextLevelEntries = 0;
-        var row = [];
-
-        for (i = 0; i < queue.length; i++) {
-          var entry = queue[i];
-          if (remainingLevelEntries <= 0) {
-            remainingLevelEntries = nextLevelEntries;
-            nextLevelEntries = 0;
-            result.push(row);
-            row = [];
-          }
-          row.push(entry.fn);
-          entry.children.forEach(function(childEntry) {
-            nextLevelEntries++;
-            queue.push(childEntry);
-          });
-          remainingLevelEntries--;
-        }
-
-        if (row.length) {
-          result.push(row);
-        }
-
-        return result;
-      }
-    }
-
-    // TODO(matsko): document the signature in a better way
-    return function(element, event, options) {
-      options = prepareAnimationOptions(options);
-      var isStructural = ['enter', 'move', 'leave'].indexOf(event) >= 0;
-
-      // there is no animation at the current moment, however
-      // these runner methods will get later updated with the
-      // methods leading into the driver's end/cancel methods
-      // for now they just stop the animation from starting
-      var runner = new $$AnimateRunner({
-        end: function() { close(); },
-        cancel: function() { close(true); }
-      });
-
-      if (!drivers.length) {
-        close();
-        return runner;
-      }
-
-      setRunner(element, runner);
-
-      var classes = mergeClasses(element.attr('class'), mergeClasses(options.addClass, options.removeClass));
-      var tempClasses = options.tempClasses;
-      if (tempClasses) {
-        classes += ' ' + tempClasses;
-        options.tempClasses = null;
-      }
-
-      var prepareClassName;
-      if (isStructural) {
-        prepareClassName = 'ng-' + event + PREPARE_CLASS_SUFFIX;
-        $$jqLite.addClass(element, prepareClassName);
-      }
-
-      animationQueue.push({
-        // this data is used by the postDigest code and passed into
-        // the driver step function
-        element: element,
-        classes: classes,
-        event: event,
-        structural: isStructural,
-        options: options,
-        beforeStart: beforeStart,
-        close: close
-      });
-
-      element.on('$destroy', handleDestroyedElement);
-
-      // we only want there to be one function called within the post digest
-      // block. This way we can group animations for all the animations that
-      // were apart of the same postDigest flush call.
-      if (animationQueue.length > 1) return runner;
-
-      $rootScope.$$postDigest(function() {
-        var animations = [];
-        forEach(animationQueue, function(entry) {
-          // the element was destroyed early on which removed the runner
-          // form its storage. This means we can't animate this element
-          // at all and it already has been closed due to destruction.
-          if (getRunner(entry.element)) {
-            animations.push(entry);
-          } else {
-            entry.close();
-          }
-        });
-
-        // now any future animations will be in another postDigest
-        animationQueue.length = 0;
-
-        var groupedAnimations = groupAnimations(animations);
-        var toBeSortedAnimations = [];
-
-        forEach(groupedAnimations, function(animationEntry) {
-          toBeSortedAnimations.push({
-            domNode: getDomNode(animationEntry.from ? animationEntry.from.element : animationEntry.element),
-            fn: function triggerAnimationStart() {
-              // it's important that we apply the `ng-animate` CSS class and the
-              // temporary classes before we do any driver invoking since these
-              // CSS classes may be required for proper CSS detection.
-              animationEntry.beforeStart();
-
-              var startAnimationFn, closeFn = animationEntry.close;
-
-              // in the event that the element was removed before the digest runs or
-              // during the RAF sequencing then we should not trigger the animation.
-              var targetElement = animationEntry.anchors
-                  ? (animationEntry.from.element || animationEntry.to.element)
-                  : animationEntry.element;
-
-              if (getRunner(targetElement)) {
-                var operation = invokeFirstDriver(animationEntry);
-                if (operation) {
-                  startAnimationFn = operation.start;
-                }
-              }
-
-              if (!startAnimationFn) {
-                closeFn();
-              } else {
-                var animationRunner = startAnimationFn();
-                animationRunner.done(function(status) {
-                  closeFn(!status);
-                });
-                updateAnimationRunners(animationEntry, animationRunner);
-              }
-            }
-          });
-        });
-
-        // we need to sort each of the animations in order of parent to child
-        // relationships. This ensures that the child classes are applied at the
-        // right time.
-        $$rAFScheduler(sortAnimations(toBeSortedAnimations));
-      });
-
-      return runner;
-
-      // TODO(matsko): change to reference nodes
-      function getAnchorNodes(node) {
-        var SELECTOR = '[' + NG_ANIMATE_REF_ATTR + ']';
-        var items = node.hasAttribute(NG_ANIMATE_REF_ATTR)
-              ? [node]
-              : node.querySelectorAll(SELECTOR);
-        var anchors = [];
-        forEach(items, function(node) {
-          var attr = node.getAttribute(NG_ANIMATE_REF_ATTR);
-          if (attr && attr.length) {
-            anchors.push(node);
-          }
-        });
-        return anchors;
-      }
-
-      function groupAnimations(animations) {
-        var preparedAnimations = [];
-        var refLookup = {};
-        forEach(animations, function(animation, index) {
-          var element = animation.element;
-          var node = getDomNode(element);
-          var event = animation.event;
-          var enterOrMove = ['enter', 'move'].indexOf(event) >= 0;
-          var anchorNodes = animation.structural ? getAnchorNodes(node) : [];
-
-          if (anchorNodes.length) {
-            var direction = enterOrMove ? 'to' : 'from';
-
-            forEach(anchorNodes, function(anchor) {
-              var key = anchor.getAttribute(NG_ANIMATE_REF_ATTR);
-              refLookup[key] = refLookup[key] || {};
-              refLookup[key][direction] = {
-                animationID: index,
-                element: jqLite(anchor)
-              };
-            });
-          } else {
-            preparedAnimations.push(animation);
-          }
-        });
-
-        var usedIndicesLookup = {};
-        var anchorGroups = {};
-        forEach(refLookup, function(operations, key) {
-          var from = operations.from;
-          var to = operations.to;
-
-          if (!from || !to) {
-            // only one of these is set therefore we can't have an
-            // anchor animation since all three pieces are required
-            var index = from ? from.animationID : to.animationID;
-            var indexKey = index.toString();
-            if (!usedIndicesLookup[indexKey]) {
-              usedIndicesLookup[indexKey] = true;
-              preparedAnimations.push(animations[index]);
-            }
-            return;
-          }
-
-          var fromAnimation = animations[from.animationID];
-          var toAnimation = animations[to.animationID];
-          var lookupKey = from.animationID.toString();
-          if (!anchorGroups[lookupKey]) {
-            var group = anchorGroups[lookupKey] = {
-              structural: true,
-              beforeStart: function() {
-                fromAnimation.beforeStart();
-                toAnimation.beforeStart();
-              },
-              close: function() {
-                fromAnimation.close();
-                toAnimation.close();
-              },
-              classes: cssClassesIntersection(fromAnimation.classes, toAnimation.classes),
-              from: fromAnimation,
-              to: toAnimation,
-              anchors: [] // TODO(matsko): change to reference nodes
-            };
-
-            // the anchor animations require that the from and to elements both have at least
-            // one shared CSS class which effectively marries the two elements together to use
-            // the same animation driver and to properly sequence the anchor animation.
-            if (group.classes.length) {
-              preparedAnimations.push(group);
-            } else {
-              preparedAnimations.push(fromAnimation);
-              preparedAnimations.push(toAnimation);
-            }
-          }
-
-          anchorGroups[lookupKey].anchors.push({
-            'out': from.element, 'in': to.element
-          });
-        });
-
-        return preparedAnimations;
-      }
-
-      function cssClassesIntersection(a,b) {
-        a = a.split(' ');
-        b = b.split(' ');
-        var matches = [];
-
-        for (var i = 0; i < a.length; i++) {
-          var aa = a[i];
-          if (aa.substring(0,3) === 'ng-') continue;
-
-          for (var j = 0; j < b.length; j++) {
-            if (aa === b[j]) {
-              matches.push(aa);
-              break;
-            }
-          }
-        }
-
-        return matches.join(' ');
-      }
-
-      function invokeFirstDriver(animationDetails) {
-        // we loop in reverse order since the more general drivers (like CSS and JS)
-        // may attempt more elements, but custom drivers are more particular
-        for (var i = drivers.length - 1; i >= 0; i--) {
-          var driverName = drivers[i];
-          if (!$injector.has(driverName)) continue; // TODO(matsko): remove this check
-
-          var factory = $injector.get(driverName);
-          var driver = factory(animationDetails);
-          if (driver) {
-            return driver;
-          }
-        }
-      }
-
-      function beforeStart() {
-        element.addClass(NG_ANIMATE_CLASSNAME);
-        if (tempClasses) {
-          $$jqLite.addClass(element, tempClasses);
-        }
-        if (prepareClassName) {
-          $$jqLite.removeClass(element, prepareClassName);
-          prepareClassName = null;
-        }
-      }
-
-      function updateAnimationRunners(animation, newRunner) {
-        if (animation.from && animation.to) {
-          update(animation.from.element);
-          update(animation.to.element);
-        } else {
-          update(animation.element);
-        }
-
-        function update(element) {
-          getRunner(element).setHost(newRunner);
-        }
-      }
-
-      function handleDestroyedElement() {
-        var runner = getRunner(element);
-        if (runner && (event !== 'leave' || !options.$$domOperationFired)) {
-          runner.end();
-        }
-      }
-
-      function close(rejected) { // jshint ignore:line
-        element.off('$destroy', handleDestroyedElement);
-        removeRunner(element);
-
-        applyAnimationClasses(element, options);
-        applyAnimationStyles(element, options);
-        options.domOperation();
-
-        if (tempClasses) {
-          $$jqLite.removeClass(element, tempClasses);
-        }
-
-        element.removeClass(NG_ANIMATE_CLASSNAME);
-        runner.complete(!rejected);
-      }
-    };
-  }];
-}];
-
-/**
- * @ngdoc directive
- * @name ngAnimateSwap
- * @restrict A
- * @scope
- *
- * @description
- *
- * ngAnimateSwap is a animation-oriented directive that allows for the container to
- * be removed and entered in whenever the associated expression changes. A
- * common usecase for this directive is a rotating banner component which
- * contains one image being present at a time. When the active image changes
- * then the old image will perform a `leave` animation and the new element
- * will be inserted via an `enter` animation.
- *
- * @example
- * 
- *   
- *     
    
- *       
    
- *         {{ number }}
- *       
    
- *     
    
- *       
- *   
- *     angular.module('ngAnimateSwapExample', ['ngAnimate'])
- *       .controller('AppCtrl', ['$scope', '$interval', function($scope, $interval) {
- *         $scope.number = 0;
- *         $interval(function() {
- *           $scope.number++;
- *         }, 1000);
- *
- *         var colors = ['red','blue','green','yellow','orange'];
- *         $scope.colorClass = function(number) {
- *           return colors[number % colors.length];
- *         };
- *       }]);
- *   
- *  
- *  .container {
- *    height:250px;
- *    width:250px;
- *    position:relative;
- *    overflow:hidden;
- *    border:2px solid black;
- *  }
- *  .container .cell {
- *    font-size:150px;
- *    text-align:center;
- *    line-height:250px;
- *    position:absolute;
- *    top:0;
- *    left:0;
- *    right:0;
- *    border-bottom:2px solid black;
- *  }
- *  .swap-animation.ng-enter, .swap-animation.ng-leave {
- *    transition:0.5s linear all;
- *  }
- *  .swap-animation.ng-enter {
- *    top:-250px;
- *  }
- *  .swap-animation.ng-enter-active {
- *    top:0px;
- *  }
- *  .swap-animation.ng-leave {
- *    top:0px;
- *  }
- *  .swap-animation.ng-leave-active {
- *    top:250px;
- *  }
- *  .red { background:red; }
- *  .green { background:green; }
- *  .blue { background:blue; }
- *  .yellow { background:yellow; }
- *  .orange { background:orange; }
- *  
- *     
- */
-var ngAnimateSwapDirective = ['$animate', '$rootScope', function($animate, $rootScope) {
-  return {
-    restrict: 'A',
-    transclude: 'element',
-    terminal: true,
-    priority: 600, // we use 600 here to ensure that the directive is caught before others
-    link: function(scope, $element, attrs, ctrl, $transclude) {
-      var previousElement, previousScope;
-      scope.$watchCollection(attrs.ngAnimateSwap || attrs['for'], function(value) {
-        if (previousElement) {
-          $animate.leave(previousElement);
-        }
-        if (previousScope) {
-          previousScope.$destroy();
-          previousScope = null;
-        }
-        if (value || value === 0) {
-          previousScope = scope.$new();
-          $transclude(previousScope, function(element) {
-            previousElement = element;
-            $animate.enter(element, null, $element);
-          });
-        }
-      });
-    }
-  };
-}];
-
-/* global angularAnimateModule: true,
-
-   ngAnimateSwapDirective,
-   $$AnimateAsyncRunFactory,
-   $$rAFSchedulerFactory,
-   $$AnimateChildrenDirective,
-   $$AnimateQueueProvider,
-   $$AnimationProvider,
-   $AnimateCssProvider,
-   $$AnimateCssDriverProvider,
-   $$AnimateJsProvider,
-   $$AnimateJsDriverProvider,
-*/
-
-/**
- * @ngdoc module
- * @name ngAnimate
- * @description
- *
- * The `ngAnimate` module provides support for CSS-based animations (keyframes and transitions) as well as JavaScript-based animations via
- * callback hooks. Animations are not enabled by default, however, by including `ngAnimate` the animation hooks are enabled for an Angular app.
- *
- * 
    
- *
- * # Usage
- * Simply put, there are two ways to make use of animations when ngAnimate is used: by using **CSS** and **JavaScript**. The former works purely based
- * using CSS (by using matching CSS selectors/styles) and the latter triggers animations that are registered via `module.animation()`. For
- * both CSS and JS animations the sole requirement is to have a matching `CSS class` that exists both in the registered animation and within
- * the HTML element that the animation will be triggered on.
- *
- * ## Directive Support
- * The following directives are "animation aware":
- *
- * | Directive                                                                                                | Supported Animations                                                     |
- * |----------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------|
- * | {@link ng.directive:ngRepeat#animations ngRepeat}                                                        | enter, leave and move                                                    |
- * | {@link ngRoute.directive:ngView#animations ngView}                                                       | enter and leave                                                          |
- * | {@link ng.directive:ngInclude#animations ngInclude}                                                      | enter and leave                                                          |
- * | {@link ng.directive:ngSwitch#animations ngSwitch}                                                        | enter and leave                                                          |
- * | {@link ng.directive:ngIf#animations ngIf}                                                                | enter and leave                                                          |
- * | {@link ng.directive:ngClass#animations ngClass}                                                          | add and remove (the CSS class(es) present)                               |
- * | {@link ng.directive:ngShow#animations ngShow} & {@link ng.directive:ngHide#animations ngHide}            | add and remove (the ng-hide class value)                                 |
- * | {@link ng.directive:form#animation-hooks form} & {@link ng.directive:ngModel#animation-hooks ngModel}    | add and remove (dirty, pristine, valid, invalid & all other validations) |
- * | {@link module:ngMessages#animations ngMessages}                                                          | add and remove (ng-active & ng-inactive)                                 |
- * | {@link module:ngMessages#animations ngMessage}                                                           | enter and leave                                                          |
- *
- * (More information can be found by visiting each the documentation associated with each directive.)
- *
- * ## CSS-based Animations
- *
- * CSS-based animations with ngAnimate are unique since they require no JavaScript code at all. By using a CSS class that we reference between our HTML
- * and CSS code we can create an animation that will be picked up by Angular when an the underlying directive performs an operation.
- *
- * The example below shows how an `enter` animation can be made possible on an element using `ng-if`:
- *
- * ```html
- * 
    
- *    Fade me in out
- * 
    
- * 
- * 
- * ```
- *
- * Notice the CSS class **fade**? We can now create the CSS transition code that references this class:
- *
- * ```css
- * /* The starting CSS styles for the enter animation */
- * .fade.ng-enter {
- *   transition:0.5s linear all;
- *   opacity:0;
- * }
- *
- * /* The finishing CSS styles for the enter animation */
- * .fade.ng-enter.ng-enter-active {
- *   opacity:1;
- * }
- * ```
- *
- * The key thing to remember here is that, depending on the animation event (which each of the directives above trigger depending on what's going on) two
- * generated CSS classes will be applied to the element; in the example above we have `.ng-enter` and `.ng-enter-active`. For CSS transitions, the transition
- * code **must** be defined within the starting CSS class (in this case `.ng-enter`). The destination class is what the transition will animate towards.
- *
- * If for example we wanted to create animations for `leave` and `move` (ngRepeat triggers move) then we can do so using the same CSS naming conventions:
- *
- * ```css
- * /* now the element will fade out before it is removed from the DOM */
- * .fade.ng-leave {
- *   transition:0.5s linear all;
- *   opacity:1;
- * }
- * .fade.ng-leave.ng-leave-active {
- *   opacity:0;
- * }
- * ```
- *
- * We can also make use of **CSS Keyframes** by referencing the keyframe animation within the starting CSS class:
- *
- * ```css
- * /* there is no need to define anything inside of the destination
- * CSS class since the keyframe will take charge of the animation */
- * .fade.ng-leave {
- *   animation: my_fade_animation 0.5s linear;
- *   -webkit-animation: my_fade_animation 0.5s linear;
- * }
- *
- * @keyframes my_fade_animation {
- *   from { opacity:1; }
- *   to { opacity:0; }
- * }
- *
- * @-webkit-keyframes my_fade_animation {
- *   from { opacity:1; }
- *   to { opacity:0; }
- * }
- * ```
- *
- * Feel free also mix transitions and keyframes together as well as any other CSS classes on the same element.
- *
- * ### CSS Class-based Animations
- *
- * Class-based animations (animations that are triggered via `ngClass`, `ngShow`, `ngHide` and some other directives) have a slightly different
- * naming convention. Class-based animations are basic enough that a standard transition or keyframe can be referenced on the class being added
- * and removed.
- *
- * For example if we wanted to do a CSS animation for `ngHide` then we place an animation on the `.ng-hide` CSS class:
- *
- * ```html
- * 
    
- *   Show and hide me
- * 
    
- * 
- *
- * 
- * ```
- *
- * All that is going on here with ngShow/ngHide behind the scenes is the `.ng-hide` class is added/removed (when the hidden state is valid). Since
- * ngShow and ngHide are animation aware then we can match up a transition and ngAnimate handles the rest.
- *
- * In addition the addition and removal of the CSS class, ngAnimate also provides two helper methods that we can use to further decorate the animation
- * with CSS styles.
- *
- * ```html
- * 
    
- *   Highlight this box
- * 
    
- * 
- *
- * 
- * ```
- *
- * We can also make use of CSS keyframes by placing them within the CSS classes.
- *
- *
- * ### CSS Staggering Animations
- * A Staggering animation is a collection of animations that are issued with a slight delay in between each successive operation resulting in a
- * curtain-like effect. The ngAnimate module (versions >=1.2) supports staggering animations and the stagger effect can be
- * performed by creating a **ng-EVENT-stagger** CSS class and attaching that class to the base CSS class used for
- * the animation. The style property expected within the stagger class can either be a **transition-delay** or an
- * **animation-delay** property (or both if your animation contains both transitions and keyframe animations).
- *
- * ```css
- * .my-animation.ng-enter {
- *   /* standard transition code */
- *   transition: 1s linear all;
- *   opacity:0;
- * }
- * .my-animation.ng-enter-stagger {
- *   /* this will have a 100ms delay between each successive leave animation */
- *   transition-delay: 0.1s;
- *
- *   /* As of 1.4.4, this must always be set: it signals ngAnimate
- *     to not accidentally inherit a delay property from another CSS class */
- *   transition-duration: 0s;
- * }
- * .my-animation.ng-enter.ng-enter-active {
- *   /* standard transition styles */
- *   opacity:1;
- * }
- * ```
- *
- * Staggering animations work by default in ngRepeat (so long as the CSS class is defined). Outside of ngRepeat, to use staggering animations
- * on your own, they can be triggered by firing multiple calls to the same event on $animate. However, the restrictions surrounding this
- * are that each of the elements must have the same CSS className value as well as the same parent element. A stagger operation
- * will also be reset if one or more animation frames have passed since the multiple calls to `$animate` were fired.
- *
- * The following code will issue the **ng-leave-stagger** event on the element provided:
- *
- * ```js
- * var kids = parent.children();
- *
- * $animate.leave(kids[0]); //stagger index=0
- * $animate.leave(kids[1]); //stagger index=1
- * $animate.leave(kids[2]); //stagger index=2
- * $animate.leave(kids[3]); //stagger index=3
- * $animate.leave(kids[4]); //stagger index=4
- *
- * window.requestAnimationFrame(function() {
- *   //stagger has reset itself
- *   $animate.leave(kids[5]); //stagger index=0
- *   $animate.leave(kids[6]); //stagger index=1
- *
- *   $scope.$digest();
- * });
- * ```
- *
- * Stagger animations are currently only supported within CSS-defined animations.
- *
- * ### The `ng-animate` CSS class
- *
- * When ngAnimate is animating an element it will apply the `ng-animate` CSS class to the element for the duration of the animation.
- * This is a temporary CSS class and it will be removed once the animation is over (for both JavaScript and CSS-based animations).
- *
- * Therefore, animations can be applied to an element using this temporary class directly via CSS.
- *
- * ```css
- * .zipper.ng-animate {
- *   transition:0.5s linear all;
- * }
- * .zipper.ng-enter {
- *   opacity:0;
- * }
- * .zipper.ng-enter.ng-enter-active {
- *   opacity:1;
- * }
- * .zipper.ng-leave {
- *   opacity:1;
- * }
- * .zipper.ng-leave.ng-leave-active {
- *   opacity:0;
- * }
- * ```
- *
- * (Note that the `ng-animate` CSS class is reserved and it cannot be applied on an element directly since ngAnimate will always remove
- * the CSS class once an animation has completed.)
- *
- *
- * ### The `ng-[event]-prepare` class
- *
- * This is a special class that can be used to prevent unwanted flickering / flash of content before
- * the actual animation starts. The class is added as soon as an animation is initialized, but removed
- * before the actual animation starts (after waiting for a $digest).
- * It is also only added for *structural* animations (`enter`, `move`, and `leave`).
- *
- * In practice, flickering can appear when nesting elements with structural animations such as `ngIf`
- * into elements that have class-based animations such as `ngClass`.
- *
- * ```html
- * 
    
- *   
    
- *     
    
- *   
    
- * 
    
- * ```
- *
- * It is possible that during the `enter` animation, the `.message` div will be briefly visible before it starts animating.
- * In that case, you can add styles to the CSS that make sure the element stays hidden before the animation starts:
- *
- * ```css
- * .message.ng-enter-prepare {
- *   opacity: 0;
- * }
- *
- * ```
- *
- * ## JavaScript-based Animations
- *
- * ngAnimate also allows for animations to be consumed by JavaScript code. The approach is similar to CSS-based animations (where there is a shared
- * CSS class that is referenced in our HTML code) but in addition we need to register the JavaScript animation on the module. By making use of the
- * `module.animation()` module function we can register the animation.
- *
- * Let's see an example of a enter/leave animation using `ngRepeat`:
- *
- * ```html
- * 
    
- *   {{ item }}
- * 
    
- * ```
- *
- * See the **slide** CSS class? Let's use that class to define an animation that we'll structure in our module code by using `module.animation`:
- *
- * ```js
- * myModule.animation('.slide', [function() {
- *   return {
- *     // make note that other events (like addClass/removeClass)
- *     // have different function input parameters
- *     enter: function(element, doneFn) {
- *       jQuery(element).fadeIn(1000, doneFn);
- *
- *       // remember to call doneFn so that angular
- *       // knows that the animation has concluded
- *     },
- *
- *     move: function(element, doneFn) {
- *       jQuery(element).fadeIn(1000, doneFn);
- *     },
- *
- *     leave: function(element, doneFn) {
- *       jQuery(element).fadeOut(1000, doneFn);
- *     }
- *   }
- * }]);
- * ```
- *
- * The nice thing about JS-based animations is that we can inject other services and make use of advanced animation libraries such as
- * greensock.js and velocity.js.
- *
- * If our animation code class-based (meaning that something like `ngClass`, `ngHide` and `ngShow` triggers it) then we can still define
- * our animations inside of the same registered animation, however, the function input arguments are a bit different:
- *
- * ```html
- * 
    
- *   this box is moody
- * 
    
- * 
- * 
- * 
- * ```
- *
- * ```js
- * myModule.animation('.colorful', [function() {
- *   return {
- *     addClass: function(element, className, doneFn) {
- *       // do some cool animation and call the doneFn
- *     },
- *     removeClass: function(element, className, doneFn) {
- *       // do some cool animation and call the doneFn
- *     },
- *     setClass: function(element, addedClass, removedClass, doneFn) {
- *       // do some cool animation and call the doneFn
- *     }
- *   }
- * }]);
- * ```
- *
- * ## CSS + JS Animations Together
- *
- * AngularJS 1.4 and higher has taken steps to make the amalgamation of CSS and JS animations more flexible. However, unlike earlier versions of Angular,
- * defining CSS and JS animations to work off of the same CSS class will not work anymore. Therefore the example below will only result in **JS animations taking
- * charge of the animation**:
- *
- * ```html
- * 
    
- *   Slide in and out
- * 
    
- * ```
- *
- * ```js
- * myModule.animation('.slide', [function() {
- *   return {
- *     enter: function(element, doneFn) {
- *       jQuery(element).slideIn(1000, doneFn);
- *     }
- *   }
- * }]);
- * ```
- *
- * ```css
- * .slide.ng-enter {
- *   transition:0.5s linear all;
- *   transform:translateY(-100px);
- * }
- * .slide.ng-enter.ng-enter-active {
- *   transform:translateY(0);
- * }
- * ```
- *
- * Does this mean that CSS and JS animations cannot be used together? Do JS-based animations always have higher priority? We can make up for the
- * lack of CSS animations by using the `$animateCss` service to trigger our own tweaked-out, CSS-based animations directly from
- * our own JS-based animation code:
- *
- * ```js
- * myModule.animation('.slide', ['$animateCss', function($animateCss) {
- *   return {
- *     enter: function(element) {
-*        // this will trigger `.slide.ng-enter` and `.slide.ng-enter-active`.
- *       return $animateCss(element, {
- *         event: 'enter',
- *         structural: true
- *       });
- *     }
- *   }
- * }]);
- * ```
- *
- * The nice thing here is that we can save bandwidth by sticking to our CSS-based animation code and we don't need to rely on a 3rd-party animation framework.
- *
- * The `$animateCss` service is very powerful since we can feed in all kinds of extra properties that will be evaluated and fed into a CSS transition or
- * keyframe animation. For example if we wanted to animate the height of an element while adding and removing classes then we can do so by providing that
- * data into `$animateCss` directly:
- *
- * ```js
- * myModule.animation('.slide', ['$animateCss', function($animateCss) {
- *   return {
- *     enter: function(element) {
- *       return $animateCss(element, {
- *         event: 'enter',
- *         structural: true,
- *         addClass: 'maroon-setting',
- *         from: { height:0 },
- *         to: { height: 200 }
- *       });
- *     }
- *   }
- * }]);
- * ```
- *
- * Now we can fill in the rest via our transition CSS code:
- *
- * ```css
- * /* the transition tells ngAnimate to make the animation happen */
- * .slide.ng-enter { transition:0.5s linear all; }
- *
- * /* this extra CSS class will be absorbed into the transition
- * since the $animateCss code is adding the class */
- * .maroon-setting { background:red; }
- * ```
- *
- * And `$animateCss` will figure out the rest. Just make sure to have the `done()` callback fire the `doneFn` function to signal when the animation is over.
- *
- * To learn more about what's possible be sure to visit the {@link ngAnimate.$animateCss $animateCss service}.
- *
- * ## Animation Anchoring (via `ng-animate-ref`)
- *
- * ngAnimate in AngularJS 1.4 comes packed with the ability to cross-animate elements between
- * structural areas of an application (like views) by pairing up elements using an attribute
- * called `ng-animate-ref`.
- *
- * Let's say for example we have two views that are managed by `ng-view` and we want to show
- * that there is a relationship between two components situated in within these views. By using the
- * `ng-animate-ref` attribute we can identify that the two components are paired together and we
- * can then attach an animation, which is triggered when the view changes.
- *
- * Say for example we have the following template code:
- *
- * ```html
- * 
- * 
    
- * 
    
- *
- * 
- * 
- *   
- * 
- *
- * 
- * 
- * ```
- *
- * Now, when the view changes (once the link is clicked), ngAnimate will examine the
- * HTML contents to see if there is a match reference between any components in the view
- * that is leaving and the view that is entering. It will scan both the view which is being
- * removed (leave) and inserted (enter) to see if there are any paired DOM elements that
- * contain a matching ref value.
- *
- * The two images match since they share the same ref value. ngAnimate will now create a
- * transport element (which is a clone of the first image element) and it will then attempt
- * to animate to the position of the second image element in the next view. For the animation to
- * work a special CSS class called `ng-anchor` will be added to the transported element.
- *
- * We can now attach a transition onto the `.banner.ng-anchor` CSS class and then
- * ngAnimate will handle the entire transition for us as well as the addition and removal of
- * any changes of CSS classes between the elements:
- *
- * ```css
- * .banner.ng-anchor {
- *   /* this animation will last for 1 second since there are
- *          two phases to the animation (an `in` and an `out` phase) */
- *   transition:0.5s linear all;
- * }
- * ```
- *
- * We also **must** include animations for the views that are being entered and removed
- * (otherwise anchoring wouldn't be possible since the new view would be inserted right away).
- *
- * ```css
- * .view-animation.ng-enter, .view-animation.ng-leave {
- *   transition:0.5s linear all;
- *   position:fixed;
- *   left:0;
- *   top:0;
- *   width:100%;
- * }
- * .view-animation.ng-enter {
- *   transform:translateX(100%);
- * }
- * .view-animation.ng-leave,
- * .view-animation.ng-enter.ng-enter-active {
- *   transform:translateX(0%);
- * }
- * .view-animation.ng-leave.ng-leave-active {
- *   transform:translateX(-100%);
- * }
- * ```
- *
- * Now we can jump back to the anchor animation. When the animation happens, there are two stages that occur:
- * an `out` and an `in` stage. The `out` stage happens first and that is when the element is animated away
- * from its origin. Once that animation is over then the `in` stage occurs which animates the
- * element to its destination. The reason why there are two animations is to give enough time
- * for the enter animation on the new element to be ready.
- *
- * The example above sets up a transition for both the in and out phases, but we can also target the out or
- * in phases directly via `ng-anchor-out` and `ng-anchor-in`.
- *
- * ```css
- * .banner.ng-anchor-out {
- *   transition: 0.5s linear all;
- *
- *   /* the scale will be applied during the out animation,
- *          but will be animated away when the in animation runs */
- *   transform: scale(1.2);
- * }
- *
- * .banner.ng-anchor-in {
- *   transition: 1s linear all;
- * }
- * ```
- *
- *
- *
- *
- * ### Anchoring Demo
- *
-  
-    
-      Home
-      
    
-      
    
-        
    
-      
    
-        
-    
-      angular.module('anchoringExample', ['ngAnimate', 'ngRoute'])
-        .config(['$routeProvider', function($routeProvider) {
-          $routeProvider.when('/', {
-            templateUrl: 'home.html',
-            controller: 'HomeController as home'
-          });
-          $routeProvider.when('/profile/:id', {
-            templateUrl: 'profile.html',
-            controller: 'ProfileController as profile'
-          });
-        }])
-        .run(['$rootScope', function($rootScope) {
-          $rootScope.records = [
-            { id:1, title: "Miss Beulah Roob" },
-            { id:2, title: "Trent Morissette" },
-            { id:3, title: "Miss Ava Pouros" },
-            { id:4, title: "Rod Pouros" },
-            { id:5, title: "Abdul Rice" },
-            { id:6, title: "Laurie Rutherford Sr." },
-            { id:7, title: "Nakia McLaughlin" },
-            { id:8, title: "Jordon Blanda DVM" },
-            { id:9, title: "Rhoda Hand" },
-            { id:10, title: "Alexandrea Sauer" }
-          ];
-        }])
-        .controller('HomeController', [function() {
-          //empty
-        }])
-        .controller('ProfileController', ['$rootScope', '$routeParams', function($rootScope, $routeParams) {
-          var index = parseInt($routeParams.id, 10);
-          var record = $rootScope.records[index - 1];
-
-          this.title = record.title;
-          this.id = record.id;
-        }]);
-    
-    
-      
    Welcome to the home page
    
-      
    Please click on an element
    
-      
-        {{ record.title }}
-      
-        
-    
-      
    
-        {{ profile.title }}
-      
    
-        
-    
-      .record {
-        display:block;
-        font-size:20px;
-      }
-      .profile {
-        background:black;
-        color:white;
-        font-size:100px;
-      }
-      .view-container {
-        position:relative;
-      }
-      .view-container > .view.ng-animate {
-        position:absolute;
-        top:0;
-        left:0;
-        width:100%;
-        min-height:500px;
-      }
-      .view.ng-enter, .view.ng-leave,
-      .record.ng-anchor {
-        transition:0.5s linear all;
-      }
-      .view.ng-enter {
-        transform:translateX(100%);
-      }
-      .view.ng-enter.ng-enter-active, .view.ng-leave {
-        transform:translateX(0%);
-      }
-      .view.ng-leave.ng-leave-active {
-        transform:translateX(-100%);
-      }
-      .record.ng-anchor-out {
-        background:red;
-      }
-    
-      
- *
- * ### How is the element transported?
- *
- * When an anchor animation occurs, ngAnimate will clone the starting element and position it exactly where the starting
- * element is located on screen via absolute positioning. The cloned element will be placed inside of the root element
- * of the application (where ng-app was defined) and all of the CSS classes of the starting element will be applied. The
- * element will then animate into the `out` and `in` animations and will eventually reach the coordinates and match
- * the dimensions of the destination element. During the entire animation a CSS class of `.ng-animate-shim` will be applied
- * to both the starting and destination elements in order to hide them from being visible (the CSS styling for the class
- * is: `visibility:hidden`). Once the anchor reaches its destination then it will be removed and the destination element
- * will become visible since the shim class will be removed.
- *
- * ### How is the morphing handled?
- *
- * CSS Anchoring relies on transitions and keyframes and the internal code is intelligent enough to figure out
- * what CSS classes differ between the starting element and the destination element. These different CSS classes
- * will be added/removed on the anchor element and a transition will be applied (the transition that is provided
- * in the anchor class). Long story short, ngAnimate will figure out what classes to add and remove which will
- * make the transition of the element as smooth and automatic as possible. Be sure to use simple CSS classes that
- * do not rely on DOM nesting structure so that the anchor element appears the same as the starting element (since
- * the cloned element is placed inside of root element which is likely close to the body element).
- *
- * Note that if the root element is on the `` element then the cloned node will be placed inside of body.
- *
- *
- * ## Using $animate in your directive code
- *
- * So far we've explored how to feed in animations into an Angular application, but how do we trigger animations within our own directives in our application?
- * By injecting the `$animate` service into our directive code, we can trigger structural and class-based hooks which can then be consumed by animations. Let's
- * imagine we have a greeting box that shows and hides itself when the data changes
- *
- * ```html
- * Hi there
- * ```
- *
- * ```js
- * ngModule.directive('greetingBox', ['$animate', function($animate) {
- *   return function(scope, element, attrs) {
- *     attrs.$observe('active', function(value) {
- *       value ? $animate.addClass(element, 'on') : $animate.removeClass(element, 'on');
- *     });
- *   });
- * }]);
- * ```
- *
- * Now the `on` CSS class is added and removed on the greeting box component. Now if we add a CSS class on top of the greeting box element
- * in our HTML code then we can trigger a CSS or JS animation to happen.
- *
- * ```css
- * /* normally we would create a CSS class to reference on the element */
- * greeting-box.on { transition:0.5s linear all; background:green; color:white; }
- * ```
- *
- * The `$animate` service contains a variety of other methods like `enter`, `leave`, `animate` and `setClass`. To learn more about what's
- * possible be sure to visit the {@link ng.$animate $animate service API page}.
- *
- *
- * ### Preventing Collisions With Third Party Libraries
- *
- * Some third-party frameworks place animation duration defaults across many element or className
- * selectors in order to make their code small and reuseable. This can lead to issues with ngAnimate, which
- * is expecting actual animations on these elements and has to wait for their completion.
- *
- * You can prevent this unwanted behavior by using a prefix on all your animation classes:
- *
- * ```css
- * /* prefixed with animate- */
- * .animate-fade-add.animate-fade-add-active {
- *   transition:1s linear all;
- *   opacity:0;
- * }
- * ```
- *
- * You then configure `$animate` to enforce this prefix:
- *
- * ```js
- * $animateProvider.classNameFilter(/animate-/);
- * ```
- *
- * This also may provide your application with a speed boost since only specific elements containing CSS class prefix
- * will be evaluated for animation when any DOM changes occur in the application.
- *
- * ## Callbacks and Promises
- *
- * When `$animate` is called it returns a promise that can be used to capture when the animation has ended. Therefore if we were to trigger
- * an animation (within our directive code) then we can continue performing directive and scope related activities after the animation has
- * ended by chaining onto the returned promise that animation method returns.
- *
- * ```js
- * // somewhere within the depths of the directive
- * $animate.enter(element, parent).then(function() {
- *   //the animation has completed
- * });
- * ```
- *
- * (Note that earlier versions of Angular prior to v1.4 required the promise code to be wrapped using `$scope.$apply(...)`. This is not the case
- * anymore.)
- *
- * In addition to the animation promise, we can also make use of animation-related callbacks within our directives and controller code by registering
- * an event listener using the `$animate` service. Let's say for example that an animation was triggered on our view
- * routing controller to hook into that:
- *
- * ```js
- * ngModule.controller('HomePageController', ['$animate', function($animate) {
- *   $animate.on('enter', ngViewElement, function(element) {
- *     // the animation for this route has completed
- *   }]);
- * }])
- * ```
- *
- * (Note that you will need to trigger a digest within the callback to get angular to notice any scope-related changes.)
- */
-
-/**
- * @ngdoc service
- * @name $animate
- * @kind object
- *
- * @description
- * The ngAnimate `$animate` service documentation is the same for the core `$animate` service.
- *
- * Click here {@link ng.$animate to learn more about animations with `$animate`}.
- */
-angular.module('ngAnimate', [])
-  .directive('ngAnimateSwap', ngAnimateSwapDirective)
-
-  .directive('ngAnimateChildren', $$AnimateChildrenDirective)
-  .factory('$$rAFScheduler', $$rAFSchedulerFactory)
-
-  .provider('$$animateQueue', $$AnimateQueueProvider)
-  .provider('$$animation', $$AnimationProvider)
-
-  .provider('$animateCss', $AnimateCssProvider)
-  .provider('$$animateCssDriver', $$AnimateCssDriverProvider)
-
-  .provider('$$animateJs', $$AnimateJsProvider)
-  .provider('$$animateJsDriver', $$AnimateJsDriverProvider);
-
-
-})(window, window.angular);
diff --git a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-animate.min.js b/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-animate.min.js
deleted file mode 100644
index 8e8e41dfd..000000000
--- a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-animate.min.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- AngularJS v1.5.0
- (c) 2010-2016 Google, Inc. http://angularjs.org
- License: MIT
-*/
-(function(D,r,Va){'use strict';function ya(a,b,c){if(!a)throw Ka("areq",b||"?",c||"required");return a}function za(a,b){if(!a&&!b)return"";if(!a)return b;if(!b)return a;ba(a)&&(a=a.join(" "));ba(b)&&(b=b.join(" "));return a+" "+b}function La(a){var b={};a&&(a.to||a.from)&&(b.to=a.to,b.from=a.from);return b}function X(a,b,c){var d="";a=ba(a)?a:a&&R(a)&&a.length?a.split(/\s+/):[];s(a,function(a,g){a&&0=a&&(a=e,e=0,b.push(t),t=[]);t.push(g.fn);g.children.forEach(function(a){e++;
-c.push(a)});a--}t.length&&b.push(t);return b}(c)}var M=[],r=U(a);return function(u,A,v){function z(a){a=a.hasAttribute("ng-animate-ref")?[a]:a.querySelectorAll("[ng-animate-ref]");var b=[];s(a,function(a){var c=a.getAttribute("ng-animate-ref");c&&c.length&&b.push(a)});return b}function K(a){var b=[],c={};s(a,function(a,f){var d=G(a.element),h=0<=["enter","move"].indexOf(a.event),d=a.structural?z(d):[];if(d.length){var e=h?"to":"from";s(d,function(a){var b=a.getAttribute("ng-animate-ref");c[b]=c[b]||
-{};c[b][e]={animationID:f,element:I(a)}})}else b.push(a)});var d={},h={};s(c,function(c,e){var l=c.from,t=c.to;if(l&&t){var g=a[l.animationID],E=a[t.animationID],k=l.animationID.toString();if(!h[k]){var z=h[k]={structural:!0,beforeStart:function(){g.beforeStart();E.beforeStart()},close:function(){g.close();E.close()},classes:J(g.classes,E.classes),from:g,to:E,anchors:[]};z.classes.length?b.push(z):(b.push(g),b.push(E))}h[k].anchors.push({out:l.element,"in":t.element})}else l=l?l.animationID:t.animationID,
-t=l.toString(),d[t]||(d[t]=!0,b.push(a[l]))});return b}function J(a,b){a=a.split(" ");b=b.split(" ");for(var c=[],d=0;d=P&&b>=O&&(wa=!0,q())}function L(){function b(){if(!A){t(!1);s(m,
-function(a){l.style[a[0]]=a[1]});z(a,f);e.addClass(a,ca);if(p.recalculateTimingStyles){ja=l.className+" "+da;ga=r(l,ja);F=v(l,ja,ga);$=F.maxDelay;n=Math.max($,0);O=F.maxDuration;if(0===O){q();return}p.hasTransitions=0B.expectedEndTime)?H.cancel(B.timer):g.push(q)}L&&(k=H(c,k,!1),g[0]={timer:k,expectedEndTime:d},g.push(q),a.data("$$animateCss",g));if(ea.length)a.on(ea.join(" "),E);f.to&&(f.cleanupStyles&&Ga(x,l,Object.keys(f.to)),Ba(a,
-f))}}function c(){var b=a.data("$$animateCss");if(b){for(var d=1;dARIA](http://www.w3.org/TR/wai-aria/)
- * attributes that convey state or semantic information about the application for users
- * of assistive technologies, such as screen readers.
- *
- * 
    
- *
- * ## Usage
- *
- * For ngAria to do its magic, simply include the module `ngAria` as a dependency. The following
- * directives are supported:
- * `ngModel`, `ngChecked`, `ngRequired`, `ngValue`, `ngDisabled`, `ngShow`, `ngHide`, `ngClick`,
- * `ngDblClick`, and `ngMessages`.
- *
- * Below is a more detailed breakdown of the attributes handled by ngAria:
- *
- * | Directive                                   | Supported Attributes                                                                   |
- * |---------------------------------------------|----------------------------------------------------------------------------------------|
- * | {@link ng.directive:ngModel ngModel}        | aria-checked, aria-valuemin, aria-valuemax, aria-valuenow, aria-invalid, aria-required, input roles |
- * | {@link ng.directive:ngDisabled ngDisabled}  | aria-disabled                                                                          |
- * | {@link ng.directive:ngRequired ngRequired}  | aria-required                                                                          |
- * | {@link ng.directive:ngChecked ngChecked}    | aria-checked                                                                           |
- * | {@link ng.directive:ngValue ngValue}        | aria-checked                                                                           |
- * | {@link ng.directive:ngShow ngShow}          | aria-hidden                                                                            |
- * | {@link ng.directive:ngHide ngHide}          | aria-hidden                                                                            |
- * | {@link ng.directive:ngDblclick ngDblclick}  | tabindex                                                                               |
- * | {@link module:ngMessages ngMessages}        | aria-live                                                                              |
- * | {@link ng.directive:ngClick ngClick}        | tabindex, keypress event, button role                                                  |
- *
- * Find out more information about each directive by reading the
- * {@link guide/accessibility ngAria Developer Guide}.
- *
- * ##Example
- * Using ngDisabled with ngAria:
- * ```html
- * 
- * ```
- * Becomes:
- * ```html
- * 
- * ```
- *
- * ##Disabling Attributes
- * It's possible to disable individual attributes added by ngAria with the
- * {@link ngAria.$ariaProvider#config config} method. For more details, see the
- * {@link guide/accessibility Developer Guide}.
- */
- /* global -ngAriaModule */
-var ngAriaModule = angular.module('ngAria', ['ng']).
-                        provider('$aria', $AriaProvider);
-
-/**
-* Internal Utilities
-*/
-var nodeBlackList = ['BUTTON', 'A', 'INPUT', 'TEXTAREA', 'SELECT', 'DETAILS', 'SUMMARY'];
-
-var isNodeOneOf = function(elem, nodeTypeArray) {
-  if (nodeTypeArray.indexOf(elem[0].nodeName) !== -1) {
-    return true;
-  }
-};
-/**
- * @ngdoc provider
- * @name $ariaProvider
- *
- * @description
- *
- * Used for configuring the ARIA attributes injected and managed by ngAria.
- *
- * ```js
- * angular.module('myApp', ['ngAria'], function config($ariaProvider) {
- *   $ariaProvider.config({
- *     ariaValue: true,
- *     tabindex: false
- *   });
- * });
- *```
- *
- * ## Dependencies
- * Requires the {@link ngAria} module to be installed.
- *
- */
-function $AriaProvider() {
-  var config = {
-    ariaHidden: true,
-    ariaChecked: true,
-    ariaDisabled: true,
-    ariaRequired: true,
-    ariaInvalid: true,
-    ariaValue: true,
-    tabindex: true,
-    bindKeypress: true,
-    bindRoleForClick: true
-  };
-
-  /**
-   * @ngdoc method
-   * @name $ariaProvider#config
-   *
-   * @param {object} config object to enable/disable specific ARIA attributes
-   *
-   *  - **ariaHidden** – `{boolean}` – Enables/disables aria-hidden tags
-   *  - **ariaChecked** – `{boolean}` – Enables/disables aria-checked tags
-   *  - **ariaDisabled** – `{boolean}` – Enables/disables aria-disabled tags
-   *  - **ariaRequired** – `{boolean}` – Enables/disables aria-required tags
-   *  - **ariaInvalid** – `{boolean}` – Enables/disables aria-invalid tags
-   *  - **ariaValue** – `{boolean}` – Enables/disables aria-valuemin, aria-valuemax and aria-valuenow tags
-   *  - **tabindex** – `{boolean}` – Enables/disables tabindex tags
-   *  - **bindKeypress** – `{boolean}` – Enables/disables keypress event binding on `div` and
-   *    `li` elements with ng-click
-   *  - **bindRoleForClick** – `{boolean}` – Adds role=button to non-interactive elements like `div`
-   *    using ng-click, making them more accessible to users of assistive technologies
-   *
-   * @description
-   * Enables/disables various ARIA attributes
-   */
-  this.config = function(newConfig) {
-    config = angular.extend(config, newConfig);
-  };
-
-  function watchExpr(attrName, ariaAttr, nodeBlackList, negate) {
-    return function(scope, elem, attr) {
-      var ariaCamelName = attr.$normalize(ariaAttr);
-      if (config[ariaCamelName] && !isNodeOneOf(elem, nodeBlackList) && !attr[ariaCamelName]) {
-        scope.$watch(attr[attrName], function(boolVal) {
-          // ensure boolean value
-          boolVal = negate ? !boolVal : !!boolVal;
-          elem.attr(ariaAttr, boolVal);
-        });
-      }
-    };
-  }
-  /**
-   * @ngdoc service
-   * @name $aria
-   *
-   * @description
-   * @priority 200
-   *
-   * The $aria service contains helper methods for applying common
-   * [ARIA](http://www.w3.org/TR/wai-aria/) attributes to HTML directives.
-   *
-   * ngAria injects common accessibility attributes that tell assistive technologies when HTML
-   * elements are enabled, selected, hidden, and more. To see how this is performed with ngAria,
-   * let's review a code snippet from ngAria itself:
-   *
-   *```js
-   * ngAriaModule.directive('ngDisabled', ['$aria', function($aria) {
-   *   return $aria.$$watchExpr('ngDisabled', 'aria-disabled', nodeBlackList, false);
-   * }])
-   *```
-   * Shown above, the ngAria module creates a directive with the same signature as the
-   * traditional `ng-disabled` directive. But this ngAria version is dedicated to
-   * solely managing accessibility attributes on custom elements. The internal `$aria` service is
-   * used to watch the boolean attribute `ngDisabled`. If it has not been explicitly set by the
-   * developer, `aria-disabled` is injected as an attribute with its value synchronized to the
-   * value in `ngDisabled`.
-   *
-   * Because ngAria hooks into the `ng-disabled` directive, developers do not have to do
-   * anything to enable this feature. The `aria-disabled` attribute is automatically managed
-   * simply as a silent side-effect of using `ng-disabled` with the ngAria module.
-   *
-   * The full list of directives that interface with ngAria:
-   * * **ngModel**
-   * * **ngChecked**
-   * * **ngRequired**
-   * * **ngDisabled**
-   * * **ngValue**
-   * * **ngShow**
-   * * **ngHide**
-   * * **ngClick**
-   * * **ngDblclick**
-   * * **ngMessages**
-   *
-   * Read the {@link guide/accessibility ngAria Developer Guide} for a thorough explanation of each
-   * directive.
-   *
-   *
-   * ## Dependencies
-   * Requires the {@link ngAria} module to be installed.
-   */
-  this.$get = function() {
-    return {
-      config: function(key) {
-        return config[key];
-      },
-      $$watchExpr: watchExpr
-    };
-  };
-}
-
-
-ngAriaModule.directive('ngShow', ['$aria', function($aria) {
-  return $aria.$$watchExpr('ngShow', 'aria-hidden', [], true);
-}])
-.directive('ngHide', ['$aria', function($aria) {
-  return $aria.$$watchExpr('ngHide', 'aria-hidden', [], false);
-}])
-.directive('ngValue', ['$aria', function($aria) {
-  return $aria.$$watchExpr('ngValue', 'aria-checked', nodeBlackList, false);
-}])
-.directive('ngChecked', ['$aria', function($aria) {
-  return $aria.$$watchExpr('ngChecked', 'aria-checked', nodeBlackList, false);
-}])
-.directive('ngRequired', ['$aria', function($aria) {
-  return $aria.$$watchExpr('ngRequired', 'aria-required', nodeBlackList, false);
-}])
-.directive('ngModel', ['$aria', function($aria) {
-
-  function shouldAttachAttr(attr, normalizedAttr, elem, allowBlacklistEls) {
-    return $aria.config(normalizedAttr) && !elem.attr(attr) && (allowBlacklistEls || !isNodeOneOf(elem, nodeBlackList));
-  }
-
-  function shouldAttachRole(role, elem) {
-    // if element does not have role attribute
-    // AND element type is equal to role (if custom element has a type equaling shape) <-- remove?
-    // AND element is not INPUT
-    return !elem.attr('role') && (elem.attr('type') === role) && (elem[0].nodeName !== 'INPUT');
-  }
-
-  function getShape(attr, elem) {
-    var type = attr.type,
-        role = attr.role;
-
-    return ((type || role) === 'checkbox' || role === 'menuitemcheckbox') ? 'checkbox' :
-           ((type || role) === 'radio'    || role === 'menuitemradio') ? 'radio' :
-           (type === 'range'              || role === 'progressbar' || role === 'slider') ? 'range' : '';
-  }
-
-  return {
-    restrict: 'A',
-    require: 'ngModel',
-    priority: 200, //Make sure watches are fired after any other directives that affect the ngModel value
-    compile: function(elem, attr) {
-      var shape = getShape(attr, elem);
-
-      return {
-        pre: function(scope, elem, attr, ngModel) {
-          if (shape === 'checkbox') {
-            //Use the input[checkbox] $isEmpty implementation for elements with checkbox roles
-            ngModel.$isEmpty = function(value) {
-              return value === false;
-            };
-          }
-        },
-        post: function(scope, elem, attr, ngModel) {
-          var needsTabIndex = shouldAttachAttr('tabindex', 'tabindex', elem, false);
-
-          function ngAriaWatchModelValue() {
-            return ngModel.$modelValue;
-          }
-
-          function getRadioReaction(newVal) {
-            var boolVal = (attr.value == ngModel.$viewValue);
-            elem.attr('aria-checked', boolVal);
-          }
-
-          function getCheckboxReaction() {
-            elem.attr('aria-checked', !ngModel.$isEmpty(ngModel.$viewValue));
-          }
-
-          switch (shape) {
-            case 'radio':
-            case 'checkbox':
-              if (shouldAttachRole(shape, elem)) {
-                elem.attr('role', shape);
-              }
-              if (shouldAttachAttr('aria-checked', 'ariaChecked', elem, false)) {
-                scope.$watch(ngAriaWatchModelValue, shape === 'radio' ?
-                    getRadioReaction : getCheckboxReaction);
-              }
-              if (needsTabIndex) {
-                elem.attr('tabindex', 0);
-              }
-              break;
-            case 'range':
-              if (shouldAttachRole(shape, elem)) {
-                elem.attr('role', 'slider');
-              }
-              if ($aria.config('ariaValue')) {
-                var needsAriaValuemin = !elem.attr('aria-valuemin') &&
-                    (attr.hasOwnProperty('min') || attr.hasOwnProperty('ngMin'));
-                var needsAriaValuemax = !elem.attr('aria-valuemax') &&
-                    (attr.hasOwnProperty('max') || attr.hasOwnProperty('ngMax'));
-                var needsAriaValuenow = !elem.attr('aria-valuenow');
-
-                if (needsAriaValuemin) {
-                  attr.$observe('min', function ngAriaValueMinReaction(newVal) {
-                    elem.attr('aria-valuemin', newVal);
-                  });
-                }
-                if (needsAriaValuemax) {
-                  attr.$observe('max', function ngAriaValueMinReaction(newVal) {
-                    elem.attr('aria-valuemax', newVal);
-                  });
-                }
-                if (needsAriaValuenow) {
-                  scope.$watch(ngAriaWatchModelValue, function ngAriaValueNowReaction(newVal) {
-                    elem.attr('aria-valuenow', newVal);
-                  });
-                }
-              }
-              if (needsTabIndex) {
-                elem.attr('tabindex', 0);
-              }
-              break;
-          }
-
-          if (!attr.hasOwnProperty('ngRequired') && ngModel.$validators.required
-            && shouldAttachAttr('aria-required', 'ariaRequired', elem, false)) {
-            // ngModel.$error.required is undefined on custom controls
-            attr.$observe('required', function() {
-              elem.attr('aria-required', !!attr['required']);
-            });
-          }
-
-          if (shouldAttachAttr('aria-invalid', 'ariaInvalid', elem, true)) {
-            scope.$watch(function ngAriaInvalidWatch() {
-              return ngModel.$invalid;
-            }, function ngAriaInvalidReaction(newVal) {
-              elem.attr('aria-invalid', !!newVal);
-            });
-          }
-        }
-      };
-    }
-  };
-}])
-.directive('ngDisabled', ['$aria', function($aria) {
-  return $aria.$$watchExpr('ngDisabled', 'aria-disabled', nodeBlackList, false);
-}])
-.directive('ngMessages', function() {
-  return {
-    restrict: 'A',
-    require: '?ngMessages',
-    link: function(scope, elem, attr, ngMessages) {
-      if (!elem.attr('aria-live')) {
-        elem.attr('aria-live', 'assertive');
-      }
-    }
-  };
-})
-.directive('ngClick',['$aria', '$parse', function($aria, $parse) {
-  return {
-    restrict: 'A',
-    compile: function(elem, attr) {
-      var fn = $parse(attr.ngClick, /* interceptorFn */ null, /* expensiveChecks */ true);
-      return function(scope, elem, attr) {
-
-        if (!isNodeOneOf(elem, nodeBlackList)) {
-
-          if ($aria.config('bindRoleForClick') && !elem.attr('role')) {
-            elem.attr('role', 'button');
-          }
-
-          if ($aria.config('tabindex') && !elem.attr('tabindex')) {
-            elem.attr('tabindex', 0);
-          }
-
-          if ($aria.config('bindKeypress') && !attr.ngKeypress) {
-            elem.on('keypress', function(event) {
-              var keyCode = event.which || event.keyCode;
-              if (keyCode === 32 || keyCode === 13) {
-                scope.$apply(callback);
-              }
-
-              function callback() {
-                fn(scope, { $event: event });
-              }
-            });
-          }
-        }
-      };
-    }
-  };
-}])
-.directive('ngDblclick', ['$aria', function($aria) {
-  return function(scope, elem, attr) {
-    if ($aria.config('tabindex') && !elem.attr('tabindex') && !isNodeOneOf(elem, nodeBlackList)) {
-      elem.attr('tabindex', 0);
-    }
-  };
-}]);
-
-
-})(window, window.angular);
diff --git a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-aria.min.js b/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-aria.min.js
deleted file mode 100644
index cf0fd7425..000000000
--- a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-aria.min.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- AngularJS v1.5.0
- (c) 2010-2016 Google, Inc. http://angularjs.org
- License: MIT
-*/
-(function(s,q,t){'use strict';var f="BUTTON A INPUT TEXTAREA SELECT DETAILS SUMMARY".split(" "),l=function(a,c){if(-1!==c.indexOf(a[0].nodeName))return!0};q.module("ngAria",["ng"]).provider("$aria",function(){function a(a,h,p,n){return function(d,e,b){var g=b.$normalize(h);!c[g]||l(e,p)||b[g]||d.$watch(b[a],function(b){b=n?!b:!!b;e.attr(h,b)})}}var c={ariaHidden:!0,ariaChecked:!0,ariaDisabled:!0,ariaRequired:!0,ariaInvalid:!0,ariaValue:!0,tabindex:!0,bindKeypress:!0,bindRoleForClick:!0};this.config=
-function(a){c=q.extend(c,a)};this.$get=function(){return{config:function(a){return c[a]},$$watchExpr:a}}}).directive("ngShow",["$aria",function(a){return a.$$watchExpr("ngShow","aria-hidden",[],!0)}]).directive("ngHide",["$aria",function(a){return a.$$watchExpr("ngHide","aria-hidden",[],!1)}]).directive("ngValue",["$aria",function(a){return a.$$watchExpr("ngValue","aria-checked",f,!1)}]).directive("ngChecked",["$aria",function(a){return a.$$watchExpr("ngChecked","aria-checked",f,!1)}]).directive("ngRequired",
-["$aria",function(a){return a.$$watchExpr("ngRequired","aria-required",f,!1)}]).directive("ngModel",["$aria",function(a){function c(c,n,d,e){return a.config(n)&&!d.attr(c)&&(e||!l(d,f))}function m(a,c){return!c.attr("role")&&c.attr("type")===a&&"INPUT"!==c[0].nodeName}function h(a,c){var d=a.type,e=a.role;return"checkbox"===(d||e)||"menuitemcheckbox"===e?"checkbox":"radio"===(d||e)||"menuitemradio"===e?"radio":"range"===d||"progressbar"===e||"slider"===e?"range":""}return{restrict:"A",require:"ngModel",
-priority:200,compile:function(f,n){var d=h(n,f);return{pre:function(a,b,c,k){"checkbox"===d&&(k.$isEmpty=function(a){return!1===a})},post:function(e,b,g,k){function f(){return k.$modelValue}function h(a){b.attr("aria-checked",g.value==k.$viewValue)}function n(){b.attr("aria-checked",!k.$isEmpty(k.$viewValue))}var l=c("tabindex","tabindex",b,!1);switch(d){case "radio":case "checkbox":m(d,b)&&b.attr("role",d);c("aria-checked","ariaChecked",b,!1)&&e.$watch(f,"radio"===d?h:n);l&&b.attr("tabindex",0);
-break;case "range":m(d,b)&&b.attr("role","slider");if(a.config("ariaValue")){var p=!b.attr("aria-valuemin")&&(g.hasOwnProperty("min")||g.hasOwnProperty("ngMin")),q=!b.attr("aria-valuemax")&&(g.hasOwnProperty("max")||g.hasOwnProperty("ngMax")),r=!b.attr("aria-valuenow");p&&g.$observe("min",function(a){b.attr("aria-valuemin",a)});q&&g.$observe("max",function(a){b.attr("aria-valuemax",a)});r&&e.$watch(f,function(a){b.attr("aria-valuenow",a)})}l&&b.attr("tabindex",0)}!g.hasOwnProperty("ngRequired")&&
-k.$validators.required&&c("aria-required","ariaRequired",b,!1)&&g.$observe("required",function(){b.attr("aria-required",!!g.required)});c("aria-invalid","ariaInvalid",b,!0)&&e.$watch(function(){return k.$invalid},function(a){b.attr("aria-invalid",!!a)})}}}}}]).directive("ngDisabled",["$aria",function(a){return a.$$watchExpr("ngDisabled","aria-disabled",f,!1)}]).directive("ngMessages",function(){return{restrict:"A",require:"?ngMessages",link:function(a,c,f,h){c.attr("aria-live")||c.attr("aria-live",
-"assertive")}}}).directive("ngClick",["$aria","$parse",function(a,c){return{restrict:"A",compile:function(m,h){var p=c(h.ngClick,null,!0);return function(c,d,e){if(!l(d,f)&&(a.config("bindRoleForClick")&&!d.attr("role")&&d.attr("role","button"),a.config("tabindex")&&!d.attr("tabindex")&&d.attr("tabindex",0),a.config("bindKeypress")&&!e.ngKeypress))d.on("keypress",function(a){function d(){p(c,{$event:a})}var e=a.which||a.keyCode;32!==e&&13!==e||c.$apply(d)})}}}}]).directive("ngDblclick",["$aria",function(a){return function(c,
-m,h){!a.config("tabindex")||m.attr("tabindex")||l(m,f)||m.attr("tabindex",0)}}])})(window,window.angular);
-//# sourceMappingURL=angular-aria.min.js.map
diff --git a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-aria.min.js.map b/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-aria.min.js.map
deleted file mode 100644
index b1db15b5d..000000000
--- a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-aria.min.js.map
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-"version":3,
-"file":"angular-aria.min.js",
-"lineCount":13,
-"mappings":"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",
-"sources":["angular-aria.js"],
-"names":["window","angular","undefined","nodeBlackList","isNodeOneOf","elem","nodeTypeArray","indexOf","nodeName","module","provider","ngAriaModule","$AriaProvider","watchExpr","attrName","ariaAttr","negate","scope","attr","ariaCamelName","$normalize","config","$watch","boolVal","ariaHidden","ariaChecked","ariaDisabled","ariaRequired","ariaInvalid","ariaValue","tabindex","bindKeypress","bindRoleForClick","this.config","newConfig","extend","$get","this.$get","key","$$watchExpr","directive","$aria","shouldAttachAttr","normalizedAttr","allowBlacklistEls","shouldAttachRole","role","getShape","type","restrict","require","priority","compile","shape","pre","ngModel","$isEmpty","ngModel.$isEmpty","value","post","ngAriaWatchModelValue","$modelValue","getRadioReaction","newVal","$viewValue","getCheckboxReaction","needsTabIndex","needsAriaValuemin","hasOwnProperty","needsAriaValuemax","needsAriaValuenow","$observe","ngAriaValueMinReaction","ngAriaValueNowReaction","$validators","required","ngAriaInvalidWatch","$invalid","ngAriaInvalidReaction","link","ngMessages","$parse","fn","ngClick","ngKeypress","on","event","callback","$event","keyCode","which","$apply"]
-}
diff --git a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-cookies.js b/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-cookies.js
deleted file mode 100644
index 2157ef03f..000000000
--- a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-cookies.js
+++ /dev/null
@@ -1,322 +0,0 @@
-/**
- * @license AngularJS v1.5.0
- * (c) 2010-2016 Google, Inc. http://angularjs.org
- * License: MIT
- */
-(function(window, angular, undefined) {'use strict';
-
-/**
- * @ngdoc module
- * @name ngCookies
- * @description
- *
- * # ngCookies
- *
- * The `ngCookies` module provides a convenient wrapper for reading and writing browser cookies.
- *
- *
- * 
    
- *
- * See {@link ngCookies.$cookies `$cookies`} for usage.
- */
-
-
-angular.module('ngCookies', ['ng']).
-  /**
-   * @ngdoc provider
-   * @name $cookiesProvider
-   * @description
-   * Use `$cookiesProvider` to change the default behavior of the {@link ngCookies.$cookies $cookies} service.
-   * */
-   provider('$cookies', [function $CookiesProvider() {
-    /**
-     * @ngdoc property
-     * @name $cookiesProvider#defaults
-     * @description
-     *
-     * Object containing default options to pass when setting cookies.
-     *
-     * The object may have following properties:
-     *
-     * - **path** - `{string}` - The cookie will be available only for this path and its
-     *   sub-paths. By default, this is the URL that appears in your `` tag.
-     * - **domain** - `{string}` - The cookie will be available only for this domain and
-     *   its sub-domains. For security reasons the user agent will not accept the cookie
-     *   if the current domain is not a sub-domain of this domain or equal to it.
-     * - **expires** - `{string|Date}` - String of the form "Wdy, DD Mon YYYY HH:MM:SS GMT"
-     *   or a Date object indicating the exact date/time this cookie will expire.
-     * - **secure** - `{boolean}` - If `true`, then the cookie will only be available through a
-     *   secured connection.
-     *
-     * Note: By default, the address that appears in your `` tag will be used as the path.
-     * This is important so that cookies will be visible for all routes when html5mode is enabled.
-     *
-     **/
-    var defaults = this.defaults = {};
-
-    function calcOptions(options) {
-      return options ? angular.extend({}, defaults, options) : defaults;
-    }
-
-    /**
-     * @ngdoc service
-     * @name $cookies
-     *
-     * @description
-     * Provides read/write access to browser's cookies.
-     *
-     * 
    
-     * Up until Angular 1.3, `$cookies` exposed properties that represented the
-     * current browser cookie values. In version 1.4, this behavior has changed, and
-     * `$cookies` now provides a standard api of getters, setters etc.
-     * 
    
-     *
-     * Requires the {@link ngCookies `ngCookies`} module to be installed.
-     *
-     * @example
-     *
-     * ```js
-     * angular.module('cookiesExample', ['ngCookies'])
-     *   .controller('ExampleController', ['$cookies', function($cookies) {
-     *     // Retrieving a cookie
-     *     var favoriteCookie = $cookies.get('myFavorite');
-     *     // Setting a cookie
-     *     $cookies.put('myFavorite', 'oatmeal');
-     *   }]);
-     * ```
-     */
-    this.$get = ['$$cookieReader', '$$cookieWriter', function($$cookieReader, $$cookieWriter) {
-      return {
-        /**
-         * @ngdoc method
-         * @name $cookies#get
-         *
-         * @description
-         * Returns the value of given cookie key
-         *
-         * @param {string} key Id to use for lookup.
-         * @returns {string} Raw cookie value.
-         */
-        get: function(key) {
-          return $$cookieReader()[key];
-        },
-
-        /**
-         * @ngdoc method
-         * @name $cookies#getObject
-         *
-         * @description
-         * Returns the deserialized value of given cookie key
-         *
-         * @param {string} key Id to use for lookup.
-         * @returns {Object} Deserialized cookie value.
-         */
-        getObject: function(key) {
-          var value = this.get(key);
-          return value ? angular.fromJson(value) : value;
-        },
-
-        /**
-         * @ngdoc method
-         * @name $cookies#getAll
-         *
-         * @description
-         * Returns a key value object with all the cookies
-         *
-         * @returns {Object} All cookies
-         */
-        getAll: function() {
-          return $$cookieReader();
-        },
-
-        /**
-         * @ngdoc method
-         * @name $cookies#put
-         *
-         * @description
-         * Sets a value for given cookie key
-         *
-         * @param {string} key Id for the `value`.
-         * @param {string} value Raw value to be stored.
-         * @param {Object=} options Options object.
-         *    See {@link ngCookies.$cookiesProvider#defaults $cookiesProvider.defaults}
-         */
-        put: function(key, value, options) {
-          $$cookieWriter(key, value, calcOptions(options));
-        },
-
-        /**
-         * @ngdoc method
-         * @name $cookies#putObject
-         *
-         * @description
-         * Serializes and sets a value for given cookie key
-         *
-         * @param {string} key Id for the `value`.
-         * @param {Object} value Value to be stored.
-         * @param {Object=} options Options object.
-         *    See {@link ngCookies.$cookiesProvider#defaults $cookiesProvider.defaults}
-         */
-        putObject: function(key, value, options) {
-          this.put(key, angular.toJson(value), options);
-        },
-
-        /**
-         * @ngdoc method
-         * @name $cookies#remove
-         *
-         * @description
-         * Remove given cookie
-         *
-         * @param {string} key Id of the key-value pair to delete.
-         * @param {Object=} options Options object.
-         *    See {@link ngCookies.$cookiesProvider#defaults $cookiesProvider.defaults}
-         */
-        remove: function(key, options) {
-          $$cookieWriter(key, undefined, calcOptions(options));
-        }
-      };
-    }];
-  }]);
-
-angular.module('ngCookies').
-/**
- * @ngdoc service
- * @name $cookieStore
- * @deprecated
- * @requires $cookies
- *
- * @description
- * Provides a key-value (string-object) storage, that is backed by session cookies.
- * Objects put or retrieved from this storage are automatically serialized or
- * deserialized by angular's toJson/fromJson.
- *
- * Requires the {@link ngCookies `ngCookies`} module to be installed.
- *
- * 
    
- * **Note:** The $cookieStore service is **deprecated**.
- * Please use the {@link ngCookies.$cookies `$cookies`} service instead.
- * 
    
- *
- * @example
- *
- * ```js
- * angular.module('cookieStoreExample', ['ngCookies'])
- *   .controller('ExampleController', ['$cookieStore', function($cookieStore) {
- *     // Put cookie
- *     $cookieStore.put('myFavorite','oatmeal');
- *     // Get cookie
- *     var favoriteCookie = $cookieStore.get('myFavorite');
- *     // Removing a cookie
- *     $cookieStore.remove('myFavorite');
- *   }]);
- * ```
- */
- factory('$cookieStore', ['$cookies', function($cookies) {
-
-    return {
-      /**
-       * @ngdoc method
-       * @name $cookieStore#get
-       *
-       * @description
-       * Returns the value of given cookie key
-       *
-       * @param {string} key Id to use for lookup.
-       * @returns {Object} Deserialized cookie value, undefined if the cookie does not exist.
-       */
-      get: function(key) {
-        return $cookies.getObject(key);
-      },
-
-      /**
-       * @ngdoc method
-       * @name $cookieStore#put
-       *
-       * @description
-       * Sets a value for given cookie key
-       *
-       * @param {string} key Id for the `value`.
-       * @param {Object} value Value to be stored.
-       */
-      put: function(key, value) {
-        $cookies.putObject(key, value);
-      },
-
-      /**
-       * @ngdoc method
-       * @name $cookieStore#remove
-       *
-       * @description
-       * Remove given cookie
-       *
-       * @param {string} key Id of the key-value pair to delete.
-       */
-      remove: function(key) {
-        $cookies.remove(key);
-      }
-    };
-
-  }]);
-
-/**
- * @name $$cookieWriter
- * @requires $document
- *
- * @description
- * This is a private service for writing cookies
- *
- * @param {string} name Cookie name
- * @param {string=} value Cookie value (if undefined, cookie will be deleted)
- * @param {Object=} options Object with options that need to be stored for the cookie.
- */
-function $$CookieWriter($document, $log, $browser) {
-  var cookiePath = $browser.baseHref();
-  var rawDocument = $document[0];
-
-  function buildCookieString(name, value, options) {
-    var path, expires;
-    options = options || {};
-    expires = options.expires;
-    path = angular.isDefined(options.path) ? options.path : cookiePath;
-    if (angular.isUndefined(value)) {
-      expires = 'Thu, 01 Jan 1970 00:00:00 GMT';
-      value = '';
-    }
-    if (angular.isString(expires)) {
-      expires = new Date(expires);
-    }
-
-    var str = encodeURIComponent(name) + '=' + encodeURIComponent(value);
-    str += path ? ';path=' + path : '';
-    str += options.domain ? ';domain=' + options.domain : '';
-    str += expires ? ';expires=' + expires.toUTCString() : '';
-    str += options.secure ? ';secure' : '';
-
-    // per http://www.ietf.org/rfc/rfc2109.txt browser must allow at minimum:
-    // - 300 cookies
-    // - 20 cookies per unique domain
-    // - 4096 bytes per cookie
-    var cookieLength = str.length + 1;
-    if (cookieLength > 4096) {
-      $log.warn("Cookie '" + name +
-        "' possibly not set or overflowed because it was too large (" +
-        cookieLength + " > 4096 bytes)!");
-    }
-
-    return str;
-  }
-
-  return function(name, value, options) {
-    rawDocument.cookie = buildCookieString(name, value, options);
-  };
-}
-
-$$CookieWriter.$inject = ['$document', '$log', '$browser'];
-
-angular.module('ngCookies').provider('$$cookieWriter', function $$CookieWriterProvider() {
-  this.$get = $$CookieWriter;
-});
-
-
-})(window, window.angular);
diff --git a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-cookies.min.js b/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-cookies.min.js
deleted file mode 100644
index d0f126a95..000000000
--- a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-cookies.min.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- AngularJS v1.5.0
- (c) 2010-2016 Google, Inc. http://angularjs.org
- License: MIT
-*/
-(function(p,c,n){'use strict';function l(b,a,g){var d=g.baseHref(),k=b[0];return function(b,e,f){var g,h;f=f||{};h=f.expires;g=c.isDefined(f.path)?f.path:d;c.isUndefined(e)&&(h="Thu, 01 Jan 1970 00:00:00 GMT",e="");c.isString(h)&&(h=new Date(h));e=encodeURIComponent(b)+"="+encodeURIComponent(e);e=e+(g?";path="+g:"")+(f.domain?";domain="+f.domain:"");e+=h?";expires="+h.toUTCString():"";e+=f.secure?";secure":"";f=e.length+1;4096 4096 bytes)!");k.cookie=e}}c.module("ngCookies",["ng"]).provider("$cookies",[function(){var b=this.defaults={};this.$get=["$$cookieReader","$$cookieWriter",function(a,g){return{get:function(d){return a()[d]},getObject:function(d){return(d=this.get(d))?c.fromJson(d):d},getAll:function(){return a()},put:function(d,a,m){g(d,a,m?c.extend({},b,m):b)},putObject:function(d,b,a){this.put(d,c.toJson(b),a)},remove:function(a,k){g(a,n,k?c.extend({},b,k):b)}}}]}]);c.module("ngCookies").factory("$cookieStore",
-["$cookies",function(b){return{get:function(a){return b.getObject(a)},put:function(a,c){b.putObject(a,c)},remove:function(a){b.remove(a)}}}]);l.$inject=["$document","$log","$browser"];c.module("ngCookies").provider("$$cookieWriter",function(){this.$get=l})})(window,window.angular);
-//# sourceMappingURL=angular-cookies.min.js.map
diff --git a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-cookies.min.js.map b/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-cookies.min.js.map
deleted file mode 100644
index 555b5103b..000000000
--- a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-cookies.min.js.map
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-"version":3,
-"file":"angular-cookies.min.js",
-"lineCount":8,
-"mappings":"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",
-"sources":["angular-cookies.js"],
-"names":["window","angular","undefined","$$CookieWriter","$document","$log","$browser","cookiePath","baseHref","rawDocument","name","value","options","path","expires","isDefined","isUndefined","isString","Date","str","encodeURIComponent","domain","toUTCString","secure","cookieLength","length","warn","cookie","module","provider","$CookiesProvider","defaults","$get","$$cookieReader","$$cookieWriter","get","key","getObject","fromJson","getAll","put","extend","putObject","toJson","remove","factory","$cookies","$inject","$$CookieWriterProvider"]
-}
diff --git a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-csp.css b/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-csp.css
deleted file mode 100644
index 23134fdfb..000000000
--- a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-csp.css
+++ /dev/null
@@ -1,20 +0,0 @@
-
-@charset "UTF-8";
-
-[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak],
-.ng-cloak, .x-ng-cloak,
-.ng-hide:not(.ng-hide-animate) {
-  display: none !important;
-}
-
-ng\:form {
-  display: block;
-}
-
-.ng-animate-shim {
-  visibility:hidden;
-}
-
-.ng-anchor {
-  position:absolute;
-}
diff --git a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-loader.js b/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-loader.js
deleted file mode 100644
index 77948fd58..000000000
--- a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-loader.js
+++ /dev/null
@@ -1,484 +0,0 @@
-/**
- * @license AngularJS v1.5.0
- * (c) 2010-2016 Google, Inc. http://angularjs.org
- * License: MIT
- */
-
-(function() {'use strict';
-    function isFunction(value) {return typeof value === 'function';};
-
-/* global: toDebugString: true */
-
-function serializeObject(obj) {
-  var seen = [];
-
-  return JSON.stringify(obj, function(key, val) {
-    val = toJsonReplacer(key, val);
-    if (isObject(val)) {
-
-      if (seen.indexOf(val) >= 0) return '...';
-
-      seen.push(val);
-    }
-    return val;
-  });
-}
-
-function toDebugString(obj) {
-  if (typeof obj === 'function') {
-    return obj.toString().replace(/ \{[\s\S]*$/, '');
-  } else if (isUndefined(obj)) {
-    return 'undefined';
-  } else if (typeof obj !== 'string') {
-    return serializeObject(obj);
-  }
-  return obj;
-}
-
-/**
- * @description
- *
- * This object provides a utility for producing rich Error messages within
- * Angular. It can be called as follows:
- *
- * var exampleMinErr = minErr('example');
- * throw exampleMinErr('one', 'This {0} is {1}', foo, bar);
- *
- * The above creates an instance of minErr in the example namespace. The
- * resulting error will have a namespaced error code of example.one.  The
- * resulting error will replace {0} with the value of foo, and {1} with the
- * value of bar. The object is not restricted in the number of arguments it can
- * take.
- *
- * If fewer arguments are specified than necessary for interpolation, the extra
- * interpolation markers will be preserved in the final string.
- *
- * Since data will be parsed statically during a build step, some restrictions
- * are applied with respect to how minErr instances are created and called.
- * Instances should have names of the form namespaceMinErr for a minErr created
- * using minErr('namespace') . Error codes, namespaces and template strings
- * should all be static strings, not variables or general expressions.
- *
- * @param {string} module The namespace to use for the new minErr instance.
- * @param {function} ErrorConstructor Custom error constructor to be instantiated when returning
- *   error from returned function, for cases when a particular type of error is useful.
- * @returns {function(code:string, template:string, ...templateArgs): Error} minErr instance
- */
-
-function minErr(module, ErrorConstructor) {
-  ErrorConstructor = ErrorConstructor || Error;
-  return function() {
-    var SKIP_INDEXES = 2;
-
-    var templateArgs = arguments,
-      code = templateArgs[0],
-      message = '[' + (module ? module + ':' : '') + code + '] ',
-      template = templateArgs[1],
-      paramPrefix, i;
-
-    message += template.replace(/\{\d+\}/g, function(match) {
-      var index = +match.slice(1, -1),
-        shiftedIndex = index + SKIP_INDEXES;
-
-      if (shiftedIndex < templateArgs.length) {
-        return toDebugString(templateArgs[shiftedIndex]);
-      }
-
-      return match;
-    });
-
-    message += '\nhttp://errors.angularjs.org/1.5.0/' +
-      (module ? module + '/' : '') + code;
-
-    for (i = SKIP_INDEXES, paramPrefix = '?'; i < templateArgs.length; i++, paramPrefix = '&') {
-      message += paramPrefix + 'p' + (i - SKIP_INDEXES) + '=' +
-        encodeURIComponent(toDebugString(templateArgs[i]));
-    }
-
-    return new ErrorConstructor(message);
-  };
-}
-
-/**
- * @ngdoc type
- * @name angular.Module
- * @module ng
- * @description
- *
- * Interface for configuring angular {@link angular.module modules}.
- */
-
-function setupModuleLoader(window) {
-
-  var $injectorMinErr = minErr('$injector');
-  var ngMinErr = minErr('ng');
-
-  function ensure(obj, name, factory) {
-    return obj[name] || (obj[name] = factory());
-  }
-
-  var angular = ensure(window, 'angular', Object);
-
-  // We need to expose `angular.$$minErr` to modules such as `ngResource` that reference it during bootstrap
-  angular.$$minErr = angular.$$minErr || minErr;
-
-  return ensure(angular, 'module', function() {
-    /** @type {Object.} */
-    var modules = {};
-
-    /**
-     * @ngdoc function
-     * @name angular.module
-     * @module ng
-     * @description
-     *
-     * The `angular.module` is a global place for creating, registering and retrieving Angular
-     * modules.
-     * All modules (angular core or 3rd party) that should be available to an application must be
-     * registered using this mechanism.
-     *
-     * Passing one argument retrieves an existing {@link angular.Module},
-     * whereas passing more than one argument creates a new {@link angular.Module}
-     *
-     *
-     * # Module
-     *
-     * A module is a collection of services, directives, controllers, filters, and configuration information.
-     * `angular.module` is used to configure the {@link auto.$injector $injector}.
-     *
-     * ```js
-     * // Create a new module
-     * var myModule = angular.module('myModule', []);
-     *
-     * // register a new service
-     * myModule.value('appName', 'MyCoolApp');
-     *
-     * // configure existing services inside initialization blocks.
-     * myModule.config(['$locationProvider', function($locationProvider) {
-     *   // Configure existing providers
-     *   $locationProvider.hashPrefix('!');
-     * }]);
-     * ```
-     *
-     * Then you can create an injector and load your modules like this:
-     *
-     * ```js
-     * var injector = angular.injector(['ng', 'myModule'])
-     * ```
-     *
-     * However it's more likely that you'll just use
-     * {@link ng.directive:ngApp ngApp} or
-     * {@link angular.bootstrap} to simplify this process for you.
-     *
-     * @param {!string} name The name of the module to create or retrieve.
-     * @param {!Array.=} requires If specified then new module is being created. If
-     *        unspecified then the module is being retrieved for further configuration.
-     * @param {Function=} configFn Optional configuration function for the module. Same as
-     *        {@link angular.Module#config Module#config()}.
-     * @returns {angular.Module} new module with the {@link angular.Module} api.
-     */
-    return function module(name, requires, configFn) {
-      var assertNotHasOwnProperty = function(name, context) {
-        if (name === 'hasOwnProperty') {
-          throw ngMinErr('badname', 'hasOwnProperty is not a valid {0} name', context);
-        }
-      };
-
-      assertNotHasOwnProperty(name, 'module');
-      if (requires && modules.hasOwnProperty(name)) {
-        modules[name] = null;
-      }
-      return ensure(modules, name, function() {
-        if (!requires) {
-          throw $injectorMinErr('nomod', "Module '{0}' is not available! You either misspelled " +
-             "the module name or forgot to load it. If registering a module ensure that you " +
-             "specify the dependencies as the second argument.", name);
-        }
-
-        /** @type {!Array.>} */
-        var invokeQueue = [];
-
-        /** @type {!Array.} */
-        var configBlocks = [];
-
-        /** @type {!Array.} */
-        var runBlocks = [];
-
-        var config = invokeLater('$injector', 'invoke', 'push', configBlocks);
-
-        /** @type {angular.Module} */
-        var moduleInstance = {
-          // Private state
-          _invokeQueue: invokeQueue,
-          _configBlocks: configBlocks,
-          _runBlocks: runBlocks,
-
-          /**
-           * @ngdoc property
-           * @name angular.Module#requires
-           * @module ng
-           *
-           * @description
-           * Holds the list of modules which the injector will load before the current module is
-           * loaded.
-           */
-          requires: requires,
-
-          /**
-           * @ngdoc property
-           * @name angular.Module#name
-           * @module ng
-           *
-           * @description
-           * Name of the module.
-           */
-          name: name,
-
-
-          /**
-           * @ngdoc method
-           * @name angular.Module#provider
-           * @module ng
-           * @param {string} name service name
-           * @param {Function} providerType Construction function for creating new instance of the
-           *                                service.
-           * @description
-           * See {@link auto.$provide#provider $provide.provider()}.
-           */
-          provider: invokeLaterAndSetModuleName('$provide', 'provider'),
-
-          /**
-           * @ngdoc method
-           * @name angular.Module#factory
-           * @module ng
-           * @param {string} name service name
-           * @param {Function} providerFunction Function for creating new instance of the service.
-           * @description
-           * See {@link auto.$provide#factory $provide.factory()}.
-           */
-          factory: invokeLaterAndSetModuleName('$provide', 'factory'),
-
-          /**
-           * @ngdoc method
-           * @name angular.Module#service
-           * @module ng
-           * @param {string} name service name
-           * @param {Function} constructor A constructor function that will be instantiated.
-           * @description
-           * See {@link auto.$provide#service $provide.service()}.
-           */
-          service: invokeLaterAndSetModuleName('$provide', 'service'),
-
-          /**
-           * @ngdoc method
-           * @name angular.Module#value
-           * @module ng
-           * @param {string} name service name
-           * @param {*} object Service instance object.
-           * @description
-           * See {@link auto.$provide#value $provide.value()}.
-           */
-          value: invokeLater('$provide', 'value'),
-
-          /**
-           * @ngdoc method
-           * @name angular.Module#constant
-           * @module ng
-           * @param {string} name constant name
-           * @param {*} object Constant value.
-           * @description
-           * Because the constants are fixed, they get applied before other provide methods.
-           * See {@link auto.$provide#constant $provide.constant()}.
-           */
-          constant: invokeLater('$provide', 'constant', 'unshift'),
-
-           /**
-           * @ngdoc method
-           * @name angular.Module#decorator
-           * @module ng
-           * @param {string} The name of the service to decorate.
-           * @param {Function} This function will be invoked when the service needs to be
-           *                                    instantiated and should return the decorated service instance.
-           * @description
-           * See {@link auto.$provide#decorator $provide.decorator()}.
-           */
-          decorator: invokeLaterAndSetModuleName('$provide', 'decorator'),
-
-          /**
-           * @ngdoc method
-           * @name angular.Module#animation
-           * @module ng
-           * @param {string} name animation name
-           * @param {Function} animationFactory Factory function for creating new instance of an
-           *                                    animation.
-           * @description
-           *
-           * **NOTE**: animations take effect only if the **ngAnimate** module is loaded.
-           *
-           *
-           * Defines an animation hook that can be later used with
-           * {@link $animate $animate} service and directives that use this service.
-           *
-           * ```js
-           * module.animation('.animation-name', function($inject1, $inject2) {
-           *   return {
-           *     eventName : function(element, done) {
-           *       //code to run the animation
-           *       //once complete, then run done()
-           *       return function cancellationFunction(element) {
-           *         //code to cancel the animation
-           *       }
-           *     }
-           *   }
-           * })
-           * ```
-           *
-           * See {@link ng.$animateProvider#register $animateProvider.register()} and
-           * {@link ngAnimate ngAnimate module} for more information.
-           */
-          animation: invokeLaterAndSetModuleName('$animateProvider', 'register'),
-
-          /**
-           * @ngdoc method
-           * @name angular.Module#filter
-           * @module ng
-           * @param {string} name Filter name - this must be a valid angular expression identifier
-           * @param {Function} filterFactory Factory function for creating new instance of filter.
-           * @description
-           * See {@link ng.$filterProvider#register $filterProvider.register()}.
-           *
-           * 
    
-           * **Note:** Filter names must be valid angular {@link expression} identifiers, such as `uppercase` or `orderBy`.
-           * Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace
-           * your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores
-           * (`myapp_subsection_filterx`).
-           * 
    
-           */
-          filter: invokeLaterAndSetModuleName('$filterProvider', 'register'),
-
-          /**
-           * @ngdoc method
-           * @name angular.Module#controller
-           * @module ng
-           * @param {string|Object} name Controller name, or an object map of controllers where the
-           *    keys are the names and the values are the constructors.
-           * @param {Function} constructor Controller constructor function.
-           * @description
-           * See {@link ng.$controllerProvider#register $controllerProvider.register()}.
-           */
-          controller: invokeLaterAndSetModuleName('$controllerProvider', 'register'),
-
-          /**
-           * @ngdoc method
-           * @name angular.Module#directive
-           * @module ng
-           * @param {string|Object} name Directive name, or an object map of directives where the
-           *    keys are the names and the values are the factories.
-           * @param {Function} directiveFactory Factory function for creating new instance of
-           * directives.
-           * @description
-           * See {@link ng.$compileProvider#directive $compileProvider.directive()}.
-           */
-          directive: invokeLaterAndSetModuleName('$compileProvider', 'directive'),
-
-          /**
-           * @ngdoc method
-           * @name angular.Module#component
-           * @module ng
-           * @param {string} name Name of the component in camel-case (i.e. myComp which will match as my-comp)
-           * @param {Object} options Component definition object (a simplified
-           *    {@link ng.$compile#directive-definition-object directive definition object})
-           *
-           * @description
-           * See {@link ng.$compileProvider#component $compileProvider.component()}.
-           */
-          component: invokeLaterAndSetModuleName('$compileProvider', 'component'),
-
-          /**
-           * @ngdoc method
-           * @name angular.Module#config
-           * @module ng
-           * @param {Function} configFn Execute this function on module load. Useful for service
-           *    configuration.
-           * @description
-           * Use this method to register work which needs to be performed on module loading.
-           * For more about how to configure services, see
-           * {@link providers#provider-recipe Provider Recipe}.
-           */
-          config: config,
-
-          /**
-           * @ngdoc method
-           * @name angular.Module#run
-           * @module ng
-           * @param {Function} initializationFn Execute this function after injector creation.
-           *    Useful for application initialization.
-           * @description
-           * Use this method to register work which should be performed when the injector is done
-           * loading all modules.
-           */
-          run: function(block) {
-            runBlocks.push(block);
-            return this;
-          }
-        };
-
-        if (configFn) {
-          config(configFn);
-        }
-
-        return moduleInstance;
-
-        /**
-         * @param {string} provider
-         * @param {string} method
-         * @param {String=} insertMethod
-         * @returns {angular.Module}
-         */
-        function invokeLater(provider, method, insertMethod, queue) {
-          if (!queue) queue = invokeQueue;
-          return function() {
-            queue[insertMethod || 'push']([provider, method, arguments]);
-            return moduleInstance;
-          };
-        }
-
-        /**
-         * @param {string} provider
-         * @param {string} method
-         * @returns {angular.Module}
-         */
-        function invokeLaterAndSetModuleName(provider, method) {
-          return function(recipeName, factoryFunction) {
-            if (factoryFunction && isFunction(factoryFunction)) factoryFunction.$$moduleName = name;
-            invokeQueue.push([provider, method, arguments]);
-            return moduleInstance;
-          };
-        }
-      });
-    };
-  });
-
-}
-
-setupModuleLoader(window);
-})(window);
-
-/**
- * Closure compiler type information
- *
- * @typedef { {
- *   requires: !Array.,
- *   invokeQueue: !Array.>,
- *
- *   service: function(string, Function):angular.Module,
- *   factory: function(string, Function):angular.Module,
- *   value: function(string, *):angular.Module,
- *
- *   filter: function(string, Function):angular.Module,
- *
- *   init: function(Function):angular.Module
- * } }
- */
-angular.Module;
-
diff --git a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-loader.min.js b/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-loader.min.js
deleted file mode 100644
index 316ee26e9..000000000
--- a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-loader.min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- AngularJS v1.5.0
- (c) 2010-2016 Google, Inc. http://angularjs.org
- License: MIT
-*/
-(function(){'use strict';function d(b){return function(){var a=arguments[0],e;e="["+(b?b+":":"")+a+"] http://errors.angularjs.org/1.5.0/"+(b?b+"/":"")+a;for(a=1;a= line.length) {
-      index -= line.length;
-    } else {
-      return { line: i + 1, column: index + 1 };
-    }
-  }
-}
-var PARSE_CACHE_FOR_TEXT_LITERALS = Object.create(null);
-
-function parseTextLiteral(text) {
-  var cachedFn = PARSE_CACHE_FOR_TEXT_LITERALS[text];
-  if (cachedFn != null) {
-    return cachedFn;
-  }
-  function parsedFn(context) { return text; }
-  parsedFn['$$watchDelegate'] = function watchDelegate(scope, listener, objectEquality) {
-    var unwatch = scope['$watch'](noop,
-        function textLiteralWatcher() {
-          if (isFunction(listener)) { listener.call(null, text, text, scope); }
-          unwatch();
-        },
-        objectEquality);
-    return unwatch;
-  };
-  PARSE_CACHE_FOR_TEXT_LITERALS[text] = parsedFn;
-  parsedFn['exp'] = text; // Needed to pretend to be $interpolate for tests copied from interpolateSpec.js
-  parsedFn['expressions'] = []; // Require this to call $compile.$$addBindingInfo() which allows Protractor to find elements by binding.
-  return parsedFn;
-}
-
-function subtractOffset(expressionFn, offset) {
-  if (offset === 0) {
-    return expressionFn;
-  }
-  function minusOffset(value) {
-    return (value == void 0) ? value : value - offset;
-  }
-  function parsedFn(context) { return minusOffset(expressionFn(context)); }
-  var unwatch;
-  parsedFn['$$watchDelegate'] = function watchDelegate(scope, listener, objectEquality) {
-    unwatch = scope['$watch'](expressionFn,
-        function pluralExpressionWatchListener(newValue, oldValue) {
-          if (isFunction(listener)) { listener.call(null, minusOffset(newValue), minusOffset(oldValue), scope); }
-        },
-        objectEquality);
-    return unwatch;
-  };
-  return parsedFn;
-}
-
-// NOTE: ADVANCED_OPTIMIZATIONS mode.
-//
-// This file is compiled with Closure compiler's ADVANCED_OPTIMIZATIONS flag! Be wary of using
-// constructs incompatible with that mode.
-
-/* global $interpolateMinErr: false */
-/* global isFunction: false */
-/* global noop: false */
-
-/**
- * @constructor
- * @private
- */
-function MessageSelectorBase(expressionFn, choices) {
-  var self = this;
-  this.expressionFn = expressionFn;
-  this.choices = choices;
-  if (choices["other"] === void 0) {
-    throw $interpolateMinErr('reqother', '“other” is a required option.');
-  }
-  this.parsedFn = function(context) { return self.getResult(context); };
-  this.parsedFn['$$watchDelegate'] = function $$watchDelegate(scope, listener, objectEquality) {
-    return self.watchDelegate(scope, listener, objectEquality);
-  };
-  this.parsedFn['exp'] = expressionFn['exp'];
-  this.parsedFn['expressions'] = expressionFn['expressions'];
-}
-
-MessageSelectorBase.prototype.getMessageFn = function getMessageFn(value) {
-  return this.choices[this.categorizeValue(value)];
-};
-
-MessageSelectorBase.prototype.getResult = function getResult(context) {
-  return this.getMessageFn(this.expressionFn(context))(context);
-};
-
-MessageSelectorBase.prototype.watchDelegate = function watchDelegate(scope, listener, objectEquality) {
-  var watchers = new MessageSelectorWatchers(this, scope, listener, objectEquality);
-  return function() { watchers.cancelWatch(); };
-};
-
-/**
- * @constructor
- * @private
- */
-function MessageSelectorWatchers(msgSelector, scope, listener, objectEquality) {
-  var self = this;
-  this.scope = scope;
-  this.msgSelector = msgSelector;
-  this.listener = listener;
-  this.objectEquality = objectEquality;
-  this.lastMessage = void 0;
-  this.messageFnWatcher = noop;
-  var expressionFnListener = function(newValue, oldValue) { return self.expressionFnListener(newValue, oldValue); };
-  this.expressionFnWatcher = scope['$watch'](msgSelector.expressionFn, expressionFnListener, objectEquality);
-}
-
-MessageSelectorWatchers.prototype.expressionFnListener = function expressionFnListener(newValue, oldValue) {
-  var self = this;
-  this.messageFnWatcher();
-  var messageFnListener = function(newMessage, oldMessage) { return self.messageFnListener(newMessage, oldMessage); };
-  var messageFn = this.msgSelector.getMessageFn(newValue);
-  this.messageFnWatcher = this.scope['$watch'](messageFn, messageFnListener, this.objectEquality);
-};
-
-MessageSelectorWatchers.prototype.messageFnListener = function messageFnListener(newMessage, oldMessage) {
-  if (isFunction(this.listener)) {
-    this.listener.call(null, newMessage, newMessage === oldMessage ? newMessage : this.lastMessage, this.scope);
-  }
-  this.lastMessage = newMessage;
-};
-
-MessageSelectorWatchers.prototype.cancelWatch = function cancelWatch() {
-  this.expressionFnWatcher();
-  this.messageFnWatcher();
-};
-
-/**
- * @constructor
- * @extends MessageSelectorBase
- * @private
- */
-function SelectMessage(expressionFn, choices) {
-  MessageSelectorBase.call(this, expressionFn, choices);
-}
-
-function SelectMessageProto() {}
-SelectMessageProto.prototype = MessageSelectorBase.prototype;
-
-SelectMessage.prototype = new SelectMessageProto();
-SelectMessage.prototype.categorizeValue = function categorizeSelectValue(value) {
-  return (this.choices[value] !== void 0) ? value : "other";
-};
-
-/**
- * @constructor
- * @extends MessageSelectorBase
- * @private
- */
-function PluralMessage(expressionFn, choices, offset, pluralCat) {
-  MessageSelectorBase.call(this, expressionFn, choices);
-  this.offset = offset;
-  this.pluralCat = pluralCat;
-}
-
-function PluralMessageProto() {}
-PluralMessageProto.prototype = MessageSelectorBase.prototype;
-
-PluralMessage.prototype = new PluralMessageProto();
-PluralMessage.prototype.categorizeValue = function categorizePluralValue(value) {
-  if (isNaN(value)) {
-    return "other";
-  } else if (this.choices[value] !== void 0) {
-    return value;
-  } else {
-    var category = this.pluralCat(value - this.offset);
-    return (this.choices[category] !== void 0) ? category : "other";
-  }
-};
-
-// NOTE: ADVANCED_OPTIMIZATIONS mode.
-//
-// This file is compiled with Closure compiler's ADVANCED_OPTIMIZATIONS flag! Be wary of using
-// constructs incompatible with that mode.
-
-/* global $interpolateMinErr: false */
-/* global isFunction: false */
-/* global parseTextLiteral: false */
-
-/**
- * @constructor
- * @private
- */
-function InterpolationParts(trustedContext, allOrNothing) {
-  this.trustedContext = trustedContext;
-  this.allOrNothing = allOrNothing;
-  this.textParts = [];
-  this.expressionFns = [];
-  this.expressionIndices = [];
-  this.partialText = '';
-  this.concatParts = null;
-}
-
-InterpolationParts.prototype.flushPartialText = function flushPartialText() {
-  if (this.partialText) {
-    if (this.concatParts == null) {
-      this.textParts.push(this.partialText);
-    } else {
-      this.textParts.push(this.concatParts.join(''));
-      this.concatParts = null;
-    }
-    this.partialText = '';
-  }
-};
-
-InterpolationParts.prototype.addText = function addText(text) {
-  if (text.length) {
-    if (!this.partialText) {
-      this.partialText = text;
-    } else if (this.concatParts) {
-      this.concatParts.push(text);
-    } else {
-      this.concatParts = [this.partialText, text];
-    }
-  }
-};
-
-InterpolationParts.prototype.addExpressionFn = function addExpressionFn(expressionFn) {
-  this.flushPartialText();
-  this.expressionIndices.push(this.textParts.length);
-  this.expressionFns.push(expressionFn);
-  this.textParts.push('');
-};
-
-InterpolationParts.prototype.getExpressionValues = function getExpressionValues(context) {
-  var expressionValues = new Array(this.expressionFns.length);
-  for (var i = 0; i < this.expressionFns.length; i++) {
-    expressionValues[i] = this.expressionFns[i](context);
-  }
-  return expressionValues;
-};
-
-InterpolationParts.prototype.getResult = function getResult(expressionValues) {
-  for (var i = 0; i < this.expressionIndices.length; i++) {
-    var expressionValue = expressionValues[i];
-    if (this.allOrNothing && expressionValue === void 0) return;
-    this.textParts[this.expressionIndices[i]] = expressionValue;
-  }
-  return this.textParts.join('');
-};
-
-
-InterpolationParts.prototype.toParsedFn = function toParsedFn(mustHaveExpression, originalText) {
-  var self = this;
-  this.flushPartialText();
-  if (mustHaveExpression && this.expressionFns.length === 0) {
-    return void 0;
-  }
-  if (this.textParts.length === 0) {
-    return parseTextLiteral('');
-  }
-  if (this.trustedContext && this.textParts.length > 1) {
-    $interpolateMinErr['throwNoconcat'](originalText);
-  }
-  if (this.expressionFns.length === 0) {
-    if (this.textParts.length != 1) { this.errorInParseLogic(); }
-    return parseTextLiteral(this.textParts[0]);
-  }
-  var parsedFn = function(context) {
-    return self.getResult(self.getExpressionValues(context));
-  };
-  parsedFn['$$watchDelegate'] = function $$watchDelegate(scope, listener, objectEquality) {
-    return self.watchDelegate(scope, listener, objectEquality);
-  };
-
-  parsedFn['exp'] = originalText; // Needed to pretend to be $interpolate for tests copied from interpolateSpec.js
-  parsedFn['expressions'] = new Array(this.expressionFns.length); // Require this to call $compile.$$addBindingInfo() which allows Protractor to find elements by binding.
-  for (var i = 0; i < this.expressionFns.length; i++) {
-    parsedFn['expressions'][i] = this.expressionFns[i]['exp'];
-  }
-
-  return parsedFn;
-};
-
-InterpolationParts.prototype.watchDelegate = function watchDelegate(scope, listener, objectEquality) {
-  var watcher = new InterpolationPartsWatcher(this, scope, listener, objectEquality);
-  return function() { watcher.cancelWatch(); };
-};
-
-function InterpolationPartsWatcher(interpolationParts, scope, listener, objectEquality) {
-  this.interpolationParts = interpolationParts;
-  this.scope = scope;
-  this.previousResult = (void 0);
-  this.listener = listener;
-  var self = this;
-  this.expressionFnsWatcher = scope['$watchGroup'](interpolationParts.expressionFns, function(newExpressionValues, oldExpressionValues) {
-    self.watchListener(newExpressionValues, oldExpressionValues);
-  });
-}
-
-InterpolationPartsWatcher.prototype.watchListener = function watchListener(newExpressionValues, oldExpressionValues) {
-  var result = this.interpolationParts.getResult(newExpressionValues);
-  if (isFunction(this.listener)) {
-    this.listener.call(null, result, newExpressionValues === oldExpressionValues ? result : this.previousResult, this.scope);
-  }
-  this.previousResult = result;
-};
-
-InterpolationPartsWatcher.prototype.cancelWatch = function cancelWatch() {
-  this.expressionFnsWatcher();
-};
-
-// NOTE: ADVANCED_OPTIMIZATIONS mode.
-//
-// This file is compiled with Closure compiler's ADVANCED_OPTIMIZATIONS flag! Be wary of using
-// constructs incompatible with that mode.
-
-/* global $interpolateMinErr: false */
-/* global indexToLineAndColumn: false */
-/* global InterpolationParts: false */
-/* global PluralMessage: false */
-/* global SelectMessage: false */
-/* global subtractOffset: false */
-
-// The params src and dst are exactly one of two types: NestedParserState or MessageFormatParser.
-// This function is fully optimized by V8. (inspect via IRHydra or --trace-deopt.)
-// The idea behind writing it this way is to avoid repeating oneself.  This is the ONE place where
-// the parser state that is saved/restored when parsing nested mustaches is specified.
-function copyNestedParserState(src, dst) {
-  dst.expressionFn = src.expressionFn;
-  dst.expressionMinusOffsetFn = src.expressionMinusOffsetFn;
-  dst.pluralOffset = src.pluralOffset;
-  dst.choices = src.choices;
-  dst.choiceKey = src.choiceKey;
-  dst.interpolationParts = src.interpolationParts;
-  dst.ruleChoiceKeyword = src.ruleChoiceKeyword;
-  dst.msgStartIndex = src.msgStartIndex;
-  dst.expressionStartIndex = src.expressionStartIndex;
-}
-
-function NestedParserState(parser) {
-  copyNestedParserState(parser, this);
-}
-
-/**
- * @constructor
- * @private
- */
-function MessageFormatParser(text, startIndex, $parse, pluralCat, stringifier,
-                             mustHaveExpression, trustedContext, allOrNothing) {
-  this.text = text;
-  this.index = startIndex || 0;
-  this.$parse = $parse;
-  this.pluralCat = pluralCat;
-  this.stringifier = stringifier;
-  this.mustHaveExpression = !!mustHaveExpression;
-  this.trustedContext = trustedContext;
-  this.allOrNothing = !!allOrNothing;
-  this.expressionFn = null;
-  this.expressionMinusOffsetFn = null;
-  this.pluralOffset = null;
-  this.choices = null;
-  this.choiceKey = null;
-  this.interpolationParts = null;
-  this.msgStartIndex = null;
-  this.nestedStateStack = [];
-  this.parsedFn = null;
-  this.rule = null;
-  this.ruleStack = null;
-  this.ruleChoiceKeyword = null;
-  this.interpNestLevel = null;
-  this.expressionStartIndex = null;
-  this.stringStartIndex = null;
-  this.stringQuote = null;
-  this.stringInterestsRe = null;
-  this.angularOperatorStack = null;
-  this.textPart = null;
-}
-
-// preserve v8 optimization.
-var EMPTY_STATE = new NestedParserState(new MessageFormatParser(
-        /* text= */ '', /* startIndex= */ 0, /* $parse= */ null, /* pluralCat= */ null, /* stringifier= */ null,
-        /* mustHaveExpression= */ false, /* trustedContext= */ null, /* allOrNothing */ false));
-
-MessageFormatParser.prototype.pushState = function pushState() {
-  this.nestedStateStack.push(new NestedParserState(this));
-  copyNestedParserState(EMPTY_STATE, this);
-};
-
-MessageFormatParser.prototype.popState = function popState() {
-  if (this.nestedStateStack.length === 0) {
-    this.errorInParseLogic();
-  }
-  var previousState = this.nestedStateStack.pop();
-  copyNestedParserState(previousState, this);
-};
-
-// Oh my JavaScript!  Who knew you couldn't match a regex at a specific
-// location in a string but will always search forward?!
-// Apparently you'll be growing this ability via the sticky flag (y) in
-// ES6.  I'll just to work around you for now.
-MessageFormatParser.prototype.matchRe = function matchRe(re, search) {
-  re.lastIndex = this.index;
-  var match = re.exec(this.text);
-  if (match != null && (search === true || (match.index == this.index))) {
-    this.index = re.lastIndex;
-    return match;
-  }
-  return null;
-};
-
-MessageFormatParser.prototype.searchRe = function searchRe(re) {
-  return this.matchRe(re, true);
-};
-
-
-MessageFormatParser.prototype.consumeRe = function consumeRe(re) {
-  // Without the sticky flag, we can't use the .test() method to consume a
-  // match at the current index.  Instead, we'll use the slower .exec() method
-  // and verify match.index.
-  return !!this.matchRe(re);
-};
-
-// Run through our grammar avoiding deeply nested function call chains.
-MessageFormatParser.prototype.run = function run(initialRule) {
-  this.ruleStack = [initialRule];
-  do {
-    this.rule = this.ruleStack.pop();
-    while (this.rule) {
-      this.rule();
-    }
-    this.assertRuleOrNull(this.rule);
-  } while (this.ruleStack.length > 0);
-};
-
-MessageFormatParser.prototype.errorInParseLogic = function errorInParseLogic() {
-    throw $interpolateMinErr('logicbug',
-        'The messageformat parser has encountered an internal error.  Please file a github issue against the AngularJS project and provide this message text that triggers the bug.  Text: “{0}”',
-        this.text);
-};
-
-MessageFormatParser.prototype.assertRuleOrNull = function assertRuleOrNull(rule) {
-  if (rule === void 0) {
-    this.errorInParseLogic();
-  }
-};
-
-var NEXT_WORD_RE = /\s*(\w+)\s*/g;
-MessageFormatParser.prototype.errorExpecting = function errorExpecting() {
-  // What was wrong with the syntax? Unsupported type, missing comma, or something else?
-  var match = this.matchRe(NEXT_WORD_RE), position;
-  if (match == null) {
-    position = indexToLineAndColumn(this.text, this.index);
-    throw $interpolateMinErr('reqarg',
-        'Expected one of “plural” or “select” at line {0}, column {1} of text “{2}”',
-        position.line, position.column, this.text);
-  }
-  var word = match[1];
-  if (word == "select" || word == "plural") {
-    position = indexToLineAndColumn(this.text, this.index);
-    throw $interpolateMinErr('reqcomma',
-        'Expected a comma after the keyword “{0}” at line {1}, column {2} of text “{3}”',
-        word, position.line, position.column, this.text);
-  } else {
-    position = indexToLineAndColumn(this.text, this.index);
-    throw $interpolateMinErr('unknarg',
-        'Unsupported keyword “{0}” at line {0}, column {1}. Only “plural” and “select” are currently supported.  Text: “{3}”',
-        word, position.line, position.column, this.text);
-  }
-};
-
-var STRING_START_RE = /['"]/g;
-MessageFormatParser.prototype.ruleString = function ruleString() {
-  var match = this.matchRe(STRING_START_RE);
-  if (match == null) {
-    var position = indexToLineAndColumn(this.text, this.index);
-    throw $interpolateMinErr('wantstring',
-        'Expected the beginning of a string at line {0}, column {1} in text “{2}”',
-        position.line, position.column, this.text);
-  }
-  this.startStringAtMatch(match);
-};
-
-MessageFormatParser.prototype.startStringAtMatch = function startStringAtMatch(match) {
-  this.stringStartIndex = match.index;
-  this.stringQuote = match[0];
-  this.stringInterestsRe = this.stringQuote == "'" ? SQUOTED_STRING_INTEREST_RE : DQUOTED_STRING_INTEREST_RE;
-  this.rule = this.ruleInsideString;
-};
-
-var SQUOTED_STRING_INTEREST_RE = /\\(?:\\|'|u[0-9A-Fa-f]{4}|x[0-9A-Fa-f]{2}|[0-7]{3}|\r\n|\n|[\s\S])|'/g;
-var DQUOTED_STRING_INTEREST_RE = /\\(?:\\|"|u[0-9A-Fa-f]{4}|x[0-9A-Fa-f]{2}|[0-7]{3}|\r\n|\n|[\s\S])|"/g;
-MessageFormatParser.prototype.ruleInsideString = function ruleInsideString() {
-  var match = this.searchRe(this.stringInterestsRe);
-  if (match == null) {
-    var position = indexToLineAndColumn(this.text, this.stringStartIndex);
-    throw $interpolateMinErr('untermstr',
-        'The string beginning at line {0}, column {1} is unterminated in text “{2}”',
-        position.line, position.column, this.text);
-  }
-  var chars = match[0];
-  if (match == this.stringQuote) {
-    this.rule = null;
-  }
-};
-
-var PLURAL_OR_SELECT_ARG_TYPE_RE = /\s*(plural|select)\s*,\s*/g;
-MessageFormatParser.prototype.rulePluralOrSelect = function rulePluralOrSelect() {
-  var match = this.searchRe(PLURAL_OR_SELECT_ARG_TYPE_RE);
-  if (match == null) {
-    this.errorExpecting();
-  }
-  var argType = match[1];
-  switch (argType) {
-    case "plural": this.rule = this.rulePluralStyle; break;
-    case "select": this.rule = this.ruleSelectStyle; break;
-    default: this.errorInParseLogic();
-  }
-};
-
-MessageFormatParser.prototype.rulePluralStyle = function rulePluralStyle() {
-  this.choices = Object.create(null);
-  this.ruleChoiceKeyword = this.rulePluralValueOrKeyword;
-  this.rule = this.rulePluralOffset;
-};
-
-MessageFormatParser.prototype.ruleSelectStyle = function ruleSelectStyle() {
-  this.choices = Object.create(null);
-  this.ruleChoiceKeyword = this.ruleSelectKeyword;
-  this.rule = this.ruleSelectKeyword;
-};
-
-var NUMBER_RE = /[0]|(?:[1-9][0-9]*)/g;
-var PLURAL_OFFSET_RE = new RegExp("\\s*offset\\s*:\\s*(" + NUMBER_RE.source + ")", "g");
-
-MessageFormatParser.prototype.rulePluralOffset = function rulePluralOffset() {
-  var match = this.matchRe(PLURAL_OFFSET_RE);
-  this.pluralOffset = (match == null) ? 0 : parseInt(match[1], 10);
-  this.expressionMinusOffsetFn = subtractOffset(this.expressionFn, this.pluralOffset);
-  this.rule = this.rulePluralValueOrKeyword;
-};
-
-MessageFormatParser.prototype.assertChoiceKeyIsNew = function assertChoiceKeyIsNew(choiceKey, index) {
-  if (this.choices[choiceKey] !== void 0) {
-    var position = indexToLineAndColumn(this.text, index);
-    throw $interpolateMinErr('dupvalue',
-        'The choice “{0}” is specified more than once. Duplicate key is at line {1}, column {2} in text “{3}”',
-        choiceKey, position.line, position.column, this.text);
-  }
-};
-
-var SELECT_KEYWORD = /\s*(\w+)/g;
-MessageFormatParser.prototype.ruleSelectKeyword = function ruleSelectKeyword() {
-  var match = this.matchRe(SELECT_KEYWORD);
-  if (match == null) {
-    this.parsedFn = new SelectMessage(this.expressionFn, this.choices).parsedFn;
-    this.rule = null;
-    return;
-  }
-  this.choiceKey = match[1];
-  this.assertChoiceKeyIsNew(this.choiceKey, match.index);
-  this.rule = this.ruleMessageText;
-};
-
-var EXPLICIT_VALUE_OR_KEYWORD_RE = new RegExp("\\s*(?:(?:=(" + NUMBER_RE.source + "))|(\\w+))", "g");
-MessageFormatParser.prototype.rulePluralValueOrKeyword = function rulePluralValueOrKeyword() {
-  var match = this.matchRe(EXPLICIT_VALUE_OR_KEYWORD_RE);
-  if (match == null) {
-    this.parsedFn = new PluralMessage(this.expressionFn, this.choices, this.pluralOffset, this.pluralCat).parsedFn;
-    this.rule = null;
-    return;
-  }
-  if (match[1] != null) {
-    this.choiceKey = parseInt(match[1], 10);
-  } else {
-    this.choiceKey = match[2];
-  }
-  this.assertChoiceKeyIsNew(this.choiceKey, match.index);
-  this.rule = this.ruleMessageText;
-};
-
-var BRACE_OPEN_RE = /\s*{/g;
-var BRACE_CLOSE_RE = /}/g;
-MessageFormatParser.prototype.ruleMessageText = function ruleMessageText() {
-  if (!this.consumeRe(BRACE_OPEN_RE)) {
-    var position = indexToLineAndColumn(this.text, this.index);
-    throw $interpolateMinErr('reqopenbrace',
-        'The plural choice “{0}” must be followed by a message in braces at line {1}, column {2} in text “{3}”',
-        this.choiceKey, position.line, position.column, this.text);
-  }
-  this.msgStartIndex = this.index;
-  this.interpolationParts = new InterpolationParts(this.trustedContext, this.allOrNothing);
-  this.rule = this.ruleInInterpolationOrMessageText;
-};
-
-// Note: Since "\" is used as an escape character, don't allow it to be part of the
-// startSymbol/endSymbol when I add the feature to allow them to be redefined.
-var INTERP_OR_END_MESSAGE_RE = /\\.|{{|}/g;
-var INTERP_OR_PLURALVALUE_OR_END_MESSAGE_RE = /\\.|{{|#|}/g;
-var ESCAPE_OR_MUSTACHE_BEGIN_RE = /\\.|{{/g;
-MessageFormatParser.prototype.advanceInInterpolationOrMessageText = function advanceInInterpolationOrMessageText() {
-  var currentIndex = this.index, match, re;
-  if (this.ruleChoiceKeyword == null) { // interpolation
-    match = this.searchRe(ESCAPE_OR_MUSTACHE_BEGIN_RE);
-    if (match == null) { // End of interpolation text.  Nothing more to process.
-      this.textPart = this.text.substring(currentIndex);
-      this.index = this.text.length;
-      return null;
-    }
-  } else {
-    match = this.searchRe(this.ruleChoiceKeyword == this.rulePluralValueOrKeyword ?
-                          INTERP_OR_PLURALVALUE_OR_END_MESSAGE_RE : INTERP_OR_END_MESSAGE_RE);
-    if (match == null) {
-      var position = indexToLineAndColumn(this.text, this.msgStartIndex);
-      throw $interpolateMinErr('reqendbrace',
-          'The plural/select choice “{0}” message starting at line {1}, column {2} does not have an ending closing brace. Text “{3}”',
-          this.choiceKey, position.line, position.column, this.text);
-    }
-  }
-  // match is non-null.
-  var token = match[0];
-  this.textPart = this.text.substring(currentIndex, match.index);
-  return token;
-};
-
-MessageFormatParser.prototype.ruleInInterpolationOrMessageText = function ruleInInterpolationOrMessageText() {
-  var currentIndex = this.index;
-  var token = this.advanceInInterpolationOrMessageText();
-  if (token == null) {
-    // End of interpolation text.  Nothing more to process.
-    this.index = this.text.length;
-    this.interpolationParts.addText(this.text.substring(currentIndex));
-    this.rule = null;
-    return;
-  }
-  if (token[0] == "\\") {
-    // unescape next character and continue
-    this.interpolationParts.addText(this.textPart + token[1]);
-    return;
-  }
-  this.interpolationParts.addText(this.textPart);
-  if (token == "{{") {
-    this.pushState();
-    this.ruleStack.push(this.ruleEndMustacheInInterpolationOrMessage);
-    this.rule = this.ruleEnteredMustache;
-  } else if (token == "}") {
-    this.choices[this.choiceKey] = this.interpolationParts.toParsedFn(/*mustHaveExpression=*/false, this.text);
-    this.rule = this.ruleChoiceKeyword;
-  } else if (token == "#") {
-    this.interpolationParts.addExpressionFn(this.expressionMinusOffsetFn);
-  } else {
-    this.errorInParseLogic();
-  }
-};
-
-MessageFormatParser.prototype.ruleInterpolate = function ruleInterpolate() {
-  this.interpolationParts = new InterpolationParts(this.trustedContext, this.allOrNothing);
-  this.rule = this.ruleInInterpolation;
-};
-
-MessageFormatParser.prototype.ruleInInterpolation = function ruleInInterpolation() {
-  var currentIndex = this.index;
-  var match = this.searchRe(ESCAPE_OR_MUSTACHE_BEGIN_RE);
-  if (match == null) {
-    // End of interpolation text.  Nothing more to process.
-    this.index = this.text.length;
-    this.interpolationParts.addText(this.text.substring(currentIndex));
-    this.parsedFn = this.interpolationParts.toParsedFn(this.mustHaveExpression, this.text);
-    this.rule = null;
-    return;
-  }
-  var token = match[0];
-  if (token[0] == "\\") {
-    // unescape next character and continue
-    this.interpolationParts.addText(this.text.substring(currentIndex, match.index) + token[1]);
-    return;
-  }
-  this.interpolationParts.addText(this.text.substring(currentIndex, match.index));
-  this.pushState();
-  this.ruleStack.push(this.ruleInterpolationEndMustache);
-  this.rule = this.ruleEnteredMustache;
-};
-
-MessageFormatParser.prototype.ruleInterpolationEndMustache = function ruleInterpolationEndMustache() {
-  var expressionFn = this.parsedFn;
-  this.popState();
-  this.interpolationParts.addExpressionFn(expressionFn);
-  this.rule = this.ruleInInterpolation;
-};
-
-MessageFormatParser.prototype.ruleEnteredMustache = function ruleEnteredMustache() {
-  this.parsedFn = null;
-  this.ruleStack.push(this.ruleEndMustache);
-  this.rule = this.ruleAngularExpression;
-};
-
-MessageFormatParser.prototype.ruleEndMustacheInInterpolationOrMessage = function ruleEndMustacheInInterpolationOrMessage() {
-  var expressionFn = this.parsedFn;
-  this.popState();
-  this.interpolationParts.addExpressionFn(expressionFn);
-  this.rule = this.ruleInInterpolationOrMessageText;
-};
-
-
-
-var INTERP_END_RE = /\s*}}/g;
-MessageFormatParser.prototype.ruleEndMustache = function ruleEndMustache() {
-  var match = this.matchRe(INTERP_END_RE);
-  if (match == null) {
-    var position = indexToLineAndColumn(this.text, this.index);
-    throw $interpolateMinErr('reqendinterp',
-        'Expecting end of interpolation symbol, “{0}”, at line {1}, column {2} in text “{3}”',
-        '}}', position.line, position.column, this.text);
-  }
-  if (this.parsedFn == null) {
-    // If we parsed a MessageFormat extension, (e.g. select/plural today, maybe more some other
-    // day), then the result *has* to be a string and those rules would have already set
-    // this.parsedFn.  If there was no MessageFormat extension, then there is no requirement to
-    // stringify the result and parsedFn isn't set.  We set it here.  While we could have set it
-    // unconditionally when exiting the Angular expression, I intend for us to not just replace
-    // $interpolate, but also to replace $parse in a future version (so ng-bind can work), and in
-    // such a case we do not want to unnecessarily stringify something if it's not going to be used
-    // in a string context.
-    this.parsedFn = this.$parse(this.expressionFn, this.stringifier);
-    this.parsedFn['exp'] = this.expressionFn['exp']; // Needed to pretend to be $interpolate for tests copied from interpolateSpec.js
-    this.parsedFn['expressions'] = this.expressionFn['expressions']; // Require this to call $compile.$$addBindingInfo() which allows Protractor to find elements by binding.
-  }
-  this.rule = null;
-};
-
-MessageFormatParser.prototype.ruleAngularExpression = function ruleAngularExpression() {
-  this.angularOperatorStack = [];
-  this.expressionStartIndex = this.index;
-  this.rule = this.ruleInAngularExpression;
-};
-
-function getEndOperator(opBegin) {
-  switch (opBegin) {
-    case "{": return "}";
-    case "[": return "]";
-    case "(": return ")";
-    default: return null;
-  }
-}
-
-function getBeginOperator(opEnd) {
-  switch (opEnd) {
-    case "}": return "{";
-    case "]": return "[";
-    case ")": return "(";
-    default: return null;
-  }
-}
-
-// TODO(chirayu): The interpolation endSymbol must also be accounted for. It
-// just so happens that "}" is an operator so it's in the list below.  But we
-// should support any other type of start/end interpolation symbol.
-var INTERESTING_OPERATORS_RE = /[[\]{}()'",]/g;
-MessageFormatParser.prototype.ruleInAngularExpression = function ruleInAngularExpression() {
-  var startIndex = this.index;
-  var match = this.searchRe(INTERESTING_OPERATORS_RE);
-  var position;
-  if (match == null) {
-    if (this.angularOperatorStack.length === 0) {
-      // This is the end of the Angular expression so this is actually a
-      // success.  Note that when inside an interpolation, this means we even
-      // consumed the closing interpolation symbols if they were curlies.  This
-      // is NOT an error at this point but will become an error further up the
-      // stack when the part that saw the opening curlies is unable to find the
-      // closing ones.
-      this.index = this.text.length;
-      this.expressionFn = this.$parse(this.text.substring(this.expressionStartIndex, this.index));
-      // Needed to pretend to be $interpolate for tests copied from interpolateSpec.js
-      this.expressionFn['exp'] = this.text.substring(this.expressionStartIndex, this.index);
-      this.expressionFn['expressions'] = this.expressionFn['expressions'];
-      this.rule = null;
-      return;
-    }
-    var innermostOperator = this.angularOperatorStack[0];
-    throw $interpolateMinErr('badexpr',
-        'Unexpected end of Angular expression.  Expecting operator “{0}” at the end of the text “{1}”',
-        this.getEndOperator(innermostOperator), this.text);
-  }
-  var operator = match[0];
-  if (operator == "'" || operator == '"') {
-    this.ruleStack.push(this.ruleInAngularExpression);
-    this.startStringAtMatch(match);
-    return;
-  }
-  if (operator == ",") {
-    if (this.trustedContext) {
-      position = indexToLineAndColumn(this.text, this.index);
-      throw $interpolateMinErr('unsafe',
-          'Use of select/plural MessageFormat syntax is currently disallowed in a secure context ({0}).  At line {1}, column {2} of text “{3}”',
-          this.trustedContext, position.line, position.column, this.text);
-    }
-    // only the top level comma has relevance.
-    if (this.angularOperatorStack.length === 0) {
-      // todo: does this need to be trimmed?
-      this.expressionFn = this.$parse(this.text.substring(this.expressionStartIndex, match.index));
-      // Needed to pretend to be $interpolate for tests copied from interpolateSpec.js
-      this.expressionFn['exp'] = this.text.substring(this.expressionStartIndex, match.index);
-      this.expressionFn['expressions'] = this.expressionFn['expressions'];
-      this.rule = null;
-      this.rule = this.rulePluralOrSelect;
-    }
-    return;
-  }
-  if (getEndOperator(operator) != null) {
-    this.angularOperatorStack.unshift(operator);
-    return;
-  }
-  var beginOperator = getBeginOperator(operator);
-  if (beginOperator == null) {
-    this.errorInParseLogic();
-  }
-  if (this.angularOperatorStack.length > 0) {
-    if (beginOperator == this.angularOperatorStack[0]) {
-      this.angularOperatorStack.shift();
-      return;
-    }
-    position = indexToLineAndColumn(this.text, this.index);
-    throw $interpolateMinErr('badexpr',
-        'Unexpected operator “{0}” at line {1}, column {2} in text. Was expecting “{3}”. Text: “{4}”',
-        operator, position.line, position.column, getEndOperator(this.angularOperatorStack[0]), this.text);
-  }
-  // We are trying to pop off the operator stack but there really isn't anything to pop off.
-  this.index = match.index;
-  this.expressionFn = this.$parse(this.text.substring(this.expressionStartIndex, this.index));
-  // Needed to pretend to be $interpolate for tests copied from interpolateSpec.js
-  this.expressionFn['exp'] = this.text.substring(this.expressionStartIndex, this.index);
-  this.expressionFn['expressions'] = this.expressionFn['expressions'];
-  this.rule = null;
-};
-
-// NOTE: ADVANCED_OPTIMIZATIONS mode.
-//
-// This file is compiled with Closure compiler's ADVANCED_OPTIMIZATIONS flag! Be wary of using
-// constructs incompatible with that mode.
-
-/* global $interpolateMinErr: false */
-/* global MessageFormatParser: false */
-/* global stringify: false */
-
-/**
- * @ngdoc service
- * @name $$messageFormat
- *
- * @description
- * Angular internal service to recognize MessageFormat extensions in interpolation expressions.
- * For more information, see:
- * https://docs.google.com/a/google.com/document/d/1pbtW2yvtmFBikfRrJd8VAsabiFkKezmYZ_PbgdjQOVU/edit
- *
- * ## Example
- *
- * 
- * 
- *   
    
- *     
    
- *     {{recipients.length, plural, offset:1
- *             =0    {{{sender.name}} gave no gifts (\#=#)}
- *             =1    {{{sender.name}} gave one gift to {{recipients[0].name}} (\#=#)}
- *             one   {{{sender.name}} gave {{recipients[0].name}} and one other person a gift (\#=#)}
- *             other {{{sender.name}} gave {{recipients[0].name}} and # other people a gift (\#=#)}
- *           }}
- *   
    
- *     
- *
- * 
- *   function Person(name, gender) {
- *     this.name = name;
- *     this.gender = gender;
- *   }
- *
- *   var alice   = new Person("Alice", "female"),
- *       bob     = new Person("Bob", "male"),
- *       charlie = new Person("Charlie", "male"),
- *       harry   = new Person("Harry Potter", "male");
- *
- *   angular.module('msgFmtExample', ['ngMessageFormat'])
- *     .controller('AppController', ['$scope', function($scope) {
- *         $scope.recipients = [alice, bob, charlie];
- *         $scope.sender = harry;
- *         $scope.decreaseRecipients = function() {
- *           --$scope.recipients.length;
- *         };
- *       }]);
- * 
- *
- * 
- *   describe('MessageFormat plural', function() {
- *     it('should pluralize initial values', function() {
- *       var messageElem = element(by.binding('recipients.length')), decreaseRecipientsBtn = element(by.id('decreaseRecipients'));
- *       expect(messageElem.getText()).toEqual('Harry Potter gave Alice and 2 other people a gift (#=2)');
- *       decreaseRecipientsBtn.click();
- *       expect(messageElem.getText()).toEqual('Harry Potter gave Alice and one other person a gift (#=1)');
- *       decreaseRecipientsBtn.click();
- *       expect(messageElem.getText()).toEqual('Harry Potter gave one gift to Alice (#=0)');
- *       decreaseRecipientsBtn.click();
- *       expect(messageElem.getText()).toEqual('Harry Potter gave no gifts (#=-1)');
- *     });
- *   });
- * 
- *     
- */
-var $$MessageFormatFactory = ['$parse', '$locale', '$sce', '$exceptionHandler', function $$messageFormat(
-                   $parse,   $locale,   $sce,   $exceptionHandler) {
-
-  function getStringifier(trustedContext, allOrNothing, text) {
-    return function stringifier(value) {
-      try {
-        value = trustedContext ? $sce['getTrusted'](trustedContext, value) : $sce['valueOf'](value);
-        return allOrNothing && (value === void 0) ? value : stringify(value);
-      } catch (err) {
-        $exceptionHandler($interpolateMinErr['interr'](text, err));
-      }
-    };
-  }
-
-  function interpolate(text, mustHaveExpression, trustedContext, allOrNothing) {
-    var stringifier = getStringifier(trustedContext, allOrNothing, text);
-    var parser = new MessageFormatParser(text, 0, $parse, $locale['pluralCat'], stringifier,
-                                         mustHaveExpression, trustedContext, allOrNothing);
-    parser.run(parser.ruleInterpolate);
-    return parser.parsedFn;
-  }
-
-  return {
-    'interpolate': interpolate
-  };
-}];
-
-var $$interpolateDecorator = ['$$messageFormat', '$delegate', function $$interpolateDecorator($$messageFormat, $interpolate) {
-  if ($interpolate['startSymbol']() != "{{" || $interpolate['endSymbol']() != "}}") {
-    throw $interpolateMinErr('nochgmustache', 'angular-message-format.js currently does not allow you to use custom start and end symbols for interpolation.');
-  }
-  var interpolate = $$messageFormat['interpolate'];
-  interpolate['startSymbol'] = $interpolate['startSymbol'];
-  interpolate['endSymbol'] = $interpolate['endSymbol'];
-  return interpolate;
-}];
-
-
-/**
- * @ngdoc module
- * @name ngMessageFormat
- * @packageName angular-message-format
- * @description
- */
-var module = window['angular']['module']('ngMessageFormat', ['ng']);
-module['factory']('$$messageFormat', $$MessageFormatFactory);
-module['config'](['$provide', function($provide) {
-  $provide['decorator']('$interpolate', $$interpolateDecorator);
-}]);
-
-
-})(window, window.angular);
diff --git a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-message-format.min.js b/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-message-format.min.js
deleted file mode 100644
index f85a58769..000000000
--- a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-message-format.min.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- AngularJS v1.5.0
- (c) 2010-2016 Google, Inc. http://angularjs.org
- License: MIT
-*/
-(function(h){'use strict';function C(a){if(null==a)return"";switch(typeof a){case "string":return a;case "number":return""+a;default:return D(a)}}function f(a,b){for(var d=a.split(/\n/g),k=0;k=c.length)b-=c.length;else return{h:k+1,f:b+1}}}function t(a){function b(){return a}var d=u[a];if(null!=d)return d;b.$$watchDelegate=function(b,d,c){var e=b.$watch(v,function(){m(d)&&d.call(null,a,a,b);e()},c);return e};u[a]=b;b.exp=a;b.expressions=[];return b}function F(a,b){function d(a){return void 0==
-a?a:a-b}function c(b){return d(a(b))}if(0===b)return a;var e;c.$$watchDelegate=function(b,c,k){return e=b.$watch(a,function(a,k){m(c)&&c.call(null,d(a),d(k),b)},k)};return c}function l(a,b){var d=this;this.b=a;this.e=b;if(void 0===b.other)throw e("reqother");this.d=function(a){return d.D(a)};this.d.$$watchDelegate=function(a,b,c){return d.P(a,b,c)};this.d.exp=a.exp;this.d.expressions=a.expressions}function n(a,b,d,c){var e=this;this.scope=b;this.oa=a;this.v=d;this.qa=c;this.U=void 0;this.K=v;this.ka=
-b.$watch(a.b,function(a){return e.ja(a)},c)}function p(a,b){l.call(this,a,b)}function w(){}function q(a,b,d,c){l.call(this,a,b);this.offset=d;this.M=c}function x(){}function g(a,b){this.u=a;this.B=b;this.i=[];this.g=[];this.J=[];this.s="";this.q=null}function r(a,b,d){this.c=a;this.scope=b;this.W=void 0;this.v=d;var c=this;this.la=b.$watchGroup(a.g,function(a,b){c.Ea(a,b)})}function s(a,b){b.b=a.b;b.C=a.C;b.w=a.w;b.e=a.e;b.k=a.k;b.c=a.c;b.n=a.n;b.F=a.F;b.l=a.l}function y(a){s(a,this)}function c(a,
-b,d,c,e,E,f,g){this.text=a;this.index=b||0;this.A=d;this.M=c;this.Da=e;this.pa=!!E;this.u=f;this.B=!!g;this.F=this.c=this.k=this.e=this.w=this.C=this.b=null;this.L=[];this.G=this.j=this.ca=this.O=this.da=this.l=this.n=this.o=this.a=this.d=null}function z(a){switch(a){case "{":return"}";case "[":return"]";case "(":return")";default:return null}}function G(a){switch(a){case "}":return"{";case "]":return"[";case ")":return"(";default:return null}}var e=h.angular.$interpolateMinErr,v=h.angular.noop,m=
-h.angular.isFunction,D=h.angular.toJson,u=Object.create(null);l.prototype.T=function(a){return this.e[this.R(a)]};l.prototype.D=function(a){return this.T(this.b(a))(a)};l.prototype.P=function(a,b,d){var c=new n(this,a,b,d);return function(){c.I()}};n.prototype.ja=function(a){var b=this;this.K();a=this.oa.T(a);this.K=this.scope.$watch(a,function(a,c){return b.na(a,c)},this.qa)};n.prototype.na=function(a,b){m(this.v)&&this.v.call(null,a,a===b?a:this.U,this.scope);this.U=a};n.prototype.I=function(){this.ka();
-this.K()};w.prototype=l.prototype;p.prototype=new w;p.prototype.R=function(a){return void 0!==this.e[a]?a:"other"};x.prototype=l.prototype;q.prototype=new x;q.prototype.R=function(a){if(isNaN(a))return"other";if(void 0!==this.e[a])return a;a=this.M(a-this.offset);return void 0!==this.e[a]?a:"other"};g.prototype.S=function(){this.s&&(null==this.q?this.i.push(this.s):(this.i.push(this.q.join("")),this.q=null),this.s="")};g.prototype.p=function(a){a.length&&(this.s?this.q?this.q.push(a):this.q=[this.s,
-a]:this.s=a)};g.prototype.H=function(a){this.S();this.J.push(this.i.length);this.g.push(a);this.i.push("")};g.prototype.ma=function(a){for(var b=Array(this.g.length),d=0;d
- *   
- *   
    
- *     
    You did not enter a field
    
- *     
    
- *       Your email must be between 5 and 100 characters long
- *     
    
- *   
    
- * 
- * ```
- *
- * Now whatever key/value entries are present within the provided object (in this case `$error`) then
- * the ngMessages directive will render the inner first ngMessage directive (depending if the key values
- * match the attribute value present on each ngMessage directive). In other words, if your errors
- * object contains the following data:
- *
- * ```javascript
- * 
- * myField.$error = { minlength : true, required : true };
- * ```
- *
- * Then the `required` message will be displayed first. When required is false then the `minlength` message
- * will be displayed right after (since these messages are ordered this way in the template HTML code).
- * The prioritization of each message is determined by what order they're present in the DOM.
- * Therefore, instead of having custom JavaScript code determine the priority of what errors are
- * present before others, the presentation of the errors are handled within the template.
- *
- * By default, ngMessages will only display one error at a time. However, if you wish to display all
- * messages then the `ng-messages-multiple` attribute flag can be used on the element containing the
- * ngMessages directive to make this happen.
- *
- * ```html
- * 
- * 
    ...
    
- *
- * 
- * ...
- * ```
- *
- * ## Reusing and Overriding Messages
- * In addition to prioritization, ngMessages also allows for including messages from a remote or an inline
- * template. This allows for generic collection of messages to be reused across multiple parts of an
- * application.
- *
- * ```html
- * 
- *
- * 
    
- *   
    
- * 
    
- * ```
- *
- * However, including generic messages may not be useful enough to match all input fields, therefore,
- * `ngMessages` provides the ability to override messages defined in the remote template by redefining
- * them within the directive container.
- *
- * ```html
- * 
- * 
- *
- * 
    
- *   
- *   
- *   
    
- *     
- *     
    You did not enter your email address
    
- *
- *     
- *     
    Your email address is invalid
    
- *
- *     
- *     
    
- *   
    
- * 
    
- * ```
- *
- * In the example HTML code above the message that is set on required will override the corresponding
- * required message defined within the remote template. Therefore, with particular input fields (such
- * email addresses, date fields, autocomplete inputs, etc...), specialized error messages can be applied
- * while more generic messages can be used to handle other, more general input errors.
- *
- * ## Dynamic Messaging
- * ngMessages also supports using expressions to dynamically change key values. Using arrays and
- * repeaters to list messages is also supported. This means that the code below will be able to
- * fully adapt itself and display the appropriate message when any of the expression data changes:
- *
- * ```html
- * 
    
- *   
- *   
    
- *     
    You did not enter your email address
    
- *     
    
- *       
- *       
    {{ errorMessage.text }}
    
- *     
    
- *   
    
- * 
    
- * ```
- *
- * The `errorMessage.type` expression can be a string value or it can be an array so
- * that multiple errors can be associated with a single error message:
- *
- * ```html
- *   
- *   
    
- *     
    You did not enter your email address
    
- *     
    
- *       Your email must be between 5 and 100 characters long
- *     
    
- *   
    
- * ```
- *
- * Feel free to use other structural directives such as ng-if and ng-switch to further control
- * what messages are active and when. Be careful, if you place ng-message on the same element
- * as these structural directives, Angular may not be able to determine if a message is active
- * or not. Therefore it is best to place the ng-message on a child element of the structural
- * directive.
- *
- * ```html
- * 
    
- *   
    
- *     
    Please enter something
    
- *   
    
- * 
    
- * ```
- *
- * ## Animations
- * If the `ngAnimate` module is active within the application then the `ngMessages`, `ngMessage` and
- * `ngMessageExp` directives will trigger animations whenever any messages are added and removed from
- * the DOM by the `ngMessages` directive.
- *
- * Whenever the `ngMessages` directive contains one or more visible messages then the `.ng-active` CSS
- * class will be added to the element. The `.ng-inactive` CSS class will be applied when there are no
- * messages present. Therefore, CSS transitions and keyframes as well as JavaScript animations can
- * hook into the animations whenever these classes are added/removed.
- *
- * Let's say that our HTML code for our messages container looks like so:
- *
- * ```html
- * 
- * ```
- *
- * Then the CSS animation code for the message container looks like so:
- *
- * ```css
- * .my-messages {
- *   transition:1s linear all;
- * }
- * .my-messages.ng-active {
- *   // messages are visible
- * }
- * .my-messages.ng-inactive {
- *   // messages are hidden
- * }
- * ```
- *
- * Whenever an inner message is attached (becomes visible) or removed (becomes hidden) then the enter
- * and leave animation is triggered for each particular element bound to the `ngMessage` directive.
- *
- * Therefore, the CSS code for the inner messages looks like so:
- *
- * ```css
- * .some-message {
- *   transition:1s linear all;
- * }
- *
- * .some-message.ng-enter {}
- * .some-message.ng-enter.ng-enter-active {}
- *
- * .some-message.ng-leave {}
- * .some-message.ng-leave.ng-leave-active {}
- * ```
- *
- * {@link ngAnimate Click here} to learn how to use JavaScript animations or to learn more about ngAnimate.
- */
-angular.module('ngMessages', [])
-
-   /**
-    * @ngdoc directive
-    * @module ngMessages
-    * @name ngMessages
-    * @restrict AE
-    *
-    * @description
-    * `ngMessages` is a directive that is designed to show and hide messages based on the state
-    * of a key/value object that it listens on. The directive itself complements error message
-    * reporting with the `ngModel` $error object (which stores a key/value state of validation errors).
-    *
-    * `ngMessages` manages the state of internal messages within its container element. The internal
-    * messages use the `ngMessage` directive and will be inserted/removed from the page depending
-    * on if they're present within the key/value object. By default, only one message will be displayed
-    * at a time and this depends on the prioritization of the messages within the template. (This can
-    * be changed by using the `ng-messages-multiple` or `multiple` attribute on the directive container.)
-    *
-    * A remote template can also be used to promote message reusability and messages can also be
-    * overridden.
-    *
-    * {@link module:ngMessages Click here} to learn more about `ngMessages` and `ngMessage`.
-    *
-    * @usage
-    * ```html
-    * 
-    * 
-    *   ...
-    *   ...
-    *   ...
-    * 
-    *
-    * 
-    * 
-    *   ...
-    *   ...
-    *   ...
-    * 
-    * ```
-    *
-    * @param {string} ngMessages an angular expression evaluating to a key/value object
-    *                 (this is typically the $error object on an ngModel instance).
-    * @param {string=} ngMessagesMultiple|multiple when set, all messages will be displayed with true
-    *
-    * @example
-    * 
-    *   
-    *     
    
-    *       
-    *       
    myForm.myName.$error = {{ myForm.myName.$error | json }}
    
-    *
-    *       
    
-    *         
    You did not enter a field
    
-    *         
    Your field is too short
    
-    *         
    Your field is too long
    
-    *       
    
-    *     
    
-    *       
-    *   
-    *     angular.module('ngMessagesExample', ['ngMessages']);
-    *   
-    *     
-    */
-   .directive('ngMessages', ['$animate', function($animate) {
-     var ACTIVE_CLASS = 'ng-active';
-     var INACTIVE_CLASS = 'ng-inactive';
-
-     return {
-       require: 'ngMessages',
-       restrict: 'AE',
-       controller: ['$element', '$scope', '$attrs', function($element, $scope, $attrs) {
-         var ctrl = this;
-         var latestKey = 0;
-         var nextAttachId = 0;
-
-         this.getAttachId = function getAttachId() { return nextAttachId++; };
-
-         var messages = this.messages = {};
-         var renderLater, cachedCollection;
-
-         this.render = function(collection) {
-           collection = collection || {};
-
-           renderLater = false;
-           cachedCollection = collection;
-
-           // this is true if the attribute is empty or if the attribute value is truthy
-           var multiple = isAttrTruthy($scope, $attrs.ngMessagesMultiple) ||
-                          isAttrTruthy($scope, $attrs.multiple);
-
-           var unmatchedMessages = [];
-           var matchedKeys = {};
-           var messageItem = ctrl.head;
-           var messageFound = false;
-           var totalMessages = 0;
-
-           // we use != instead of !== to allow for both undefined and null values
-           while (messageItem != null) {
-             totalMessages++;
-             var messageCtrl = messageItem.message;
-
-             var messageUsed = false;
-             if (!messageFound) {
-               forEach(collection, function(value, key) {
-                 if (!messageUsed && truthy(value) && messageCtrl.test(key)) {
-                   // this is to prevent the same error name from showing up twice
-                   if (matchedKeys[key]) return;
-                   matchedKeys[key] = true;
-
-                   messageUsed = true;
-                   messageCtrl.attach();
-                 }
-               });
-             }
-
-             if (messageUsed) {
-               // unless we want to display multiple messages then we should
-               // set a flag here to avoid displaying the next message in the list
-               messageFound = !multiple;
-             } else {
-               unmatchedMessages.push(messageCtrl);
-             }
-
-             messageItem = messageItem.next;
-           }
-
-           forEach(unmatchedMessages, function(messageCtrl) {
-             messageCtrl.detach();
-           });
-
-           unmatchedMessages.length !== totalMessages
-              ? $animate.setClass($element, ACTIVE_CLASS, INACTIVE_CLASS)
-              : $animate.setClass($element, INACTIVE_CLASS, ACTIVE_CLASS);
-         };
-
-         $scope.$watchCollection($attrs.ngMessages || $attrs['for'], ctrl.render);
-
-         this.reRender = function() {
-           if (!renderLater) {
-             renderLater = true;
-             $scope.$evalAsync(function() {
-               if (renderLater) {
-                 cachedCollection && ctrl.render(cachedCollection);
-               }
-             });
-           }
-         };
-
-         this.register = function(comment, messageCtrl) {
-           var nextKey = latestKey.toString();
-           messages[nextKey] = {
-             message: messageCtrl
-           };
-           insertMessageNode($element[0], comment, nextKey);
-           comment.$$ngMessageNode = nextKey;
-           latestKey++;
-
-           ctrl.reRender();
-         };
-
-         this.deregister = function(comment) {
-           var key = comment.$$ngMessageNode;
-           delete comment.$$ngMessageNode;
-           removeMessageNode($element[0], comment, key);
-           delete messages[key];
-           ctrl.reRender();
-         };
-
-         function findPreviousMessage(parent, comment) {
-           var prevNode = comment;
-           var parentLookup = [];
-           while (prevNode && prevNode !== parent) {
-             var prevKey = prevNode.$$ngMessageNode;
-             if (prevKey && prevKey.length) {
-               return messages[prevKey];
-             }
-
-             // dive deeper into the DOM and examine its children for any ngMessage
-             // comments that may be in an element that appears deeper in the list
-             if (prevNode.childNodes.length && parentLookup.indexOf(prevNode) == -1) {
-               parentLookup.push(prevNode);
-               prevNode = prevNode.childNodes[prevNode.childNodes.length - 1];
-             } else {
-               prevNode = prevNode.previousSibling || prevNode.parentNode;
-             }
-           }
-         }
-
-         function insertMessageNode(parent, comment, key) {
-           var messageNode = messages[key];
-           if (!ctrl.head) {
-             ctrl.head = messageNode;
-           } else {
-             var match = findPreviousMessage(parent, comment);
-             if (match) {
-               messageNode.next = match.next;
-               match.next = messageNode;
-             } else {
-               messageNode.next = ctrl.head;
-               ctrl.head = messageNode;
-             }
-           }
-         }
-
-         function removeMessageNode(parent, comment, key) {
-           var messageNode = messages[key];
-
-           var match = findPreviousMessage(parent, comment);
-           if (match) {
-             match.next = messageNode.next;
-           } else {
-             ctrl.head = messageNode.next;
-           }
-         }
-       }]
-     };
-
-     function isAttrTruthy(scope, attr) {
-      return (isString(attr) && attr.length === 0) || //empty attribute
-             truthy(scope.$eval(attr));
-     }
-
-     function truthy(val) {
-       return isString(val) ? val.length : !!val;
-     }
-   }])
-
-   /**
-    * @ngdoc directive
-    * @name ngMessagesInclude
-    * @restrict AE
-    * @scope
-    *
-    * @description
-    * `ngMessagesInclude` is a directive with the purpose to import existing ngMessage template
-    * code from a remote template and place the downloaded template code into the exact spot
-    * that the ngMessagesInclude directive is placed within the ngMessages container. This allows
-    * for a series of pre-defined messages to be reused and also allows for the developer to
-    * determine what messages are overridden due to the placement of the ngMessagesInclude directive.
-    *
-    * @usage
-    * ```html
-    * 
-    * 
-    *   ...
-    * 
-    *
-    * 
-    * 
-    *   ...
-    * 
-    * ```
-    *
-    * {@link module:ngMessages Click here} to learn more about `ngMessages` and `ngMessage`.
-    *
-    * @param {string} ngMessagesInclude|src a string value corresponding to the remote template.
-    */
-   .directive('ngMessagesInclude',
-     ['$templateRequest', '$document', '$compile', function($templateRequest, $document, $compile) {
-
-     return {
-       restrict: 'AE',
-       require: '^^ngMessages', // we only require this for validation sake
-       link: function($scope, element, attrs) {
-         var src = attrs.ngMessagesInclude || attrs.src;
-         $templateRequest(src).then(function(html) {
-           $compile(html)($scope, function(contents) {
-             element.after(contents);
-
-             // the anchor is placed for debugging purposes
-             var anchor = jqLite($document[0].createComment(' ngMessagesInclude: ' + src + ' '));
-             element.after(anchor);
-
-             // we don't want to pollute the DOM anymore by keeping an empty directive element
-             element.remove();
-           });
-         });
-       }
-     };
-   }])
-
-   /**
-    * @ngdoc directive
-    * @name ngMessage
-    * @restrict AE
-    * @scope
-    *
-    * @description
-    * `ngMessage` is a directive with the purpose to show and hide a particular message.
-    * For `ngMessage` to operate, a parent `ngMessages` directive on a parent DOM element
-    * must be situated since it determines which messages are visible based on the state
-    * of the provided key/value map that `ngMessages` listens on.
-    *
-    * More information about using `ngMessage` can be found in the
-    * {@link module:ngMessages `ngMessages` module documentation}.
-    *
-    * @usage
-    * ```html
-    * 
-    * 
-    *   ...
-    *   ...
-    * 
-    *
-    * 
-    * 
-    *   ...
-    *   ...
-    * 
-    * ```
-    *
-    * @param {expression} ngMessage|when a string value corresponding to the message key.
-    */
-  .directive('ngMessage', ngMessageDirectiveFactory())
-
-
-   /**
-    * @ngdoc directive
-    * @name ngMessageExp
-    * @restrict AE
-    * @priority 1
-    * @scope
-    *
-    * @description
-    * `ngMessageExp` is a directive with the purpose to show and hide a particular message.
-    * For `ngMessageExp` to operate, a parent `ngMessages` directive on a parent DOM element
-    * must be situated since it determines which messages are visible based on the state
-    * of the provided key/value map that `ngMessages` listens on.
-    *
-    * @usage
-    * ```html
-    * 
-    * 
-    *   ...
-    * 
-    *
-    * 
-    * 
-    *   ...
-    * 
-    * ```
-    *
-    * {@link module:ngMessages Click here} to learn more about `ngMessages` and `ngMessage`.
-    *
-    * @param {expression} ngMessageExp|whenExp an expression value corresponding to the message key.
-    */
-  .directive('ngMessageExp', ngMessageDirectiveFactory());
-
-function ngMessageDirectiveFactory() {
-  return ['$animate', function($animate) {
-    return {
-      restrict: 'AE',
-      transclude: 'element',
-      priority: 1, // must run before ngBind, otherwise the text is set on the comment
-      terminal: true,
-      require: '^^ngMessages',
-      link: function(scope, element, attrs, ngMessagesCtrl, $transclude) {
-        var commentNode = element[0];
-
-        var records;
-        var staticExp = attrs.ngMessage || attrs.when;
-        var dynamicExp = attrs.ngMessageExp || attrs.whenExp;
-        var assignRecords = function(items) {
-          records = items
-              ? (isArray(items)
-                    ? items
-                    : items.split(/[\s,]+/))
-              : null;
-          ngMessagesCtrl.reRender();
-        };
-
-        if (dynamicExp) {
-          assignRecords(scope.$eval(dynamicExp));
-          scope.$watchCollection(dynamicExp, assignRecords);
-        } else {
-          assignRecords(staticExp);
-        }
-
-        var currentElement, messageCtrl;
-        ngMessagesCtrl.register(commentNode, messageCtrl = {
-          test: function(name) {
-            return contains(records, name);
-          },
-          attach: function() {
-            if (!currentElement) {
-              $transclude(scope, function(elm) {
-                $animate.enter(elm, null, element);
-                currentElement = elm;
-
-                // Each time we attach this node to a message we get a new id that we can match
-                // when we are destroying the node later.
-                var $$attachId = currentElement.$$attachId = ngMessagesCtrl.getAttachId();
-
-                // in the event that the parent element is destroyed
-                // by any other structural directive then it's time
-                // to deregister the message from the controller
-                currentElement.on('$destroy', function() {
-                  if (currentElement && currentElement.$$attachId === $$attachId) {
-                    ngMessagesCtrl.deregister(commentNode);
-                    messageCtrl.detach();
-                  }
-                });
-              });
-            }
-          },
-          detach: function() {
-            if (currentElement) {
-              var elm = currentElement;
-              currentElement = null;
-              $animate.leave(elm);
-            }
-          }
-        });
-      }
-    };
-  }];
-
-  function contains(collection, key) {
-    if (collection) {
-      return isArray(collection)
-          ? collection.indexOf(key) >= 0
-          : collection.hasOwnProperty(key);
-    }
-  }
-}
-
-
-})(window, window.angular);
diff --git a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-messages.min.js b/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-messages.min.js
deleted file mode 100644
index 19f59cc89..000000000
--- a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-messages.min.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- AngularJS v1.5.0
- (c) 2010-2016 Google, Inc. http://angularjs.org
- License: MIT
-*/
-(function(A,d,B){'use strict';function l(){return["$animate",function(v){return{restrict:"AE",transclude:"element",priority:1,terminal:!0,require:"^^ngMessages",link:function(n,r,a,b,m){var k=r[0],f,p=a.ngMessage||a.when;a=a.ngMessageExp||a.whenExp;var d=function(a){f=a?w(a)?a:a.split(/[\s,]+/):null;b.reRender()};a?(d(n.$eval(a)),n.$watchCollection(a,d)):d(p);var e,q;b.register(k,q={test:function(a){var g=f;a=g?w(g)?0<=g.indexOf(a):g.hasOwnProperty(a):void 0;return a},attach:function(){e||m(n,function(a){v.enter(a,
-null,r);e=a;var g=e.$$attachId=b.getAttachId();e.on("$destroy",function(){e&&e.$$attachId===g&&(b.deregister(k),q.detach())})})},detach:function(){if(e){var a=e;e=null;v.leave(a)}}})}}}]}var w=d.isArray,x=d.forEach,y=d.isString,z=d.element;d.module("ngMessages",[]).directive("ngMessages",["$animate",function(d){function n(a,b){return y(b)&&0===b.length||r(a.$eval(b))}function r(a){return y(a)?a.length:!!a}return{require:"ngMessages",restrict:"AE",controller:["$element","$scope","$attrs",function(a,
-b,m){function k(a,b){for(var c=b,f=[];c&&c!==a;){var h=c.$$ngMessageNode;if(h&&h.length)return e[h];c.childNodes.length&&-1==f.indexOf(c)?(f.push(c),c=c.childNodes[c.childNodes.length-1]):c=c.previousSibling||c.parentNode}}var f=this,p=0,l=0;this.getAttachId=function(){return l++};var e=this.messages={},q,s;this.render=function(g){g=g||{};q=!1;s=g;for(var e=n(b,m.ngMessagesMultiple)||n(b,m.multiple),c=[],k={},h=f.head,p=!1,l=0;null!=h;){l++;var t=h.message,u=!1;p||x(g,function(a,c){!u&&r(a)&&t.test(c)&&
-!k[c]&&(u=k[c]=!0,t.attach())});u?p=!e:c.push(t);h=h.next}x(c,function(a){a.detach()});c.length!==l?d.setClass(a,"ng-active","ng-inactive"):d.setClass(a,"ng-inactive","ng-active")};b.$watchCollection(m.ngMessages||m["for"],f.render);this.reRender=function(){q||(q=!0,b.$evalAsync(function(){q&&s&&f.render(s)}))};this.register=function(g,b){var c=p.toString();e[c]={message:b};var d=a[0],h=e[c];f.head?(d=k(d,g))?(h.next=d.next,d.next=h):(h.next=f.head,f.head=h):f.head=h;g.$$ngMessageNode=c;p++;f.reRender()};
-this.deregister=function(b){var d=b.$$ngMessageNode;delete b.$$ngMessageNode;var c=e[d];(b=k(a[0],b))?b.next=c.next:f.head=c.next;delete e[d];f.reRender()}}]}}]).directive("ngMessagesInclude",["$templateRequest","$document","$compile",function(d,n,l){return{restrict:"AE",require:"^^ngMessages",link:function(a,b,m){var k=m.ngMessagesInclude||m.src;d(k).then(function(d){l(d)(a,function(a){b.after(a);a=z(n[0].createComment(" ngMessagesInclude: "+k+" "));b.after(a);b.remove()})})}}}]).directive("ngMessage",
-l()).directive("ngMessageExp",l())})(window,window.angular);
-//# sourceMappingURL=angular-messages.min.js.map
diff --git a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-messages.min.js.map b/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-messages.min.js.map
deleted file mode 100644
index 0cb2a943d..000000000
--- a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-messages.min.js.map
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-"version":3,
-"file":"angular-messages.min.js",
-"lineCount":11,
-"mappings":"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",
-"sources":["angular-messages.js"],
-"names":["window","angular","undefined","ngMessageDirectiveFactory","$animate","restrict","transclude","priority","terminal","require","link","scope","element","attrs","ngMessagesCtrl","$transclude","commentNode","records","staticExp","ngMessage","when","dynamicExp","ngMessageExp","whenExp","assignRecords","items","isArray","split","reRender","$eval","$watchCollection","currentElement","messageCtrl","register","test","name","collection","indexOf","hasOwnProperty","attach","elm","enter","$$attachId","getAttachId","on","deregister","detach","leave","forEach","isString","jqLite","module","directive","isAttrTruthy","attr","length","truthy","val","controller","$element","$scope","$attrs","findPreviousMessage","parent","comment","prevNode","parentLookup","prevKey","$$ngMessageNode","messages","childNodes","push","previousSibling","parentNode","ctrl","latestKey","nextAttachId","this.getAttachId","renderLater","cachedCollection","render","this.render","multiple","ngMessagesMultiple","unmatchedMessages","matchedKeys","messageItem","head","messageFound","totalMessages","message","messageUsed","value","key","next","setClass","ACTIVE_CLASS","INACTIVE_CLASS","ngMessages","this.reRender","$evalAsync","this.register","nextKey","toString","messageNode","match","this.deregister","$templateRequest","$document","$compile","src","ngMessagesInclude","then","html","contents","after","anchor","createComment","remove"]
-}
diff --git a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-mocks.js b/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-mocks.js
deleted file mode 100644
index 34d360870..000000000
--- a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-mocks.js
+++ /dev/null
@@ -1,2842 +0,0 @@
-/**
- * @license AngularJS v1.5.0
- * (c) 2010-2016 Google, Inc. http://angularjs.org
- * License: MIT
- */
-(function(window, angular, undefined) {
-
-'use strict';
-
-/**
- * @ngdoc object
- * @name angular.mock
- * @description
- *
- * Namespace from 'angular-mocks.js' which contains testing related code.
- */
-angular.mock = {};
-
-/**
- * ! This is a private undocumented service !
- *
- * @name $browser
- *
- * @description
- * This service is a mock implementation of {@link ng.$browser}. It provides fake
- * implementation for commonly used browser apis that are hard to test, e.g. setTimeout, xhr,
- * cookies, etc...
- *
- * The api of this service is the same as that of the real {@link ng.$browser $browser}, except
- * that there are several helper methods available which can be used in tests.
- */
-angular.mock.$BrowserProvider = function() {
-  this.$get = function() {
-    return new angular.mock.$Browser();
-  };
-};
-
-angular.mock.$Browser = function() {
-  var self = this;
-
-  this.isMock = true;
-  self.$$url = "http://server/";
-  self.$$lastUrl = self.$$url; // used by url polling fn
-  self.pollFns = [];
-
-  // TODO(vojta): remove this temporary api
-  self.$$completeOutstandingRequest = angular.noop;
-  self.$$incOutstandingRequestCount = angular.noop;
-
-
-  // register url polling fn
-
-  self.onUrlChange = function(listener) {
-    self.pollFns.push(
-      function() {
-        if (self.$$lastUrl !== self.$$url || self.$$state !== self.$$lastState) {
-          self.$$lastUrl = self.$$url;
-          self.$$lastState = self.$$state;
-          listener(self.$$url, self.$$state);
-        }
-      }
-    );
-
-    return listener;
-  };
-
-  self.$$applicationDestroyed = angular.noop;
-  self.$$checkUrlChange = angular.noop;
-
-  self.deferredFns = [];
-  self.deferredNextId = 0;
-
-  self.defer = function(fn, delay) {
-    delay = delay || 0;
-    self.deferredFns.push({time:(self.defer.now + delay), fn:fn, id: self.deferredNextId});
-    self.deferredFns.sort(function(a, b) { return a.time - b.time;});
-    return self.deferredNextId++;
-  };
-
-
-  /**
-   * @name $browser#defer.now
-   *
-   * @description
-   * Current milliseconds mock time.
-   */
-  self.defer.now = 0;
-
-
-  self.defer.cancel = function(deferId) {
-    var fnIndex;
-
-    angular.forEach(self.deferredFns, function(fn, index) {
-      if (fn.id === deferId) fnIndex = index;
-    });
-
-    if (angular.isDefined(fnIndex)) {
-      self.deferredFns.splice(fnIndex, 1);
-      return true;
-    }
-
-    return false;
-  };
-
-
-  /**
-   * @name $browser#defer.flush
-   *
-   * @description
-   * Flushes all pending requests and executes the defer callbacks.
-   *
-   * @param {number=} number of milliseconds to flush. See {@link #defer.now}
-   */
-  self.defer.flush = function(delay) {
-    if (angular.isDefined(delay)) {
-      self.defer.now += delay;
-    } else {
-      if (self.deferredFns.length) {
-        self.defer.now = self.deferredFns[self.deferredFns.length - 1].time;
-      } else {
-        throw new Error('No deferred tasks to be flushed');
-      }
-    }
-
-    while (self.deferredFns.length && self.deferredFns[0].time <= self.defer.now) {
-      self.deferredFns.shift().fn();
-    }
-  };
-
-  self.$$baseHref = '/';
-  self.baseHref = function() {
-    return this.$$baseHref;
-  };
-};
-angular.mock.$Browser.prototype = {
-
-/**
-  * @name $browser#poll
-  *
-  * @description
-  * run all fns in pollFns
-  */
-  poll: function poll() {
-    angular.forEach(this.pollFns, function(pollFn) {
-      pollFn();
-    });
-  },
-
-  url: function(url, replace, state) {
-    if (angular.isUndefined(state)) {
-      state = null;
-    }
-    if (url) {
-      this.$$url = url;
-      // Native pushState serializes & copies the object; simulate it.
-      this.$$state = angular.copy(state);
-      return this;
-    }
-
-    return this.$$url;
-  },
-
-  state: function() {
-    return this.$$state;
-  },
-
-  notifyWhenNoOutstandingRequests: function(fn) {
-    fn();
-  }
-};
-
-
-/**
- * @ngdoc provider
- * @name $exceptionHandlerProvider
- *
- * @description
- * Configures the mock implementation of {@link ng.$exceptionHandler} to rethrow or to log errors
- * passed to the `$exceptionHandler`.
- */
-
-/**
- * @ngdoc service
- * @name $exceptionHandler
- *
- * @description
- * Mock implementation of {@link ng.$exceptionHandler} that rethrows or logs errors passed
- * to it. See {@link ngMock.$exceptionHandlerProvider $exceptionHandlerProvider} for configuration
- * information.
- *
- *
- * ```js
- *   describe('$exceptionHandlerProvider', function() {
- *
- *     it('should capture log messages and exceptions', function() {
- *
- *       module(function($exceptionHandlerProvider) {
- *         $exceptionHandlerProvider.mode('log');
- *       });
- *
- *       inject(function($log, $exceptionHandler, $timeout) {
- *         $timeout(function() { $log.log(1); });
- *         $timeout(function() { $log.log(2); throw 'banana peel'; });
- *         $timeout(function() { $log.log(3); });
- *         expect($exceptionHandler.errors).toEqual([]);
- *         expect($log.assertEmpty());
- *         $timeout.flush();
- *         expect($exceptionHandler.errors).toEqual(['banana peel']);
- *         expect($log.log.logs).toEqual([[1], [2], [3]]);
- *       });
- *     });
- *   });
- * ```
- */
-
-angular.mock.$ExceptionHandlerProvider = function() {
-  var handler;
-
-  /**
-   * @ngdoc method
-   * @name $exceptionHandlerProvider#mode
-   *
-   * @description
-   * Sets the logging mode.
-   *
-   * @param {string} mode Mode of operation, defaults to `rethrow`.
-   *
-   *   - `log`: Sometimes it is desirable to test that an error is thrown, for this case the `log`
-   *            mode stores an array of errors in `$exceptionHandler.errors`, to allow later
-   *            assertion of them. See {@link ngMock.$log#assertEmpty assertEmpty()} and
-   *            {@link ngMock.$log#reset reset()}
-   *   - `rethrow`: If any errors are passed to the handler in tests, it typically means that there
-   *                is a bug in the application or test, so this mock will make these tests fail.
-   *                For any implementations that expect exceptions to be thrown, the `rethrow` mode
-   *                will also maintain a log of thrown errors.
-   */
-  this.mode = function(mode) {
-
-    switch (mode) {
-      case 'log':
-      case 'rethrow':
-        var errors = [];
-        handler = function(e) {
-          if (arguments.length == 1) {
-            errors.push(e);
-          } else {
-            errors.push([].slice.call(arguments, 0));
-          }
-          if (mode === "rethrow") {
-            throw e;
-          }
-        };
-        handler.errors = errors;
-        break;
-      default:
-        throw new Error("Unknown mode '" + mode + "', only 'log'/'rethrow' modes are allowed!");
-    }
-  };
-
-  this.$get = function() {
-    return handler;
-  };
-
-  this.mode('rethrow');
-};
-
-
-/**
- * @ngdoc service
- * @name $log
- *
- * @description
- * Mock implementation of {@link ng.$log} that gathers all logged messages in arrays
- * (one array per logging level). These arrays are exposed as `logs` property of each of the
- * level-specific log function, e.g. for level `error` the array is exposed as `$log.error.logs`.
- *
- */
-angular.mock.$LogProvider = function() {
-  var debug = true;
-
-  function concat(array1, array2, index) {
-    return array1.concat(Array.prototype.slice.call(array2, index));
-  }
-
-  this.debugEnabled = function(flag) {
-    if (angular.isDefined(flag)) {
-      debug = flag;
-      return this;
-    } else {
-      return debug;
-    }
-  };
-
-  this.$get = function() {
-    var $log = {
-      log: function() { $log.log.logs.push(concat([], arguments, 0)); },
-      warn: function() { $log.warn.logs.push(concat([], arguments, 0)); },
-      info: function() { $log.info.logs.push(concat([], arguments, 0)); },
-      error: function() { $log.error.logs.push(concat([], arguments, 0)); },
-      debug: function() {
-        if (debug) {
-          $log.debug.logs.push(concat([], arguments, 0));
-        }
-      }
-    };
-
-    /**
-     * @ngdoc method
-     * @name $log#reset
-     *
-     * @description
-     * Reset all of the logging arrays to empty.
-     */
-    $log.reset = function() {
-      /**
-       * @ngdoc property
-       * @name $log#log.logs
-       *
-       * @description
-       * Array of messages logged using {@link ng.$log#log `log()`}.
-       *
-       * @example
-       * ```js
-       * $log.log('Some Log');
-       * var first = $log.log.logs.unshift();
-       * ```
-       */
-      $log.log.logs = [];
-      /**
-       * @ngdoc property
-       * @name $log#info.logs
-       *
-       * @description
-       * Array of messages logged using {@link ng.$log#info `info()`}.
-       *
-       * @example
-       * ```js
-       * $log.info('Some Info');
-       * var first = $log.info.logs.unshift();
-       * ```
-       */
-      $log.info.logs = [];
-      /**
-       * @ngdoc property
-       * @name $log#warn.logs
-       *
-       * @description
-       * Array of messages logged using {@link ng.$log#warn `warn()`}.
-       *
-       * @example
-       * ```js
-       * $log.warn('Some Warning');
-       * var first = $log.warn.logs.unshift();
-       * ```
-       */
-      $log.warn.logs = [];
-      /**
-       * @ngdoc property
-       * @name $log#error.logs
-       *
-       * @description
-       * Array of messages logged using {@link ng.$log#error `error()`}.
-       *
-       * @example
-       * ```js
-       * $log.error('Some Error');
-       * var first = $log.error.logs.unshift();
-       * ```
-       */
-      $log.error.logs = [];
-        /**
-       * @ngdoc property
-       * @name $log#debug.logs
-       *
-       * @description
-       * Array of messages logged using {@link ng.$log#debug `debug()`}.
-       *
-       * @example
-       * ```js
-       * $log.debug('Some Error');
-       * var first = $log.debug.logs.unshift();
-       * ```
-       */
-      $log.debug.logs = [];
-    };
-
-    /**
-     * @ngdoc method
-     * @name $log#assertEmpty
-     *
-     * @description
-     * Assert that all of the logging methods have no logged messages. If any messages are present,
-     * an exception is thrown.
-     */
-    $log.assertEmpty = function() {
-      var errors = [];
-      angular.forEach(['error', 'warn', 'info', 'log', 'debug'], function(logLevel) {
-        angular.forEach($log[logLevel].logs, function(log) {
-          angular.forEach(log, function(logItem) {
-            errors.push('MOCK $log (' + logLevel + '): ' + String(logItem) + '\n' +
-                        (logItem.stack || ''));
-          });
-        });
-      });
-      if (errors.length) {
-        errors.unshift("Expected $log to be empty! Either a message was logged unexpectedly, or " +
-          "an expected log message was not checked and removed:");
-        errors.push('');
-        throw new Error(errors.join('\n---------\n'));
-      }
-    };
-
-    $log.reset();
-    return $log;
-  };
-};
-
-
-/**
- * @ngdoc service
- * @name $interval
- *
- * @description
- * Mock implementation of the $interval service.
- *
- * Use {@link ngMock.$interval#flush `$interval.flush(millis)`} to
- * move forward by `millis` milliseconds and trigger any functions scheduled to run in that
- * time.
- *
- * @param {function()} fn A function that should be called repeatedly.
- * @param {number} delay Number of milliseconds between each function call.
- * @param {number=} [count=0] Number of times to repeat. If not set, or 0, will repeat
- *   indefinitely.
- * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise
- *   will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block.
- * @param {...*=} Pass additional parameters to the executed function.
- * @returns {promise} A promise which will be notified on each iteration.
- */
-angular.mock.$IntervalProvider = function() {
-  this.$get = ['$browser', '$rootScope', '$q', '$$q',
-       function($browser,   $rootScope,   $q,   $$q) {
-    var repeatFns = [],
-        nextRepeatId = 0,
-        now = 0;
-
-    var $interval = function(fn, delay, count, invokeApply) {
-      var hasParams = arguments.length > 4,
-          args = hasParams ? Array.prototype.slice.call(arguments, 4) : [],
-          iteration = 0,
-          skipApply = (angular.isDefined(invokeApply) && !invokeApply),
-          deferred = (skipApply ? $$q : $q).defer(),
-          promise = deferred.promise;
-
-      count = (angular.isDefined(count)) ? count : 0;
-      promise.then(null, null, (!hasParams) ? fn : function() {
-        fn.apply(null, args);
-      });
-
-      promise.$$intervalId = nextRepeatId;
-
-      function tick() {
-        deferred.notify(iteration++);
-
-        if (count > 0 && iteration >= count) {
-          var fnIndex;
-          deferred.resolve(iteration);
-
-          angular.forEach(repeatFns, function(fn, index) {
-            if (fn.id === promise.$$intervalId) fnIndex = index;
-          });
-
-          if (angular.isDefined(fnIndex)) {
-            repeatFns.splice(fnIndex, 1);
-          }
-        }
-
-        if (skipApply) {
-          $browser.defer.flush();
-        } else {
-          $rootScope.$apply();
-        }
-      }
-
-      repeatFns.push({
-        nextTime:(now + delay),
-        delay: delay,
-        fn: tick,
-        id: nextRepeatId,
-        deferred: deferred
-      });
-      repeatFns.sort(function(a, b) { return a.nextTime - b.nextTime;});
-
-      nextRepeatId++;
-      return promise;
-    };
-    /**
-     * @ngdoc method
-     * @name $interval#cancel
-     *
-     * @description
-     * Cancels a task associated with the `promise`.
-     *
-     * @param {promise} promise A promise from calling the `$interval` function.
-     * @returns {boolean} Returns `true` if the task was successfully cancelled.
-     */
-    $interval.cancel = function(promise) {
-      if (!promise) return false;
-      var fnIndex;
-
-      angular.forEach(repeatFns, function(fn, index) {
-        if (fn.id === promise.$$intervalId) fnIndex = index;
-      });
-
-      if (angular.isDefined(fnIndex)) {
-        repeatFns[fnIndex].deferred.reject('canceled');
-        repeatFns.splice(fnIndex, 1);
-        return true;
-      }
-
-      return false;
-    };
-
-    /**
-     * @ngdoc method
-     * @name $interval#flush
-     * @description
-     *
-     * Runs interval tasks scheduled to be run in the next `millis` milliseconds.
-     *
-     * @param {number=} millis maximum timeout amount to flush up until.
-     *
-     * @return {number} The amount of time moved forward.
-     */
-    $interval.flush = function(millis) {
-      now += millis;
-      while (repeatFns.length && repeatFns[0].nextTime <= now) {
-        var task = repeatFns[0];
-        task.fn();
-        task.nextTime += task.delay;
-        repeatFns.sort(function(a, b) { return a.nextTime - b.nextTime;});
-      }
-      return millis;
-    };
-
-    return $interval;
-  }];
-};
-
-
-/* jshint -W101 */
-/* The R_ISO8061_STR regex is never going to fit into the 100 char limit!
- * This directive should go inside the anonymous function but a bug in JSHint means that it would
- * not be enacted early enough to prevent the warning.
- */
-var R_ISO8061_STR = /^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?:\:?(\d\d)(?:\:?(\d\d)(?:\.(\d{3}))?)?)?(Z|([+-])(\d\d):?(\d\d)))?$/;
-
-function jsonStringToDate(string) {
-  var match;
-  if (match = string.match(R_ISO8061_STR)) {
-    var date = new Date(0),
-        tzHour = 0,
-        tzMin  = 0;
-    if (match[9]) {
-      tzHour = toInt(match[9] + match[10]);
-      tzMin = toInt(match[9] + match[11]);
-    }
-    date.setUTCFullYear(toInt(match[1]), toInt(match[2]) - 1, toInt(match[3]));
-    date.setUTCHours(toInt(match[4] || 0) - tzHour,
-                     toInt(match[5] || 0) - tzMin,
-                     toInt(match[6] || 0),
-                     toInt(match[7] || 0));
-    return date;
-  }
-  return string;
-}
-
-function toInt(str) {
-  return parseInt(str, 10);
-}
-
-function padNumber(num, digits, trim) {
-  var neg = '';
-  if (num < 0) {
-    neg =  '-';
-    num = -num;
-  }
-  num = '' + num;
-  while (num.length < digits) num = '0' + num;
-  if (trim) {
-    num = num.substr(num.length - digits);
-  }
-  return neg + num;
-}
-
-
-/**
- * @ngdoc type
- * @name angular.mock.TzDate
- * @description
- *
- * *NOTE*: this is not an injectable instance, just a globally available mock class of `Date`.
- *
- * Mock of the Date type which has its timezone specified via constructor arg.
- *
- * The main purpose is to create Date-like instances with timezone fixed to the specified timezone
- * offset, so that we can test code that depends on local timezone settings without dependency on
- * the time zone settings of the machine where the code is running.
- *
- * @param {number} offset Offset of the *desired* timezone in hours (fractions will be honored)
- * @param {(number|string)} timestamp Timestamp representing the desired time in *UTC*
- *
- * @example
- * !!!! WARNING !!!!!
- * This is not a complete Date object so only methods that were implemented can be called safely.
- * To make matters worse, TzDate instances inherit stuff from Date via a prototype.
- *
- * We do our best to intercept calls to "unimplemented" methods, but since the list of methods is
- * incomplete we might be missing some non-standard methods. This can result in errors like:
- * "Date.prototype.foo called on incompatible Object".
- *
- * ```js
- * var newYearInBratislava = new TzDate(-1, '2009-12-31T23:00:00Z');
- * newYearInBratislava.getTimezoneOffset() => -60;
- * newYearInBratislava.getFullYear() => 2010;
- * newYearInBratislava.getMonth() => 0;
- * newYearInBratislava.getDate() => 1;
- * newYearInBratislava.getHours() => 0;
- * newYearInBratislava.getMinutes() => 0;
- * newYearInBratislava.getSeconds() => 0;
- * ```
- *
- */
-angular.mock.TzDate = function(offset, timestamp) {
-  var self = new Date(0);
-  if (angular.isString(timestamp)) {
-    var tsStr = timestamp;
-
-    self.origDate = jsonStringToDate(timestamp);
-
-    timestamp = self.origDate.getTime();
-    if (isNaN(timestamp)) {
-      throw {
-        name: "Illegal Argument",
-        message: "Arg '" + tsStr + "' passed into TzDate constructor is not a valid date string"
-      };
-    }
-  } else {
-    self.origDate = new Date(timestamp);
-  }
-
-  var localOffset = new Date(timestamp).getTimezoneOffset();
-  self.offsetDiff = localOffset * 60 * 1000 - offset * 1000 * 60 * 60;
-  self.date = new Date(timestamp + self.offsetDiff);
-
-  self.getTime = function() {
-    return self.date.getTime() - self.offsetDiff;
-  };
-
-  self.toLocaleDateString = function() {
-    return self.date.toLocaleDateString();
-  };
-
-  self.getFullYear = function() {
-    return self.date.getFullYear();
-  };
-
-  self.getMonth = function() {
-    return self.date.getMonth();
-  };
-
-  self.getDate = function() {
-    return self.date.getDate();
-  };
-
-  self.getHours = function() {
-    return self.date.getHours();
-  };
-
-  self.getMinutes = function() {
-    return self.date.getMinutes();
-  };
-
-  self.getSeconds = function() {
-    return self.date.getSeconds();
-  };
-
-  self.getMilliseconds = function() {
-    return self.date.getMilliseconds();
-  };
-
-  self.getTimezoneOffset = function() {
-    return offset * 60;
-  };
-
-  self.getUTCFullYear = function() {
-    return self.origDate.getUTCFullYear();
-  };
-
-  self.getUTCMonth = function() {
-    return self.origDate.getUTCMonth();
-  };
-
-  self.getUTCDate = function() {
-    return self.origDate.getUTCDate();
-  };
-
-  self.getUTCHours = function() {
-    return self.origDate.getUTCHours();
-  };
-
-  self.getUTCMinutes = function() {
-    return self.origDate.getUTCMinutes();
-  };
-
-  self.getUTCSeconds = function() {
-    return self.origDate.getUTCSeconds();
-  };
-
-  self.getUTCMilliseconds = function() {
-    return self.origDate.getUTCMilliseconds();
-  };
-
-  self.getDay = function() {
-    return self.date.getDay();
-  };
-
-  // provide this method only on browsers that already have it
-  if (self.toISOString) {
-    self.toISOString = function() {
-      return padNumber(self.origDate.getUTCFullYear(), 4) + '-' +
-            padNumber(self.origDate.getUTCMonth() + 1, 2) + '-' +
-            padNumber(self.origDate.getUTCDate(), 2) + 'T' +
-            padNumber(self.origDate.getUTCHours(), 2) + ':' +
-            padNumber(self.origDate.getUTCMinutes(), 2) + ':' +
-            padNumber(self.origDate.getUTCSeconds(), 2) + '.' +
-            padNumber(self.origDate.getUTCMilliseconds(), 3) + 'Z';
-    };
-  }
-
-  //hide all methods not implemented in this mock that the Date prototype exposes
-  var unimplementedMethods = ['getUTCDay',
-      'getYear', 'setDate', 'setFullYear', 'setHours', 'setMilliseconds',
-      'setMinutes', 'setMonth', 'setSeconds', 'setTime', 'setUTCDate', 'setUTCFullYear',
-      'setUTCHours', 'setUTCMilliseconds', 'setUTCMinutes', 'setUTCMonth', 'setUTCSeconds',
-      'setYear', 'toDateString', 'toGMTString', 'toJSON', 'toLocaleFormat', 'toLocaleString',
-      'toLocaleTimeString', 'toSource', 'toString', 'toTimeString', 'toUTCString', 'valueOf'];
-
-  angular.forEach(unimplementedMethods, function(methodName) {
-    self[methodName] = function() {
-      throw new Error("Method '" + methodName + "' is not implemented in the TzDate mock");
-    };
-  });
-
-  return self;
-};
-
-//make "tzDateInstance instanceof Date" return true
-angular.mock.TzDate.prototype = Date.prototype;
-/* jshint +W101 */
-
-
-/**
- * @ngdoc service
- * @name $animate
- *
- * @description
- * Mock implementation of the {@link ng.$animate `$animate`} service. Exposes two additional methods
- * for testing animations.
- */
-angular.mock.animate = angular.module('ngAnimateMock', ['ng'])
-
-  .config(['$provide', function($provide) {
-
-    $provide.factory('$$forceReflow', function() {
-      function reflowFn() {
-        reflowFn.totalReflows++;
-      }
-      reflowFn.totalReflows = 0;
-      return reflowFn;
-    });
-
-    $provide.factory('$$animateAsyncRun', function() {
-      var queue = [];
-      var queueFn = function() {
-        return function(fn) {
-          queue.push(fn);
-        };
-      };
-      queueFn.flush = function() {
-        if (queue.length === 0) return false;
-
-        for (var i = 0; i < queue.length; i++) {
-          queue[i]();
-        }
-        queue = [];
-
-        return true;
-      };
-      return queueFn;
-    });
-
-    $provide.decorator('$$animateJs', ['$delegate', function($delegate) {
-      var runners = [];
-
-      var animateJsConstructor = function() {
-        var animator = $delegate.apply($delegate, arguments);
-        // If no javascript animation is found, animator is undefined
-        if (animator) {
-          runners.push(animator);
-        }
-        return animator;
-      };
-
-      animateJsConstructor.$closeAndFlush = function() {
-        runners.forEach(function(runner) {
-          runner.end();
-        });
-        runners = [];
-      };
-
-      return animateJsConstructor;
-    }]);
-
-    $provide.decorator('$animateCss', ['$delegate', function($delegate) {
-      var runners = [];
-
-      var animateCssConstructor = function(element, options) {
-        var animator = $delegate(element, options);
-        runners.push(animator);
-        return animator;
-      };
-
-      animateCssConstructor.$closeAndFlush = function() {
-        runners.forEach(function(runner) {
-          runner.end();
-        });
-        runners = [];
-      };
-
-      return animateCssConstructor;
-    }]);
-
-    $provide.decorator('$animate', ['$delegate', '$timeout', '$browser', '$$rAF', '$animateCss', '$$animateJs',
-                                    '$$forceReflow', '$$animateAsyncRun', '$rootScope',
-                            function($delegate,   $timeout,   $browser,   $$rAF,   $animateCss,   $$animateJs,
-                                     $$forceReflow,   $$animateAsyncRun,  $rootScope) {
-      var animate = {
-        queue: [],
-        cancel: $delegate.cancel,
-        on: $delegate.on,
-        off: $delegate.off,
-        pin: $delegate.pin,
-        get reflows() {
-          return $$forceReflow.totalReflows;
-        },
-        enabled: $delegate.enabled,
-        /**
-         * @ngdoc method
-         * @name $animate#closeAndFlush
-         * @description
-         *
-         * This method will close all pending animations (both {@link ngAnimate#javascript-based-animations Javascript}
-         * and {@link ngAnimate.$animateCss CSS}) and it will also flush any remaining animation frames and/or callbacks.
-         */
-        closeAndFlush: function() {
-          // we allow the flush command to swallow the errors
-          // because depending on whether CSS or JS animations are
-          // used, there may not be a RAF flush. The primary flush
-          // at the end of this function must throw an exception
-          // because it will track if there were pending animations
-          this.flush(true);
-          $animateCss.$closeAndFlush();
-          $$animateJs.$closeAndFlush();
-          this.flush();
-        },
-        /**
-         * @ngdoc method
-         * @name $animate#flush
-         * @description
-         *
-         * This method is used to flush the pending callbacks and animation frames to either start
-         * an animation or conclude an animation. Note that this will not actually close an
-         * actively running animation (see {@link ngMock.$animate#closeAndFlush `closeAndFlush()`} for that).
-         */
-        flush: function(hideErrors) {
-          $rootScope.$digest();
-
-          var doNextRun, somethingFlushed = false;
-          do {
-            doNextRun = false;
-
-            if ($$rAF.queue.length) {
-              $$rAF.flush();
-              doNextRun = somethingFlushed = true;
-            }
-
-            if ($$animateAsyncRun.flush()) {
-              doNextRun = somethingFlushed = true;
-            }
-          } while (doNextRun);
-
-          if (!somethingFlushed && !hideErrors) {
-            throw new Error('No pending animations ready to be closed or flushed');
-          }
-
-          $rootScope.$digest();
-        }
-      };
-
-      angular.forEach(
-        ['animate','enter','leave','move','addClass','removeClass','setClass'], function(method) {
-        animate[method] = function() {
-          animate.queue.push({
-            event: method,
-            element: arguments[0],
-            options: arguments[arguments.length - 1],
-            args: arguments
-          });
-          return $delegate[method].apply($delegate, arguments);
-        };
-      });
-
-      return animate;
-    }]);
-
-  }]);
-
-
-/**
- * @ngdoc function
- * @name angular.mock.dump
- * @description
- *
- * *NOTE*: this is not an injectable instance, just a globally available function.
- *
- * Method for serializing common angular objects (scope, elements, etc..) into strings, useful for
- * debugging.
- *
- * This method is also available on window, where it can be used to display objects on debug
- * console.
- *
- * @param {*} object - any object to turn into string.
- * @return {string} a serialized string of the argument
- */
-angular.mock.dump = function(object) {
-  return serialize(object);
-
-  function serialize(object) {
-    var out;
-
-    if (angular.isElement(object)) {
-      object = angular.element(object);
-      out = angular.element('
    ');
-      angular.forEach(object, function(element) {
-        out.append(angular.element(element).clone());
-      });
-      out = out.html();
-    } else if (angular.isArray(object)) {
-      out = [];
-      angular.forEach(object, function(o) {
-        out.push(serialize(o));
-      });
-      out = '[ ' + out.join(', ') + ' ]';
-    } else if (angular.isObject(object)) {
-      if (angular.isFunction(object.$eval) && angular.isFunction(object.$apply)) {
-        out = serializeScope(object);
-      } else if (object instanceof Error) {
-        out = object.stack || ('' + object.name + ': ' + object.message);
-      } else {
-        // TODO(i): this prevents methods being logged,
-        // we should have a better way to serialize objects
-        out = angular.toJson(object, true);
-      }
-    } else {
-      out = String(object);
-    }
-
-    return out;
-  }
-
-  function serializeScope(scope, offset) {
-    offset = offset ||  '  ';
-    var log = [offset + 'Scope(' + scope.$id + '): {'];
-    for (var key in scope) {
-      if (Object.prototype.hasOwnProperty.call(scope, key) && !key.match(/^(\$|this)/)) {
-        log.push('  ' + key + ': ' + angular.toJson(scope[key]));
-      }
-    }
-    var child = scope.$$childHead;
-    while (child) {
-      log.push(serializeScope(child, offset + '  '));
-      child = child.$$nextSibling;
-    }
-    log.push('}');
-    return log.join('\n' + offset);
-  }
-};
-
-/**
- * @ngdoc service
- * @name $httpBackend
- * @description
- * Fake HTTP backend implementation suitable for unit testing applications that use the
- * {@link ng.$http $http service}.
- *
- * *Note*: For fake HTTP backend implementation suitable for end-to-end testing or backend-less
- * development please see {@link ngMockE2E.$httpBackend e2e $httpBackend mock}.
- *
- * During unit testing, we want our unit tests to run quickly and have no external dependencies so
- * we don’t want to send [XHR](https://developer.mozilla.org/en/xmlhttprequest) or
- * [JSONP](http://en.wikipedia.org/wiki/JSONP) requests to a real server. All we really need is
- * to verify whether a certain request has been sent or not, or alternatively just let the
- * application make requests, respond with pre-trained responses and assert that the end result is
- * what we expect it to be.
- *
- * This mock implementation can be used to respond with static or dynamic responses via the
- * `expect` and `when` apis and their shortcuts (`expectGET`, `whenPOST`, etc).
- *
- * When an Angular application needs some data from a server, it calls the $http service, which
- * sends the request to a real server using $httpBackend service. With dependency injection, it is
- * easy to inject $httpBackend mock (which has the same API as $httpBackend) and use it to verify
- * the requests and respond with some testing data without sending a request to a real server.
- *
- * There are two ways to specify what test data should be returned as http responses by the mock
- * backend when the code under test makes http requests:
- *
- * - `$httpBackend.expect` - specifies a request expectation
- * - `$httpBackend.when` - specifies a backend definition
- *
- *
- * ## Request Expectations vs Backend Definitions
- *
- * Request expectations provide a way to make assertions about requests made by the application and
- * to define responses for those requests. The test will fail if the expected requests are not made
- * or they are made in the wrong order.
- *
- * Backend definitions allow you to define a fake backend for your application which doesn't assert
- * if a particular request was made or not, it just returns a trained response if a request is made.
- * The test will pass whether or not the request gets made during testing.
- *
- *
- * 
- *   
- *   
- *     
- *     
- *     
- *   
- *   
- *     
- *     
- *     
- *   
- *   
- *     
- *     
- *     
- *   
- *   
- *     
- *     
- *     
- *   
- *   
- *     
- *     
- *     
- *   
- *   
- *     
- *     
- *     
- *   
- * 
    Request expectationsBackend definitions
    Syntax.expect(...).respond(...).when(...).respond(...)
    Typical usagestrict unit testsloose (black-box) unit testing
    Fulfills multiple requestsNOYES
    Order of requests mattersYESNO
    Request requiredYESNO
    Response requiredoptional (see below)YES
    
- *
- * In cases where both backend definitions and request expectations are specified during unit
- * testing, the request expectations are evaluated first.
- *
- * If a request expectation has no response specified, the algorithm will search your backend
- * definitions for an appropriate response.
- *
- * If a request didn't match any expectation or if the expectation doesn't have the response
- * defined, the backend definitions are evaluated in sequential order to see if any of them match
- * the request. The response from the first matched definition is returned.
- *
- *
- * ## Flushing HTTP requests
- *
- * The $httpBackend used in production always responds to requests asynchronously. If we preserved
- * this behavior in unit testing, we'd have to create async unit tests, which are hard to write,
- * to follow and to maintain. But neither can the testing mock respond synchronously; that would
- * change the execution of the code under test. For this reason, the mock $httpBackend has a
- * `flush()` method, which allows the test to explicitly flush pending requests. This preserves
- * the async api of the backend, while allowing the test to execute synchronously.
- *
- *
- * ## Unit testing with mock $httpBackend
- * The following code shows how to setup and use the mock backend when unit testing a controller.
- * First we create the controller under test:
- *
-  ```js
-  // The module code
-  angular
-    .module('MyApp', [])
-    .controller('MyController', MyController);
-
-  // The controller code
-  function MyController($scope, $http) {
-    var authToken;
-
-    $http.get('/auth.py').then(function(response) {
-      authToken = response.headers('A-Token');
-      $scope.user = response.data;
-    });
-
-    $scope.saveMessage = function(message) {
-      var headers = { 'Authorization': authToken };
-      $scope.status = 'Saving...';
-
-      $http.post('/add-msg.py', message, { headers: headers } ).then(function(response) {
-        $scope.status = '';
-      }).catch(function() {
-        $scope.status = 'Failed...';
-      });
-    };
-  }
-  ```
- *
- * Now we setup the mock backend and create the test specs:
- *
-  ```js
-    // testing controller
-    describe('MyController', function() {
-       var $httpBackend, $rootScope, createController, authRequestHandler;
-
-       // Set up the module
-       beforeEach(module('MyApp'));
-
-       beforeEach(inject(function($injector) {
-         // Set up the mock http service responses
-         $httpBackend = $injector.get('$httpBackend');
-         // backend definition common for all tests
-         authRequestHandler = $httpBackend.when('GET', '/auth.py')
-                                .respond({userId: 'userX'}, {'A-Token': 'xxx'});
-
-         // Get hold of a scope (i.e. the root scope)
-         $rootScope = $injector.get('$rootScope');
-         // The $controller service is used to create instances of controllers
-         var $controller = $injector.get('$controller');
-
-         createController = function() {
-           return $controller('MyController', {'$scope' : $rootScope });
-         };
-       }));
-
-
-       afterEach(function() {
-         $httpBackend.verifyNoOutstandingExpectation();
-         $httpBackend.verifyNoOutstandingRequest();
-       });
-
-
-       it('should fetch authentication token', function() {
-         $httpBackend.expectGET('/auth.py');
-         var controller = createController();
-         $httpBackend.flush();
-       });
-
-
-       it('should fail authentication', function() {
-
-         // Notice how you can change the response even after it was set
-         authRequestHandler.respond(401, '');
-
-         $httpBackend.expectGET('/auth.py');
-         var controller = createController();
-         $httpBackend.flush();
-         expect($rootScope.status).toBe('Failed...');
-       });
-
-
-       it('should send msg to server', function() {
-         var controller = createController();
-         $httpBackend.flush();
-
-         // now you don’t care about the authentication, but
-         // the controller will still send the request and
-         // $httpBackend will respond without you having to
-         // specify the expectation and response for this request
-
-         $httpBackend.expectPOST('/add-msg.py', 'message content').respond(201, '');
-         $rootScope.saveMessage('message content');
-         expect($rootScope.status).toBe('Saving...');
-         $httpBackend.flush();
-         expect($rootScope.status).toBe('');
-       });
-
-
-       it('should send auth header', function() {
-         var controller = createController();
-         $httpBackend.flush();
-
-         $httpBackend.expectPOST('/add-msg.py', undefined, function(headers) {
-           // check if the header was sent, if it wasn't the expectation won't
-           // match the request and the test will fail
-           return headers['Authorization'] == 'xxx';
-         }).respond(201, '');
-
-         $rootScope.saveMessage('whatever');
-         $httpBackend.flush();
-       });
-    });
-  ```
- *
- * ## Dynamic responses
- *
- * You define a response to a request by chaining a call to `respond()` onto a definition or expectation.
- * If you provide a **callback** as the first parameter to `respond(callback)` then you can dynamically generate
- * a response based on the properties of the request.
- *
- * The `callback` function should be of the form `function(method, url, data, headers, params)`.
- *
- * ### Query parameters
- *
- * By default, query parameters on request URLs are parsed into the `params` object. So a request URL
- * of `/list?q=searchstr&orderby=-name` would set `params` to be `{q: 'searchstr', orderby: '-name'}`.
- *
- * ### Regex parameter matching
- *
- * If an expectation or definition uses a **regex** to match the URL, you can provide an array of **keys** via a
- * `params` argument. The index of each **key** in the array will match the index of a **group** in the
- * **regex**.
- *
- * The `params` object in the **callback** will now have properties with these keys, which hold the value of the
- * corresponding **group** in the **regex**.
- *
- * This also applies to the `when` and `expect` shortcut methods.
- *
- *
- * ```js
- *   $httpBackend.expect('GET', /\/user\/(.+)/, undefined, undefined, ['id'])
- *     .respond(function(method, url, data, headers, params) {
- *       // for requested url of '/user/1234' params is {id: '1234'}
- *     });
- *
- *   $httpBackend.whenPATCH(/\/user\/(.+)\/article\/(.+)/, undefined, undefined, ['user', 'article'])
- *     .respond(function(method, url, data, headers, params) {
- *       // for url of '/user/1234/article/567' params is {user: '1234', article: '567'}
- *     });
- * ```
- *
- * ## Matching route requests
- *
- * For extra convenience, `whenRoute` and `expectRoute` shortcuts are available. These methods offer colon
- * delimited matching of the url path, ignoring the query string. This allows declarations
- * similar to how application routes are configured with `$routeProvider`. Because these methods convert
- * the definition url to regex, declaration order is important. Combined with query parameter parsing,
- * the following is possible:
- *
-  ```js
-    $httpBackend.whenRoute('GET', '/users/:id')
-      .respond(function(method, url, data, headers, params) {
-        return [200, MockUserList[Number(params.id)]];
-      });
-
-    $httpBackend.whenRoute('GET', '/users')
-      .respond(function(method, url, data, headers, params) {
-        var userList = angular.copy(MockUserList),
-          defaultSort = 'lastName',
-          count, pages, isPrevious, isNext;
-
-        // paged api response '/v1/users?page=2'
-        params.page = Number(params.page) || 1;
-
-        // query for last names '/v1/users?q=Archer'
-        if (params.q) {
-          userList = $filter('filter')({lastName: params.q});
-        }
-
-        pages = Math.ceil(userList.length / pagingLength);
-        isPrevious = params.page > 1;
-        isNext = params.page < pages;
-
-        return [200, {
-          count:    userList.length,
-          previous: isPrevious,
-          next:     isNext,
-          // sort field -> '/v1/users?sortBy=firstName'
-          results:  $filter('orderBy')(userList, params.sortBy || defaultSort)
-                      .splice((params.page - 1) * pagingLength, pagingLength)
-        }];
-      });
-  ```
- */
-angular.mock.$HttpBackendProvider = function() {
-  this.$get = ['$rootScope', '$timeout', createHttpBackendMock];
-};
-
-/**
- * General factory function for $httpBackend mock.
- * Returns instance for unit testing (when no arguments specified):
- *   - passing through is disabled
- *   - auto flushing is disabled
- *
- * Returns instance for e2e testing (when `$delegate` and `$browser` specified):
- *   - passing through (delegating request to real backend) is enabled
- *   - auto flushing is enabled
- *
- * @param {Object=} $delegate Real $httpBackend instance (allow passing through if specified)
- * @param {Object=} $browser Auto-flushing enabled if specified
- * @return {Object} Instance of $httpBackend mock
- */
-function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) {
-  var definitions = [],
-      expectations = [],
-      responses = [],
-      responsesPush = angular.bind(responses, responses.push),
-      copy = angular.copy;
-
-  function createResponse(status, data, headers, statusText) {
-    if (angular.isFunction(status)) return status;
-
-    return function() {
-      return angular.isNumber(status)
-          ? [status, data, headers, statusText]
-          : [200, status, data, headers];
-    };
-  }
-
-  // TODO(vojta): change params to: method, url, data, headers, callback
-  function $httpBackend(method, url, data, callback, headers, timeout, withCredentials) {
-    var xhr = new MockXhr(),
-        expectation = expectations[0],
-        wasExpected = false;
-
-    function prettyPrint(data) {
-      return (angular.isString(data) || angular.isFunction(data) || data instanceof RegExp)
-          ? data
-          : angular.toJson(data);
-    }
-
-    function wrapResponse(wrapped) {
-      if (!$browser && timeout) {
-        timeout.then ? timeout.then(handleTimeout) : $timeout(handleTimeout, timeout);
-      }
-
-      return handleResponse;
-
-      function handleResponse() {
-        var response = wrapped.response(method, url, data, headers, wrapped.params(url));
-        xhr.$$respHeaders = response[2];
-        callback(copy(response[0]), copy(response[1]), xhr.getAllResponseHeaders(),
-                 copy(response[3] || ''));
-      }
-
-      function handleTimeout() {
-        for (var i = 0, ii = responses.length; i < ii; i++) {
-          if (responses[i] === handleResponse) {
-            responses.splice(i, 1);
-            callback(-1, undefined, '');
-            break;
-          }
-        }
-      }
-    }
-
-    if (expectation && expectation.match(method, url)) {
-      if (!expectation.matchData(data)) {
-        throw new Error('Expected ' + expectation + ' with different data\n' +
-            'EXPECTED: ' + prettyPrint(expectation.data) + '\nGOT:      ' + data);
-      }
-
-      if (!expectation.matchHeaders(headers)) {
-        throw new Error('Expected ' + expectation + ' with different headers\n' +
-                        'EXPECTED: ' + prettyPrint(expectation.headers) + '\nGOT:      ' +
-                        prettyPrint(headers));
-      }
-
-      expectations.shift();
-
-      if (expectation.response) {
-        responses.push(wrapResponse(expectation));
-        return;
-      }
-      wasExpected = true;
-    }
-
-    var i = -1, definition;
-    while ((definition = definitions[++i])) {
-      if (definition.match(method, url, data, headers || {})) {
-        if (definition.response) {
-          // if $browser specified, we do auto flush all requests
-          ($browser ? $browser.defer : responsesPush)(wrapResponse(definition));
-        } else if (definition.passThrough) {
-          $delegate(method, url, data, callback, headers, timeout, withCredentials);
-        } else throw new Error('No response defined !');
-        return;
-      }
-    }
-    throw wasExpected ?
-        new Error('No response defined !') :
-        new Error('Unexpected request: ' + method + ' ' + url + '\n' +
-                  (expectation ? 'Expected ' + expectation : 'No more request expected'));
-  }
-
-  /**
-   * @ngdoc method
-   * @name $httpBackend#when
-   * @description
-   * Creates a new backend definition.
-   *
-   * @param {string} method HTTP method.
-   * @param {string|RegExp|function(string)} url HTTP url or function that receives a url
-   *   and returns true if the url matches the current definition.
-   * @param {(string|RegExp|function(string))=} data HTTP request body or function that receives
-   *   data string and returns true if the data is as expected.
-   * @param {(Object|function(Object))=} headers HTTP headers or function that receives http header
-   *   object and returns true if the headers match the current definition.
-   * @param {(Array)=} keys Array of keys to assign to regex matches in request url described above.
-   * @returns {requestHandler} Returns an object with `respond` method that controls how a matched
-   *   request is handled. You can save this object for later use and invoke `respond` again in
-   *   order to change how a matched request is handled.
-   *
-   *  - respond –
-   *      `{function([status,] data[, headers, statusText])
-   *      | function(function(method, url, data, headers, params)}`
-   *    – The respond method takes a set of static data to be returned or a function that can
-   *    return an array containing response status (number), response data (string), response
-   *    headers (Object), and the text for the status (string). The respond method returns the
-   *    `requestHandler` object for possible overrides.
-   */
-  $httpBackend.when = function(method, url, data, headers, keys) {
-    var definition = new MockHttpExpectation(method, url, data, headers, keys),
-        chain = {
-          respond: function(status, data, headers, statusText) {
-            definition.passThrough = undefined;
-            definition.response = createResponse(status, data, headers, statusText);
-            return chain;
-          }
-        };
-
-    if ($browser) {
-      chain.passThrough = function() {
-        definition.response = undefined;
-        definition.passThrough = true;
-        return chain;
-      };
-    }
-
-    definitions.push(definition);
-    return chain;
-  };
-
-  /**
-   * @ngdoc method
-   * @name $httpBackend#whenGET
-   * @description
-   * Creates a new backend definition for GET requests. For more info see `when()`.
-   *
-   * @param {string|RegExp|function(string)} url HTTP url or function that receives a url
-   *   and returns true if the url matches the current definition.
-   * @param {(Object|function(Object))=} headers HTTP headers.
-   * @param {(Array)=} keys Array of keys to assign to regex matches in request url described above.
-   * @returns {requestHandler} Returns an object with `respond` method that controls how a matched
-   * request is handled. You can save this object for later use and invoke `respond` again in
-   * order to change how a matched request is handled.
-   */
-
-  /**
-   * @ngdoc method
-   * @name $httpBackend#whenHEAD
-   * @description
-   * Creates a new backend definition for HEAD requests. For more info see `when()`.
-   *
-   * @param {string|RegExp|function(string)} url HTTP url or function that receives a url
-   *   and returns true if the url matches the current definition.
-   * @param {(Object|function(Object))=} headers HTTP headers.
-   * @param {(Array)=} keys Array of keys to assign to regex matches in request url described above.
-   * @returns {requestHandler} Returns an object with `respond` method that controls how a matched
-   * request is handled. You can save this object for later use and invoke `respond` again in
-   * order to change how a matched request is handled.
-   */
-
-  /**
-   * @ngdoc method
-   * @name $httpBackend#whenDELETE
-   * @description
-   * Creates a new backend definition for DELETE requests. For more info see `when()`.
-   *
-   * @param {string|RegExp|function(string)} url HTTP url or function that receives a url
-   *   and returns true if the url matches the current definition.
-   * @param {(Object|function(Object))=} headers HTTP headers.
-   * @param {(Array)=} keys Array of keys to assign to regex matches in request url described above.
-   * @returns {requestHandler} Returns an object with `respond` method that controls how a matched
-   * request is handled. You can save this object for later use and invoke `respond` again in
-   * order to change how a matched request is handled.
-   */
-
-  /**
-   * @ngdoc method
-   * @name $httpBackend#whenPOST
-   * @description
-   * Creates a new backend definition for POST requests. For more info see `when()`.
-   *
-   * @param {string|RegExp|function(string)} url HTTP url or function that receives a url
-   *   and returns true if the url matches the current definition.
-   * @param {(string|RegExp|function(string))=} data HTTP request body or function that receives
-   *   data string and returns true if the data is as expected.
-   * @param {(Object|function(Object))=} headers HTTP headers.
-   * @param {(Array)=} keys Array of keys to assign to regex matches in request url described above.
-   * @returns {requestHandler} Returns an object with `respond` method that controls how a matched
-   * request is handled. You can save this object for later use and invoke `respond` again in
-   * order to change how a matched request is handled.
-   */
-
-  /**
-   * @ngdoc method
-   * @name $httpBackend#whenPUT
-   * @description
-   * Creates a new backend definition for PUT requests.  For more info see `when()`.
-   *
-   * @param {string|RegExp|function(string)} url HTTP url or function that receives a url
-   *   and returns true if the url matches the current definition.
-   * @param {(string|RegExp|function(string))=} data HTTP request body or function that receives
-   *   data string and returns true if the data is as expected.
-   * @param {(Object|function(Object))=} headers HTTP headers.
-   * @param {(Array)=} keys Array of keys to assign to regex matches in request url described above.
-   * @returns {requestHandler} Returns an object with `respond` method that controls how a matched
-   * request is handled. You can save this object for later use and invoke `respond` again in
-   * order to change how a matched request is handled.
-   */
-
-  /**
-   * @ngdoc method
-   * @name $httpBackend#whenJSONP
-   * @description
-   * Creates a new backend definition for JSONP requests. For more info see `when()`.
-   *
-   * @param {string|RegExp|function(string)} url HTTP url or function that receives a url
-   *   and returns true if the url matches the current definition.
-   * @param {(Array)=} keys Array of keys to assign to regex matches in request url described above.
-   * @returns {requestHandler} Returns an object with `respond` method that controls how a matched
-   * request is handled. You can save this object for later use and invoke `respond` again in
-   * order to change how a matched request is handled.
-   */
-  createShortMethods('when');
-
-  /**
-   * @ngdoc method
-   * @name $httpBackend#whenRoute
-   * @description
-   * Creates a new backend definition that compares only with the requested route.
-   *
-   * @param {string} method HTTP method.
-   * @param {string} url HTTP url string that supports colon param matching.
-   * @returns {requestHandler} Returns an object with `respond` method that controls how a matched
-   * request is handled. You can save this object for later use and invoke `respond` again in
-   * order to change how a matched request is handled. See #when for more info.
-   */
-  $httpBackend.whenRoute = function(method, url) {
-    var pathObj = parseRoute(url);
-    return $httpBackend.when(method, pathObj.regexp, undefined, undefined, pathObj.keys);
-  };
-
-  function parseRoute(url) {
-    var ret = {
-      regexp: url
-    },
-    keys = ret.keys = [];
-
-    if (!url || !angular.isString(url)) return ret;
-
-    url = url
-      .replace(/([().])/g, '\\$1')
-      .replace(/(\/)?:(\w+)([\?\*])?/g, function(_, slash, key, option) {
-        var optional = option === '?' ? option : null;
-        var star = option === '*' ? option : null;
-        keys.push({ name: key, optional: !!optional });
-        slash = slash || '';
-        return ''
-          + (optional ? '' : slash)
-          + '(?:'
-          + (optional ? slash : '')
-          + (star && '(.+?)' || '([^/]+)')
-          + (optional || '')
-          + ')'
-          + (optional || '');
-      })
-      .replace(/([\/$\*])/g, '\\$1');
-
-    ret.regexp = new RegExp('^' + url, 'i');
-    return ret;
-  }
-
-  /**
-   * @ngdoc method
-   * @name $httpBackend#expect
-   * @description
-   * Creates a new request expectation.
-   *
-   * @param {string} method HTTP method.
-   * @param {string|RegExp|function(string)} url HTTP url or function that receives a url
-   *   and returns true if the url matches the current definition.
-   * @param {(string|RegExp|function(string)|Object)=} data HTTP request body or function that
-   *  receives data string and returns true if the data is as expected, or Object if request body
-   *  is in JSON format.
-   * @param {(Object|function(Object))=} headers HTTP headers or function that receives http header
-   *   object and returns true if the headers match the current expectation.
-   * @param {(Array)=} keys Array of keys to assign to regex matches in request url described above.
-   * @returns {requestHandler} Returns an object with `respond` method that controls how a matched
-   *  request is handled. You can save this object for later use and invoke `respond` again in
-   *  order to change how a matched request is handled.
-   *
-   *  - respond –
-   *    `{function([status,] data[, headers, statusText])
-   *    | function(function(method, url, data, headers, params)}`
-   *    – The respond method takes a set of static data to be returned or a function that can
-   *    return an array containing response status (number), response data (string), response
-   *    headers (Object), and the text for the status (string). The respond method returns the
-   *    `requestHandler` object for possible overrides.
-   */
-  $httpBackend.expect = function(method, url, data, headers, keys) {
-    var expectation = new MockHttpExpectation(method, url, data, headers, keys),
-        chain = {
-          respond: function(status, data, headers, statusText) {
-            expectation.response = createResponse(status, data, headers, statusText);
-            return chain;
-          }
-        };
-
-    expectations.push(expectation);
-    return chain;
-  };
-
-  /**
-   * @ngdoc method
-   * @name $httpBackend#expectGET
-   * @description
-   * Creates a new request expectation for GET requests. For more info see `expect()`.
-   *
-   * @param {string|RegExp|function(string)} url HTTP url or function that receives a url
-   *   and returns true if the url matches the current definition.
-   * @param {Object=} headers HTTP headers.
-   * @param {(Array)=} keys Array of keys to assign to regex matches in request url described above.
-   * @returns {requestHandler} Returns an object with `respond` method that controls how a matched
-   * request is handled. You can save this object for later use and invoke `respond` again in
-   * order to change how a matched request is handled. See #expect for more info.
-   */
-
-  /**
-   * @ngdoc method
-   * @name $httpBackend#expectHEAD
-   * @description
-   * Creates a new request expectation for HEAD requests. For more info see `expect()`.
-   *
-   * @param {string|RegExp|function(string)} url HTTP url or function that receives a url
-   *   and returns true if the url matches the current definition.
-   * @param {Object=} headers HTTP headers.
-   * @param {(Array)=} keys Array of keys to assign to regex matches in request url described above.
-   * @returns {requestHandler} Returns an object with `respond` method that controls how a matched
-   *   request is handled. You can save this object for later use and invoke `respond` again in
-   *   order to change how a matched request is handled.
-   */
-
-  /**
-   * @ngdoc method
-   * @name $httpBackend#expectDELETE
-   * @description
-   * Creates a new request expectation for DELETE requests. For more info see `expect()`.
-   *
-   * @param {string|RegExp|function(string)} url HTTP url or function that receives a url
-   *   and returns true if the url matches the current definition.
-   * @param {Object=} headers HTTP headers.
-   * @param {(Array)=} keys Array of keys to assign to regex matches in request url described above.
-   * @returns {requestHandler} Returns an object with `respond` method that controls how a matched
-   *   request is handled. You can save this object for later use and invoke `respond` again in
-   *   order to change how a matched request is handled.
-   */
-
-  /**
-   * @ngdoc method
-   * @name $httpBackend#expectPOST
-   * @description
-   * Creates a new request expectation for POST requests. For more info see `expect()`.
-   *
-   * @param {string|RegExp|function(string)} url HTTP url or function that receives a url
-   *   and returns true if the url matches the current definition.
-   * @param {(string|RegExp|function(string)|Object)=} data HTTP request body or function that
-   *  receives data string and returns true if the data is as expected, or Object if request body
-   *  is in JSON format.
-   * @param {Object=} headers HTTP headers.
-   * @param {(Array)=} keys Array of keys to assign to regex matches in request url described above.
-   * @returns {requestHandler} Returns an object with `respond` method that controls how a matched
-   *   request is handled. You can save this object for later use and invoke `respond` again in
-   *   order to change how a matched request is handled.
-   */
-
-  /**
-   * @ngdoc method
-   * @name $httpBackend#expectPUT
-   * @description
-   * Creates a new request expectation for PUT requests. For more info see `expect()`.
-   *
-   * @param {string|RegExp|function(string)} url HTTP url or function that receives a url
-   *   and returns true if the url matches the current definition.
-   * @param {(string|RegExp|function(string)|Object)=} data HTTP request body or function that
-   *  receives data string and returns true if the data is as expected, or Object if request body
-   *  is in JSON format.
-   * @param {Object=} headers HTTP headers.
-   * @param {(Array)=} keys Array of keys to assign to regex matches in request url described above.
-   * @returns {requestHandler} Returns an object with `respond` method that controls how a matched
-   *   request is handled. You can save this object for later use and invoke `respond` again in
-   *   order to change how a matched request is handled.
-   */
-
-  /**
-   * @ngdoc method
-   * @name $httpBackend#expectPATCH
-   * @description
-   * Creates a new request expectation for PATCH requests. For more info see `expect()`.
-   *
-   * @param {string|RegExp|function(string)} url HTTP url or function that receives a url
-   *   and returns true if the url matches the current definition.
-   * @param {(string|RegExp|function(string)|Object)=} data HTTP request body or function that
-   *  receives data string and returns true if the data is as expected, or Object if request body
-   *  is in JSON format.
-   * @param {Object=} headers HTTP headers.
-   * @param {(Array)=} keys Array of keys to assign to regex matches in request url described above.
-   * @returns {requestHandler} Returns an object with `respond` method that controls how a matched
-   *   request is handled. You can save this object for later use and invoke `respond` again in
-   *   order to change how a matched request is handled.
-   */
-
-  /**
-   * @ngdoc method
-   * @name $httpBackend#expectJSONP
-   * @description
-   * Creates a new request expectation for JSONP requests. For more info see `expect()`.
-   *
-   * @param {string|RegExp|function(string)} url HTTP url or function that receives an url
-   *   and returns true if the url matches the current definition.
-   * @param {(Array)=} keys Array of keys to assign to regex matches in request url described above.
-   * @returns {requestHandler} Returns an object with `respond` method that controls how a matched
-   *   request is handled. You can save this object for later use and invoke `respond` again in
-   *   order to change how a matched request is handled.
-   */
-  createShortMethods('expect');
-
-  /**
-   * @ngdoc method
-   * @name $httpBackend#expectRoute
-   * @description
-   * Creates a new request expectation that compares only with the requested route.
-   *
-   * @param {string} method HTTP method.
-   * @param {string} url HTTP url string that supports colon param matching.
-   * @returns {requestHandler} Returns an object with `respond` method that controls how a matched
-   * request is handled. You can save this object for later use and invoke `respond` again in
-   * order to change how a matched request is handled. See #expect for more info.
-   */
-  $httpBackend.expectRoute = function(method, url) {
-    var pathObj = parseRoute(url);
-    return $httpBackend.expect(method, pathObj.regexp, undefined, undefined, pathObj.keys);
-  };
-
-
-  /**
-   * @ngdoc method
-   * @name $httpBackend#flush
-   * @description
-   * Flushes all pending requests using the trained responses.
-   *
-   * @param {number=} count Number of responses to flush (in the order they arrived). If undefined,
-   *   all pending requests will be flushed. If there are no pending requests when the flush method
-   *   is called an exception is thrown (as this typically a sign of programming error).
-   */
-  $httpBackend.flush = function(count, digest) {
-    if (digest !== false) $rootScope.$digest();
-    if (!responses.length) throw new Error('No pending request to flush !');
-
-    if (angular.isDefined(count) && count !== null) {
-      while (count--) {
-        if (!responses.length) throw new Error('No more pending request to flush !');
-        responses.shift()();
-      }
-    } else {
-      while (responses.length) {
-        responses.shift()();
-      }
-    }
-    $httpBackend.verifyNoOutstandingExpectation(digest);
-  };
-
-
-  /**
-   * @ngdoc method
-   * @name $httpBackend#verifyNoOutstandingExpectation
-   * @description
-   * Verifies that all of the requests defined via the `expect` api were made. If any of the
-   * requests were not made, verifyNoOutstandingExpectation throws an exception.
-   *
-   * Typically, you would call this method following each test case that asserts requests using an
-   * "afterEach" clause.
-   *
-   * ```js
-   *   afterEach($httpBackend.verifyNoOutstandingExpectation);
-   * ```
-   */
-  $httpBackend.verifyNoOutstandingExpectation = function(digest) {
-    if (digest !== false) $rootScope.$digest();
-    if (expectations.length) {
-      throw new Error('Unsatisfied requests: ' + expectations.join(', '));
-    }
-  };
-
-
-  /**
-   * @ngdoc method
-   * @name $httpBackend#verifyNoOutstandingRequest
-   * @description
-   * Verifies that there are no outstanding requests that need to be flushed.
-   *
-   * Typically, you would call this method following each test case that asserts requests using an
-   * "afterEach" clause.
-   *
-   * ```js
-   *   afterEach($httpBackend.verifyNoOutstandingRequest);
-   * ```
-   */
-  $httpBackend.verifyNoOutstandingRequest = function() {
-    if (responses.length) {
-      throw new Error('Unflushed requests: ' + responses.length);
-    }
-  };
-
-
-  /**
-   * @ngdoc method
-   * @name $httpBackend#resetExpectations
-   * @description
-   * Resets all request expectations, but preserves all backend definitions. Typically, you would
-   * call resetExpectations during a multiple-phase test when you want to reuse the same instance of
-   * $httpBackend mock.
-   */
-  $httpBackend.resetExpectations = function() {
-    expectations.length = 0;
-    responses.length = 0;
-  };
-
-  return $httpBackend;
-
-
-  function createShortMethods(prefix) {
-    angular.forEach(['GET', 'DELETE', 'JSONP', 'HEAD'], function(method) {
-     $httpBackend[prefix + method] = function(url, headers, keys) {
-       return $httpBackend[prefix](method, url, undefined, headers, keys);
-     };
-    });
-
-    angular.forEach(['PUT', 'POST', 'PATCH'], function(method) {
-      $httpBackend[prefix + method] = function(url, data, headers, keys) {
-        return $httpBackend[prefix](method, url, data, headers, keys);
-      };
-    });
-  }
-}
-
-function MockHttpExpectation(method, url, data, headers, keys) {
-
-  this.data = data;
-  this.headers = headers;
-
-  this.match = function(m, u, d, h) {
-    if (method != m) return false;
-    if (!this.matchUrl(u)) return false;
-    if (angular.isDefined(d) && !this.matchData(d)) return false;
-    if (angular.isDefined(h) && !this.matchHeaders(h)) return false;
-    return true;
-  };
-
-  this.matchUrl = function(u) {
-    if (!url) return true;
-    if (angular.isFunction(url.test)) return url.test(u);
-    if (angular.isFunction(url)) return url(u);
-    return url == u;
-  };
-
-  this.matchHeaders = function(h) {
-    if (angular.isUndefined(headers)) return true;
-    if (angular.isFunction(headers)) return headers(h);
-    return angular.equals(headers, h);
-  };
-
-  this.matchData = function(d) {
-    if (angular.isUndefined(data)) return true;
-    if (data && angular.isFunction(data.test)) return data.test(d);
-    if (data && angular.isFunction(data)) return data(d);
-    if (data && !angular.isString(data)) {
-      return angular.equals(angular.fromJson(angular.toJson(data)), angular.fromJson(d));
-    }
-    return data == d;
-  };
-
-  this.toString = function() {
-    return method + ' ' + url;
-  };
-
-  this.params = function(u) {
-    return angular.extend(parseQuery(), pathParams());
-
-    function pathParams() {
-      var keyObj = {};
-      if (!url || !angular.isFunction(url.test) || !keys || keys.length === 0) return keyObj;
-
-      var m = url.exec(u);
-      if (!m) return keyObj;
-      for (var i = 1, len = m.length; i < len; ++i) {
-        var key = keys[i - 1];
-        var val = m[i];
-        if (key && val) {
-          keyObj[key.name || key] = val;
-        }
-      }
-
-      return keyObj;
-    }
-
-    function parseQuery() {
-      var obj = {}, key_value, key,
-          queryStr = u.indexOf('?') > -1
-          ? u.substring(u.indexOf('?') + 1)
-          : "";
-
-      angular.forEach(queryStr.split('&'), function(keyValue) {
-        if (keyValue) {
-          key_value = keyValue.replace(/\+/g,'%20').split('=');
-          key = tryDecodeURIComponent(key_value[0]);
-          if (angular.isDefined(key)) {
-            var val = angular.isDefined(key_value[1]) ? tryDecodeURIComponent(key_value[1]) : true;
-            if (!hasOwnProperty.call(obj, key)) {
-              obj[key] = val;
-            } else if (angular.isArray(obj[key])) {
-              obj[key].push(val);
-            } else {
-              obj[key] = [obj[key],val];
-            }
-          }
-        }
-      });
-      return obj;
-    }
-    function tryDecodeURIComponent(value) {
-      try {
-        return decodeURIComponent(value);
-      } catch (e) {
-        // Ignore any invalid uri component
-      }
-    }
-  };
-}
-
-function createMockXhr() {
-  return new MockXhr();
-}
-
-function MockXhr() {
-
-  // hack for testing $http, $httpBackend
-  MockXhr.$$lastInstance = this;
-
-  this.open = function(method, url, async) {
-    this.$$method = method;
-    this.$$url = url;
-    this.$$async = async;
-    this.$$reqHeaders = {};
-    this.$$respHeaders = {};
-  };
-
-  this.send = function(data) {
-    this.$$data = data;
-  };
-
-  this.setRequestHeader = function(key, value) {
-    this.$$reqHeaders[key] = value;
-  };
-
-  this.getResponseHeader = function(name) {
-    // the lookup must be case insensitive,
-    // that's why we try two quick lookups first and full scan last
-    var header = this.$$respHeaders[name];
-    if (header) return header;
-
-    name = angular.lowercase(name);
-    header = this.$$respHeaders[name];
-    if (header) return header;
-
-    header = undefined;
-    angular.forEach(this.$$respHeaders, function(headerVal, headerName) {
-      if (!header && angular.lowercase(headerName) == name) header = headerVal;
-    });
-    return header;
-  };
-
-  this.getAllResponseHeaders = function() {
-    var lines = [];
-
-    angular.forEach(this.$$respHeaders, function(value, key) {
-      lines.push(key + ': ' + value);
-    });
-    return lines.join('\n');
-  };
-
-  this.abort = angular.noop;
-}
-
-
-/**
- * @ngdoc service
- * @name $timeout
- * @description
- *
- * This service is just a simple decorator for {@link ng.$timeout $timeout} service
- * that adds a "flush" and "verifyNoPendingTasks" methods.
- */
-
-angular.mock.$TimeoutDecorator = ['$delegate', '$browser', function($delegate, $browser) {
-
-  /**
-   * @ngdoc method
-   * @name $timeout#flush
-   * @description
-   *
-   * Flushes the queue of pending tasks.
-   *
-   * @param {number=} delay maximum timeout amount to flush up until
-   */
-  $delegate.flush = function(delay) {
-    $browser.defer.flush(delay);
-  };
-
-  /**
-   * @ngdoc method
-   * @name $timeout#verifyNoPendingTasks
-   * @description
-   *
-   * Verifies that there are no pending tasks that need to be flushed.
-   */
-  $delegate.verifyNoPendingTasks = function() {
-    if ($browser.deferredFns.length) {
-      throw new Error('Deferred tasks to flush (' + $browser.deferredFns.length + '): ' +
-          formatPendingTasksAsString($browser.deferredFns));
-    }
-  };
-
-  function formatPendingTasksAsString(tasks) {
-    var result = [];
-    angular.forEach(tasks, function(task) {
-      result.push('{id: ' + task.id + ', ' + 'time: ' + task.time + '}');
-    });
-
-    return result.join(', ');
-  }
-
-  return $delegate;
-}];
-
-angular.mock.$RAFDecorator = ['$delegate', function($delegate) {
-  var rafFn = function(fn) {
-    var index = rafFn.queue.length;
-    rafFn.queue.push(fn);
-    return function() {
-      rafFn.queue.splice(index, 1);
-    };
-  };
-
-  rafFn.queue = [];
-  rafFn.supported = $delegate.supported;
-
-  rafFn.flush = function() {
-    if (rafFn.queue.length === 0) {
-      throw new Error('No rAF callbacks present');
-    }
-
-    var length = rafFn.queue.length;
-    for (var i = 0; i < length; i++) {
-      rafFn.queue[i]();
-    }
-
-    rafFn.queue = rafFn.queue.slice(i);
-  };
-
-  return rafFn;
-}];
-
-/**
- *
- */
-angular.mock.$RootElementProvider = function() {
-  this.$get = function() {
-    return angular.element('
    ');
-  };
-};
-
-/**
- * @ngdoc service
- * @name $controller
- * @description
- * A decorator for {@link ng.$controller} with additional `bindings` parameter, useful when testing
- * controllers of directives that use {@link $compile#-bindtocontroller- `bindToController`}.
- *
- *
- * ## Example
- *
- * ```js
- *
- * // Directive definition ...
- *
- * myMod.directive('myDirective', {
- *   controller: 'MyDirectiveController',
- *   bindToController: {
- *     name: '@'
- *   }
- * });
- *
- *
- * // Controller definition ...
- *
- * myMod.controller('MyDirectiveController', ['$log', function($log) {
- *   $log.info(this.name);
- * })];
- *
- *
- * // In a test ...
- *
- * describe('myDirectiveController', function() {
- *   it('should write the bound name to the log', inject(function($controller, $log) {
- *     var ctrl = $controller('MyDirectiveController', { /* no locals */ }, { name: 'Clark Kent' });
- *     expect(ctrl.name).toEqual('Clark Kent');
- *     expect($log.info.logs).toEqual(['Clark Kent']);
- *   });
- * });
- *
- * ```
- *
- * @param {Function|string} constructor If called with a function then it's considered to be the
- *    controller constructor function. Otherwise it's considered to be a string which is used
- *    to retrieve the controller constructor using the following steps:
- *
- *    * check if a controller with given name is registered via `$controllerProvider`
- *    * check if evaluating the string on the current scope returns a constructor
- *    * if $controllerProvider#allowGlobals, check `window[constructor]` on the global
- *      `window` object (not recommended)
- *
- *    The string can use the `controller as property` syntax, where the controller instance is published
- *    as the specified property on the `scope`; the `scope` must be injected into `locals` param for this
- *    to work correctly.
- *
- * @param {Object} locals Injection locals for Controller.
- * @param {Object=} bindings Properties to add to the controller before invoking the constructor. This is used
- *                           to simulate the `bindToController` feature and simplify certain kinds of tests.
- * @return {Object} Instance of given controller.
- */
-angular.mock.$ControllerDecorator = ['$delegate', function($delegate) {
-  return function(expression, locals, later, ident) {
-    if (later && typeof later === 'object') {
-      var create = $delegate(expression, locals, true, ident);
-      angular.extend(create.instance, later);
-      return create();
-    }
-    return $delegate(expression, locals, later, ident);
-  };
-}];
-
-/**
- * @ngdoc service
- * @name $componentController
- * @description
- * A service that can be used to create instances of component controllers.
- * 
    
- * Be aware that the controller will be instantiated and attached to the scope as specified in
- * the component definition object. That means that you must always provide a `$scope` object
- * in the `locals` param.
- * 
    
- * @param {string} componentName the name of the component whose controller we want to instantiate
- * @param {Object} locals Injection locals for Controller.
- * @param {Object=} bindings Properties to add to the controller before invoking the constructor. This is used
- *                           to simulate the `bindToController` feature and simplify certain kinds of tests.
- * @param {string=} ident Override the property name to use when attaching the controller to the scope.
- * @return {Object} Instance of requested controller.
- */
-angular.mock.$ComponentControllerProvider = ['$compileProvider', function($compileProvider) {
-  return {
-    $get: ['$controller','$injector', function($controller,$injector) {
-      return function $componentController(componentName, locals, bindings, ident) {
-        // get all directives associated to the component name
-        var directives = $injector.get(componentName + 'Directive');
-        // look for those directives that are components
-        var candidateDirectives = directives.filter(function(directiveInfo) {
-          // components have controller, controllerAs and restrict:'E'
-          return directiveInfo.controller && directiveInfo.controllerAs && directiveInfo.restrict === 'E';
-        });
-        // check if valid directives found
-        if (candidateDirectives.length === 0) {
-          throw new Error('No component found');
-        }
-        if (candidateDirectives.length > 1) {
-          throw new Error('Too many components found');
-        }
-        // get the info of the component
-        var directiveInfo = candidateDirectives[0];
-        return $controller(directiveInfo.controller, locals, bindings, ident || directiveInfo.controllerAs);
-      };
-    }]
-  };
-}];
-
-
-/**
- * @ngdoc module
- * @name ngMock
- * @packageName angular-mocks
- * @description
- *
- * # ngMock
- *
- * The `ngMock` module provides support to inject and mock Angular services into unit tests.
- * In addition, ngMock also extends various core ng services such that they can be
- * inspected and controlled in a synchronous manner within test code.
- *
- *
- * 
    
- *
- */
-angular.module('ngMock', ['ng']).provider({
-  $browser: angular.mock.$BrowserProvider,
-  $exceptionHandler: angular.mock.$ExceptionHandlerProvider,
-  $log: angular.mock.$LogProvider,
-  $interval: angular.mock.$IntervalProvider,
-  $httpBackend: angular.mock.$HttpBackendProvider,
-  $rootElement: angular.mock.$RootElementProvider,
-  $componentController: angular.mock.$ComponentControllerProvider
-}).config(['$provide', function($provide) {
-  $provide.decorator('$timeout', angular.mock.$TimeoutDecorator);
-  $provide.decorator('$$rAF', angular.mock.$RAFDecorator);
-  $provide.decorator('$rootScope', angular.mock.$RootScopeDecorator);
-  $provide.decorator('$controller', angular.mock.$ControllerDecorator);
-}]);
-
-/**
- * @ngdoc module
- * @name ngMockE2E
- * @module ngMockE2E
- * @packageName angular-mocks
- * @description
- *
- * The `ngMockE2E` is an angular module which contains mocks suitable for end-to-end testing.
- * Currently there is only one mock present in this module -
- * the {@link ngMockE2E.$httpBackend e2e $httpBackend} mock.
- */
-angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) {
-  $provide.decorator('$httpBackend', angular.mock.e2e.$httpBackendDecorator);
-}]);
-
-/**
- * @ngdoc service
- * @name $httpBackend
- * @module ngMockE2E
- * @description
- * Fake HTTP backend implementation suitable for end-to-end testing or backend-less development of
- * applications that use the {@link ng.$http $http service}.
- *
- * *Note*: For fake http backend implementation suitable for unit testing please see
- * {@link ngMock.$httpBackend unit-testing $httpBackend mock}.
- *
- * This implementation can be used to respond with static or dynamic responses via the `when` api
- * and its shortcuts (`whenGET`, `whenPOST`, etc) and optionally pass through requests to the
- * real $httpBackend for specific requests (e.g. to interact with certain remote apis or to fetch
- * templates from a webserver).
- *
- * As opposed to unit-testing, in an end-to-end testing scenario or in scenario when an application
- * is being developed with the real backend api replaced with a mock, it is often desirable for
- * certain category of requests to bypass the mock and issue a real http request (e.g. to fetch
- * templates or static files from the webserver). To configure the backend with this behavior
- * use the `passThrough` request handler of `when` instead of `respond`.
- *
- * Additionally, we don't want to manually have to flush mocked out requests like we do during unit
- * testing. For this reason the e2e $httpBackend flushes mocked out requests
- * automatically, closely simulating the behavior of the XMLHttpRequest object.
- *
- * To setup the application to run with this http backend, you have to create a module that depends
- * on the `ngMockE2E` and your application modules and defines the fake backend:
- *
- * ```js
- *   myAppDev = angular.module('myAppDev', ['myApp', 'ngMockE2E']);
- *   myAppDev.run(function($httpBackend) {
- *     phones = [{name: 'phone1'}, {name: 'phone2'}];
- *
- *     // returns the current list of phones
- *     $httpBackend.whenGET('/phones').respond(phones);
- *
- *     // adds a new phone to the phones array
- *     $httpBackend.whenPOST('/phones').respond(function(method, url, data) {
- *       var phone = angular.fromJson(data);
- *       phones.push(phone);
- *       return [200, phone, {}];
- *     });
- *     $httpBackend.whenGET(/^\/templates\//).passThrough();
- *     //...
- *   });
- * ```
- *
- * Afterwards, bootstrap your app with this new module.
- */
-
-/**
- * @ngdoc method
- * @name $httpBackend#when
- * @module ngMockE2E
- * @description
- * Creates a new backend definition.
- *
- * @param {string} method HTTP method.
- * @param {string|RegExp|function(string)} url HTTP url or function that receives a url
- *   and returns true if the url matches the current definition.
- * @param {(string|RegExp)=} data HTTP request body.
- * @param {(Object|function(Object))=} headers HTTP headers or function that receives http header
- *   object and returns true if the headers match the current definition.
- * @param {(Array)=} keys Array of keys to assign to regex matches in request url described on
- *   {@link ngMock.$httpBackend $httpBackend mock}.
- * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
- *   control how a matched request is handled. You can save this object for later use and invoke
- *   `respond` or `passThrough` again in order to change how a matched request is handled.
- *
- *  - respond –
- *    `{function([status,] data[, headers, statusText])
- *    | function(function(method, url, data, headers, params)}`
- *    – The respond method takes a set of static data to be returned or a function that can return
- *    an array containing response status (number), response data (string), response headers
- *    (Object), and the text for the status (string).
- *  - passThrough – `{function()}` – Any request matching a backend definition with
- *    `passThrough` handler will be passed through to the real backend (an XHR request will be made
- *    to the server.)
- *  - Both methods return the `requestHandler` object for possible overrides.
- */
-
-/**
- * @ngdoc method
- * @name $httpBackend#whenGET
- * @module ngMockE2E
- * @description
- * Creates a new backend definition for GET requests. For more info see `when()`.
- *
- * @param {string|RegExp|function(string)} url HTTP url or function that receives a url
- *   and returns true if the url matches the current definition.
- * @param {(Object|function(Object))=} headers HTTP headers.
- * @param {(Array)=} keys Array of keys to assign to regex matches in request url described on
- *   {@link ngMock.$httpBackend $httpBackend mock}.
- * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
- *   control how a matched request is handled. You can save this object for later use and invoke
- *   `respond` or `passThrough` again in order to change how a matched request is handled.
- */
-
-/**
- * @ngdoc method
- * @name $httpBackend#whenHEAD
- * @module ngMockE2E
- * @description
- * Creates a new backend definition for HEAD requests. For more info see `when()`.
- *
- * @param {string|RegExp|function(string)} url HTTP url or function that receives a url
- *   and returns true if the url matches the current definition.
- * @param {(Object|function(Object))=} headers HTTP headers.
- * @param {(Array)=} keys Array of keys to assign to regex matches in request url described on
- *   {@link ngMock.$httpBackend $httpBackend mock}.
- * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
- *   control how a matched request is handled. You can save this object for later use and invoke
- *   `respond` or `passThrough` again in order to change how a matched request is handled.
- */
-
-/**
- * @ngdoc method
- * @name $httpBackend#whenDELETE
- * @module ngMockE2E
- * @description
- * Creates a new backend definition for DELETE requests. For more info see `when()`.
- *
- * @param {string|RegExp|function(string)} url HTTP url or function that receives a url
- *   and returns true if the url matches the current definition.
- * @param {(Object|function(Object))=} headers HTTP headers.
- * @param {(Array)=} keys Array of keys to assign to regex matches in request url described on
- *   {@link ngMock.$httpBackend $httpBackend mock}.
- * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
- *   control how a matched request is handled. You can save this object for later use and invoke
- *   `respond` or `passThrough` again in order to change how a matched request is handled.
- */
-
-/**
- * @ngdoc method
- * @name $httpBackend#whenPOST
- * @module ngMockE2E
- * @description
- * Creates a new backend definition for POST requests. For more info see `when()`.
- *
- * @param {string|RegExp|function(string)} url HTTP url or function that receives a url
- *   and returns true if the url matches the current definition.
- * @param {(string|RegExp)=} data HTTP request body.
- * @param {(Object|function(Object))=} headers HTTP headers.
- * @param {(Array)=} keys Array of keys to assign to regex matches in request url described on
- *   {@link ngMock.$httpBackend $httpBackend mock}.
- * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
- *   control how a matched request is handled. You can save this object for later use and invoke
- *   `respond` or `passThrough` again in order to change how a matched request is handled.
- */
-
-/**
- * @ngdoc method
- * @name $httpBackend#whenPUT
- * @module ngMockE2E
- * @description
- * Creates a new backend definition for PUT requests.  For more info see `when()`.
- *
- * @param {string|RegExp|function(string)} url HTTP url or function that receives a url
- *   and returns true if the url matches the current definition.
- * @param {(string|RegExp)=} data HTTP request body.
- * @param {(Object|function(Object))=} headers HTTP headers.
- * @param {(Array)=} keys Array of keys to assign to regex matches in request url described on
- *   {@link ngMock.$httpBackend $httpBackend mock}.
- * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
- *   control how a matched request is handled. You can save this object for later use and invoke
- *   `respond` or `passThrough` again in order to change how a matched request is handled.
- */
-
-/**
- * @ngdoc method
- * @name $httpBackend#whenPATCH
- * @module ngMockE2E
- * @description
- * Creates a new backend definition for PATCH requests.  For more info see `when()`.
- *
- * @param {string|RegExp|function(string)} url HTTP url or function that receives a url
- *   and returns true if the url matches the current definition.
- * @param {(string|RegExp)=} data HTTP request body.
- * @param {(Object|function(Object))=} headers HTTP headers.
- * @param {(Array)=} keys Array of keys to assign to regex matches in request url described on
- *   {@link ngMock.$httpBackend $httpBackend mock}.
- * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
- *   control how a matched request is handled. You can save this object for later use and invoke
- *   `respond` or `passThrough` again in order to change how a matched request is handled.
- */
-
-/**
- * @ngdoc method
- * @name $httpBackend#whenJSONP
- * @module ngMockE2E
- * @description
- * Creates a new backend definition for JSONP requests. For more info see `when()`.
- *
- * @param {string|RegExp|function(string)} url HTTP url or function that receives a url
- *   and returns true if the url matches the current definition.
- * @param {(Array)=} keys Array of keys to assign to regex matches in request url described on
- *   {@link ngMock.$httpBackend $httpBackend mock}.
- * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
- *   control how a matched request is handled. You can save this object for later use and invoke
- *   `respond` or `passThrough` again in order to change how a matched request is handled.
- */
-/**
- * @ngdoc method
- * @name $httpBackend#whenRoute
- * @module ngMockE2E
- * @description
- * Creates a new backend definition that compares only with the requested route.
- *
- * @param {string} method HTTP method.
- * @param {string} url HTTP url string that supports colon param matching.
- * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
- *   control how a matched request is handled. You can save this object for later use and invoke
- *   `respond` or `passThrough` again in order to change how a matched request is handled.
- */
-angular.mock.e2e = {};
-angular.mock.e2e.$httpBackendDecorator =
-  ['$rootScope', '$timeout', '$delegate', '$browser', createHttpBackendMock];
-
-
-/**
- * @ngdoc type
- * @name $rootScope.Scope
- * @module ngMock
- * @description
- * {@link ng.$rootScope.Scope Scope} type decorated with helper methods useful for testing. These
- * methods are automatically available on any {@link ng.$rootScope.Scope Scope} instance when
- * `ngMock` module is loaded.
- *
- * In addition to all the regular `Scope` methods, the following helper methods are available:
- */
-angular.mock.$RootScopeDecorator = ['$delegate', function($delegate) {
-
-  var $rootScopePrototype = Object.getPrototypeOf($delegate);
-
-  $rootScopePrototype.$countChildScopes = countChildScopes;
-  $rootScopePrototype.$countWatchers = countWatchers;
-
-  return $delegate;
-
-  // ------------------------------------------------------------------------------------------ //
-
-  /**
-   * @ngdoc method
-   * @name $rootScope.Scope#$countChildScopes
-   * @module ngMock
-   * @description
-   * Counts all the direct and indirect child scopes of the current scope.
-   *
-   * The current scope is excluded from the count. The count includes all isolate child scopes.
-   *
-   * @returns {number} Total number of child scopes.
-   */
-  function countChildScopes() {
-    // jshint validthis: true
-    var count = 0; // exclude the current scope
-    var pendingChildHeads = [this.$$childHead];
-    var currentScope;
-
-    while (pendingChildHeads.length) {
-      currentScope = pendingChildHeads.shift();
-
-      while (currentScope) {
-        count += 1;
-        pendingChildHeads.push(currentScope.$$childHead);
-        currentScope = currentScope.$$nextSibling;
-      }
-    }
-
-    return count;
-  }
-
-
-  /**
-   * @ngdoc method
-   * @name $rootScope.Scope#$countWatchers
-   * @module ngMock
-   * @description
-   * Counts all the watchers of direct and indirect child scopes of the current scope.
-   *
-   * The watchers of the current scope are included in the count and so are all the watchers of
-   * isolate child scopes.
-   *
-   * @returns {number} Total number of watchers.
-   */
-  function countWatchers() {
-    // jshint validthis: true
-    var count = this.$$watchers ? this.$$watchers.length : 0; // include the current scope
-    var pendingChildHeads = [this.$$childHead];
-    var currentScope;
-
-    while (pendingChildHeads.length) {
-      currentScope = pendingChildHeads.shift();
-
-      while (currentScope) {
-        count += currentScope.$$watchers ? currentScope.$$watchers.length : 0;
-        pendingChildHeads.push(currentScope.$$childHead);
-        currentScope = currentScope.$$nextSibling;
-      }
-    }
-
-    return count;
-  }
-}];
-
-
-if (window.jasmine || window.mocha) {
-
-  var currentSpec = null,
-      annotatedFunctions = [],
-      isSpecRunning = function() {
-        return !!currentSpec;
-      };
-
-  angular.mock.$$annotate = angular.injector.$$annotate;
-  angular.injector.$$annotate = function(fn) {
-    if (typeof fn === 'function' && !fn.$inject) {
-      annotatedFunctions.push(fn);
-    }
-    return angular.mock.$$annotate.apply(this, arguments);
-  };
-
-
-  (window.beforeEach || window.setup)(function() {
-    annotatedFunctions = [];
-    currentSpec = this;
-  });
-
-  (window.afterEach || window.teardown)(function() {
-    var injector = currentSpec.$injector;
-
-    annotatedFunctions.forEach(function(fn) {
-      delete fn.$inject;
-    });
-
-    angular.forEach(currentSpec.$modules, function(module) {
-      if (module && module.$$hashKey) {
-        module.$$hashKey = undefined;
-      }
-    });
-
-    currentSpec.$injector = null;
-    currentSpec.$modules = null;
-    currentSpec.$providerInjector = null;
-    currentSpec = null;
-
-    if (injector) {
-      injector.get('$rootElement').off();
-      injector.get('$rootScope').$destroy();
-    }
-
-    // clean up jquery's fragment cache
-    angular.forEach(angular.element.fragments, function(val, key) {
-      delete angular.element.fragments[key];
-    });
-
-    MockXhr.$$lastInstance = null;
-
-    angular.forEach(angular.callbacks, function(val, key) {
-      delete angular.callbacks[key];
-    });
-    angular.callbacks.counter = 0;
-  });
-
-  /**
-   * @ngdoc function
-   * @name angular.mock.module
-   * @description
-   *
-   * *NOTE*: This function is also published on window for easy access.
    
-   * *NOTE*: This function is declared ONLY WHEN running tests with jasmine or mocha
-   *
-   * This function registers a module configuration code. It collects the configuration information
-   * which will be used when the injector is created by {@link angular.mock.inject inject}.
-   *
-   * See {@link angular.mock.inject inject} for usage example
-   *
-   * @param {...(string|Function|Object)} fns any number of modules which are represented as string
-   *        aliases or as anonymous module initialization functions. The modules are used to
-   *        configure the injector. The 'ng' and 'ngMock' modules are automatically loaded. If an
-   *        object literal is passed each key-value pair will be registered on the module via
-   *        {@link auto.$provide $provide}.value, the key being the string name (or token) to associate
-   *        with the value on the injector.
-   */
-  window.module = angular.mock.module = function() {
-    var moduleFns = Array.prototype.slice.call(arguments, 0);
-    return isSpecRunning() ? workFn() : workFn;
-    /////////////////////
-    function workFn() {
-      if (currentSpec.$injector) {
-        throw new Error('Injector already created, can not register a module!');
-      } else {
-        var fn, modules = currentSpec.$modules || (currentSpec.$modules = []);
-        angular.forEach(moduleFns, function(module) {
-          if (angular.isObject(module) && !angular.isArray(module)) {
-            fn = function($provide) {
-              angular.forEach(module, function(value, key) {
-                $provide.value(key, value);
-              });
-            };
-          } else {
-            fn = module;
-          }
-          if (currentSpec.$providerInjector) {
-            currentSpec.$providerInjector.invoke(fn);
-          } else {
-            modules.push(fn);
-          }
-        });
-      }
-    }
-  };
-
-  /**
-   * @ngdoc function
-   * @name angular.mock.inject
-   * @description
-   *
-   * *NOTE*: This function is also published on window for easy access.
    
-   * *NOTE*: This function is declared ONLY WHEN running tests with jasmine or mocha
-   *
-   * The inject function wraps a function into an injectable function. The inject() creates new
-   * instance of {@link auto.$injector $injector} per test, which is then used for
-   * resolving references.
-   *
-   *
-   * ## Resolving References (Underscore Wrapping)
-   * Often, we would like to inject a reference once, in a `beforeEach()` block and reuse this
-   * in multiple `it()` clauses. To be able to do this we must assign the reference to a variable
-   * that is declared in the scope of the `describe()` block. Since we would, most likely, want
-   * the variable to have the same name of the reference we have a problem, since the parameter
-   * to the `inject()` function would hide the outer variable.
-   *
-   * To help with this, the injected parameters can, optionally, be enclosed with underscores.
-   * These are ignored by the injector when the reference name is resolved.
-   *
-   * For example, the parameter `_myService_` would be resolved as the reference `myService`.
-   * Since it is available in the function body as _myService_, we can then assign it to a variable
-   * defined in an outer scope.
-   *
-   * ```
-   * // Defined out reference variable outside
-   * var myService;
-   *
-   * // Wrap the parameter in underscores
-   * beforeEach( inject( function(_myService_){
-   *   myService = _myService_;
-   * }));
-   *
-   * // Use myService in a series of tests.
-   * it('makes use of myService', function() {
-   *   myService.doStuff();
-   * });
-   *
-   * ```
-   *
-   * See also {@link angular.mock.module angular.mock.module}
-   *
-   * ## Example
-   * Example of what a typical jasmine tests looks like with the inject method.
-   * ```js
-   *
-   *   angular.module('myApplicationModule', [])
-   *       .value('mode', 'app')
-   *       .value('version', 'v1.0.1');
-   *
-   *
-   *   describe('MyApp', function() {
-   *
-   *     // You need to load modules that you want to test,
-   *     // it loads only the "ng" module by default.
-   *     beforeEach(module('myApplicationModule'));
-   *
-   *
-   *     // inject() is used to inject arguments of all given functions
-   *     it('should provide a version', inject(function(mode, version) {
-   *       expect(version).toEqual('v1.0.1');
-   *       expect(mode).toEqual('app');
-   *     }));
-   *
-   *
-   *     // The inject and module method can also be used inside of the it or beforeEach
-   *     it('should override a version and test the new version is injected', function() {
-   *       // module() takes functions or strings (module aliases)
-   *       module(function($provide) {
-   *         $provide.value('version', 'overridden'); // override version here
-   *       });
-   *
-   *       inject(function(version) {
-   *         expect(version).toEqual('overridden');
-   *       });
-   *     });
-   *   });
-   *
-   * ```
-   *
-   * @param {...Function} fns any number of functions which will be injected using the injector.
-   */
-
-
-
-  var ErrorAddingDeclarationLocationStack = function(e, errorForStack) {
-    this.message = e.message;
-    this.name = e.name;
-    if (e.line) this.line = e.line;
-    if (e.sourceId) this.sourceId = e.sourceId;
-    if (e.stack && errorForStack)
-      this.stack = e.stack + '\n' + errorForStack.stack;
-    if (e.stackArray) this.stackArray = e.stackArray;
-  };
-  ErrorAddingDeclarationLocationStack.prototype.toString = Error.prototype.toString;
-
-  window.inject = angular.mock.inject = function() {
-    var blockFns = Array.prototype.slice.call(arguments, 0);
-    var errorForStack = new Error('Declaration Location');
-    return isSpecRunning() ? workFn.call(currentSpec) : workFn;
-    /////////////////////
-    function workFn() {
-      var modules = currentSpec.$modules || [];
-      var strictDi = !!currentSpec.$injectorStrict;
-      modules.unshift(function($injector) {
-        currentSpec.$providerInjector = $injector;
-      });
-      modules.unshift('ngMock');
-      modules.unshift('ng');
-      var injector = currentSpec.$injector;
-      if (!injector) {
-        if (strictDi) {
-          // If strictDi is enabled, annotate the providerInjector blocks
-          angular.forEach(modules, function(moduleFn) {
-            if (typeof moduleFn === "function") {
-              angular.injector.$$annotate(moduleFn);
-            }
-          });
-        }
-        injector = currentSpec.$injector = angular.injector(modules, strictDi);
-        currentSpec.$injectorStrict = strictDi;
-      }
-      for (var i = 0, ii = blockFns.length; i < ii; i++) {
-        if (currentSpec.$injectorStrict) {
-          // If the injector is strict / strictDi, and the spec wants to inject using automatic
-          // annotation, then annotate the function here.
-          injector.annotate(blockFns[i]);
-        }
-        try {
-          /* jshint -W040 *//* Jasmine explicitly provides a `this` object when calling functions */
-          injector.invoke(blockFns[i] || angular.noop, this);
-          /* jshint +W040 */
-        } catch (e) {
-          if (e.stack && errorForStack) {
-            throw new ErrorAddingDeclarationLocationStack(e, errorForStack);
-          }
-          throw e;
-        } finally {
-          errorForStack = null;
-        }
-      }
-    }
-  };
-
-
-  angular.mock.inject.strictDi = function(value) {
-    value = arguments.length ? !!value : true;
-    return isSpecRunning() ? workFn() : workFn;
-
-    function workFn() {
-      if (value !== currentSpec.$injectorStrict) {
-        if (currentSpec.$injector) {
-          throw new Error('Injector already created, can not modify strict annotations');
-        } else {
-          currentSpec.$injectorStrict = value;
-        }
-      }
-    }
-  };
-}
-
-
-})(window, window.angular);
diff --git a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-resource.js b/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-resource.js
deleted file mode 100644
index 444be83c4..000000000
--- a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-resource.js
+++ /dev/null
@@ -1,768 +0,0 @@
-/**
- * @license AngularJS v1.5.0
- * (c) 2010-2016 Google, Inc. http://angularjs.org
- * License: MIT
- */
-(function(window, angular, undefined) {'use strict';
-
-var $resourceMinErr = angular.$$minErr('$resource');
-
-// Helper functions and regex to lookup a dotted path on an object
-// stopping at undefined/null.  The path must be composed of ASCII
-// identifiers (just like $parse)
-var MEMBER_NAME_REGEX = /^(\.[a-zA-Z_$@][0-9a-zA-Z_$@]*)+$/;
-
-function isValidDottedPath(path) {
-  return (path != null && path !== '' && path !== 'hasOwnProperty' &&
-      MEMBER_NAME_REGEX.test('.' + path));
-}
-
-function lookupDottedPath(obj, path) {
-  if (!isValidDottedPath(path)) {
-    throw $resourceMinErr('badmember', 'Dotted member path "@{0}" is invalid.', path);
-  }
-  var keys = path.split('.');
-  for (var i = 0, ii = keys.length; i < ii && angular.isDefined(obj); i++) {
-    var key = keys[i];
-    obj = (obj !== null) ? obj[key] : undefined;
-  }
-  return obj;
-}
-
-/**
- * Create a shallow copy of an object and clear other fields from the destination
- */
-function shallowClearAndCopy(src, dst) {
-  dst = dst || {};
-
-  angular.forEach(dst, function(value, key) {
-    delete dst[key];
-  });
-
-  for (var key in src) {
-    if (src.hasOwnProperty(key) && !(key.charAt(0) === '$' && key.charAt(1) === '$')) {
-      dst[key] = src[key];
-    }
-  }
-
-  return dst;
-}
-
-/**
- * @ngdoc module
- * @name ngResource
- * @description
- *
- * # ngResource
- *
- * The `ngResource` module provides interaction support with RESTful services
- * via the $resource service.
- *
- *
- * 
    
- *
- * See {@link ngResource.$resource `$resource`} for usage.
- */
-
-/**
- * @ngdoc service
- * @name $resource
- * @requires $http
- * @requires ng.$log
- * @requires $q
- * @requires ng.$timeout
- *
- * @description
- * A factory which creates a resource object that lets you interact with
- * [RESTful](http://en.wikipedia.org/wiki/Representational_State_Transfer) server-side data sources.
- *
- * The returned resource object has action methods which provide high-level behaviors without
- * the need to interact with the low level {@link ng.$http $http} service.
- *
- * Requires the {@link ngResource `ngResource`} module to be installed.
- *
- * By default, trailing slashes will be stripped from the calculated URLs,
- * which can pose problems with server backends that do not expect that
- * behavior.  This can be disabled by configuring the `$resourceProvider` like
- * this:
- *
- * ```js
-     app.config(['$resourceProvider', function($resourceProvider) {
-       // Don't strip trailing slashes from calculated URLs
-       $resourceProvider.defaults.stripTrailingSlashes = false;
-     }]);
- * ```
- *
- * @param {string} url A parameterized URL template with parameters prefixed by `:` as in
- *   `/user/:username`. If you are using a URL with a port number (e.g.
- *   `http://example.com:8080/api`), it will be respected.
- *
- *   If you are using a url with a suffix, just add the suffix, like this:
- *   `$resource('http://example.com/resource.json')` or `$resource('http://example.com/:id.json')`
- *   or even `$resource('http://example.com/resource/:resource_id.:format')`
- *   If the parameter before the suffix is empty, :resource_id in this case, then the `/.` will be
- *   collapsed down to a single `.`.  If you need this sequence to appear and not collapse then you
- *   can escape it with `/\.`.
- *
- * @param {Object=} paramDefaults Default values for `url` parameters. These can be overridden in
- *   `actions` methods. If a parameter value is a function, it will be executed every time
- *   when a param value needs to be obtained for a request (unless the param was overridden).
- *
- *   Each key value in the parameter object is first bound to url template if present and then any
- *   excess keys are appended to the url search query after the `?`.
- *
- *   Given a template `/path/:verb` and parameter `{verb:'greet', salutation:'Hello'}` results in
- *   URL `/path/greet?salutation=Hello`.
- *
- *   If the parameter value is prefixed with `@` then the value for that parameter will be extracted
- *   from the corresponding property on the `data` object (provided when calling an action method).
- *   For example, if the `defaultParam` object is `{someParam: '@someProp'}` then the value of
- *   `someParam` will be `data.someProp`.
- *
- * @param {Object.=} actions Hash with declaration of custom actions that should extend
- *   the default set of resource actions. The declaration should be created in the format of {@link
- *   ng.$http#usage $http.config}:
- *
- *       {action1: {method:?, params:?, isArray:?, headers:?, ...},
- *        action2: {method:?, params:?, isArray:?, headers:?, ...},
- *        ...}
- *
- *   Where:
- *
- *   - **`action`** – {string} – The name of action. This name becomes the name of the method on
- *     your resource object.
- *   - **`method`** – {string} – Case insensitive HTTP method (e.g. `GET`, `POST`, `PUT`,
- *     `DELETE`, `JSONP`, etc).
- *   - **`params`** – {Object=} – Optional set of pre-bound parameters for this action. If any of
- *     the parameter value is a function, it will be executed every time when a param value needs to
- *     be obtained for a request (unless the param was overridden).
- *   - **`url`** – {string} – action specific `url` override. The url templating is supported just
- *     like for the resource-level urls.
- *   - **`isArray`** – {boolean=} – If true then the returned object for this action is an array,
- *     see `returns` section.
- *   - **`transformRequest`** –
- *     `{function(data, headersGetter)|Array.}` –
- *     transform function or an array of such functions. The transform function takes the http
- *     request body and headers and returns its transformed (typically serialized) version.
- *     By default, transformRequest will contain one function that checks if the request data is
- *     an object and serializes to using `angular.toJson`. To prevent this behavior, set
- *     `transformRequest` to an empty array: `transformRequest: []`
- *   - **`transformResponse`** –
- *     `{function(data, headersGetter)|Array.}` –
- *     transform function or an array of such functions. The transform function takes the http
- *     response body and headers and returns its transformed (typically deserialized) version.
- *     By default, transformResponse will contain one function that checks if the response looks
- *     like a JSON string and deserializes it using `angular.fromJson`. To prevent this behavior,
- *     set `transformResponse` to an empty array: `transformResponse: []`
- *   - **`cache`** – `{boolean|Cache}` – If true, a default $http cache will be used to cache the
- *     GET request, otherwise if a cache instance built with
- *     {@link ng.$cacheFactory $cacheFactory}, this cache will be used for
- *     caching.
- *   - **`timeout`** – `{number}` – timeout in milliseconds.
    
- *     **Note:** In contrast to {@link ng.$http#usage $http.config}, {@link ng.$q promises} are
- *     **not** supported in $resource, because the same value would be used for multiple requests.
- *     If you are looking for a way to cancel requests, you should use the `cancellable` option.
- *   - **`cancellable`** – `{boolean}` – if set to true, the request made by a "non-instance" call
- *     will be cancelled (if not already completed) by calling `$cancelRequest()` on the call's
- *     return value. Calling `$cancelRequest()` for a non-cancellable or an already
- *     completed/cancelled request will have no effect.
    
- *   - **`withCredentials`** - `{boolean}` - whether to set the `withCredentials` flag on the
- *     XHR object. See
- *     [requests with credentials](https://developer.mozilla.org/en/http_access_control#section_5)
- *     for more information.
- *   - **`responseType`** - `{string}` - see
- *     [requestType](https://developer.mozilla.org/en-US/docs/DOM/XMLHttpRequest#responseType).
- *   - **`interceptor`** - `{Object=}` - The interceptor object has two optional methods -
- *     `response` and `responseError`. Both `response` and `responseError` interceptors get called
- *     with `http response` object. See {@link ng.$http $http interceptors}.
- *
- * @param {Object} options Hash with custom settings that should extend the
- *   default `$resourceProvider` behavior.  The supported options are:
- *
- *   - **`stripTrailingSlashes`** – {boolean} – If true then the trailing
- *   slashes from any calculated URL will be stripped. (Defaults to true.)
- *   - **`cancellable`** – {boolean} – If true, the request made by a "non-instance" call will be
- *   cancelled (if not already completed) by calling `$cancelRequest()` on the call's return value.
- *   This can be overwritten per action. (Defaults to false.)
- *
- * @returns {Object} A resource "class" object with methods for the default set of resource actions
- *   optionally extended with custom `actions`. The default set contains these actions:
- *   ```js
- *   { 'get':    {method:'GET'},
- *     'save':   {method:'POST'},
- *     'query':  {method:'GET', isArray:true},
- *     'remove': {method:'DELETE'},
- *     'delete': {method:'DELETE'} };
- *   ```
- *
- *   Calling these methods invoke an {@link ng.$http} with the specified http method,
- *   destination and parameters. When the data is returned from the server then the object is an
- *   instance of the resource class. The actions `save`, `remove` and `delete` are available on it
- *   as  methods with the `$` prefix. This allows you to easily perform CRUD operations (create,
- *   read, update, delete) on server-side data like this:
- *   ```js
- *   var User = $resource('/user/:userId', {userId:'@id'});
- *   var user = User.get({userId:123}, function() {
- *     user.abc = true;
- *     user.$save();
- *   });
- *   ```
- *
- *   It is important to realize that invoking a $resource object method immediately returns an
- *   empty reference (object or array depending on `isArray`). Once the data is returned from the
- *   server the existing reference is populated with the actual data. This is a useful trick since
- *   usually the resource is assigned to a model which is then rendered by the view. Having an empty
- *   object results in no rendering, once the data arrives from the server then the object is
- *   populated with the data and the view automatically re-renders itself showing the new data. This
- *   means that in most cases one never has to write a callback function for the action methods.
- *
- *   The action methods on the class object or instance object can be invoked with the following
- *   parameters:
- *
- *   - HTTP GET "class" actions: `Resource.action([parameters], [success], [error])`
- *   - non-GET "class" actions: `Resource.action([parameters], postData, [success], [error])`
- *   - non-GET instance actions:  `instance.$action([parameters], [success], [error])`
- *
- *
- *   Success callback is called with (value, responseHeaders) arguments, where the value is
- *   the populated resource instance or collection object. The error callback is called
- *   with (httpResponse) argument.
- *
- *   Class actions return empty instance (with additional properties below).
- *   Instance actions return promise of the action.
- *
- *   The Resource instances and collections have these additional properties:
- *
- *   - `$promise`: the {@link ng.$q promise} of the original server interaction that created this
- *     instance or collection.
- *
- *     On success, the promise is resolved with the same resource instance or collection object,
- *     updated with data from server. This makes it easy to use in
- *     {@link ngRoute.$routeProvider resolve section of $routeProvider.when()} to defer view
- *     rendering until the resource(s) are loaded.
- *
- *     On failure, the promise is rejected with the {@link ng.$http http response} object, without
- *     the `resource` property.
- *
- *     If an interceptor object was provided, the promise will instead be resolved with the value
- *     returned by the interceptor.
- *
- *   - `$resolved`: `true` after first server interaction is completed (either with success or
- *      rejection), `false` before that. Knowing if the Resource has been resolved is useful in
- *      data-binding.
- *
- *   The Resource instances and collections have these additional methods:
- *
- *   - `$cancelRequest`: If there is a cancellable, pending request related to the instance or
- *      collection, calling this method will abort the request.
- *
- * @example
- *
- * # Credit card resource
- *
- * ```js
-     // Define CreditCard class
-     var CreditCard = $resource('/user/:userId/card/:cardId',
-      {userId:123, cardId:'@id'}, {
-       charge: {method:'POST', params:{charge:true}}
-      });
-
-     // We can retrieve a collection from the server
-     var cards = CreditCard.query(function() {
-       // GET: /user/123/card
-       // server returns: [ {id:456, number:'1234', name:'Smith'} ];
-
-       var card = cards[0];
-       // each item is an instance of CreditCard
-       expect(card instanceof CreditCard).toEqual(true);
-       card.name = "J. Smith";
-       // non GET methods are mapped onto the instances
-       card.$save();
-       // POST: /user/123/card/456 {id:456, number:'1234', name:'J. Smith'}
-       // server returns: {id:456, number:'1234', name: 'J. Smith'};
-
-       // our custom method is mapped as well.
-       card.$charge({amount:9.99});
-       // POST: /user/123/card/456?amount=9.99&charge=true {id:456, number:'1234', name:'J. Smith'}
-     });
-
-     // we can create an instance as well
-     var newCard = new CreditCard({number:'0123'});
-     newCard.name = "Mike Smith";
-     newCard.$save();
-     // POST: /user/123/card {number:'0123', name:'Mike Smith'}
-     // server returns: {id:789, number:'0123', name: 'Mike Smith'};
-     expect(newCard.id).toEqual(789);
- * ```
- *
- * The object returned from this function execution is a resource "class" which has "static" method
- * for each action in the definition.
- *
- * Calling these methods invoke `$http` on the `url` template with the given `method`, `params` and
- * `headers`.
- *
- * @example
- *
- * # User resource
- *
- * When the data is returned from the server then the object is an instance of the resource type and
- * all of the non-GET methods are available with `$` prefix. This allows you to easily support CRUD
- * operations (create, read, update, delete) on server-side data.
-
-   ```js
-     var User = $resource('/user/:userId', {userId:'@id'});
-     User.get({userId:123}, function(user) {
-       user.abc = true;
-       user.$save();
-     });
-   ```
- *
- * It's worth noting that the success callback for `get`, `query` and other methods gets passed
- * in the response that came from the server as well as $http header getter function, so one
- * could rewrite the above example and get access to http headers as:
- *
-   ```js
-     var User = $resource('/user/:userId', {userId:'@id'});
-     User.get({userId:123}, function(user, getResponseHeaders){
-       user.abc = true;
-       user.$save(function(user, putResponseHeaders) {
-         //user => saved user object
-         //putResponseHeaders => $http header getter
-       });
-     });
-   ```
- *
- * You can also access the raw `$http` promise via the `$promise` property on the object returned
- *
-   ```
-     var User = $resource('/user/:userId', {userId:'@id'});
-     User.get({userId:123})
-         .$promise.then(function(user) {
-           $scope.user = user;
-         });
-   ```
- *
- * @example
- *
- * # Creating a custom 'PUT' request
- *
- * In this example we create a custom method on our resource to make a PUT request
- * ```js
- *    var app = angular.module('app', ['ngResource', 'ngRoute']);
- *
- *    // Some APIs expect a PUT request in the format URL/object/ID
- *    // Here we are creating an 'update' method
- *    app.factory('Notes', ['$resource', function($resource) {
- *    return $resource('/notes/:id', null,
- *        {
- *            'update': { method:'PUT' }
- *        });
- *    }]);
- *
- *    // In our controller we get the ID from the URL using ngRoute and $routeParams
- *    // We pass in $routeParams and our Notes factory along with $scope
- *    app.controller('NotesCtrl', ['$scope', '$routeParams', 'Notes',
-                                      function($scope, $routeParams, Notes) {
- *    // First get a note object from the factory
- *    var note = Notes.get({ id:$routeParams.id });
- *    $id = note.id;
- *
- *    // Now call update passing in the ID first then the object you are updating
- *    Notes.update({ id:$id }, note);
- *
- *    // This will PUT /notes/ID with the note object in the request payload
- *    }]);
- * ```
- *
- * @example
- *
- * # Cancelling requests
- *
- * If an action's configuration specifies that it is cancellable, you can cancel the request related
- * to an instance or collection (as long as it is a result of a "non-instance" call):
- *
-   ```js
-     // ...defining the `Hotel` resource...
-     var Hotel = $resource('/api/hotel/:id', {id: '@id'}, {
-       // Let's make the `query()` method cancellable
-       query: {method: 'get', isArray: true, cancellable: true}
-     });
-
-     // ...somewhere in the PlanVacationController...
-     ...
-     this.onDestinationChanged = function onDestinationChanged(destination) {
-       // We don't care about any pending request for hotels
-       // in a different destination any more
-       this.availableHotels.$cancelRequest();
-
-       // Let's query for hotels in ''
-       // (calls: /api/hotel?location=)
-       this.availableHotels = Hotel.query({location: destination});
-     };
-   ```
- *
- */
-angular.module('ngResource', ['ng']).
-  provider('$resource', function() {
-    var PROTOCOL_AND_DOMAIN_REGEX = /^https?:\/\/[^\/]*/;
-    var provider = this;
-
-    this.defaults = {
-      // Strip slashes by default
-      stripTrailingSlashes: true,
-
-      // Default actions configuration
-      actions: {
-        'get': {method: 'GET'},
-        'save': {method: 'POST'},
-        'query': {method: 'GET', isArray: true},
-        'remove': {method: 'DELETE'},
-        'delete': {method: 'DELETE'}
-      }
-    };
-
-    this.$get = ['$http', '$log', '$q', '$timeout', function($http, $log, $q, $timeout) {
-
-      var noop = angular.noop,
-        forEach = angular.forEach,
-        extend = angular.extend,
-        copy = angular.copy,
-        isFunction = angular.isFunction;
-
-      /**
-       * We need our custom method because encodeURIComponent is too aggressive and doesn't follow
-       * http://www.ietf.org/rfc/rfc3986.txt with regards to the character set
-       * (pchar) allowed in path segments:
-       *    segment       = *pchar
-       *    pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
-       *    pct-encoded   = "%" HEXDIG HEXDIG
-       *    unreserved    = ALPHA / DIGIT / "-" / "." / "_" / "~"
-       *    sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
-       *                     / "*" / "+" / "," / ";" / "="
-       */
-      function encodeUriSegment(val) {
-        return encodeUriQuery(val, true).
-          replace(/%26/gi, '&').
-          replace(/%3D/gi, '=').
-          replace(/%2B/gi, '+');
-      }
-
-
-      /**
-       * This method is intended for encoding *key* or *value* parts of query component. We need a
-       * custom method because encodeURIComponent is too aggressive and encodes stuff that doesn't
-       * have to be encoded per http://tools.ietf.org/html/rfc3986:
-       *    query       = *( pchar / "/" / "?" )
-       *    pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
-       *    unreserved    = ALPHA / DIGIT / "-" / "." / "_" / "~"
-       *    pct-encoded   = "%" HEXDIG HEXDIG
-       *    sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
-       *                     / "*" / "+" / "," / ";" / "="
-       */
-      function encodeUriQuery(val, pctEncodeSpaces) {
-        return encodeURIComponent(val).
-          replace(/%40/gi, '@').
-          replace(/%3A/gi, ':').
-          replace(/%24/g, '$').
-          replace(/%2C/gi, ',').
-          replace(/%20/g, (pctEncodeSpaces ? '%20' : '+'));
-      }
-
-      function Route(template, defaults) {
-        this.template = template;
-        this.defaults = extend({}, provider.defaults, defaults);
-        this.urlParams = {};
-      }
-
-      Route.prototype = {
-        setUrlParams: function(config, params, actionUrl) {
-          var self = this,
-            url = actionUrl || self.template,
-            val,
-            encodedVal,
-            protocolAndDomain = '';
-
-          var urlParams = self.urlParams = {};
-          forEach(url.split(/\W/), function(param) {
-            if (param === 'hasOwnProperty') {
-              throw $resourceMinErr('badname', "hasOwnProperty is not a valid parameter name.");
-            }
-            if (!(new RegExp("^\\d+$").test(param)) && param &&
-              (new RegExp("(^|[^\\\\]):" + param + "(\\W|$)").test(url))) {
-              urlParams[param] = {
-                isQueryParamValue: (new RegExp("\\?.*=:" + param + "(?:\\W|$)")).test(url)
-              };
-            }
-          });
-          url = url.replace(/\\:/g, ':');
-          url = url.replace(PROTOCOL_AND_DOMAIN_REGEX, function(match) {
-            protocolAndDomain = match;
-            return '';
-          });
-
-          params = params || {};
-          forEach(self.urlParams, function(paramInfo, urlParam) {
-            val = params.hasOwnProperty(urlParam) ? params[urlParam] : self.defaults[urlParam];
-            if (angular.isDefined(val) && val !== null) {
-              if (paramInfo.isQueryParamValue) {
-                encodedVal = encodeUriQuery(val, true);
-              } else {
-                encodedVal = encodeUriSegment(val);
-              }
-              url = url.replace(new RegExp(":" + urlParam + "(\\W|$)", "g"), function(match, p1) {
-                return encodedVal + p1;
-              });
-            } else {
-              url = url.replace(new RegExp("(\/?):" + urlParam + "(\\W|$)", "g"), function(match,
-                  leadingSlashes, tail) {
-                if (tail.charAt(0) == '/') {
-                  return tail;
-                } else {
-                  return leadingSlashes + tail;
-                }
-              });
-            }
-          });
-
-          // strip trailing slashes and set the url (unless this behavior is specifically disabled)
-          if (self.defaults.stripTrailingSlashes) {
-            url = url.replace(/\/+$/, '') || '/';
-          }
-
-          // then replace collapse `/.` if found in the last URL path segment before the query
-          // E.g. `http://url.com/id./format?q=x` becomes `http://url.com/id.format?q=x`
-          url = url.replace(/\/\.(?=\w+($|\?))/, '.');
-          // replace escaped `/\.` with `/.`
-          config.url = protocolAndDomain + url.replace(/\/\\\./, '/.');
-
-
-          // set params - delegate param encoding to $http
-          forEach(params, function(value, key) {
-            if (!self.urlParams[key]) {
-              config.params = config.params || {};
-              config.params[key] = value;
-            }
-          });
-        }
-      };
-
-
-      function resourceFactory(url, paramDefaults, actions, options) {
-        var route = new Route(url, options);
-
-        actions = extend({}, provider.defaults.actions, actions);
-
-        function extractParams(data, actionParams) {
-          var ids = {};
-          actionParams = extend({}, paramDefaults, actionParams);
-          forEach(actionParams, function(value, key) {
-            if (isFunction(value)) { value = value(); }
-            ids[key] = value && value.charAt && value.charAt(0) == '@' ?
-              lookupDottedPath(data, value.substr(1)) : value;
-          });
-          return ids;
-        }
-
-        function defaultResponseInterceptor(response) {
-          return response.resource;
-        }
-
-        function Resource(value) {
-          shallowClearAndCopy(value || {}, this);
-        }
-
-        Resource.prototype.toJSON = function() {
-          var data = extend({}, this);
-          delete data.$promise;
-          delete data.$resolved;
-          return data;
-        };
-
-        forEach(actions, function(action, name) {
-          var hasBody = /^(POST|PUT|PATCH)$/i.test(action.method);
-          var numericTimeout = action.timeout;
-          var cancellable = angular.isDefined(action.cancellable) ? action.cancellable :
-              (options && angular.isDefined(options.cancellable)) ? options.cancellable :
-              provider.defaults.cancellable;
-
-          if (numericTimeout && !angular.isNumber(numericTimeout)) {
-            $log.debug('ngResource:\n' +
-                       '  Only numeric values are allowed as `timeout`.\n' +
-                       '  Promises are not supported in $resource, because the same value would ' +
-                       'be used for multiple requests. If you are looking for a way to cancel ' +
-                       'requests, you should use the `cancellable` option.');
-            delete action.timeout;
-            numericTimeout = null;
-          }
-
-          Resource[name] = function(a1, a2, a3, a4) {
-            var params = {}, data, success, error;
-
-            /* jshint -W086 */ /* (purposefully fall through case statements) */
-            switch (arguments.length) {
-              case 4:
-                error = a4;
-                success = a3;
-              //fallthrough
-              case 3:
-              case 2:
-                if (isFunction(a2)) {
-                  if (isFunction(a1)) {
-                    success = a1;
-                    error = a2;
-                    break;
-                  }
-
-                  success = a2;
-                  error = a3;
-                  //fallthrough
-                } else {
-                  params = a1;
-                  data = a2;
-                  success = a3;
-                  break;
-                }
-              case 1:
-                if (isFunction(a1)) success = a1;
-                else if (hasBody) data = a1;
-                else params = a1;
-                break;
-              case 0: break;
-              default:
-                throw $resourceMinErr('badargs',
-                  "Expected up to 4 arguments [params, data, success, error], got {0} arguments",
-                  arguments.length);
-            }
-            /* jshint +W086 */ /* (purposefully fall through case statements) */
-
-            var isInstanceCall = this instanceof Resource;
-            var value = isInstanceCall ? data : (action.isArray ? [] : new Resource(data));
-            var httpConfig = {};
-            var responseInterceptor = action.interceptor && action.interceptor.response ||
-              defaultResponseInterceptor;
-            var responseErrorInterceptor = action.interceptor && action.interceptor.responseError ||
-              undefined;
-            var timeoutDeferred;
-            var numericTimeoutPromise;
-
-            forEach(action, function(value, key) {
-              switch (key) {
-                default:
-                  httpConfig[key] = copy(value);
-                  break;
-                case 'params':
-                case 'isArray':
-                case 'interceptor':
-                case 'cancellable':
-                  break;
-              }
-            });
-
-            if (!isInstanceCall && cancellable) {
-              timeoutDeferred = $q.defer();
-              httpConfig.timeout = timeoutDeferred.promise;
-
-              if (numericTimeout) {
-                numericTimeoutPromise = $timeout(timeoutDeferred.resolve, numericTimeout);
-              }
-            }
-
-            if (hasBody) httpConfig.data = data;
-            route.setUrlParams(httpConfig,
-              extend({}, extractParams(data, action.params || {}), params),
-              action.url);
-
-            var promise = $http(httpConfig).then(function(response) {
-              var data = response.data;
-
-              if (data) {
-                // Need to convert action.isArray to boolean in case it is undefined
-                // jshint -W018
-                if (angular.isArray(data) !== (!!action.isArray)) {
-                  throw $resourceMinErr('badcfg',
-                      'Error in resource configuration for action `{0}`. Expected response to ' +
-                      'contain an {1} but got an {2} (Request: {3} {4})', name, action.isArray ? 'array' : 'object',
-                    angular.isArray(data) ? 'array' : 'object', httpConfig.method, httpConfig.url);
-                }
-                // jshint +W018
-                if (action.isArray) {
-                  value.length = 0;
-                  forEach(data, function(item) {
-                    if (typeof item === "object") {
-                      value.push(new Resource(item));
-                    } else {
-                      // Valid JSON values may be string literals, and these should not be converted
-                      // into objects. These items will not have access to the Resource prototype
-                      // methods, but unfortunately there
-                      value.push(item);
-                    }
-                  });
-                } else {
-                  var promise = value.$promise;     // Save the promise
-                  shallowClearAndCopy(data, value);
-                  value.$promise = promise;         // Restore the promise
-                }
-              }
-              response.resource = value;
-
-              return response;
-            }, function(response) {
-              (error || noop)(response);
-              return $q.reject(response);
-            });
-
-            promise.finally(function() {
-              value.$resolved = true;
-              if (!isInstanceCall && cancellable) {
-                value.$cancelRequest = angular.noop;
-                $timeout.cancel(numericTimeoutPromise);
-                timeoutDeferred = numericTimeoutPromise = httpConfig.timeout = null;
-              }
-            });
-
-            promise = promise.then(
-              function(response) {
-                var value = responseInterceptor(response);
-                (success || noop)(value, response.headers);
-                return value;
-              },
-              responseErrorInterceptor);
-
-            if (!isInstanceCall) {
-              // we are creating instance / collection
-              // - set the initial promise
-              // - return the instance / collection
-              value.$promise = promise;
-              value.$resolved = false;
-              if (cancellable) value.$cancelRequest = timeoutDeferred.resolve;
-
-              return value;
-            }
-
-            // instance call
-            return promise;
-          };
-
-
-          Resource.prototype['$' + name] = function(params, success, error) {
-            if (isFunction(params)) {
-              error = success; success = params; params = {};
-            }
-            var result = Resource[name].call(this, params, this, success, error);
-            return result.$promise || result;
-          };
-        });
-
-        Resource.bind = function(additionalParamDefaults) {
-          return resourceFactory(url, extend({}, paramDefaults, additionalParamDefaults), actions);
-        };
-
-        return Resource;
-      }
-
-      return resourceFactory;
-    }];
-  });
-
-
-})(window, window.angular);
diff --git a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-resource.min.js b/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-resource.min.js
deleted file mode 100644
index 306657dcb..000000000
--- a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-resource.min.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- AngularJS v1.5.0
- (c) 2010-2016 Google, Inc. http://angularjs.org
- License: MIT
-*/
-(function(Q,d,G){'use strict';function H(t,g){g=g||{};d.forEach(g,function(d,q){delete g[q]});for(var q in t)!t.hasOwnProperty(q)||"$"===q.charAt(0)&&"$"===q.charAt(1)||(g[q]=t[q]);return g}var z=d.$$minErr("$resource"),N=/^(\.[a-zA-Z_$@][0-9a-zA-Z_$@]*)+$/;d.module("ngResource",["ng"]).provider("$resource",function(){var t=/^https?:\/\/[^\/]*/,g=this;this.defaults={stripTrailingSlashes:!0,actions:{get:{method:"GET"},save:{method:"POST"},query:{method:"GET",isArray:!0},remove:{method:"DELETE"},"delete":{method:"DELETE"}}};
-this.$get=["$http","$log","$q","$timeout",function(q,M,I,J){function A(d,h){return encodeURIComponent(d).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%20/g,h?"%20":"+")}function B(d,h){this.template=d;this.defaults=v({},g.defaults,h);this.urlParams={}}function K(e,h,n,k){function c(a,b){var c={};b=v({},h,b);u(b,function(b,h){x(b)&&(b=b());var f;if(b&&b.charAt&&"@"==b.charAt(0)){f=a;var l=b.substr(1);if(null==l||""===l||"hasOwnProperty"===l||!N.test("."+
-l))throw z("badmember",l);for(var l=l.split("."),m=0,k=l.length;m
- */
- /* global -ngRouteModule */
-var ngRouteModule = angular.module('ngRoute', ['ng']).
-                        provider('$route', $RouteProvider),
-    $routeMinErr = angular.$$minErr('ngRoute');
-
-/**
- * @ngdoc provider
- * @name $routeProvider
- *
- * @description
- *
- * Used for configuring routes.
- *
- * ## Example
- * See {@link ngRoute.$route#example $route} for an example of configuring and using `ngRoute`.
- *
- * ## Dependencies
- * Requires the {@link ngRoute `ngRoute`} module to be installed.
- */
-function $RouteProvider() {
-  function inherit(parent, extra) {
-    return angular.extend(Object.create(parent), extra);
-  }
-
-  var routes = {};
-
-  /**
-   * @ngdoc method
-   * @name $routeProvider#when
-   *
-   * @param {string} path Route path (matched against `$location.path`). If `$location.path`
-   *    contains redundant trailing slash or is missing one, the route will still match and the
-   *    `$location.path` will be updated to add or drop the trailing slash to exactly match the
-   *    route definition.
-   *
-   *    * `path` can contain named groups starting with a colon: e.g. `:name`. All characters up
-   *        to the next slash are matched and stored in `$routeParams` under the given `name`
-   *        when the route matches.
-   *    * `path` can contain named groups starting with a colon and ending with a star:
-   *        e.g.`:name*`. All characters are eagerly stored in `$routeParams` under the given `name`
-   *        when the route matches.
-   *    * `path` can contain optional named groups with a question mark: e.g.`:name?`.
-   *
-   *    For example, routes like `/color/:color/largecode/:largecode*\/edit` will match
-   *    `/color/brown/largecode/code/with/slashes/edit` and extract:
-   *
-   *    * `color: brown`
-   *    * `largecode: code/with/slashes`.
-   *
-   *
-   * @param {Object} route Mapping information to be assigned to `$route.current` on route
-   *    match.
-   *
-   *    Object properties:
-   *
-   *    - `controller` – `{(string|function()=}` – Controller fn that should be associated with
-   *      newly created scope or the name of a {@link angular.Module#controller registered
-   *      controller} if passed as a string.
-   *    - `controllerAs` – `{string=}` – An identifier name for a reference to the controller.
-   *      If present, the controller will be published to scope under the `controllerAs` name.
-   *    - `template` – `{string=|function()=}` – html template as a string or a function that
-   *      returns an html template as a string which should be used by {@link
-   *      ngRoute.directive:ngView ngView} or {@link ng.directive:ngInclude ngInclude} directives.
-   *      This property takes precedence over `templateUrl`.
-   *
-   *      If `template` is a function, it will be called with the following parameters:
-   *
-   *      - `{Array.}` - route parameters extracted from the current
-   *        `$location.path()` by applying the current route
-   *
-   *    - `templateUrl` – `{string=|function()=}` – path or function that returns a path to an html
-   *      template that should be used by {@link ngRoute.directive:ngView ngView}.
-   *
-   *      If `templateUrl` is a function, it will be called with the following parameters:
-   *
-   *      - `{Array.}` - route parameters extracted from the current
-   *        `$location.path()` by applying the current route
-   *
-   *    - `resolve` - `{Object.=}` - An optional map of dependencies which should
-   *      be injected into the controller. If any of these dependencies are promises, the router
-   *      will wait for them all to be resolved or one to be rejected before the controller is
-   *      instantiated.
-   *      If all the promises are resolved successfully, the values of the resolved promises are
-   *      injected and {@link ngRoute.$route#$routeChangeSuccess $routeChangeSuccess} event is
-   *      fired. If any of the promises are rejected the
-   *      {@link ngRoute.$route#$routeChangeError $routeChangeError} event is fired.
-   *      For easier access to the resolved dependencies from the template, the `resolve` map will
-   *      be available on the scope of the route, under `$resolve` (by default) or a custom name
-   *      specified by the `resolveAs` property (see below). This can be particularly useful, when
-   *      working with {@link angular.Module#component components} as route templates.
    
-   *      
    
-   *        **Note:** If your scope already contains a property with this name, it will be hidden
-   *        or overwritten. Make sure, you specify an appropriate name for this property, that
-   *        does not collide with other properties on the scope.
-   *      
    
-   *      The map object is:
-   *
-   *      - `key` – `{string}`: a name of a dependency to be injected into the controller.
-   *      - `factory` - `{string|function}`: If `string` then it is an alias for a service.
-   *        Otherwise if function, then it is {@link auto.$injector#invoke injected}
-   *        and the return value is treated as the dependency. If the result is a promise, it is
-   *        resolved before its value is injected into the controller. Be aware that
-   *        `ngRoute.$routeParams` will still refer to the previous route within these resolve
-   *        functions.  Use `$route.current.params` to access the new route parameters, instead.
-   *
-   *    - `resolveAs` - `{string=}` - The name under which the `resolve` map will be available on
-   *      the scope of the route. If omitted, defaults to `$resolve`.
-   *
-   *    - `redirectTo` – `{(string|function())=}` – value to update
-   *      {@link ng.$location $location} path with and trigger route redirection.
-   *
-   *      If `redirectTo` is a function, it will be called with the following parameters:
-   *
-   *      - `{Object.}` - route parameters extracted from the current
-   *        `$location.path()` by applying the current route templateUrl.
-   *      - `{string}` - current `$location.path()`
-   *      - `{Object}` - current `$location.search()`
-   *
-   *      The custom `redirectTo` function is expected to return a string which will be used
-   *      to update `$location.path()` and `$location.search()`.
-   *
-   *    - `[reloadOnSearch=true]` - `{boolean=}` - reload route when only `$location.search()`
-   *      or `$location.hash()` changes.
-   *
-   *      If the option is set to `false` and url in the browser changes, then
-   *      `$routeUpdate` event is broadcasted on the root scope.
-   *
-   *    - `[caseInsensitiveMatch=false]` - `{boolean=}` - match routes without being case sensitive
-   *
-   *      If the option is set to `true`, then the particular route can be matched without being
-   *      case sensitive
-   *
-   * @returns {Object} self
-   *
-   * @description
-   * Adds a new route definition to the `$route` service.
-   */
-  this.when = function(path, route) {
-    //copy original route object to preserve params inherited from proto chain
-    var routeCopy = angular.copy(route);
-    if (angular.isUndefined(routeCopy.reloadOnSearch)) {
-      routeCopy.reloadOnSearch = true;
-    }
-    if (angular.isUndefined(routeCopy.caseInsensitiveMatch)) {
-      routeCopy.caseInsensitiveMatch = this.caseInsensitiveMatch;
-    }
-    routes[path] = angular.extend(
-      routeCopy,
-      path && pathRegExp(path, routeCopy)
-    );
-
-    // create redirection for trailing slashes
-    if (path) {
-      var redirectPath = (path[path.length - 1] == '/')
-            ? path.substr(0, path.length - 1)
-            : path + '/';
-
-      routes[redirectPath] = angular.extend(
-        {redirectTo: path},
-        pathRegExp(redirectPath, routeCopy)
-      );
-    }
-
-    return this;
-  };
-
-  /**
-   * @ngdoc property
-   * @name $routeProvider#caseInsensitiveMatch
-   * @description
-   *
-   * A boolean property indicating if routes defined
-   * using this provider should be matched using a case insensitive
-   * algorithm. Defaults to `false`.
-   */
-  this.caseInsensitiveMatch = false;
-
-   /**
-    * @param path {string} path
-    * @param opts {Object} options
-    * @return {?Object}
-    *
-    * @description
-    * Normalizes the given path, returning a regular expression
-    * and the original path.
-    *
-    * Inspired by pathRexp in visionmedia/express/lib/utils.js.
-    */
-  function pathRegExp(path, opts) {
-    var insensitive = opts.caseInsensitiveMatch,
-        ret = {
-          originalPath: path,
-          regexp: path
-        },
-        keys = ret.keys = [];
-
-    path = path
-      .replace(/([().])/g, '\\$1')
-      .replace(/(\/)?:(\w+)([\?\*])?/g, function(_, slash, key, option) {
-        var optional = option === '?' ? option : null;
-        var star = option === '*' ? option : null;
-        keys.push({ name: key, optional: !!optional });
-        slash = slash || '';
-        return ''
-          + (optional ? '' : slash)
-          + '(?:'
-          + (optional ? slash : '')
-          + (star && '(.+?)' || '([^/]+)')
-          + (optional || '')
-          + ')'
-          + (optional || '');
-      })
-      .replace(/([\/$\*])/g, '\\$1');
-
-    ret.regexp = new RegExp('^' + path + '$', insensitive ? 'i' : '');
-    return ret;
-  }
-
-  /**
-   * @ngdoc method
-   * @name $routeProvider#otherwise
-   *
-   * @description
-   * Sets route definition that will be used on route change when no other route definition
-   * is matched.
-   *
-   * @param {Object|string} params Mapping information to be assigned to `$route.current`.
-   * If called with a string, the value maps to `redirectTo`.
-   * @returns {Object} self
-   */
-  this.otherwise = function(params) {
-    if (typeof params === 'string') {
-      params = {redirectTo: params};
-    }
-    this.when(null, params);
-    return this;
-  };
-
-
-  this.$get = ['$rootScope',
-               '$location',
-               '$routeParams',
-               '$q',
-               '$injector',
-               '$templateRequest',
-               '$sce',
-      function($rootScope, $location, $routeParams, $q, $injector, $templateRequest, $sce) {
-
-    /**
-     * @ngdoc service
-     * @name $route
-     * @requires $location
-     * @requires $routeParams
-     *
-     * @property {Object} current Reference to the current route definition.
-     * The route definition contains:
-     *
-     *   - `controller`: The controller constructor as defined in the route definition.
-     *   - `locals`: A map of locals which is used by {@link ng.$controller $controller} service for
-     *     controller instantiation. The `locals` contain
-     *     the resolved values of the `resolve` map. Additionally the `locals` also contain:
-     *
-     *     - `$scope` - The current route scope.
-     *     - `$template` - The current route template HTML.
-     *
-     *     The `locals` will be assigned to the route scope's `$resolve` property. You can override
-     *     the property name, using `resolveAs` in the route definition. See
-     *     {@link ngRoute.$routeProvider $routeProvider} for more info.
-     *
-     * @property {Object} routes Object with all route configuration Objects as its properties.
-     *
-     * @description
-     * `$route` is used for deep-linking URLs to controllers and views (HTML partials).
-     * It watches `$location.url()` and tries to map the path to an existing route definition.
-     *
-     * Requires the {@link ngRoute `ngRoute`} module to be installed.
-     *
-     * You can define routes through {@link ngRoute.$routeProvider $routeProvider}'s API.
-     *
-     * The `$route` service is typically used in conjunction with the
-     * {@link ngRoute.directive:ngView `ngView`} directive and the
-     * {@link ngRoute.$routeParams `$routeParams`} service.
-     *
-     * @example
-     * This example shows how changing the URL hash causes the `$route` to match a route against the
-     * URL, and the `ngView` pulls in the partial.
-     *
-     * 
-     *   
-     *     
    
-     *       Choose:
-     *       Moby |
-     *       Moby: Ch1 |
-     *       Gatsby |
-     *       Gatsby: Ch4 |
-     *       Scarlet Letter
    
-     *
-     *       
    
-     *
-     *       
    
-     *
-     *       
    $location.path() = {{$location.path()}}
    
-     *       
    $route.current.templateUrl = {{$route.current.templateUrl}}
    
-     *       
    $route.current.params = {{$route.current.params}}
    
-     *       
    $route.current.scope.name = {{$route.current.scope.name}}
    
-     *       
    $routeParams = {{$routeParams}}
    
-     *     
    
-     *       
-     *
-     *   
-     *     controller: {{name}}
    
-     *     Book Id: {{params.bookId}}
    
-     *       
-     *
-     *   
-     *     controller: {{name}}
    
-     *     Book Id: {{params.bookId}}
    
-     *     Chapter Id: {{params.chapterId}}
-     *       
-     *
-     *   
-     *     angular.module('ngRouteExample', ['ngRoute'])
-     *
-     *      .controller('MainController', function($scope, $route, $routeParams, $location) {
-     *          $scope.$route = $route;
-     *          $scope.$location = $location;
-     *          $scope.$routeParams = $routeParams;
-     *      })
-     *
-     *      .controller('BookController', function($scope, $routeParams) {
-     *          $scope.name = "BookController";
-     *          $scope.params = $routeParams;
-     *      })
-     *
-     *      .controller('ChapterController', function($scope, $routeParams) {
-     *          $scope.name = "ChapterController";
-     *          $scope.params = $routeParams;
-     *      })
-     *
-     *     .config(function($routeProvider, $locationProvider) {
-     *       $routeProvider
-     *        .when('/Book/:bookId', {
-     *         templateUrl: 'book.html',
-     *         controller: 'BookController',
-     *         resolve: {
-     *           // I will cause a 1 second delay
-     *           delay: function($q, $timeout) {
-     *             var delay = $q.defer();
-     *             $timeout(delay.resolve, 1000);
-     *             return delay.promise;
-     *           }
-     *         }
-     *       })
-     *       .when('/Book/:bookId/ch/:chapterId', {
-     *         templateUrl: 'chapter.html',
-     *         controller: 'ChapterController'
-     *       });
-     *
-     *       // configure html5 to get links working on jsfiddle
-     *       $locationProvider.html5Mode(true);
-     *     });
-     *
-     *   
-     *
-     *   
-     *     it('should load and compile correct template', function() {
-     *       element(by.linkText('Moby: Ch1')).click();
-     *       var content = element(by.css('[ng-view]')).getText();
-     *       expect(content).toMatch(/controller\: ChapterController/);
-     *       expect(content).toMatch(/Book Id\: Moby/);
-     *       expect(content).toMatch(/Chapter Id\: 1/);
-     *
-     *       element(by.partialLinkText('Scarlet')).click();
-     *
-     *       content = element(by.css('[ng-view]')).getText();
-     *       expect(content).toMatch(/controller\: BookController/);
-     *       expect(content).toMatch(/Book Id\: Scarlet/);
-     *     });
-     *   
-     *     
-     */
-
-    /**
-     * @ngdoc event
-     * @name $route#$routeChangeStart
-     * @eventType broadcast on root scope
-     * @description
-     * Broadcasted before a route change. At this  point the route services starts
-     * resolving all of the dependencies needed for the route change to occur.
-     * Typically this involves fetching the view template as well as any dependencies
-     * defined in `resolve` route property. Once  all of the dependencies are resolved
-     * `$routeChangeSuccess` is fired.
-     *
-     * The route change (and the `$location` change that triggered it) can be prevented
-     * by calling `preventDefault` method of the event. See {@link ng.$rootScope.Scope#$on}
-     * for more details about event object.
-     *
-     * @param {Object} angularEvent Synthetic event object.
-     * @param {Route} next Future route information.
-     * @param {Route} current Current route information.
-     */
-
-    /**
-     * @ngdoc event
-     * @name $route#$routeChangeSuccess
-     * @eventType broadcast on root scope
-     * @description
-     * Broadcasted after a route change has happened successfully.
-     * The `resolve` dependencies are now available in the `current.locals` property.
-     *
-     * {@link ngRoute.directive:ngView ngView} listens for the directive
-     * to instantiate the controller and render the view.
-     *
-     * @param {Object} angularEvent Synthetic event object.
-     * @param {Route} current Current route information.
-     * @param {Route|Undefined} previous Previous route information, or undefined if current is
-     * first route entered.
-     */
-
-    /**
-     * @ngdoc event
-     * @name $route#$routeChangeError
-     * @eventType broadcast on root scope
-     * @description
-     * Broadcasted if any of the resolve promises are rejected.
-     *
-     * @param {Object} angularEvent Synthetic event object
-     * @param {Route} current Current route information.
-     * @param {Route} previous Previous route information.
-     * @param {Route} rejection Rejection of the promise. Usually the error of the failed promise.
-     */
-
-    /**
-     * @ngdoc event
-     * @name $route#$routeUpdate
-     * @eventType broadcast on root scope
-     * @description
-     * The `reloadOnSearch` property has been set to false, and we are reusing the same
-     * instance of the Controller.
-     *
-     * @param {Object} angularEvent Synthetic event object
-     * @param {Route} current Current/previous route information.
-     */
-
-    var forceReload = false,
-        preparedRoute,
-        preparedRouteIsUpdateOnly,
-        $route = {
-          routes: routes,
-
-          /**
-           * @ngdoc method
-           * @name $route#reload
-           *
-           * @description
-           * Causes `$route` service to reload the current route even if
-           * {@link ng.$location $location} hasn't changed.
-           *
-           * As a result of that, {@link ngRoute.directive:ngView ngView}
-           * creates new scope and reinstantiates the controller.
-           */
-          reload: function() {
-            forceReload = true;
-
-            var fakeLocationEvent = {
-              defaultPrevented: false,
-              preventDefault: function fakePreventDefault() {
-                this.defaultPrevented = true;
-                forceReload = false;
-              }
-            };
-
-            $rootScope.$evalAsync(function() {
-              prepareRoute(fakeLocationEvent);
-              if (!fakeLocationEvent.defaultPrevented) commitRoute();
-            });
-          },
-
-          /**
-           * @ngdoc method
-           * @name $route#updateParams
-           *
-           * @description
-           * Causes `$route` service to update the current URL, replacing
-           * current route parameters with those specified in `newParams`.
-           * Provided property names that match the route's path segment
-           * definitions will be interpolated into the location's path, while
-           * remaining properties will be treated as query params.
-           *
-           * @param {!Object} newParams mapping of URL parameter names to values
-           */
-          updateParams: function(newParams) {
-            if (this.current && this.current.$$route) {
-              newParams = angular.extend({}, this.current.params, newParams);
-              $location.path(interpolate(this.current.$$route.originalPath, newParams));
-              // interpolate modifies newParams, only query params are left
-              $location.search(newParams);
-            } else {
-              throw $routeMinErr('norout', 'Tried updating route when with no current route');
-            }
-          }
-        };
-
-    $rootScope.$on('$locationChangeStart', prepareRoute);
-    $rootScope.$on('$locationChangeSuccess', commitRoute);
-
-    return $route;
-
-    /////////////////////////////////////////////////////
-
-    /**
-     * @param on {string} current url
-     * @param route {Object} route regexp to match the url against
-     * @return {?Object}
-     *
-     * @description
-     * Check if the route matches the current url.
-     *
-     * Inspired by match in
-     * visionmedia/express/lib/router/router.js.
-     */
-    function switchRouteMatcher(on, route) {
-      var keys = route.keys,
-          params = {};
-
-      if (!route.regexp) return null;
-
-      var m = route.regexp.exec(on);
-      if (!m) return null;
-
-      for (var i = 1, len = m.length; i < len; ++i) {
-        var key = keys[i - 1];
-
-        var val = m[i];
-
-        if (key && val) {
-          params[key.name] = val;
-        }
-      }
-      return params;
-    }
-
-    function prepareRoute($locationEvent) {
-      var lastRoute = $route.current;
-
-      preparedRoute = parseRoute();
-      preparedRouteIsUpdateOnly = preparedRoute && lastRoute && preparedRoute.$$route === lastRoute.$$route
-          && angular.equals(preparedRoute.pathParams, lastRoute.pathParams)
-          && !preparedRoute.reloadOnSearch && !forceReload;
-
-      if (!preparedRouteIsUpdateOnly && (lastRoute || preparedRoute)) {
-        if ($rootScope.$broadcast('$routeChangeStart', preparedRoute, lastRoute).defaultPrevented) {
-          if ($locationEvent) {
-            $locationEvent.preventDefault();
-          }
-        }
-      }
-    }
-
-    function commitRoute() {
-      var lastRoute = $route.current;
-      var nextRoute = preparedRoute;
-
-      if (preparedRouteIsUpdateOnly) {
-        lastRoute.params = nextRoute.params;
-        angular.copy(lastRoute.params, $routeParams);
-        $rootScope.$broadcast('$routeUpdate', lastRoute);
-      } else if (nextRoute || lastRoute) {
-        forceReload = false;
-        $route.current = nextRoute;
-        if (nextRoute) {
-          if (nextRoute.redirectTo) {
-            if (angular.isString(nextRoute.redirectTo)) {
-              $location.path(interpolate(nextRoute.redirectTo, nextRoute.params)).search(nextRoute.params)
-                       .replace();
-            } else {
-              $location.url(nextRoute.redirectTo(nextRoute.pathParams, $location.path(), $location.search()))
-                       .replace();
-            }
-          }
-        }
-
-        $q.when(nextRoute).
-          then(function() {
-            if (nextRoute) {
-              var locals = angular.extend({}, nextRoute.resolve),
-                  template, templateUrl;
-
-              angular.forEach(locals, function(value, key) {
-                locals[key] = angular.isString(value) ?
-                    $injector.get(value) : $injector.invoke(value, null, null, key);
-              });
-
-              if (angular.isDefined(template = nextRoute.template)) {
-                if (angular.isFunction(template)) {
-                  template = template(nextRoute.params);
-                }
-              } else if (angular.isDefined(templateUrl = nextRoute.templateUrl)) {
-                if (angular.isFunction(templateUrl)) {
-                  templateUrl = templateUrl(nextRoute.params);
-                }
-                if (angular.isDefined(templateUrl)) {
-                  nextRoute.loadedTemplateUrl = $sce.valueOf(templateUrl);
-                  template = $templateRequest(templateUrl);
-                }
-              }
-              if (angular.isDefined(template)) {
-                locals['$template'] = template;
-              }
-              return $q.all(locals);
-            }
-          }).
-          then(function(locals) {
-            // after route change
-            if (nextRoute == $route.current) {
-              if (nextRoute) {
-                nextRoute.locals = locals;
-                angular.copy(nextRoute.params, $routeParams);
-              }
-              $rootScope.$broadcast('$routeChangeSuccess', nextRoute, lastRoute);
-            }
-          }, function(error) {
-            if (nextRoute == $route.current) {
-              $rootScope.$broadcast('$routeChangeError', nextRoute, lastRoute, error);
-            }
-          });
-      }
-    }
-
-
-    /**
-     * @returns {Object} the current active route, by matching it against the URL
-     */
-    function parseRoute() {
-      // Match a route
-      var params, match;
-      angular.forEach(routes, function(route, path) {
-        if (!match && (params = switchRouteMatcher($location.path(), route))) {
-          match = inherit(route, {
-            params: angular.extend({}, $location.search(), params),
-            pathParams: params});
-          match.$$route = route;
-        }
-      });
-      // No route matched; fallback to "otherwise" route
-      return match || routes[null] && inherit(routes[null], {params: {}, pathParams:{}});
-    }
-
-    /**
-     * @returns {string} interpolation of the redirect path with the parameters
-     */
-    function interpolate(string, params) {
-      var result = [];
-      angular.forEach((string || '').split(':'), function(segment, i) {
-        if (i === 0) {
-          result.push(segment);
-        } else {
-          var segmentMatch = segment.match(/(\w+)(?:[?*])?(.*)/);
-          var key = segmentMatch[1];
-          result.push(params[key]);
-          result.push(segmentMatch[2] || '');
-          delete params[key];
-        }
-      });
-      return result.join('');
-    }
-  }];
-}
-
-ngRouteModule.provider('$routeParams', $RouteParamsProvider);
-
-
-/**
- * @ngdoc service
- * @name $routeParams
- * @requires $route
- *
- * @description
- * The `$routeParams` service allows you to retrieve the current set of route parameters.
- *
- * Requires the {@link ngRoute `ngRoute`} module to be installed.
- *
- * The route parameters are a combination of {@link ng.$location `$location`}'s
- * {@link ng.$location#search `search()`} and {@link ng.$location#path `path()`}.
- * The `path` parameters are extracted when the {@link ngRoute.$route `$route`} path is matched.
- *
- * In case of parameter name collision, `path` params take precedence over `search` params.
- *
- * The service guarantees that the identity of the `$routeParams` object will remain unchanged
- * (but its properties will likely change) even when a route change occurs.
- *
- * Note that the `$routeParams` are only updated *after* a route change completes successfully.
- * This means that you cannot rely on `$routeParams` being correct in route resolve functions.
- * Instead you can use `$route.current.params` to access the new route's parameters.
- *
- * @example
- * ```js
- *  // Given:
- *  // URL: http://server.com/index.html#/Chapter/1/Section/2?search=moby
- *  // Route: /Chapter/:chapterId/Section/:sectionId
- *  //
- *  // Then
- *  $routeParams ==> {chapterId:'1', sectionId:'2', search:'moby'}
- * ```
- */
-function $RouteParamsProvider() {
-  this.$get = function() { return {}; };
-}
-
-ngRouteModule.directive('ngView', ngViewFactory);
-ngRouteModule.directive('ngView', ngViewFillContentFactory);
-
-
-/**
- * @ngdoc directive
- * @name ngView
- * @restrict ECA
- *
- * @description
- * # Overview
- * `ngView` is a directive that complements the {@link ngRoute.$route $route} service by
- * including the rendered template of the current route into the main layout (`index.html`) file.
- * Every time the current route changes, the included view changes with it according to the
- * configuration of the `$route` service.
- *
- * Requires the {@link ngRoute `ngRoute`} module to be installed.
- *
- * @animations
- * enter - animation is used to bring new content into the browser.
- * leave - animation is used to animate existing content away.
- *
- * The enter and leave animation occur concurrently.
- *
- * @scope
- * @priority 400
- * @param {string=} onload Expression to evaluate whenever the view updates.
- *
- * @param {string=} autoscroll Whether `ngView` should call {@link ng.$anchorScroll
- *                  $anchorScroll} to scroll the viewport after the view is updated.
- *
- *                  - If the attribute is not set, disable scrolling.
- *                  - If the attribute is set without value, enable scrolling.
- *                  - Otherwise enable scrolling only if the `autoscroll` attribute value evaluated
- *                    as an expression yields a truthy value.
- * @example
-    
-      
-        
    
-          Choose:
-          Moby |
-          Moby: Ch1 |
-          Gatsby |
-          Gatsby: Ch4 |
-          Scarlet Letter
    
-
-          
    
-            
    
-          
    
-          
    
-
-          
    $location.path() = {{main.$location.path()}}
    
-          
    $route.current.templateUrl = {{main.$route.current.templateUrl}}
    
-          
    $route.current.params = {{main.$route.current.params}}
    
-          
    $routeParams = {{main.$routeParams}}
    
-        
    
-          
-
-      
-        
    
-          controller: {{book.name}}
    
-          Book Id: {{book.params.bookId}}
    
-        
    
-          
-
-      
-        
    
-          controller: {{chapter.name}}
    
-          Book Id: {{chapter.params.bookId}}
    
-          Chapter Id: {{chapter.params.chapterId}}
-        
    
-          
-
-      
-        .view-animate-container {
-          position:relative;
-          height:100px!important;
-          background:white;
-          border:1px solid black;
-          height:40px;
-          overflow:hidden;
-        }
-
-        .view-animate {
-          padding:10px;
-        }
-
-        .view-animate.ng-enter, .view-animate.ng-leave {
-          transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 1.5s;
-
-          display:block;
-          width:100%;
-          border-left:1px solid black;
-
-          position:absolute;
-          top:0;
-          left:0;
-          right:0;
-          bottom:0;
-          padding:10px;
-        }
-
-        .view-animate.ng-enter {
-          left:100%;
-        }
-        .view-animate.ng-enter.ng-enter-active {
-          left:0;
-        }
-        .view-animate.ng-leave.ng-leave-active {
-          left:-100%;
-        }
-      
-
-      
-        angular.module('ngViewExample', ['ngRoute', 'ngAnimate'])
-          .config(['$routeProvider', '$locationProvider',
-            function($routeProvider, $locationProvider) {
-              $routeProvider
-                .when('/Book/:bookId', {
-                  templateUrl: 'book.html',
-                  controller: 'BookCtrl',
-                  controllerAs: 'book'
-                })
-                .when('/Book/:bookId/ch/:chapterId', {
-                  templateUrl: 'chapter.html',
-                  controller: 'ChapterCtrl',
-                  controllerAs: 'chapter'
-                });
-
-              $locationProvider.html5Mode(true);
-          }])
-          .controller('MainCtrl', ['$route', '$routeParams', '$location',
-            function($route, $routeParams, $location) {
-              this.$route = $route;
-              this.$location = $location;
-              this.$routeParams = $routeParams;
-          }])
-          .controller('BookCtrl', ['$routeParams', function($routeParams) {
-            this.name = "BookCtrl";
-            this.params = $routeParams;
-          }])
-          .controller('ChapterCtrl', ['$routeParams', function($routeParams) {
-            this.name = "ChapterCtrl";
-            this.params = $routeParams;
-          }]);
-
-      
-
-      
-        it('should load and compile correct template', function() {
-          element(by.linkText('Moby: Ch1')).click();
-          var content = element(by.css('[ng-view]')).getText();
-          expect(content).toMatch(/controller\: ChapterCtrl/);
-          expect(content).toMatch(/Book Id\: Moby/);
-          expect(content).toMatch(/Chapter Id\: 1/);
-
-          element(by.partialLinkText('Scarlet')).click();
-
-          content = element(by.css('[ng-view]')).getText();
-          expect(content).toMatch(/controller\: BookCtrl/);
-          expect(content).toMatch(/Book Id\: Scarlet/);
-        });
-      
-        
- */
-
-
-/**
- * @ngdoc event
- * @name ngView#$viewContentLoaded
- * @eventType emit on the current ngView scope
- * @description
- * Emitted every time the ngView content is reloaded.
- */
-ngViewFactory.$inject = ['$route', '$anchorScroll', '$animate'];
-function ngViewFactory($route, $anchorScroll, $animate) {
-  return {
-    restrict: 'ECA',
-    terminal: true,
-    priority: 400,
-    transclude: 'element',
-    link: function(scope, $element, attr, ctrl, $transclude) {
-        var currentScope,
-            currentElement,
-            previousLeaveAnimation,
-            autoScrollExp = attr.autoscroll,
-            onloadExp = attr.onload || '';
-
-        scope.$on('$routeChangeSuccess', update);
-        update();
-
-        function cleanupLastView() {
-          if (previousLeaveAnimation) {
-            $animate.cancel(previousLeaveAnimation);
-            previousLeaveAnimation = null;
-          }
-
-          if (currentScope) {
-            currentScope.$destroy();
-            currentScope = null;
-          }
-          if (currentElement) {
-            previousLeaveAnimation = $animate.leave(currentElement);
-            previousLeaveAnimation.then(function() {
-              previousLeaveAnimation = null;
-            });
-            currentElement = null;
-          }
-        }
-
-        function update() {
-          var locals = $route.current && $route.current.locals,
-              template = locals && locals.$template;
-
-          if (angular.isDefined(template)) {
-            var newScope = scope.$new();
-            var current = $route.current;
-
-            // Note: This will also link all children of ng-view that were contained in the original
-            // html. If that content contains controllers, ... they could pollute/change the scope.
-            // However, using ng-view on an element with additional content does not make sense...
-            // Note: We can't remove them in the cloneAttchFn of $transclude as that
-            // function is called before linking the content, which would apply child
-            // directives to non existing elements.
-            var clone = $transclude(newScope, function(clone) {
-              $animate.enter(clone, null, currentElement || $element).then(function onNgViewEnter() {
-                if (angular.isDefined(autoScrollExp)
-                  && (!autoScrollExp || scope.$eval(autoScrollExp))) {
-                  $anchorScroll();
-                }
-              });
-              cleanupLastView();
-            });
-
-            currentElement = clone;
-            currentScope = current.scope = newScope;
-            currentScope.$emit('$viewContentLoaded');
-            currentScope.$eval(onloadExp);
-          } else {
-            cleanupLastView();
-          }
-        }
-    }
-  };
-}
-
-// This directive is called during the $transclude call of the first `ngView` directive.
-// It will replace and compile the content of the element with the loaded template.
-// We need this directive so that the element content is already filled when
-// the link function of another directive on the same element as ngView
-// is called.
-ngViewFillContentFactory.$inject = ['$compile', '$controller', '$route'];
-function ngViewFillContentFactory($compile, $controller, $route) {
-  return {
-    restrict: 'ECA',
-    priority: -400,
-    link: function(scope, $element) {
-      var current = $route.current,
-          locals = current.locals;
-
-      $element.html(locals.$template);
-
-      var link = $compile($element.contents());
-
-      if (current.controller) {
-        locals.$scope = scope;
-        var controller = $controller(current.controller, locals);
-        if (current.controllerAs) {
-          scope[current.controllerAs] = controller;
-        }
-        $element.data('$ngControllerController', controller);
-        $element.children().data('$ngControllerController', controller);
-      }
-      scope[current.resolveAs || '$resolve'] = locals;
-
-      link(scope);
-    }
-  };
-}
-
-
-})(window, window.angular);
diff --git a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-route.min.js b/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-route.min.js
deleted file mode 100644
index 4d0d01878..000000000
--- a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-route.min.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- AngularJS v1.5.0
- (c) 2010-2016 Google, Inc. http://angularjs.org
- License: MIT
-*/
-(function(r,d,C){'use strict';function x(s,h,g){return{restrict:"ECA",terminal:!0,priority:400,transclude:"element",link:function(a,c,b,f,y){function k(){n&&(g.cancel(n),n=null);l&&(l.$destroy(),l=null);m&&(n=g.leave(m),n.then(function(){n=null}),m=null)}function z(){var b=s.current&&s.current.locals;if(d.isDefined(b&&b.$template)){var b=a.$new(),f=s.current;m=y(b,function(b){g.enter(b,null,m||c).then(function(){!d.isDefined(u)||u&&!a.$eval(u)||h()});k()});l=f.scope=b;l.$emit("$viewContentLoaded");
-l.$eval(v)}else k()}var l,m,n,u=b.autoscroll,v=b.onload||"";a.$on("$routeChangeSuccess",z);z()}}}function A(d,h,g){return{restrict:"ECA",priority:-400,link:function(a,c){var b=g.current,f=b.locals;c.html(f.$template);var y=d(c.contents());if(b.controller){f.$scope=a;var k=h(b.controller,f);b.controllerAs&&(a[b.controllerAs]=k);c.data("$ngControllerController",k);c.children().data("$ngControllerController",k)}a[b.resolveAs||"$resolve"]=f;y(a)}}}r=d.module("ngRoute",["ng"]).provider("$route",function(){function s(a,
-c){return d.extend(Object.create(a),c)}function h(a,d){var b=d.caseInsensitiveMatch,f={originalPath:a,regexp:a},g=f.keys=[];a=a.replace(/([().])/g,"\\$1").replace(/(\/)?:(\w+)([\?\*])?/g,function(a,d,b,c){a="?"===c?c:null;c="*"===c?c:null;g.push({name:b,optional:!!a});d=d||"";return""+(a?"":d)+"(?:"+(a?d:"")+(c&&"(.+?)"||"([^/]+)")+(a||"")+")"+(a||"")}).replace(/([\/$\*])/g,"\\$1");f.regexp=new RegExp("^"+a+"$",b?"i":"");return f}var g={};this.when=function(a,c){var b=d.copy(c);d.isUndefined(b.reloadOnSearch)&&
-(b.reloadOnSearch=!0);d.isUndefined(b.caseInsensitiveMatch)&&(b.caseInsensitiveMatch=this.caseInsensitiveMatch);g[a]=d.extend(b,a&&h(a,b));if(a){var f="/"==a[a.length-1]?a.substr(0,a.length-1):a+"/";g[f]=d.extend({redirectTo:a},h(f,b))}return this};this.caseInsensitiveMatch=!1;this.otherwise=function(a){"string"===typeof a&&(a={redirectTo:a});this.when(null,a);return this};this.$get=["$rootScope","$location","$routeParams","$q","$injector","$templateRequest","$sce",function(a,c,b,f,h,k,r){function l(b){var e=
-t.current;(x=(p=n())&&e&&p.$$route===e.$$route&&d.equals(p.pathParams,e.pathParams)&&!p.reloadOnSearch&&!v)||!e&&!p||a.$broadcast("$routeChangeStart",p,e).defaultPrevented&&b&&b.preventDefault()}function m(){var w=t.current,e=p;if(x)w.params=e.params,d.copy(w.params,b),a.$broadcast("$routeUpdate",w);else if(e||w)v=!1,(t.current=e)&&e.redirectTo&&(d.isString(e.redirectTo)?c.path(u(e.redirectTo,e.params)).search(e.params).replace():c.url(e.redirectTo(e.pathParams,c.path(),c.search())).replace()),f.when(e).then(function(){if(e){var a=
-d.extend({},e.resolve),b,c;d.forEach(a,function(b,e){a[e]=d.isString(b)?h.get(b):h.invoke(b,null,null,e)});d.isDefined(b=e.template)?d.isFunction(b)&&(b=b(e.params)):d.isDefined(c=e.templateUrl)&&(d.isFunction(c)&&(c=c(e.params)),d.isDefined(c)&&(e.loadedTemplateUrl=r.valueOf(c),b=k(c)));d.isDefined(b)&&(a.$template=b);return f.all(a)}}).then(function(c){e==t.current&&(e&&(e.locals=c,d.copy(e.params,b)),a.$broadcast("$routeChangeSuccess",e,w))},function(b){e==t.current&&a.$broadcast("$routeChangeError",
-e,w,b)})}function n(){var a,b;d.forEach(g,function(f,g){var q;if(q=!b){var h=c.path();q=f.keys;var l={};if(f.regexp)if(h=f.regexp.exec(h)){for(var k=1,n=h.length;k
- *
- * See {@link ngSanitize.$sanitize `$sanitize`} for usage.
- */
-
-/**
- * @ngdoc service
- * @name $sanitize
- * @kind function
- *
- * @description
- *   Sanitizes an html string by stripping all potentially dangerous tokens.
- *
- *   The input is sanitized by parsing the HTML into tokens. All safe tokens (from a whitelist) are
- *   then serialized back to properly escaped html string. This means that no unsafe input can make
- *   it into the returned string.
- *
- *   The whitelist for URL sanitization of attribute values is configured using the functions
- *   `aHrefSanitizationWhitelist` and `imgSrcSanitizationWhitelist` of {@link ng.$compileProvider
- *   `$compileProvider`}.
- *
- *   The input may also contain SVG markup if this is enabled via {@link $sanitizeProvider}.
- *
- * @param {string} html HTML input.
- * @returns {string} Sanitized HTML.
- *
- * @example
-   
-   
-     
-     
    
-        Snippet: 
-       
-         
-           
-           
-           
-           
-         
-         
-           
-           
-           
-           
-         
-         
-           
-           
-           
-           
-         
-         
-           
-           
-           
-           
-         
-       
    DirectiveHowSourceRendered
    ng-bind-htmlAutomatically uses $sanitize
    <div ng-bind-html="snippet">
    </div>
    ng-bind-htmlBypass $sanitize by explicitly trusting the dangerous value
-           
    <div ng-bind-html="deliberatelyTrustDangerousSnippet()">
-</div>
    
-           
    ng-bindAutomatically escapes
    <div ng-bind="snippet">
    </div>
    
-       
    
-       
-   
-     it('should sanitize the html snippet by default', function() {
-       expect(element(by.css('#bind-html-with-sanitize div')).getInnerHtml()).
-         toBe('
    an html\nclick here\nsnippet
    ');
-     });
-
-     it('should inline raw snippet if bound to a trusted value', function() {
-       expect(element(by.css('#bind-html-with-trust div')).getInnerHtml()).
-         toBe("
    an html\n" +
-              "click here\n" +
-              "snippet
    ");
-     });
-
-     it('should escape snippet without any filter', function() {
-       expect(element(by.css('#bind-default div')).getInnerHtml()).
-         toBe("<p style=\"color:blue\">an html\n" +
-              "<em onmouseover=\"this.textContent='PWN3D!'\">click here</em>\n" +
-              "snippet</p>");
-     });
-
-     it('should update', function() {
-       element(by.model('snippet')).clear();
-       element(by.model('snippet')).sendKeys('new text');
-       expect(element(by.css('#bind-html-with-sanitize div')).getInnerHtml()).
-         toBe('new text');
-       expect(element(by.css('#bind-html-with-trust div')).getInnerHtml()).toBe(
-         'new text');
-       expect(element(by.css('#bind-default div')).getInnerHtml()).toBe(
-         "new <b onclick=\"alert(1)\">text</b>");
-     });
-       
-       
- */
-
-
-/**
- * @ngdoc provider
- * @name $sanitizeProvider
- *
- * @description
- * Creates and configures {@link $sanitize} instance.
- */
-function $SanitizeProvider() {
-  var svgEnabled = false;
-
-  this.$get = ['$$sanitizeUri', function($$sanitizeUri) {
-    if (svgEnabled) {
-      angular.extend(validElements, svgElements);
-    }
-    return function(html) {
-      var buf = [];
-      htmlParser(html, htmlSanitizeWriter(buf, function(uri, isImage) {
-        return !/^unsafe:/.test($$sanitizeUri(uri, isImage));
-      }));
-      return buf.join('');
-    };
-  }];
-
-
-  /**
-   * @ngdoc method
-   * @name $sanitizeProvider#enableSvg
-   * @kind function
-   *
-   * @description
-   * Enables a subset of svg to be supported by the sanitizer.
-   *
-   * 
    
-   *   
    By enabling this setting without taking other precautions, you might expose your
-   *   application to click-hijacking attacks. In these attacks, sanitized svg elements could be positioned
-   *   outside of the containing element and be rendered over other elements on the page (e.g. a login
-   *   link). Such behavior can then result in phishing incidents.
    
-   *
-   *   
    To protect against these, explicitly setup `overflow: hidden` css rule for all potential svg
-   *   tags within the sanitized content:
    
-   *
-   *   
    
-   *
-   *   
    
-   *   .rootOfTheIncludedContent svg {
-   *     overflow: hidden !important;
-   *   }
-   *   
    
-   * 
    
-   *
-   * @param {boolean=} regexp New regexp to whitelist urls with.
-   * @returns {boolean|ng.$sanitizeProvider} Returns the currently configured value if called
-   *    without an argument or self for chaining otherwise.
-   */
-  this.enableSvg = function(enableSvg) {
-    if (angular.isDefined(enableSvg)) {
-      svgEnabled = enableSvg;
-      return this;
-    } else {
-      return svgEnabled;
-    }
-  };
-}
-
-function sanitizeText(chars) {
-  var buf = [];
-  var writer = htmlSanitizeWriter(buf, angular.noop);
-  writer.chars(chars);
-  return buf.join('');
-}
-
-
-// Regular Expressions for parsing tags and attributes
-var SURROGATE_PAIR_REGEXP = /[\uD800-\uDBFF][\uDC00-\uDFFF]/g,
-  // Match everything outside of normal chars and " (quote character)
-  NON_ALPHANUMERIC_REGEXP = /([^\#-~ |!])/g;
-
-
-// Good source of info about elements and attributes
-// http://dev.w3.org/html5/spec/Overview.html#semantics
-// http://simon.html5.org/html-elements
-
-// Safe Void Elements - HTML5
-// http://dev.w3.org/html5/spec/Overview.html#void-elements
-var voidElements = toMap("area,br,col,hr,img,wbr");
-
-// Elements that you can, intentionally, leave open (and which close themselves)
-// http://dev.w3.org/html5/spec/Overview.html#optional-tags
-var optionalEndTagBlockElements = toMap("colgroup,dd,dt,li,p,tbody,td,tfoot,th,thead,tr"),
-    optionalEndTagInlineElements = toMap("rp,rt"),
-    optionalEndTagElements = angular.extend({},
-                                            optionalEndTagInlineElements,
-                                            optionalEndTagBlockElements);
-
-// Safe Block Elements - HTML5
-var blockElements = angular.extend({}, optionalEndTagBlockElements, toMap("address,article," +
-        "aside,blockquote,caption,center,del,dir,div,dl,figure,figcaption,footer,h1,h2,h3,h4,h5," +
-        "h6,header,hgroup,hr,ins,map,menu,nav,ol,pre,section,table,ul"));
-
-// Inline Elements - HTML5
-var inlineElements = angular.extend({}, optionalEndTagInlineElements, toMap("a,abbr,acronym,b," +
-        "bdi,bdo,big,br,cite,code,del,dfn,em,font,i,img,ins,kbd,label,map,mark,q,ruby,rp,rt,s," +
-        "samp,small,span,strike,strong,sub,sup,time,tt,u,var"));
-
-// SVG Elements
-// https://wiki.whatwg.org/wiki/Sanitization_rules#svg_Elements
-// Note: the elements animate,animateColor,animateMotion,animateTransform,set are intentionally omitted.
-// They can potentially allow for arbitrary javascript to be executed. See #11290
-var svgElements = toMap("circle,defs,desc,ellipse,font-face,font-face-name,font-face-src,g,glyph," +
-        "hkern,image,linearGradient,line,marker,metadata,missing-glyph,mpath,path,polygon,polyline," +
-        "radialGradient,rect,stop,svg,switch,text,title,tspan");
-
-// Blocked Elements (will be stripped)
-var blockedElements = toMap("script,style");
-
-var validElements = angular.extend({},
-                                   voidElements,
-                                   blockElements,
-                                   inlineElements,
-                                   optionalEndTagElements);
-
-//Attributes that have href and hence need to be sanitized
-var uriAttrs = toMap("background,cite,href,longdesc,src,xlink:href");
-
-var htmlAttrs = toMap('abbr,align,alt,axis,bgcolor,border,cellpadding,cellspacing,class,clear,' +
-    'color,cols,colspan,compact,coords,dir,face,headers,height,hreflang,hspace,' +
-    'ismap,lang,language,nohref,nowrap,rel,rev,rows,rowspan,rules,' +
-    'scope,scrolling,shape,size,span,start,summary,tabindex,target,title,type,' +
-    'valign,value,vspace,width');
-
-// SVG attributes (without "id" and "name" attributes)
-// https://wiki.whatwg.org/wiki/Sanitization_rules#svg_Attributes
-var svgAttrs = toMap('accent-height,accumulate,additive,alphabetic,arabic-form,ascent,' +
-    'baseProfile,bbox,begin,by,calcMode,cap-height,class,color,color-rendering,content,' +
-    'cx,cy,d,dx,dy,descent,display,dur,end,fill,fill-rule,font-family,font-size,font-stretch,' +
-    'font-style,font-variant,font-weight,from,fx,fy,g1,g2,glyph-name,gradientUnits,hanging,' +
-    'height,horiz-adv-x,horiz-origin-x,ideographic,k,keyPoints,keySplines,keyTimes,lang,' +
-    'marker-end,marker-mid,marker-start,markerHeight,markerUnits,markerWidth,mathematical,' +
-    'max,min,offset,opacity,orient,origin,overline-position,overline-thickness,panose-1,' +
-    'path,pathLength,points,preserveAspectRatio,r,refX,refY,repeatCount,repeatDur,' +
-    'requiredExtensions,requiredFeatures,restart,rotate,rx,ry,slope,stemh,stemv,stop-color,' +
-    'stop-opacity,strikethrough-position,strikethrough-thickness,stroke,stroke-dasharray,' +
-    'stroke-dashoffset,stroke-linecap,stroke-linejoin,stroke-miterlimit,stroke-opacity,' +
-    'stroke-width,systemLanguage,target,text-anchor,to,transform,type,u1,u2,underline-position,' +
-    'underline-thickness,unicode,unicode-range,units-per-em,values,version,viewBox,visibility,' +
-    'width,widths,x,x-height,x1,x2,xlink:actuate,xlink:arcrole,xlink:role,xlink:show,xlink:title,' +
-    'xlink:type,xml:base,xml:lang,xml:space,xmlns,xmlns:xlink,y,y1,y2,zoomAndPan', true);
-
-var validAttrs = angular.extend({},
-                                uriAttrs,
-                                svgAttrs,
-                                htmlAttrs);
-
-function toMap(str, lowercaseKeys) {
-  var obj = {}, items = str.split(','), i;
-  for (i = 0; i < items.length; i++) {
-    obj[lowercaseKeys ? angular.lowercase(items[i]) : items[i]] = true;
-  }
-  return obj;
-}
-
-var inertBodyElement;
-(function(window) {
-  var doc;
-  if (window.document && window.document.implementation) {
-    doc = window.document.implementation.createHTMLDocument("inert");
-  } else {
-    throw $sanitizeMinErr('noinert', "Can't create an inert html document");
-  }
-  var docElement = doc.documentElement || doc.getDocumentElement();
-  var bodyElements = docElement.getElementsByTagName('body');
-
-  // usually there should be only one body element in the document, but IE doesn't have any, so we need to create one
-  if (bodyElements.length === 1) {
-    inertBodyElement = bodyElements[0];
-  } else {
-    var html = doc.createElement('html');
-    inertBodyElement = doc.createElement('body');
-    html.appendChild(inertBodyElement);
-    doc.appendChild(html);
-  }
-})(window);
-
-/**
- * @example
- * htmlParser(htmlString, {
- *     start: function(tag, attrs) {},
- *     end: function(tag) {},
- *     chars: function(text) {},
- *     comment: function(text) {}
- * });
- *
- * @param {string} html string
- * @param {object} handler
- */
-function htmlParser(html, handler) {
-  if (html === null || html === undefined) {
-    html = '';
-  } else if (typeof html !== 'string') {
-    html = '' + html;
-  }
-  inertBodyElement.innerHTML = html;
-
-  //mXSS protection
-  var mXSSAttempts = 5;
-  do {
-    if (mXSSAttempts === 0) {
-      throw $sanitizeMinErr('uinput', "Failed to sanitize html because the input is unstable");
-    }
-    mXSSAttempts--;
-
-    // strip custom-namespaced attributes on IE<=11
-    if (document.documentMode <= 11) {
-      stripCustomNsAttrs(inertBodyElement);
-    }
-    html = inertBodyElement.innerHTML; //trigger mXSS
-    inertBodyElement.innerHTML = html;
-  } while (html !== inertBodyElement.innerHTML);
-
-  var node = inertBodyElement.firstChild;
-  while (node) {
-    switch (node.nodeType) {
-      case 1: // ELEMENT_NODE
-        handler.start(node.nodeName.toLowerCase(), attrToMap(node.attributes));
-        break;
-      case 3: // TEXT NODE
-        handler.chars(node.textContent);
-        break;
-    }
-
-    var nextNode;
-    if (!(nextNode = node.firstChild)) {
-      if (node.nodeType == 1) {
-        handler.end(node.nodeName.toLowerCase());
-      }
-      nextNode = node.nextSibling;
-      if (!nextNode) {
-        while (nextNode == null) {
-          node = node.parentNode;
-          if (node === inertBodyElement) break;
-          nextNode = node.nextSibling;
-          if (node.nodeType == 1) {
-            handler.end(node.nodeName.toLowerCase());
-          }
-        }
-      }
-    }
-    node = nextNode;
-  }
-
-  while (node = inertBodyElement.firstChild) {
-    inertBodyElement.removeChild(node);
-  }
-}
-
-function attrToMap(attrs) {
-  var map = {};
-  for (var i = 0, ii = attrs.length; i < ii; i++) {
-    var attr = attrs[i];
-    map[attr.name] = attr.value;
-  }
-  return map;
-}
-
-
-/**
- * Escapes all potentially dangerous characters, so that the
- * resulting string can be safely inserted into attribute or
- * element text.
- * @param value
- * @returns {string} escaped text
- */
-function encodeEntities(value) {
-  return value.
-    replace(/&/g, '&').
-    replace(SURROGATE_PAIR_REGEXP, function(value) {
-      var hi = value.charCodeAt(0);
-      var low = value.charCodeAt(1);
-      return '&#' + (((hi - 0xD800) * 0x400) + (low - 0xDC00) + 0x10000) + ';';
-    }).
-    replace(NON_ALPHANUMERIC_REGEXP, function(value) {
-      return '&#' + value.charCodeAt(0) + ';';
-    }).
-    replace(//g, '>');
-}
-
-/**
- * create an HTML/XML writer which writes to buffer
- * @param {Array} buf use buf.join('') to get out sanitized html string
- * @returns {object} in the form of {
- *     start: function(tag, attrs) {},
- *     end: function(tag) {},
- *     chars: function(text) {},
- *     comment: function(text) {}
- * }
- */
-function htmlSanitizeWriter(buf, uriValidator) {
-  var ignoreCurrentElement = false;
-  var out = angular.bind(buf, buf.push);
-  return {
-    start: function(tag, attrs) {
-      tag = angular.lowercase(tag);
-      if (!ignoreCurrentElement && blockedElements[tag]) {
-        ignoreCurrentElement = tag;
-      }
-      if (!ignoreCurrentElement && validElements[tag] === true) {
-        out('<');
-        out(tag);
-        angular.forEach(attrs, function(value, key) {
-          var lkey=angular.lowercase(key);
-          var isImage = (tag === 'img' && lkey === 'src') || (lkey === 'background');
-          if (validAttrs[lkey] === true &&
-            (uriAttrs[lkey] !== true || uriValidator(value, isImage))) {
-            out(' ');
-            out(key);
-            out('="');
-            out(encodeEntities(value));
-            out('"');
-          }
-        });
-        out('>');
-      }
-    },
-    end: function(tag) {
-      tag = angular.lowercase(tag);
-      if (!ignoreCurrentElement && validElements[tag] === true && voidElements[tag] !== true) {
-        out('');
-      }
-      if (tag == ignoreCurrentElement) {
-        ignoreCurrentElement = false;
-      }
-    },
-    chars: function(chars) {
-      if (!ignoreCurrentElement) {
-        out(encodeEntities(chars));
-      }
-    }
-  };
-}
-
-
-/**
- * When IE9-11 comes across an unknown namespaced attribute e.g. 'xlink:foo' it adds 'xmlns:ns1' attribute to declare
- * ns1 namespace and prefixes the attribute with 'ns1' (e.g. 'ns1:xlink:foo'). This is undesirable since we don't want
- * to allow any of these custom attributes. This method strips them all.
- *
- * @param node Root element to process
- */
-function stripCustomNsAttrs(node) {
-  if (node.nodeType === Node.ELEMENT_NODE) {
-    var attrs = node.attributes;
-    for (var i = 0, l = attrs.length; i < l; i++) {
-      var attrNode = attrs[i];
-      var attrName = attrNode.name.toLowerCase();
-      if (attrName === 'xmlns:ns1' || attrName.indexOf('ns1:') === 0) {
-        node.removeAttributeNode(attrNode);
-        i--;
-        l--;
-      }
-    }
-  }
-
-  var nextNode = node.firstChild;
-  if (nextNode) {
-    stripCustomNsAttrs(nextNode);
-  }
-
-  nextNode = node.nextSibling;
-  if (nextNode) {
-    stripCustomNsAttrs(nextNode);
-  }
-}
-
-
-
-// define ngSanitize module and register $sanitize service
-angular.module('ngSanitize', []).provider('$sanitize', $SanitizeProvider);
-
-/* global sanitizeText: false */
-
-/**
- * @ngdoc filter
- * @name linky
- * @kind function
- *
- * @description
- * Finds links in text input and turns them into html links. Supports `http/https/ftp/mailto` and
- * plain email address links.
- *
- * Requires the {@link ngSanitize `ngSanitize`} module to be installed.
- *
- * @param {string} text Input text.
- * @param {string} target Window (`_blank|_self|_parent|_top`) or named frame to open links in.
- * @param {object|function(url)} [attributes] Add custom attributes to the link element.
- *
- *    Can be one of:
- *
- *    - `object`: A map of attributes
- *    - `function`: Takes the url as a parameter and returns a map of attributes
- *
- *    If the map of attributes contains a value for `target`, it overrides the value of
- *    the target parameter.
- *
- *
- * @returns {string} Html-linkified and {@link $sanitize sanitized} text.
- *
- * @usage
-   
- *
- * @example
-   
-     
-       
    
-       Snippet: 
-       
-         
-           
-           
-           
-         
-         
-           
-           
-           
-         
-         
-          
-          
-          
-         
-         
-          
-          
-          
-         
-         
-           
-           
-           
-         
-       
    FilterSourceRendered
    linky filter
-             
    <div ng-bind-html="snippet | linky">
    </div>
    
-               		
-             
    
-           
    linky target
-            
    <div ng-bind-html="snippetWithSingleURL | linky:'_blank'">
    </div>
    
-              		
-            
    
-          
    linky custom attributes
-            
    <div ng-bind-html="snippetWithSingleURL | linky:'_self':{rel: 'nofollow'}">
    </div>
    
-              		
-            
    
-          
    no filter
    <div ng-bind="snippet">
    </div>
    
-     
-     
-       angular.module('linkyExample', ['ngSanitize'])
-         .controller('ExampleController', ['$scope', function($scope) {
-           $scope.snippet =
-             'Pretty text with some links:\n'+
-             'http://angularjs.org/,\n'+
-             'mailto:us@somewhere.org,\n'+
-             'another@somewhere.org,\n'+
-             'and one more: ftp://127.0.0.1/.';
-           $scope.snippetWithSingleURL = 'http://angularjs.org/';
-         }]);
-     
-     
-       it('should linkify the snippet with urls', function() {
-         expect(element(by.id('linky-filter')).element(by.binding('snippet | linky')).getText()).
-             toBe('Pretty text with some links: http://angularjs.org/, us@somewhere.org, ' +
-                  'another@somewhere.org, and one more: ftp://127.0.0.1/.');
-         expect(element.all(by.css('#linky-filter a')).count()).toEqual(4);
-       });
-
-       it('should not linkify snippet without the linky filter', function() {
-         expect(element(by.id('escaped-html')).element(by.binding('snippet')).getText()).
-             toBe('Pretty text with some links: http://angularjs.org/, mailto:us@somewhere.org, ' +
-                  'another@somewhere.org, and one more: ftp://127.0.0.1/.');
-         expect(element.all(by.css('#escaped-html a')).count()).toEqual(0);
-       });
-
-       it('should update', function() {
-         element(by.model('snippet')).clear();
-         element(by.model('snippet')).sendKeys('new http://link.');
-         expect(element(by.id('linky-filter')).element(by.binding('snippet | linky')).getText()).
-             toBe('new http://link.');
-         expect(element.all(by.css('#linky-filter a')).count()).toEqual(1);
-         expect(element(by.id('escaped-html')).element(by.binding('snippet')).getText())
-             .toBe('new http://link.');
-       });
-
-       it('should work with the target property', function() {
-        expect(element(by.id('linky-target')).
-            element(by.binding("snippetWithSingleURL | linky:'_blank'")).getText()).
-            toBe('http://angularjs.org/');
-        expect(element(by.css('#linky-target a')).getAttribute('target')).toEqual('_blank');
-       });
-
-       it('should optionally add custom attributes', function() {
-        expect(element(by.id('linky-custom-attributes')).
-            element(by.binding("snippetWithSingleURL | linky:'_self':{rel: 'nofollow'}")).getText()).
-            toBe('http://angularjs.org/');
-        expect(element(by.css('#linky-custom-attributes a')).getAttribute('rel')).toEqual('nofollow');
-       });
-     
-   
- */
-angular.module('ngSanitize').filter('linky', ['$sanitize', function($sanitize) {
-  var LINKY_URL_REGEXP =
-        /((ftp|https?):\/\/|(www\.)|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>"\u201d\u2019]/i,
-      MAILTO_REGEXP = /^mailto:/i;
-
-  var linkyMinErr = angular.$$minErr('linky');
-  var isString = angular.isString;
-
-  return function(text, target, attributes) {
-    if (text == null || text === '') return text;
-    if (!isString(text)) throw linkyMinErr('notstring', 'Expected string but received: {0}', text);
-
-    var match;
-    var raw = text;
-    var html = [];
-    var url;
-    var i;
-    while ((match = raw.match(LINKY_URL_REGEXP))) {
-      // We can not end in these as they are sometimes found at the end of the sentence
-      url = match[0];
-      // if we did not match ftp/http/www/mailto then assume mailto
-      if (!match[2] && !match[4]) {
-        url = (match[3] ? 'http://' : 'mailto:') + url;
-      }
-      i = match.index;
-      addText(raw.substr(0, i));
-      addLink(url, match[0].replace(MAILTO_REGEXP, ''));
-      raw = raw.substring(i + match[0].length);
-    }
-    addText(raw);
-    return $sanitize(html.join(''));
-
-    function addText(text) {
-      if (!text) {
-        return;
-      }
-      html.push(sanitizeText(text));
-    }
-
-    function addLink(url, text) {
-      var key;
-      html.push('');
-      addText(text);
-      html.push('');
-    }
-  };
-}]);
-
-
-})(window, window.angular);
diff --git a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-sanitize.min.js b/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-sanitize.min.js
deleted file mode 100644
index 135d5a0e8..000000000
--- a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-sanitize.min.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- AngularJS v1.5.0
- (c) 2010-2016 Google, Inc. http://angularjs.org
- License: MIT
-*/
-(function(A,e,B){'use strict';function C(a){var c=[];v(c,e.noop).chars(a);return c.join("")}function h(a,c){var b={},d=a.split(","),l;for(l=0;l=document.documentMode&&n(g);a=g.innerHTML;g.innerHTML=a}while(a!==g.innerHTML);for(b=g.firstChild;b;){switch(b.nodeType){case 1:c.start(b.nodeName.toLowerCase(),E(b.attributes));
-break;case 3:c.chars(b.textContent)}var d;if(!(d=b.firstChild)&&(1==b.nodeType&&c.end(b.nodeName.toLowerCase()),d=b.nextSibling,!d))for(;null==d;){b=b.parentNode;if(b===g)break;d=b.nextSibling;1==b.nodeType&&c.end(b.nodeName.toLowerCase())}b=d}for(;b=g.firstChild;)g.removeChild(b)}function E(a){for(var c={},b=0,d=a.length;b/g,">")}function v(a,c){var b=!1,d=e.bind(a,a.push);return{start:function(a,f){a=e.lowercase(a);!b&&H[a]&&(b=a);b||!0!==t[a]||(d("<"),d(a),e.forEach(f,function(b,f){var g=e.lowercase(f),h="img"===a&&"src"===g||"background"===g;!0!==I[g]||!0===y[g]&&!c(b,h)||(d(" "),d(f),d('="'),d(x(b)),d('"'))}),d(">"))},end:function(a){a=e.lowercase(a);b||!0!==t[a]||!0===z[a]||(d(""));a==
-b&&(b=!1)},chars:function(a){b||d(x(a))}}}function n(a){if(a.nodeType===Node.ELEMENT_NODE)for(var c=a.attributes,b=0,d=c.length;b"\u201d\u2019]/i,b=/^mailto:/i,d=e.$$minErr("linky"),g=e.isString;return function(f,h,m){function k(a){a&&p.push(C(a))}function q(a,b){var c;p.push("');k(b);p.push("")}if(null==f||""===f)return f;if(!g(f))throw d("notstring",f);for(var r=f,p=[],s,n;f=r.match(c);)s=f[0],f[2]||f[4]||(s=(f[3]?"http://":"mailto:")+s),n=f.index,k(r.substr(0,n)),q(s,f[0].replace(b,"")),r=r.substring(n+f[0].length);k(r);return a(p.join(""))}}])})(window,window.angular);
-//# sourceMappingURL=angular-sanitize.min.js.map
diff --git a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-sanitize.min.js.map b/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-sanitize.min.js.map
deleted file mode 100644
index 7276abd2d..000000000
--- a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-sanitize.min.js.map
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-"version":3,
-"file":"angular-sanitize.min.js",
-"lineCount":14,
-"mappings":"A;;;;;aAKC,SAAQ,CAACA,CAAD,CAASC,CAAT,CAAkBC,CAAlB,CAA6B,CAsMtCC,QAASA,EAAY,CAACC,CAAD,CAAQ,CAC3B,IAAIC,EAAM,EACGC,EAAAC,CAAmBF,CAAnBE,CAAwBN,CAAAO,KAAxBD,CACbH,MAAA,CAAaA,CAAb,CACA,OAAOC,EAAAI,KAAA,CAAS,EAAT,CAJoB,CAyF7BC,QAASA,EAAK,CAACC,CAAD,CAAMC,CAAN,CAAqB,CAAA,IAC7BC,EAAM,EADuB,CACnBC,EAAQH,CAAAI,MAAA,CAAU,GAAV,CADW,CACKC,CACtC,KAAKA,CAAL,CAAS,CAAT,CAAYA,CAAZ,CAAgBF,CAAAG,OAAhB,CAA8BD,CAAA,EAA9B,CACEH,CAAA,CAAID,CAAA,CAAgBX,CAAAiB,UAAA,CAAkBJ,CAAA,CAAME,CAAN,CAAlB,CAAhB,CAA8CF,CAAA,CAAME,CAAN,CAAlD,CAAA,CAA8D,CAAA,CAEhE,OAAOH,EAL0B,CA0CnCM,QAASA,EAAU,CAACC,CAAD,CAAOC,CAAP,CAAgB,CACpB,IAAb,GAAID,CAAJ,EAAqBA,CAArB,GAA8BlB,CAA9B,CACEkB,CADF,CACS,EADT,CAE2B,QAF3B,GAEW,MAAOA,EAFlB,GAGEA,CAHF,CAGS,EAHT,CAGcA,CAHd,CAKAE,EAAAC,UAAA,CAA6BH,CAG7B,KAAII,EAAe,CACnB,GAAG,CACD,GAAqB,CAArB,GAAIA,CAAJ,CACE,KAAMC,EAAA,CAAgB,QAAhB,CAAN,CAEFD,CAAA,EAG6B,GAA7B,EAAIE,QAAAC,aAAJ,EACEC,CAAA,CAAmBN,CAAnB,CAEFF,EAAA,CAAOE,CAAAC,UACPD,EAAAC,UAAA,CAA6BH,CAX5B,CAAH,MAYSA,CAZT,GAYkBE,CAAAC,UAZlB,CAeA,KADIM,CACJ,CADWP,CAAAQ,WACX,CAAOD,CAAP,CAAA,CAAa,CACX,OAAQA,CAAAE,SAAR,EACE,KAAK,CAAL,CACEV,CAAAW,MAAA,CAAcH,CAAAI,SAAAC,YAAA,EAAd,CAA2CC,CAAA,CAAUN,CAAAO,WAAV,CAA3C,CACA;KACF,MAAK,CAAL,CACEf,CAAAjB,MAAA,CAAcyB,CAAAQ,YAAd,CALJ,CASA,IAAIC,CACJ,IAAM,EAAAA,CAAA,CAAWT,CAAAC,WAAX,CAAN,GACuB,CAIhBQ,EAJDT,CAAAE,SAICO,EAHHjB,CAAAkB,IAAA,CAAYV,CAAAI,SAAAC,YAAA,EAAZ,CAGGI,CADLA,CACKA,CADMT,CAAAW,YACNF,CAAAA,CAAAA,CALP,EAMI,IAAA,CAAmB,IAAnB,EAAOA,CAAP,CAAA,CAAyB,CACvBT,CAAA,CAAOA,CAAAY,WACP,IAAIZ,CAAJ,GAAaP,CAAb,CAA+B,KAC/BgB,EAAA,CAAWT,CAAAW,YACU,EAArB,EAAIX,CAAAE,SAAJ,EACEV,CAAAkB,IAAA,CAAYV,CAAAI,SAAAC,YAAA,EAAZ,CALqB,CAU7BL,CAAA,CAAOS,CA3BI,CA8Bb,IAAA,CAAOT,CAAP,CAAcP,CAAAQ,WAAd,CAAA,CACER,CAAAoB,YAAA,CAA6Bb,CAA7B,CAxD+B,CA4DnCM,QAASA,EAAS,CAACQ,CAAD,CAAQ,CAExB,IADA,IAAIC,EAAM,EAAV,CACS5B,EAAI,CADb,CACgB6B,EAAKF,CAAA1B,OAArB,CAAmCD,CAAnC,CAAuC6B,CAAvC,CAA2C7B,CAAA,EAA3C,CAAgD,CAC9C,IAAI8B,EAAOH,CAAA,CAAM3B,CAAN,CACX4B,EAAA,CAAIE,CAAAC,KAAJ,CAAA,CAAiBD,CAAAE,MAF6B,CAIhD,MAAOJ,EANiB,CAiB1BK,QAASA,EAAc,CAACD,CAAD,CAAQ,CAC7B,MAAOA,EAAAE,QAAA,CACG,IADH,CACS,OADT,CAAAA,QAAA,CAEGC,CAFH,CAE0B,QAAQ,CAACH,CAAD,CAAQ,CAC7C,IAAII,EAAKJ,CAAAK,WAAA,CAAiB,CAAjB,CACLC,EAAAA,CAAMN,CAAAK,WAAA,CAAiB,CAAjB,CACV,OAAO,IAAP,EAAgC,IAAhC,EAAiBD,CAAjB,CAAsB,KAAtB;CAA0CE,CAA1C,CAAgD,KAAhD,EAA0D,KAA1D,EAAqE,GAHxB,CAF1C,CAAAJ,QAAA,CAOGK,CAPH,CAO4B,QAAQ,CAACP,CAAD,CAAQ,CAC/C,MAAO,IAAP,CAAcA,CAAAK,WAAA,CAAiB,CAAjB,CAAd,CAAoC,GADW,CAP5C,CAAAH,QAAA,CAUG,IAVH,CAUS,MAVT,CAAAA,QAAA,CAWG,IAXH,CAWS,MAXT,CADsB,CAyB/B5C,QAASA,EAAkB,CAACD,CAAD,CAAMmD,CAAN,CAAoB,CAC7C,IAAIC,EAAuB,CAAA,CAA3B,CACIC,EAAMzD,CAAA0D,KAAA,CAAatD,CAAb,CAAkBA,CAAAuD,KAAlB,CACV,OAAO,CACL5B,MAAOA,QAAQ,CAAC6B,CAAD,CAAMlB,CAAN,CAAa,CAC1BkB,CAAA,CAAM5D,CAAAiB,UAAA,CAAkB2C,CAAlB,CACDJ,EAAAA,CAAL,EAA6BK,CAAA,CAAgBD,CAAhB,CAA7B,GACEJ,CADF,CACyBI,CADzB,CAGKJ,EAAL,EAAoD,CAAA,CAApD,GAA6BM,CAAA,CAAcF,CAAd,CAA7B,GACEH,CAAA,CAAI,GAAJ,CAcA,CAbAA,CAAA,CAAIG,CAAJ,CAaA,CAZA5D,CAAA+D,QAAA,CAAgBrB,CAAhB,CAAuB,QAAQ,CAACK,CAAD,CAAQiB,CAAR,CAAa,CAC1C,IAAIC,EAAKjE,CAAAiB,UAAA,CAAkB+C,CAAlB,CAAT,CACIE,EAAmB,KAAnBA,GAAWN,CAAXM,EAAqC,KAArCA,GAA4BD,CAA5BC,EAAyD,YAAzDA,GAAgDD,CAC3B,EAAA,CAAzB,GAAIE,CAAA,CAAWF,CAAX,CAAJ,EACsB,CAAA,CADtB,GACGG,CAAA,CAASH,CAAT,CADH,EAC8B,CAAAV,CAAA,CAAaR,CAAb,CAAoBmB,CAApB,CAD9B,GAEET,CAAA,CAAI,GAAJ,CAIA,CAHAA,CAAA,CAAIO,CAAJ,CAGA,CAFAP,CAAA,CAAI,IAAJ,CAEA,CADAA,CAAA,CAAIT,CAAA,CAAeD,CAAf,CAAJ,CACA,CAAAU,CAAA,CAAI,GAAJ,CANF,CAH0C,CAA5C,CAYA,CAAAA,CAAA,CAAI,GAAJ,CAfF,CAL0B,CADvB,CAwBLnB,IAAKA,QAAQ,CAACsB,CAAD,CAAM,CACjBA,CAAA,CAAM5D,CAAAiB,UAAA,CAAkB2C,CAAlB,CACDJ,EAAL,EAAoD,CAAA,CAApD,GAA6BM,CAAA,CAAcF,CAAd,CAA7B,EAAkF,CAAA,CAAlF,GAA4DS,CAAA,CAAaT,CAAb,CAA5D,GACEH,CAAA,CAAI,IAAJ,CAEA,CADAA,CAAA,CAAIG,CAAJ,CACA,CAAAH,CAAA,CAAI,GAAJ,CAHF,CAKIG,EAAJ;AAAWJ,CAAX,GACEA,CADF,CACyB,CAAA,CADzB,CAPiB,CAxBd,CAmCLrD,MAAOA,QAAQ,CAACA,CAAD,CAAQ,CAChBqD,CAAL,EACEC,CAAA,CAAIT,CAAA,CAAe7C,CAAf,CAAJ,CAFmB,CAnClB,CAHsC,CAsD/CwB,QAASA,EAAkB,CAACC,CAAD,CAAO,CAChC,GAAIA,CAAAE,SAAJ,GAAsBwC,IAAAC,aAAtB,CAEE,IADA,IAAI7B,EAAQd,CAAAO,WAAZ,CACSpB,EAAI,CADb,CACgByD,EAAI9B,CAAA1B,OAApB,CAAkCD,CAAlC,CAAsCyD,CAAtC,CAAyCzD,CAAA,EAAzC,CAA8C,CAC5C,IAAI0D,EAAW/B,CAAA,CAAM3B,CAAN,CAAf,CACI2D,EAAWD,CAAA3B,KAAAb,YAAA,EACf,IAAiB,WAAjB,GAAIyC,CAAJ,EAA6D,CAA7D,GAAgCA,CAAAC,QAAA,CAAiB,MAAjB,CAAhC,CACE/C,CAAAgD,oBAAA,CAAyBH,CAAzB,CAEA,CADA1D,CAAA,EACA,CAAAyD,CAAA,EAN0C,CAYhD,CADInC,CACJ,CADeT,CAAAC,WACf,GACEF,CAAA,CAAmBU,CAAnB,CAIF,EADAA,CACA,CADWT,CAAAW,YACX,GACEZ,CAAA,CAAmBU,CAAnB,CArB8B,CAxdlC,IAAIb,EAAkBxB,CAAA6E,SAAA,CAAiB,WAAjB,CAAtB,CAkMI3B,EAAwB,iCAlM5B,CAoMEI,EAA0B,eApM5B,CA6MIe,EAAe5D,CAAA,CAAM,wBAAN,CA7MnB,CAiNIqE,EAA8BrE,CAAA,CAAM,gDAAN,CAjNlC,CAkNIsE,EAA+BtE,CAAA,CAAM,OAAN,CAlNnC,CAmNIuE,EAAyBhF,CAAAiF,OAAA,CAAe,EAAf,CACeF,CADf,CAEeD,CAFf,CAnN7B,CAwNII,EAAgBlF,CAAAiF,OAAA,CAAe,EAAf;AAAmBH,CAAnB,CAAgDrE,CAAA,CAAM,qKAAN,CAAhD,CAxNpB,CA6NI0E,EAAiBnF,CAAAiF,OAAA,CAAe,EAAf,CAAmBF,CAAnB,CAAiDtE,CAAA,CAAM,2JAAN,CAAjD,CA7NrB,CAqOI2E,EAAc3E,CAAA,CAAM,wNAAN,CArOlB;AA0OIoD,EAAkBpD,CAAA,CAAM,cAAN,CA1OtB,CA4OIqD,EAAgB9D,CAAAiF,OAAA,CAAe,EAAf,CACeZ,CADf,CAEea,CAFf,CAGeC,CAHf,CAIeH,CAJf,CA5OpB,CAmPIZ,EAAW3D,CAAA,CAAM,8CAAN,CAnPf,CAqPI4E,EAAY5E,CAAA,CAAM,kTAAN,CArPhB,CA6PI6E,EAAW7E,CAAA,CAAM,guCAAN;AAcoE,CAAA,CAdpE,CA7Pf,CA6QI0D,EAAanE,CAAAiF,OAAA,CAAe,EAAf,CACeb,CADf,CAEekB,CAFf,CAGeD,CAHf,CA7QjB,CA0RIhE,CACH,UAAQ,CAACtB,CAAD,CAAS,CAEhB,GAAIA,CAAA0B,SAAJ,EAAuB1B,CAAA0B,SAAA8D,eAAvB,CACEC,CAAA,CAAMzF,CAAA0B,SAAA8D,eAAAE,mBAAA,CAAkD,OAAlD,CADR,KAGE,MAAMjE,EAAA,CAAgB,SAAhB,CAAN,CAGF,IAAIkE,EAAeC,CADFH,CAAAI,gBACED,EADqBH,CAAAK,mBAAA,EACrBF,sBAAA,CAAgC,MAAhC,CAGS,EAA5B,GAAID,CAAA1E,OAAJ,CACEK,CADF,CACqBqE,CAAA,CAAa,CAAb,CADrB,EAGMvE,CAGJ,CAHWqE,CAAAM,cAAA,CAAkB,MAAlB,CAGX,CAFAzE,CAEA,CAFmBmE,CAAAM,cAAA,CAAkB,MAAlB,CAEnB,CADA3E,CAAA4E,YAAA,CAAiB1E,CAAjB,CACA,CAAAmE,CAAAO,YAAA,CAAgB5E,CAAhB,CANF,CAXgB,CAAjB,CAAD,CAmBGpB,CAnBH,CAyNAC,EAAAgG,OAAA,CAAe,YAAf,CAA6B,EAA7B,CAAAC,SAAA,CAA0C,WAA1C,CApXAC,QAA0B,EAAG,CAC3B,IAAIC,EAAa,CAAA,CAEjB,KAAAC,KAAA,CAAY,CAAC,eAAD,CAAkB,QAAQ,CAACC,CAAD,CAAgB,CAChDF,CAAJ,EACEnG,CAAAiF,OAAA,CAAenB,CAAf,CAA8BsB,CAA9B,CAEF,OAAO,SAAQ,CAACjE,CAAD,CAAO,CACpB,IAAIf;AAAM,EACVc,EAAA,CAAWC,CAAX,CAAiBd,CAAA,CAAmBD,CAAnB,CAAwB,QAAQ,CAACkG,CAAD,CAAMpC,CAAN,CAAe,CAC9D,MAAO,CAAC,UAAAqC,KAAA,CAAgBF,CAAA,CAAcC,CAAd,CAAmBpC,CAAnB,CAAhB,CADsD,CAA/C,CAAjB,CAGA,OAAO9D,EAAAI,KAAA,CAAS,EAAT,CALa,CAJ8B,CAA1C,CA4CZ,KAAAgG,UAAA,CAAiBC,QAAQ,CAACD,CAAD,CAAY,CACnC,MAAIxG,EAAA0G,UAAA,CAAkBF,CAAlB,CAAJ,EACEL,CACO,CADMK,CACN,CAAA,IAFT,EAISL,CAL0B,CA/CV,CAoX7B,CAmIAnG,EAAAgG,OAAA,CAAe,YAAf,CAAAW,OAAA,CAAoC,OAApC,CAA6C,CAAC,WAAD,CAAc,QAAQ,CAACC,CAAD,CAAY,CAAA,IACzEC,EACE,yFAFuE,CAGzEC,EAAgB,WAHyD,CAKzEC,EAAc/G,CAAA6E,SAAA,CAAiB,OAAjB,CAL2D,CAMzEmC,EAAWhH,CAAAgH,SAEf,OAAO,SAAQ,CAACC,CAAD,CAAOC,CAAP,CAAe/E,CAAf,CAA2B,CAwBxCgF,QAASA,EAAO,CAACF,CAAD,CAAO,CAChBA,CAAL,EAGA9F,CAAAwC,KAAA,CAAUzD,CAAA,CAAa+G,CAAb,CAAV,CAJqB,CAOvBG,QAASA,EAAO,CAACC,CAAD,CAAMJ,CAAN,CAAY,CAC1B,IAAIjD,CACJ7C,EAAAwC,KAAA,CAAU,KAAV,CACI3D,EAAAsH,WAAA,CAAmBnF,CAAnB,CAAJ,GACEA,CADF,CACeA,CAAA,CAAWkF,CAAX,CADf,CAGA,IAAIrH,CAAAuH,SAAA,CAAiBpF,CAAjB,CAAJ,CACE,IAAK6B,CAAL,GAAY7B,EAAZ,CACEhB,CAAAwC,KAAA,CAAUK,CAAV;AAAgB,IAAhB,CAAuB7B,CAAA,CAAW6B,CAAX,CAAvB,CAAyC,IAAzC,CAFJ,KAKE7B,EAAA,CAAa,EAEX,EAAAnC,CAAA0G,UAAA,CAAkBQ,CAAlB,CAAJ,EAAmC,QAAnC,EAA+C/E,EAA/C,EACEhB,CAAAwC,KAAA,CAAU,UAAV,CACUuD,CADV,CAEU,IAFV,CAIF/F,EAAAwC,KAAA,CAAU,QAAV,CACU0D,CAAApE,QAAA,CAAY,IAAZ,CAAkB,QAAlB,CADV,CAEU,IAFV,CAGAkE,EAAA,CAAQF,CAAR,CACA9F,EAAAwC,KAAA,CAAU,MAAV,CAtB0B,CA9B5B,GAAY,IAAZ,EAAIsD,CAAJ,EAA6B,EAA7B,GAAoBA,CAApB,CAAiC,MAAOA,EACxC,IAAK,CAAAD,CAAA,CAASC,CAAT,CAAL,CAAqB,KAAMF,EAAA,CAAY,WAAZ,CAA8DE,CAA9D,CAAN,CAOrB,IAJA,IAAIO,EAAMP,CAAV,CACI9F,EAAO,EADX,CAEIkG,CAFJ,CAGItG,CACJ,CAAQ0G,CAAR,CAAgBD,CAAAC,MAAA,CAAUZ,CAAV,CAAhB,CAAA,CAEEQ,CAQA,CARMI,CAAA,CAAM,CAAN,CAQN,CANKA,CAAA,CAAM,CAAN,CAML,EANkBA,CAAA,CAAM,CAAN,CAMlB,GALEJ,CAKF,EALSI,CAAA,CAAM,CAAN,CAAA,CAAW,SAAX,CAAuB,SAKhC,EAL6CJ,CAK7C,EAHAtG,CAGA,CAHI0G,CAAAC,MAGJ,CAFAP,CAAA,CAAQK,CAAAG,OAAA,CAAW,CAAX,CAAc5G,CAAd,CAAR,CAEA,CADAqG,CAAA,CAAQC,CAAR,CAAaI,CAAA,CAAM,CAAN,CAAAxE,QAAA,CAAiB6D,CAAjB,CAAgC,EAAhC,CAAb,CACA,CAAAU,CAAA,CAAMA,CAAAI,UAAA,CAAc7G,CAAd,CAAkB0G,CAAA,CAAM,CAAN,CAAAzG,OAAlB,CAERmG,EAAA,CAAQK,CAAR,CACA,OAAOZ,EAAA,CAAUzF,CAAAX,KAAA,CAAU,EAAV,CAAV,CAtBiC,CARmC,CAAlC,CAA7C,CApoBsC,CAArC,CAAD,CAusBGT,MAvsBH,CAusBWA,MAAAC,QAvsBX;",
-"sources":["angular-sanitize.js"],
-"names":["window","angular","undefined","sanitizeText","chars","buf","htmlSanitizeWriter","writer","noop","join","toMap","str","lowercaseKeys","obj","items","split","i","length","lowercase","htmlParser","html","handler","inertBodyElement","innerHTML","mXSSAttempts","$sanitizeMinErr","document","documentMode","stripCustomNsAttrs","node","firstChild","nodeType","start","nodeName","toLowerCase","attrToMap","attributes","textContent","nextNode","end","nextSibling","parentNode","removeChild","attrs","map","ii","attr","name","value","encodeEntities","replace","SURROGATE_PAIR_REGEXP","hi","charCodeAt","low","NON_ALPHANUMERIC_REGEXP","uriValidator","ignoreCurrentElement","out","bind","push","tag","blockedElements","validElements","forEach","key","lkey","isImage","validAttrs","uriAttrs","voidElements","Node","ELEMENT_NODE","l","attrNode","attrName","indexOf","removeAttributeNode","$$minErr","optionalEndTagBlockElements","optionalEndTagInlineElements","optionalEndTagElements","extend","blockElements","inlineElements","svgElements","htmlAttrs","svgAttrs","implementation","doc","createHTMLDocument","bodyElements","getElementsByTagName","documentElement","getDocumentElement","createElement","appendChild","module","provider","$SanitizeProvider","svgEnabled","$get","$$sanitizeUri","uri","test","enableSvg","this.enableSvg","isDefined","filter","$sanitize","LINKY_URL_REGEXP","MAILTO_REGEXP","linkyMinErr","isString","text","target","addText","addLink","url","isFunction","isObject","raw","match","index","substr","substring"]
-}
diff --git a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-scenario.js b/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-scenario.js
deleted file mode 100644
index 20af805fc..000000000
--- a/vid/src/main/webapp/app/fusion/external/angular-1.5/angular-scenario.js
+++ /dev/null
@@ -1,41849 +0,0 @@
-/*!
- * jQuery JavaScript Library v2.1.1
- * http://jquery.com/
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- *
- * Copyright 2005, 2014 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2014-05-01T17:11Z
- */
-
-(function( global, factory ) {'use strict';
-
-	if ( typeof module === "object" && typeof module.exports === "object" ) {
-		// For CommonJS and CommonJS-like environments where a proper window is present,
-		// execute the factory and get jQuery
-		// For environments that do not inherently posses a window with a document
-		// (such as Node.js), expose a jQuery-making factory as module.exports
-		// This accentuates the need for the creation of a real window
-		// e.g. var jQuery = require("jquery")(window);
-		// See ticket #14549 for more info
-		module.exports = global.document ?
-			factory( global, true ) :
-			function( w ) {
-				if ( !w.document ) {
-					throw new Error( "jQuery requires a window with a document" );
-				}
-				return factory( w );
-			};
-	} else {
-		factory( global );
-	}
-
-// Pass this if window is not defined yet
-}(typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
-
-// Can't do this because several apps including ASP.NET trace
-// the stack via arguments.caller.callee and Firefox dies if
-// you try to trace through "use strict" call chains. (#13335)
-// Support: Firefox 18+
-//
-
-var arr = [];
-
-var slice = arr.slice;
-
-var concat = arr.concat;
-
-var push = arr.push;
-
-var indexOf = arr.indexOf;
-
-var class2type = {};
-
-var toString = class2type.toString;
-
-var hasOwn = class2type.hasOwnProperty;
-
-var support = {};
-
-
-
-var
-	// Use the correct document accordingly with window argument (sandbox)
-	document = window.document,
-
-	version = "2.1.1",
-
-	// Define a local copy of jQuery
-	jQuery = function( selector, context ) {
-		// The jQuery object is actually just the init constructor 'enhanced'
-		// Need init if jQuery is called (just allow error to be thrown if not included)
-		return new jQuery.fn.init( selector, context );
-	},
-
-	// Support: Android<4.1
-	// Make sure we trim BOM and NBSP
-	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
-
-	// Matches dashed string for camelizing
-	rmsPrefix = /^-ms-/,
-	rdashAlpha = /-([\da-z])/gi,
-
-	// Used by jQuery.camelCase as callback to replace()
-	fcamelCase = function( all, letter ) {
-		return letter.toUpperCase();
-	};
-
-jQuery.fn = jQuery.prototype = {
-	// The current version of jQuery being used
-	jquery: version,
-
-	constructor: jQuery,
-
-	// Start with an empty selector
-	selector: "",
-
-	// The default length of a jQuery object is 0
-	length: 0,
-
-	toArray: function() {
-		return slice.call( this );
-	},
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num != null ?
-
-			// Return just the one element from the set
-			( num < 0 ? this[ num + this.length ] : this[ num ] ) :
-
-			// Return all the elements in a clean array
-			slice.call( this );
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems ) {
-
-		// Build a new jQuery matched element set
-		var ret = jQuery.merge( this.constructor(), elems );
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-		ret.context = this.context;
-
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		}));
-	},
-
-	slice: function() {
-		return this.pushStack( slice.apply( this, arguments ) );
-	},
-
-	first: function() {
-		return this.eq( 0 );
-	},
-
-	last: function() {
-		return this.eq( -1 );
-	},
-
-	eq: function( i ) {
-		var len = this.length,
-			j = +i + ( i < 0 ? len : 0 );
-		return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] );
-	},
-
-	end: function() {
-		return this.prevObject || this.constructor(null);
-	},
-
-	// For internal use only.
-	// Behaves like an Array's method, not like a jQuery method.
-	push: push,
-	sort: arr.sort,
-	splice: arr.splice
-};
-
-jQuery.extend = jQuery.fn.extend = function() {
-	var options, name, src, copy, copyIsArray, clone,
-		target = arguments[0] || {},
-		i = 1,
-		length = arguments.length,
-		deep = false;
-
-	// Handle a deep copy situation
-	if ( typeof target === "boolean" ) {
-		deep = target;
-
-		// skip the boolean and the target
-		target = arguments[ i ] || {};
-		i++;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
-		target = {};
-	}
-
-	// extend jQuery itself if only one argument is passed
-	if ( i === length ) {
-		target = this;
-		i--;
-	}
-
-	for ( ; i < length; i++ ) {
-		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null ) {
-			// Extend the base object
-			for ( name in options ) {
-				src = target[ name ];
-				copy = options[ name ];
-
-				// Prevent never-ending loop
-				if ( target === copy ) {
-					continue;
-				}
-
-				// Recurse if we're merging plain objects or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
-					if ( copyIsArray ) {
-						copyIsArray = false;
-						clone = src && jQuery.isArray(src) ? src : [];
-
-					} else {
-						clone = src && jQuery.isPlainObject(src) ? src : {};
-					}
-
-					// Never move original objects, clone them
-					target[ name ] = jQuery.extend( deep, clone, copy );
-
-				// Don't bring in undefined values
-				} else if ( copy !== undefined ) {
-					target[ name ] = copy;
-				}
-			}
-		}
-	}
-
-	// Return the modified object
-	return target;
-};
-
-jQuery.extend({
-	// Unique for each copy of jQuery on the page
-	expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ),
-
-	// Assume jQuery is ready without the ready module
-	isReady: true,
-
-	error: function( msg ) {
-		throw new Error( msg );
-	},
-
-	noop: function() {},
-
-	// See test/unit/core.js for details concerning isFunction.
-	// Since version 1.3, DOM methods and functions like alert
-	// aren't supported. They return false on IE (#2968).
-	isFunction: function( obj ) {
-		return jQuery.type(obj) === "function";
-	},
-
-	isArray: Array.isArray,
-
-	isWindow: function( obj ) {
-		return obj != null && obj === obj.window;
-	},
-
-	isNumeric: function( obj ) {
-		// parseFloat NaNs numeric-cast false positives (null|true|false|"")
-		// ...but misinterprets leading-number strings, particularly hex literals ("0x...")
-		// subtraction forces infinities to NaN
-		return !jQuery.isArray( obj ) && obj - parseFloat( obj ) >= 0;
-	},
-
-	isPlainObject: function( obj ) {
-		// Not plain objects:
-		// - Any object or value whose internal [[Class]] property is not "[object Object]"
-		// - DOM nodes
-		// - window
-		if ( jQuery.type( obj ) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-			return false;
-		}
-
-		if ( obj.constructor &&
-				!hasOwn.call( obj.constructor.prototype, "isPrototypeOf" ) ) {
-			return false;
-		}
-
-		// If the function hasn't returned already, we're confident that
-		// |obj| is a plain object, created by {} or constructed with new Object
-		return true;
-	},
-
-	isEmptyObject: function( obj ) {
-		var name;
-		for ( name in obj ) {
-			return false;
-		}
-		return true;
-	},
-
-	type: function( obj ) {
-		if ( obj == null ) {
-			return obj + "";
-		}
-		// Support: Android < 4.0, iOS < 6 (functionish RegExp)
-		return typeof obj === "object" || typeof obj === "function" ?
-			class2type[ toString.call(obj) ] || "object" :
-			typeof obj;
-	},
-
-	// Evaluates a script in a global context
-	globalEval: function( code ) {
-		var script,
-			indirect = eval;
-
-		code = jQuery.trim( code );
-
-		if ( code ) {
-			// If the code includes a valid, prologue position
-			// strict mode pragma, execute code by injecting a
-			// script tag into the document.
-			if ( code.indexOf("use strict") === 1 ) {
-				script = document.createElement("script");
-				script.text = code;
-				document.head.appendChild( script ).parentNode.removeChild( script );
-			} else {
-			// Otherwise, avoid the DOM node creation, insertion
-			// and removal by using an indirect global eval
-				indirect( code );
-			}
-		}
-	},
-
-	// Convert dashed to camelCase; used by the css and data modules
-	// Microsoft forgot to hump their vendor prefix (#9572)
-	camelCase: function( string ) {
-		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
-	},
-
-	// args is for internal usage only
-	each: function( obj, callback, args ) {
-		var value,
-			i = 0,
-			length = obj.length,
-			isArray = isArraylike( obj );
-
-		if ( args ) {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			}
-
-		// A special, fast, case for the most common use of each
-		} else {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			}
-		}
-
-		return obj;
-	},
-
-	// Support: Android<4.1
-	trim: function( text ) {
-		return text == null ?
-			"" :
-			( text + "" ).replace( rtrim, "" );
-	},
-
-	// results is for internal usage only
-	makeArray: function( arr, results ) {
-		var ret = results || [];
-
-		if ( arr != null ) {
-			if ( isArraylike( Object(arr) ) ) {
-				jQuery.merge( ret,
-					typeof arr === "string" ?
-					[ arr ] : arr
-				);
-			} else {
-				push.call( ret, arr );
-			}
-		}
-
-		return ret;
-	},
-
-	inArray: function( elem, arr, i ) {
-		return arr == null ? -1 : indexOf.call( arr, elem, i );
-	},
-
-	merge: function( first, second ) {
-		var len = +second.length,
-			j = 0,
-			i = first.length;
-
-		for ( ; j < len; j++ ) {
-			first[ i++ ] = second[ j ];
-		}
-
-		first.length = i;
-
-		return first;
-	},
-
-	grep: function( elems, callback, invert ) {
-		var callbackInverse,
-			matches = [],
-			i = 0,
-			length = elems.length,
-			callbackExpect = !invert;
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( ; i < length; i++ ) {
-			callbackInverse = !callback( elems[ i ], i );
-			if ( callbackInverse !== callbackExpect ) {
-				matches.push( elems[ i ] );
-			}
-		}
-
-		return matches;
-	},
-
-	// arg is for internal usage only
-	map: function( elems, callback, arg ) {
-		var value,
-			i = 0,
-			length = elems.length,
-			isArray = isArraylike( elems ),
-			ret = [];
-
-		// Go through the array, translating each of the items to their new values
-		if ( isArray ) {
-			for ( ; i < length; i++ ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret.push( value );
-				}
-			}
-
-		// Go through every key on the object,
-		} else {
-			for ( i in elems ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret.push( value );
-				}
-			}
-		}
-
-		// Flatten any nested arrays
-		return concat.apply( [], ret );
-	},
-
-	// A global GUID counter for objects
-	guid: 1,
-
-	// Bind a function to a context, optionally partially applying any
-	// arguments.
-	proxy: function( fn, context ) {
-		var tmp, args, proxy;
-
-		if ( typeof context === "string" ) {
-			tmp = fn[ context ];
-			context = fn;
-			fn = tmp;
-		}
-
-		// Quick check to determine if target is callable, in the spec
-		// this throws a TypeError, but we will just return undefined.
-		if ( !jQuery.isFunction( fn ) ) {
-			return undefined;
-		}
-
-		// Simulated bind
-		args = slice.call( arguments, 2 );
-		proxy = function() {
-			return fn.apply( context || this, args.concat( slice.call( arguments ) ) );
-		};
-
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		proxy.guid = fn.guid = fn.guid || jQuery.guid++;
-
-		return proxy;
-	},
-
-	now: Date.now,
-
-	// jQuery.support is not used in Core but other projects attach their
-	// properties to it so it needs to exist.
-	support: support
-});
-
-// Populate the class2type map
-jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-});
-
-function isArraylike( obj ) {
-	var length = obj.length,
-		type = jQuery.type( obj );
-
-	if ( type === "function" || jQuery.isWindow( obj ) ) {
-		return false;
-	}
-
-	if ( obj.nodeType === 1 && length ) {
-		return true;
-	}
-
-	return type === "array" || length === 0 ||
-		typeof length === "number" && length > 0 && ( length - 1 ) in obj;
-}
-var Sizzle =
-/*!
- * Sizzle CSS Selector Engine v1.10.19
- * http://sizzlejs.com/
- *
- * Copyright 2013 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2014-04-18
- */
-(function( window ) {
-
-var i,
-	support,
-	Expr,
-	getText,
-	isXML,
-	tokenize,
-	compile,
-	select,
-	outermostContext,
-	sortInput,
-	hasDuplicate,
-
-	// Local document vars
-	setDocument,
-	document,
-	docElem,
-	documentIsHTML,
-	rbuggyQSA,
-	rbuggyMatches,
-	matches,
-	contains,
-
-	// Instance-specific data
-	expando = "sizzle" + -(new Date()),
-	preferredDoc = window.document,
-	dirruns = 0,
-	done = 0,
-	classCache = createCache(),
-	tokenCache = createCache(),
-	compilerCache = createCache(),
-	sortOrder = function( a, b ) {
-		if ( a === b ) {
-			hasDuplicate = true;
-		}
-		return 0;
-	},
-
-	// General-purpose constants
-	strundefined = typeof undefined,
-	MAX_NEGATIVE = 1 << 31,
-
-	// Instance methods
-	hasOwn = ({}).hasOwnProperty,
-	arr = [],
-	pop = arr.pop,
-	push_native = arr.push,
-	push = arr.push,
-	slice = arr.slice,
-	// Use a stripped-down indexOf if we can't use a native one
-	indexOf = arr.indexOf || function( elem ) {
-		var i = 0,
-			len = this.length;
-		for ( ; i < len; i++ ) {
-			if ( this[i] === elem ) {
-				return i;
-			}
-		}
-		return -1;
-	},
-
-	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
-
-	// Regular expressions
-
-	// Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
-	whitespace = "[\\x20\\t\\r\\n\\f]",
-	// http://www.w3.org/TR/css3-syntax/#characters
-	characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
-
-	// Loosely modeled on CSS identifier characters
-	// An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors
-	// Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
-	identifier = characterEncoding.replace( "w", "w#" ),
-
-	// Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
-	attributes = "\\[" + whitespace + "*(" + characterEncoding + ")(?:" + whitespace +
-		// Operator (capture 2)
-		"*([*^$|!~]?=)" + whitespace +
-		// "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]"
-		"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace +
-		"*\\]",
-
-	pseudos = ":(" + characterEncoding + ")(?:\\((" +
-		// To reduce the number of selectors needing tokenize in the preFilter, prefer arguments:
-		// 1. quoted (capture 3; capture 4 or capture 5)
-		"('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" +
-		// 2. simple (capture 6)
-		"((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" +
-		// 3. anything else (capture 2)
-		".*" +
-		")\\)|)",
-
-	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
-	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
-
-	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
-	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
-
-	rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ),
-
-	rpseudo = new RegExp( pseudos ),
-	ridentifier = new RegExp( "^" + identifier + "$" ),
-
-	matchExpr = {
-		"ID": new RegExp( "^#(" + characterEncoding + ")" ),
-		"CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
-		"TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
-		"ATTR": new RegExp( "^" + attributes ),
-		"PSEUDO": new RegExp( "^" + pseudos ),
-		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
-			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
-			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
-		"bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
-		// For use in libraries implementing .is()
-		// We use this for POS matching in `select`
-		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
-			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
-	},
-
-	rinputs = /^(?:input|select|textarea|button)$/i,
-	rheader = /^h\d$/i,
-
-	rnative = /^[^{]+\{\s*\[native \w/,
-
-	// Easily-parseable/retrievable ID or TAG or CLASS selectors
-	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
-
-	rsibling = /[+~]/,
-	rescape = /'|\\/g,
-
-	// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
-	runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
-	funescape = function( _, escaped, escapedWhitespace ) {
-		var high = "0x" + escaped - 0x10000;
-		// NaN means non-codepoint
-		// Support: Firefox<24
-		// Workaround erroneous numeric interpretation of +"0x"
-		return high !== high || escapedWhitespace ?
-			escaped :
-			high < 0 ?
-				// BMP codepoint
-				String.fromCharCode( high + 0x10000 ) :
-				// Supplemental Plane codepoint (surrogate pair)
-				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
-	};
-
-// Optimize for push.apply( _, NodeList )
-try {
-	push.apply(
-		(arr = slice.call( preferredDoc.childNodes )),
-		preferredDoc.childNodes
-	);
-	// Support: Android<4.0
-	// Detect silently failing push.apply
-	arr[ preferredDoc.childNodes.length ].nodeType;
-} catch ( e ) {
-	push = { apply: arr.length ?
-
-		// Leverage slice if possible
-		function( target, els ) {
-			push_native.apply( target, slice.call(els) );
-		} :
-
-		// Support: IE<9
-		// Otherwise append directly
-		function( target, els ) {
-			var j = target.length,
-				i = 0;
-			// Can't trust NodeList.length
-			while ( (target[j++] = els[i++]) ) {}
-			target.length = j - 1;
-		}
-	};
-}
-
-function Sizzle( selector, context, results, seed ) {
-	var match, elem, m, nodeType,
-		// QSA vars
-		i, groups, old, nid, newContext, newSelector;
-
-	if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
-		setDocument( context );
-	}
-
-	context = context || document;
-	results = results || [];
-
-	if ( !selector || typeof selector !== "string" ) {
-		return results;
-	}
-
-	if ( (nodeType = context.nodeType) !== 1 && nodeType !== 9 ) {
-		return [];
-	}
-
-	if ( documentIsHTML && !seed ) {
-
-		// Shortcuts
-		if ( (match = rquickExpr.exec( selector )) ) {
-			// Speed-up: Sizzle("#ID")
-			if ( (m = match[1]) ) {
-				if ( nodeType === 9 ) {
-					elem = context.getElementById( m );
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document (jQuery #6963)
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE, Opera, and Webkit return items
-						// by name instead of ID
-						if ( elem.id === m ) {
-							results.push( elem );
-							return results;
-						}
-					} else {
-						return results;
-					}
-				} else {
-					// Context is not a document
-					if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
-						contains( context, elem ) && elem.id === m ) {
-						results.push( elem );
-						return results;
-					}
-				}
-
-			// Speed-up: Sizzle("TAG")
-			} else if ( match[2] ) {
-				push.apply( results, context.getElementsByTagName( selector ) );
-				return results;
-
-			// Speed-up: Sizzle(".CLASS")
-			} else if ( (m = match[3]) && support.getElementsByClassName && context.getElementsByClassName ) {
-				push.apply( results, context.getElementsByClassName( m ) );
-				return results;
-			}
-		}
-
-		// QSA path
-		if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
-			nid = old = expando;
-			newContext = context;
-			newSelector = nodeType === 9 && selector;
-
-			// qSA works strangely on Element-rooted queries
-			// We can work around this by specifying an extra ID on the root
-			// and working up from there (Thanks to Andrew Dupont for the technique)
-			// IE 8 doesn't work on object elements
-			if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
-				groups = tokenize( selector );
-
-				if ( (old = context.getAttribute("id")) ) {
-					nid = old.replace( rescape, "\\$&" );
-				} else {
-					context.setAttribute( "id", nid );
-				}
-				nid = "[id='" + nid + "'] ";
-
-				i = groups.length;
-				while ( i-- ) {
-					groups[i] = nid + toSelector( groups[i] );
-				}
-				newContext = rsibling.test( selector ) && testContext( context.parentNode ) || context;
-				newSelector = groups.join(",");
-			}
-
-			if ( newSelector ) {
-				try {
-					push.apply( results,
-						newContext.querySelectorAll( newSelector )
-					);
-					return results;
-				} catch(qsaError) {
-				} finally {
-					if ( !old ) {
-						context.removeAttribute("id");
-					}
-				}
-			}
-		}
-	}
-
-	// All others
-	return select( selector.replace( rtrim, "$1" ), context, results, seed );
-}
-
-/**
- * Create key-value caches of limited size
- * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
- *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
- *	deleting the oldest entry
- */
-function createCache() {
-	var keys = [];
-
-	function cache( key, value ) {
-		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
-		if ( keys.push( key + " " ) > Expr.cacheLength ) {
-			// Only keep the most recent entries
-			delete cache[ keys.shift() ];
-		}
-		return (cache[ key + " " ] = value);
-	}
-	return cache;
-}
-
-/**
- * Mark a function for special use by Sizzle
- * @param {Function} fn The function to mark
- */
-function markFunction( fn ) {
-	fn[ expando ] = true;
-	return fn;
-}
-
-/**
- * Support testing using an element
- * @param {Function} fn Passed the created div and expects a boolean result
- */
-function assert( fn ) {
-	var div = document.createElement("div");
-
-	try {
-		return !!fn( div );
-	} catch (e) {
-		return false;
-	} finally {
-		// Remove from its parent by default
-		if ( div.parentNode ) {
-			div.parentNode.removeChild( div );
-		}
-		// release memory in IE
-		div = null;
-	}
-}
-
-/**
- * Adds the same handler for all of the specified attrs
- * @param {String} attrs Pipe-separated list of attributes
- * @param {Function} handler The method that will be applied
- */
-function addHandle( attrs, handler ) {
-	var arr = attrs.split("|"),
-		i = attrs.length;
-
-	while ( i-- ) {
-		Expr.attrHandle[ arr[i] ] = handler;
-	}
-}
-
-/**
- * Checks document order of two siblings
- * @param {Element} a
- * @param {Element} b
- * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
- */
-function siblingCheck( a, b ) {
-	var cur = b && a,
-		diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
-			( ~b.sourceIndex || MAX_NEGATIVE ) -
-			( ~a.sourceIndex || MAX_NEGATIVE );
-
-	// Use IE sourceIndex if available on both nodes
-	if ( diff ) {
-		return diff;
-	}
-
-	// Check if b follows a
-	if ( cur ) {
-		while ( (cur = cur.nextSibling) ) {
-			if ( cur === b ) {
-				return -1;
-			}
-		}
-	}
-
-	return a ? 1 : -1;
-}
-
-/**
- * Returns a function to use in pseudos for input types
- * @param {String} type
- */
-function createInputPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return name === "input" && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for buttons
- * @param {String} type
- */
-function createButtonPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return (name === "input" || name === "button") && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for positionals
- * @param {Function} fn
- */
-function createPositionalPseudo( fn ) {
-	return markFunction(function( argument ) {
-		argument = +argument;
-		return markFunction(function( seed, matches ) {
-			var j,
-				matchIndexes = fn( [], seed.length, argument ),
-				i = matchIndexes.length;
-
-			// Match elements found at the specified indexes
-			while ( i-- ) {
-				if ( seed[ (j = matchIndexes[i]) ] ) {
-					seed[j] = !(matches[j] = seed[j]);
-				}
-			}
-		});
-	});
-}
-
-/**
- * Checks a node for validity as a Sizzle context
- * @param {Element|Object=} context
- * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value
- */
-function testContext( context ) {
-	return context && typeof context.getElementsByTagName !== strundefined && context;
-}
-
-// Expose support vars for convenience
-support = Sizzle.support = {};
-
-/**
- * Detects XML nodes
- * @param {Element|Object} elem An element or a document
- * @returns {Boolean} True iff elem is a non-HTML XML node
- */
-isXML = Sizzle.isXML = function( elem ) {
-	// documentElement is verified for cases where it doesn't yet exist
-	// (such as loading iframes in IE - #4833)
-	var documentElement = elem && (elem.ownerDocument || elem).documentElement;
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-/**
- * Sets document-related variables once based on the current document
- * @param {Element|Object} [doc] An element or document object to use to set the document
- * @returns {Object} Returns the current document
- */
-setDocument = Sizzle.setDocument = function( node ) {
-	var hasCompare,
-		doc = node ? node.ownerDocument || node : preferredDoc,
-		parent = doc.defaultView;
-
-	// If no document and documentElement is available, return
-	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
-		return document;
-	}
-
-	// Set our document
-	document = doc;
-	docElem = doc.documentElement;
-
-	// Support tests
-	documentIsHTML = !isXML( doc );
-
-	// Support: IE>8
-	// If iframe document is assigned to "document" variable and if iframe has been reloaded,
-	// IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936
-	// IE6-8 do not support the defaultView property so parent will be undefined
-	if ( parent && parent !== parent.top ) {
-		// IE11 does not have attachEvent, so all must suffer
-		if ( parent.addEventListener ) {
-			parent.addEventListener( "unload", function() {
-				setDocument();
-			}, false );
-		} else if ( parent.attachEvent ) {
-			parent.attachEvent( "onunload", function() {
-				setDocument();
-			});
-		}
-	}
-
-	/* Attributes
-	---------------------------------------------------------------------- */
-
-	// Support: IE<8
-	// Verify that getAttribute really returns attributes and not properties (excepting IE8 booleans)
-	support.attributes = assert(function( div ) {
-		div.className = "i";
-		return !div.getAttribute("className");
-	});
-
-	/* getElement(s)By*
-	---------------------------------------------------------------------- */
-
-	// Check if getElementsByTagName("*") returns only elements
-	support.getElementsByTagName = assert(function( div ) {
-		div.appendChild( doc.createComment("") );
-		return !div.getElementsByTagName("*").length;
-	});
-
-	// Check if getElementsByClassName can be trusted
-	support.getElementsByClassName = rnative.test( doc.getElementsByClassName ) && assert(function( div ) {
-		div.innerHTML = "
    ";
-
-		// Support: Safari<4
-		// Catch class over-caching
-		div.firstChild.className = "i";
-		// Support: Opera<10
-		// Catch gEBCN failure to find non-leading classes
-		return div.getElementsByClassName("i").length === 2;
-	});
-
-	// Support: IE<10
-	// Check if getElementById returns elements by name
-	// The broken getElementById methods don't pick up programatically-set names,
-	// so use a roundabout getElementsByName test
-	support.getById = assert(function( div ) {
-		docElem.appendChild( div ).id = expando;
-		return !doc.getElementsByName || !doc.getElementsByName( expando ).length;
-	});
-
-	// ID find and filter
-	if ( support.getById ) {
-		Expr.find["ID"] = function( id, context ) {
-			if ( typeof context.getElementById !== strundefined && documentIsHTML ) {
-				var m = context.getElementById( id );
-				// Check parentNode to catch when Blackberry 4.6 returns
-				// nodes that are no longer in the document #6963
-				return m && m.parentNode ? [ m ] : [];
-			}
-		};
-		Expr.filter["ID"] = function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				return elem.getAttribute("id") === attrId;
-			};
-		};
-	} else {
-		// Support: IE6/7
-		// getElementById is not reliable as a find shortcut
-		delete Expr.find["ID"];
-
-		Expr.filter["ID"] =  function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id");
-				return node && node.value === attrId;
-			};
-		};
-	}
-
-	// Tag
-	Expr.find["TAG"] = support.getElementsByTagName ?
-		function( tag, context ) {
-			if ( typeof context.getElementsByTagName !== strundefined ) {
-				return context.getElementsByTagName( tag );
-			}
-		} :
-		function( tag, context ) {
-			var elem,
-				tmp = [],
-				i = 0,
-				results = context.getElementsByTagName( tag );
-
-			// Filter out possible comments
-			if ( tag === "*" ) {
-				while ( (elem = results[i++]) ) {
-					if ( elem.nodeType === 1 ) {
-						tmp.push( elem );
-					}
-				}
-
-				return tmp;
-			}
-			return results;
-		};
-
-	// Class
-	Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
-		if ( typeof context.getElementsByClassName !== strundefined && documentIsHTML ) {
-			return context.getElementsByClassName( className );
-		}
-	};
-
-	/* QSA/matchesSelector
-	---------------------------------------------------------------------- */
-
-	// QSA and matchesSelector support
-
-	// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
-	rbuggyMatches = [];
-
-	// qSa(:focus) reports false when true (Chrome 21)
-	// We allow this because of a bug in IE8/9 that throws an error
-	// whenever `document.activeElement` is accessed on an iframe
-	// So, we allow :focus to pass through QSA all the time to avoid the IE error
-	// See http://bugs.jquery.com/ticket/13378
-	rbuggyQSA = [];
-
-	if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) {
-		// Build QSA regex
-		// Regex strategy adopted from Diego Perini
-		assert(function( div ) {
-			// Select is set to empty string on purpose
-			// This is to test IE's treatment of not explicitly
-			// setting a boolean content attribute,
-			// since its presence should be enough
-			// http://bugs.jquery.com/ticket/12359
-			div.innerHTML = "";
-
-			// Support: IE8, Opera 11-12.16
-			// Nothing should be selected when empty strings follow ^= or $= or *=
-			// The test attribute must be unknown in Opera but "safe" for WinRT
-			// http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
-			if ( div.querySelectorAll("[msallowclip^='']").length ) {
-				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
-			}
-
-			// Support: IE8
-			// Boolean attributes and "value" are not treated correctly
-			if ( !div.querySelectorAll("[selected]").length ) {
-				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
-			}
-
-			// Webkit/Opera - :checked should return selected option elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":checked").length ) {
-				rbuggyQSA.push(":checked");
-			}
-		});
-
-		assert(function( div ) {
-			// Support: Windows 8 Native Apps
-			// The type and name attributes are restricted during .innerHTML assignment
-			var input = doc.createElement("input");
-			input.setAttribute( "type", "hidden" );
-			div.appendChild( input ).setAttribute( "name", "D" );
-
-			// Support: IE8
-			// Enforce case-sensitivity of name attribute
-			if ( div.querySelectorAll("[name=d]").length ) {
-				rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
-			}
-
-			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":enabled").length ) {
-				rbuggyQSA.push( ":enabled", ":disabled" );
-			}
-
-			// Opera 10-11 does not throw on post-comma invalid pseudos
-			div.querySelectorAll("*,:x");
-			rbuggyQSA.push(",.*:");
-		});
-	}
-
-	if ( (support.matchesSelector = rnative.test( (matches = docElem.matches ||
-		docElem.webkitMatchesSelector ||
-		docElem.mozMatchesSelector ||
-		docElem.oMatchesSelector ||
-		docElem.msMatchesSelector) )) ) {
-
-		assert(function( div ) {
-			// Check to see if it's possible to do matchesSelector
-			// on a disconnected node (IE 9)
-			support.disconnectedMatch = matches.call( div, "div" );
-
-			// This should fail with an exception
-			// Gecko does not error, returns false instead
-			matches.call( div, "[s!='']:x" );
-			rbuggyMatches.push( "!=", pseudos );
-		});
-	}
-
-	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
-	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
-
-	/* Contains
-	---------------------------------------------------------------------- */
-	hasCompare = rnative.test( docElem.compareDocumentPosition );
-
-	// Element contains another
-	// Purposefully does not implement inclusive descendent
-	// As in, an element does not contain itself
-	contains = hasCompare || rnative.test( docElem.contains ) ?
-		function( a, b ) {
-			var adown = a.nodeType === 9 ? a.documentElement : a,
-				bup = b && b.parentNode;
-			return a === bup || !!( bup && bup.nodeType === 1 && (
-				adown.contains ?
-					adown.contains( bup ) :
-					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
-			));
-		} :
-		function( a, b ) {
-			if ( b ) {
-				while ( (b = b.parentNode) ) {
-					if ( b === a ) {
-						return true;
-					}
-				}
-			}
-			return false;
-		};
-
-	/* Sorting
-	---------------------------------------------------------------------- */
-
-	// Document order sorting
-	sortOrder = hasCompare ?
-	function( a, b ) {
-
-		// Flag for duplicate removal
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		// Sort on method existence if only one input has compareDocumentPosition
-		var compare = !a.compareDocumentPosition - !b.compareDocumentPosition;
-		if ( compare ) {
-			return compare;
-		}
-
-		// Calculate position if both inputs belong to the same document
-		compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ?
-			a.compareDocumentPosition( b ) :
-
-			// Otherwise we know they are disconnected
-			1;
-
-		// Disconnected nodes
-		if ( compare & 1 ||
-			(!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
-
-			// Choose the first element that is related to our preferred document
-			if ( a === doc || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) {
-				return -1;
-			}
-			if ( b === doc || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) {
-				return 1;
-			}
-
-			// Maintain original order
-			return sortInput ?
-				( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
-				0;
-		}
-
-		return compare & 4 ? -1 : 1;
-	} :
-	function( a, b ) {
-		// Exit early if the nodes are identical
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		var cur,
-			i = 0,
-			aup = a.parentNode,
-			bup = b.parentNode,
-			ap = [ a ],
-			bp = [ b ];
-
-		// Parentless nodes are either documents or disconnected
-		if ( !aup || !bup ) {
-			return a === doc ? -1 :
-				b === doc ? 1 :
-				aup ? -1 :
-				bup ? 1 :
-				sortInput ?
-				( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
-				0;
-
-		// If the nodes are siblings, we can do a quick check
-		} else if ( aup === bup ) {
-			return siblingCheck( a, b );
-		}
-
-		// Otherwise we need full lists of their ancestors for comparison
-		cur = a;
-		while ( (cur = cur.parentNode) ) {
-			ap.unshift( cur );
-		}
-		cur = b;
-		while ( (cur = cur.parentNode) ) {
-			bp.unshift( cur );
-		}
-
-		// Walk down the tree looking for a discrepancy
-		while ( ap[i] === bp[i] ) {
-			i++;
-		}
-
-		return i ?
-			// Do a sibling check if the nodes have a common ancestor
-			siblingCheck( ap[i], bp[i] ) :
-
-			// Otherwise nodes in our document sort first
-			ap[i] === preferredDoc ? -1 :
-			bp[i] === preferredDoc ? 1 :
-			0;
-	};
-
-	return doc;
-};
-
-Sizzle.matches = function( expr, elements ) {
-	return Sizzle( expr, null, null, elements );
-};
-
-Sizzle.matchesSelector = function( elem, expr ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	// Make sure that attribute selectors are quoted
-	expr = expr.replace( rattributeQuotes, "='$1']" );
-
-	if ( support.matchesSelector && documentIsHTML &&
-		( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
-		( !rbuggyQSA     || !rbuggyQSA.test( expr ) ) ) {
-
-		try {
-			var ret = matches.call( elem, expr );
-
-			// IE 9's matchesSelector returns false on disconnected nodes
-			if ( ret || support.disconnectedMatch ||
-					// As well, disconnected nodes are said to be in a document
-					// fragment in IE 9
-					elem.document && elem.document.nodeType !== 11 ) {
-				return ret;
-			}
-		} catch(e) {}
-	}
-
-	return Sizzle( expr, document, null, [ elem ] ).length > 0;
-};
-
-Sizzle.contains = function( context, elem ) {
-	// Set document vars if needed
-	if ( ( context.ownerDocument || context ) !== document ) {
-		setDocument( context );
-	}
-	return contains( context, elem );
-};
-
-Sizzle.attr = function( elem, name ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	var fn = Expr.attrHandle[ name.toLowerCase() ],
-		// Don't get fooled by Object.prototype properties (jQuery #13807)
-		val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
-			fn( elem, name, !documentIsHTML ) :
-			undefined;
-
-	return val !== undefined ?
-		val :
-		support.attributes || !documentIsHTML ?
-			elem.getAttribute( name ) :
-			(val = elem.getAttributeNode(name)) && val.specified ?
-				val.value :
-				null;
-};
-
-Sizzle.error = function( msg ) {
-	throw new Error( "Syntax error, unrecognized expression: " + msg );
-};
-
-/**
- * Document sorting and removing duplicates
- * @param {ArrayLike} results
- */
-Sizzle.uniqueSort = function( results ) {
-	var elem,
-		duplicates = [],
-		j = 0,
-		i = 0;
-
-	// Unless we *know* we can detect duplicates, assume their presence
-	hasDuplicate = !support.detectDuplicates;
-	sortInput = !support.sortStable && results.slice( 0 );
-	results.sort( sortOrder );
-
-	if ( hasDuplicate ) {
-		while ( (elem = results[i++]) ) {
-			if ( elem === results[ i ] ) {
-				j = duplicates.push( i );
-			}
-		}
-		while ( j-- ) {
-			results.splice( duplicates[ j ], 1 );
-		}
-	}
-
-	// Clear input after sorting to release objects
-	// See https://github.com/jquery/sizzle/pull/225
-	sortInput = null;
-
-	return results;
-};
-
-/**
- * Utility function for retrieving the text value of an array of DOM nodes
- * @param {Array|Element} elem
- */
-getText = Sizzle.getText = function( elem ) {
-	var node,
-		ret = "",
-		i = 0,
-		nodeType = elem.nodeType;
-
-	if ( !nodeType ) {
-		// If no nodeType, this is expected to be an array
-		while ( (node = elem[i++]) ) {
-			// Do not traverse comment nodes
-			ret += getText( node );
-		}
-	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
-		// Use textContent for elements
-		// innerText usage removed for consistency of new lines (jQuery #11153)
-		if ( typeof elem.textContent === "string" ) {
-			return elem.textContent;
-		} else {
-			// Traverse its children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				ret += getText( elem );
-			}
-		}
-	} else if ( nodeType === 3 || nodeType === 4 ) {
-		return elem.nodeValue;
-	}
-	// Do not include comment or processing instruction nodes
-
-	return ret;
-};
-
-Expr = Sizzle.selectors = {
-
-	// Can be adjusted by the user
-	cacheLength: 50,
-
-	createPseudo: markFunction,
-
-	match: matchExpr,
-
-	attrHandle: {},
-
-	find: {},
-
-	relative: {
-		">": { dir: "parentNode", first: true },
-		" ": { dir: "parentNode" },
-		"+": { dir: "previousSibling", first: true },
-		"~": { dir: "previousSibling" }
-	},
-
-	preFilter: {
-		"ATTR": function( match ) {
-			match[1] = match[1].replace( runescape, funescape );
-
-			// Move the given value to match[3] whether quoted or unquoted
-			match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape );
-
-			if ( match[2] === "~=" ) {
-				match[3] = " " + match[3] + " ";
-			}
-
-			return match.slice( 0, 4 );
-		},
-
-		"CHILD": function( match ) {
-			/* matches from matchExpr["CHILD"]
-				1 type (only|nth|...)
-				2 what (child|of-type)
-				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
-				4 xn-component of xn+y argument ([+-]?\d*n|)
-				5 sign of xn-component
-				6 x of xn-component
-				7 sign of y-component
-				8 y of y-component
-			*/
-			match[1] = match[1].toLowerCase();
-
-			if ( match[1].slice( 0, 3 ) === "nth" ) {
-				// nth-* requires argument
-				if ( !match[3] ) {
-					Sizzle.error( match[0] );
-				}
-
-				// numeric x and y parameters for Expr.filter.CHILD
-				// remember that false/true cast respectively to 0/1
-				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
-				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
-
-			// other types prohibit arguments
-			} else if ( match[3] ) {
-				Sizzle.error( match[0] );
-			}
-
-			return match;
-		},
-
-		"PSEUDO": function( match ) {
-			var excess,
-				unquoted = !match[6] && match[2];
-
-			if ( matchExpr["CHILD"].test( match[0] ) ) {
-				return null;
-			}
-
-			// Accept quoted arguments as-is
-			if ( match[3] ) {
-				match[2] = match[4] || match[5] || "";
-
-			// Strip excess characters from unquoted arguments
-			} else if ( unquoted && rpseudo.test( unquoted ) &&
-				// Get excess from tokenize (recursively)
-				(excess = tokenize( unquoted, true )) &&
-				// advance to the next closing parenthesis
-				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
-
-				// excess is a negative index
-				match[0] = match[0].slice( 0, excess );
-				match[2] = unquoted.slice( 0, excess );
-			}
-
-			// Return only captures needed by the pseudo filter method (type and argument)
-			return match.slice( 0, 3 );
-		}
-	},
-
-	filter: {
-
-		"TAG": function( nodeNameSelector ) {
-			var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
-			return nodeNameSelector === "*" ?
-				function() { return true; } :
-				function( elem ) {
-					return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
-				};
-		},
-
-		"CLASS": function( className ) {
-			var pattern = classCache[ className + " " ];
-
-			return pattern ||
-				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
-				classCache( className, function( elem ) {
-					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== strundefined && elem.getAttribute("class") || "" );
-				});
-		},
-
-		"ATTR": function( name, operator, check ) {
-			return function( elem ) {
-				var result = Sizzle.attr( elem, name );
-
-				if ( result == null ) {
-					return operator === "!=";
-				}
-				if ( !operator ) {
-					return true;
-				}
-
-				result += "";
-
-				return operator === "=" ? result === check :
-					operator === "!=" ? result !== check :
-					operator === "^=" ? check && result.indexOf( check ) === 0 :
-					operator === "*=" ? check && result.indexOf( check ) > -1 :
-					operator === "$=" ? check && result.slice( -check.length ) === check :
-					operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 :
-					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
-					false;
-			};
-		},
-
-		"CHILD": function( type, what, argument, first, last ) {
-			var simple = type.slice( 0, 3 ) !== "nth",
-				forward = type.slice( -4 ) !== "last",
-				ofType = what === "of-type";
-
-			return first === 1 && last === 0 ?
-
-				// Shortcut for :nth-*(n)
-				function( elem ) {
-					return !!elem.parentNode;
-				} :
-
-				function( elem, context, xml ) {
-					var cache, outerCache, node, diff, nodeIndex, start,
-						dir = simple !== forward ? "nextSibling" : "previousSibling",
-						parent = elem.parentNode,
-						name = ofType && elem.nodeName.toLowerCase(),
-						useCache = !xml && !ofType;
-
-					if ( parent ) {
-
-						// :(first|last|only)-(child|of-type)
-						if ( simple ) {
-							while ( dir ) {
-								node = elem;
-								while ( (node = node[ dir ]) ) {
-									if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) {
-										return false;
-									}
-								}
-								// Reverse direction for :only-* (if we haven't yet done so)
-								start = dir = type === "only" && !start && "nextSibling";
-							}
-							return true;
-						}
-
-						start = [ forward ? parent.firstChild : parent.lastChild ];
-
-						// non-xml :nth-child(...) stores cache data on `parent`
-						if ( forward && useCache ) {
-							// Seek `elem` from a previously-cached index
-							outerCache = parent[ expando ] || (parent[ expando ] = {});
-							cache = outerCache[ type ] || [];
-							nodeIndex = cache[0] === dirruns && cache[1];
-							diff = cache[0] === dirruns && cache[2];
-							node = nodeIndex && parent.childNodes[ nodeIndex ];
-
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-
-								// Fallback to seeking `elem` from the start
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								// When found, cache indexes on `parent` and break
-								if ( node.nodeType === 1 && ++diff && node === elem ) {
-									outerCache[ type ] = [ dirruns, nodeIndex, diff ];
-									break;
-								}
-							}
-
-						// Use previously-cached element index if available
-						} else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) {
-							diff = cache[1];
-
-						// xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...)
-						} else {
-							// Use the same loop as above to seek `elem` from the start
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) {
-									// Cache the index of each encountered element
-									if ( useCache ) {
-										(node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ];
-									}
-
-									if ( node === elem ) {
-										break;
-									}
-								}
-							}
-						}
-
-						// Incorporate the offset, then check against cycle size
-						diff -= last;
-						return diff === first || ( diff % first === 0 && diff / first >= 0 );
-					}
-				};
-		},
-
-		"PSEUDO": function( pseudo, argument ) {
-			// pseudo-class names are case-insensitive
-			// http://www.w3.org/TR/selectors/#pseudo-classes
-			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
-			// Remember that setFilters inherits from pseudos
-			var args,
-				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
-					Sizzle.error( "unsupported pseudo: " + pseudo );
-
-			// The user may use createPseudo to indicate that
-			// arguments are needed to create the filter function
-			// just as Sizzle does
-			if ( fn[ expando ] ) {
-				return fn( argument );
-			}
-
-			// But maintain support for old signatures
-			if ( fn.length > 1 ) {
-				args = [ pseudo, pseudo, "", argument ];
-				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
-					markFunction(function( seed, matches ) {
-						var idx,
-							matched = fn( seed, argument ),
-							i = matched.length;
-						while ( i-- ) {
-							idx = indexOf.call( seed, matched[i] );
-							seed[ idx ] = !( matches[ idx ] = matched[i] );
-						}
-					}) :
-					function( elem ) {
-						return fn( elem, 0, args );
-					};
-			}
-
-			return fn;
-		}
-	},
-
-	pseudos: {
-		// Potentially complex pseudos
-		"not": markFunction(function( selector ) {
-			// Trim the selector passed to compile
-			// to avoid treating leading and trailing
-			// spaces as combinators
-			var input = [],
-				results = [],
-				matcher = compile( selector.replace( rtrim, "$1" ) );
-
-			return matcher[ expando ] ?
-				markFunction(function( seed, matches, context, xml ) {
-					var elem,
-						unmatched = matcher( seed, null, xml, [] ),
-						i = seed.length;
-
-					// Match elements unmatched by `matcher`
-					while ( i-- ) {
-						if ( (elem = unmatched[i]) ) {
-							seed[i] = !(matches[i] = elem);
-						}
-					}
-				}) :
-				function( elem, context, xml ) {
-					input[0] = elem;
-					matcher( input, null, xml, results );
-					return !results.pop();
-				};
-		}),
-
-		"has": markFunction(function( selector ) {
-			return function( elem ) {
-				return Sizzle( selector, elem ).length > 0;
-			};
-		}),
-
-		"contains": markFunction(function( text ) {
-			return function( elem ) {
-				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
-			};
-		}),
-
-		// "Whether an element is represented by a :lang() selector
-		// is based solely on the element's language value
-		// being equal to the identifier C,
-		// or beginning with the identifier C immediately followed by "-".
-		// The matching of C against the element's language value is performed case-insensitively.
-		// The identifier C does not have to be a valid language name."
-		// http://www.w3.org/TR/selectors/#lang-pseudo
-		"lang": markFunction( function( lang ) {
-			// lang value must be a valid identifier
-			if ( !ridentifier.test(lang || "") ) {
-				Sizzle.error( "unsupported lang: " + lang );
-			}
-			lang = lang.replace( runescape, funescape ).toLowerCase();
-			return function( elem ) {
-				var elemLang;
-				do {
-					if ( (elemLang = documentIsHTML ?
-						elem.lang :
-						elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
-
-						elemLang = elemLang.toLowerCase();
-						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
-					}
-				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
-				return false;
-			};
-		}),
-
-		// Miscellaneous
-		"target": function( elem ) {
-			var hash = window.location && window.location.hash;
-			return hash && hash.slice( 1 ) === elem.id;
-		},
-
-		"root": function( elem ) {
-			return elem === docElem;
-		},
-
-		"focus": function( elem ) {
-			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
-		},
-
-		// Boolean properties
-		"enabled": function( elem ) {
-			return elem.disabled === false;
-		},
-
-		"disabled": function( elem ) {
-			return elem.disabled === true;
-		},
-
-		"checked": function( elem ) {
-			// In CSS3, :checked should return both checked and selected elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			var nodeName = elem.nodeName.toLowerCase();
-			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
-		},
-
-		"selected": function( elem ) {
-			// Accessing this property makes selected-by-default
-			// options in Safari work properly
-			if ( elem.parentNode ) {
-				elem.parentNode.selectedIndex;
-			}
-
-			return elem.selected === true;
-		},
-
-		// Contents
-		"empty": function( elem ) {
-			// http://www.w3.org/TR/selectors/#empty-pseudo
-			// :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
-			//   but not by others (comment: 8; processing instruction: 7; etc.)
-			// nodeType < 6 works because attributes (2) do not appear as children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				if ( elem.nodeType < 6 ) {
-					return false;
-				}
-			}
-			return true;
-		},
-
-		"parent": function( elem ) {
-			return !Expr.pseudos["empty"]( elem );
-		},
-
-		// Element/input types
-		"header": function( elem ) {
-			return rheader.test( elem.nodeName );
-		},
-
-		"input": function( elem ) {
-			return rinputs.test( elem.nodeName );
-		},
-
-		"button": function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return name === "input" && elem.type === "button" || name === "button";
-		},
-
-		"text": function( elem ) {
-			var attr;
-			return elem.nodeName.toLowerCase() === "input" &&
-				elem.type === "text" &&
-
-				// Support: IE<8
-				// New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
-				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" );
-		},
-
-		// Position-in-collection
-		"first": createPositionalPseudo(function() {
-			return [ 0 ];
-		}),
-
-		"last": createPositionalPseudo(function( matchIndexes, length ) {
-			return [ length - 1 ];
-		}),
-
-		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			return [ argument < 0 ? argument + length : argument ];
-		}),
-
-		"even": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 0;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"odd": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 1;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; --i >= 0; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; ++i < length; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		})
-	}
-};
-
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
-
-// Add button/input type pseudos
-for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
-	Expr.pseudos[ i ] = createInputPseudo( i );
-}
-for ( i in { submit: true, reset: true } ) {
-	Expr.pseudos[ i ] = createButtonPseudo( i );
-}
-
-// Easy API for creating new setFilters
-function setFilters() {}
-setFilters.prototype = Expr.filters = Expr.pseudos;
-Expr.setFilters = new setFilters();
-
-tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
-	var matched, match, tokens, type,
-		soFar, groups, preFilters,
-		cached = tokenCache[ selector + " " ];
-
-	if ( cached ) {
-		return parseOnly ? 0 : cached.slice( 0 );
-	}
-
-	soFar = selector;
-	groups = [];
-	preFilters = Expr.preFilter;
-
-	while ( soFar ) {
-
-		// Comma and first run
-		if ( !matched || (match = rcomma.exec( soFar )) ) {
-			if ( match ) {
-				// Don't consume trailing commas as valid
-				soFar = soFar.slice( match[0].length ) || soFar;
-			}
-			groups.push( (tokens = []) );
-		}
-
-		matched = false;
-
-		// Combinators
-		if ( (match = rcombinators.exec( soFar )) ) {
-			matched = match.shift();
-			tokens.push({
-				value: matched,
-				// Cast descendant combinators to space
-				type: match[0].replace( rtrim, " " )
-			});
-			soFar = soFar.slice( matched.length );
-		}
-
-		// Filters
-		for ( type in Expr.filter ) {
-			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
-				(match = preFilters[ type ]( match ))) ) {
-				matched = match.shift();
-				tokens.push({
-					value: matched,
-					type: type,
-					matches: match
-				});
-				soFar = soFar.slice( matched.length );
-			}
-		}
-
-		if ( !matched ) {
-			break;
-		}
-	}
-
-	// Return the length of the invalid excess
-	// if we're just parsing
-	// Otherwise, throw an error or return tokens
-	return parseOnly ?
-		soFar.length :
-		soFar ?
-			Sizzle.error( selector ) :
-			// Cache the tokens
-			tokenCache( selector, groups ).slice( 0 );
-};
-
-function toSelector( tokens ) {
-	var i = 0,
-		len = tokens.length,
-		selector = "";
-	for ( ; i < len; i++ ) {
-		selector += tokens[i].value;
-	}
-	return selector;
-}
-
-function addCombinator( matcher, combinator, base ) {
-	var dir = combinator.dir,
-		checkNonElements = base && dir === "parentNode",
-		doneName = done++;
-
-	return combinator.first ?
-		// Check against closest ancestor/preceding element
-		function( elem, context, xml ) {
-			while ( (elem = elem[ dir ]) ) {
-				if ( elem.nodeType === 1 || checkNonElements ) {
-					return matcher( elem, context, xml );
-				}
-			}
-		} :
-
-		// Check against all ancestor/preceding elements
-		function( elem, context, xml ) {
-			var oldCache, outerCache,
-				newCache = [ dirruns, doneName ];
-
-			// We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
-			if ( xml ) {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						if ( matcher( elem, context, xml ) ) {
-							return true;
-						}
-					}
-				}
-			} else {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						outerCache = elem[ expando ] || (elem[ expando ] = {});
-						if ( (oldCache = outerCache[ dir ]) &&
-							oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
-
-							// Assign to newCache so results back-propagate to previous elements
-							return (newCache[ 2 ] = oldCache[ 2 ]);
-						} else {
-							// Reuse newcache so results back-propagate to previous elements
-							outerCache[ dir ] = newCache;
-
-							// A match means we're done; a fail means we have to keep checking
-							if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) {
-								return true;
-							}
-						}
-					}
-				}
-			}
-		};
-}
-
-function elementMatcher( matchers ) {
-	return matchers.length > 1 ?
-		function( elem, context, xml ) {
-			var i = matchers.length;
-			while ( i-- ) {
-				if ( !matchers[i]( elem, context, xml ) ) {
-					return false;
-				}
-			}
-			return true;
-		} :
-		matchers[0];
-}
-
-function multipleContexts( selector, contexts, results ) {
-	var i = 0,
-		len = contexts.length;
-	for ( ; i < len; i++ ) {
-		Sizzle( selector, contexts[i], results );
-	}
-	return results;
-}
-
-function condense( unmatched, map, filter, context, xml ) {
-	var elem,
-		newUnmatched = [],
-		i = 0,
-		len = unmatched.length,
-		mapped = map != null;
-
-	for ( ; i < len; i++ ) {
-		if ( (elem = unmatched[i]) ) {
-			if ( !filter || filter( elem, context, xml ) ) {
-				newUnmatched.push( elem );
-				if ( mapped ) {
-					map.push( i );
-				}
-			}
-		}
-	}
-
-	return newUnmatched;
-}
-
-function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
-	if ( postFilter && !postFilter[ expando ] ) {
-		postFilter = setMatcher( postFilter );
-	}
-	if ( postFinder && !postFinder[ expando ] ) {
-		postFinder = setMatcher( postFinder, postSelector );
-	}
-	return markFunction(function( seed, results, context, xml ) {
-		var temp, i, elem,
-			preMap = [],
-			postMap = [],
-			preexisting = results.length,
-
-			// Get initial elements from seed or context
-			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
-
-			// Prefilter to get matcher input, preserving a map for seed-results synchronization
-			matcherIn = preFilter && ( seed || !selector ) ?
-				condense( elems, preMap, preFilter, context, xml ) :
-				elems,
-
-			matcherOut = matcher ?
-				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
-				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
-
-					// ...intermediate processing is necessary
-					[] :
-
-					// ...otherwise use results directly
-					results :
-				matcherIn;
-
-		// Find primary matches
-		if ( matcher ) {
-			matcher( matcherIn, matcherOut, context, xml );
-		}
-
-		// Apply postFilter
-		if ( postFilter ) {
-			temp = condense( matcherOut, postMap );
-			postFilter( temp, [], context, xml );
-
-			// Un-match failing elements by moving them back to matcherIn
-			i = temp.length;
-			while ( i-- ) {
-				if ( (elem = temp[i]) ) {
-					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
-				}
-			}
-		}
-
-		if ( seed ) {
-			if ( postFinder || preFilter ) {
-				if ( postFinder ) {
-					// Get the final matcherOut by condensing this intermediate into postFinder contexts
-					temp = [];
-					i = matcherOut.length;
-					while ( i-- ) {
-						if ( (elem = matcherOut[i]) ) {
-							// Restore matcherIn since elem is not yet a final match
-							temp.push( (matcherIn[i] = elem) );
-						}
-					}
-					postFinder( null, (matcherOut = []), temp, xml );
-				}
-
-				// Move matched elements from seed to results to keep them synchronized
-				i = matcherOut.length;
-				while ( i-- ) {
-					if ( (elem = matcherOut[i]) &&
-						(temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) {
-
-						seed[temp] = !(results[temp] = elem);
-					}
-				}
-			}
-
-		// Add elements to results, through postFinder if defined
-		} else {
-			matcherOut = condense(
-				matcherOut === results ?
-					matcherOut.splice( preexisting, matcherOut.length ) :
-					matcherOut
-			);
-			if ( postFinder ) {
-				postFinder( null, results, matcherOut, xml );
-			} else {
-				push.apply( results, matcherOut );
-			}
-		}
-	});
-}
-
-function matcherFromTokens( tokens ) {
-	var checkContext, matcher, j,
-		len = tokens.length,
-		leadingRelative = Expr.relative[ tokens[0].type ],
-		implicitRelative = leadingRelative || Expr.relative[" "],
-		i = leadingRelative ? 1 : 0,
-
-		// The foundational matcher ensures that elements are reachable from top-level context(s)
-		matchContext = addCombinator( function( elem ) {
-			return elem === checkContext;
-		}, implicitRelative, true ),
-		matchAnyContext = addCombinator( function( elem ) {
-			return indexOf.call( checkContext, elem ) > -1;
-		}, implicitRelative, true ),
-		matchers = [ function( elem, context, xml ) {
-			return ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
-				(checkContext = context).nodeType ?
-					matchContext( elem, context, xml ) :
-					matchAnyContext( elem, context, xml ) );
-		} ];
-
-	for ( ; i < len; i++ ) {
-		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
-			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
-		} else {
-			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
-
-			// Return special upon seeing a positional matcher
-			if ( matcher[ expando ] ) {
-				// Find the next relative operator (if any) for proper handling
-				j = ++i;
-				for ( ; j < len; j++ ) {
-					if ( Expr.relative[ tokens[j].type ] ) {
-						break;
-					}
-				}
-				return setMatcher(
-					i > 1 && elementMatcher( matchers ),
-					i > 1 && toSelector(
-						// If the preceding token was a descendant combinator, insert an implicit any-element `*`
-						tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
-					).replace( rtrim, "$1" ),
-					matcher,
-					i < j && matcherFromTokens( tokens.slice( i, j ) ),
-					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
-					j < len && toSelector( tokens )
-				);
-			}
-			matchers.push( matcher );
-		}
-	}
-
-	return elementMatcher( matchers );
-}
-
-function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
-	var bySet = setMatchers.length > 0,
-		byElement = elementMatchers.length > 0,
-		superMatcher = function( seed, context, xml, results, outermost ) {
-			var elem, j, matcher,
-				matchedCount = 0,
-				i = "0",
-				unmatched = seed && [],
-				setMatched = [],
-				contextBackup = outermostContext,
-				// We must always have either seed elements or outermost context
-				elems = seed || byElement && Expr.find["TAG"]( "*", outermost ),
-				// Use integer dirruns iff this is the outermost matcher
-				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1),
-				len = elems.length;
-
-			if ( outermost ) {
-				outermostContext = context !== document && context;
-			}
-
-			// Add elements passing elementMatchers directly to results
-			// Keep `i` a string if there are no elements so `matchedCount` will be "00" below
-			// Support: IE<9, Safari
-			// Tolerate NodeList properties (IE: "length"; Safari: ) matching elements by id
-			for ( ; i !== len && (elem = elems[i]) != null; i++ ) {
-				if ( byElement && elem ) {
-					j = 0;
-					while ( (matcher = elementMatchers[j++]) ) {
-						if ( matcher( elem, context, xml ) ) {
-							results.push( elem );
-							break;
-						}
-					}
-					if ( outermost ) {
-						dirruns = dirrunsUnique;
-					}
-				}
-
-				// Track unmatched elements for set filters
-				if ( bySet ) {
-					// They will have gone through all possible matchers
-					if ( (elem = !matcher && elem) ) {
-						matchedCount--;
-					}
-
-					// Lengthen the array for every element, matched or not
-					if ( seed ) {
-						unmatched.push( elem );
-					}
-				}
-			}
-
-			// Apply set filters to unmatched elements
-			matchedCount += i;
-			if ( bySet && i !== matchedCount ) {
-				j = 0;
-				while ( (matcher = setMatchers[j++]) ) {
-					matcher( unmatched, setMatched, context, xml );
-				}
-
-				if ( seed ) {
-					// Reintegrate element matches to eliminate the need for sorting
-					if ( matchedCount > 0 ) {
-						while ( i-- ) {
-							if ( !(unmatched[i] || setMatched[i]) ) {
-								setMatched[i] = pop.call( results );
-							}
-						}
-					}
-
-					// Discard index placeholder values to get only actual matches
-					setMatched = condense( setMatched );
-				}
-
-				// Add matches to results
-				push.apply( results, setMatched );
-
-				// Seedless set matches succeeding multiple successful matchers stipulate sorting
-				if ( outermost && !seed && setMatched.length > 0 &&
-					( matchedCount + setMatchers.length ) > 1 ) {
-
-					Sizzle.uniqueSort( results );
-				}
-			}
-
-			// Override manipulation of globals by nested matchers
-			if ( outermost ) {
-				dirruns = dirrunsUnique;
-				outermostContext = contextBackup;
-			}
-
-			return unmatched;
-		};
-
-	return bySet ?
-		markFunction( superMatcher ) :
-		superMatcher;
-}
-
-compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
-	var i,
-		setMatchers = [],
-		elementMatchers = [],
-		cached = compilerCache[ selector + " " ];
-
-	if ( !cached ) {
-		// Generate a function of recursive functions that can be used to check each element
-		if ( !match ) {
-			match = tokenize( selector );
-		}
-		i = match.length;
-		while ( i-- ) {
-			cached = matcherFromTokens( match[i] );
-			if ( cached[ expando ] ) {
-				setMatchers.push( cached );
-			} else {
-				elementMatchers.push( cached );
-			}
-		}
-
-		// Cache the compiled function
-		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
-
-		// Save selector and tokenization
-		cached.selector = selector;
-	}
-	return cached;
-};
-
-/**
- * A low-level selection function that works with Sizzle's compiled
- *  selector functions
- * @param {String|Function} selector A selector or a pre-compiled
- *  selector function built with Sizzle.compile
- * @param {Element} context
- * @param {Array} [results]
- * @param {Array} [seed] A set of elements to match against
- */
-select = Sizzle.select = function( selector, context, results, seed ) {
-	var i, tokens, token, type, find,
-		compiled = typeof selector === "function" && selector,
-		match = !seed && tokenize( (selector = compiled.selector || selector) );
-
-	results = results || [];
-
-	// Try to minimize operations if there is no seed and only one group
-	if ( match.length === 1 ) {
-
-		// Take a shortcut and set the context if the root selector is an ID
-		tokens = match[0] = match[0].slice( 0 );
-		if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
-				support.getById && context.nodeType === 9 && documentIsHTML &&
-				Expr.relative[ tokens[1].type ] ) {
-
-			context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
-			if ( !context ) {
-				return results;
-
-			// Precompiled matchers will still verify ancestry, so step up a level
-			} else if ( compiled ) {
-				context = context.parentNode;
-			}
-
-			selector = selector.slice( tokens.shift().value.length );
-		}
-
-		// Fetch a seed set for right-to-left matching
-		i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
-		while ( i-- ) {
-			token = tokens[i];
-
-			// Abort if we hit a combinator
-			if ( Expr.relative[ (type = token.type) ] ) {
-				break;
-			}
-			if ( (find = Expr.find[ type ]) ) {
-				// Search, expanding context for leading sibling combinators
-				if ( (seed = find(
-					token.matches[0].replace( runescape, funescape ),
-					rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context
-				)) ) {
-
-					// If seed is empty or no tokens remain, we can return early
-					tokens.splice( i, 1 );
-					selector = seed.length && toSelector( tokens );
-					if ( !selector ) {
-						push.apply( results, seed );
-						return results;
-					}
-
-					break;
-				}
-			}
-		}
-	}
-
-	// Compile and execute a filtering function if one is not provided
-	// Provide `match` to avoid retokenization if we modified the selector above
-	( compiled || compile( selector, match ) )(
-		seed,
-		context,
-		!documentIsHTML,
-		results,
-		rsibling.test( selector ) && testContext( context.parentNode ) || context
-	);
-	return results;
-};
-
-// One-time assignments
-
-// Sort stability
-support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
-
-// Support: Chrome<14
-// Always assume duplicates if they aren't passed to the comparison function
-support.detectDuplicates = !!hasDuplicate;
-
-// Initialize against the default document
-setDocument();
-
-// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
-// Detached nodes confoundingly follow *each other*
-support.sortDetached = assert(function( div1 ) {
-	// Should return 1, but returns 4 (following)
-	return div1.compareDocumentPosition( document.createElement("div") ) & 1;
-});
-
-// Support: IE<8
-// Prevent attribute/property "interpolation"
-// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !assert(function( div ) {
-	div.innerHTML = "";
-	return div.firstChild.getAttribute("href") === "#" ;
-}) ) {
-	addHandle( "type|href|height|width", function( elem, name, isXML ) {
-		if ( !isXML ) {
-			return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
-		}
-	});
-}
-
-// Support: IE<9
-// Use defaultValue in place of getAttribute("value")
-if ( !support.attributes || !assert(function( div ) {
-	div.innerHTML = "";
-	div.firstChild.setAttribute( "value", "" );
-	return div.firstChild.getAttribute( "value" ) === "";
-}) ) {
-	addHandle( "value", function( elem, name, isXML ) {
-		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
-			return elem.defaultValue;
-		}
-	});
-}
-
-// Support: IE<9
-// Use getAttributeNode to fetch booleans when getAttribute lies
-if ( !assert(function( div ) {
-	return div.getAttribute("disabled") == null;
-}) ) {
-	addHandle( booleans, function( elem, name, isXML ) {
-		var val;
-		if ( !isXML ) {
-			return elem[ name ] === true ? name.toLowerCase() :
-					(val = elem.getAttributeNode( name )) && val.specified ?
-					val.value :
-				null;
-		}
-	});
-}
-
-return Sizzle;
-
-})( window );
-
-
-
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.pseudos;
-jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-
-
-
-var rneedsContext = jQuery.expr.match.needsContext;
-
-var rsingleTag = (/^<(\w+)\s*\/?>(?:<\/\1>|)$/);
-
-
-
-var risSimple = /^.[^:#\[\.,]*$/;
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, not ) {
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep( elements, function( elem, i ) {
-			/* jshint -W018 */
-			return !!qualifier.call( elem, i, elem ) !== not;
-		});
-
-	}
-
-	if ( qualifier.nodeType ) {
-		return jQuery.grep( elements, function( elem ) {
-			return ( elem === qualifier ) !== not;
-		});
-
-	}
-
-	if ( typeof qualifier === "string" ) {
-		if ( risSimple.test( qualifier ) ) {
-			return jQuery.filter( qualifier, elements, not );
-		}
-
-		qualifier = jQuery.filter( qualifier, elements );
-	}
-
-	return jQuery.grep( elements, function( elem ) {
-		return ( indexOf.call( qualifier, elem ) >= 0 ) !== not;
-	});
-}
-
-jQuery.filter = function( expr, elems, not ) {
-	var elem = elems[ 0 ];
-
-	if ( not ) {
-		expr = ":not(" + expr + ")";
-	}
-
-	return elems.length === 1 && elem.nodeType === 1 ?
-		jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] :
-		jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
-			return elem.nodeType === 1;
-		}));
-};
-
-jQuery.fn.extend({
-	find: function( selector ) {
-		var i,
-			len = this.length,
-			ret = [],
-			self = this;
-
-		if ( typeof selector !== "string" ) {
-			return this.pushStack( jQuery( selector ).filter(function() {
-				for ( i = 0; i < len; i++ ) {
-					if ( jQuery.contains( self[ i ], this ) ) {
-						return true;
-					}
-				}
-			}) );
-		}
-
-		for ( i = 0; i < len; i++ ) {
-			jQuery.find( selector, self[ i ], ret );
-		}
-
-		// Needed because $( selector, context ) becomes $( context ).find( selector )
-		ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
-		ret.selector = this.selector ? this.selector + " " + selector : selector;
-		return ret;
-	},
-	filter: function( selector ) {
-		return this.pushStack( winnow(this, selector || [], false) );
-	},
-	not: function( selector ) {
-		return this.pushStack( winnow(this, selector || [], true) );
-	},
-	is: function( selector ) {
-		return !!winnow(
-			this,
-
-			// If this is a positional/relative selector, check membership in the returned set
-			// so $("p:first").is("p:last") won't return true for a doc with two "p".
-			typeof selector === "string" && rneedsContext.test( selector ) ?
-				jQuery( selector ) :
-				selector || [],
-			false
-		).length;
-	}
-});
-
-
-// Initialize a jQuery object
-
-
-// A central reference to the root jQuery(document)
-var rootjQuery,
-
-	// A simple way to check for HTML strings
-	// Prioritize #id over  to avoid XSS via location.hash (#9521)
-	// Strict HTML recognition (#11290: must start with <)
-	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,
-
-	init = jQuery.fn.init = function( selector, context ) {
-		var match, elem;
-
-		// HANDLE: $(""), $(null), $(undefined), $(false)
-		if ( !selector ) {
-			return this;
-		}
-
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			if ( selector[0] === "<" && selector[ selector.length - 1 ] === ">" && selector.length >= 3 ) {
-				// Assume that strings that start and end with <> are HTML and skip the regex check
-				match = [ null, selector, null ];
-
-			} else {
-				match = rquickExpr.exec( selector );
-			}
-
-			// Match html or make sure no context is specified for #id
-			if ( match && (match[1] || !context) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] ) {
-					context = context instanceof jQuery ? context[0] : context;
-
-					// scripts is true for back-compat
-					// Intentionally let the error be thrown if parseHTML is not present
-					jQuery.merge( this, jQuery.parseHTML(
-						match[1],
-						context && context.nodeType ? context.ownerDocument || context : document,
-						true
-					) );
-
-					// HANDLE: $(html, props)
-					if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
-						for ( match in context ) {
-							// Properties of context are called as methods if possible
-							if ( jQuery.isFunction( this[ match ] ) ) {
-								this[ match ]( context[ match ] );
-
-							// ...and otherwise set as attributes
-							} else {
-								this.attr( match, context[ match ] );
-							}
-						}
-					}
-
-					return this;
-
-				// HANDLE: $(#id)
-				} else {
-					elem = document.getElementById( match[2] );
-
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Inject the element directly into the jQuery object
-						this.length = 1;
-						this[0] = elem;
-					}
-
-					this.context = document;
-					this.selector = selector;
-					return this;
-				}
-
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return ( context || rootjQuery ).find( selector );
-
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return this.constructor( context ).find( selector );
-			}
-
-		// HANDLE: $(DOMElement)
-		} else if ( selector.nodeType ) {
-			this.context = this[0] = selector;
-			this.length = 1;
-			return this;
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return typeof rootjQuery.ready !== "undefined" ?
-				rootjQuery.ready( selector ) :
-				// Execute immediately if ready is not present
-				selector( jQuery );
-		}
-
-		if ( selector.selector !== undefined ) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
-		return jQuery.makeArray( selector, this );
-	};
-
-// Give the init function the jQuery prototype for later instantiation
-init.prototype = jQuery.fn;
-
-// Initialize central reference
-rootjQuery = jQuery( document );
-
-
-var rparentsprev = /^(?:parents|prev(?:Until|All))/,
-	// methods guaranteed to produce a unique set when starting from a unique set
-	guaranteedUnique = {
-		children: true,
-		contents: true,
-		next: true,
-		prev: true
-	};
-
-jQuery.extend({
-	dir: function( elem, dir, until ) {
-		var matched = [],
-			truncate = until !== undefined;
-
-		while ( (elem = elem[ dir ]) && elem.nodeType !== 9 ) {
-			if ( elem.nodeType === 1 ) {
-				if ( truncate && jQuery( elem ).is( until ) ) {
-					break;
-				}
-				matched.push( elem );
-			}
-		}
-		return matched;
-	},
-
-	sibling: function( n, elem ) {
-		var matched = [];
-
-		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType === 1 && n !== elem ) {
-				matched.push( n );
-			}
-		}
-
-		return matched;
-	}
-});
-
-jQuery.fn.extend({
-	has: function( target ) {
-		var targets = jQuery( target, this ),
-			l = targets.length;
-
-		return this.filter(function() {
-			var i = 0;
-			for ( ; i < l; i++ ) {
-				if ( jQuery.contains( this, targets[i] ) ) {
-					return true;
-				}
-			}
-		});
-	},
-
-	closest: function( selectors, context ) {
-		var cur,
-			i = 0,
-			l = this.length,
-			matched = [],
-			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
-				jQuery( selectors, context || this.context ) :
-				0;
-
-		for ( ; i < l; i++ ) {
-			for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) {
-				// Always skip document fragments
-				if ( cur.nodeType < 11 && (pos ?
-					pos.index(cur) > -1 :
-
-					// Don't pass non-elements to Sizzle
-					cur.nodeType === 1 &&
-						jQuery.find.matchesSelector(cur, selectors)) ) {
-
-					matched.push( cur );
-					break;
-				}
-			}
-		}
-
-		return this.pushStack( matched.length > 1 ? jQuery.unique( matched ) : matched );
-	},
-
-	// Determine the position of an element within
-	// the matched set of elements
-	index: function( elem ) {
-
-		// No argument, return index in parent
-		if ( !elem ) {
-			return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1;
-		}
-
-		// index in selector
-		if ( typeof elem === "string" ) {
-			return indexOf.call( jQuery( elem ), this[ 0 ] );
-		}
-
-		// Locate the position of the desired element
-		return indexOf.call( this,
-
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[ 0 ] : elem
-		);
-	},
-
-	add: function( selector, context ) {
-		return this.pushStack(
-			jQuery.unique(
-				jQuery.merge( this.get(), jQuery( selector, context ) )
-			)
-		);
-	},
-
-	addBack: function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter(selector)
-		);
-	}
-});
-
-function sibling( cur, dir ) {
-	while ( (cur = cur[dir]) && cur.nodeType !== 1 ) {}
-	return cur;
-}
-
-jQuery.each({
-	parent: function( elem ) {
-		var parent = elem.parentNode;
-		return parent && parent.nodeType !== 11 ? parent : null;
-	},
-	parents: function( elem ) {
-		return jQuery.dir( elem, "parentNode" );
-	},
-	parentsUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "parentNode", until );
-	},
-	next: function( elem ) {
-		return sibling( elem, "nextSibling" );
-	},
-	prev: function( elem ) {
-		return sibling( elem, "previousSibling" );
-	},
-	nextAll: function( elem ) {
-		return jQuery.dir( elem, "nextSibling" );
-	},
-	prevAll: function( elem ) {
-		return jQuery.dir( elem, "previousSibling" );
-	},
-	nextUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "nextSibling", until );
-	},
-	prevUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "previousSibling", until );
-	},
-	siblings: function( elem ) {
-		return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
-	},
-	children: function( elem ) {
-		return jQuery.sibling( elem.firstChild );
-	},
-	contents: function( elem ) {
-		return elem.contentDocument || jQuery.merge( [], elem.childNodes );
-	}
-}, function( name, fn ) {
-	jQuery.fn[ name ] = function( until, selector ) {
-		var matched = jQuery.map( this, fn, until );
-
-		if ( name.slice( -5 ) !== "Until" ) {
-			selector = until;
-		}
-
-		if ( selector && typeof selector === "string" ) {
-			matched = jQuery.filter( selector, matched );
-		}
-
-		if ( this.length > 1 ) {
-			// Remove duplicates
-			if ( !guaranteedUnique[ name ] ) {
-				jQuery.unique( matched );
-			}
-
-			// Reverse order for parents* and prev-derivatives
-			if ( rparentsprev.test( name ) ) {
-				matched.reverse();
-			}
-		}
-
-		return this.pushStack( matched );
-	};
-});
-var rnotwhite = (/\S+/g);
-
-
-
-// String to Object options format cache
-var optionsCache = {};
-
-// Convert String-formatted options into Object-formatted ones and store in cache
-function createOptions( options ) {
-	var object = optionsCache[ options ] = {};
-	jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) {
-		object[ flag ] = true;
-	});
-	return object;
-}
-
-/*
- * Create a callback list using the following parameters:
- *
- *	options: an optional list of space-separated options that will change how
- *			the callback list behaves or a more traditional option object
- *
- * By default a callback list will act like an event callback list and can be
- * "fired" multiple times.
- *
- * Possible options:
- *
- *	once:			will ensure the callback list can only be fired once (like a Deferred)
- *
- *	memory:			will keep track of previous values and will call any callback added
- *					after the list has been fired right away with the latest "memorized"
- *					values (like a Deferred)
- *
- *	unique:			will ensure a callback can only be added once (no duplicate in the list)
- *
- *	stopOnFalse:	interrupt callings when a callback returns false
- *
- */
-jQuery.Callbacks = function( options ) {
-
-	// Convert options from String-formatted to Object-formatted if needed
-	// (we check in cache first)
-	options = typeof options === "string" ?
-		( optionsCache[ options ] || createOptions( options ) ) :
-		jQuery.extend( {}, options );
-
-	var // Last fire value (for non-forgettable lists)
-		memory,
-		// Flag to know if list was already fired
-		fired,
-		// Flag to know if list is currently firing
-		firing,
-		// First callback to fire (used internally by add and fireWith)
-		firingStart,
-		// End of the loop when firing
-		firingLength,
-		// Index of currently firing callback (modified by remove if needed)
-		firingIndex,
-		// Actual callback list
-		list = [],
-		// Stack of fire calls for repeatable lists
-		stack = !options.once && [],
-		// Fire callbacks
-		fire = function( data ) {
-			memory = options.memory && data;
-			fired = true;
-			firingIndex = firingStart || 0;
-			firingStart = 0;
-			firingLength = list.length;
-			firing = true;
-			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
-				if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
-					memory = false; // To prevent further calls using add
-					break;
-				}
-			}
-			firing = false;
-			if ( list ) {
-				if ( stack ) {
-					if ( stack.length ) {
-						fire( stack.shift() );
-					}
-				} else if ( memory ) {
-					list = [];
-				} else {
-					self.disable();
-				}
-			}
-		},
-		// Actual Callbacks object
-		self = {
-			// Add a callback or a collection of callbacks to the list
-			add: function() {
-				if ( list ) {
-					// First, we save the current length
-					var start = list.length;
-					(function add( args ) {
-						jQuery.each( args, function( _, arg ) {
-							var type = jQuery.type( arg );
-							if ( type === "function" ) {
-								if ( !options.unique || !self.has( arg ) ) {
-									list.push( arg );
-								}
-							} else if ( arg && arg.length && type !== "string" ) {
-								// Inspect recursively
-								add( arg );
-							}
-						});
-					})( arguments );
-					// Do we need to add the callbacks to the
-					// current firing batch?
-					if ( firing ) {
-						firingLength = list.length;
-					// With memory, if we're not firing then
-					// we should call right away
-					} else if ( memory ) {
-						firingStart = start;
-						fire( memory );
-					}
-				}
-				return this;
-			},
-			// Remove a callback from the list
-			remove: function() {
-				if ( list ) {
-					jQuery.each( arguments, function( _, arg ) {
-						var index;
-						while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
-							list.splice( index, 1 );
-							// Handle firing indexes
-							if ( firing ) {
-								if ( index <= firingLength ) {
-									firingLength--;
-								}
-								if ( index <= firingIndex ) {
-									firingIndex--;
-								}
-							}
-						}
-					});
-				}
-				return this;
-			},
-			// Check if a given callback is in the list.
-			// If no argument is given, return whether or not list has callbacks attached.
-			has: function( fn ) {
-				return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length );
-			},
-			// Remove all callbacks from the list
-			empty: function() {
-				list = [];
-				firingLength = 0;
-				return this;
-			},
-			// Have the list do nothing anymore
-			disable: function() {
-				list = stack = memory = undefined;
-				return this;
-			},
-			// Is it disabled?
-			disabled: function() {
-				return !list;
-			},
-			// Lock the list in its current state
-			lock: function() {
-				stack = undefined;
-				if ( !memory ) {
-					self.disable();
-				}
-				return this;
-			},
-			// Is it locked?
-			locked: function() {
-				return !stack;
-			},
-			// Call all callbacks with the given context and arguments
-			fireWith: function( context, args ) {
-				if ( list && ( !fired || stack ) ) {
-					args = args || [];
-					args = [ context, args.slice ? args.slice() : args ];
-					if ( firing ) {
-						stack.push( args );
-					} else {
-						fire( args );
-					}
-				}
-				return this;
-			},
-			// Call all the callbacks with the given arguments
-			fire: function() {
-				self.fireWith( this, arguments );
-				return this;
-			},
-			// To know if the callbacks have already been called at least once
-			fired: function() {
-				return !!fired;
-			}
-		};
-
-	return self;
-};
-
-
-jQuery.extend({
-
-	Deferred: function( func ) {
-		var tuples = [
-				// action, add listener, listener list, final state
-				[ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
-				[ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
-				[ "notify", "progress", jQuery.Callbacks("memory") ]
-			],
-			state = "pending",
-			promise = {
-				state: function() {
-					return state;
-				},
-				always: function() {
-					deferred.done( arguments ).fail( arguments );
-					return this;
-				},
-				then: function( /* fnDone, fnFail, fnProgress */ ) {
-					var fns = arguments;
-					return jQuery.Deferred(function( newDefer ) {
-						jQuery.each( tuples, function( i, tuple ) {
-							var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
-							// deferred[ done | fail | progress ] for forwarding actions to newDefer
-							deferred[ tuple[1] ](function() {
-								var returned = fn && fn.apply( this, arguments );
-								if ( returned && jQuery.isFunction( returned.promise ) ) {
-									returned.promise()
-										.done( newDefer.resolve )
-										.fail( newDefer.reject )
-										.progress( newDefer.notify );
-								} else {
-									newDefer[ tuple[ 0 ] + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments );
-								}
-							});
-						});
-						fns = null;
-					}).promise();
-				},
-				// Get a promise for this deferred
-				// If obj is provided, the promise aspect is added to the object
-				promise: function( obj ) {
-					return obj != null ? jQuery.extend( obj, promise ) : promise;
-				}
-			},
-			deferred = {};
-
-		// Keep pipe for back-compat
-		promise.pipe = promise.then;
-
-		// Add list-specific methods
-		jQuery.each( tuples, function( i, tuple ) {
-			var list = tuple[ 2 ],
-				stateString = tuple[ 3 ];
-
-			// promise[ done | fail | progress ] = list.add
-			promise[ tuple[1] ] = list.add;
-
-			// Handle state
-			if ( stateString ) {
-				list.add(function() {
-					// state = [ resolved | rejected ]
-					state = stateString;
-
-				// [ reject_list | resolve_list ].disable; progress_list.lock
-				}, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
-			}
-
-			// deferred[ resolve | reject | notify ]
-			deferred[ tuple[0] ] = function() {
-				deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments );
-				return this;
-			};
-			deferred[ tuple[0] + "With" ] = list.fireWith;
-		});
-
-		// Make the deferred a promise
-		promise.promise( deferred );
-
-		// Call given func if any
-		if ( func ) {
-			func.call( deferred, deferred );
-		}
-
-		// All done!
-		return deferred;
-	},
-
-	// Deferred helper
-	when: function( subordinate /* , ..., subordinateN */ ) {
-		var i = 0,
-			resolveValues = slice.call( arguments ),
-			length = resolveValues.length,
-
-			// the count of uncompleted subordinates
-			remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
-
-			// the master Deferred. If resolveValues consist of only a single Deferred, just use that.
-			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
-
-			// Update function for both resolve and progress values
-			updateFunc = function( i, contexts, values ) {
-				return function( value ) {
-					contexts[ i ] = this;
-					values[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
-					if ( values === progressValues ) {
-						deferred.notifyWith( contexts, values );
-					} else if ( !( --remaining ) ) {
-						deferred.resolveWith( contexts, values );
-					}
-				};
-			},
-
-			progressValues, progressContexts, resolveContexts;
-
-		// add listeners to Deferred subordinates; treat others as resolved
-		if ( length > 1 ) {
-			progressValues = new Array( length );
-			progressContexts = new Array( length );
-			resolveContexts = new Array( length );
-			for ( ; i < length; i++ ) {
-				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
-					resolveValues[ i ].promise()
-						.done( updateFunc( i, resolveContexts, resolveValues ) )
-						.fail( deferred.reject )
-						.progress( updateFunc( i, progressContexts, progressValues ) );
-				} else {
-					--remaining;
-				}
-			}
-		}
-
-		// if we're not waiting on anything, resolve the master
-		if ( !remaining ) {
-			deferred.resolveWith( resolveContexts, resolveValues );
-		}
-
-		return deferred.promise();
-	}
-});
-
-
-// The deferred used on DOM ready
-var readyList;
-
-jQuery.fn.ready = function( fn ) {
-	// Add the callback
-	jQuery.ready.promise().done( fn );
-
-	return this;
-};
-
-jQuery.extend({
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
-
-	// A counter to track how many items to wait for before
-	// the ready event fires. See #6781
-	readyWait: 1,
-
-	// Hold (or release) the ready event
-	holdReady: function( hold ) {
-		if ( hold ) {
-			jQuery.readyWait++;
-		} else {
-			jQuery.ready( true );
-		}
-	},
-
-	// Handle when the DOM is ready
-	ready: function( wait ) {
-
-		// Abort if there are pending holds or we're already ready
-		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
-			return;
-		}
-
-		// Remember that the DOM is ready
-		jQuery.isReady = true;
-
-		// If a normal DOM Ready event fired, decrement, and wait if need be
-		if ( wait !== true && --jQuery.readyWait > 0 ) {
-			return;
-		}
-
-		// If there are functions bound, to execute
-		readyList.resolveWith( document, [ jQuery ] );
-
-		// Trigger any bound ready events
-		if ( jQuery.fn.triggerHandler ) {
-			jQuery( document ).triggerHandler( "ready" );
-			jQuery( document ).off( "ready" );
-		}
-	}
-});
-
-/**
- * The ready event handler and self cleanup method
- */
-function completed() {
-	document.removeEventListener( "DOMContentLoaded", completed, false );
-	window.removeEventListener( "load", completed, false );
-	jQuery.ready();
-}
-
-jQuery.ready.promise = function( obj ) {
-	if ( !readyList ) {
-
-		readyList = jQuery.Deferred();
-
-		// Catch cases where $(document).ready() is called after the browser event has already occurred.
-		// we once tried to use readyState "interactive" here, but it caused issues like the one
-		// discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
-		if ( document.readyState === "complete" ) {
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			setTimeout( jQuery.ready );
-
-		} else {
-
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", completed, false );
-
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", completed, false );
-		}
-	}
-	return readyList.promise( obj );
-};
-
-// Kick off the DOM ready check even if the user does not
-jQuery.ready.promise();
-
-
-
-
-// Multifunctional method to get and set values of a collection
-// The value/s can optionally be executed if it's a function
-var access = jQuery.access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
-	var i = 0,
-		len = elems.length,
-		bulk = key == null;
-
-	// Sets many values
-	if ( jQuery.type( key ) === "object" ) {
-		chainable = true;
-		for ( i in key ) {
-			jQuery.access( elems, fn, i, key[i], true, emptyGet, raw );
-		}
-
-	// Sets one value
-	} else if ( value !== undefined ) {
-		chainable = true;
-
-		if ( !jQuery.isFunction( value ) ) {
-			raw = true;
-		}
-
-		if ( bulk ) {
-			// Bulk operations run against the entire set
-			if ( raw ) {
-				fn.call( elems, value );
-				fn = null;
-
-			// ...except when executing function values
-			} else {
-				bulk = fn;
-				fn = function( elem, key, value ) {
-					return bulk.call( jQuery( elem ), value );
-				};
-			}
-		}
-
-		if ( fn ) {
-			for ( ; i < len; i++ ) {
-				fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) );
-			}
-		}
-	}
-
-	return chainable ?
-		elems :
-
-		// Gets
-		bulk ?
-			fn.call( elems ) :
-			len ? fn( elems[0], key ) : emptyGet;
-};
-
-
-/**
- * Determines whether an object can have data
- */
-jQuery.acceptData = function( owner ) {
-	// Accepts only:
-	//  - Node
-	//    - Node.ELEMENT_NODE
-	//    - Node.DOCUMENT_NODE
-	//  - Object
-	//    - Any
-	/* jshint -W018 */
-	return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType );
-};
-
-
-function Data() {
-	// Support: Android < 4,
-	// Old WebKit does not have Object.preventExtensions/freeze method,
-	// return new empty object instead with no [[set]] accessor
-	Object.defineProperty( this.cache = {}, 0, {
-		get: function() {
-			return {};
-		}
-	});
-
-	this.expando = jQuery.expando + Math.random();
-}
-
-Data.uid = 1;
-Data.accepts = jQuery.acceptData;
-
-Data.prototype = {
-	key: function( owner ) {
-		// We can accept data for non-element nodes in modern browsers,
-		// but we should not, see #8335.
-		// Always return the key for a frozen object.
-		if ( !Data.accepts( owner ) ) {
-			return 0;
-		}
-
-		var descriptor = {},
-			// Check if the owner object already has a cache key
-			unlock = owner[ this.expando ];
-
-		// If not, create one
-		if ( !unlock ) {
-			unlock = Data.uid++;
-
-			// Secure it in a non-enumerable, non-writable property
-			try {
-				descriptor[ this.expando ] = { value: unlock };
-				Object.defineProperties( owner, descriptor );
-
-			// Support: Android < 4
-			// Fallback to a less secure definition
-			} catch ( e ) {
-				descriptor[ this.expando ] = unlock;
-				jQuery.extend( owner, descriptor );
-			}
-		}
-
-		// Ensure the cache object
-		if ( !this.cache[ unlock ] ) {
-			this.cache[ unlock ] = {};
-		}
-
-		return unlock;
-	},
-	set: function( owner, data, value ) {
-		var prop,
-			// There may be an unlock assigned to this node,
-			// if there is no entry for this "owner", create one inline
-			// and set the unlock as though an owner entry had always existed
-			unlock = this.key( owner ),
-			cache = this.cache[ unlock ];
-
-		// Handle: [ owner, key, value ] args
-		if ( typeof data === "string" ) {
-			cache[ data ] = value;
-
-		// Handle: [ owner, { properties } ] args
-		} else {
-			// Fresh assignments by object are shallow copied
-			if ( jQuery.isEmptyObject( cache ) ) {
-				jQuery.extend( this.cache[ unlock ], data );
-			// Otherwise, copy the properties one-by-one to the cache object
-			} else {
-				for ( prop in data ) {
-					cache[ prop ] = data[ prop ];
-				}
-			}
-		}
-		return cache;
-	},
-	get: function( owner, key ) {
-		// Either a valid cache is found, or will be created.
-		// New caches will be created and the unlock returned,
-		// allowing direct access to the newly created
-		// empty data object. A valid owner object must be provided.
-		var cache = this.cache[ this.key( owner ) ];
-
-		return key === undefined ?
-			cache : cache[ key ];
-	},
-	access: function( owner, key, value ) {
-		var stored;
-		// In cases where either:
-		//
-		//   1. No key was specified
-		//   2. A string key was specified, but no value provided
-		//
-		// Take the "read" path and allow the get method to determine
-		// which value to return, respectively either:
-		//
-		//   1. The entire cache object
-		//   2. The data stored at the key
-		//
-		if ( key === undefined ||
-				((key && typeof key === "string") && value === undefined) ) {
-
-			stored = this.get( owner, key );
-
-			return stored !== undefined ?
-				stored : this.get( owner, jQuery.camelCase(key) );
-		}
-
-		// [*]When the key is not a string, or both a key and value
-		// are specified, set or extend (existing objects) with either:
-		//
-		//   1. An object of properties
-		//   2. A key and value
-		//
-		this.set( owner, key, value );
-
-		// Since the "set" path can have two possible entry points
-		// return the expected data based on which path was taken[*]
-		return value !== undefined ? value : key;
-	},
-	remove: function( owner, key ) {
-		var i, name, camel,
-			unlock = this.key( owner ),
-			cache = this.cache[ unlock ];
-
-		if ( key === undefined ) {
-			this.cache[ unlock ] = {};
-
-		} else {
-			// Support array or space separated string of keys
-			if ( jQuery.isArray( key ) ) {
-				// If "name" is an array of keys...
-				// When data is initially created, via ("key", "val") signature,
-				// keys will be converted to camelCase.
-				// Since there is no way to tell _how_ a key was added, remove
-				// both plain key and camelCase key. #12786
-				// This will only penalize the array argument path.
-				name = key.concat( key.map( jQuery.camelCase ) );
-			} else {
-				camel = jQuery.camelCase( key );
-				// Try the string as a key before any manipulation
-				if ( key in cache ) {
-					name = [ key, camel ];
-				} else {
-					// If a key with the spaces exists, use it.
-					// Otherwise, create an array by matching non-whitespace
-					name = camel;
-					name = name in cache ?
-						[ name ] : ( name.match( rnotwhite ) || [] );
-				}
-			}
-
-			i = name.length;
-			while ( i-- ) {
-				delete cache[ name[ i ] ];
-			}
-		}
-	},
-	hasData: function( owner ) {
-		return !jQuery.isEmptyObject(
-			this.cache[ owner[ this.expando ] ] || {}
-		);
-	},
-	discard: function( owner ) {
-		if ( owner[ this.expando ] ) {
-			delete this.cache[ owner[ this.expando ] ];
-		}
-	}
-};
-var data_priv = new Data();
-
-var data_user = new Data();
-
-
-
-/*
-	Implementation Summary
-
-	1. Enforce API surface and semantic compatibility with 1.9.x branch
-	2. Improve the module's maintainability by reducing the storage
-		paths to a single mechanism.
-	3. Use the same single mechanism to support "private" and "user" data.
-	4. _Never_ expose "private" data to user code (TODO: Drop _data, _removeData)
-	5. Avoid exposing implementation details on user objects (eg. expando properties)
-	6. Provide a clear path for implementation upgrade to WeakMap in 2014
-*/
-var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,
-	rmultiDash = /([A-Z])/g;
-
-function dataAttr( elem, key, data ) {
-	var name;
-
-	// If nothing was found internally, try to fetch any
-	// data from the HTML5 data-* attribute
-	if ( data === undefined && elem.nodeType === 1 ) {
-		name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
-		data = elem.getAttribute( name );
-
-		if ( typeof data === "string" ) {
-			try {
-				data = data === "true" ? true :
-					data === "false" ? false :
-					data === "null" ? null :
-					// Only convert to a number if it doesn't change the string
-					+data + "" === data ? +data :
-					rbrace.test( data ) ? jQuery.parseJSON( data ) :
-					data;
-			} catch( e ) {}
-
-			// Make sure we set the data so it isn't changed later
-			data_user.set( elem, key, data );
-		} else {
-			data = undefined;
-		}
-	}
-	return data;
-}
-
-jQuery.extend({
-	hasData: function( elem ) {
-		return data_user.hasData( elem ) || data_priv.hasData( elem );
-	},
-
-	data: function( elem, name, data ) {
-		return data_user.access( elem, name, data );
-	},
-
-	removeData: function( elem, name ) {
-		data_user.remove( elem, name );
-	},
-
-	// TODO: Now that all calls to _data and _removeData have been replaced
-	// with direct calls to data_priv methods, these can be deprecated.
-	_data: function( elem, name, data ) {
-		return data_priv.access( elem, name, data );
-	},
-
-	_removeData: function( elem, name ) {
-		data_priv.remove( elem, name );
-	}
-});
-
-jQuery.fn.extend({
-	data: function( key, value ) {
-		var i, name, data,
-			elem = this[ 0 ],
-			attrs = elem && elem.attributes;
-
-		// Gets all values
-		if ( key === undefined ) {
-			if ( this.length ) {
-				data = data_user.get( elem );
-
-				if ( elem.nodeType === 1 && !data_priv.get( elem, "hasDataAttrs" ) ) {
-					i = attrs.length;
-					while ( i-- ) {
-
-						// Support: IE11+
-						// The attrs elements can be null (#14894)
-						if ( attrs[ i ] ) {
-							name = attrs[ i ].name;
-							if ( name.indexOf( "data-" ) === 0 ) {
-								name = jQuery.camelCase( name.slice(5) );
-								dataAttr( elem, name, data[ name ] );
-							}
-						}
-					}
-					data_priv.set( elem, "hasDataAttrs", true );
-				}
-			}
-
-			return data;
-		}
-
-		// Sets multiple values
-		if ( typeof key === "object" ) {
-			return this.each(function() {
-				data_user.set( this, key );
-			});
-		}
-
-		return access( this, function( value ) {
-			var data,
-				camelKey = jQuery.camelCase( key );
-
-			// The calling jQuery object (element matches) is not empty
-			// (and therefore has an element appears at this[ 0 ]) and the
-			// `value` parameter was not undefined. An empty jQuery object
-			// will result in `undefined` for elem = this[ 0 ] which will
-			// throw an exception if an attempt to read a data cache is made.
-			if ( elem && value === undefined ) {
-				// Attempt to get data from the cache
-				// with the key as-is
-				data = data_user.get( elem, key );
-				if ( data !== undefined ) {
-					return data;
-				}
-
-				// Attempt to get data from the cache
-				// with the key camelized
-				data = data_user.get( elem, camelKey );
-				if ( data !== undefined ) {
-					return data;
-				}
-
-				// Attempt to "discover" the data in
-				// HTML5 custom data-* attrs
-				data = dataAttr( elem, camelKey, undefined );
-				if ( data !== undefined ) {
-					return data;
-				}
-
-				// We tried really hard, but the data doesn't exist.
-				return;
-			}
-
-			// Set the data...
-			this.each(function() {
-				// First, attempt to store a copy or reference of any
-				// data that might've been store with a camelCased key.
-				var data = data_user.get( this, camelKey );
-
-				// For HTML5 data-* attribute interop, we have to
-				// store property names with dashes in a camelCase form.
-				// This might not apply to all properties...*
-				data_user.set( this, camelKey, value );
-
-				// *... In the case of properties that might _actually_
-				// have dashes, we need to also store a copy of that
-				// unchanged property.
-				if ( key.indexOf("-") !== -1 && data !== undefined ) {
-					data_user.set( this, key, value );
-				}
-			});
-		}, null, value, arguments.length > 1, null, true );
-	},
-
-	removeData: function( key ) {
-		return this.each(function() {
-			data_user.remove( this, key );
-		});
-	}
-});
-
-
-jQuery.extend({
-	queue: function( elem, type, data ) {
-		var queue;
-
-		if ( elem ) {
-			type = ( type || "fx" ) + "queue";
-			queue = data_priv.get( elem, type );
-
-			// Speed up dequeue by getting out quickly if this is just a lookup
-			if ( data ) {
-				if ( !queue || jQuery.isArray( data ) ) {
-					queue = data_priv.access( elem, type, jQuery.makeArray(data) );
-				} else {
-					queue.push( data );
-				}
-			}
-			return queue || [];
-		}
-	},
-
-	dequeue: function( elem, type ) {
-		type = type || "fx";
-
-		var queue = jQuery.queue( elem, type ),
-			startLength = queue.length,
-			fn = queue.shift(),
-			hooks = jQuery._queueHooks( elem, type ),
-			next = function() {
-				jQuery.dequeue( elem, type );
-			};
-
-		// If the fx queue is dequeued, always remove the progress sentinel
-		if ( fn === "inprogress" ) {
-			fn = queue.shift();
-			startLength--;
-		}
-
-		if ( fn ) {
-
-			// Add a progress sentinel to prevent the fx queue from being
-			// automatically dequeued
-			if ( type === "fx" ) {
-				queue.unshift( "inprogress" );
-			}
-
-			// clear up the last queue stop function
-			delete hooks.stop;
-			fn.call( elem, next, hooks );
-		}
-
-		if ( !startLength && hooks ) {
-			hooks.empty.fire();
-		}
-	},
-
-	// not intended for public consumption - generates a queueHooks object, or returns the current one
-	_queueHooks: function( elem, type ) {
-		var key = type + "queueHooks";
-		return data_priv.get( elem, key ) || data_priv.access( elem, key, {
-			empty: jQuery.Callbacks("once memory").add(function() {
-				data_priv.remove( elem, [ type + "queue", key ] );
-			})
-		});
-	}
-});
-
-jQuery.fn.extend({
-	queue: function( type, data ) {
-		var setter = 2;
-
-		if ( typeof type !== "string" ) {
-			data = type;
-			type = "fx";
-			setter--;
-		}
-
-		if ( arguments.length < setter ) {
-			return jQuery.queue( this[0], type );
-		}
-
-		return data === undefined ?
-			this :
-			this.each(function() {
-				var queue = jQuery.queue( this, type, data );
-
-				// ensure a hooks for this queue
-				jQuery._queueHooks( this, type );
-
-				if ( type === "fx" && queue[0] !== "inprogress" ) {
-					jQuery.dequeue( this, type );
-				}
-			});
-	},
-	dequeue: function( type ) {
-		return this.each(function() {
-			jQuery.dequeue( this, type );
-		});
-	},
-	clearQueue: function( type ) {
-		return this.queue( type || "fx", [] );
-	},
-	// Get a promise resolved when queues of a certain type
-	// are emptied (fx is the type by default)
-	promise: function( type, obj ) {
-		var tmp,
-			count = 1,
-			defer = jQuery.Deferred(),
-			elements = this,
-			i = this.length,
-			resolve = function() {
-				if ( !( --count ) ) {
-					defer.resolveWith( elements, [ elements ] );
-				}
-			};
-
-		if ( typeof type !== "string" ) {
-			obj = type;
-			type = undefined;
-		}
-		type = type || "fx";
-
-		while ( i-- ) {
-			tmp = data_priv.get( elements[ i ], type + "queueHooks" );
-			if ( tmp && tmp.empty ) {
-				count++;
-				tmp.empty.add( resolve );
-			}
-		}
-		resolve();
-		return defer.promise( obj );
-	}
-});
-var pnum = (/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/).source;
-
-var cssExpand = [ "Top", "Right", "Bottom", "Left" ];
-
-var isHidden = function( elem, el ) {
-		// isHidden might be called from jQuery#filter function;
-		// in that case, element will be second argument
-		elem = el || elem;
-		return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
-	};
-
-var rcheckableType = (/^(?:checkbox|radio)$/i);
-
-
-
-(function() {
-	var fragment = document.createDocumentFragment(),
-		div = fragment.appendChild( document.createElement( "div" ) ),
-		input = document.createElement( "input" );
-
-	// #11217 - WebKit loses check when the name is after the checked attribute
-	// Support: Windows Web Apps (WWA)
-	// `name` and `type` need .setAttribute for WWA
-	input.setAttribute( "type", "radio" );
-	input.setAttribute( "checked", "checked" );
-	input.setAttribute( "name", "t" );
-
-	div.appendChild( input );
-
-	// Support: Safari 5.1, iOS 5.1, Android 4.x, Android 2.3
-	// old WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	// Make sure textarea (and checkbox) defaultValue is properly cloned
-	// Support: IE9-IE11+
-	div.innerHTML = "";
-	support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
-})();
-var strundefined = typeof undefined;
-
-
-
-support.focusinBubbles = "onfocusin" in window;
-
-
-var
-	rkeyEvent = /^key/,
-	rmouseEvent = /^(?:mouse|pointer|contextmenu)|click/,
-	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
-	rtypenamespace = /^([^.]*)(?:\.(.+)|)$/;
-
-function returnTrue() {
-	return true;
-}
-
-function returnFalse() {
-	return false;
-}
-
-function safeActiveElement() {
-	try {
-		return document.activeElement;
-	} catch ( err ) { }
-}
-
-/*
- * Helper functions for managing events -- not part of the public interface.
- * Props to Dean Edwards' addEvent library for many of the ideas.
- */
-jQuery.event = {
-
-	global: {},
-
-	add: function( elem, types, handler, data, selector ) {
-
-		var handleObjIn, eventHandle, tmp,
-			events, t, handleObj,
-			special, handlers, type, namespaces, origType,
-			elemData = data_priv.get( elem );
-
-		// Don't attach events to noData or text/comment nodes (but allow plain objects)
-		if ( !elemData ) {
-			return;
-		}
-
-		// Caller can pass in an object of custom data in lieu of the handler
-		if ( handler.handler ) {
-			handleObjIn = handler;
-			handler = handleObjIn.handler;
-			selector = handleObjIn.selector;
-		}
-
-		// Make sure that the handler has a unique ID, used to find/remove it later
-		if ( !handler.guid ) {
-			handler.guid = jQuery.guid++;
-		}
-
-		// Init the element's event structure and main handler, if this is the first
-		if ( !(events = elemData.events) ) {
-			events = elemData.events = {};
-		}
-		if ( !(eventHandle = elemData.handle) ) {
-			eventHandle = elemData.handle = function( e ) {
-				// Discard the second event of a jQuery.event.trigger() and
-				// when an event is called after a page has unloaded
-				return typeof jQuery !== strundefined && jQuery.event.triggered !== e.type ?
-					jQuery.event.dispatch.apply( elem, arguments ) : undefined;
-			};
-		}
-
-		// Handle multiple events separated by a space
-		types = ( types || "" ).match( rnotwhite ) || [ "" ];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-			// There *must* be a type, no attaching namespace-only handlers
-			if ( !type ) {
-				continue;
-			}
-
-			// If event changes its type, use the special event handlers for the changed type
-			special = jQuery.event.special[ type ] || {};
-
-			// If selector defined, determine special event api type, otherwise given type
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-
-			// Update special based on newly reset type
-			special = jQuery.event.special[ type ] || {};
-
-			// handleObj is passed to all event handlers
-			handleObj = jQuery.extend({
-				type: type,
-				origType: origType,
-				data: data,
-				handler: handler,
-				guid: handler.guid,
-				selector: selector,
-				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
-				namespace: namespaces.join(".")
-			}, handleObjIn );
-
-			// Init the event handler queue if we're the first
-			if ( !(handlers = events[ type ]) ) {
-				handlers = events[ type ] = [];
-				handlers.delegateCount = 0;
-
-				// Only use addEventListener if the special events handler returns false
-				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-					if ( elem.addEventListener ) {
-						elem.addEventListener( type, eventHandle, false );
-					}
-				}
-			}
-
-			if ( special.add ) {
-				special.add.call( elem, handleObj );
-
-				if ( !handleObj.handler.guid ) {
-					handleObj.handler.guid = handler.guid;
-				}
-			}
-
-			// Add to the element's handler list, delegates in front
-			if ( selector ) {
-				handlers.splice( handlers.delegateCount++, 0, handleObj );
-			} else {
-				handlers.push( handleObj );
-			}
-
-			// Keep track of which events have ever been used, for event optimization
-			jQuery.event.global[ type ] = true;
-		}
-
-	},
-
-	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, selector, mappedTypes ) {
-
-		var j, origCount, tmp,
-			events, t, handleObj,
-			special, handlers, type, namespaces, origType,
-			elemData = data_priv.hasData( elem ) && data_priv.get( elem );
-
-		if ( !elemData || !(events = elemData.events) ) {
-			return;
-		}
-
-		// Once for each type.namespace in types; type may be omitted
-		types = ( types || "" ).match( rnotwhite ) || [ "" ];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-			// Unbind all events (on this namespace, if provided) for the element
-			if ( !type ) {
-				for ( type in events ) {
-					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
-				}
-				continue;
-			}
-
-			special = jQuery.event.special[ type ] || {};
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-			handlers = events[ type ] || [];
-			tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" );
-
-			// Remove matching events
-			origCount = j = handlers.length;
-			while ( j-- ) {
-				handleObj = handlers[ j ];
-
-				if ( ( mappedTypes || origType === handleObj.origType ) &&
-					( !handler || handler.guid === handleObj.guid ) &&
-					( !tmp || tmp.test( handleObj.namespace ) ) &&
-					( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
-					handlers.splice( j, 1 );
-
-					if ( handleObj.selector ) {
-						handlers.delegateCount--;
-					}
-					if ( special.remove ) {
-						special.remove.call( elem, handleObj );
-					}
-				}
-			}
-
-			// Remove generic event handler if we removed something and no more handlers exist
-			// (avoids potential for endless recursion during removal of special event handlers)
-			if ( origCount && !handlers.length ) {
-				if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
-					jQuery.removeEvent( elem, type, elemData.handle );
-				}
-
-				delete events[ type ];
-			}
-		}
-
-		// Remove the expando if it's no longer used
-		if ( jQuery.isEmptyObject( events ) ) {
-			delete elemData.handle;
-			data_priv.remove( elem, "events" );
-		}
-	},
-
-	trigger: function( event, data, elem, onlyHandlers ) {
-
-		var i, cur, tmp, bubbleType, ontype, handle, special,
-			eventPath = [ elem || document ],
-			type = hasOwn.call( event, "type" ) ? event.type : event,
-			namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : [];
-
-		cur = tmp = elem = elem || document;
-
-		// Don't do events on text and comment nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		// focus/blur morphs to focusin/out; ensure we're not firing them right now
-		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
-			return;
-		}
-
-		if ( type.indexOf(".") >= 0 ) {
-			// Namespaced trigger; create a regexp to match event type in handle()
-			namespaces = type.split(".");
-			type = namespaces.shift();
-			namespaces.sort();
-		}
-		ontype = type.indexOf(":") < 0 && "on" + type;
-
-		// Caller can pass in a jQuery.Event object, Object, or just an event type string
-		event = event[ jQuery.expando ] ?
-			event :
-			new jQuery.Event( type, typeof event === "object" && event );
-
-		// Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true)
-		event.isTrigger = onlyHandlers ? 2 : 3;
-		event.namespace = namespaces.join(".");
-		event.namespace_re = event.namespace ?
-			new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) :
-			null;
-
-		// Clean up the event in case it is being reused
-		event.result = undefined;
-		if ( !event.target ) {
-			event.target = elem;
-		}
-
-		// Clone any incoming data and prepend the event, creating the handler arg list
-		data = data == null ?
-			[ event ] :
-			jQuery.makeArray( data, [ event ] );
-
-		// Allow special events to draw outside the lines
-		special = jQuery.event.special[ type ] || {};
-		if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
-			return;
-		}
-
-		// Determine event propagation path in advance, per W3C events spec (#9951)
-		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
-		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
-
-			bubbleType = special.delegateType || type;
-			if ( !rfocusMorph.test( bubbleType + type ) ) {
-				cur = cur.parentNode;
-			}
-			for ( ; cur; cur = cur.parentNode ) {
-				eventPath.push( cur );
-				tmp = cur;
-			}
-
-			// Only add window if we got to document (e.g., not plain obj or detached DOM)
-			if ( tmp === (elem.ownerDocument || document) ) {
-				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
-			}
-		}
-
-		// Fire handlers on the event path
-		i = 0;
-		while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) {
-
-			event.type = i > 1 ?
-				bubbleType :
-				special.bindType || type;
-
-			// jQuery handler
-			handle = ( data_priv.get( cur, "events" ) || {} )[ event.type ] && data_priv.get( cur, "handle" );
-			if ( handle ) {
-				handle.apply( cur, data );
-			}
-
-			// Native handler
-			handle = ontype && cur[ ontype ];
-			if ( handle && handle.apply && jQuery.acceptData( cur ) ) {
-				event.result = handle.apply( cur, data );
-				if ( event.result === false ) {
-					event.preventDefault();
-				}
-			}
-		}
-		event.type = type;
-
-		// If nobody prevented the default action, do it now
-		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
-
-			if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) &&
-				jQuery.acceptData( elem ) ) {
-
-				// Call a native DOM method on the target with the same name name as the event.
-				// Don't do default actions on window, that's where global variables be (#6170)
-				if ( ontype && jQuery.isFunction( elem[ type ] ) && !jQuery.isWindow( elem ) ) {
-
-					// Don't re-trigger an onFOO event when we call its FOO() method
-					tmp = elem[ ontype ];
-
-					if ( tmp ) {
-						elem[ ontype ] = null;
-					}
-
-					// Prevent re-triggering of the same event, since we already bubbled it above
-					jQuery.event.triggered = type;
-					elem[ type ]();
-					jQuery.event.triggered = undefined;
-
-					if ( tmp ) {
-						elem[ ontype ] = tmp;
-					}
-				}
-			}
-		}
-
-		return event.result;
-	},
-
-	dispatch: function( event ) {
-
-		// Make a writable jQuery.Event from the native event object
-		event = jQuery.event.fix( event );
-
-		var i, j, ret, matched, handleObj,
-			handlerQueue = [],
-			args = slice.call( arguments ),
-			handlers = ( data_priv.get( this, "events" ) || {} )[ event.type ] || [],
-			special = jQuery.event.special[ event.type ] || {};
-
-		// Use the fix-ed jQuery.Event rather than the (read-only) native event
-		args[0] = event;
-		event.delegateTarget = this;
-
-		// Call the preDispatch hook for the mapped type, and let it bail if desired
-		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
-			return;
-		}
-
-		// Determine handlers
-		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
-
-		// Run delegates first; they may want to stop propagation beneath us
-		i = 0;
-		while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) {
-			event.currentTarget = matched.elem;
-
-			j = 0;
-			while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) {
-
-				// Triggered event must either 1) have no namespace, or
-				// 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
-				if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) {
-
-					event.handleObj = handleObj;
-					event.data = handleObj.data;
-
-					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
-							.apply( matched.elem, args );
-
-					if ( ret !== undefined ) {
-						if ( (event.result = ret) === false ) {
-							event.preventDefault();
-							event.stopPropagation();
-						}
-					}
-				}
-			}
-		}
-
-		// Call the postDispatch hook for the mapped type
-		if ( special.postDispatch ) {
-			special.postDispatch.call( this, event );
-		}
-
-		return event.result;
-	},
-
-	handlers: function( event, handlers ) {
-		var i, matches, sel, handleObj,
-			handlerQueue = [],
-			delegateCount = handlers.delegateCount,
-			cur = event.target;
-
-		// Find delegate handlers
-		// Black-hole SVG  instance trees (#13180)
-		// Avoid non-left-click bubbling in Firefox (#3861)
-		if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) {
-
-			for ( ; cur !== this; cur = cur.parentNode || this ) {
-
-				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
-				if ( cur.disabled !== true || event.type !== "click" ) {
-					matches = [];
-					for ( i = 0; i < delegateCount; i++ ) {
-						handleObj = handlers[ i ];
-
-						// Don't conflict with Object.prototype properties (#13203)
-						sel = handleObj.selector + " ";
-
-						if ( matches[ sel ] === undefined ) {
-							matches[ sel ] = handleObj.needsContext ?
-								jQuery( sel, this ).index( cur ) >= 0 :
-								jQuery.find( sel, this, null, [ cur ] ).length;
-						}
-						if ( matches[ sel ] ) {
-							matches.push( handleObj );
-						}
-					}
-					if ( matches.length ) {
-						handlerQueue.push({ elem: cur, handlers: matches });
-					}
-				}
-			}
-		}
-
-		// Add the remaining (directly-bound) handlers
-		if ( delegateCount < handlers.length ) {
-			handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) });
-		}
-
-		return handlerQueue;
-	},
-
-	// Includes some event props shared by KeyEvent and MouseEvent
-	props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
-
-	fixHooks: {},
-
-	keyHooks: {
-		props: "char charCode key keyCode".split(" "),
-		filter: function( event, original ) {
-
-			// Add which for key events
-			if ( event.which == null ) {
-				event.which = original.charCode != null ? original.charCode : original.keyCode;
-			}
-
-			return event;
-		}
-	},
-
-	mouseHooks: {
-		props: "button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
-		filter: function( event, original ) {
-			var eventDoc, doc, body,
-				button = original.button;
-
-			// Calculate pageX/Y if missing and clientX/Y available
-			if ( event.pageX == null && original.clientX != null ) {
-				eventDoc = event.target.ownerDocument || document;
-				doc = eventDoc.documentElement;
-				body = eventDoc.body;
-
-				event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
-				event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
-			}
-
-			// Add which for click: 1 === left; 2 === middle; 3 === right
-			// Note: button is not normalized, so don't use it
-			if ( !event.which && button !== undefined ) {
-				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
-			}
-
-			return event;
-		}
-	},
-
-	fix: function( event ) {
-		if ( event[ jQuery.expando ] ) {
-			return event;
-		}
-
-		// Create a writable copy of the event object and normalize some properties
-		var i, prop, copy,
-			type = event.type,
-			originalEvent = event,
-			fixHook = this.fixHooks[ type ];
-
-		if ( !fixHook ) {
-			this.fixHooks[ type ] = fixHook =
-				rmouseEvent.test( type ) ? this.mouseHooks :
-				rkeyEvent.test( type ) ? this.keyHooks :
-				{};
-		}
-		copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
-
-		event = new jQuery.Event( originalEvent );
-
-		i = copy.length;
-		while ( i-- ) {
-			prop = copy[ i ];
-			event[ prop ] = originalEvent[ prop ];
-		}
-
-		// Support: Cordova 2.5 (WebKit) (#13255)
-		// All events should have a target; Cordova deviceready doesn't
-		if ( !event.target ) {
-			event.target = document;
-		}
-
-		// Support: Safari 6.0+, Chrome < 28
-		// Target should not be a text node (#504, #13143)
-		if ( event.target.nodeType === 3 ) {
-			event.target = event.target.parentNode;
-		}
-
-		return fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
-	},
-
-	special: {
-		load: {
-			// Prevent triggered image.load events from bubbling to window.load
-			noBubble: true
-		},
-		focus: {
-			// Fire native event if possible so blur/focus sequence is correct
-			trigger: function() {
-				if ( this !== safeActiveElement() && this.focus ) {
-					this.focus();
-					return false;
-				}
-			},
-			delegateType: "focusin"
-		},
-		blur: {
-			trigger: function() {
-				if ( this === safeActiveElement() && this.blur ) {
-					this.blur();
-					return false;
-				}
-			},
-			delegateType: "focusout"
-		},
-		click: {
-			// For checkbox, fire native event so checked state will be right
-			trigger: function() {
-				if ( this.type === "checkbox" && this.click && jQuery.nodeName( this, "input" ) ) {
-					this.click();
-					return false;
-				}
-			},
-
-			// For cross-browser consistency, don't fire native .click() on links
-			_default: function( event ) {
-				return jQuery.nodeName( event.target, "a" );
-			}
-		},
-
-		beforeunload: {
-			postDispatch: function( event ) {
-
-				// Support: Firefox 20+
-				// Firefox doesn't alert if the returnValue field is not set.
-				if ( event.result !== undefined && event.originalEvent ) {
-					event.originalEvent.returnValue = event.result;
-				}
-			}
-		}
-	},
-
-	simulate: function( type, elem, event, bubble ) {
-		// Piggyback on a donor event to simulate a different one.
-		// Fake originalEvent to avoid donor's stopPropagation, but if the
-		// simulated event prevents default then we do the same on the donor.
-		var e = jQuery.extend(
-			new jQuery.Event(),
-			event,
-			{
-				type: type,
-				isSimulated: true,
-				originalEvent: {}
-			}
-		);
-		if ( bubble ) {
-			jQuery.event.trigger( e, null, elem );
-		} else {
-			jQuery.event.dispatch.call( elem, e );
-		}
-		if ( e.isDefaultPrevented() ) {
-			event.preventDefault();
-		}
-	}
-};
-
-jQuery.removeEvent = function( elem, type, handle ) {
-	if ( elem.removeEventListener ) {
-		elem.removeEventListener( type, handle, false );
-	}
-};
-
-jQuery.Event = function( src, props ) {
-	// Allow instantiation without the 'new' keyword
-	if ( !(this instanceof jQuery.Event) ) {
-		return new jQuery.Event( src, props );
-	}
-
-	// Event object
-	if ( src && src.type ) {
-		this.originalEvent = src;
-		this.type = src.type;
-
-		// Events bubbling up the document may have been marked as prevented
-		// by a handler lower down the tree; reflect the correct value.
-		this.isDefaultPrevented = src.defaultPrevented ||
-				src.defaultPrevented === undefined &&
-				// Support: Android < 4.0
-				src.returnValue === false ?
-			returnTrue :
-			returnFalse;
-
-	// Event type
-	} else {
-		this.type = src;
-	}
-
-	// Put explicitly provided properties onto the event object
-	if ( props ) {
-		jQuery.extend( this, props );
-	}
-
-	// Create a timestamp if incoming event doesn't have one
-	this.timeStamp = src && src.timeStamp || jQuery.now();
-
-	// Mark it as fixed
-	this[ jQuery.expando ] = true;
-};
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
-	isDefaultPrevented: returnFalse,
-	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse,
-
-	preventDefault: function() {
-		var e = this.originalEvent;
-
-		this.isDefaultPrevented = returnTrue;
-
-		if ( e && e.preventDefault ) {
-			e.preventDefault();
-		}
-	},
-	stopPropagation: function() {
-		var e = this.originalEvent;
-
-		this.isPropagationStopped = returnTrue;
-
-		if ( e && e.stopPropagation ) {
-			e.stopPropagation();
-		}
-	},
-	stopImmediatePropagation: function() {
-		var e = this.originalEvent;
-
-		this.isImmediatePropagationStopped = returnTrue;
-
-		if ( e && e.stopImmediatePropagation ) {
-			e.stopImmediatePropagation();
-		}
-
-		this.stopPropagation();
-	}
-};
-
-// Create mouseenter/leave events using mouseover/out and event-time checks
-// Support: Chrome 15+
-jQuery.each({
-	mouseenter: "mouseover",
-	mouseleave: "mouseout",
-	pointerenter: "pointerover",
-	pointerleave: "pointerout"
-}, function( orig, fix ) {
-	jQuery.event.special[ orig ] = {
-		delegateType: fix,
-		bindType: fix,
-
-		handle: function( event ) {
-			var ret,
-				target = this,
-				related = event.relatedTarget,
-				handleObj = event.handleObj;
-
-			// For mousenter/leave call the handler if related is outside the target.
-			// NB: No relatedTarget if the mouse left/entered the browser window
-			if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
-				event.type = handleObj.origType;
-				ret = handleObj.handler.apply( this, arguments );
-				event.type = fix;
-			}
-			return ret;
-		}
-	};
-});
-
-// Create "bubbling" focus and blur events
-// Support: Firefox, Chrome, Safari
-if ( !support.focusinBubbles ) {
-	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-
-		// Attach a single capturing handler on the document while someone wants focusin/focusout
-		var handler = function( event ) {
-				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
-			};
-
-		jQuery.event.special[ fix ] = {
-			setup: function() {
-				var doc = this.ownerDocument || this,
-					attaches = data_priv.access( doc, fix );
-
-				if ( !attaches ) {
-					doc.addEventListener( orig, handler, true );
-				}
-				data_priv.access( doc, fix, ( attaches || 0 ) + 1 );
-			},
-			teardown: function() {
-				var doc = this.ownerDocument || this,
-					attaches = data_priv.access( doc, fix ) - 1;
-
-				if ( !attaches ) {
-					doc.removeEventListener( orig, handler, true );
-					data_priv.remove( doc, fix );
-
-				} else {
-					data_priv.access( doc, fix, attaches );
-				}
-			}
-		};
-	});
-}
-
-jQuery.fn.extend({
-
-	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
-		var origFn, type;
-
-		// Types can be a map of types/handlers
-		if ( typeof types === "object" ) {
-			// ( types-Object, selector, data )
-			if ( typeof selector !== "string" ) {
-				// ( types-Object, data )
-				data = data || selector;
-				selector = undefined;
-			}
-			for ( type in types ) {
-				this.on( type, selector, data, types[ type ], one );
-			}
-			return this;
-		}
-
-		if ( data == null && fn == null ) {
-			// ( types, fn )
-			fn = selector;
-			data = selector = undefined;
-		} else if ( fn == null ) {
-			if ( typeof selector === "string" ) {
-				// ( types, selector, fn )
-				fn = data;
-				data = undefined;
-			} else {
-				// ( types, data, fn )
-				fn = data;
-				data = selector;
-				selector = undefined;
-			}
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		} else if ( !fn ) {
-			return this;
-		}
-
-		if ( one === 1 ) {
-			origFn = fn;
-			fn = function( event ) {
-				// Can use an empty set, since event contains the info
-				jQuery().off( event );
-				return origFn.apply( this, arguments );
-			};
-			// Use same guid so caller can remove using origFn
-			fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
-		}
-		return this.each( function() {
-			jQuery.event.add( this, types, fn, data, selector );
-		});
-	},
-	one: function( types, selector, data, fn ) {
-		return this.on( types, selector, data, fn, 1 );
-	},
-	off: function( types, selector, fn ) {
-		var handleObj, type;
-		if ( types && types.preventDefault && types.handleObj ) {
-			// ( event )  dispatched jQuery.Event
-			handleObj = types.handleObj;
-			jQuery( types.delegateTarget ).off(
-				handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
-				handleObj.selector,
-				handleObj.handler
-			);
-			return this;
-		}
-		if ( typeof types === "object" ) {
-			// ( types-object [, selector] )
-			for ( type in types ) {
-				this.off( type, selector, types[ type ] );
-			}
-			return this;
-		}
-		if ( selector === false || typeof selector === "function" ) {
-			// ( types [, fn] )
-			fn = selector;
-			selector = undefined;
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		}
-		return this.each(function() {
-			jQuery.event.remove( this, types, fn, selector );
-		});
-	},
-
-	trigger: function( type, data ) {
-		return this.each(function() {
-			jQuery.event.trigger( type, data, this );
-		});
-	},
-	triggerHandler: function( type, data ) {
-		var elem = this[0];
-		if ( elem ) {
-			return jQuery.event.trigger( type, data, elem, true );
-		}
-	}
-});
-
-
-var
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
-	rtagName = /<([\w:]+)/,
-	rhtml = /<|&#?\w+;/,
-	rnoInnerhtml = /<(?:script|style|link)/i,
-	// checked="checked" or checked
-	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
-	rscriptType = /^$|\/(?:java|ecma)script/i,
-	rscriptTypeMasked = /^true\/(.*)/,
-	rcleanScript = /^\s*\s*$/g,
-
-	// We have to close these tags to support XHTML (#13200)
-	wrapMap = {
-
-		// Support: IE 9
-		option: [ 1, "" ],
-
-		thead: [ 1, "", "
    " ],
-		col: [ 2, "", "
    " ],
-		tr: [ 2, "", "
    " ],
-		td: [ 3, "", "
    " ],
-
-		_default: [ 0, "", "" ]
-	};
-
-// Support: IE 9
-wrapMap.optgroup = wrapMap.option;
-
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-// Support: 1.x compatibility
-// Manipulating tables requires a tbody
-function manipulationTarget( elem, content ) {
-	return jQuery.nodeName( elem, "table" ) &&
-		jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ?
-
-		elem.getElementsByTagName("tbody")[0] ||
-			elem.appendChild( elem.ownerDocument.createElement("tbody") ) :
-		elem;
-}
-
-// Replace/restore the type attribute of script elements for safe DOM manipulation
-function disableScript( elem ) {
-	elem.type = (elem.getAttribute("type") !== null) + "/" + elem.type;
-	return elem;
-}
-function restoreScript( elem ) {
-	var match = rscriptTypeMasked.exec( elem.type );
-
-	if ( match ) {
-		elem.type = match[ 1 ];
-	} else {
-		elem.removeAttribute("type");
-	}
-
-	return elem;
-}
-
-// Mark scripts as having already been evaluated
-function setGlobalEval( elems, refElements ) {
-	var i = 0,
-		l = elems.length;
-
-	for ( ; i < l; i++ ) {
-		data_priv.set(
-			elems[ i ], "globalEval", !refElements || data_priv.get( refElements[ i ], "globalEval" )
-		);
-	}
-}
-
-function cloneCopyEvent( src, dest ) {
-	var i, l, type, pdataOld, pdataCur, udataOld, udataCur, events;
-
-	if ( dest.nodeType !== 1 ) {
-		return;
-	}
-
-	// 1. Copy private data: events, handlers, etc.
-	if ( data_priv.hasData( src ) ) {
-		pdataOld = data_priv.access( src );
-		pdataCur = data_priv.set( dest, pdataOld );
-		events = pdataOld.events;
-
-		if ( events ) {
-			delete pdataCur.handle;
-			pdataCur.events = {};
-
-			for ( type in events ) {
-				for ( i = 0, l = events[ type ].length; i < l; i++ ) {
-					jQuery.event.add( dest, type, events[ type ][ i ] );
-				}
-			}
-		}
-	}
-
-	// 2. Copy user data
-	if ( data_user.hasData( src ) ) {
-		udataOld = data_user.access( src );
-		udataCur = jQuery.extend( {}, udataOld );
-
-		data_user.set( dest, udataCur );
-	}
-}
-
-function getAll( context, tag ) {
-	var ret = context.getElementsByTagName ? context.getElementsByTagName( tag || "*" ) :
-			context.querySelectorAll ? context.querySelectorAll( tag || "*" ) :
-			[];
-
-	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
-		jQuery.merge( [ context ], ret ) :
-		ret;
-}
-
-// Support: IE >= 9
-function fixInput( src, dest ) {
-	var nodeName = dest.nodeName.toLowerCase();
-
-	// Fails to persist the checked state of a cloned checkbox or radio button.
-	if ( nodeName === "input" && rcheckableType.test( src.type ) ) {
-		dest.checked = src.checked;
-
-	// Fails to return the selected option to the default selected state when cloning options
-	} else if ( nodeName === "input" || nodeName === "textarea" ) {
-		dest.defaultValue = src.defaultValue;
-	}
-}
-
-jQuery.extend({
-	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
-		var i, l, srcElements, destElements,
-			clone = elem.cloneNode( true ),
-			inPage = jQuery.contains( elem.ownerDocument, elem );
-
-		// Support: IE >= 9
-		// Fix Cloning issues
-		if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) &&
-				!jQuery.isXMLDoc( elem ) ) {
-
-			// We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
-			destElements = getAll( clone );
-			srcElements = getAll( elem );
-
-			for ( i = 0, l = srcElements.length; i < l; i++ ) {
-				fixInput( srcElements[ i ], destElements[ i ] );
-			}
-		}
-
-		// Copy the events from the original to the clone
-		if ( dataAndEvents ) {
-			if ( deepDataAndEvents ) {
-				srcElements = srcElements || getAll( elem );
-				destElements = destElements || getAll( clone );
-
-				for ( i = 0, l = srcElements.length; i < l; i++ ) {
-					cloneCopyEvent( srcElements[ i ], destElements[ i ] );
-				}
-			} else {
-				cloneCopyEvent( elem, clone );
-			}
-		}
-
-		// Preserve script evaluation history
-		destElements = getAll( clone, "script" );
-		if ( destElements.length > 0 ) {
-			setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
-		}
-
-		// Return the cloned set
-		return clone;
-	},
-
-	buildFragment: function( elems, context, scripts, selection ) {
-		var elem, tmp, tag, wrap, contains, j,
-			fragment = context.createDocumentFragment(),
-			nodes = [],
-			i = 0,
-			l = elems.length;
-
-		for ( ; i < l; i++ ) {
-			elem = elems[ i ];
-
-			if ( elem || elem === 0 ) {
-
-				// Add nodes directly
-				if ( jQuery.type( elem ) === "object" ) {
-					// Support: QtWebKit
-					// jQuery.merge because push.apply(_, arraylike) throws
-					jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
-
-				// Convert non-html into a text node
-				} else if ( !rhtml.test( elem ) ) {
-					nodes.push( context.createTextNode( elem ) );
-
-				// Convert html into DOM nodes
-				} else {
-					tmp = tmp || fragment.appendChild( context.createElement("div") );
-
-					// Deserialize a standard representation
-					tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase();
-					wrap = wrapMap[ tag ] || wrapMap._default;
-					tmp.innerHTML = wrap[ 1 ] + elem.replace( rxhtmlTag, "<$1>" ) + wrap[ 2 ];
-
-					// Descend through wrappers to the right content
-					j = wrap[ 0 ];
-					while ( j-- ) {
-						tmp = tmp.lastChild;
-					}
-
-					// Support: QtWebKit
-					// jQuery.merge because push.apply(_, arraylike) throws
-					jQuery.merge( nodes, tmp.childNodes );
-
-					// Remember the top-level container
-					tmp = fragment.firstChild;
-
-					// Fixes #12346
-					// Support: Webkit, IE
-					tmp.textContent = "";
-				}
-			}
-		}
-
-		// Remove wrapper from fragment
-		fragment.textContent = "";
-
-		i = 0;
-		while ( (elem = nodes[ i++ ]) ) {
-
-			// #4087 - If origin and destination elements are the same, and this is
-			// that element, do not do anything
-			if ( selection && jQuery.inArray( elem, selection ) !== -1 ) {
-				continue;
-			}
-
-			contains = jQuery.contains( elem.ownerDocument, elem );
-
-			// Append to fragment
-			tmp = getAll( fragment.appendChild( elem ), "script" );
-
-			// Preserve script evaluation history
-			if ( contains ) {
-				setGlobalEval( tmp );
-			}
-
-			// Capture executables
-			if ( scripts ) {
-				j = 0;
-				while ( (elem = tmp[ j++ ]) ) {
-					if ( rscriptType.test( elem.type || "" ) ) {
-						scripts.push( elem );
-					}
-				}
-			}
-		}
-
-		return fragment;
-	},
-
-	cleanData: function( elems ) {
-		var data, elem, type, key,
-			special = jQuery.event.special,
-			i = 0;
-
-		for ( ; (elem = elems[ i ]) !== undefined; i++ ) {
-			if ( jQuery.acceptData( elem ) ) {
-				key = elem[ data_priv.expando ];
-
-				if ( key && (data = data_priv.cache[ key ]) ) {
-					if ( data.events ) {
-						for ( type in data.events ) {
-							if ( special[ type ] ) {
-								jQuery.event.remove( elem, type );
-
-							// This is a shortcut to avoid jQuery.event.remove's overhead
-							} else {
-								jQuery.removeEvent( elem, type, data.handle );
-							}
-						}
-					}
-					if ( data_priv.cache[ key ] ) {
-						// Discard any remaining `private` data
-						delete data_priv.cache[ key ];
-					}
-				}
-			}
-			// Discard any remaining `user` data
-			delete data_user.cache[ elem[ data_user.expando ] ];
-		}
-	}
-});
-
-jQuery.fn.extend({
-	text: function( value ) {
-		return access( this, function( value ) {
-			return value === undefined ?
-				jQuery.text( this ) :
-				this.empty().each(function() {
-					if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-						this.textContent = value;
-					}
-				});
-		}, null, value, arguments.length );
-	},
-
-	append: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.appendChild( elem );
-			}
-		});
-	},
-
-	prepend: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.insertBefore( elem, target.firstChild );
-			}
-		});
-	},
-
-	before: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this );
-			}
-		});
-	},
-
-	after: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			}
-		});
-	},
-
-	remove: function( selector, keepData /* Internal Use Only */ ) {
-		var elem,
-			elems = selector ? jQuery.filter( selector, this ) : this,
-			i = 0;
-
-		for ( ; (elem = elems[i]) != null; i++ ) {
-			if ( !keepData && elem.nodeType === 1 ) {
-				jQuery.cleanData( getAll( elem ) );
-			}
-
-			if ( elem.parentNode ) {
-				if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) {
-					setGlobalEval( getAll( elem, "script" ) );
-				}
-				elem.parentNode.removeChild( elem );
-			}
-		}
-
-		return this;
-	},
-
-	empty: function() {
-		var elem,
-			i = 0;
-
-		for ( ; (elem = this[i]) != null; i++ ) {
-			if ( elem.nodeType === 1 ) {
-
-				// Prevent memory leaks
-				jQuery.cleanData( getAll( elem, false ) );
-
-				// Remove any remaining nodes
-				elem.textContent = "";
-			}
-		}
-
-		return this;
-	},
-
-	clone: function( dataAndEvents, deepDataAndEvents ) {
-		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
-
-		return this.map(function() {
-			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
-		});
-	},
-
-	html: function( value ) {
-		return access( this, function( value ) {
-			var elem = this[ 0 ] || {},
-				i = 0,
-				l = this.length;
-
-			if ( value === undefined && elem.nodeType === 1 ) {
-				return elem.innerHTML;
-			}
-
-			// See if we can take a shortcut and just use innerHTML
-			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
-				!wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) {
-
-				value = value.replace( rxhtmlTag, "<$1>" );
-
-				try {
-					for ( ; i < l; i++ ) {
-						elem = this[ i ] || {};
-
-						// Remove element nodes and prevent memory leaks
-						if ( elem.nodeType === 1 ) {
-							jQuery.cleanData( getAll( elem, false ) );
-							elem.innerHTML = value;
-						}
-					}
-
-					elem = 0;
-
-				// If using innerHTML throws an exception, use the fallback method
-				} catch( e ) {}
-			}
-
-			if ( elem ) {
-				this.empty().append( value );
-			}
-		}, null, value, arguments.length );
-	},
-
-	replaceWith: function() {
-		var arg = arguments[ 0 ];
-
-		// Make the changes, replacing each context element with the new content
-		this.domManip( arguments, function( elem ) {
-			arg = this.parentNode;
-
-			jQuery.cleanData( getAll( this ) );
-
-			if ( arg ) {
-				arg.replaceChild( elem, this );
-			}
-		});
-
-		// Force removal if there was no new content (e.g., from empty arguments)
-		return arg && (arg.length || arg.nodeType) ? this : this.remove();
-	},
-
-	detach: function( selector ) {
-		return this.remove( selector, true );
-	},
-
-	domManip: function( args, callback ) {
-
-		// Flatten any nested arrays
-		args = concat.apply( [], args );
-
-		var fragment, first, scripts, hasScripts, node, doc,
-			i = 0,
-			l = this.length,
-			set = this,
-			iNoClone = l - 1,
-			value = args[ 0 ],
-			isFunction = jQuery.isFunction( value );
-
-		// We can't cloneNode fragments that contain checked, in WebKit
-		if ( isFunction ||
-				( l > 1 && typeof value === "string" &&
-					!support.checkClone && rchecked.test( value ) ) ) {
-			return this.each(function( index ) {
-				var self = set.eq( index );
-				if ( isFunction ) {
-					args[ 0 ] = value.call( this, index, self.html() );
-				}
-				self.domManip( args, callback );
-			});
-		}
-
-		if ( l ) {
-			fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, this );
-			first = fragment.firstChild;
-
-			if ( fragment.childNodes.length === 1 ) {
-				fragment = first;
-			}
-
-			if ( first ) {
-				scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
-				hasScripts = scripts.length;
-
-				// Use the original fragment for the last item instead of the first because it can end up
-				// being emptied incorrectly in certain situations (#8070).
-				for ( ; i < l; i++ ) {
-					node = fragment;
-
-					if ( i !== iNoClone ) {
-						node = jQuery.clone( node, true, true );
-
-						// Keep references to cloned scripts for later restoration
-						if ( hasScripts ) {
-							// Support: QtWebKit
-							// jQuery.merge because push.apply(_, arraylike) throws
-							jQuery.merge( scripts, getAll( node, "script" ) );
-						}
-					}
-
-					callback.call( this[ i ], node, i );
-				}
-
-				if ( hasScripts ) {
-					doc = scripts[ scripts.length - 1 ].ownerDocument;
-
-					// Reenable scripts
-					jQuery.map( scripts, restoreScript );
-
-					// Evaluate executable scripts on first document insertion
-					for ( i = 0; i < hasScripts; i++ ) {
-						node = scripts[ i ];
-						if ( rscriptType.test( node.type || "" ) &&
-							!data_priv.access( node, "globalEval" ) && jQuery.contains( doc, node ) ) {
-
-							if ( node.src ) {
-								// Optional AJAX dependency, but won't run scripts if not present
-								if ( jQuery._evalUrl ) {
-									jQuery._evalUrl( node.src );
-								}
-							} else {
-								jQuery.globalEval( node.textContent.replace( rcleanScript, "" ) );
-							}
-						}
-					}
-				}
-			}
-		}
-
-		return this;
-	}
-});
-
-jQuery.each({
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var elems,
-			ret = [],
-			insert = jQuery( selector ),
-			last = insert.length - 1,
-			i = 0;
-
-		for ( ; i <= last; i++ ) {
-			elems = i === last ? this : this.clone( true );
-			jQuery( insert[ i ] )[ original ]( elems );
-
-			// Support: QtWebKit
-			// .get() because push.apply(_, arraylike) throws
-			push.apply( ret, elems.get() );
-		}
-
-		return this.pushStack( ret );
-	};
-});
-
-
-var iframe,
-	elemdisplay = {};
-
-/**
- * Retrieve the actual display of a element
- * @param {String} name nodeName of the element
- * @param {Object} doc Document object
- */
-// Called only from within defaultDisplay
-function actualDisplay( name, doc ) {
-	var style,
-		elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
-
-		// getDefaultComputedStyle might be reliably used only on attached element
-		display = window.getDefaultComputedStyle && ( style = window.getDefaultComputedStyle( elem[ 0 ] ) ) ?
-
-			// Use of this method is a temporary fix (more like optmization) until something better comes along,
-			// since it was removed from specification and supported only in FF
-			style.display : jQuery.css( elem[ 0 ], "display" );
-
-	// We don't have any data stored on the element,
-	// so use "detach" method as fast way to get rid of the element
-	elem.detach();
-
-	return display;
-}
-
-/**
- * Try to determine the default display value of an element
- * @param {String} nodeName
- */
-function defaultDisplay( nodeName ) {
-	var doc = document,
-		display = elemdisplay[ nodeName ];
-
-	if ( !display ) {
-		display = actualDisplay( nodeName, doc );
-
-		// If the simple way fails, read from inside an iframe
-		if ( display === "none" || !display ) {
-
-			// Use the already-created iframe if possible
-			iframe = (iframe || jQuery( "
    
-	
-	
-		
-
-
- -->
-
-
-		
-
-
-	
-	
-	
-    
-    
-    
-    
-
-        
-	
-	
-       
-        
-		 
-	
-	
-	
-		
    
-		
    
-	    
    
-		
    
-		
    
-		
    
-		
    
-		
    		
-		
    
-	
- 		
-		
-		
-		
diff --git a/vid/src/main/webapp/app/fusion/notebook-integration/scripts/view-models/notebook-viz.html b/vid/src/main/webapp/app/fusion/notebook-integration/scripts/view-models/notebook-viz.html
deleted file mode 100644
index 3c0afd29a..000000000
--- a/vid/src/main/webapp/app/fusion/notebook-integration/scripts/view-models/notebook-viz.html
+++ /dev/null
@@ -1,26 +0,0 @@
-
- 
    
-	
-
-		
    
-	
-	
-		
    
diff --git a/vid/src/main/webapp/app/fusion/notebook-integration/scripts/view-models/notebook.htm b/vid/src/main/webapp/app/fusion/notebook-integration/scripts/view-models/notebook.htm
deleted file mode 100644
index bfd74ad32..000000000
--- a/vid/src/main/webapp/app/fusion/notebook-integration/scripts/view-models/notebook.htm
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-	
-	
-	
-    
-    
-    
-    
-
-        
-	
-	
-	
-       
-        
-		 
-	
-	
-	
-		
    
-		
    
-	    
    
-		
    
-		
    
-		
    
-		
    
-		
    		
-		
    
-	
-
diff --git a/vid/src/main/webapp/app/fusion/notebook-integration/scripts/view-models/notebookInputs.html b/vid/src/main/webapp/app/fusion/notebook-integration/scripts/view-models/notebookInputs.html
deleted file mode 100644
index 0a28b50ed..000000000
--- a/vid/src/main/webapp/app/fusion/notebook-integration/scripts/view-models/notebookInputs.html
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
    
-	
    
-	
    
-		
    
-		
-	
    
-	
    
-	
-	 
-	 			
-	
-		
-	 
-	
     
-	 
    	
-			
    
-			
-				
    
-					
-					
    
-					 
-				
    
-			
-				
    
-					
    
-					
-				
    
-				
-				
    
-				
-			 	
-				Remove  
-				  
    
-		  
    
-		 
    
-  
    
-     
-	
-	
-	
-	  
    
-	
-	
    
-	Submit
-	
    
-	
-	
-	
-
    
-
-
diff --git a/vid/src/main/webapp/app/fusion/scripts/att_angular_gridster/angular-gridster.js b/vid/src/main/webapp/app/fusion/scripts/att_angular_gridster/angular-gridster.js
deleted file mode 100644
index 985fa4341..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/att_angular_gridster/angular-gridster.js
+++ /dev/null
@@ -1,2244 +0,0 @@
-/*global define:true*/
-(function(root, factory) {
-
-	'use strict';
-
-	if (typeof define === 'function' && define.amd) {
-		// AMD
-		define(['angular'], factory);
-	} else if (typeof exports === 'object') {
-		// CommonJS
-		module.exports = factory(require('angular'));
-	} else {
-		// Browser, nothing "exported". Only registered as a module with angular.
-		factory(root.angular);
-	}
-}(this, function(angular) {
-
-   'use strict';
-
-    var ie8 = false;
-
-    var getInternetExplorerVersion = function ()
-        // Returns the version of Internet Explorer >4 or
-        // undefined(indicating the use of another browser).
-        {
-            var isIE10 = (eval("/*@cc_on!@*/false") && document.documentMode === 10);
-            if (isIE10) {
-                return 10;
-            }
-            var v = 3,
-                div = document.createElement('div'),
-                all = div.getElementsByTagName('i');
-            do {
-                div.innerHTML = '';
-            } while (all[0]);
-            return v > 4 ? v : undefined;
-        };
-
-    var browserVersion = getInternetExplorerVersion();
-
-    if (browserVersion && browserVersion < 9) {
-        ie8 = true;
-    }
-        
-	// This returned angular module 'gridster' is what is exported.
-	return angular.module('attGridsterLib', [])
-
-	.constant('gridsterConfig', {
-		columns: 6, // number of columns in the grid
-		pushing: true, // whether to push other items out of the way
-		floating: true, // whether to automatically float items up so they stack
-		swapping: true, // whether or not to have items switch places instead of push down if they are the same size
-		width: 'auto', // width of the grid. "auto" will expand the grid to its parent container
-		colWidth: 'auto', // width of grid columns. "auto" will divide the width of the grid evenly among the columns
-		rowHeight: 'match', // height of grid rows. 'match' will make it the same as the column width, a numeric value will be interpreted as pixels, '/2' is half the column width, '*5' is five times the column width, etc.
-		margins: [10, 10], // margins in between grid items
-		outerMargin: false,
-		isMobile: false, // toggle mobile view
-		mobileBreakPoint: 100, // width threshold to toggle mobile mode
-		mobileModeEnabled: true, // whether or not to toggle mobile mode when screen width is less than mobileBreakPoint
-		minColumns: 1, // minimum amount of columns the grid can scale down to
-		minRows: 1, // minimum amount of rows to show if the grid is empty
-		maxRows: 100, // maximum amount of rows in the grid
-		defaultSizeX: 1, // default width of an item in columns
-		defaultSizeY: 1, // default height of an item in rows
-		minSizeX: 1, // minimum column width of an item
-		maxSizeX: null, // maximum column width of an item
-		minSizeY: 1, // minumum row height of an item
-		maxSizeY: null, // maximum row height of an item
-		saveGridItemCalculatedHeightInMobile: false, // grid item height in mobile display. true- to use the calculated height by sizeY given
-		resizable: { // options to pass to resizable handler
-			enabled: false,
-			handles: ['s', 'e', 'n', 'w', 'se', 'ne', 'sw', 'nw']
-		},
-		draggable: { // options to pass to draggable handler
-			enabled: true,
-			scrollSensitivity: 20, // Distance in pixels from the edge of the viewport after which the viewport should scroll, relative to pointer
-			scrollSpeed: 15 // Speed at which the window should scroll once the mouse pointer gets within scrollSensitivity distance
-		}
-	})
-
-	.controller('GridsterCtrl', ['gridsterConfig', '$timeout',
-		function(gridsterConfig, $timeout) {
-
-			var gridster = this;
-
-			/**
-			 * Create options from gridsterConfig constant
-			 */
-			angular.extend(this, gridsterConfig);
-
-			this.resizable = angular.extend({}, gridsterConfig.resizable || {});
-			this.draggable = angular.extend({}, gridsterConfig.draggable || {});
-
-			var flag = false;
-			this.layoutChanged = function() {
-				if (flag) {
-					return;
-				}
-				flag = true;
-				$timeout(function() {
-					flag = false;
-					if (gridster.loaded) {
-						gridster.floatItemsUp();
-					}
-					gridster.updateHeight(gridster.movingItem ? gridster.movingItem.sizeY : 0);
-				}, 30);
-			};
-
-			/**
-			 * A positional array of the items in the grid
-			 */
-			this.grid = [];
-
-			/**
-			 * Clean up after yourself
-			 */
-			this.destroy = function() {
-				// empty the grid to cut back on the possibility
-				// of circular references
-				if (this.grid) {
-					this.grid = [];
-				}
-				this.$element = null;
-			};
-
-			/**
-			 * Overrides default options
-			 *
-			 * @param {Object} options The options to override
-			 */
-			this.setOptions = function(options) {
-				if (!options) {
-					return;
-				}
-
-				options = angular.extend({}, options);
-
-				// all this to avoid using jQuery...
-				if (options.draggable) {
-					angular.extend(this.draggable, options.draggable);
-					delete(options.draggable);
-				}
-				if (options.resizable) {
-					angular.extend(this.resizable, options.resizable);
-					delete(options.resizable);
-				}
-
-				angular.extend(this, options);
-
-				if (!this.margins || this.margins.length !== 2) {
-					this.margins = [0, 0];
-				} else {
-					for (var x = 0, l = this.margins.length; x < l; ++x) {
-						this.margins[x] = parseInt(this.margins[x], 10);
-						if (isNaN(this.margins[x])) {
-							this.margins[x] = 0;
-						}
-					}
-				}
-			};
-
-			/**
-			 * Check if item can occupy a specified position in the grid
-			 *
-			 * @param {Object} item The item in question
-			 * @param {Number} row The row index
-			 * @param {Number} column The column index
-			 * @returns {Boolean} True if if item fits
-			 */
-			this.canItemOccupy = function(item, row, column) {
-				return row > -1 && column > -1 && item.sizeX + column <= this.columns && item.sizeY + row <= this.maxRows;
-			};
-
-			/**
-			 * Set the item in the first suitable position
-			 *
-			 * @param {Object} item The item to insert
-			 */
-			this.autoSetItemPosition = function(item) {
-				// walk through each row and column looking for a place it will fit
-				for (var rowIndex = 0; rowIndex < this.maxRows; ++rowIndex) {
-					for (var colIndex = 0; colIndex < this.columns; ++colIndex) {
-						// only insert if position is not already taken and it can fit
-						var items = this.getItems(rowIndex, colIndex, item.sizeX, item.sizeY, item);
-						if (items.length === 0 && this.canItemOccupy(item, rowIndex, colIndex)) {
-							this.putItem(item, rowIndex, colIndex);
-							return;
-						}
-					}
-				}
-				throw new Error('Unable to place item!');
-			};
-
-			/**
-			 * Gets items at a specific coordinate
-			 *
-			 * @param {Number} row
-			 * @param {Number} column
-			 * @param {Number} sizeX
-			 * @param {Number} sizeY
-			 * @param {Array} excludeItems An array of items to exclude from selection
-			 * @returns {Array} Items that match the criteria
-			 */
-			this.getItems = function(row, column, sizeX, sizeY, excludeItems) {
-				var items = [];
-				if (!sizeX || !sizeY) {
-					sizeX = sizeY = 1;
-				}
-				if (excludeItems && !(excludeItems instanceof Array)) {
-					excludeItems = [excludeItems];
-				}
-				for (var h = 0; h < sizeY; ++h) {
-					for (var w = 0; w < sizeX; ++w) {
-						var item = this.getItem(row + h, column + w, excludeItems);
-						if (item && (!excludeItems || excludeItems.indexOf(item) === -1) && items.indexOf(item) === -1) {
-							items.push(item);
-						}
-					}
-				}
-				return items;
-			};
-
-			/**
-			 * @param {Array} items
-			 * @returns {Object} An item that represents the bounding box of the items
-			 */
-			this.getBoundingBox = function(items) {
-
-				if (items.length === 0) {
-					return null;
-				}
-				if (items.length === 1) {
-					return {
-						row: items[0].row,
-						col: items[0].col,
-						sizeY: items[0].sizeY,
-						sizeX: items[0].sizeX
-					};
-				}
-
-				var maxRow = 0;
-				var maxCol = 0;
-				var minRow = 9999;
-				var minCol = 9999;
-
-				for (var i = 0, l = items.length; i < l; ++i) {
-					var item = items[i];
-					minRow = Math.min(item.row, minRow);
-					minCol = Math.min(item.col, minCol);
-					maxRow = Math.max(item.row + item.sizeY, maxRow);
-					maxCol = Math.max(item.col + item.sizeX, maxCol);
-				}
-
-				return {
-					row: minRow,
-					col: minCol,
-					sizeY: maxRow - minRow,
-					sizeX: maxCol - minCol
-				};
-			};
-
-
-			/**
-			 * Removes an item from the grid
-			 *
-			 * @param {Object} item
-			 */
-			this.removeItem = function(item) {
-				for (var rowIndex = 0, l = this.grid.length; rowIndex < l; ++rowIndex) {
-					var columns = this.grid[rowIndex];
-					if (!columns) {
-						continue;
-					}
-					var index = columns.indexOf(item);
-					if (index !== -1) {
-						columns[index] = null;
-						break;
-					}
-				}
-				this.layoutChanged();
-			};
-
-			/**
-			 * Returns the item at a specified coordinate
-			 *
-			 * @param {Number} row
-			 * @param {Number} column
-			 * @param {Array} excludeItems Items to exclude from selection
-			 * @returns {Object} The matched item or null
-			 */
-			this.getItem = function(row, column, excludeItems) {
-				if (excludeItems && !(excludeItems instanceof Array)) {
-					excludeItems = [excludeItems];
-				}
-				var sizeY = 1;
-				while (row > -1) {
-					var sizeX = 1,
-						col = column;
-					while (col > -1) {
-						var items = this.grid[row];
-						if (items) {
-							var item = items[col];
-							if (item && (!excludeItems || excludeItems.indexOf(item) === -1) && item.sizeX >= sizeX && item.sizeY >= sizeY) {
-								return item;
-							}
-						}
-						++sizeX;
-						--col;
-					}
-					--row;
-					++sizeY;
-				}
-				return null;
-			};
-
-			/**
-			 * Insert an array of items into the grid
-			 *
-			 * @param {Array} items An array of items to insert
-			 */
-			this.putItems = function(items) {
-				for (var i = 0, l = items.length; i < l; ++i) {
-					this.putItem(items[i]);
-				}
-			};
-
-			/**
-			 * Insert a single item into the grid
-			 *
-			 * @param {Object} item The item to insert
-			 * @param {Number} row (Optional) Specifies the items row index
-			 * @param {Number} column (Optional) Specifies the items column index
-			 * @param {Array} ignoreItems
-			 */
-			this.putItem = function(item, row, column, ignoreItems) {
-				// auto place item if no row specified
-				if (typeof row === 'undefined' || row === null) {
-					row = item.row;
-					column = item.col;
-					if (typeof row === 'undefined' || row === null) {
-						this.autoSetItemPosition(item);
-						return;
-					}
-				}
-
-				// keep item within allowed bounds
-				if (!this.canItemOccupy(item, row, column)) {
-					column = Math.min(this.columns - item.sizeX, Math.max(0, column));
-					row = Math.min(this.maxRows - item.sizeY, Math.max(0, row));
-				}
-
-				// check if item is already in grid
-				if (item.oldRow !== null && typeof item.oldRow !== 'undefined') {
-					var samePosition = item.oldRow === row && item.oldColumn === column;
-					var inGrid = this.grid[row] && this.grid[row][column] === item;
-					if (samePosition && inGrid) {
-						item.row = row;
-						item.col = column;
-						return;
-					} else {
-						// remove from old position
-						var oldRow = this.grid[item.oldRow];
-						if (oldRow && oldRow[item.oldColumn] === item) {
-							delete oldRow[item.oldColumn];
-						}
-					}
-				}
-
-				item.oldRow = item.row = row;
-				item.oldColumn = item.col = column;
-
-				this.moveOverlappingItems(item, ignoreItems);
-
-				if (!this.grid[row]) {
-					this.grid[row] = [];
-				}
-				this.grid[row][column] = item;
-
-				if (this.movingItem === item) {
-					this.floatItemUp(item);
-				}
-				this.layoutChanged();
-			};
-
-			/**
-			 * Trade row and column if item1 with item2
-			 *
-			 * @param {Object} item1
-			 * @param {Object} item2
-			 */
-			this.swapItems = function(item1, item2) {
-				this.grid[item1.row][item1.col] = item2;
-				this.grid[item2.row][item2.col] = item1;
-
-				var item1Row = item1.row;
-				var item1Col = item1.col;
-				item1.row = item2.row;
-				item1.col = item2.col;
-				item2.row = item1Row;
-				item2.col = item1Col;
-			};
-
-			/**
-			 * Prevents items from being overlapped
-			 *
-			 * @param {Object} item The item that should remain
-			 * @param {Array} ignoreItems
-			 */
-			this.moveOverlappingItems = function(item, ignoreItems) {
-				// don't move item, so ignore it
-				if (!ignoreItems) {
-					ignoreItems = [item];
-				} else if (ignoreItems.indexOf(item) === -1) {
-					ignoreItems = ignoreItems.slice(0);
-					ignoreItems.push(item);
-				}
-
-				// get the items in the space occupied by the item's coordinates
-				var overlappingItems = this.getItems(
-					item.row,
-					item.col,
-					item.sizeX,
-					item.sizeY,
-					ignoreItems
-				);
-				this.moveItemsDown(overlappingItems, item.row + item.sizeY, ignoreItems);
-			};
-
-			/**
-			 * Moves an array of items to a specified row
-			 *
-			 * @param {Array} items The items to move
-			 * @param {Number} newRow The target row
-			 * @param {Array} ignoreItems
-			 */
-			this.moveItemsDown = function(items, newRow, ignoreItems) {
-				if (!items || items.length === 0) {
-					return;
-				}
-				items.sort(function(a, b) {
-					return a.row - b.row;
-				});
-
-				ignoreItems = ignoreItems ? ignoreItems.slice(0) : [];
-				var topRows = {},
-					item, i, l;
-
-				// calculate the top rows in each column
-				for (i = 0, l = items.length; i < l; ++i) {
-					item = items[i];
-					var topRow = topRows[item.col];
-					if (typeof topRow === 'undefined' || item.row < topRow) {
-						topRows[item.col] = item.row;
-					}
-				}
-
-				// move each item down from the top row in its column to the row
-				for (i = 0, l = items.length; i < l; ++i) {
-					item = items[i];
-					var rowsToMove = newRow - topRows[item.col];
-					this.moveItemDown(item, item.row + rowsToMove, ignoreItems);
-					ignoreItems.push(item);
-				}
-			};
-
-			/**
-			 * Moves an item down to a specified row
-			 *
-			 * @param {Object} item The item to move
-			 * @param {Number} newRow The target row
-			 * @param {Array} ignoreItems
-			 */
-			this.moveItemDown = function(item, newRow, ignoreItems) {
-				if (item.row >= newRow) {
-					return;
-				}
-				while (item.row < newRow) {
-					++item.row;
-					this.moveOverlappingItems(item, ignoreItems);
-				}
-				this.putItem(item, item.row, item.col, ignoreItems);
-			};
-
-			/**
-			 * Moves all items up as much as possible
-			 */
-			this.floatItemsUp = function() {
-				if (this.floating === false) {
-					return;
-				}
-				for (var rowIndex = 0, l = this.grid.length; rowIndex < l; ++rowIndex) {
-					var columns = this.grid[rowIndex];
-					if (!columns) {
-						continue;
-					}
-					for (var colIndex = 0, len = columns.length; colIndex < len; ++colIndex) {
-						var item = columns[colIndex];
-						if (item) {
-							this.floatItemUp(item);
-						}
-					}
-				}
-			};
-
-			/**
-			 * Float an item up to the most suitable row
-			 *
-			 * @param {Object} item The item to move
-			 */
-			this.floatItemUp = function(item) {
-				if (this.floating === false) {
-					return;
-				}
-				var colIndex = item.col,
-					sizeY = item.sizeY,
-					sizeX = item.sizeX,
-					bestRow = null,
-					bestColumn = null,
-					rowIndex = item.row - 1;
-
-				while (rowIndex > -1) {
-					var items = this.getItems(rowIndex, colIndex, sizeX, sizeY, item);
-					if (items.length !== 0) {
-						break;
-					}
-					bestRow = rowIndex;
-					bestColumn = colIndex;
-					--rowIndex;
-				}
-				if (bestRow !== null) {
-					this.putItem(item, bestRow, bestColumn);
-				}
-			};
-
-			/**
-			 * Update gridsters height
-			 *
-			 * @param {Number} plus (Optional) Additional height to add
-			 */
-			this.updateHeight = function(plus) {
-				var maxHeight = this.minRows;
-				plus = plus || 0;
-				for (var rowIndex = this.grid.length; rowIndex >= 0; --rowIndex) {
-					var columns = this.grid[rowIndex];
-					if (!columns) {
-						continue;
-					}
-					for (var colIndex = 0, len = columns.length; colIndex < len; ++colIndex) {
-						if (columns[colIndex]) {
-							maxHeight = Math.max(maxHeight, rowIndex + plus + columns[colIndex].sizeY);
-						}
-					}
-				}
-				this.gridHeight = this.maxRows - maxHeight > 0 ? Math.min(this.maxRows, maxHeight) : Math.max(this.maxRows, maxHeight);
-			};
-
-			/**
-			 * Returns the number of rows that will fit in given amount of pixels
-			 *
-			 * @param {Number} pixels
-			 * @param {Boolean} ceilOrFloor (Optional) Determines rounding method
-			 */
-			this.pixelsToRows = function(pixels, ceilOrFloor) {
-				if (ceilOrFloor === true) {
-					return Math.ceil(pixels / this.curRowHeight);
-				} else if (ceilOrFloor === false) {
-					return Math.floor(pixels / this.curRowHeight);
-				}
-
-				return Math.round(pixels / this.curRowHeight);
-			};
-
-			/**
-			 * Returns the number of columns that will fit in a given amount of pixels
-			 *
-			 * @param {Number} pixels
-			 * @param {Boolean} ceilOrFloor (Optional) Determines rounding method
-			 * @returns {Number} The number of columns
-			 */
-			this.pixelsToColumns = function(pixels, ceilOrFloor) {
-				if (ceilOrFloor === true) {
-					return Math.ceil(pixels / this.curColWidth);
-				} else if (ceilOrFloor === false) {
-					return Math.floor(pixels / this.curColWidth);
-				}
-
-				return Math.round(pixels / this.curColWidth);
-			};
-		}
-	])
-
-	.directive('gridsterPreview', function() {
-		return {
-			replace: true,
-			scope: true,
-			require: '^gridster',
-			template: '
    ',
-			link: function(scope, $el, attrs, gridster) {
-
-				/**
-				 * @returns {Object} style object for preview element
-				 */
-				scope.previewStyle = function() {
-                                    
-					if (!gridster.movingItem) {
-						return {
-							display: 'none'
-						};
-					}
-
-					return {
-						display: 'block',
-						height: (gridster.movingItem.sizeY * gridster.curRowHeight - gridster.margins[0]) + 'px',
-						width: (gridster.movingItem.sizeX * gridster.curColWidth - gridster.margins[1]) + 'px',
-						top: (gridster.movingItem.row * gridster.curRowHeight + (gridster.outerMargin ? gridster.margins[0] : 0)) + 'px',
-						left: (gridster.movingItem.col * gridster.curColWidth + (gridster.outerMargin ? gridster.margins[1] : 0)) + 'px'
-					};
-				};
-			}
-		};
-	})
-
-	/**
-	 * The gridster directive
-	 *
-	 * @param {Function} $timeout
-	 * @param {Object} $window
-	 * @param {Object} $rootScope
-	 * @param {Function} gridsterDebounce
-	 */
-	.directive('gridster', ['$timeout', '$window', '$rootScope', 'gridsterDebounce',
-		function($timeout, $window, $rootScope, gridsterDebounce) {
-			return {
-				scope: true,
-				restrict: 'EAC',
-				controller: 'GridsterCtrl',
-				controllerAs: 'gridster',
-				compile: function($tplElem) {
-                                        
-                                        $tplElem.prepend('
    ');
-                                        
-                                        return function(scope, $elem, attrs, gridster) {
-						gridster.loaded = false;
-
-						gridster.$element = $elem;
-
-						scope.gridster = gridster;
-
-						$elem.addClass('gridster');
-
-						var isVisible = function(ele) {
-							return ele.style.visibility !== 'hidden' && ele.style.display !== 'none';
-						};
-
-						function refresh(config) {
-							gridster.setOptions(config);
-
-							if (!isVisible($elem[0])) {
-								return;
-							}
-
-							// resolve "auto" & "match" values
-							if (gridster.width === 'auto') {
-								gridster.curWidth = $elem[0].offsetWidth || parseInt($elem.css('width'), 10);
-							} else {
-								gridster.curWidth = gridster.width;
-							}
-
-							if (gridster.colWidth === 'auto') {
-								gridster.curColWidth = (gridster.curWidth + (gridster.outerMargin ? -gridster.margins[1] : gridster.margins[1])) / gridster.columns;
-							} else {
-								gridster.curColWidth = gridster.colWidth;
-							}
-
-							gridster.curRowHeight = gridster.rowHeight;
-							if (typeof gridster.rowHeight === 'string') {
-								if (gridster.rowHeight === 'match') {
-									gridster.curRowHeight = Math.round(gridster.curColWidth);
-								} else if (gridster.rowHeight.indexOf('*') !== -1) {
-									gridster.curRowHeight = Math.round(gridster.curColWidth * gridster.rowHeight.replace('*', '').replace(' ', ''));
-								} else if (gridster.rowHeight.indexOf('/') !== -1) {
-									gridster.curRowHeight = Math.round(gridster.curColWidth / gridster.rowHeight.replace('/', '').replace(' ', ''));
-								}
-							}
-
-							gridster.isMobile = gridster.mobileModeEnabled && gridster.curWidth <= gridster.mobileBreakPoint;
-
-							// loop through all items and reset their CSS
-							for (var rowIndex = 0, l = gridster.grid.length; rowIndex < l; ++rowIndex) {
-								var columns = gridster.grid[rowIndex];
-								if (!columns) {
-									continue;
-								}
-
-								for (var colIndex = 0, len = columns.length; colIndex < len; ++colIndex) {
-									if (columns[colIndex]) {
-										var item = columns[colIndex];
-										item.setElementPosition();
-										item.setElementSizeY();
-										item.setElementSizeX();
-									}
-								}
-							}
-
-							updateHeight();
-						}
-
-						var optionsKey = attrs.gridster;
-						if (optionsKey) {
-							scope.$parent.$watch(optionsKey, function(newConfig) {
-								refresh(newConfig);
-							}, true);
-						} else {
-							refresh({});
-						}
-
-						scope.$watch(function() {
-							return gridster.loaded;
-						}, function() {
-							if (gridster.loaded) {
-								$elem.addClass('gridster-loaded');
-							} else {
-								$elem.removeClass('gridster-loaded');
-							}
-						});
-
-						scope.$watch(function() {
-							return gridster.isMobile;
-						}, function() {
-							if (gridster.isMobile) {
-								$elem.addClass('gridster-mobile').removeClass('gridster-desktop');
-							} else {
-								$elem.removeClass('gridster-mobile').addClass('gridster-desktop');
-							}
-							$rootScope.$broadcast('gridster-mobile-changed', gridster);
-						});
-
-						scope.$watch(function() {
-							return gridster.draggable;
-						}, function() {
-							$rootScope.$broadcast('gridster-draggable-changed', gridster);
-						}, true);
-
-						scope.$watch(function() {
-							return gridster.resizable;
-						}, function() {
-							$rootScope.$broadcast('gridster-resizable-changed', gridster);
-						}, true);
-
-						function updateHeight() {
-                                                    if(gridster.gridHeight){ //need to put this check, otherwise fail in IE8
-							$elem.css('height', (gridster.gridHeight * gridster.curRowHeight) + (gridster.outerMargin ? gridster.margins[0] : -gridster.margins[0]) + 'px');
-                                                    }
-						}
-
-						scope.$watch(function() {
-							return gridster.gridHeight;
-						}, updateHeight);
-
-						scope.$watch(function() {
-							return gridster.movingItem;
-						}, function() {
-							gridster.updateHeight(gridster.movingItem ? gridster.movingItem.sizeY : 0);
-						});
-
-						var prevWidth = $elem[0].offsetWidth || parseInt($elem.css('width'), 10);
-
-						var resize = function() {
-							var width = $elem[0].offsetWidth || parseInt($elem.css('width'), 10);
-
-							if (!width || width === prevWidth || gridster.movingItem) {
-								return;
-							}
-							prevWidth = width;
-
-							if (gridster.loaded) {
-								$elem.removeClass('gridster-loaded');
-							}
-
-							refresh();
-
-							if (gridster.loaded) {
-								$elem.addClass('gridster-loaded');
-							}
-
-							$rootScope.$broadcast('gridster-resized', [width, $elem[0].offsetHeight], gridster);
-						};
-
-						// track element width changes any way we can
-						var onResize = gridsterDebounce(function onResize() {
-							resize();
-							$timeout(function() {
-								scope.$apply();
-							});
-						}, 100);
-
-						scope.$watch(function() {
-							return isVisible($elem[0]);
-						}, onResize);
-
-						// see https://github.com/sdecima/javascript-detect-element-resize
-						if (typeof window.addResizeListener === 'function') {
-							window.addResizeListener($elem[0], onResize);
-						} else {
-							scope.$watch(function() {
-								return $elem[0].offsetWidth || parseInt($elem.css('width'), 10);
-							}, resize);
-						}
-						var $win = angular.element($window);
-						$win.on('resize', onResize);
-
-						// be sure to cleanup
-						scope.$on('$destroy', function() {
-							gridster.destroy();
-							$win.off('resize', onResize);
-							if (typeof window.removeResizeListener === 'function') {
-								window.removeResizeListener($elem[0], onResize);
-							}
-						});
-
-						// allow a little time to place items before floating up
-						$timeout(function() {
-							scope.$watch('gridster.floating', function() {
-								gridster.floatItemsUp();
-							});
-							gridster.loaded = true;
-						}, 100);
-					};
-				}
-			};
-		}
-	])
-
-	.controller('GridsterItemCtrl', function() {
-		this.$element = null;
-		this.gridster = null;
-		this.row = null;
-		this.col = null;
-		this.sizeX = null;
-		this.sizeY = null;
-		this.minSizeX = 0;
-		this.minSizeY = 0;
-		this.maxSizeX = null;
-		this.maxSizeY = null;
-
-		this.init = function($element, gridster) {
-			this.$element = $element;
-			this.gridster = gridster;
-			this.sizeX = gridster.defaultSizeX;
-			this.sizeY = gridster.defaultSizeY;
-		};
-
-		this.destroy = function() {
-			// set these to null to avoid the possibility of circular references
-			this.gridster = null;
-			this.$element = null;
-		};
-
-		/**
-		 * Returns the items most important attributes
-		 */
-		this.toJSON = function() {
-			return {
-				row: this.row,
-				col: this.col,
-				sizeY: this.sizeY,
-				sizeX: this.sizeX
-			};
-		};
-
-		this.isMoving = function() {
-			return this.gridster.movingItem === this;
-		};
-
-		/**
-		 * Set the items position
-		 *
-		 * @param {Number} row
-		 * @param {Number} column
-		 */
-		this.setPosition = function(row, column) {
-			this.gridster.putItem(this, row, column);
-
-			if (!this.isMoving()) {
-				this.setElementPosition();
-			}
-		};
-
-		/**
-		 * Sets a specified size property
-		 *
-		 * @param {String} key Can be either "x" or "y"
-		 * @param {Number} value The size amount
-		 * @param {Boolean} preventMove
-		 */
-		this.setSize = function(key, value, preventMove) {
-			key = key.toUpperCase();
-			var camelCase = 'size' + key,
-				titleCase = 'Size' + key;
-			if (value === '') {
-				return;
-			}
-			value = parseInt(value, 10);
-			if (isNaN(value) || value === 0) {
-				value = this.gridster['default' + titleCase];
-			}
-			var max = key === 'X' ? this.gridster.columns : this.gridster.maxRows;
-			if (this['max' + titleCase]) {
-				max = Math.min(this['max' + titleCase], max);
-			}
-			if (this.gridster['max' + titleCase]) {
-				max = Math.min(this.gridster['max' + titleCase], max);
-			}
-			if (key === 'X' && this.cols) {
-				max -= this.cols;
-			} else if (key === 'Y' && this.rows) {
-				max -= this.rows;
-			}
-
-			var min = 0;
-			if (this['min' + titleCase]) {
-				min = Math.max(this['min' + titleCase], min);
-			}
-			if (this.gridster['min' + titleCase]) {
-				min = Math.max(this.gridster['min' + titleCase], min);
-			}
-
-			value = Math.max(Math.min(value, max), min);
-
-			var changed = (this[camelCase] !== value || (this['old' + titleCase] && this['old' + titleCase] !== value));
-			this['old' + titleCase] = this[camelCase] = value;
-
-			if (!this.isMoving()) {
-				this['setElement' + titleCase]();
-			}
-			if (!preventMove && changed) {
-				this.gridster.moveOverlappingItems(this);
-				this.gridster.layoutChanged();
-			}
-
-			return changed;
-		};
-
-		/**
-		 * Sets the items sizeY property
-		 *
-		 * @param {Number} rows
-		 * @param {Boolean} preventMove
-		 */
-		this.setSizeY = function(rows, preventMove) {
-			return this.setSize('Y', rows, preventMove);
-		};
-
-		/**
-		 * Sets the items sizeX property
-		 *
-		 * @param {Number} columns
-		 * @param {Boolean} preventMove
-		 */
-		this.setSizeX = function(columns, preventMove) {
-			return this.setSize('X', columns, preventMove);
-		};
-
-		/**
-		 * Sets an elements position on the page
-		 */
-		this.setElementPosition = function() {
-			if (this.gridster.isMobile) {
-				this.$element.css({
-					marginLeft: this.gridster.margins[0] + 'px',
-					marginRight: this.gridster.margins[0] + 'px',
-					marginTop: this.gridster.margins[1] + 'px',
-					marginBottom: this.gridster.margins[1] + 'px',
-					top: '',
-					left: ''
-				});
-			} else {
-				this.$element.css({
-					margin: 0,
-					top: (this.row * this.gridster.curRowHeight + (this.gridster.outerMargin ? this.gridster.margins[0] : 0)) + 'px',
-					left: (this.col * this.gridster.curColWidth + (this.gridster.outerMargin ? this.gridster.margins[1] : 0)) + 'px'
-				});
-			}
-		};
-
-		/**
-		 * Sets an elements height
-		 */
-		this.setElementSizeY = function() {
-			if (this.gridster.isMobile && !this.gridster.saveGridItemCalculatedHeightInMobile) {
-				this.$element.css('height', '');
-			} else {
-				var computedHeight = (this.sizeY * this.gridster.curRowHeight - this.gridster.margins[0]) + 'px';
-				//this.$element.css('height', computedHeight);
-                this.$element.attr('style', this.$element.attr('style') + '; ' + 'height: '+computedHeight+' !important;');
-			}
-		};
-
-		/**
-		 * Sets an elements width
-		 */
-		this.setElementSizeX = function() {
-			if (this.gridster.isMobile) {
-				this.$element.css('width', '');
-			} else {
-				this.$element.css('width', (this.sizeX * this.gridster.curColWidth - this.gridster.margins[1]) + 'px');
-			}
-		};
-
-		/**
-		 * Gets an element's width
-		 */
-		this.getElementSizeX = function() {
-			return (this.sizeX * this.gridster.curColWidth - this.gridster.margins[1]);
-		};
-
-		/**
-		 * Gets an element's height
-		 */
-		this.getElementSizeY = function() {
-			return (this.sizeY * this.gridster.curRowHeight - this.gridster.margins[0]);
-		};
-
-	})
-
-	.factory('GridsterTouch', [function() {
-		return function GridsterTouch(target, startEvent, moveEvent, endEvent) {
-			var lastXYById = {};
-
-			//  Opera doesn't have Object.keys so we use this wrapper
-			var numberOfKeys = function(theObject) {
-				if (Object.keys) {
-					return Object.keys(theObject).length;
-				}
-
-				var n = 0,
-					key;
-				for (key in theObject) {
-					++n;
-				}
-
-				return n;
-			};
-
-			//  this calculates the delta needed to convert pageX/Y to offsetX/Y because offsetX/Y don't exist in the TouchEvent object or in Firefox's MouseEvent object
-			var computeDocumentToElementDelta = function(theElement) {
-				var elementLeft = 0;
-				var elementTop = 0;
-				var oldIEUserAgent = navigator.userAgent.match(/\bMSIE\b/);
-
-				for (var offsetElement = theElement; offsetElement != null; offsetElement = offsetElement.offsetParent) {
-					//  the following is a major hack for versions of IE less than 8 to avoid an apparent problem on the IEBlog with double-counting the offsets
-					//  this may not be a general solution to IE7's problem with offsetLeft/offsetParent
-					if (oldIEUserAgent &&
-						(!document.documentMode || document.documentMode < 8) &&
-						offsetElement.currentStyle.position === 'relative' && offsetElement.offsetParent && offsetElement.offsetParent.currentStyle.position === 'relative' && offsetElement.offsetLeft === offsetElement.offsetParent.offsetLeft) {
-						// add only the top
-						elementTop += offsetElement.offsetTop;
-					} else {
-						elementLeft += offsetElement.offsetLeft;
-						elementTop += offsetElement.offsetTop;
-					}
-				}
-
-				return {
-					x: elementLeft,
-					y: elementTop
-				};
-			};
-
-			//  cache the delta from the document to our event target (reinitialized each mousedown/MSPointerDown/touchstart)
-			var documentToTargetDelta = computeDocumentToElementDelta(target);
-
-			//  common event handler for the mouse/pointer/touch models and their down/start, move, up/end, and cancel events
-			var doEvent = function(theEvtObj) {
-
-				if (theEvtObj.type === 'mousemove' && numberOfKeys(lastXYById) === 0) {
-					return;
-				}
-
-				var prevent = true;
-
-				var pointerList = theEvtObj.changedTouches ? theEvtObj.changedTouches : [theEvtObj];
-                                
-				for (var i = 0; i < pointerList.length; ++i) {
-					var pointerObj = pointerList[i];
-					var pointerId = (typeof pointerObj.identifier !== 'undefined') ? pointerObj.identifier : (typeof pointerObj.pointerId !== 'undefined') ? pointerObj.pointerId : 1;
-                                        
-                                        //  use the pageX/Y coordinates to compute target-relative coordinates when we have them (in ie < 9, we need to do a little work to put them there)
-					if (typeof pointerObj.pageX === 'undefined') {
-                                                
-                                                //  initialize assuming our source element is our target
-						if(!ie8){
-                                                    pointerObj.pageX = pointerObj.offsetX + documentToTargetDelta.x;
-                                                    pointerObj.pageY = pointerObj.offsetY + documentToTargetDelta.y;
-                                                }
-                                                else{
-                                                    pointerObj.pageX = pointerObj.clientX;
-                                                    pointerObj.pageY = pointerObj.clientY;
-                                                }
-
-						if (pointerObj.srcElement.offsetParent === target && document.documentMode && document.documentMode === 8 && pointerObj.type === 'mousedown') {
-							//  source element is a child piece of VML, we're in IE8, and we've not called setCapture yet - add the origin of the source element
-							pointerObj.pageX += pointerObj.srcElement.offsetLeft;
-							pointerObj.pageY += pointerObj.srcElement.offsetTop;
-						} else if (pointerObj.srcElement !== target && !document.documentMode || document.documentMode < 8) {
-							//  source element isn't the target (most likely it's a child piece of VML) and we're in a version of IE before IE8 -
-							//  the offsetX/Y values are unpredictable so use the clientX/Y values and adjust by the scroll offsets of its parents
-							//  to get the document-relative coordinates (the same as pageX/Y)
-							var sx = -2,
-								sy = -2; // adjust for old IE's 2-pixel border
-							for (var scrollElement = pointerObj.srcElement; scrollElement !== null; scrollElement = scrollElement.parentNode) {
-								sx += scrollElement.scrollLeft ? scrollElement.scrollLeft : 0;
-								sy += scrollElement.scrollTop ? scrollElement.scrollTop : 0;
-							}
-
-							pointerObj.pageX = pointerObj.clientX + sx;
-							pointerObj.pageY = pointerObj.clientY + sy;
-						}
-					}
-
-
-					var pageX = pointerObj.pageX;
-					var pageY = pointerObj.pageY;
-
-					if (theEvtObj.type.match(/(start|down)$/i)) {
-						//  clause for processing MSPointerDown, touchstart, and mousedown
-
-						//  refresh the document-to-target delta on start in case the target has moved relative to document
-						documentToTargetDelta = computeDocumentToElementDelta(target);
-
-						//  protect against failing to get an up or end on this pointerId
-						if (lastXYById[pointerId]) {
-							if (endEvent) {
-								endEvent({
-									target: theEvtObj.target,
-									which: theEvtObj.which,
-									pointerId: pointerId,
-									pageX: pageX,
-									pageY: pageY
-								});
-							}
-
-							delete lastXYById[pointerId];
-						}
-
-						if (startEvent) {
-							if (prevent) {
-								prevent = startEvent({
-									target: theEvtObj.target,
-									which: theEvtObj.which,
-									pointerId: pointerId,
-									pageX: pageX,
-									pageY: pageY
-								});
-							}
-						}
-
-						//  init last page positions for this pointer
-						lastXYById[pointerId] = {
-							x: pageX,
-							y: pageY
-						};
-
-						// IE pointer model
-						if (target.msSetPointerCapture) {
-							target.msSetPointerCapture(pointerId);
-						} else if (theEvtObj.type === 'mousedown' && numberOfKeys(lastXYById) === 1) {
-							if (useSetReleaseCapture) {
-								target.setCapture(true);
-							} else {
-								document.addEventListener('mousemove', doEvent, false);
-								document.addEventListener('mouseup', doEvent, false);
-							}
-						}
-					} else if (theEvtObj.type.match(/move$/i)) {
-						//  clause handles mousemove, MSPointerMove, and touchmove
-
-						if (lastXYById[pointerId] && !(lastXYById[pointerId].x === pageX && lastXYById[pointerId].y === pageY)) {
-							//  only extend if the pointer is down and it's not the same as the last point
-
-							if (moveEvent && prevent) {
-								prevent = moveEvent({
-									target: theEvtObj.target,
-									which: theEvtObj.which,
-									pointerId: pointerId,
-									pageX: pageX,
-									pageY: pageY
-								});
-							}
-
-							//  update last page positions for this pointer
-							lastXYById[pointerId].x = pageX;
-							lastXYById[pointerId].y = pageY;
-						}
-					} else if (lastXYById[pointerId] && theEvtObj.type.match(/(up|end|cancel)$/i)) {
-						//  clause handles up/end/cancel
-
-						if (endEvent && prevent) {
-							prevent = endEvent({
-								target: theEvtObj.target,
-								which: theEvtObj.which,
-								pointerId: pointerId,
-								pageX: pageX,
-								pageY: pageY
-							});
-						}
-
-						//  delete last page positions for this pointer
-						delete lastXYById[pointerId];
-
-						//  in the Microsoft pointer model, release the capture for this pointer
-						//  in the mouse model, release the capture or remove document-level event handlers if there are no down points
-						//  nothing is required for the iOS touch model because capture is implied on touchstart
-						if (target.msReleasePointerCapture) {
-							target.msReleasePointerCapture(pointerId);
-						} else if (theEvtObj.type === 'mouseup' && numberOfKeys(lastXYById) === 0) {
-							if (useSetReleaseCapture) {
-								target.releaseCapture();
-							} else {
-								document.removeEventListener('mousemove', doEvent, false);
-								document.removeEventListener('mouseup', doEvent, false);
-							}
-						}
-					}
-				}
-
-				if (prevent) {
-					if (theEvtObj.preventDefault) {
-						theEvtObj.preventDefault();
-					}
-
-					if (theEvtObj.preventManipulation) {
-						theEvtObj.preventManipulation();
-					}
-
-					if (theEvtObj.preventMouseEvent) {
-						theEvtObj.preventMouseEvent();
-					}
-				}
-			};
-
-			var useSetReleaseCapture = false;
-			// saving the settings for contentZooming and touchaction before activation
-			var contentZooming, msTouchAction;
-
-			this.enable = function() {
-
-				if (window.navigator.msPointerEnabled) {
-					//  Microsoft pointer model
-					target.addEventListener('MSPointerDown', doEvent, false);
-					target.addEventListener('MSPointerMove', doEvent, false);
-					target.addEventListener('MSPointerUp', doEvent, false);
-					target.addEventListener('MSPointerCancel', doEvent, false);
-
-					//  css way to prevent panning in our target area
-					if (typeof target.style.msContentZooming !== 'undefined') {
-						contentZooming = target.style.msContentZooming;
-						target.style.msContentZooming = 'none';
-					}
-
-					//  new in Windows Consumer Preview: css way to prevent all built-in touch actions on our target
-					//  without this, you cannot touch draw on the element because IE will intercept the touch events
-					if (typeof target.style.msTouchAction !== 'undefined') {
-						msTouchAction = target.style.msTouchAction;
-						target.style.msTouchAction = 'none';
-					}
-				} else if (target.addEventListener) {
-					//  iOS touch model
-					target.addEventListener('touchstart', doEvent, false);
-					target.addEventListener('touchmove', doEvent, false);
-					target.addEventListener('touchend', doEvent, false);
-					target.addEventListener('touchcancel', doEvent, false);
-
-					//  mouse model
-					target.addEventListener('mousedown', doEvent, false);
-
-					//  mouse model with capture
-					//  rejecting gecko because, unlike ie, firefox does not send events to target when the mouse is outside target
-					if (target.setCapture && !window.navigator.userAgent.match(/\bGecko\b/)) {
-						useSetReleaseCapture = true;
-
-						target.addEventListener('mousemove', doEvent, false);
-						target.addEventListener('mouseup', doEvent, false);
-					}
-				} else if (target.attachEvent && target.setCapture) {
-					//  legacy IE mode - mouse with capture
-					useSetReleaseCapture = true;
-					target.attachEvent('onmousedown', function() {
-						doEvent(window.event);
-						window.event.returnValue = false;
-						return false;
-					});
-					target.attachEvent('onmousemove', function() {
-						doEvent(window.event);
-						window.event.returnValue = false;
-						return false;
-					});
-					target.attachEvent('onmouseup', function() {
-						doEvent(window.event);
-						window.event.returnValue = false;
-						return false;
-					});
-				}
-			};
-
-			this.disable = function() {
-				if (window.navigator.msPointerEnabled) {
-					//  Microsoft pointer model
-					target.removeEventListener('MSPointerDown', doEvent, false);
-					target.removeEventListener('MSPointerMove', doEvent, false);
-					target.removeEventListener('MSPointerUp', doEvent, false);
-					target.removeEventListener('MSPointerCancel', doEvent, false);
-
-					//  reset zooming to saved value
-					if (contentZooming) {
-						target.style.msContentZooming = contentZooming;
-					}
-
-					// reset touch action setting
-					if (msTouchAction) {
-						target.style.msTouchAction = msTouchAction;
-					}
-				} else if (target.removeEventListener) {
-					//  iOS touch model
-					target.removeEventListener('touchstart', doEvent, false);
-					target.removeEventListener('touchmove', doEvent, false);
-					target.removeEventListener('touchend', doEvent, false);
-					target.removeEventListener('touchcancel', doEvent, false);
-
-					//  mouse model
-					target.removeEventListener('mousedown', doEvent, false);
-
-					//  mouse model with capture
-					//  rejecting gecko because, unlike ie, firefox does not send events to target when the mouse is outside target
-					if (target.setCapture && !window.navigator.userAgent.match(/\bGecko\b/)) {
-						useSetReleaseCapture = true;
-
-						target.removeEventListener('mousemove', doEvent, false);
-						target.removeEventListener('mouseup', doEvent, false);
-					}
-				} else if (target.detachEvent && target.setCapture) {
-					//  legacy IE mode - mouse with capture
-					useSetReleaseCapture = true;
-					target.detachEvent('onmousedown');
-					target.detachEvent('onmousemove');
-					target.detachEvent('onmouseup');
-				}
-			};
-
-			return this;
-		};
-	}])
-
-	.factory('GridsterDraggable', ['$document', '$timeout', '$window', 'GridsterTouch',
-		function($document, $timeout, $window, GridsterTouch) {
-			function GridsterDraggable($el, scope, gridster, item, itemOptions) {
-
-				var elmX, elmY, elmW, elmH,
-
-					mouseX = 0,
-					mouseY = 0,
-					lastMouseX = 0,
-					lastMouseY = 0,
-					mOffX = 0,
-					mOffY = 0,
-
-					minTop = 0,
-					maxTop = 9999,
-					minLeft = 0,
-					realdocument = $document[0];
-
-				var originalCol, originalRow;
-				var inputTags = ['select', 'input', 'textarea', 'button'];
-                                
-                                var gridsterItemDragElement = $el[0].querySelector('[gridster-item-drag]');
-                                //console.log(gridsterItemDragElement);
-                                var isDraggableAreaDefined = gridsterItemDragElement?true:false;
-                               //console.log(isDraggableAreaDefined);
-                                
-				function mouseDown(e) {
-                                    
-                                    if(ie8){
-                                        e.target = window.event.srcElement;
-                                        e.which = window.event.button;
-                                    }
-                                    
-                                    if(isDraggableAreaDefined && (!gridsterItemDragElement.contains(e.target))){
-                                        return false;
-                                    }
-                                    
-                                        if (inputTags.indexOf(e.target.nodeName.toLowerCase()) !== -1) {
-                                            return false;
-                                        }
-
-					var $target = angular.element(e.target);
-
-					// exit, if a resize handle was hit
-					if ($target.hasClass('gridster-item-resizable-handler')) {
-						return false;
-					}
-
-					// exit, if the target has it's own click event
-					if ($target.attr('onclick') || $target.attr('ng-click')) {
-						return false;
-					}
-
-					// only works if you have jQuery
-					if ($target.closest && $target.closest('.gridster-no-drag').length) {
-						return false;
-					}
-                                        
-					switch (e.which) {
-						case 1:
-							// left mouse button
-							break;
-						case 2:
-						case 3:
-							// right or middle mouse button
-							return;
-					}
-
-					lastMouseX = e.pageX;
-					lastMouseY = e.pageY;
-
-					elmX = parseInt($el.css('left'), 10);
-					elmY = parseInt($el.css('top'), 10);
-					elmW = $el[0].offsetWidth;
-					elmH = $el[0].offsetHeight;
-
-					originalCol = item.col;
-					originalRow = item.row;
-
-					dragStart(e);
-
-					return true;
-				}
-
-				function mouseMove(e) {
-					if (!$el.hasClass('gridster-item-moving') || $el.hasClass('gridster-item-resizing')) {
-						return false;
-					}
-
-					var maxLeft = gridster.curWidth - 1;
-
-					// Get the current mouse position.
-					mouseX = e.pageX;
-					mouseY = e.pageY;
-
-					// Get the deltas
-					var diffX = mouseX - lastMouseX + mOffX;
-					var diffY = mouseY - lastMouseY + mOffY;
-					mOffX = mOffY = 0;
-
-					// Update last processed mouse positions.
-					lastMouseX = mouseX;
-					lastMouseY = mouseY;
-
-					var dX = diffX,
-						dY = diffY;
-					if (elmX + dX < minLeft) {
-						diffX = minLeft - elmX;
-						mOffX = dX - diffX;
-					} else if (elmX + elmW + dX > maxLeft) {
-						diffX = maxLeft - elmX - elmW;
-						mOffX = dX - diffX;
-					}
-
-					if (elmY + dY < minTop) {
-						diffY = minTop - elmY;
-						mOffY = dY - diffY;
-					} else if (elmY + elmH + dY > maxTop) {
-						diffY = maxTop - elmY - elmH;
-						mOffY = dY - diffY;
-					}
-					elmX += diffX;
-					elmY += diffY;
-
-					// set new position
-					$el.css({
-						'top': elmY + 'px',
-						'left': elmX + 'px'
-					});
-
-					drag(e);
-
-					return true;
-				}
-
-				function mouseUp(e) {
-					if (!$el.hasClass('gridster-item-moving') || $el.hasClass('gridster-item-resizing')) {
-						return false;
-					}
-
-					mOffX = mOffY = 0;
-
-					dragStop(e);
-
-					return true;
-				}
-
-				function dragStart(event) {
-					$el.addClass('gridster-item-moving');
-					gridster.movingItem = item;
-
-					gridster.updateHeight(item.sizeY);
-					scope.$apply(function() {
-						if (gridster.draggable && gridster.draggable.start) {
-							gridster.draggable.start(event, $el, itemOptions);
-						}
-					});
-				}
-
-				function drag(event) {
-					var oldRow = item.row,
-						oldCol = item.col,
-						hasCallback = gridster.draggable && gridster.draggable.drag,
-						scrollSensitivity = gridster.draggable.scrollSensitivity,
-						scrollSpeed = gridster.draggable.scrollSpeed;
-                                        
-					var row = gridster.pixelsToRows(elmY);
-					var col = gridster.pixelsToColumns(elmX);
-
-					var itemsInTheWay = gridster.getItems(row, col, item.sizeX, item.sizeY, item);
-					var hasItemsInTheWay = itemsInTheWay.length !== 0;
-                                        
-					if (gridster.swapping === true && hasItemsInTheWay) {
-						var boundingBoxItem = gridster.getBoundingBox(itemsInTheWay),
-							sameSize = boundingBoxItem.sizeX === item.sizeX && boundingBoxItem.sizeY === item.sizeY,
-							sameRow = boundingBoxItem.row === oldRow,
-							sameCol = boundingBoxItem.col === oldCol,
-							samePosition = boundingBoxItem.row === row && boundingBoxItem.col === col,
-							inline = sameRow || sameCol;
-
-						if (sameSize && itemsInTheWay.length === 1) {
-							if (samePosition) {
-								gridster.swapItems(item, itemsInTheWay[0]);
-							} else if (inline) {
-								return;
-							}
-						} else if (boundingBoxItem.sizeX <= item.sizeX && boundingBoxItem.sizeY <= item.sizeY && inline) {
-							var emptyRow = item.row <= row ? item.row : row + item.sizeY,
-								emptyCol = item.col <= col ? item.col : col + item.sizeX,
-								rowOffset = emptyRow - boundingBoxItem.row,
-								colOffset = emptyCol - boundingBoxItem.col;
-
-							for (var i = 0, l = itemsInTheWay.length; i < l; ++i) {
-								var itemInTheWay = itemsInTheWay[i];
-
-								var itemsInFreeSpace = gridster.getItems(
-									itemInTheWay.row + rowOffset,
-									itemInTheWay.col + colOffset,
-									itemInTheWay.sizeX,
-									itemInTheWay.sizeY,
-									item
-								);
-
-								if (itemsInFreeSpace.length === 0) {
-									gridster.putItem(itemInTheWay, itemInTheWay.row + rowOffset, itemInTheWay.col + colOffset);
-								}
-							}
-						}
-					}
-
-					if (gridster.pushing !== false || !hasItemsInTheWay) {
-						item.row = row;
-						item.col = col;
-					}
-                                        
-                                        if(($window.navigator.appName === 'Microsoft Internet Explorer' && !ie8) || $window.navigator.userAgent.indexOf("Firefox")!==-1){
-                                            if (event.pageY - realdocument.documentElement.scrollTop < scrollSensitivity) {
-                                                    realdocument.documentElement.scrollTop = realdocument.documentElement.scrollTop - scrollSpeed;
-                                            } else if ($window.innerHeight - (event.pageY - realdocument.documentElement.scrollTop) < scrollSensitivity) {
-                                                    realdocument.documentElement.scrollTop = realdocument.documentElement.scrollTop + scrollSpeed;
-                                            }
-                                        }
-                                        else{
-                                            if (event.pageY - realdocument.body.scrollTop < scrollSensitivity) {
-                                                    realdocument.body.scrollTop = realdocument.body.scrollTop - scrollSpeed;
-                                            } else if ($window.innerHeight - (event.pageY - realdocument.body.scrollTop) < scrollSensitivity) {
-                                                    realdocument.body.scrollTop = realdocument.body.scrollTop + scrollSpeed;
-                                            }
-                                        }
-                                        
-                                        
-
-					if (event.pageX - realdocument.body.scrollLeft < scrollSensitivity) {
-						realdocument.body.scrollLeft = realdocument.body.scrollLeft - scrollSpeed;
-					} else if ($window.innerWidth - (event.pageX - realdocument.body.scrollLeft) < scrollSensitivity) {
-						realdocument.body.scrollLeft = realdocument.body.scrollLeft + scrollSpeed;
-					}
-
-					if (hasCallback || oldRow !== item.row || oldCol !== item.col) {
-						scope.$apply(function() {
-							if (hasCallback) {
-								gridster.draggable.drag(event, $el, itemOptions);
-							}
-						});
-					}
-				}
-
-				function dragStop(event) {
-					$el.removeClass('gridster-item-moving');
-					var row = gridster.pixelsToRows(elmY);
-					var col = gridster.pixelsToColumns(elmX);
-					if (gridster.pushing !== false || gridster.getItems(row, col, item.sizeX, item.sizeY, item).length === 0) {
-						item.row = row;
-						item.col = col;
-					}
-					gridster.movingItem = null;
-					item.setPosition(item.row, item.col);
-
-					scope.$apply(function() {
-						if (gridster.draggable && gridster.draggable.stop) {
-							gridster.draggable.stop(event, $el, itemOptions);
-						}
-					});
-				}
-
-				var enabled = null;
-				var $dragHandles = null;
-				var unifiedInputs = [];
-
-				this.enable = function() {
-					if (enabled === true) {
-						return;
-					}
-
-					// disable and timeout required for some template rendering
-					$timeout(function() {
-						// disable any existing draghandles
-						for (var u = 0, ul = unifiedInputs.length; u < ul; ++u) {
-							unifiedInputs[u].disable();
-						}
-						unifiedInputs = [];
-
-						if (gridster.draggable && gridster.draggable.handle) {
-							$dragHandles = angular.element($el[0].querySelectorAll(gridster.draggable.handle));
-							if ($dragHandles.length === 0) {
-								// fall back to element if handle not found...
-								$dragHandles = $el;
-							}
-						} else {
-							$dragHandles = $el;
-						}
-
-						for (var h = 0, hl = $dragHandles.length; h < hl; ++h) {
-							unifiedInputs[h] = new GridsterTouch($dragHandles[h], mouseDown, mouseMove, mouseUp);
-							unifiedInputs[h].enable();
-						}
-
-						enabled = true;
-					});
-				};
-
-				this.disable = function() {
-					if (enabled === false) {
-						return;
-					}
-
-					// timeout to avoid race contition with the enable timeout
-					$timeout(function() {
-
-						for (var u = 0, ul = unifiedInputs.length; u < ul; ++u) {
-							unifiedInputs[u].disable();
-						}
-
-						unifiedInputs = [];
-						enabled = false;
-					});
-				};
-
-				this.toggle = function(enabled) {
-					if (enabled) {
-						this.enable();
-					} else {
-						this.disable();
-					}
-				};
-
-				this.destroy = function() {
-					this.disable();
-				};
-			}
-
-			return GridsterDraggable;
-		}
-	])
-
-	.factory('GridsterResizable', ['GridsterTouch', function(GridsterTouch) {
-		function GridsterResizable($el, scope, gridster, item, itemOptions) {
-
-			function ResizeHandle(handleClass) {
-
-				var hClass = handleClass;
-
-				var elmX, elmY, elmW, elmH,
-
-					mouseX = 0,
-					mouseY = 0,
-					lastMouseX = 0,
-					lastMouseY = 0,
-					mOffX = 0,
-					mOffY = 0,
-
-					minTop = 0,
-					maxTop = 9999,
-					minLeft = 0;
-
-				var getMinHeight = function() {
-					return (item.minSizeY ? item.minSizeY : 1) * gridster.curRowHeight - gridster.margins[0];
-				};
-				var getMinWidth = function() {
-					return (item.minSizeX ? item.minSizeX : 1) * gridster.curColWidth - gridster.margins[1];
-				};
-
-				var originalWidth, originalHeight;
-				var savedDraggable;
-
-				function mouseDown(e) {
-					switch (e.which) {
-						case 1:
-							// left mouse button
-							break;
-						case 2:
-						case 3:
-							// right or middle mouse button
-							return;
-					}
-
-					// save the draggable setting to restore after resize
-					savedDraggable = gridster.draggable.enabled;
-					if (savedDraggable) {
-						gridster.draggable.enabled = false;
-						scope.$broadcast('gridster-draggable-changed', gridster);
-					}
-
-					// Get the current mouse position.
-					lastMouseX = e.pageX;
-					lastMouseY = e.pageY;
-
-					// Record current widget dimensions
-					elmX = parseInt($el.css('left'), 10);
-					elmY = parseInt($el.css('top'), 10);
-					elmW = $el[0].offsetWidth;
-					elmH = $el[0].offsetHeight;
-
-					originalWidth = item.sizeX;
-					originalHeight = item.sizeY;
-
-					resizeStart(e);
-
-					return true;
-				}
-
-				function resizeStart(e) {
-					$el.addClass('gridster-item-moving');
-					$el.addClass('gridster-item-resizing');
-
-					gridster.movingItem = item;
-
-					item.setElementSizeX();
-					item.setElementSizeY();
-					item.setElementPosition();
-					gridster.updateHeight(1);
-
-					scope.$apply(function() {
-						// callback
-						if (gridster.resizable && gridster.resizable.start) {
-							gridster.resizable.start(e, $el, itemOptions); // options is the item model
-						}
-					});
-				}
-
-				function mouseMove(e) {
-					var maxLeft = gridster.curWidth - 1;
-
-					// Get the current mouse position.
-					mouseX = e.pageX;
-					mouseY = e.pageY;
-
-					// Get the deltas
-					var diffX = mouseX - lastMouseX + mOffX;
-					var diffY = mouseY - lastMouseY + mOffY;
-					mOffX = mOffY = 0;
-
-					// Update last processed mouse positions.
-					lastMouseX = mouseX;
-					lastMouseY = mouseY;
-
-					var dY = diffY,
-						dX = diffX;
-
-					if (hClass.indexOf('n') >= 0) {
-						if (elmH - dY < getMinHeight()) {
-							diffY = elmH - getMinHeight();
-							mOffY = dY - diffY;
-						} else if (elmY + dY < minTop) {
-							diffY = minTop - elmY;
-							mOffY = dY - diffY;
-						}
-						elmY += diffY;
-						elmH -= diffY;
-					}
-					if (hClass.indexOf('s') >= 0) {
-						if (elmH + dY < getMinHeight()) {
-							diffY = getMinHeight() - elmH;
-							mOffY = dY - diffY;
-						} else if (elmY + elmH + dY > maxTop) {
-							diffY = maxTop - elmY - elmH;
-							mOffY = dY - diffY;
-						}
-						elmH += diffY;
-					}
-					if (hClass.indexOf('w') >= 0) {
-						if (elmW - dX < getMinWidth()) {
-							diffX = elmW - getMinWidth();
-							mOffX = dX - diffX;
-						} else if (elmX + dX < minLeft) {
-							diffX = minLeft - elmX;
-							mOffX = dX - diffX;
-						}
-						elmX += diffX;
-						elmW -= diffX;
-					}
-					if (hClass.indexOf('e') >= 0) {
-						if (elmW + dX < getMinWidth()) {
-							diffX = getMinWidth() - elmW;
-							mOffX = dX - diffX;
-						} else if (elmX + elmW + dX > maxLeft) {
-							diffX = maxLeft - elmX - elmW;
-							mOffX = dX - diffX;
-						}
-						elmW += diffX;
-					}
-
-					// set new position
-					$el.css({
-						'top': elmY + 'px',
-						'left': elmX + 'px',
-						'width': elmW + 'px',
-						'height': elmH + 'px'
-					});
-
-					resize(e);
-
-					return true;
-				}
-
-				function mouseUp(e) {
-					// restore draggable setting to its original state
-					if (gridster.draggable.enabled !== savedDraggable) {
-						gridster.draggable.enabled = savedDraggable;
-						scope.$broadcast('gridster-draggable-changed', gridster);
-					}
-
-					mOffX = mOffY = 0;
-
-					resizeStop(e);
-
-					return true;
-				}
-
-				function resize(e) {
-					var oldRow = item.row,
-						oldCol = item.col,
-						oldSizeX = item.sizeX,
-						oldSizeY = item.sizeY,
-						hasCallback = gridster.resizable && gridster.resizable.resize;
-
-					var col = item.col;
-					// only change column if grabbing left edge
-					if (['w', 'nw', 'sw'].indexOf(handleClass) !== -1) {
-						col = gridster.pixelsToColumns(elmX, false);
-					}
-
-					var row = item.row;
-					// only change row if grabbing top edge
-					if (['n', 'ne', 'nw'].indexOf(handleClass) !== -1) {
-						row = gridster.pixelsToRows(elmY, false);
-					}
-
-					var sizeX = item.sizeX;
-					// only change row if grabbing left or right edge
-					if (['n', 's'].indexOf(handleClass) === -1) {
-						sizeX = gridster.pixelsToColumns(elmW, true);
-					}
-
-					var sizeY = item.sizeY;
-					// only change row if grabbing top or bottom edge
-					if (['e', 'w'].indexOf(handleClass) === -1) {
-						sizeY = gridster.pixelsToRows(elmH, true);
-					}
-
-					if (gridster.pushing !== false || gridster.getItems(row, col, sizeX, sizeY, item).length === 0) {
-						item.row = row;
-						item.col = col;
-						item.sizeX = sizeX;
-						item.sizeY = sizeY;
-					}
-					var isChanged = item.row !== oldRow || item.col !== oldCol || item.sizeX !== oldSizeX || item.sizeY !== oldSizeY;
-
-					if (hasCallback || isChanged) {
-						scope.$apply(function() {
-							if (hasCallback) {
-								gridster.resizable.resize(e, $el, itemOptions); // options is the item model
-							}
-						});
-					}
-				}
-
-				function resizeStop(e) {
-					$el.removeClass('gridster-item-moving');
-					$el.removeClass('gridster-item-resizing');
-
-					gridster.movingItem = null;
-
-					item.setPosition(item.row, item.col);
-					item.setSizeY(item.sizeY);
-					item.setSizeX(item.sizeX);
-
-					scope.$apply(function() {
-						if (gridster.resizable && gridster.resizable.stop) {
-							gridster.resizable.stop(e, $el, itemOptions); // options is the item model
-						}
-					});
-				}
-
-				var $dragHandle = null;
-				var unifiedInput;
-
-				this.enable = function() {
-					if (!$dragHandle) {
-						$dragHandle = angular.element('
    ');
-						$el.append($dragHandle);
-					}
-
-					unifiedInput = new GridsterTouch($dragHandle[0], mouseDown, mouseMove, mouseUp);
-					unifiedInput.enable();
-				};
-
-				this.disable = function() {
-					if ($dragHandle) {
-						$dragHandle.remove();
-						$dragHandle = null;
-					}
-
-					unifiedInput.disable();
-					unifiedInput = undefined;
-				};
-
-				this.destroy = function() {
-					this.disable();
-				};
-			}
-
-			var handles = [];
-			var handlesOpts = gridster.resizable.handles;
-			if (typeof handlesOpts === 'string') {
-				handlesOpts = gridster.resizable.handles.split(',');
-			}
-			var enabled = false;
-
-			for (var c = 0, l = handlesOpts.length; c < l; c++) {
-				handles.push(new ResizeHandle(handlesOpts[c]));
-			}
-
-			this.enable = function() {
-				if (enabled) {
-					return;
-				}
-				for (var c = 0, l = handles.length; c < l; c++) {
-					handles[c].enable();
-				}
-				enabled = true;
-			};
-
-			this.disable = function() {
-				if (!enabled) {
-					return;
-				}
-				for (var c = 0, l = handles.length; c < l; c++) {
-					handles[c].disable();
-				}
-				enabled = false;
-			};
-
-			this.toggle = function(enabled) {
-				if (enabled) {
-					this.enable();
-				} else {
-					this.disable();
-				}
-			};
-
-			this.destroy = function() {
-				for (var c = 0, l = handles.length; c < l; c++) {
-					handles[c].destroy();
-				}
-			};
-		}
-		return GridsterResizable;
-	}])
-
-	.factory('gridsterDebounce', function() {
-		return function gridsterDebounce(func, wait, immediate) {
-			var timeout;
-			return function() {
-				var context = this,
-					args = arguments;
-				var later = function() {
-					timeout = null;
-					if (!immediate) {
-						func.apply(context, args);
-					}
-				};
-				var callNow = immediate && !timeout;
-				clearTimeout(timeout);
-				timeout = setTimeout(later, wait);
-				if (callNow) {
-					func.apply(context, args);
-				}
-			};
-		};
-	})
-
-	/**
-	 * GridsterItem directive
-	 * @param $parse
-	 * @param GridsterDraggable
-	 * @param GridsterResizable
-	 * @param gridsterDebounce
-	 */
-	.directive('gridsterItem', ['$parse', 'GridsterDraggable', 'GridsterResizable', 'gridsterDebounce',
-		function($parse, GridsterDraggable, GridsterResizable, gridsterDebounce) {
-			return {
-				scope: true,
-				restrict: 'EA',
-				controller: 'GridsterItemCtrl',
-				controllerAs: 'gridsterItem',
-				require: ['^gridster', 'gridsterItem'],
-				link: function(scope, $el, attrs, controllers) {
-					var optionsKey = attrs.gridsterItem,
-						options;
-                                        
-                                        var gridster = controllers[0],
-						item = controllers[1];
-
-					scope.gridster = gridster;
-                                        
-
-					// bind the item's position properties
-					// options can be an object specified by gridster-item="object"
-					// or the options can be the element html attributes object
-					if (optionsKey) {
-						var $optionsGetter = $parse(optionsKey);
-						options = $optionsGetter(scope) || {};
-						if (!options && $optionsGetter.assign) {
-							options = {
-								row: item.row,
-								col: item.col,
-								sizeX: item.sizeX,
-								sizeY: item.sizeY,
-								minSizeX: 0,
-								minSizeY: 0,
-								maxSizeX: null,
-								maxSizeY: null
-							};
-							$optionsGetter.assign(scope, options);
-						}
-					} else {
-						options = attrs;
-					}
-                                        
-					item.init($el, gridster);
-
-					$el.addClass('gridster-item');
-
-					var aspects = ['minSizeX', 'maxSizeX', 'minSizeY', 'maxSizeY', 'sizeX', 'sizeY', 'row', 'col'],
-						$getters = {};
-
-					var expressions = [];
-					var aspectFn = function(aspect) {
-						var expression;
-						if (typeof options[aspect] === 'string') {
-							// watch the expression in the scope
-							expression = options[aspect];
-						} else if (typeof options[aspect.toLowerCase()] === 'string') {
-							// watch the expression in the scope
-							expression = options[aspect.toLowerCase()];
-						} else if (optionsKey) {
-							// watch the expression on the options object in the scope
-							expression = optionsKey + '.' + aspect;
-						} else {
-							return;
-						}
-						expressions.push('"' + aspect + '":' + expression);
-						$getters[aspect] = $parse(expression);
-
-						// initial set
-						var val = $getters[aspect](scope);
-						if (typeof val === 'number') {
-							item[aspect] = val;
-						}
-					};
-
-					for (var i = 0, l = aspects.length; i < l; ++i) {
-						aspectFn(aspects[i]);
-					}
-
-					var watchExpressions = '{' + expressions.join(',') + '}';
-                                        
-					// when the value changes externally, update the internal item object
-					scope.$watchCollection(watchExpressions, function(newVals, oldVals) {
-						for (var aspect in newVals) {
-							var newVal = newVals[aspect];
-							var oldVal = oldVals[aspect];
-							if (oldVal === newVal) {
-								continue;
-							}
-							newVal = parseInt(newVal, 10);
-							if (!isNaN(newVal)) {
-								item[aspect] = newVal;
-							}
-						}
-					});
-
-					function positionChanged() {
-						// call setPosition so the element and gridster controller are updated
-						item.setPosition(item.row, item.col);
-
-						// when internal item position changes, update externally bound values
-						if ($getters.row && $getters.row.assign) {
-							$getters.row.assign(scope, item.row);
-						}
-						if ($getters.col && $getters.col.assign) {
-							$getters.col.assign(scope, item.col);
-						}
-					}
-					scope.$watch(function() {
-						return item.row + ',' + item.col;
-					}, positionChanged);
-
-					function sizeChanged() {
-						var changedX = item.setSizeX(item.sizeX, true);
-						if (changedX && $getters.sizeX && $getters.sizeX.assign) {
-							$getters.sizeX.assign(scope, item.sizeX);
-						}
-						var changedY = item.setSizeY(item.sizeY, true);
-						if (changedY && $getters.sizeY && $getters.sizeY.assign) {
-							$getters.sizeY.assign(scope, item.sizeY);
-						}
-
-						if (changedX || changedY) {
-							item.gridster.moveOverlappingItems(item);
-							gridster.layoutChanged();
-							scope.$broadcast('gridster-item-resized', item);
-						}
-					}
-
-					scope.$watch(function() {
-						return item.sizeY + ',' + item.sizeX + ',' + item.minSizeX + ',' + item.maxSizeX + ',' + item.minSizeY + ',' + item.maxSizeY;
-					}, sizeChanged);
-
-					var draggable = new GridsterDraggable($el, scope, gridster, item, options);
-					var resizable = new GridsterResizable($el, scope, gridster, item, options);
-
-					var updateResizable = function() {
-						resizable.toggle(!gridster.isMobile && gridster.resizable && gridster.resizable.enabled);
-					};
-					updateResizable();
-
-					var updateDraggable = function() {
-						draggable.toggle(!gridster.isMobile && gridster.draggable && gridster.draggable.enabled);
-					};
-					updateDraggable();
-
-					scope.$on('gridster-draggable-changed', updateDraggable);
-					scope.$on('gridster-resizable-changed', updateResizable);
-					scope.$on('gridster-resized', updateResizable);
-					scope.$on('gridster-mobile-changed', function() {
-						updateResizable();
-						updateDraggable();
-					});
-
-					function whichTransitionEvent() {
-						var el = document.createElement('div');
-						var transitions = {
-							'transition': 'transitionend',
-							'OTransition': 'oTransitionEnd',
-							'MozTransition': 'transitionend',
-							'WebkitTransition': 'webkitTransitionEnd'
-						};
-						for (var t in transitions) {
-                                                        if (el.style[t] !== undefined) {
-								return transitions[t];
-							}
-						}
-					}
-
-					var debouncedTransitionEndPublisher = gridsterDebounce(function() {
-						scope.$apply(function() {
-							scope.$broadcast('gridster-item-transition-end', item);
-						});
-					}, 50);
-
-					if(whichTransitionEvent()){ //check for IE8, as it evaluates to null
-                                            $el.on(whichTransitionEvent(), debouncedTransitionEndPublisher);
-                                        }
-
-					scope.$broadcast('gridster-item-initialized', item);
-
-					return scope.$on('$destroy', function() {
-						try {
-							resizable.destroy();
-							draggable.destroy();
-						} catch (e) {}
-
-						try {
-							gridster.removeItem(item);
-						} catch (e) {}
-
-						try {
-							item.destroy();
-						} catch (e) {}
-					});
-				}
-			};
-		}
-	])
-
-	.directive('gridsterNoDrag', function() {
-		return {
-			restrict: 'A',
-			link: function(scope, $element) {
-				$element.addClass('gridster-no-drag');
-			}
-		};
-	})
-
-	;
-
-}));
diff --git a/vid/src/main/webapp/app/fusion/scripts/att_angular_gridster/ui-gridster-tpls.js b/vid/src/main/webapp/app/fusion/scripts/att_angular_gridster/ui-gridster-tpls.js
deleted file mode 100644
index 3ca3db7d8..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/att_angular_gridster/ui-gridster-tpls.js
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
-* FileName ui-gridster
-* Version 0.0.1
-* Build number ad58c6f4f8f8fd7f04ac457f95d76f09
-* Date 08/17/2015
-*/
-
-
-(function(angular, window){
-angular.module("att.gridster", ["att.gridster.tpls", "att.gridster.utilities","att.gridster.gridster"]);
-angular.module("att.gridster.tpls", ["template/gridster/gridster.html","template/gridster/gridsterItem.html","template/gridster/gridsterItemBody.html","template/gridster/gridsterItemFooter.html","template/gridster/gridsterItemHeader.html"]);
-angular.module('att.gridster.utilities', [])
-        .factory('$extendObj', [function() {
-                var _extendDeep = function(dst) {
-                    angular.forEach(arguments, function(obj) {
-                        if (obj !== dst) {
-                            angular.forEach(obj, function(value, key) {
-                                if (dst[key] && dst[key].constructor && dst[key].constructor === Object) {
-                                    _extendDeep(dst[key], value);
-                                } else {
-                                    dst[key] = value;
-                                }
-                            });
-                        }
-                    });
-                    return dst;
-                };
-                return {
-                    extendDeep: _extendDeep
-                };
-            }]);
-
-angular.module('att.gridster.gridster', ['attGridsterLib', 'att.gridster.utilities'])
-        .config(['$compileProvider', function($compileProvider) {
-                $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|javascript):/);
-            }])
-        .constant('attGridsterConfig',
-                {
-                    columns: 3,
-                    margins: [10, 10],
-                    outerMargin: true,
-                    pushing: true,
-                    floating: true,
-                    swapping: true,
-                    draggable: {
-                        enabled: true
-                    }
-                })
-        .directive('attGridster', ['attGridsterConfig', '$extendObj', function(attGridsterConfig, $extendObj) {
-                return {
-                    restrict: 'EA',
-                    scope: {
-                        attGridsterOptions: '=?'
-                    },
-                    templateUrl: 'template/gridster/gridster.html',
-                    replace: false,
-                    transclude: true,
-                    controller: [function() {}],
-                    link: function(scope) {
-                        if (angular.isDefined(scope.attGridsterOptions)) {
-                            attGridsterConfig = $extendObj.extendDeep(attGridsterConfig, scope.attGridsterOptions);
-                        }
-                        scope.attGridsterConfig = attGridsterConfig;
-                    }
-                };
-            }])
-        .directive('attGridsterItem', ['$timeout', function($timeout) {
-                return {
-                    restrict: 'EA',
-                    require: ['^attGridster'],
-                    scope: {
-                        attGridsterItem: '='
-                    },
-                    templateUrl: 'template/gridster/gridsterItem.html',
-                    replace: false,
-                    transclude: true,
-                    controller: [function() {}]
-                };
-            }])
-        .directive('attGridsterItemHeader', [function() {
-                return {
-                    restrict: 'EA',
-                    require: ['^attGridsterItem'],
-                    scope: {
-                        headerText: '@',
-                        subHeaderText: '@?'
-                    },
-                    templateUrl: 'template/gridster/gridsterItemHeader.html',
-                    replace: true,
-                    transclude: true,
-                    link: function(scope, element) {
-                        if (angular.isDefined(scope.subHeaderText) && scope.subHeaderText) {
-                            angular.element(element[0].querySelector('span.gridster-item-sub-header-content')).attr("tabindex", "0");
-                            angular.element(element[0].querySelector('span.gridster-item-sub-header-content')).attr("aria-label", scope.subHeaderText);
-                        }
-                    }
-                };
-            }])
-        .directive('attGridsterItemBody', [function() {
-                return {
-                    restrict: 'EA',
-                    require: ['^attGridsterItem'],
-                    scope: {},
-                    templateUrl: 'template/gridster/gridsterItemBody.html',
-                    replace: true,
-                    transclude: true
-                };
-            }])
-        .directive('attGridsterItemFooter', ['$location', function($location) {
-                return {
-                    restrict: 'EA',
-                    require: ['^attGridsterItem'],
-                    scope: {
-                        attGridsterItemFooterLink: '@?'
-                    },
-                    templateUrl: 'template/gridster/gridsterItemFooter.html',
-                    replace: true,
-                    transclude: true,
-                    controller: ['$scope', function($scope) {
-                            $scope.clickOnFooterLink = function(evt) {
-                                evt.preventDefault();
-                                evt.stopPropagation();
-                                if ($scope.attGridsterItemFooterLink) {
-                                    $location.url($scope.attGridsterItemFooterLink);
-                                }
-                            };
-                        }],
-                    link: function(scope, element) {
-                        if (angular.isDefined(scope.attGridsterItemFooterLink) && scope.attGridsterItemFooterLink) {
-                            element.attr("role", "link");
-                        }
-                    }
-                };
-            }]);
-angular.module("template/gridster/gridster.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/gridster/gridster.html",
-    "
    ");
-}]);
-
-angular.module("template/gridster/gridsterItem.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/gridster/gridsterItem.html",
-    "
    ");
-}]);
-
-angular.module("template/gridster/gridsterItemBody.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/gridster/gridsterItemBody.html",
-    "
    ");
-}]);
-
-angular.module("template/gridster/gridsterItemFooter.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/gridster/gridsterItemFooter.html",
-    "
    \n" +
-    "    \n" +
-    "
    ");
-}]);
-
-angular.module("template/gridster/gridsterItemHeader.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/gridster/gridsterItemHeader.html",
-    "
    \n" +
-    "    \"||\"\n" +
-    "    {{headerText}}\n" +
-    "    {{subHeaderText}}\n" +
-    "    
    \n" +
-    "
    ");
-}]);
-
-return {}
-})(angular, window);
\ No newline at end of file
diff --git a/vid/src/main/webapp/app/fusion/scripts/controllers/adminController.js b/vid/src/main/webapp/app/fusion/scripts/controllers/adminController.js
deleted file mode 100644
index a99be9fea..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/controllers/adminController.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-app.config(function($routeProvider) {
-	$routeProvider
-	
-	
-	.when('/role_function_list', {
-		templateUrl: 'app/fusion/scripts/view-models/profile-page/role_function_list.html',
-		controller: 'roleFunctionListController'
-	})
-	
-	.when('/admin_menu_edit', {
-		templateUrl: 'app/fusion/scripts/view-models/profile-page/admin_menu_edit.html',
-		controller: 'AdminMenuEditController'
-	})
-	.when('/role/:roleId', {
-		templateUrl: 'app/fusion/scripts/view-models/profile-page/role.html',
-		controller: 'roleController'
-	})
-	.when('/jcs_admin', {
-		templateUrl: 'app/fusion/scripts/view-models/profile-page/jcs_admin.html',
-		controller: 'cacheAdminController'
-	})
-	.when('/broadcast_list', {
-		templateUrl: 'app/fusion/scripts/view-models/profile-page/broadcast_list.html',
-		controller: 'broadcastListController'
-	})
-	.when('/broadcast/:messageLocationId/:messageLocation/:messageId', {
-		templateUrl: 'app/fusion/scripts/view-models/profile-page/broadcast.html',
-		controller: 'broadcastController'
-	})
-	.when('/broadcast/:messageLocationId/:messageLocation', {
-		templateUrl: 'app/fusion/scripts/view-models/profile-page/broadcast.html',
-		controller: 'broadcastController'
-	})
-	.when('/collaborate_list', {
-		templateUrl: 'app/fusion/scripts/view-models/profile-page/collaborate_list.html',
-		controller: 'collaborateListController'
-	})
-	.when('/usage_list', {
-		templateUrl: 'app/fusion/scripts/view-models/profile-page/usage_list.html',
-		controller: 'usageListController'
-	})
-	.otherwise({
-		templateUrl: 'app/fusion/scripts/view-models/profile-page/role_list.html',
-		controller : "roleListController"
-	});
-});
diff --git a/vid/src/main/webapp/app/fusion/scripts/controllers/admin_menu_edit.js b/vid/src/main/webapp/app/fusion/scripts/controllers/admin_menu_edit.js
deleted file mode 100644
index 54d58a45a..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/controllers/admin_menu_edit.js
+++ /dev/null
@@ -1,230 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-app.controller('AdminMenuEditController', function ($scope, AdminService, modalService, $modal, $route){
-	$( "#dialog" ).hide();
-	
-/*    AdminService.getRoleFunctionList().then(function(data){
-		
-		var j = data;
-  		$scope.data = JSON.parse(j.data);
-  		$scope.availableRoleFunctions =JSON.parse($scope.data.availableRoleFunctions);
-  		
-  		//$scope.resetMenu();
-	
-	},function(error){
-		console.log("failed");
-		reloadPageOnce();
-	});*/
-	$scope.init = function () {
-		$scope.numberOfRecordstoShow=20;
-		 AdminService.getFnMenuItems().then(function(data){ 
-				var j = data;
-		  		$scope.data =JSON.parse(j.data);
-		  		$scope.fnMenuItems =($scope.data.fnMenuItems);  	
-		  	
-			},function(error){
-				console.log("failed");
-				//reloadPageOnce();
-			}); 
-	}
-	$scope.init();
-    $scope.mapActiveStatus = function(status){
-    	if(status)
-    		status = "Y";
-    		else
-    			status = "N";
-    	return status;
-    	
-    };
-    
-
-    $scope.addNewFnMenuItemModalPopup = function(availableFnMenuItem) {
-		$scope.editFnMenuItem = null;
-		var modalInstance = $modal.open({
-		    templateUrl: 'fn_menu_add_popup.html',
-		    controller: 'fn_menu_popupController',
-		    resolve: {
-		    	message: function () {
-		    		var message = {
-		    				availableFnMenuItem: $scope.editFnMenuItem
-                           	};
-		          return message;
-		        }					
-		      }
-		  }); 
-		modalInstance.result.then(function(response){
-            console.log('response', response);
-            $scope.availableFnMenuItems=response.availableFnMenuItems; 
-            $route.reload();
-        });
-	};
-	
-	$scope.removeMenuItem = function(fnMenuItem) { 
-		modalService.popupConfirmWin("Confirm","You are about to delete the menu item "+fnMenuItem.label+". Do you want to continue?",
-    			function(){
-					  var uuu = "admin_fn_menu/removeMenuItem.htm";
-					  var postData={fnMenuItem: fnMenuItem};
-				  	  $.ajax({
-				  		 type : 'POST',
-				  		 url : uuu,
-				  		 dataType: 'json',
-				  		 contentType: 'application/json',
-				  		 data: JSON.stringify(postData),
-				  		 success : function(data){
-				  			$scope.$apply(function(){$scope.fnMenuItem=data.fnMenuItem;}); 
-				  			$route.reload();
-						 },
-						 error : function(data){
-							 console.log(data);
-							 modalService.showFailure("Fail","Error while deleting: "+ data.responseText);
-						 }
-				  	  });
-					
-    	})
-		
-	};	
-	
-	$scope.editRoleFunction = null;
-	var dialog = null;
-	$scope.editRoleFunctionPopup = function(availableRoleFunction) {
-		$scope.editRoleFunction = availableRoleFunction;
-		$( "#dialog" ).dialog({
-		      modal: true
-	    });
-	};
-	
-    $scope.editMenuItemModalPopup = function(availableFnMenuItem) {
-		$scope.editFnMenuItem = availableFnMenuItem;
-		var modalInstance = $modal.open({
-		    templateUrl: 'fn_menu_add_popup.html',
-		    controller: 'fn_menu_popupController',
-		    resolve: {
-		    	message: function () {
-		    		var message = {
-		    				availableFnMenuItem: $scope.editFnMenuItem
-                           	};
-		          return message;
-		        }					
-		      }
-		  }); 
-		modalInstance.result.then(function(response){
-            $scope.availableFnMenuItems=response.availableFnMenuItems;
-            $route.reload();
-        });
-	};	
-	
-	$scope.editRoleFunctionModalPopup = function(availableRoleFunction) {
-		$scope.editRoleFunction = availableRoleFunction;
-		var modalInstance = $modal.open({
-		    templateUrl: 'edit_role_function_popup.html',
-		    controller: 'rolefunctionpopupController',
-		    resolve: {
-		    	message: function () {
-		    		var message = {
-		    				availableRoleFunction: $scope.editRoleFunction
-                           	};
-		          return message;
-		        }					
-		      }
-		  }); 
-		modalInstance.result.then(function(response){
-            console.log('response', response);
-            $scope.availableRoleFunctions=response.availableRoleFunctions;
-        });
-	};
-	
-	$scope.addNewRoleFunctionModalPopup = function(availableRoleFunction) {
-		$scope.editRoleFunction = null;
-		var modalInstance = $modal.open({
-		    templateUrl: 'edit_role_function_popup.html',
-		    controller: 'rolefunctionpopupController',
-		    resolve: {
-		    	message: function () {
-		    		var message = {
-		    				availableRoleFunction: $scope.editRoleFunction
-                           	};
-		          return message;
-		        }					
-		      }
-		  }); 
-		modalInstance.result.then(function(response){
-            console.log('response', response);
-            $scope.availableRoleFunctions=response.availableRoleFunctions;
-        });
-	};
-	
-	$scope.addNewRoleFunctionPopup = function() {
-		$scope.editRoleFunction = null;
-		$( "#dialog" ).dialog({
-		      modal: true
-	    });
-	};
-	
-	$scope.saveRoleFunction = function(availableRoleFunction) {
-		  var uuu = "role_function_list/saveRoleFunction.htm";
-		  var postData={availableRoleFunction: availableRoleFunction};
-	  	  $.ajax({
-	  		 type : 'POST',
-	  		 url : uuu,
-	  		 dataType: 'json',
-	  		 contentType: 'application/json',
-	  		 data: JSON.stringify(postData),
-	  		 success : function(data){
-	  			$scope.$apply(function(){
-	  				$scope.availableRoleFunctions=[];$scope.$apply();
-	  				$scope.availableRoleFunctions=data.availableRoleFunctions;});  
-	  			//alert("Update Successful.") ;
-	  			console.log($scope.availableRoleFunctions);
-  				
-	  			$scope.editRoleFunction = null;
-	  			$( "#dialog" ).dialog("close");
-			 },
-			 error : function(data){
-				 modalService.showFailure("Fail","Error while saving.");
-			 }
-	  	  });
-		};
-	
-		
-		$scope.removeRole = function(availableRoleFunction) {
-			modalService.popupConfirmWin("Confirm","You are about to delete the role function "+availableRoleFunction.name+". Do you want to continue?",
-	    			function(){
-						  var uuu = "role_function_list/removeRoleFunction.htm";
-						  var postData={availableRoleFunction: availableRoleFunction};
-					  	  $.ajax({
-					  		 type : 'POST',
-					  		 url : uuu,
-					  		 dataType: 'json',
-					  		 contentType: 'application/json',
-					  		 data: JSON.stringify(postData),
-					  		 success : function(data){
-					  			$scope.$apply(function(){$scope.availableRoleFunctions=data.availableRoleFunctions;});  
-							 },
-							 error : function(data){
-								 console.log(data);
-								 modalService.showFailure("Fail","Error while deleting: "+ data.responseText);
-							 }
-					  	  });
-						
-	    	})
-			
-		};
-
-});
diff --git a/vid/src/main/webapp/app/fusion/scripts/controllers/ase-controller.js b/vid/src/main/webapp/app/fusion/scripts/controllers/ase-controller.js
deleted file mode 100644
index 45fc31ac8..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/controllers/ase-controller.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-app.controller('aseCtrl', function ($scope){
-/*		do nothing yet*/
-});	
diff --git a/vid/src/main/webapp/app/fusion/scripts/controllers/broadcast-controller.js b/vid/src/main/webapp/app/fusion/scripts/controllers/broadcast-controller.js
deleted file mode 100644
index 77ee22f5f..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/controllers/broadcast-controller.js
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-app.controller('broadcastController', function ($scope, modalService, $modal,AdminService,$routeParams){
-	//$scope.broadcastMessage=${broadcastMessage};
-	//$scope.broadcastSites=${broadcastSites};
-	//console.log($scope.broadcastMessage);	
-	$scope.broadcastMessage=[];
-	$scope.broadcastSites=[];
-	AdminService.getBroadcast($routeParams.messageLocationId, $routeParams.messageLocation, $routeParams.messageId).then(function(data){
-		var j = data;
-  		$scope.data = JSON.parse(j.data);
-  		$scope.broadcastMessage=JSON.parse($scope.data.broadcastMessage);
-  		$scope.broadcastSites=JSON.parse($scope.data.broadcastSites);
-  		console.log($scope.broadcastMessage);
-  		console.log($scope.broadcastMessage.id);
-  		console.log($scope.broadcastSites);
-  		//$scope.resetMenu();
-	
-	},function(error){
-		console.log("failed");
-		reloadPageOnce();
-    });
-	
-	$scope.save = function() {
-		  var uuu = "broadcast/save";
-		  var postData={broadcastMessage: $scope.broadcastMessage};
-	  	  $.ajax({
-	  		 type : 'POST',
-	  		 url : uuu,
-	  		 dataType: 'json',
-	  		 contentType: 'application/json',
-	  		 data: JSON.stringify(postData),
-	  		 success : function(data){
-	  			window.location.href = "admin#/broadcast_list";
-			 },
-			 error : function(data){
-				 modalService.showFailure("Fail","Error while saving.");
-			 }
-	  	  });
-	};
-	
-	$scope.close = function() {
-	window.location.href = "admin#/broadcast_list";
-};	
-	
-});
-
-$(function() {
-    $( "#startDatepicker" ).datepicker();
-    $( "#endDatepicker" ).datepicker();
-    
-    $( "#startDatepicker" ).change(function() {
-    	var tempStartDate = moment($( "#startDatepicker" ).val()).format('YYYY-MM-DD hh:mm:ss.S');
-    	$( "#startDateHidden" ).val(tempStartDate.toString());
-    	  //alert( $( "#startDateHidden" ).val() );
-    });
-    $( "#endDatepicker" ).change(function() {
-    	var tempEndDate = moment($( "#endDatepicker" ).val()).format('YYYY-MM-DD hh:mm:ss.S');
-    	$( "#endDateHidden" ).val(tempEndDate.toString());
-    	  //alert( $( "#endDateHidden" ).val() );
-  	});
-});
diff --git a/vid/src/main/webapp/app/fusion/scripts/controllers/broadcast-list-controller.js b/vid/src/main/webapp/app/fusion/scripts/controllers/broadcast-list-controller.js
deleted file mode 100644
index cb10a29b4..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/controllers/broadcast-list-controller.js
+++ /dev/null
@@ -1,120 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-app.controller('broadcastListController', function ($scope, modalService, $modal,AdminService){
-	//$scope.broadcastMessage=${broadcastMessage};
-	//$scope.broadcastSites=${broadcastSites};
-	//console.log($scope.broadcastMessage);
-	var messagesMap = {};
-	AdminService.getBroadcastList().then(function(data){ 
-			
-			var j = data;
-	  		$scope.data = JSON.parse(j.data);
-	  		$scope.messagesList=(($scope.data.messagesList===null) ? [""]:$scope.data.messagesList);
-	  		$scope.messageLocations=(($scope.data.messageLocations===null) ? [""]:$scope.data.messageLocations);
-	  		console.log("messages: "+$scope.messagesList);
-	  		console.log("location: "+$scope.messageLocations);
-	  		$.each($scope.messageLocations, function(i, a){ 
-	  			//var result = [];
-	  		    angular.forEach($scope.messagesList, function(value, key) {
-	  		    	if (key+'' === a.value+'') {
-	  		    		//var objsJSON = JSON.parse(value);
-	  		    		
-	  		    		$.each(value, function(i, a){ 
-	  		    			var startDateLong = a.startDate;
-	  		    			var tempStartDate = new Date(startDateLong);
-	  		    			tempStartDate = moment(tempStartDate).format('DD MMM YYYY hh:mmA zz');//03 Jun 2013 04:15PM EDT
-	  		    			a.displayStartDate=tempStartDate.toString();
-	  		    			
-	  		    			var endDateLong = a.endDate;
-	  		    			var tempEndDate = new Date(endDateLong);
-	  		    			tempEndDate = moment(tempEndDate).format('DD MMM YYYY hh:mmA zz');//03 Jun 2013 04:15PM EDT
-	  		    			a.displayEndDate=tempEndDate.toString();
-	  		    		});
-	  		    		a.messages = value;
-	  		        }
-	  		    }); 
-	  		    console.log(a.messages);
-	  		});	
-	  		
-	  		//$scope.resetMenu();
-		
-		},function(error){
-			console.log("failed");
-			reloadPageOnce();
-	});
-	
-	
-	$scope.editMessage = function(location) {
-		
-		editMessage(location.value, location.label);
-	};
-	
-	$scope.toggleActive = function(broadcastMessage) {
-
-		//alert('deleted'+role.name);
-		var uuu = "broadcast_list/toggleActive";
-		  var postData={broadcastMessage:broadcastMessage};
-	  	  $.ajax({
-	  		 type : 'POST',
-	  		 url : uuu,
-	  		 dataType: 'json',
-	  		 contentType: 'application/json',
-	  		 data: JSON.stringify(postData),
-	  		 success : function(data){
-	  			//window.location.reload();  
-			 },
-			 error : function(data){
-				 console.log(data);
-				 modalService.showFailure("Fail","Error while toggling: "+ data.responseText);
-				 
-			 }
-	  	  });
-	
-	
-	};
-	
-	$scope.remove = function(broadcastMessage) {
-
-			//alert('deleted'+role.name);
-			  var uuu = "broadcast_list/remove";
-			  var postData={broadcastMessage:broadcastMessage};
-		  	  $.ajax({
-		  		 type : 'POST',
-		  		 url : uuu,
-		  		 dataType: 'json',
-		  		 contentType: 'application/json',
-		  		 data: JSON.stringify(postData),
-		  		 success : function(data){
-		  			window.location.reload();  
-				 },
-				 error : function(data){
-					 console.log(data);
-					 modalService.showFailure("Fail","Error while deleting: "+ data.responseText);
-				 }
-		  	  });
-		
-		
-	};
-	
-});
-
-function editMessage(messageLocationId, messageLocation, messageId) {
-    window.location='admin#/broadcast/'+messageLocationId + '/' + messageLocation + ((messageId != null) ? '/' + messageId : '');
-}
diff --git a/vid/src/main/webapp/app/fusion/scripts/controllers/collaborate-list-controller.js b/vid/src/main/webapp/app/fusion/scripts/controllers/collaborate-list-controller.js
deleted file mode 100644
index 5b0b93421..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/controllers/collaborate-list-controller.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-app.controller("collaborateListController", function ($scope,$http,modalService, $modal,AdminService) { 
-	// Table Data
-    AdminService.getCollaborateList().then(function(data){
-		
-		var j = data;
-  		$scope.tableData = JSON.parse(j.data);
-  		//$scope.resetMenu();
-	
-	},function(error){
-		console.log("failed");
-		reloadPageOnce();
-	});
-	
-	$scope.viewPerPage = 20;
-    $scope.scrollViewsPerPage = 2;
-    $scope.currentPage = 1;
-    $scope.totalPage;
-    $scope.searchCategory = "";
-    $scope.searchString = "";
- /*    modalService.showSuccess('','Modal Sample') ; */
-	for(x in $scope.tableData){
-		if($scope.tableData[x].active_yn=='Y')
-			$scope.tableData[x].active_yn=true;
-		else
-			$scope.tableData[x].active_yn=false;
-	}
-    $scope.openCollaboration = function(chatId){
-    	openInNewTab('collaboration?chat_id=' + chatId);
-    }
-   
-    $scope.toggleProfileActive = function(profileId) {
-    	modalService.popupConfirmWin("Confirm","You are about to change user's active status. Do you want to continue?",
-    			function(){
-    		        $http.get("profile/toggleProfileActive?profile_id="+profileId).success(function(){});
-					
-    	})
-    };
-   
-});
-
-function openInNewTab(url) {
-	  var win = window.open(url, '_blank');
-	  win.focus();
-};
diff --git a/vid/src/main/webapp/app/fusion/scripts/controllers/fn_menu_add_popup_controller.js b/vid/src/main/webapp/app/fusion/scripts/controllers/fn_menu_add_popup_controller.js
deleted file mode 100644
index e0179946f..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/controllers/fn_menu_add_popup_controller.js
+++ /dev/null
@@ -1,281 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-var fn_menu_popupController =  function ($scope, $modalInstance, message, $http){ /// examine the LeftMenuService
-				if(message.availableFnMenuItem==null)
-					$scope.label='Add New Menu Item'
-						
-				else{
-					$scope.label='Edit Menu Item'
-					//$scope.disableParentId=true;
-				}
-				
-				$scope.getParentData = function(){
-					var uuu = "admin_fn_menu/get_parent_list"
-					  	  $.ajax({
-						  		 type : 'GET',
-						  		 url : uuu,
-						  		 dataType: 'json',				     			// data type expected from server
-						  		 contentType: 'application/json',  
-						  		 //data: JSON.stringify(postData),   			// data type sent to server	
-						  		 success : function(data){
-						  			$scope.$apply(function(){
-						  				//$scope.availableRoleFunctions=[];$scope.$apply();
-						  				$scope.parentListSelectData=data;		// data from server
-						  				menuItems = $scope.parentListSelectData;
-						  				var heirarchicalMenuItems = [];
-						  				var children = [];
-						  				for ( var i=0; i b[prop]) {  
-				            return 1;  
-				        } else if (a[prop] < b[prop]) {  
-				            return -1;  
-				        }  
-				        return 0;  
-				    }  
-									
-				};
-				
-				$scope.getParentLabel = function(parentId, parentListSelectData){
-					var element;
-					element = parentListSelectData[0];
-				    for (var i=0; i=0)
-				$scope.importProfileList.splice(index, 1);
-		}
-	};
-	
-	$scope.prepareProfileSelection = function() {
-		if($scope.importProfileList)
-			$.each($scope.importProfileList, function(i, profile){ 
-			    $scope.preparePostSearchBean(profile);
-			});	
-			;
-	}
-	
-	$scope.preparePostSearchBean = function(profile) {
-		//console.log('Importing: '+profile.orgUserId);
-		//console.log('ngexistinguser:'+$scope.ngexistingUsers[profile.orgUserId])
-		if($scope.postSearchBean.selected==null){
-			$scope.postSearchBean.selected=[];
-			$scope.postSearchBean.postOrgUserId=[];
-			$scope.postSearchBean.postHrid=[];
-			$scope.postSearchBean.postFirstName=[];
-			$scope.postSearchBean.postLastName=[];
-			$scope.postSearchBean.postOrgCode=[];
-			$scope.postSearchBean.postPhone=[];
-			$scope.postSearchBean.postEmail=[];
-			$scope.postSearchBean.postAddress1=[];
-			$scope.postSearchBean.postAddress2=[];
-			$scope.postSearchBean.postCity=[];
-			$scope.postSearchBean.postState=[];
-			$scope.postSearchBean.postZipCode=[];
-			$scope.postSearchBean.postLocationClli=[];
-			$scope.postSearchBean.postBusinessCountryCode=[];
-			$scope.postSearchBean.postBusinessCountryName=[];
-			$scope.postSearchBean.postDepartment=[];
-			$scope.postSearchBean.postDepartmentName=[];
-			$scope.postSearchBean.postBusinessUnit=[];
-			$scope.postSearchBean.postBusinessUnitName=[];
-			$scope.postSearchBean.postJobTitle=[];
-			$scope.postSearchBean.postOrgManagerUserId=[];
-			$scope.postSearchBean.postCommandChain=[];
-			$scope.postSearchBean.postCompanyCode=[];
-			$scope.postSearchBean.postCompany=[];
-			$scope.postSearchBean.postCostCenter=[];
-			$scope.postSearchBean.postSiloStatus=[];
-			$scope.postSearchBean.postFinancialLocCode=[];
-		}
-			
-		$scope.postSearchBean.selected.push(profile.orgUserId);	
-		$scope.postSearchBean.postOrgUserId.push(profile.orgUserId);
-		$scope.postSearchBean.postHrid.push(profile.hrid);
-		$scope.postSearchBean.postFirstName.push(profile.firstName);
-		$scope.postSearchBean.postLastName.push(profile.lastName);
-		$scope.postSearchBean.postOrgCode.push(profile.orgCode);
-		$scope.postSearchBean.postPhone.push(profile.phone);
-		$scope.postSearchBean.postEmail.push(profile.email);
-		$scope.postSearchBean.postAddress1.push(profile.address1);
-		$scope.postSearchBean.postAddress2.push(profile.address2);
-		$scope.postSearchBean.postCity.push(profile.city);
-		$scope.postSearchBean.postState.push(profile.state);
-		if(profile.zipCodeSuffix==null)
-			$scope.postSearchBean.postZipCode.push(profile.zipCode);
-		else
-			$scope.postSearchBean.postZipCode.push(profile.zipCode+'-'+profile.zipCodeSuffix);
-		$scope.postSearchBean.postLocationClli.push(profile.locationClli);
-		$scope.postSearchBean.postBusinessCountryCode.push(profile.businessCountryCode);
-		$scope.postSearchBean.postBusinessCountryName.push(profile.businessCountryName);
-		$scope.postSearchBean.postDepartment.push(profile.department);
-		$scope.postSearchBean.postDepartmentName.push(profile.departmentName);
-		$scope.postSearchBean.postBusinessUnit.push(profile.businessUnit);
-		$scope.postSearchBean.postBusinessUnitName.push(profile.businessUnitName);
-		$scope.postSearchBean.postJobTitle.push(profile.jobTitle);
-		$scope.postSearchBean.postOrgManagerUserId.push(profile.orgManagerUserId);
-		$scope.postSearchBean.postCommandChain.push(profile.commandChain);
-		$scope.postSearchBean.postCompanyCode.push(profile.companyCode);
-		$scope.postSearchBean.postCompany.push(profile.company);
-		$scope.postSearchBean.postCostCenter.push(profile.costCenter);
-		$scope.postSearchBean.postSiloStatus.push(profile.siloStatus);
-		$scope.postSearchBean.postFinancialLocCode.push(profile.financialLocCode);
-	};
-		
-});	
diff --git a/vid/src/main/webapp/app/fusion/scripts/controllers/profile-controller.js b/vid/src/main/webapp/app/fusion/scripts/controllers/profile-controller.js
deleted file mode 100644
index aa0066b07..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/controllers/profile-controller.js
+++ /dev/null
@@ -1,286 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-app.controller('profileController', function ($scope,$http,ProfileService,$routeParams,modalService){
-	$scope.tableData=[];
-	$scope.profile=[];
-	$scope.ociavailableRoles=[];
-	$scope.ociTimeZones;
-	$scope.ociCountries;
-	var stateList=[];
-	$scope.availableRoles = []; 
-	$scope.timeZones = []; 
-	$scope.selectedTimeZone = null;
-	$scope.countries = []; 
-	$scope.selectedCountry = null;
-
-	ProfileService.getProfileDetail($routeParams.profileId).then(function(data){
-		var j = data;
-  		$scope.data = JSON.parse(j.data);
-  		$scope.profile =JSON.parse($scope.data.profile);
-  		$scope.ociavailableRoles =JSON.parse($scope.data.availableRoles);
-  		$scope.ociTimeZones=JSON.parse($scope.data.timeZones);
-  		$scope.ociCountries=JSON.parse($scope.data.countries);
-  		stateList=JSON.parse($scope.data.stateList);
-  		$scope.orgUserId=$scope.profile.orgUserId;
-  		$scope.orgManagerUserId=$scope.profile.orgManagerUserId;
-  		
-  		
-  		if($scope.ociavailableRoles)
-  			$.each($scope.ociavailableRoles, function(i, a){ 
-  				var availableRole = a;
-  				availableRole.selected = false;
-  			    $.each($scope.profile.roles, function(j, b){ 
-  			    	if(a.id === b.id) {
-  			    		availableRole.selected = true;
-  			    	} 
-  			    });
-  			    $scope.availableRoles.push(availableRole);	    
-  			});	
-  			;
-  		
-  		/*$scope.ociTimeZones = ${model.timeZones};*/
-  		
-  		if($scope.ociTimeZones){
-  			$.each($scope.ociTimeZones, function(i, a){ 
-  				var timeZone = {"index":i, "value":a.value, "title":a.label};
-  			    $scope.timeZones.push(timeZone);
-  			    if($scope.profile.timeZoneId !== null && a.value === $scope.profile.timeZoneId.toString()){
-  			    	$scope.selectedTimeZone = timeZone;
-  				}	    
-  			});	
-  		};
-  		
-  		/*$scope.ociCountries = ${model.countries};*/
-  		
-  		//alert($scope.ociCountries[0].label);
-  		if($scope.ociCountries)
-  		$.each($scope.ociCountries, function(i, a){ 
-  			var country = {"index":i, "value":a.value, "title":a.label};
-  		    $scope.countries.push(country);
-  		    if(a.value === $scope.profile.country){
-  		    	$scope.selectedCountry = country;
-  			}	    
-  		});	
-  		;
-  		
-  		/*var stateList=${model.stateList};*/
-  		//alert(stateList[0].label);
-  		stateList = stateList== null? []: stateList;
-  		var selectedState= $scope.profile.state ? $scope.profile.state:"";
-  		$scope.stateList = initDropdownWithLookUp(stateList,selectedState );
-  		
-  		//$scope.resetMenu();
-	    },function(error){
-		console.log("failed");
-		reloadPageOnce();
-	});
-
-	/*$scope.profile=${model.profile};*/
-	$scope.orgUserId=$scope.profile.orgUserId;
-	$scope.orgManagerUserId=$scope.profile.orgManagerUserId;
-	
-	$scope.viewPerPage = 2;
-	$scope.currentPage = 1;
-	$scope.totalPage;
-	$scope.searchCategory = "";
-	$scope.searchString = "";
-	
-	$( "#dialog" ).hide();
-	
-	/*$scope.ociavailableRoles=${model.availableRoles};*/
-	//modalService.showFailure('Error','') ; 
-	
-	
-	$scope.saveProfile = function() {
-		  var uuu = "profile/saveProfile?profile_id=" + $routeParams.profileId;
-		  var postData={profile: $scope.profile,
-				        selectedCountry:$scope.selectedCountry!=null?$scope.selectedCountry.value:"",
-				        selectedState:$scope.stateList.selected!=null?$scope.stateList.selected.value:"",
-				        selectedTimeZone:$scope.selectedTimeZone!=null?$scope.selectedTimeZone.value:""
-		               };
-	  	  $.ajax({
-	  		 type : 'POST',
-	  		 url : uuu,
-	  		 dataType: 'json',
-	  		 contentType: 'application/json',
-	  		 data: JSON.stringify(postData),
-	  		 success : function(data){
-	  			modalService.showSuccess("Success","Update Successful.");
-			 },
-			 error : function(data){
-				 modalService.showFailure("Fail","Error while saving.");
-			 }
-	  	  });
-	};
-		
-		$scope.addNewRolePopup = function(role) {
-			$( "#dialog" ).dialog({
-			      modal: true,
-			      width: 500,
-			      height:600
-			    });
-			$(".ui-dialog").css("z-index",2001); 
-			$(".ui-dialog-titlebar").hide();     
-		};
-		
-		$scope.toggleRole = function(selected,availableRole) {
-				$scope.profileTemp=$scope.profile;
-				$scope.profile={};
-				//alert('toggleRole: '+selected);
-				if(!selected) {
-					//remove role
-					var uuu = "profile/removeRole?profile_id=" + $routeParams.profileId;
-					modalService.popupConfirmWinWithCancel("Confirm","You are about to remove the role "+availableRole.name+" from the profile for "+$scope.profile.firstName+" "+$scope.profile.lastName+". Do you want to continue?",
-			    			function(){
-									var postData={role:availableRole};
-								  	  $.ajax({
-								  		 type : 'POST',
-								  		 url : uuu,
-								  		 dataType: 'json',
-								  		 contentType: 'application/json',
-								  		 data: JSON.stringify(postData),
-								  		 success : function(data){
-								  			$scope.$apply(function(){$scope.profile=data;}); 
-										 },
-										 error : function(data){
-											 $scope.$apply(function(){$scope.profile=$scope.profileTemp;});
-											 modalService.showFailure("Fail","Error while saving.");
-										 }
-								  	  });
-					},
-				    function(){
-				          availableRole.selected=!availableRole.selected;
-					});
-										
-					
-				} else {
-					//add role
-					var uuu = "profile/addNewRole?profile_id=" + $routeParams.profileId;
-					modalService.popupConfirmWinWithCancel("Confirm","You are about to add the role "+availableRole.name+" from the profile for "+$scope.profile.firstName+" "+$scope.profile.lastName+". Do you want to continue?",
-			    			function(){
-									var postData={role:availableRole};
-								  	  $.ajax({
-								  		 type : 'POST',
-								  		 url : uuu,
-								  		 dataType: 'json',
-								  		 contentType: 'application/json',
-								  		 data: JSON.stringify(postData),
-								  		 success : function(data){
-								  			$scope.$apply(function(){$scope.profile=data;}); 
-										 },
-										 error : function(data){
-											 $scope.$apply(function(){$scope.profile=$scope.profileTemp;});
-											 modalService.showFailure("Fail","Error while saving.");
-										 }
-								  	  });
-						
-			    	},function(){
-				          availableRole.selected=!availableRole.selected;
-			    	})
-				
-				}
-				
-				  
-		};
-
-		$scope.removeRole = function(role) {
-			
-			
-			modalService.popupConfirmWin("Confirm","You are about to remove the role "+role.name+" from the profile for "+$scope.profile.firstName+" "+$scope.profile.lastName+". Do you want to continue?",
-	    			function(){
-							$scope.profileTemp=$scope.profile;
-							$scope.profile={};
-							var uuu = "profile/removeRole?profile_id=" + $routeParams.profileId;
-							  var postData={role:role};
-						  	  $.ajax({
-						  		 type : 'POST',
-						  		 url : uuu,
-						  		 dataType: 'json',
-						  		 contentType: 'application/json',
-						  		 data: JSON.stringify(postData),
-						  		 success : function(data){
-						  			$scope.$apply(function(){
-						  				$scope.profile=data;
-						  				$.each($scope.availableRoles, function(k, c){ 
-						  			    	if(c.id === role.id) {
-						  			    		c.selected = false;
-						  			    	}
-						  			    });
-						  			});
-						  			
-								 },
-								 error : function(data){
-									 $scope.$apply(function(){$scope.profile=$scope.profileTemp;});
-									 modalService.showFailure("Fail","Error while saving.");
-								 }
-						  	  });
-				
-	    	})
-	    	
-			
-		};
-		
-		function initDropdownWithLookUp(arr,selectedValue){
-			var dropdownArray=[];
-			var selected = null;
-			if(arr){
-				for(var i = 0,l = arr.length; i < l; i++) {
-					var option = { 
-					        "index" : i ,
-					        "value" : arr[i].value,
-					        "title" : arr[i].label
-					    };
-					dropdownArray.push(option);
-					if(arr[i].value === selectedValue){
-						selected = option;
-					}
-				}
-			}
-			var dropDown={};
-			dropDown.options = dropdownArray;
-			dropDown.selected = selected;
-			return dropDown;
-		};
-		
-		$scope.doRolePopup = function() {	
-			 var modalInstance = $modal.open({
-			    templateUrl: 'roles_popup.html',
-			    controller: 'rolepopupController',
-			    resolve: {
-			    	 message: function () {
-			    		 var message ={
-			    				 availableRoles: $scope.availableRoles
-		        		  };
-			          return message;
-			        }
-			      }
-			  });   
-			 	modalInstance.result.then(function (opts) {
-					if(opts!=null){
-						$scope.profile=opts.profile;
-					}		
-	           });
-		} 
-		
-		$scope.close = function(){
-			$('#dialog').dialog('close');
-		}
-	
-});
diff --git a/vid/src/main/webapp/app/fusion/scripts/controllers/profile-search-controller.js b/vid/src/main/webapp/app/fusion/scripts/controllers/profile-search-controller.js
deleted file mode 100644
index 6da82dcc6..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/controllers/profile-search-controller.js
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-app.controller('profileSearchCtrl', function($scope, $http,ProfileService,modalService){
-
-    $scope.showInput = true;
-    $scope.totalPages1 = 5;
-    $scope.viewPerPage1 = 8;
-    $scope.currentPage1 = 1;
-
-	$scope.$watch('viewPerPage1', function(val) {
-		ProfileService.getProfilePagination($scope.currentPage1, val).then(function(data){
-    		var j = data;
-      		$scope.data = JSON.parse(j.data);
-      		$scope.tableData =JSON.parse($scope.data.profileList);
-      		$scope.totalPages1 =JSON.parse($scope.data.totalPage);
-      		for(x in $scope.tableData){
-				if($scope.tableData[x].active_yn=='Y')
-					$scope.tableData[x].active_yn=true;
-				else
-					$scope.tableData[x].active_yn=false;
-			}
-    	},function(error){
-    		console.log("failed");
-    		reloadPageOnce();
-    	});
-		
-	});
-	    
-	$scope.customHandler = function(num) {
-	    	$scope.currentPage1 = num;	    	
-	    	ProfileService.getProfilePagination($scope.currentPage1,$scope.viewPerPage1).then(function(data){
-	    		var j = data;
-	      		$scope.data = JSON.parse(j.data);
-	      		$scope.tableData =JSON.parse($scope.data.profileList);
-	      		$scope.totalPages1 =JSON.parse($scope.data.totalPage);
-	      		for(x in $scope.tableData){
-					if($scope.tableData[x].active_yn=='Y')
-						$scope.tableData[x].active_yn=true;
-					else
-						$scope.tableData[x].active_yn=false;
-				}
-	    	},function(error){
-	    		console.log("failed");
-	    		reloadPageOnce();
-	    	});
-
-	    };
-
-	$scope.editRow = function(profileId){
-        window.location = 'userProfile#/profile/' + profileId;
-    };
-   
-	$scope.toggleProfileActive = function(rowData) {
-    	modalService.popupConfirmWinWithCancel("Confirm","You are about to change user's active status. Do you want to continue?",
-    			function(){ 
-    		        $http.get("profile/toggleProfileActive?profile_id="+rowData.id).success(function(){});
-    	},
-    	function(){
-    		rowData.active=!rowData.active;
-    	})
-    };
-
-});
diff --git a/vid/src/main/webapp/app/fusion/scripts/controllers/profileController.js b/vid/src/main/webapp/app/fusion/scripts/controllers/profileController.js
deleted file mode 100644
index 4b30e40ea..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/controllers/profileController.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-app.config(function($routeProvider) {
-	$routeProvider
-	.when('/profile/:profileId', {
-		templateUrl: 'app/fusion/scripts/view-models/profile-page/profile_detail.html',
-		controller: 'profileController'
-	})
-	.when('/post_search', {
-		templateUrl: 'app/fusion/scripts/view-models/profile-page/post_search.html',
-		controller: 'postSearchCtrl'
-	})
-	.when('/self_profile', {
-		templateUrl: 'app/fusion/scripts/view-models/profile-page/self_profile.html',
-		controller: 'selfProfileController'
-	})
-	.otherwise({
-		templateUrl: 'app/fusion/scripts/view-models/profile-page/profile_search.html',
-		controller : "profileSearchCtrl"
-	});
-});
diff --git a/vid/src/main/webapp/app/fusion/scripts/controllers/role-controller.js b/vid/src/main/webapp/app/fusion/scripts/controllers/role-controller.js
deleted file mode 100644
index 50913af8e..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/controllers/role-controller.js
+++ /dev/null
@@ -1,226 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-app.controller('roleController', function ($scope, modalService, $modal, AdminService,$routeParams){
-	//$scope.role=${role};
-	//console.log($scope.role.roleFunctions);
-		
-	$( "#dialogRoleFunction" ).hide();
-	$( "#dialogChildRole" ).hide();
-	
-	//$scope.ociavailableRoleFunctions=${availableRoleFunctions};
-	
-	AdminService.getRole($routeParams.roleId).then(function(data){
-		
-		var j = data;
-  		$scope.data = JSON.parse(j.data);
-  		
-  		$scope.role =JSON.parse($scope.data.role);
-  		console.log($scope.role);
-  		
-  		$scope.ociavailableRoleFunctions =JSON.parse($scope.data.availableRoleFunctions);
-  		console.log($scope.ociavailableRoleFunctions);
-  		$scope.availableRoleFunctions=[];
-  		
-  		if($scope.ociavailableRoleFunctions)
-  			$.each($scope.ociavailableRoleFunctions, function(i, a){ 
-  				var availableRoleFunction = a;
-  				availableRoleFunction.selected = false;
-  			    $.each($scope.role.roleFunctions, function(j, b){ 
-  			    	if(a.code === b.code) {
-  			    		availableRoleFunction.selected = true;
-  			    	}
-  			    });
-  			    $scope.availableRoleFunctions.push(availableRoleFunction);	    
-  		});	
-  		
-
-  		$scope.ociavailableRoles=JSON.parse($scope.data.availableRoles);
-  		console.log($scope.ociavailableRoles);
-  		console.log("testing roles if exist");
-  		$scope.availableRoles=[];
-  		
-  		if($scope.ociavailableRoles)
-  			$.each($scope.ociavailableRoles, function(i, a){ 
-  				var availableRole = a;
-  				availableRole.selected = false;
-  				if($scope.role.childRoles){
-  			    $.each($scope.role.childRoles, function(j, b){ 
-  			    	if(a.id === b.id) {
-  			    		availableRole.selected = true;
-  			    	}
-  			    });
-  				};
-  			    $scope.availableRoles.push(availableRole);	    
-  		});
-  			
-	
-	},function(error){
-		console.log("failed");
-		reloadPageOnce();
-	});
-
-	$scope.saveRole = function() {
-				var exists = false;	
-				for(x in $scope.availableRoles){
-				  console.log($scope.availableRoles[x].name);
-					if($scope.availableRoles[x].name==$scope.role.name){
-						modalService.showFailure("Warning",  "Role already exists.");
-						exists = true;
-						//$modalInstance.close({availableRoleFunctions:message.availableRoleFunctions});
-					}
-				}
-				if(!exists){
-					var uuu = "role/saveRole.htm?role_id="+$routeParams.roleId;
-					  var postData={role: $scope.role, childRoles: $scope.role.childRoles, roleFunctions : $scope.role.roleFunctions};
-				  	  $.ajax({
-				  		 type : 'POST',
-				  		 url : uuu,
-				  		 dataType: 'json',
-				  		 contentType: 'application/json',
-				  		 data: JSON.stringify(postData),
-				  		 success : function(data){
-				  			modalService.showSuccess("Success","Update Successful.");
-						 },
-						 error : function(data){
-							 console.log(data);
-							 modalService.showFailure("Fail","Error while saving.");
-						 }
-				  	  });
-				}
-			  
-			};
-		
-	$scope.addNewRoleFunctionModalPopup = function() {
-			var modalInstance = $modal.open({
-			    templateUrl: 'role_functions_popup.html',
-			    controller: 'rolepopupController',
-			    backdrop: 'static',
-			    resolve: {
-			    	roleId: function () {
-				          return $routeParams.roleId;
-				        },
-			    	role: function () {
-			          return $scope.role;
-			        },
-			        availableRoles: function () {
-				          return $scope.ociavailableRoles;
-				    },
-				    availableRoleFunctions: function () {
-				          return $scope.ociavailableRoleFunctions;
-				    }
-			      }
-			  }); 
-			modalInstance.result.then(function(response){
-	            console.log('response', response);
-	            $scope.role=response.role;
-	        });
-	};
-		
-	 $scope.addNewChildRoleModalPopup = function() {
-			var modalInstance = $modal.open({
-			    templateUrl: 'child_roles_popup.html',
-			    controller: 'rolepopupController',
-			    backdrop: 'static',
-			    resolve: {
-			    	roleId: function () {
-				          return $routeParams.roleId;
-				        },
-			    	role: function () {
-			          return $scope.role;
-			        },
-			        availableRoles: function () {
-				          return $scope.ociavailableRoles;
-				    },
-				    availableRoleFunctions: function () {
-				          return $scope.ociavailableRoleFunctions;
-				    }		
-			      }
-			  }); 
-			modalInstance.result.then(function(response){
-	            console.log('response', response);
-	            $scope.role=response.role;
-	        });
-		};
-		
-		
-
-		$scope.removeRoleFunction = function(roleFunction) {
-			modalService.popupConfirmWin("Confirm","You are about to remove the role function "+roleFunction.name+" from the role for "+$scope.role.name+". Do you want to continue?",
-	    			function(){
-						var uuu = "role/removeRoleFunction.htm?role_id=" + $routeParams.roleId;
-						  var postData={roleFunction:roleFunction};
-					  	  $.ajax({
-					  		 type : 'POST',
-					  		 url : uuu,
-					  		 dataType: 'json',
-					  		 contentType: 'application/json',
-					  		 data: JSON.stringify(postData),
-					  		 success : function(data){
-					  			$scope.$apply(function(){
-					  				$scope.role=data.role;
-					  				$.each($scope.availableRoleFunctions, function(k, c){ 
-					  			    	if(c.code === roleFunction.code) {
-					  			    		c.selected = false;
-					  			    	}
-					  			    });
-					  			});
-					  			
-							 },
-							 error : function(data){
-								 modalService.showFailure("Fail","Error while saving.");
-							 }
-					  	  });
-				
-	    	})
-		
-		};
-		
-		$scope.removeChildRole = function(childRole) {
-			modalService.popupConfirmWin("Confirm","You are about to remove the child role "+childRole.name+" from the role for "+$scope.role.name+". Do you want to continue?",
-	    			function(){
-					var uuu = "role/removeChildRole.htm?role_id=" + $routeParams.roleId;
-					  var postData={childRole:childRole};
-				  	  $.ajax({
-				  		 type : 'POST',
-				  		 url : uuu,
-				  		 dataType: 'json',
-				  		 contentType: 'application/json',
-				  		 data: JSON.stringify(postData),
-				  		 success : function(data){
-				  			$scope.$apply(function(){
-				  				$scope.role=data.role;
-				  				$.each($scope.availableRoles, function(k, c){ 
-				  			    	if(c.id === childRole.id) {
-				  			    		c.selected = false;
-				  			    	}
-				  			    });
-				  			});
-				  			
-						 },
-						 error : function(data){
-							 modalService.showFailure("Fail","Error while saving.");
-						 }
-				  	  });
-				
-	    	})
-			
-		};
-		
-});
diff --git a/vid/src/main/webapp/app/fusion/scripts/controllers/role-function-list-controller.js b/vid/src/main/webapp/app/fusion/scripts/controllers/role-function-list-controller.js
deleted file mode 100644
index eedac3e06..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/controllers/role-function-list-controller.js
+++ /dev/null
@@ -1,157 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-app.controller('roleFunctionListController', function ($scope, AdminService, modalService, $modal){
-	$( "#dialog" ).hide();
-	
-    AdminService.getRoleFunctionList().then(function(data){
-		
-		var j = data;
-  		$scope.data = JSON.parse(j.data);
-  		$scope.availableRoleFunctions =JSON.parse($scope.data.availableRoleFunctions);
-  		
-  		//$scope.resetMenu();
-	
-	},function(error){
-		console.log("failed");
-		reloadPageOnce();
-	});
-	
-	$scope.editRoleFunction = null;
-	var dialog = null;
-	$scope.editRoleFunctionPopup = function(availableRoleFunction) {
-		$scope.editRoleFunction = availableRoleFunction;
-		$( "#dialog" ).dialog({
-		      modal: true
-	    });
-	};
-	
-	$scope.editRoleFunctionModalPopup = function(availableRoleFunction) {
-		$scope.editRoleFunction = availableRoleFunction;
-		$scope.availableRoleFunctionsTemp=$scope.availableRoleFunctions;
-		$scope.availableRoleFunctions={};
-		var modalInstance = $modal.open({
-		    templateUrl: 'edit_role_function_popup.html',
-		    controller: 'rolefunctionpopupController',
-		    resolve: {
-		    	message: function () {
-		    		var message = {
-		    				availableRoleFunction:  $scope.editRoleFunction,
-		    				availableRoleFunctions: $scope.availableRoleFunctionsTemp
-                           	};
-		          return message;
-		        }					
-		      }
-		  }); 
-		modalInstance.result.then(function(response){
-            console.log('response', response);
-            if(response!=null)
-            	$scope.availableRoleFunctions=response.availableRoleFunctions;
-            else
-            	$scope.availableRoleFunctions=$scope.availableRoleFunctionsTemp;
-        });
-	};
-	
-	$scope.addNewRoleFunctionModalPopup = function(availableRoleFunction) {
-		$scope.editRoleFunction = null;
-		$scope.availableRoleFunctionsTemp=$scope.availableRoleFunctions;
-		$scope.availableRoleFunctions={};
-		var modalInstance = $modal.open({
-		    templateUrl: 'edit_role_function_popup.html',
-		    controller: 'rolefunctionpopupController',
-		    resolve: {
-		    	message: function () {
-		    		var message = {
-		    				availableRoleFunction: $scope.editRoleFunction,
-		    				availableRoleFunctions: $scope.availableRoleFunctionsTemp
-                           	};
-		          return message;
-		        }					
-		      }
-		  }); 
-		modalInstance.result.then(function(response){
-            console.log('response', response);
-            if(response!=null)
-            	$scope.availableRoleFunctions=response.availableRoleFunctions;
-            else
-            	$scope.availableRoleFunctions=$scope.availableRoleFunctionsTemp;
-        });
-	};
-	
-	$scope.addNewRoleFunctionPopup = function() {
-		$scope.editRoleFunction = null;
-		$( "#dialog" ).dialog({
-		      modal: true
-	    });
-	};
-	
-	$scope.saveRoleFunction = function(availableRoleFunction) {
-		  var uuu = "role_function_list/saveRoleFunction.htm";
-		  var postData={availableRoleFunction: availableRoleFunction};
-	  	  $.ajax({
-	  		 type : 'POST',
-	  		 url : uuu,
-	  		 dataType: 'json',
-	  		 contentType: 'application/json',
-	  		 data: JSON.stringify(postData),
-	  		 success : function(data){
-	  			$scope.$apply(function(){
-	  				$scope.availableRoleFunctions=[];$scope.$apply();
-	  				$scope.availableRoleFunctions=data.availableRoleFunctions;});  
-	  			//alert("Update Successful.") ;
-	  			console.log($scope.availableRoleFunctions);
-  				
-	  			$scope.editRoleFunction = null;
-	  			$( "#dialog" ).dialog("close");
-			 },
-			 error : function(data){
-				 modalService.showFailure("Fail","Error while saving.");
-			 }
-	  	  });
-		};
-	
-		
-		$scope.removeRole = function(availableRoleFunction) {
-			modalService.popupConfirmWin("Confirm","You are about to delete the role function "+availableRoleFunction.name+". Do you want to continue?",
-	    			function(){
-							$scope.availableRoleFunctionsTemp=$scope.availableRoleFunctions;
-							$scope.availableRoleFunctions={};
-						  var uuu = "role_function_list/removeRoleFunction.htm";
-						  var postData={availableRoleFunction: availableRoleFunction};
-					  	  $.ajax({
-					  		 type : 'POST',
-					  		 url : uuu,
-					  		 dataType: 'json',
-					  		 contentType: 'application/json',
-					  		 data: JSON.stringify(postData),
-					  		 success : function(data){
-					  			$scope.$apply(function(){$scope.availableRoleFunctions=data.availableRoleFunctions;});  
-							 },
-							 error : function(data){
-								 console.log(data);
-								 $scope.$apply(function(){$scope.availableRoleFunctions=$scope.availableRoleFunctionsTemp;});
-								 modalService.showFailure("Fail","Error while deleting: "+ data.responseText);
-							 }
-					  	  });
-						
-	    	})
-			
-		};
-
-});
diff --git a/vid/src/main/webapp/app/fusion/scripts/controllers/role-list-controller.js b/vid/src/main/webapp/app/fusion/scripts/controllers/role-list-controller.js
deleted file mode 100644
index a16d61ef2..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/controllers/role-list-controller.js
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-app.controller('roleListController', function ($scope,AdminService,modalService){
-	
-	AdminService.getRoles().then(function(data){
-		
-		var j = data;
-  		$scope.data = JSON.parse(j.data);
-  		$scope.availableRoles =JSON.parse($scope.data.availableRoles);
-  	
-  		//$scope.resetMenu();
-	
-	},function(error){
-		console.log("failed");
-		reloadPageOnce();
-	});
-	
-	//console.log($scope.availableRoles);
-		$scope.toggleRole = function(selected,availableRole) {
-				//alert('toggleRole: '+selected);
-				var toggleType = null;
-				if(selected) {
-					toggleType = "activate";
-				} else {
-					toggleType = "inactivate";
-				}
-				
-				modalService.popupConfirmWinWithCancel("Confirm","You are about to "+toggleType+" the test role "+availableRole.name+". Do you want to continue?",
-		    			function(){
-			                    var uuu = "role_list/toggleRole";
-								
-								var postData={role:availableRole};
-							  	  $.ajax({
-							  		 type : 'POST',
-							  		 url : uuu,
-							  		 dataType: 'json',
-							  		 contentType: 'application/json',
-							  		 data: JSON.stringify(postData),
-							  		 success : function(data){
-							  			console.log(data);
-							  			$scope.$apply(function(){$scope.availableRoles=data.availableRoles;}); 
-							  			console.log($scope.availableRoles);
-									 },
-									 error : function(data){
-										 console.log(data);
-										 modalService.showFailure("Fail","Error while saving.");
-									 }
-							  	  });
-					
-		    	},
-		    	function(){
-		    		availableRole.active=!availableRole.active;
-		    	})
-				
-				  
-		};
-
-		$scope.removeRole = function(role) {
-			
-			modalService.popupConfirmWin("Confirm","You are about to delete the role "+role.name+". Do you want to continue?",
-	    			function(){
-							var uuu = "role_list/removeRole";
-							  var postData={role:role};
-						  	  $.ajax({
-						  		 type : 'POST',
-						  		 url : uuu,
-						  		 dataType: 'json',
-						  		 contentType: 'application/json',
-						  		 data: JSON.stringify(postData),
-						  		 success : function(data){
-						  			$scope.$apply(function(){$scope.availableRoles=data.availableRoles;});  
-								 },
-								 error : function(data){
-									 console.log(data);
-									 modalService.showFailure("Fail","Error while deleting: "+ data.responseText);
-								 }
-						  	  });
-				
-	    	})
-	    	
-			
-		};
-		
-
-});
diff --git a/vid/src/main/webapp/app/fusion/scripts/controllers/rolefunctionpopupController.js b/vid/src/main/webapp/app/fusion/scripts/controllers/rolefunctionpopupController.js
deleted file mode 100644
index 14aea22c0..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/controllers/rolefunctionpopupController.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-var rolefunctionpopupController =  function ($scope, modalService, $modalInstance, message, $http,AdminService){
-				if(message.availableRoleFunction==null) {
-					$scope.label='Add Role Function';
-					var tempText = "";
-				}
-				else{
-					$scope.label='Edit Role Function'
-					$scope.disableCd=true;
-					var tempText = new String(message.availableRoleFunction.name);
-					$scope.editRoleFunction = message.availableRoleFunction; 
-				}
-				
-				$scope.tempText = tempText;
-				
-				$scope.saveRoleFunction = function(availableRoleFunction) {
-					  var uuu = "role_function_list/saveRoleFunction.htm";
-					  var postData={availableRoleFunction: availableRoleFunction};
-
-					  if(availableRoleFunction==null){
-							modalService.showFailure("Warning",  "Please enter valid role function details.");
-					  }
-					  var exists = false;
-					  for(x in message.availableRoleFunctions){
-						  console.log(message.availableRoleFunctions[x].name);
-							if(message.availableRoleFunctions[x].name==availableRoleFunction.name){
-								modalService.showFailure("Warning",  "Role Function already exists.");
-								exists = true;
-								availableRoleFunction.name = $scope.tempText;
-							}
-					  }
-					  
-					  if(!exists && availableRoleFunction.name.trim() != '' && availableRoleFunction.code.trim() != ''){
-			              $http.post(uuu, JSON.stringify(postData)).then(function(res){
-			            	  console.log("data");
-//			            	  console.log(res.data);
-//			            	  $scope.availableRoleFunctionsTemp = res.data.availableRoleFunctions;
-			            	  AdminService.getRoleFunctionList().then(function(data){
-			            			
-			            			var j = data;
-			            	  		$scope.data = JSON.parse(j.data);
-			            	  		$scope.availableRoleFunctions =JSON.parse($scope.data.availableRoleFunctions);
-			            	  		
-			            	  		//$scope.resetMenu();
-			            	  		$modalInstance.close();
-			            		},function(error){
-			            			console.log("failed");
-			            			reloadPageOnce();
-			            			$modalInstance.close();			            			
-			            		});
-			            	  
-			            	  
-			              });						  
-						  
-						  
-						  
-						  
-						}
-				};
-					  
-				  	  
-					
-				$scope.close = function() { 
-					$modalInstance.close();
-				};
-}
diff --git a/vid/src/main/webapp/app/fusion/scripts/controllers/rolepopupmodelController.js b/vid/src/main/webapp/app/fusion/scripts/controllers/rolepopupmodelController.js
deleted file mode 100644
index f8ecfaddb..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/controllers/rolepopupmodelController.js
+++ /dev/null
@@ -1,205 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-var rolepopupController =  function ($scope, $modalInstance, role, roleId, availableRoles, availableRoleFunctions,AdminService,modalService){
-	
-	  		$scope.role = role;
-	  		console.log($scope.role);
-	  		if($scope.role.childRoles==null){
-	  			$scope.role.childRoles=[];
-	  		}
-	  		
-	  		$scope.ociavailableRoles=availableRoles;
-	  		console.log($scope.ociavailableRoles);
-	  		
-	  		$scope.availableRoles=[];
-	  		if($scope.ociavailableRoles)
-	  			$.each($scope.ociavailableRoles, function(i, a){ 
-	  				var availableRole = a;
-	  				availableRole.selected = false;
-	  				if($scope.role.childRoles){
-	  			    $.each($scope.role.childRoles, function(j, b){ 
-	  			    	if(a.id === b.id) {
-	  			    		availableRole.selected = true;
-	  			    	}
-	  			    });
-	  				};
-	  			    $scope.availableRoles.push(availableRole);	    
-	  			});	
-	  			
-	  		$scope.ociavailableRoleFunctions = availableRoleFunctions; 
-	  		console.log($scope.ociavailableRoleFunctions);
-	  		$scope.availableRoleFunctions = []; 
-	  		if($scope.ociavailableRoleFunctions)
-	  			$.each($scope.ociavailableRoleFunctions, function(i, a){ 
-	  				var availableRoleFunction = a;
-	  				availableRoleFunction.selected = false;
-	  			    $.each($scope.role.roleFunctions, function(j, b){ 
-	  			    	if(a.code === b.code) {
-	  			    		availableRoleFunction.selected = true;
-	  			    	}
-	  			    });
-	  			    $scope.availableRoleFunctions.push(availableRoleFunction);	    
-	  		});
-	  		//$scope.resetMenu();
-		
-		$scope.toggleRoleFunction = function(selected,availableRoleFunction) {
-			//alert('toggleRole: '+selected);
-			 
-			if(!selected) {
-				//remove role function
-				if(role.id==null){
-					var index = $scope.role.roleFunctions.indexOf(availableRoleFunction);
-				 	if(index>=0)
-						$scope.role.roleFunctions.splice(index, 1);
-					return;
-				}
-				var uuu = "role/removeRoleFunction.htm?role_id=" + roleId;
-				modalService.popupConfirmWinWithCancel("Confirm","You are about to remove the role function "+availableRoleFunction.name+" from the role for "+$scope.role.name+". Do you want to continue?",
-		    			function(){
-								var postData={roleFunction:availableRoleFunction};
-							  	  $.ajax({
-							  		 type : 'POST',
-							  		 url : uuu,
-							  		 dataType: 'json',
-							  		 contentType: 'application/json',
-							  		 data: JSON.stringify(postData),
-							  		 success : function(data){
-							  			$scope.$apply(function(){$scope.role=data.role;}); 
-									 },
-									 error : function(data){
-										 modalService.showFailure("Fail","Error while saving.");
-									 }
-							  	  });
-					
-		    	},
-		    	function(){
-		    		availableRoleFunction.selected=!availableRoleFunction.selected;
-		    	})
-	
-			} else {
-				//add role function
-				if(role.id==null){
-					$scope.role.roleFunctions.push(availableRoleFunction);
-					return;
-				}
-				var uuu = "role/addRoleFunction.htm?role_id=" + roleId;
-				
-				modalService.popupConfirmWinWithCancel("Confirm","You are about to add the role function "+availableRoleFunction.name+" to the role for "+$scope.role.name+". Do you want to continue?",
-		    			function(){
-					  var postData={roleFunction:availableRoleFunction};
-				  	  $.ajax({
-				  		 type : 'POST',
-				  		 url : uuu,
-				  		 dataType: 'json',
-				  		 contentType: 'application/json',
-				  		 data: JSON.stringify(postData),
-				  		 success : function(data){
-				  			$scope.$apply(function(){$scope.role=data.role;}); 
-						 },
-						 error : function(data){
-							 modalService.showFailure("Fail","Error while saving.");
-						 }
-				  	  });
-					
-		    	},
-		    	function(){
-		    		availableRoleFunction.selected=!availableRoleFunction.selected;
-		    	})
-			}
-			
-			  
-	};
-	
-	$scope.toggleChildRole = function(selected,availableRole) {
-		//alert('toggleRole: '+selected);
-
-		if(!selected) {
-			//remove role
-			if(role.id==null){
-				var index = $scope.role.childRoles.indexOf(availableRole);
-			 	if(index>=0)
-					$scope.role.childRoles.splice(index, 1);
-				return;
-			}
-			var uuu = "role/removeChildRole.htm?role_id=" + roleId;
-			
-			modalService.popupConfirmWinWithCancel("Confirm","You are about to remove the child role "+availableRole.name+" from the role for "+$scope.role.name+". Do you want to continue?",
-	    			function(){
-						var postData={childRole:availableRole};
-					  	  $.ajax({
-					  		 type : 'POST',
-					  		 url : uuu,
-					  		 dataType: 'json',
-					  		 contentType: 'application/json',
-					  		 data: JSON.stringify(postData),
-					  		 success : function(data){
-					  			 console.log('role',data.role);
-					  			 $scope.$apply(function(){$scope.role=data.role;}); 
-							 },
-							 error : function(data){
-								 modalService.showFailure("Fail","Error while saving.");
-							 }
-					  	  });
-				
-	    	},
-	    	function(){
-	    		 availableRole.selected=true;			
-	    	})
-	    	
-		} else {
-			//add role
-			if(role.id==null){
-				$scope.role.childRoles.push(availableRole);
-				return;
-			}
-			var uuu = "role/addChildRole.htm?role_id=" + roleId;
-			
-			modalService.popupConfirmWinWithCancel("Confirm","You are about to add the child role "+availableRole.name+" to the role for "+$scope.role.name+". Do you want to continue?",
-	    			function(){
-				  var postData={childRole:availableRole};
-			  	  $.ajax({
-			  		 type : 'POST',
-			  		 url : uuu,
-			  		 dataType: 'json',
-			  		 contentType: 'application/json',
-			  		 data: JSON.stringify(postData),
-			  		 success : function(data){
-			  			$scope.$apply(function(){$scope.role=data.role;}); 
-					 },
-					 error : function(data){
-						 modalService.showFailure("Fail","Error while saving.");
-					 }
-			  	});
-				
-	    	},
-	    	function(){
-	    		availableRole.selected=false;
-	    	})
-		}
-		
-		  
-	};
-	
-	$scope.close = function() {
-		console.log('role', $scope.role);
-		$modalInstance.close({role:$scope.role});
-	};
-	
-}
diff --git a/vid/src/main/webapp/app/fusion/scripts/controllers/self-profile-controller.js b/vid/src/main/webapp/app/fusion/scripts/controllers/self-profile-controller.js
deleted file mode 100644
index b82dae306..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/controllers/self-profile-controller.js
+++ /dev/null
@@ -1,284 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-app.controller('selfProfileController', function ($scope,$http,ProfileService,$routeParams,modalService){
-	$scope.tableData=[];
-	$scope.profile=[];
-	$scope.ociavailableRoles=[];
-	$scope.ociTimeZones;
-	$scope.ociCountries;
-	var stateList=[];
-	$scope.availableRoles = []; 
-	$scope.timeZones = []; 
-	$scope.selectedTimeZone = null;
-	$scope.countries = []; 
-	$scope.selectedCountry = null;
-	$scope.isUserSystemAdmin = false;
-
-	ProfileService.getSelfProfileDetail().then(function(data){
-		var j = data;
-  		$scope.data = JSON.parse(j.data);
-  		$scope.profile =JSON.parse($scope.data.profile);
-  		$scope.profileId = $scope.profile.id;
-  		$scope.ociavailableRoles =JSON.parse($scope.data.availableRoles);
-  		$scope.ociTimeZones=JSON.parse($scope.data.timeZones);
-  		$scope.ociCountries=JSON.parse($scope.data.countries);
-  		stateList=JSON.parse($scope.data.stateList);
-  		$scope.orgUserId=$scope.profile.orgUserId;
-  		$scope.orgManagerUserId=$scope.profile.orgManagerUserId;
-  		
-  		if($scope.ociavailableRoles)
-  			$.each($scope.ociavailableRoles, function(i, a){ 
-  				var availableRole = a;
-  				availableRole.selected = false;
-  			    $.each($scope.profile.roles, function(j, b){ 
-  			    	if(a.id === b.id) {
-  			    		availableRole.selected = true;
-  			    		if(a.id === 1){
-  			    			$scope.isUserSystemAdmin = true;
-  			    		}
-  			    	} 
-  			    });
-  			    $scope.availableRoles.push(availableRole);	    
-  			});	
-  			;
-  		
-  		/*$scope.ociTimeZones = ${model.timeZones};*/
-  		
-  		if($scope.ociTimeZones){
-  			$.each($scope.ociTimeZones, function(i, a){ 
-  				var timeZone = {"index":i, "value":a.value, "title":a.label};
-  			    $scope.timeZones.push(timeZone);
-  			    if($scope.profile.timeZoneId !== null && a.value === $scope.profile.timeZoneId.toString()){
-  			    	$scope.selectedTimeZone = timeZone;
-  				}	    
-  			});	
-  		};
-  		
-  		/*$scope.ociCountries = ${model.countries};*/
-  		
-  		//alert($scope.ociCountries[0].label);
-  		if($scope.ociCountries)
-  		$.each($scope.ociCountries, function(i, a){ 
-  			var country = {"index":i, "value":a.value, "title":a.label};
-  		    $scope.countries.push(country);
-  		    if(a.value === $scope.profile.country){
-  		    	$scope.selectedCountry = country;
-  			}	    
-  		});	
-  		;
-  		
-  		/*var stateList=${model.stateList};*/
-  		//alert(stateList[0].label);
-  		stateList = stateList== null? []: stateList;
-  		var selectedState= $scope.profile.state ? $scope.profile.state:"";
-  		$scope.stateList = initDropdownWithLookUp(stateList,selectedState );
-  		
-  		//$scope.resetMenu();
-	    },function(error){
-		console.log("failed");
-		reloadPageOnce();
-	});
-
-	/*$scope.profile=${model.profile};*/
-	$scope.orgUserId=$scope.profile.orgUserId;
-	$scope.orgManagerUserId=$scope.profile.orgManagerUserId;
-	
-	$scope.viewPerPage = 2;
-	$scope.currentPage = 1;
-	$scope.totalPage;
-	$scope.searchCategory = "";
-	$scope.searchString = "";
-	
-	$( "#dialog" ).hide();
-	
-	/*$scope.ociavailableRoles=${model.availableRoles};*/
-	//modalService.showFailure('Error','') ; 
-	
-	
-	$scope.saveProfile = function() {
-		  var uuu = "profile/saveProfile?profile_id=" + $scope.profileId;;
-		  var postData={profile: $scope.profile,
-				        selectedCountry:$scope.selectedCountry!=null?$scope.selectedCountry.value:"",
-				        selectedState:$scope.stateList.selected!=null?$scope.stateList.selected.value:"",
-				        selectedTimeZone:$scope.selectedTimeZone!=null?$scope.selectedTimeZone.value:""
-		               };
-	  	  $.ajax({
-	  		 type : 'POST',
-	  		 url : uuu,
-	  		 dataType: 'json',
-	  		 contentType: 'application/json',
-	  		 data: JSON.stringify(postData),
-	  		 success : function(data){
-	  			modalService.showSuccess("Success","Update Successful.");
-			 },
-			 error : function(data){
-				 modalService.showFailure("Fail","Error while saving.");
-			 }
-	  	  });
-	};
-		
-		$scope.addNewRolePopup = function(role) {
-			$( "#dialog" ).dialog({
-			      modal: true,
-			      width: 500,
-			      height:600
-			    });
-			
-			$(".ui-dialog").css("z-index",10002);  
-			$(".ui-dialog-titlebar").hide();     
-		};
-		
-		$scope.toggleRole = function(selected,availableRole) {
-				//alert('toggleRole: '+selected);
-				if(!selected) {
-					//remove role
-					var uuu = "profile/removeRole?profile_id=" + $scope.profileId;;
-					modalService.popupConfirmWinWithCancel("Confirm","You are about to remove the role "+availableRole.name+" from the profile for "+$scope.profile.firstName+" "+$scope.profile.lastName+". Do you want to continue?",
-			    			function(){
-									var postData={role:availableRole};
-								  	  $.ajax({
-								  		 type : 'POST',
-								  		 url : uuu,
-								  		 dataType: 'json',
-								  		 contentType: 'application/json',
-								  		 data: JSON.stringify(postData),
-								  		 success : function(data){
-								  			$scope.$apply(function(){$scope.profile=data;}); 
-										 },
-										 error : function(data){
-											 modalService.showFailure("Fail","Error while saving.");
-										 }
-								  	  });
-					},
-				    function(){
-				          availableRole.selected=!availableRole.selected;
-					});
-										
-					
-				} else {
-					//add role
-					var uuu = "profile/addNewRole?profile_id=" + $scope.profileId;;
-					modalService.popupConfirmWinWithCancel("Confirm","You are about to add the role "+availableRole.name+" from the profile for "+$scope.profile.firstName+" "+$scope.profile.lastName+". Do you want to continue?",
-			    			function(){
-									var postData={role:availableRole};
-								  	  $.ajax({
-								  		 type : 'POST',
-								  		 url : uuu,
-								  		 dataType: 'json',
-								  		 contentType: 'application/json',
-								  		 data: JSON.stringify(postData),
-								  		 success : function(data){
-								  			$scope.$apply(function(){$scope.profile=data;}); 
-										 },
-										 error : function(data){
-											 modalService.showFailure("Fail","Error while saving.");
-										 }
-								  	  });
-						
-			    	},function(){
-				          availableRole.selected=!availableRole.selected;
-			    	})
-				
-				}
-				
-				  
-		};
-
-		$scope.removeRole = function(role) {
-			
-			
-			modalService.popupConfirmWin("Confirm","You are about to remove the role "+role.name+" from the profile for "+$scope.profile.firstName+" "+$scope.profile.lastName+". Do you want to continue?",
-	    			function(){
-							var uuu = "profile/removeRole?profile_id=" + $scope.profileId;;
-							  var postData={role:role};
-						  	  $.ajax({
-						  		 type : 'POST',
-						  		 url : uuu,
-						  		 dataType: 'json',
-						  		 contentType: 'application/json',
-						  		 data: JSON.stringify(postData),
-						  		 success : function(data){
-						  			$scope.$apply(function(){
-						  				$scope.profile=data;
-						  				$.each($scope.availableRoles, function(k, c){ 
-						  			    	if(c.id === role.id) {
-						  			    		c.selected = false;
-						  			    	}
-						  			    });
-						  			});
-						  			
-								 },
-								 error : function(data){
-									 modalService.showFailure("Fail","Error while saving.");
-								 }
-						  	  });
-				
-	    	})
-	    	
-			
-		};
-		
-		function initDropdownWithLookUp(arr,selectedValue){
-			var dropdownArray=[];
-			var selected = null;
-			if(arr){
-				for(var i = 0,l = arr.length; i < l; i++) {
-					var option = { 
-					        "index" : i ,
-					        "value" : arr[i].value,
-					        "title" : arr[i].label
-					    };
-					dropdownArray.push(option);
-					if(arr[i].value === selectedValue){
-						selected = option;
-					}
-				}
-			}
-			var dropDown={};
-			dropDown.options = dropdownArray;
-			dropDown.selected = selected;
-			return dropDown;
-		};
-		
-		$scope.doRolePopup = function() {	
-			 var modalInstance = $modal.open({
-			    templateUrl: 'roles_popup.html',
-			    controller: 'rolepopupController',
-			    resolve: {
-			    	 message: function () {
-			    		 var message ={
-			    				 availableRoles: $scope.availableRoles
-		        		  };
-			          return message;
-			        }
-			      }
-			  });   
-			 	modalInstance.result.then(function (opts) {
-					if(opts!=null){
-						$scope.profile=opts.profile;
-					}		
-	           });
-		} 
-		
-		$scope.close = function(){
-			$('#dialog').dialog('close');
-		}
-
-});
diff --git a/vid/src/main/webapp/app/fusion/scripts/controllers/usage-list-controller.js b/vid/src/main/webapp/app/fusion/scripts/controllers/usage-list-controller.js
deleted file mode 100644
index b495b9340..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/controllers/usage-list-controller.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-app.controller('usageListController', function ($scope,$interval,$http,$modal,modalService,AdminService){
-	
-    AdminService.getUsageList().then(function(data){
-		
-		var j = data;
-  		$scope.data = JSON.parse(j.data);
-  		$scope.users =$scope.data;
-  		//$scope.resetMenu();
-	
-	},function(error){
-		console.log("failed");
-		reloadPageOnce();
-	});
-	
-	$scope.removeSession = function(sessionId) {
-		modalService.popupConfirmWin("Confirm","You are about to expel this user from the application. All of their unsaved data will be lost. Do you want to continue?",
-    			function(){
-			          $http.get("usage_list/removeSession?deleteSessionId="+sessionId).success(function(response){$scope.users=response;});
-    	})
-		
-	}
-});
diff --git a/vid/src/main/webapp/app/fusion/scripts/controllers/workflows/workflowApp.js b/vid/src/main/webapp/app/fusion/scripts/controllers/workflows/workflowApp.js
deleted file mode 100644
index 0a5c80196..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/controllers/workflows/workflowApp.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-angular.module('att.abs.helper', []);
-angular.module('quantum', []);
-
-var app=angular.module("workflowApp", ["att.abs", "att.abs.helper","modalServices",
-                               "att.gridster","checklist-model","ngRoute", "ui.bootstrap"]);
diff --git a/vid/src/main/webapp/app/fusion/scripts/controllers/workflows/workflowController.js b/vid/src/main/webapp/app/fusion/scripts/controllers/workflows/workflowController.js
deleted file mode 100644
index 169a88680..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/controllers/workflows/workflowController.js
+++ /dev/null
@@ -1,509 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-app.controller('workflowsController', function($scope, $http, $uibModal, $log, modalService, $modal) {
-		
-	$scope.viewPerPage = 5;
-    $scope.scrollViewsPerPage = 20;
-    $scope.currentPage = 2;
-    $scope.totalPage;
-    $scope.searchCategory = "";
-    $scope.searchString = "";
-    $scope.radio = {
-        value: ""
-    };
-	
-	
-    $scope.showModal = false;
-    $scope.toggleModal = function(){
-        $scope.showModal = !$scope.showModal;
-    };
-
-    $scope.workflow = {};
-    $scope.workflow.active = "true";
-
-    $scope.updateAllWorkflowStatus = function() {
-		angular.forEach($scope.workflows,function(value){
-			$scope.checkWorkflowStatus(value);
-	    })
-	}
-
-    $scope.fetchWorkflowsList = function() {
-        $http.get('workflows/list').then(function(workflowList){
-        	console.log('Got new list from server = ' + workflowList.data);
-            $scope.workflows = workflowList.data;
-            $scope.updateAllWorkflowStatus();
-        });    	
-    };
-
-    $scope.addNewWorkflow = function(newWorkflow) {
-        $http.post('workflows/addWorkflow/', JSON.stringify(newWorkflow)).success(function() {
-            $scope.fetchWorkflowsList();
-        });
-        
-        $scope.workflow.name = '';
-
-    };
-
-    $scope.updateWorkflow = function (workflowToEdit) {
-    	//workflowToEdit.active='true';
-		 var modalInstance = $uibModal.open({
-			 animation: $scope.animationsEnabled,
-			 templateUrl: 'app/fusion/scripts/view-models/workflows/workflow-new.html',
-			 //size : modalSize,
-			 controller: ['$scope', '$uibModalInstance', '$http', function ($scope, $uibModalInstance, $http) {
-		    		$scope.workflow = workflowToEdit;		    		
-					$scope.ok = function() {	      		  
-		              console.log('Updating existing workflow ... ' + JSON.stringify($scope.workflow));	              
-		              $http.post('workflows/editWorkflow/', JSON.stringify($scope.workflow)).then(function(returnedWorkflow){
-		            	  console.log('Returned Workflow = ' + JSON.stringify(returnedWorkflow));
-		            	  $uibModalInstance.close($scope.workflow);
-		              });
-		      	  };
-		
-		      	  $scope.cancel = function() {
-		      		  $uibModalInstance.dismiss();
-		      	  };
-		    }],
-		    //End of inner controller
-		    resolve: {
-		        workflow: function() {
-		        	console.log('Passing ' + JSON.stringify($scope.workflow)); 
-		        	return $scope.workflow; 
-		        }
-		    }
-		  });
-
-	      modalInstance.result.then(function (editedWorkFlow) {
-	    	  //Need to convert to proper date - later
-	    	  delete editedWorkFlow.created;
-	    	  delete editedWorkFlow.updated;
-	    	  
-	    	  delete editedWorkFlow.createdBy;
-	    	  delete editedWorkFlow.modifiedBy;
-	    	  
-	    	  console.log('selected Item ' + JSON.stringify(editedWorkFlow));	    	  
-	    	  $scope.$emit('workflowAdded', editedWorkFlow);
-	    	  
-	      }, function () {
-	        $log.info('Modal dismissed at: ' + new Date());
-	      });
-    };
-    
-    $scope.reset = function(){
-    	console.log("Resetting ....");
-    };
-      
-	$scope.update = function(){
-		console.log("updating ....");
-	};
-
-    $scope.createWorkflow = function (modalSize) {
-    	
-		 var modalInstance = $uibModal.open({
-		 animation: $scope.animationsEnabled,
-		 templateUrl: 'app/fusion/scripts/view-models/workflows/workflow-new.html',
-		 size : modalSize,		 
-		 controller: ['$scope', '$uibModalInstance', '$http', function ($scope, $uibModalInstance, $http) {
-	    		$scope.workflow = {};
-	    		$scope.workflow.active = 'true'; 
-				$scope.ok = function() {	      		  
-	              console.log('Saving new workflow ... ' + JSON.stringify($scope.workflow));	              
-	              $http.post('workflows/addWorkflow/', JSON.stringify($scope.workflow)).then(function(returnedWorkflow){
-	            	  console.log('Returned Workflow = ' + JSON.stringify(returnedWorkflow));
-	            	  $uibModalInstance.close($scope.workflow);
-	              });
-	      	  };
-/*	      	  console.log(size);*/
-	      	  $scope.cancel = function() {
-	      		  $uibModalInstance.dismiss();
-	      	  };
-	    }],
-	    //End of inner controller
-	    resolve: {
-	        workflow: function() {
-	        	console.log('Passing ' + JSON.stringify($scope.workflow)); 
-	        	return $scope.workflow; 
-	        }
-	    }
-	  });
-
-      modalInstance.result.then(function (newWorkflow) {
-    	  console.log('selected Item ' + JSON.stringify(newWorkflow));
-    	  $scope.$emit('workflowAdded', newWorkflow);
-    	  
-      }, function () {
-        $log.info('Modal dismissed at: ' + new Date());
-      });
-   };//End of createWorkflow function
-   
- 
-   $scope.removeWorkflow = function(workflowToRemove){	   
-	   var modalInstance = $uibModal.open({
-			 animation: $scope.animationsEnabled,
-			 templateUrl: 'app/fusion/scripts/view-models/workflows/workflow-remove.html',
-			 controller: ['$scope', '$uibModalInstance', '$http', function ($scope, $uibModalInstance, $http) {
-		    		$scope.workflowToRemove = workflowToRemove;
-					$scope.ok = function() {	      		  
-		              console.log('Removing workflow ... ' + JSON.stringify($scope.workflowToRemove) + ' on client request.');	              
-		              $http.post('workflows/removeWorkflow/', JSON.stringify($scope.workflowToRemove.id)).then(function(){
-		            	  console.log('Workflow successfully removed !!!');
-		            	  $uibModalInstance.close();
-		              });
-		      	  };
-		
-		      	  $scope.cancel = function() {
-		      		  $uibModalInstance.dismiss();
-		      	  };
-		    }]
-		  });
-
-	      modalInstance.result.then(function () {
-	    	  $scope.$emit('workflowRemoved');	    	  
-	      }, function () {
-	        $log.info('Modal dismissed at: ' + new Date());
-	      });
-	   
-	};
-	
-	
-	
-	   $scope.scheduleWorkflow = function(workflowToSchedule){	   
-		   var modalInstance = $uibModal.open({
-				 animation: $scope.animationsEnabled,
-				 templateUrl: 'app/fusion/scripts/view-models/workflows/workflow-schedule.html',
-				 size:'lg',
-
-				 controller: ['$scope', '$uibModalInstance', '$http','dateFilter', function ($scope, $uibModalInstance, $http,dateFilter) {
-					 
-					 $scope.workflowToSchedule = workflowToSchedule;
-					 $scope.dt = new Date();
-					 $scope.dt2 = new Date();
-					 $scope.dateformat = 'MM/dd/yyyy',
-					 $scope.datetimeformat = "hh:mm a";
-					 
-					 $scope.recurrenceOptions =[{						   
-						  index:0, value:'One-Time', title:'One-Time'
-					 },{
-						 index:1, value: 'Hourly',title:'Hourly'
-					 },{
-						 index:2, value: 'Daily',title:'Daily'
-					 },{
-						 index:3, value: 'Weekly',title:'Weekly'								 		 		 
-			 }]					 
-			 $scope.selectRecurrenceOpt = $scope.recurrenceOptions[0];					 
-					 
-					 $scope.hours = [];
-					 for (var i=0; i<24; i++){
-						 var newObj={}
-						 newObj.index = i;
-						 newObj.value = ""+i;
-						 newObj.title = ""+i;
-						 $scope.hours.push(newObj);
-					 }
-					 
-					 $scope.minutes = [];
-					 for (var i=0; i<60; i++){
-						 var newObj={}
-						 newObj.index = i;
-						 newObj.value = ""+i;
-						 newObj.title = ""+i;
-						 $scope.minutes.push(newObj);
-					 }					 
-					 
-					 $scope.AMPMOptions =[
-					   {
-						  index:0, value:'AM', title:'AM'
-					 },{
-						 index:1, value: 'PM',title:'PM'
-					 }]
-					 
-					 $scope.selectFirstHour =$scope.hours[0];					 
-					 $scope.selectFirstMinute =$scope.minutes[0];
-					 
-					 $scope.selectLastHour =$scope.hours[0];					 
-					 $scope.selectLastMinute =$scope.minutes[0];					 					 	
-					 
-					 $scope.selectStartAMPMOption=$scope.AMPMOptions[0];
-					 $scope.selectLastAMPMOption=$scope.AMPMOptions[0];
-
-					 var GenerateCronExpression = function(trigger_dt, RecurrenceOpt) {
-					 	var CRON_sec = trigger_dt.getSeconds();
-					 	var CRON_min = trigger_dt.getMinutes();
-					 	var CRON_hr = trigger_dt.getHours();
-					 	var CRON_date= trigger_dt.getDate();
-					 	var CRON_month = trigger_dt.toLocaleString('en-US', {month: 'short'}).toUpperCase();
-					 	var CRON_day = trigger_dt.toLocaleString('en-US', {weekday: 'short'}).toUpperCase();
-					 	var CRON_year = trigger_dt.getFullYear();
-					 	if (RecurrenceOpt ==="One-Time") {
-					 		CRON_day = '?'
-						} else {
-							if (RecurrenceOpt ==="Hourly") {
-								CRON_hr = '*';
-								CRON_date = '*'
-								CRON_month = '*'
-								CRON_day = '?'
-								CRON_year = '*'
-							} else if (RecurrenceOpt ==="Daily") {
-								CRON_date = '*'
-								CRON_month = '*'
-								CRON_day = '?'
-								CRON_year = '*'
-							} else if (RecurrenceOpt ==="Weekly") {
-								CRON_date = '*'
-								CRON_month = '*'
-								CRON_year = '*'			
-							}
-						}
-
-						var CRON_Expression = [CRON_sec, CRON_min, CRON_hr, CRON_date, CRON_month, CRON_day, CRON_year];
-						return CRON_Expression.join(" ");
-					}
-
-			    		$scope.ok = function() {
-						 	
-							// DateTime for the start time: it should be noted that the start time
-						 	// for a CRON job should be prior to the trigger time.
-							$scope.trigger_dt = new Date( $scope.dt.getFullYear() +
-												"-" + ("0"+($scope.dt.getMonth()+1)).slice(-2) +
-												"-" +("0"+ $scope.dt.getDate()).slice(-2) +
-												" " + ("0" + $scope.selectFirstHour.value).slice(-2) +
-												":" +("0" + $scope.selectFirstMinute.value).slice(-2) +
-												":00.0");
-
-							$scope.startDateTime_CRON = GenerateCronExpression($scope.trigger_dt, $scope.selectRecurrenceOpt.value)
-
-							//roll back the the start date time by 30 seconds (start time should be 30 seconds prior to trigger time)
-							dt_st = new Date($scope.trigger_dt - 30*1000)
-							
-							startDateTime = dt_st.getFullYear() +
-												"-" + ("0"+(dt_st.getMonth()+1)).slice(-2) +
-												"-" +("0"+ dt_st.getDate()).slice(-2) +
-												" " + ("0" + dt_st.getHours()).slice(-2) +
-												":" +("0" + dt_st.getMinutes()).slice(-2) +
-												":" + ("0" + dt_st.getSeconds()).slice(-2) +".0";
-							$scope.startDateTime = startDateTime;
-							
-							$scope.endDateTime = $scope.dt2.getFullYear() + 
-												"-" + ("0"+($scope.dt2.getMonth()+1)).slice(-2) +
-												"-" +("0"+ $scope.dt2.getDate()).slice(-2) +
-												" " + ("0"+ $scope.selectLastHour.value).slice(-2) +
-												":" +("0" + $scope.selectLastMinute.value).slice(-2) +
-												":00.0"
-												
-							$scope.WorkflowScheduleObject = {};
-							$scope.WorkflowScheduleObject['startDateTime_CRON'] = $scope.startDateTime_CRON;
-							$scope.WorkflowScheduleObject['startDateTime'] = $scope.startDateTime;
-							$scope.WorkflowScheduleObject['endDateTime'] = $scope.endDateTime;
-							$scope.WorkflowScheduleObject['workflowKey'] = $scope.workflowToSchedule.workflowKey;
-							$scope.WorkflowScheduleObject['recurrence'] = $scope.selectRecurrenceOpt.value;
-							$scope.WorkflowScheduleObject['workflow_arguments'] = "test";
-							$scope.WorkflowScheduleObject['workflow_server_url'] = $scope.workflowToSchedule.runLink;
-							
-							
-							TimeFromNowToStart = new Date($scope.startDateTime)-new Date()
-							TimeStartToEnd = new Date($scope.endDateTime)-new Date($scope.startDateTime)
-							
-							if (TimeFromNowToStart<=0) {
-								console.log("invalid start time input")
-								alert("Please ensure the scheduled start date time is later than current time.")
-								return;
-							}
-							if (TimeStartToEnd<=0) {
-								console.log("invalid end time input")
-								alert("Please ensure the schduled end date time is later than the start time.")
-								return;								
-							}
-							// if successful then save and close
-							$scope.saveCronJob($scope.WorkflowScheduleObject);
-							$uibModalInstance.close();
-							
-					 	};
-					 	
-						$scope.saveCronJob = function(cronJobData){
-							
-							console.log('saving cron job data: ' + cronJobData);
-							var uuu = "workflows/saveCronJob.htm";
-							var postData={cronJobDataObj: cronJobData};
-						  	$.ajax({
-							  		 type : 'POST',
-							  		 url : uuu,
-							  		 //dataType: 'json',				// data type expected from server
-							  		 contentType: 'application/json',  
-							  		 data: JSON.stringify(postData),   // data type sent to server	
-							  		 success : function(data){
-													  			$scope.$apply(function(){
-													  				//$scope.availableRoleFunctions=[];$scope.$apply();
-													  				// new // $scope.availableFnMenuItems=data.availableFnMenuItems;
-													  				}
-													  				);  
-													  			//alert("Update Successful.") ;
-													  			//$scope.editRoleFunction = null;
-													  			// new /// $modalInstance.close({availableFnMenuItems:$scope.availableRoleFunctions});
-							  		 						},
-									 error : function(data){
-										 alert("Error while saving."); 
-									 }
-							  	  });							
-							
-						};
-			
-			      	  $scope.cancel = function() {
-			      		  console.log("cancel triggered")
-			      		  $uibModalInstance.dismiss();
-			      	  };
-			    }]
-			  });
-
-		      modalInstance.result.then(function () {
-		    	  $scope.$emit('workflowRemoved');	    	  
-		      }, function () {
-		        $log.info('Modal dismissed at: ' + new Date());
-		      });
-		   
-		};	
-	
-	
-	
-	
-	
-	
-	
-	
-	   $scope.previewWorkflow = function(workflowToPreview,modalSize){	   
-		   var modalInstance = $uibModal.open({
-				 animation: $scope.animationsEnabled,
-				 templateUrl: 'app/fusion/scripts/view-models/workflows/workflow-preview.html',
-				 size:modalSize,
-				 controller: ['$scope', '$uibModalInstance', '$http', function ($scope, $uibModalInstance, $http) {
-			    		$scope.workflowToPreview = workflowToPreview;
-			    		console.log('previewWorkFlow invoked');
-			    		console.log($scope.workflowToPreview);
-			
-			      	  $scope.cancel = function() {
-			      		  $uibModalInstance.dismiss();
-			      	  };
-			    }]
-			  });
-
-		      modalInstance.result.then(function () {
-		    	  $scope.$emit('workflowRemoved');  
-		      }, function () {
-		        $log.info('Modal dismissed at: ' + new Date());
-		      });
-		   
-		};   
-	
-	
-	/* change work flow status based on the boolean variable "suspendBool" which corresponds whether 
-	 * we would like to suspend or activate a workflow specified by key. */	
-	$scope.changeWorkflowStatus = function(workflowToChangeStatus,suspendBool){
-		if (workflowToChangeStatus!==null) {
-		var statusUrl= workflowToChangeStatus.runLink+"/engine-rest/process-definition/key/"+workflowToChangeStatus.workflowKey
-		var suspendedUrl= statusUrl+"/suspended"
-		var xmlHttp = new XMLHttpRequest();
-		xmlHttp.open('PUT', suspendedUrl, false); 
-		xmlHttp.setRequestHeader('Content-Type', 'application/json;charset=UTF-8');
-		xmlHttp.onload = function() {
-			if (suspendBool) {
-				console.log("process definition is now suspended"); 
-				workflowToChangeStatus.active="false"
-			} else {
-				console.log("process definition is now activated");				
-				workflowToChangeStatus.active="true"
-			}
-		};
-		xmlHttp.send(JSON.stringify({
-			"suspended" : suspendBool,
-			"includeProcessInstances" : true,
-			"executionDate" : "2013-11-21T10:49:45"
-		}));
-		}
-		
-	};
-
-	$scope.activateWorkflow = function(workflowToActivate){
-		$scope.changeWorkflowStatus(workflowToActivate,false)
-
-	};
-
-	$scope.suspendWorkflow = function(workflowToActivate){
-		$scope.changeWorkflowStatus(workflowToActivate,true)
-	};		
-	
-	$scope.checkWorkflowStatus = function(workflow) {
-		if (workflow!==null) {
-		var statusUrl= workflow.runLink+"/engine-rest/process-definition/key/"+workflow.workflowKey
-		var xmlHttp3 = new XMLHttpRequest();
-		xmlHttp3.open('GET', statusUrl, true);
-		xmlHttp3.withCredentials = true;
-		xmlHttp3.send();		
-		xmlHttp3.onreadystatechange = function() {
-			if (xmlHttp3.readyState == 4 && xmlHttp3.status == 200) {
-				// do something with the response in the variable data
-				var temp = JSON.parse(xmlHttp3.responseText)
-				if (temp.suspended == false){
-					console.log("Activated")
-					workflow.active="true"
-				} else {
-					console.log("Suspended")
-					workflow.active="false"
-				}
-			}
-		}
-		}
-	};
-	
-	$scope.StartWorkflowInstance = function(workflowToStart){
-		if (workflowToStart!==null) {
-		var statusUrl= workflowToStart.runLink+"/engine-rest/process-definition/key/"+workflowToStart.workflowKey
-		var suspendedUrl= statusUrl+"/submit-form"
-		var xmlHttp = new XMLHttpRequest();
-		xmlHttp.open('POST', suspendedUrl, false); 
-		xmlHttp.setRequestHeader('Content-Type', 'application/json;charset=UTF-8');
-		xmlHttp.onload = function() {
-		};
-		xmlHttp.send(JSON.stringify({
-			  "variables": {
-				    "customerId": {"value":"asdasda","type":"String"},
-				    "amount":{"value":"100","type":"String"}
-				  }
-				}));
-		}
-		
-	};	
-	
-	
-	$scope.$on('workflowAdded', function(event, newWorkflow) { 
-		console.log("New Workflow to be added in list scope " + JSON.stringify(newWorkflow)); 
-		//$scope.workflows.push(newWorkflow);
-		$scope.fetchWorkflowsList();
-		console.log('newly added workflow = ' + JSON.stringify(newWorkflow));
-	});
-	
-	$scope.$on('workflowRemoved', function(event) {
-		$scope.fetchWorkflowsList();
-	});
-
-	$scope.fetchWorkflowsList();
-
-	
-	
-});
-
diff --git a/vid/src/main/webapp/app/fusion/scripts/controllers/workflows/workflowRouting.js b/vid/src/main/webapp/app/fusion/scripts/controllers/workflows/workflowRouting.js
deleted file mode 100644
index 81fe4e283..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/controllers/workflows/workflowRouting.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-app.config(function($routeProvider) {
-	$routeProvider
-	.when('/all', {
-		templateUrl: 'app/fusion/scripts/view-models/workflows/workflow-listing.html',
-		controller: 'workflowsController'
-	})
-});
diff --git a/vid/src/main/webapp/app/fusion/scripts/directives/footer.js b/vid/src/main/webapp/app/fusion/scripts/directives/footer.js
deleted file mode 100644
index a2dab75c2..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/directives/footer.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-app.directive('qFooter', function () {
-    return {
-        restrict: 'A', //This menas that it will be used as an attribute and NOT as an element. I don't like creating custom HTML elements
-        replace: false,
-        templateUrl: "app/fusion/scripts/view-models/footer.html",
-        controller: ['$scope', '$filter', function ($scope, $filter) {
-            // Your behaviour goes here :)
-        }]
-    }
-});
-
diff --git a/vid/src/main/webapp/app/fusion/scripts/directives/header.js b/vid/src/main/webapp/app/fusion/scripts/directives/header.js
deleted file mode 100644
index bc90d2005..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/directives/header.js
+++ /dev/null
@@ -1,504 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-app.directive('qHeader', function () {
-    return {
-        restrict: 'A', //This menas that it will be used as an attribute and NOT as an element. I don't like creating custom HTML elements
-        replace: false,
-        templateUrl: "app/fusion/scripts/view-models/header.html",
-        controller: ['$scope', '$filter','$http','$timeout', '$log','UserInfoService', '$window', '$cookies', function ($scope, $filter, $http, $timeout, $log,UserInfoService, $window, $cookies) {
-        	
-        	/*Define fields*/
-        	$scope.userName;
-        	$scope.userFirstName;
-        	$scope.redirectUrl;
-        	$scope.contactUsUrl;
-        	$scope.getAccessUrl;
-        	$scope.childData=[];
-        	$scope.parentData=[];
-        	$scope.menuItems = [];
-        	$scope.loadMenufail=false;
-        	$scope.megaMenuDataObject=[];       	
-        	$scope.activeClickSubMenu = {
-          		x: ''
-          	};
-      		$scope.activeClickMenu = {
-      			x: ''
-      		};
-      		$scope.favoritesMenuItems = [];
-            $scope.favoriteItemsCount = 0;
-            $scope.showFavorites = false;
-            $scope.emptyFavorites = false;
-            $scope.favoritesWindow = false;
-      		
-            /*Menu Structure*/
-			var menuStructureConvert = function(menuItems) {	
-      			console.log(menuItems);     		
-  				$scope.megaMenuDataObjectTemp = 
-  				[
-  					 {
-  						 text: "ECOMP",
-  						 children: menuItems
-	  				 },
-	  				 {
-	  					 text: "Help",
-	  					 children: [
-	  					            {
-		      						 text:"Contact Us",
-		      						 url:$scope.contactUsUrl
-	  					            },
-									{
-	  					             text:"Get Access",
-	  					             url:$scope.getAccessUrl
-									}]
-	  				 }
-  				 ];      			
-  				return $scope.megaMenuDataObjectTemp;
-	        };
-	        
-	        /***************functions**************/
-	        /*Put user info into fields*/
-	    	$scope.inputUserInfo = function(userInfo){
-	    		if (typeof(userInfo) != "undefined" && userInfo!=null && userInfo!=''){
-	    			if(typeof(userInfo.USER_FIRST_NAME) != "undefined" && userInfo.USER_FIRST_NAME!=null){		
-	    				$scope.userFirstName = userInfo.USER_FIRST_NAME;
-	    			}
-	    		}		
-	    	}
-	        /*getting user info from session*/
-	    	$scope.getUserNameFromSession = function(){
-	    		UserInfoService.getFunctionalMenuStaticDetailSession()
-	    	  	.then(function (res) {
-	    	  		$scope.contactUsUrl=res.contactUsLink;
-      		  		$scope.userName = res.userName;
-      		  		$scope.userFirstName = res.firstName;
-      		  		$scope.redirectUrl = res.portalUrl;
-      		  		$scope.getAccessUrl = res.getAccessUrl;
-	    	  	});
-	        }
-      		$scope.getTopMenuStaticInfo=function() {
-        		var promise = UserInfoService.getFunctionalMenuStaticDetailShareContext();
-        		promise.then(
-    				function(res) {   					
-    					if(res==null || res==''){
-    						$log.info('failed getting static User information');     
-    						$scope.getUserNameFromSession();
-    					}else{
-    						$log.info('Received static User information');
-    						
-    						var resData = res;
-    						console.log(resData);
-    						$scope.inputUserInfo(resData);
-    						$scope.userName = $scope.firstName+ ' '+ $scope.lastName;
-    					}
-    				},
-    				function(err) {
-						$log.info('failed getting static User information');       				
-    				}
-        		);
-      		}
-
-        	$scope.returnToPortal=function(){
-        		window.location.href = $scope.redirectUrl;
-        	}
-        	
-	        var unflatten = function( array, parent, tree ){
-	            tree = typeof tree !== 'undefined' ? tree : [];
-	            parent = typeof parent !== 'undefined' ? parent : { menuId: null };
-	            var children = _.filter( array, function(child){ return child.parentMenuId == parent.menuId; });
-	            if( !_.isEmpty( children )  ){
-	              if( parent.menuId === null ){
-	                tree = children;
-	              }else{
-	                parent['children'] = children
-	              }
-	              _.each( children, function( child ){ unflatten( array, child ) } );
-	            }
-	            return tree;
-	        }
-        	
-        	$scope.getMenu=function() {
-        		$scope.getTopMenuStaticInfo();
-	        	$http({
-	      		        method: "GET",
-	      		        url: 'get_functional_menu',
-// TIMEOUT USED FOR LOCAL TESTING ONLY	      		        
-//	      		        timeout: 100
-	      		 }).success(function (response) {
-	      			 
-				  		if (response == '101: Timeout') {
-				  			$log.debug('Timeout attempting to get_functional_menu');
-				  			$scope.megaMenuDataObject = menuStructureConvert("");
-//				  			$scope.createErrorMenu();
- 				 	   		//$scope.loadMenufail=true;
-				  		} else {
-		 				 	if(typeof response != 'undefined' && response.length!=0 && typeof response[0] != 'undefined' && typeof response[0].error!="undefined"){
-					  			$log.debug('Timeout attempting to get_functional_menu');		 				 		
-		 				 		$scope.menuItems = unflatten( response);
-	 				 	   		$scope.megaMenuDataObject = menuStructureConvert($scope.menuItems);	 				 	 
-//					  			$scope.createErrorMenu();
-	 				 	   		//$scope.loadMenufail=true;
-	 				 	   	}else{
-	 				 	   		$scope.loadMenufail=false;
-	 				 	   		$scope.contactUsURL = response.contactUsLink;
-	 				 	   		$log.debug('functional_menu',response);	 				 	   		
-	 				 	   		$scope.megaMenuDataObject = menuStructureConvert("");
-	 				 	   	}
-				  		}
-	      		 }).error(function (response){
-				  		$scope.megaMenuDataObject = menuStructureConvert("");
-//				  		$scope.createErrorMenu();
-			 	   		//$scope.loadMenufail=true;
-				        $log.debug('REST API failed get_functional_menu...');
-	      		 });
-	        	
-        	}
-        	
-        	$scope.adjustHeader=function() {
-        		$scope.showHeader = ($cookies.show_app_header == undefined ? true : $cookies.show_app_header);
-        		
-        		if($scope.showHeader == true) {
-    	    		$scope.drawer_margin_top = 70;
-    	    		$scope.drawer_custom_top = 54;
-    	    		$scope.toggle_drawer_top = 55;
-        		}
-        		else  {
-        			
-        			$scope.drawer_margin_top = 60;
-            		$scope.drawer_custom_top = 0;
-            		$scope.toggle_drawer_top = 10;
-        		}
-        		
-        	}
-
-        	$scope.getMenu();
-        	$scope.adjustHeader();
-
-/* **************************************************************************/
-/* Logic for the favorite menus is here */
-
-            $scope.loadFavorites = function () {
-                $log.debug('loadFavorites has happened.');
-                if ($scope.favoritesMenuItems == '') {
-                    $scope.generateFavoriteItems();
-                    $log.debug('loadFavorites is calling generateFavoriteItems()');
-                } else {
-                    $log.debug('loadFavorites is NOT calling generateFavoriteItems()');
-                }
-            }
-            
-            $scope.goToUrl = function (item) {
-                $log.info("goToUrl called")
-                $log.info(item);
-
-                var url = item.url;
-                var restrictedApp = item.restrictedApp;
-                $log.debug('Restricted app status is: ' + restrictedApp);
-                if (!url) {
-                    $log.info('No url found for this application, doing nothing..');
-                    return;
-                }
-                if (restrictedApp) {
-                    $window.open(url, '_blank');
-                } else {
-                    $window.open(url, '_self');
-                }
-
-            }
-            
-            $scope.submenuLevelAction = function(index, column) {
-                if ($scope.favoritesMenuItems == '') {
-                    $scope.generateFavoriteItems();
-                    $log.debug('submenuLevelAction is calling generateFavoriteItems()');
-                }
-                $log.debug('item hovered/clicked: ' + index + '; column = ' + column);
-                if (column == 2) {  // 2 is Design
-                    $scope.favoritesWindow = false;
-                    $scope.showFavorites = false;
-                    $scope.emptyFavorites = false;
-                }
-                if (index=='Favorites' && $scope.favoriteItemsCount != 0) {
-                    $log.debug('Showing Favorites window');
-                    $scope.favoritesWindow = true;
-                    $scope.showFavorites = true;
-                    $scope.emptyFavorites = false;
-                }
-                if (index=='Favorites' && $scope.favoriteItemsCount == 0) {
-                    $log.debug('Hiding Favorites window in favor of No Favorites Window');
-                    $scope.favoritesWindow = true;
-                    $scope.showFavorites = false;
-                    $scope.emptyFavorites = true;
-                }
-                if (column > 2) {
-                    $scope.favoritesWindow = false;
-                    $scope.showFavorites = false;
-                    $scope.emptyFavorites = false;
-                }
-            };
-            
-            $scope.hideFavoritesWindow = function() {
-                $log.debug('$scope.hideFavoritesWindow has been called');
-                $scope.showFavorites = false;
-                $scope.emptyFavorites = false;
-            }
-            
-            $scope.isUrlFavorite = function (menuId) {
-//                 $log.debug('array objects in menu favorites = ' + $scope.favoriteItemsCount + '; menuId=' + menuId);
-                var jsonMenu =  JSON.stringify($scope.favoritesMenuItems);
-                var isMenuFavorite =  jsonMenu.indexOf('menuId\":' + menuId);
-                if (isMenuFavorite==-1) {
-                    return false;
-                } else {
-                    return true;
-                }
-
-            }
-            
-            $scope.generateFavoriteItems  = function() {
-            	$http({
-      		        method: "GET",
-      		        url: 'get_favorites',
-// TIMEOUT USED FOR LOCAL TESTING ONLY	      		        
-//	      		        timeout: 100
-	      		    }).success(function (response) {
-				  		if (response == '101: Timeout') {
-						$log.error('Timeout attempting to get_favorites_menu');
-					} else {
-					 	if(typeof response != 'undefined' && response.length!=0 && typeof response[0] != 'undefined' && typeof response[0].error!="undefined"){
-						    $log.error('REST API failed get_favorites' + response);
-					 	   	}else{
-					 	   		$log.debug('get_favorites = ' + JSON.stringify(response));
-						 	   	$scope.favoritesMenuItems = response;
-		                        $scope.favoriteItemsCount = Object.keys($scope.favoritesMenuItems).length;
-		                        $log.info('number of favorite menus: ' + $scope.favoriteItemsCount);
-	                        }
-				  		}
-				}).error(function (response){
-				    $log.error('REST API failed get_favorites' + response);
-//createFavoriteErrorMenu() USED FOR LOCAL TESTING ONLY	      		        
-//					$scope.createFavoriteErrorMenu();
-				});
-        	}
-
-        	$scope.createFavoriteErrorMenu=function() {
-                $scope.favoritesMenuItems = [];
-                $scope.favoriteItemsCount = Object.keys($scope.favoritesMenuItems).length;
-                $log.info('number of favorite menus: ' + $scope.favoriteItemsCount);
-        	}
-            
-        	/* end of Favorite Menu code */
-	        /* **************************************************************************/
-
-        	
-	        /* **************************************************************************/
-        	// THIS IS USED FOR LOCAL TESTING ONLY
-	        /* **************************************************************************/
-        	$scope.createErrorMenu=function() {
-	  			$log.debug('Creating fake menu now...');
-//        		$scope.loadMenufail=true;
-                $scope.menuItems = [
-                                       {
-                                   	    "menuId": 1,
-                                   	    "column": 2,
-                                   	    "text": "Design",
-                                   	    "parentMenuId": null,
-                                   	    "url": ""
-                                   	  },
-                                   	  {
-                                   	    "menuId": 2,
-                                   	    "column": 3,
-                                   	    "text": "Infrastructure Ordering",
-                                   	    "parentMenuId": null,
-                                   	    "url": ""
-                                   	  },
-                                   	  {
-                                   	    "menuId": 3,
-                                   	    "column": 4,
-                                   	    "text": "Service Creation",
-                                   	    "parentMenuId": null,
-                                   	    "url": ""
-                                   	  },
-                                   	  {
-                                   	    "menuId": 4,
-                                   	    "column": 5,
-                                   	    "text": "Service Mgmt",
-                                   	    "parentMenuId": null,
-                                   	    "url": ""
-                                   	  },
-                                   	  {
-                                   	    "menuId": 90,
-                                   	    "column": 1,
-                                   	    "text": "Google",
-                                   	    "parentMenuId": 1,
-                                   	    "url": ""
-                                   	  },
-                                   	  {
-                                   	    "menuId": 91,
-                                   	    "column": 1,
-                                   	    "text": "Mike Little's Coffee Cup",
-                                   	    "parentMenuId": 2,
-                                   	    "url": ""
-                                   	  },
-                                   	  {
-                                   	    "menuId": 92,
-                                   	    "column": 2,
-                                   	    "text": "Andy and his Astrophotgraphy",
-                                   	    "parentMenuId": 3,
-                                   	    "url": ""
-                                   	  },
-                                   	  {
-                                   	    "menuId": 93,
-                                   	    "column": 1,
-                                   	    "text": "JSONLint",
-                                   	    "parentMenuId": 4,
-                                   	    "url": ""
-                                   	  },
-                                   	  {
-                                   	    "menuId": 94,
-                                   	    "column": 2,
-                                   	    "text": "HROneStop",
-                                   	    "parentMenuId": 4,
-                                   	    "url": ""
-                                   	  },
-                                   	  {
-                                   	    "menuId": 95,
-                                   	    "column": 2,
-                                   	    "text": "4th Level App4a R16",
-                                   	    "parentMenuId": 4,
-                                   	    "url": ""
-                                   	  },
-                                   	  {
-                                   	    "menuId": 96,
-                                   	    "column": 3,
-                                   	    "text": "3rd Level App1c R200",
-                                   	    "parentMenuId": 4,
-                                   	    "url": ""
-                                   	  },
-                                   	  {
-                                   	    "menuId": 97,
-                                   	    "column": 1,
-                                   	    "text": "3rd Level App4b R16",
-                                   	    "parentMenuId": 5,
-                                   	    "url": ""
-                                   	  },
-                                   	  {
-                                   	    "menuId": 98,
-                                   	    "column": 2,
-                                   	    "text": "3rd Level App2b R16",
-                                   	    "parentMenuId": 5,
-                                   	    "url": ""
-                                   	  },
-                                   	  {
-                                   	    "menuId": 99,
-                                   	    "column": 1,
-                                   	    "text": "Favorites",
-                                   	    "parentMenuId": null,
-                                   	    "url": ""
-                                   	  }
-                                   	];
-		  		$scope.menuItems = unflatten( $scope.menuItems );
-		  		//remove this
-	 	   		$scope.megaMenuDataObject = menuStructureConvert($scope.menuItems);
-        	}
-        }]
-    }
-});
-
-app.filter("ellipsis", function(){
-    return function(text, length){
-        if (text) {
-            var ellipsis = text.length > length ? "..." : "";
-            return text.slice(0, length) + ellipsis;
-        };
-        return text;        
-    }
-});
-
-function reloadPageOnce() {
-	if( window.localStorage )
-	{
-	  if( !localStorage.getItem('firstLoad') )
-	  {
-	    localStorage['firstLoad'] = true;
-	    window.location.reload();
-	  }  
-	  else
-	    localStorage.removeItem('firstLoad');
-	}
-}
-app.controller('loginSnippetCtrl', function ($scope,$http, $log,UserInfoService){
-	/*Define fields*/
-	$scope.userProfile={
-			firstName:'',
-			lastName:'',
-			fullName:'',
-			email:'',
-			userid:''
-	}
-	/*Put user info into fields*/
-	$scope.inputUserInfo = function(userInfo){
-		if (typeof(userInfo) != "undefined" && userInfo!=null && userInfo!=''){
-			if (typeof(userInfo.USER_FIRST_NAME) != "undefined" && userInfo.USER_FIRST_NAME!=null && userInfo.USER_FIRST_NAME!='')
-    			$scope.userProfile.firstName = userInfo.USER_FIRST_NAME;
-    		if (typeof(userInfo.USER_LAST_NAME) != "undefined" && userInfo.USER_LAST_NAME!=null && userInfo.USER_LAST_NAME!='')
-    			$scope.userProfile.lastName = userInfo.USER_LAST_NAME;
-    		if (typeof(userInfo.USER_EMAIL) != "undefined" && userInfo.USER_EMAIL!=null && userInfo.USER_EMAIL!='')
-    			$scope.userProfile.email = userInfo.USER_EMAIL;	
-    		if (typeof(userInfo.USER_ORGUSERID) != "undefined" && userInfo.USER_ORGUSERID!=null && userInfo.USER_ORGUSERID!='')
-				$scope.userProfile.userid = userInfo.USER_ORGUSERID;    	
-		}		
-	}
-	/*getting user info from session*/
-	$scope.getUserNameFromSession = function(){
-		UserInfoService.getFunctionalMenuStaticDetailSession()
-	  	.then(function (response) {	  		
-	  		$scope.userProfile.fullName = response.userName;
-	  		$scope.userProfile.userid = response.userid;
-	  		$scope.userProfile.email = response.email;
-	  	});
-    }
-	/*getting user info from shared context*/
-	$scope.getUserName=function() {
-		var promise = UserInfoService.getFunctionalMenuStaticDetailShareContext();
-		promise.then(
-			function(res) { 
-				if(res==null || res==''){
-					$log.info('Getting User information from session');
-					$scope.getUserNameFromSession();
-					
-				}else{
-					$log.info('Received User information from shared context',res);
-					var resData = res;
-					console.log(resData);
-					$scope.inputUserInfo(resData);
-					$scope.userProfile.fullName = $scope.userProfile.firstName+ ' '+ $scope.userProfile.lastName;					
-				}
-			},
-			function(err) {
-				console.log('error');
-			}
-		);
-    };
-    /*call the get user info function*/
-    try{
-    	$scope.getUserName();
-    }catch(err){
-    	$log.info('Error while getting User information',err);
-    }
-});
diff --git a/vid/src/main/webapp/app/fusion/scripts/directives/leftMenu.js b/vid/src/main/webapp/app/fusion/scripts/directives/leftMenu.js
deleted file mode 100644
index 737cb8012..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/directives/leftMenu.js
+++ /dev/null
@@ -1,203 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-
-app.directive('qMenu', function () {
-    return {
-        restrict: 'A', //This menas that it will be used as an attribute and NOT as an element. I don't like creating custom HTML elements
-        replace: false,
-        templateUrl: "app/fusion/scripts/view-models/left_menu.html",
-        controller: ['$scope', '$filter','$http','$timeout','$cookies','LeftMenuService', function ($scope, $filter, $http,$timeout,$cookies,LeftMenuService) {
-        	
-        	$scope.leftChildData=[];
-        	$scope.leftParentData=[];
-        	$scope.leftMenuItems = [];
-        	$scope.app_name = "";
-        	$scope.app_name_full;
-        	LeftMenuService.getLeftMenu().then(function(response){
-        		var j = response; 
-    	  		try{
-    	  			if(j && j !== "null" && j!== "undefined"){
-    	  				$scope.leftParentData = JSON.parse(j.data);
-    	      		    $scope.leftChildData = JSON.parse(j.data2);
-    	  			}else{
-    	  				throw "Get Left Menu respsone is not an object/is empty"; 
-    	  			}  
-      		    	try{
-        	  			var leftChildItemList = $scope.leftChildData;
-                  		var pageUrl = window.location.href.split('/')[window.location.href.split('/').length-1];
-                 		var leftParentList =$scope.leftParentData;
-                 		for (var i = 0; i < leftParentList.length; i++) {
-                 			$scope.item = {
-                 				parentLabel : leftParentList[i].label,
-                 				parentAction : leftParentList[i].action,
-                 				parentImageSrc : leftParentList[i].imageSrc,                 				
-                 				open:pageUrl==leftParentList[i].action?true:false,
-                 				childItemList : leftChildItemList[i]
-                 			}
-                 			$scope.leftMenuItems.push($scope.item);
-                 		};   
-        	  		}catch(err){
-        	  			console.log("error happened while trying to set left menu structure"+err);  					   
-        	  		}
-    	  		}catch (e) {
-    	  			console.log("error happened while trying to get left menu items"+e);
-    	  			reloadPageOnce();
-    	  			return;
-    	        }	       
-    		},function(error){
-    			console.log("error happened while calling getLeftMenu"+error);
-    		});
-        	
-        	LeftMenuService.getAppName().then(function(response){
-        		var j = response; 
-    	  		try{
-    	  			if(j && j !== "null" && j!== "undefined"){
-    	  				console.log("app name is " + $scope.app_name);
-    	  				$scope.app_name_full = j.data;
-    	  				var processed_app_name = j.data;
-    	  				var n = processed_app_name.length;
-    	  				if (n > 15) {
-    	  					n = 15;
-    	  				}
-    	  				$scope.app_name = processed_app_name.substr(0, n);
-    	  			}else{
-    	  				throw "Get app_name respsone is not an object/is empty"; 
-    	  			}  
-    	  		}catch (e) {
-    	  			console.log("error happened while trying to get app name "+e);
-    	  			return;
-    	        }	       
-    		},function(error){
-    			console.log("error happened while calling getAppName "+error);
-    		});
-        	
-        	$scope.adjustHeader=function() {
-        		$scope.showHeader = ($cookies.show_app_header == undefined ? true : $cookies.show_app_header);
-        		
-        		if($scope.showHeader == true) {
-    	    		$scope.drawer_margin_top = 50;
-    	    		$scope.drawer_custom_top = 20;
-    	    		$scope.toggle_drawer_top = 55;
-        		}
-        		else  {
-        			
-        			$scope.drawer_margin_top = 0;
-            		$scope.drawer_custom_top = 0;
-            		$scope.toggle_drawer_top = 0;
-        		}
-        		
-        		
-        	};
-
-        	$scope.adjustHLeftMenu = function (type){
-        		$scope.showHeader = ($cookies.show_app_header == undefined ? true : $cookies.show_app_header);
-        		
-        		if($scope.showHeader == true) {
-    	    		$scope.drawer_margin_top = 60;
-    	    		$scope.drawer_custom_top = 54;
-    	    		$scope.toggle_drawer_top = 55;
-        		}
-        		else  {
-        			
-        			$scope.drawer_margin_top = 50;
-            		$scope.drawer_custom_top = 0;
-            		$scope.toggle_drawer_top = 10;
-        		}
-        		if(type=='burgerIcon'){
-        			return { "top": $scope.toggle_drawer_top+"px"};
-        		}else if(type=='leftMenu'){
-        			return { "margin-top": $scope.drawer_margin_top+"px"};
-        		}else
-        			return;
-        	}
-        	$scope.adjustHeader();
-    		$scope.drawerOpen = true;
-
-    		$scope.toggleDrawer = function() {
-    			$scope.drawerOpen = !($scope.drawerOpen);
-    			if ($scope.drawerOpen) {
-    			// setCookie('drawerOpen','open',30);
-    			$scope.arrowShow = true;
-
-
-    			if (document.getElementById('fnMenueContent')!=null)
-    			document.getElementById('fnMenueContent').style.marginLeft = "0px";
-    			
-    			if (document.getElementById('rightContentAdmin')!=null)
-    					document.getElementById('rightContentAdmin').style.marginLeft = "210px"; 
-    					
-    				else if (document.getElementById('rightContentProfile')!=null)
-    					document.getElementById('rightContentProfile').style.marginLeft = "210px";
-
-
-
-    			} else {
-
-    			$scope.arrowShow = false;
-
-    			if (document.getElementById('fnMenueContent')!=null)
-    			document.getElementById('fnMenueContent').style.marginLeft = "-150px";
-    			
-    			if (document.getElementById('rightContentAdmin')!=null) {
-    						document.getElementById('rightContentAdmin').style.marginLeft = "50px";
-    						
-    					}
-    					
-    			else if (document.getElementById('rightContentProfile')!=null)
-    				document.getElementById('rightContentProfile').style.marginLeft = "50px";
-    			
-				
-
-
-    			}
-    			};
-    			
-    		$timeout(function() {
-    			detectScrollEvent();
-    		}, 800);
-        }]
-    }
-    
-});
-$(window).scroll(function() {
-	if ($('.att-drawer').is(':visible')) {
-		detectScrollEvent();
-	}
-
-});
-
-function detectScrollEvent() {
-	try{
-		var footerOff = $('#footerContainer').offset().top;
-		var headOff = $('#headerContainer').offset().top;
-		var winHeight = $(window).height();
-		if ((footerOff - headOff) <= winHeight) {
-			$('.att-drawer').css({
-				"height" : footerOff - headOff - 55
-			});
-		} else {
-			$('.att-drawer').css({
-				"height" : "94vh"
-			});
-		}
-	}catch(err){
-		console.log(err)
-	}
-}
diff --git a/vid/src/main/webapp/app/fusion/scripts/jquery.resize.js b/vid/src/main/webapp/app/fusion/scripts/jquery.resize.js
deleted file mode 100644
index 1ebd6c95b..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/jquery.resize.js
+++ /dev/null
@@ -1,139 +0,0 @@
-/*!
- * jquery.resize.js 0.0.1 - https://github.com/yckart/jquery.resize.js
- * Resize-event for DOM-Nodes
- *
- * @see http://workingdraft.de/113/
- * @see http://www.backalleycoder.com/2013/03/18/cross-browser-event-based-element-resize-detection/
- *
- * Copyright (c) 2013 Yannick Albert (http://yckart.com)
- * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php).
- * 2013/04/01
- */
-
-(function(factory) {
-    if(typeof define === 'function' && define.amd) {
-        // AMD. Register as an anonymous module.
-        define(['jquery'], factory);
-    } else if(typeof exports === 'object') {
-        // Node/CommonJS style for Browserify
-        module.exports = factory;
-    } else {
-        // Browser globals
-        factory(jQuery);
-    }
-}(function($) {
-
-    function addFlowListener(element, type, fn) {
-        var flow = type == 'over';
-        element.addEventListener('OverflowEvent' in window ? 'overflowchanged' : type + 'flow', function(e) {
-            if(e.type == (type + 'flow') || ((e.orient == 0 && e.horizontalOverflow == flow) || (e.orient == 1 && e.verticalOverflow == flow) || (e.orient == 2 && e.horizontalOverflow == flow && e.verticalOverflow == flow))) {
-                e.flow = type;
-                return fn.call(this, e);
-            }
-        }, false);
-    };
-
-    function fireEvent(element, type, data, options) {
-        var options = options || {},
-            event = document.createEvent('Event');
-        event.initEvent(type, 'bubbles' in options ? options.bubbles : true, 'cancelable' in options ? options.cancelable : true);
-        for(var z in data) event[z] = data[z];
-        element.dispatchEvent(event);
-    };
-
-    $.event.special.resize = {
-        setup: function() {
-            var element = this;
-            var resize = 'onresize' in element;
-            if(!resize && !element._resizeSensor) {
-                var sensor = element._resizeSensor = document.createElement('div');
-                sensor.className = 'resize-sensor';
-                sensor.innerHTML = '
    ';
-
-                var x = 0,
-                    y = 0,
-                    first = sensor.firstElementChild.firstChild,
-                    last = sensor.lastElementChild.firstChild,
-                    matchFlow = function(event) {
-                        var change = false,
-                            width = element.offsetWidth;
-                        if(x != width) {
-                            first.style.width = width - 1 + 'px';
-                            last.style.width = width + 1 + 'px';
-                            change = true;
-                            x = width;
-                        }
-                        var height = element.offsetHeight;
-                        if(y != height) {
-                            first.style.height = height - 1 + 'px';
-                            last.style.height = height + 1 + 'px';
-                            change = true;
-                            y = height;
-                        }
-                        if(change && event.currentTarget != element) fireEvent(element, 'resize');
-                    };
-
-                if(getComputedStyle(element).position == 'static') {
-                    element.style.position = 'relative';
-                    element._resizeSensor._resetPosition = true;
-                }
-                addFlowListener(sensor, 'over', matchFlow);
-                addFlowListener(sensor, 'under', matchFlow);
-                addFlowListener(sensor.firstElementChild, 'over', matchFlow);
-                addFlowListener(sensor.lastElementChild, 'under', matchFlow);
-                element.appendChild(sensor);
-                matchFlow({});
-            }
-            var events = element._flowEvents || (element._flowEvents = []);
-            if(events.indexOf(handler) == -1) events.push(handler);
-            if(!resize) element.addEventListener('resize', handler, false);
-            element.onresize = function(e) {
-                events.forEach(function(fn) {
-                    fn.call(element, e);
-                });
-            };
-        },
-
-        teardown: function() {
-            var element = this;
-            var index = element._flowEvents.indexOf(handler);
-            if(index > -1) element._flowEvents.splice(index, 1);
-            if(!element._flowEvents.length) {
-                var sensor = element._resizeSensor;
-                if(sensor) {
-                    element.removeChild(sensor);
-                    if(sensor._resetPosition) element.style.position = 'static';
-                    delete element._resizeSensor;
-                }
-                if('onresize' in element) element.onresize = null;
-                delete element._flowEvents;
-            }
-            element.removeEventListener('resize', handler);
-        }
-    };
-
-    $.fn.extend({
-        resize: function(fn) {
-            return fn ? this.bind("resize", fn) : this.trigger("resize");
-        },
-
-        unresize: function(fn) {
-            return this.unbind("resize", fn);
-        }
-    });
-
-
-    function handler(event) {
-        var orgEvent = event || window.event,
-            args = [].slice.call(arguments, 1);
-
-        event = $.event.fix(orgEvent);
-        event.type = "resize";
-
-        // Add event to the front of the arguments
-        args.unshift(event);
-
-        return($.event.dispatch || $.event.handle).apply(this, args);
-    }
-
-}));
\ No newline at end of file
diff --git a/vid/src/main/webapp/app/fusion/scripts/layout/debug.js b/vid/src/main/webapp/app/fusion/scripts/layout/debug.js
deleted file mode 100644
index eff36a250..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/layout/debug.js
+++ /dev/null
@@ -1,329 +0,0 @@
-/**
- *	debugData
- *
- *	Pass me a data structure {} and I'll output all the key/value pairs - recursively
- *
- *	@example var HTML = debugData( oElem.style, "Element.style", { keys: "top,left,width,height", recurse: true, sort: true, display: true, returnHTML: true });	
- *
- *	@param Object	o_Data   A JSON-style data structure
- *	@param String	s_Title  Title for dialog (optional)
- *	@param Hash	options  Pass additional options in a hash
- */
-function debugData (o_Data, s_Title, options) {
-	options = options || {};
-	var
-		str=(s_Title||s_Title==='' ? s_Title : 'DATA')
-	,	dType=$.type(o_Data)
-	//	maintain backward compatibility with OLD 'recurseData' param
-	,	recurse=($.type(options)==='boolean' ? options : options.recurse !==false)
-	,	keys=(options.keys?','+options.keys+',':false)
-	,	display=options.display !==false
-	,	html=options.returnHTML !==false
-	,	sort=!!options.sort
-	,	prefix=options.indent ? '    ' : ''
-	,	D=[], i=0 // Array to hold data, i=counter
-	,	hasSubKeys = false
-	,	k, t, skip, x, type	// loop vars
-	;
-	if (dType!=='object' && dType!=='array') {
-		if (options.display) alert( (s_Title || 'debugData') +': '+ o_Data );
-		return o_Data;
-	}
-	if (dType==='object' && $.isPlainObject(o_Data))
-		dType='hash';
-
-	if (o_Data.jquery) {
-		str=s_Title+'jQuery Collection ('+ o_Data.length +')\n    context="'+ o_Data.context +'"';
-	}
-	else if (o_Data.nodeName) {
-		str=s_Title+o_Data.tagName;
-		var id = o_Data.id, cls=o_Data.className, src=o_Data.src, hrf=o_Data.href;
-		if (id)  str+='\n    id="'+		id+'"';
-		if (cls) str+='\n    class="'+	cls+'"';
-		if (src) str+='\n    src="'+	src+'"';
-		if (hrf) str+='\n    href="'+	hrf+'"';
-	}
-	else {
-		parse(o_Data,prefix,dType); // recursive parsing
-		if (sort && !hasSubKeys) D.sort(); // sort by keyName - but NOT if has subKeys!
-		if (str) str += '\n***'+ '****************************'.substr(0,str.length) +'\n';
-		str += D.join('\n'); // add line-breaks
-	}
-
-	if (display) alert(str); // display data
-	if (html) str=str.replace(/\n/g, ' 
    ').replace(/  /g, '  '); // format as HTML
-	return str;
-
-	function parse ( data, prefix, parentType ) {
-		var first = true;
-		try {
-			$.each( data, function (key, val) {
-				skip = (keys && keys.indexOf(','+key+',') === -1);
-				type = $.type(val);
-				if (type==='object' && $.isPlainObject(val))
-					type = 'hash';
-				k = prefix + (first ? '    ' : ',   ');
-				first = false;
-
-				if (parentType!=='array') // no key-names for array items
-					k += key+':  '; // NOT an array
-
-				if (type==="date" || type==="regexp") {
-					val  = val.toString();
-					type = "string";
-				}
-				if (type==="string") {				// STRING
-					if (!skip) D[i++] = k +'"'+ val +'"';
-				}
-													// NULL, UNDEFINED, NUMBER or BOOLEAN
-				else if (/^(null|undefined|number|boolean)/.test(type)) {
-					if (!skip) D[i++] = k + val;
-				}
-				else if (type==="function") {		// FUNCTION
-					if (!skip) D[i++] = k +'function()';
-				}
-				else if (type==="array") {			// ARRAY
-					if (!skip) {
-						D[i++] = k +'[';
-						parse( val, prefix+'    ',type); // RECURSE
-						D[i++] = prefix +'    ]';
-					}
-				}
-				else if (val.jquery) {				// JQUERY OBJECT
-					if (!skip) D[i++] = k +'jQuery ('+ val.length +') context="'+ val.context +'"';
-				}
-				else if (val.nodeName) {			// DOM ELEMENT
-					var id = val.id, cls=val.className, src=val.src, hrf=val.href;
-					if (skip) D[i++] = k +' '+
-						id  ? 'id="'+	id+'"' :
-						src ? 'src="'+	src+'"' :
-						hrf ? 'href="'+	hrf+'"' :
-						cls ? 'class="'+cls+'"' :
-						'';
-				}
-				else if (type==="hash") {			// JSON
-					if (!recurse || $.isEmptyObject(val)) { // show an empty hash
-						if (!skip) D[i++] = k +'{ }';
-					}
-					else { // recurse into JSON hash - indent output
-						D[i++] = k +'{';
-						parse( val, prefix+'    ',type); // RECURSE
-						D[i++] = prefix +'    }';
-					}
-				}
-				else {								// OBJECT
-					if (!skip) D[i++] = k +'OBJECT'; // NOT a hash
-				}
-			});
-		} catch (e) {}
-	}
-};
-
-function debugStackTrace (s_Title, options) {
-	var
-		callstack = []
-	,	isCallstackPopulated = false
-	;
-	try {
-		i.dont.exist += 0; // doesn't exist- that's the point
-	} catch(e) {
-		if (e.stack) { // Firefox
-			var lines = e.stack.split('\n');
-			for (var i=0, len=lines.length; i')
-		.html( content.replace(/\n/g, '
    ').replace(/  /g, '  ') ) // format as HTML
-		.css( options.css )
-		;
-};
diff --git a/vid/src/main/webapp/app/fusion/scripts/layout/jquery-latest.js b/vid/src/main/webapp/app/fusion/scripts/layout/jquery-latest.js
deleted file mode 100644
index 1c998babc..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/layout/jquery-latest.js
+++ /dev/null
@@ -1,9555 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.9.0
- * http://jquery.com/
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- *
- * Copyright 2005, 2012 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2013-1-14
- */
-(function( window, undefined ) {
-"use strict";
-var
-	// A central reference to the root jQuery(document)
-	rootjQuery,
-
-	// The deferred used on DOM ready
-	readyList,
-
-	// Use the correct document accordingly with window argument (sandbox)
-	document = window.document,
-	location = window.location,
-
-	// Map over jQuery in case of overwrite
-	_jQuery = window.jQuery,
-
-	// Map over the $ in case of overwrite
-	_$ = window.$,
-
-	// [[Class]] -> type pairs
-	class2type = {},
-
-	// List of deleted data cache ids, so we can reuse them
-	core_deletedIds = [],
-
-	core_version = "1.9.0",
-
-	// Save a reference to some core methods
-	core_concat = core_deletedIds.concat,
-	core_push = core_deletedIds.push,
-	core_slice = core_deletedIds.slice,
-	core_indexOf = core_deletedIds.indexOf,
-	core_toString = class2type.toString,
-	core_hasOwn = class2type.hasOwnProperty,
-	core_trim = core_version.trim,
-
-	// Define a local copy of jQuery
-	jQuery = function( selector, context ) {
-		// The jQuery object is actually just the init constructor 'enhanced'
-		return new jQuery.fn.init( selector, context, rootjQuery );
-	},
-
-	// Used for matching numbers
-	core_pnum = /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,
-
-	// Used for splitting on whitespace
-	core_rnotwhite = /\S+/g,
-
-	// Make sure we trim BOM and NBSP (here's looking at you, Safari 5.0 and IE)
-	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
-
-	// A simple way to check for HTML strings
-	// Prioritize #id over  to avoid XSS via location.hash (#9521)
-	// Strict HTML recognition (#11290: must start with <)
-	rquickExpr = /^(?:(<[\w\W]+>)[^>]*|#([\w-]*))$/,
-
-	// Match a standalone tag
-	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>|)$/,
-
-	// JSON RegExp
-	rvalidchars = /^[\],:{}\s]*$/,
-	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
-	rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,
-	rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,
-
-	// Matches dashed string for camelizing
-	rmsPrefix = /^-ms-/,
-	rdashAlpha = /-([\da-z])/gi,
-
-	// Used by jQuery.camelCase as callback to replace()
-	fcamelCase = function( all, letter ) {
-		return letter.toUpperCase();
-	},
-
-	// The ready event handler and self cleanup method
-	DOMContentLoaded = function() {
-		if ( document.addEventListener ) {
-			document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-			jQuery.ready();
-		} else if ( document.readyState === "complete" ) {
-			// we're here because readyState === "complete" in oldIE
-			// which is good enough for us to call the dom ready!
-			document.detachEvent( "onreadystatechange", DOMContentLoaded );
-			jQuery.ready();
-		}
-	};
-
-jQuery.fn = jQuery.prototype = {
-	// The current version of jQuery being used
-	jquery: core_version,
-
-	constructor: jQuery,
-	init: function( selector, context, rootjQuery ) {
-		var match, elem;
-
-		// HANDLE: $(""), $(null), $(undefined), $(false)
-		if ( !selector ) {
-			return this;
-		}
-
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
-				// Assume that strings that start and end with <> are HTML and skip the regex check
-				match = [ null, selector, null ];
-
-			} else {
-				match = rquickExpr.exec( selector );
-			}
-
-			// Match html or make sure no context is specified for #id
-			if ( match && (match[1] || !context) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] ) {
-					context = context instanceof jQuery ? context[0] : context;
-
-					// scripts is true for back-compat
-					jQuery.merge( this, jQuery.parseHTML(
-						match[1],
-						context && context.nodeType ? context.ownerDocument || context : document,
-						true
-					) );
-
-					// HANDLE: $(html, props)
-					if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
-						for ( match in context ) {
-							// Properties of context are called as methods if possible
-							if ( jQuery.isFunction( this[ match ] ) ) {
-								this[ match ]( context[ match ] );
-
-							// ...and otherwise set as attributes
-							} else {
-								this.attr( match, context[ match ] );
-							}
-						}
-					}
-
-					return this;
-
-				// HANDLE: $(#id)
-				} else {
-					elem = document.getElementById( match[2] );
-
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE and Opera return items
-						// by name instead of ID
-						if ( elem.id !== match[2] ) {
-							return rootjQuery.find( selector );
-						}
-
-						// Otherwise, we inject the element directly into the jQuery object
-						this.length = 1;
-						this[0] = elem;
-					}
-
-					this.context = document;
-					this.selector = selector;
-					return this;
-				}
-
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return ( context || rootjQuery ).find( selector );
-
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return this.constructor( context ).find( selector );
-			}
-
-		// HANDLE: $(DOMElement)
-		} else if ( selector.nodeType ) {
-			this.context = this[0] = selector;
-			this.length = 1;
-			return this;
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return rootjQuery.ready( selector );
-		}
-
-		if ( selector.selector !== undefined ) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
-		return jQuery.makeArray( selector, this );
-	},
-
-	// Start with an empty selector
-	selector: "",
-
-	// The default length of a jQuery object is 0
-	length: 0,
-
-	// The number of elements contained in the matched element set
-	size: function() {
-		return this.length;
-	},
-
-	toArray: function() {
-		return core_slice.call( this );
-	},
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num == null ?
-
-			// Return a 'clean' array
-			this.toArray() :
-
-			// Return just the object
-			( num < 0 ? this[ this.length + num ] : this[ num ] );
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems ) {
-
-		// Build a new jQuery matched element set
-		var ret = jQuery.merge( this.constructor(), elems );
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-		ret.context = this.context;
-
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
-	},
-
-	ready: function( fn ) {
-		// Add the callback
-		jQuery.ready.promise().done( fn );
-
-		return this;
-	},
-
-	slice: function() {
-		return this.pushStack( core_slice.apply( this, arguments ) );
-	},
-
-	first: function() {
-		return this.eq( 0 );
-	},
-
-	last: function() {
-		return this.eq( -1 );
-	},
-
-	eq: function( i ) {
-		var len = this.length,
-			j = +i + ( i < 0 ? len : 0 );
-		return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		}));
-	},
-
-	end: function() {
-		return this.prevObject || this.constructor(null);
-	},
-
-	// For internal use only.
-	// Behaves like an Array's method, not like a jQuery method.
-	push: core_push,
-	sort: [].sort,
-	splice: [].splice
-};
-
-// Give the init function the jQuery prototype for later instantiation
-jQuery.fn.init.prototype = jQuery.fn;
-
-jQuery.extend = jQuery.fn.extend = function() {
-	var options, name, src, copy, copyIsArray, clone,
-		target = arguments[0] || {},
-		i = 1,
-		length = arguments.length,
-		deep = false;
-
-	// Handle a deep copy situation
-	if ( typeof target === "boolean" ) {
-		deep = target;
-		target = arguments[1] || {};
-		// skip the boolean and the target
-		i = 2;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
-		target = {};
-	}
-
-	// extend jQuery itself if only one argument is passed
-	if ( length === i ) {
-		target = this;
-		--i;
-	}
-
-	for ( ; i < length; i++ ) {
-		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null ) {
-			// Extend the base object
-			for ( name in options ) {
-				src = target[ name ];
-				copy = options[ name ];
-
-				// Prevent never-ending loop
-				if ( target === copy ) {
-					continue;
-				}
-
-				// Recurse if we're merging plain objects or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
-					if ( copyIsArray ) {
-						copyIsArray = false;
-						clone = src && jQuery.isArray(src) ? src : [];
-
-					} else {
-						clone = src && jQuery.isPlainObject(src) ? src : {};
-					}
-
-					// Never move original objects, clone them
-					target[ name ] = jQuery.extend( deep, clone, copy );
-
-				// Don't bring in undefined values
-				} else if ( copy !== undefined ) {
-					target[ name ] = copy;
-				}
-			}
-		}
-	}
-
-	// Return the modified object
-	return target;
-};
-
-jQuery.extend({
-	noConflict: function( deep ) {
-		if ( window.$ === jQuery ) {
-			window.$ = _$;
-		}
-
-		if ( deep && window.jQuery === jQuery ) {
-			window.jQuery = _jQuery;
-		}
-
-		return jQuery;
-	},
-
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
-
-	// A counter to track how many items to wait for before
-	// the ready event fires. See #6781
-	readyWait: 1,
-
-	// Hold (or release) the ready event
-	holdReady: function( hold ) {
-		if ( hold ) {
-			jQuery.readyWait++;
-		} else {
-			jQuery.ready( true );
-		}
-	},
-
-	// Handle when the DOM is ready
-	ready: function( wait ) {
-
-		// Abort if there are pending holds or we're already ready
-		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
-			return;
-		}
-
-		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-		if ( !document.body ) {
-			return setTimeout( jQuery.ready );
-		}
-
-		// Remember that the DOM is ready
-		jQuery.isReady = true;
-
-		// If a normal DOM Ready event fired, decrement, and wait if need be
-		if ( wait !== true && --jQuery.readyWait > 0 ) {
-			return;
-		}
-
-		// If there are functions bound, to execute
-		readyList.resolveWith( document, [ jQuery ] );
-
-		// Trigger any bound ready events
-		if ( jQuery.fn.trigger ) {
-			jQuery( document ).trigger("ready").off("ready");
-		}
-	},
-
-	// See test/unit/core.js for details concerning isFunction.
-	// Since version 1.3, DOM methods and functions like alert
-	// aren't supported. They return false on IE (#2968).
-	isFunction: function( obj ) {
-		return jQuery.type(obj) === "function";
-	},
-
-	isArray: Array.isArray || function( obj ) {
-		return jQuery.type(obj) === "array";
-	},
-
-	isWindow: function( obj ) {
-		return obj != null && obj == obj.window;
-	},
-
-	isNumeric: function( obj ) {
-		return !isNaN( parseFloat(obj) ) && isFinite( obj );
-	},
-
-	type: function( obj ) {
-		if ( obj == null ) {
-			return String( obj );
-		}
-		return typeof obj === "object" || typeof obj === "function" ?
-			class2type[ core_toString.call(obj) ] || "object" :
-			typeof obj;
-	},
-
-	isPlainObject: function( obj ) {
-		// Must be an Object.
-		// Because of IE, we also have to check the presence of the constructor property.
-		// Make sure that DOM nodes and window objects don't pass through, as well
-		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-			return false;
-		}
-
-		try {
-			// Not own constructor property must be Object
-			if ( obj.constructor &&
-				!core_hasOwn.call(obj, "constructor") &&
-				!core_hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
-				return false;
-			}
-		} catch ( e ) {
-			// IE8,9 Will throw exceptions on certain host objects #9897
-			return false;
-		}
-
-		// Own properties are enumerated firstly, so to speed up,
-		// if last one is own, then all properties are own.
-
-		var key;
-		for ( key in obj ) {}
-
-		return key === undefined || core_hasOwn.call( obj, key );
-	},
-
-	isEmptyObject: function( obj ) {
-		var name;
-		for ( name in obj ) {
-			return false;
-		}
-		return true;
-	},
-
-	error: function( msg ) {
-		throw new Error( msg );
-	},
-
-	// data: string of html
-	// context (optional): If specified, the fragment will be created in this context, defaults to document
-	// keepScripts (optional): If true, will include scripts passed in the html string
-	parseHTML: function( data, context, keepScripts ) {
-		if ( !data || typeof data !== "string" ) {
-			return null;
-		}
-		if ( typeof context === "boolean" ) {
-			keepScripts = context;
-			context = false;
-		}
-		context = context || document;
-
-		var parsed = rsingleTag.exec( data ),
-			scripts = !keepScripts && [];
-
-		// Single tag
-		if ( parsed ) {
-			return [ context.createElement( parsed[1] ) ];
-		}
-
-		parsed = jQuery.buildFragment( [ data ], context, scripts );
-		if ( scripts ) {
-			jQuery( scripts ).remove();
-		}
-		return jQuery.merge( [], parsed.childNodes );
-	},
-
-	parseJSON: function( data ) {
-		// Attempt to parse using the native JSON parser first
-		if ( window.JSON && window.JSON.parse ) {
-			return window.JSON.parse( data );
-		}
-
-		if ( data === null ) {
-			return data;
-		}
-
-		if ( typeof data === "string" ) {
-
-			// Make sure leading/trailing whitespace is removed (IE can't handle it)
-			data = jQuery.trim( data );
-
-			if ( data ) {
-				// Make sure the incoming data is actual JSON
-				// Logic borrowed from http://json.org/json2.js
-				if ( rvalidchars.test( data.replace( rvalidescape, "@" )
-					.replace( rvalidtokens, "]" )
-					.replace( rvalidbraces, "")) ) {
-
-					return ( new Function( "return " + data ) )();
-				}
-			}
-		}
-
-		jQuery.error( "Invalid JSON: " + data );
-	},
-
-	// Cross-browser xml parsing
-	parseXML: function( data ) {
-		var xml, tmp;
-		if ( !data || typeof data !== "string" ) {
-			return null;
-		}
-		try {
-			if ( window.DOMParser ) { // Standard
-				tmp = new DOMParser();
-				xml = tmp.parseFromString( data , "text/xml" );
-			} else { // IE
-				xml = new ActiveXObject( "Microsoft.XMLDOM" );
-				xml.async = "false";
-				xml.loadXML( data );
-			}
-		} catch( e ) {
-			xml = undefined;
-		}
-		if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
-			jQuery.error( "Invalid XML: " + data );
-		}
-		return xml;
-	},
-
-	noop: function() {},
-
-	// Evaluates a script in a global context
-	// Workarounds based on findings by Jim Driscoll
-	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
-	globalEval: function( data ) {
-		if ( data && jQuery.trim( data ) ) {
-			// We use execScript on Internet Explorer
-			// We use an anonymous function so that context is window
-			// rather than jQuery in Firefox
-			( window.execScript || function( data ) {
-				window[ "eval" ].call( window, data );
-			} )( data );
-		}
-	},
-
-	// Convert dashed to camelCase; used by the css and data modules
-	// Microsoft forgot to hump their vendor prefix (#9572)
-	camelCase: function( string ) {
-		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
-	},
-
-	// args is for internal usage only
-	each: function( obj, callback, args ) {
-		var value,
-			i = 0,
-			length = obj.length,
-			isArray = isArraylike( obj );
-
-		if ( args ) {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			}
-
-		// A special, fast, case for the most common use of each
-		} else {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			}
-		}
-
-		return obj;
-	},
-
-	// Use native String.trim function wherever possible
-	trim: core_trim && !core_trim.call("\uFEFF\xA0") ?
-		function( text ) {
-			return text == null ?
-				"" :
-				core_trim.call( text );
-		} :
-
-		// Otherwise use our own trimming functionality
-		function( text ) {
-			return text == null ?
-				"" :
-				( text + "" ).replace( rtrim, "" );
-		},
-
-	// results is for internal usage only
-	makeArray: function( arr, results ) {
-		var ret = results || [];
-
-		if ( arr != null ) {
-			if ( isArraylike( Object(arr) ) ) {
-				jQuery.merge( ret,
-					typeof arr === "string" ?
-					[ arr ] : arr
-				);
-			} else {
-				core_push.call( ret, arr );
-			}
-		}
-
-		return ret;
-	},
-
-	inArray: function( elem, arr, i ) {
-		var len;
-
-		if ( arr ) {
-			if ( core_indexOf ) {
-				return core_indexOf.call( arr, elem, i );
-			}
-
-			len = arr.length;
-			i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
-
-			for ( ; i < len; i++ ) {
-				// Skip accessing in sparse arrays
-				if ( i in arr && arr[ i ] === elem ) {
-					return i;
-				}
-			}
-		}
-
-		return -1;
-	},
-
-	merge: function( first, second ) {
-		var l = second.length,
-			i = first.length,
-			j = 0;
-
-		if ( typeof l === "number" ) {
-			for ( ; j < l; j++ ) {
-				first[ i++ ] = second[ j ];
-			}
-		} else {
-			while ( second[j] !== undefined ) {
-				first[ i++ ] = second[ j++ ];
-			}
-		}
-
-		first.length = i;
-
-		return first;
-	},
-
-	grep: function( elems, callback, inv ) {
-		var retVal,
-			ret = [],
-			i = 0,
-			length = elems.length;
-		inv = !!inv;
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( ; i < length; i++ ) {
-			retVal = !!callback( elems[ i ], i );
-			if ( inv !== retVal ) {
-				ret.push( elems[ i ] );
-			}
-		}
-
-		return ret;
-	},
-
-	// arg is for internal usage only
-	map: function( elems, callback, arg ) {
-		var value,
-			i = 0,
-			length = elems.length,
-			isArray = isArraylike( elems ),
-			ret = [];
-
-		// Go through the array, translating each of the items to their
-		if ( isArray ) {
-			for ( ; i < length; i++ ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret[ ret.length ] = value;
-				}
-			}
-
-		// Go through every key on the object,
-		} else {
-			for ( i in elems ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret[ ret.length ] = value;
-				}
-			}
-		}
-
-		// Flatten any nested arrays
-		return core_concat.apply( [], ret );
-	},
-
-	// A global GUID counter for objects
-	guid: 1,
-
-	// Bind a function to a context, optionally partially applying any
-	// arguments.
-	proxy: function( fn, context ) {
-		var tmp, args, proxy;
-
-		if ( typeof context === "string" ) {
-			tmp = fn[ context ];
-			context = fn;
-			fn = tmp;
-		}
-
-		// Quick check to determine if target is callable, in the spec
-		// this throws a TypeError, but we will just return undefined.
-		if ( !jQuery.isFunction( fn ) ) {
-			return undefined;
-		}
-
-		// Simulated bind
-		args = core_slice.call( arguments, 2 );
-		proxy = function() {
-			return fn.apply( context || this, args.concat( core_slice.call( arguments ) ) );
-		};
-
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		proxy.guid = fn.guid = fn.guid || jQuery.guid++;
-
-		return proxy;
-	},
-
-	// Multifunctional method to get and set values of a collection
-	// The value/s can optionally be executed if it's a function
-	access: function( elems, fn, key, value, chainable, emptyGet, raw ) {
-		var i = 0,
-			length = elems.length,
-			bulk = key == null;
-
-		// Sets many values
-		if ( jQuery.type( key ) === "object" ) {
-			chainable = true;
-			for ( i in key ) {
-				jQuery.access( elems, fn, i, key[i], true, emptyGet, raw );
-			}
-
-		// Sets one value
-		} else if ( value !== undefined ) {
-			chainable = true;
-
-			if ( !jQuery.isFunction( value ) ) {
-				raw = true;
-			}
-
-			if ( bulk ) {
-				// Bulk operations run against the entire set
-				if ( raw ) {
-					fn.call( elems, value );
-					fn = null;
-
-				// ...except when executing function values
-				} else {
-					bulk = fn;
-					fn = function( elem, key, value ) {
-						return bulk.call( jQuery( elem ), value );
-					};
-				}
-			}
-
-			if ( fn ) {
-				for ( ; i < length; i++ ) {
-					fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) );
-				}
-			}
-		}
-
-		return chainable ?
-			elems :
-
-			// Gets
-			bulk ?
-				fn.call( elems ) :
-				length ? fn( elems[0], key ) : emptyGet;
-	},
-
-	now: function() {
-		return ( new Date() ).getTime();
-	}
-});
-
-jQuery.ready.promise = function( obj ) {
-	if ( !readyList ) {
-
-		readyList = jQuery.Deferred();
-
-		// Catch cases where $(document).ready() is called after the browser event has already occurred.
-		// we once tried to use readyState "interactive" here, but it caused issues like the one
-		// discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
-		if ( document.readyState === "complete" ) {
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			setTimeout( jQuery.ready );
-
-		// Standards-based browsers support DOMContentLoaded
-		} else if ( document.addEventListener ) {
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", jQuery.ready, false );
-
-		// If IE event model is used
-		} else {
-			// Ensure firing before onload, maybe late but safe also for iframes
-			document.attachEvent( "onreadystatechange", DOMContentLoaded );
-
-			// A fallback to window.onload, that will always work
-			window.attachEvent( "onload", jQuery.ready );
-
-			// If IE and not a frame
-			// continually check to see if the document is ready
-			var top = false;
-
-			try {
-				top = window.frameElement == null && document.documentElement;
-			} catch(e) {}
-
-			if ( top && top.doScroll ) {
-				(function doScrollCheck() {
-					if ( !jQuery.isReady ) {
-
-						try {
-							// Use the trick by Diego Perini
-							// http://javascript.nwbox.com/IEContentLoaded/
-							top.doScroll("left");
-						} catch(e) {
-							return setTimeout( doScrollCheck, 50 );
-						}
-
-						// and execute any waiting functions
-						jQuery.ready();
-					}
-				})();
-			}
-		}
-	}
-	return readyList.promise( obj );
-};
-
-// Populate the class2type map
-jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-});
-
-function isArraylike( obj ) {
-	var length = obj.length,
-		type = jQuery.type( obj );
-
-	if ( jQuery.isWindow( obj ) ) {
-		return false;
-	}
-
-	if ( obj.nodeType === 1 && length ) {
-		return true;
-	}
-
-	return type === "array" || type !== "function" &&
-		( length === 0 ||
-		typeof length === "number" && length > 0 && ( length - 1 ) in obj );
-}
-
-// All jQuery objects should point back to these
-rootjQuery = jQuery(document);
-// String to Object options format cache
-var optionsCache = {};
-
-// Convert String-formatted options into Object-formatted ones and store in cache
-function createOptions( options ) {
-	var object = optionsCache[ options ] = {};
-	jQuery.each( options.match( core_rnotwhite ) || [], function( _, flag ) {
-		object[ flag ] = true;
-	});
-	return object;
-}
-
-/*
- * Create a callback list using the following parameters:
- *
- *	options: an optional list of space-separated options that will change how
- *			the callback list behaves or a more traditional option object
- *
- * By default a callback list will act like an event callback list and can be
- * "fired" multiple times.
- *
- * Possible options:
- *
- *	once:			will ensure the callback list can only be fired once (like a Deferred)
- *
- *	memory:			will keep track of previous values and will call any callback added
- *					after the list has been fired right away with the latest "memorized"
- *					values (like a Deferred)
- *
- *	unique:			will ensure a callback can only be added once (no duplicate in the list)
- *
- *	stopOnFalse:	interrupt callings when a callback returns false
- *
- */
-jQuery.Callbacks = function( options ) {
-
-	// Convert options from String-formatted to Object-formatted if needed
-	// (we check in cache first)
-	options = typeof options === "string" ?
-		( optionsCache[ options ] || createOptions( options ) ) :
-		jQuery.extend( {}, options );
-
-	var // Last fire value (for non-forgettable lists)
-		memory,
-		// Flag to know if list was already fired
-		fired,
-		// Flag to know if list is currently firing
-		firing,
-		// First callback to fire (used internally by add and fireWith)
-		firingStart,
-		// End of the loop when firing
-		firingLength,
-		// Index of currently firing callback (modified by remove if needed)
-		firingIndex,
-		// Actual callback list
-		list = [],
-		// Stack of fire calls for repeatable lists
-		stack = !options.once && [],
-		// Fire callbacks
-		fire = function( data ) {
-			memory = options.memory && data;
-			fired = true;
-			firingIndex = firingStart || 0;
-			firingStart = 0;
-			firingLength = list.length;
-			firing = true;
-			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
-				if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
-					memory = false; // To prevent further calls using add
-					break;
-				}
-			}
-			firing = false;
-			if ( list ) {
-				if ( stack ) {
-					if ( stack.length ) {
-						fire( stack.shift() );
-					}
-				} else if ( memory ) {
-					list = [];
-				} else {
-					self.disable();
-				}
-			}
-		},
-		// Actual Callbacks object
-		self = {
-			// Add a callback or a collection of callbacks to the list
-			add: function() {
-				if ( list ) {
-					// First, we save the current length
-					var start = list.length;
-					(function add( args ) {
-						jQuery.each( args, function( _, arg ) {
-							var type = jQuery.type( arg );
-							if ( type === "function" ) {
-								if ( !options.unique || !self.has( arg ) ) {
-									list.push( arg );
-								}
-							} else if ( arg && arg.length && type !== "string" ) {
-								// Inspect recursively
-								add( arg );
-							}
-						});
-					})( arguments );
-					// Do we need to add the callbacks to the
-					// current firing batch?
-					if ( firing ) {
-						firingLength = list.length;
-					// With memory, if we're not firing then
-					// we should call right away
-					} else if ( memory ) {
-						firingStart = start;
-						fire( memory );
-					}
-				}
-				return this;
-			},
-			// Remove a callback from the list
-			remove: function() {
-				if ( list ) {
-					jQuery.each( arguments, function( _, arg ) {
-						var index;
-						while( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
-							list.splice( index, 1 );
-							// Handle firing indexes
-							if ( firing ) {
-								if ( index <= firingLength ) {
-									firingLength--;
-								}
-								if ( index <= firingIndex ) {
-									firingIndex--;
-								}
-							}
-						}
-					});
-				}
-				return this;
-			},
-			// Control if a given callback is in the list
-			has: function( fn ) {
-				return jQuery.inArray( fn, list ) > -1;
-			},
-			// Remove all callbacks from the list
-			empty: function() {
-				list = [];
-				return this;
-			},
-			// Have the list do nothing anymore
-			disable: function() {
-				list = stack = memory = undefined;
-				return this;
-			},
-			// Is it disabled?
-			disabled: function() {
-				return !list;
-			},
-			// Lock the list in its current state
-			lock: function() {
-				stack = undefined;
-				if ( !memory ) {
-					self.disable();
-				}
-				return this;
-			},
-			// Is it locked?
-			locked: function() {
-				return !stack;
-			},
-			// Call all callbacks with the given context and arguments
-			fireWith: function( context, args ) {
-				args = args || [];
-				args = [ context, args.slice ? args.slice() : args ];
-				if ( list && ( !fired || stack ) ) {
-					if ( firing ) {
-						stack.push( args );
-					} else {
-						fire( args );
-					}
-				}
-				return this;
-			},
-			// Call all the callbacks with the given arguments
-			fire: function() {
-				self.fireWith( this, arguments );
-				return this;
-			},
-			// To know if the callbacks have already been called at least once
-			fired: function() {
-				return !!fired;
-			}
-		};
-
-	return self;
-};
-jQuery.extend({
-
-	Deferred: function( func ) {
-		var tuples = [
-				// action, add listener, listener list, final state
-				[ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
-				[ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
-				[ "notify", "progress", jQuery.Callbacks("memory") ]
-			],
-			state = "pending",
-			promise = {
-				state: function() {
-					return state;
-				},
-				always: function() {
-					deferred.done( arguments ).fail( arguments );
-					return this;
-				},
-				then: function( /* fnDone, fnFail, fnProgress */ ) {
-					var fns = arguments;
-					return jQuery.Deferred(function( newDefer ) {
-						jQuery.each( tuples, function( i, tuple ) {
-							var action = tuple[ 0 ],
-								fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
-							// deferred[ done | fail | progress ] for forwarding actions to newDefer
-							deferred[ tuple[1] ](function() {
-								var returned = fn && fn.apply( this, arguments );
-								if ( returned && jQuery.isFunction( returned.promise ) ) {
-									returned.promise()
-										.done( newDefer.resolve )
-										.fail( newDefer.reject )
-										.progress( newDefer.notify );
-								} else {
-									newDefer[ action + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments );
-								}
-							});
-						});
-						fns = null;
-					}).promise();
-				},
-				// Get a promise for this deferred
-				// If obj is provided, the promise aspect is added to the object
-				promise: function( obj ) {
-					return obj != null ? jQuery.extend( obj, promise ) : promise;
-				}
-			},
-			deferred = {};
-
-		// Keep pipe for back-compat
-		promise.pipe = promise.then;
-
-		// Add list-specific methods
-		jQuery.each( tuples, function( i, tuple ) {
-			var list = tuple[ 2 ],
-				stateString = tuple[ 3 ];
-
-			// promise[ done | fail | progress ] = list.add
-			promise[ tuple[1] ] = list.add;
-
-			// Handle state
-			if ( stateString ) {
-				list.add(function() {
-					// state = [ resolved | rejected ]
-					state = stateString;
-
-				// [ reject_list | resolve_list ].disable; progress_list.lock
-				}, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
-			}
-
-			// deferred[ resolve | reject | notify ]
-			deferred[ tuple[0] ] = function() {
-				deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments );
-				return this;
-			};
-			deferred[ tuple[0] + "With" ] = list.fireWith;
-		});
-
-		// Make the deferred a promise
-		promise.promise( deferred );
-
-		// Call given func if any
-		if ( func ) {
-			func.call( deferred, deferred );
-		}
-
-		// All done!
-		return deferred;
-	},
-
-	// Deferred helper
-	when: function( subordinate /* , ..., subordinateN */ ) {
-		var i = 0,
-			resolveValues = core_slice.call( arguments ),
-			length = resolveValues.length,
-
-			// the count of uncompleted subordinates
-			remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
-
-			// the master Deferred. If resolveValues consist of only a single Deferred, just use that.
-			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
-
-			// Update function for both resolve and progress values
-			updateFunc = function( i, contexts, values ) {
-				return function( value ) {
-					contexts[ i ] = this;
-					values[ i ] = arguments.length > 1 ? core_slice.call( arguments ) : value;
-					if( values === progressValues ) {
-						deferred.notifyWith( contexts, values );
-					} else if ( !( --remaining ) ) {
-						deferred.resolveWith( contexts, values );
-					}
-				};
-			},
-
-			progressValues, progressContexts, resolveContexts;
-
-		// add listeners to Deferred subordinates; treat others as resolved
-		if ( length > 1 ) {
-			progressValues = new Array( length );
-			progressContexts = new Array( length );
-			resolveContexts = new Array( length );
-			for ( ; i < length; i++ ) {
-				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
-					resolveValues[ i ].promise()
-						.done( updateFunc( i, resolveContexts, resolveValues ) )
-						.fail( deferred.reject )
-						.progress( updateFunc( i, progressContexts, progressValues ) );
-				} else {
-					--remaining;
-				}
-			}
-		}
-
-		// if we're not waiting on anything, resolve the master
-		if ( !remaining ) {
-			deferred.resolveWith( resolveContexts, resolveValues );
-		}
-
-		return deferred.promise();
-	}
-});
-jQuery.support = (function() {
-
-	var support, all, a, select, opt, input, fragment, eventName, isSupported, i,
-		div = document.createElement("div");
-
-	// Setup
-	div.setAttribute( "className", "t" );
-	div.innerHTML = "  
    a";
-
-	// Support tests won't run in some limited or non-browser environments
-	all = div.getElementsByTagName("*");
-	a = div.getElementsByTagName("a")[ 0 ];
-	if ( !all || !a || !all.length ) {
-		return {};
-	}
-
-	// First batch of tests
-	select = document.createElement("select");
-	opt = select.appendChild( document.createElement("option") );
-	input = div.getElementsByTagName("input")[ 0 ];
-
-	a.style.cssText = "top:1px;float:left;opacity:.5";
-	support = {
-		// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
-		getSetAttribute: div.className !== "t",
-
-		// IE strips leading whitespace when .innerHTML is used
-		leadingWhitespace: div.firstChild.nodeType === 3,
-
-		// Make sure that tbody elements aren't automatically inserted
-		// IE will insert them into empty tables
-		tbody: !div.getElementsByTagName("tbody").length,
-
-		// Make sure that link elements get serialized correctly by innerHTML
-		// This requires a wrapper element in IE
-		htmlSerialize: !!div.getElementsByTagName("link").length,
-
-		// Get the style information from getAttribute
-		// (IE uses .cssText instead)
-		style: /top/.test( a.getAttribute("style") ),
-
-		// Make sure that URLs aren't manipulated
-		// (IE normalizes it by default)
-		hrefNormalized: a.getAttribute("href") === "/a",
-
-		// Make sure that element opacity exists
-		// (IE uses filter instead)
-		// Use a regex to work around a WebKit issue. See #5145
-		opacity: /^0.5/.test( a.style.opacity ),
-
-		// Verify style float existence
-		// (IE uses styleFloat instead of cssFloat)
-		cssFloat: !!a.style.cssFloat,
-
-		// Check the default checkbox/radio value ("" on WebKit; "on" elsewhere)
-		checkOn: !!input.value,
-
-		// Make sure that a selected-by-default option has a working selected property.
-		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
-		optSelected: opt.selected,
-
-		// Tests for enctype support on a form (#6743)
-		enctype: !!document.createElement("form").enctype,
-
-		// Makes sure cloning an html5 element does not cause problems
-		// Where outerHTML is undefined, this still works
-		html5Clone: document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav>",
-
-		// jQuery.support.boxModel DEPRECATED in 1.8 since we don't support Quirks Mode
-		boxModel: document.compatMode === "CSS1Compat",
-
-		// Will be defined later
-		deleteExpando: true,
-		noCloneEvent: true,
-		inlineBlockNeedsLayout: false,
-		shrinkWrapBlocks: false,
-		reliableMarginRight: true,
-		boxSizingReliable: true,
-		pixelPosition: false
-	};
-
-	// Make sure checked status is properly cloned
-	input.checked = true;
-	support.noCloneChecked = input.cloneNode( true ).checked;
-
-	// Make sure that the options inside disabled selects aren't marked as disabled
-	// (WebKit marks them as disabled)
-	select.disabled = true;
-	support.optDisabled = !opt.disabled;
-
-	// Support: IE<9
-	try {
-		delete div.test;
-	} catch( e ) {
-		support.deleteExpando = false;
-	}
-
-	// Check if we can trust getAttribute("value")
-	input = document.createElement("input");
-	input.setAttribute( "value", "" );
-	support.input = input.getAttribute( "value" ) === "";
-
-	// Check if an input maintains its value after becoming a radio
-	input.value = "t";
-	input.setAttribute( "type", "radio" );
-	support.radioValue = input.value === "t";
-
-	// #11217 - WebKit loses check when the name is after the checked attribute
-	input.setAttribute( "checked", "t" );
-	input.setAttribute( "name", "t" );
-
-	fragment = document.createDocumentFragment();
-	fragment.appendChild( input );
-
-	// Check if a disconnected checkbox will retain its checked
-	// value of true after appended to the DOM (IE6/7)
-	support.appendChecked = input.checked;
-
-	// WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	// Support: IE<9
-	// Opera does not clone events (and typeof div.attachEvent === undefined).
-	// IE9-10 clones events bound via attachEvent, but they don't trigger with .click()
-	if ( div.attachEvent ) {
-		div.attachEvent( "onclick", function() {
-			support.noCloneEvent = false;
-		});
-
-		div.cloneNode( true ).click();
-	}
-
-	// Support: IE<9 (lack submit/change bubble), Firefox 17+ (lack focusin event)
-	// Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP), test/csp.php
-	for ( i in { submit: true, change: true, focusin: true }) {
-		div.setAttribute( eventName = "on" + i, "t" );
-
-		support[ i + "Bubbles" ] = eventName in window || div.attributes[ eventName ].expando === false;
-	}
-
-	div.style.backgroundClip = "content-box";
-	div.cloneNode( true ).style.backgroundClip = "";
-	support.clearCloneStyle = div.style.backgroundClip === "content-box";
-
-	// Run tests that need a body at doc ready
-	jQuery(function() {
-		var container, marginDiv, tds,
-			divReset = "padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",
-			body = document.getElementsByTagName("body")[0];
-
-		if ( !body ) {
-			// Return for frameset docs that don't have a body
-			return;
-		}
-
-		container = document.createElement("div");
-		container.style.cssText = "border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px";
-
-		body.appendChild( container ).appendChild( div );
-
-		// Support: IE8
-		// Check if table cells still have offsetWidth/Height when they are set
-		// to display:none and there are still other visible table cells in a
-		// table row; if so, offsetWidth/Height are not reliable for use when
-		// determining if an element has been hidden directly using
-		// display:none (it is still safe to use offsets if a parent element is
-		// hidden; don safety goggles and see bug #4512 for more information).
-		div.innerHTML = "
    t
    ";
-		tds = div.getElementsByTagName("td");
-		tds[ 0 ].style.cssText = "padding:0;margin:0;border:0;display:none";
-		isSupported = ( tds[ 0 ].offsetHeight === 0 );
-
-		tds[ 0 ].style.display = "";
-		tds[ 1 ].style.display = "none";
-
-		// Support: IE8
-		// Check if empty table cells still have offsetWidth/Height
-		support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
-
-		// Check box-sizing and margin behavior
-		div.innerHTML = "";
-		div.style.cssText = "box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;";
-		support.boxSizing = ( div.offsetWidth === 4 );
-		support.doesNotIncludeMarginInBodyOffset = ( body.offsetTop !== 1 );
-
-		// Use window.getComputedStyle because jsdom on node.js will break without it.
-		if ( window.getComputedStyle ) {
-			support.pixelPosition = ( window.getComputedStyle( div, null ) || {} ).top !== "1%";
-			support.boxSizingReliable = ( window.getComputedStyle( div, null ) || { width: "4px" } ).width === "4px";
-
-			// Check if div with explicit width and no margin-right incorrectly
-			// gets computed margin-right based on width of container. (#3333)
-			// Fails in WebKit before Feb 2011 nightlies
-			// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-			marginDiv = div.appendChild( document.createElement("div") );
-			marginDiv.style.cssText = div.style.cssText = divReset;
-			marginDiv.style.marginRight = marginDiv.style.width = "0";
-			div.style.width = "1px";
-
-			support.reliableMarginRight =
-				!parseFloat( ( window.getComputedStyle( marginDiv, null ) || {} ).marginRight );
-		}
-
-		if ( typeof div.style.zoom !== "undefined" ) {
-			// Support: IE<8
-			// Check if natively block-level elements act like inline-block
-			// elements when setting their display to 'inline' and giving
-			// them layout
-			div.innerHTML = "";
-			div.style.cssText = divReset + "width:1px;padding:1px;display:inline;zoom:1";
-			support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 );
-
-			// Support: IE6
-			// Check if elements with layout shrink-wrap their children
-			div.style.display = "block";
-			div.innerHTML = "
    ";
-			div.firstChild.style.width = "5px";
-			support.shrinkWrapBlocks = ( div.offsetWidth !== 3 );
-
-			// Prevent IE 6 from affecting layout for positioned elements #11048
-			// Prevent IE from shrinking the body in IE 7 mode #12869
-			body.style.zoom = 1;
-		}
-
-		body.removeChild( container );
-
-		// Null elements to avoid leaks in IE
-		container = div = tds = marginDiv = null;
-	});
-
-	// Null elements to avoid leaks in IE
-	all = select = fragment = opt = a = input = null;
-
-	return support;
-})();
-
-var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/,
-	rmultiDash = /([A-Z])/g;
-	
-function internalData( elem, name, data, pvt /* Internal Use Only */ ){
-	if ( !jQuery.acceptData( elem ) ) {
-		return;
-	}
-
-	var thisCache, ret,
-		internalKey = jQuery.expando,
-		getByName = typeof name === "string",
-
-		// We have to handle DOM nodes and JS objects differently because IE6-7
-		// can't GC object references properly across the DOM-JS boundary
-		isNode = elem.nodeType,
-
-		// Only DOM nodes need the global jQuery cache; JS object data is
-		// attached directly to the object so GC can occur automatically
-		cache = isNode ? jQuery.cache : elem,
-
-		// Only defining an ID for JS objects if its cache already exists allows
-		// the code to shortcut on the same path as a DOM node with no cache
-		id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey;
-
-	// Avoid doing any more work than we need to when trying to get data on an
-	// object that has no data at all
-	if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && getByName && data === undefined ) {
-		return;
-	}
-
-	if ( !id ) {
-		// Only DOM nodes need a new unique ID for each element since their data
-		// ends up in the global cache
-		if ( isNode ) {
-			elem[ internalKey ] = id = core_deletedIds.pop() || jQuery.guid++;
-		} else {
-			id = internalKey;
-		}
-	}
-
-	if ( !cache[ id ] ) {
-		cache[ id ] = {};
-
-		// Avoids exposing jQuery metadata on plain JS objects when the object
-		// is serialized using JSON.stringify
-		if ( !isNode ) {
-			cache[ id ].toJSON = jQuery.noop;
-		}
-	}
-
-	// An object can be passed to jQuery.data instead of a key/value pair; this gets
-	// shallow copied over onto the existing cache
-	if ( typeof name === "object" || typeof name === "function" ) {
-		if ( pvt ) {
-			cache[ id ] = jQuery.extend( cache[ id ], name );
-		} else {
-			cache[ id ].data = jQuery.extend( cache[ id ].data, name );
-		}
-	}
-
-	thisCache = cache[ id ];
-
-	// jQuery data() is stored in a separate object inside the object's internal data
-	// cache in order to avoid key collisions between internal data and user-defined
-	// data.
-	if ( !pvt ) {
-		if ( !thisCache.data ) {
-			thisCache.data = {};
-		}
-
-		thisCache = thisCache.data;
-	}
-
-	if ( data !== undefined ) {
-		thisCache[ jQuery.camelCase( name ) ] = data;
-	}
-
-	// Check for both converted-to-camel and non-converted data property names
-	// If a data property was specified
-	if ( getByName ) {
-
-		// First Try to find as-is property data
-		ret = thisCache[ name ];
-
-		// Test for null|undefined property data
-		if ( ret == null ) {
-
-			// Try to find the camelCased property
-			ret = thisCache[ jQuery.camelCase( name ) ];
-		}
-	} else {
-		ret = thisCache;
-	}
-
-	return ret;
-}
-
-function internalRemoveData( elem, name, pvt /* For internal use only */ ){
-	if ( !jQuery.acceptData( elem ) ) {
-		return;
-	}
-
-	var thisCache, i, l,
-
-		isNode = elem.nodeType,
-
-		// See jQuery.data for more information
-		cache = isNode ? jQuery.cache : elem,
-		id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
-
-	// If there is already no cache entry for this object, there is no
-	// purpose in continuing
-	if ( !cache[ id ] ) {
-		return;
-	}
-
-	if ( name ) {
-
-		thisCache = pvt ? cache[ id ] : cache[ id ].data;
-
-		if ( thisCache ) {
-
-			// Support array or space separated string names for data keys
-			if ( !jQuery.isArray( name ) ) {
-
-				// try the string as a key before any manipulation
-				if ( name in thisCache ) {
-					name = [ name ];
-				} else {
-
-					// split the camel cased version by spaces unless a key with the spaces exists
-					name = jQuery.camelCase( name );
-					if ( name in thisCache ) {
-						name = [ name ];
-					} else {
-						name = name.split(" ");
-					}
-				}
-			} else {
-				// If "name" is an array of keys...
-				// When data is initially created, via ("key", "val") signature,
-				// keys will be converted to camelCase.
-				// Since there is no way to tell _how_ a key was added, remove
-				// both plain key and camelCase key. #12786
-				// This will only penalize the array argument path.
-				name = name.concat( jQuery.map( name, jQuery.camelCase ) );
-			}
-
-			for ( i = 0, l = name.length; i < l; i++ ) {
-				delete thisCache[ name[i] ];
-			}
-
-			// If there is no data left in the cache, we want to continue
-			// and let the cache object itself get destroyed
-			if ( !( pvt ? isEmptyDataObject : jQuery.isEmptyObject )( thisCache ) ) {
-				return;
-			}
-		}
-	}
-
-	// See jQuery.data for more information
-	if ( !pvt ) {
-		delete cache[ id ].data;
-
-		// Don't destroy the parent cache unless the internal data object
-		// had been the only thing left in it
-		if ( !isEmptyDataObject( cache[ id ] ) ) {
-			return;
-		}
-	}
-
-	// Destroy the cache
-	if ( isNode ) {
-		jQuery.cleanData( [ elem ], true );
-
-	// Use delete when supported for expandos or `cache` is not a window per isWindow (#10080)
-	} else if ( jQuery.support.deleteExpando || cache != cache.window ) {
-		delete cache[ id ];
-
-	// When all else fails, null
-	} else {
-		cache[ id ] = null;
-	}
-}
-
-jQuery.extend({
-	cache: {},
-
-	// Unique for each copy of jQuery on the page
-	// Non-digits removed to match rinlinejQuery
-	expando: "jQuery" + ( core_version + Math.random() ).replace( /\D/g, "" ),
-
-	// The following elements throw uncatchable exceptions if you
-	// attempt to add expando properties to them.
-	noData: {
-		"embed": true,
-		// Ban all objects except for Flash (which handle expandos)
-		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
-		"applet": true
-	},
-
-	hasData: function( elem ) {
-		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
-		return !!elem && !isEmptyDataObject( elem );
-	},
-
-	data: function( elem, name, data ) {
-		return internalData( elem, name, data, false );
-	},
-
-	removeData: function( elem, name ) {
-		return internalRemoveData( elem, name, false );
-	},
-
-	// For internal use only.
-	_data: function( elem, name, data ) {
-		return internalData( elem, name, data, true );
-	},
-	
-	_removeData: function( elem, name ) {
-		return internalRemoveData( elem, name, true );
-	},
-
-	// A method for determining if a DOM node can handle the data expando
-	acceptData: function( elem ) {
-		var noData = elem.nodeName && jQuery.noData[ elem.nodeName.toLowerCase() ];
-
-		// nodes accept data unless otherwise specified; rejection can be conditional
-		return !noData || noData !== true && elem.getAttribute("classid") === noData;
-	}
-});
-
-jQuery.fn.extend({
-	data: function( key, value ) {
-		var attrs, name,
-			elem = this[0],
-			i = 0,
-			data = null;
-
-		// Gets all values
-		if ( key === undefined ) {
-			if ( this.length ) {
-				data = jQuery.data( elem );
-
-				if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
-					attrs = elem.attributes;
-					for ( ; i < attrs.length; i++ ) {
-						name = attrs[i].name;
-
-						if ( !name.indexOf( "data-" ) ) {
-							name = jQuery.camelCase( name.substring(5) );
-
-							dataAttr( elem, name, data[ name ] );
-						}
-					}
-					jQuery._data( elem, "parsedAttrs", true );
-				}
-			}
-
-			return data;
-		}
-
-		// Sets multiple values
-		if ( typeof key === "object" ) {
-			return this.each(function() {
-				jQuery.data( this, key );
-			});
-		}
-
-		return jQuery.access( this, function( value ) {
-
-			if ( value === undefined ) {
-				// Try to fetch any internally stored data first
-				return elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : null;
-			}
-
-			this.each(function() {
-				jQuery.data( this, key, value );
-			});
-		}, null, value, arguments.length > 1, null, true );
-	},
-
-	removeData: function( key ) {
-		return this.each(function() {
-			jQuery.removeData( this, key );
-		});
-	}
-});
-
-function dataAttr( elem, key, data ) {
-	// If nothing was found internally, try to fetch any
-	// data from the HTML5 data-* attribute
-	if ( data === undefined && elem.nodeType === 1 ) {
-
-		var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
-
-		data = elem.getAttribute( name );
-
-		if ( typeof data === "string" ) {
-			try {
-				data = data === "true" ? true :
-				data === "false" ? false :
-				data === "null" ? null :
-				// Only convert to a number if it doesn't change the string
-				+data + "" === data ? +data :
-				rbrace.test( data ) ? jQuery.parseJSON( data ) :
-					data;
-			} catch( e ) {}
-
-			// Make sure we set the data so it isn't changed later
-			jQuery.data( elem, key, data );
-
-		} else {
-			data = undefined;
-		}
-	}
-
-	return data;
-}
-
-// checks a cache object for emptiness
-function isEmptyDataObject( obj ) {
-	var name;
-	for ( name in obj ) {
-
-		// if the public data object is empty, the private is still empty
-		if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) {
-			continue;
-		}
-		if ( name !== "toJSON" ) {
-			return false;
-		}
-	}
-
-	return true;
-}
-jQuery.extend({
-	queue: function( elem, type, data ) {
-		var queue;
-
-		if ( elem ) {
-			type = ( type || "fx" ) + "queue";
-			queue = jQuery._data( elem, type );
-
-			// Speed up dequeue by getting out quickly if this is just a lookup
-			if ( data ) {
-				if ( !queue || jQuery.isArray(data) ) {
-					queue = jQuery._data( elem, type, jQuery.makeArray(data) );
-				} else {
-					queue.push( data );
-				}
-			}
-			return queue || [];
-		}
-	},
-
-	dequeue: function( elem, type ) {
-		type = type || "fx";
-
-		var queue = jQuery.queue( elem, type ),
-			startLength = queue.length,
-			fn = queue.shift(),
-			hooks = jQuery._queueHooks( elem, type ),
-			next = function() {
-				jQuery.dequeue( elem, type );
-			};
-
-		// If the fx queue is dequeued, always remove the progress sentinel
-		if ( fn === "inprogress" ) {
-			fn = queue.shift();
-			startLength--;
-		}
-
-		hooks.cur = fn;
-		if ( fn ) {
-
-			// Add a progress sentinel to prevent the fx queue from being
-			// automatically dequeued
-			if ( type === "fx" ) {
-				queue.unshift( "inprogress" );
-			}
-
-			// clear up the last queue stop function
-			delete hooks.stop;
-			fn.call( elem, next, hooks );
-		}
-
-		if ( !startLength && hooks ) {
-			hooks.empty.fire();
-		}
-	},
-
-	// not intended for public consumption - generates a queueHooks object, or returns the current one
-	_queueHooks: function( elem, type ) {
-		var key = type + "queueHooks";
-		return jQuery._data( elem, key ) || jQuery._data( elem, key, {
-			empty: jQuery.Callbacks("once memory").add(function() {
-				jQuery._removeData( elem, type + "queue" );
-				jQuery._removeData( elem, key );
-			})
-		});
-	}
-});
-
-jQuery.fn.extend({
-	queue: function( type, data ) {
-		var setter = 2;
-
-		if ( typeof type !== "string" ) {
-			data = type;
-			type = "fx";
-			setter--;
-		}
-
-		if ( arguments.length < setter ) {
-			return jQuery.queue( this[0], type );
-		}
-
-		return data === undefined ?
-			this :
-			this.each(function() {
-				var queue = jQuery.queue( this, type, data );
-
-				// ensure a hooks for this queue
-				jQuery._queueHooks( this, type );
-
-				if ( type === "fx" && queue[0] !== "inprogress" ) {
-					jQuery.dequeue( this, type );
-				}
-			});
-	},
-	dequeue: function( type ) {
-		return this.each(function() {
-			jQuery.dequeue( this, type );
-		});
-	},
-	// Based off of the plugin by Clint Helfers, with permission.
-	// http://blindsignals.com/index.php/2009/07/jquery-delay/
-	delay: function( time, type ) {
-		time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
-		type = type || "fx";
-
-		return this.queue( type, function( next, hooks ) {
-			var timeout = setTimeout( next, time );
-			hooks.stop = function() {
-				clearTimeout( timeout );
-			};
-		});
-	},
-	clearQueue: function( type ) {
-		return this.queue( type || "fx", [] );
-	},
-	// Get a promise resolved when queues of a certain type
-	// are emptied (fx is the type by default)
-	promise: function( type, obj ) {
-		var tmp,
-			count = 1,
-			defer = jQuery.Deferred(),
-			elements = this,
-			i = this.length,
-			resolve = function() {
-				if ( !( --count ) ) {
-					defer.resolveWith( elements, [ elements ] );
-				}
-			};
-
-		if ( typeof type !== "string" ) {
-			obj = type;
-			type = undefined;
-		}
-		type = type || "fx";
-
-		while( i-- ) {
-			tmp = jQuery._data( elements[ i ], type + "queueHooks" );
-			if ( tmp && tmp.empty ) {
-				count++;
-				tmp.empty.add( resolve );
-			}
-		}
-		resolve();
-		return defer.promise( obj );
-	}
-});
-var nodeHook, boolHook,
-	rclass = /[\t\r\n]/g,
-	rreturn = /\r/g,
-	rfocusable = /^(?:input|select|textarea|button|object)$/i,
-	rclickable = /^(?:a|area)$/i,
-	rboolean = /^(?:checked|selected|autofocus|autoplay|async|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped)$/i,
-	ruseDefault = /^(?:checked|selected)$/i,
-	getSetAttribute = jQuery.support.getSetAttribute,
-	getSetInput = jQuery.support.input;
-
-jQuery.fn.extend({
-	attr: function( name, value ) {
-		return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 );
-	},
-
-	removeAttr: function( name ) {
-		return this.each(function() {
-			jQuery.removeAttr( this, name );
-		});
-	},
-
-	prop: function( name, value ) {
-		return jQuery.access( this, jQuery.prop, name, value, arguments.length > 1 );
-	},
-
-	removeProp: function( name ) {
-		name = jQuery.propFix[ name ] || name;
-		return this.each(function() {
-			// try/catch handles cases where IE balks (such as removing a property on window)
-			try {
-				this[ name ] = undefined;
-				delete this[ name ];
-			} catch( e ) {}
-		});
-	},
-
-	addClass: function( value ) {
-		var classes, elem, cur, clazz, j,
-			i = 0,
-			len = this.length,
-			proceed = typeof value === "string" && value;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).addClass( value.call( this, j, this.className ) );
-			});
-		}
-
-		if ( proceed ) {
-			// The disjunction here is for better compressibility (see removeClass)
-			classes = ( value || "" ).match( core_rnotwhite ) || [];
-
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					" "
-				);
-
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
-							cur += clazz + " ";
-						}
-					}
-					elem.className = jQuery.trim( cur );
-
-				}
-			}
-		}
-
-		return this;
-	},
-
-	removeClass: function( value ) {
-		var classes, elem, cur, clazz, j,
-			i = 0,
-			len = this.length,
-			proceed = arguments.length === 0 || typeof value === "string" && value;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).removeClass( value.call( this, j, this.className ) );
-			});
-		}
-		if ( proceed ) {
-			classes = ( value || "" ).match( core_rnotwhite ) || [];
-
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				// This expression is here for better compressibility (see addClass)
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					""
-				);
-
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						// Remove *all* instances
-						while ( cur.indexOf( " " + clazz + " " ) >= 0 ) {
-							cur = cur.replace( " " + clazz + " ", " " );
-						}
-					}
-					elem.className = value ? jQuery.trim( cur ) : "";
-				}
-			}
-		}
-
-		return this;
-	},
-
-	toggleClass: function( value, stateVal ) {
-		var type = typeof value,
-			isBool = typeof stateVal === "boolean";
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( i ) {
-				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
-			});
-		}
-
-		return this.each(function() {
-			if ( type === "string" ) {
-				// toggle individual class names
-				var className,
-					i = 0,
-					self = jQuery( this ),
-					state = stateVal,
-					classNames = value.match( core_rnotwhite ) || [];
-
-				while ( (className = classNames[ i++ ]) ) {
-					// check each className given, space separated list
-					state = isBool ? state : !self.hasClass( className );
-					self[ state ? "addClass" : "removeClass" ]( className );
-				}
-
-			// Toggle whole class name
-			} else if ( type === "undefined" || type === "boolean" ) {
-				if ( this.className ) {
-					// store className if set
-					jQuery._data( this, "__className__", this.className );
-				}
-
-				// If the element has a class name or if we're passed "false",
-				// then remove the whole classname (if there was one, the above saved it).
-				// Otherwise bring back whatever was previously saved (if anything),
-				// falling back to the empty string if nothing was stored.
-				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
-			}
-		});
-	},
-
-	hasClass: function( selector ) {
-		var className = " " + selector + " ",
-			i = 0,
-			l = this.length;
-		for ( ; i < l; i++ ) {
-			if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
-				return true;
-			}
-		}
-
-		return false;
-	},
-
-	val: function( value ) {
-		var hooks, ret, isFunction,
-			elem = this[0];
-
-		if ( !arguments.length ) {
-			if ( elem ) {
-				hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
-
-				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
-					return ret;
-				}
-
-				ret = elem.value;
-
-				return typeof ret === "string" ?
-					// handle most common string cases
-					ret.replace(rreturn, "") :
-					// handle cases where value is null/undef or number
-					ret == null ? "" : ret;
-			}
-
-			return;
-		}
-
-		isFunction = jQuery.isFunction( value );
-
-		return this.each(function( i ) {
-			var val,
-				self = jQuery(this);
-
-			if ( this.nodeType !== 1 ) {
-				return;
-			}
-
-			if ( isFunction ) {
-				val = value.call( this, i, self.val() );
-			} else {
-				val = value;
-			}
-
-			// Treat null/undefined as ""; convert numbers to string
-			if ( val == null ) {
-				val = "";
-			} else if ( typeof val === "number" ) {
-				val += "";
-			} else if ( jQuery.isArray( val ) ) {
-				val = jQuery.map(val, function ( value ) {
-					return value == null ? "" : value + "";
-				});
-			}
-
-			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
-
-			// If set returns undefined, fall back to normal setting
-			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
-				this.value = val;
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	valHooks: {
-		option: {
-			get: function( elem ) {
-				// attributes.value is undefined in Blackberry 4.7 but
-				// uses .value. See #6932
-				var val = elem.attributes.value;
-				return !val || val.specified ? elem.value : elem.text;
-			}
-		},
-		select: {
-			get: function( elem ) {
-				var value, option,
-					options = elem.options,
-					index = elem.selectedIndex,
-					one = elem.type === "select-one" || index < 0,
-					values = one ? null : [],
-					max = one ? index + 1 : options.length,
-					i = index < 0 ?
-						max :
-						one ? index : 0;
-
-				// Loop through all the selected options
-				for ( ; i < max; i++ ) {
-					option = options[ i ];
-
-					// oldIE doesn't update selected after form reset (#2551)
-					if ( ( option.selected || i === index ) &&
-							// Don't return options that are disabled or in a disabled optgroup
-							( jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null ) &&
-							( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
-
-						// Get the specific value for the option
-						value = jQuery( option ).val();
-
-						// We don't need an array for one selects
-						if ( one ) {
-							return value;
-						}
-
-						// Multi-Selects return an array
-						values.push( value );
-					}
-				}
-
-				return values;
-			},
-
-			set: function( elem, value ) {
-				var values = jQuery.makeArray( value );
-
-				jQuery(elem).find("option").each(function() {
-					this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
-				});
-
-				if ( !values.length ) {
-					elem.selectedIndex = -1;
-				}
-				return values;
-			}
-		}
-	},
-
-	attr: function( elem, name, value ) {
-		var ret, hooks, notxml,
-			nType = elem.nodeType;
-
-		// don't get/set attributes on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		// Fallback to prop when attributes are not supported
-		if ( typeof elem.getAttribute === "undefined" ) {
-			return jQuery.prop( elem, name, value );
-		}
-
-		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-		// All attributes are lowercase
-		// Grab necessary hook if one is defined
-		if ( notxml ) {
-			name = name.toLowerCase();
-			hooks = jQuery.attrHooks[ name ] || ( rboolean.test( name ) ? boolHook : nodeHook );
-		}
-
-		if ( value !== undefined ) {
-
-			if ( value === null ) {
-				jQuery.removeAttr( elem, name );
-
-			} else if ( hooks && notxml && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				elem.setAttribute( name, value + "" );
-				return value;
-			}
-
-		} else if ( hooks && notxml && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
-			return ret;
-
-		} else {
-
-			// In IE9+, Flash objects don't have .getAttribute (#12945)
-			// Support: IE9+
-			if ( typeof elem.getAttribute !== "undefined" ) {
-				ret =  elem.getAttribute( name );
-			}
-
-			// Non-existent attributes return null, we normalize to undefined
-			return ret == null ?
-				undefined :
-				ret;
-		}
-	},
-
-	removeAttr: function( elem, value ) {
-		var name, propName,
-			i = 0,
-			attrNames = value && value.match( core_rnotwhite );
-
-		if ( attrNames && elem.nodeType === 1 ) {
-			while ( (name = attrNames[i++]) ) {
-				propName = jQuery.propFix[ name ] || name;
-
-				// Boolean attributes get special treatment (#10870)
-				if ( rboolean.test( name ) ) {
-					// Set corresponding property to false for boolean attributes
-					// Also clear defaultChecked/defaultSelected (if appropriate) for IE<8
-					if ( !getSetAttribute && ruseDefault.test( name ) ) {
-						elem[ jQuery.camelCase( "default-" + name ) ] =
-							elem[ propName ] = false;
-					} else {
-						elem[ propName ] = false;
-					}
-
-				// See #9699 for explanation of this approach (setting first, then removal)
-				} else {
-					jQuery.attr( elem, name, "" );
-				}
-
-				elem.removeAttribute( getSetAttribute ? name : propName );
-			}
-		}
-	},
-
-	attrHooks: {
-		type: {
-			set: function( elem, value ) {
-				if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
-					// Setting the type on a radio button after the value resets the value in IE6-9
-					// Reset value to default in case type is set after value during creation
-					var val = elem.value;
-					elem.setAttribute( "type", value );
-					if ( val ) {
-						elem.value = val;
-					}
-					return value;
-				}
-			}
-		}
-	},
-
-	propFix: {
-		tabindex: "tabIndex",
-		readonly: "readOnly",
-		"for": "htmlFor",
-		"class": "className",
-		maxlength: "maxLength",
-		cellspacing: "cellSpacing",
-		cellpadding: "cellPadding",
-		rowspan: "rowSpan",
-		colspan: "colSpan",
-		usemap: "useMap",
-		frameborder: "frameBorder",
-		contenteditable: "contentEditable"
-	},
-
-	prop: function( elem, name, value ) {
-		var ret, hooks, notxml,
-			nType = elem.nodeType;
-
-		// don't get/set properties on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-		if ( notxml ) {
-			// Fix name and attach hooks
-			name = jQuery.propFix[ name ] || name;
-			hooks = jQuery.propHooks[ name ];
-		}
-
-		if ( value !== undefined ) {
-			if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				return ( elem[ name ] = value );
-			}
-
-		} else {
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
-				return ret;
-
-			} else {
-				return elem[ name ];
-			}
-		}
-	},
-
-	propHooks: {
-		tabIndex: {
-			get: function( elem ) {
-				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
-				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-				var attributeNode = elem.getAttributeNode("tabindex");
-
-				return attributeNode && attributeNode.specified ?
-					parseInt( attributeNode.value, 10 ) :
-					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
-						0 :
-						undefined;
-			}
-		}
-	}
-});
-
-// Hook for boolean attributes
-boolHook = {
-	get: function( elem, name ) {
-		var
-			// Use .prop to determine if this attribute is understood as boolean
-			prop = jQuery.prop( elem, name ),
-
-			// Fetch it accordingly
-			attr = typeof prop === "boolean" && elem.getAttribute( name ),
-			detail = typeof prop === "boolean" ?
-
-				getSetInput && getSetAttribute ?
-					attr != null :
-					// oldIE fabricates an empty string for missing boolean attributes
-					// and conflates checked/selected into attroperties
-					ruseDefault.test( name ) ?
-						elem[ jQuery.camelCase( "default-" + name ) ] :
-						!!attr :
-
-				// fetch an attribute node for properties not recognized as boolean
-				elem.getAttributeNode( name );
-
-		return detail && detail.value !== false ?
-			name.toLowerCase() :
-			undefined;
-	},
-	set: function( elem, value, name ) {
-		if ( value === false ) {
-			// Remove boolean attributes when set to false
-			jQuery.removeAttr( elem, name );
-		} else if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
-			// IE<8 needs the *property* name
-			elem.setAttribute( !getSetAttribute && jQuery.propFix[ name ] || name, name );
-
-		// Use defaultChecked and defaultSelected for oldIE
-		} else {
-			elem[ jQuery.camelCase( "default-" + name ) ] = elem[ name ] = true;
-		}
-
-		return name;
-	}
-};
-
-// fix oldIE value attroperty
-if ( !getSetInput || !getSetAttribute ) {
-	jQuery.attrHooks.value = {
-		get: function( elem, name ) {
-			var ret = elem.getAttributeNode( name );
-			return jQuery.nodeName( elem, "input" ) ?
-
-				// Ignore the value *property* by using defaultValue
-				elem.defaultValue :
-
-				ret && ret.specified ? ret.value : undefined;
-		},
-		set: function( elem, value, name ) {
-			if ( jQuery.nodeName( elem, "input" ) ) {
-				// Does not return so that setAttribute is also used
-				elem.defaultValue = value;
-			} else {
-				// Use nodeHook if defined (#1954); otherwise setAttribute is fine
-				return nodeHook && nodeHook.set( elem, value, name );
-			}
-		}
-	};
-}
-
-// IE6/7 do not support getting/setting some attributes with get/setAttribute
-if ( !getSetAttribute ) {
-
-	// Use this for any attribute in IE6/7
-	// This fixes almost every IE6/7 issue
-	nodeHook = jQuery.valHooks.button = {
-		get: function( elem, name ) {
-			var ret = elem.getAttributeNode( name );
-			return ret && ( name === "id" || name === "name" || name === "coords" ? ret.value !== "" : ret.specified ) ?
-				ret.value :
-				undefined;
-		},
-		set: function( elem, value, name ) {
-			// Set the existing or create a new attribute node
-			var ret = elem.getAttributeNode( name );
-			if ( !ret ) {
-				elem.setAttributeNode(
-					(ret = elem.ownerDocument.createAttribute( name ))
-				);
-			}
-
-			ret.value = value += "";
-
-			// Break association with cloned elements by also using setAttribute (#9646)
-			return name === "value" || value === elem.getAttribute( name ) ?
-				value :
-				undefined;
-		}
-	};
-
-	// Set contenteditable to false on removals(#10429)
-	// Setting to empty string throws an error as an invalid value
-	jQuery.attrHooks.contenteditable = {
-		get: nodeHook.get,
-		set: function( elem, value, name ) {
-			nodeHook.set( elem, value === "" ? false : value, name );
-		}
-	};
-
-	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
-	// This is for removals
-	jQuery.each([ "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
-			set: function( elem, value ) {
-				if ( value === "" ) {
-					elem.setAttribute( name, "auto" );
-					return value;
-				}
-			}
-		});
-	});
-}
-
-
-// Some attributes require a special call on IE
-// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !jQuery.support.hrefNormalized ) {
-	jQuery.each([ "href", "src", "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
-			get: function( elem ) {
-				var ret = elem.getAttribute( name, 2 );
-				return ret == null ? undefined : ret;
-			}
-		});
-	});
-
-	// href/src property should get the full normalized URL (#10299/#12915)
-	jQuery.each([ "href", "src" ], function( i, name ) {
-		jQuery.propHooks[ name ] = {
-			get: function( elem ) {
-				return elem.getAttribute( name, 4 );
-			}
-		};
-	});
-}
-
-if ( !jQuery.support.style ) {
-	jQuery.attrHooks.style = {
-		get: function( elem ) {
-			// Return undefined in the case of empty string
-			// Note: IE uppercases css property names, but if we were to .toLowerCase()
-			// .cssText, that would destroy case senstitivity in URL's, like in "background"
-			return elem.style.cssText || undefined;
-		},
-		set: function( elem, value ) {
-			return ( elem.style.cssText = value + "" );
-		}
-	};
-}
-
-// Safari mis-reports the default selected property of an option
-// Accessing the parent's selectedIndex property fixes it
-if ( !jQuery.support.optSelected ) {
-	jQuery.propHooks.selected = jQuery.extend( jQuery.propHooks.selected, {
-		get: function( elem ) {
-			var parent = elem.parentNode;
-
-			if ( parent ) {
-				parent.selectedIndex;
-
-				// Make sure that it also works with optgroups, see #5701
-				if ( parent.parentNode ) {
-					parent.parentNode.selectedIndex;
-				}
-			}
-			return null;
-		}
-	});
-}
-
-// IE6/7 call enctype encoding
-if ( !jQuery.support.enctype ) {
-	jQuery.propFix.enctype = "encoding";
-}
-
-// Radios and checkboxes getter/setter
-if ( !jQuery.support.checkOn ) {
-	jQuery.each([ "radio", "checkbox" ], function() {
-		jQuery.valHooks[ this ] = {
-			get: function( elem ) {
-				// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
-				return elem.getAttribute("value") === null ? "on" : elem.value;
-			}
-		};
-	});
-}
-jQuery.each([ "radio", "checkbox" ], function() {
-	jQuery.valHooks[ this ] = jQuery.extend( jQuery.valHooks[ this ], {
-		set: function( elem, value ) {
-			if ( jQuery.isArray( value ) ) {
-				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
-			}
-		}
-	});
-});
-var rformElems = /^(?:input|select|textarea)$/i,
-	rkeyEvent = /^key/,
-	rmouseEvent = /^(?:mouse|contextmenu)|click/,
-	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
-	rtypenamespace = /^([^.]*)(?:\.(.+)|)$/;
-
-function returnTrue() {
-	return true;
-}
-
-function returnFalse() {
-	return false;
-}
-
-/*
- * Helper functions for managing events -- not part of the public interface.
- * Props to Dean Edwards' addEvent library for many of the ideas.
- */
-jQuery.event = {
-
-	global: {},
-
-	add: function( elem, types, handler, data, selector ) {
-
-		var handleObjIn, eventHandle, tmp,
-			events, t, handleObj,
-			special, handlers, type, namespaces, origType,
-			// Don't attach events to noData or text/comment nodes (but allow plain objects)
-			elemData = elem.nodeType !== 3 && elem.nodeType !== 8 && jQuery._data( elem );
-
-		if ( !elemData ) {
-			return;
-		}
-
-		// Caller can pass in an object of custom data in lieu of the handler
-		if ( handler.handler ) {
-			handleObjIn = handler;
-			handler = handleObjIn.handler;
-			selector = handleObjIn.selector;
-		}
-
-		// Make sure that the handler has a unique ID, used to find/remove it later
-		if ( !handler.guid ) {
-			handler.guid = jQuery.guid++;
-		}
-
-		// Init the element's event structure and main handler, if this is the first
-		if ( !(events = elemData.events) ) {
-			events = elemData.events = {};
-		}
-		if ( !(eventHandle = elemData.handle) ) {
-			eventHandle = elemData.handle = function( e ) {
-				// Discard the second event of a jQuery.event.trigger() and
-				// when an event is called after a page has unloaded
-				return typeof jQuery !== "undefined" && (!e || jQuery.event.triggered !== e.type) ?
-					jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
-					undefined;
-			};
-			// Add elem as a property of the handle fn to prevent a memory leak with IE non-native events
-			eventHandle.elem = elem;
-		}
-
-		// Handle multiple events separated by a space
-		// jQuery(...).bind("mouseover mouseout", fn);
-		types = ( types || "" ).match( core_rnotwhite ) || [""];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-			// If event changes its type, use the special event handlers for the changed type
-			special = jQuery.event.special[ type ] || {};
-
-			// If selector defined, determine special event api type, otherwise given type
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-
-			// Update special based on newly reset type
-			special = jQuery.event.special[ type ] || {};
-
-			// handleObj is passed to all event handlers
-			handleObj = jQuery.extend({
-				type: type,
-				origType: origType,
-				data: data,
-				handler: handler,
-				guid: handler.guid,
-				selector: selector,
-				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
-				namespace: namespaces.join(".")
-			}, handleObjIn );
-
-			// Init the event handler queue if we're the first
-			if ( !(handlers = events[ type ]) ) {
-				handlers = events[ type ] = [];
-				handlers.delegateCount = 0;
-
-				// Only use addEventListener/attachEvent if the special events handler returns false
-				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-					// Bind the global event handler to the element
-					if ( elem.addEventListener ) {
-						elem.addEventListener( type, eventHandle, false );
-
-					} else if ( elem.attachEvent ) {
-						elem.attachEvent( "on" + type, eventHandle );
-					}
-				}
-			}
-
-			if ( special.add ) {
-				special.add.call( elem, handleObj );
-
-				if ( !handleObj.handler.guid ) {
-					handleObj.handler.guid = handler.guid;
-				}
-			}
-
-			// Add to the element's handler list, delegates in front
-			if ( selector ) {
-				handlers.splice( handlers.delegateCount++, 0, handleObj );
-			} else {
-				handlers.push( handleObj );
-			}
-
-			// Keep track of which events have ever been used, for event optimization
-			jQuery.event.global[ type ] = true;
-		}
-
-		// Nullify elem to prevent memory leaks in IE
-		elem = null;
-	},
-
-	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, selector, mappedTypes ) {
-
-		var j, origCount, tmp,
-			events, t, handleObj,
-			special, handlers, type, namespaces, origType,
-			elemData = jQuery.hasData( elem ) && jQuery._data( elem );
-
-		if ( !elemData || !(events = elemData.events) ) {
-			return;
-		}
-
-		// Once for each type.namespace in types; type may be omitted
-		types = ( types || "" ).match( core_rnotwhite ) || [""];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-			// Unbind all events (on this namespace, if provided) for the element
-			if ( !type ) {
-				for ( type in events ) {
-					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
-				}
-				continue;
-			}
-
-			special = jQuery.event.special[ type ] || {};
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-			handlers = events[ type ] || [];
-			tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" );
-
-			// Remove matching events
-			origCount = j = handlers.length;
-			while ( j-- ) {
-				handleObj = handlers[ j ];
-
-				if ( ( mappedTypes || origType === handleObj.origType ) &&
-					( !handler || handler.guid === handleObj.guid ) &&
-					( !tmp || tmp.test( handleObj.namespace ) ) &&
-					( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
-					handlers.splice( j, 1 );
-
-					if ( handleObj.selector ) {
-						handlers.delegateCount--;
-					}
-					if ( special.remove ) {
-						special.remove.call( elem, handleObj );
-					}
-				}
-			}
-
-			// Remove generic event handler if we removed something and no more handlers exist
-			// (avoids potential for endless recursion during removal of special event handlers)
-			if ( origCount && !handlers.length ) {
-				if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
-					jQuery.removeEvent( elem, type, elemData.handle );
-				}
-
-				delete events[ type ];
-			}
-		}
-
-		// Remove the expando if it's no longer used
-		if ( jQuery.isEmptyObject( events ) ) {
-			delete elemData.handle;
-
-			// removeData also checks for emptiness and clears the expando if empty
-			// so use it instead of delete
-			jQuery._removeData( elem, "events" );
-		}
-	},
-
-	trigger: function( event, data, elem, onlyHandlers ) {
-
-		var i, cur, tmp, bubbleType, ontype, handle, special,
-			eventPath = [ elem || document ],
-			type = event.type || event,
-			namespaces = event.namespace ? event.namespace.split(".") : [];
-
-		cur = tmp = elem = elem || document;
-
-		// Don't do events on text and comment nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		// focus/blur morphs to focusin/out; ensure we're not firing them right now
-		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
-			return;
-		}
-
-		if ( type.indexOf(".") >= 0 ) {
-			// Namespaced trigger; create a regexp to match event type in handle()
-			namespaces = type.split(".");
-			type = namespaces.shift();
-			namespaces.sort();
-		}
-		ontype = type.indexOf(":") < 0 && "on" + type;
-
-		// Caller can pass in a jQuery.Event object, Object, or just an event type string
-		event = event[ jQuery.expando ] ?
-			event :
-			new jQuery.Event( type, typeof event === "object" && event );
-
-		event.isTrigger = true;
-		event.namespace = namespaces.join(".");
-		event.namespace_re = event.namespace ?
-			new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) :
-			null;
-
-		// Clean up the event in case it is being reused
-		event.result = undefined;
-		if ( !event.target ) {
-			event.target = elem;
-		}
-
-		// Clone any incoming data and prepend the event, creating the handler arg list
-		data = data == null ?
-			[ event ] :
-			jQuery.makeArray( data, [ event ] );
-
-		// Allow special events to draw outside the lines
-		special = jQuery.event.special[ type ] || {};
-		if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
-			return;
-		}
-
-		// Determine event propagation path in advance, per W3C events spec (#9951)
-		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
-		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
-
-			bubbleType = special.delegateType || type;
-			if ( !rfocusMorph.test( bubbleType + type ) ) {
-				cur = cur.parentNode;
-			}
-			for ( ; cur; cur = cur.parentNode ) {
-				eventPath.push( cur );
-				tmp = cur;
-			}
-
-			// Only add window if we got to document (e.g., not plain obj or detached DOM)
-			if ( tmp === (elem.ownerDocument || document) ) {
-				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
-			}
-		}
-
-		// Fire handlers on the event path
-		i = 0;
-		while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) {
-
-			event.type = i > 1 ?
-				bubbleType :
-				special.bindType || type;
-
-			// jQuery handler
-			handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" );
-			if ( handle ) {
-				handle.apply( cur, data );
-			}
-
-			// Native handler
-			handle = ontype && cur[ ontype ];
-			if ( handle && jQuery.acceptData( cur ) && handle.apply && handle.apply( cur, data ) === false ) {
-				event.preventDefault();
-			}
-		}
-		event.type = type;
-
-		// If nobody prevented the default action, do it now
-		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
-
-			if ( (!special._default || special._default.apply( elem.ownerDocument, data ) === false) &&
-				!(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) {
-
-				// Call a native DOM method on the target with the same name name as the event.
-				// Can't use an .isFunction() check here because IE6/7 fails that test.
-				// Don't do default actions on window, that's where global variables be (#6170)
-				if ( ontype && elem[ type ] && !jQuery.isWindow( elem ) ) {
-
-					// Don't re-trigger an onFOO event when we call its FOO() method
-					tmp = elem[ ontype ];
-
-					if ( tmp ) {
-						elem[ ontype ] = null;
-					}
-
-					// Prevent re-triggering of the same event, since we already bubbled it above
-					jQuery.event.triggered = type;
-					try {
-						elem[ type ]();
-					} catch ( e ) {
-						// IE<9 dies on focus/blur to hidden element (#1486,#12518)
-						// only reproducible on winXP IE8 native, not IE9 in IE8 mode
-					}
-					jQuery.event.triggered = undefined;
-
-					if ( tmp ) {
-						elem[ ontype ] = tmp;
-					}
-				}
-			}
-		}
-
-		return event.result;
-	},
-
-	dispatch: function( event ) {
-
-		// Make a writable jQuery.Event from the native event object
-		event = jQuery.event.fix( event );
-
-		var i, j, ret, matched, handleObj,
-			handlerQueue = [],
-			args = core_slice.call( arguments ),
-			handlers = ( jQuery._data( this, "events" ) || {} )[ event.type ] || [],
-			special = jQuery.event.special[ event.type ] || {};
-
-		// Use the fix-ed jQuery.Event rather than the (read-only) native event
-		args[0] = event;
-		event.delegateTarget = this;
-
-		// Call the preDispatch hook for the mapped type, and let it bail if desired
-		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
-			return;
-		}
-
-		// Determine handlers
-		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
-
-		// Run delegates first; they may want to stop propagation beneath us
-		i = 0;
-		while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) {
-			event.currentTarget = matched.elem;
-
-			j = 0;
-			while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) {
-
-				// Triggered event must either 1) have no namespace, or
-				// 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
-				if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) {
-
-					event.handleObj = handleObj;
-					event.data = handleObj.data;
-
-					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
-							.apply( matched.elem, args );
-
-					if ( ret !== undefined ) {
-						if ( (event.result = ret) === false ) {
-							event.preventDefault();
-							event.stopPropagation();
-						}
-					}
-				}
-			}
-		}
-
-		// Call the postDispatch hook for the mapped type
-		if ( special.postDispatch ) {
-			special.postDispatch.call( this, event );
-		}
-
-		return event.result;
-	},
-
-	handlers: function( event, handlers ) {
-		var i, matches, sel, handleObj,
-			handlerQueue = [],
-			delegateCount = handlers.delegateCount,
-			cur = event.target;
-
-		// Find delegate handlers
-		// Black-hole SVG  instance trees (#13180)
-		// Avoid non-left-click bubbling in Firefox (#3861)
-		if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) {
-
-			for ( ; cur != this; cur = cur.parentNode || this ) {
-
-				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
-				if ( cur.disabled !== true || event.type !== "click" ) {
-					matches = [];
-					for ( i = 0; i < delegateCount; i++ ) {
-						handleObj = handlers[ i ];
-
-						// Don't conflict with Object.prototype properties (#13203)
-						sel = handleObj.selector + " ";
-
-						if ( matches[ sel ] === undefined ) {
-							matches[ sel ] = handleObj.needsContext ?
-								jQuery( sel, this ).index( cur ) >= 0 :
-								jQuery.find( sel, this, null, [ cur ] ).length;
-						}
-						if ( matches[ sel ] ) {
-							matches.push( handleObj );
-						}
-					}
-					if ( matches.length ) {
-						handlerQueue.push({ elem: cur, handlers: matches });
-					}
-				}
-			}
-		}
-
-		// Add the remaining (directly-bound) handlers
-		if ( delegateCount < handlers.length ) {
-			handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) });
-		}
-
-		return handlerQueue;
-	},
-
-	fix: function( event ) {
-		if ( event[ jQuery.expando ] ) {
-			return event;
-		}
-
-		// Create a writable copy of the event object and normalize some properties
-		var i, prop,
-			originalEvent = event,
-			fixHook = jQuery.event.fixHooks[ event.type ] || {},
-			copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
-
-		event = new jQuery.Event( originalEvent );
-
-		i = copy.length;
-		while ( i-- ) {
-			prop = copy[ i ];
-			event[ prop ] = originalEvent[ prop ];
-		}
-
-		// Support: IE<9
-		// Fix target property (#1925)
-		if ( !event.target ) {
-			event.target = originalEvent.srcElement || document;
-		}
-
-		// Support: Chrome 23+, Safari?
-		// Target should not be a text node (#504, #13143)
-		if ( event.target.nodeType === 3 ) {
-			event.target = event.target.parentNode;
-		}
-
-		// Support: IE<9
-		// For mouse/key events, metaKey==false if it's undefined (#3368, #11328)
-		event.metaKey = !!event.metaKey;
-
-		return fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
-	},
-
-	// Includes some event props shared by KeyEvent and MouseEvent
-	props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
-
-	fixHooks: {},
-
-	keyHooks: {
-		props: "char charCode key keyCode".split(" "),
-		filter: function( event, original ) {
-
-			// Add which for key events
-			if ( event.which == null ) {
-				event.which = original.charCode != null ? original.charCode : original.keyCode;
-			}
-
-			return event;
-		}
-	},
-
-	mouseHooks: {
-		props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
-		filter: function( event, original ) {
-			var eventDoc, doc, body,
-				button = original.button,
-				fromElement = original.fromElement;
-
-			// Calculate pageX/Y if missing and clientX/Y available
-			if ( event.pageX == null && original.clientX != null ) {
-				eventDoc = event.target.ownerDocument || document;
-				doc = eventDoc.documentElement;
-				body = eventDoc.body;
-
-				event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
-				event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
-			}
-
-			// Add relatedTarget, if necessary
-			if ( !event.relatedTarget && fromElement ) {
-				event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
-			}
-
-			// Add which for click: 1 === left; 2 === middle; 3 === right
-			// Note: button is not normalized, so don't use it
-			if ( !event.which && button !== undefined ) {
-				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
-			}
-
-			return event;
-		}
-	},
-
-	special: {
-		load: {
-			// Prevent triggered image.load events from bubbling to window.load
-			noBubble: true
-		},
-		click: {
-			// For checkbox, fire native event so checked state will be right
-			trigger: function() {
-				if ( jQuery.nodeName( this, "input" ) && this.type === "checkbox" && this.click ) {
-					this.click();
-					return false;
-				}
-			}
-		},
-		focus: {
-			// Fire native event if possible so blur/focus sequence is correct
-			trigger: function() {
-				if ( this !== document.activeElement && this.focus ) {
-					try {
-						this.focus();
-						return false;
-					} catch ( e ) {
-						// Support: IE<9
-						// If we error on focus to hidden element (#1486, #12518),
-						// let .trigger() run the handlers
-					}
-				}
-			},
-			delegateType: "focusin"
-		},
-		blur: {
-			trigger: function() {
-				if ( this === document.activeElement && this.blur ) {
-					this.blur();
-					return false;
-				}
-			},
-			delegateType: "focusout"
-		},
-
-		beforeunload: {
-			postDispatch: function( event ) {
-
-				// Even when returnValue equals to undefined Firefox will still show alert
-				if ( event.result !== undefined ) {
-					event.originalEvent.returnValue = event.result;
-				}
-			}
-		}
-	},
-
-	simulate: function( type, elem, event, bubble ) {
-		// Piggyback on a donor event to simulate a different one.
-		// Fake originalEvent to avoid donor's stopPropagation, but if the
-		// simulated event prevents default then we do the same on the donor.
-		var e = jQuery.extend(
-			new jQuery.Event(),
-			event,
-			{ type: type,
-				isSimulated: true,
-				originalEvent: {}
-			}
-		);
-		if ( bubble ) {
-			jQuery.event.trigger( e, null, elem );
-		} else {
-			jQuery.event.dispatch.call( elem, e );
-		}
-		if ( e.isDefaultPrevented() ) {
-			event.preventDefault();
-		}
-	}
-};
-
-jQuery.removeEvent = document.removeEventListener ?
-	function( elem, type, handle ) {
-		if ( elem.removeEventListener ) {
-			elem.removeEventListener( type, handle, false );
-		}
-	} :
-	function( elem, type, handle ) {
-		var name = "on" + type;
-
-		if ( elem.detachEvent ) {
-
-			// #8545, #7054, preventing memory leaks for custom events in IE6-8
-			// detachEvent needed property on element, by name of that event, to properly expose it to GC
-			if ( typeof elem[ name ] === "undefined" ) {
-				elem[ name ] = null;
-			}
-
-			elem.detachEvent( name, handle );
-		}
-	};
-
-jQuery.Event = function( src, props ) {
-	// Allow instantiation without the 'new' keyword
-	if ( !(this instanceof jQuery.Event) ) {
-		return new jQuery.Event( src, props );
-	}
-
-	// Event object
-	if ( src && src.type ) {
-		this.originalEvent = src;
-		this.type = src.type;
-
-		// Events bubbling up the document may have been marked as prevented
-		// by a handler lower down the tree; reflect the correct value.
-		this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false ||
-			src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse;
-
-	// Event type
-	} else {
-		this.type = src;
-	}
-
-	// Put explicitly provided properties onto the event object
-	if ( props ) {
-		jQuery.extend( this, props );
-	}
-
-	// Create a timestamp if incoming event doesn't have one
-	this.timeStamp = src && src.timeStamp || jQuery.now();
-
-	// Mark it as fixed
-	this[ jQuery.expando ] = true;
-};
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
-	isDefaultPrevented: returnFalse,
-	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse,
-
-	preventDefault: function() {
-		var e = this.originalEvent;
-
-		this.isDefaultPrevented = returnTrue;
-		if ( !e ) {
-			return;
-		}
-
-		// If preventDefault exists, run it on the original event
-		if ( e.preventDefault ) {
-			e.preventDefault();
-
-		// Support: IE
-		// Otherwise set the returnValue property of the original event to false
-		} else {
-			e.returnValue = false;
-		}
-	},
-	stopPropagation: function() {
-		var e = this.originalEvent;
-
-		this.isPropagationStopped = returnTrue;
-		if ( !e ) {
-			return;
-		}
-		// If stopPropagation exists, run it on the original event
-		if ( e.stopPropagation ) {
-			e.stopPropagation();
-		}
-
-		// Support: IE
-		// Set the cancelBubble property of the original event to true
-		e.cancelBubble = true;
-	},
-	stopImmediatePropagation: function() {
-		this.isImmediatePropagationStopped = returnTrue;
-		this.stopPropagation();
-	}
-};
-
-// Create mouseenter/leave events using mouseover/out and event-time checks
-jQuery.each({
-	mouseenter: "mouseover",
-	mouseleave: "mouseout"
-}, function( orig, fix ) {
-	jQuery.event.special[ orig ] = {
-		delegateType: fix,
-		bindType: fix,
-
-		handle: function( event ) {
-			var ret,
-				target = this,
-				related = event.relatedTarget,
-				handleObj = event.handleObj;
-
-			// For mousenter/leave call the handler if related is outside the target.
-			// NB: No relatedTarget if the mouse left/entered the browser window
-			if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
-				event.type = handleObj.origType;
-				ret = handleObj.handler.apply( this, arguments );
-				event.type = fix;
-			}
-			return ret;
-		}
-	};
-});
-
-// IE submit delegation
-if ( !jQuery.support.submitBubbles ) {
-
-	jQuery.event.special.submit = {
-		setup: function() {
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
-			}
-
-			// Lazy-add a submit handler when a descendant form may potentially be submitted
-			jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
-				// Node name check avoids a VML-related crash in IE (#9807)
-				var elem = e.target,
-					form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined;
-				if ( form && !jQuery._data( form, "submitBubbles" ) ) {
-					jQuery.event.add( form, "submit._submit", function( event ) {
-						event._submit_bubble = true;
-					});
-					jQuery._data( form, "submitBubbles", true );
-				}
-			});
-			// return undefined since we don't need an event listener
-		},
-
-		postDispatch: function( event ) {
-			// If form was submitted by the user, bubble the event up the tree
-			if ( event._submit_bubble ) {
-				delete event._submit_bubble;
-				if ( this.parentNode && !event.isTrigger ) {
-					jQuery.event.simulate( "submit", this.parentNode, event, true );
-				}
-			}
-		},
-
-		teardown: function() {
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
-			}
-
-			// Remove delegated handlers; cleanData eventually reaps submit handlers attached above
-			jQuery.event.remove( this, "._submit" );
-		}
-	};
-}
-
-// IE change delegation and checkbox/radio fix
-if ( !jQuery.support.changeBubbles ) {
-
-	jQuery.event.special.change = {
-
-		setup: function() {
-
-			if ( rformElems.test( this.nodeName ) ) {
-				// IE doesn't fire change on a check/radio until blur; trigger it on click
-				// after a propertychange. Eat the blur-change in special.change.handle.
-				// This still fires onchange a second time for check/radio after blur.
-				if ( this.type === "checkbox" || this.type === "radio" ) {
-					jQuery.event.add( this, "propertychange._change", function( event ) {
-						if ( event.originalEvent.propertyName === "checked" ) {
-							this._just_changed = true;
-						}
-					});
-					jQuery.event.add( this, "click._change", function( event ) {
-						if ( this._just_changed && !event.isTrigger ) {
-							this._just_changed = false;
-						}
-						// Allow triggered, simulated change events (#11500)
-						jQuery.event.simulate( "change", this, event, true );
-					});
-				}
-				return false;
-			}
-			// Delegated event; lazy-add a change handler on descendant inputs
-			jQuery.event.add( this, "beforeactivate._change", function( e ) {
-				var elem = e.target;
-
-				if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "changeBubbles" ) ) {
-					jQuery.event.add( elem, "change._change", function( event ) {
-						if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
-							jQuery.event.simulate( "change", this.parentNode, event, true );
-						}
-					});
-					jQuery._data( elem, "changeBubbles", true );
-				}
-			});
-		},
-
-		handle: function( event ) {
-			var elem = event.target;
-
-			// Swallow native change events from checkbox/radio, we already triggered them above
-			if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) {
-				return event.handleObj.handler.apply( this, arguments );
-			}
-		},
-
-		teardown: function() {
-			jQuery.event.remove( this, "._change" );
-
-			return !rformElems.test( this.nodeName );
-		}
-	};
-}
-
-// Create "bubbling" focus and blur events
-if ( !jQuery.support.focusinBubbles ) {
-	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-
-		// Attach a single capturing handler while someone wants focusin/focusout
-		var attaches = 0,
-			handler = function( event ) {
-				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
-			};
-
-		jQuery.event.special[ fix ] = {
-			setup: function() {
-				if ( attaches++ === 0 ) {
-					document.addEventListener( orig, handler, true );
-				}
-			},
-			teardown: function() {
-				if ( --attaches === 0 ) {
-					document.removeEventListener( orig, handler, true );
-				}
-			}
-		};
-	});
-}
-
-jQuery.fn.extend({
-
-	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
-		var origFn, type;
-
-		// Types can be a map of types/handlers
-		if ( typeof types === "object" ) {
-			// ( types-Object, selector, data )
-			if ( typeof selector !== "string" ) {
-				// ( types-Object, data )
-				data = data || selector;
-				selector = undefined;
-			}
-			for ( type in types ) {
-				this.on( type, selector, data, types[ type ], one );
-			}
-			return this;
-		}
-
-		if ( data == null && fn == null ) {
-			// ( types, fn )
-			fn = selector;
-			data = selector = undefined;
-		} else if ( fn == null ) {
-			if ( typeof selector === "string" ) {
-				// ( types, selector, fn )
-				fn = data;
-				data = undefined;
-			} else {
-				// ( types, data, fn )
-				fn = data;
-				data = selector;
-				selector = undefined;
-			}
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		} else if ( !fn ) {
-			return this;
-		}
-
-		if ( one === 1 ) {
-			origFn = fn;
-			fn = function( event ) {
-				// Can use an empty set, since event contains the info
-				jQuery().off( event );
-				return origFn.apply( this, arguments );
-			};
-			// Use same guid so caller can remove using origFn
-			fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
-		}
-		return this.each( function() {
-			jQuery.event.add( this, types, fn, data, selector );
-		});
-	},
-	one: function( types, selector, data, fn ) {
-		return this.on( types, selector, data, fn, 1 );
-	},
-	off: function( types, selector, fn ) {
-		var handleObj, type;
-		if ( types && types.preventDefault && types.handleObj ) {
-			// ( event )  dispatched jQuery.Event
-			handleObj = types.handleObj;
-			jQuery( types.delegateTarget ).off(
-				handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
-				handleObj.selector,
-				handleObj.handler
-			);
-			return this;
-		}
-		if ( typeof types === "object" ) {
-			// ( types-object [, selector] )
-			for ( type in types ) {
-				this.off( type, selector, types[ type ] );
-			}
-			return this;
-		}
-		if ( selector === false || typeof selector === "function" ) {
-			// ( types [, fn] )
-			fn = selector;
-			selector = undefined;
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		}
-		return this.each(function() {
-			jQuery.event.remove( this, types, fn, selector );
-		});
-	},
-
-	bind: function( types, data, fn ) {
-		return this.on( types, null, data, fn );
-	},
-	unbind: function( types, fn ) {
-		return this.off( types, null, fn );
-	},
-
-	delegate: function( selector, types, data, fn ) {
-		return this.on( types, selector, data, fn );
-	},
-	undelegate: function( selector, types, fn ) {
-		// ( namespace ) or ( selector, types [, fn] )
-		return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn );
-	},
-
-	trigger: function( type, data ) {
-		return this.each(function() {
-			jQuery.event.trigger( type, data, this );
-		});
-	},
-	triggerHandler: function( type, data ) {
-		var elem = this[0];
-		if ( elem ) {
-			return jQuery.event.trigger( type, data, elem, true );
-		}
-	},
-
-	hover: function( fnOver, fnOut ) {
-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-	}
-});
-
-jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
-	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) {
-
-	// Handle event binding
-	jQuery.fn[ name ] = function( data, fn ) {
-		return arguments.length > 0 ?
-			this.on( name, null, data, fn ) :
-			this.trigger( name );
-	};
-
-	if ( rkeyEvent.test( name ) ) {
-		jQuery.event.fixHooks[ name ] = jQuery.event.keyHooks;
-	}
-
-	if ( rmouseEvent.test( name ) ) {
-		jQuery.event.fixHooks[ name ] = jQuery.event.mouseHooks;
-	}
-});
-/*!
- * Sizzle CSS Selector Engine
- * Copyright 2012 jQuery Foundation and other contributors
- * Released under the MIT license
- * http://sizzlejs.com/
- */
-(function( window, undefined ) {
-
-var i,
-	cachedruns,
-	Expr,
-	getText,
-	isXML,
-	compile,
-	hasDuplicate,
-	outermostContext,
-
-	// Local document vars
-	setDocument,
-	document,
-	docElem,
-	documentIsXML,
-	rbuggyQSA,
-	rbuggyMatches,
-	matches,
-	contains,
-	sortOrder,
-
-	// Instance-specific data
-	expando = "sizzle" + -(new Date()),
-	preferredDoc = window.document,
-	support = {},
-	dirruns = 0,
-	done = 0,
-	classCache = createCache(),
-	tokenCache = createCache(),
-	compilerCache = createCache(),
-
-	// General-purpose constants
-	strundefined = typeof undefined,
-	MAX_NEGATIVE = 1 << 31,
-
-	// Array methods
-	arr = [],
-	pop = arr.pop,
-	push = arr.push,
-	slice = arr.slice,
-	// Use a stripped-down indexOf if we can't use a native one
-	indexOf = arr.indexOf || function( elem ) {
-		var i = 0,
-			len = this.length;
-		for ( ; i < len; i++ ) {
-			if ( this[i] === elem ) {
-				return i;
-			}
-		}
-		return -1;
-	},
-
-
-	// Regular expressions
-
-	// Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
-	whitespace = "[\\x20\\t\\r\\n\\f]",
-	// http://www.w3.org/TR/css3-syntax/#characters
-	characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
-
-	// Loosely modeled on CSS identifier characters
-	// An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors
-	// Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
-	identifier = characterEncoding.replace( "w", "w#" ),
-
-	// Acceptable operators http://www.w3.org/TR/selectors/#attribute-selectors
-	operators = "([*^$|!~]?=)",
-	attributes = "\\[" + whitespace + "*(" + characterEncoding + ")" + whitespace +
-		"*(?:" + operators + whitespace + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + identifier + ")|)|)" + whitespace + "*\\]",
-
-	// Prefer arguments quoted,
-	//   then not containing pseudos/brackets,
-	//   then attribute selectors/non-parenthetical expressions,
-	//   then anything else
-	// These preferences are here to reduce the number of selectors
-	//   needing tokenize in the PSEUDO preFilter
-	pseudos = ":(" + characterEncoding + ")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|" + attributes.replace( 3, 8 ) + ")*)|.*)\\)|)",
-
-	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
-	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
-
-	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
-	rcombinators = new RegExp( "^" + whitespace + "*([\\x20\\t\\r\\n\\f>+~])" + whitespace + "*" ),
-	rpseudo = new RegExp( pseudos ),
-	ridentifier = new RegExp( "^" + identifier + "$" ),
-
-	matchExpr = {
-		"ID": new RegExp( "^#(" + characterEncoding + ")" ),
-		"CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
-		"NAME": new RegExp( "^\\[name=['\"]?(" + characterEncoding + ")['\"]?\\]" ),
-		"TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
-		"ATTR": new RegExp( "^" + attributes ),
-		"PSEUDO": new RegExp( "^" + pseudos ),
-		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
-			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
-			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
-		// For use in libraries implementing .is()
-		// We use this for POS matching in `select`
-		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
-			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
-	},
-
-	rsibling = /[\x20\t\r\n\f]*[+~]/,
-
-	rnative = /\{\s*\[native code\]\s*\}/,
-
-	// Easily-parseable/retrievable ID or TAG or CLASS selectors
-	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
-
-	rinputs = /^(?:input|select|textarea|button)$/i,
-	rheader = /^h\d$/i,
-
-	rescape = /'|\\/g,
-	rattributeQuotes = /\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,
-
-	// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
-	runescape = /\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?|.)/g,
-	funescape = function( _, escaped ) {
-		var high = "0x" + escaped - 0x10000;
-		// NaN means non-codepoint
-		return high !== high ?
-			escaped :
-			// BMP codepoint
-			high < 0 ?
-				String.fromCharCode( high + 0x10000 ) :
-				// Supplemental Plane codepoint (surrogate pair)
-				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
-	};
-
-// Use a stripped-down slice if we can't use a native one
-try {
-	slice.call( docElem.childNodes, 0 )[0].nodeType;
-} catch ( e ) {
-	slice = function( i ) {
-		var elem,
-			results = [];
-		for ( ; (elem = this[i]); i++ ) {
-			results.push( elem );
-		}
-		return results;
-	};
-}
-
-/**
- * For feature detection
- * @param {Function} fn The function to test for native support
- */
-function isNative( fn ) {
-	return rnative.test( fn + "" );
-}
-
-/**
- * Create key-value caches of limited size
- * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
- *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
- *	deleting the oldest entry
- */
-function createCache() {
-	var cache,
-		keys = [];
-
-	return (cache = function( key, value ) {
-		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
-		if ( keys.push( key += " " ) > Expr.cacheLength ) {
-			// Only keep the most recent entries
-			delete cache[ keys.shift() ];
-		}
-		return (cache[ key ] = value);
-	});
-}
-
-/**
- * Mark a function for special use by Sizzle
- * @param {Function} fn The function to mark
- */
-function markFunction( fn ) {
-	fn[ expando ] = true;
-	return fn;
-}
-
-/**
- * Support testing using an element
- * @param {Function} fn Passed the created div and expects a boolean result
- */
-function assert( fn ) {
-	var div = document.createElement("div");
-
-	try {
-		return fn( div );
-	} catch (e) {
-		return false;
-	} finally {
-		// release memory in IE
-		div = null;
-	}
-}
-
-function Sizzle( selector, context, results, seed ) {
-	var match, elem, m, nodeType,
-		// QSA vars
-		i, groups, old, nid, newContext, newSelector;
-
-	if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
-		setDocument( context );
-	}
-
-	context = context || document;
-	results = results || [];
-
-	if ( !selector || typeof selector !== "string" ) {
-		return results;
-	}
-
-	if ( (nodeType = context.nodeType) !== 1 && nodeType !== 9 ) {
-		return [];
-	}
-
-	if ( !documentIsXML && !seed ) {
-
-		// Shortcuts
-		if ( (match = rquickExpr.exec( selector )) ) {
-			// Speed-up: Sizzle("#ID")
-			if ( (m = match[1]) ) {
-				if ( nodeType === 9 ) {
-					elem = context.getElementById( m );
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE, Opera, and Webkit return items
-						// by name instead of ID
-						if ( elem.id === m ) {
-							results.push( elem );
-							return results;
-						}
-					} else {
-						return results;
-					}
-				} else {
-					// Context is not a document
-					if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
-						contains( context, elem ) && elem.id === m ) {
-						results.push( elem );
-						return results;
-					}
-				}
-
-			// Speed-up: Sizzle("TAG")
-			} else if ( match[2] ) {
-				push.apply( results, slice.call(context.getElementsByTagName( selector ), 0) );
-				return results;
-
-			// Speed-up: Sizzle(".CLASS")
-			} else if ( (m = match[3]) && support.getByClassName && context.getElementsByClassName ) {
-				push.apply( results, slice.call(context.getElementsByClassName( m ), 0) );
-				return results;
-			}
-		}
-
-		// QSA path
-		if ( support.qsa && !rbuggyQSA.test(selector) ) {
-			old = true;
-			nid = expando;
-			newContext = context;
-			newSelector = nodeType === 9 && selector;
-
-			// qSA works strangely on Element-rooted queries
-			// We can work around this by specifying an extra ID on the root
-			// and working up from there (Thanks to Andrew Dupont for the technique)
-			// IE 8 doesn't work on object elements
-			if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
-				groups = tokenize( selector );
-
-				if ( (old = context.getAttribute("id")) ) {
-					nid = old.replace( rescape, "\\$&" );
-				} else {
-					context.setAttribute( "id", nid );
-				}
-				nid = "[id='" + nid + "'] ";
-
-				i = groups.length;
-				while ( i-- ) {
-					groups[i] = nid + toSelector( groups[i] );
-				}
-				newContext = rsibling.test( selector ) && context.parentNode || context;
-				newSelector = groups.join(",");
-			}
-
-			if ( newSelector ) {
-				try {
-					push.apply( results, slice.call( newContext.querySelectorAll(
-						newSelector
-					), 0 ) );
-					return results;
-				} catch(qsaError) {
-				} finally {
-					if ( !old ) {
-						context.removeAttribute("id");
-					}
-				}
-			}
-		}
-	}
-
-	// All others
-	return select( selector.replace( rtrim, "$1" ), context, results, seed );
-}
-
-/**
- * Detect xml
- * @param {Element|Object} elem An element or a document
- */
-isXML = Sizzle.isXML = function( elem ) {
-	// documentElement is verified for cases where it doesn't yet exist
-	// (such as loading iframes in IE - #4833)
-	var documentElement = elem && (elem.ownerDocument || elem).documentElement;
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-/**
- * Sets document-related variables once based on the current document
- * @param {Element|Object} [doc] An element or document object to use to set the document
- * @returns {Object} Returns the current document
- */
-setDocument = Sizzle.setDocument = function( node ) {
-	var doc = node ? node.ownerDocument || node : preferredDoc;
-
-	// If no document and documentElement is available, return
-	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
-		return document;
-	}
-
-	// Set our document
-	document = doc;
-	docElem = doc.documentElement;
-
-	// Support tests
-	documentIsXML = isXML( doc );
-
-	// Check if getElementsByTagName("*") returns only elements
-	support.tagNameNoComments = assert(function( div ) {
-		div.appendChild( doc.createComment("") );
-		return !div.getElementsByTagName("*").length;
-	});
-
-	// Check if attributes should be retrieved by attribute nodes
-	support.attributes = assert(function( div ) {
-		div.innerHTML = "";
-		var type = typeof div.lastChild.getAttribute("multiple");
-		// IE8 returns a string for some attributes even when not present
-		return type !== "boolean" && type !== "string";
-	});
-
-	// Check if getElementsByClassName can be trusted
-	support.getByClassName = assert(function( div ) {
-		// Opera can't find a second classname (in 9.6)
-		div.innerHTML = "";
-		if ( !div.getElementsByClassName || !div.getElementsByClassName("e").length ) {
-			return false;
-		}
-
-		// Safari 3.2 caches class attributes and doesn't catch changes
-		div.lastChild.className = "e";
-		return div.getElementsByClassName("e").length === 2;
-	});
-
-	// Check if getElementById returns elements by name
-	// Check if getElementsByName privileges form controls or returns elements by ID
-	support.getByName = assert(function( div ) {
-		// Inject content
-		div.id = expando + 0;
-		div.innerHTML = "
    ";
-		docElem.insertBefore( div, docElem.firstChild );
-
-		// Test
-		var pass = doc.getElementsByName &&
-			// buggy browsers will return fewer than the correct 2
-			doc.getElementsByName( expando ).length === 2 +
-			// buggy browsers will return more than the correct 0
-			doc.getElementsByName( expando + 0 ).length;
-		support.getIdNotName = !doc.getElementById( expando );
-
-		// Cleanup
-		docElem.removeChild( div );
-
-		return pass;
-	});
-
-	// IE6/7 return modified attributes
-	Expr.attrHandle = assert(function( div ) {
-		div.innerHTML = "";
-		return div.firstChild && typeof div.firstChild.getAttribute !== strundefined &&
-			div.firstChild.getAttribute("href") === "#";
-	}) ?
-		{} :
-		{
-			"href": function( elem ) {
-				return elem.getAttribute( "href", 2 );
-			},
-			"type": function( elem ) {
-				return elem.getAttribute("type");
-			}
-		};
-
-	// ID find and filter
-	if ( support.getIdNotName ) {
-		Expr.find["ID"] = function( id, context ) {
-			if ( typeof context.getElementById !== strundefined && !documentIsXML ) {
-				var m = context.getElementById( id );
-				// Check parentNode to catch when Blackberry 4.6 returns
-				// nodes that are no longer in the document #6963
-				return m && m.parentNode ? [m] : [];
-			}
-		};
-		Expr.filter["ID"] = function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				return elem.getAttribute("id") === attrId;
-			};
-		};
-	} else {
-		Expr.find["ID"] = function( id, context ) {
-			if ( typeof context.getElementById !== strundefined && !documentIsXML ) {
-				var m = context.getElementById( id );
-
-				return m ?
-					m.id === id || typeof m.getAttributeNode !== strundefined && m.getAttributeNode("id").value === id ?
-						[m] :
-						undefined :
-					[];
-			}
-		};
-		Expr.filter["ID"] =  function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id");
-				return node && node.value === attrId;
-			};
-		};
-	}
-
-	// Tag
-	Expr.find["TAG"] = support.tagNameNoComments ?
-		function( tag, context ) {
-			if ( typeof context.getElementsByTagName !== strundefined ) {
-				return context.getElementsByTagName( tag );
-			}
-		} :
-		function( tag, context ) {
-			var elem,
-				tmp = [],
-				i = 0,
-				results = context.getElementsByTagName( tag );
-
-			// Filter out possible comments
-			if ( tag === "*" ) {
-				for ( ; (elem = results[i]); i++ ) {
-					if ( elem.nodeType === 1 ) {
-						tmp.push( elem );
-					}
-				}
-
-				return tmp;
-			}
-			return results;
-		};
-
-	// Name
-	Expr.find["NAME"] = support.getByName && function( tag, context ) {
-		if ( typeof context.getElementsByName !== strundefined ) {
-			return context.getElementsByName( name );
-		}
-	};
-
-	// Class
-	Expr.find["CLASS"] = support.getByClassName && function( className, context ) {
-		if ( typeof context.getElementsByClassName !== strundefined && !documentIsXML ) {
-			return context.getElementsByClassName( className );
-		}
-	};
-
-	// QSA and matchesSelector support
-
-	// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
-	rbuggyMatches = [];
-
-	// qSa(:focus) reports false when true (Chrome 21),
-	// no need to also add to buggyMatches since matches checks buggyQSA
-	// A support test would require too much code (would include document ready)
-	rbuggyQSA = [ ":focus" ];
-
-	if ( (support.qsa = isNative(doc.querySelectorAll)) ) {
-		// Build QSA regex
-		// Regex strategy adopted from Diego Perini
-		assert(function( div ) {
-			// Select is set to empty string on purpose
-			// This is to test IE's treatment of not explictly
-			// setting a boolean content attribute,
-			// since its presence should be enough
-			// http://bugs.jquery.com/ticket/12359
-			div.innerHTML = "";
-
-			// IE8 - Some boolean attributes are not treated correctly
-			if ( !div.querySelectorAll("[selected]").length ) {
-				rbuggyQSA.push( "\\[" + whitespace + "*(?:checked|disabled|ismap|multiple|readonly|selected|value)" );
-			}
-
-			// Webkit/Opera - :checked should return selected option elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":checked").length ) {
-				rbuggyQSA.push(":checked");
-			}
-		});
-
-		assert(function( div ) {
-
-			// Opera 10-12/IE8 - ^= $= *= and empty values
-			// Should not select anything
-			div.innerHTML = "";
-			if ( div.querySelectorAll("[i^='']").length ) {
-				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:\"\"|'')" );
-			}
-
-			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":enabled").length ) {
-				rbuggyQSA.push( ":enabled", ":disabled" );
-			}
-
-			// Opera 10-11 does not throw on post-comma invalid pseudos
-			div.querySelectorAll("*,:x");
-			rbuggyQSA.push(",.*:");
-		});
-	}
-
-	if ( (support.matchesSelector = isNative( (matches = docElem.matchesSelector ||
-		docElem.mozMatchesSelector ||
-		docElem.webkitMatchesSelector ||
-		docElem.oMatchesSelector ||
-		docElem.msMatchesSelector) )) ) {
-
-		assert(function( div ) {
-			// Check to see if it's possible to do matchesSelector
-			// on a disconnected node (IE 9)
-			support.disconnectedMatch = matches.call( div, "div" );
-
-			// This should fail with an exception
-			// Gecko does not error, returns false instead
-			matches.call( div, "[s!='']:x" );
-			rbuggyMatches.push( "!=", pseudos );
-		});
-	}
-
-	rbuggyQSA = new RegExp( rbuggyQSA.join("|") );
-	rbuggyMatches = new RegExp( rbuggyMatches.join("|") );
-
-	// Element contains another
-	// Purposefully does not implement inclusive descendent
-	// As in, an element does not contain itself
-	contains = isNative(docElem.contains) || docElem.compareDocumentPosition ?
-		function( a, b ) {
-			var adown = a.nodeType === 9 ? a.documentElement : a,
-				bup = b && b.parentNode;
-			return a === bup || !!( bup && bup.nodeType === 1 && (
-				adown.contains ?
-					adown.contains( bup ) :
-					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
-			));
-		} :
-		function( a, b ) {
-			if ( b ) {
-				while ( (b = b.parentNode) ) {
-					if ( b === a ) {
-						return true;
-					}
-				}
-			}
-			return false;
-		};
-
-	// Document order sorting
-	sortOrder = docElem.compareDocumentPosition ?
-	function( a, b ) {
-		var compare;
-
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		if ( (compare = b.compareDocumentPosition && a.compareDocumentPosition && a.compareDocumentPosition( b )) ) {
-			if ( compare & 1 || a.parentNode && a.parentNode.nodeType === 11 ) {
-				if ( a === doc || contains( preferredDoc, a ) ) {
-					return -1;
-				}
-				if ( b === doc || contains( preferredDoc, b ) ) {
-					return 1;
-				}
-				return 0;
-			}
-			return compare & 4 ? -1 : 1;
-		}
-
-		return a.compareDocumentPosition ? -1 : 1;
-	} :
-	function( a, b ) {
-		var cur,
-			i = 0,
-			aup = a.parentNode,
-			bup = b.parentNode,
-			ap = [ a ],
-			bp = [ b ];
-
-		// The nodes are identical, we can exit early
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-
-		// Fallback to using sourceIndex (in IE) if it's available on both nodes
-		} else if ( a.sourceIndex && b.sourceIndex ) {
-			return ( ~b.sourceIndex || MAX_NEGATIVE ) - ( contains( preferredDoc, a ) && ~a.sourceIndex || MAX_NEGATIVE );
-
-		// Parentless nodes are either documents or disconnected
-		} else if ( !aup || !bup ) {
-			return a === doc ? -1 :
-				b === doc ? 1 :
-				aup ? -1 :
-				bup ? 1 :
-				0;
-
-		// If the nodes are siblings, we can do a quick check
-		} else if ( aup === bup ) {
-			return siblingCheck( a, b );
-		}
-
-		// Otherwise we need full lists of their ancestors for comparison
-		cur = a;
-		while ( (cur = cur.parentNode) ) {
-			ap.unshift( cur );
-		}
-		cur = b;
-		while ( (cur = cur.parentNode) ) {
-			bp.unshift( cur );
-		}
-
-		// Walk down the tree looking for a discrepancy
-		while ( ap[i] === bp[i] ) {
-			i++;
-		}
-
-		return i ?
-			// Do a sibling check if the nodes have a common ancestor
-			siblingCheck( ap[i], bp[i] ) :
-
-			// Otherwise nodes in our document sort first
-			ap[i] === preferredDoc ? -1 :
-			bp[i] === preferredDoc ? 1 :
-			0;
-	};
-
-	// Always assume the presence of duplicates if sort doesn't
-	// pass them to our comparison function (as in Google Chrome).
-	hasDuplicate = false;
-	[0, 0].sort( sortOrder );
-	support.detectDuplicates = hasDuplicate;
-
-	return document;
-};
-
-Sizzle.matches = function( expr, elements ) {
-	return Sizzle( expr, null, null, elements );
-};
-
-Sizzle.matchesSelector = function( elem, expr ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	// Make sure that attribute selectors are quoted
-	expr = expr.replace( rattributeQuotes, "='$1']" );
-
-	// rbuggyQSA always contains :focus, so no need for an existence check
-	if ( support.matchesSelector && !documentIsXML && (!rbuggyMatches || !rbuggyMatches.test(expr)) && !rbuggyQSA.test(expr) ) {
-		try {
-			var ret = matches.call( elem, expr );
-
-			// IE 9's matchesSelector returns false on disconnected nodes
-			if ( ret || support.disconnectedMatch ||
-					// As well, disconnected nodes are said to be in a document
-					// fragment in IE 9
-					elem.document && elem.document.nodeType !== 11 ) {
-				return ret;
-			}
-		} catch(e) {}
-	}
-
-	return Sizzle( expr, document, null, [elem] ).length > 0;
-};
-
-Sizzle.contains = function( context, elem ) {
-	// Set document vars if needed
-	if ( ( context.ownerDocument || context ) !== document ) {
-		setDocument( context );
-	}
-	return contains( context, elem );
-};
-
-Sizzle.attr = function( elem, name ) {
-	var val;
-
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	if ( !documentIsXML ) {
-		name = name.toLowerCase();
-	}
-	if ( (val = Expr.attrHandle[ name ]) ) {
-		return val( elem );
-	}
-	if ( documentIsXML || support.attributes ) {
-		return elem.getAttribute( name );
-	}
-	return ( (val = elem.getAttributeNode( name )) || elem.getAttribute( name ) ) && elem[ name ] === true ?
-		name :
-		val && val.specified ? val.value : null;
-};
-
-Sizzle.error = function( msg ) {
-	throw new Error( "Syntax error, unrecognized expression: " + msg );
-};
-
-// Document sorting and removing duplicates
-Sizzle.uniqueSort = function( results ) {
-	var elem,
-		duplicates = [],
-		i = 1,
-		j = 0;
-
-	// Unless we *know* we can detect duplicates, assume their presence
-	hasDuplicate = !support.detectDuplicates;
-	results.sort( sortOrder );
-
-	if ( hasDuplicate ) {
-		for ( ; (elem = results[i]); i++ ) {
-			if ( elem === results[ i - 1 ] ) {
-				j = duplicates.push( i );
-			}
-		}
-		while ( j-- ) {
-			results.splice( duplicates[ j ], 1 );
-		}
-	}
-
-	return results;
-};
-
-function siblingCheck( a, b ) {
-	var cur = a && b && a.nextSibling;
-
-	for ( ; cur; cur = cur.nextSibling ) {
-		if ( cur === b ) {
-			return -1;
-		}
-	}
-
-	return a ? 1 : -1;
-}
-
-// Returns a function to use in pseudos for input types
-function createInputPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return name === "input" && elem.type === type;
-	};
-}
-
-// Returns a function to use in pseudos for buttons
-function createButtonPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return (name === "input" || name === "button") && elem.type === type;
-	};
-}
-
-// Returns a function to use in pseudos for positionals
-function createPositionalPseudo( fn ) {
-	return markFunction(function( argument ) {
-		argument = +argument;
-		return markFunction(function( seed, matches ) {
-			var j,
-				matchIndexes = fn( [], seed.length, argument ),
-				i = matchIndexes.length;
-
-			// Match elements found at the specified indexes
-			while ( i-- ) {
-				if ( seed[ (j = matchIndexes[i]) ] ) {
-					seed[j] = !(matches[j] = seed[j]);
-				}
-			}
-		});
-	});
-}
-
-/**
- * Utility function for retrieving the text value of an array of DOM nodes
- * @param {Array|Element} elem
- */
-getText = Sizzle.getText = function( elem ) {
-	var node,
-		ret = "",
-		i = 0,
-		nodeType = elem.nodeType;
-
-	if ( !nodeType ) {
-		// If no nodeType, this is expected to be an array
-		for ( ; (node = elem[i]); i++ ) {
-			// Do not traverse comment nodes
-			ret += getText( node );
-		}
-	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
-		// Use textContent for elements
-		// innerText usage removed for consistency of new lines (see #11153)
-		if ( typeof elem.textContent === "string" ) {
-			return elem.textContent;
-		} else {
-			// Traverse its children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				ret += getText( elem );
-			}
-		}
-	} else if ( nodeType === 3 || nodeType === 4 ) {
-		return elem.nodeValue;
-	}
-	// Do not include comment or processing instruction nodes
-
-	return ret;
-};
-
-Expr = Sizzle.selectors = {
-
-	// Can be adjusted by the user
-	cacheLength: 50,
-
-	createPseudo: markFunction,
-
-	match: matchExpr,
-
-	find: {},
-
-	relative: {
-		">": { dir: "parentNode", first: true },
-		" ": { dir: "parentNode" },
-		"+": { dir: "previousSibling", first: true },
-		"~": { dir: "previousSibling" }
-	},
-
-	preFilter: {
-		"ATTR": function( match ) {
-			match[1] = match[1].replace( runescape, funescape );
-
-			// Move the given value to match[3] whether quoted or unquoted
-			match[3] = ( match[4] || match[5] || "" ).replace( runescape, funescape );
-
-			if ( match[2] === "~=" ) {
-				match[3] = " " + match[3] + " ";
-			}
-
-			return match.slice( 0, 4 );
-		},
-
-		"CHILD": function( match ) {
-			/* matches from matchExpr["CHILD"]
-				1 type (only|nth|...)
-				2 what (child|of-type)
-				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
-				4 xn-component of xn+y argument ([+-]?\d*n|)
-				5 sign of xn-component
-				6 x of xn-component
-				7 sign of y-component
-				8 y of y-component
-			*/
-			match[1] = match[1].toLowerCase();
-
-			if ( match[1].slice( 0, 3 ) === "nth" ) {
-				// nth-* requires argument
-				if ( !match[3] ) {
-					Sizzle.error( match[0] );
-				}
-
-				// numeric x and y parameters for Expr.filter.CHILD
-				// remember that false/true cast respectively to 0/1
-				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
-				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
-
-			// other types prohibit arguments
-			} else if ( match[3] ) {
-				Sizzle.error( match[0] );
-			}
-
-			return match;
-		},
-
-		"PSEUDO": function( match ) {
-			var excess,
-				unquoted = !match[5] && match[2];
-
-			if ( matchExpr["CHILD"].test( match[0] ) ) {
-				return null;
-			}
-
-			// Accept quoted arguments as-is
-			if ( match[4] ) {
-				match[2] = match[4];
-
-			// Strip excess characters from unquoted arguments
-			} else if ( unquoted && rpseudo.test( unquoted ) &&
-				// Get excess from tokenize (recursively)
-				(excess = tokenize( unquoted, true )) &&
-				// advance to the next closing parenthesis
-				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
-
-				// excess is a negative index
-				match[0] = match[0].slice( 0, excess );
-				match[2] = unquoted.slice( 0, excess );
-			}
-
-			// Return only captures needed by the pseudo filter method (type and argument)
-			return match.slice( 0, 3 );
-		}
-	},
-
-	filter: {
-
-		"TAG": function( nodeName ) {
-			if ( nodeName === "*" ) {
-				return function() { return true; };
-			}
-
-			nodeName = nodeName.replace( runescape, funescape ).toLowerCase();
-			return function( elem ) {
-				return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
-			};
-		},
-
-		"CLASS": function( className ) {
-			var pattern = classCache[ className + " " ];
-
-			return pattern ||
-				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
-				classCache( className, function( elem ) {
-					return pattern.test( elem.className || (typeof elem.getAttribute !== strundefined && elem.getAttribute("class")) || "" );
-				});
-		},
-
-		"ATTR": function( name, operator, check ) {
-			return function( elem ) {
-				var result = Sizzle.attr( elem, name );
-
-				if ( result == null ) {
-					return operator === "!=";
-				}
-				if ( !operator ) {
-					return true;
-				}
-
-				result += "";
-
-				return operator === "=" ? result === check :
-					operator === "!=" ? result !== check :
-					operator === "^=" ? check && result.indexOf( check ) === 0 :
-					operator === "*=" ? check && result.indexOf( check ) > -1 :
-					operator === "$=" ? check && result.substr( result.length - check.length ) === check :
-					operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 :
-					operator === "|=" ? result === check || result.substr( 0, check.length + 1 ) === check + "-" :
-					false;
-			};
-		},
-
-		"CHILD": function( type, what, argument, first, last ) {
-			var simple = type.slice( 0, 3 ) !== "nth",
-				forward = type.slice( -4 ) !== "last",
-				ofType = what === "of-type";
-
-			return first === 1 && last === 0 ?
-
-				// Shortcut for :nth-*(n)
-				function( elem ) {
-					return !!elem.parentNode;
-				} :
-
-				function( elem, context, xml ) {
-					var cache, outerCache, node, diff, nodeIndex, start,
-						dir = simple !== forward ? "nextSibling" : "previousSibling",
-						parent = elem.parentNode,
-						name = ofType && elem.nodeName.toLowerCase(),
-						useCache = !xml && !ofType;
-
-					if ( parent ) {
-
-						// :(first|last|only)-(child|of-type)
-						if ( simple ) {
-							while ( dir ) {
-								node = elem;
-								while ( (node = node[ dir ]) ) {
-									if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) {
-										return false;
-									}
-								}
-								// Reverse direction for :only-* (if we haven't yet done so)
-								start = dir = type === "only" && !start && "nextSibling";
-							}
-							return true;
-						}
-
-						start = [ forward ? parent.firstChild : parent.lastChild ];
-
-						// non-xml :nth-child(...) stores cache data on `parent`
-						if ( forward && useCache ) {
-							// Seek `elem` from a previously-cached index
-							outerCache = parent[ expando ] || (parent[ expando ] = {});
-							cache = outerCache[ type ] || [];
-							nodeIndex = cache[0] === dirruns && cache[1];
-							diff = cache[0] === dirruns && cache[2];
-							node = nodeIndex && parent.childNodes[ nodeIndex ];
-
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-
-								// Fallback to seeking `elem` from the start
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								// When found, cache indexes on `parent` and break
-								if ( node.nodeType === 1 && ++diff && node === elem ) {
-									outerCache[ type ] = [ dirruns, nodeIndex, diff ];
-									break;
-								}
-							}
-
-						// Use previously-cached element index if available
-						} else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) {
-							diff = cache[1];
-
-						// xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...)
-						} else {
-							// Use the same loop as above to seek `elem` from the start
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) {
-									// Cache the index of each encountered element
-									if ( useCache ) {
-										(node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ];
-									}
-
-									if ( node === elem ) {
-										break;
-									}
-								}
-							}
-						}
-
-						// Incorporate the offset, then check against cycle size
-						diff -= last;
-						return diff === first || ( diff % first === 0 && diff / first >= 0 );
-					}
-				};
-		},
-
-		"PSEUDO": function( pseudo, argument ) {
-			// pseudo-class names are case-insensitive
-			// http://www.w3.org/TR/selectors/#pseudo-classes
-			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
-			// Remember that setFilters inherits from pseudos
-			var args,
-				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
-					Sizzle.error( "unsupported pseudo: " + pseudo );
-
-			// The user may use createPseudo to indicate that
-			// arguments are needed to create the filter function
-			// just as Sizzle does
-			if ( fn[ expando ] ) {
-				return fn( argument );
-			}
-
-			// But maintain support for old signatures
-			if ( fn.length > 1 ) {
-				args = [ pseudo, pseudo, "", argument ];
-				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
-					markFunction(function( seed, matches ) {
-						var idx,
-							matched = fn( seed, argument ),
-							i = matched.length;
-						while ( i-- ) {
-							idx = indexOf.call( seed, matched[i] );
-							seed[ idx ] = !( matches[ idx ] = matched[i] );
-						}
-					}) :
-					function( elem ) {
-						return fn( elem, 0, args );
-					};
-			}
-
-			return fn;
-		}
-	},
-
-	pseudos: {
-		// Potentially complex pseudos
-		"not": markFunction(function( selector ) {
-			// Trim the selector passed to compile
-			// to avoid treating leading and trailing
-			// spaces as combinators
-			var input = [],
-				results = [],
-				matcher = compile( selector.replace( rtrim, "$1" ) );
-
-			return matcher[ expando ] ?
-				markFunction(function( seed, matches, context, xml ) {
-					var elem,
-						unmatched = matcher( seed, null, xml, [] ),
-						i = seed.length;
-
-					// Match elements unmatched by `matcher`
-					while ( i-- ) {
-						if ( (elem = unmatched[i]) ) {
-							seed[i] = !(matches[i] = elem);
-						}
-					}
-				}) :
-				function( elem, context, xml ) {
-					input[0] = elem;
-					matcher( input, null, xml, results );
-					return !results.pop();
-				};
-		}),
-
-		"has": markFunction(function( selector ) {
-			return function( elem ) {
-				return Sizzle( selector, elem ).length > 0;
-			};
-		}),
-
-		"contains": markFunction(function( text ) {
-			return function( elem ) {
-				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
-			};
-		}),
-
-		// "Whether an element is represented by a :lang() selector
-		// is based solely on the element's language value
-		// being equal to the identifier C,
-		// or beginning with the identifier C immediately followed by "-".
-		// The matching of C against the element's language value is performed case-insensitively.
-		// The identifier C does not have to be a valid language name."
-		// http://www.w3.org/TR/selectors/#lang-pseudo
-		"lang": markFunction( function( lang ) {
-			// lang value must be a valid identifider
-			if ( !ridentifier.test(lang || "") ) {
-				Sizzle.error( "unsupported lang: " + lang );
-			}
-			lang = lang.replace( runescape, funescape ).toLowerCase();
-			return function( elem ) {
-				var elemLang;
-				do {
-					if ( (elemLang = documentIsXML ?
-						elem.getAttribute("xml:lang") || elem.getAttribute("lang") :
-						elem.lang) ) {
-
-						elemLang = elemLang.toLowerCase();
-						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
-					}
-				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
-				return false;
-			};
-		}),
-
-		// Miscellaneous
-		"target": function( elem ) {
-			var hash = window.location && window.location.hash;
-			return hash && hash.slice( 1 ) === elem.id;
-		},
-
-		"root": function( elem ) {
-			return elem === docElem;
-		},
-
-		"focus": function( elem ) {
-			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
-		},
-
-		// Boolean properties
-		"enabled": function( elem ) {
-			return elem.disabled === false;
-		},
-
-		"disabled": function( elem ) {
-			return elem.disabled === true;
-		},
-
-		"checked": function( elem ) {
-			// In CSS3, :checked should return both checked and selected elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			var nodeName = elem.nodeName.toLowerCase();
-			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
-		},
-
-		"selected": function( elem ) {
-			// Accessing this property makes selected-by-default
-			// options in Safari work properly
-			if ( elem.parentNode ) {
-				elem.parentNode.selectedIndex;
-			}
-
-			return elem.selected === true;
-		},
-
-		// Contents
-		"empty": function( elem ) {
-			// http://www.w3.org/TR/selectors/#empty-pseudo
-			// :empty is only affected by element nodes and content nodes(including text(3), cdata(4)),
-			//   not comment, processing instructions, or others
-			// Thanks to Diego Perini for the nodeName shortcut
-			//   Greater than "@" means alpha characters (specifically not starting with "#" or "?")
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				if ( elem.nodeName > "@" || elem.nodeType === 3 || elem.nodeType === 4 ) {
-					return false;
-				}
-			}
-			return true;
-		},
-
-		"parent": function( elem ) {
-			return !Expr.pseudos["empty"]( elem );
-		},
-
-		// Element/input types
-		"header": function( elem ) {
-			return rheader.test( elem.nodeName );
-		},
-
-		"input": function( elem ) {
-			return rinputs.test( elem.nodeName );
-		},
-
-		"button": function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return name === "input" && elem.type === "button" || name === "button";
-		},
-
-		"text": function( elem ) {
-			var attr;
-			// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc)
-			// use getAttribute instead to test this case
-			return elem.nodeName.toLowerCase() === "input" &&
-				elem.type === "text" &&
-				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === elem.type );
-		},
-
-		// Position-in-collection
-		"first": createPositionalPseudo(function() {
-			return [ 0 ];
-		}),
-
-		"last": createPositionalPseudo(function( matchIndexes, length ) {
-			return [ length - 1 ];
-		}),
-
-		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			return [ argument < 0 ? argument + length : argument ];
-		}),
-
-		"even": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 0;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"odd": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 1;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; --i >= 0; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; ++i < length; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		})
-	}
-};
-
-// Add button/input type pseudos
-for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
-	Expr.pseudos[ i ] = createInputPseudo( i );
-}
-for ( i in { submit: true, reset: true } ) {
-	Expr.pseudos[ i ] = createButtonPseudo( i );
-}
-
-function tokenize( selector, parseOnly ) {
-	var matched, match, tokens, type,
-		soFar, groups, preFilters,
-		cached = tokenCache[ selector + " " ];
-
-	if ( cached ) {
-		return parseOnly ? 0 : cached.slice( 0 );
-	}
-
-	soFar = selector;
-	groups = [];
-	preFilters = Expr.preFilter;
-
-	while ( soFar ) {
-
-		// Comma and first run
-		if ( !matched || (match = rcomma.exec( soFar )) ) {
-			if ( match ) {
-				// Don't consume trailing commas as valid
-				soFar = soFar.slice( match[0].length ) || soFar;
-			}
-			groups.push( tokens = [] );
-		}
-
-		matched = false;
-
-		// Combinators
-		if ( (match = rcombinators.exec( soFar )) ) {
-			matched = match.shift();
-			tokens.push( {
-				value: matched,
-				// Cast descendant combinators to space
-				type: match[0].replace( rtrim, " " )
-			} );
-			soFar = soFar.slice( matched.length );
-		}
-
-		// Filters
-		for ( type in Expr.filter ) {
-			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
-				(match = preFilters[ type ]( match ))) ) {
-				matched = match.shift();
-				tokens.push( {
-					value: matched,
-					type: type,
-					matches: match
-				} );
-				soFar = soFar.slice( matched.length );
-			}
-		}
-
-		if ( !matched ) {
-			break;
-		}
-	}
-
-	// Return the length of the invalid excess
-	// if we're just parsing
-	// Otherwise, throw an error or return tokens
-	return parseOnly ?
-		soFar.length :
-		soFar ?
-			Sizzle.error( selector ) :
-			// Cache the tokens
-			tokenCache( selector, groups ).slice( 0 );
-}
-
-function toSelector( tokens ) {
-	var i = 0,
-		len = tokens.length,
-		selector = "";
-	for ( ; i < len; i++ ) {
-		selector += tokens[i].value;
-	}
-	return selector;
-}
-
-function addCombinator( matcher, combinator, base ) {
-	var dir = combinator.dir,
-		checkNonElements = base && combinator.dir === "parentNode",
-		doneName = done++;
-
-	return combinator.first ?
-		// Check against closest ancestor/preceding element
-		function( elem, context, xml ) {
-			while ( (elem = elem[ dir ]) ) {
-				if ( elem.nodeType === 1 || checkNonElements ) {
-					return matcher( elem, context, xml );
-				}
-			}
-		} :
-
-		// Check against all ancestor/preceding elements
-		function( elem, context, xml ) {
-			var data, cache, outerCache,
-				dirkey = dirruns + " " + doneName;
-
-			// We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
-			if ( xml ) {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						if ( matcher( elem, context, xml ) ) {
-							return true;
-						}
-					}
-				}
-			} else {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						outerCache = elem[ expando ] || (elem[ expando ] = {});
-						if ( (cache = outerCache[ dir ]) && cache[0] === dirkey ) {
-							if ( (data = cache[1]) === true || data === cachedruns ) {
-								return data === true;
-							}
-						} else {
-							cache = outerCache[ dir ] = [ dirkey ];
-							cache[1] = matcher( elem, context, xml ) || cachedruns;
-							if ( cache[1] === true ) {
-								return true;
-							}
-						}
-					}
-				}
-			}
-		};
-}
-
-function elementMatcher( matchers ) {
-	return matchers.length > 1 ?
-		function( elem, context, xml ) {
-			var i = matchers.length;
-			while ( i-- ) {
-				if ( !matchers[i]( elem, context, xml ) ) {
-					return false;
-				}
-			}
-			return true;
-		} :
-		matchers[0];
-}
-
-function condense( unmatched, map, filter, context, xml ) {
-	var elem,
-		newUnmatched = [],
-		i = 0,
-		len = unmatched.length,
-		mapped = map != null;
-
-	for ( ; i < len; i++ ) {
-		if ( (elem = unmatched[i]) ) {
-			if ( !filter || filter( elem, context, xml ) ) {
-				newUnmatched.push( elem );
-				if ( mapped ) {
-					map.push( i );
-				}
-			}
-		}
-	}
-
-	return newUnmatched;
-}
-
-function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
-	if ( postFilter && !postFilter[ expando ] ) {
-		postFilter = setMatcher( postFilter );
-	}
-	if ( postFinder && !postFinder[ expando ] ) {
-		postFinder = setMatcher( postFinder, postSelector );
-	}
-	return markFunction(function( seed, results, context, xml ) {
-		var temp, i, elem,
-			preMap = [],
-			postMap = [],
-			preexisting = results.length,
-
-			// Get initial elements from seed or context
-			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
-
-			// Prefilter to get matcher input, preserving a map for seed-results synchronization
-			matcherIn = preFilter && ( seed || !selector ) ?
-				condense( elems, preMap, preFilter, context, xml ) :
-				elems,
-
-			matcherOut = matcher ?
-				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
-				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
-
-					// ...intermediate processing is necessary
-					[] :
-
-					// ...otherwise use results directly
-					results :
-				matcherIn;
-
-		// Find primary matches
-		if ( matcher ) {
-			matcher( matcherIn, matcherOut, context, xml );
-		}
-
-		// Apply postFilter
-		if ( postFilter ) {
-			temp = condense( matcherOut, postMap );
-			postFilter( temp, [], context, xml );
-
-			// Un-match failing elements by moving them back to matcherIn
-			i = temp.length;
-			while ( i-- ) {
-				if ( (elem = temp[i]) ) {
-					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
-				}
-			}
-		}
-
-		if ( seed ) {
-			if ( postFinder || preFilter ) {
-				if ( postFinder ) {
-					// Get the final matcherOut by condensing this intermediate into postFinder contexts
-					temp = [];
-					i = matcherOut.length;
-					while ( i-- ) {
-						if ( (elem = matcherOut[i]) ) {
-							// Restore matcherIn since elem is not yet a final match
-							temp.push( (matcherIn[i] = elem) );
-						}
-					}
-					postFinder( null, (matcherOut = []), temp, xml );
-				}
-
-				// Move matched elements from seed to results to keep them synchronized
-				i = matcherOut.length;
-				while ( i-- ) {
-					if ( (elem = matcherOut[i]) &&
-						(temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) {
-
-						seed[temp] = !(results[temp] = elem);
-					}
-				}
-			}
-
-		// Add elements to results, through postFinder if defined
-		} else {
-			matcherOut = condense(
-				matcherOut === results ?
-					matcherOut.splice( preexisting, matcherOut.length ) :
-					matcherOut
-			);
-			if ( postFinder ) {
-				postFinder( null, results, matcherOut, xml );
-			} else {
-				push.apply( results, matcherOut );
-			}
-		}
-	});
-}
-
-function matcherFromTokens( tokens ) {
-	var checkContext, matcher, j,
-		len = tokens.length,
-		leadingRelative = Expr.relative[ tokens[0].type ],
-		implicitRelative = leadingRelative || Expr.relative[" "],
-		i = leadingRelative ? 1 : 0,
-
-		// The foundational matcher ensures that elements are reachable from top-level context(s)
-		matchContext = addCombinator( function( elem ) {
-			return elem === checkContext;
-		}, implicitRelative, true ),
-		matchAnyContext = addCombinator( function( elem ) {
-			return indexOf.call( checkContext, elem ) > -1;
-		}, implicitRelative, true ),
-		matchers = [ function( elem, context, xml ) {
-			return ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
-				(checkContext = context).nodeType ?
-					matchContext( elem, context, xml ) :
-					matchAnyContext( elem, context, xml ) );
-		} ];
-
-	for ( ; i < len; i++ ) {
-		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
-			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
-		} else {
-			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
-
-			// Return special upon seeing a positional matcher
-			if ( matcher[ expando ] ) {
-				// Find the next relative operator (if any) for proper handling
-				j = ++i;
-				for ( ; j < len; j++ ) {
-					if ( Expr.relative[ tokens[j].type ] ) {
-						break;
-					}
-				}
-				return setMatcher(
-					i > 1 && elementMatcher( matchers ),
-					i > 1 && toSelector( tokens.slice( 0, i - 1 ) ).replace( rtrim, "$1" ),
-					matcher,
-					i < j && matcherFromTokens( tokens.slice( i, j ) ),
-					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
-					j < len && toSelector( tokens )
-				);
-			}
-			matchers.push( matcher );
-		}
-	}
-
-	return elementMatcher( matchers );
-}
-
-function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
-	// A counter to specify which element is currently being matched
-	var matcherCachedRuns = 0,
-		bySet = setMatchers.length > 0,
-		byElement = elementMatchers.length > 0,
-		superMatcher = function( seed, context, xml, results, expandContext ) {
-			var elem, j, matcher,
-				setMatched = [],
-				matchedCount = 0,
-				i = "0",
-				unmatched = seed && [],
-				outermost = expandContext != null,
-				contextBackup = outermostContext,
-				// We must always have either seed elements or context
-				elems = seed || byElement && Expr.find["TAG"]( "*", expandContext && context.parentNode || context ),
-				// Nested matchers should use non-integer dirruns
-				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.E);
-
-			if ( outermost ) {
-				outermostContext = context !== document && context;
-				cachedruns = matcherCachedRuns;
-			}
-
-			// Add elements passing elementMatchers directly to results
-			for ( ; (elem = elems[i]) != null; i++ ) {
-				if ( byElement && elem ) {
-					for ( j = 0; (matcher = elementMatchers[j]); j++ ) {
-						if ( matcher( elem, context, xml ) ) {
-							results.push( elem );
-							break;
-						}
-					}
-					if ( outermost ) {
-						dirruns = dirrunsUnique;
-						cachedruns = ++matcherCachedRuns;
-					}
-				}
-
-				// Track unmatched elements for set filters
-				if ( bySet ) {
-					// They will have gone through all possible matchers
-					if ( (elem = !matcher && elem) ) {
-						matchedCount--;
-					}
-
-					// Lengthen the array for every element, matched or not
-					if ( seed ) {
-						unmatched.push( elem );
-					}
-				}
-			}
-
-			// Apply set filters to unmatched elements
-			// `i` starts as a string, so matchedCount would equal "00" if there are no elements
-			matchedCount += i;
-			if ( bySet && i !== matchedCount ) {
-				for ( j = 0; (matcher = setMatchers[j]); j++ ) {
-					matcher( unmatched, setMatched, context, xml );
-				}
-
-				if ( seed ) {
-					// Reintegrate element matches to eliminate the need for sorting
-					if ( matchedCount > 0 ) {
-						while ( i-- ) {
-							if ( !(unmatched[i] || setMatched[i]) ) {
-								setMatched[i] = pop.call( results );
-							}
-						}
-					}
-
-					// Discard index placeholder values to get only actual matches
-					setMatched = condense( setMatched );
-				}
-
-				// Add matches to results
-				push.apply( results, setMatched );
-
-				// Seedless set matches succeeding multiple successful matchers stipulate sorting
-				if ( outermost && !seed && setMatched.length > 0 &&
-					( matchedCount + setMatchers.length ) > 1 ) {
-
-					Sizzle.uniqueSort( results );
-				}
-			}
-
-			// Override manipulation of globals by nested matchers
-			if ( outermost ) {
-				dirruns = dirrunsUnique;
-				outermostContext = contextBackup;
-			}
-
-			return unmatched;
-		};
-
-	return bySet ?
-		markFunction( superMatcher ) :
-		superMatcher;
-}
-
-compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) {
-	var i,
-		setMatchers = [],
-		elementMatchers = [],
-		cached = compilerCache[ selector + " " ];
-
-	if ( !cached ) {
-		// Generate a function of recursive functions that can be used to check each element
-		if ( !group ) {
-			group = tokenize( selector );
-		}
-		i = group.length;
-		while ( i-- ) {
-			cached = matcherFromTokens( group[i] );
-			if ( cached[ expando ] ) {
-				setMatchers.push( cached );
-			} else {
-				elementMatchers.push( cached );
-			}
-		}
-
-		// Cache the compiled function
-		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
-	}
-	return cached;
-};
-
-function multipleContexts( selector, contexts, results ) {
-	var i = 0,
-		len = contexts.length;
-	for ( ; i < len; i++ ) {
-		Sizzle( selector, contexts[i], results );
-	}
-	return results;
-}
-
-function select( selector, context, results, seed ) {
-	var i, tokens, token, type, find,
-		match = tokenize( selector );
-
-	if ( !seed ) {
-		// Try to minimize operations if there is only one group
-		if ( match.length === 1 ) {
-
-			// Take a shortcut and set the context if the root selector is an ID
-			tokens = match[0] = match[0].slice( 0 );
-			if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
-					context.nodeType === 9 && !documentIsXML &&
-					Expr.relative[ tokens[1].type ] ) {
-
-				context = Expr.find["ID"]( token.matches[0].replace( runescape, funescape ), context )[0];
-				if ( !context ) {
-					return results;
-				}
-
-				selector = selector.slice( tokens.shift().value.length );
-			}
-
-			// Fetch a seed set for right-to-left matching
-			for ( i = matchExpr["needsContext"].test( selector ) ? -1 : tokens.length - 1; i >= 0; i-- ) {
-				token = tokens[i];
-
-				// Abort if we hit a combinator
-				if ( Expr.relative[ (type = token.type) ] ) {
-					break;
-				}
-				if ( (find = Expr.find[ type ]) ) {
-					// Search, expanding context for leading sibling combinators
-					if ( (seed = find(
-						token.matches[0].replace( runescape, funescape ),
-						rsibling.test( tokens[0].type ) && context.parentNode || context
-					)) ) {
-
-						// If seed is empty or no tokens remain, we can return early
-						tokens.splice( i, 1 );
-						selector = seed.length && toSelector( tokens );
-						if ( !selector ) {
-							push.apply( results, slice.call( seed, 0 ) );
-							return results;
-						}
-
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	// Compile and execute a filtering function
-	// Provide `match` to avoid retokenization if we modified the selector above
-	compile( selector, match )(
-		seed,
-		context,
-		documentIsXML,
-		results,
-		rsibling.test( selector )
-	);
-	return results;
-}
-
-// Deprecated
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
-
-// Easy API for creating new setFilters
-function setFilters() {}
-Expr.filters = setFilters.prototype = Expr.pseudos;
-Expr.setFilters = new setFilters();
-
-// Initialize with the default document
-setDocument();
-
-// Override sizzle attribute retrieval
-Sizzle.attr = jQuery.attr;
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.pseudos;
-jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-
-
-})( window );
-var runtil = /Until$/,
-	rparentsprev = /^(?:parents|prev(?:Until|All))/,
-	isSimple = /^.[^:#\[\.,]*$/,
-	rneedsContext = jQuery.expr.match.needsContext,
-	// methods guaranteed to produce a unique set when starting from a unique set
-	guaranteedUnique = {
-		children: true,
-		contents: true,
-		next: true,
-		prev: true
-	};
-
-jQuery.fn.extend({
-	find: function( selector ) {
-		var i, ret, self;
-
-		if ( typeof selector !== "string" ) {
-			self = this;
-			return this.pushStack( jQuery( selector ).filter(function() {
-				for ( i = 0; i < self.length; i++ ) {
-					if ( jQuery.contains( self[ i ], this ) ) {
-						return true;
-					}
-				}
-			}) );
-		}
-
-		ret = [];
-		for ( i = 0; i < this.length; i++ ) {
-			jQuery.find( selector, this[ i ], ret );
-		}
-
-		// Needed because $( selector, context ) becomes $( context ).find( selector )
-		ret = this.pushStack( jQuery.unique( ret ) );
-		ret.selector = ( this.selector ? this.selector + " " : "" ) + selector;
-		return ret;
-	},
-
-	has: function( target ) {
-		var i,
-			targets = jQuery( target, this ),
-			len = targets.length;
-
-		return this.filter(function() {
-			for ( i = 0; i < len; i++ ) {
-				if ( jQuery.contains( this, targets[i] ) ) {
-					return true;
-				}
-			}
-		});
-	},
-
-	not: function( selector ) {
-		return this.pushStack( winnow(this, selector, false) );
-	},
-
-	filter: function( selector ) {
-		return this.pushStack( winnow(this, selector, true) );
-	},
-
-	is: function( selector ) {
-		return !!selector && (
-			typeof selector === "string" ?
-				// If this is a positional/relative selector, check membership in the returned set
-				// so $("p:first").is("p:last") won't return true for a doc with two "p".
-				rneedsContext.test( selector ) ?
-					jQuery( selector, this.context ).index( this[0] ) >= 0 :
-					jQuery.filter( selector, this ).length > 0 :
-				this.filter( selector ).length > 0 );
-	},
-
-	closest: function( selectors, context ) {
-		var cur,
-			i = 0,
-			l = this.length,
-			ret = [],
-			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
-				jQuery( selectors, context || this.context ) :
-				0;
-
-		for ( ; i < l; i++ ) {
-			cur = this[i];
-
-			while ( cur && cur.ownerDocument && cur !== context && cur.nodeType !== 11 ) {
-				if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {
-					ret.push( cur );
-					break;
-				}
-				cur = cur.parentNode;
-			}
-		}
-
-		return this.pushStack( ret.length > 1 ? jQuery.unique( ret ) : ret );
-	},
-
-	// Determine the position of an element within
-	// the matched set of elements
-	index: function( elem ) {
-
-		// No argument, return index in parent
-		if ( !elem ) {
-			return ( this[0] && this[0].parentNode ) ? this.first().prevAll().length : -1;
-		}
-
-		// index in selector
-		if ( typeof elem === "string" ) {
-			return jQuery.inArray( this[0], jQuery( elem ) );
-		}
-
-		// Locate the position of the desired element
-		return jQuery.inArray(
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[0] : elem, this );
-	},
-
-	add: function( selector, context ) {
-		var set = typeof selector === "string" ?
-				jQuery( selector, context ) :
-				jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ),
-			all = jQuery.merge( this.get(), set );
-
-		return this.pushStack( jQuery.unique(all) );
-	},
-
-	addBack: function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter(selector)
-		);
-	}
-});
-
-jQuery.fn.andSelf = jQuery.fn.addBack;
-
-function sibling( cur, dir ) {
-	do {
-		cur = cur[ dir ];
-	} while ( cur && cur.nodeType !== 1 );
-
-	return cur;
-}
-
-jQuery.each({
-	parent: function( elem ) {
-		var parent = elem.parentNode;
-		return parent && parent.nodeType !== 11 ? parent : null;
-	},
-	parents: function( elem ) {
-		return jQuery.dir( elem, "parentNode" );
-	},
-	parentsUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "parentNode", until );
-	},
-	next: function( elem ) {
-		return sibling( elem, "nextSibling" );
-	},
-	prev: function( elem ) {
-		return sibling( elem, "previousSibling" );
-	},
-	nextAll: function( elem ) {
-		return jQuery.dir( elem, "nextSibling" );
-	},
-	prevAll: function( elem ) {
-		return jQuery.dir( elem, "previousSibling" );
-	},
-	nextUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "nextSibling", until );
-	},
-	prevUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "previousSibling", until );
-	},
-	siblings: function( elem ) {
-		return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
-	},
-	children: function( elem ) {
-		return jQuery.sibling( elem.firstChild );
-	},
-	contents: function( elem ) {
-		return jQuery.nodeName( elem, "iframe" ) ?
-			elem.contentDocument || elem.contentWindow.document :
-			jQuery.merge( [], elem.childNodes );
-	}
-}, function( name, fn ) {
-	jQuery.fn[ name ] = function( until, selector ) {
-		var ret = jQuery.map( this, fn, until );
-
-		if ( !runtil.test( name ) ) {
-			selector = until;
-		}
-
-		if ( selector && typeof selector === "string" ) {
-			ret = jQuery.filter( selector, ret );
-		}
-
-		ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret;
-
-		if ( this.length > 1 && rparentsprev.test( name ) ) {
-			ret = ret.reverse();
-		}
-
-		return this.pushStack( ret );
-	};
-});
-
-jQuery.extend({
-	filter: function( expr, elems, not ) {
-		if ( not ) {
-			expr = ":not(" + expr + ")";
-		}
-
-		return elems.length === 1 ?
-			jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
-			jQuery.find.matches(expr, elems);
-	},
-
-	dir: function( elem, dir, until ) {
-		var matched = [],
-			cur = elem[ dir ];
-
-		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
-			if ( cur.nodeType === 1 ) {
-				matched.push( cur );
-			}
-			cur = cur[dir];
-		}
-		return matched;
-	},
-
-	sibling: function( n, elem ) {
-		var r = [];
-
-		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType === 1 && n !== elem ) {
-				r.push( n );
-			}
-		}
-
-		return r;
-	}
-});
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, keep ) {
-
-	// Can't pass null or undefined to indexOf in Firefox 4
-	// Set to 0 to skip string check
-	qualifier = qualifier || 0;
-
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep(elements, function( elem, i ) {
-			var retVal = !!qualifier.call( elem, i, elem );
-			return retVal === keep;
-		});
-
-	} else if ( qualifier.nodeType ) {
-		return jQuery.grep(elements, function( elem ) {
-			return ( elem === qualifier ) === keep;
-		});
-
-	} else if ( typeof qualifier === "string" ) {
-		var filtered = jQuery.grep(elements, function( elem ) {
-			return elem.nodeType === 1;
-		});
-
-		if ( isSimple.test( qualifier ) ) {
-			return jQuery.filter(qualifier, filtered, !keep);
-		} else {
-			qualifier = jQuery.filter( qualifier, filtered );
-		}
-	}
-
-	return jQuery.grep(elements, function( elem ) {
-		return ( jQuery.inArray( elem, qualifier ) >= 0 ) === keep;
-	});
-}
-function createSafeFragment( document ) {
-	var list = nodeNames.split( "|" ),
-		safeFrag = document.createDocumentFragment();
-
-	if ( safeFrag.createElement ) {
-		while ( list.length ) {
-			safeFrag.createElement(
-				list.pop()
-			);
-		}
-	}
-	return safeFrag;
-}
-
-var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" +
-		"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
-	rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
-	rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
-	rleadingWhitespace = /^\s+/,
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
-	rtagName = /<([\w:]+)/,
-	rtbody = /\s*$/g,
-
-	// We have to close these tags to support XHTML (#13200)
-	wrapMap = {
-		option: [ 1, "" ],
-		legend: [ 1, "
    ", "
    " ],
-		area: [ 1, "", "" ],
-		param: [ 1, "", "" ],
-		thead: [ 1, "", "
    " ],
-		tr: [ 2, "", "
    " ],
-		col: [ 2, "", "
    " ],
-		td: [ 3, "", "
    " ],
-
-		// IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags,
-		// unless wrapped in a div with non-breaking characters in front of it.
-		_default: jQuery.support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X
    ", "
    "  ]
-	},
-	safeFragment = createSafeFragment( document ),
-	fragmentDiv = safeFragment.appendChild( document.createElement("div") );
-
-wrapMap.optgroup = wrapMap.option;
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-jQuery.fn.extend({
-	text: function( value ) {
-		return jQuery.access( this, function( value ) {
-			return value === undefined ?
-				jQuery.text( this ) :
-				this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) );
-		}, null, value, arguments.length );
-	},
-
-	wrapAll: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapAll( html.call(this, i) );
-			});
-		}
-
-		if ( this[0] ) {
-			// The elements to wrap the target around
-			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
-
-			if ( this[0].parentNode ) {
-				wrap.insertBefore( this[0] );
-			}
-
-			wrap.map(function() {
-				var elem = this;
-
-				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
-					elem = elem.firstChild;
-				}
-
-				return elem;
-			}).append( this );
-		}
-
-		return this;
-	},
-
-	wrapInner: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapInner( html.call(this, i) );
-			});
-		}
-
-		return this.each(function() {
-			var self = jQuery( this ),
-				contents = self.contents();
-
-			if ( contents.length ) {
-				contents.wrapAll( html );
-
-			} else {
-				self.append( html );
-			}
-		});
-	},
-
-	wrap: function( html ) {
-		var isFunction = jQuery.isFunction( html );
-
-		return this.each(function(i) {
-			jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
-		});
-	},
-
-	unwrap: function() {
-		return this.parent().each(function() {
-			if ( !jQuery.nodeName( this, "body" ) ) {
-				jQuery( this ).replaceWith( this.childNodes );
-			}
-		}).end();
-	},
-
-	append: function() {
-		return this.domManip(arguments, true, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				this.appendChild( elem );
-			}
-		});
-	},
-
-	prepend: function() {
-		return this.domManip(arguments, true, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				this.insertBefore( elem, this.firstChild );
-			}
-		});
-	},
-
-	before: function() {
-		return this.domManip( arguments, false, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this );
-			}
-		});
-	},
-
-	after: function() {
-		return this.domManip( arguments, false, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			}
-		});
-	},
-
-	// keepData is for internal use only--do not document
-	remove: function( selector, keepData ) {
-		var elem,
-			i = 0;
-
-		for ( ; (elem = this[i]) != null; i++ ) {
-			if ( !selector || jQuery.filter( selector, [ elem ] ).length > 0 ) {
-				if ( !keepData && elem.nodeType === 1 ) {
-					jQuery.cleanData( getAll( elem ) );
-				}
-
-				if ( elem.parentNode ) {
-					if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) {
-						setGlobalEval( getAll( elem, "script" ) );
-					}
-					elem.parentNode.removeChild( elem );
-				}
-			}
-		}
-
-		return this;
-	},
-
-	empty: function() {
-		var elem,
-			i = 0;
-
-		for ( ; (elem = this[i]) != null; i++ ) {
-			// Remove element nodes and prevent memory leaks
-			if ( elem.nodeType === 1 ) {
-				jQuery.cleanData( getAll( elem, false ) );
-			}
-
-			// Remove any remaining nodes
-			while ( elem.firstChild ) {
-				elem.removeChild( elem.firstChild );
-			}
-
-			// If this is a select, ensure that it displays empty (#12336)
-			// Support: IE<9
-			if ( elem.options && jQuery.nodeName( elem, "select" ) ) {
-				elem.options.length = 0;
-			}
-		}
-
-		return this;
-	},
-
-	clone: function( dataAndEvents, deepDataAndEvents ) {
-		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
-
-		return this.map( function () {
-			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
-		});
-	},
-
-	html: function( value ) {
-		return jQuery.access( this, function( value ) {
-			var elem = this[0] || {},
-				i = 0,
-				l = this.length;
-
-			if ( value === undefined ) {
-				return elem.nodeType === 1 ?
-					elem.innerHTML.replace( rinlinejQuery, "" ) :
-					undefined;
-			}
-
-			// See if we can take a shortcut and just use innerHTML
-			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
-				( jQuery.support.htmlSerialize || !rnoshimcache.test( value )  ) &&
-				( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
-				!wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) {
-
-				value = value.replace( rxhtmlTag, "<$1>" );
-
-				try {
-					for (; i < l; i++ ) {
-						// Remove element nodes and prevent memory leaks
-						elem = this[i] || {};
-						if ( elem.nodeType === 1 ) {
-							jQuery.cleanData( getAll( elem, false ) );
-							elem.innerHTML = value;
-						}
-					}
-
-					elem = 0;
-
-				// If using innerHTML throws an exception, use the fallback method
-				} catch(e) {}
-			}
-
-			if ( elem ) {
-				this.empty().append( value );
-			}
-		}, null, value, arguments.length );
-	},
-
-	replaceWith: function( value ) {
-		var isFunc = jQuery.isFunction( value );
-
-		// Make sure that the elements are removed from the DOM before they are inserted
-		// this can help fix replacing a parent with child elements
-		if ( !isFunc && typeof value !== "string" ) {
-			value = jQuery( value ).not( this ).detach();
-		}
-
-		return this.domManip( [ value ], true, function( elem ) {
-			var next = this.nextSibling,
-				parent = this.parentNode;
-
-			if ( parent && this.nodeType === 1 || this.nodeType === 11 ) {
-
-				jQuery( this ).remove();
-
-				if ( next ) {
-					next.parentNode.insertBefore( elem, next );
-				} else {
-					parent.appendChild( elem );
-				}
-			}
-		});
-	},
-
-	detach: function( selector ) {
-		return this.remove( selector, true );
-	},
-
-	domManip: function( args, table, callback ) {
-
-		// Flatten any nested arrays
-		args = core_concat.apply( [], args );
-
-		var fragment, first, scripts, hasScripts, node, doc,
-			i = 0,
-			l = this.length,
-			set = this,
-			iNoClone = l - 1,
-			value = args[0],
-			isFunction = jQuery.isFunction( value );
-
-		// We can't cloneNode fragments that contain checked, in WebKit
-		if ( isFunction || !( l <= 1 || typeof value !== "string" || jQuery.support.checkClone || !rchecked.test( value ) ) ) {
-			return this.each(function( index ) {
-				var self = set.eq( index );
-				if ( isFunction ) {
-					args[0] = value.call( this, index, table ? self.html() : undefined );
-				}
-				self.domManip( args, table, callback );
-			});
-		}
-
-		if ( l ) {
-			fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, this );
-			first = fragment.firstChild;
-
-			if ( fragment.childNodes.length === 1 ) {
-				fragment = first;
-			}
-
-			if ( first ) {
-				table = table && jQuery.nodeName( first, "tr" );
-				scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
-				hasScripts = scripts.length;
-
-				// Use the original fragment for the last item instead of the first because it can end up
-				// being emptied incorrectly in certain situations (#8070).
-				for ( ; i < l; i++ ) {
-					node = fragment;
-
-					if ( i !== iNoClone ) {
-						node = jQuery.clone( node, true, true );
-
-						// Keep references to cloned scripts for later restoration
-						if ( hasScripts ) {
-							jQuery.merge( scripts, getAll( node, "script" ) );
-						}
-					}
-
-					callback.call(
-						table && jQuery.nodeName( this[i], "table" ) ?
-							findOrAppend( this[i], "tbody" ) :
-							this[i],
-						node,
-						i
-					);
-				}
-
-				if ( hasScripts ) {
-					doc = scripts[ scripts.length - 1 ].ownerDocument;
-
-					// Reenable scripts
-					jQuery.map( scripts, restoreScript );
-
-					// Evaluate executable scripts on first document insertion
-					for ( i = 0; i < hasScripts; i++ ) {
-						node = scripts[ i ];
-						if ( rscriptType.test( node.type || "" ) &&
-							!jQuery._data( node, "globalEval" ) && jQuery.contains( doc, node ) ) {
-
-							if ( node.src ) {
-								// Hope ajax is available...
-								jQuery.ajax({
-									url: node.src,
-									type: "GET",
-									dataType: "script",
-									async: false,
-									global: false,
-									"throws": true
-								});
-							} else {
-								jQuery.globalEval( ( node.text || node.textContent || node.innerHTML || "" ).replace( rcleanScript, "" ) );
-							}
-						}
-					}
-				}
-
-				// Fix #11809: Avoid leaking memory
-				fragment = first = null;
-			}
-		}
-
-		return this;
-	}
-});
-
-function findOrAppend( elem, tag ) {
-	return elem.getElementsByTagName( tag )[0] || elem.appendChild( elem.ownerDocument.createElement( tag ) );
-}
-
-// Replace/restore the type attribute of script elements for safe DOM manipulation
-function disableScript( elem ) {
-	var attr = elem.getAttributeNode("type");
-	elem.type = ( attr && attr.specified ) + "/" + elem.type;
-	return elem;
-}
-function restoreScript( elem ) {
-	var match = rscriptTypeMasked.exec( elem.type );
-	if ( match ) {
-		elem.type = match[1];
-	} else {
-		elem.removeAttribute("type");
-	}
-	return elem;
-}
-
-// Mark scripts as having already been evaluated
-function setGlobalEval( elems, refElements ) {
-	var elem,
-		i = 0;
-	for ( ; (elem = elems[i]) != null; i++ ) {
-		jQuery._data( elem, "globalEval", !refElements || jQuery._data( refElements[i], "globalEval" ) );
-	}
-}
-
-function cloneCopyEvent( src, dest ) {
-
-	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
-		return;
-	}
-
-	var type, i, l,
-		oldData = jQuery._data( src ),
-		curData = jQuery._data( dest, oldData ),
-		events = oldData.events;
-
-	if ( events ) {
-		delete curData.handle;
-		curData.events = {};
-
-		for ( type in events ) {
-			for ( i = 0, l = events[ type ].length; i < l; i++ ) {
-				jQuery.event.add( dest, type, events[ type ][ i ] );
-			}
-		}
-	}
-
-	// make the cloned public data object a copy from the original
-	if ( curData.data ) {
-		curData.data = jQuery.extend( {}, curData.data );
-	}
-}
-
-function fixCloneNodeIssues( src, dest ) {
-	var nodeName, data, e;
-
-	// We do not need to do anything for non-Elements
-	if ( dest.nodeType !== 1 ) {
-		return;
-	}
-
-	nodeName = dest.nodeName.toLowerCase();
-
-	// IE6-8 copies events bound via attachEvent when using cloneNode.
-	if ( !jQuery.support.noCloneEvent && dest[ jQuery.expando ] ) {
-		data = jQuery._data( dest );
-
-		for ( e in data.events ) {
-			jQuery.removeEvent( dest, e, data.handle );
-		}
-
-		// Event data gets referenced instead of copied if the expando gets copied too
-		dest.removeAttribute( jQuery.expando );
-	}
-
-	// IE blanks contents when cloning scripts, and tries to evaluate newly-set text
-	if ( nodeName === "script" && dest.text !== src.text ) {
-		disableScript( dest ).text = src.text;
-		restoreScript( dest );
-
-	// IE6-10 improperly clones children of object elements using classid.
-	// IE10 throws NoModificationAllowedError if parent is null, #12132.
-	} else if ( nodeName === "object" ) {
-		if ( dest.parentNode ) {
-			dest.outerHTML = src.outerHTML;
-		}
-
-		// This path appears unavoidable for IE9. When cloning an object
-		// element in IE9, the outerHTML strategy above is not sufficient.
-		// If the src has innerHTML and the destination does not,
-		// copy the src.innerHTML into the dest.innerHTML. #10324
-		if ( jQuery.support.html5Clone && ( src.innerHTML && !jQuery.trim(dest.innerHTML) ) ) {
-			dest.innerHTML = src.innerHTML;
-		}
-
-	} else if ( nodeName === "input" && manipulation_rcheckableType.test( src.type ) ) {
-		// IE6-8 fails to persist the checked state of a cloned checkbox
-		// or radio button. Worse, IE6-7 fail to give the cloned element
-		// a checked appearance if the defaultChecked value isn't also set
-
-		dest.defaultChecked = dest.checked = src.checked;
-
-		// IE6-7 get confused and end up setting the value of a cloned
-		// checkbox/radio button to an empty string instead of "on"
-		if ( dest.value !== src.value ) {
-			dest.value = src.value;
-		}
-
-	// IE6-8 fails to return the selected option to the default selected
-	// state when cloning options
-	} else if ( nodeName === "option" ) {
-		dest.defaultSelected = dest.selected = src.defaultSelected;
-
-	// IE6-8 fails to set the defaultValue to the correct value when
-	// cloning other types of input fields
-	} else if ( nodeName === "input" || nodeName === "textarea" ) {
-		dest.defaultValue = src.defaultValue;
-	}
-}
-
-jQuery.each({
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var elems,
-			i = 0,
-			ret = [],
-			insert = jQuery( selector ),
-			last = insert.length - 1;
-
-		for ( ; i <= last; i++ ) {
-			elems = i === last ? this : this.clone(true);
-			jQuery( insert[i] )[ original ]( elems );
-
-			// Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get()
-			core_push.apply( ret, elems.get() );
-		}
-
-		return this.pushStack( ret );
-	};
-});
-
-function getAll( context, tag ) {
-	var elems, elem,
-		i = 0,
-		found = typeof context.getElementsByTagName !== "undefined" ? context.getElementsByTagName( tag || "*" ) :
-			typeof context.querySelectorAll !== "undefined" ? context.querySelectorAll( tag || "*" ) :
-			undefined;
-
-	if ( !found ) {
-		for ( found = [], elems = context.childNodes || context; (elem = elems[i]) != null; i++ ) {
-			if ( !tag || jQuery.nodeName( elem, tag ) ) {
-				found.push( elem );
-			} else {
-				jQuery.merge( found, getAll( elem, tag ) );
-			}
-		}
-	}
-
-	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
-		jQuery.merge( [ context ], found ) :
-		found;
-}
-
-// Used in buildFragment, fixes the defaultChecked property
-function fixDefaultChecked( elem ) {
-	if ( manipulation_rcheckableType.test( elem.type ) ) {
-		elem.defaultChecked = elem.checked;
-	}
-}
-
-jQuery.extend({
-	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
-		var destElements, srcElements, node, i, clone,
-			inPage = jQuery.contains( elem.ownerDocument, elem );
-
-		if ( jQuery.support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) {
-			clone = elem.cloneNode( true );
-
-		// IE<=8 does not properly clone detached, unknown element nodes
-		} else {
-			fragmentDiv.innerHTML = elem.outerHTML;
-			fragmentDiv.removeChild( clone = fragmentDiv.firstChild );
-		}
-
-		if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
-				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
-
-			// We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
-			destElements = getAll( clone );
-			srcElements = getAll( elem );
-
-			// Fix all IE cloning issues
-			for ( i = 0; (node = srcElements[i]) != null; ++i ) {
-				// Ensure that the destination node is not null; Fixes #9587
-				if ( destElements[i] ) {
-					fixCloneNodeIssues( node, destElements[i] );
-				}
-			}
-		}
-
-		// Copy the events from the original to the clone
-		if ( dataAndEvents ) {
-			if ( deepDataAndEvents ) {
-				srcElements = srcElements || getAll( elem );
-				destElements = destElements || getAll( clone );
-
-				for ( i = 0; (node = srcElements[i]) != null; i++ ) {
-					cloneCopyEvent( node, destElements[i] );
-				}
-			} else {
-				cloneCopyEvent( elem, clone );
-			}
-		}
-
-		// Preserve script evaluation history
-		destElements = getAll( clone, "script" );
-		if ( destElements.length > 0 ) {
-			setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
-		}
-
-		destElements = srcElements = node = null;
-
-		// Return the cloned set
-		return clone;
-	},
-
-	buildFragment: function( elems, context, scripts, selection ) {
-		var contains, elem, tag, tmp, wrap, tbody, j,
-			l = elems.length,
-
-			// Ensure a safe fragment
-			safe = createSafeFragment( context ),
-
-			nodes = [],
-			i = 0;
-
-		for ( ; i < l; i++ ) {
-			elem = elems[ i ];
-
-			if ( elem || elem === 0 ) {
-
-				// Add nodes directly
-				if ( jQuery.type( elem ) === "object" ) {
-					jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
-
-				// Convert non-html into a text node
-				} else if ( !rhtml.test( elem ) ) {
-					nodes.push( context.createTextNode( elem ) );
-
-				// Convert html into DOM nodes
-				} else {
-					tmp = tmp || safe.appendChild( context.createElement("div") );
-
-					// Deserialize a standard representation
-					tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase();
-					wrap = wrapMap[ tag ] || wrapMap._default;
-
-					tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1>" ) + wrap[2];
-
-					// Descend through wrappers to the right content
-					j = wrap[0];
-					while ( j-- ) {
-						tmp = tmp.lastChild;
-					}
-
-					// Manually add leading whitespace removed by IE
-					if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
-						nodes.push( context.createTextNode( rleadingWhitespace.exec( elem )[0] ) );
-					}
-
-					// Remove IE's autoinserted  from table fragments
-					if ( !jQuery.support.tbody ) {
-
-						// String was a , *may* have spurious 
-						elem = tag === "table" && !rtbody.test( elem ) ?
-							tmp.firstChild :
-
-							// String was a bare  or 
-							wrap[1] === "
    " && !rtbody.test( elem ) ?
-								tmp :
-								0;
-
-						j = elem && elem.childNodes.length;
-						while ( j-- ) {
-							if ( jQuery.nodeName( (tbody = elem.childNodes[j]), "tbody" ) && !tbody.childNodes.length ) {
-								elem.removeChild( tbody );
-							}
-						}
-					}
-
-					jQuery.merge( nodes, tmp.childNodes );
-
-					// Fix #12392 for WebKit and IE > 9
-					tmp.textContent = "";
-
-					// Fix #12392 for oldIE
-					while ( tmp.firstChild ) {
-						tmp.removeChild( tmp.firstChild );
-					}
-
-					// Remember the top-level container for proper cleanup
-					tmp = safe.lastChild;
-				}
-			}
-		}
-
-		// Fix #11356: Clear elements from fragment
-		if ( tmp ) {
-			safe.removeChild( tmp );
-		}
-
-		// Reset defaultChecked for any radios and checkboxes
-		// about to be appended to the DOM in IE 6/7 (#8060)
-		if ( !jQuery.support.appendChecked ) {
-			jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked );
-		}
-
-		i = 0;
-		while ( (elem = nodes[ i++ ]) ) {
-
-			// #4087 - If origin and destination elements are the same, and this is
-			// that element, do not do anything
-			if ( selection && jQuery.inArray( elem, selection ) !== -1 ) {
-				continue;
-			}
-
-			contains = jQuery.contains( elem.ownerDocument, elem );
-
-			// Append to fragment
-			tmp = getAll( safe.appendChild( elem ), "script" );
-
-			// Preserve script evaluation history
-			if ( contains ) {
-				setGlobalEval( tmp );
-			}
-
-			// Capture executables
-			if ( scripts ) {
-				j = 0;
-				while ( (elem = tmp[ j++ ]) ) {
-					if ( rscriptType.test( elem.type || "" ) ) {
-						scripts.push( elem );
-					}
-				}
-			}
-		}
-
-		tmp = null;
-
-		return safe;
-	},
-
-	cleanData: function( elems, /* internal */ acceptData ) {
-		var data, id, elem, type,
-			i = 0,
-			internalKey = jQuery.expando,
-			cache = jQuery.cache,
-			deleteExpando = jQuery.support.deleteExpando,
-			special = jQuery.event.special;
-
-		for ( ; (elem = elems[i]) != null; i++ ) {
-
-			if ( acceptData || jQuery.acceptData( elem ) ) {
-
-				id = elem[ internalKey ];
-				data = id && cache[ id ];
-
-				if ( data ) {
-					if ( data.events ) {
-						for ( type in data.events ) {
-							if ( special[ type ] ) {
-								jQuery.event.remove( elem, type );
-
-							// This is a shortcut to avoid jQuery.event.remove's overhead
-							} else {
-								jQuery.removeEvent( elem, type, data.handle );
-							}
-						}
-					}
-
-					// Remove cache only if it was not already removed by jQuery.event.remove
-					if ( cache[ id ] ) {
-
-						delete cache[ id ];
-
-						// IE does not allow us to delete expando properties from nodes,
-						// nor does it have a removeAttribute function on Document nodes;
-						// we must handle all of these cases
-						if ( deleteExpando ) {
-							delete elem[ internalKey ];
-
-						} else if ( typeof elem.removeAttribute !== "undefined" ) {
-							elem.removeAttribute( internalKey );
-
-						} else {
-							elem[ internalKey ] = null;
-						}
-
-						core_deletedIds.push( id );
-					}
-				}
-			}
-		}
-	}
-});
-var curCSS, getStyles, iframe,
-	ralpha = /alpha\([^)]*\)/i,
-	ropacity = /opacity\s*=\s*([^)]*)/,
-	rposition = /^(top|right|bottom|left)$/,
-	// swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
-	// see here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
-	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
-	rmargin = /^margin/,
-	rnumsplit = new RegExp( "^(" + core_pnum + ")(.*)$", "i" ),
-	rnumnonpx = new RegExp( "^(" + core_pnum + ")(?!px)[a-z%]+$", "i" ),
-	rrelNum = new RegExp( "^([+-])=(" + core_pnum + ")", "i" ),
-	elemdisplay = { BODY: "block" },
-
-	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
-	cssNormalTransform = {
-		letterSpacing: 0,
-		fontWeight: 400
-	},
-
-	cssExpand = [ "Top", "Right", "Bottom", "Left" ],
-	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ];
-
-// return a css property mapped to a potentially vendor prefixed property
-function vendorPropName( style, name ) {
-
-	// shortcut for names that are not vendor prefixed
-	if ( name in style ) {
-		return name;
-	}
-
-	// check for vendor prefixed names
-	var capName = name.charAt(0).toUpperCase() + name.slice(1),
-		origName = name,
-		i = cssPrefixes.length;
-
-	while ( i-- ) {
-		name = cssPrefixes[ i ] + capName;
-		if ( name in style ) {
-			return name;
-		}
-	}
-
-	return origName;
-}
-
-function isHidden( elem, el ) {
-	// isHidden might be called from jQuery#filter function;
-	// in that case, element will be second argument
-	elem = el || elem;
-	return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
-}
-
-function showHide( elements, show ) {
-	var elem,
-		values = [],
-		index = 0,
-		length = elements.length;
-
-	for ( ; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-		values[ index ] = jQuery._data( elem, "olddisplay" );
-		if ( show ) {
-			// Reset the inline display of this element to learn if it is
-			// being hidden by cascaded rules or not
-			if ( !values[ index ] && elem.style.display === "none" ) {
-				elem.style.display = "";
-			}
-
-			// Set elements which have been overridden with display: none
-			// in a stylesheet to whatever the default browser style is
-			// for such an element
-			if ( elem.style.display === "" && isHidden( elem ) ) {
-				values[ index ] = jQuery._data( elem, "olddisplay", css_defaultDisplay(elem.nodeName) );
-			}
-		} else if ( !values[ index ] && !isHidden( elem ) ) {
-			jQuery._data( elem, "olddisplay", jQuery.css( elem, "display" ) );
-		}
-	}
-
-	// Set the display of most of the elements in a second loop
-	// to avoid the constant reflow
-	for ( index = 0; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-		if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
-			elem.style.display = show ? values[ index ] || "" : "none";
-		}
-	}
-
-	return elements;
-}
-
-jQuery.fn.extend({
-	css: function( name, value ) {
-		return jQuery.access( this, function( elem, name, value ) {
-			var styles, len,
-				map = {},
-				i = 0;
-
-			if ( jQuery.isArray( name ) ) {
-				styles = getStyles( elem );
-				len = name.length;
-
-				for ( ; i < len; i++ ) {
-					map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
-				}
-
-				return map;
-			}
-
-			return value !== undefined ?
-				jQuery.style( elem, name, value ) :
-				jQuery.css( elem, name );
-		}, name, value, arguments.length > 1 );
-	},
-	show: function() {
-		return showHide( this, true );
-	},
-	hide: function() {
-		return showHide( this );
-	},
-	toggle: function( state ) {
-		var bool = typeof state === "boolean";
-
-		return this.each(function() {
-			if ( bool ? state : isHidden( this ) ) {
-				jQuery( this ).show();
-			} else {
-				jQuery( this ).hide();
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	// Add in style property hooks for overriding the default
-	// behavior of getting and setting a style property
-	cssHooks: {
-		opacity: {
-			get: function( elem, computed ) {
-				if ( computed ) {
-					// We should always get a number back from opacity
-					var ret = curCSS( elem, "opacity" );
-					return ret === "" ? "1" : ret;
-				}
-			}
-		}
-	},
-
-	// Exclude the following css properties to add px
-	cssNumber: {
-		"columnCount": true,
-		"fillOpacity": true,
-		"fontWeight": true,
-		"lineHeight": true,
-		"opacity": true,
-		"orphans": true,
-		"widows": true,
-		"zIndex": true,
-		"zoom": true
-	},
-
-	// Add in properties whose names you wish to fix before
-	// setting or getting the value
-	cssProps: {
-		// normalize float css property
-		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
-	},
-
-	// Get and set the style property on a DOM Node
-	style: function( elem, name, value, extra ) {
-		// Don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
-			return;
-		}
-
-		// Make sure that we're working with the right name
-		var ret, type, hooks,
-			origName = jQuery.camelCase( name ),
-			style = elem.style;
-
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) );
-
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// Check if we're setting a value
-		if ( value !== undefined ) {
-			type = typeof value;
-
-			// convert relative number strings (+= or -=) to relative numbers. #7345
-			if ( type === "string" && (ret = rrelNum.exec( value )) ) {
-				value = ( ret[1] + 1 ) * ret[2] + parseFloat( jQuery.css( elem, name ) );
-				// Fixes bug #9237
-				type = "number";
-			}
-
-			// Make sure that NaN and null values aren't set. See: #7116
-			if ( value == null || type === "number" && isNaN( value ) ) {
-				return;
-			}
-
-			// If a number was passed in, add 'px' to the (except for certain CSS properties)
-			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
-				value += "px";
-			}
-
-			// Fixes #8908, it can be done more correctly by specifing setters in cssHooks,
-			// but it would mean to define eight (for every problematic property) identical functions
-			if ( !jQuery.support.clearCloneStyle && value === "" && name.indexOf("background") === 0 ) {
-				style[ name ] = "inherit";
-			}
-
-			// If a hook was provided, use that value, otherwise just set the specified value
-			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) {
-
-				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
-				// Fixes bug #5509
-				try {
-					style[ name ] = value;
-				} catch(e) {}
-			}
-
-		} else {
-			// If a hook was provided get the non-computed value from there
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
-				return ret;
-			}
-
-			// Otherwise just get the value from the style object
-			return style[ name ];
-		}
-	},
-
-	css: function( elem, name, extra, styles ) {
-		var val, num, hooks,
-			origName = jQuery.camelCase( name );
-
-		// Make sure that we're working with the right name
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) );
-
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// If a hook was provided get the computed value from there
-		if ( hooks && "get" in hooks ) {
-			val = hooks.get( elem, true, extra );
-		}
-
-		// Otherwise, if a way to get the computed value exists, use that
-		if ( val === undefined ) {
-			val = curCSS( elem, name, styles );
-		}
-
-		//convert "normal" to computed value
-		if ( val === "normal" && name in cssNormalTransform ) {
-			val = cssNormalTransform[ name ];
-		}
-
-		// Return, converting to number if forced or a qualifier was provided and val looks numeric
-		if ( extra ) {
-			num = parseFloat( val );
-			return extra === true || jQuery.isNumeric( num ) ? num || 0 : val;
-		}
-		return val;
-	},
-
-	// A method for quickly swapping in/out CSS properties to get correct calculations
-	swap: function( elem, options, callback, args ) {
-		var ret, name,
-			old = {};
-
-		// Remember the old values, and insert the new ones
-		for ( name in options ) {
-			old[ name ] = elem.style[ name ];
-			elem.style[ name ] = options[ name ];
-		}
-
-		ret = callback.apply( elem, args || [] );
-
-		// Revert the old values
-		for ( name in options ) {
-			elem.style[ name ] = old[ name ];
-		}
-
-		return ret;
-	}
-});
-
-// NOTE: we've included the "window" in window.getComputedStyle
-// because jsdom on node.js will break without it.
-if ( window.getComputedStyle ) {
-	getStyles = function( elem ) {
-		return window.getComputedStyle( elem, null );
-	};
-
-	curCSS = function( elem, name, _computed ) {
-		var width, minWidth, maxWidth,
-			computed = _computed || getStyles( elem ),
-
-			// getPropertyValue is only needed for .css('filter') in IE9, see #12537
-			ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined,
-			style = elem.style;
-
-		if ( computed ) {
-
-			if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
-				ret = jQuery.style( elem, name );
-			}
-
-			// A tribute to the "awesome hack by Dean Edwards"
-			// Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right
-			// Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
-			// this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
-			if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
-
-				// Remember the original values
-				width = style.width;
-				minWidth = style.minWidth;
-				maxWidth = style.maxWidth;
-
-				// Put in the new values to get a computed value out
-				style.minWidth = style.maxWidth = style.width = ret;
-				ret = computed.width;
-
-				// Revert the changed values
-				style.width = width;
-				style.minWidth = minWidth;
-				style.maxWidth = maxWidth;
-			}
-		}
-
-		return ret;
-	};
-} else if ( document.documentElement.currentStyle ) {
-	getStyles = function( elem ) {
-		return elem.currentStyle;
-	};
-
-	curCSS = function( elem, name, _computed ) {
-		var left, rs, rsLeft,
-			computed = _computed || getStyles( elem ),
-			ret = computed ? computed[ name ] : undefined,
-			style = elem.style;
-
-		// Avoid setting ret to empty string here
-		// so we don't default to auto
-		if ( ret == null && style && style[ name ] ) {
-			ret = style[ name ];
-		}
-
-		// From the awesome hack by Dean Edwards
-		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-
-		// If we're not dealing with a regular pixel number
-		// but a number that has a weird ending, we need to convert it to pixels
-		// but not position css attributes, as those are proportional to the parent element instead
-		// and we can't measure the parent instead because it might trigger a "stacking dolls" problem
-		if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) {
-
-			// Remember the original values
-			left = style.left;
-			rs = elem.runtimeStyle;
-			rsLeft = rs && rs.left;
-
-			// Put in the new values to get a computed value out
-			if ( rsLeft ) {
-				rs.left = elem.currentStyle.left;
-			}
-			style.left = name === "fontSize" ? "1em" : ret;
-			ret = style.pixelLeft + "px";
-
-			// Revert the changed values
-			style.left = left;
-			if ( rsLeft ) {
-				rs.left = rsLeft;
-			}
-		}
-
-		return ret === "" ? "auto" : ret;
-	};
-}
-
-function setPositiveNumber( elem, value, subtract ) {
-	var matches = rnumsplit.exec( value );
-	return matches ?
-		// Guard against undefined "subtract", e.g., when used as in cssHooks
-		Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
-		value;
-}
-
-function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
-	var i = extra === ( isBorderBox ? "border" : "content" ) ?
-		// If we already have the right measurement, avoid augmentation
-		4 :
-		// Otherwise initialize for horizontal or vertical properties
-		name === "width" ? 1 : 0,
-
-		val = 0;
-
-	for ( ; i < 4; i += 2 ) {
-		// both box models exclude margin, so add it if we want it
-		if ( extra === "margin" ) {
-			val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
-		}
-
-		if ( isBorderBox ) {
-			// border-box includes padding, so remove it if we want content
-			if ( extra === "content" ) {
-				val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-			}
-
-			// at this point, extra isn't border nor margin, so remove border
-			if ( extra !== "margin" ) {
-				val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		} else {
-			// at this point, extra isn't content, so add padding
-			val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-
-			// at this point, extra isn't content nor padding, so add border
-			if ( extra !== "padding" ) {
-				val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		}
-	}
-
-	return val;
-}
-
-function getWidthOrHeight( elem, name, extra ) {
-
-	// Start with offset property, which is equivalent to the border-box value
-	var valueIsBorderBox = true,
-		val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
-		styles = getStyles( elem ),
-		isBorderBox = jQuery.support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
-
-	// some non-html elements return undefined for offsetWidth, so check for null/undefined
-	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
-	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
-	if ( val <= 0 || val == null ) {
-		// Fall back to computed then uncomputed css if necessary
-		val = curCSS( elem, name, styles );
-		if ( val < 0 || val == null ) {
-			val = elem.style[ name ];
-		}
-
-		// Computed unit is not pixels. Stop here and return.
-		if ( rnumnonpx.test(val) ) {
-			return val;
-		}
-
-		// we need the check for style in case a browser which returns unreliable values
-		// for getComputedStyle silently falls back to the reliable elem.style
-		valueIsBorderBox = isBorderBox && ( jQuery.support.boxSizingReliable || val === elem.style[ name ] );
-
-		// Normalize "", auto, and prepare for extra
-		val = parseFloat( val ) || 0;
-	}
-
-	// use the active box-sizing model to add/subtract irrelevant styles
-	return ( val +
-		augmentWidthOrHeight(
-			elem,
-			name,
-			extra || ( isBorderBox ? "border" : "content" ),
-			valueIsBorderBox,
-			styles
-		)
-	) + "px";
-}
-
-// Try to determine the default display value of an element
-function css_defaultDisplay( nodeName ) {
-	var doc = document,
-		display = elemdisplay[ nodeName ];
-
-	if ( !display ) {
-		display = actualDisplay( nodeName, doc );
-
-		// If the simple way fails, read from inside an iframe
-		if ( display === "none" || !display ) {
-			// Use the already-created iframe if possible
-			iframe = ( iframe ||
-				jQuery("' : '');
-		inst._keyEvent = false;
-		return html;
-	},
-
-	/* Generate the month and year header. */
-	_generateMonthYearHeader: function(inst, drawMonth, drawYear, minDate, maxDate,
-			secondary, monthNames, monthNamesShort) {
-		var changeMonth = this._get(inst, 'changeMonth');
-		var changeYear = this._get(inst, 'changeYear');
-		var showMonthAfterYear = this._get(inst, 'showMonthAfterYear');
-		var html = '
    ';
-		var monthHtml = '';
-		// month selection
-		if (secondary || !changeMonth)
-			monthHtml += '' + monthNames[drawMonth] + '';
-		else {
-			var inMinYear = (minDate && minDate.getFullYear() == drawYear);
-			var inMaxYear = (maxDate && maxDate.getFullYear() == drawYear);
-			monthHtml += '';
-		}
-		if (!showMonthAfterYear)
-			html += monthHtml + (secondary || !(changeMonth && changeYear) ? ' ' : '');
-		// year selection
-		if ( !inst.yearshtml ) {
-			inst.yearshtml = '';
-			if (secondary || !changeYear)
-				html += '' + drawYear + '';
-			else {
-				// determine range of years to display
-				var years = this._get(inst, 'yearRange').split(':');
-				var thisYear = new Date().getFullYear();
-				var determineYear = function(value) {
-					var year = (value.match(/c[+-].*/) ? drawYear + parseInt(value.substring(1), 10) :
-						(value.match(/[+-].*/) ? thisYear + parseInt(value, 10) :
-						parseInt(value, 10)));
-					return (isNaN(year) ? thisYear : year);
-				};
-				var year = determineYear(years[0]);
-				var endYear = Math.max(year, determineYear(years[1] || ''));
-				year = (minDate ? Math.max(year, minDate.getFullYear()) : year);
-				endYear = (maxDate ? Math.min(endYear, maxDate.getFullYear()) : endYear);
-				inst.yearshtml += '';
-
-				html += inst.yearshtml;
-				inst.yearshtml = null;
-			}
-		}
-		html += this._get(inst, 'yearSuffix');
-		if (showMonthAfterYear)
-			html += (secondary || !(changeMonth && changeYear) ? ' ' : '') + monthHtml;
-		html += '
    '; // Close datepicker_header
-		return html;
-	},
-
-	/* Adjust one of the date sub-fields. */
-	_adjustInstDate: function(inst, offset, period) {
-		var year = inst.drawYear + (period == 'Y' ? offset : 0);
-		var month = inst.drawMonth + (period == 'M' ? offset : 0);
-		var day = Math.min(inst.selectedDay, this._getDaysInMonth(year, month)) +
-			(period == 'D' ? offset : 0);
-		var date = this._restrictMinMax(inst,
-			this._daylightSavingAdjust(new Date(year, month, day)));
-		inst.selectedDay = date.getDate();
-		inst.drawMonth = inst.selectedMonth = date.getMonth();
-		inst.drawYear = inst.selectedYear = date.getFullYear();
-		if (period == 'M' || period == 'Y')
-			this._notifyChange(inst);
-	},
-
-	/* Ensure a date is within any min/max bounds. */
-	_restrictMinMax: function(inst, date) {
-		var minDate = this._getMinMaxDate(inst, 'min');
-		var maxDate = this._getMinMaxDate(inst, 'max');
-		var newDate = (minDate && date < minDate ? minDate : date);
-		newDate = (maxDate && newDate > maxDate ? maxDate : newDate);
-		return newDate;
-	},
-
-	/* Notify change of month/year. */
-	_notifyChange: function(inst) {
-		var onChange = this._get(inst, 'onChangeMonthYear');
-		if (onChange)
-			onChange.apply((inst.input ? inst.input[0] : null),
-				[inst.selectedYear, inst.selectedMonth + 1, inst]);
-	},
-
-	/* Determine the number of months to show. */
-	_getNumberOfMonths: function(inst) {
-		var numMonths = this._get(inst, 'numberOfMonths');
-		return (numMonths == null ? [1, 1] : (typeof numMonths == 'number' ? [1, numMonths] : numMonths));
-	},
-
-	/* Determine the current maximum date - ensure no time components are set. */
-	_getMinMaxDate: function(inst, minMax) {
-		return this._determineDate(inst, this._get(inst, minMax + 'Date'), null);
-	},
-
-	/* Find the number of days in a given month. */
-	_getDaysInMonth: function(year, month) {
-		return 32 - this._daylightSavingAdjust(new Date(year, month, 32)).getDate();
-	},
-
-	/* Find the day of the week of the first of a month. */
-	_getFirstDayOfMonth: function(year, month) {
-		return new Date(year, month, 1).getDay();
-	},
-
-	/* Determines if we should allow a "next/prev" month display change. */
-	_canAdjustMonth: function(inst, offset, curYear, curMonth) {
-		var numMonths = this._getNumberOfMonths(inst);
-		var date = this._daylightSavingAdjust(new Date(curYear,
-			curMonth + (offset < 0 ? offset : numMonths[0] * numMonths[1]), 1));
-		if (offset < 0)
-			date.setDate(this._getDaysInMonth(date.getFullYear(), date.getMonth()));
-		return this._isInRange(inst, date);
-	},
-
-	/* Is the given date in the accepted range? */
-	_isInRange: function(inst, date) {
-		var minDate = this._getMinMaxDate(inst, 'min');
-		var maxDate = this._getMinMaxDate(inst, 'max');
-		return ((!minDate || date.getTime() >= minDate.getTime()) &&
-			(!maxDate || date.getTime() <= maxDate.getTime()));
-	},
-
-	/* Provide the configuration settings for formatting/parsing. */
-	_getFormatConfig: function(inst) {
-		var shortYearCutoff = this._get(inst, 'shortYearCutoff');
-		shortYearCutoff = (typeof shortYearCutoff != 'string' ? shortYearCutoff :
-			new Date().getFullYear() % 100 + parseInt(shortYearCutoff, 10));
-		return {shortYearCutoff: shortYearCutoff,
-			dayNamesShort: this._get(inst, 'dayNamesShort'), dayNames: this._get(inst, 'dayNames'),
-			monthNamesShort: this._get(inst, 'monthNamesShort'), monthNames: this._get(inst, 'monthNames')};
-	},
-
-	/* Format the given date for display. */
-	_formatDate: function(inst, day, month, year) {
-		if (!day) {
-			inst.currentDay = inst.selectedDay;
-			inst.currentMonth = inst.selectedMonth;
-			inst.currentYear = inst.selectedYear;
-		}
-		var date = (day ? (typeof day == 'object' ? day :
-			this._daylightSavingAdjust(new Date(year, month, day))) :
-			this._daylightSavingAdjust(new Date(inst.currentYear, inst.currentMonth, inst.currentDay)));
-		return this.formatDate(this._get(inst, 'dateFormat'), date, this._getFormatConfig(inst));
-	}
-});
-
-/*
- * Bind hover events for datepicker elements.
- * Done via delegate so the binding only occurs once in the lifetime of the parent div.
- * Global instActive, set by _updateDatepicker allows the handlers to find their way back to the active picker.
- */
-function bindHover(dpDiv) {
-	var selector = 'button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a';
-	return dpDiv.delegate(selector, 'mouseout', function() {
-			$(this).removeClass('ui-state-hover');
-			if (this.className.indexOf('ui-datepicker-prev') != -1) $(this).removeClass('ui-datepicker-prev-hover');
-			if (this.className.indexOf('ui-datepicker-next') != -1) $(this).removeClass('ui-datepicker-next-hover');
-		})
-		.delegate(selector, 'mouseover', function(){
-			if (!$.datepicker._isDisabledDatepicker( instActive.inline ? dpDiv.parent()[0] : instActive.input[0])) {
-				$(this).parents('.ui-datepicker-calendar').find('a').removeClass('ui-state-hover');
-				$(this).addClass('ui-state-hover');
-				if (this.className.indexOf('ui-datepicker-prev') != -1) $(this).addClass('ui-datepicker-prev-hover');
-				if (this.className.indexOf('ui-datepicker-next') != -1) $(this).addClass('ui-datepicker-next-hover');
-			}
-		});
-}
-
-/* jQuery extend now ignores nulls! */
-function extendRemove(target, props) {
-	$.extend(target, props);
-	for (var name in props)
-		if (props[name] == null || props[name] == undefined)
-			target[name] = props[name];
-	return target;
-};
-
-/* Invoke the datepicker functionality.
-   @param  options  string - a command, optionally followed by additional parameters or
-	                Object - settings for attaching new datepicker functionality
-   @return  jQuery object */
-$.fn.datepicker = function(options){
-
-	/* Verify an empty collection wasn't passed - Fixes #6976 */
-	if ( !this.length ) {
-		return this;
-	}
-
-	/* Initialise the date picker. */
-	if (!$.datepicker.initialized) {
-		$(document).mousedown($.datepicker._checkExternalClick).
-			find(document.body).append($.datepicker.dpDiv);
-		$.datepicker.initialized = true;
-	}
-
-	var otherArgs = Array.prototype.slice.call(arguments, 1);
-	if (typeof options == 'string' && (options == 'isDisabled' || options == 'getDate' || options == 'widget'))
-		return $.datepicker['_' + options + 'Datepicker'].
-			apply($.datepicker, [this[0]].concat(otherArgs));
-	if (options == 'option' && arguments.length == 2 && typeof arguments[1] == 'string')
-		return $.datepicker['_' + options + 'Datepicker'].
-			apply($.datepicker, [this[0]].concat(otherArgs));
-	return this.each(function() {
-		typeof options == 'string' ?
-			$.datepicker['_' + options + 'Datepicker'].
-				apply($.datepicker, [this].concat(otherArgs)) :
-			$.datepicker._attachDatepicker(this, options);
-	});
-};
-
-$.datepicker = new Datepicker(); // singleton instance
-$.datepicker.initialized = false;
-$.datepicker.uuid = new Date().getTime();
-$.datepicker.version = "1.9.2";
-
-// Workaround for #4055
-// Add another global to avoid noConflict issues with inline event handlers
-window['DP_jQuery_' + dpuuid] = $;
-
-})(jQuery);
-(function( $, undefined ) {
-
-var uiDialogClasses = "ui-dialog ui-widget ui-widget-content ui-corner-all ",
-	sizeRelatedOptions = {
-		buttons: true,
-		height: true,
-		maxHeight: true,
-		maxWidth: true,
-		minHeight: true,
-		minWidth: true,
-		width: true
-	},
-	resizableRelatedOptions = {
-		maxHeight: true,
-		maxWidth: true,
-		minHeight: true,
-		minWidth: true
-	};
-
-$.widget("ui.dialog", {
-	version: "1.9.2",
-	options: {
-		autoOpen: true,
-		buttons: {},
-		closeOnEscape: true,
-		closeText: "close",
-		dialogClass: "",
-		draggable: true,
-		hide: null,
-		height: "auto",
-		maxHeight: false,
-		maxWidth: false,
-		minHeight: 150,
-		minWidth: 150,
-		modal: false,
-		position: {
-			my: "center",
-			at: "center",
-			of: window,
-			collision: "fit",
-			// ensure that the titlebar is never outside the document
-			using: function( pos ) {
-				var topOffset = $( this ).css( pos ).offset().top;
-				if ( topOffset < 0 ) {
-					$( this ).css( "top", pos.top - topOffset );
-				}
-			}
-		},
-		resizable: true,
-		show: null,
-		stack: true,
-		title: "",
-		width: 300,
-		zIndex: 1000
-	},
-
-	_create: function() {
-		this.originalTitle = this.element.attr( "title" );
-		// #5742 - .attr() might return a DOMElement
-		if ( typeof this.originalTitle !== "string" ) {
-			this.originalTitle = "";
-		}
-		this.oldPosition = {
-			parent: this.element.parent(),
-			index: this.element.parent().children().index( this.element )
-		};
-		this.options.title = this.options.title || this.originalTitle;
-		var that = this,
-			options = this.options,
-
-			title = options.title || " ",
-			uiDialog,
-			uiDialogTitlebar,
-			uiDialogTitlebarClose,
-			uiDialogTitle,
-			uiDialogButtonPane;
-
-			uiDialog = ( this.uiDialog = $( "
    " ) )
-				.addClass( uiDialogClasses + options.dialogClass )
-				.css({
-					display: "none",
-					outline: 0, // TODO: move to stylesheet
-					zIndex: options.zIndex
-				})
-				// setting tabIndex makes the div focusable
-				.attr( "tabIndex", -1)
-				.keydown(function( event ) {
-					if ( options.closeOnEscape && !event.isDefaultPrevented() && event.keyCode &&
-							event.keyCode === $.ui.keyCode.ESCAPE ) {
-						that.close( event );
-						event.preventDefault();
-					}
-				})
-				.mousedown(function( event ) {
-					that.moveToTop( false, event );
-				})
-				.appendTo( "body" );
-
-			this.element
-				.show()
-				.removeAttr( "title" )
-				.addClass( "ui-dialog-content ui-widget-content" )
-				.appendTo( uiDialog );
-
-			uiDialogTitlebar = ( this.uiDialogTitlebar = $( "
    " ) )
-				.addClass( "ui-dialog-titlebar  ui-widget-header  " +
-					"ui-corner-all  ui-helper-clearfix" )
-				.bind( "mousedown", function() {
-					// Dialog isn't getting focus when dragging (#8063)
-					uiDialog.focus();
-				})
-				.prependTo( uiDialog );
-
-			uiDialogTitlebarClose = $( "" )
-				.addClass( "ui-dialog-titlebar-close  ui-corner-all" )
-				.attr( "role", "button" )
-				.click(function( event ) {
-					event.preventDefault();
-					that.close( event );
-				})
-				.appendTo( uiDialogTitlebar );
-
-			( this.uiDialogTitlebarCloseText = $( "" ) )
-				.addClass( "ui-icon ui-icon-closethick" )
-				.text( options.closeText )
-				.appendTo( uiDialogTitlebarClose );
-
-			uiDialogTitle = $( "" )
-				.uniqueId()
-				.addClass( "ui-dialog-title" )
-				.html( title )
-				.prependTo( uiDialogTitlebar );
-
-			uiDialogButtonPane = ( this.uiDialogButtonPane = $( "
    " ) )
-				.addClass( "ui-dialog-buttonpane ui-widget-content ui-helper-clearfix" );
-
-			( this.uiButtonSet = $( "
    " ) )
-				.addClass( "ui-dialog-buttonset" )
-				.appendTo( uiDialogButtonPane );
-
-		uiDialog.attr({
-			role: "dialog",
-			"aria-labelledby": uiDialogTitle.attr( "id" )
-		});
-
-		uiDialogTitlebar.find( "*" ).add( uiDialogTitlebar ).disableSelection();
-		this._hoverable( uiDialogTitlebarClose );
-		this._focusable( uiDialogTitlebarClose );
-
-		if ( options.draggable && $.fn.draggable ) {
-			this._makeDraggable();
-		}
-		if ( options.resizable && $.fn.resizable ) {
-			this._makeResizable();
-		}
-
-		this._createButtons( options.buttons );
-		this._isOpen = false;
-
-		if ( $.fn.bgiframe ) {
-			uiDialog.bgiframe();
-		}
-
-		// prevent tabbing out of modal dialogs
-		this._on( uiDialog, { keydown: function( event ) {
-			if ( !options.modal || event.keyCode !== $.ui.keyCode.TAB ) {
-				return;
-			}
-
-			var tabbables = $( ":tabbable", uiDialog ),
-				first = tabbables.filter( ":first" ),
-				last  = tabbables.filter( ":last" );
-
-			if ( event.target === last[0] && !event.shiftKey ) {
-				first.focus( 1 );
-				return false;
-			} else if ( event.target === first[0] && event.shiftKey ) {
-				last.focus( 1 );
-				return false;
-			}
-		}});
-	},
-
-	_init: function() {
-		if ( this.options.autoOpen ) {
-			this.open();
-		}
-	},
-
-	_destroy: function() {
-		var next,
-			oldPosition = this.oldPosition;
-
-		if ( this.overlay ) {
-			this.overlay.destroy();
-		}
-		this.uiDialog.hide();
-		this.element
-			.removeClass( "ui-dialog-content ui-widget-content" )
-			.hide()
-			.appendTo( "body" );
-		this.uiDialog.remove();
-
-		if ( this.originalTitle ) {
-			this.element.attr( "title", this.originalTitle );
-		}
-
-		next = oldPosition.parent.children().eq( oldPosition.index );
-		// Don't try to place the dialog next to itself (#8613)
-		if ( next.length && next[ 0 ] !== this.element[ 0 ] ) {
-			next.before( this.element );
-		} else {
-			oldPosition.parent.append( this.element );
-		}
-	},
-
-	widget: function() {
-		return this.uiDialog;
-	},
-
-	close: function( event ) {
-		var that = this,
-			maxZ, thisZ;
-
-		if ( !this._isOpen ) {
-			return;
-		}
-
-		if ( false === this._trigger( "beforeClose", event ) ) {
-			return;
-		}
-
-		this._isOpen = false;
-
-		if ( this.overlay ) {
-			this.overlay.destroy();
-		}
-
-		if ( this.options.hide ) {
-			this._hide( this.uiDialog, this.options.hide, function() {
-				that._trigger( "close", event );
-			});
-		} else {
-			this.uiDialog.hide();
-			this._trigger( "close", event );
-		}
-
-		$.ui.dialog.overlay.resize();
-
-		// adjust the maxZ to allow other modal dialogs to continue to work (see #4309)
-		if ( this.options.modal ) {
-			maxZ = 0;
-			$( ".ui-dialog" ).each(function() {
-				if ( this !== that.uiDialog[0] ) {
-					thisZ = $( this ).css( "z-index" );
-					if ( !isNaN( thisZ ) ) {
-						maxZ = Math.max( maxZ, thisZ );
-					}
-				}
-			});
-			$.ui.dialog.maxZ = maxZ;
-		}
-
-		return this;
-	},
-
-	isOpen: function() {
-		return this._isOpen;
-	},
-
-	// the force parameter allows us to move modal dialogs to their correct
-	// position on open
-	moveToTop: function( force, event ) {
-		var options = this.options,
-			saveScroll;
-
-		if ( ( options.modal && !force ) ||
-				( !options.stack && !options.modal ) ) {
-			return this._trigger( "focus", event );
-		}
-
-		if ( options.zIndex > $.ui.dialog.maxZ ) {
-			$.ui.dialog.maxZ = options.zIndex;
-		}
-		if ( this.overlay ) {
-			$.ui.dialog.maxZ += 1;
-			$.ui.dialog.overlay.maxZ = $.ui.dialog.maxZ;
-			this.overlay.$el.css( "z-index", $.ui.dialog.overlay.maxZ );
-		}
-
-		// Save and then restore scroll
-		// Opera 9.5+ resets when parent z-index is changed.
-		// http://bugs.jqueryui.com/ticket/3193
-		saveScroll = {
-			scrollTop: this.element.scrollTop(),
-			scrollLeft: this.element.scrollLeft()
-		};
-		$.ui.dialog.maxZ += 1;
-		this.uiDialog.css( "z-index", $.ui.dialog.maxZ );
-		this.element.attr( saveScroll );
-		this._trigger( "focus", event );
-
-		return this;
-	},
-
-	open: function() {
-		if ( this._isOpen ) {
-			return;
-		}
-
-		var hasFocus,
-			options = this.options,
-			uiDialog = this.uiDialog;
-
-		this._size();
-		this._position( options.position );
-		uiDialog.show( options.show );
-		this.overlay = options.modal ? new $.ui.dialog.overlay( this ) : null;
-		this.moveToTop( true );
-
-		// set focus to the first tabbable element in the content area or the first button
-		// if there are no tabbable elements, set focus on the dialog itself
-		hasFocus = this.element.find( ":tabbable" );
-		if ( !hasFocus.length ) {
-			hasFocus = this.uiDialogButtonPane.find( ":tabbable" );
-			if ( !hasFocus.length ) {
-				hasFocus = uiDialog;
-			}
-		}
-		hasFocus.eq( 0 ).focus();
-
-		this._isOpen = true;
-		this._trigger( "open" );
-
-		return this;
-	},
-
-	_createButtons: function( buttons ) {
-		var that = this,
-			hasButtons = false;
-
-		// if we already have a button pane, remove it
-		this.uiDialogButtonPane.remove();
-		this.uiButtonSet.empty();
-
-		if ( typeof buttons === "object" && buttons !== null ) {
-			$.each( buttons, function() {
-				return !(hasButtons = true);
-			});
-		}
-		if ( hasButtons ) {
-			$.each( buttons, function( name, props ) {
-				var button, click;
-				props = $.isFunction( props ) ?
-					{ click: props, text: name } :
-					props;
-				// Default to a non-submitting button
-				props = $.extend( { type: "button" }, props );
-				// Change the context for the click callback to be the main element
-				click = props.click;
-				props.click = function() {
-					click.apply( that.element[0], arguments );
-				};
-				button = $( "", props )
-					.appendTo( that.uiButtonSet );
-				if ( $.fn.button ) {
-					button.button();
-				}
-			});
-			this.uiDialog.addClass( "ui-dialog-buttons" );
-			this.uiDialogButtonPane.appendTo( this.uiDialog );
-		} else {
-			this.uiDialog.removeClass( "ui-dialog-buttons" );
-		}
-	},
-
-	_makeDraggable: function() {
-		var that = this,
-			options = this.options;
-
-		function filteredUi( ui ) {
-			return {
-				position: ui.position,
-				offset: ui.offset
-			};
-		}
-
-		this.uiDialog.draggable({
-			cancel: ".ui-dialog-content, .ui-dialog-titlebar-close",
-			handle: ".ui-dialog-titlebar",
-			containment: "document",
-			start: function( event, ui ) {
-				$( this )
-					.addClass( "ui-dialog-dragging" );
-				that._trigger( "dragStart", event, filteredUi( ui ) );
-			},
-			drag: function( event, ui ) {
-				that._trigger( "drag", event, filteredUi( ui ) );
-			},
-			stop: function( event, ui ) {
-				options.position = [
-					ui.position.left - that.document.scrollLeft(),
-					ui.position.top - that.document.scrollTop()
-				];
-				$( this )
-					.removeClass( "ui-dialog-dragging" );
-				that._trigger( "dragStop", event, filteredUi( ui ) );
-				$.ui.dialog.overlay.resize();
-			}
-		});
-	},
-
-	_makeResizable: function( handles ) {
-		handles = (handles === undefined ? this.options.resizable : handles);
-		var that = this,
-			options = this.options,
-			// .ui-resizable has position: relative defined in the stylesheet
-			// but dialogs have to use absolute or fixed positioning
-			position = this.uiDialog.css( "position" ),
-			resizeHandles = typeof handles === 'string' ?
-				handles	:
-				"n,e,s,w,se,sw,ne,nw";
-
-		function filteredUi( ui ) {
-			return {
-				originalPosition: ui.originalPosition,
-				originalSize: ui.originalSize,
-				position: ui.position,
-				size: ui.size
-			};
-		}
-
-		this.uiDialog.resizable({
-			cancel: ".ui-dialog-content",
-			containment: "document",
-			alsoResize: this.element,
-			maxWidth: options.maxWidth,
-			maxHeight: options.maxHeight,
-			minWidth: options.minWidth,
-			minHeight: this._minHeight(),
-			handles: resizeHandles,
-			start: function( event, ui ) {
-				$( this ).addClass( "ui-dialog-resizing" );
-				that._trigger( "resizeStart", event, filteredUi( ui ) );
-			},
-			resize: function( event, ui ) {
-				that._trigger( "resize", event, filteredUi( ui ) );
-			},
-			stop: function( event, ui ) {
-				$( this ).removeClass( "ui-dialog-resizing" );
-				options.height = $( this ).height();
-				options.width = $( this ).width();
-				that._trigger( "resizeStop", event, filteredUi( ui ) );
-				$.ui.dialog.overlay.resize();
-			}
-		})
-		.css( "position", position )
-		.find( ".ui-resizable-se" )
-			.addClass( "ui-icon ui-icon-grip-diagonal-se" );
-	},
-
-	_minHeight: function() {
-		var options = this.options;
-
-		if ( options.height === "auto" ) {
-			return options.minHeight;
-		} else {
-			return Math.min( options.minHeight, options.height );
-		}
-	},
-
-	_position: function( position ) {
-		var myAt = [],
-			offset = [ 0, 0 ],
-			isVisible;
-
-		if ( position ) {
-			// deep extending converts arrays to objects in jQuery <= 1.3.2 :-(
-	//		if (typeof position == 'string' || $.isArray(position)) {
-	//			myAt = $.isArray(position) ? position : position.split(' ');
-
-			if ( typeof position === "string" || (typeof position === "object" && "0" in position ) ) {
-				myAt = position.split ? position.split( " " ) : [ position[ 0 ], position[ 1 ] ];
-				if ( myAt.length === 1 ) {
-					myAt[ 1 ] = myAt[ 0 ];
-				}
-
-				$.each( [ "left", "top" ], function( i, offsetPosition ) {
-					if ( +myAt[ i ] === myAt[ i ] ) {
-						offset[ i ] = myAt[ i ];
-						myAt[ i ] = offsetPosition;
-					}
-				});
-
-				position = {
-					my: myAt[0] + (offset[0] < 0 ? offset[0] : "+" + offset[0]) + " " +
-						myAt[1] + (offset[1] < 0 ? offset[1] : "+" + offset[1]),
-					at: myAt.join( " " )
-				};
-			}
-
-			position = $.extend( {}, $.ui.dialog.prototype.options.position, position );
-		} else {
-			position = $.ui.dialog.prototype.options.position;
-		}
-
-		// need to show the dialog to get the actual offset in the position plugin
-		isVisible = this.uiDialog.is( ":visible" );
-		if ( !isVisible ) {
-			this.uiDialog.show();
-		}
-		this.uiDialog.position( position );
-		if ( !isVisible ) {
-			this.uiDialog.hide();
-		}
-	},
-
-	_setOptions: function( options ) {
-		var that = this,
-			resizableOptions = {},
-			resize = false;
-
-		$.each( options, function( key, value ) {
-			that._setOption( key, value );
-
-			if ( key in sizeRelatedOptions ) {
-				resize = true;
-			}
-			if ( key in resizableRelatedOptions ) {
-				resizableOptions[ key ] = value;
-			}
-		});
-
-		if ( resize ) {
-			this._size();
-		}
-		if ( this.uiDialog.is( ":data(resizable)" ) ) {
-			this.uiDialog.resizable( "option", resizableOptions );
-		}
-	},
-
-	_setOption: function( key, value ) {
-		var isDraggable, isResizable,
-			uiDialog = this.uiDialog;
-
-		switch ( key ) {
-			case "buttons":
-				this._createButtons( value );
-				break;
-			case "closeText":
-				// ensure that we always pass a string
-				this.uiDialogTitlebarCloseText.text( "" + value );
-				break;
-			case "dialogClass":
-				uiDialog
-					.removeClass( this.options.dialogClass )
-					.addClass( uiDialogClasses + value );
-				break;
-			case "disabled":
-				if ( value ) {
-					uiDialog.addClass( "ui-dialog-disabled" );
-				} else {
-					uiDialog.removeClass( "ui-dialog-disabled" );
-				}
-				break;
-			case "draggable":
-				isDraggable = uiDialog.is( ":data(draggable)" );
-				if ( isDraggable && !value ) {
-					uiDialog.draggable( "destroy" );
-				}
-
-				if ( !isDraggable && value ) {
-					this._makeDraggable();
-				}
-				break;
-			case "position":
-				this._position( value );
-				break;
-			case "resizable":
-				// currently resizable, becoming non-resizable
-				isResizable = uiDialog.is( ":data(resizable)" );
-				if ( isResizable && !value ) {
-					uiDialog.resizable( "destroy" );
-				}
-
-				// currently resizable, changing handles
-				if ( isResizable && typeof value === "string" ) {
-					uiDialog.resizable( "option", "handles", value );
-				}
-
-				// currently non-resizable, becoming resizable
-				if ( !isResizable && value !== false ) {
-					this._makeResizable( value );
-				}
-				break;
-			case "title":
-				// convert whatever was passed in o a string, for html() to not throw up
-				$( ".ui-dialog-title", this.uiDialogTitlebar )
-					.html( "" + ( value || " " ) );
-				break;
-		}
-
-		this._super( key, value );
-	},
-
-	_size: function() {
-		/* If the user has resized the dialog, the .ui-dialog and .ui-dialog-content
-		 * divs will both have width and height set, so we need to reset them
-		 */
-		var nonContentHeight, minContentHeight, autoHeight,
-			options = this.options,
-			isVisible = this.uiDialog.is( ":visible" );
-
-		// reset content sizing
-		this.element.show().css({
-			width: "auto",
-			minHeight: 0,
-			height: 0
-		});
-
-		if ( options.minWidth > options.width ) {
-			options.width = options.minWidth;
-		}
-
-		// reset wrapper sizing
-		// determine the height of all the non-content elements
-		nonContentHeight = this.uiDialog.css({
-				height: "auto",
-				width: options.width
-			})
-			.outerHeight();
-		minContentHeight = Math.max( 0, options.minHeight - nonContentHeight );
-
-		if ( options.height === "auto" ) {
-			// only needed for IE6 support
-			if ( $.support.minHeight ) {
-				this.element.css({
-					minHeight: minContentHeight,
-					height: "auto"
-				});
-			} else {
-				this.uiDialog.show();
-				autoHeight = this.element.css( "height", "auto" ).height();
-				if ( !isVisible ) {
-					this.uiDialog.hide();
-				}
-				this.element.height( Math.max( autoHeight, minContentHeight ) );
-			}
-		} else {
-			this.element.height( Math.max( options.height - nonContentHeight, 0 ) );
-		}
-
-		if (this.uiDialog.is( ":data(resizable)" ) ) {
-			this.uiDialog.resizable( "option", "minHeight", this._minHeight() );
-		}
-	}
-});
-
-$.extend($.ui.dialog, {
-	uuid: 0,
-	maxZ: 0,
-
-	getTitleId: function($el) {
-		var id = $el.attr( "id" );
-		if ( !id ) {
-			this.uuid += 1;
-			id = this.uuid;
-		}
-		return "ui-dialog-title-" + id;
-	},
-
-	overlay: function( dialog ) {
-		this.$el = $.ui.dialog.overlay.create( dialog );
-	}
-});
-
-$.extend( $.ui.dialog.overlay, {
-	instances: [],
-	// reuse old instances due to IE memory leak with alpha transparency (see #5185)
-	oldInstances: [],
-	maxZ: 0,
-	events: $.map(
-		"focus,mousedown,mouseup,keydown,keypress,click".split( "," ),
-		function( event ) {
-			return event + ".dialog-overlay";
-		}
-	).join( " " ),
-	create: function( dialog ) {
-		if ( this.instances.length === 0 ) {
-			// prevent use of anchors and inputs
-			// we use a setTimeout in case the overlay is created from an
-			// event that we're going to be cancelling (see #2804)
-			setTimeout(function() {
-				// handle $(el).dialog().dialog('close') (see #4065)
-				if ( $.ui.dialog.overlay.instances.length ) {
-					$( document ).bind( $.ui.dialog.overlay.events, function( event ) {
-						// stop events if the z-index of the target is < the z-index of the overlay
-						// we cannot return true when we don't want to cancel the event (#3523)
-						if ( $( event.target ).zIndex() < $.ui.dialog.overlay.maxZ ) {
-							return false;
-						}
-					});
-				}
-			}, 1 );
-
-			// handle window resize
-			$( window ).bind( "resize.dialog-overlay", $.ui.dialog.overlay.resize );
-		}
-
-		var $el = ( this.oldInstances.pop() || $( "
    " ).addClass( "ui-widget-overlay" ) );
-
-		// allow closing by pressing the escape key
-		$( document ).bind( "keydown.dialog-overlay", function( event ) {
-			var instances = $.ui.dialog.overlay.instances;
-			// only react to the event if we're the top overlay
-			if ( instances.length !== 0 && instances[ instances.length - 1 ] === $el &&
-				dialog.options.closeOnEscape && !event.isDefaultPrevented() && event.keyCode &&
-				event.keyCode === $.ui.keyCode.ESCAPE ) {
-
-				dialog.close( event );
-				event.preventDefault();
-			}
-		});
-
-		$el.appendTo( document.body ).css({
-			width: this.width(),
-			height: this.height()
-		});
-
-		if ( $.fn.bgiframe ) {
-			$el.bgiframe();
-		}
-
-		this.instances.push( $el );
-		return $el;
-	},
-
-	destroy: function( $el ) {
-		var indexOf = $.inArray( $el, this.instances ),
-			maxZ = 0;
-
-		if ( indexOf !== -1 ) {
-			this.oldInstances.push( this.instances.splice( indexOf, 1 )[ 0 ] );
-		}
-
-		if ( this.instances.length === 0 ) {
-			$( [ document, window ] ).unbind( ".dialog-overlay" );
-		}
-
-		$el.height( 0 ).width( 0 ).remove();
-
-		// adjust the maxZ to allow other modal dialogs to continue to work (see #4309)
-		$.each( this.instances, function() {
-			maxZ = Math.max( maxZ, this.css( "z-index" ) );
-		});
-		this.maxZ = maxZ;
-	},
-
-	height: function() {
-		var scrollHeight,
-			offsetHeight;
-		// handle IE
-		if ( $.ui.ie ) {
-			scrollHeight = Math.max(
-				document.documentElement.scrollHeight,
-				document.body.scrollHeight
-			);
-			offsetHeight = Math.max(
-				document.documentElement.offsetHeight,
-				document.body.offsetHeight
-			);
-
-			if ( scrollHeight < offsetHeight ) {
-				return $( window ).height() + "px";
-			} else {
-				return scrollHeight + "px";
-			}
-		// handle "good" browsers
-		} else {
-			return $( document ).height() + "px";
-		}
-	},
-
-	width: function() {
-		var scrollWidth,
-			offsetWidth;
-		// handle IE
-		if ( $.ui.ie ) {
-			scrollWidth = Math.max(
-				document.documentElement.scrollWidth,
-				document.body.scrollWidth
-			);
-			offsetWidth = Math.max(
-				document.documentElement.offsetWidth,
-				document.body.offsetWidth
-			);
-
-			if ( scrollWidth < offsetWidth ) {
-				return $( window ).width() + "px";
-			} else {
-				return scrollWidth + "px";
-			}
-		// handle "good" browsers
-		} else {
-			return $( document ).width() + "px";
-		}
-	},
-
-	resize: function() {
-		/* If the dialog is draggable and the user drags it past the
-		 * right edge of the window, the document becomes wider so we
-		 * need to stretch the overlay. If the user then drags the
-		 * dialog back to the left, the document will become narrower,
-		 * so we need to shrink the overlay to the appropriate size.
-		 * This is handled by shrinking the overlay before setting it
-		 * to the full document size.
-		 */
-		var $overlays = $( [] );
-		$.each( $.ui.dialog.overlay.instances, function() {
-			$overlays = $overlays.add( this );
-		});
-
-		$overlays.css({
-			width: 0,
-			height: 0
-		}).css({
-			width: $.ui.dialog.overlay.width(),
-			height: $.ui.dialog.overlay.height()
-		});
-	}
-});
-
-$.extend( $.ui.dialog.overlay.prototype, {
-	destroy: function() {
-		$.ui.dialog.overlay.destroy( this.$el );
-	}
-});
-
-}( jQuery ) );
-(function( $, undefined ) {
-
-$.widget("ui.draggable", $.ui.mouse, {
-	version: "1.9.2",
-	widgetEventPrefix: "drag",
-	options: {
-		addClasses: true,
-		appendTo: "parent",
-		axis: false,
-		connectToSortable: false,
-		containment: false,
-		cursor: "auto",
-		cursorAt: false,
-		grid: false,
-		handle: false,
-		helper: "original",
-		iframeFix: false,
-		opacity: false,
-		refreshPositions: false,
-		revert: false,
-		revertDuration: 500,
-		scope: "default",
-		scroll: true,
-		scrollSensitivity: 20,
-		scrollSpeed: 20,
-		snap: false,
-		snapMode: "both",
-		snapTolerance: 20,
-		stack: false,
-		zIndex: false
-	},
-	_create: function() {
-
-		if (this.options.helper == 'original' && !(/^(?:r|a|f)/).test(this.element.css("position")))
-			this.element[0].style.position = 'relative';
-
-		(this.options.addClasses && this.element.addClass("ui-draggable"));
-		(this.options.disabled && this.element.addClass("ui-draggable-disabled"));
-
-		this._mouseInit();
-
-	},
-
-	_destroy: function() {
-		this.element.removeClass( "ui-draggable ui-draggable-dragging ui-draggable-disabled" );
-		this._mouseDestroy();
-	},
-
-	_mouseCapture: function(event) {
-
-		var o = this.options;
-
-		// among others, prevent a drag on a resizable-handle
-		if (this.helper || o.disabled || $(event.target).is('.ui-resizable-handle'))
-			return false;
-
-		//Quit if we're not on a valid handle
-		this.handle = this._getHandle(event);
-		if (!this.handle)
-			return false;
-
-		$(o.iframeFix === true ? "iframe" : o.iframeFix).each(function() {
-			$('
    ')
-			.css({
-				width: this.offsetWidth+"px", height: this.offsetHeight+"px",
-				position: "absolute", opacity: "0.001", zIndex: 1000
-			})
-			.css($(this).offset())
-			.appendTo("body");
-		});
-
-		return true;
-
-	},
-
-	_mouseStart: function(event) {
-
-		var o = this.options;
-
-		//Create and append the visible helper
-		this.helper = this._createHelper(event);
-
-		this.helper.addClass("ui-draggable-dragging");
-
-		//Cache the helper size
-		this._cacheHelperProportions();
-
-		//If ddmanager is used for droppables, set the global draggable
-		if($.ui.ddmanager)
-			$.ui.ddmanager.current = this;
-
-		/*
-		 * - Position generation -
-		 * This block generates everything position related - it's the core of draggables.
-		 */
-
-		//Cache the margins of the original element
-		this._cacheMargins();
-
-		//Store the helper's css position
-		this.cssPosition = this.helper.css("position");
-		this.scrollParent = this.helper.scrollParent();
-
-		//The element's absolute position on the page minus margins
-		this.offset = this.positionAbs = this.element.offset();
-		this.offset = {
-			top: this.offset.top - this.margins.top,
-			left: this.offset.left - this.margins.left
-		};
-
-		$.extend(this.offset, {
-			click: { //Where the click happened, relative to the element
-				left: event.pageX - this.offset.left,
-				top: event.pageY - this.offset.top
-			},
-			parent: this._getParentOffset(),
-			relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
-		});
-
-		//Generate the original position
-		this.originalPosition = this.position = this._generatePosition(event);
-		this.originalPageX = event.pageX;
-		this.originalPageY = event.pageY;
-
-		//Adjust the mouse offset relative to the helper if 'cursorAt' is supplied
-		(o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
-
-		//Set a containment if given in the options
-		if(o.containment)
-			this._setContainment();
-
-		//Trigger event + callbacks
-		if(this._trigger("start", event) === false) {
-			this._clear();
-			return false;
-		}
-
-		//Recache the helper size
-		this._cacheHelperProportions();
-
-		//Prepare the droppable offsets
-		if ($.ui.ddmanager && !o.dropBehaviour)
-			$.ui.ddmanager.prepareOffsets(this, event);
-
-
-		this._mouseDrag(event, true); //Execute the drag once - this causes the helper not to be visible before getting its correct position
-
-		//If the ddmanager is used for droppables, inform the manager that dragging has started (see #5003)
-		if ( $.ui.ddmanager ) $.ui.ddmanager.dragStart(this, event);
-
-		return true;
-	},
-
-	_mouseDrag: function(event, noPropagation) {
-
-		//Compute the helpers position
-		this.position = this._generatePosition(event);
-		this.positionAbs = this._convertPositionTo("absolute");
-
-		//Call plugins and callbacks and use the resulting position if something is returned
-		if (!noPropagation) {
-			var ui = this._uiHash();
-			if(this._trigger('drag', event, ui) === false) {
-				this._mouseUp({});
-				return false;
-			}
-			this.position = ui.position;
-		}
-
-		if(!this.options.axis || this.options.axis != "y") this.helper[0].style.left = this.position.left+'px';
-		if(!this.options.axis || this.options.axis != "x") this.helper[0].style.top = this.position.top+'px';
-		if($.ui.ddmanager) $.ui.ddmanager.drag(this, event);
-
-		return false;
-	},
-
-	_mouseStop: function(event) {
-
-		//If we are using droppables, inform the manager about the drop
-		var dropped = false;
-		if ($.ui.ddmanager && !this.options.dropBehaviour)
-			dropped = $.ui.ddmanager.drop(this, event);
-
-		//if a drop comes from outside (a sortable)
-		if(this.dropped) {
-			dropped = this.dropped;
-			this.dropped = false;
-		}
-
-		//if the original element is no longer in the DOM don't bother to continue (see #8269)
-		var element = this.element[0], elementInDom = false;
-		while ( element && (element = element.parentNode) ) {
-			if (element == document ) {
-				elementInDom = true;
-			}
-		}
-		if ( !elementInDom && this.options.helper === "original" )
-			return false;
-
-		if((this.options.revert == "invalid" && !dropped) || (this.options.revert == "valid" && dropped) || this.options.revert === true || ($.isFunction(this.options.revert) && this.options.revert.call(this.element, dropped))) {
-			var that = this;
-			$(this.helper).animate(this.originalPosition, parseInt(this.options.revertDuration, 10), function() {
-				if(that._trigger("stop", event) !== false) {
-					that._clear();
-				}
-			});
-		} else {
-			if(this._trigger("stop", event) !== false) {
-				this._clear();
-			}
-		}
-
-		return false;
-	},
-
-	_mouseUp: function(event) {
-		//Remove frame helpers
-		$("div.ui-draggable-iframeFix").each(function() {
-			this.parentNode.removeChild(this);
-		});
-
-		//If the ddmanager is used for droppables, inform the manager that dragging has stopped (see #5003)
-		if( $.ui.ddmanager ) $.ui.ddmanager.dragStop(this, event);
-
-		return $.ui.mouse.prototype._mouseUp.call(this, event);
-	},
-
-	cancel: function() {
-
-		if(this.helper.is(".ui-draggable-dragging")) {
-			this._mouseUp({});
-		} else {
-			this._clear();
-		}
-
-		return this;
-
-	},
-
-	_getHandle: function(event) {
-
-		var handle = !this.options.handle || !$(this.options.handle, this.element).length ? true : false;
-		$(this.options.handle, this.element)
-			.find("*")
-			.andSelf()
-			.each(function() {
-				if(this == event.target) handle = true;
-			});
-
-		return handle;
-
-	},
-
-	_createHelper: function(event) {
-
-		var o = this.options;
-		var helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event])) : (o.helper == 'clone' ? this.element.clone().removeAttr('id') : this.element);
-
-		if(!helper.parents('body').length)
-			helper.appendTo((o.appendTo == 'parent' ? this.element[0].parentNode : o.appendTo));
-
-		if(helper[0] != this.element[0] && !(/(fixed|absolute)/).test(helper.css("position")))
-			helper.css("position", "absolute");
-
-		return helper;
-
-	},
-
-	_adjustOffsetFromHelper: function(obj) {
-		if (typeof obj == 'string') {
-			obj = obj.split(' ');
-		}
-		if ($.isArray(obj)) {
-			obj = {left: +obj[0], top: +obj[1] || 0};
-		}
-		if ('left' in obj) {
-			this.offset.click.left = obj.left + this.margins.left;
-		}
-		if ('right' in obj) {
-			this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
-		}
-		if ('top' in obj) {
-			this.offset.click.top = obj.top + this.margins.top;
-		}
-		if ('bottom' in obj) {
-			this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
-		}
-	},
-
-	_getParentOffset: function() {
-
-		//Get the offsetParent and cache its position
-		this.offsetParent = this.helper.offsetParent();
-		var po = this.offsetParent.offset();
-
-		// This is a special case where we need to modify a offset calculated on start, since the following happened:
-		// 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
-		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
-		//    the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
-		if(this.cssPosition == 'absolute' && this.scrollParent[0] != document && $.contains(this.scrollParent[0], this.offsetParent[0])) {
-			po.left += this.scrollParent.scrollLeft();
-			po.top += this.scrollParent.scrollTop();
-		}
-
-		if((this.offsetParent[0] == document.body) //This needs to be actually done for all browsers, since pageX/pageY includes this information
-		|| (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() == 'html' && $.ui.ie)) //Ugly IE fix
-			po = { top: 0, left: 0 };
-
-		return {
-			top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
-			left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
-		};
-
-	},
-
-	_getRelativeOffset: function() {
-
-		if(this.cssPosition == "relative") {
-			var p = this.element.position();
-			return {
-				top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.scrollParent.scrollTop(),
-				left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.scrollParent.scrollLeft()
-			};
-		} else {
-			return { top: 0, left: 0 };
-		}
-
-	},
-
-	_cacheMargins: function() {
-		this.margins = {
-			left: (parseInt(this.element.css("marginLeft"),10) || 0),
-			top: (parseInt(this.element.css("marginTop"),10) || 0),
-			right: (parseInt(this.element.css("marginRight"),10) || 0),
-			bottom: (parseInt(this.element.css("marginBottom"),10) || 0)
-		};
-	},
-
-	_cacheHelperProportions: function() {
-		this.helperProportions = {
-			width: this.helper.outerWidth(),
-			height: this.helper.outerHeight()
-		};
-	},
-
-	_setContainment: function() {
-
-		var o = this.options;
-		if(o.containment == 'parent') o.containment = this.helper[0].parentNode;
-		if(o.containment == 'document' || o.containment == 'window') this.containment = [
-			o.containment == 'document' ? 0 : $(window).scrollLeft() - this.offset.relative.left - this.offset.parent.left,
-			o.containment == 'document' ? 0 : $(window).scrollTop() - this.offset.relative.top - this.offset.parent.top,
-			(o.containment == 'document' ? 0 : $(window).scrollLeft()) + $(o.containment == 'document' ? document : window).width() - this.helperProportions.width - this.margins.left,
-			(o.containment == 'document' ? 0 : $(window).scrollTop()) + ($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
-		];
-
-		if(!(/^(document|window|parent)$/).test(o.containment) && o.containment.constructor != Array) {
-			var c = $(o.containment);
-			var ce = c[0]; if(!ce) return;
-			var co = c.offset();
-			var over = ($(ce).css("overflow") != 'hidden');
-
-			this.containment = [
-				(parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0),
-				(parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0),
-				(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left - this.margins.right,
-				(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top  - this.margins.bottom
-			];
-			this.relative_container = c;
-
-		} else if(o.containment.constructor == Array) {
-			this.containment = o.containment;
-		}
-
-	},
-
-	_convertPositionTo: function(d, pos) {
-
-		if(!pos) pos = this.position;
-		var mod = d == "absolute" ? 1 : -1;
-		var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
-
-		return {
-			top: (
-				pos.top																	// The absolute mouse position
-				+ this.offset.relative.top * mod										// Only for relative positioned nodes: Relative offset from element to offset parent
-				+ this.offset.parent.top * mod											// The offsetParent's offset without borders (offset + border)
-				- ( ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod)
-			),
-			left: (
-				pos.left																// The absolute mouse position
-				+ this.offset.relative.left * mod										// Only for relative positioned nodes: Relative offset from element to offset parent
-				+ this.offset.parent.left * mod											// The offsetParent's offset without borders (offset + border)
-				- ( ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod)
-			)
-		};
-
-	},
-
-	_generatePosition: function(event) {
-
-		var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
-		var pageX = event.pageX;
-		var pageY = event.pageY;
-
-		/*
-		 * - Position constraining -
-		 * Constrain the position to a mix of grid, containment.
-		 */
-
-		if(this.originalPosition) { //If we are not dragging yet, we won't check for options
-			var containment;
-			if(this.containment) {
-			if (this.relative_container){
-				var co = this.relative_container.offset();
-				containment = [ this.containment[0] + co.left,
-					this.containment[1] + co.top,
-					this.containment[2] + co.left,
-					this.containment[3] + co.top ];
-			}
-			else {
-				containment = this.containment;
-			}
-
-				if(event.pageX - this.offset.click.left < containment[0]) pageX = containment[0] + this.offset.click.left;
-				if(event.pageY - this.offset.click.top < containment[1]) pageY = containment[1] + this.offset.click.top;
-				if(event.pageX - this.offset.click.left > containment[2]) pageX = containment[2] + this.offset.click.left;
-				if(event.pageY - this.offset.click.top > containment[3]) pageY = containment[3] + this.offset.click.top;
-			}
-
-			if(o.grid) {
-				//Check for grid elements set to 0 to prevent divide by 0 error causing invalid argument errors in IE (see ticket #6950)
-				var top = o.grid[1] ? this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1] : this.originalPageY;
-				pageY = containment ? (!(top - this.offset.click.top < containment[1] || top - this.offset.click.top > containment[3]) ? top : (!(top - this.offset.click.top < containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
-
-				var left = o.grid[0] ? this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0] : this.originalPageX;
-				pageX = containment ? (!(left - this.offset.click.left < containment[0] || left - this.offset.click.left > containment[2]) ? left : (!(left - this.offset.click.left < containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
-			}
-
-		}
-
-		return {
-			top: (
-				pageY																// The absolute mouse position
-				- this.offset.click.top													// Click offset (relative to the element)
-				- this.offset.relative.top												// Only for relative positioned nodes: Relative offset from element to offset parent
-				- this.offset.parent.top												// The offsetParent's offset without borders (offset + border)
-				+ ( ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
-			),
-			left: (
-				pageX																// The absolute mouse position
-				- this.offset.click.left												// Click offset (relative to the element)
-				- this.offset.relative.left												// Only for relative positioned nodes: Relative offset from element to offset parent
-				- this.offset.parent.left												// The offsetParent's offset without borders (offset + border)
-				+ ( ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ))
-			)
-		};
-
-	},
-
-	_clear: function() {
-		this.helper.removeClass("ui-draggable-dragging");
-		if(this.helper[0] != this.element[0] && !this.cancelHelperRemoval) this.helper.remove();
-		//if($.ui.ddmanager) $.ui.ddmanager.current = null;
-		this.helper = null;
-		this.cancelHelperRemoval = false;
-	},
-
-	// From now on bulk stuff - mainly helpers
-
-	_trigger: function(type, event, ui) {
-		ui = ui || this._uiHash();
-		$.ui.plugin.call(this, type, [event, ui]);
-		if(type == "drag") this.positionAbs = this._convertPositionTo("absolute"); //The absolute position has to be recalculated after plugins
-		return $.Widget.prototype._trigger.call(this, type, event, ui);
-	},
-
-	plugins: {},
-
-	_uiHash: function(event) {
-		return {
-			helper: this.helper,
-			position: this.position,
-			originalPosition: this.originalPosition,
-			offset: this.positionAbs
-		};
-	}
-
-});
-
-$.ui.plugin.add("draggable", "connectToSortable", {
-	start: function(event, ui) {
-
-		var inst = $(this).data("draggable"), o = inst.options,
-			uiSortable = $.extend({}, ui, { item: inst.element });
-		inst.sortables = [];
-		$(o.connectToSortable).each(function() {
-			var sortable = $.data(this, 'sortable');
-			if (sortable && !sortable.options.disabled) {
-				inst.sortables.push({
-					instance: sortable,
-					shouldRevert: sortable.options.revert
-				});
-				sortable.refreshPositions();	// Call the sortable's refreshPositions at drag start to refresh the containerCache since the sortable container cache is used in drag and needs to be up to date (this will ensure it's initialised as well as being kept in step with any changes that might have happened on the page).
-				sortable._trigger("activate", event, uiSortable);
-			}
-		});
-
-	},
-	stop: function(event, ui) {
-
-		//If we are still over the sortable, we fake the stop event of the sortable, but also remove helper
-		var inst = $(this).data("draggable"),
-			uiSortable = $.extend({}, ui, { item: inst.element });
-
-		$.each(inst.sortables, function() {
-			if(this.instance.isOver) {
-
-				this.instance.isOver = 0;
-
-				inst.cancelHelperRemoval = true; //Don't remove the helper in the draggable instance
-				this.instance.cancelHelperRemoval = false; //Remove it in the sortable instance (so sortable plugins like revert still work)
-
-				//The sortable revert is supported, and we have to set a temporary dropped variable on the draggable to support revert: 'valid/invalid'
-				if(this.shouldRevert) this.instance.options.revert = true;
-
-				//Trigger the stop of the sortable
-				this.instance._mouseStop(event);
-
-				this.instance.options.helper = this.instance.options._helper;
-
-				//If the helper has been the original item, restore properties in the sortable
-				if(inst.options.helper == 'original')
-					this.instance.currentItem.css({ top: 'auto', left: 'auto' });
-
-			} else {
-				this.instance.cancelHelperRemoval = false; //Remove the helper in the sortable instance
-				this.instance._trigger("deactivate", event, uiSortable);
-			}
-
-		});
-
-	},
-	drag: function(event, ui) {
-
-		var inst = $(this).data("draggable"), that = this;
-
-		var checkPos = function(o) {
-			var dyClick = this.offset.click.top, dxClick = this.offset.click.left;
-			var helperTop = this.positionAbs.top, helperLeft = this.positionAbs.left;
-			var itemHeight = o.height, itemWidth = o.width;
-			var itemTop = o.top, itemLeft = o.left;
-
-			return $.ui.isOver(helperTop + dyClick, helperLeft + dxClick, itemTop, itemLeft, itemHeight, itemWidth);
-		};
-
-		$.each(inst.sortables, function(i) {
-
-			var innermostIntersecting = false;
-			var thisSortable = this;
-			//Copy over some variables to allow calling the sortable's native _intersectsWith
-			this.instance.positionAbs = inst.positionAbs;
-			this.instance.helperProportions = inst.helperProportions;
-			this.instance.offset.click = inst.offset.click;
-
-			if(this.instance._intersectsWith(this.instance.containerCache)) {
-				innermostIntersecting = true;
-				$.each(inst.sortables, function () {
-					this.instance.positionAbs = inst.positionAbs;
-					this.instance.helperProportions = inst.helperProportions;
-					this.instance.offset.click = inst.offset.click;
-					if  (this != thisSortable
-						&& this.instance._intersectsWith(this.instance.containerCache)
-						&& $.ui.contains(thisSortable.instance.element[0], this.instance.element[0]))
-						innermostIntersecting = false;
-						return innermostIntersecting;
-				});
-			}
-
-
-			if(innermostIntersecting) {
-				//If it intersects, we use a little isOver variable and set it once, so our move-in stuff gets fired only once
-				if(!this.instance.isOver) {
-
-					this.instance.isOver = 1;
-					//Now we fake the start of dragging for the sortable instance,
-					//by cloning the list group item, appending it to the sortable and using it as inst.currentItem
-					//We can then fire the start event of the sortable with our passed browser event, and our own helper (so it doesn't create a new one)
-					this.instance.currentItem = $(that).clone().removeAttr('id').appendTo(this.instance.element).data("sortable-item", true);
-					this.instance.options._helper = this.instance.options.helper; //Store helper option to later restore it
-					this.instance.options.helper = function() { return ui.helper[0]; };
-
-					event.target = this.instance.currentItem[0];
-					this.instance._mouseCapture(event, true);
-					this.instance._mouseStart(event, true, true);
-
-					//Because the browser event is way off the new appended portlet, we modify a couple of variables to reflect the changes
-					this.instance.offset.click.top = inst.offset.click.top;
-					this.instance.offset.click.left = inst.offset.click.left;
-					this.instance.offset.parent.left -= inst.offset.parent.left - this.instance.offset.parent.left;
-					this.instance.offset.parent.top -= inst.offset.parent.top - this.instance.offset.parent.top;
-
-					inst._trigger("toSortable", event);
-					inst.dropped = this.instance.element; //draggable revert needs that
-					//hack so receive/update callbacks work (mostly)
-					inst.currentItem = inst.element;
-					this.instance.fromOutside = inst;
-
-				}
-
-				//Provided we did all the previous steps, we can fire the drag event of the sortable on every draggable drag, when it intersects with the sortable
-				if(this.instance.currentItem) this.instance._mouseDrag(event);
-
-			} else {
-
-				//If it doesn't intersect with the sortable, and it intersected before,
-				//we fake the drag stop of the sortable, but make sure it doesn't remove the helper by using cancelHelperRemoval
-				if(this.instance.isOver) {
-
-					this.instance.isOver = 0;
-					this.instance.cancelHelperRemoval = true;
-
-					//Prevent reverting on this forced stop
-					this.instance.options.revert = false;
-
-					// The out event needs to be triggered independently
-					this.instance._trigger('out', event, this.instance._uiHash(this.instance));
-
-					this.instance._mouseStop(event, true);
-					this.instance.options.helper = this.instance.options._helper;
-
-					//Now we remove our currentItem, the list group clone again, and the placeholder, and animate the helper back to it's original size
-					this.instance.currentItem.remove();
-					if(this.instance.placeholder) this.instance.placeholder.remove();
-
-					inst._trigger("fromSortable", event);
-					inst.dropped = false; //draggable revert needs that
-				}
-
-			};
-
-		});
-
-	}
-});
-
-$.ui.plugin.add("draggable", "cursor", {
-	start: function(event, ui) {
-		var t = $('body'), o = $(this).data('draggable').options;
-		if (t.css("cursor")) o._cursor = t.css("cursor");
-		t.css("cursor", o.cursor);
-	},
-	stop: function(event, ui) {
-		var o = $(this).data('draggable').options;
-		if (o._cursor) $('body').css("cursor", o._cursor);
-	}
-});
-
-$.ui.plugin.add("draggable", "opacity", {
-	start: function(event, ui) {
-		var t = $(ui.helper), o = $(this).data('draggable').options;
-		if(t.css("opacity")) o._opacity = t.css("opacity");
-		t.css('opacity', o.opacity);
-	},
-	stop: function(event, ui) {
-		var o = $(this).data('draggable').options;
-		if(o._opacity) $(ui.helper).css('opacity', o._opacity);
-	}
-});
-
-$.ui.plugin.add("draggable", "scroll", {
-	start: function(event, ui) {
-		var i = $(this).data("draggable");
-		if(i.scrollParent[0] != document && i.scrollParent[0].tagName != 'HTML') i.overflowOffset = i.scrollParent.offset();
-	},
-	drag: function(event, ui) {
-
-		var i = $(this).data("draggable"), o = i.options, scrolled = false;
-
-		if(i.scrollParent[0] != document && i.scrollParent[0].tagName != 'HTML') {
-
-			if(!o.axis || o.axis != 'x') {
-				if((i.overflowOffset.top + i.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity)
-					i.scrollParent[0].scrollTop = scrolled = i.scrollParent[0].scrollTop + o.scrollSpeed;
-				else if(event.pageY - i.overflowOffset.top < o.scrollSensitivity)
-					i.scrollParent[0].scrollTop = scrolled = i.scrollParent[0].scrollTop - o.scrollSpeed;
-			}
-
-			if(!o.axis || o.axis != 'y') {
-				if((i.overflowOffset.left + i.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity)
-					i.scrollParent[0].scrollLeft = scrolled = i.scrollParent[0].scrollLeft + o.scrollSpeed;
-				else if(event.pageX - i.overflowOffset.left < o.scrollSensitivity)
-					i.scrollParent[0].scrollLeft = scrolled = i.scrollParent[0].scrollLeft - o.scrollSpeed;
-			}
-
-		} else {
-
-			if(!o.axis || o.axis != 'x') {
-				if(event.pageY - $(document).scrollTop() < o.scrollSensitivity)
-					scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
-				else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity)
-					scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
-			}
-
-			if(!o.axis || o.axis != 'y') {
-				if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity)
-					scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
-				else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity)
-					scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
-			}
-
-		}
-
-		if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour)
-			$.ui.ddmanager.prepareOffsets(i, event);
-
-	}
-});
-
-$.ui.plugin.add("draggable", "snap", {
-	start: function(event, ui) {
-
-		var i = $(this).data("draggable"), o = i.options;
-		i.snapElements = [];
-
-		$(o.snap.constructor != String ? ( o.snap.items || ':data(draggable)' ) : o.snap).each(function() {
-			var $t = $(this); var $o = $t.offset();
-			if(this != i.element[0]) i.snapElements.push({
-				item: this,
-				width: $t.outerWidth(), height: $t.outerHeight(),
-				top: $o.top, left: $o.left
-			});
-		});
-
-	},
-	drag: function(event, ui) {
-
-		var inst = $(this).data("draggable"), o = inst.options;
-		var d = o.snapTolerance;
-
-		var x1 = ui.offset.left, x2 = x1 + inst.helperProportions.width,
-			y1 = ui.offset.top, y2 = y1 + inst.helperProportions.height;
-
-		for (var i = inst.snapElements.length - 1; i >= 0; i--){
-
-			var l = inst.snapElements[i].left, r = l + inst.snapElements[i].width,
-				t = inst.snapElements[i].top, b = t + inst.snapElements[i].height;
-
-			//Yes, I know, this is insane ;)
-			if(!((l-d < x1 && x1 < r+d && t-d < y1 && y1 < b+d) || (l-d < x1 && x1 < r+d && t-d < y2 && y2 < b+d) || (l-d < x2 && x2 < r+d && t-d < y1 && y1 < b+d) || (l-d < x2 && x2 < r+d && t-d < y2 && y2 < b+d))) {
-				if(inst.snapElements[i].snapping) (inst.options.snap.release && inst.options.snap.release.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item })));
-				inst.snapElements[i].snapping = false;
-				continue;
-			}
-
-			if(o.snapMode != 'inner') {
-				var ts = Math.abs(t - y2) <= d;
-				var bs = Math.abs(b - y1) <= d;
-				var ls = Math.abs(l - x2) <= d;
-				var rs = Math.abs(r - x1) <= d;
-				if(ts) ui.position.top = inst._convertPositionTo("relative", { top: t - inst.helperProportions.height, left: 0 }).top - inst.margins.top;
-				if(bs) ui.position.top = inst._convertPositionTo("relative", { top: b, left: 0 }).top - inst.margins.top;
-				if(ls) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l - inst.helperProportions.width }).left - inst.margins.left;
-				if(rs) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r }).left - inst.margins.left;
-			}
-
-			var first = (ts || bs || ls || rs);
-
-			if(o.snapMode != 'outer') {
-				var ts = Math.abs(t - y1) <= d;
-				var bs = Math.abs(b - y2) <= d;
-				var ls = Math.abs(l - x1) <= d;
-				var rs = Math.abs(r - x2) <= d;
-				if(ts) ui.position.top = inst._convertPositionTo("relative", { top: t, left: 0 }).top - inst.margins.top;
-				if(bs) ui.position.top = inst._convertPositionTo("relative", { top: b - inst.helperProportions.height, left: 0 }).top - inst.margins.top;
-				if(ls) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l }).left - inst.margins.left;
-				if(rs) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r - inst.helperProportions.width }).left - inst.margins.left;
-			}
-
-			if(!inst.snapElements[i].snapping && (ts || bs || ls || rs || first))
-				(inst.options.snap.snap && inst.options.snap.snap.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item })));
-			inst.snapElements[i].snapping = (ts || bs || ls || rs || first);
-
-		};
-
-	}
-});
-
-$.ui.plugin.add("draggable", "stack", {
-	start: function(event, ui) {
-
-		var o = $(this).data("draggable").options;
-
-		var group = $.makeArray($(o.stack)).sort(function(a,b) {
-			return (parseInt($(a).css("zIndex"),10) || 0) - (parseInt($(b).css("zIndex"),10) || 0);
-		});
-		if (!group.length) { return; }
-
-		var min = parseInt(group[0].style.zIndex) || 0;
-		$(group).each(function(i) {
-			this.style.zIndex = min + i;
-		});
-
-		this[0].style.zIndex = min + group.length;
-
-	}
-});
-
-$.ui.plugin.add("draggable", "zIndex", {
-	start: function(event, ui) {
-		var t = $(ui.helper), o = $(this).data("draggable").options;
-		if(t.css("zIndex")) o._zIndex = t.css("zIndex");
-		t.css('zIndex', o.zIndex);
-	},
-	stop: function(event, ui) {
-		var o = $(this).data("draggable").options;
-		if(o._zIndex) $(ui.helper).css('zIndex', o._zIndex);
-	}
-});
-
-})(jQuery);
-(function( $, undefined ) {
-
-$.widget("ui.droppable", {
-	version: "1.9.2",
-	widgetEventPrefix: "drop",
-	options: {
-		accept: '*',
-		activeClass: false,
-		addClasses: true,
-		greedy: false,
-		hoverClass: false,
-		scope: 'default',
-		tolerance: 'intersect'
-	},
-	_create: function() {
-
-		var o = this.options, accept = o.accept;
-		this.isover = 0; this.isout = 1;
-
-		this.accept = $.isFunction(accept) ? accept : function(d) {
-			return d.is(accept);
-		};
-
-		//Store the droppable's proportions
-		this.proportions = { width: this.element[0].offsetWidth, height: this.element[0].offsetHeight };
-
-		// Add the reference and positions to the manager
-		$.ui.ddmanager.droppables[o.scope] = $.ui.ddmanager.droppables[o.scope] || [];
-		$.ui.ddmanager.droppables[o.scope].push(this);
-
-		(o.addClasses && this.element.addClass("ui-droppable"));
-
-	},
-
-	_destroy: function() {
-		var drop = $.ui.ddmanager.droppables[this.options.scope];
-		for ( var i = 0; i < drop.length; i++ )
-			if ( drop[i] == this )
-				drop.splice(i, 1);
-
-		this.element.removeClass("ui-droppable ui-droppable-disabled");
-	},
-
-	_setOption: function(key, value) {
-
-		if(key == 'accept') {
-			this.accept = $.isFunction(value) ? value : function(d) {
-				return d.is(value);
-			};
-		}
-		$.Widget.prototype._setOption.apply(this, arguments);
-	},
-
-	_activate: function(event) {
-		var draggable = $.ui.ddmanager.current;
-		if(this.options.activeClass) this.element.addClass(this.options.activeClass);
-		(draggable && this._trigger('activate', event, this.ui(draggable)));
-	},
-
-	_deactivate: function(event) {
-		var draggable = $.ui.ddmanager.current;
-		if(this.options.activeClass) this.element.removeClass(this.options.activeClass);
-		(draggable && this._trigger('deactivate', event, this.ui(draggable)));
-	},
-
-	_over: function(event) {
-
-		var draggable = $.ui.ddmanager.current;
-		if (!draggable || (draggable.currentItem || draggable.element)[0] == this.element[0]) return; // Bail if draggable and droppable are same element
-
-		if (this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
-			if(this.options.hoverClass) this.element.addClass(this.options.hoverClass);
-			this._trigger('over', event, this.ui(draggable));
-		}
-
-	},
-
-	_out: function(event) {
-
-		var draggable = $.ui.ddmanager.current;
-		if (!draggable || (draggable.currentItem || draggable.element)[0] == this.element[0]) return; // Bail if draggable and droppable are same element
-
-		if (this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
-			if(this.options.hoverClass) this.element.removeClass(this.options.hoverClass);
-			this._trigger('out', event, this.ui(draggable));
-		}
-
-	},
-
-	_drop: function(event,custom) {
-
-		var draggable = custom || $.ui.ddmanager.current;
-		if (!draggable || (draggable.currentItem || draggable.element)[0] == this.element[0]) return false; // Bail if draggable and droppable are same element
-
-		var childrenIntersection = false;
-		this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function() {
-			var inst = $.data(this, 'droppable');
-			if(
-				inst.options.greedy
-				&& !inst.options.disabled
-				&& inst.options.scope == draggable.options.scope
-				&& inst.accept.call(inst.element[0], (draggable.currentItem || draggable.element))
-				&& $.ui.intersect(draggable, $.extend(inst, { offset: inst.element.offset() }), inst.options.tolerance)
-			) { childrenIntersection = true; return false; }
-		});
-		if(childrenIntersection) return false;
-
-		if(this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
-			if(this.options.activeClass) this.element.removeClass(this.options.activeClass);
-			if(this.options.hoverClass) this.element.removeClass(this.options.hoverClass);
-			this._trigger('drop', event, this.ui(draggable));
-			return this.element;
-		}
-
-		return false;
-
-	},
-
-	ui: function(c) {
-		return {
-			draggable: (c.currentItem || c.element),
-			helper: c.helper,
-			position: c.position,
-			offset: c.positionAbs
-		};
-	}
-
-});
-
-$.ui.intersect = function(draggable, droppable, toleranceMode) {
-
-	if (!droppable.offset) return false;
-
-	var x1 = (draggable.positionAbs || draggable.position.absolute).left, x2 = x1 + draggable.helperProportions.width,
-		y1 = (draggable.positionAbs || draggable.position.absolute).top, y2 = y1 + draggable.helperProportions.height;
-	var l = droppable.offset.left, r = l + droppable.proportions.width,
-		t = droppable.offset.top, b = t + droppable.proportions.height;
-
-	switch (toleranceMode) {
-		case 'fit':
-			return (l <= x1 && x2 <= r
-				&& t <= y1 && y2 <= b);
-			break;
-		case 'intersect':
-			return (l < x1 + (draggable.helperProportions.width / 2) // Right Half
-				&& x2 - (draggable.helperProportions.width / 2) < r // Left Half
-				&& t < y1 + (draggable.helperProportions.height / 2) // Bottom Half
-				&& y2 - (draggable.helperProportions.height / 2) < b ); // Top Half
-			break;
-		case 'pointer':
-			var draggableLeft = ((draggable.positionAbs || draggable.position.absolute).left + (draggable.clickOffset || draggable.offset.click).left),
-				draggableTop = ((draggable.positionAbs || draggable.position.absolute).top + (draggable.clickOffset || draggable.offset.click).top),
-				isOver = $.ui.isOver(draggableTop, draggableLeft, t, l, droppable.proportions.height, droppable.proportions.width);
-			return isOver;
-			break;
-		case 'touch':
-			return (
-					(y1 >= t && y1 <= b) ||	// Top edge touching
-					(y2 >= t && y2 <= b) ||	// Bottom edge touching
-					(y1 < t && y2 > b)		// Surrounded vertically
-				) && (
-					(x1 >= l && x1 <= r) ||	// Left edge touching
-					(x2 >= l && x2 <= r) ||	// Right edge touching
-					(x1 < l && x2 > r)		// Surrounded horizontally
-				);
-			break;
-		default:
-			return false;
-			break;
-		}
-
-};
-
-/*
-	This manager tracks offsets of draggables and droppables
-*/
-$.ui.ddmanager = {
-	current: null,
-	droppables: { 'default': [] },
-	prepareOffsets: function(t, event) {
-
-		var m = $.ui.ddmanager.droppables[t.options.scope] || [];
-		var type = event ? event.type : null; // workaround for #2317
-		var list = (t.currentItem || t.element).find(":data(droppable)").andSelf();
-
-		droppablesLoop: for (var i = 0; i < m.length; i++) {
-
-			if(m[i].options.disabled || (t && !m[i].accept.call(m[i].element[0],(t.currentItem || t.element)))) continue;	//No disabled and non-accepted
-			for (var j=0; j < list.length; j++) { if(list[j] == m[i].element[0]) { m[i].proportions.height = 0; continue droppablesLoop; } }; //Filter out elements in the current dragged item
-			m[i].visible = m[i].element.css("display") != "none"; if(!m[i].visible) continue; 									//If the element is not visible, continue
-
-			if(type == "mousedown") m[i]._activate.call(m[i], event); //Activate the droppable if used directly from draggables
-
-			m[i].offset = m[i].element.offset();
-			m[i].proportions = { width: m[i].element[0].offsetWidth, height: m[i].element[0].offsetHeight };
-
-		}
-
-	},
-	drop: function(draggable, event) {
-
-		var dropped = false;
-		$.each($.ui.ddmanager.droppables[draggable.options.scope] || [], function() {
-
-			if(!this.options) return;
-			if (!this.options.disabled && this.visible && $.ui.intersect(draggable, this, this.options.tolerance))
-				dropped = this._drop.call(this, event) || dropped;
-
-			if (!this.options.disabled && this.visible && this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
-				this.isout = 1; this.isover = 0;
-				this._deactivate.call(this, event);
-			}
-
-		});
-		return dropped;
-
-	},
-	dragStart: function( draggable, event ) {
-		//Listen for scrolling so that if the dragging causes scrolling the position of the droppables can be recalculated (see #5003)
-		draggable.element.parentsUntil( "body" ).bind( "scroll.droppable", function() {
-			if( !draggable.options.refreshPositions ) $.ui.ddmanager.prepareOffsets( draggable, event );
-		});
-	},
-	drag: function(draggable, event) {
-
-		//If you have a highly dynamic page, you might try this option. It renders positions every time you move the mouse.
-		if(draggable.options.refreshPositions) $.ui.ddmanager.prepareOffsets(draggable, event);
-
-		//Run through all droppables and check their positions based on specific tolerance options
-		$.each($.ui.ddmanager.droppables[draggable.options.scope] || [], function() {
-
-			if(this.options.disabled || this.greedyChild || !this.visible) return;
-			var intersects = $.ui.intersect(draggable, this, this.options.tolerance);
-
-			var c = !intersects && this.isover == 1 ? 'isout' : (intersects && this.isover == 0 ? 'isover' : null);
-			if(!c) return;
-
-			var parentInstance;
-			if (this.options.greedy) {
-				// find droppable parents with same scope
-				var scope = this.options.scope;
-				var parent = this.element.parents(':data(droppable)').filter(function () {
-					return $.data(this, 'droppable').options.scope === scope;
-				});
-
-				if (parent.length) {
-					parentInstance = $.data(parent[0], 'droppable');
-					parentInstance.greedyChild = (c == 'isover' ? 1 : 0);
-				}
-			}
-
-			// we just moved into a greedy child
-			if (parentInstance && c == 'isover') {
-				parentInstance['isover'] = 0;
-				parentInstance['isout'] = 1;
-				parentInstance._out.call(parentInstance, event);
-			}
-
-			this[c] = 1; this[c == 'isout' ? 'isover' : 'isout'] = 0;
-			this[c == "isover" ? "_over" : "_out"].call(this, event);
-
-			// we just moved out of a greedy child
-			if (parentInstance && c == 'isout') {
-				parentInstance['isout'] = 0;
-				parentInstance['isover'] = 1;
-				parentInstance._over.call(parentInstance, event);
-			}
-		});
-
-	},
-	dragStop: function( draggable, event ) {
-		draggable.element.parentsUntil( "body" ).unbind( "scroll.droppable" );
-		//Call prepareOffsets one final time since IE does not fire return scroll events when overflow was caused by drag (see #5003)
-		if( !draggable.options.refreshPositions ) $.ui.ddmanager.prepareOffsets( draggable, event );
-	}
-};
-
-})(jQuery);
-;(jQuery.effects || (function($, undefined) {
-
-var backCompat = $.uiBackCompat !== false,
-	// prefix used for storing data on .data()
-	dataSpace = "ui-effects-";
-
-$.effects = {
-	effect: {}
-};
-
-/*!
- * jQuery Color Animations v2.0.0
- * http://jquery.com/
- *
- * Copyright 2012 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * Date: Mon Aug 13 13:41:02 2012 -0500
- */
-(function( jQuery, undefined ) {
-
-	var stepHooks = "backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor".split(" "),
-
-	// plusequals test for += 100 -= 100
-	rplusequals = /^([\-+])=\s*(\d+\.?\d*)/,
-	// a set of RE's that can match strings and generate color tuples.
-	stringParsers = [{
-			re: /rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,
-			parse: function( execResult ) {
-				return [
-					execResult[ 1 ],
-					execResult[ 2 ],
-					execResult[ 3 ],
-					execResult[ 4 ]
-				];
-			}
-		}, {
-			re: /rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,
-			parse: function( execResult ) {
-				return [
-					execResult[ 1 ] * 2.55,
-					execResult[ 2 ] * 2.55,
-					execResult[ 3 ] * 2.55,
-					execResult[ 4 ]
-				];
-			}
-		}, {
-			// this regex ignores A-F because it's compared against an already lowercased string
-			re: /#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,
-			parse: function( execResult ) {
-				return [
-					parseInt( execResult[ 1 ], 16 ),
-					parseInt( execResult[ 2 ], 16 ),
-					parseInt( execResult[ 3 ], 16 )
-				];
-			}
-		}, {
-			// this regex ignores A-F because it's compared against an already lowercased string
-			re: /#([a-f0-9])([a-f0-9])([a-f0-9])/,
-			parse: function( execResult ) {
-				return [
-					parseInt( execResult[ 1 ] + execResult[ 1 ], 16 ),
-					parseInt( execResult[ 2 ] + execResult[ 2 ], 16 ),
-					parseInt( execResult[ 3 ] + execResult[ 3 ], 16 )
-				];
-			}
-		}, {
-			re: /hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,
-			space: "hsla",
-			parse: function( execResult ) {
-				return [
-					execResult[ 1 ],
-					execResult[ 2 ] / 100,
-					execResult[ 3 ] / 100,
-					execResult[ 4 ]
-				];
-			}
-		}],
-
-	// jQuery.Color( )
-	color = jQuery.Color = function( color, green, blue, alpha ) {
-		return new jQuery.Color.fn.parse( color, green, blue, alpha );
-	},
-	spaces = {
-		rgba: {
-			props: {
-				red: {
-					idx: 0,
-					type: "byte"
-				},
-				green: {
-					idx: 1,
-					type: "byte"
-				},
-				blue: {
-					idx: 2,
-					type: "byte"
-				}
-			}
-		},
-
-		hsla: {
-			props: {
-				hue: {
-					idx: 0,
-					type: "degrees"
-				},
-				saturation: {
-					idx: 1,
-					type: "percent"
-				},
-				lightness: {
-					idx: 2,
-					type: "percent"
-				}
-			}
-		}
-	},
-	propTypes = {
-		"byte": {
-			floor: true,
-			max: 255
-		},
-		"percent": {
-			max: 1
-		},
-		"degrees": {
-			mod: 360,
-			floor: true
-		}
-	},
-	support = color.support = {},
-
-	// element for support tests
-	supportElem = jQuery( "
    " )[ 0 ],
-
-	// colors = jQuery.Color.names
-	colors,
-
-	// local aliases of functions called often
-	each = jQuery.each;
-
-// determine rgba support immediately
-supportElem.style.cssText = "background-color:rgba(1,1,1,.5)";
-support.rgba = supportElem.style.backgroundColor.indexOf( "rgba" ) > -1;
-
-// define cache name and alpha properties
-// for rgba and hsla spaces
-each( spaces, function( spaceName, space ) {
-	space.cache = "_" + spaceName;
-	space.props.alpha = {
-		idx: 3,
-		type: "percent",
-		def: 1
-	};
-});
-
-function clamp( value, prop, allowEmpty ) {
-	var type = propTypes[ prop.type ] || {};
-
-	if ( value == null ) {
-		return (allowEmpty || !prop.def) ? null : prop.def;
-	}
-
-	// ~~ is an short way of doing floor for positive numbers
-	value = type.floor ? ~~value : parseFloat( value );
-
-	// IE will pass in empty strings as value for alpha,
-	// which will hit this case
-	if ( isNaN( value ) ) {
-		return prop.def;
-	}
-
-	if ( type.mod ) {
-		// we add mod before modding to make sure that negatives values
-		// get converted properly: -10 -> 350
-		return (value + type.mod) % type.mod;
-	}
-
-	// for now all property types without mod have min and max
-	return 0 > value ? 0 : type.max < value ? type.max : value;
-}
-
-function stringParse( string ) {
-	var inst = color(),
-		rgba = inst._rgba = [];
-
-	string = string.toLowerCase();
-
-	each( stringParsers, function( i, parser ) {
-		var parsed,
-			match = parser.re.exec( string ),
-			values = match && parser.parse( match ),
-			spaceName = parser.space || "rgba";
-
-		if ( values ) {
-			parsed = inst[ spaceName ]( values );
-
-			// if this was an rgba parse the assignment might happen twice
-			// oh well....
-			inst[ spaces[ spaceName ].cache ] = parsed[ spaces[ spaceName ].cache ];
-			rgba = inst._rgba = parsed._rgba;
-
-			// exit each( stringParsers ) here because we matched
-			return false;
-		}
-	});
-
-	// Found a stringParser that handled it
-	if ( rgba.length ) {
-
-		// if this came from a parsed string, force "transparent" when alpha is 0
-		// chrome, (and maybe others) return "transparent" as rgba(0,0,0,0)
-		if ( rgba.join() === "0,0,0,0" ) {
-			jQuery.extend( rgba, colors.transparent );
-		}
-		return inst;
-	}
-
-	// named colors
-	return colors[ string ];
-}
-
-color.fn = jQuery.extend( color.prototype, {
-	parse: function( red, green, blue, alpha ) {
-		if ( red === undefined ) {
-			this._rgba = [ null, null, null, null ];
-			return this;
-		}
-		if ( red.jquery || red.nodeType ) {
-			red = jQuery( red ).css( green );
-			green = undefined;
-		}
-
-		var inst = this,
-			type = jQuery.type( red ),
-			rgba = this._rgba = [];
-
-		// more than 1 argument specified - assume ( red, green, blue, alpha )
-		if ( green !== undefined ) {
-			red = [ red, green, blue, alpha ];
-			type = "array";
-		}
-
-		if ( type === "string" ) {
-			return this.parse( stringParse( red ) || colors._default );
-		}
-
-		if ( type === "array" ) {
-			each( spaces.rgba.props, function( key, prop ) {
-				rgba[ prop.idx ] = clamp( red[ prop.idx ], prop );
-			});
-			return this;
-		}
-
-		if ( type === "object" ) {
-			if ( red instanceof color ) {
-				each( spaces, function( spaceName, space ) {
-					if ( red[ space.cache ] ) {
-						inst[ space.cache ] = red[ space.cache ].slice();
-					}
-				});
-			} else {
-				each( spaces, function( spaceName, space ) {
-					var cache = space.cache;
-					each( space.props, function( key, prop ) {
-
-						// if the cache doesn't exist, and we know how to convert
-						if ( !inst[ cache ] && space.to ) {
-
-							// if the value was null, we don't need to copy it
-							// if the key was alpha, we don't need to copy it either
-							if ( key === "alpha" || red[ key ] == null ) {
-								return;
-							}
-							inst[ cache ] = space.to( inst._rgba );
-						}
-
-						// this is the only case where we allow nulls for ALL properties.
-						// call clamp with alwaysAllowEmpty
-						inst[ cache ][ prop.idx ] = clamp( red[ key ], prop, true );
-					});
-
-					// everything defined but alpha?
-					if ( inst[ cache ] && $.inArray( null, inst[ cache ].slice( 0, 3 ) ) < 0 ) {
-						// use the default of 1
-						inst[ cache ][ 3 ] = 1;
-						if ( space.from ) {
-							inst._rgba = space.from( inst[ cache ] );
-						}
-					}
-				});
-			}
-			return this;
-		}
-	},
-	is: function( compare ) {
-		var is = color( compare ),
-			same = true,
-			inst = this;
-
-		each( spaces, function( _, space ) {
-			var localCache,
-				isCache = is[ space.cache ];
-			if (isCache) {
-				localCache = inst[ space.cache ] || space.to && space.to( inst._rgba ) || [];
-				each( space.props, function( _, prop ) {
-					if ( isCache[ prop.idx ] != null ) {
-						same = ( isCache[ prop.idx ] === localCache[ prop.idx ] );
-						return same;
-					}
-				});
-			}
-			return same;
-		});
-		return same;
-	},
-	_space: function() {
-		var used = [],
-			inst = this;
-		each( spaces, function( spaceName, space ) {
-			if ( inst[ space.cache ] ) {
-				used.push( spaceName );
-			}
-		});
-		return used.pop();
-	},
-	transition: function( other, distance ) {
-		var end = color( other ),
-			spaceName = end._space(),
-			space = spaces[ spaceName ],
-			startColor = this.alpha() === 0 ? color( "transparent" ) : this,
-			start = startColor[ space.cache ] || space.to( startColor._rgba ),
-			result = start.slice();
-
-		end = end[ space.cache ];
-		each( space.props, function( key, prop ) {
-			var index = prop.idx,
-				startValue = start[ index ],
-				endValue = end[ index ],
-				type = propTypes[ prop.type ] || {};
-
-			// if null, don't override start value
-			if ( endValue === null ) {
-				return;
-			}
-			// if null - use end
-			if ( startValue === null ) {
-				result[ index ] = endValue;
-			} else {
-				if ( type.mod ) {
-					if ( endValue - startValue > type.mod / 2 ) {
-						startValue += type.mod;
-					} else if ( startValue - endValue > type.mod / 2 ) {
-						startValue -= type.mod;
-					}
-				}
-				result[ index ] = clamp( ( endValue - startValue ) * distance + startValue, prop );
-			}
-		});
-		return this[ spaceName ]( result );
-	},
-	blend: function( opaque ) {
-		// if we are already opaque - return ourself
-		if ( this._rgba[ 3 ] === 1 ) {
-			return this;
-		}
-
-		var rgb = this._rgba.slice(),
-			a = rgb.pop(),
-			blend = color( opaque )._rgba;
-
-		return color( jQuery.map( rgb, function( v, i ) {
-			return ( 1 - a ) * blend[ i ] + a * v;
-		}));
-	},
-	toRgbaString: function() {
-		var prefix = "rgba(",
-			rgba = jQuery.map( this._rgba, function( v, i ) {
-				return v == null ? ( i > 2 ? 1 : 0 ) : v;
-			});
-
-		if ( rgba[ 3 ] === 1 ) {
-			rgba.pop();
-			prefix = "rgb(";
-		}
-
-		return prefix + rgba.join() + ")";
-	},
-	toHslaString: function() {
-		var prefix = "hsla(",
-			hsla = jQuery.map( this.hsla(), function( v, i ) {
-				if ( v == null ) {
-					v = i > 2 ? 1 : 0;
-				}
-
-				// catch 1 and 2
-				if ( i && i < 3 ) {
-					v = Math.round( v * 100 ) + "%";
-				}
-				return v;
-			});
-
-		if ( hsla[ 3 ] === 1 ) {
-			hsla.pop();
-			prefix = "hsl(";
-		}
-		return prefix + hsla.join() + ")";
-	},
-	toHexString: function( includeAlpha ) {
-		var rgba = this._rgba.slice(),
-			alpha = rgba.pop();
-
-		if ( includeAlpha ) {
-			rgba.push( ~~( alpha * 255 ) );
-		}
-
-		return "#" + jQuery.map( rgba, function( v ) {
-
-			// default to 0 when nulls exist
-			v = ( v || 0 ).toString( 16 );
-			return v.length === 1 ? "0" + v : v;
-		}).join("");
-	},
-	toString: function() {
-		return this._rgba[ 3 ] === 0 ? "transparent" : this.toRgbaString();
-	}
-});
-color.fn.parse.prototype = color.fn;
-
-// hsla conversions adapted from:
-// https://code.google.com/p/maashaack/source/browse/packages/graphics/trunk/src/graphics/colors/HUE2RGB.as?r=5021
-
-function hue2rgb( p, q, h ) {
-	h = ( h + 1 ) % 1;
-	if ( h * 6 < 1 ) {
-		return p + (q - p) * h * 6;
-	}
-	if ( h * 2 < 1) {
-		return q;
-	}
-	if ( h * 3 < 2 ) {
-		return p + (q - p) * ((2/3) - h) * 6;
-	}
-	return p;
-}
-
-spaces.hsla.to = function ( rgba ) {
-	if ( rgba[ 0 ] == null || rgba[ 1 ] == null || rgba[ 2 ] == null ) {
-		return [ null, null, null, rgba[ 3 ] ];
-	}
-	var r = rgba[ 0 ] / 255,
-		g = rgba[ 1 ] / 255,
-		b = rgba[ 2 ] / 255,
-		a = rgba[ 3 ],
-		max = Math.max( r, g, b ),
-		min = Math.min( r, g, b ),
-		diff = max - min,
-		add = max + min,
-		l = add * 0.5,
-		h, s;
-
-	if ( min === max ) {
-		h = 0;
-	} else if ( r === max ) {
-		h = ( 60 * ( g - b ) / diff ) + 360;
-	} else if ( g === max ) {
-		h = ( 60 * ( b - r ) / diff ) + 120;
-	} else {
-		h = ( 60 * ( r - g ) / diff ) + 240;
-	}
-
-	if ( l === 0 || l === 1 ) {
-		s = l;
-	} else if ( l <= 0.5 ) {
-		s = diff / add;
-	} else {
-		s = diff / ( 2 - add );
-	}
-	return [ Math.round(h) % 360, s, l, a == null ? 1 : a ];
-};
-
-spaces.hsla.from = function ( hsla ) {
-	if ( hsla[ 0 ] == null || hsla[ 1 ] == null || hsla[ 2 ] == null ) {
-		return [ null, null, null, hsla[ 3 ] ];
-	}
-	var h = hsla[ 0 ] / 360,
-		s = hsla[ 1 ],
-		l = hsla[ 2 ],
-		a = hsla[ 3 ],
-		q = l <= 0.5 ? l * ( 1 + s ) : l + s - l * s,
-		p = 2 * l - q;
-
-	return [
-		Math.round( hue2rgb( p, q, h + ( 1 / 3 ) ) * 255 ),
-		Math.round( hue2rgb( p, q, h ) * 255 ),
-		Math.round( hue2rgb( p, q, h - ( 1 / 3 ) ) * 255 ),
-		a
-	];
-};
-
-
-each( spaces, function( spaceName, space ) {
-	var props = space.props,
-		cache = space.cache,
-		to = space.to,
-		from = space.from;
-
-	// makes rgba() and hsla()
-	color.fn[ spaceName ] = function( value ) {
-
-		// generate a cache for this space if it doesn't exist
-		if ( to && !this[ cache ] ) {
-			this[ cache ] = to( this._rgba );
-		}
-		if ( value === undefined ) {
-			return this[ cache ].slice();
-		}
-
-		var ret,
-			type = jQuery.type( value ),
-			arr = ( type === "array" || type === "object" ) ? value : arguments,
-			local = this[ cache ].slice();
-
-		each( props, function( key, prop ) {
-			var val = arr[ type === "object" ? key : prop.idx ];
-			if ( val == null ) {
-				val = local[ prop.idx ];
-			}
-			local[ prop.idx ] = clamp( val, prop );
-		});
-
-		if ( from ) {
-			ret = color( from( local ) );
-			ret[ cache ] = local;
-			return ret;
-		} else {
-			return color( local );
-		}
-	};
-
-	// makes red() green() blue() alpha() hue() saturation() lightness()
-	each( props, function( key, prop ) {
-		// alpha is included in more than one space
-		if ( color.fn[ key ] ) {
-			return;
-		}
-		color.fn[ key ] = function( value ) {
-			var vtype = jQuery.type( value ),
-				fn = ( key === "alpha" ? ( this._hsla ? "hsla" : "rgba" ) : spaceName ),
-				local = this[ fn ](),
-				cur = local[ prop.idx ],
-				match;
-
-			if ( vtype === "undefined" ) {
-				return cur;
-			}
-
-			if ( vtype === "function" ) {
-				value = value.call( this, cur );
-				vtype = jQuery.type( value );
-			}
-			if ( value == null && prop.empty ) {
-				return this;
-			}
-			if ( vtype === "string" ) {
-				match = rplusequals.exec( value );
-				if ( match ) {
-					value = cur + parseFloat( match[ 2 ] ) * ( match[ 1 ] === "+" ? 1 : -1 );
-				}
-			}
-			local[ prop.idx ] = value;
-			return this[ fn ]( local );
-		};
-	});
-});
-
-// add .fx.step functions
-each( stepHooks, function( i, hook ) {
-	jQuery.cssHooks[ hook ] = {
-		set: function( elem, value ) {
-			var parsed, curElem,
-				backgroundColor = "";
-
-			if ( jQuery.type( value ) !== "string" || ( parsed = stringParse( value ) ) ) {
-				value = color( parsed || value );
-				if ( !support.rgba && value._rgba[ 3 ] !== 1 ) {
-					curElem = hook === "backgroundColor" ? elem.parentNode : elem;
-					while (
-						(backgroundColor === "" || backgroundColor === "transparent") &&
-						curElem && curElem.style
-					) {
-						try {
-							backgroundColor = jQuery.css( curElem, "backgroundColor" );
-							curElem = curElem.parentNode;
-						} catch ( e ) {
-						}
-					}
-
-					value = value.blend( backgroundColor && backgroundColor !== "transparent" ?
-						backgroundColor :
-						"_default" );
-				}
-
-				value = value.toRgbaString();
-			}
-			try {
-				elem.style[ hook ] = value;
-			} catch( error ) {
-				// wrapped to prevent IE from throwing errors on "invalid" values like 'auto' or 'inherit'
-			}
-		}
-	};
-	jQuery.fx.step[ hook ] = function( fx ) {
-		if ( !fx.colorInit ) {
-			fx.start = color( fx.elem, hook );
-			fx.end = color( fx.end );
-			fx.colorInit = true;
-		}
-		jQuery.cssHooks[ hook ].set( fx.elem, fx.start.transition( fx.end, fx.pos ) );
-	};
-});
-
-jQuery.cssHooks.borderColor = {
-	expand: function( value ) {
-		var expanded = {};
-
-		each( [ "Top", "Right", "Bottom", "Left" ], function( i, part ) {
-			expanded[ "border" + part + "Color" ] = value;
-		});
-		return expanded;
-	}
-};
-
-// Basic color names only.
-// Usage of any of the other color names requires adding yourself or including
-// jquery.color.svg-names.js.
-colors = jQuery.Color.names = {
-	// 4.1. Basic color keywords
-	aqua: "#00ffff",
-	black: "#000000",
-	blue: "#0000ff",
-	fuchsia: "#ff00ff",
-	gray: "#808080",
-	green: "#008000",
-	lime: "#00ff00",
-	maroon: "#800000",
-	navy: "#000080",
-	olive: "#808000",
-	purple: "#800080",
-	red: "#ff0000",
-	silver: "#c0c0c0",
-	teal: "#008080",
-	white: "#ffffff",
-	yellow: "#ffff00",
-
-	// 4.2.3. "transparent" color keyword
-	transparent: [ null, null, null, 0 ],
-
-	_default: "#ffffff"
-};
-
-})( jQuery );
-
-
-
-/******************************************************************************/
-/****************************** CLASS ANIMATIONS ******************************/
-/******************************************************************************/
-(function() {
-
-var classAnimationActions = [ "add", "remove", "toggle" ],
-	shorthandStyles = {
-		border: 1,
-		borderBottom: 1,
-		borderColor: 1,
-		borderLeft: 1,
-		borderRight: 1,
-		borderTop: 1,
-		borderWidth: 1,
-		margin: 1,
-		padding: 1
-	};
-
-$.each([ "borderLeftStyle", "borderRightStyle", "borderBottomStyle", "borderTopStyle" ], function( _, prop ) {
-	$.fx.step[ prop ] = function( fx ) {
-		if ( fx.end !== "none" && !fx.setAttr || fx.pos === 1 && !fx.setAttr ) {
-			jQuery.style( fx.elem, prop, fx.end );
-			fx.setAttr = true;
-		}
-	};
-});
-
-function getElementStyles() {
-	var style = this.ownerDocument.defaultView ?
-			this.ownerDocument.defaultView.getComputedStyle( this, null ) :
-			this.currentStyle,
-		newStyle = {},
-		key,
-		len;
-
-	// webkit enumerates style porperties
-	if ( style && style.length && style[ 0 ] && style[ style[ 0 ] ] ) {
-		len = style.length;
-		while ( len-- ) {
-			key = style[ len ];
-			if ( typeof style[ key ] === "string" ) {
-				newStyle[ $.camelCase( key ) ] = style[ key ];
-			}
-		}
-	} else {
-		for ( key in style ) {
-			if ( typeof style[ key ] === "string" ) {
-				newStyle[ key ] = style[ key ];
-			}
-		}
-	}
-
-	return newStyle;
-}
-
-
-function styleDifference( oldStyle, newStyle ) {
-	var diff = {},
-		name, value;
-
-	for ( name in newStyle ) {
-		value = newStyle[ name ];
-		if ( oldStyle[ name ] !== value ) {
-			if ( !shorthandStyles[ name ] ) {
-				if ( $.fx.step[ name ] || !isNaN( parseFloat( value ) ) ) {
-					diff[ name ] = value;
-				}
-			}
-		}
-	}
-
-	return diff;
-}
-
-$.effects.animateClass = function( value, duration, easing, callback ) {
-	var o = $.speed( duration, easing, callback );
-
-	return this.queue( function() {
-		var animated = $( this ),
-			baseClass = animated.attr( "class" ) || "",
-			applyClassChange,
-			allAnimations = o.children ? animated.find( "*" ).andSelf() : animated;
-
-		// map the animated objects to store the original styles.
-		allAnimations = allAnimations.map(function() {
-			var el = $( this );
-			return {
-				el: el,
-				start: getElementStyles.call( this )
-			};
-		});
-
-		// apply class change
-		applyClassChange = function() {
-			$.each( classAnimationActions, function(i, action) {
-				if ( value[ action ] ) {
-					animated[ action + "Class" ]( value[ action ] );
-				}
-			});
-		};
-		applyClassChange();
-
-		// map all animated objects again - calculate new styles and diff
-		allAnimations = allAnimations.map(function() {
-			this.end = getElementStyles.call( this.el[ 0 ] );
-			this.diff = styleDifference( this.start, this.end );
-			return this;
-		});
-
-		// apply original class
-		animated.attr( "class", baseClass );
-
-		// map all animated objects again - this time collecting a promise
-		allAnimations = allAnimations.map(function() {
-			var styleInfo = this,
-				dfd = $.Deferred(),
-				opts = jQuery.extend({}, o, {
-					queue: false,
-					complete: function() {
-						dfd.resolve( styleInfo );
-					}
-				});
-
-			this.el.animate( this.diff, opts );
-			return dfd.promise();
-		});
-
-		// once all animations have completed:
-		$.when.apply( $, allAnimations.get() ).done(function() {
-
-			// set the final class
-			applyClassChange();
-
-			// for each animated element,
-			// clear all css properties that were animated
-			$.each( arguments, function() {
-				var el = this.el;
-				$.each( this.diff, function(key) {
-					el.css( key, '' );
-				});
-			});
-
-			// this is guarnteed to be there if you use jQuery.speed()
-			// it also handles dequeuing the next anim...
-			o.complete.call( animated[ 0 ] );
-		});
-	});
-};
-
-$.fn.extend({
-	_addClass: $.fn.addClass,
-	addClass: function( classNames, speed, easing, callback ) {
-		return speed ?
-			$.effects.animateClass.call( this,
-				{ add: classNames }, speed, easing, callback ) :
-			this._addClass( classNames );
-	},
-
-	_removeClass: $.fn.removeClass,
-	removeClass: function( classNames, speed, easing, callback ) {
-		return speed ?
-			$.effects.animateClass.call( this,
-				{ remove: classNames }, speed, easing, callback ) :
-			this._removeClass( classNames );
-	},
-
-	_toggleClass: $.fn.toggleClass,
-	toggleClass: function( classNames, force, speed, easing, callback ) {
-		if ( typeof force === "boolean" || force === undefined ) {
-			if ( !speed ) {
-				// without speed parameter
-				return this._toggleClass( classNames, force );
-			} else {
-				return $.effects.animateClass.call( this,
-					(force ? { add: classNames } : { remove: classNames }),
-					speed, easing, callback );
-			}
-		} else {
-			// without force parameter
-			return $.effects.animateClass.call( this,
-				{ toggle: classNames }, force, speed, easing );
-		}
-	},
-
-	switchClass: function( remove, add, speed, easing, callback) {
-		return $.effects.animateClass.call( this, {
-			add: add,
-			remove: remove
-		}, speed, easing, callback );
-	}
-});
-
-})();
-
-/******************************************************************************/
-/*********************************** EFFECTS **********************************/
-/******************************************************************************/
-
-(function() {
-
-$.extend( $.effects, {
-	version: "1.9.2",
-
-	// Saves a set of properties in a data storage
-	save: function( element, set ) {
-		for( var i=0; i < set.length; i++ ) {
-			if ( set[ i ] !== null ) {
-				element.data( dataSpace + set[ i ], element[ 0 ].style[ set[ i ] ] );
-			}
-		}
-	},
-
-	// Restores a set of previously saved properties from a data storage
-	restore: function( element, set ) {
-		var val, i;
-		for( i=0; i < set.length; i++ ) {
-			if ( set[ i ] !== null ) {
-				val = element.data( dataSpace + set[ i ] );
-				// support: jQuery 1.6.2
-				// http://bugs.jquery.com/ticket/9917
-				// jQuery 1.6.2 incorrectly returns undefined for any falsy value.
-				// We can't differentiate between "" and 0 here, so we just assume
-				// empty string since it's likely to be a more common value...
-				if ( val === undefined ) {
-					val = "";
-				}
-				element.css( set[ i ], val );
-			}
-		}
-	},
-
-	setMode: function( el, mode ) {
-		if (mode === "toggle") {
-			mode = el.is( ":hidden" ) ? "show" : "hide";
-		}
-		return mode;
-	},
-
-	// Translates a [top,left] array into a baseline value
-	// this should be a little more flexible in the future to handle a string & hash
-	getBaseline: function( origin, original ) {
-		var y, x;
-		switch ( origin[ 0 ] ) {
-			case "top": y = 0; break;
-			case "middle": y = 0.5; break;
-			case "bottom": y = 1; break;
-			default: y = origin[ 0 ] / original.height;
-		}
-		switch ( origin[ 1 ] ) {
-			case "left": x = 0; break;
-			case "center": x = 0.5; break;
-			case "right": x = 1; break;
-			default: x = origin[ 1 ] / original.width;
-		}
-		return {
-			x: x,
-			y: y
-		};
-	},
-
-	// Wraps the element around a wrapper that copies position properties
-	createWrapper: function( element ) {
-
-		// if the element is already wrapped, return it
-		if ( element.parent().is( ".ui-effects-wrapper" )) {
-			return element.parent();
-		}
-
-		// wrap the element
-		var props = {
-				width: element.outerWidth(true),
-				height: element.outerHeight(true),
-				"float": element.css( "float" )
-			},
-			wrapper = $( "
    " )
-				.addClass( "ui-effects-wrapper" )
-				.css({
-					fontSize: "100%",
-					background: "transparent",
-					border: "none",
-					margin: 0,
-					padding: 0
-				}),
-			// Store the size in case width/height are defined in % - Fixes #5245
-			size = {
-				width: element.width(),
-				height: element.height()
-			},
-			active = document.activeElement;
-
-		// support: Firefox
-		// Firefox incorrectly exposes anonymous content
-		// https://bugzilla.mozilla.org/show_bug.cgi?id=561664
-		try {
-			active.id;
-		} catch( e ) {
-			active = document.body;
-		}
-
-		element.wrap( wrapper );
-
-		// Fixes #7595 - Elements lose focus when wrapped.
-		if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
-			$( active ).focus();
-		}
-
-		wrapper = element.parent(); //Hotfix for jQuery 1.4 since some change in wrap() seems to actually lose the reference to the wrapped element
-
-		// transfer positioning properties to the wrapper
-		if ( element.css( "position" ) === "static" ) {
-			wrapper.css({ position: "relative" });
-			element.css({ position: "relative" });
-		} else {
-			$.extend( props, {
-				position: element.css( "position" ),
-				zIndex: element.css( "z-index" )
-			});
-			$.each([ "top", "left", "bottom", "right" ], function(i, pos) {
-				props[ pos ] = element.css( pos );
-				if ( isNaN( parseInt( props[ pos ], 10 ) ) ) {
-					props[ pos ] = "auto";
-				}
-			});
-			element.css({
-				position: "relative",
-				top: 0,
-				left: 0,
-				right: "auto",
-				bottom: "auto"
-			});
-		}
-		element.css(size);
-
-		return wrapper.css( props ).show();
-	},
-
-	removeWrapper: function( element ) {
-		var active = document.activeElement;
-
-		if ( element.parent().is( ".ui-effects-wrapper" ) ) {
-			element.parent().replaceWith( element );
-
-			// Fixes #7595 - Elements lose focus when wrapped.
-			if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
-				$( active ).focus();
-			}
-		}
-
-
-		return element;
-	},
-
-	setTransition: function( element, list, factor, value ) {
-		value = value || {};
-		$.each( list, function( i, x ) {
-			var unit = element.cssUnit( x );
-			if ( unit[ 0 ] > 0 ) {
-				value[ x ] = unit[ 0 ] * factor + unit[ 1 ];
-			}
-		});
-		return value;
-	}
-});
-
-// return an effect options object for the given parameters:
-function _normalizeArguments( effect, options, speed, callback ) {
-
-	// allow passing all options as the first parameter
-	if ( $.isPlainObject( effect ) ) {
-		options = effect;
-		effect = effect.effect;
-	}
-
-	// convert to an object
-	effect = { effect: effect };
-
-	// catch (effect, null, ...)
-	if ( options == null ) {
-		options = {};
-	}
-
-	// catch (effect, callback)
-	if ( $.isFunction( options ) ) {
-		callback = options;
-		speed = null;
-		options = {};
-	}
-
-	// catch (effect, speed, ?)
-	if ( typeof options === "number" || $.fx.speeds[ options ] ) {
-		callback = speed;
-		speed = options;
-		options = {};
-	}
-
-	// catch (effect, options, callback)
-	if ( $.isFunction( speed ) ) {
-		callback = speed;
-		speed = null;
-	}
-
-	// add options to effect
-	if ( options ) {
-		$.extend( effect, options );
-	}
-
-	speed = speed || options.duration;
-	effect.duration = $.fx.off ? 0 :
-		typeof speed === "number" ? speed :
-		speed in $.fx.speeds ? $.fx.speeds[ speed ] :
-		$.fx.speeds._default;
-
-	effect.complete = callback || options.complete;
-
-	return effect;
-}
-
-function standardSpeed( speed ) {
-	// valid standard speeds
-	if ( !speed || typeof speed === "number" || $.fx.speeds[ speed ] ) {
-		return true;
-	}
-
-	// invalid strings - treat as "normal" speed
-	if ( typeof speed === "string" && !$.effects.effect[ speed ] ) {
-		// TODO: remove in 2.0 (#7115)
-		if ( backCompat && $.effects[ speed ] ) {
-			return false;
-		}
-		return true;
-	}
-
-	return false;
-}
-
-$.fn.extend({
-	effect: function( /* effect, options, speed, callback */ ) {
-		var args = _normalizeArguments.apply( this, arguments ),
-			mode = args.mode,
-			queue = args.queue,
-			effectMethod = $.effects.effect[ args.effect ],
-
-			// DEPRECATED: remove in 2.0 (#7115)
-			oldEffectMethod = !effectMethod && backCompat && $.effects[ args.effect ];
-
-		if ( $.fx.off || !( effectMethod || oldEffectMethod ) ) {
-			// delegate to the original method (e.g., .show()) if possible
-			if ( mode ) {
-				return this[ mode ]( args.duration, args.complete );
-			} else {
-				return this.each( function() {
-					if ( args.complete ) {
-						args.complete.call( this );
-					}
-				});
-			}
-		}
-
-		function run( next ) {
-			var elem = $( this ),
-				complete = args.complete,
-				mode = args.mode;
-
-			function done() {
-				if ( $.isFunction( complete ) ) {
-					complete.call( elem[0] );
-				}
-				if ( $.isFunction( next ) ) {
-					next();
-				}
-			}
-
-			// if the element is hiddden and mode is hide,
-			// or element is visible and mode is show
-			if ( elem.is( ":hidden" ) ? mode === "hide" : mode === "show" ) {
-				done();
-			} else {
-				effectMethod.call( elem[0], args, done );
-			}
-		}
-
-		// TODO: remove this check in 2.0, effectMethod will always be true
-		if ( effectMethod ) {
-			return queue === false ? this.each( run ) : this.queue( queue || "fx", run );
-		} else {
-			// DEPRECATED: remove in 2.0 (#7115)
-			return oldEffectMethod.call(this, {
-				options: args,
-				duration: args.duration,
-				callback: args.complete,
-				mode: args.mode
-			});
-		}
-	},
-
-	_show: $.fn.show,
-	show: function( speed ) {
-		if ( standardSpeed( speed ) ) {
-			return this._show.apply( this, arguments );
-		} else {
-			var args = _normalizeArguments.apply( this, arguments );
-			args.mode = "show";
-			return this.effect.call( this, args );
-		}
-	},
-
-	_hide: $.fn.hide,
-	hide: function( speed ) {
-		if ( standardSpeed( speed ) ) {
-			return this._hide.apply( this, arguments );
-		} else {
-			var args = _normalizeArguments.apply( this, arguments );
-			args.mode = "hide";
-			return this.effect.call( this, args );
-		}
-	},
-
-	// jQuery core overloads toggle and creates _toggle
-	__toggle: $.fn.toggle,
-	toggle: function( speed ) {
-		if ( standardSpeed( speed ) || typeof speed === "boolean" || $.isFunction( speed ) ) {
-			return this.__toggle.apply( this, arguments );
-		} else {
-			var args = _normalizeArguments.apply( this, arguments );
-			args.mode = "toggle";
-			return this.effect.call( this, args );
-		}
-	},
-
-	// helper functions
-	cssUnit: function(key) {
-		var style = this.css( key ),
-			val = [];
-
-		$.each( [ "em", "px", "%", "pt" ], function( i, unit ) {
-			if ( style.indexOf( unit ) > 0 ) {
-				val = [ parseFloat( style ), unit ];
-			}
-		});
-		return val;
-	}
-});
-
-})();
-
-/******************************************************************************/
-/*********************************** EASING ***********************************/
-/******************************************************************************/
-
-(function() {
-
-// based on easing equations from Robert Penner (http://www.robertpenner.com/easing)
-
-var baseEasings = {};
-
-$.each( [ "Quad", "Cubic", "Quart", "Quint", "Expo" ], function( i, name ) {
-	baseEasings[ name ] = function( p ) {
-		return Math.pow( p, i + 2 );
-	};
-});
-
-$.extend( baseEasings, {
-	Sine: function ( p ) {
-		return 1 - Math.cos( p * Math.PI / 2 );
-	},
-	Circ: function ( p ) {
-		return 1 - Math.sqrt( 1 - p * p );
-	},
-	Elastic: function( p ) {
-		return p === 0 || p === 1 ? p :
-			-Math.pow( 2, 8 * (p - 1) ) * Math.sin( ( (p - 1) * 80 - 7.5 ) * Math.PI / 15 );
-	},
-	Back: function( p ) {
-		return p * p * ( 3 * p - 2 );
-	},
-	Bounce: function ( p ) {
-		var pow2,
-			bounce = 4;
-
-		while ( p < ( ( pow2 = Math.pow( 2, --bounce ) ) - 1 ) / 11 ) {}
-		return 1 / Math.pow( 4, 3 - bounce ) - 7.5625 * Math.pow( ( pow2 * 3 - 2 ) / 22 - p, 2 );
-	}
-});
-
-$.each( baseEasings, function( name, easeIn ) {
-	$.easing[ "easeIn" + name ] = easeIn;
-	$.easing[ "easeOut" + name ] = function( p ) {
-		return 1 - easeIn( 1 - p );
-	};
-	$.easing[ "easeInOut" + name ] = function( p ) {
-		return p < 0.5 ?
-			easeIn( p * 2 ) / 2 :
-			1 - easeIn( p * -2 + 2 ) / 2;
-	};
-});
-
-})();
-
-})(jQuery));
-(function( $, undefined ) {
-
-var rvertical = /up|down|vertical/,
-	rpositivemotion = /up|left|vertical|horizontal/;
-
-$.effects.effect.blind = function( o, done ) {
-	// Create element
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
-		mode = $.effects.setMode( el, o.mode || "hide" ),
-		direction = o.direction || "up",
-		vertical = rvertical.test( direction ),
-		ref = vertical ? "height" : "width",
-		ref2 = vertical ? "top" : "left",
-		motion = rpositivemotion.test( direction ),
-		animation = {},
-		show = mode === "show",
-		wrapper, distance, margin;
-
-	// if already wrapped, the wrapper's properties are my property. #6245
-	if ( el.parent().is( ".ui-effects-wrapper" ) ) {
-		$.effects.save( el.parent(), props );
-	} else {
-		$.effects.save( el, props );
-	}
-	el.show();
-	wrapper = $.effects.createWrapper( el ).css({
-		overflow: "hidden"
-	});
-
-	distance = wrapper[ ref ]();
-	margin = parseFloat( wrapper.css( ref2 ) ) || 0;
-
-	animation[ ref ] = show ? distance : 0;
-	if ( !motion ) {
-		el
-			.css( vertical ? "bottom" : "right", 0 )
-			.css( vertical ? "top" : "left", "auto" )
-			.css({ position: "absolute" });
-
-		animation[ ref2 ] = show ? margin : distance + margin;
-	}
-
-	// start at 0 if we are showing
-	if ( show ) {
-		wrapper.css( ref, 0 );
-		if ( ! motion ) {
-			wrapper.css( ref2, margin + distance );
-		}
-	}
-
-	// Animate
-	wrapper.animate( animation, {
-		duration: o.duration,
-		easing: o.easing,
-		queue: false,
-		complete: function() {
-			if ( mode === "hide" ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		}
-	});
-
-};
-
-})(jQuery);
-(function( $, undefined ) {
-
-$.effects.effect.bounce = function( o, done ) {
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
-
-		// defaults:
-		mode = $.effects.setMode( el, o.mode || "effect" ),
-		hide = mode === "hide",
-		show = mode === "show",
-		direction = o.direction || "up",
-		distance = o.distance,
-		times = o.times || 5,
-
-		// number of internal animations
-		anims = times * 2 + ( show || hide ? 1 : 0 ),
-		speed = o.duration / anims,
-		easing = o.easing,
-
-		// utility:
-		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
-		motion = ( direction === "up" || direction === "left" ),
-		i,
-		upAnim,
-		downAnim,
-
-		// we will need to re-assemble the queue to stack our animations in place
-		queue = el.queue(),
-		queuelen = queue.length;
-
-	// Avoid touching opacity to prevent clearType and PNG issues in IE
-	if ( show || hide ) {
-		props.push( "opacity" );
-	}
-
-	$.effects.save( el, props );
-	el.show();
-	$.effects.createWrapper( el ); // Create Wrapper
-
-	// default distance for the BIGGEST bounce is the outer Distance / 3
-	if ( !distance ) {
-		distance = el[ ref === "top" ? "outerHeight" : "outerWidth" ]() / 3;
-	}
-
-	if ( show ) {
-		downAnim = { opacity: 1 };
-		downAnim[ ref ] = 0;
-
-		// if we are showing, force opacity 0 and set the initial position
-		// then do the "first" animation
-		el.css( "opacity", 0 )
-			.css( ref, motion ? -distance * 2 : distance * 2 )
-			.animate( downAnim, speed, easing );
-	}
-
-	// start at the smallest distance if we are hiding
-	if ( hide ) {
-		distance = distance / Math.pow( 2, times - 1 );
-	}
-
-	downAnim = {};
-	downAnim[ ref ] = 0;
-	// Bounces up/down/left/right then back to 0 -- times * 2 animations happen here
-	for ( i = 0; i < times; i++ ) {
-		upAnim = {};
-		upAnim[ ref ] = ( motion ? "-=" : "+=" ) + distance;
-
-		el.animate( upAnim, speed, easing )
-			.animate( downAnim, speed, easing );
-
-		distance = hide ? distance * 2 : distance / 2;
-	}
-
-	// Last Bounce when Hiding
-	if ( hide ) {
-		upAnim = { opacity: 0 };
-		upAnim[ ref ] = ( motion ? "-=" : "+=" ) + distance;
-
-		el.animate( upAnim, speed, easing );
-	}
-
-	el.queue(function() {
-		if ( hide ) {
-			el.hide();
-		}
-		$.effects.restore( el, props );
-		$.effects.removeWrapper( el );
-		done();
-	});
-
-	// inject all the animations we just queued to be first in line (after "inprogress")
-	if ( queuelen > 1) {
-		queue.splice.apply( queue,
-			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
-	}
-	el.dequeue();
-
-};
-
-})(jQuery);
-(function( $, undefined ) {
-
-$.effects.effect.clip = function( o, done ) {
-	// Create element
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
-		mode = $.effects.setMode( el, o.mode || "hide" ),
-		show = mode === "show",
-		direction = o.direction || "vertical",
-		vert = direction === "vertical",
-		size = vert ? "height" : "width",
-		position = vert ? "top" : "left",
-		animation = {},
-		wrapper, animate, distance;
-
-	// Save & Show
-	$.effects.save( el, props );
-	el.show();
-
-	// Create Wrapper
-	wrapper = $.effects.createWrapper( el ).css({
-		overflow: "hidden"
-	});
-	animate = ( el[0].tagName === "IMG" ) ? wrapper : el;
-	distance = animate[ size ]();
-
-	// Shift
-	if ( show ) {
-		animate.css( size, 0 );
-		animate.css( position, distance / 2 );
-	}
-
-	// Create Animation Object:
-	animation[ size ] = show ? distance : 0;
-	animation[ position ] = show ? 0 : distance / 2;
-
-	// Animate
-	animate.animate( animation, {
-		queue: false,
-		duration: o.duration,
-		easing: o.easing,
-		complete: function() {
-			if ( !show ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		}
-	});
-
-};
-
-})(jQuery);
-(function( $, undefined ) {
-
-$.effects.effect.drop = function( o, done ) {
-
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "opacity", "height", "width" ],
-		mode = $.effects.setMode( el, o.mode || "hide" ),
-		show = mode === "show",
-		direction = o.direction || "left",
-		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
-		motion = ( direction === "up" || direction === "left" ) ? "pos" : "neg",
-		animation = {
-			opacity: show ? 1 : 0
-		},
-		distance;
-
-	// Adjust
-	$.effects.save( el, props );
-	el.show();
-	$.effects.createWrapper( el );
-
-	distance = o.distance || el[ ref === "top" ? "outerHeight": "outerWidth" ]( true ) / 2;
-
-	if ( show ) {
-		el
-			.css( "opacity", 0 )
-			.css( ref, motion === "pos" ? -distance : distance );
-	}
-
-	// Animation
-	animation[ ref ] = ( show ?
-		( motion === "pos" ? "+=" : "-=" ) :
-		( motion === "pos" ? "-=" : "+=" ) ) +
-		distance;
-
-	// Animate
-	el.animate( animation, {
-		queue: false,
-		duration: o.duration,
-		easing: o.easing,
-		complete: function() {
-			if ( mode === "hide" ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		}
-	});
-};
-
-})(jQuery);
-(function( $, undefined ) {
-
-$.effects.effect.explode = function( o, done ) {
-
-	var rows = o.pieces ? Math.round( Math.sqrt( o.pieces ) ) : 3,
-		cells = rows,
-		el = $( this ),
-		mode = $.effects.setMode( el, o.mode || "hide" ),
-		show = mode === "show",
-
-		// show and then visibility:hidden the element before calculating offset
-		offset = el.show().css( "visibility", "hidden" ).offset(),
-
-		// width and height of a piece
-		width = Math.ceil( el.outerWidth() / cells ),
-		height = Math.ceil( el.outerHeight() / rows ),
-		pieces = [],
-
-		// loop
-		i, j, left, top, mx, my;
-
-	// children animate complete:
-	function childComplete() {
-		pieces.push( this );
-		if ( pieces.length === rows * cells ) {
-			animComplete();
-		}
-	}
-
-	// clone the element for each row and cell.
-	for( i = 0; i < rows ; i++ ) { // ===>
-		top = offset.top + i * height;
-		my = i - ( rows - 1 ) / 2 ;
-
-		for( j = 0; j < cells ; j++ ) { // |||
-			left = offset.left + j * width;
-			mx = j - ( cells - 1 ) / 2 ;
-
-			// Create a clone of the now hidden main element that will be absolute positioned
-			// within a wrapper div off the -left and -top equal to size of our pieces
-			el
-				.clone()
-				.appendTo( "body" )
-				.wrap( "
    " )
-				.css({
-					position: "absolute",
-					visibility: "visible",
-					left: -j * width,
-					top: -i * height
-				})
-
-			// select the wrapper - make it overflow: hidden and absolute positioned based on
-			// where the original was located +left and +top equal to the size of pieces
-				.parent()
-				.addClass( "ui-effects-explode" )
-				.css({
-					position: "absolute",
-					overflow: "hidden",
-					width: width,
-					height: height,
-					left: left + ( show ? mx * width : 0 ),
-					top: top + ( show ? my * height : 0 ),
-					opacity: show ? 0 : 1
-				}).animate({
-					left: left + ( show ? 0 : mx * width ),
-					top: top + ( show ? 0 : my * height ),
-					opacity: show ? 1 : 0
-				}, o.duration || 500, o.easing, childComplete );
-		}
-	}
-
-	function animComplete() {
-		el.css({
-			visibility: "visible"
-		});
-		$( pieces ).remove();
-		if ( !show ) {
-			el.hide();
-		}
-		done();
-	}
-};
-
-})(jQuery);
-(function( $, undefined ) {
-
-$.effects.effect.fade = function( o, done ) {
-	var el = $( this ),
-		mode = $.effects.setMode( el, o.mode || "toggle" );
-
-	el.animate({
-		opacity: mode
-	}, {
-		queue: false,
-		duration: o.duration,
-		easing: o.easing,
-		complete: done
-	});
-};
-
-})( jQuery );
-(function( $, undefined ) {
-
-$.effects.effect.fold = function( o, done ) {
-
-	// Create element
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
-		mode = $.effects.setMode( el, o.mode || "hide" ),
-		show = mode === "show",
-		hide = mode === "hide",
-		size = o.size || 15,
-		percent = /([0-9]+)%/.exec( size ),
-		horizFirst = !!o.horizFirst,
-		widthFirst = show !== horizFirst,
-		ref = widthFirst ? [ "width", "height" ] : [ "height", "width" ],
-		duration = o.duration / 2,
-		wrapper, distance,
-		animation1 = {},
-		animation2 = {};
-
-	$.effects.save( el, props );
-	el.show();
-
-	// Create Wrapper
-	wrapper = $.effects.createWrapper( el ).css({
-		overflow: "hidden"
-	});
-	distance = widthFirst ?
-		[ wrapper.width(), wrapper.height() ] :
-		[ wrapper.height(), wrapper.width() ];
-
-	if ( percent ) {
-		size = parseInt( percent[ 1 ], 10 ) / 100 * distance[ hide ? 0 : 1 ];
-	}
-	if ( show ) {
-		wrapper.css( horizFirst ? {
-			height: 0,
-			width: size
-		} : {
-			height: size,
-			width: 0
-		});
-	}
-
-	// Animation
-	animation1[ ref[ 0 ] ] = show ? distance[ 0 ] : size;
-	animation2[ ref[ 1 ] ] = show ? distance[ 1 ] : 0;
-
-	// Animate
-	wrapper
-		.animate( animation1, duration, o.easing )
-		.animate( animation2, duration, o.easing, function() {
-			if ( hide ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		});
-
-};
-
-})(jQuery);
-(function( $, undefined ) {
-
-$.effects.effect.highlight = function( o, done ) {
-	var elem = $( this ),
-		props = [ "backgroundImage", "backgroundColor", "opacity" ],
-		mode = $.effects.setMode( elem, o.mode || "show" ),
-		animation = {
-			backgroundColor: elem.css( "backgroundColor" )
-		};
-
-	if (mode === "hide") {
-		animation.opacity = 0;
-	}
-
-	$.effects.save( elem, props );
-
-	elem
-		.show()
-		.css({
-			backgroundImage: "none",
-			backgroundColor: o.color || "#ffff99"
-		})
-		.animate( animation, {
-			queue: false,
-			duration: o.duration,
-			easing: o.easing,
-			complete: function() {
-				if ( mode === "hide" ) {
-					elem.hide();
-				}
-				$.effects.restore( elem, props );
-				done();
-			}
-		});
-};
-
-})(jQuery);
-(function( $, undefined ) {
-
-$.effects.effect.pulsate = function( o, done ) {
-	var elem = $( this ),
-		mode = $.effects.setMode( elem, o.mode || "show" ),
-		show = mode === "show",
-		hide = mode === "hide",
-		showhide = ( show || mode === "hide" ),
-
-		// showing or hiding leaves of the "last" animation
-		anims = ( ( o.times || 5 ) * 2 ) + ( showhide ? 1 : 0 ),
-		duration = o.duration / anims,
-		animateTo = 0,
-		queue = elem.queue(),
-		queuelen = queue.length,
-		i;
-
-	if ( show || !elem.is(":visible")) {
-		elem.css( "opacity", 0 ).show();
-		animateTo = 1;
-	}
-
-	// anims - 1 opacity "toggles"
-	for ( i = 1; i < anims; i++ ) {
-		elem.animate({
-			opacity: animateTo
-		}, duration, o.easing );
-		animateTo = 1 - animateTo;
-	}
-
-	elem.animate({
-		opacity: animateTo
-	}, duration, o.easing);
-
-	elem.queue(function() {
-		if ( hide ) {
-			elem.hide();
-		}
-		done();
-	});
-
-	// We just queued up "anims" animations, we need to put them next in the queue
-	if ( queuelen > 1 ) {
-		queue.splice.apply( queue,
-			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
-	}
-	elem.dequeue();
-};
-
-})(jQuery);
-(function( $, undefined ) {
-
-$.effects.effect.puff = function( o, done ) {
-	var elem = $( this ),
-		mode = $.effects.setMode( elem, o.mode || "hide" ),
-		hide = mode === "hide",
-		percent = parseInt( o.percent, 10 ) || 150,
-		factor = percent / 100,
-		original = {
-			height: elem.height(),
-			width: elem.width(),
-			outerHeight: elem.outerHeight(),
-			outerWidth: elem.outerWidth()
-		};
-
-	$.extend( o, {
-		effect: "scale",
-		queue: false,
-		fade: true,
-		mode: mode,
-		complete: done,
-		percent: hide ? percent : 100,
-		from: hide ?
-			original :
-			{
-				height: original.height * factor,
-				width: original.width * factor,
-				outerHeight: original.outerHeight * factor,
-				outerWidth: original.outerWidth * factor
-			}
-	});
-
-	elem.effect( o );
-};
-
-$.effects.effect.scale = function( o, done ) {
-
-	// Create element
-	var el = $( this ),
-		options = $.extend( true, {}, o ),
-		mode = $.effects.setMode( el, o.mode || "effect" ),
-		percent = parseInt( o.percent, 10 ) ||
-			( parseInt( o.percent, 10 ) === 0 ? 0 : ( mode === "hide" ? 0 : 100 ) ),
-		direction = o.direction || "both",
-		origin = o.origin,
-		original = {
-			height: el.height(),
-			width: el.width(),
-			outerHeight: el.outerHeight(),
-			outerWidth: el.outerWidth()
-		},
-		factor = {
-			y: direction !== "horizontal" ? (percent / 100) : 1,
-			x: direction !== "vertical" ? (percent / 100) : 1
-		};
-
-	// We are going to pass this effect to the size effect:
-	options.effect = "size";
-	options.queue = false;
-	options.complete = done;
-
-	// Set default origin and restore for show/hide
-	if ( mode !== "effect" ) {
-		options.origin = origin || ["middle","center"];
-		options.restore = true;
-	}
-
-	options.from = o.from || ( mode === "show" ? {
-		height: 0,
-		width: 0,
-		outerHeight: 0,
-		outerWidth: 0
-	} : original );
-	options.to = {
-		height: original.height * factor.y,
-		width: original.width * factor.x,
-		outerHeight: original.outerHeight * factor.y,
-		outerWidth: original.outerWidth * factor.x
-	};
-
-	// Fade option to support puff
-	if ( options.fade ) {
-		if ( mode === "show" ) {
-			options.from.opacity = 0;
-			options.to.opacity = 1;
-		}
-		if ( mode === "hide" ) {
-			options.from.opacity = 1;
-			options.to.opacity = 0;
-		}
-	}
-
-	// Animate
-	el.effect( options );
-
-};
-
-$.effects.effect.size = function( o, done ) {
-
-	// Create element
-	var original, baseline, factor,
-		el = $( this ),
-		props0 = [ "position", "top", "bottom", "left", "right", "width", "height", "overflow", "opacity" ],
-
-		// Always restore
-		props1 = [ "position", "top", "bottom", "left", "right", "overflow", "opacity" ],
-
-		// Copy for children
-		props2 = [ "width", "height", "overflow" ],
-		cProps = [ "fontSize" ],
-		vProps = [ "borderTopWidth", "borderBottomWidth", "paddingTop", "paddingBottom" ],
-		hProps = [ "borderLeftWidth", "borderRightWidth", "paddingLeft", "paddingRight" ],
-
-		// Set options
-		mode = $.effects.setMode( el, o.mode || "effect" ),
-		restore = o.restore || mode !== "effect",
-		scale = o.scale || "both",
-		origin = o.origin || [ "middle", "center" ],
-		position = el.css( "position" ),
-		props = restore ? props0 : props1,
-		zero = {
-			height: 0,
-			width: 0,
-			outerHeight: 0,
-			outerWidth: 0
-		};
-
-	if ( mode === "show" ) {
-		el.show();
-	}
-	original = {
-		height: el.height(),
-		width: el.width(),
-		outerHeight: el.outerHeight(),
-		outerWidth: el.outerWidth()
-	};
-
-	if ( o.mode === "toggle" && mode === "show" ) {
-		el.from = o.to || zero;
-		el.to = o.from || original;
-	} else {
-		el.from = o.from || ( mode === "show" ? zero : original );
-		el.to = o.to || ( mode === "hide" ? zero : original );
-	}
-
-	// Set scaling factor
-	factor = {
-		from: {
-			y: el.from.height / original.height,
-			x: el.from.width / original.width
-		},
-		to: {
-			y: el.to.height / original.height,
-			x: el.to.width / original.width
-		}
-	};
-
-	// Scale the css box
-	if ( scale === "box" || scale === "both" ) {
-
-		// Vertical props scaling
-		if ( factor.from.y !== factor.to.y ) {
-			props = props.concat( vProps );
-			el.from = $.effects.setTransition( el, vProps, factor.from.y, el.from );
-			el.to = $.effects.setTransition( el, vProps, factor.to.y, el.to );
-		}
-
-		// Horizontal props scaling
-		if ( factor.from.x !== factor.to.x ) {
-			props = props.concat( hProps );
-			el.from = $.effects.setTransition( el, hProps, factor.from.x, el.from );
-			el.to = $.effects.setTransition( el, hProps, factor.to.x, el.to );
-		}
-	}
-
-	// Scale the content
-	if ( scale === "content" || scale === "both" ) {
-
-		// Vertical props scaling
-		if ( factor.from.y !== factor.to.y ) {
-			props = props.concat( cProps ).concat( props2 );
-			el.from = $.effects.setTransition( el, cProps, factor.from.y, el.from );
-			el.to = $.effects.setTransition( el, cProps, factor.to.y, el.to );
-		}
-	}
-
-	$.effects.save( el, props );
-	el.show();
-	$.effects.createWrapper( el );
-	el.css( "overflow", "hidden" ).css( el.from );
-
-	// Adjust
-	if (origin) { // Calculate baseline shifts
-		baseline = $.effects.getBaseline( origin, original );
-		el.from.top = ( original.outerHeight - el.outerHeight() ) * baseline.y;
-		el.from.left = ( original.outerWidth - el.outerWidth() ) * baseline.x;
-		el.to.top = ( original.outerHeight - el.to.outerHeight ) * baseline.y;
-		el.to.left = ( original.outerWidth - el.to.outerWidth ) * baseline.x;
-	}
-	el.css( el.from ); // set top & left
-
-	// Animate
-	if ( scale === "content" || scale === "both" ) { // Scale the children
-
-		// Add margins/font-size
-		vProps = vProps.concat([ "marginTop", "marginBottom" ]).concat(cProps);
-		hProps = hProps.concat([ "marginLeft", "marginRight" ]);
-		props2 = props0.concat(vProps).concat(hProps);
-
-		el.find( "*[width]" ).each( function(){
-			var child = $( this ),
-				c_original = {
-					height: child.height(),
-					width: child.width(),
-					outerHeight: child.outerHeight(),
-					outerWidth: child.outerWidth()
-				};
-			if (restore) {
-				$.effects.save(child, props2);
-			}
-
-			child.from = {
-				height: c_original.height * factor.from.y,
-				width: c_original.width * factor.from.x,
-				outerHeight: c_original.outerHeight * factor.from.y,
-				outerWidth: c_original.outerWidth * factor.from.x
-			};
-			child.to = {
-				height: c_original.height * factor.to.y,
-				width: c_original.width * factor.to.x,
-				outerHeight: c_original.height * factor.to.y,
-				outerWidth: c_original.width * factor.to.x
-			};
-
-			// Vertical props scaling
-			if ( factor.from.y !== factor.to.y ) {
-				child.from = $.effects.setTransition( child, vProps, factor.from.y, child.from );
-				child.to = $.effects.setTransition( child, vProps, factor.to.y, child.to );
-			}
-
-			// Horizontal props scaling
-			if ( factor.from.x !== factor.to.x ) {
-				child.from = $.effects.setTransition( child, hProps, factor.from.x, child.from );
-				child.to = $.effects.setTransition( child, hProps, factor.to.x, child.to );
-			}
-
-			// Animate children
-			child.css( child.from );
-			child.animate( child.to, o.duration, o.easing, function() {
-
-				// Restore children
-				if ( restore ) {
-					$.effects.restore( child, props2 );
-				}
-			});
-		});
-	}
-
-	// Animate
-	el.animate( el.to, {
-		queue: false,
-		duration: o.duration,
-		easing: o.easing,
-		complete: function() {
-			if ( el.to.opacity === 0 ) {
-				el.css( "opacity", el.from.opacity );
-			}
-			if( mode === "hide" ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			if ( !restore ) {
-
-				// we need to calculate our new positioning based on the scaling
-				if ( position === "static" ) {
-					el.css({
-						position: "relative",
-						top: el.to.top,
-						left: el.to.left
-					});
-				} else {
-					$.each([ "top", "left" ], function( idx, pos ) {
-						el.css( pos, function( _, str ) {
-							var val = parseInt( str, 10 ),
-								toRef = idx ? el.to.left : el.to.top;
-
-							// if original was "auto", recalculate the new value from wrapper
-							if ( str === "auto" ) {
-								return toRef + "px";
-							}
-
-							return val + toRef + "px";
-						});
-					});
-				}
-			}
-
-			$.effects.removeWrapper( el );
-			done();
-		}
-	});
-
-};
-
-})(jQuery);
-(function( $, undefined ) {
-
-$.effects.effect.shake = function( o, done ) {
-
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
-		mode = $.effects.setMode( el, o.mode || "effect" ),
-		direction = o.direction || "left",
-		distance = o.distance || 20,
-		times = o.times || 3,
-		anims = times * 2 + 1,
-		speed = Math.round(o.duration/anims),
-		ref = (direction === "up" || direction === "down") ? "top" : "left",
-		positiveMotion = (direction === "up" || direction === "left"),
-		animation = {},
-		animation1 = {},
-		animation2 = {},
-		i,
-
-		// we will need to re-assemble the queue to stack our animations in place
-		queue = el.queue(),
-		queuelen = queue.length;
-
-	$.effects.save( el, props );
-	el.show();
-	$.effects.createWrapper( el );
-
-	// Animation
-	animation[ ref ] = ( positiveMotion ? "-=" : "+=" ) + distance;
-	animation1[ ref ] = ( positiveMotion ? "+=" : "-=" ) + distance * 2;
-	animation2[ ref ] = ( positiveMotion ? "-=" : "+=" ) + distance * 2;
-
-	// Animate
-	el.animate( animation, speed, o.easing );
-
-	// Shakes
-	for ( i = 1; i < times; i++ ) {
-		el.animate( animation1, speed, o.easing ).animate( animation2, speed, o.easing );
-	}
-	el
-		.animate( animation1, speed, o.easing )
-		.animate( animation, speed / 2, o.easing )
-		.queue(function() {
-			if ( mode === "hide" ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		});
-
-	// inject all the animations we just queued to be first in line (after "inprogress")
-	if ( queuelen > 1) {
-		queue.splice.apply( queue,
-			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
-	}
-	el.dequeue();
-
-};
-
-})(jQuery);
-(function( $, undefined ) {
-
-$.effects.effect.slide = function( o, done ) {
-
-	// Create element
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "width", "height" ],
-		mode = $.effects.setMode( el, o.mode || "show" ),
-		show = mode === "show",
-		direction = o.direction || "left",
-		ref = (direction === "up" || direction === "down") ? "top" : "left",
-		positiveMotion = (direction === "up" || direction === "left"),
-		distance,
-		animation = {};
-
-	// Adjust
-	$.effects.save( el, props );
-	el.show();
-	distance = o.distance || el[ ref === "top" ? "outerHeight" : "outerWidth" ]( true );
-
-	$.effects.createWrapper( el ).css({
-		overflow: "hidden"
-	});
-
-	if ( show ) {
-		el.css( ref, positiveMotion ? (isNaN(distance) ? "-" + distance : -distance) : distance );
-	}
-
-	// Animation
-	animation[ ref ] = ( show ?
-		( positiveMotion ? "+=" : "-=") :
-		( positiveMotion ? "-=" : "+=")) +
-		distance;
-
-	// Animate
-	el.animate( animation, {
-		queue: false,
-		duration: o.duration,
-		easing: o.easing,
-		complete: function() {
-			if ( mode === "hide" ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		}
-	});
-};
-
-})(jQuery);
-(function( $, undefined ) {
-
-$.effects.effect.transfer = function( o, done ) {
-	var elem = $( this ),
-		target = $( o.to ),
-		targetFixed = target.css( "position" ) === "fixed",
-		body = $("body"),
-		fixTop = targetFixed ? body.scrollTop() : 0,
-		fixLeft = targetFixed ? body.scrollLeft() : 0,
-		endPosition = target.offset(),
-		animation = {
-			top: endPosition.top - fixTop ,
-			left: endPosition.left - fixLeft ,
-			height: target.innerHeight(),
-			width: target.innerWidth()
-		},
-		startPosition = elem.offset(),
-		transfer = $( '
    ' )
-			.appendTo( document.body )
-			.addClass( o.className )
-			.css({
-				top: startPosition.top - fixTop ,
-				left: startPosition.left - fixLeft ,
-				height: elem.innerHeight(),
-				width: elem.innerWidth(),
-				position: targetFixed ? "fixed" : "absolute"
-			})
-			.animate( animation, o.duration, o.easing, function() {
-				transfer.remove();
-				done();
-			});
-};
-
-})(jQuery);
-(function( $, undefined ) {
-
-var mouseHandled = false;
-
-$.widget( "ui.menu", {
-	version: "1.9.2",
-	defaultElement: "
      ",
-	delay: 300,
-	options: {
-		icons: {
-			submenu: "ui-icon-carat-1-e"
-		},
-		menus: "ul",
-		position: {
-			my: "left top",
-			at: "right top"
-		},
-		role: "menu",
-
-		// callbacks
-		blur: null,
-		focus: null,
-		select: null
-	},
-
-	_create: function() {
-		this.activeMenu = this.element;
-		this.element
-			.uniqueId()
-			.addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" )
-			.toggleClass( "ui-menu-icons", !!this.element.find( ".ui-icon" ).length )
-			.attr({
-				role: this.options.role,
-				tabIndex: 0
-			})
-			// need to catch all clicks on disabled menu
-			// not possible through _on
-			.bind( "click" + this.eventNamespace, $.proxy(function( event ) {
-				if ( this.options.disabled ) {
-					event.preventDefault();
-				}
-			}, this ));
-
-		if ( this.options.disabled ) {
-			this.element
-				.addClass( "ui-state-disabled" )
-				.attr( "aria-disabled", "true" );
-		}
-
-		this._on({
-			// Prevent focus from sticking to links inside menu after clicking
-			// them (focus should always stay on UL during navigation).
-			"mousedown .ui-menu-item > a": function( event ) {
-				event.preventDefault();
-			},
-			"click .ui-state-disabled > a": function( event ) {
-				event.preventDefault();
-			},
-			"click .ui-menu-item:has(a)": function( event ) {
-				var target = $( event.target ).closest( ".ui-menu-item" );
-				if ( !mouseHandled && target.not( ".ui-state-disabled" ).length ) {
-					mouseHandled = true;
-
-					this.select( event );
-					// Open submenu on click
-					if ( target.has( ".ui-menu" ).length ) {
-						this.expand( event );
-					} else if ( !this.element.is( ":focus" ) ) {
-						// Redirect focus to the menu
-						this.element.trigger( "focus", [ true ] );
-
-						// If the active item is on the top level, let it stay active.
-						// Otherwise, blur the active item since it is no longer visible.
-						if ( this.active && this.active.parents( ".ui-menu" ).length === 1 ) {
-							clearTimeout( this.timer );
-						}
-					}
-				}
-			},
-			"mouseenter .ui-menu-item": function( event ) {
-				var target = $( event.currentTarget );
-				// Remove ui-state-active class from siblings of the newly focused menu item
-				// to avoid a jump caused by adjacent elements both having a class with a border
-				target.siblings().children( ".ui-state-active" ).removeClass( "ui-state-active" );
-				this.focus( event, target );
-			},
-			mouseleave: "collapseAll",
-			"mouseleave .ui-menu": "collapseAll",
-			focus: function( event, keepActiveItem ) {
-				// If there's already an active item, keep it active
-				// If not, activate the first item
-				var item = this.active || this.element.children( ".ui-menu-item" ).eq( 0 );
-
-				if ( !keepActiveItem ) {
-					this.focus( event, item );
-				}
-			},
-			blur: function( event ) {
-				this._delay(function() {
-					if ( !$.contains( this.element[0], this.document[0].activeElement ) ) {
-						this.collapseAll( event );
-					}
-				});
-			},
-			keydown: "_keydown"
-		});
-
-		this.refresh();
-
-		// Clicks outside of a menu collapse any open menus
-		this._on( this.document, {
-			click: function( event ) {
-				if ( !$( event.target ).closest( ".ui-menu" ).length ) {
-					this.collapseAll( event );
-				}
-
-				// Reset the mouseHandled flag
-				mouseHandled = false;
-			}
-		});
-	},
-
-	_destroy: function() {
-		// Destroy (sub)menus
-		this.element
-			.removeAttr( "aria-activedescendant" )
-			.find( ".ui-menu" ).andSelf()
-				.removeClass( "ui-menu ui-widget ui-widget-content ui-corner-all ui-menu-icons" )
-				.removeAttr( "role" )
-				.removeAttr( "tabIndex" )
-				.removeAttr( "aria-labelledby" )
-				.removeAttr( "aria-expanded" )
-				.removeAttr( "aria-hidden" )
-				.removeAttr( "aria-disabled" )
-				.removeUniqueId()
-				.show();
-
-		// Destroy menu items
-		this.element.find( ".ui-menu-item" )
-			.removeClass( "ui-menu-item" )
-			.removeAttr( "role" )
-			.removeAttr( "aria-disabled" )
-			.children( "a" )
-				.removeUniqueId()
-				.removeClass( "ui-corner-all ui-state-hover" )
-				.removeAttr( "tabIndex" )
-				.removeAttr( "role" )
-				.removeAttr( "aria-haspopup" )
-				.children().each( function() {
-					var elem = $( this );
-					if ( elem.data( "ui-menu-submenu-carat" ) ) {
-						elem.remove();
-					}
-				});
-
-		// Destroy menu dividers
-		this.element.find( ".ui-menu-divider" ).removeClass( "ui-menu-divider ui-widget-content" );
-	},
-
-	_keydown: function( event ) {
-		var match, prev, character, skip, regex,
-			preventDefault = true;
-
-		function escape( value ) {
-			return value.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" );
-		}
-
-		switch ( event.keyCode ) {
-		case $.ui.keyCode.PAGE_UP:
-			this.previousPage( event );
-			break;
-		case $.ui.keyCode.PAGE_DOWN:
-			this.nextPage( event );
-			break;
-		case $.ui.keyCode.HOME:
-			this._move( "first", "first", event );
-			break;
-		case $.ui.keyCode.END:
-			this._move( "last", "last", event );
-			break;
-		case $.ui.keyCode.UP:
-			this.previous( event );
-			break;
-		case $.ui.keyCode.DOWN:
-			this.next( event );
-			break;
-		case $.ui.keyCode.LEFT:
-			this.collapse( event );
-			break;
-		case $.ui.keyCode.RIGHT:
-			if ( this.active && !this.active.is( ".ui-state-disabled" ) ) {
-				this.expand( event );
-			}
-			break;
-		case $.ui.keyCode.ENTER:
-		case $.ui.keyCode.SPACE:
-			this._activate( event );
-			break;
-		case $.ui.keyCode.ESCAPE:
-			this.collapse( event );
-			break;
-		default:
-			preventDefault = false;
-			prev = this.previousFilter || "";
-			character = String.fromCharCode( event.keyCode );
-			skip = false;
-
-			clearTimeout( this.filterTimer );
-
-			if ( character === prev ) {
-				skip = true;
-			} else {
-				character = prev + character;
-			}
-
-			regex = new RegExp( "^" + escape( character ), "i" );
-			match = this.activeMenu.children( ".ui-menu-item" ).filter(function() {
-				return regex.test( $( this ).children( "a" ).text() );
-			});
-			match = skip && match.index( this.active.next() ) !== -1 ?
-				this.active.nextAll( ".ui-menu-item" ) :
-				match;
-
-			// If no matches on the current filter, reset to the last character pressed
-			// to move down the menu to the first item that starts with that character
-			if ( !match.length ) {
-				character = String.fromCharCode( event.keyCode );
-				regex = new RegExp( "^" + escape( character ), "i" );
-				match = this.activeMenu.children( ".ui-menu-item" ).filter(function() {
-					return regex.test( $( this ).children( "a" ).text() );
-				});
-			}
-
-			if ( match.length ) {
-				this.focus( event, match );
-				if ( match.length > 1 ) {
-					this.previousFilter = character;
-					this.filterTimer = this._delay(function() {
-						delete this.previousFilter;
-					}, 1000 );
-				} else {
-					delete this.previousFilter;
-				}
-			} else {
-				delete this.previousFilter;
-			}
-		}
-
-		if ( preventDefault ) {
-			event.preventDefault();
-		}
-	},
-
-	_activate: function( event ) {
-		if ( !this.active.is( ".ui-state-disabled" ) ) {
-			if ( this.active.children( "a[aria-haspopup='true']" ).length ) {
-				this.expand( event );
-			} else {
-				this.select( event );
-			}
-		}
-	},
-
-	refresh: function() {
-		var menus,
-			icon = this.options.icons.submenu,
-			submenus = this.element.find( this.options.menus );
-
-		// Initialize nested menus
-		submenus.filter( ":not(.ui-menu)" )
-			.addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" )
-			.hide()
-			.attr({
-				role: this.options.role,
-				"aria-hidden": "true",
-				"aria-expanded": "false"
-			})
-			.each(function() {
-				var menu = $( this ),
-					item = menu.prev( "a" ),
-					submenuCarat = $( "" )
-						.addClass( "ui-menu-icon ui-icon " + icon )
-						.data( "ui-menu-submenu-carat", true );
-
-				item
-					.attr( "aria-haspopup", "true" )
-					.prepend( submenuCarat );
-				menu.attr( "aria-labelledby", item.attr( "id" ) );
-			});
-
-		menus = submenus.add( this.element );
-
-		// Don't refresh list items that are already adapted
-		menus.children( ":not(.ui-menu-item):has(a)" )
-			.addClass( "ui-menu-item" )
-			.attr( "role", "presentation" )
-			.children( "a" )
-				.uniqueId()
-				.addClass( "ui-corner-all" )
-				.attr({
-					tabIndex: -1,
-					role: this._itemRole()
-				});
-
-		// Initialize unlinked menu-items containing spaces and/or dashes only as dividers
-		menus.children( ":not(.ui-menu-item)" ).each(function() {
-			var item = $( this );
-			// hyphen, em dash, en dash
-			if ( !/[^\-—–\s]/.test( item.text() ) ) {
-				item.addClass( "ui-widget-content ui-menu-divider" );
-			}
-		});
-
-		// Add aria-disabled attribute to any disabled menu item
-		menus.children( ".ui-state-disabled" ).attr( "aria-disabled", "true" );
-
-		// If the active item has been removed, blur the menu
-		if ( this.active && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) {
-			this.blur();
-		}
-	},
-
-	_itemRole: function() {
-		return {
-			menu: "menuitem",
-			listbox: "option"
-		}[ this.options.role ];
-	},
-
-	focus: function( event, item ) {
-		var nested, focused;
-		this.blur( event, event && event.type === "focus" );
-
-		this._scrollIntoView( item );
-
-		this.active = item.first();
-		focused = this.active.children( "a" ).addClass( "ui-state-focus" );
-		// Only update aria-activedescendant if there's a role
-		// otherwise we assume focus is managed elsewhere
-		if ( this.options.role ) {
-			this.element.attr( "aria-activedescendant", focused.attr( "id" ) );
-		}
-
-		// Highlight active parent menu item, if any
-		this.active
-			.parent()
-			.closest( ".ui-menu-item" )
-			.children( "a:first" )
-			.addClass( "ui-state-active" );
-
-		if ( event && event.type === "keydown" ) {
-			this._close();
-		} else {
-			this.timer = this._delay(function() {
-				this._close();
-			}, this.delay );
-		}
-
-		nested = item.children( ".ui-menu" );
-		if ( nested.length && ( /^mouse/.test( event.type ) ) ) {
-			this._startOpening(nested);
-		}
-		this.activeMenu = item.parent();
-
-		this._trigger( "focus", event, { item: item } );
-	},
-
-	_scrollIntoView: function( item ) {
-		var borderTop, paddingTop, offset, scroll, elementHeight, itemHeight;
-		if ( this._hasScroll() ) {
-			borderTop = parseFloat( $.css( this.activeMenu[0], "borderTopWidth" ) ) || 0;
-			paddingTop = parseFloat( $.css( this.activeMenu[0], "paddingTop" ) ) || 0;
-			offset = item.offset().top - this.activeMenu.offset().top - borderTop - paddingTop;
-			scroll = this.activeMenu.scrollTop();
-			elementHeight = this.activeMenu.height();
-			itemHeight = item.height();
-
-			if ( offset < 0 ) {
-				this.activeMenu.scrollTop( scroll + offset );
-			} else if ( offset + itemHeight > elementHeight ) {
-				this.activeMenu.scrollTop( scroll + offset - elementHeight + itemHeight );
-			}
-		}
-	},
-
-	blur: function( event, fromFocus ) {
-		if ( !fromFocus ) {
-			clearTimeout( this.timer );
-		}
-
-		if ( !this.active ) {
-			return;
-		}
-
-		this.active.children( "a" ).removeClass( "ui-state-focus" );
-		this.active = null;
-
-		this._trigger( "blur", event, { item: this.active } );
-	},
-
-	_startOpening: function( submenu ) {
-		clearTimeout( this.timer );
-
-		// Don't open if already open fixes a Firefox bug that caused a .5 pixel
-		// shift in the submenu position when mousing over the carat icon
-		if ( submenu.attr( "aria-hidden" ) !== "true" ) {
-			return;
-		}
-
-		this.timer = this._delay(function() {
-			this._close();
-			this._open( submenu );
-		}, this.delay );
-	},
-
-	_open: function( submenu ) {
-		var position = $.extend({
-			of: this.active
-		}, this.options.position );
-
-		clearTimeout( this.timer );
-		this.element.find( ".ui-menu" ).not( submenu.parents( ".ui-menu" ) )
-			.hide()
-			.attr( "aria-hidden", "true" );
-
-		submenu
-			.show()
-			.removeAttr( "aria-hidden" )
-			.attr( "aria-expanded", "true" )
-			.position( position );
-	},
-
-	collapseAll: function( event, all ) {
-		clearTimeout( this.timer );
-		this.timer = this._delay(function() {
-			// If we were passed an event, look for the submenu that contains the event
-			var currentMenu = all ? this.element :
-				$( event && event.target ).closest( this.element.find( ".ui-menu" ) );
-
-			// If we found no valid submenu ancestor, use the main menu to close all sub menus anyway
-			if ( !currentMenu.length ) {
-				currentMenu = this.element;
-			}
-
-			this._close( currentMenu );
-
-			this.blur( event );
-			this.activeMenu = currentMenu;
-		}, this.delay );
-	},
-
-	// With no arguments, closes the currently active menu - if nothing is active
-	// it closes all menus.  If passed an argument, it will search for menus BELOW
-	_close: function( startMenu ) {
-		if ( !startMenu ) {
-			startMenu = this.active ? this.active.parent() : this.element;
-		}
-
-		startMenu
-			.find( ".ui-menu" )
-				.hide()
-				.attr( "aria-hidden", "true" )
-				.attr( "aria-expanded", "false" )
-			.end()
-			.find( "a.ui-state-active" )
-				.removeClass( "ui-state-active" );
-	},
-
-	collapse: function( event ) {
-		var newItem = this.active &&
-			this.active.parent().closest( ".ui-menu-item", this.element );
-		if ( newItem && newItem.length ) {
-			this._close();
-			this.focus( event, newItem );
-		}
-	},
-
-	expand: function( event ) {
-		var newItem = this.active &&
-			this.active
-				.children( ".ui-menu " )
-				.children( ".ui-menu-item" )
-				.first();
-
-		if ( newItem && newItem.length ) {
-			this._open( newItem.parent() );
-
-			// Delay so Firefox will not hide activedescendant change in expanding submenu from AT
-			this._delay(function() {
-				this.focus( event, newItem );
-			});
-		}
-	},
-
-	next: function( event ) {
-		this._move( "next", "first", event );
-	},
-
-	previous: function( event ) {
-		this._move( "prev", "last", event );
-	},
-
-	isFirstItem: function() {
-		return this.active && !this.active.prevAll( ".ui-menu-item" ).length;
-	},
-
-	isLastItem: function() {
-		return this.active && !this.active.nextAll( ".ui-menu-item" ).length;
-	},
-
-	_move: function( direction, filter, event ) {
-		var next;
-		if ( this.active ) {
-			if ( direction === "first" || direction === "last" ) {
-				next = this.active
-					[ direction === "first" ? "prevAll" : "nextAll" ]( ".ui-menu-item" )
-					.eq( -1 );
-			} else {
-				next = this.active
-					[ direction + "All" ]( ".ui-menu-item" )
-					.eq( 0 );
-			}
-		}
-		if ( !next || !next.length || !this.active ) {
-			next = this.activeMenu.children( ".ui-menu-item" )[ filter ]();
-		}
-
-		this.focus( event, next );
-	},
-
-	nextPage: function( event ) {
-		var item, base, height;
-
-		if ( !this.active ) {
-			this.next( event );
-			return;
-		}
-		if ( this.isLastItem() ) {
-			return;
-		}
-		if ( this._hasScroll() ) {
-			base = this.active.offset().top;
-			height = this.element.height();
-			this.active.nextAll( ".ui-menu-item" ).each(function() {
-				item = $( this );
-				return item.offset().top - base - height < 0;
-			});
-
-			this.focus( event, item );
-		} else {
-			this.focus( event, this.activeMenu.children( ".ui-menu-item" )
-				[ !this.active ? "first" : "last" ]() );
-		}
-	},
-
-	previousPage: function( event ) {
-		var item, base, height;
-		if ( !this.active ) {
-			this.next( event );
-			return;
-		}
-		if ( this.isFirstItem() ) {
-			return;
-		}
-		if ( this._hasScroll() ) {
-			base = this.active.offset().top;
-			height = this.element.height();
-			this.active.prevAll( ".ui-menu-item" ).each(function() {
-				item = $( this );
-				return item.offset().top - base + height > 0;
-			});
-
-			this.focus( event, item );
-		} else {
-			this.focus( event, this.activeMenu.children( ".ui-menu-item" ).first() );
-		}
-	},
-
-	_hasScroll: function() {
-		return this.element.outerHeight() < this.element.prop( "scrollHeight" );
-	},
-
-	select: function( event ) {
-		// TODO: It should never be possible to not have an active item at this
-		// point, but the tests don't trigger mouseenter before click.
-		this.active = this.active || $( event.target ).closest( ".ui-menu-item" );
-		var ui = { item: this.active };
-		if ( !this.active.has( ".ui-menu" ).length ) {
-			this.collapseAll( event, true );
-		}
-		this._trigger( "select", event, ui );
-	}
-});
-
-}( jQuery ));
-(function( $, undefined ) {
-
-$.widget( "ui.progressbar", {
-	version: "1.9.2",
-	options: {
-		value: 0,
-		max: 100
-	},
-
-	min: 0,
-
-	_create: function() {
-		this.element
-			.addClass( "ui-progressbar ui-widget ui-widget-content ui-corner-all" )
-			.attr({
-				role: "progressbar",
-				"aria-valuemin": this.min,
-				"aria-valuemax": this.options.max,
-				"aria-valuenow": this._value()
-			});
-
-		this.valueDiv = $( "
      " )
-			.appendTo( this.element );
-
-		this.oldValue = this._value();
-		this._refreshValue();
-	},
-
-	_destroy: function() {
-		this.element
-			.removeClass( "ui-progressbar ui-widget ui-widget-content ui-corner-all" )
-			.removeAttr( "role" )
-			.removeAttr( "aria-valuemin" )
-			.removeAttr( "aria-valuemax" )
-			.removeAttr( "aria-valuenow" );
-
-		this.valueDiv.remove();
-	},
-
-	value: function( newValue ) {
-		if ( newValue === undefined ) {
-			return this._value();
-		}
-
-		this._setOption( "value", newValue );
-		return this;
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "value" ) {
-			this.options.value = value;
-			this._refreshValue();
-			if ( this._value() === this.options.max ) {
-				this._trigger( "complete" );
-			}
-		}
-
-		this._super( key, value );
-	},
-
-	_value: function() {
-		var val = this.options.value;
-		// normalize invalid value
-		if ( typeof val !== "number" ) {
-			val = 0;
-		}
-		return Math.min( this.options.max, Math.max( this.min, val ) );
-	},
-
-	_percentage: function() {
-		return 100 * this._value() / this.options.max;
-	},
-
-	_refreshValue: function() {
-		var value = this.value(),
-			percentage = this._percentage();
-
-		if ( this.oldValue !== value ) {
-			this.oldValue = value;
-			this._trigger( "change" );
-		}
-
-		this.valueDiv
-			.toggle( value > this.min )
-			.toggleClass( "ui-corner-right", value === this.options.max )
-			.width( percentage.toFixed(0) + "%" );
-		this.element.attr( "aria-valuenow", value );
-	}
-});
-
-})( jQuery );
-(function( $, undefined ) {
-
-$.widget("ui.resizable", $.ui.mouse, {
-	version: "1.9.2",
-	widgetEventPrefix: "resize",
-	options: {
-		alsoResize: false,
-		animate: false,
-		animateDuration: "slow",
-		animateEasing: "swing",
-		aspectRatio: false,
-		autoHide: false,
-		containment: false,
-		ghost: false,
-		grid: false,
-		handles: "e,s,se",
-		helper: false,
-		maxHeight: null,
-		maxWidth: null,
-		minHeight: 10,
-		minWidth: 10,
-		zIndex: 1000
-	},
-	_create: function() {
-
-		var that = this, o = this.options;
-		this.element.addClass("ui-resizable");
-
-		$.extend(this, {
-			_aspectRatio: !!(o.aspectRatio),
-			aspectRatio: o.aspectRatio,
-			originalElement: this.element,
-			_proportionallyResizeElements: [],
-			_helper: o.helper || o.ghost || o.animate ? o.helper || 'ui-resizable-helper' : null
-		});
-
-		//Wrap the element if it cannot hold child nodes
-		if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)) {
-
-			//Create a wrapper element and set the wrapper to the new current internal element
-			this.element.wrap(
-				$('
      ').css({
-					position: this.element.css('position'),
-					width: this.element.outerWidth(),
-					height: this.element.outerHeight(),
-					top: this.element.css('top'),
-					left: this.element.css('left')
-				})
-			);
-
-			//Overwrite the original this.element
-			this.element = this.element.parent().data(
-				"resizable", this.element.data('resizable')
-			);
-
-			this.elementIsWrapper = true;
-
-			//Move margins to the wrapper
-			this.element.css({ marginLeft: this.originalElement.css("marginLeft"), marginTop: this.originalElement.css("marginTop"), marginRight: this.originalElement.css("marginRight"), marginBottom: this.originalElement.css("marginBottom") });
-			this.originalElement.css({ marginLeft: 0, marginTop: 0, marginRight: 0, marginBottom: 0});
-
-			//Prevent Safari textarea resize
-			this.originalResizeStyle = this.originalElement.css('resize');
-			this.originalElement.css('resize', 'none');
-
-			//Push the actual element to our proportionallyResize internal array
-			this._proportionallyResizeElements.push(this.originalElement.css({ position: 'static', zoom: 1, display: 'block' }));
-
-			// avoid IE jump (hard set the margin)
-			this.originalElement.css({ margin: this.originalElement.css('margin') });
-
-			// fix handlers offset
-			this._proportionallyResize();
-
-		}
-
-		this.handles = o.handles || (!$('.ui-resizable-handle', this.element).length ? "e,s,se" : { n: '.ui-resizable-n', e: '.ui-resizable-e', s: '.ui-resizable-s', w: '.ui-resizable-w', se: '.ui-resizable-se', sw: '.ui-resizable-sw', ne: '.ui-resizable-ne', nw: '.ui-resizable-nw' });
-		if(this.handles.constructor == String) {
-
-			if(this.handles == 'all') this.handles = 'n,e,s,w,se,sw,ne,nw';
-			var n = this.handles.split(","); this.handles = {};
-
-			for(var i = 0; i < n.length; i++) {
-
-				var handle = $.trim(n[i]), hname = 'ui-resizable-'+handle;
-				var axis = $('
      ');
-
-				// Apply zIndex to all handles - see #7960
-				axis.css({ zIndex: o.zIndex });
-
-				//TODO : What's going on here?
-				if ('se' == handle) {
-					axis.addClass('ui-icon ui-icon-gripsmall-diagonal-se');
-				};
-
-				//Insert into internal handles object and append to element
-				this.handles[handle] = '.ui-resizable-'+handle;
-				this.element.append(axis);
-			}
-
-		}
-
-		this._renderAxis = function(target) {
-
-			target = target || this.element;
-
-			for(var i in this.handles) {
-
-				if(this.handles[i].constructor == String)
-					this.handles[i] = $(this.handles[i], this.element).show();
-
-				//Apply pad to wrapper element, needed to fix axis position (textarea, inputs, scrolls)
-				if (this.elementIsWrapper && this.originalElement[0].nodeName.match(/textarea|input|select|button/i)) {
-
-					var axis = $(this.handles[i], this.element), padWrapper = 0;
-
-					//Checking the correct pad and border
-					padWrapper = /sw|ne|nw|se|n|s/.test(i) ? axis.outerHeight() : axis.outerWidth();
-
-					//The padding type i have to apply...
-					var padPos = [ 'padding',
-						/ne|nw|n/.test(i) ? 'Top' :
-						/se|sw|s/.test(i) ? 'Bottom' :
-						/^e$/.test(i) ? 'Right' : 'Left' ].join("");
-
-					target.css(padPos, padWrapper);
-
-					this._proportionallyResize();
-
-				}
-
-				//TODO: What's that good for? There's not anything to be executed left
-				if(!$(this.handles[i]).length)
-					continue;
-
-			}
-		};
-
-		//TODO: make renderAxis a prototype function
-		this._renderAxis(this.element);
-
-		this._handles = $('.ui-resizable-handle', this.element)
-			.disableSelection();
-
-		//Matching axis name
-		this._handles.mouseover(function() {
-			if (!that.resizing) {
-				if (this.className)
-					var axis = this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);
-				//Axis, default = se
-				that.axis = axis && axis[1] ? axis[1] : 'se';
-			}
-		});
-
-		//If we want to auto hide the elements
-		if (o.autoHide) {
-			this._handles.hide();
-			$(this.element)
-				.addClass("ui-resizable-autohide")
-				.mouseenter(function() {
-					if (o.disabled) return;
-					$(this).removeClass("ui-resizable-autohide");
-					that._handles.show();
-				})
-				.mouseleave(function(){
-					if (o.disabled) return;
-					if (!that.resizing) {
-						$(this).addClass("ui-resizable-autohide");
-						that._handles.hide();
-					}
-				});
-		}
-
-		//Initialize the mouse interaction
-		this._mouseInit();
-
-	},
-
-	_destroy: function() {
-
-		this._mouseDestroy();
-
-		var _destroy = function(exp) {
-			$(exp).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing")
-				.removeData("resizable").removeData("ui-resizable").unbind(".resizable").find('.ui-resizable-handle').remove();
-		};
-
-		//TODO: Unwrap at same DOM position
-		if (this.elementIsWrapper) {
-			_destroy(this.element);
-			var wrapper = this.element;
-			this.originalElement.css({
-				position: wrapper.css('position'),
-				width: wrapper.outerWidth(),
-				height: wrapper.outerHeight(),
-				top: wrapper.css('top'),
-				left: wrapper.css('left')
-			}).insertAfter( wrapper );
-			wrapper.remove();
-		}
-
-		this.originalElement.css('resize', this.originalResizeStyle);
-		_destroy(this.originalElement);
-
-		return this;
-	},
-
-	_mouseCapture: function(event) {
-		var handle = false;
-		for (var i in this.handles) {
-			if ($(this.handles[i])[0] == event.target) {
-				handle = true;
-			}
-		}
-
-		return !this.options.disabled && handle;
-	},
-
-	_mouseStart: function(event) {
-
-		var o = this.options, iniPos = this.element.position(), el = this.element;
-
-		this.resizing = true;
-		this.documentScroll = { top: $(document).scrollTop(), left: $(document).scrollLeft() };
-
-		// bugfix for http://dev.jquery.com/ticket/1749
-		if (el.is('.ui-draggable') || (/absolute/).test(el.css('position'))) {
-			el.css({ position: 'absolute', top: iniPos.top, left: iniPos.left });
-		}
-
-		this._renderProxy();
-
-		var curleft = num(this.helper.css('left')), curtop = num(this.helper.css('top'));
-
-		if (o.containment) {
-			curleft += $(o.containment).scrollLeft() || 0;
-			curtop += $(o.containment).scrollTop() || 0;
-		}
-
-		//Store needed variables
-		this.offset = this.helper.offset();
-		this.position = { left: curleft, top: curtop };
-		this.size = this._helper ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
-		this.originalSize = this._helper ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
-		this.originalPosition = { left: curleft, top: curtop };
-		this.sizeDiff = { width: el.outerWidth() - el.width(), height: el.outerHeight() - el.height() };
-		this.originalMousePosition = { left: event.pageX, top: event.pageY };
-
-		//Aspect Ratio
-		this.aspectRatio = (typeof o.aspectRatio == 'number') ? o.aspectRatio : ((this.originalSize.width / this.originalSize.height) || 1);
-
-		var cursor = $('.ui-resizable-' + this.axis).css('cursor');
-		$('body').css('cursor', cursor == 'auto' ? this.axis + '-resize' : cursor);
-
-		el.addClass("ui-resizable-resizing");
-		this._propagate("start", event);
-		return true;
-	},
-
-	_mouseDrag: function(event) {
-
-		//Increase performance, avoid regex
-		var el = this.helper, o = this.options, props = {},
-			that = this, smp = this.originalMousePosition, a = this.axis;
-
-		var dx = (event.pageX-smp.left)||0, dy = (event.pageY-smp.top)||0;
-		var trigger = this._change[a];
-		if (!trigger) return false;
-
-		// Calculate the attrs that will be change
-		var data = trigger.apply(this, [event, dx, dy]);
-
-		// Put this in the mouseDrag handler since the user can start pressing shift while resizing
-		this._updateVirtualBoundaries(event.shiftKey);
-		if (this._aspectRatio || event.shiftKey)
-			data = this._updateRatio(data, event);
-
-		data = this._respectSize(data, event);
-
-		// plugins callbacks need to be called first
-		this._propagate("resize", event);
-
-		el.css({
-			top: this.position.top + "px", left: this.position.left + "px",
-			width: this.size.width + "px", height: this.size.height + "px"
-		});
-
-		if (!this._helper && this._proportionallyResizeElements.length)
-			this._proportionallyResize();
-
-		this._updateCache(data);
-
-		// calling the user callback at the end
-		this._trigger('resize', event, this.ui());
-
-		return false;
-	},
-
-	_mouseStop: function(event) {
-
-		this.resizing = false;
-		var o = this.options, that = this;
-
-		if(this._helper) {
-			var pr = this._proportionallyResizeElements, ista = pr.length && (/textarea/i).test(pr[0].nodeName),
-				soffseth = ista && $.ui.hasScroll(pr[0], 'left') /* TODO - jump height */ ? 0 : that.sizeDiff.height,
-				soffsetw = ista ? 0 : that.sizeDiff.width;
-
-			var s = { width: (that.helper.width()  - soffsetw), height: (that.helper.height() - soffseth) },
-				left = (parseInt(that.element.css('left'), 10) + (that.position.left - that.originalPosition.left)) || null,
-				top = (parseInt(that.element.css('top'), 10) + (that.position.top - that.originalPosition.top)) || null;
-
-			if (!o.animate)
-				this.element.css($.extend(s, { top: top, left: left }));
-
-			that.helper.height(that.size.height);
-			that.helper.width(that.size.width);
-
-			if (this._helper && !o.animate) this._proportionallyResize();
-		}
-
-		$('body').css('cursor', 'auto');
-
-		this.element.removeClass("ui-resizable-resizing");
-
-		this._propagate("stop", event);
-
-		if (this._helper) this.helper.remove();
-		return false;
-
-	},
-
-	_updateVirtualBoundaries: function(forceAspectRatio) {
-		var o = this.options, pMinWidth, pMaxWidth, pMinHeight, pMaxHeight, b;
-
-		b = {
-			minWidth: isNumber(o.minWidth) ? o.minWidth : 0,
-			maxWidth: isNumber(o.maxWidth) ? o.maxWidth : Infinity,
-			minHeight: isNumber(o.minHeight) ? o.minHeight : 0,
-			maxHeight: isNumber(o.maxHeight) ? o.maxHeight : Infinity
-		};
-
-		if(this._aspectRatio || forceAspectRatio) {
-			// We want to create an enclosing box whose aspect ration is the requested one
-			// First, compute the "projected" size for each dimension based on the aspect ratio and other dimension
-			pMinWidth = b.minHeight * this.aspectRatio;
-			pMinHeight = b.minWidth / this.aspectRatio;
-			pMaxWidth = b.maxHeight * this.aspectRatio;
-			pMaxHeight = b.maxWidth / this.aspectRatio;
-
-			if(pMinWidth > b.minWidth) b.minWidth = pMinWidth;
-			if(pMinHeight > b.minHeight) b.minHeight = pMinHeight;
-			if(pMaxWidth < b.maxWidth) b.maxWidth = pMaxWidth;
-			if(pMaxHeight < b.maxHeight) b.maxHeight = pMaxHeight;
-		}
-		this._vBoundaries = b;
-	},
-
-	_updateCache: function(data) {
-		var o = this.options;
-		this.offset = this.helper.offset();
-		if (isNumber(data.left)) this.position.left = data.left;
-		if (isNumber(data.top)) this.position.top = data.top;
-		if (isNumber(data.height)) this.size.height = data.height;
-		if (isNumber(data.width)) this.size.width = data.width;
-	},
-
-	_updateRatio: function(data, event) {
-
-		var o = this.options, cpos = this.position, csize = this.size, a = this.axis;
-
-		if (isNumber(data.height)) data.width = (data.height * this.aspectRatio);
-		else if (isNumber(data.width)) data.height = (data.width / this.aspectRatio);
-
-		if (a == 'sw') {
-			data.left = cpos.left + (csize.width - data.width);
-			data.top = null;
-		}
-		if (a == 'nw') {
-			data.top = cpos.top + (csize.height - data.height);
-			data.left = cpos.left + (csize.width - data.width);
-		}
-
-		return data;
-	},
-
-	_respectSize: function(data, event) {
-
-		var el = this.helper, o = this._vBoundaries, pRatio = this._aspectRatio || event.shiftKey, a = this.axis,
-				ismaxw = isNumber(data.width) && o.maxWidth && (o.maxWidth < data.width), ismaxh = isNumber(data.height) && o.maxHeight && (o.maxHeight < data.height),
-					isminw = isNumber(data.width) && o.minWidth && (o.minWidth > data.width), isminh = isNumber(data.height) && o.minHeight && (o.minHeight > data.height);
-
-		if (isminw) data.width = o.minWidth;
-		if (isminh) data.height = o.minHeight;
-		if (ismaxw) data.width = o.maxWidth;
-		if (ismaxh) data.height = o.maxHeight;
-
-		var dw = this.originalPosition.left + this.originalSize.width, dh = this.position.top + this.size.height;
-		var cw = /sw|nw|w/.test(a), ch = /nw|ne|n/.test(a);
-
-		if (isminw && cw) data.left = dw - o.minWidth;
-		if (ismaxw && cw) data.left = dw - o.maxWidth;
-		if (isminh && ch)	data.top = dh - o.minHeight;
-		if (ismaxh && ch)	data.top = dh - o.maxHeight;
-
-		// fixing jump error on top/left - bug #2330
-		var isNotwh = !data.width && !data.height;
-		if (isNotwh && !data.left && data.top) data.top = null;
-		else if (isNotwh && !data.top && data.left) data.left = null;
-
-		return data;
-	},
-
-	_proportionallyResize: function() {
-
-		var o = this.options;
-		if (!this._proportionallyResizeElements.length) return;
-		var element = this.helper || this.element;
-
-		for (var i=0; i < this._proportionallyResizeElements.length; i++) {
-
-			var prel = this._proportionallyResizeElements[i];
-
-			if (!this.borderDif) {
-				var b = [prel.css('borderTopWidth'), prel.css('borderRightWidth'), prel.css('borderBottomWidth'), prel.css('borderLeftWidth')],
-					p = [prel.css('paddingTop'), prel.css('paddingRight'), prel.css('paddingBottom'), prel.css('paddingLeft')];
-
-				this.borderDif = $.map(b, function(v, i) {
-					var border = parseInt(v,10)||0, padding = parseInt(p[i],10)||0;
-					return border + padding;
-				});
-			}
-
-			prel.css({
-				height: (element.height() - this.borderDif[0] - this.borderDif[2]) || 0,
-				width: (element.width() - this.borderDif[1] - this.borderDif[3]) || 0
-			});
-
-		};
-
-	},
-
-	_renderProxy: function() {
-
-		var el = this.element, o = this.options;
-		this.elementOffset = el.offset();
-
-		if(this._helper) {
-
-			this.helper = this.helper || $('
      ');
-
-			// fix ie6 offset TODO: This seems broken
-			var ie6offset = ($.ui.ie6 ? 1 : 0),
-			pxyoffset = ( $.ui.ie6 ? 2 : -1 );
-
-			this.helper.addClass(this._helper).css({
-				width: this.element.outerWidth() + pxyoffset,
-				height: this.element.outerHeight() + pxyoffset,
-				position: 'absolute',
-				left: this.elementOffset.left - ie6offset +'px',
-				top: this.elementOffset.top - ie6offset +'px',
-				zIndex: ++o.zIndex //TODO: Don't modify option
-			});
-
-			this.helper
-				.appendTo("body")
-				.disableSelection();
-
-		} else {
-			this.helper = this.element;
-		}
-
-	},
-
-	_change: {
-		e: function(event, dx, dy) {
-			return { width: this.originalSize.width + dx };
-		},
-		w: function(event, dx, dy) {
-			var o = this.options, cs = this.originalSize, sp = this.originalPosition;
-			return { left: sp.left + dx, width: cs.width - dx };
-		},
-		n: function(event, dx, dy) {
-			var o = this.options, cs = this.originalSize, sp = this.originalPosition;
-			return { top: sp.top + dy, height: cs.height - dy };
-		},
-		s: function(event, dx, dy) {
-			return { height: this.originalSize.height + dy };
-		},
-		se: function(event, dx, dy) {
-			return $.extend(this._change.s.apply(this, arguments), this._change.e.apply(this, [event, dx, dy]));
-		},
-		sw: function(event, dx, dy) {
-			return $.extend(this._change.s.apply(this, arguments), this._change.w.apply(this, [event, dx, dy]));
-		},
-		ne: function(event, dx, dy) {
-			return $.extend(this._change.n.apply(this, arguments), this._change.e.apply(this, [event, dx, dy]));
-		},
-		nw: function(event, dx, dy) {
-			return $.extend(this._change.n.apply(this, arguments), this._change.w.apply(this, [event, dx, dy]));
-		}
-	},
-
-	_propagate: function(n, event) {
-		$.ui.plugin.call(this, n, [event, this.ui()]);
-		(n != "resize" && this._trigger(n, event, this.ui()));
-	},
-
-	plugins: {},
-
-	ui: function() {
-		return {
-			originalElement: this.originalElement,
-			element: this.element,
-			helper: this.helper,
-			position: this.position,
-			size: this.size,
-			originalSize: this.originalSize,
-			originalPosition: this.originalPosition
-		};
-	}
-
-});
-
-/*
- * Resizable Extensions
- */
-
-$.ui.plugin.add("resizable", "alsoResize", {
-
-	start: function (event, ui) {
-		var that = $(this).data("resizable"), o = that.options;
-
-		var _store = function (exp) {
-			$(exp).each(function() {
-				var el = $(this);
-				el.data("resizable-alsoresize", {
-					width: parseInt(el.width(), 10), height: parseInt(el.height(), 10),
-					left: parseInt(el.css('left'), 10), top: parseInt(el.css('top'), 10)
-				});
-			});
-		};
-
-		if (typeof(o.alsoResize) == 'object' && !o.alsoResize.parentNode) {
-			if (o.alsoResize.length) { o.alsoResize = o.alsoResize[0]; _store(o.alsoResize); }
-			else { $.each(o.alsoResize, function (exp) { _store(exp); }); }
-		}else{
-			_store(o.alsoResize);
-		}
-	},
-
-	resize: function (event, ui) {
-		var that = $(this).data("resizable"), o = that.options, os = that.originalSize, op = that.originalPosition;
-
-		var delta = {
-			height: (that.size.height - os.height) || 0, width: (that.size.width - os.width) || 0,
-			top: (that.position.top - op.top) || 0, left: (that.position.left - op.left) || 0
-		},
-
-		_alsoResize = function (exp, c) {
-			$(exp).each(function() {
-				var el = $(this), start = $(this).data("resizable-alsoresize"), style = {},
-					css = c && c.length ? c : el.parents(ui.originalElement[0]).length ? ['width', 'height'] : ['width', 'height', 'top', 'left'];
-
-				$.each(css, function (i, prop) {
-					var sum = (start[prop]||0) + (delta[prop]||0);
-					if (sum && sum >= 0)
-						style[prop] = sum || null;
-				});
-
-				el.css(style);
-			});
-		};
-
-		if (typeof(o.alsoResize) == 'object' && !o.alsoResize.nodeType) {
-			$.each(o.alsoResize, function (exp, c) { _alsoResize(exp, c); });
-		}else{
-			_alsoResize(o.alsoResize);
-		}
-	},
-
-	stop: function (event, ui) {
-		$(this).removeData("resizable-alsoresize");
-	}
-});
-
-$.ui.plugin.add("resizable", "animate", {
-
-	stop: function(event, ui) {
-		var that = $(this).data("resizable"), o = that.options;
-
-		var pr = that._proportionallyResizeElements, ista = pr.length && (/textarea/i).test(pr[0].nodeName),
-					soffseth = ista && $.ui.hasScroll(pr[0], 'left') /* TODO - jump height */ ? 0 : that.sizeDiff.height,
-						soffsetw = ista ? 0 : that.sizeDiff.width;
-
-		var style = { width: (that.size.width - soffsetw), height: (that.size.height - soffseth) },
-					left = (parseInt(that.element.css('left'), 10) + (that.position.left - that.originalPosition.left)) || null,
-						top = (parseInt(that.element.css('top'), 10) + (that.position.top - that.originalPosition.top)) || null;
-
-		that.element.animate(
-			$.extend(style, top && left ? { top: top, left: left } : {}), {
-				duration: o.animateDuration,
-				easing: o.animateEasing,
-				step: function() {
-
-					var data = {
-						width: parseInt(that.element.css('width'), 10),
-						height: parseInt(that.element.css('height'), 10),
-						top: parseInt(that.element.css('top'), 10),
-						left: parseInt(that.element.css('left'), 10)
-					};
-
-					if (pr && pr.length) $(pr[0]).css({ width: data.width, height: data.height });
-
-					// propagating resize, and updating values for each animation step
-					that._updateCache(data);
-					that._propagate("resize", event);
-
-				}
-			}
-		);
-	}
-
-});
-
-$.ui.plugin.add("resizable", "containment", {
-
-	start: function(event, ui) {
-		var that = $(this).data("resizable"), o = that.options, el = that.element;
-		var oc = o.containment,	ce = (oc instanceof $) ? oc.get(0) : (/parent/.test(oc)) ? el.parent().get(0) : oc;
-		if (!ce) return;
-
-		that.containerElement = $(ce);
-
-		if (/document/.test(oc) || oc == document) {
-			that.containerOffset = { left: 0, top: 0 };
-			that.containerPosition = { left: 0, top: 0 };
-
-			that.parentData = {
-				element: $(document), left: 0, top: 0,
-				width: $(document).width(), height: $(document).height() || document.body.parentNode.scrollHeight
-			};
-		}
-
-		// i'm a node, so compute top, left, right, bottom
-		else {
-			var element = $(ce), p = [];
-			$([ "Top", "Right", "Left", "Bottom" ]).each(function(i, name) { p[i] = num(element.css("padding" + name)); });
-
-			that.containerOffset = element.offset();
-			that.containerPosition = element.position();
-			that.containerSize = { height: (element.innerHeight() - p[3]), width: (element.innerWidth() - p[1]) };
-
-			var co = that.containerOffset, ch = that.containerSize.height,	cw = that.containerSize.width,
-						width = ($.ui.hasScroll(ce, "left") ? ce.scrollWidth : cw ), height = ($.ui.hasScroll(ce) ? ce.scrollHeight : ch);
-
-			that.parentData = {
-				element: ce, left: co.left, top: co.top, width: width, height: height
-			};
-		}
-	},
-
-	resize: function(event, ui) {
-		var that = $(this).data("resizable"), o = that.options,
-				ps = that.containerSize, co = that.containerOffset, cs = that.size, cp = that.position,
-				pRatio = that._aspectRatio || event.shiftKey, cop = { top:0, left:0 }, ce = that.containerElement;
-
-		if (ce[0] != document && (/static/).test(ce.css('position'))) cop = co;
-
-		if (cp.left < (that._helper ? co.left : 0)) {
-			that.size.width = that.size.width + (that._helper ? (that.position.left - co.left) : (that.position.left - cop.left));
-			if (pRatio) that.size.height = that.size.width / that.aspectRatio;
-			that.position.left = o.helper ? co.left : 0;
-		}
-
-		if (cp.top < (that._helper ? co.top : 0)) {
-			that.size.height = that.size.height + (that._helper ? (that.position.top - co.top) : that.position.top);
-			if (pRatio) that.size.width = that.size.height * that.aspectRatio;
-			that.position.top = that._helper ? co.top : 0;
-		}
-
-		that.offset.left = that.parentData.left+that.position.left;
-		that.offset.top = that.parentData.top+that.position.top;
-
-		var woset = Math.abs( (that._helper ? that.offset.left - cop.left : (that.offset.left - cop.left)) + that.sizeDiff.width ),
-					hoset = Math.abs( (that._helper ? that.offset.top - cop.top : (that.offset.top - co.top)) + that.sizeDiff.height );
-
-		var isParent = that.containerElement.get(0) == that.element.parent().get(0),
-			isOffsetRelative = /relative|absolute/.test(that.containerElement.css('position'));
-
-		if(isParent && isOffsetRelative) woset -= that.parentData.left;
-
-		if (woset + that.size.width >= that.parentData.width) {
-			that.size.width = that.parentData.width - woset;
-			if (pRatio) that.size.height = that.size.width / that.aspectRatio;
-		}
-
-		if (hoset + that.size.height >= that.parentData.height) {
-			that.size.height = that.parentData.height - hoset;
-			if (pRatio) that.size.width = that.size.height * that.aspectRatio;
-		}
-	},
-
-	stop: function(event, ui){
-		var that = $(this).data("resizable"), o = that.options, cp = that.position,
-				co = that.containerOffset, cop = that.containerPosition, ce = that.containerElement;
-
-		var helper = $(that.helper), ho = helper.offset(), w = helper.outerWidth() - that.sizeDiff.width, h = helper.outerHeight() - that.sizeDiff.height;
-
-		if (that._helper && !o.animate && (/relative/).test(ce.css('position')))
-			$(this).css({ left: ho.left - cop.left - co.left, width: w, height: h });
-
-		if (that._helper && !o.animate && (/static/).test(ce.css('position')))
-			$(this).css({ left: ho.left - cop.left - co.left, width: w, height: h });
-
-	}
-});
-
-$.ui.plugin.add("resizable", "ghost", {
-
-	start: function(event, ui) {
-
-		var that = $(this).data("resizable"), o = that.options, cs = that.size;
-
-		that.ghost = that.originalElement.clone();
-		that.ghost
-			.css({ opacity: .25, display: 'block', position: 'relative', height: cs.height, width: cs.width, margin: 0, left: 0, top: 0 })
-			.addClass('ui-resizable-ghost')
-			.addClass(typeof o.ghost == 'string' ? o.ghost : '');
-
-		that.ghost.appendTo(that.helper);
-
-	},
-
-	resize: function(event, ui){
-		var that = $(this).data("resizable"), o = that.options;
-		if (that.ghost) that.ghost.css({ position: 'relative', height: that.size.height, width: that.size.width });
-	},
-
-	stop: function(event, ui){
-		var that = $(this).data("resizable"), o = that.options;
-		if (that.ghost && that.helper) that.helper.get(0).removeChild(that.ghost.get(0));
-	}
-
-});
-
-$.ui.plugin.add("resizable", "grid", {
-
-	resize: function(event, ui) {
-		var that = $(this).data("resizable"), o = that.options, cs = that.size, os = that.originalSize, op = that.originalPosition, a = that.axis, ratio = o._aspectRatio || event.shiftKey;
-		o.grid = typeof o.grid == "number" ? [o.grid, o.grid] : o.grid;
-		var ox = Math.round((cs.width - os.width) / (o.grid[0]||1)) * (o.grid[0]||1), oy = Math.round((cs.height - os.height) / (o.grid[1]||1)) * (o.grid[1]||1);
-
-		if (/^(se|s|e)$/.test(a)) {
-			that.size.width = os.width + ox;
-			that.size.height = os.height + oy;
-		}
-		else if (/^(ne)$/.test(a)) {
-			that.size.width = os.width + ox;
-			that.size.height = os.height + oy;
-			that.position.top = op.top - oy;
-		}
-		else if (/^(sw)$/.test(a)) {
-			that.size.width = os.width + ox;
-			that.size.height = os.height + oy;
-			that.position.left = op.left - ox;
-		}
-		else {
-			that.size.width = os.width + ox;
-			that.size.height = os.height + oy;
-			that.position.top = op.top - oy;
-			that.position.left = op.left - ox;
-		}
-	}
-
-});
-
-var num = function(v) {
-	return parseInt(v, 10) || 0;
-};
-
-var isNumber = function(value) {
-	return !isNaN(parseInt(value, 10));
-};
-
-})(jQuery);
-(function( $, undefined ) {
-
-$.widget("ui.selectable", $.ui.mouse, {
-	version: "1.9.2",
-	options: {
-		appendTo: 'body',
-		autoRefresh: true,
-		distance: 0,
-		filter: '*',
-		tolerance: 'touch'
-	},
-	_create: function() {
-		var that = this;
-
-		this.element.addClass("ui-selectable");
-
-		this.dragged = false;
-
-		// cache selectee children based on filter
-		var selectees;
-		this.refresh = function() {
-			selectees = $(that.options.filter, that.element[0]);
-			selectees.addClass("ui-selectee");
-			selectees.each(function() {
-				var $this = $(this);
-				var pos = $this.offset();
-				$.data(this, "selectable-item", {
-					element: this,
-					$element: $this,
-					left: pos.left,
-					top: pos.top,
-					right: pos.left + $this.outerWidth(),
-					bottom: pos.top + $this.outerHeight(),
-					startselected: false,
-					selected: $this.hasClass('ui-selected'),
-					selecting: $this.hasClass('ui-selecting'),
-					unselecting: $this.hasClass('ui-unselecting')
-				});
-			});
-		};
-		this.refresh();
-
-		this.selectees = selectees.addClass("ui-selectee");
-
-		this._mouseInit();
-
-		this.helper = $("
      ");
-	},
-
-	_destroy: function() {
-		this.selectees
-			.removeClass("ui-selectee")
-			.removeData("selectable-item");
-		this.element
-			.removeClass("ui-selectable ui-selectable-disabled");
-		this._mouseDestroy();
-	},
-
-	_mouseStart: function(event) {
-		var that = this;
-
-		this.opos = [event.pageX, event.pageY];
-
-		if (this.options.disabled)
-			return;
-
-		var options = this.options;
-
-		this.selectees = $(options.filter, this.element[0]);
-
-		this._trigger("start", event);
-
-		$(options.appendTo).append(this.helper);
-		// position helper (lasso)
-		this.helper.css({
-			"left": event.clientX,
-			"top": event.clientY,
-			"width": 0,
-			"height": 0
-		});
-
-		if (options.autoRefresh) {
-			this.refresh();
-		}
-
-		this.selectees.filter('.ui-selected').each(function() {
-			var selectee = $.data(this, "selectable-item");
-			selectee.startselected = true;
-			if (!event.metaKey && !event.ctrlKey) {
-				selectee.$element.removeClass('ui-selected');
-				selectee.selected = false;
-				selectee.$element.addClass('ui-unselecting');
-				selectee.unselecting = true;
-				// selectable UNSELECTING callback
-				that._trigger("unselecting", event, {
-					unselecting: selectee.element
-				});
-			}
-		});
-
-		$(event.target).parents().andSelf().each(function() {
-			var selectee = $.data(this, "selectable-item");
-			if (selectee) {
-				var doSelect = (!event.metaKey && !event.ctrlKey) || !selectee.$element.hasClass('ui-selected');
-				selectee.$element
-					.removeClass(doSelect ? "ui-unselecting" : "ui-selected")
-					.addClass(doSelect ? "ui-selecting" : "ui-unselecting");
-				selectee.unselecting = !doSelect;
-				selectee.selecting = doSelect;
-				selectee.selected = doSelect;
-				// selectable (UN)SELECTING callback
-				if (doSelect) {
-					that._trigger("selecting", event, {
-						selecting: selectee.element
-					});
-				} else {
-					that._trigger("unselecting", event, {
-						unselecting: selectee.element
-					});
-				}
-				return false;
-			}
-		});
-
-	},
-
-	_mouseDrag: function(event) {
-		var that = this;
-		this.dragged = true;
-
-		if (this.options.disabled)
-			return;
-
-		var options = this.options;
-
-		var x1 = this.opos[0], y1 = this.opos[1], x2 = event.pageX, y2 = event.pageY;
-		if (x1 > x2) { var tmp = x2; x2 = x1; x1 = tmp; }
-		if (y1 > y2) { var tmp = y2; y2 = y1; y1 = tmp; }
-		this.helper.css({left: x1, top: y1, width: x2-x1, height: y2-y1});
-
-		this.selectees.each(function() {
-			var selectee = $.data(this, "selectable-item");
-			//prevent helper from being selected if appendTo: selectable
-			if (!selectee || selectee.element == that.element[0])
-				return;
-			var hit = false;
-			if (options.tolerance == 'touch') {
-				hit = ( !(selectee.left > x2 || selectee.right < x1 || selectee.top > y2 || selectee.bottom < y1) );
-			} else if (options.tolerance == 'fit') {
-				hit = (selectee.left > x1 && selectee.right < x2 && selectee.top > y1 && selectee.bottom < y2);
-			}
-
-			if (hit) {
-				// SELECT
-				if (selectee.selected) {
-					selectee.$element.removeClass('ui-selected');
-					selectee.selected = false;
-				}
-				if (selectee.unselecting) {
-					selectee.$element.removeClass('ui-unselecting');
-					selectee.unselecting = false;
-				}
-				if (!selectee.selecting) {
-					selectee.$element.addClass('ui-selecting');
-					selectee.selecting = true;
-					// selectable SELECTING callback
-					that._trigger("selecting", event, {
-						selecting: selectee.element
-					});
-				}
-			} else {
-				// UNSELECT
-				if (selectee.selecting) {
-					if ((event.metaKey || event.ctrlKey) && selectee.startselected) {
-						selectee.$element.removeClass('ui-selecting');
-						selectee.selecting = false;
-						selectee.$element.addClass('ui-selected');
-						selectee.selected = true;
-					} else {
-						selectee.$element.removeClass('ui-selecting');
-						selectee.selecting = false;
-						if (selectee.startselected) {
-							selectee.$element.addClass('ui-unselecting');
-							selectee.unselecting = true;
-						}
-						// selectable UNSELECTING callback
-						that._trigger("unselecting", event, {
-							unselecting: selectee.element
-						});
-					}
-				}
-				if (selectee.selected) {
-					if (!event.metaKey && !event.ctrlKey && !selectee.startselected) {
-						selectee.$element.removeClass('ui-selected');
-						selectee.selected = false;
-
-						selectee.$element.addClass('ui-unselecting');
-						selectee.unselecting = true;
-						// selectable UNSELECTING callback
-						that._trigger("unselecting", event, {
-							unselecting: selectee.element
-						});
-					}
-				}
-			}
-		});
-
-		return false;
-	},
-
-	_mouseStop: function(event) {
-		var that = this;
-
-		this.dragged = false;
-
-		var options = this.options;
-
-		$('.ui-unselecting', this.element[0]).each(function() {
-			var selectee = $.data(this, "selectable-item");
-			selectee.$element.removeClass('ui-unselecting');
-			selectee.unselecting = false;
-			selectee.startselected = false;
-			that._trigger("unselected", event, {
-				unselected: selectee.element
-			});
-		});
-		$('.ui-selecting', this.element[0]).each(function() {
-			var selectee = $.data(this, "selectable-item");
-			selectee.$element.removeClass('ui-selecting').addClass('ui-selected');
-			selectee.selecting = false;
-			selectee.selected = true;
-			selectee.startselected = true;
-			that._trigger("selected", event, {
-				selected: selectee.element
-			});
-		});
-		this._trigger("stop", event);
-
-		this.helper.remove();
-
-		return false;
-	}
-
-});
-
-})(jQuery);
-(function( $, undefined ) {
-
-// number of pages in a slider
-// (how many times can you page up/down to go through the whole range)
-var numPages = 5;
-
-$.widget( "ui.slider", $.ui.mouse, {
-	version: "1.9.2",
-	widgetEventPrefix: "slide",
-
-	options: {
-		animate: false,
-		distance: 0,
-		max: 100,
-		min: 0,
-		orientation: "horizontal",
-		range: false,
-		step: 1,
-		value: 0,
-		values: null
-	},
-
-	_create: function() {
-		var i, handleCount,
-			o = this.options,
-			existingHandles = this.element.find( ".ui-slider-handle" ).addClass( "ui-state-default ui-corner-all" ),
-			handle = "",
-			handles = [];
-
-		this._keySliding = false;
-		this._mouseSliding = false;
-		this._animateOff = true;
-		this._handleIndex = null;
-		this._detectOrientation();
-		this._mouseInit();
-
-		this.element
-			.addClass( "ui-slider" +
-				" ui-slider-" + this.orientation +
-				" ui-widget" +
-				" ui-widget-content" +
-				" ui-corner-all" +
-				( o.disabled ? " ui-slider-disabled ui-disabled" : "" ) );
-
-		this.range = $([]);
-
-		if ( o.range ) {
-			if ( o.range === true ) {
-				if ( !o.values ) {
-					o.values = [ this._valueMin(), this._valueMin() ];
-				}
-				if ( o.values.length && o.values.length !== 2 ) {
-					o.values = [ o.values[0], o.values[0] ];
-				}
-			}
-
-			this.range = $( "
      " )
-				.appendTo( this.element )
-				.addClass( "ui-slider-range" +
-				// note: this isn't the most fittingly semantic framework class for this element,
-				// but worked best visually with a variety of themes
-				" ui-widget-header" +
-				( ( o.range === "min" || o.range === "max" ) ? " ui-slider-range-" + o.range : "" ) );
-		}
-
-		handleCount = ( o.values && o.values.length ) || 1;
-
-		for ( i = existingHandles.length; i < handleCount; i++ ) {
-			handles.push( handle );
-		}
-
-		this.handles = existingHandles.add( $( handles.join( "" ) ).appendTo( this.element ) );
-
-		this.handle = this.handles.eq( 0 );
-
-		this.handles.add( this.range ).filter( "a" )
-			.click(function( event ) {
-				event.preventDefault();
-			})
-			.mouseenter(function() {
-				if ( !o.disabled ) {
-					$( this ).addClass( "ui-state-hover" );
-				}
-			})
-			.mouseleave(function() {
-				$( this ).removeClass( "ui-state-hover" );
-			})
-			.focus(function() {
-				if ( !o.disabled ) {
-					$( ".ui-slider .ui-state-focus" ).removeClass( "ui-state-focus" );
-					$( this ).addClass( "ui-state-focus" );
-				} else {
-					$( this ).blur();
-				}
-			})
-			.blur(function() {
-				$( this ).removeClass( "ui-state-focus" );
-			});
-
-		this.handles.each(function( i ) {
-			$( this ).data( "ui-slider-handle-index", i );
-		});
-
-		this._on( this.handles, {
-			keydown: function( event ) {
-				var allowed, curVal, newVal, step,
-					index = $( event.target ).data( "ui-slider-handle-index" );
-
-				switch ( event.keyCode ) {
-					case $.ui.keyCode.HOME:
-					case $.ui.keyCode.END:
-					case $.ui.keyCode.PAGE_UP:
-					case $.ui.keyCode.PAGE_DOWN:
-					case $.ui.keyCode.UP:
-					case $.ui.keyCode.RIGHT:
-					case $.ui.keyCode.DOWN:
-					case $.ui.keyCode.LEFT:
-						event.preventDefault();
-						if ( !this._keySliding ) {
-							this._keySliding = true;
-							$( event.target ).addClass( "ui-state-active" );
-							allowed = this._start( event, index );
-							if ( allowed === false ) {
-								return;
-							}
-						}
-						break;
-				}
-
-				step = this.options.step;
-				if ( this.options.values && this.options.values.length ) {
-					curVal = newVal = this.values( index );
-				} else {
-					curVal = newVal = this.value();
-				}
-
-				switch ( event.keyCode ) {
-					case $.ui.keyCode.HOME:
-						newVal = this._valueMin();
-						break;
-					case $.ui.keyCode.END:
-						newVal = this._valueMax();
-						break;
-					case $.ui.keyCode.PAGE_UP:
-						newVal = this._trimAlignValue( curVal + ( (this._valueMax() - this._valueMin()) / numPages ) );
-						break;
-					case $.ui.keyCode.PAGE_DOWN:
-						newVal = this._trimAlignValue( curVal - ( (this._valueMax() - this._valueMin()) / numPages ) );
-						break;
-					case $.ui.keyCode.UP:
-					case $.ui.keyCode.RIGHT:
-						if ( curVal === this._valueMax() ) {
-							return;
-						}
-						newVal = this._trimAlignValue( curVal + step );
-						break;
-					case $.ui.keyCode.DOWN:
-					case $.ui.keyCode.LEFT:
-						if ( curVal === this._valueMin() ) {
-							return;
-						}
-						newVal = this._trimAlignValue( curVal - step );
-						break;
-				}
-
-				this._slide( event, index, newVal );
-			},
-			keyup: function( event ) {
-				var index = $( event.target ).data( "ui-slider-handle-index" );
-
-				if ( this._keySliding ) {
-					this._keySliding = false;
-					this._stop( event, index );
-					this._change( event, index );
-					$( event.target ).removeClass( "ui-state-active" );
-				}
-			}
-		});
-
-		this._refreshValue();
-
-		this._animateOff = false;
-	},
-
-	_destroy: function() {
-		this.handles.remove();
-		this.range.remove();
-
-		this.element
-			.removeClass( "ui-slider" +
-				" ui-slider-horizontal" +
-				" ui-slider-vertical" +
-				" ui-slider-disabled" +
-				" ui-widget" +
-				" ui-widget-content" +
-				" ui-corner-all" );
-
-		this._mouseDestroy();
-	},
-
-	_mouseCapture: function( event ) {
-		var position, normValue, distance, closestHandle, index, allowed, offset, mouseOverHandle,
-			that = this,
-			o = this.options;
-
-		if ( o.disabled ) {
-			return false;
-		}
-
-		this.elementSize = {
-			width: this.element.outerWidth(),
-			height: this.element.outerHeight()
-		};
-		this.elementOffset = this.element.offset();
-
-		position = { x: event.pageX, y: event.pageY };
-		normValue = this._normValueFromMouse( position );
-		distance = this._valueMax() - this._valueMin() + 1;
-		this.handles.each(function( i ) {
-			var thisDistance = Math.abs( normValue - that.values(i) );
-			if ( distance > thisDistance ) {
-				distance = thisDistance;
-				closestHandle = $( this );
-				index = i;
-			}
-		});
-
-		// workaround for bug #3736 (if both handles of a range are at 0,
-		// the first is always used as the one with least distance,
-		// and moving it is obviously prevented by preventing negative ranges)
-		if( o.range === true && this.values(1) === o.min ) {
-			index += 1;
-			closestHandle = $( this.handles[index] );
-		}
-
-		allowed = this._start( event, index );
-		if ( allowed === false ) {
-			return false;
-		}
-		this._mouseSliding = true;
-
-		this._handleIndex = index;
-
-		closestHandle
-			.addClass( "ui-state-active" )
-			.focus();
-
-		offset = closestHandle.offset();
-		mouseOverHandle = !$( event.target ).parents().andSelf().is( ".ui-slider-handle" );
-		this._clickOffset = mouseOverHandle ? { left: 0, top: 0 } : {
-			left: event.pageX - offset.left - ( closestHandle.width() / 2 ),
-			top: event.pageY - offset.top -
-				( closestHandle.height() / 2 ) -
-				( parseInt( closestHandle.css("borderTopWidth"), 10 ) || 0 ) -
-				( parseInt( closestHandle.css("borderBottomWidth"), 10 ) || 0) +
-				( parseInt( closestHandle.css("marginTop"), 10 ) || 0)
-		};
-
-		if ( !this.handles.hasClass( "ui-state-hover" ) ) {
-			this._slide( event, index, normValue );
-		}
-		this._animateOff = true;
-		return true;
-	},
-
-	_mouseStart: function() {
-		return true;
-	},
-
-	_mouseDrag: function( event ) {
-		var position = { x: event.pageX, y: event.pageY },
-			normValue = this._normValueFromMouse( position );
-
-		this._slide( event, this._handleIndex, normValue );
-
-		return false;
-	},
-
-	_mouseStop: function( event ) {
-		this.handles.removeClass( "ui-state-active" );
-		this._mouseSliding = false;
-
-		this._stop( event, this._handleIndex );
-		this._change( event, this._handleIndex );
-
-		this._handleIndex = null;
-		this._clickOffset = null;
-		this._animateOff = false;
-
-		return false;
-	},
-
-	_detectOrientation: function() {
-		this.orientation = ( this.options.orientation === "vertical" ) ? "vertical" : "horizontal";
-	},
-
-	_normValueFromMouse: function( position ) {
-		var pixelTotal,
-			pixelMouse,
-			percentMouse,
-			valueTotal,
-			valueMouse;
-
-		if ( this.orientation === "horizontal" ) {
-			pixelTotal = this.elementSize.width;
-			pixelMouse = position.x - this.elementOffset.left - ( this._clickOffset ? this._clickOffset.left : 0 );
-		} else {
-			pixelTotal = this.elementSize.height;
-			pixelMouse = position.y - this.elementOffset.top - ( this._clickOffset ? this._clickOffset.top : 0 );
-		}
-
-		percentMouse = ( pixelMouse / pixelTotal );
-		if ( percentMouse > 1 ) {
-			percentMouse = 1;
-		}
-		if ( percentMouse < 0 ) {
-			percentMouse = 0;
-		}
-		if ( this.orientation === "vertical" ) {
-			percentMouse = 1 - percentMouse;
-		}
-
-		valueTotal = this._valueMax() - this._valueMin();
-		valueMouse = this._valueMin() + percentMouse * valueTotal;
-
-		return this._trimAlignValue( valueMouse );
-	},
-
-	_start: function( event, index ) {
-		var uiHash = {
-			handle: this.handles[ index ],
-			value: this.value()
-		};
-		if ( this.options.values && this.options.values.length ) {
-			uiHash.value = this.values( index );
-			uiHash.values = this.values();
-		}
-		return this._trigger( "start", event, uiHash );
-	},
-
-	_slide: function( event, index, newVal ) {
-		var otherVal,
-			newValues,
-			allowed;
-
-		if ( this.options.values && this.options.values.length ) {
-			otherVal = this.values( index ? 0 : 1 );
-
-			if ( ( this.options.values.length === 2 && this.options.range === true ) &&
-					( ( index === 0 && newVal > otherVal) || ( index === 1 && newVal < otherVal ) )
-				) {
-				newVal = otherVal;
-			}
-
-			if ( newVal !== this.values( index ) ) {
-				newValues = this.values();
-				newValues[ index ] = newVal;
-				// A slide can be canceled by returning false from the slide callback
-				allowed = this._trigger( "slide", event, {
-					handle: this.handles[ index ],
-					value: newVal,
-					values: newValues
-				} );
-				otherVal = this.values( index ? 0 : 1 );
-				if ( allowed !== false ) {
-					this.values( index, newVal, true );
-				}
-			}
-		} else {
-			if ( newVal !== this.value() ) {
-				// A slide can be canceled by returning false from the slide callback
-				allowed = this._trigger( "slide", event, {
-					handle: this.handles[ index ],
-					value: newVal
-				} );
-				if ( allowed !== false ) {
-					this.value( newVal );
-				}
-			}
-		}
-	},
-
-	_stop: function( event, index ) {
-		var uiHash = {
-			handle: this.handles[ index ],
-			value: this.value()
-		};
-		if ( this.options.values && this.options.values.length ) {
-			uiHash.value = this.values( index );
-			uiHash.values = this.values();
-		}
-
-		this._trigger( "stop", event, uiHash );
-	},
-
-	_change: function( event, index ) {
-		if ( !this._keySliding && !this._mouseSliding ) {
-			var uiHash = {
-				handle: this.handles[ index ],
-				value: this.value()
-			};
-			if ( this.options.values && this.options.values.length ) {
-				uiHash.value = this.values( index );
-				uiHash.values = this.values();
-			}
-
-			this._trigger( "change", event, uiHash );
-		}
-	},
-
-	value: function( newValue ) {
-		if ( arguments.length ) {
-			this.options.value = this._trimAlignValue( newValue );
-			this._refreshValue();
-			this._change( null, 0 );
-			return;
-		}
-
-		return this._value();
-	},
-
-	values: function( index, newValue ) {
-		var vals,
-			newValues,
-			i;
-
-		if ( arguments.length > 1 ) {
-			this.options.values[ index ] = this._trimAlignValue( newValue );
-			this._refreshValue();
-			this._change( null, index );
-			return;
-		}
-
-		if ( arguments.length ) {
-			if ( $.isArray( arguments[ 0 ] ) ) {
-				vals = this.options.values;
-				newValues = arguments[ 0 ];
-				for ( i = 0; i < vals.length; i += 1 ) {
-					vals[ i ] = this._trimAlignValue( newValues[ i ] );
-					this._change( null, i );
-				}
-				this._refreshValue();
-			} else {
-				if ( this.options.values && this.options.values.length ) {
-					return this._values( index );
-				} else {
-					return this.value();
-				}
-			}
-		} else {
-			return this._values();
-		}
-	},
-
-	_setOption: function( key, value ) {
-		var i,
-			valsLength = 0;
-
-		if ( $.isArray( this.options.values ) ) {
-			valsLength = this.options.values.length;
-		}
-
-		$.Widget.prototype._setOption.apply( this, arguments );
-
-		switch ( key ) {
-			case "disabled":
-				if ( value ) {
-					this.handles.filter( ".ui-state-focus" ).blur();
-					this.handles.removeClass( "ui-state-hover" );
-					this.handles.prop( "disabled", true );
-					this.element.addClass( "ui-disabled" );
-				} else {
-					this.handles.prop( "disabled", false );
-					this.element.removeClass( "ui-disabled" );
-				}
-				break;
-			case "orientation":
-				this._detectOrientation();
-				this.element
-					.removeClass( "ui-slider-horizontal ui-slider-vertical" )
-					.addClass( "ui-slider-" + this.orientation );
-				this._refreshValue();
-				break;
-			case "value":
-				this._animateOff = true;
-				this._refreshValue();
-				this._change( null, 0 );
-				this._animateOff = false;
-				break;
-			case "values":
-				this._animateOff = true;
-				this._refreshValue();
-				for ( i = 0; i < valsLength; i += 1 ) {
-					this._change( null, i );
-				}
-				this._animateOff = false;
-				break;
-			case "min":
-			case "max":
-				this._animateOff = true;
-				this._refreshValue();
-				this._animateOff = false;
-				break;
-		}
-	},
-
-	//internal value getter
-	// _value() returns value trimmed by min and max, aligned by step
-	_value: function() {
-		var val = this.options.value;
-		val = this._trimAlignValue( val );
-
-		return val;
-	},
-
-	//internal values getter
-	// _values() returns array of values trimmed by min and max, aligned by step
-	// _values( index ) returns single value trimmed by min and max, aligned by step
-	_values: function( index ) {
-		var val,
-			vals,
-			i;
-
-		if ( arguments.length ) {
-			val = this.options.values[ index ];
-			val = this._trimAlignValue( val );
-
-			return val;
-		} else {
-			// .slice() creates a copy of the array
-			// this copy gets trimmed by min and max and then returned
-			vals = this.options.values.slice();
-			for ( i = 0; i < vals.length; i+= 1) {
-				vals[ i ] = this._trimAlignValue( vals[ i ] );
-			}
-
-			return vals;
-		}
-	},
-
-	// returns the step-aligned value that val is closest to, between (inclusive) min and max
-	_trimAlignValue: function( val ) {
-		if ( val <= this._valueMin() ) {
-			return this._valueMin();
-		}
-		if ( val >= this._valueMax() ) {
-			return this._valueMax();
-		}
-		var step = ( this.options.step > 0 ) ? this.options.step : 1,
-			valModStep = (val - this._valueMin()) % step,
-			alignValue = val - valModStep;
-
-		if ( Math.abs(valModStep) * 2 >= step ) {
-			alignValue += ( valModStep > 0 ) ? step : ( -step );
-		}
-
-		// Since JavaScript has problems with large floats, round
-		// the final value to 5 digits after the decimal point (see #4124)
-		return parseFloat( alignValue.toFixed(5) );
-	},
-
-	_valueMin: function() {
-		return this.options.min;
-	},
-
-	_valueMax: function() {
-		return this.options.max;
-	},
-
-	_refreshValue: function() {
-		var lastValPercent, valPercent, value, valueMin, valueMax,
-			oRange = this.options.range,
-			o = this.options,
-			that = this,
-			animate = ( !this._animateOff ) ? o.animate : false,
-			_set = {};
-
-		if ( this.options.values && this.options.values.length ) {
-			this.handles.each(function( i ) {
-				valPercent = ( that.values(i) - that._valueMin() ) / ( that._valueMax() - that._valueMin() ) * 100;
-				_set[ that.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
-				$( this ).stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
-				if ( that.options.range === true ) {
-					if ( that.orientation === "horizontal" ) {
-						if ( i === 0 ) {
-							that.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { left: valPercent + "%" }, o.animate );
-						}
-						if ( i === 1 ) {
-							that.range[ animate ? "animate" : "css" ]( { width: ( valPercent - lastValPercent ) + "%" }, { queue: false, duration: o.animate } );
-						}
-					} else {
-						if ( i === 0 ) {
-							that.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { bottom: ( valPercent ) + "%" }, o.animate );
-						}
-						if ( i === 1 ) {
-							that.range[ animate ? "animate" : "css" ]( { height: ( valPercent - lastValPercent ) + "%" }, { queue: false, duration: o.animate } );
-						}
-					}
-				}
-				lastValPercent = valPercent;
-			});
-		} else {
-			value = this.value();
-			valueMin = this._valueMin();
-			valueMax = this._valueMax();
-			valPercent = ( valueMax !== valueMin ) ?
-					( value - valueMin ) / ( valueMax - valueMin ) * 100 :
-					0;
-			_set[ this.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
-			this.handle.stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
-
-			if ( oRange === "min" && this.orientation === "horizontal" ) {
-				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { width: valPercent + "%" }, o.animate );
-			}
-			if ( oRange === "max" && this.orientation === "horizontal" ) {
-				this.range[ animate ? "animate" : "css" ]( { width: ( 100 - valPercent ) + "%" }, { queue: false, duration: o.animate } );
-			}
-			if ( oRange === "min" && this.orientation === "vertical" ) {
-				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { height: valPercent + "%" }, o.animate );
-			}
-			if ( oRange === "max" && this.orientation === "vertical" ) {
-				this.range[ animate ? "animate" : "css" ]( { height: ( 100 - valPercent ) + "%" }, { queue: false, duration: o.animate } );
-			}
-		}
-	}
-
-});
-
-}(jQuery));
-(function( $, undefined ) {
-
-$.widget("ui.sortable", $.ui.mouse, {
-	version: "1.9.2",
-	widgetEventPrefix: "sort",
-	ready: false,
-	options: {
-		appendTo: "parent",
-		axis: false,
-		connectWith: false,
-		containment: false,
-		cursor: 'auto',
-		cursorAt: false,
-		dropOnEmpty: true,
-		forcePlaceholderSize: false,
-		forceHelperSize: false,
-		grid: false,
-		handle: false,
-		helper: "original",
-		items: '> *',
-		opacity: false,
-		placeholder: false,
-		revert: false,
-		scroll: true,
-		scrollSensitivity: 20,
-		scrollSpeed: 20,
-		scope: "default",
-		tolerance: "intersect",
-		zIndex: 1000
-	},
-	_create: function() {
-
-		var o = this.options;
-		this.containerCache = {};
-		this.element.addClass("ui-sortable");
-
-		//Get the items
-		this.refresh();
-
-		//Let's determine if the items are being displayed horizontally
-		this.floating = this.items.length ? o.axis === 'x' || (/left|right/).test(this.items[0].item.css('float')) || (/inline|table-cell/).test(this.items[0].item.css('display')) : false;
-
-		//Let's determine the parent's offset
-		this.offset = this.element.offset();
-
-		//Initialize mouse events for interaction
-		this._mouseInit();
-
-		//We're ready to go
-		this.ready = true
-
-	},
-
-	_destroy: function() {
-		this.element
-			.removeClass("ui-sortable ui-sortable-disabled");
-		this._mouseDestroy();
-
-		for ( var i = this.items.length - 1; i >= 0; i-- )
-			this.items[i].item.removeData(this.widgetName + "-item");
-
-		return this;
-	},
-
-	_setOption: function(key, value){
-		if ( key === "disabled" ) {
-			this.options[ key ] = value;
-
-			this.widget().toggleClass( "ui-sortable-disabled", !!value );
-		} else {
-			// Don't call widget base _setOption for disable as it adds ui-state-disabled class
-			$.Widget.prototype._setOption.apply(this, arguments);
-		}
-	},
-
-	_mouseCapture: function(event, overrideHandle) {
-		var that = this;
-
-		if (this.reverting) {
-			return false;
-		}
-
-		if(this.options.disabled || this.options.type == 'static') return false;
-
-		//We have to refresh the items data once first
-		this._refreshItems(event);
-
-		//Find out if the clicked node (or one of its parents) is a actual item in this.items
-		var currentItem = null, nodes = $(event.target).parents().each(function() {
-			if($.data(this, that.widgetName + '-item') == that) {
-				currentItem = $(this);
-				return false;
-			}
-		});
-		if($.data(event.target, that.widgetName + '-item') == that) currentItem = $(event.target);
-
-		if(!currentItem) return false;
-		if(this.options.handle && !overrideHandle) {
-			var validHandle = false;
-
-			$(this.options.handle, currentItem).find("*").andSelf().each(function() { if(this == event.target) validHandle = true; });
-			if(!validHandle) return false;
-		}
-
-		this.currentItem = currentItem;
-		this._removeCurrentsFromItems();
-		return true;
-
-	},
-
-	_mouseStart: function(event, overrideHandle, noActivation) {
-
-		var o = this.options;
-		this.currentContainer = this;
-
-		//We only need to call refreshPositions, because the refreshItems call has been moved to mouseCapture
-		this.refreshPositions();
-
-		//Create and append the visible helper
-		this.helper = this._createHelper(event);
-
-		//Cache the helper size
-		this._cacheHelperProportions();
-
-		/*
-		 * - Position generation -
-		 * This block generates everything position related - it's the core of draggables.
-		 */
-
-		//Cache the margins of the original element
-		this._cacheMargins();
-
-		//Get the next scrolling parent
-		this.scrollParent = this.helper.scrollParent();
-
-		//The element's absolute position on the page minus margins
-		this.offset = this.currentItem.offset();
-		this.offset = {
-			top: this.offset.top - this.margins.top,
-			left: this.offset.left - this.margins.left
-		};
-
-		$.extend(this.offset, {
-			click: { //Where the click happened, relative to the element
-				left: event.pageX - this.offset.left,
-				top: event.pageY - this.offset.top
-			},
-			parent: this._getParentOffset(),
-			relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
-		});
-
-		// Only after we got the offset, we can change the helper's position to absolute
-		// TODO: Still need to figure out a way to make relative sorting possible
-		this.helper.css("position", "absolute");
-		this.cssPosition = this.helper.css("position");
-
-		//Generate the original position
-		this.originalPosition = this._generatePosition(event);
-		this.originalPageX = event.pageX;
-		this.originalPageY = event.pageY;
-
-		//Adjust the mouse offset relative to the helper if 'cursorAt' is supplied
-		(o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
-
-		//Cache the former DOM position
-		this.domPosition = { prev: this.currentItem.prev()[0], parent: this.currentItem.parent()[0] };
-
-		//If the helper is not the original, hide the original so it's not playing any role during the drag, won't cause anything bad this way
-		if(this.helper[0] != this.currentItem[0]) {
-			this.currentItem.hide();
-		}
-
-		//Create the placeholder
-		this._createPlaceholder();
-
-		//Set a containment if given in the options
-		if(o.containment)
-			this._setContainment();
-
-		if(o.cursor) { // cursor option
-			if ($('body').css("cursor")) this._storedCursor = $('body').css("cursor");
-			$('body').css("cursor", o.cursor);
-		}
-
-		if(o.opacity) { // opacity option
-			if (this.helper.css("opacity")) this._storedOpacity = this.helper.css("opacity");
-			this.helper.css("opacity", o.opacity);
-		}
-
-		if(o.zIndex) { // zIndex option
-			if (this.helper.css("zIndex")) this._storedZIndex = this.helper.css("zIndex");
-			this.helper.css("zIndex", o.zIndex);
-		}
-
-		//Prepare scrolling
-		if(this.scrollParent[0] != document && this.scrollParent[0].tagName != 'HTML')
-			this.overflowOffset = this.scrollParent.offset();
-
-		//Call callbacks
-		this._trigger("start", event, this._uiHash());
-
-		//Recache the helper size
-		if(!this._preserveHelperProportions)
-			this._cacheHelperProportions();
-
-
-		//Post 'activate' events to possible containers
-		if(!noActivation) {
-			 for (var i = this.containers.length - 1; i >= 0; i--) { this.containers[i]._trigger("activate", event, this._uiHash(this)); }
-		}
-
-		//Prepare possible droppables
-		if($.ui.ddmanager)
-			$.ui.ddmanager.current = this;
-
-		if ($.ui.ddmanager && !o.dropBehaviour)
-			$.ui.ddmanager.prepareOffsets(this, event);
-
-		this.dragging = true;
-
-		this.helper.addClass("ui-sortable-helper");
-		this._mouseDrag(event); //Execute the drag once - this causes the helper not to be visible before getting its correct position
-		return true;
-
-	},
-
-	_mouseDrag: function(event) {
-
-		//Compute the helpers position
-		this.position = this._generatePosition(event);
-		this.positionAbs = this._convertPositionTo("absolute");
-
-		if (!this.lastPositionAbs) {
-			this.lastPositionAbs = this.positionAbs;
-		}
-
-		//Do scrolling
-		if(this.options.scroll) {
-			var o = this.options, scrolled = false;
-			if(this.scrollParent[0] != document && this.scrollParent[0].tagName != 'HTML') {
-
-				if((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity)
-					this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed;
-				else if(event.pageY - this.overflowOffset.top < o.scrollSensitivity)
-					this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop - o.scrollSpeed;
-
-				if((this.overflowOffset.left + this.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity)
-					this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft + o.scrollSpeed;
-				else if(event.pageX - this.overflowOffset.left < o.scrollSensitivity)
-					this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft - o.scrollSpeed;
-
-			} else {
-
-				if(event.pageY - $(document).scrollTop() < o.scrollSensitivity)
-					scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
-				else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity)
-					scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
-
-				if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity)
-					scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
-				else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity)
-					scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
-
-			}
-
-			if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour)
-				$.ui.ddmanager.prepareOffsets(this, event);
-		}
-
-		//Regenerate the absolute position used for position checks
-		this.positionAbs = this._convertPositionTo("absolute");
-
-		//Set the helper position
-		if(!this.options.axis || this.options.axis != "y") this.helper[0].style.left = this.position.left+'px';
-		if(!this.options.axis || this.options.axis != "x") this.helper[0].style.top = this.position.top+'px';
-
-		//Rearrange
-		for (var i = this.items.length - 1; i >= 0; i--) {
-
-			//Cache variables and intersection, continue if no intersection
-			var item = this.items[i], itemElement = item.item[0], intersection = this._intersectsWithPointer(item);
-			if (!intersection) continue;
-
-			// Only put the placeholder inside the current Container, skip all
-			// items form other containers. This works because when moving
-			// an item from one container to another the
-			// currentContainer is switched before the placeholder is moved.
-			//
-			// Without this moving items in "sub-sortables" can cause the placeholder to jitter
-			// beetween the outer and inner container.
-			if (item.instance !== this.currentContainer) continue;
-
-			if (itemElement != this.currentItem[0] //cannot intersect with itself
-				&&	this.placeholder[intersection == 1 ? "next" : "prev"]()[0] != itemElement //no useless actions that have been done before
-				&&	!$.contains(this.placeholder[0], itemElement) //no action if the item moved is the parent of the item checked
-				&& (this.options.type == 'semi-dynamic' ? !$.contains(this.element[0], itemElement) : true)
-				//&& itemElement.parentNode == this.placeholder[0].parentNode // only rearrange items within the same container
-			) {
-
-				this.direction = intersection == 1 ? "down" : "up";
-
-				if (this.options.tolerance == "pointer" || this._intersectsWithSides(item)) {
-					this._rearrange(event, item);
-				} else {
-					break;
-				}
-
-				this._trigger("change", event, this._uiHash());
-				break;
-			}
-		}
-
-		//Post events to containers
-		this._contactContainers(event);
-
-		//Interconnect with droppables
-		if($.ui.ddmanager) $.ui.ddmanager.drag(this, event);
-
-		//Call callbacks
-		this._trigger('sort', event, this._uiHash());
-
-		this.lastPositionAbs = this.positionAbs;
-		return false;
-
-	},
-
-	_mouseStop: function(event, noPropagation) {
-
-		if(!event) return;
-
-		//If we are using droppables, inform the manager about the drop
-		if ($.ui.ddmanager && !this.options.dropBehaviour)
-			$.ui.ddmanager.drop(this, event);
-
-		if(this.options.revert) {
-			var that = this;
-			var cur = this.placeholder.offset();
-
-			this.reverting = true;
-
-			$(this.helper).animate({
-				left: cur.left - this.offset.parent.left - this.margins.left + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollLeft),
-				top: cur.top - this.offset.parent.top - this.margins.top + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop)
-			}, parseInt(this.options.revert, 10) || 500, function() {
-				that._clear(event);
-			});
-		} else {
-			this._clear(event, noPropagation);
-		}
-
-		return false;
-
-	},
-
-	cancel: function() {
-
-		if(this.dragging) {
-
-			this._mouseUp({ target: null });
-
-			if(this.options.helper == "original")
-				this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
-			else
-				this.currentItem.show();
-
-			//Post deactivating events to containers
-			for (var i = this.containers.length - 1; i >= 0; i--){
-				this.containers[i]._trigger("deactivate", null, this._uiHash(this));
-				if(this.containers[i].containerCache.over) {
-					this.containers[i]._trigger("out", null, this._uiHash(this));
-					this.containers[i].containerCache.over = 0;
-				}
-			}
-
-		}
-
-		if (this.placeholder) {
-			//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
-			if(this.placeholder[0].parentNode) this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
-			if(this.options.helper != "original" && this.helper && this.helper[0].parentNode) this.helper.remove();
-
-			$.extend(this, {
-				helper: null,
-				dragging: false,
-				reverting: false,
-				_noFinalSort: null
-			});
-
-			if(this.domPosition.prev) {
-				$(this.domPosition.prev).after(this.currentItem);
-			} else {
-				$(this.domPosition.parent).prepend(this.currentItem);
-			}
-		}
-
-		return this;
-
-	},
-
-	serialize: function(o) {
-
-		var items = this._getItemsAsjQuery(o && o.connected);
-		var str = []; o = o || {};
-
-		$(items).each(function() {
-			var res = ($(o.item || this).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
-			if(res) str.push((o.key || res[1]+'[]')+'='+(o.key && o.expression ? res[1] : res[2]));
-		});
-
-		if(!str.length && o.key) {
-			str.push(o.key + '=');
-		}
-
-		return str.join('&');
-
-	},
-
-	toArray: function(o) {
-
-		var items = this._getItemsAsjQuery(o && o.connected);
-		var ret = []; o = o || {};
-
-		items.each(function() { ret.push($(o.item || this).attr(o.attribute || 'id') || ''); });
-		return ret;
-
-	},
-
-	/* Be careful with the following core functions */
-	_intersectsWith: function(item) {
-
-		var x1 = this.positionAbs.left,
-			x2 = x1 + this.helperProportions.width,
-			y1 = this.positionAbs.top,
-			y2 = y1 + this.helperProportions.height;
-
-		var l = item.left,
-			r = l + item.width,
-			t = item.top,
-			b = t + item.height;
-
-		var dyClick = this.offset.click.top,
-			dxClick = this.offset.click.left;
-
-		var isOverElement = (y1 + dyClick) > t && (y1 + dyClick) < b && (x1 + dxClick) > l && (x1 + dxClick) < r;
-
-		if(	   this.options.tolerance == "pointer"
-			|| this.options.forcePointerForContainers
-			|| (this.options.tolerance != "pointer" && this.helperProportions[this.floating ? 'width' : 'height'] > item[this.floating ? 'width' : 'height'])
-		) {
-			return isOverElement;
-		} else {
-
-			return (l < x1 + (this.helperProportions.width / 2) // Right Half
-				&& x2 - (this.helperProportions.width / 2) < r // Left Half
-				&& t < y1 + (this.helperProportions.height / 2) // Bottom Half
-				&& y2 - (this.helperProportions.height / 2) < b ); // Top Half
-
-		}
-	},
-
-	_intersectsWithPointer: function(item) {
-
-		var isOverElementHeight = (this.options.axis === 'x') || $.ui.isOverAxis(this.positionAbs.top + this.offset.click.top, item.top, item.height),
-			isOverElementWidth = (this.options.axis === 'y') || $.ui.isOverAxis(this.positionAbs.left + this.offset.click.left, item.left, item.width),
-			isOverElement = isOverElementHeight && isOverElementWidth,
-			verticalDirection = this._getDragVerticalDirection(),
-			horizontalDirection = this._getDragHorizontalDirection();
-
-		if (!isOverElement)
-			return false;
-
-		return this.floating ?
-			( ((horizontalDirection && horizontalDirection == "right") || verticalDirection == "down") ? 2 : 1 )
-			: ( verticalDirection && (verticalDirection == "down" ? 2 : 1) );
-
-	},
-
-	_intersectsWithSides: function(item) {
-
-		var isOverBottomHalf = $.ui.isOverAxis(this.positionAbs.top + this.offset.click.top, item.top + (item.height/2), item.height),
-			isOverRightHalf = $.ui.isOverAxis(this.positionAbs.left + this.offset.click.left, item.left + (item.width/2), item.width),
-			verticalDirection = this._getDragVerticalDirection(),
-			horizontalDirection = this._getDragHorizontalDirection();
-
-		if (this.floating && horizontalDirection) {
-			return ((horizontalDirection == "right" && isOverRightHalf) || (horizontalDirection == "left" && !isOverRightHalf));
-		} else {
-			return verticalDirection && ((verticalDirection == "down" && isOverBottomHalf) || (verticalDirection == "up" && !isOverBottomHalf));
-		}
-
-	},
-
-	_getDragVerticalDirection: function() {
-		var delta = this.positionAbs.top - this.lastPositionAbs.top;
-		return delta != 0 && (delta > 0 ? "down" : "up");
-	},
-
-	_getDragHorizontalDirection: function() {
-		var delta = this.positionAbs.left - this.lastPositionAbs.left;
-		return delta != 0 && (delta > 0 ? "right" : "left");
-	},
-
-	refresh: function(event) {
-		this._refreshItems(event);
-		this.refreshPositions();
-		return this;
-	},
-
-	_connectWith: function() {
-		var options = this.options;
-		return options.connectWith.constructor == String
-			? [options.connectWith]
-			: options.connectWith;
-	},
-
-	_getItemsAsjQuery: function(connected) {
-
-		var items = [];
-		var queries = [];
-		var connectWith = this._connectWith();
-
-		if(connectWith && connected) {
-			for (var i = connectWith.length - 1; i >= 0; i--){
-				var cur = $(connectWith[i]);
-				for (var j = cur.length - 1; j >= 0; j--){
-					var inst = $.data(cur[j], this.widgetName);
-					if(inst && inst != this && !inst.options.disabled) {
-						queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element).not(".ui-sortable-helper").not('.ui-sortable-placeholder'), inst]);
-					}
-				};
-			};
-		}
-
-		queries.push([$.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this.options.items, this.element).not(".ui-sortable-helper").not('.ui-sortable-placeholder'), this]);
-
-		for (var i = queries.length - 1; i >= 0; i--){
-			queries[i][0].each(function() {
-				items.push(this);
-			});
-		};
-
-		return $(items);
-
-	},
-
-	_removeCurrentsFromItems: function() {
-
-		var list = this.currentItem.find(":data(" + this.widgetName + "-item)");
-
-		this.items = $.grep(this.items, function (item) {
-			for (var j=0; j < list.length; j++) {
-				if(list[j] == item.item[0])
-					return false;
-			};
-			return true;
-		});
-
-	},
-
-	_refreshItems: function(event) {
-
-		this.items = [];
-		this.containers = [this];
-		var items = this.items;
-		var queries = [[$.isFunction(this.options.items) ? this.options.items.call(this.element[0], event, { item: this.currentItem }) : $(this.options.items, this.element), this]];
-		var connectWith = this._connectWith();
-
-		if(connectWith && this.ready) { //Shouldn't be run the first time through due to massive slow-down
-			for (var i = connectWith.length - 1; i >= 0; i--){
-				var cur = $(connectWith[i]);
-				for (var j = cur.length - 1; j >= 0; j--){
-					var inst = $.data(cur[j], this.widgetName);
-					if(inst && inst != this && !inst.options.disabled) {
-						queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element[0], event, { item: this.currentItem }) : $(inst.options.items, inst.element), inst]);
-						this.containers.push(inst);
-					}
-				};
-			};
-		}
-
-		for (var i = queries.length - 1; i >= 0; i--) {
-			var targetData = queries[i][1];
-			var _queries = queries[i][0];
-
-			for (var j=0, queriesLength = _queries.length; j < queriesLength; j++) {
-				var item = $(_queries[j]);
-
-				item.data(this.widgetName + '-item', targetData); // Data for target checking (mouse manager)
-
-				items.push({
-					item: item,
-					instance: targetData,
-					width: 0, height: 0,
-					left: 0, top: 0
-				});
-			};
-		};
-
-	},
-
-	refreshPositions: function(fast) {
-
-		//This has to be redone because due to the item being moved out/into the offsetParent, the offsetParent's position will change
-		if(this.offsetParent && this.helper) {
-			this.offset.parent = this._getParentOffset();
-		}
-
-		for (var i = this.items.length - 1; i >= 0; i--){
-			var item = this.items[i];
-
-			//We ignore calculating positions of all connected containers when we're not over them
-			if(item.instance != this.currentContainer && this.currentContainer && item.item[0] != this.currentItem[0])
-				continue;
-
-			var t = this.options.toleranceElement ? $(this.options.toleranceElement, item.item) : item.item;
-
-			if (!fast) {
-				item.width = t.outerWidth();
-				item.height = t.outerHeight();
-			}
-
-			var p = t.offset();
-			item.left = p.left;
-			item.top = p.top;
-		};
-
-		if(this.options.custom && this.options.custom.refreshContainers) {
-			this.options.custom.refreshContainers.call(this);
-		} else {
-			for (var i = this.containers.length - 1; i >= 0; i--){
-				var p = this.containers[i].element.offset();
-				this.containers[i].containerCache.left = p.left;
-				this.containers[i].containerCache.top = p.top;
-				this.containers[i].containerCache.width	= this.containers[i].element.outerWidth();
-				this.containers[i].containerCache.height = this.containers[i].element.outerHeight();
-			};
-		}
-
-		return this;
-	},
-
-	_createPlaceholder: function(that) {
-		that = that || this;
-		var o = that.options;
-
-		if(!o.placeholder || o.placeholder.constructor == String) {
-			var className = o.placeholder;
-			o.placeholder = {
-				element: function() {
-
-					var el = $(document.createElement(that.currentItem[0].nodeName))
-						.addClass(className || that.currentItem[0].className+" ui-sortable-placeholder")
-						.removeClass("ui-sortable-helper")[0];
-
-					if(!className)
-						el.style.visibility = "hidden";
-
-					return el;
-				},
-				update: function(container, p) {
-
-					// 1. If a className is set as 'placeholder option, we don't force sizes - the class is responsible for that
-					// 2. The option 'forcePlaceholderSize can be enabled to force it even if a class name is specified
-					if(className && !o.forcePlaceholderSize) return;
-
-					//If the element doesn't have a actual height by itself (without styles coming from a stylesheet), it receives the inline height from the dragged item
-					if(!p.height()) { p.height(that.currentItem.innerHeight() - parseInt(that.currentItem.css('paddingTop')||0, 10) - parseInt(that.currentItem.css('paddingBottom')||0, 10)); };
-					if(!p.width()) { p.width(that.currentItem.innerWidth() - parseInt(that.currentItem.css('paddingLeft')||0, 10) - parseInt(that.currentItem.css('paddingRight')||0, 10)); };
-				}
-			};
-		}
-
-		//Create the placeholder
-		that.placeholder = $(o.placeholder.element.call(that.element, that.currentItem));
-
-		//Append it after the actual current item
-		that.currentItem.after(that.placeholder);
-
-		//Update the size of the placeholder (TODO: Logic to fuzzy, see line 316/317)
-		o.placeholder.update(that, that.placeholder);
-
-	},
-
-	_contactContainers: function(event) {
-
-		// get innermost container that intersects with item
-		var innermostContainer = null, innermostIndex = null;
-
-
-		for (var i = this.containers.length - 1; i >= 0; i--){
-
-			// never consider a container that's located within the item itself
-			if($.contains(this.currentItem[0], this.containers[i].element[0]))
-				continue;
-
-			if(this._intersectsWith(this.containers[i].containerCache)) {
-
-				// if we've already found a container and it's more "inner" than this, then continue
-				if(innermostContainer && $.contains(this.containers[i].element[0], innermostContainer.element[0]))
-					continue;
-
-				innermostContainer = this.containers[i];
-				innermostIndex = i;
-
-			} else {
-				// container doesn't intersect. trigger "out" event if necessary
-				if(this.containers[i].containerCache.over) {
-					this.containers[i]._trigger("out", event, this._uiHash(this));
-					this.containers[i].containerCache.over = 0;
-				}
-			}
-
-		}
-
-		// if no intersecting containers found, return
-		if(!innermostContainer) return;
-
-		// move the item into the container if it's not there already
-		if(this.containers.length === 1) {
-			this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
-			this.containers[innermostIndex].containerCache.over = 1;
-		} else {
-
-			//When entering a new container, we will find the item with the least distance and append our item near it
-			var dist = 10000; var itemWithLeastDistance = null;
-			var posProperty = this.containers[innermostIndex].floating ? 'left' : 'top';
-			var sizeProperty = this.containers[innermostIndex].floating ? 'width' : 'height';
-			var base = this.positionAbs[posProperty] + this.offset.click[posProperty];
-			for (var j = this.items.length - 1; j >= 0; j--) {
-				if(!$.contains(this.containers[innermostIndex].element[0], this.items[j].item[0])) continue;
-				if(this.items[j].item[0] == this.currentItem[0]) continue;
-				var cur = this.items[j].item.offset()[posProperty];
-				var nearBottom = false;
-				if(Math.abs(cur - base) > Math.abs(cur + this.items[j][sizeProperty] - base)){
-					nearBottom = true;
-					cur += this.items[j][sizeProperty];
-				}
-
-				if(Math.abs(cur - base) < dist) {
-					dist = Math.abs(cur - base); itemWithLeastDistance = this.items[j];
-					this.direction = nearBottom ? "up": "down";
-				}
-			}
-
-			if(!itemWithLeastDistance && !this.options.dropOnEmpty) //Check if dropOnEmpty is enabled
-				return;
-
-			this.currentContainer = this.containers[innermostIndex];
-			itemWithLeastDistance ? this._rearrange(event, itemWithLeastDistance, null, true) : this._rearrange(event, null, this.containers[innermostIndex].element, true);
-			this._trigger("change", event, this._uiHash());
-			this.containers[innermostIndex]._trigger("change", event, this._uiHash(this));
-
-			//Update the placeholder
-			this.options.placeholder.update(this.currentContainer, this.placeholder);
-
-			this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
-			this.containers[innermostIndex].containerCache.over = 1;
-		}
-
-
-	},
-
-	_createHelper: function(event) {
-
-		var o = this.options;
-		var helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event, this.currentItem])) : (o.helper == 'clone' ? this.currentItem.clone() : this.currentItem);
-
-		if(!helper.parents('body').length) //Add the helper to the DOM if that didn't happen already
-			$(o.appendTo != 'parent' ? o.appendTo : this.currentItem[0].parentNode)[0].appendChild(helper[0]);
-
-		if(helper[0] == this.currentItem[0])
-			this._storedCSS = { width: this.currentItem[0].style.width, height: this.currentItem[0].style.height, position: this.currentItem.css("position"), top: this.currentItem.css("top"), left: this.currentItem.css("left") };
-
-		if(helper[0].style.width == '' || o.forceHelperSize) helper.width(this.currentItem.width());
-		if(helper[0].style.height == '' || o.forceHelperSize) helper.height(this.currentItem.height());
-
-		return helper;
-
-	},
-
-	_adjustOffsetFromHelper: function(obj) {
-		if (typeof obj == 'string') {
-			obj = obj.split(' ');
-		}
-		if ($.isArray(obj)) {
-			obj = {left: +obj[0], top: +obj[1] || 0};
-		}
-		if ('left' in obj) {
-			this.offset.click.left = obj.left + this.margins.left;
-		}
-		if ('right' in obj) {
-			this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
-		}
-		if ('top' in obj) {
-			this.offset.click.top = obj.top + this.margins.top;
-		}
-		if ('bottom' in obj) {
-			this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
-		}
-	},
-
-	_getParentOffset: function() {
-
-
-		//Get the offsetParent and cache its position
-		this.offsetParent = this.helper.offsetParent();
-		var po = this.offsetParent.offset();
-
-		// This is a special case where we need to modify a offset calculated on start, since the following happened:
-		// 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
-		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
-		//    the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
-		if(this.cssPosition == 'absolute' && this.scrollParent[0] != document && $.contains(this.scrollParent[0], this.offsetParent[0])) {
-			po.left += this.scrollParent.scrollLeft();
-			po.top += this.scrollParent.scrollTop();
-		}
-
-		if((this.offsetParent[0] == document.body) //This needs to be actually done for all browsers, since pageX/pageY includes this information
-		|| (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() == 'html' && $.ui.ie)) //Ugly IE fix
-			po = { top: 0, left: 0 };
-
-		return {
-			top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
-			left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
-		};
-
-	},
-
-	_getRelativeOffset: function() {
-
-		if(this.cssPosition == "relative") {
-			var p = this.currentItem.position();
-			return {
-				top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.scrollParent.scrollTop(),
-				left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.scrollParent.scrollLeft()
-			};
-		} else {
-			return { top: 0, left: 0 };
-		}
-
-	},
-
-	_cacheMargins: function() {
-		this.margins = {
-			left: (parseInt(this.currentItem.css("marginLeft"),10) || 0),
-			top: (parseInt(this.currentItem.css("marginTop"),10) || 0)
-		};
-	},
-
-	_cacheHelperProportions: function() {
-		this.helperProportions = {
-			width: this.helper.outerWidth(),
-			height: this.helper.outerHeight()
-		};
-	},
-
-	_setContainment: function() {
-
-		var o = this.options;
-		if(o.containment == 'parent') o.containment = this.helper[0].parentNode;
-		if(o.containment == 'document' || o.containment == 'window') this.containment = [
-			0 - this.offset.relative.left - this.offset.parent.left,
-			0 - this.offset.relative.top - this.offset.parent.top,
-			$(o.containment == 'document' ? document : window).width() - this.helperProportions.width - this.margins.left,
-			($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
-		];
-
-		if(!(/^(document|window|parent)$/).test(o.containment)) {
-			var ce = $(o.containment)[0];
-			var co = $(o.containment).offset();
-			var over = ($(ce).css("overflow") != 'hidden');
-
-			this.containment = [
-				co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0) - this.margins.left,
-				co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0) - this.margins.top,
-				co.left+(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left,
-				co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top
-			];
-		}
-
-	},
-
-	_convertPositionTo: function(d, pos) {
-
-		if(!pos) pos = this.position;
-		var mod = d == "absolute" ? 1 : -1;
-		var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
-
-		return {
-			top: (
-				pos.top																	// The absolute mouse position
-				+ this.offset.relative.top * mod										// Only for relative positioned nodes: Relative offset from element to offset parent
-				+ this.offset.parent.top * mod											// The offsetParent's offset without borders (offset + border)
-				- ( ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod)
-			),
-			left: (
-				pos.left																// The absolute mouse position
-				+ this.offset.relative.left * mod										// Only for relative positioned nodes: Relative offset from element to offset parent
-				+ this.offset.parent.left * mod											// The offsetParent's offset without borders (offset + border)
-				- ( ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod)
-			)
-		};
-
-	},
-
-	_generatePosition: function(event) {
-
-		var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
-
-		// This is another very weird special case that only happens for relative elements:
-		// 1. If the css position is relative
-		// 2. and the scroll parent is the document or similar to the offset parent
-		// we have to refresh the relative offset during the scroll so there are no jumps
-		if(this.cssPosition == 'relative' && !(this.scrollParent[0] != document && this.scrollParent[0] != this.offsetParent[0])) {
-			this.offset.relative = this._getRelativeOffset();
-		}
-
-		var pageX = event.pageX;
-		var pageY = event.pageY;
-
-		/*
-		 * - Position constraining -
-		 * Constrain the position to a mix of grid, containment.
-		 */
-
-		if(this.originalPosition) { //If we are not dragging yet, we won't check for options
-
-			if(this.containment) {
-				if(event.pageX - this.offset.click.left < this.containment[0]) pageX = this.containment[0] + this.offset.click.left;
-				if(event.pageY - this.offset.click.top < this.containment[1]) pageY = this.containment[1] + this.offset.click.top;
-				if(event.pageX - this.offset.click.left > this.containment[2]) pageX = this.containment[2] + this.offset.click.left;
-				if(event.pageY - this.offset.click.top > this.containment[3]) pageY = this.containment[3] + this.offset.click.top;
-			}
-
-			if(o.grid) {
-				var top = this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1];
-				pageY = this.containment ? (!(top - this.offset.click.top < this.containment[1] || top - this.offset.click.top > this.containment[3]) ? top : (!(top - this.offset.click.top < this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
-
-				var left = this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0];
-				pageX = this.containment ? (!(left - this.offset.click.left < this.containment[0] || left - this.offset.click.left > this.containment[2]) ? left : (!(left - this.offset.click.left < this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
-			}
-
-		}
-
-		return {
-			top: (
-				pageY																// The absolute mouse position
-				- this.offset.click.top													// Click offset (relative to the element)
-				- this.offset.relative.top												// Only for relative positioned nodes: Relative offset from element to offset parent
-				- this.offset.parent.top												// The offsetParent's offset without borders (offset + border)
-				+ ( ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
-			),
-			left: (
-				pageX																// The absolute mouse position
-				- this.offset.click.left												// Click offset (relative to the element)
-				- this.offset.relative.left												// Only for relative positioned nodes: Relative offset from element to offset parent
-				- this.offset.parent.left												// The offsetParent's offset without borders (offset + border)
-				+ ( ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ))
-			)
-		};
-
-	},
-
-	_rearrange: function(event, i, a, hardRefresh) {
-
-		a ? a[0].appendChild(this.placeholder[0]) : i.item[0].parentNode.insertBefore(this.placeholder[0], (this.direction == 'down' ? i.item[0] : i.item[0].nextSibling));
-
-		//Various things done here to improve the performance:
-		// 1. we create a setTimeout, that calls refreshPositions
-		// 2. on the instance, we have a counter variable, that get's higher after every append
-		// 3. on the local scope, we copy the counter variable, and check in the timeout, if it's still the same
-		// 4. this lets only the last addition to the timeout stack through
-		this.counter = this.counter ? ++this.counter : 1;
-		var counter = this.counter;
-
-		this._delay(function() {
-			if(counter == this.counter) this.refreshPositions(!hardRefresh); //Precompute after each DOM insertion, NOT on mousemove
-		});
-
-	},
-
-	_clear: function(event, noPropagation) {
-
-		this.reverting = false;
-		// We delay all events that have to be triggered to after the point where the placeholder has been removed and
-		// everything else normalized again
-		var delayedTriggers = [];
-
-		// We first have to update the dom position of the actual currentItem
-		// Note: don't do it if the current item is already removed (by a user), or it gets reappended (see #4088)
-		if(!this._noFinalSort && this.currentItem.parent().length) this.placeholder.before(this.currentItem);
-		this._noFinalSort = null;
-
-		if(this.helper[0] == this.currentItem[0]) {
-			for(var i in this._storedCSS) {
-				if(this._storedCSS[i] == 'auto' || this._storedCSS[i] == 'static') this._storedCSS[i] = '';
-			}
-			this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
-		} else {
-			this.currentItem.show();
-		}
-
-		if(this.fromOutside && !noPropagation) delayedTriggers.push(function(event) { this._trigger("receive", event, this._uiHash(this.fromOutside)); });
-		if((this.fromOutside || this.domPosition.prev != this.currentItem.prev().not(".ui-sortable-helper")[0] || this.domPosition.parent != this.currentItem.parent()[0]) && !noPropagation) delayedTriggers.push(function(event) { this._trigger("update", event, this._uiHash()); }); //Trigger update callback if the DOM position has changed
-
-		// Check if the items Container has Changed and trigger appropriate
-		// events.
-		if (this !== this.currentContainer) {
-			if(!noPropagation) {
-				delayedTriggers.push(function(event) { this._trigger("remove", event, this._uiHash()); });
-				delayedTriggers.push((function(c) { return function(event) { c._trigger("receive", event, this._uiHash(this)); };  }).call(this, this.currentContainer));
-				delayedTriggers.push((function(c) { return function(event) { c._trigger("update", event, this._uiHash(this));  }; }).call(this, this.currentContainer));
-			}
-		}
-
-
-		//Post events to containers
-		for (var i = this.containers.length - 1; i >= 0; i--){
-			if(!noPropagation) delayedTriggers.push((function(c) { return function(event) { c._trigger("deactivate", event, this._uiHash(this)); };  }).call(this, this.containers[i]));
-			if(this.containers[i].containerCache.over) {
-				delayedTriggers.push((function(c) { return function(event) { c._trigger("out", event, this._uiHash(this)); };  }).call(this, this.containers[i]));
-				this.containers[i].containerCache.over = 0;
-			}
-		}
-
-		//Do what was originally in plugins
-		if(this._storedCursor) $('body').css("cursor", this._storedCursor); //Reset cursor
-		if(this._storedOpacity) this.helper.css("opacity", this._storedOpacity); //Reset opacity
-		if(this._storedZIndex) this.helper.css("zIndex", this._storedZIndex == 'auto' ? '' : this._storedZIndex); //Reset z-index
-
-		this.dragging = false;
-		if(this.cancelHelperRemoval) {
-			if(!noPropagation) {
-				this._trigger("beforeStop", event, this._uiHash());
-				for (var i=0; i < delayedTriggers.length; i++) { delayedTriggers[i].call(this, event); }; //Trigger all delayed events
-				this._trigger("stop", event, this._uiHash());
-			}
-
-			this.fromOutside = false;
-			return false;
-		}
-
-		if(!noPropagation) this._trigger("beforeStop", event, this._uiHash());
-
-		//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
-		this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
-
-		if(this.helper[0] != this.currentItem[0]) this.helper.remove(); this.helper = null;
-
-		if(!noPropagation) {
-			for (var i=0; i < delayedTriggers.length; i++) { delayedTriggers[i].call(this, event); }; //Trigger all delayed events
-			this._trigger("stop", event, this._uiHash());
-		}
-
-		this.fromOutside = false;
-		return true;
-
-	},
-
-	_trigger: function() {
-		if ($.Widget.prototype._trigger.apply(this, arguments) === false) {
-			this.cancel();
-		}
-	},
-
-	_uiHash: function(_inst) {
-		var inst = _inst || this;
-		return {
-			helper: inst.helper,
-			placeholder: inst.placeholder || $([]),
-			position: inst.position,
-			originalPosition: inst.originalPosition,
-			offset: inst.positionAbs,
-			item: inst.currentItem,
-			sender: _inst ? _inst.element : null
-		};
-	}
-
-});
-
-})(jQuery);
-(function( $ ) {
-
-function modifier( fn ) {
-	return function() {
-		var previous = this.element.val();
-		fn.apply( this, arguments );
-		this._refresh();
-		if ( previous !== this.element.val() ) {
-			this._trigger( "change" );
-		}
-	};
-}
-
-$.widget( "ui.spinner", {
-	version: "1.9.2",
-	defaultElement: "",
-	widgetEventPrefix: "spin",
-	options: {
-		culture: null,
-		icons: {
-			down: "ui-icon-triangle-1-s",
-			up: "ui-icon-triangle-1-n"
-		},
-		incremental: true,
-		max: null,
-		min: null,
-		numberFormat: null,
-		page: 10,
-		step: 1,
-
-		change: null,
-		spin: null,
-		start: null,
-		stop: null
-	},
-
-	_create: function() {
-		// handle string values that need to be parsed
-		this._setOption( "max", this.options.max );
-		this._setOption( "min", this.options.min );
-		this._setOption( "step", this.options.step );
-
-		// format the value, but don't constrain
-		this._value( this.element.val(), true );
-
-		this._draw();
-		this._on( this._events );
-		this._refresh();
-
-		// turning off autocomplete prevents the browser from remembering the
-		// value when navigating through history, so we re-enable autocomplete
-		// if the page is unloaded before the widget is destroyed. #7790
-		this._on( this.window, {
-			beforeunload: function() {
-				this.element.removeAttr( "autocomplete" );
-			}
-		});
-	},
-
-	_getCreateOptions: function() {
-		var options = {},
-			element = this.element;
-
-		$.each( [ "min", "max", "step" ], function( i, option ) {
-			var value = element.attr( option );
-			if ( value !== undefined && value.length ) {
-				options[ option ] = value;
-			}
-		});
-
-		return options;
-	},
-
-	_events: {
-		keydown: function( event ) {
-			if ( this._start( event ) && this._keydown( event ) ) {
-				event.preventDefault();
-			}
-		},
-		keyup: "_stop",
-		focus: function() {
-			this.previous = this.element.val();
-		},
-		blur: function( event ) {
-			if ( this.cancelBlur ) {
-				delete this.cancelBlur;
-				return;
-			}
-
-			this._refresh();
-			if ( this.previous !== this.element.val() ) {
-				this._trigger( "change", event );
-			}
-		},
-		mousewheel: function( event, delta ) {
-			if ( !delta ) {
-				return;
-			}
-			if ( !this.spinning && !this._start( event ) ) {
-				return false;
-			}
-
-			this._spin( (delta > 0 ? 1 : -1) * this.options.step, event );
-			clearTimeout( this.mousewheelTimer );
-			this.mousewheelTimer = this._delay(function() {
-				if ( this.spinning ) {
-					this._stop( event );
-				}
-			}, 100 );
-			event.preventDefault();
-		},
-		"mousedown .ui-spinner-button": function( event ) {
-			var previous;
-
-			// We never want the buttons to have focus; whenever the user is
-			// interacting with the spinner, the focus should be on the input.
-			// If the input is focused then this.previous is properly set from
-			// when the input first received focus. If the input is not focused
-			// then we need to set this.previous based on the value before spinning.
-			previous = this.element[0] === this.document[0].activeElement ?
-				this.previous : this.element.val();
-			function checkFocus() {
-				var isActive = this.element[0] === this.document[0].activeElement;
-				if ( !isActive ) {
-					this.element.focus();
-					this.previous = previous;
-					// support: IE
-					// IE sets focus asynchronously, so we need to check if focus
-					// moved off of the input because the user clicked on the button.
-					this._delay(function() {
-						this.previous = previous;
-					});
-				}
-			}
-
-			// ensure focus is on (or stays on) the text field
-			event.preventDefault();
-			checkFocus.call( this );
-
-			// support: IE
-			// IE doesn't prevent moving focus even with event.preventDefault()
-			// so we set a flag to know when we should ignore the blur event
-			// and check (again) if focus moved off of the input.
-			this.cancelBlur = true;
-			this._delay(function() {
-				delete this.cancelBlur;
-				checkFocus.call( this );
-			});
-
-			if ( this._start( event ) === false ) {
-				return;
-			}
-
-			this._repeat( null, $( event.currentTarget ).hasClass( "ui-spinner-up" ) ? 1 : -1, event );
-		},
-		"mouseup .ui-spinner-button": "_stop",
-		"mouseenter .ui-spinner-button": function( event ) {
-			// button will add ui-state-active if mouse was down while mouseleave and kept down
-			if ( !$( event.currentTarget ).hasClass( "ui-state-active" ) ) {
-				return;
-			}
-
-			if ( this._start( event ) === false ) {
-				return false;
-			}
-			this._repeat( null, $( event.currentTarget ).hasClass( "ui-spinner-up" ) ? 1 : -1, event );
-		},
-		// TODO: do we really want to consider this a stop?
-		// shouldn't we just stop the repeater and wait until mouseup before
-		// we trigger the stop event?
-		"mouseleave .ui-spinner-button": "_stop"
-	},
-
-	_draw: function() {
-		var uiSpinner = this.uiSpinner = this.element
-			.addClass( "ui-spinner-input" )
-			.attr( "autocomplete", "off" )
-			.wrap( this._uiSpinnerHtml() )
-			.parent()
-				// add buttons
-				.append( this._buttonHtml() );
-
-		this.element.attr( "role", "spinbutton" );
-
-		// button bindings
-		this.buttons = uiSpinner.find( ".ui-spinner-button" )
-			.attr( "tabIndex", -1 )
-			.button()
-			.removeClass( "ui-corner-all" );
-
-		// IE 6 doesn't understand height: 50% for the buttons
-		// unless the wrapper has an explicit height
-		if ( this.buttons.height() > Math.ceil( uiSpinner.height() * 0.5 ) &&
-				uiSpinner.height() > 0 ) {
-			uiSpinner.height( uiSpinner.height() );
-		}
-
-		// disable spinner if element was already disabled
-		if ( this.options.disabled ) {
-			this.disable();
-		}
-	},
-
-	_keydown: function( event ) {
-		var options = this.options,
-			keyCode = $.ui.keyCode;
-
-		switch ( event.keyCode ) {
-		case keyCode.UP:
-			this._repeat( null, 1, event );
-			return true;
-		case keyCode.DOWN:
-			this._repeat( null, -1, event );
-			return true;
-		case keyCode.PAGE_UP:
-			this._repeat( null, options.page, event );
-			return true;
-		case keyCode.PAGE_DOWN:
-			this._repeat( null, -options.page, event );
-			return true;
-		}
-
-		return false;
-	},
-
-	_uiSpinnerHtml: function() {
-		return "";
-	},
-
-	_buttonHtml: function() {
-		return "" +
-			"" +
-			"";
-	},
-
-	_start: function( event ) {
-		if ( !this.spinning && this._trigger( "start", event ) === false ) {
-			return false;
-		}
-
-		if ( !this.counter ) {
-			this.counter = 1;
-		}
-		this.spinning = true;
-		return true;
-	},
-
-	_repeat: function( i, steps, event ) {
-		i = i || 500;
-
-		clearTimeout( this.timer );
-		this.timer = this._delay(function() {
-			this._repeat( 40, steps, event );
-		}, i );
-
-		this._spin( steps * this.options.step, event );
-	},
-
-	_spin: function( step, event ) {
-		var value = this.value() || 0;
-
-		if ( !this.counter ) {
-			this.counter = 1;
-		}
-
-		value = this._adjustValue( value + step * this._increment( this.counter ) );
-
-		if ( !this.spinning || this._trigger( "spin", event, { value: value } ) !== false) {
-			this._value( value );
-			this.counter++;
-		}
-	},
-
-	_increment: function( i ) {
-		var incremental = this.options.incremental;
-
-		if ( incremental ) {
-			return $.isFunction( incremental ) ?
-				incremental( i ) :
-				Math.floor( i*i*i/50000 - i*i/500 + 17*i/200 + 1 );
-		}
-
-		return 1;
-	},
-
-	_precision: function() {
-		var precision = this._precisionOf( this.options.step );
-		if ( this.options.min !== null ) {
-			precision = Math.max( precision, this._precisionOf( this.options.min ) );
-		}
-		return precision;
-	},
-
-	_precisionOf: function( num ) {
-		var str = num.toString(),
-			decimal = str.indexOf( "." );
-		return decimal === -1 ? 0 : str.length - decimal - 1;
-	},
-
-	_adjustValue: function( value ) {
-		var base, aboveMin,
-			options = this.options;
-
-		// make sure we're at a valid step
-		// - find out where we are relative to the base (min or 0)
-		base = options.min !== null ? options.min : 0;
-		aboveMin = value - base;
-		// - round to the nearest step
-		aboveMin = Math.round(aboveMin / options.step) * options.step;
-		// - rounding is based on 0, so adjust back to our base
-		value = base + aboveMin;
-
-		// fix precision from bad JS floating point math
-		value = parseFloat( value.toFixed( this._precision() ) );
-
-		// clamp the value
-		if ( options.max !== null && value > options.max) {
-			return options.max;
-		}
-		if ( options.min !== null && value < options.min ) {
-			return options.min;
-		}
-
-		return value;
-	},
-
-	_stop: function( event ) {
-		if ( !this.spinning ) {
-			return;
-		}
-
-		clearTimeout( this.timer );
-		clearTimeout( this.mousewheelTimer );
-		this.counter = 0;
-		this.spinning = false;
-		this._trigger( "stop", event );
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "culture" || key === "numberFormat" ) {
-			var prevValue = this._parse( this.element.val() );
-			this.options[ key ] = value;
-			this.element.val( this._format( prevValue ) );
-			return;
-		}
-
-		if ( key === "max" || key === "min" || key === "step" ) {
-			if ( typeof value === "string" ) {
-				value = this._parse( value );
-			}
-		}
-
-		this._super( key, value );
-
-		if ( key === "disabled" ) {
-			if ( value ) {
-				this.element.prop( "disabled", true );
-				this.buttons.button( "disable" );
-			} else {
-				this.element.prop( "disabled", false );
-				this.buttons.button( "enable" );
-			}
-		}
-	},
-
-	_setOptions: modifier(function( options ) {
-		this._super( options );
-		this._value( this.element.val() );
-	}),
-
-	_parse: function( val ) {
-		if ( typeof val === "string" && val !== "" ) {
-			val = window.Globalize && this.options.numberFormat ?
-				Globalize.parseFloat( val, 10, this.options.culture ) : +val;
-		}
-		return val === "" || isNaN( val ) ? null : val;
-	},
-
-	_format: function( value ) {
-		if ( value === "" ) {
-			return "";
-		}
-		return window.Globalize && this.options.numberFormat ?
-			Globalize.format( value, this.options.numberFormat, this.options.culture ) :
-			value;
-	},
-
-	_refresh: function() {
-		this.element.attr({
-			"aria-valuemin": this.options.min,
-			"aria-valuemax": this.options.max,
-			// TODO: what should we do with values that can't be parsed?
-			"aria-valuenow": this._parse( this.element.val() )
-		});
-	},
-
-	// update the value without triggering change
-	_value: function( value, allowAny ) {
-		var parsed;
-		if ( value !== "" ) {
-			parsed = this._parse( value );
-			if ( parsed !== null ) {
-				if ( !allowAny ) {
-					parsed = this._adjustValue( parsed );
-				}
-				value = this._format( parsed );
-			}
-		}
-		this.element.val( value );
-		this._refresh();
-	},
-
-	_destroy: function() {
-		this.element
-			.removeClass( "ui-spinner-input" )
-			.prop( "disabled", false )
-			.removeAttr( "autocomplete" )
-			.removeAttr( "role" )
-			.removeAttr( "aria-valuemin" )
-			.removeAttr( "aria-valuemax" )
-			.removeAttr( "aria-valuenow" );
-		this.uiSpinner.replaceWith( this.element );
-	},
-
-	stepUp: modifier(function( steps ) {
-		this._stepUp( steps );
-	}),
-	_stepUp: function( steps ) {
-		this._spin( (steps || 1) * this.options.step );
-	},
-
-	stepDown: modifier(function( steps ) {
-		this._stepDown( steps );
-	}),
-	_stepDown: function( steps ) {
-		this._spin( (steps || 1) * -this.options.step );
-	},
-
-	pageUp: modifier(function( pages ) {
-		this._stepUp( (pages || 1) * this.options.page );
-	}),
-
-	pageDown: modifier(function( pages ) {
-		this._stepDown( (pages || 1) * this.options.page );
-	}),
-
-	value: function( newVal ) {
-		if ( !arguments.length ) {
-			return this._parse( this.element.val() );
-		}
-		modifier( this._value ).call( this, newVal );
-	},
-
-	widget: function() {
-		return this.uiSpinner;
-	}
-});
-
-}( jQuery ) );
-(function( $, undefined ) {
-
-var tabId = 0,
-	rhash = /#.*$/;
-
-function getNextTabId() {
-	return ++tabId;
-}
-
-function isLocal( anchor ) {
-	return anchor.hash.length > 1 &&
-		anchor.href.replace( rhash, "" ) ===
-			location.href.replace( rhash, "" )
-				// support: Safari 5.1
-				// Safari 5.1 doesn't encode spaces in window.location
-				// but it does encode spaces from anchors (#8777)
-				.replace( /\s/g, "%20" );
-}
-
-$.widget( "ui.tabs", {
-	version: "1.9.2",
-	delay: 300,
-	options: {
-		active: null,
-		collapsible: false,
-		event: "click",
-		heightStyle: "content",
-		hide: null,
-		show: null,
-
-		// callbacks
-		activate: null,
-		beforeActivate: null,
-		beforeLoad: null,
-		load: null
-	},
-
-	_create: function() {
-		var that = this,
-			options = this.options,
-			active = options.active,
-			locationHash = location.hash.substring( 1 );
-
-		this.running = false;
-
-		this.element
-			.addClass( "ui-tabs ui-widget ui-widget-content ui-corner-all" )
-			.toggleClass( "ui-tabs-collapsible", options.collapsible )
-			// Prevent users from focusing disabled tabs via click
-			.delegate( ".ui-tabs-nav > li", "mousedown" + this.eventNamespace, function( event ) {
-				if ( $( this ).is( ".ui-state-disabled" ) ) {
-					event.preventDefault();
-				}
-			})
-			// support: IE <9
-			// Preventing the default action in mousedown doesn't prevent IE
-			// from focusing the element, so if the anchor gets focused, blur.
-			// We don't have to worry about focusing the previously focused
-			// element since clicking on a non-focusable element should focus
-			// the body anyway.
-			.delegate( ".ui-tabs-anchor", "focus" + this.eventNamespace, function() {
-				if ( $( this ).closest( "li" ).is( ".ui-state-disabled" ) ) {
-					this.blur();
-				}
-			});
-
-		this._processTabs();
-
-		if ( active === null ) {
-			// check the fragment identifier in the URL
-			if ( locationHash ) {
-				this.tabs.each(function( i, tab ) {
-					if ( $( tab ).attr( "aria-controls" ) === locationHash ) {
-						active = i;
-						return false;
-					}
-				});
-			}
-
-			// check for a tab marked active via a class
-			if ( active === null ) {
-				active = this.tabs.index( this.tabs.filter( ".ui-tabs-active" ) );
-			}
-
-			// no active tab, set to false
-			if ( active === null || active === -1 ) {
-				active = this.tabs.length ? 0 : false;
-			}
-		}
-
-		// handle numbers: negative, out of range
-		if ( active !== false ) {
-			active = this.tabs.index( this.tabs.eq( active ) );
-			if ( active === -1 ) {
-				active = options.collapsible ? false : 0;
-			}
-		}
-		options.active = active;
-
-		// don't allow collapsible: false and active: false
-		if ( !options.collapsible && options.active === false && this.anchors.length ) {
-			options.active = 0;
-		}
-
-		// Take disabling tabs via class attribute from HTML
-		// into account and update option properly.
-		if ( $.isArray( options.disabled ) ) {
-			options.disabled = $.unique( options.disabled.concat(
-				$.map( this.tabs.filter( ".ui-state-disabled" ), function( li ) {
-					return that.tabs.index( li );
-				})
-			) ).sort();
-		}
-
-		// check for length avoids error when initializing empty list
-		if ( this.options.active !== false && this.anchors.length ) {
-			this.active = this._findActive( this.options.active );
-		} else {
-			this.active = $();
-		}
-
-		this._refresh();
-
-		if ( this.active.length ) {
-			this.load( options.active );
-		}
-	},
-
-	_getCreateEventData: function() {
-		return {
-			tab: this.active,
-			panel: !this.active.length ? $() : this._getPanelForTab( this.active )
-		};
-	},
-
-	_tabKeydown: function( event ) {
-		var focusedTab = $( this.document[0].activeElement ).closest( "li" ),
-			selectedIndex = this.tabs.index( focusedTab ),
-			goingForward = true;
-
-		if ( this._handlePageNav( event ) ) {
-			return;
-		}
-
-		switch ( event.keyCode ) {
-			case $.ui.keyCode.RIGHT:
-			case $.ui.keyCode.DOWN:
-				selectedIndex++;
-				break;
-			case $.ui.keyCode.UP:
-			case $.ui.keyCode.LEFT:
-				goingForward = false;
-				selectedIndex--;
-				break;
-			case $.ui.keyCode.END:
-				selectedIndex = this.anchors.length - 1;
-				break;
-			case $.ui.keyCode.HOME:
-				selectedIndex = 0;
-				break;
-			case $.ui.keyCode.SPACE:
-				// Activate only, no collapsing
-				event.preventDefault();
-				clearTimeout( this.activating );
-				this._activate( selectedIndex );
-				return;
-			case $.ui.keyCode.ENTER:
-				// Toggle (cancel delayed activation, allow collapsing)
-				event.preventDefault();
-				clearTimeout( this.activating );
-				// Determine if we should collapse or activate
-				this._activate( selectedIndex === this.options.active ? false : selectedIndex );
-				return;
-			default:
-				return;
-		}
-
-		// Focus the appropriate tab, based on which key was pressed
-		event.preventDefault();
-		clearTimeout( this.activating );
-		selectedIndex = this._focusNextTab( selectedIndex, goingForward );
-
-		// Navigating with control key will prevent automatic activation
-		if ( !event.ctrlKey ) {
-			// Update aria-selected immediately so that AT think the tab is already selected.
-			// Otherwise AT may confuse the user by stating that they need to activate the tab,
-			// but the tab will already be activated by the time the announcement finishes.
-			focusedTab.attr( "aria-selected", "false" );
-			this.tabs.eq( selectedIndex ).attr( "aria-selected", "true" );
-
-			this.activating = this._delay(function() {
-				this.option( "active", selectedIndex );
-			}, this.delay );
-		}
-	},
-
-	_panelKeydown: function( event ) {
-		if ( this._handlePageNav( event ) ) {
-			return;
-		}
-
-		// Ctrl+up moves focus to the current tab
-		if ( event.ctrlKey && event.keyCode === $.ui.keyCode.UP ) {
-			event.preventDefault();
-			this.active.focus();
-		}
-	},
-
-	// Alt+page up/down moves focus to the previous/next tab (and activates)
-	_handlePageNav: function( event ) {
-		if ( event.altKey && event.keyCode === $.ui.keyCode.PAGE_UP ) {
-			this._activate( this._focusNextTab( this.options.active - 1, false ) );
-			return true;
-		}
-		if ( event.altKey && event.keyCode === $.ui.keyCode.PAGE_DOWN ) {
-			this._activate( this._focusNextTab( this.options.active + 1, true ) );
-			return true;
-		}
-	},
-
-	_findNextTab: function( index, goingForward ) {
-		var lastTabIndex = this.tabs.length - 1;
-
-		function constrain() {
-			if ( index > lastTabIndex ) {
-				index = 0;
-			}
-			if ( index < 0 ) {
-				index = lastTabIndex;
-			}
-			return index;
-		}
-
-		while ( $.inArray( constrain(), this.options.disabled ) !== -1 ) {
-			index = goingForward ? index + 1 : index - 1;
-		}
-
-		return index;
-	},
-
-	_focusNextTab: function( index, goingForward ) {
-		index = this._findNextTab( index, goingForward );
-		this.tabs.eq( index ).focus();
-		return index;
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "active" ) {
-			// _activate() will handle invalid values and update this.options
-			this._activate( value );
-			return;
-		}
-
-		if ( key === "disabled" ) {
-			// don't use the widget factory's disabled handling
-			this._setupDisabled( value );
-			return;
-		}
-
-		this._super( key, value);
-
-		if ( key === "collapsible" ) {
-			this.element.toggleClass( "ui-tabs-collapsible", value );
-			// Setting collapsible: false while collapsed; open first panel
-			if ( !value && this.options.active === false ) {
-				this._activate( 0 );
-			}
-		}
-
-		if ( key === "event" ) {
-			this._setupEvents( value );
-		}
-
-		if ( key === "heightStyle" ) {
-			this._setupHeightStyle( value );
-		}
-	},
-
-	_tabId: function( tab ) {
-		return tab.attr( "aria-controls" ) || "ui-tabs-" + getNextTabId();
-	},
-
-	_sanitizeSelector: function( hash ) {
-		return hash ? hash.replace( /[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g, "\\$&" ) : "";
-	},
-
-	refresh: function() {
-		var options = this.options,
-			lis = this.tablist.children( ":has(a[href])" );
-
-		// get disabled tabs from class attribute from HTML
-		// this will get converted to a boolean if needed in _refresh()
-		options.disabled = $.map( lis.filter( ".ui-state-disabled" ), function( tab ) {
-			return lis.index( tab );
-		});
-
-		this._processTabs();
-
-		// was collapsed or no tabs
-		if ( options.active === false || !this.anchors.length ) {
-			options.active = false;
-			this.active = $();
-		// was active, but active tab is gone
-		} else if ( this.active.length && !$.contains( this.tablist[ 0 ], this.active[ 0 ] ) ) {
-			// all remaining tabs are disabled
-			if ( this.tabs.length === options.disabled.length ) {
-				options.active = false;
-				this.active = $();
-			// activate previous tab
-			} else {
-				this._activate( this._findNextTab( Math.max( 0, options.active - 1 ), false ) );
-			}
-		// was active, active tab still exists
-		} else {
-			// make sure active index is correct
-			options.active = this.tabs.index( this.active );
-		}
-
-		this._refresh();
-	},
-
-	_refresh: function() {
-		this._setupDisabled( this.options.disabled );
-		this._setupEvents( this.options.event );
-		this._setupHeightStyle( this.options.heightStyle );
-
-		this.tabs.not( this.active ).attr({
-			"aria-selected": "false",
-			tabIndex: -1
-		});
-		this.panels.not( this._getPanelForTab( this.active ) )
-			.hide()
-			.attr({
-				"aria-expanded": "false",
-				"aria-hidden": "true"
-			});
-
-		// Make sure one tab is in the tab order
-		if ( !this.active.length ) {
-			this.tabs.eq( 0 ).attr( "tabIndex", 0 );
-		} else {
-			this.active
-				.addClass( "ui-tabs-active ui-state-active" )
-				.attr({
-					"aria-selected": "true",
-					tabIndex: 0
-				});
-			this._getPanelForTab( this.active )
-				.show()
-				.attr({
-					"aria-expanded": "true",
-					"aria-hidden": "false"
-				});
-		}
-	},
-
-	_processTabs: function() {
-		var that = this;
-
-		this.tablist = this._getList()
-			.addClass( "ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all" )
-			.attr( "role", "tablist" );
-
-		this.tabs = this.tablist.find( "> li:has(a[href])" )
-			.addClass( "ui-state-default ui-corner-top" )
-			.attr({
-				role: "tab",
-				tabIndex: -1
-			});
-
-		this.anchors = this.tabs.map(function() {
-				return $( "a", this )[ 0 ];
-			})
-			.addClass( "ui-tabs-anchor" )
-			.attr({
-				role: "presentation",
-				tabIndex: -1
-			});
-
-		this.panels = $();
-
-		this.anchors.each(function( i, anchor ) {
-			var selector, panel, panelId,
-				anchorId = $( anchor ).uniqueId().attr( "id" ),
-				tab = $( anchor ).closest( "li" ),
-				originalAriaControls = tab.attr( "aria-controls" );
-
-			// inline tab
-			if ( isLocal( anchor ) ) {
-				selector = anchor.hash;
-				panel = that.element.find( that._sanitizeSelector( selector ) );
-			// remote tab
-			} else {
-				panelId = that._tabId( tab );
-				selector = "#" + panelId;
-				panel = that.element.find( selector );
-				if ( !panel.length ) {
-					panel = that._createPanel( panelId );
-					panel.insertAfter( that.panels[ i - 1 ] || that.tablist );
-				}
-				panel.attr( "aria-live", "polite" );
-			}
-
-			if ( panel.length) {
-				that.panels = that.panels.add( panel );
-			}
-			if ( originalAriaControls ) {
-				tab.data( "ui-tabs-aria-controls", originalAriaControls );
-			}
-			tab.attr({
-				"aria-controls": selector.substring( 1 ),
-				"aria-labelledby": anchorId
-			});
-			panel.attr( "aria-labelledby", anchorId );
-		});
-
-		this.panels
-			.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" )
-			.attr( "role", "tabpanel" );
-	},
-
-	// allow overriding how to find the list for rare usage scenarios (#7715)
-	_getList: function() {
-		return this.element.find( "ol,ul" ).eq( 0 );
-	},
-
-	_createPanel: function( id ) {
-		return $( "
      " )
-			.attr( "id", id )
-			.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" )
-			.data( "ui-tabs-destroy", true );
-	},
-
-	_setupDisabled: function( disabled ) {
-		if ( $.isArray( disabled ) ) {
-			if ( !disabled.length ) {
-				disabled = false;
-			} else if ( disabled.length === this.anchors.length ) {
-				disabled = true;
-			}
-		}
-
-		// disable tabs
-		for ( var i = 0, li; ( li = this.tabs[ i ] ); i++ ) {
-			if ( disabled === true || $.inArray( i, disabled ) !== -1 ) {
-				$( li )
-					.addClass( "ui-state-disabled" )
-					.attr( "aria-disabled", "true" );
-			} else {
-				$( li )
-					.removeClass( "ui-state-disabled" )
-					.removeAttr( "aria-disabled" );
-			}
-		}
-
-		this.options.disabled = disabled;
-	},
-
-	_setupEvents: function( event ) {
-		var events = {
-			click: function( event ) {
-				event.preventDefault();
-			}
-		};
-		if ( event ) {
-			$.each( event.split(" "), function( index, eventName ) {
-				events[ eventName ] = "_eventHandler";
-			});
-		}
-
-		this._off( this.anchors.add( this.tabs ).add( this.panels ) );
-		this._on( this.anchors, events );
-		this._on( this.tabs, { keydown: "_tabKeydown" } );
-		this._on( this.panels, { keydown: "_panelKeydown" } );
-
-		this._focusable( this.tabs );
-		this._hoverable( this.tabs );
-	},
-
-	_setupHeightStyle: function( heightStyle ) {
-		var maxHeight, overflow,
-			parent = this.element.parent();
-
-		if ( heightStyle === "fill" ) {
-			// IE 6 treats height like minHeight, so we need to turn off overflow
-			// in order to get a reliable height
-			// we use the minHeight support test because we assume that only
-			// browsers that don't support minHeight will treat height as minHeight
-			if ( !$.support.minHeight ) {
-				overflow = parent.css( "overflow" );
-				parent.css( "overflow", "hidden");
-			}
-			maxHeight = parent.height();
-			this.element.siblings( ":visible" ).each(function() {
-				var elem = $( this ),
-					position = elem.css( "position" );
-
-				if ( position === "absolute" || position === "fixed" ) {
-					return;
-				}
-				maxHeight -= elem.outerHeight( true );
-			});
-			if ( overflow ) {
-				parent.css( "overflow", overflow );
-			}
-
-			this.element.children().not( this.panels ).each(function() {
-				maxHeight -= $( this ).outerHeight( true );
-			});
-
-			this.panels.each(function() {
-				$( this ).height( Math.max( 0, maxHeight -
-					$( this ).innerHeight() + $( this ).height() ) );
-			})
-			.css( "overflow", "auto" );
-		} else if ( heightStyle === "auto" ) {
-			maxHeight = 0;
-			this.panels.each(function() {
-				maxHeight = Math.max( maxHeight, $( this ).height( "" ).height() );
-			}).height( maxHeight );
-		}
-	},
-
-	_eventHandler: function( event ) {
-		var options = this.options,
-			active = this.active,
-			anchor = $( event.currentTarget ),
-			tab = anchor.closest( "li" ),
-			clickedIsActive = tab[ 0 ] === active[ 0 ],
-			collapsing = clickedIsActive && options.collapsible,
-			toShow = collapsing ? $() : this._getPanelForTab( tab ),
-			toHide = !active.length ? $() : this._getPanelForTab( active ),
-			eventData = {
-				oldTab: active,
-				oldPanel: toHide,
-				newTab: collapsing ? $() : tab,
-				newPanel: toShow
-			};
-
-		event.preventDefault();
-
-		if ( tab.hasClass( "ui-state-disabled" ) ||
-				// tab is already loading
-				tab.hasClass( "ui-tabs-loading" ) ||
-				// can't switch durning an animation
-				this.running ||
-				// click on active header, but not collapsible
-				( clickedIsActive && !options.collapsible ) ||
-				// allow canceling activation
-				( this._trigger( "beforeActivate", event, eventData ) === false ) ) {
-			return;
-		}
-
-		options.active = collapsing ? false : this.tabs.index( tab );
-
-		this.active = clickedIsActive ? $() : tab;
-		if ( this.xhr ) {
-			this.xhr.abort();
-		}
-
-		if ( !toHide.length && !toShow.length ) {
-			$.error( "jQuery UI Tabs: Mismatching fragment identifier." );
-		}
-
-		if ( toShow.length ) {
-			this.load( this.tabs.index( tab ), event );
-		}
-		this._toggle( event, eventData );
-	},
-
-	// handles show/hide for selecting tabs
-	_toggle: function( event, eventData ) {
-		var that = this,
-			toShow = eventData.newPanel,
-			toHide = eventData.oldPanel;
-
-		this.running = true;
-
-		function complete() {
-			that.running = false;
-			that._trigger( "activate", event, eventData );
-		}
-
-		function show() {
-			eventData.newTab.closest( "li" ).addClass( "ui-tabs-active ui-state-active" );
-
-			if ( toShow.length && that.options.show ) {
-				that._show( toShow, that.options.show, complete );
-			} else {
-				toShow.show();
-				complete();
-			}
-		}
-
-		// start out by hiding, then showing, then completing
-		if ( toHide.length && this.options.hide ) {
-			this._hide( toHide, this.options.hide, function() {
-				eventData.oldTab.closest( "li" ).removeClass( "ui-tabs-active ui-state-active" );
-				show();
-			});
-		} else {
-			eventData.oldTab.closest( "li" ).removeClass( "ui-tabs-active ui-state-active" );
-			toHide.hide();
-			show();
-		}
-
-		toHide.attr({
-			"aria-expanded": "false",
-			"aria-hidden": "true"
-		});
-		eventData.oldTab.attr( "aria-selected", "false" );
-		// If we're switching tabs, remove the old tab from the tab order.
-		// If we're opening from collapsed state, remove the previous tab from the tab order.
-		// If we're collapsing, then keep the collapsing tab in the tab order.
-		if ( toShow.length && toHide.length ) {
-			eventData.oldTab.attr( "tabIndex", -1 );
-		} else if ( toShow.length ) {
-			this.tabs.filter(function() {
-				return $( this ).attr( "tabIndex" ) === 0;
-			})
-			.attr( "tabIndex", -1 );
-		}
-
-		toShow.attr({
-			"aria-expanded": "true",
-			"aria-hidden": "false"
-		});
-		eventData.newTab.attr({
-			"aria-selected": "true",
-			tabIndex: 0
-		});
-	},
-
-	_activate: function( index ) {
-		var anchor,
-			active = this._findActive( index );
-
-		// trying to activate the already active panel
-		if ( active[ 0 ] === this.active[ 0 ] ) {
-			return;
-		}
-
-		// trying to collapse, simulate a click on the current active header
-		if ( !active.length ) {
-			active = this.active;
-		}
-
-		anchor = active.find( ".ui-tabs-anchor" )[ 0 ];
-		this._eventHandler({
-			target: anchor,
-			currentTarget: anchor,
-			preventDefault: $.noop
-		});
-	},
-
-	_findActive: function( index ) {
-		return index === false ? $() : this.tabs.eq( index );
-	},
-
-	_getIndex: function( index ) {
-		// meta-function to give users option to provide a href string instead of a numerical index.
-		if ( typeof index === "string" ) {
-			index = this.anchors.index( this.anchors.filter( "[href$='" + index + "']" ) );
-		}
-
-		return index;
-	},
-
-	_destroy: function() {
-		if ( this.xhr ) {
-			this.xhr.abort();
-		}
-
-		this.element.removeClass( "ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible" );
-
-		this.tablist
-			.removeClass( "ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all" )
-			.removeAttr( "role" );
-
-		this.anchors
-			.removeClass( "ui-tabs-anchor" )
-			.removeAttr( "role" )
-			.removeAttr( "tabIndex" )
-			.removeData( "href.tabs" )
-			.removeData( "load.tabs" )
-			.removeUniqueId();
-
-		this.tabs.add( this.panels ).each(function() {
-			if ( $.data( this, "ui-tabs-destroy" ) ) {
-				$( this ).remove();
-			} else {
-				$( this )
-					.removeClass( "ui-state-default ui-state-active ui-state-disabled " +
-						"ui-corner-top ui-corner-bottom ui-widget-content ui-tabs-active ui-tabs-panel" )
-					.removeAttr( "tabIndex" )
-					.removeAttr( "aria-live" )
-					.removeAttr( "aria-busy" )
-					.removeAttr( "aria-selected" )
-					.removeAttr( "aria-labelledby" )
-					.removeAttr( "aria-hidden" )
-					.removeAttr( "aria-expanded" )
-					.removeAttr( "role" );
-			}
-		});
-
-		this.tabs.each(function() {
-			var li = $( this ),
-				prev = li.data( "ui-tabs-aria-controls" );
-			if ( prev ) {
-				li.attr( "aria-controls", prev );
-			} else {
-				li.removeAttr( "aria-controls" );
-			}
-		});
-
-		this.panels.show();
-
-		if ( this.options.heightStyle !== "content" ) {
-			this.panels.css( "height", "" );
-		}
-	},
-
-	enable: function( index ) {
-		var disabled = this.options.disabled;
-		if ( disabled === false ) {
-			return;
-		}
-
-		if ( index === undefined ) {
-			disabled = false;
-		} else {
-			index = this._getIndex( index );
-			if ( $.isArray( disabled ) ) {
-				disabled = $.map( disabled, function( num ) {
-					return num !== index ? num : null;
-				});
-			} else {
-				disabled = $.map( this.tabs, function( li, num ) {
-					return num !== index ? num : null;
-				});
-			}
-		}
-		this._setupDisabled( disabled );
-	},
-
-	disable: function( index ) {
-		var disabled = this.options.disabled;
-		if ( disabled === true ) {
-			return;
-		}
-
-		if ( index === undefined ) {
-			disabled = true;
-		} else {
-			index = this._getIndex( index );
-			if ( $.inArray( index, disabled ) !== -1 ) {
-				return;
-			}
-			if ( $.isArray( disabled ) ) {
-				disabled = $.merge( [ index ], disabled ).sort();
-			} else {
-				disabled = [ index ];
-			}
-		}
-		this._setupDisabled( disabled );
-	},
-
-	load: function( index, event ) {
-		index = this._getIndex( index );
-		var that = this,
-			tab = this.tabs.eq( index ),
-			anchor = tab.find( ".ui-tabs-anchor" ),
-			panel = this._getPanelForTab( tab ),
-			eventData = {
-				tab: tab,
-				panel: panel
-			};
-
-		// not remote
-		if ( isLocal( anchor[ 0 ] ) ) {
-			return;
-		}
-
-		this.xhr = $.ajax( this._ajaxSettings( anchor, event, eventData ) );
-
-		// support: jQuery <1.8
-		// jQuery <1.8 returns false if the request is canceled in beforeSend,
-		// but as of 1.8, $.ajax() always returns a jqXHR object.
-		if ( this.xhr && this.xhr.statusText !== "canceled" ) {
-			tab.addClass( "ui-tabs-loading" );
-			panel.attr( "aria-busy", "true" );
-
-			this.xhr
-				.success(function( response ) {
-					// support: jQuery <1.8
-					// http://bugs.jquery.com/ticket/11778
-					setTimeout(function() {
-						panel.html( response );
-						that._trigger( "load", event, eventData );
-					}, 1 );
-				})
-				.complete(function( jqXHR, status ) {
-					// support: jQuery <1.8
-					// http://bugs.jquery.com/ticket/11778
-					setTimeout(function() {
-						if ( status === "abort" ) {
-							that.panels.stop( false, true );
-						}
-
-						tab.removeClass( "ui-tabs-loading" );
-						panel.removeAttr( "aria-busy" );
-
-						if ( jqXHR === that.xhr ) {
-							delete that.xhr;
-						}
-					}, 1 );
-				});
-		}
-	},
-
-	// TODO: Remove this function in 1.10 when ajaxOptions is removed
-	_ajaxSettings: function( anchor, event, eventData ) {
-		var that = this;
-		return {
-			url: anchor.attr( "href" ),
-			beforeSend: function( jqXHR, settings ) {
-				return that._trigger( "beforeLoad", event,
-					$.extend( { jqXHR : jqXHR, ajaxSettings: settings }, eventData ) );
-			}
-		};
-	},
-
-	_getPanelForTab: function( tab ) {
-		var id = $( tab ).attr( "aria-controls" );
-		return this.element.find( this._sanitizeSelector( "#" + id ) );
-	}
-});
-
-// DEPRECATED
-if ( $.uiBackCompat !== false ) {
-
-	// helper method for a lot of the back compat extensions
-	$.ui.tabs.prototype._ui = function( tab, panel ) {
-		return {
-			tab: tab,
-			panel: panel,
-			index: this.anchors.index( tab )
-		};
-	};
-
-	// url method
-	$.widget( "ui.tabs", $.ui.tabs, {
-		url: function( index, url ) {
-			this.anchors.eq( index ).attr( "href", url );
-		}
-	});
-
-	// TODO: Remove _ajaxSettings() method when removing this extension
-	// ajaxOptions and cache options
-	$.widget( "ui.tabs", $.ui.tabs, {
-		options: {
-			ajaxOptions: null,
-			cache: false
-		},
-
-		_create: function() {
-			this._super();
-
-			var that = this;
-
-			this._on({ tabsbeforeload: function( event, ui ) {
-				// tab is already cached
-				if ( $.data( ui.tab[ 0 ], "cache.tabs" ) ) {
-					event.preventDefault();
-					return;
-				}
-
-				ui.jqXHR.success(function() {
-					if ( that.options.cache ) {
-						$.data( ui.tab[ 0 ], "cache.tabs", true );
-					}
-				});
-			}});
-		},
-
-		_ajaxSettings: function( anchor, event, ui ) {
-			var ajaxOptions = this.options.ajaxOptions;
-			return $.extend( {}, ajaxOptions, {
-				error: function( xhr, status ) {
-					try {
-						// Passing index avoid a race condition when this method is
-						// called after the user has selected another tab.
-						// Pass the anchor that initiated this request allows
-						// loadError to manipulate the tab content panel via $(a.hash)
-						ajaxOptions.error(
-							xhr, status, ui.tab.closest( "li" ).index(), ui.tab[ 0 ] );
-					}
-					catch ( error ) {}
-				}
-			}, this._superApply( arguments ) );
-		},
-
-		_setOption: function( key, value ) {
-			// reset cache if switching from cached to not cached
-			if ( key === "cache" && value === false ) {
-				this.anchors.removeData( "cache.tabs" );
-			}
-			this._super( key, value );
-		},
-
-		_destroy: function() {
-			this.anchors.removeData( "cache.tabs" );
-			this._super();
-		},
-
-		url: function( index ){
-			this.anchors.eq( index ).removeData( "cache.tabs" );
-			this._superApply( arguments );
-		}
-	});
-
-	// abort method
-	$.widget( "ui.tabs", $.ui.tabs, {
-		abort: function() {
-			if ( this.xhr ) {
-				this.xhr.abort();
-			}
-		}
-	});
-
-	// spinner
-	$.widget( "ui.tabs", $.ui.tabs, {
-		options: {
-			spinner: "Loading…"
-		},
-		_create: function() {
-			this._super();
-			this._on({
-				tabsbeforeload: function( event, ui ) {
-					// Don't react to nested tabs or tabs that don't use a spinner
-					if ( event.target !== this.element[ 0 ] ||
-							!this.options.spinner ) {
-						return;
-					}
-
-					var span = ui.tab.find( "span" ),
-						html = span.html();
-					span.html( this.options.spinner );
-					ui.jqXHR.complete(function() {
-						span.html( html );
-					});
-				}
-			});
-		}
-	});
-
-	// enable/disable events
-	$.widget( "ui.tabs", $.ui.tabs, {
-		options: {
-			enable: null,
-			disable: null
-		},
-
-		enable: function( index ) {
-			var options = this.options,
-				trigger;
-
-			if ( index && options.disabled === true ||
-					( $.isArray( options.disabled ) && $.inArray( index, options.disabled ) !== -1 ) ) {
-				trigger = true;
-			}
-
-			this._superApply( arguments );
-
-			if ( trigger ) {
-				this._trigger( "enable", null, this._ui( this.anchors[ index ], this.panels[ index ] ) );
-			}
-		},
-
-		disable: function( index ) {
-			var options = this.options,
-				trigger;
-
-			if ( index && options.disabled === false ||
-					( $.isArray( options.disabled ) && $.inArray( index, options.disabled ) === -1 ) ) {
-				trigger = true;
-			}
-
-			this._superApply( arguments );
-
-			if ( trigger ) {
-				this._trigger( "disable", null, this._ui( this.anchors[ index ], this.panels[ index ] ) );
-			}
-		}
-	});
-
-	// add/remove methods and events
-	$.widget( "ui.tabs", $.ui.tabs, {
-		options: {
-			add: null,
-			remove: null,
-			tabTemplate: "
    • #{label}
      • "
-		},
-
-		add: function( url, label, index ) {
-			if ( index === undefined ) {
-				index = this.anchors.length;
-			}
-
-			var doInsertAfter, panel,
-				options = this.options,
-				li = $( options.tabTemplate
-					.replace( /#\{href\}/g, url )
-					.replace( /#\{label\}/g, label ) ),
-				id = !url.indexOf( "#" ) ?
-					url.replace( "#", "" ) :
-					this._tabId( li );
-
-			li.addClass( "ui-state-default ui-corner-top" ).data( "ui-tabs-destroy", true );
-			li.attr( "aria-controls", id );
-
-			doInsertAfter = index >= this.tabs.length;
-
-			// try to find an existing element before creating a new one
-			panel = this.element.find( "#" + id );
-			if ( !panel.length ) {
-				panel = this._createPanel( id );
-				if ( doInsertAfter ) {
-					if ( index > 0 ) {
-						panel.insertAfter( this.panels.eq( -1 ) );
-					} else {
-						panel.appendTo( this.element );
-					}
-				} else {
-					panel.insertBefore( this.panels[ index ] );
-				}
-			}
-			panel.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" ).hide();
-
-			if ( doInsertAfter ) {
-				li.appendTo( this.tablist );
-			} else {
-				li.insertBefore( this.tabs[ index ] );
-			}
-
-			options.disabled = $.map( options.disabled, function( n ) {
-				return n >= index ? ++n : n;
-			});
-
-			this.refresh();
-			if ( this.tabs.length === 1 && options.active === false ) {
-				this.option( "active", 0 );
-			}
-
-			this._trigger( "add", null, this._ui( this.anchors[ index ], this.panels[ index ] ) );
-			return this;
-		},
-
-		remove: function( index ) {
-			index = this._getIndex( index );
-			var options = this.options,
-				tab = this.tabs.eq( index ).remove(),
-				panel = this._getPanelForTab( tab ).remove();
-
-			// If selected tab was removed focus tab to the right or
-			// in case the last tab was removed the tab to the left.
-			// We check for more than 2 tabs, because if there are only 2,
-			// then when we remove this tab, there will only be one tab left
-			// so we don't need to detect which tab to activate.
-			if ( tab.hasClass( "ui-tabs-active" ) && this.anchors.length > 2 ) {
-				this._activate( index + ( index + 1 < this.anchors.length ? 1 : -1 ) );
-			}
-
-			options.disabled = $.map(
-				$.grep( options.disabled, function( n ) {
-					return n !== index;
-				}),
-				function( n ) {
-					return n >= index ? --n : n;
-				});
-
-			this.refresh();
-
-			this._trigger( "remove", null, this._ui( tab.find( "a" )[ 0 ], panel[ 0 ] ) );
-			return this;
-		}
-	});
-
-	// length method
-	$.widget( "ui.tabs", $.ui.tabs, {
-		length: function() {
-			return this.anchors.length;
-		}
-	});
-
-	// panel ids (idPrefix option + title attribute)
-	$.widget( "ui.tabs", $.ui.tabs, {
-		options: {
-			idPrefix: "ui-tabs-"
-		},
-
-		_tabId: function( tab ) {
-			var a = tab.is( "li" ) ? tab.find( "a[href]" ) : tab;
-			a = a[0];
-			return $( a ).closest( "li" ).attr( "aria-controls" ) ||
-				a.title && a.title.replace( /\s/g, "_" ).replace( /[^\w\u00c0-\uFFFF\-]/g, "" ) ||
-				this.options.idPrefix + getNextTabId();
-		}
-	});
-
-	// _createPanel method
-	$.widget( "ui.tabs", $.ui.tabs, {
-		options: {
-			panelTemplate: "
      "
-		},
-
-		_createPanel: function( id ) {
-			return $( this.options.panelTemplate )
-				.attr( "id", id )
-				.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" )
-				.data( "ui-tabs-destroy", true );
-		}
-	});
-
-	// selected option
-	$.widget( "ui.tabs", $.ui.tabs, {
-		_create: function() {
-			var options = this.options;
-			if ( options.active === null && options.selected !== undefined ) {
-				options.active = options.selected === -1 ? false : options.selected;
-			}
-			this._super();
-			options.selected = options.active;
-			if ( options.selected === false ) {
-				options.selected = -1;
-			}
-		},
-
-		_setOption: function( key, value ) {
-			if ( key !== "selected" ) {
-				return this._super( key, value );
-			}
-
-			var options = this.options;
-			this._super( "active", value === -1 ? false : value );
-			options.selected = options.active;
-			if ( options.selected === false ) {
-				options.selected = -1;
-			}
-		},
-
-		_eventHandler: function() {
-			this._superApply( arguments );
-			this.options.selected = this.options.active;
-			if ( this.options.selected === false ) {
-				this.options.selected = -1;
-			}
-		}
-	});
-
-	// show and select event
-	$.widget( "ui.tabs", $.ui.tabs, {
-		options: {
-			show: null,
-			select: null
-		},
-		_create: function() {
-			this._super();
-			if ( this.options.active !== false ) {
-				this._trigger( "show", null, this._ui(
-					this.active.find( ".ui-tabs-anchor" )[ 0 ],
-					this._getPanelForTab( this.active )[ 0 ] ) );
-			}
-		},
-		_trigger: function( type, event, data ) {
-			var tab, panel,
-				ret = this._superApply( arguments );
-
-			if ( !ret ) {
-				return false;
-			}
-
-			if ( type === "beforeActivate" ) {
-				tab = data.newTab.length ? data.newTab : data.oldTab;
-				panel = data.newPanel.length ? data.newPanel : data.oldPanel;
-				ret = this._super( "select", event, {
-					tab: tab.find( ".ui-tabs-anchor" )[ 0],
-					panel: panel[ 0 ],
-					index: tab.closest( "li" ).index()
-				});
-			} else if ( type === "activate" && data.newTab.length ) {
-				ret = this._super( "show", event, {
-					tab: data.newTab.find( ".ui-tabs-anchor" )[ 0 ],
-					panel: data.newPanel[ 0 ],
-					index: data.newTab.closest( "li" ).index()
-				});
-			}
-			return ret;
-		}
-	});
-
-	// select method
-	$.widget( "ui.tabs", $.ui.tabs, {
-		select: function( index ) {
-			index = this._getIndex( index );
-			if ( index === -1 ) {
-				if ( this.options.collapsible && this.options.selected !== -1 ) {
-					index = this.options.selected;
-				} else {
-					return;
-				}
-			}
-			this.anchors.eq( index ).trigger( this.options.event + this.eventNamespace );
-		}
-	});
-
-	// cookie option
-	(function() {
-
-	var listId = 0;
-
-	$.widget( "ui.tabs", $.ui.tabs, {
-		options: {
-			cookie: null // e.g. { expires: 7, path: '/', domain: 'jquery.com', secure: true }
-		},
-		_create: function() {
-			var options = this.options,
-				active;
-			if ( options.active == null && options.cookie ) {
-				active = parseInt( this._cookie(), 10 );
-				if ( active === -1 ) {
-					active = false;
-				}
-				options.active = active;
-			}
-			this._super();
-		},
-		_cookie: function( active ) {
-			var cookie = [ this.cookie ||
-				( this.cookie = this.options.cookie.name || "ui-tabs-" + (++listId) ) ];
-			if ( arguments.length ) {
-				cookie.push( active === false ? -1 : active );
-				cookie.push( this.options.cookie );
-			}
-			return $.cookie.apply( null, cookie );
-		},
-		_refresh: function() {
-			this._super();
-			if ( this.options.cookie ) {
-				this._cookie( this.options.active, this.options.cookie );
-			}
-		},
-		_eventHandler: function() {
-			this._superApply( arguments );
-			if ( this.options.cookie ) {
-				this._cookie( this.options.active, this.options.cookie );
-			}
-		},
-		_destroy: function() {
-			this._super();
-			if ( this.options.cookie ) {
-				this._cookie( null, this.options.cookie );
-			}
-		}
-	});
-
-	})();
-
-	// load event
-	$.widget( "ui.tabs", $.ui.tabs, {
-		_trigger: function( type, event, data ) {
-			var _data = $.extend( {}, data );
-			if ( type === "load" ) {
-				_data.panel = _data.panel[ 0 ];
-				_data.tab = _data.tab.find( ".ui-tabs-anchor" )[ 0 ];
-			}
-			return this._super( type, event, _data );
-		}
-	});
-
-	// fx option
-	// The new animation options (show, hide) conflict with the old show callback.
-	// The old fx option wins over show/hide anyway (always favor back-compat).
-	// If a user wants to use the new animation API, they must give up the old API.
-	$.widget( "ui.tabs", $.ui.tabs, {
-		options: {
-			fx: null // e.g. { height: "toggle", opacity: "toggle", duration: 200 }
-		},
-
-		_getFx: function() {
-			var hide, show,
-				fx = this.options.fx;
-
-			if ( fx ) {
-				if ( $.isArray( fx ) ) {
-					hide = fx[ 0 ];
-					show = fx[ 1 ];
-				} else {
-					hide = show = fx;
-				}
-			}
-
-			return fx ? { show: show, hide: hide } : null;
-		},
-
-		_toggle: function( event, eventData ) {
-			var that = this,
-				toShow = eventData.newPanel,
-				toHide = eventData.oldPanel,
-				fx = this._getFx();
-
-			if ( !fx ) {
-				return this._super( event, eventData );
-			}
-
-			that.running = true;
-
-			function complete() {
-				that.running = false;
-				that._trigger( "activate", event, eventData );
-			}
-
-			function show() {
-				eventData.newTab.closest( "li" ).addClass( "ui-tabs-active ui-state-active" );
-
-				if ( toShow.length && fx.show ) {
-					toShow
-						.animate( fx.show, fx.show.duration, function() {
-							complete();
-						});
-				} else {
-					toShow.show();
-					complete();
-				}
-			}
-
-			// start out by hiding, then showing, then completing
-			if ( toHide.length && fx.hide ) {
-				toHide.animate( fx.hide, fx.hide.duration, function() {
-					eventData.oldTab.closest( "li" ).removeClass( "ui-tabs-active ui-state-active" );
-					show();
-				});
-			} else {
-				eventData.oldTab.closest( "li" ).removeClass( "ui-tabs-active ui-state-active" );
-				toHide.hide();
-				show();
-			}
-		}
-	});
-}
-
-})( jQuery );
-(function( $ ) {
-
-var increments = 0;
-
-function addDescribedBy( elem, id ) {
-	var describedby = (elem.attr( "aria-describedby" ) || "").split( /\s+/ );
-	describedby.push( id );
-	elem
-		.data( "ui-tooltip-id", id )
-		.attr( "aria-describedby", $.trim( describedby.join( " " ) ) );
-}
-
-function removeDescribedBy( elem ) {
-	var id = elem.data( "ui-tooltip-id" ),
-		describedby = (elem.attr( "aria-describedby" ) || "").split( /\s+/ ),
-		index = $.inArray( id, describedby );
-	if ( index !== -1 ) {
-		describedby.splice( index, 1 );
-	}
-
-	elem.removeData( "ui-tooltip-id" );
-	describedby = $.trim( describedby.join( " " ) );
-	if ( describedby ) {
-		elem.attr( "aria-describedby", describedby );
-	} else {
-		elem.removeAttr( "aria-describedby" );
-	}
-}
-
-$.widget( "ui.tooltip", {
-	version: "1.9.2",
-	options: {
-		content: function() {
-			return $( this ).attr( "title" );
-		},
-		hide: true,
-		// Disabled elements have inconsistent behavior across browsers (#8661)
-		items: "[title]:not([disabled])",
-		position: {
-			my: "left top+15",
-			at: "left bottom",
-			collision: "flipfit flip"
-		},
-		show: true,
-		tooltipClass: null,
-		track: false,
-
-		// callbacks
-		close: null,
-		open: null
-	},
-
-	_create: function() {
-		this._on({
-			mouseover: "open",
-			focusin: "open"
-		});
-
-		// IDs of generated tooltips, needed for destroy
-		this.tooltips = {};
-		// IDs of parent tooltips where we removed the title attribute
-		this.parents = {};
-
-		if ( this.options.disabled ) {
-			this._disable();
-		}
-	},
-
-	_setOption: function( key, value ) {
-		var that = this;
-
-		if ( key === "disabled" ) {
-			this[ value ? "_disable" : "_enable" ]();
-			this.options[ key ] = value;
-			// disable element style changes
-			return;
-		}
-
-		this._super( key, value );
-
-		if ( key === "content" ) {
-			$.each( this.tooltips, function( id, element ) {
-				that._updateContent( element );
-			});
-		}
-	},
-
-	_disable: function() {
-		var that = this;
-
-		// close open tooltips
-		$.each( this.tooltips, function( id, element ) {
-			var event = $.Event( "blur" );
-			event.target = event.currentTarget = element[0];
-			that.close( event, true );
-		});
-
-		// remove title attributes to prevent native tooltips
-		this.element.find( this.options.items ).andSelf().each(function() {
-			var element = $( this );
-			if ( element.is( "[title]" ) ) {
-				element
-					.data( "ui-tooltip-title", element.attr( "title" ) )
-					.attr( "title", "" );
-			}
-		});
-	},
-
-	_enable: function() {
-		// restore title attributes
-		this.element.find( this.options.items ).andSelf().each(function() {
-			var element = $( this );
-			if ( element.data( "ui-tooltip-title" ) ) {
-				element.attr( "title", element.data( "ui-tooltip-title" ) );
-			}
-		});
-	},
-
-	open: function( event ) {
-		var that = this,
-			target = $( event ? event.target : this.element )
-				// we need closest here due to mouseover bubbling,
-				// but always pointing at the same event target
-				.closest( this.options.items );
-
-		// No element to show a tooltip for or the tooltip is already open
-		if ( !target.length || target.data( "ui-tooltip-id" ) ) {
-			return;
-		}
-
-		if ( target.attr( "title" ) ) {
-			target.data( "ui-tooltip-title", target.attr( "title" ) );
-		}
-
-		target.data( "ui-tooltip-open", true );
-
-		// kill parent tooltips, custom or native, for hover
-		if ( event && event.type === "mouseover" ) {
-			target.parents().each(function() {
-				var parent = $( this ),
-					blurEvent;
-				if ( parent.data( "ui-tooltip-open" ) ) {
-					blurEvent = $.Event( "blur" );
-					blurEvent.target = blurEvent.currentTarget = this;
-					that.close( blurEvent, true );
-				}
-				if ( parent.attr( "title" ) ) {
-					parent.uniqueId();
-					that.parents[ this.id ] = {
-						element: this,
-						title: parent.attr( "title" )
-					};
-					parent.attr( "title", "" );
-				}
-			});
-		}
-
-		this._updateContent( target, event );
-	},
-
-	_updateContent: function( target, event ) {
-		var content,
-			contentOption = this.options.content,
-			that = this,
-			eventType = event ? event.type : null;
-
-		if ( typeof contentOption === "string" ) {
-			return this._open( event, target, contentOption );
-		}
-
-		content = contentOption.call( target[0], function( response ) {
-			// ignore async response if tooltip was closed already
-			if ( !target.data( "ui-tooltip-open" ) ) {
-				return;
-			}
-			// IE may instantly serve a cached response for ajax requests
-			// delay this call to _open so the other call to _open runs first
-			that._delay(function() {
-				// jQuery creates a special event for focusin when it doesn't
-				// exist natively. To improve performance, the native event
-				// object is reused and the type is changed. Therefore, we can't
-				// rely on the type being correct after the event finished
-				// bubbling, so we set it back to the previous value. (#8740)
-				if ( event ) {
-					event.type = eventType;
-				}
-				this._open( event, target, response );
-			});
-		});
-		if ( content ) {
-			this._open( event, target, content );
-		}
-	},
-
-	_open: function( event, target, content ) {
-		var tooltip, events, delayedShow,
-			positionOption = $.extend( {}, this.options.position );
-
-		if ( !content ) {
-			return;
-		}
-
-		// Content can be updated multiple times. If the tooltip already
-		// exists, then just update the content and bail.
-		tooltip = this._find( target );
-		if ( tooltip.length ) {
-			tooltip.find( ".ui-tooltip-content" ).html( content );
-			return;
-		}
-
-		// if we have a title, clear it to prevent the native tooltip
-		// we have to check first to avoid defining a title if none exists
-		// (we don't want to cause an element to start matching [title])
-		//
-		// We use removeAttr only for key events, to allow IE to export the correct
-		// accessible attributes. For mouse events, set to empty string to avoid
-		// native tooltip showing up (happens only when removing inside mouseover).
-		if ( target.is( "[title]" ) ) {
-			if ( event && event.type === "mouseover" ) {
-				target.attr( "title", "" );
-			} else {
-				target.removeAttr( "title" );
-			}
-		}
-
-		tooltip = this._tooltip( target );
-		addDescribedBy( target, tooltip.attr( "id" ) );
-		tooltip.find( ".ui-tooltip-content" ).html( content );
-
-		function position( event ) {
-			positionOption.of = event;
-			if ( tooltip.is( ":hidden" ) ) {
-				return;
-			}
-			tooltip.position( positionOption );
-		}
-		if ( this.options.track && event && /^mouse/.test( event.type ) ) {
-			this._on( this.document, {
-				mousemove: position
-			});
-			// trigger once to override element-relative positioning
-			position( event );
-		} else {
-			tooltip.position( $.extend({
-				of: target
-			}, this.options.position ) );
-		}
-
-		tooltip.hide();
-
-		this._show( tooltip, this.options.show );
-		// Handle tracking tooltips that are shown with a delay (#8644). As soon
-		// as the tooltip is visible, position the tooltip using the most recent
-		// event.
-		if ( this.options.show && this.options.show.delay ) {
-			delayedShow = setInterval(function() {
-				if ( tooltip.is( ":visible" ) ) {
-					position( positionOption.of );
-					clearInterval( delayedShow );
-				}
-			}, $.fx.interval );
-		}
-
-		this._trigger( "open", event, { tooltip: tooltip } );
-
-		events = {
-			keyup: function( event ) {
-				if ( event.keyCode === $.ui.keyCode.ESCAPE ) {
-					var fakeEvent = $.Event(event);
-					fakeEvent.currentTarget = target[0];
-					this.close( fakeEvent, true );
-				}
-			},
-			remove: function() {
-				this._removeTooltip( tooltip );
-			}
-		};
-		if ( !event || event.type === "mouseover" ) {
-			events.mouseleave = "close";
-		}
-		if ( !event || event.type === "focusin" ) {
-			events.focusout = "close";
-		}
-		this._on( true, target, events );
-	},
-
-	close: function( event ) {
-		var that = this,
-			target = $( event ? event.currentTarget : this.element ),
-			tooltip = this._find( target );
-
-		// disabling closes the tooltip, so we need to track when we're closing
-		// to avoid an infinite loop in case the tooltip becomes disabled on close
-		if ( this.closing ) {
-			return;
-		}
-
-		// only set title if we had one before (see comment in _open())
-		if ( target.data( "ui-tooltip-title" ) ) {
-			target.attr( "title", target.data( "ui-tooltip-title" ) );
-		}
-
-		removeDescribedBy( target );
-
-		tooltip.stop( true );
-		this._hide( tooltip, this.options.hide, function() {
-			that._removeTooltip( $( this ) );
-		});
-
-		target.removeData( "ui-tooltip-open" );
-		this._off( target, "mouseleave focusout keyup" );
-		// Remove 'remove' binding only on delegated targets
-		if ( target[0] !== this.element[0] ) {
-			this._off( target, "remove" );
-		}
-		this._off( this.document, "mousemove" );
-
-		if ( event && event.type === "mouseleave" ) {
-			$.each( this.parents, function( id, parent ) {
-				$( parent.element ).attr( "title", parent.title );
-				delete that.parents[ id ];
-			});
-		}
-
-		this.closing = true;
-		this._trigger( "close", event, { tooltip: tooltip } );
-		this.closing = false;
-	},
-
-	_tooltip: function( element ) {
-		var id = "ui-tooltip-" + increments++,
-			tooltip = $( "
      " )
-				.attr({
-					id: id,
-					role: "tooltip"
-				})
-				.addClass( "ui-tooltip ui-widget ui-corner-all ui-widget-content " +
-					( this.options.tooltipClass || "" ) );
-		$( "
      " )
-			.addClass( "ui-tooltip-content" )
-			.appendTo( tooltip );
-		tooltip.appendTo( this.document[0].body );
-		if ( $.fn.bgiframe ) {
-			tooltip.bgiframe();
-		}
-		this.tooltips[ id ] = element;
-		return tooltip;
-	},
-
-	_find: function( target ) {
-		var id = target.data( "ui-tooltip-id" );
-		return id ? $( "#" + id ) : $();
-	},
-
-	_removeTooltip: function( tooltip ) {
-		tooltip.remove();
-		delete this.tooltips[ tooltip.attr( "id" ) ];
-	},
-
-	_destroy: function() {
-		var that = this;
-
-		// close open tooltips
-		$.each( this.tooltips, function( id, element ) {
-			// Delegate to close method to handle common cleanup
-			var event = $.Event( "blur" );
-			event.target = event.currentTarget = element[0];
-			that.close( event, true );
-
-			// Remove immediately; destroying an open tooltip doesn't use the
-			// hide animation
-			$( "#" + id ).remove();
-
-			// Restore the title
-			if ( element.data( "ui-tooltip-title" ) ) {
-				element.attr( "title", element.data( "ui-tooltip-title" ) );
-				element.removeData( "ui-tooltip-title" );
-			}
-		});
-	}
-});
-
-}( jQuery ) );
\ No newline at end of file
diff --git a/vid/src/main/webapp/app/fusion/scripts/layout/jquery.layout-latest.js b/vid/src/main/webapp/app/fusion/scripts/layout/jquery.layout-latest.js
deleted file mode 100644
index 434724d9c..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/layout/jquery.layout-latest.js
+++ /dev/null
@@ -1,6086 +0,0 @@
-/**
- * @preserve
- * jquery.layout 1.4.3
- * $Date: 2015/03/13 22:37:04 $
- * $Rev: 1.0403 $
- *
- * Copyright (c) 2014 Kevin Dalman (http://jquery-dev.com)
- * Based on work by Fabrizio Balliano (http://www.fabrizioballiano.net)
- *
- * Dual licensed under the GPL (http://www.gnu.org/licenses/gpl.html)
- * and MIT (http://www.opensource.org/licenses/mit-license.php) licenses.
- *
- * SEE: http://layout.jquery-dev.com/LICENSE.txt
- *
- * Changelog: http://layout.jquery-dev.com/changelog.cfm
- *
- * Docs: http://layout.jquery-dev.com/documentation.html
- * Tips: http://layout.jquery-dev.com/tips.html
- * Help: http://groups.google.com/group/jquery-ui-layout
- */
-
-/* JavaDoc Info: http://code.google.com/closure/compiler/docs/js-for-compiler.html
- * {!Object}	non-nullable type (never NULL)
- * {?string}	nullable type (sometimes NULL) - default for {Object}
- * {number=}	optional parameter
- * {*}			ALL types
- */
-/*	TODO for jQ 2.0 
- *	change .andSelf() to .addBack()
- *	check $.fn.disableSelection - this is in jQuery UI 1.9.x
- */
-
-// NOTE: For best readability, view with a fixed-width font and tabs equal to 4-chars
-
-;(function ($) {
-
-// alias Math methods - used a lot!
-var	min		= Math.min
-,	max		= Math.max
-,	round	= Math.floor
-
-,	isStr	=  function (v) { return $.type(v) === "string"; }
-
-	/**
-	 * @param {!Object}			Instance
-	 * @param {Array.}	a_fn
-	 */
-,	runPluginCallbacks = function (Instance, a_fn) {
-		if ($.isArray(a_fn))
-			for (var i=0, c=a_fn.length; i
      ').appendTo("body")
-		,	d	= { width: $c.outerWidth - $c[0].clientWidth, height: 100 - $c[0].clientHeight };
-		$c.remove();
-		window.scrollbarWidth	= d.width;
-		window.scrollbarHeight	= d.height;
-		return dim.match(/^(width|height)$/) ? d[dim] : d;
-	}
-
-
-,	disableTextSelection: function () {
-		var $d	= $(document)
-		,	s	= 'textSelectionDisabled'
-		,	x	= 'textSelectionInitialized'
-		;
-		if ($.fn.disableSelection) {
-			if (!$d.data(x)) // document hasn't been initialized yet
-				$d.on('mouseup', $.layout.enableTextSelection ).data(x, true);
-			if (!$d.data(s))
-				$d.disableSelection().data(s, true);
-		}
-	}
-,	enableTextSelection: function () {
-		var $d	= $(document)
-		,	s	= 'textSelectionDisabled';
-		if ($.fn.enableSelection && $d.data(s))
-			$d.enableSelection().data(s, false);
-	}
-
-
-	/**
-	 * Returns hash container 'display' and 'visibility'
-	 *
-	 * @see	$.swap() - swaps CSS, runs callback, resets CSS
-	 * @param  {!Object}		$E				jQuery element
-	 * @param  {boolean=}	[force=false]	Run even if display != none
-	 * @return {!Object}						Returns current style props, if applicable
-	 */
-,	showInvisibly: function ($E, force) {
-		if ($E && $E.length && (force || $E.css("display") === "none")) { // only if not *already hidden*
-			var s = $E[0].style
-				// save ONLY the 'style' props because that is what we must restore
-			,	CSS = { display: s.display || '', visibility: s.visibility || '' };
-			// show element 'invisibly' so can be measured
-			$E.css({ display: "block", visibility: "hidden" });
-			return CSS;
-		}
-		return {};
-	}
-
-	/**
-	 * Returns data for setting size of an element (container or a pane).
-	 *
-	 * @see  _create(), onWindowResize() for container, plus others for pane
-	 * @return JSON  Returns a hash of all dimensions: top, bottom, left, right, outerWidth, innerHeight, etc
-	 */
-,	getElementDimensions: function ($E, inset) {
-		var
-		//	dimensions hash - start with current data IF passed
-			d	= { css: {}, inset: {} }
-		,	x	= d.css			// CSS hash
-		,	i	= { bottom: 0 }	// TEMP insets (bottom = complier hack)
-		,	N	= $.layout.cssNum
-		,	R	= Math.round
-		,	off = $E.offset()
-		,	b, p, ei			// TEMP border, padding
-		;
-		d.offsetLeft = off.left;
-		d.offsetTop  = off.top;
-
-		if (!inset) inset = {}; // simplify logic below
-
-		$.each("Left,Right,Top,Bottom".split(","), function (idx, e) { // e = edge
-			b = x["border" + e] = $.layout.borderWidth($E, e);
-			p = x["padding"+ e] = $.layout.cssNum($E, "padding"+e);
-			ei = e.toLowerCase();
-			d.inset[ei] = inset[ei] >= 0 ? inset[ei] : p; // any missing insetX value = paddingX
-			i[ei] = d.inset[ei] + b; // total offset of content from outer side
-		});
-
-		x.width		= R($E.width());
-		x.height	= R($E.height());
-		x.top		= N($E,"top",true);
-		x.bottom	= N($E,"bottom",true);
-		x.left		= N($E,"left",true);
-		x.right		= N($E,"right",true);
-
-		d.outerWidth	= R($E.outerWidth());
-		d.outerHeight	= R($E.outerHeight());
-		// calc the TRUE inner-dimensions, even in quirks-mode!
-		d.innerWidth	= max(0, d.outerWidth  - i.left - i.right);
-		d.innerHeight	= max(0, d.outerHeight - i.top  - i.bottom);
-		// layoutWidth/Height is used in calcs for manual resizing
-		// layoutW/H only differs from innerW/H when in quirks-mode - then is like outerW/H
-		d.layoutWidth	= R($E.innerWidth());
-		d.layoutHeight	= R($E.innerHeight());
-
-		//if ($E.prop('tagName') === 'BODY') { debugData( d, $E.prop('tagName') ); } // DEBUG
-
-		//d.visible	= $E.is(":visible");// && x.width > 0 && x.height > 0;
-
-		return d;
-	}
-
-,	getElementStyles: function ($E, list) {
-		var
-			CSS	= {}
-		,	style	= $E[0].style
-		,	props	= list.split(",")
-		,	sides	= "Top,Bottom,Left,Right".split(",")
-		,	attrs	= "Color,Style,Width".split(",")
-		,	p, s, a, i, j, k
-		;
-		for (i=0; i < props.length; i++) {
-			p = props[i];
-			if (p.match(/(border|padding|margin)$/))
-				for (j=0; j < 4; j++) {
-					s = sides[j];
-					if (p === "border")
-						for (k=0; k < 3; k++) {
-							a = attrs[k];
-							CSS[p+s+a] = style[p+s+a];
-						}
-					else
-						CSS[p+s] = style[p+s];
-				}
-			else
-				CSS[p] = style[p];
-		};
-		return CSS
-	}
-
-	/**
-	 * Return the innerWidth for the current browser/doctype
-	 *
-	 * @see  initPanes(), sizeMidPanes(), initHandles(), sizeHandles()
-	 * @param  {Array.}	$E  Must pass a jQuery object - first element is processed
-	 * @param  {number=}			outerWidth (optional) Can pass a width, allowing calculations BEFORE element is resized
-	 * @return {number}			Returns the innerWidth of the elem by subtracting padding and borders
-	 */
-,	cssWidth: function ($E, outerWidth) {
-		// a 'calculated' outerHeight can be passed so borders and/or padding are removed if needed
-		if (outerWidth <= 0) return 0;
-
-		var lb	= $.layout.browser
-		,	bs	= !lb.boxModel ? "border-box" : lb.boxSizing ? $E.css("boxSizing") : "content-box"
-		,	b	= $.layout.borderWidth
-		,	n	= $.layout.cssNum
-		,	W	= outerWidth
-		;
-		// strip border and/or padding from outerWidth to get CSS Width
-		if (bs !== "border-box")
-			W -= (b($E, "Left") + b($E, "Right"));
-		if (bs === "content-box")
-			W -= (n($E, "paddingLeft") + n($E, "paddingRight"));
-		return max(0,W);
-	}
-
-	/**
-	 * Return the innerHeight for the current browser/doctype
-	 *
-	 * @see  initPanes(), sizeMidPanes(), initHandles(), sizeHandles()
-	 * @param  {Array.}	$E  Must pass a jQuery object - first element is processed
-	 * @param  {number=}			outerHeight  (optional) Can pass a width, allowing calculations BEFORE element is resized
-	 * @return {number}			Returns the innerHeight of the elem by subtracting padding and borders
-	 */
-,	cssHeight: function ($E, outerHeight) {
-		// a 'calculated' outerHeight can be passed so borders and/or padding are removed if needed
-		if (outerHeight <= 0) return 0;
-
-		var lb	= $.layout.browser
-		,	bs	= !lb.boxModel ? "border-box" : lb.boxSizing ? $E.css("boxSizing") : "content-box"
-		,	b	= $.layout.borderWidth
-		,	n	= $.layout.cssNum
-		,	H	= outerHeight
-		;
-		// strip border and/or padding from outerHeight to get CSS Height
-		if (bs !== "border-box")
-			H -= (b($E, "Top") + b($E, "Bottom"));
-		if (bs === "content-box")
-			H -= (n($E, "paddingTop") + n($E, "paddingBottom"));
-		return max(0,H);
-	}
-
-	/**
-	 * Returns the 'current CSS numeric value' for a CSS property - 0 if property does not exist
-	 *
-	 * @see  Called by many methods
-	 * @param {Array.}	$E					Must pass a jQuery object - first element is processed
-	 * @param {string}			prop				The name of the CSS property, eg: top, width, etc.
-	 * @param {boolean=}			[allowAuto=false]	true = return 'auto' if that is value; false = return 0
-	 * @return {(string|number)}						Usually used to get an integer value for position (top, left) or size (height, width)
-	 */
-,	cssNum: function ($E, prop, allowAuto) {
-		if (!$E.jquery) $E = $($E);
-		var CSS = $.layout.showInvisibly($E)
-		,	p	= $.css($E[0], prop, true)
-		,	v	= allowAuto && p=="auto" ? p : Math.round(parseFloat(p) || 0);
-		$E.css( CSS ); // RESET
-		return v;
-	}
-
-,	borderWidth: function (el, side) {
-		if (el.jquery) el = el[0];
-		var b = "border"+ side.substr(0,1).toUpperCase() + side.substr(1); // left => Left
-		return $.css(el, b+"Style", true) === "none" ? 0 : Math.round(parseFloat($.css(el, b+"Width", true)) || 0);
-	}
-
-	/**
-	 * Mouse-tracking utility - FUTURE REFERENCE
-	 *
-	 * init: if (!window.mouse) {
-	 *			window.mouse = { x: 0, y: 0 };
-	 *			$(document).mousemove( $.layout.trackMouse );
-	 *		}
-	 *
-	 * @param {Object}		evt
-	 *
-,	trackMouse: function (evt) {
-		window.mouse = { x: evt.clientX, y: evt.clientY };
-	}
-	*/
-
-	/**
-	 * SUBROUTINE for preventPrematureSlideClose option
-	 *
-	 * @param {Object}		evt
-	 * @param {Object=}		el
-	 */
-,	isMouseOverElem: function (evt, el) {
-		var
-			$E	= $(el || this)
-		,	d	= $E.offset()
-		,	T	= d.top
-		,	L	= d.left
-		,	R	= L + $E.outerWidth()
-		,	B	= T + $E.outerHeight()
-		,	x	= evt.pageX	// evt.clientX ?
-		,	y	= evt.pageY	// evt.clientY ?
-		;
-		// if X & Y are < 0, probably means is over an open SELECT
-		return ($.layout.browser.msie && x < 0 && y < 0) || ((x >= L && x <= R) && (y >= T && y <= B));
-	}
-
-	/**
-	 * Message/Logging Utility
-	 *
-	 * @example $.layout.msg("My message");				// log text
-	 * @example $.layout.msg("My message", true);		// alert text
-	 * @example $.layout.msg({ foo: "bar" }, "Title");	// log hash-data, with custom title
-	 * @example $.layout.msg({ foo: "bar" }, true, "Title", { sort: false }); -OR-
-	 * @example $.layout.msg({ foo: "bar" }, "Title", { sort: false, display: true }); // alert hash-data
-	 *
-	 * @param {(Object|string)}			info			String message OR Hash/Array
-	 * @param {(Boolean|string|Object)=}	[popup=false]	True means alert-box - can be skipped
-	 * @param {(Object|string)=}			[debugTitle=""]	Title for Hash data - can be skipped
-	 * @param {Object=}					[debugOpts]		Extra options for debug output
-	 */
-,	msg: function (info, popup, debugTitle, debugOpts) {
-		if ($.isPlainObject(info) && window.debugData) {
-			if (typeof popup === "string") {
-				debugOpts	= debugTitle;
-				debugTitle	= popup;
-			}
-			else if (typeof debugTitle === "object") {
-				debugOpts	= debugTitle;
-				debugTitle	= null;
-			}
-			var t = debugTitle || "log(  )"
-			,	o = $.extend({ sort: false, returnHTML: false, display: false }, debugOpts);
-			if (popup === true || o.display)
-				debugData( info, t, o );
-			else if (window.console)
-				console.log(debugData( info, t, o ));
-		}
-		else if (popup)
-			alert(info);
-		else if (window.console)
-			console.log(info);
-		else {
-			var id	= "#layoutLogger"
-			,	$l = $(id);
-			if (!$l.length)
-				$l = createLog();
-			$l.children("ul").append('
    • '+ info.replace(/\/g,">") +'
      • ');
-		}
-
-		function createLog () {
-			var pos = $.support.fixedPosition ? 'fixed' : 'absolute'
-			,	$e = $('
      '
-				+	'
      '
-				+	'XLayout console.log
      '
-				+	'
        '
-				+ '
        '
-				).appendTo("body");
-			$e.css('left', $(window).width() - $e.outerWidth() - 5)
-			if ($.ui.draggable) $e.draggable({ handle: ':first-child' });
-			return $e;
-		};
-	}
-
-};
-
-
-/*
- *	$.layout.browser REPLACES removed $.browser, with extra data
- *	Parsing code here adapted from jQuery 1.8 $.browse
- */
-(function(){
-	var u = navigator.userAgent.toLowerCase()
-	,	m = /(chrome)[ \/]([\w.]+)/.exec( u )
-		||	/(webkit)[ \/]([\w.]+)/.exec( u )
-		||	/(opera)(?:.*version|)[ \/]([\w.]+)/.exec( u )
-		||	/(msie) ([\w.]+)/.exec( u )
-		||	u.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( u )
-		||	[]
-	,	b = m[1] || ""
-	,	v = m[2] || 0
-	,	ie = b === "msie"
-	,	cm = document.compatMode
-	,	$s = $.support
-	,	bs = $s.boxSizing !== undefined ? $s.boxSizing : $s.boxSizingReliable
-	,	bm = !ie || !cm || cm === "CSS1Compat" || $s.boxModel || false
-	,	lb = $.layout.browser = {
-			version:	v
-		,	safari:		b === "webkit"	// webkit (NOT chrome) = safari
-		,	webkit:		b === "chrome"	// chrome = webkit
-		,	msie:		ie
-		,	isIE6:		ie && v == 6
-			// ONLY IE reverts to old box-model - Note that compatMode was deprecated as of IE8
-		,	boxModel:	bm
-		,	boxSizing:	!!(typeof bs === "function" ? bs() : bs)
-		};
-	;
-	if (b) lb[b] = true; // set CURRENT browser
-	/*	OLD versions of jQuery only set $.support.boxModel after page is loaded
-	 *	so if this is IE, use support.boxModel to test for quirks-mode (ONLY IE changes boxModel) */
-	if (!bm && !cm) $(function(){ lb.boxModel = $s.boxModel; });
-})();
-
-
-// DEFAULT OPTIONS
-$.layout.defaults = {
-/*
- *	LAYOUT & LAYOUT-CONTAINER OPTIONS
- *	- none of these options are applicable to individual panes
- */
-	name:						""			// Not required, but useful for buttons and used for the state-cookie
-,	containerClass:				"ui-layout-container" // layout-container element
-,	inset:						null		// custom container-inset values (override padding)
-,	scrollToBookmarkOnLoad:		true		// after creating a layout, scroll to bookmark in URL (.../page.htm#myBookmark)
-,	resizeWithWindow:			true		// bind thisLayout.resizeAll() to the window.resize event
-,	resizeWithWindowDelay:		200			// delay calling resizeAll because makes window resizing very jerky
-,	resizeWithWindowMaxDelay:	0			// 0 = none - force resize every XX ms while window is being resized
-,	maskPanesEarly:				false		// true = create pane-masks on resizer.mouseDown instead of waiting for resizer.dragstart
-,	onresizeall_start:			null		// CALLBACK when resizeAll() STARTS	- NOT pane-specific
-,	onresizeall_end:			null		// CALLBACK when resizeAll() ENDS	- NOT pane-specific
-,	onload_start:				null		// CALLBACK when Layout inits - after options initialized, but before elements
-,	onload_end:					null		// CALLBACK when Layout inits - after EVERYTHING has been initialized
-,	onunload_start:				null		// CALLBACK when Layout is destroyed OR onWindowUnload
-,	onunload_end:				null		// CALLBACK when Layout is destroyed OR onWindowUnload
-,	initPanes:					true		// false = DO NOT initialize the panes onLoad - will init later
-,	showErrorMessages:			true		// enables fatal error messages to warn developers of common errors
-,	showDebugMessages:			false		// display console-and-alert debug msgs - IF this Layout version _has_ debugging code!
-//	Changing this zIndex value will cause other zIndex values to automatically change
-,	zIndex:						null		// the PANE zIndex - resizers and masks will be +1
-//	DO NOT CHANGE the zIndex values below unless you clearly understand their relationships
-,	zIndexes: {								// set _default_ z-index values here...
-		pane_normal:			0			// normal z-index for panes
-	,	content_mask:			1			// applied to overlays used to mask content INSIDE panes during resizing
-	,	resizer_normal:			2			// normal z-index for resizer-bars
-	,	pane_sliding:			100			// applied to *BOTH* the pane and its resizer when a pane is 'slid open'
-	,	pane_animate:			1000		// applied to the pane when being animated - not applied to the resizer
-	,	resizer_drag:			10000		// applied to the CLONED resizer-bar when being 'dragged'
-	}
-,	errors: {
-		pane:					"pane"		// description of "layout pane element" - used only in error messages
-	,	selector:				"selector"	// description of "jQuery-selector" - used only in error messages
-	,	addButtonError:			"Error Adding Button\nInvalid "
-	,	containerMissing:		"UI Layout Initialization Error\nThe specified layout-container does not exist."
-	,	centerPaneMissing:		"UI Layout Initialization Error\nThe center-pane element does not exist.\nThe center-pane is a required element."
-	,	noContainerHeight:		"UI Layout Initialization Warning\nThe layout-container \"CONTAINER\" has no height.\nTherefore the layout is 0-height and hence 'invisible'!"
-	,	callbackError:			"UI Layout Callback Error\nThe EVENT callback is not a valid function."
-	}
-/*
- *	PANE DEFAULT SETTINGS
- *	- settings under the 'panes' key become the default settings for *all panes*
- *	- ALL pane-options can also be set specifically for each panes, which will override these 'default values'
- */
-,	panes: { // default options for 'all panes' - will be overridden by 'per-pane settings'
-		applyDemoStyles: 		false		// NOTE: renamed from applyDefaultStyles for clarity
-	,	closable:				true		// pane can open & close
-	,	resizable:				true		// when open, pane can be resized 
-	,	slidable:				true		// when closed, pane can 'slide open' over other panes - closes on mouse-out
-	,	initClosed:				false		// true = init pane as 'closed'
-	,	initHidden: 			false 		// true = init pane as 'hidden' - no resizer-bar/spacing
-	//	SELECTORS
-	//,	paneSelector:			""			// MUST be pane-specific - jQuery selector for pane
-	,	contentSelector:		".ui-layout-content" // INNER div/element to auto-size so only it scrolls, not the entire pane!
-	,	contentIgnoreSelector:	".ui-layout-ignore"	// element(s) to 'ignore' when measuring 'content'
-	,	findNestedContent:		false		// true = $P.find(contentSelector), false = $P.children(contentSelector)
-	//	GENERIC ROOT-CLASSES - for auto-generated classNames
-	,	paneClass:				"ui-layout-pane"	// Layout Pane
-	,	resizerClass:			"ui-layout-resizer"	// Resizer Bar
-	,	togglerClass:			"ui-layout-toggler"	// Toggler Button
-	,	buttonClass:			"ui-layout-button"	// CUSTOM Buttons	- eg: '[ui-layout-button]-toggle/-open/-close/-pin'
-	//	ELEMENT SIZE & SPACING
-	//,	size:					100			// MUST be pane-specific -initial size of pane
-	,	minSize:				0			// when manually resizing a pane
-	,	maxSize:				0			// ditto, 0 = no limit
-	,	spacing_open:			6			// space between pane and adjacent panes - when pane is 'open'
-	,	spacing_closed:			6			// ditto - when pane is 'closed'
-	,	togglerLength_open:		50			// Length = WIDTH of toggler button on north/south sides - HEIGHT on east/west sides
-	,	togglerLength_closed: 	50			// 100% OR -1 means 'full height/width of resizer bar' - 0 means 'hidden'
-	,	togglerAlign_open:		"center"	// top/left, bottom/right, center, OR...
-	,	togglerAlign_closed:	"center"	// 1 => nn = offset from top/left, -1 => -nn == offset from bottom/right
-	,	togglerContent_open:	""			// text or HTML to put INSIDE the toggler
-	,	togglerContent_closed:	""			// ditto
-	//	RESIZING OPTIONS
-	,	resizerDblClickToggle:	true		// 
-	,	autoResize:				true		// IF size is 'auto' or a percentage, then recalc 'pixel size' whenever the layout resizes
-	,	autoReopen:				true		// IF a pane was auto-closed due to noRoom, reopen it when there is room? False = leave it closed
-	,	resizerDragOpacity:		1			// option for ui.draggable
-	//,	resizerCursor:			""			// MUST be pane-specific - cursor when over resizer-bar
-	,	maskContents:			false		// true = add DIV-mask over-or-inside this pane so can 'drag' over IFRAMES
-	,	maskObjects:			false		// true = add IFRAME-mask over-or-inside this pane to cover objects/applets - content-mask will overlay this mask
-	,	maskZindex:				null		// will override zIndexes.content_mask if specified - not applicable to iframe-panes
-	,	resizingGrid:			false		// grid size that the resizers will snap-to during resizing, eg: [20,20]
-	,	livePaneResizing:		false		// true = LIVE Resizing as resizer is dragged
-	,	liveContentResizing:	false		// true = re-measure header/footer heights as resizer is dragged
-	,	liveResizingTolerance:	1			// how many px change before pane resizes, to control performance
-	//	SLIDING OPTIONS
-	,	sliderCursor:			"pointer"	// cursor when resizer-bar will trigger 'sliding'
-	,	slideTrigger_open:		"click"		// click, dblclick, mouseenter
-	,	slideTrigger_close:		"mouseleave"// click, mouseleave
-	,	slideDelay_open:		300			// applies only for mouseenter event - 0 = instant open
-	,	slideDelay_close:		300			// applies only for mouseleave event (300ms is the minimum!)
-	,	hideTogglerOnSlide:		false		// when pane is slid-open, should the toggler show?
-	,	preventQuickSlideClose:	$.layout.browser.webkit // Chrome triggers slideClosed as it is opening
-	,	preventPrematureSlideClose: false	// handle incorrect mouseleave trigger, like when over a SELECT-list in IE
-	//	PANE-SPECIFIC TIPS & MESSAGES
-	,	tips: {
-			Open:				"Open"		// eg: "Open Pane"
-		,	Close:				"Close"
-		,	Resize:				"Resize"
-		,	Slide:				"Slide Open"
-		,	Pin:				"Pin"
-		,	Unpin:				"Un-Pin"
-		,	noRoomToOpen:		"Not enough room to show this panel."	// alert if user tries to open a pane that cannot
-		,	minSizeWarning:		"Panel has reached its minimum size"	// displays in browser statusbar
-		,	maxSizeWarning:		"Panel has reached its maximum size"	// ditto
-		}
-	//	HOT-KEYS & MISC
-	,	showOverflowOnHover:	false		// will bind allowOverflow() utility to pane.onMouseOver
-	,	enableCursorHotkey:		true		// enabled 'cursor' hotkeys
-	//,	customHotkey:			""			// MUST be pane-specific - EITHER a charCode OR a character
-	,	customHotkeyModifier:	"SHIFT"		// either 'SHIFT', 'CTRL' or 'CTRL+SHIFT' - NOT 'ALT'
-	//	PANE ANIMATION
-	//	NOTE: fxSss_open, fxSss_close & fxSss_size options (eg: fxName_open) are auto-generated if not passed
-	,	fxName:					"slide" 	// ('none' or blank), slide, drop, scale -- only relevant to 'open' & 'close', NOT 'size'
-	,	fxSpeed:				null		// slow, normal, fast, 200, nnn - if passed, will OVERRIDE fxSettings.duration
-	,	fxSettings:				{}			// can be passed, eg: { easing: "easeOutBounce", duration: 1500 }
-	,	fxOpacityFix:			true		// tries to fix opacity in IE to restore anti-aliasing after animation
-	,	animatePaneSizing:		false		// true = animate resizing after dragging resizer-bar OR sizePane() is called
-	/*  NOTE: Action-specific FX options are auto-generated from the options above if not specifically set:
-		fxName_open:			"slide"		// 'Open' pane animation
-		fnName_close:			"slide"		// 'Close' pane animation
-		fxName_size:			"slide"		// 'Size' pane animation - when animatePaneSizing = true
-		fxSpeed_open:			null
-		fxSpeed_close:			null
-		fxSpeed_size:			null
-		fxSettings_open:		{}
-		fxSettings_close:		{}
-		fxSettings_size:		{}
-	*/
-	//	CHILD/NESTED LAYOUTS
-	,	children:				null		// Layout-options for nested/child layout - even {} is valid as options
-	,	containerSelector:		''			// if child is NOT 'directly nested', a selector to find it/them (can have more than one child layout!)
-	,	initChildren:			true		// true = child layout will be created as soon as _this_ layout completes initialization
-	,	destroyChildren:		true		// true = destroy child-layout if this pane is destroyed
-	,	resizeChildren:			true		// true = trigger child-layout.resizeAll() when this pane is resized
-	//	EVENT TRIGGERING
-	,	triggerEventsOnLoad:	false		// true = trigger onopen OR onclose callbacks when layout initializes
-	,	triggerEventsDuringLiveResize: true	// true = trigger onresize callback REPEATEDLY if livePaneResizing==true
-	//	PANE CALLBACKS
-	,	onshow_start:			null		// CALLBACK when pane STARTS to Show	- BEFORE onopen/onhide_start
-	,	onshow_end:				null		// CALLBACK when pane ENDS being Shown	- AFTER  onopen/onhide_end
-	,	onhide_start:			null		// CALLBACK when pane STARTS to Close	- BEFORE onclose_start
-	,	onhide_end:				null		// CALLBACK when pane ENDS being Closed	- AFTER  onclose_end
-	,	onopen_start:			null		// CALLBACK when pane STARTS to Open
-	,	onopen_end:				null		// CALLBACK when pane ENDS being Opened
-	,	onclose_start:			null		// CALLBACK when pane STARTS to Close
-	,	onclose_end:			null		// CALLBACK when pane ENDS being Closed
-	,	onresize_start:			null		// CALLBACK when pane STARTS being Resized ***FOR ANY REASON***
-	,	onresize_end:			null		// CALLBACK when pane ENDS being Resized ***FOR ANY REASON***
-	,	onsizecontent_start:	null		// CALLBACK when sizing of content-element STARTS
-	,	onsizecontent_end:		null		// CALLBACK when sizing of content-element ENDS
-	,	onswap_start:			null		// CALLBACK when pane STARTS to Swap
-	,	onswap_end:				null		// CALLBACK when pane ENDS being Swapped
-	,	ondrag_start:			null		// CALLBACK when pane STARTS being ***MANUALLY*** Resized
-	,	ondrag_end:				null		// CALLBACK when pane ENDS being ***MANUALLY*** Resized
-	}
-/*
- *	PANE-SPECIFIC SETTINGS
- *	- options listed below MUST be specified per-pane - they CANNOT be set under 'panes'
- *	- all options under the 'panes' key can also be set specifically for any pane
- *	- most options under the 'panes' key apply only to 'border-panes' - NOT the the center-pane
- */
-,	north: {
-		paneSelector:			".ui-layout-north"
-	,	size:					"auto"		// eg: "auto", "30%", .30, 200
-	,	resizerCursor:			"n-resize"	// custom = url(myCursor.cur)
-	,	customHotkey:			""			// EITHER a charCode (43) OR a character ("o")
-	}
-,	south: {
-		paneSelector:			".ui-layout-south"
-	,	size:					"50%"//"auto"
-	,	resizerCursor:			"s-resize"
-	,	customHotkey:			""
-	,   initClosed:				true	
-	}
-,	east: {
-		paneSelector:			".ui-layout-east"
-	,	size:					"5%"//200
-	,	resizerCursor:			"e-resize"
-	,	customHotkey:			""
-	}
-,	west: {
-		paneSelector:			".ui-layout-west"
-	,	size:					"70%" //200
-	,	resizerCursor:			"w-resize"
-	,	customHotkey:			""
-	,   initClosed:				true	
-	}
-,	center: {
-		paneSelector:			".ui-layout-center"
-	,	size:					"30%"//"auto"
-	,	minWidth:				0
-	,	minHeight:				0
-	}
-};
-
-$.layout.optionsMap = {
-	// layout/global options - NOT pane-options
-	layout: ("name,instanceKey,stateManagement,effects,inset,zIndexes,errors,"
-	+	"zIndex,scrollToBookmarkOnLoad,showErrorMessages,maskPanesEarly,"
-	+	"outset,resizeWithWindow,resizeWithWindowDelay,resizeWithWindowMaxDelay,"
-	+	"onresizeall,onresizeall_start,onresizeall_end,onload,onload_start,onload_end,onunload,onunload_start,onunload_end").split(",")
-//	borderPanes: [ ALL options that are NOT specified as 'layout' ]
-	// default.panes options that apply to the center-pane (most options apply _only_ to border-panes)
-,	center: ("paneClass,contentSelector,contentIgnoreSelector,findNestedContent,applyDemoStyles,triggerEventsOnLoad,"
-	+	"showOverflowOnHover,maskContents,maskObjects,liveContentResizing,"
-	+	"containerSelector,children,initChildren,resizeChildren,destroyChildren,"
-	+	"onresize,onresize_start,onresize_end,onsizecontent,onsizecontent_start,onsizecontent_end").split(",")
-	// options that MUST be specifically set 'per-pane' - CANNOT set in the panes (defaults) key
-,	noDefault: ("paneSelector,resizerCursor,customHotkey").split(",")
-};
-
-/**
- * Processes options passed in converts flat-format data into subkey (JSON) format
- * In flat-format, subkeys are _currently_ separated with 2 underscores, like north__optName
- * Plugins may also call this method so they can transform their own data
- *
- * @param  {!Object}	hash			Data/options passed by user - may be a single level or nested levels
- * @param  {boolean=}	[addKeys=false]	Should the primary layout.options keys be added if they do not exist?
- * @return {Object}						Returns hash of minWidth & minHeight
- */
-$.layout.transformData = function (hash, addKeys) {
-	var	json = addKeys ? { panes: {}, center: {} } : {} // init return object
-	,	branch, optKey, keys, key, val, i, c;
-
-	if (typeof hash !== "object") return json; // no options passed
-
-	// convert all 'flat-keys' to 'sub-key' format
-	for (optKey in hash) {
-		branch	= json;
-		val		= hash[ optKey ];
-		keys	= optKey.split("__"); // eg: west__size or north__fxSettings__duration
-		c		= keys.length - 1;
-		// convert underscore-delimited to subkeys
-		for (i=0; i <= c; i++) {
-			key = keys[i];
-			if (i === c) {	// last key = value
-				if ($.isPlainObject( val ))
-					branch[key] = $.layout.transformData( val ); // RECURSE
-				else
-					branch[key] = val;
-			}
-			else {
-				if (!branch[key])
-					branch[key] = {}; // create the subkey
-				// recurse to sub-key for next loop - if not done
-				branch = branch[key];
-			}
-		}
-	}
-	return json;
-};
-
-// INTERNAL CONFIG DATA - DO NOT CHANGE THIS!
-$.layout.backwardCompatibility = {
-	// data used by renameOldOptions()
-	map: {
-	//	OLD Option Name:			NEW Option Name
-		applyDefaultStyles:			"applyDemoStyles"
-	//	CHILD/NESTED LAYOUTS
-	,	childOptions:				"children"
-	,	initChildLayout:			"initChildren"
-	,	destroyChildLayout:			"destroyChildren"
-	,	resizeChildLayout:			"resizeChildren"
-	,	resizeNestedLayout:			"resizeChildren"
-	//	MISC Options
-	,	resizeWhileDragging:		"livePaneResizing"
-	,	resizeContentWhileDragging:	"liveContentResizing"
-	,	triggerEventsWhileDragging:	"triggerEventsDuringLiveResize"
-	,	maskIframesOnResize:		"maskContents"
-	//	STATE MANAGEMENT
-	,	useStateCookie:				"stateManagement.enabled"
-	,	"cookie.autoLoad":			"stateManagement.autoLoad"
-	,	"cookie.autoSave":			"stateManagement.autoSave"
-	,	"cookie.keys":				"stateManagement.stateKeys"
-	,	"cookie.name":				"stateManagement.cookie.name"
-	,	"cookie.domain":			"stateManagement.cookie.domain"
-	,	"cookie.path":				"stateManagement.cookie.path"
-	,	"cookie.expires":			"stateManagement.cookie.expires"
-	,	"cookie.secure":			"stateManagement.cookie.secure"
-	//	OLD Language options
-	,	noRoomToOpenTip:			"tips.noRoomToOpen"
-	,	togglerTip_open:			"tips.Close"	// open   = Close
-	,	togglerTip_closed:			"tips.Open"		// closed = Open
-	,	resizerTip:					"tips.Resize"
-	,	sliderTip:					"tips.Slide"
-	}
-
-/**
-* @param {Object}	opts
-*/
-,	renameOptions: function (opts) {
-		var map = $.layout.backwardCompatibility.map
-		,	oldData, newData, value
-		;
-		for (var itemPath in map) {
-			oldData	= getBranch( itemPath );
-			value	= oldData.branch[ oldData.key ];
-			if (value !== undefined) {
-				newData = getBranch( map[itemPath], true );
-				newData.branch[ newData.key ] = value;
-				delete oldData.branch[ oldData.key ];
-			}
-		}
-
-		/**
-		 * @param {string}	path
-		 * @param {boolean=}	[create=false]	Create path if does not exist
-		 */
-		function getBranch (path, create) {
-			var a = path.split(".") // split keys into array
-			,	c = a.length - 1
-			,	D = { branch: opts, key: a[c] } // init branch at top & set key (last item)
-			,	i = 0, k, undef;
-			for (; i 0) {
-			if (autoHide && $E.data('autoHidden') && $E.innerHeight() > 0) {
-				$E.show().data('autoHidden', false);
-				if (!browser.mozilla) // FireFox refreshes iframes - IE does not
-					// make hidden, then visible to 'refresh' display after animation
-					$E.css(_c.hidden).css(_c.visible);
-			}
-		}
-		else if (autoHide && !$E.data('autoHidden'))
-			$E.hide().data('autoHidden', true);
-	}
-
-	/**
-	 * @param {(string|!Object)}		el
-	 * @param {number=}				outerHeight
-	 * @param {boolean=}				[autoHide=false]
-	 */
-,	setOuterHeight = function (el, outerHeight, autoHide) {
-		var $E = el, h;
-		if (isStr(el)) $E = $Ps[el]; // west
-		else if (!el.jquery) $E = $(el);
-		h = cssH($E, outerHeight);
-		$E.css({ height: h, visibility: "visible" }); // may have been 'hidden' by sizeContent
-		if (h > 0 && $E.innerWidth() > 0) {
-			if (autoHide && $E.data('autoHidden')) {
-				$E.show().data('autoHidden', false);
-				if (!browser.mozilla) // FireFox refreshes iframes - IE does not
-					$E.css(_c.hidden).css(_c.visible);
-			}
-		}
-		else if (autoHide && !$E.data('autoHidden'))
-			$E.hide().data('autoHidden', true);
-	}
-
-
-	/**
-	 * Converts any 'size' params to a pixel/integer size, if not already
-	 * If 'auto' or a decimal/percentage is passed as 'size', a pixel-size is calculated
-	 *
-	/**
-	 * @param  {string}				pane
-	 * @param  {(string|number)=}	size
-	 * @param  {string=}				[dir]
-	 * @return {number}
-	 */
-,	_parseSize = function (pane, size, dir) {
-		if (!dir) dir = _c[pane].dir;
-
-		if (isStr(size) && size.match(/%/))
-			size = (size === '100%') ? -1 : parseInt(size, 10) / 100; // convert % to decimal
-
-		if (size === 0)
-			return 0;
-		else if (size >= 1)
-			return parseInt(size, 10);
-
-		var o = options, avail = 0;
-		if (dir=="horz") // north or south or center.minHeight
-			avail = sC.innerHeight - ($Ps.north ? o.north.spacing_open : 0) - ($Ps.south ? o.south.spacing_open : 0);
-		else if (dir=="vert") // east or west or center.minWidth
-			avail = sC.innerWidth - ($Ps.west ? o.west.spacing_open : 0) - ($Ps.east ? o.east.spacing_open : 0);
-
-		if (size === -1) // -1 == 100%
-			return avail;
-		else if (size > 0) // percentage, eg: .25
-			return round(avail * size);
-		else if (pane=="center")
-			return 0;
-		else { // size < 0 || size=='auto' || size==Missing || size==Invalid
-			// auto-size the pane
-			var	dim	= (dir === "horz" ? "height" : "width")
-			,	$P	= $Ps[pane]
-			,	$C	= dim === 'height' ? $Cs[pane] : false
-			,	vis	= $.layout.showInvisibly($P) // show pane invisibly if hidden
-			,	szP	= $P.css(dim) // SAVE current pane size
-			,	szC	= $C ? $C.css(dim) : 0 // SAVE current content size
-			;
-			$P.css(dim, "auto");
-			if ($C) $C.css(dim, "auto");
-			size = (dim === "height") ? $P.outerHeight() : $P.outerWidth(); // MEASURE
-			$P.css(dim, szP).css(vis); // RESET size & visibility
-			if ($C) $C.css(dim, szC);
-			return size;
-		}
-	}
-
-	/**
-	 * Calculates current 'size' (outer-width or outer-height) of a border-pane - optionally with 'pane-spacing' added
-	 *
-	 * @param  {(string|!Object)}	pane
-	 * @param  {boolean=}			[inclSpace=false]
-	 * @return {number}				Returns EITHER Width for east/west panes OR Height for north/south panes
-	 */
-,	getPaneSize = function (pane, inclSpace) {
-		var 
-			$P	= $Ps[pane]
-		,	o	= options[pane]
-		,	s	= state[pane]
-		,	oSp	= (inclSpace ? o.spacing_open : 0)
-		,	cSp	= (inclSpace ? o.spacing_closed : 0)
-		;
-		if (!$P || s.isHidden)
-			return 0;
-		else if (s.isClosed || (s.isSliding && inclSpace))
-			return cSp;
-		else if (_c[pane].dir === "horz")
-			return $P.outerHeight() + oSp;
-		else // dir === "vert"
-			return $P.outerWidth() + oSp;
-	}
-
-	/**
-	 * Calculate min/max pane dimensions and limits for resizing
-	 *
-	 * @param  {string}		pane
-	 * @param  {boolean=}	[slide=false]
-	 */
-,	setSizeLimits = function (pane, slide) {
-		if (!isInitialized()) return;
-		var 
-			o				= options[pane]
-		,	s				= state[pane]
-		,	c				= _c[pane]
-		,	dir				= c.dir
-		,	type			= c.sizeType.toLowerCase()
-		,	isSliding		= (slide != undefined ? slide : s.isSliding) // only open() passes 'slide' param
-		,	$P				= $Ps[pane]
-		,	paneSpacing		= o.spacing_open
-		//	measure the pane on the *opposite side* from this pane
-		,	altPane			= _c.oppositeEdge[pane]
-		,	altS			= state[altPane]
-		,	$altP			= $Ps[altPane]
-		,	altPaneSize		= (!$altP || altS.isVisible===false || altS.isSliding ? 0 : (dir=="horz" ? $altP.outerHeight() : $altP.outerWidth()))
-		,	altPaneSpacing	= ((!$altP || altS.isHidden ? 0 : options[altPane][ altS.isClosed !== false ? "spacing_closed" : "spacing_open" ]) || 0)
-		//	limitSize prevents this pane from 'overlapping' opposite pane
-		,	containerSize	= (dir=="horz" ? sC.innerHeight : sC.innerWidth)
-		,	minCenterDims	= cssMinDims("center")
-		,	minCenterSize	= dir=="horz" ? max(options.center.minHeight, minCenterDims.minHeight) : max(options.center.minWidth, minCenterDims.minWidth)
-		//	if pane is 'sliding', then ignore center and alt-pane sizes - because 'overlays' them
-		,	limitSize		= (containerSize - paneSpacing - (isSliding ? 0 : (_parseSize("center", minCenterSize, dir) + altPaneSize + altPaneSpacing)))
-		,	minSize			= s.minSize = max( _parseSize(pane, o.minSize), cssMinDims(pane).minSize )
-		,	maxSize			= s.maxSize = min( (o.maxSize ? _parseSize(pane, o.maxSize) : 100000), limitSize )
-		,	r				= s.resizerPosition = {} // used to set resizing limits
-		,	top				= sC.inset.top
-		,	left			= sC.inset.left
-		,	W				= sC.innerWidth
-		,	H				= sC.innerHeight
-		,	rW				= o.spacing_open // subtract resizer-width to get top/left position for south/east
-		;
-		switch (pane) {
-			case "north":	r.min = top + minSize;
-							r.max = top + maxSize;
-							break;
-			case "west":	r.min = left + minSize;
-							r.max = left + maxSize;
-							break;
-			case "south":	r.min = top + H - maxSize - rW;
-							r.max = top + H - minSize - rW;
-							break;
-			case "east":	r.min = left + W - maxSize - rW;
-							r.max = left + W - minSize - rW;
-							break;
-		};
-	}
-
-	/**
-	 * Returns data for setting the size/position of center pane. Also used to set Height for east/west panes
-	 *
-	 * @return JSON  Returns a hash of all dimensions: top, bottom, left, right, (outer) width and (outer) height
-	 */
-,	calcNewCenterPaneDims = function () {
-		var d = {
-			top:	getPaneSize("north", true) // true = include 'spacing' value for pane
-		,	bottom:	getPaneSize("south", true)
-		,	left:	getPaneSize("west", true)
-		,	right:	getPaneSize("east", true)
-		,	width:	0
-		,	height:	0
-		};
-
-		// NOTE: sC = state.container
-		// calc center-pane outer dimensions
-		d.width		= sC.innerWidth - d.left - d.right;  // outerWidth
-		d.height	= sC.innerHeight - d.bottom - d.top; // outerHeight
-		// add the 'container border/padding' to get final positions relative to the container
-		d.top		+= sC.inset.top;
-		d.bottom	+= sC.inset.bottom;
-		d.left		+= sC.inset.left;
-		d.right		+= sC.inset.right;
-
-		return d;
-	}
-
-
-	/**
-	 * @param {!Object}		el
-	 * @param {boolean=}		[allStates=false]
-	 */
-,	getHoverClasses = function (el, allStates) {
-		var
-			$El		= $(el)
-		,	type	= $El.data("layoutRole")
-		,	pane	= $El.data("layoutEdge")
-		,	o		= options[pane]
-		,	root	= o[type +"Class"]
-		,	_pane	= "-"+ pane // eg: "-west"
-		,	_open	= "-open"
-		,	_closed	= "-closed"
-		,	_slide	= "-sliding"
-		,	_hover	= "-hover " // NOTE the trailing space
-		,	_state	= $El.hasClass(root+_closed) ? _closed : _open
-		,	_alt	= _state === _closed ? _open : _closed
-		,	classes = (root+_hover) + (root+_pane+_hover) + (root+_state+_hover) + (root+_pane+_state+_hover)
-		;
-		if (allStates) // when 'removing' classes, also remove alternate-state classes
-			classes += (root+_alt+_hover) + (root+_pane+_alt+_hover);
-
-		if (type=="resizer" && $El.hasClass(root+_slide))
-			classes += (root+_slide+_hover) + (root+_pane+_slide+_hover);
-
-		return $.trim(classes);
-	}
-,	addHover	= function (evt, el) {
-		var $E = $(el || this);
-		if (evt && $E.data("layoutRole") === "toggler")
-			evt.stopPropagation(); // prevent triggering 'slide' on Resizer-bar
-		$E.addClass( getHoverClasses($E) );
-	}
-,	removeHover	= function (evt, el) {
-		var $E = $(el || this);
-		$E.removeClass( getHoverClasses($E, true) );
-	}
-
-,	onResizerEnter	= function (evt) { // ALSO called by toggler.mouseenter
-		var pane	= $(this).data("layoutEdge")
-		,	s		= state[pane]
-		,	$d		= $(document)
-		;
-		// ignore closed-panes and mouse moving back & forth over resizer!
-		// also ignore if ANY pane is currently resizing
-		if ( s.isResizing || state.paneResizing ) return;
-
-		if (options.maskPanesEarly)
-			showMasks( pane, { resizing: true });
-	}
-,	onResizerLeave	= function (evt, el) {
-		var	e		= el || this // el is only passed when called by the timer
-		,	pane	= $(e).data("layoutEdge")
-		,	name	= pane +"ResizerLeave"
-		,	$d		= $(document)
-		;
-		timer.clear(pane+"_openSlider"); // cancel slideOpen timer, if set
-		timer.clear(name); // cancel enableSelection timer - may re/set below
-		// this method calls itself on a timer because it needs to allow
-		// enough time for dragging to kick-in and set the isResizing flag
-		// dragging has a 100ms delay set, so this delay must be >100
-		if (!el) // 1st call - mouseleave event
-			timer.set(name, function(){ onResizerLeave(evt, e); }, 200);
-		// if user is resizing, dragStop will reset everything, so skip it here
-		else if (options.maskPanesEarly && !state.paneResizing) // 2nd call - by timer
-			hideMasks();
-	}
-
-/*
- * ###########################
- *   INITIALIZATION METHODS
- * ###########################
- */
-
-	/**
-	 * Initialize the layout - called automatically whenever an instance of layout is created
-	 *
-	 * @see  none - triggered onInit
-	 * @return  mixed	true = fully initialized | false = panes not initialized (yet) | 'cancel' = abort
-	 */
-,	_create = function () {
-		// initialize config/options
-		initOptions();
-		var o = options
-		,	s = state;
-
-		// TEMP state so isInitialized returns true during init process
-		s.creatingLayout = true;
-
-		// init plugins for this layout, if there are any (eg: stateManagement)
-		runPluginCallbacks( Instance, $.layout.onCreate );
-
-		// options & state have been initialized, so now run beforeLoad callback
-		// onload will CANCEL layout creation if it returns false
-		if (false === _runCallbacks("onload_start"))
-			return 'cancel';
-
-		// initialize the container element
-		_initContainer();
-
-		// bind hotkey function - keyDown - if required
-		initHotkeys();
-
-		// bind window.onunload
-		$(window).bind("unload."+ sID, unload);
-
-		// init plugins for this layout, if there are any (eg: customButtons)
-		runPluginCallbacks( Instance, $.layout.onLoad );
-
-		// if layout elements are hidden, then layout WILL NOT complete initialization!
-		// initLayoutElements will set initialized=true and run the onload callback IF successful
-		if (o.initPanes) _initLayoutElements();
-
-		delete s.creatingLayout;
-
-		return state.initialized;
-	}
-
-	/**
-	 * Initialize the layout IF not already
-	 *
-	 * @see  All methods in Instance run this test
-	 * @return  boolean	true = layoutElements have been initialized | false = panes are not initialized (yet)
-	 */
-,	isInitialized = function () {
-		if (state.initialized || state.creatingLayout) return true;	// already initialized
-		else return _initLayoutElements();	// try to init panes NOW
-	}
-
-	/**
-	 * Initialize the layout - called automatically whenever an instance of layout is created
-	 *
-	 * @see  _create() & isInitialized
-	 * @param {boolean=}		[retry=false]	// indicates this is a 2nd try
-	 * @return  An object pointer to the instance created
-	 */
-,	_initLayoutElements = function (retry) {
-		// initialize config/options
-		var o = options;
-		// CANNOT init panes inside a hidden container!
-		if (!$N.is(":visible")) {
-			// handle Chrome bug where popup window 'has no height'
-			// if layout is BODY element, try again in 50ms
-			// SEE: http://layout.jquery-dev.com/samples/test_popup_window.html
-			if ( !retry && browser.webkit && $N[0].tagName === "BODY" )
-				setTimeout(function(){ _initLayoutElements(true); }, 50);
-			return false;
-		}
-
-		// a center pane is required, so make sure it exists
-		if (!getPane("center").length) {
-			return _log( o.errors.centerPaneMissing );
-		}
-
-		// TEMP state so isInitialized returns true during init process
-		state.creatingLayout = true;
-
-		// update Container dims
-		$.extend(sC, elDims( $N, o.inset )); // passing inset means DO NOT include insetX values
-
-		// initialize all layout elements
-		initPanes();	// size & position panes - calls initHandles() - which calls initResizable()
-
-		if (o.scrollToBookmarkOnLoad) {
-			var l = self.location;
-			if (l.hash) l.replace( l.hash ); // scrollTo Bookmark
-		}
-
-		// check to see if this layout 'nested' inside a pane
-		if (Instance.hasParentLayout)
-			o.resizeWithWindow = false;
-		// bind resizeAll() for 'this layout instance' to window.resize event
-		else if (o.resizeWithWindow)
-			$(window).bind("resize."+ sID, windowResize);
-
-		delete state.creatingLayout;
-		state.initialized = true;
-
-		// init plugins for this layout, if there are any
-		runPluginCallbacks( Instance, $.layout.onReady );
-
-		// now run the onload callback, if exists
-		_runCallbacks("onload_end");
-
-		return true; // elements initialized successfully
-	}
-
-	/**
-	 * Initialize nested layouts for a specific pane - can optionally pass layout-options
-	 *
-	 * @param {(string|Object)}	evt_or_pane	The pane being opened, ie: north, south, east, or west
-	 * @param {Object=}			[opts]		Layout-options - if passed, will OVERRRIDE options[pane].children
-	 * @return  An object pointer to the layout instance created - or null
-	 */
-,	createChildren = function (evt_or_pane, opts) {
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$P	= $Ps[pane]
-		;
-		if (!$P) return;
-		var	$C	= $Cs[pane]
-		,	s	= state[pane]
-		,	o	= options[pane]
-		,	sm	= options.stateManagement || {}
-		,	cos = opts ? (o.children = opts) : o.children
-		;
-		if ( $.isPlainObject( cos ) )
-			cos = [ cos ]; // convert a hash to a 1-elem array
-		else if (!cos || !$.isArray( cos ))
-			return;
-
-		$.each( cos, function (idx, co) {
-			if ( !$.isPlainObject( co ) ) return;
-
-			// determine which element is supposed to be the 'child container'
-			// if pane has a 'containerSelector' OR a 'content-div', use those instead of the pane
-			var $containers = co.containerSelector ? $P.find( co.containerSelector ) : ($C || $P);
-
-			$containers.each(function(){
-				var $cont	= $(this)
-				,	child	= $cont.data("layout") //	see if a child-layout ALREADY exists on this element
-				;
-				// if no layout exists, but children are set, try to create the layout now
-				if (!child) {
-					// TODO: see about moving this to the stateManagement plugin, as a method
-					// set a unique child-instance key for this layout, if not already set
-					setInstanceKey({ container: $cont, options: co }, s );
-					// If THIS layout has a hash in stateManagement.autoLoad,
-					// then see if it also contains state-data for this child-layout
-					// If so, copy the stateData to child.options.stateManagement.autoLoad
-					if ( sm.includeChildren && state.stateData[pane] ) {
-						//	THIS layout's state was cached when its state was loaded
-						var	paneChildren = state.stateData[pane].children || {}
-						,	childState	= paneChildren[ co.instanceKey ]
-						,	co_sm		= co.stateManagement || (co.stateManagement = { autoLoad: true })
-						;
-						// COPY the stateData into the autoLoad key
-						if ( co_sm.autoLoad === true && childState ) {
-							co_sm.autoSave			= false; // disable autoSave because saving handled by parent-layout
-							co_sm.includeChildren	= true;  // cascade option - FOR NOW
-							co_sm.autoLoad = $.extend(true, {}, childState); // COPY the state-hash
-						}
-					}
-
-					// create the layout
-					child = $cont.layout( co );
-
-					// if successful, update data
-					if (child) {
-						// add the child and update all layout-pointers
-						// MAY have already been done by child-layout calling parent.refreshChildren()
-						refreshChildren( pane, child );
-					}
-				}
-			});
-		});
-	}
-
-,	setInstanceKey = function (child, parentPaneState) {
-		// create a named key for use in state and instance branches
-		var	$c	= child.container
-		,	o	= child.options
-		,	sm	= o.stateManagement
-		,	key	= o.instanceKey || $c.data("layoutInstanceKey")
-		;
-		if (!key) key = (sm && sm.cookie ? sm.cookie.name : '') || o.name; // look for a name/key
-		if (!key) key = "layout"+ (++parentPaneState.childIdx);	// if no name/key found, generate one
-		else key = key.replace(/[^\w-]/gi, '_').replace(/_{2,}/g, '_');	 // ensure is valid as a hash key
-		o.instanceKey = key;
-		$c.data("layoutInstanceKey", key); // useful if layout is destroyed and then recreated
-		return key;
-	}
-
-	/**
-	 * @param {string}		pane		The pane being opened, ie: north, south, east, or west
-	 * @param {Object=}		newChild	New child-layout Instance to add to this pane
-	 */
-,	refreshChildren = function (pane, newChild) {
-		var	$P	= $Ps[pane]
-		,	pC	= children[pane]
-		,	s	= state[pane]
-		,	o
-		;
-		// check for destroy()ed layouts and update the child pointers & arrays
-		if ($.isPlainObject( pC )) {
-			$.each( pC, function (key, child) {
-				if (child.destroyed) delete pC[key]
-			});
-			// if no more children, remove the children hash
-			if ($.isEmptyObject( pC ))
-				pC = children[pane] = null; // clear children hash
-		}
-
-		// see if there is a directly-nested layout inside this pane
-		// if there is, then there can be only ONE child-layout, so check that...
-		if (!newChild && !pC) {
-			newChild = $P.data("layout");
-		}
-
-		// if a newChild instance was passed, add it to children[pane]
-		if (newChild) {
-			// update child.state
-			newChild.hasParentLayout = true; // set parent-flag in child
-			// instanceKey is a key-name used in both state and children
-			o = newChild.options;
-			// set a unique child-instance key for this layout, if not already set
-			setInstanceKey( newChild, s );
-			// add pointer to pane.children hash
-			if (!pC) pC = children[pane] = {}; // create an empty children hash
-			pC[ o.instanceKey ] = newChild.container.data("layout"); // add childLayout instance
-		}
-
-		// ALWAYS refresh the pane.children alias, even if null
-		Instance[pane].children = children[pane];
-
-		// if newChild was NOT passed - see if there is a child layout NOW
-		if (!newChild) {
-			createChildren(pane); // MAY create a child and re-call this method
-		}
-	}
-
-,	windowResize = function () {
-		var	o = options
-		,	delay = Number(o.resizeWithWindowDelay);
-		if (delay < 10) delay = 100; // MUST have a delay!
-		// resizing uses a delay-loop because the resize event fires repeatly - except in FF, but delay anyway
-		timer.clear("winResize"); // if already running
-		timer.set("winResize", function(){
-			timer.clear("winResize");
-			timer.clear("winResizeRepeater");
-			var dims = elDims( $N, o.inset );
-			// only trigger resizeAll() if container has changed size
-			if (dims.innerWidth !== sC.innerWidth || dims.innerHeight !== sC.innerHeight)
-				resizeAll();
-		}, delay);
-		// ALSO set fixed-delay timer, if not already running
-		if (!timer.data["winResizeRepeater"]) setWindowResizeRepeater();
-	}
-
-,	setWindowResizeRepeater = function () {
-		var delay = Number(options.resizeWithWindowMaxDelay);
-		if (delay > 0)
-			timer.set("winResizeRepeater", function(){ setWindowResizeRepeater(); resizeAll(); }, delay);
-	}
-
-,	unload = function () {
-		var o = options;
-
-		_runCallbacks("onunload_start");
-
-		// trigger plugin callabacks for this layout (eg: stateManagement)
-		runPluginCallbacks( Instance, $.layout.onUnload );
-
-		_runCallbacks("onunload_end");
-	}
-
-	/**
-	 * Validate and initialize container CSS and events
-	 *
-	 * @see  _create()
-	 */
-,	_initContainer = function () {
-		var
-			N		= $N[0]	
-		,	$H		= $("html")
-		,	tag		= sC.tagName = N.tagName
-		,	id		= sC.id = N.id
-		,	cls		= sC.className = N.className
-		,	o		= options
-		,	name	= o.name
-		,	props	= "position,margin,padding,border"
-		,	css		= "layoutCSS"
-		,	CSS		= {}
-		,	hid		= "hidden" // used A LOT!
-		//	see if this container is a 'pane' inside an outer-layout
-		,	parent	= $N.data("parentLayout")	// parent-layout Instance
-		,	pane	= $N.data("layoutEdge")		// pane-name in parent-layout
-		,	isChild	= parent && pane
-		,	num		= $.layout.cssNum
-		,	$parent, n
-		;
-		// sC = state.container
-		sC.selector = $N.selector.split(".slice")[0];
-		sC.ref		= (o.name ? o.name +' layout / ' : '') + tag + (id ? "#"+id : cls ? '.['+cls+']' : ''); // used in messages
-		sC.isBody	= (tag === "BODY");
-
-		// try to find a parent-layout
-		if (!isChild && !sC.isBody) {
-			$parent = $N.closest("."+ $.layout.defaults.panes.paneClass);
-			parent	= $parent.data("parentLayout");
-			pane	= $parent.data("layoutEdge");
-			isChild	= parent && pane;
-		}
-
-		$N	.data({
-				layout: Instance
-			,	layoutContainer: sID // FLAG to indicate this is a layout-container - contains unique internal ID
-			})
-			.addClass(o.containerClass)
-		;
-		var layoutMethods = {
-			destroy:	''
-		,	initPanes:	''
-		,	resizeAll:	'resizeAll'
-		,	resize:		'resizeAll'
-		};
-		// loop hash and bind all methods - include layoutID namespacing
-		for (name in layoutMethods) {
-			$N.bind("layout"+ name.toLowerCase() +"."+ sID, Instance[ layoutMethods[name] || name ]);
-		}
-
-		// if this container is another layout's 'pane', then set child/parent pointers
-		if (isChild) {
-			// update parent flag
-			Instance.hasParentLayout = true;
-			// set pointers to THIS child-layout (Instance) in parent-layout
-			parent.refreshChildren( pane, Instance );
-		}
-
-		// SAVE original container CSS for use in destroy()
-		if (!$N.data(css)) {
-			// handle props like overflow different for BODY & HTML - has 'system default' values
-			if (sC.isBody) {
-				// SAVE  CSS
-				$N.data(css, $.extend( styles($N, props), {
-					height:		$N.css("height")
-				,	overflow:	$N.css("overflow")
-				,	overflowX:	$N.css("overflowX")
-				,	overflowY:	$N.css("overflowY")
-				}));
-				// ALSO SAVE  CSS
-				$H.data(css, $.extend( styles($H, 'padding'), {
-					height:		"auto" // FF would return a fixed px-size!
-				,	overflow:	$H.css("overflow")
-				,	overflowX:	$H.css("overflowX")
-				,	overflowY:	$H.css("overflowY")
-				}));
-			}
-			else // handle props normally for non-body elements
-				$N.data(css, styles($N, props+",top,bottom,left,right,width,height,overflow,overflowX,overflowY") );
-		}
-
-		try {
-			// common container CSS
-			CSS = {
-				overflow:	hid
-			,	overflowX:	hid
-			,	overflowY:	hid
-			};
-			$N.css( CSS );
-
-			if (o.inset && !$.isPlainObject(o.inset)) {
-				// can specify a single number for equal outset all-around
-				n = parseInt(o.inset, 10) || 0
-				o.inset = {
-					top:	n
-				,	bottom:	n
-				,	left:	n
-				,	right:	n
-				};
-			}
-
-			// format html & body if this is a full page layout
-			if (sC.isBody) {
-				// if HTML has padding, use this as an outer-spacing around BODY
-				if (!o.outset) {
-					// use padding from parent-elem (HTML) as outset
-					o.outset = {
-						top:	num($H, "paddingTop")
-					,	bottom:	num($H, "paddingBottom")
-					,	left:	num($H, "paddingLeft")
-					,	right:	num($H, "paddingRight")
-					};
-				}
-				else if (!$.isPlainObject(o.outset)) {
-					// can specify a single number for equal outset all-around
-					n = parseInt(o.outset, 10) || 0
-					o.outset = {
-						top:	n
-					,	bottom:	n
-					,	left:	n
-					,	right:	n
-					};
-				}
-				// HTML
-				$H.css( CSS ).css({
-					height:		"100%"
-				,	border:		"none"	// no border or padding allowed when using height = 100%
-				,	padding:	0		// ditto
-				,	margin:		0
-				});
-				// BODY
-				if (browser.isIE6) {
-					// IE6 CANNOT use the trick of setting absolute positioning on all 4 sides - must have 'height'
-					$N.css({
-						width:		"100%"
-					,	height:		"100%"
-					,	border:		"none"	// no border or padding allowed when using height = 100%
-					,	padding:	0		// ditto
-					,	margin:		0
-					,	position:	"relative"
-					});
-					// convert body padding to an inset option - the border cannot be measured in IE6!
-					if (!o.inset) o.inset = elDims( $N ).inset;
-				}
-				else { // use absolute positioning for BODY to allow borders & padding without overflow
-					$N.css({
-						width:		"auto"
-					,	height:		"auto"
-					,	margin:		0
-					,	position:	"absolute"	// allows for border and padding on BODY
-					});
-					// apply edge-positioning created above
-					$N.css( o.outset );
-				}
-				// set current layout-container dimensions
-				$.extend(sC, elDims( $N, o.inset )); // passing inset means DO NOT include insetX values
-			}
-			else {
-				// container MUST have 'position'
-				var	p = $N.css("position");
-				if (!p || !p.match(/(fixed|absolute|relative)/))
-					$N.css("position","relative");
-
-				// set current layout-container dimensions
-				if ( $N.is(":visible") ) {
-					$.extend(sC, elDims( $N, o.inset )); // passing inset means DO NOT change insetX (padding) values
-					if (sC.innerHeight < 1) // container has no 'height' - warn developer
-						_log( o.errors.noContainerHeight.replace(/CONTAINER/, sC.ref) );
-				}
-			}
-
-			// if container has min-width/height, then enable scrollbar(s)
-			if ( num($N, "minWidth")  ) $N.parent().css("overflowX","auto");
-			if ( num($N, "minHeight") ) $N.parent().css("overflowY","auto");
-
-		} catch (ex) {}
-	}
-
-	/**
-	 * Bind layout hotkeys - if options enabled
-	 *
-	 * @see  _create() and addPane()
-	 * @param {string=}	[panes=""]	The edge(s) to process
-	 */
-,	initHotkeys = function (panes) {
-		panes = panes ? panes.split(",") : _c.borderPanes;
-		// bind keyDown to capture hotkeys, if option enabled for ANY pane
-		$.each(panes, function (i, pane) {
-			var o = options[pane];
-			if (o.enableCursorHotkey || o.customHotkey) {
-				$(document).bind("keydown."+ sID, keyDown); // only need to bind this ONCE
-				return false; // BREAK - binding was done
-			}
-		});
-	}
-
-	/**
-	 * Build final OPTIONS data
-	 *
-	 * @see  _create()
-	 */
-,	initOptions = function () {
-		var data, d, pane, key, val, i, c, o;
-
-		// reprocess user's layout-options to have correct options sub-key structure
-		opts = $.layout.transformData( opts, true ); // panes = default subkey
-
-		// auto-rename old options for backward compatibility
-		opts = $.layout.backwardCompatibility.renameAllOptions( opts );
-
-		// if user-options has 'panes' key (pane-defaults), clean it...
-		if (!$.isEmptyObject(opts.panes)) {
-			// REMOVE any pane-defaults that MUST be set per-pane
-			data = $.layout.optionsMap.noDefault;
-			for (i=0, c=data.length; i 0) {
-			z.pane_normal		= zo;
-			z.content_mask		= max(zo+1, z.content_mask);	// MIN = +1
-			z.resizer_normal	= max(zo+2, z.resizer_normal);	// MIN = +2
-		}
-
-		// DELETE 'panes' key now that we are done - values were copied to EACH pane
-		delete options.panes;
-
-
-		function createFxOptions ( pane ) {
-			var	o = options[pane]
-			,	d = options.panes;
-			// ensure fxSettings key to avoid errors
-			if (!o.fxSettings) o.fxSettings = {};
-			if (!d.fxSettings) d.fxSettings = {};
-
-			$.each(["_open","_close","_size"], function (i,n) { 
-				var
-					sName		= "fxName"+ n
-				,	sSpeed		= "fxSpeed"+ n
-				,	sSettings	= "fxSettings"+ n
-					// recalculate fxName according to specificity rules
-				,	fxName = o[sName] =
-						o[sName]	// options.west.fxName_open
-					||	d[sName]	// options.panes.fxName_open
-					||	o.fxName	// options.west.fxName
-					||	d.fxName	// options.panes.fxName
-					||	"none"		// MEANS $.layout.defaults.panes.fxName == "" || false || null || 0
-				,	fxExists	= $.effects && ($.effects[fxName] || ($.effects.effect && $.effects.effect[fxName]))
-				;
-				// validate fxName to ensure is valid effect - MUST have effect-config data in options.effects
-				if (fxName === "none" || !options.effects[fxName] || !fxExists)
-					fxName = o[sName] = "none"; // effect not loaded OR unrecognized fxName
-
-				// set vars for effects subkeys to simplify logic
-				var	fx		= options.effects[fxName] || {}	// effects.slide
-				,	fx_all	= fx.all	|| null				// effects.slide.all
-				,	fx_pane	= fx[pane]	|| null				// effects.slide.west
-				;
-				// create fxSpeed[_open|_close|_size]
-				o[sSpeed] =
-					o[sSpeed]				// options.west.fxSpeed_open
-				||	d[sSpeed]				// options.west.fxSpeed_open
-				||	o.fxSpeed				// options.west.fxSpeed
-				||	d.fxSpeed				// options.panes.fxSpeed
-				||	null					// DEFAULT - let fxSetting.duration control speed
-				;
-				// create fxSettings[_open|_close|_size]
-				o[sSettings] = $.extend(
-					true
-				,	{}
-				,	fx_all					// effects.slide.all
-				,	fx_pane					// effects.slide.west
-				,	d.fxSettings			// options.panes.fxSettings
-				,	o.fxSettings			// options.west.fxSettings
-				,	d[sSettings]			// options.panes.fxSettings_open
-				,	o[sSettings]			// options.west.fxSettings_open
-				);
-			});
-
-			// DONE creating action-specific-settings for this pane,
-			// so DELETE generic options - are no longer meaningful
-			delete o.fxName;
-			delete o.fxSpeed;
-			delete o.fxSettings;
-		}
-	}
-
-	/**
-	 * Initialize module objects, styling, size and position for all panes
-	 *
-	 * @see  _initElements()
-	 * @param {string}	pane		The pane to process
-	 */
-,	getPane = function (pane) {
-		var sel = options[pane].paneSelector
-		if (sel.substr(0,1)==="#") // ID selector
-			// NOTE: elements selected 'by ID' DO NOT have to be 'children'
-			return $N.find(sel).eq(0);
-		else { // class or other selector
-			var $P = $N.children(sel).eq(0);
-			// look for the pane nested inside a 'form' element
-			return $P.length ? $P : $N.children("form:first").children(sel).eq(0);
-		}
-	}
-
-	/**
-	 * @param {Object=}		evt
-	 */
-,	initPanes = function (evt) {
-		// stopPropagation if called by trigger("layoutinitpanes") - use evtPane utility 
-		evtPane(evt);
-
-		// NOTE: do north & south FIRST so we can measure their height - do center LAST
-		$.each(_c.allPanes, function (idx, pane) {
-			addPane( pane, true );
-		});
-
-		// init the pane-handles NOW in case we have to hide or close the pane below
-		initHandles();
-
-		// now that all panes have been initialized and initially-sized,
-		// make sure there is really enough space available for each pane
-		$.each(_c.borderPanes, function (i, pane) {
-			if ($Ps[pane] && state[pane].isVisible) { // pane is OPEN
-				setSizeLimits(pane);
-				makePaneFit(pane); // pane may be Closed, Hidden or Resized by makePaneFit()
-			}
-		});
-		// size center-pane AGAIN in case we 'closed' a border-pane in loop above
-		sizeMidPanes("center");
-
-		//	Chrome/Webkit sometimes fires callbacks BEFORE it completes resizing!
-		//	Before RC30.3, there was a 10ms delay here, but that caused layout 
-		//	to load asynchrously, which is BAD, so try skipping delay for now
-
-		// process pane contents and callbacks, and init/resize child-layout if exists
-		$.each(_c.allPanes, function (idx, pane) {
-			afterInitPane(pane);
-		});
-	}
-
-	/**
-	 * Add a pane to the layout - subroutine of initPanes()
-	 *
-	 * @see  initPanes()
-	 * @param {string}	pane			The pane to process
-	 * @param {boolean=}	[force=false]	Size content after init
-	 */
-,	addPane = function (pane, force) {
-		if ( !force && !isInitialized() ) return;
-		var
-			o		= options[pane]
-		,	s		= state[pane]
-		,	c		= _c[pane]
-		,	dir		= c.dir
-		,	fx		= s.fx
-		,	spacing	= o.spacing_open || 0
-		,	isCenter = (pane === "center")
-		,	CSS		= {}
-		,	$P		= $Ps[pane]
-		,	size, minSize, maxSize, child
-		;
-		// if pane-pointer already exists, remove the old one first
-		if ($P)
-			removePane( pane, false, true, false );
-		else
-			$Cs[pane] = false; // init
-
-		$P = $Ps[pane] = getPane(pane);
-		if (!$P.length) {
-			$Ps[pane] = false; // logic
-			return;
-		}
-
-		// SAVE original Pane CSS
-		if (!$P.data("layoutCSS")) {
-			var props = "position,top,left,bottom,right,width,height,overflow,zIndex,display,backgroundColor,padding,margin,border";
-			$P.data("layoutCSS", styles($P, props));
-		}
-
-		// create alias for pane data in Instance - initHandles will add more
-		Instance[pane] = {
-			name:		pane
-		,	pane:		$Ps[pane]
-		,	content:	$Cs[pane]
-		,	options:	options[pane]
-		,	state:		state[pane]
-		,	children:	children[pane]
-		};
-
-		// add classes, attributes & events
-		$P	.data({
-				parentLayout:	Instance		// pointer to Layout Instance
-			,	layoutPane:		Instance[pane]	// NEW pointer to pane-alias-object
-			,	layoutEdge:		pane
-			,	layoutRole:		"pane"
-			})
-			.css(c.cssReq).css("zIndex", options.zIndexes.pane_normal)
-			.css(o.applyDemoStyles ? c.cssDemo : {}) // demo styles
-			.addClass( o.paneClass +" "+ o.paneClass+"-"+pane ) // default = "ui-layout-pane ui-layout-pane-west" - may be a dupe of 'paneSelector'
-			.bind("mouseenter."+ sID, addHover )
-			.bind("mouseleave."+ sID, removeHover )
-			;
-		var paneMethods = {
-				hide:				''
-			,	show:				''
-			,	toggle:				''
-			,	close:				''
-			,	open:				''
-			,	slideOpen:			''
-			,	slideClose:			''
-			,	slideToggle:		''
-			,	size:				'sizePane'
-			,	sizePane:			'sizePane'
-			,	sizeContent:		''
-			,	sizeHandles:		''
-			,	enableClosable:		''
-			,	disableClosable:	''
-			,	enableSlideable:	''
-			,	disableSlideable:	''
-			,	enableResizable:	''
-			,	disableResizable:	''
-			,	swapPanes:			'swapPanes'
-			,	swap:				'swapPanes'
-			,	move:				'swapPanes'
-			,	removePane:			'removePane'
-			,	remove:				'removePane'
-			,	createChildren:		''
-			,	resizeChildren:		''
-			,	resizeAll:			'resizeAll'
-			,	resizeLayout:		'resizeAll'
-			}
-		,	name;
-		// loop hash and bind all methods - include layoutID namespacing
-		for (name in paneMethods) {
-			$P.bind("layoutpane"+ name.toLowerCase() +"."+ sID, Instance[ paneMethods[name] || name ]);
-		}
-
-		// see if this pane has a 'scrolling-content element'
-		initContent(pane, false); // false = do NOT sizeContent() - called later
-
-		if (!isCenter) {
-			// call _parseSize AFTER applying pane classes & styles - but before making visible (if hidden)
-			// if o.size is auto or not valid, then MEASURE the pane and use that as its 'size'
-			size	= s.size = _parseSize(pane, o.size);
-			minSize	= _parseSize(pane,o.minSize) || 1;
-			maxSize	= _parseSize(pane,o.maxSize) || 100000;
-			if (size > 0) size = max(min(size, maxSize), minSize);
-			s.autoResize = o.autoResize; // used with percentage sizes
-
-			// state for border-panes
-			s.isClosed  = false; // true = pane is closed
-			s.isSliding = false; // true = pane is currently open by 'sliding' over adjacent panes
-			s.isResizing= false; // true = pane is in process of being resized
-			s.isHidden	= false; // true = pane is hidden - no spacing, resizer or toggler is visible!
-
-			// array for 'pin buttons' whose classNames are auto-updated on pane-open/-close
-			if (!s.pins) s.pins = [];
-		}
-		//	states common to ALL panes
-		s.tagName	= $P[0].tagName;
-		s.edge		= pane;		// useful if pane is (or about to be) 'swapped' - easy find out where it is (or is going)
-		s.noRoom	= false;	// true = pane 'automatically' hidden due to insufficient room - will unhide automatically
-		s.isVisible	= true;		// false = pane is invisible - closed OR hidden - simplify logic
-
-		// init pane positioning
-		setPanePosition( pane );
-
-		// if pane is not visible, 
-		if (dir === "horz") // north or south pane
-			CSS.height = cssH($P, size);
-		else if (dir === "vert") // east or west pane
-			CSS.width = cssW($P, size);
-		//else if (isCenter) {}
-
-		$P.css(CSS); // apply size -- top, bottom & height will be set by sizeMidPanes
-		if (dir != "horz") sizeMidPanes(pane, true); // true = skipCallback
-
-		// if manually adding a pane AFTER layout initialization, then...
-		if (state.initialized) {
-			initHandles( pane );
-			initHotkeys( pane );
-		}
-
-		// close or hide the pane if specified in settings
-		if (o.initClosed && o.closable && !o.initHidden)
-			close(pane, true, true); // true, true = force, noAnimation
-		else if (o.initHidden || o.initClosed)
-			hide(pane); // will be completely invisible - no resizer or spacing
-		else if (!s.noRoom)
-			// make the pane visible - in case was initially hidden
-			$P.css("display","block");
-		// ELSE setAsOpen() - called later by initHandles()
-
-		// RESET visibility now - pane will appear IF display:block
-		$P.css("visibility","visible");
-
-		// check option for auto-handling of pop-ups & drop-downs
-		if (o.showOverflowOnHover)
-			$P.hover( allowOverflow, resetOverflow );
-
-		// if manually adding a pane AFTER layout initialization, then...
-		if (state.initialized) {
-			afterInitPane( pane );
-		}
-	}
-
-,	afterInitPane = function (pane) {
-		var	$P	= $Ps[pane]
-		,	s	= state[pane]
-		,	o	= options[pane]
-		;
-		if (!$P) return;
-
-		// see if there is a directly-nested layout inside this pane
-		if ($P.data("layout"))
-			refreshChildren( pane, $P.data("layout") );
-
-		// process pane contents and callbacks, and init/resize child-layout if exists
-		if (s.isVisible) { // pane is OPEN
-			if (state.initialized) // this pane was added AFTER layout was created
-				resizeAll(); // will also sizeContent
-			else
-				sizeContent(pane);
-
-			if (o.triggerEventsOnLoad)
-				_runCallbacks("onresize_end", pane);
-			else // automatic if onresize called, otherwise call it specifically
-				// resize child - IF inner-layout already exists (created before this layout)
-				resizeChildren(pane, true); // a previously existing childLayout
-		}
-
-		// init childLayouts - even if pane is not visible
-		if (o.initChildren && o.children)
-			createChildren(pane);
-	}
-
-	/**
-	 * @param {string=}	panes		The pane(s) to process
-	 */
-,	setPanePosition = function (panes) {
-		panes = panes ? panes.split(",") : _c.borderPanes;
-
-		// create toggler DIVs for each pane, and set object pointers for them, eg: $R.north = north toggler DIV
-		$.each(panes, function (i, pane) {
-			var $P	= $Ps[pane]
-			,	$R	= $Rs[pane]
-			,	o	= options[pane]
-			,	s	= state[pane]
-			,	side =  _c[pane].side
-			,	CSS	= {}
-			;
-			if (!$P) return; // pane does not exist - skip
-
-			// set css-position to account for container borders & padding
-			switch (pane) {
-				case "north": 	CSS.top 	= sC.inset.top;
-								CSS.left 	= sC.inset.left;
-								CSS.right	= sC.inset.right;
-								break;
-				case "south": 	CSS.bottom	= sC.inset.bottom;
-								CSS.left 	= sC.inset.left;
-								CSS.right 	= sC.inset.right;
-								break;
-				case "west": 	CSS.left 	= sC.inset.left; // top, bottom & height set by sizeMidPanes()
-								break;
-				case "east": 	CSS.right 	= sC.inset.right; // ditto
-								break;
-				case "center":	// top, left, width & height set by sizeMidPanes()
-			}
-			// apply position
-			$P.css(CSS); 
-
-			// update resizer position
-			if ($R && s.isClosed)
-				$R.css(side, sC.inset[side]);
-			else if ($R && !s.isHidden)
-				$R.css(side, sC.inset[side] + getPaneSize(pane));
-		});
-	}
-
-	/**
-	 * Initialize module objects, styling, size and position for all resize bars and toggler buttons
-	 *
-	 * @see  _create()
-	 * @param {string=}	[panes=""]	The edge(s) to process
-	 */
-,	initHandles = function (panes) {
-		panes = panes ? panes.split(",") : _c.borderPanes;
-
-		// create toggler DIVs for each pane, and set object pointers for them, eg: $R.north = north toggler DIV
-		$.each(panes, function (i, pane) {
-			var $P		= $Ps[pane];
-			$Rs[pane]	= false; // INIT
-			$Ts[pane]	= false;
-			if (!$P) return; // pane does not exist - skip
-
-			var	o		= options[pane]
-			,	s		= state[pane]
-			,	c		= _c[pane]
-			,	paneId	= o.paneSelector.substr(0,1) === "#" ? o.paneSelector.substr(1) : ""
-			,	rClass	= o.resizerClass
-			,	tClass	= o.togglerClass
-			,	spacing	= (s.isVisible ? o.spacing_open : o.spacing_closed)
-			,	_pane	= "-"+ pane // used for classNames
-			,	_state	= (s.isVisible ? "-open" : "-closed") // used for classNames
-			,	I		= Instance[pane]
-				// INIT RESIZER BAR
-			,	$R		= I.resizer = $Rs[pane] = $("
        ")
-				// INIT TOGGLER BUTTON
-			,	$T		= I.toggler = (o.closable ? $Ts[pane] = $("
        ") : false)
-			;
-
-			//if (s.isVisible && o.resizable) ... handled by initResizable
-			if (!s.isVisible && o.slidable)
-				$R.attr("title", o.tips.Slide).css("cursor", o.sliderCursor);
-
-			$R	// if paneSelector is an ID, then create a matching ID for the resizer, eg: "#paneLeft" => "paneLeft-resizer"
-				.attr("id", paneId ? paneId +"-resizer" : "" )
-				.data({
-					parentLayout:	Instance
-				,	layoutPane:		Instance[pane]	// NEW pointer to pane-alias-object
-				,	layoutEdge:		pane
-				,	layoutRole:		"resizer"
-				})
-				.css(_c.resizers.cssReq).css("zIndex", options.zIndexes.resizer_normal)
-				.css(o.applyDemoStyles ? _c.resizers.cssDemo : {}) // add demo styles
-				.addClass(rClass +" "+ rClass+_pane)
-				.hover(addHover, removeHover) // ALWAYS add hover-classes, even if resizing is not enabled - handle with CSS instead
-				.hover(onResizerEnter, onResizerLeave) // ALWAYS NEED resizer.mouseleave to balance toggler.mouseenter
-				.mousedown($.layout.disableTextSelection)	// prevent text-selection OUTSIDE resizer
-				.mouseup($.layout.enableTextSelection)		// not really necessary, but just in case
-				.appendTo($N) // append DIV to container
-			;
-			if ($.fn.disableSelection)
-				$R.disableSelection(); // prevent text-selection INSIDE resizer
-			if (o.resizerDblClickToggle)
-				$R.bind("dblclick."+ sID, toggle );
-
-			if ($T) {
-				$T	// if paneSelector is an ID, then create a matching ID for the resizer, eg: "#paneLeft" => "#paneLeft-toggler"
-					.attr("id", paneId ? paneId +"-toggler" : "" )
-					.data({
-						parentLayout:	Instance
-					,	layoutPane:		Instance[pane]	// NEW pointer to pane-alias-object
-					,	layoutEdge:		pane
-					,	layoutRole:		"toggler"
-					})
-					.css(_c.togglers.cssReq) // add base/required styles
-					.css(o.applyDemoStyles ? _c.togglers.cssDemo : {}) // add demo styles
-					.addClass(tClass +" "+ tClass+_pane)
-					.hover(addHover, removeHover) // ALWAYS add hover-classes, even if toggling is not enabled - handle with CSS instead
-					.bind("mouseenter", onResizerEnter) // NEED toggler.mouseenter because mouseenter MAY NOT fire on resizer
-					.appendTo($R) // append SPAN to resizer DIV
-				;
-				// ADD INNER-SPANS TO TOGGLER
-				if (o.togglerContent_open) // ui-layout-open
-					$(""+ o.togglerContent_open +"")
-						.data({
-							layoutEdge:		pane
-						,	layoutRole:		"togglerContent"
-						})
-						.data("layoutRole", "togglerContent")
-						.data("layoutEdge", pane)
-						.addClass("content content-open")
-						.css("display","none")
-						.appendTo( $T )
-						//.hover( addHover, removeHover ) // use ui-layout-toggler-west-hover .content-open instead!
-					;
-				if (o.togglerContent_closed) // ui-layout-closed
-					$(""+ o.togglerContent_closed +"")
-						.data({
-							layoutEdge:		pane
-						,	layoutRole:		"togglerContent"
-						})
-						.addClass("content content-closed")
-						.css("display","none")
-						.appendTo( $T )
-						//.hover( addHover, removeHover ) // use ui-layout-toggler-west-hover .content-closed instead!
-					;
-				// ADD TOGGLER.click/.hover
-				enableClosable(pane);
-			}
-
-			// add Draggable events
-			initResizable(pane);
-
-			// ADD CLASSNAMES & SLIDE-BINDINGS - eg: class="resizer resizer-west resizer-open"
-			if (s.isVisible)
-				setAsOpen(pane);	// onOpen will be called, but NOT onResize
-			else {
-				setAsClosed(pane);	// onClose will be called
-				bindStartSlidingEvents(pane, true); // will enable events IF option is set
-			}
-
-		});
-
-		// SET ALL HANDLE DIMENSIONS
-		sizeHandles();
-	}
-
-
-	/**
-	 * Initialize scrolling ui-layout-content div - if exists
-	 *
-	 * @see  initPane() - or externally after an Ajax injection
-	 * @param {string}	pane			The pane to process
-	 * @param {boolean=}	[resize=true]	Size content after init
-	 */
-,	initContent = function (pane, resize) {
-		if (!isInitialized()) return;
-		var 
-			o	= options[pane]
-		,	sel	= o.contentSelector
-		,	I	= Instance[pane]
-		,	$P	= $Ps[pane]
-		,	$C
-		;
-		if (sel) $C = I.content = $Cs[pane] = (o.findNestedContent)
-			? $P.find(sel).eq(0) // match 1-element only
-			: $P.children(sel).eq(0)
-		;
-		if ($C && $C.length) {
-			$C.data("layoutRole", "content");
-			// SAVE original Content CSS
-			if (!$C.data("layoutCSS"))
-				$C.data("layoutCSS", styles($C, "height"));
-			$C.css( _c.content.cssReq );
-			if (o.applyDemoStyles) {
-				$C.css( _c.content.cssDemo ); // add padding & overflow: auto to content-div
-				$P.css( _c.content.cssDemoPane ); // REMOVE padding/scrolling from pane
-			}
-			// ensure no vertical scrollbar on pane - will mess up measurements
-			if ($P.css("overflowX").match(/(scroll|auto)/)) {
-				$P.css("overflow", "hidden");
-			}
-			state[pane].content = {}; // init content state
-			if (resize !== false) sizeContent(pane);
-			// sizeContent() is called AFTER init of all elements
-		}
-		else
-			I.content = $Cs[pane] = false;
-	}
-
-
-	/**
-	 * Add resize-bars to all panes that specify it in options
-	 * -dependancy: $.fn.resizable - will skip if not found
-	 *
-	 * @see  _create()
-	 * @param {string=}	[panes=""]	The edge(s) to process
-	 */
-,	initResizable = function (panes) {
-		var	draggingAvailable = $.layout.plugins.draggable
-		,	side // set in start()
-		;
-		panes = panes ? panes.split(",") : _c.borderPanes;
-
-		$.each(panes, function (idx, pane) {
-			var o = options[pane];
-			if (!draggingAvailable || !$Ps[pane] || !o.resizable) {
-				o.resizable = false;
-				return true; // skip to next
-			}
-
-			var s		= state[pane]
-			,	z		= options.zIndexes
-			,	c		= _c[pane]
-			,	side	= c.dir=="horz" ? "top" : "left"
-			,	$P 		= $Ps[pane]
-			,	$R		= $Rs[pane]
-			,	base	= o.resizerClass
-			,	lastPos	= 0 // used when live-resizing
-			,	r, live // set in start because may change
-			//	'drag' classes are applied to the ORIGINAL resizer-bar while dragging is in process
-			,	resizerClass		= base+"-drag"				// resizer-drag
-			,	resizerPaneClass	= base+"-"+pane+"-drag"		// resizer-north-drag
-			//	'helper' class is applied to the CLONED resizer-bar while it is being dragged
-			,	helperClass			= base+"-dragging"			// resizer-dragging
-			,	helperPaneClass		= base+"-"+pane+"-dragging" // resizer-north-dragging
-			,	helperLimitClass	= base+"-dragging-limit"	// resizer-drag
-			,	helperPaneLimitClass = base+"-"+pane+"-dragging-limit"	// resizer-north-drag
-			,	helperClassesSet	= false 					// logic var
-			;
-
-			if (!s.isClosed)
-				$R.attr("title", o.tips.Resize)
-				  .css("cursor", o.resizerCursor); // n-resize, s-resize, etc
-
-			$R.draggable({
-				containment:	$N[0] // limit resizing to layout container
-			,	axis:			(c.dir=="horz" ? "y" : "x") // limit resizing to horz or vert axis
-			,	delay:			0
-			,	distance:		1
-			,	grid:			o.resizingGrid
-			//	basic format for helper - style it using class: .ui-draggable-dragging
-			,	helper:			"clone"
-			,	opacity:		o.resizerDragOpacity
-			,	addClasses:		false // avoid ui-state-disabled class when disabled
-			//,	iframeFix:		o.draggableIframeFix // TODO: consider using when bug is fixed
-			,	zIndex:			z.resizer_drag
-
-			,	start: function (e, ui) {
-					// REFRESH options & state pointers in case we used swapPanes
-					o = options[pane];
-					s = state[pane];
-					// re-read options
-					live = o.livePaneResizing;
-
-					// ondrag_start callback - will CANCEL hide if returns false
-					// TODO: dragging CANNOT be cancelled like this, so see if there is a way?
-					if (false === _runCallbacks("ondrag_start", pane)) return false;
-
-					s.isResizing		= true; // prevent pane from closing while resizing
-					state.paneResizing	= pane; // easy to see if ANY pane is resizing
-					timer.clear(pane+"_closeSlider"); // just in case already triggered
-
-					// SET RESIZER LIMITS - used in drag()
-					setSizeLimits(pane); // update pane/resizer state
-					r = s.resizerPosition;
-					lastPos = ui.position[ side ]
-
-					$R.addClass( resizerClass +" "+ resizerPaneClass ); // add drag classes
-					helperClassesSet = false; // reset logic var - see drag()
-
-					// MASK PANES CONTAINING IFRAMES, APPLETS OR OTHER TROUBLESOME ELEMENTS
-					showMasks( pane, { resizing: true });
-				}
-
-			,	drag: function (e, ui) {
-					if (!helperClassesSet) { // can only add classes after clone has been added to the DOM
-						//$(".ui-draggable-dragging")
-						ui.helper
-							.addClass( helperClass +" "+ helperPaneClass ) // add helper classes
-							.css({ right: "auto", bottom: "auto" })	// fix dir="rtl" issue
-							.children().css("visibility","hidden")	// hide toggler inside dragged resizer-bar
-						;
-						helperClassesSet = true;
-						// draggable bug!? RE-SET zIndex to prevent E/W resize-bar showing through N/S pane!
-						if (s.isSliding) $Ps[pane].css("zIndex", z.pane_sliding);
-					}
-					// CONTAIN RESIZER-BAR TO RESIZING LIMITS
-					var limit = 0;
-					if (ui.position[side] < r.min) {
-						ui.position[side] = r.min;
-						limit = -1;
-					}
-					else if (ui.position[side] > r.max) {
-						ui.position[side] = r.max;
-						limit = 1;
-					}
-					// ADD/REMOVE dragging-limit CLASS
-					if (limit) {
-						ui.helper.addClass( helperLimitClass +" "+ helperPaneLimitClass ); // at dragging-limit
-						window.defaultStatus = (limit>0 && pane.match(/(north|west)/)) || (limit<0 && pane.match(/(south|east)/)) ? o.tips.maxSizeWarning : o.tips.minSizeWarning;
-					}
-					else {
-						ui.helper.removeClass( helperLimitClass +" "+ helperPaneLimitClass ); // not at dragging-limit
-						window.defaultStatus = "";
-					}
-					// DYNAMICALLY RESIZE PANES IF OPTION ENABLED
-					// won't trigger unless resizer has actually moved!
-					if (live && Math.abs(ui.position[side] - lastPos) >= o.liveResizingTolerance) {
-						lastPos = ui.position[side];
-						resizePanes(e, ui, pane)
-					}
-				}
-
-			,	stop: function (e, ui) {
-					$('body').enableSelection(); // RE-ENABLE TEXT SELECTION
-					window.defaultStatus = ""; // clear 'resizing limit' message from statusbar
-					$R.removeClass( resizerClass +" "+ resizerPaneClass ); // remove drag classes from Resizer
-					s.isResizing		= false;
-					state.paneResizing	= false; // easy to see if ANY pane is resizing
-					resizePanes(e, ui, pane, true); // true = resizingDone
-				}
-
-			});
-		});
-
-		/**
-		 * resizePanes
-		 *
-		 * Sub-routine called from stop() - and drag() if livePaneResizing
-		 *
-		 * @param {!Object}		evt
-		 * @param {!Object}		ui
-		 * @param {string}		pane
-		 * @param {boolean=}		[resizingDone=false]
-		 */
-		var resizePanes = function (evt, ui, pane, resizingDone) {
-			var	dragPos	= ui.position
-			,	c		= _c[pane]
-			,	o		= options[pane]
-			,	s		= state[pane]
-			,	resizerPos
-			;
-			switch (pane) {
-				case "north":	resizerPos = dragPos.top; break;
-				case "west":	resizerPos = dragPos.left; break;
-				case "south":	resizerPos = sC.layoutHeight - dragPos.top  - o.spacing_open; break;
-				case "east":	resizerPos = sC.layoutWidth  - dragPos.left - o.spacing_open; break;
-			};
-			// remove container margin from resizer position to get the pane size
-			var newSize = resizerPos - sC.inset[c.side];
-
-			// Disable OR Resize Mask(s) created in drag.start
-			if (!resizingDone) {
-				// ensure we meet liveResizingTolerance criteria
-				if (Math.abs(newSize - s.size) < o.liveResizingTolerance)
-					return; // SKIP resize this time
-				// resize the pane
-				manualSizePane(pane, newSize, false, true); // true = noAnimation
-				sizeMasks(); // resize all visible masks
-			}
-			else { // resizingDone
-				// ondrag_end callback
-				if (false !== _runCallbacks("ondrag_end", pane))
-					manualSizePane(pane, newSize, false, true); // true = noAnimation
-				hideMasks(true); // true = force hiding all masks even if one is 'sliding'
-				if (s.isSliding) // RE-SHOW 'object-masks' so objects won't show through sliding pane
-					showMasks( pane, { resizing: true });
-			}
-		};
-	}
-
-	/**
-	 *	sizeMask
-	 *
-	 *	Needed to overlay a DIV over an IFRAME-pane because mask CANNOT be *inside* the pane
-	 *	Called when mask created, and during livePaneResizing
-	 */
-,	sizeMask = function () {
-		var $M		= $(this)
-		,	pane	= $M.data("layoutMask") // eg: "west"
-		,	s		= state[pane]
-		;
-		// only masks over an IFRAME-pane need manual resizing
-		if (s.tagName == "IFRAME" && s.isVisible) // no need to mask closed/hidden panes
-			$M.css({
-				top:	s.offsetTop
-			,	left:	s.offsetLeft
-			,	width:	s.outerWidth
-			,	height:	s.outerHeight
-			});
-		/* ALT Method...
-		var $P = $Ps[pane];
-		$M.css( $P.position() ).css({ width: $P[0].offsetWidth, height: $P[0].offsetHeight });
-		*/
-	}
-,	sizeMasks = function () {
-		$Ms.each( sizeMask ); // resize all 'visible' masks
-	}
-
-	/**
-	 * @param {string}	pane		The pane being resized, animated or isSliding
-	 * @param {Object=}	[args]		(optional) Options: which masks to apply, and to which panes
-	 */
-,	showMasks = function (pane, args) {
-		var	c		= _c[pane]
-		,	panes	=  ["center"]
-		,	z		= options.zIndexes
-		,	a		= $.extend({
-						objectsOnly:	false
-					,	animation:		false
-					,	resizing:		true
-					,	sliding:		state[pane].isSliding
-					},	args )
-		,	o, s
-		;
-		if (a.resizing)
-			panes.push( pane );
-		if (a.sliding)
-			panes.push( _c.oppositeEdge[pane] ); // ADD the oppositeEdge-pane
-
-		if (c.dir === "horz") {
-			panes.push("west");
-			panes.push("east");
-		}
-
-		$.each(panes, function(i,p){
-			s = state[p];
-			o = options[p];
-			if (s.isVisible && ( o.maskObjects || (!a.objectsOnly && o.maskContents) )) {
-				getMasks(p).each(function(){
-					sizeMask.call(this);
-					this.style.zIndex = s.isSliding ? z.pane_sliding+1 : z.pane_normal+1
-					this.style.display = "block";
-				});
-			}
-		});
-	}
-
-	/**
-	 * @param {boolean=}	force		Hide masks even if a pane is sliding
-	 */
-,	hideMasks = function (force) {
-		// ensure no pane is resizing - could be a timing issue
-		if (force || !state.paneResizing) {
-			$Ms.hide(); // hide ALL masks
-		}
-		// if ANY pane is sliding, then DO NOT remove masks from panes with maskObjects enabled
-		else if (!force && !$.isEmptyObject( state.panesSliding )) {
-			var	i = $Ms.length - 1
-			,	p, $M;
-			for (; i >= 0; i--) {
-				$M	= $Ms.eq(i);
-				p	= $M.data("layoutMask");
-				if (!options[p].maskObjects) {
-					$M.hide();
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param {string}	pane
-	 */
-,	getMasks = function (pane) {
-		var $Masks	= $([])
-		,	$M, i = 0, c = $Ms.length
-		;
-		for (; i CSS
-		if (sC.tagName === "BODY" && ($N = $("html")).data(css)) // RESET  CSS
-			$N.css( $N.data(css) ).removeData(css);
-
-		// trigger plugins for this layout, if there are any
-		runPluginCallbacks( Instance, $.layout.onDestroy );
-
-		// trigger state-management and onunload callback
-		unload();
-
-		// clear the Instance of everything except for container & options (so could recreate)
-		// RE-CREATE: myLayout = myLayout.container.layout( myLayout.options );
-		for (var n in Instance)
-			if (!n.match(/^(container|options)$/)) delete Instance[ n ];
-		// add a 'destroyed' flag to make it easy to check
-		Instance.destroyed = true;
-
-		// if this is a child layout, CLEAR the child-pointer in the parent
-		/* for now the pointer REMAINS, but with only container, options and destroyed keys
-		if (parentPane) {
-			var layout	= parentPane.pane.data("parentLayout")
-			,	key		= layout.options.instanceKey || 'error';
-			// THIS SYNTAX MAY BE WRONG!
-			parentPane.children[key] = layout.children[ parentPane.name ].children[key] = null;
-		}
-		*/
-
-		return Instance; // for coding convenience
-	}
-
-	/**
-	 * Remove a pane from the layout - subroutine of destroy()
-	 *
-	 * @see  destroy()
-	 * @param {(string|Object)}	evt_or_pane			The pane to process
-	 * @param {boolean=}			[remove=false]		Remove the DOM element?
-	 * @param {boolean=}			[skipResize=false]	Skip calling resizeAll()?
-	 * @param {boolean=}			[destroyChild=true]	Destroy Child-layouts? If not passed, obeys options setting
-	 */
-,	removePane = function (evt_or_pane, remove, skipResize, destroyChild) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$P	= $Ps[pane]
-		,	$C	= $Cs[pane]
-		,	$R	= $Rs[pane]
-		,	$T	= $Ts[pane]
-		;
-		// NOTE: elements can still exist even after remove()
-		//		so check for missing data(), which is cleared by removed()
-		if ($P && $.isEmptyObject( $P.data() )) $P = false;
-		if ($C && $.isEmptyObject( $C.data() )) $C = false;
-		if ($R && $.isEmptyObject( $R.data() )) $R = false;
-		if ($T && $.isEmptyObject( $T.data() )) $T = false;
-
-		if ($P) $P.stop(true, true);
-
-		var	o	= options[pane]
-		,	s	= state[pane]
-		,	d	= "layout"
-		,	css	= "layoutCSS"
-		,	pC	= children[pane]
-		,	hasChildren	= $.isPlainObject( pC ) && !$.isEmptyObject( pC )
-		,	destroy		= destroyChild !== undefined ? destroyChild : o.destroyChildren
-		;
-		// FIRST destroy the child-layout(s)
-		if (hasChildren && destroy) {
-			$.each( pC, function (key, child) {
-				if (!child.destroyed)
-					child.destroy(true);// tell child-layout to destroy ALL its child-layouts too
-				if (child.destroyed)	// destroy was successful
-					delete pC[key];
-			});
-			// if no more children, remove the children hash
-			if ($.isEmptyObject( pC )) {
-				pC = children[pane] = null; // clear children hash
-				hasChildren = false;
-			}
-		}
-
-		// Note: can't 'remove' a pane element with non-destroyed children
-		if ($P && remove && !hasChildren)
-			$P.remove(); // remove the pane-element and everything inside it
-		else if ($P && $P[0]) {
-			//	create list of ALL pane-classes that need to be removed
-			var	root	= o.paneClass // default="ui-layout-pane"
-			,	pRoot	= root +"-"+ pane // eg: "ui-layout-pane-west"
-			,	_open	= "-open"
-			,	_sliding= "-sliding"
-			,	_closed	= "-closed"
-			,	classes	= [	root, root+_open, root+_closed, root+_sliding,		// generic classes
-							pRoot, pRoot+_open, pRoot+_closed, pRoot+_sliding ]	// pane-specific classes
-			;
-			$.merge(classes, getHoverClasses($P, true)); // ADD hover-classes
-			// remove all Layout classes from pane-element
-			$P	.removeClass( classes.join(" ") ) // remove ALL pane-classes
-				.removeData("parentLayout")
-				.removeData("layoutPane")
-				.removeData("layoutRole")
-				.removeData("layoutEdge")
-				.removeData("autoHidden")	// in case set
-				.unbind("."+ sID) // remove ALL Layout events
-				// TODO: remove these extra unbind commands when jQuery is fixed
-				//.unbind("mouseenter"+ sID)
-				//.unbind("mouseleave"+ sID)
-			;
-			// do NOT reset CSS if this pane/content is STILL the container of a nested layout!
-			// the nested layout will reset its 'container' CSS when/if it is destroyed
-			if (hasChildren && $C) {
-				// a content-div may not have a specific width, so give it one to contain the Layout
-				$C.width( $C.width() );
-				$.each( pC, function (key, child) {
-					child.resizeAll(); // resize the Layout
-				});
-			}
-			else if ($C)
-				$C.css( $C.data(css) ).removeData(css).removeData("layoutRole");
-			// remove pane AFTER content in case there was a nested layout
-			if (!$P.data(d))
-				$P.css( $P.data(css) ).removeData(css);
-		}
-
-		// REMOVE pane resizer and toggler elements
-		if ($T) $T.remove();
-		if ($R) $R.remove();
-
-		// CLEAR all pointers and state data
-		Instance[pane] = $Ps[pane] = $Cs[pane] = $Rs[pane] = $Ts[pane] = false;
-		s = { removed: true };
-
-		if (!skipResize)
-			resizeAll();
-	}
-
-
-/*
- * ###########################
- *	   ACTION METHODS
- * ###########################
- */
-
-	/**
-	 * @param {string}	pane
-	 */
-,	_hidePane = function (pane) {
-		var $P	= $Ps[pane]
-		,	o	= options[pane]
-		,	s	= $P[0].style
-		;
-		if (o.useOffscreenClose) {
-			if (!$P.data(_c.offscreenReset))
-				$P.data(_c.offscreenReset, { left: s.left, right: s.right });
-			$P.css( _c.offscreenCSS );
-		}
-		else
-			$P.hide().removeData(_c.offscreenReset);
-	}
-
-	/**
-	 * @param {string}	pane
-	 */
-,	_showPane = function (pane) {
-		var $P	= $Ps[pane]
-		,	o	= options[pane]
-		,	off	= _c.offscreenCSS
-		,	old	= $P.data(_c.offscreenReset)
-		,	s	= $P[0].style
-		;
-		$P	.show() // ALWAYS show, just in case
-			.removeData(_c.offscreenReset);
-		if (o.useOffscreenClose && old) {
-			if (s.left == off.left)
-				s.left = old.left;
-			if (s.right == off.right)
-				s.right = old.right;
-		}
-	}
-
-
-	/**
-	 * Completely 'hides' a pane, including its spacing - as if it does not exist
-	 * The pane is not actually 'removed' from the source, so can use 'show' to un-hide it
-	 *
-	 * @param {(string|Object)}	evt_or_pane			The pane being hidden, ie: north, south, east, or west
-	 * @param {boolean=}			[noAnimation=false]	
-	 */
-,	hide = function (evt_or_pane, noAnimation) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	o	= options[pane]
-		,	s	= state[pane]
-		,	$P	= $Ps[pane]
-		,	$R	= $Rs[pane]
-		;
-		if (pane === "center" || !$P || s.isHidden) return; // pane does not exist OR is already hidden
-
-		// onhide_start callback - will CANCEL hide if returns false
-		if (state.initialized && false === _runCallbacks("onhide_start", pane)) return;
-
-		s.isSliding = false; // just in case
-		delete state.panesSliding[pane];
-
-		// now hide the elements
-		if ($R) $R.hide(); // hide resizer-bar
-		if (!state.initialized || s.isClosed) {
-			s.isClosed = true; // to trigger open-animation on show()
-			s.isHidden  = true;
-			s.isVisible = false;
-			if (!state.initialized)
-				_hidePane(pane); // no animation when loading page
-			sizeMidPanes(_c[pane].dir === "horz" ? "" : "center");
-			if (state.initialized || o.triggerEventsOnLoad)
-				_runCallbacks("onhide_end", pane);
-		}
-		else {
-			s.isHiding = true; // used by onclose
-			close(pane, false, noAnimation); // adjust all panes to fit
-		}
-	}
-
-	/**
-	 * Show a hidden pane - show as 'closed' by default unless openPane = true
-	 *
-	 * @param {(string|Object)}	evt_or_pane			The pane being opened, ie: north, south, east, or west
-	 * @param {boolean=}			[openPane=false]
-	 * @param {boolean=}			[noAnimation=false]
-	 * @param {boolean=}			[noAlert=false]
-	 */
-,	show = function (evt_or_pane, openPane, noAnimation, noAlert) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	o	= options[pane]
-		,	s	= state[pane]
-		,	$P	= $Ps[pane]
-		,	$R	= $Rs[pane]
-		;
-		if (pane === "center" || !$P || !s.isHidden) return; // pane does not exist OR is not hidden
-
-		// onshow_start callback - will CANCEL show if returns false
-		if (false === _runCallbacks("onshow_start", pane)) return;
-
-		s.isShowing = true; // used by onopen/onclose
-		//s.isHidden  = false; - will be set by open/close - if not cancelled
-		s.isSliding = false; // just in case
-		delete state.panesSliding[pane];
-
-		// now show the elements
-		//if ($R) $R.show(); - will be shown by open/close
-		if (openPane === false)
-			close(pane, true); // true = force
-		else
-			open(pane, false, noAnimation, noAlert); // adjust all panes to fit
-	}
-
-
-	/**
-	 * Toggles a pane open/closed by calling either open or close
-	 *
-	 * @param {(string|Object)}	evt_or_pane		The pane being toggled, ie: north, south, east, or west
-	 * @param {boolean=}			[slide=false]
-	 */
-,	toggle = function (evt_or_pane, slide) {
-		if (!isInitialized()) return;
-		var	evt		= evtObj(evt_or_pane)
-		,	pane	= evtPane.call(this, evt_or_pane)
-		,	s		= state[pane]
-		;
-		if (evt) // called from to $R.dblclick OR triggerPaneEvent
-			evt.stopImmediatePropagation();
-		if (s.isHidden)
-			show(pane); // will call 'open' after unhiding it
-		else if (s.isClosed)
-			open(pane, !!slide);
-		else
-			close(pane);
-	}
-
-
-	/**
-	 * Utility method used during init or other auto-processes
-	 *
-	 * @param {string}	pane   The pane being closed
-	 * @param {boolean=}	[setHandles=false]
-	 */
-,	_closePane = function (pane, setHandles) {
-		var
-			$P	= $Ps[pane]
-		,	s	= state[pane]
-		;
-		_hidePane(pane);
-		s.isClosed = true;
-		s.isVisible = false;
-		if (setHandles) setAsClosed(pane);
-	}
-
-	/**
-	 * Close the specified pane (animation optional), and resize all other panes as needed
-	 *
-	 * @param {(string|Object)}	evt_or_pane			The pane being closed, ie: north, south, east, or west
-	 * @param {boolean=}			[force=false]
-	 * @param {boolean=}			[noAnimation=false]
-	 * @param {boolean=}			[skipCallback=false]
-	 */
-,	close = function (evt_or_pane, force, noAnimation, skipCallback) {
-		var	pane = evtPane.call(this, evt_or_pane);
-		if (pane === "center") return; // validate
-		// if pane has been initialized, but NOT the complete layout, close pane instantly
-		if (!state.initialized && $Ps[pane]) {
-			_closePane(pane, true); // INIT pane as closed
-			return;
-		}
-		if (!isInitialized()) return;
-
-		var
-			$P	= $Ps[pane]
-		,	$R	= $Rs[pane]
-		,	$T	= $Ts[pane]
-		,	o	= options[pane]
-		,	s	= state[pane]
-		,	c	= _c[pane]
-		,	doFX, isShowing, isHiding, wasSliding;
-
-		// QUEUE in case another action/animation is in progress
-		$N.queue(function( queueNext ){
-
-			if ( !$P
-			||	(!o.closable && !s.isShowing && !s.isHiding)	// invalid request // (!o.resizable && !o.closable) ???
-			||	(!force && s.isClosed && !s.isShowing)			// already closed
-			) return queueNext();
-
-			// onclose_start callback - will CANCEL hide if returns false
-			// SKIP if just 'showing' a hidden pane as 'closed'
-			var abort = !s.isShowing && false === _runCallbacks("onclose_start", pane);
-
-			// transfer logic vars to temp vars
-			isShowing	= s.isShowing;
-			isHiding	= s.isHiding;
-			wasSliding	= s.isSliding;
-			// now clear the logic vars (REQUIRED before aborting)
-			delete s.isShowing;
-			delete s.isHiding;
-
-			if (abort) return queueNext();
-
-			doFX		= !noAnimation && !s.isClosed && (o.fxName_close != "none");
-			s.isMoving	= true;
-			s.isClosed	= true;
-			s.isVisible	= false;
-			// update isHidden BEFORE sizing panes
-			if (isHiding) s.isHidden = true;
-			else if (isShowing) s.isHidden = false;
-
-			if (s.isSliding) // pane is being closed, so UNBIND trigger events
-				bindStopSlidingEvents(pane, false); // will set isSliding=false
-			else // resize panes adjacent to this one
-				sizeMidPanes(_c[pane].dir === "horz" ? "" : "center", false); // false = NOT skipCallback
-
-			// if this pane has a resizer bar, move it NOW - before animation
-			setAsClosed(pane);
-
-			// CLOSE THE PANE
-			if (doFX) { // animate the close
-				lockPaneForFX(pane, true);	// need to set left/top so animation will work
-				$P.hide( o.fxName_close, o.fxSettings_close, o.fxSpeed_close, function () {
-					lockPaneForFX(pane, false); // undo
-					if (s.isClosed) close_2();
-					queueNext();
-				});
-			}
-			else { // hide the pane without animation
-				_hidePane(pane);
-				close_2();
-				queueNext();
-			};
-		});
-
-		// SUBROUTINE
-		function close_2 () {
-			s.isMoving	= false;
-			bindStartSlidingEvents(pane, true); // will enable if o.slidable = true
-
-			// if opposite-pane was autoClosed, see if it can be autoOpened now
-			var altPane = _c.oppositeEdge[pane];
-			if (state[ altPane ].noRoom) {
-				setSizeLimits( altPane );
-				makePaneFit( altPane );
-			}
-
-			if (!skipCallback && (state.initialized || o.triggerEventsOnLoad)) {
-				// onclose callback - UNLESS just 'showing' a hidden pane as 'closed'
-				if (!isShowing)	_runCallbacks("onclose_end", pane);
-				// onhide OR onshow callback
-				if (isShowing)	_runCallbacks("onshow_end", pane);
-				if (isHiding)	_runCallbacks("onhide_end", pane);
-			}
-		}
-	}
-
-	/**
-	 * @param {string}	pane	The pane just closed, ie: north, south, east, or west
-	 */
-,	setAsClosed = function (pane) {
-		if (!$Rs[pane]) return; // handles not initialized yet!
-		var
-			$P		= $Ps[pane]
-		,	$R		= $Rs[pane]
-		,	$T		= $Ts[pane]
-		,	o		= options[pane]
-		,	s		= state[pane]
-		,	side	= _c[pane].side
-		,	rClass	= o.resizerClass
-		,	tClass	= o.togglerClass
-		,	_pane	= "-"+ pane // used for classNames
-		,	_open	= "-open"
-		,	_sliding= "-sliding"
-		,	_closed	= "-closed"
-		;
-		$R
-			.css(side, sC.inset[side]) // move the resizer
-			.removeClass( rClass+_open +" "+ rClass+_pane+_open )
-			.removeClass( rClass+_sliding +" "+ rClass+_pane+_sliding )
-			.addClass( rClass+_closed +" "+ rClass+_pane+_closed )
-		;
-		// handle already-hidden panes in case called by swap() or a similar method 
-		if (s.isHidden) $R.hide(); // hide resizer-bar 
-
-		// DISABLE 'resizing' when closed - do this BEFORE bindStartSlidingEvents?
-		if (o.resizable && $.layout.plugins.draggable)
-			$R
-				.draggable("disable")
-				.removeClass("ui-state-disabled") // do NOT apply disabled styling - not suitable here
-				.css("cursor", "default")
-				.attr("title","")
-			;
-
-		// if pane has a toggler button, adjust that too
-		if ($T) {
-			$T
-				.removeClass( tClass+_open +" "+ tClass+_pane+_open )
-				.addClass( tClass+_closed +" "+ tClass+_pane+_closed )
-				.attr("title", o.tips.Open) // may be blank
-			;
-			// toggler-content - if exists
-			$T.children(".content-open").hide();
-			$T.children(".content-closed").css("display","block");
-		}
-
-		// sync any 'pin buttons'
-		syncPinBtns(pane, false);
-
-		if (state.initialized) {
-			// resize 'length' and position togglers for adjacent panes
-			sizeHandles();
-		}
-	}
-
-	/**
-	 * Open the specified pane (animation optional), and resize all other panes as needed
-	 *
-	 * @param {(string|Object)}	evt_or_pane			The pane being opened, ie: north, south, east, or west
-	 * @param {boolean=}			[slide=false]
-	 * @param {boolean=}			[noAnimation=false]
-	 * @param {boolean=}			[noAlert=false]
-	 */
-,	open = function (evt_or_pane, slide, noAnimation, noAlert) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$P	= $Ps[pane]
-		,	$R	= $Rs[pane]
-		,	$T	= $Ts[pane]
-		,	o	= options[pane]
-		,	s	= state[pane]
-		,	c	= _c[pane]
-		,	doFX, isShowing
-		;
-		if (pane === "center") return; // validate
-		// QUEUE in case another action/animation is in progress
-		$N.queue(function( queueNext ){
-
-			if ( !$P
-			||	(!o.resizable && !o.closable && !s.isShowing)	// invalid request
-			||	(s.isVisible && !s.isSliding)					// already open
-			) return queueNext();
-
-			// pane can ALSO be unhidden by just calling show(), so handle this scenario
-			if (s.isHidden && !s.isShowing) {
-				queueNext(); // call before show() because it needs the queue free
-				show(pane, true);
-				return;
-			}
-
-			if (s.autoResize && s.size != o.size) // resize pane to original size set in options
-				sizePane(pane, o.size, true, true, true); // true=skipCallback/noAnimation/forceResize
-			else
-				// make sure there is enough space available to open the pane
-				setSizeLimits(pane, slide);
-
-			// onopen_start callback - will CANCEL open if returns false
-			var cbReturn = _runCallbacks("onopen_start", pane);
-
-			if (cbReturn === "abort")
-				return queueNext();
-
-			// update pane-state again in case options were changed in onopen_start
-			if (cbReturn !== "NC") // NC = "No Callback"
-				setSizeLimits(pane, slide);
-
-			if (s.minSize > s.maxSize) { // INSUFFICIENT ROOM FOR PANE TO OPEN!
-				syncPinBtns(pane, false); // make sure pin-buttons are reset
-				if (!noAlert && o.tips.noRoomToOpen)
-					alert(o.tips.noRoomToOpen);
-				return queueNext(); // ABORT
-			}
-
-			if (slide) // START Sliding - will set isSliding=true
-				bindStopSlidingEvents(pane, true); // BIND trigger events to close sliding-pane
-			else if (s.isSliding) // PIN PANE (stop sliding) - open pane 'normally' instead
-				bindStopSlidingEvents(pane, false); // UNBIND trigger events - will set isSliding=false
-			else if (o.slidable)
-				bindStartSlidingEvents(pane, false); // UNBIND trigger events
-
-			s.noRoom = false; // will be reset by makePaneFit if 'noRoom'
-			makePaneFit(pane);
-
-			// transfer logic var to temp var
-			isShowing = s.isShowing;
-			// now clear the logic var
-			delete s.isShowing;
-
-			doFX		= !noAnimation && s.isClosed && (o.fxName_open != "none");
-			s.isMoving	= true;
-			s.isVisible	= true;
-			s.isClosed	= false;
-			// update isHidden BEFORE sizing panes - WHY??? Old?
-			if (isShowing) s.isHidden = false;
-
-			if (doFX) { // ANIMATE
-				// mask adjacent panes with objects
-				lockPaneForFX(pane, true);	// need to set left/top so animation will work
-					$P.show( o.fxName_open, o.fxSettings_open, o.fxSpeed_open, function() {
-					lockPaneForFX(pane, false); // undo
-					if (s.isVisible) open_2(); // continue
-					queueNext();
-				});
-			}
-			else { // no animation
-				_showPane(pane);// just show pane and...
-				open_2();		// continue
-				queueNext();
-			};
-		});
-
-		// SUBROUTINE
-		function open_2 () {
-			s.isMoving	= false;
-
-			// cure iframe display issues
-			_fixIframe(pane);
-
-			// NOTE: if isSliding, then other panes are NOT 'resized'
-			if (!s.isSliding) { // resize all panes adjacent to this one
-				sizeMidPanes(_c[pane].dir=="vert" ? "center" : "", false); // false = NOT skipCallback
-			}
-
-			// set classes, position handles and execute callbacks...
-			setAsOpen(pane);
-		};
-	
-	}
-
-	/**
-	 * @param {string}	pane		The pane just opened, ie: north, south, east, or west
-	 * @param {boolean=}	[skipCallback=false]
-	 */
-,	setAsOpen = function (pane, skipCallback) {
-		var 
-			$P		= $Ps[pane]
-		,	$R		= $Rs[pane]
-		,	$T		= $Ts[pane]
-		,	o		= options[pane]
-		,	s		= state[pane]
-		,	side	= _c[pane].side
-		,	rClass	= o.resizerClass
-		,	tClass	= o.togglerClass
-		,	_pane	= "-"+ pane // used for classNames
-		,	_open	= "-open"
-		,	_closed	= "-closed"
-		,	_sliding= "-sliding"
-		;
-		$R
-			.css(side, sC.inset[side] + getPaneSize(pane)) // move the resizer
-			.removeClass( rClass+_closed +" "+ rClass+_pane+_closed )
-			.addClass( rClass+_open +" "+ rClass+_pane+_open )
-		;
-		if (s.isSliding)
-			$R.addClass( rClass+_sliding +" "+ rClass+_pane+_sliding )
-		else // in case 'was sliding'
-			$R.removeClass( rClass+_sliding +" "+ rClass+_pane+_sliding )
-
-		removeHover( 0, $R ); // remove hover classes
-		if (o.resizable && $.layout.plugins.draggable)
-			$R	.draggable("enable")
-				.css("cursor", o.resizerCursor)
-				.attr("title", o.tips.Resize);
-		else if (!s.isSliding)
-			$R.css("cursor", "default"); // n-resize, s-resize, etc
-
-		// if pane also has a toggler button, adjust that too
-		if ($T) {
-			$T	.removeClass( tClass+_closed +" "+ tClass+_pane+_closed )
-				.addClass( tClass+_open +" "+ tClass+_pane+_open )
-				.attr("title", o.tips.Close); // may be blank
-			removeHover( 0, $T ); // remove hover classes
-			// toggler-content - if exists
-			$T.children(".content-closed").hide();
-			$T.children(".content-open").css("display","block");
-		}
-
-		// sync any 'pin buttons'
-		syncPinBtns(pane, !s.isSliding);
-
-		// update pane-state dimensions - BEFORE resizing content
-		$.extend(s, elDims($P));
-
-		if (state.initialized) {
-			// resize resizer & toggler sizes for all panes
-			sizeHandles();
-			// resize content every time pane opens - to be sure
-			sizeContent(pane, true); // true = remeasure headers/footers, even if 'pane.isMoving'
-		}
-
-		if (!skipCallback && (state.initialized || o.triggerEventsOnLoad) && $P.is(":visible")) {
-			// onopen callback
-			_runCallbacks("onopen_end", pane);
-			// onshow callback - TODO: should this be here?
-			if (s.isShowing) _runCallbacks("onshow_end", pane);
-
-			// ALSO call onresize because layout-size *may* have changed while pane was closed
-			if (state.initialized)
-				_runCallbacks("onresize_end", pane);
-		}
-
-		// TODO: Somehow sizePane("north") is being called after this point???
-	}
-
-
-	/**
-	 * slideOpen / slideClose / slideToggle
-	 *
-	 * Pass-though methods for sliding
-	 */
-,	slideOpen = function (evt_or_pane) {
-		if (!isInitialized()) return;
-		var	evt		= evtObj(evt_or_pane)
-		,	pane	= evtPane.call(this, evt_or_pane)
-		,	s		= state[pane]
-		,	delay	= options[pane].slideDelay_open
-		;
-		if (pane === "center") return; // validate
-		// prevent event from triggering on NEW resizer binding created below
-		if (evt) evt.stopImmediatePropagation();
-
-		if (s.isClosed && evt && evt.type === "mouseenter" && delay > 0)
-			// trigger = mouseenter - use a delay
-			timer.set(pane+"_openSlider", open_NOW, delay);
-		else
-			open_NOW(); // will unbind events if is already open
-
-		/**
-		 * SUBROUTINE for timed open
-		 */
-		function open_NOW () {
-			if (!s.isClosed) // skip if no longer closed!
-				bindStopSlidingEvents(pane, true); // BIND trigger events to close sliding-pane
-			else if (!s.isMoving)
-				open(pane, true); // true = slide - open() will handle binding
-		};
-	}
-
-,	slideClose = function (evt_or_pane) {
-		if (!isInitialized()) return;
-		var	evt		= evtObj(evt_or_pane)
-		,	pane	= evtPane.call(this, evt_or_pane)
-		,	o		= options[pane]
-		,	s		= state[pane]
-		,	delay	= s.isMoving ? 1000 : 300 // MINIMUM delay - option may override
-		;
-		if (pane === "center") return; // validate
-		if (s.isClosed || s.isResizing)
-			return; // skip if already closed OR in process of resizing
-		else if (o.slideTrigger_close === "click")
-			close_NOW(); // close immediately onClick
-		else if (o.preventQuickSlideClose && s.isMoving)
-			return; // handle Chrome quick-close on slide-open
-		else if (o.preventPrematureSlideClose && evt && $.layout.isMouseOverElem(evt, $Ps[pane]))
-			return; // handle incorrect mouseleave trigger, like when over a SELECT-list in IE
-		else if (evt) // trigger = mouseleave - use a delay
-			// 1 sec delay if 'opening', else .3 sec
-			timer.set(pane+"_closeSlider", close_NOW, max(o.slideDelay_close, delay));
-		else // called programically
-			close_NOW();
-
-		/**
-		 * SUBROUTINE for timed close
-		 */
-		function close_NOW () {
-			if (s.isClosed) // skip 'close' if already closed!
-				bindStopSlidingEvents(pane, false); // UNBIND trigger events - TODO: is this needed here?
-			else if (!s.isMoving)
-				close(pane); // close will handle unbinding
-		};
-	}
-
-	/**
-	 * @param {(string|Object)}	evt_or_pane		The pane being opened, ie: north, south, east, or west
-	 */
-,	slideToggle = function (evt_or_pane) {
-		var pane = evtPane.call(this, evt_or_pane);
-		toggle(pane, true);
-	}
-
-
-	/**
-	 * Must set left/top on East/South panes so animation will work properly
-	 *
-	 * @param {string}	pane	The pane to lock, 'east' or 'south' - any other is ignored!
-	 * @param {boolean}	doLock  true = set left/top, false = remove
-	 */
-,	lockPaneForFX = function (pane, doLock) {
-		var $P	= $Ps[pane]
-		,	s	= state[pane]
-		,	o	= options[pane]
-		,	z	= options.zIndexes
-		;
-		if (doLock) {
-			showMasks( pane, { animation: true, objectsOnly: true });
-			$P.css({ zIndex: z.pane_animate }); // overlay all elements during animation
-			if (pane=="south")
-				$P.css({ top: sC.inset.top + sC.innerHeight - $P.outerHeight() });
-			else if (pane=="east")
-				$P.css({ left: sC.inset.left + sC.innerWidth - $P.outerWidth() });
-		}
-		else { // animation DONE - RESET CSS
-			hideMasks();
-			$P.css({ zIndex: (s.isSliding ? z.pane_sliding : z.pane_normal) });
-			if (pane=="south")
-				$P.css({ top: "auto" });
-			// if pane is positioned 'off-screen', then DO NOT screw with it!
-			else if (pane=="east" && !$P.css("left").match(/\-99999/))
-				$P.css({ left: "auto" });
-			// fix anti-aliasing in IE - only needed for animations that change opacity
-			if (browser.msie && o.fxOpacityFix && o.fxName_open != "slide" && $P.css("filter") && $P.css("opacity") == 1)
-				$P[0].style.removeAttribute('filter');
-		}
-	}
-
-
-	/**
-	 * Toggle sliding functionality of a specific pane on/off by adding removing 'slide open' trigger
-	 *
-	 * @see  open(), close()
-	 * @param {string}	pane	The pane to enable/disable, 'north', 'south', etc.
-	 * @param {boolean}	enable	Enable or Disable sliding?
-	 */
-,	bindStartSlidingEvents = function (pane, enable) {
-		var o		= options[pane]
-		,	$P		= $Ps[pane]
-		,	$R		= $Rs[pane]
-		,	evtName	= o.slideTrigger_open.toLowerCase()
-		;
-		if (!$R || (enable && !o.slidable)) return;
-
-		// make sure we have a valid event
-		if (evtName.match(/mouseover/))
-			evtName = o.slideTrigger_open = "mouseenter";
-		else if (!evtName.match(/(click|dblclick|mouseenter)/)) 
-			evtName = o.slideTrigger_open = "click";
-
-		// must remove double-click-toggle when using dblclick-slide
-		if (o.resizerDblClickToggle && evtName.match(/click/)) {
-			$R[enable ? "unbind" : "bind"]('dblclick.'+ sID, toggle)
-		}
-
-		$R
-			// add or remove event
-			[enable ? "bind" : "unbind"](evtName +'.'+ sID, slideOpen)
-			// set the appropriate cursor & title/tip
-			.css("cursor", enable ? o.sliderCursor : "default")
-			.attr("title", enable ? o.tips.Slide : "")
-		;
-	}
-
-	/**
-	 * Add or remove 'mouseleave' events to 'slide close' when pane is 'sliding' open or closed
-	 * Also increases zIndex when pane is sliding open
-	 * See bindStartSlidingEvents for code to control 'slide open'
-	 *
-	 * @see  slideOpen(), slideClose()
-	 * @param {string}	pane	The pane to process, 'north', 'south', etc.
-	 * @param {boolean}	enable	Enable or Disable events?
-	 */
-,	bindStopSlidingEvents = function (pane, enable) {
-		var	o		= options[pane]
-		,	s		= state[pane]
-		,	c		= _c[pane]
-		,	z		= options.zIndexes
-		,	evtName	= o.slideTrigger_close.toLowerCase()
-		,	action	= (enable ? "bind" : "unbind")
-		,	$P		= $Ps[pane]
-		,	$R		= $Rs[pane]
-		;
-		timer.clear(pane+"_closeSlider"); // just in case
-
-		if (enable) {
-			s.isSliding = true;
-			state.panesSliding[pane] = true;
-			// remove 'slideOpen' event from resizer
-			// ALSO will raise the zIndex of the pane & resizer
-			bindStartSlidingEvents(pane, false);
-		}
-		else {
-			s.isSliding = false;
-			delete state.panesSliding[pane];
-		}
-
-		// RE/SET zIndex - increases when pane is sliding-open, resets to normal when not
-		$P.css("zIndex", enable ? z.pane_sliding : z.pane_normal);
-		$R.css("zIndex", enable ? z.pane_sliding+2 : z.resizer_normal); // NOTE: mask = pane_sliding+1
-
-		// make sure we have a valid event
-		if (!evtName.match(/(click|mouseleave)/))
-			evtName = o.slideTrigger_close = "mouseleave"; // also catches 'mouseout'
-
-		// add/remove slide triggers
-		$R[action](evtName, slideClose); // base event on resize
-		// need extra events for mouseleave
-		if (evtName === "mouseleave") {
-			// also close on pane.mouseleave
-			$P[action]("mouseleave."+ sID, slideClose);
-			// cancel timer when mouse moves between 'pane' and 'resizer'
-			$R[action]("mouseenter."+ sID, cancelMouseOut);
-			$P[action]("mouseenter."+ sID, cancelMouseOut);
-		}
-
-		if (!enable)
-			timer.clear(pane+"_closeSlider");
-		else if (evtName === "click" && !o.resizable) {
-			// IF pane is not resizable (which already has a cursor and tip) 
-			// then set the a cursor & title/tip on resizer when sliding
-			$R.css("cursor", enable ? o.sliderCursor : "default");
-			$R.attr("title", enable ? o.tips.Close : ""); // use Toggler-tip, eg: "Close Pane"
-		}
-
-		// SUBROUTINE for mouseleave timer clearing
-		function cancelMouseOut (evt) {
-			timer.clear(pane+"_closeSlider");
-			evt.stopPropagation();
-		}
-	}
-
-
-	/**
-	 * Hides/closes a pane if there is insufficient room - reverses this when there is room again
-	 * MUST have already called setSizeLimits() before calling this method
-	 *
-	 * @param {string}	pane					The pane being resized
-	 * @param {boolean=}	[isOpening=false]		Called from onOpen?
-	 * @param {boolean=}	[skipCallback=false]	Should the onresize callback be run?
-	 * @param {boolean=}	[force=false]
-	 */
-,	makePaneFit = function (pane, isOpening, skipCallback, force) {
-		var	o	= options[pane]
-		,	s	= state[pane]
-		,	c	= _c[pane]
-		,	$P	= $Ps[pane]
-		,	$R	= $Rs[pane]
-		,	isSidePane 	= c.dir==="vert"
-		,	hasRoom		= false
-		;
-		// special handling for center & east/west panes
-		if (pane === "center" || (isSidePane && s.noVerticalRoom)) {
-			// see if there is enough room to display the pane
-			// ERROR: hasRoom = s.minHeight <= s.maxHeight && (isSidePane || s.minWidth <= s.maxWidth);
-			hasRoom = (s.maxHeight >= 0);
-			if (hasRoom && s.noRoom) { // previously hidden due to noRoom, so show now
-				_showPane(pane);
-				if ($R) $R.show();
-				s.isVisible = true;
-				s.noRoom = false;
-				if (isSidePane) s.noVerticalRoom = false;
-				_fixIframe(pane);
-			}
-			else if (!hasRoom && !s.noRoom) { // not currently hidden, so hide now
-				_hidePane(pane);
-				if ($R) $R.hide();
-				s.isVisible = false;
-				s.noRoom = true;
-			}
-		}
-
-		// see if there is enough room to fit the border-pane
-		if (pane === "center") {
-			// ignore center in this block
-		}
-		else if (s.minSize <= s.maxSize) { // pane CAN fit
-			hasRoom = true;
-			if (s.size > s.maxSize) // pane is too big - shrink it
-				sizePane(pane, s.maxSize, skipCallback, true, force); // true = noAnimation
-			else if (s.size < s.minSize) // pane is too small - enlarge it
-				sizePane(pane, s.minSize, skipCallback, true, force); // true = noAnimation
-			// need s.isVisible because new pseudoClose method keeps pane visible, but off-screen
-			else if ($R && s.isVisible && $P.is(":visible")) {
-				// make sure resizer-bar is positioned correctly
-				// handles situation where nested layout was 'hidden' when initialized
-				var	pos = s.size + sC.inset[c.side];
-				if ($.layout.cssNum( $R, c.side ) != pos) $R.css( c.side, pos );
-			}
-
-			// if was previously hidden due to noRoom, then RESET because NOW there is room
-			if (s.noRoom) {
-				// s.noRoom state will be set by open or show
-				if (s.wasOpen && o.closable) {
-					if (o.autoReopen)
-						open(pane, false, true, true); // true = noAnimation, true = noAlert
-					else // leave the pane closed, so just update state
-						s.noRoom = false;
-				}
-				else
-					show(pane, s.wasOpen, true, true); // true = noAnimation, true = noAlert
-			}
-		}
-		else { // !hasRoom - pane CANNOT fit
-			if (!s.noRoom) { // pane not set as noRoom yet, so hide or close it now...
-				s.noRoom = true; // update state
-				s.wasOpen = !s.isClosed && !s.isSliding;
-				if (s.isClosed){} // SKIP
-				else if (o.closable) // 'close' if possible
-					close(pane, true, true); // true = force, true = noAnimation
-				else // 'hide' pane if cannot just be closed
-					hide(pane, true); // true = noAnimation
-			}
-		}
-	}
-
-
-	/**
-	 * manualSizePane is an exposed flow-through method allowing extra code when pane is 'manually resized'
-	 *
-	 * @param {(string|Object)}	evt_or_pane				The pane being resized
-	 * @param {number}			size					The *desired* new size for this pane - will be validated
-	 * @param {boolean=}			[skipCallback=false]	Should the onresize callback be run?
-	 * @param {boolean=}			[noAnimation=false]
-	 * @param {boolean=}			[force=false]			Force resizing even if does not seem necessary
-	 */
-,	manualSizePane = function (evt_or_pane, size, skipCallback, noAnimation, force) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	o	= options[pane]
-		,	s	= state[pane]
-		//	if resizing callbacks have been delayed and resizing is now DONE, force resizing to complete...
-		,	forceResize = force || (o.livePaneResizing && !s.isResizing)
-		;
-		if (pane === "center") return; // validate
-		// ANY call to manualSizePane disables autoResize - ie, percentage sizing
-		s.autoResize = false;
-		// flow-through...
-		sizePane(pane, size, skipCallback, noAnimation, forceResize); // will animate resize if option enabled
-	}
-
-	/**
-	 * sizePane is called only by internal methods whenever a pane needs to be resized
-	 *
-	 * @param {(string|Object)}	evt_or_pane				The pane being resized
-	 * @param {number}			size					The *desired* new size for this pane - will be validated
-	 * @param {boolean=}			[skipCallback=false]	Should the onresize callback be run?
-	 * @param {boolean=}			[noAnimation=false]
-	 * @param {boolean=}			[force=false]			Force resizing even if does not seem necessary
-	 */
-,	sizePane = function (evt_or_pane, size, skipCallback, noAnimation, force) {
-		if (!isInitialized()) return;
-		var	pane	= evtPane.call(this, evt_or_pane) // probably NEVER called from event?
-		,	o		= options[pane]
-		,	s		= state[pane]
-		,	$P		= $Ps[pane]
-		,	$R		= $Rs[pane]
-		,	side	= _c[pane].side
-		,	dimName	= _c[pane].sizeType.toLowerCase()
-		,	skipResizeWhileDragging = s.isResizing && !o.triggerEventsDuringLiveResize
-		,	doFX	= noAnimation !== true && o.animatePaneSizing
-		,	oldSize, newSize
-		;
-		if (pane === "center") return; // validate
-		// QUEUE in case another action/animation is in progress
-		$N.queue(function( queueNext ){
-			// calculate 'current' min/max sizes
-			setSizeLimits(pane); // update pane-state
-			oldSize = s.size;
-			size = _parseSize(pane, size); // handle percentages & auto
-			size = max(size, _parseSize(pane, o.minSize));
-			size = min(size, s.maxSize);
-			if (size < s.minSize) { // not enough room for pane!
-				queueNext(); // call before makePaneFit() because it needs the queue free
-				makePaneFit(pane, false, skipCallback);	// will hide or close pane
-				return;
-			}
-
-			// IF newSize is same as oldSize, then nothing to do - abort
-			if (!force && size === oldSize)
-				return queueNext();
-
-			s.newSize = size;
-
-			// onresize_start callback CANNOT cancel resizing because this would break the layout!
-			if (!skipCallback && state.initialized && s.isVisible)
-				_runCallbacks("onresize_start", pane);
-
-			// resize the pane, and make sure its visible
-			newSize = cssSize(pane, size);
-
-			if (doFX && $P.is(":visible")) { // ANIMATE
-				var fx		= $.layout.effects.size[pane] || $.layout.effects.size.all
-				,	easing	= o.fxSettings_size.easing || fx.easing
-				,	z		= options.zIndexes
-				,	props	= {};
-				props[ dimName ] = newSize +'px';
-				s.isMoving = true;
-				// overlay all elements during animation
-				$P.css({ zIndex: z.pane_animate })
-				  .show().animate( props, o.fxSpeed_size, easing, function(){
-					// reset zIndex after animation
-					$P.css({ zIndex: (s.isSliding ? z.pane_sliding : z.pane_normal) });
-					s.isMoving = false;
-					delete s.newSize;
-					sizePane_2(); // continue
-					queueNext();
-				});
-			}
-			else { // no animation
-				$P.css( dimName, newSize );	// resize pane
-				delete s.newSize;
-				// if pane is visible, then 
-				if ($P.is(":visible"))
-					sizePane_2(); // continue
-				else {
-					// pane is NOT VISIBLE, so just update state data...
-					// when pane is *next opened*, it will have the new size
-					s.size = size;				// update state.size
-					//$.extend(s, elDims($P));	// update state dimensions - CANNOT do this when not visible!				}
-				}
-				queueNext();
-			};
-
-		});
-
-		// SUBROUTINE
-		function sizePane_2 () {
-			/*	Panes are sometimes not sized precisely in some browsers!?
-			 *	This code will resize the pane up to 3 times to nudge the pane to the correct size
-			 */
-			var	actual	= dimName==='width' ? $P.outerWidth() : $P.outerHeight()
-			,	tries	= [{
-						   	pane:		pane
-						,	count:		1
-						,	target:		size
-						,	actual:		actual
-						,	correct:	(size === actual)
-						,	attempt:	size
-						,	cssSize:	newSize
-						}]
-			,	lastTry = tries[0]
-			,	thisTry	= {}
-			,	msg		= 'Inaccurate size after resizing the '+ pane +'-pane.'
-			;
-			while ( !lastTry.correct ) {
-				thisTry = { pane: pane, count: lastTry.count+1, target: size };
-
-				if (lastTry.actual > size)
-					thisTry.attempt = max(0, lastTry.attempt - (lastTry.actual - size));
-				else // lastTry.actual < size
-					thisTry.attempt = max(0, lastTry.attempt + (size - lastTry.actual));
-
-				thisTry.cssSize = cssSize(pane, thisTry.attempt);
-				$P.css( dimName, thisTry.cssSize );
-
-				thisTry.actual	= dimName=='width' ? $P.outerWidth() : $P.outerHeight();
-				thisTry.correct	= (size === thisTry.actual);
-
-				// log attempts and alert the user of this *non-fatal error* (if showDebugMessages)
-				if ( tries.length === 1) {
-					_log(msg, false, true);
-					_log(lastTry, false, true);
-				}
-				_log(thisTry, false, true);
-				// after 4 tries, is as close as its gonna get!
-				if (tries.length > 3) break;
-
-				tries.push( thisTry );
-				lastTry = tries[ tries.length - 1 ];
-			}
-			// END TESTING CODE
-
-			// update pane-state dimensions
-			s.size	= size;
-			$.extend(s, elDims($P));
-
-			if (s.isVisible && $P.is(":visible")) {
-				// reposition the resizer-bar
-				if ($R) $R.css( side, size + sC.inset[side] );
-				// resize the content-div
-				sizeContent(pane);
-			}
-
-			if (!skipCallback && !skipResizeWhileDragging && state.initialized && s.isVisible)
-				_runCallbacks("onresize_end", pane);
-
-			// resize all the adjacent panes, and adjust their toggler buttons
-			// when skipCallback passed, it means the controlling method will handle 'other panes'
-			if (!skipCallback) {
-				// also no callback if live-resize is in progress and NOT triggerEventsDuringLiveResize
-				if (!s.isSliding) sizeMidPanes(_c[pane].dir=="horz" ? "" : "center", skipResizeWhileDragging, force);
-				sizeHandles();
-			}
-
-			// if opposite-pane was autoClosed, see if it can be autoOpened now
-			var altPane = _c.oppositeEdge[pane];
-			if (size < oldSize && state[ altPane ].noRoom) {
-				setSizeLimits( altPane );
-				makePaneFit( altPane, false, skipCallback );
-			}
-
-			// DEBUG - ALERT user/developer so they know there was a sizing problem
-			if (tries.length > 1)
-				_log(msg +'\nSee the Error Console for details.', true, true);
-		}
-	}
-
-	/**
-	 * @see  initPanes(), sizePane(), 	resizeAll(), open(), close(), hide()
-	 * @param {(Array.|string)}	panes					The pane(s) being resized, comma-delmited string
-	 * @param {boolean=}					[skipCallback=false]	Should the onresize callback be run?
-	 * @param {boolean=}					[force=false]
-	 */
-,	sizeMidPanes = function (panes, skipCallback, force) {
-		panes = (panes ? panes : "east,west,center").split(",");
-
-		$.each(panes, function (i, pane) {
-			if (!$Ps[pane]) return; // NO PANE - skip
-			var 
-				o		= options[pane]
-			,	s		= state[pane]
-			,	$P		= $Ps[pane]
-			,	$R		= $Rs[pane]
-			,	isCenter= (pane=="center")
-			,	hasRoom	= true
-			,	CSS		= {}
-			//	if pane is not visible, show it invisibly NOW rather than for *each call* in this script
-			,	visCSS	= $.layout.showInvisibly($P)
-
-			,	newCenter	= calcNewCenterPaneDims()
-			;
-
-			// update pane-state dimensions
-			$.extend(s, elDims($P));
-
-			if (pane === "center") {
-				if (!force && s.isVisible && newCenter.width === s.outerWidth && newCenter.height === s.outerHeight) {
-					$P.css(visCSS);
-					return true; // SKIP - pane already the correct size
-				}
-				// set state for makePaneFit() logic
-				$.extend(s, cssMinDims(pane), {
-					maxWidth:	newCenter.width
-				,	maxHeight:	newCenter.height
-				});
-				CSS = newCenter;
-				s.newWidth	= CSS.width;
-				s.newHeight	= CSS.height;
-				// convert OUTER width/height to CSS width/height 
-				CSS.width	= cssW($P, CSS.width);
-				// NEW - allow pane to extend 'below' visible area rather than hide it
-				CSS.height	= cssH($P, CSS.height);
-				hasRoom		= CSS.width >= 0 && CSS.height >= 0; // height >= 0 = ALWAYS TRUE NOW
-
-				// during layout init, try to shrink east/west panes to make room for center
-				if (!state.initialized && o.minWidth > newCenter.width) {
-					var
-						reqPx	= o.minWidth - s.outerWidth
-					,	minE	= options.east.minSize || 0
-					,	minW	= options.west.minSize || 0
-					,	sizeE	= state.east.size
-					,	sizeW	= state.west.size
-					,	newE	= sizeE
-					,	newW	= sizeW
-					;
-					if (reqPx > 0 && state.east.isVisible && sizeE > minE) {
-						newE = max( sizeE-minE, sizeE-reqPx );
-						reqPx -= sizeE-newE;
-					}
-					if (reqPx > 0 && state.west.isVisible && sizeW > minW) {
-						newW = max( sizeW-minW, sizeW-reqPx );
-						reqPx -= sizeW-newW;
-					}
-					// IF we found enough extra space, then resize the border panes as calculated
-					if (reqPx === 0) {
-						if (sizeE && sizeE != minE)
-							sizePane('east', newE, true, true, force); // true = skipCallback/noAnimation - initPanes will handle when done
-						if (sizeW && sizeW != minW)
-							sizePane('west', newW, true, true, force); // true = skipCallback/noAnimation
-						// now start over!
-						sizeMidPanes('center', skipCallback, force);
-						$P.css(visCSS);
-						return; // abort this loop
-					}
-				}
-			}
-			else { // for east and west, set only the height, which is same as center height
-				// set state.min/maxWidth/Height for makePaneFit() logic
-				if (s.isVisible && !s.noVerticalRoom)
-					$.extend(s, elDims($P), cssMinDims(pane))
-				if (!force && !s.noVerticalRoom && newCenter.height === s.outerHeight) {
-					$P.css(visCSS);
-					return true; // SKIP - pane already the correct size
-				}
-				// east/west have same top, bottom & height as center
-				CSS.top		= newCenter.top;
-				CSS.bottom	= newCenter.bottom;
-				s.newSize	= newCenter.height
-				// NEW - allow pane to extend 'below' visible area rather than hide it
-				CSS.height	= cssH($P, newCenter.height);
-				s.maxHeight	= CSS.height;
-				hasRoom		= (s.maxHeight >= 0); // ALWAYS TRUE NOW
-				if (!hasRoom) s.noVerticalRoom = true; // makePaneFit() logic
-			}
-
-			if (hasRoom) {
-				// resizeAll passes skipCallback because it triggers callbacks after ALL panes are resized
-				if (!skipCallback && state.initialized)
-					_runCallbacks("onresize_start", pane);
-
-				$P.css(CSS); // apply the CSS to pane
-				if (pane !== "center")
-					sizeHandles(pane); // also update resizer length
-				if (s.noRoom && !s.isClosed && !s.isHidden)
-					makePaneFit(pane); // will re-open/show auto-closed/hidden pane
-				if (s.isVisible) {
-					$.extend(s, elDims($P)); // update pane dimensions
-					if (state.initialized) sizeContent(pane); // also resize the contents, if exists
-				}
-			}
-			else if (!s.noRoom && s.isVisible) // no room for pane
-				makePaneFit(pane); // will hide or close pane
-
-			// reset visibility, if necessary
-			$P.css(visCSS);
-
-			delete s.newSize;
-			delete s.newWidth;
-			delete s.newHeight;
-
-			if (!s.isVisible)
-				return true; // DONE - next pane
-
-			/*
-			 * Extra CSS for IE6 or IE7 in Quirks-mode - add 'width' to NORTH/SOUTH panes
-			 * Normally these panes have only 'left' & 'right' positions so pane auto-sizes
-			 * ALSO required when pane is an IFRAME because will NOT default to 'full width'
-			 *	TODO: Can I use width:100% for a north/south iframe?
-			 *	TODO: Sounds like a job for $P.outerWidth( sC.innerWidth ) SETTER METHOD
-			 */
-			if (pane === "center") { // finished processing midPanes
-				var fix = browser.isIE6 || !browser.boxModel;
-				if ($Ps.north && (fix || state.north.tagName=="IFRAME")) 
-					$Ps.north.css("width", cssW($Ps.north, sC.innerWidth));
-				if ($Ps.south && (fix || state.south.tagName=="IFRAME"))
-					$Ps.south.css("width", cssW($Ps.south, sC.innerWidth));
-			}
-
-			// resizeAll passes skipCallback because it triggers callbacks after ALL panes are resized
-			if (!skipCallback && state.initialized)
-				_runCallbacks("onresize_end", pane);
-		});
-	}
-
-
-	/**
-	 * @see  window.onresize(), callbacks or custom code
-	 * @param {(Object|boolean)=}	evt_or_refresh	If 'true', then also reset pane-positioning
-	 */
-,	resizeAll = function (evt_or_refresh) {
-		var	oldW	= sC.innerWidth
-		,	oldH	= sC.innerHeight
-		;
-		// stopPropagation if called by trigger("layoutdestroy") - use evtPane utility 
-		evtPane(evt_or_refresh);
-
-		// cannot size layout when 'container' is hidden or collapsed
-		if (!$N.is(":visible")) return;
-
-		if (!state.initialized) {
-			_initLayoutElements();
-			return; // no need to resize since we just initialized!
-		}
-
-		if (evt_or_refresh === true && $.isPlainObject(options.outset)) {
-			// update container CSS in case outset option has changed
-			$N.css( options.outset );
-		}
-		// UPDATE container dimensions
-		$.extend(sC, elDims( $N, options.inset ));
-		if (!sC.outerHeight) return;
-
-		// if 'true' passed, refresh pane & handle positioning too
-		if (evt_or_refresh === true) {
-			setPanePosition();
-		}
-
-		// onresizeall_start will CANCEL resizing if returns false
-		// state.container has already been set, so user can access this info for calcuations
-		if (false === _runCallbacks("onresizeall_start")) return false;
-
-		var	// see if container is now 'smaller' than before
-			shrunkH	= (sC.innerHeight < oldH)
-		,	shrunkW	= (sC.innerWidth < oldW)
-		,	$P, o, s
-		;
-		// NOTE special order for sizing: S-N-E-W
-		$.each(["south","north","east","west"], function (i, pane) {
-			if (!$Ps[pane]) return; // no pane - SKIP
-			o = options[pane];
-			s = state[pane];
-			if (s.autoResize && s.size != o.size) // resize pane to original size set in options
-				sizePane(pane, o.size, true, true, true); // true=skipCallback/noAnimation/forceResize
-			else {
-				setSizeLimits(pane);
-				makePaneFit(pane, false, true, true); // true=skipCallback/forceResize
-			}
-		});
-
-		sizeMidPanes("", true, true); // true=skipCallback/forceResize
-		sizeHandles(); // reposition the toggler elements
-
-		// trigger all individual pane callbacks AFTER layout has finished resizing
-		$.each(_c.allPanes, function (i, pane) {
-			$P = $Ps[pane];
-			if (!$P) return; // SKIP
-			if (state[pane].isVisible) // undefined for non-existent panes
-				_runCallbacks("onresize_end", pane); // callback - if exists
-		});
-
-		_runCallbacks("onresizeall_end");
-		//_triggerLayoutEvent(pane, 'resizeall');
-	}
-
-	/**
-	 * Whenever a pane resizes or opens that has a nested layout, trigger resizeAll
-	 *
-	 * @param {(string|Object)}	evt_or_pane		The pane just resized or opened
-	 */
-,	resizeChildren = function (evt_or_pane, skipRefresh) {
-		var	pane = evtPane.call(this, evt_or_pane);
-
-		if (!options[pane].resizeChildren) return;
-
-		// ensure the pane-children are up-to-date
-		if (!skipRefresh) refreshChildren( pane );
-		var pC = children[pane];
-		if ($.isPlainObject( pC )) {
-			// resize one or more children
-			$.each( pC, function (key, child) {
-				if (!child.destroyed) child.resizeAll();
-			});
-		}
-	}
-
-	/**
-	 * IF pane has a content-div, then resize all elements inside pane to fit pane-height
-	 *
-	 * @param {(string|Object)}	evt_or_panes		The pane(s) being resized
-	 * @param {boolean=}			[remeasure=false]	Should the content (header/footer) be remeasured?
-	 */
-,	sizeContent = function (evt_or_panes, remeasure) {
-		if (!isInitialized()) return;
-
-		var panes = evtPane.call(this, evt_or_panes);
-		panes = panes ? panes.split(",") : _c.allPanes;
-
-		$.each(panes, function (idx, pane) {
-			var
-				$P	= $Ps[pane]
-			,	$C	= $Cs[pane]
-			,	o	= options[pane]
-			,	s	= state[pane]
-			,	m	= s.content // m = measurements
-			;
-			if (!$P || !$C || !$P.is(":visible")) return true; // NOT VISIBLE - skip
-
-			// if content-element was REMOVED, update OR remove the pointer
-			if (!$C.length) {
-				initContent(pane, false);	// false = do NOT sizeContent() - already there!
-				if (!$C) return;			// no replacement element found - pointer have been removed
-			}
-
-			// onsizecontent_start will CANCEL resizing if returns false
-			if (false === _runCallbacks("onsizecontent_start", pane)) return;
-
-			// skip re-measuring offsets if live-resizing
-			if ((!s.isMoving && !s.isResizing) || o.liveContentResizing || remeasure || m.top == undefined) {
-				_measure();
-				// if any footers are below pane-bottom, they may not measure correctly,
-				// so allow pane overflow and re-measure
-				if (m.hiddenFooters > 0 && $P.css("overflow") === "hidden") {
-					$P.css("overflow", "visible");
-					_measure(); // remeasure while overflowing
-					$P.css("overflow", "hidden");
-				}
-			}
-			// NOTE: spaceAbove/Below *includes* the pane paddingTop/Bottom, but not pane.borders
-			var newH = s.innerHeight - (m.spaceAbove - s.css.paddingTop) - (m.spaceBelow - s.css.paddingBottom);
-
-			if (!$C.is(":visible") || m.height != newH) {
-				// size the Content element to fit new pane-size - will autoHide if not enough room
-				setOuterHeight($C, newH, true); // true=autoHide
-				m.height = newH; // save new height
-			};
-
-			if (state.initialized)
-				_runCallbacks("onsizecontent_end", pane);
-
-			function _below ($E) {
-				return max(s.css.paddingBottom, (parseInt($E.css("marginBottom"), 10) || 0));
-			};
-
-			function _measure () {
-				var
-					ignore	= options[pane].contentIgnoreSelector
-				,	$Fs		= $C.nextAll().not(".ui-layout-mask").not(ignore || ":lt(0)") // not :lt(0) = ALL
-				,	$Fs_vis	= $Fs.filter(':visible')
-				,	$F		= $Fs_vis.filter(':last')
-				;
-				m = {
-					top:			$C[0].offsetTop
-				,	height:			$C.outerHeight()
-				,	numFooters:		$Fs.length
-				,	hiddenFooters:	$Fs.length - $Fs_vis.length
-				,	spaceBelow:		0 // correct if no content footer ($E)
-				}
-					m.spaceAbove	= m.top; // just for state - not used in calc
-					m.bottom		= m.top + m.height;
-				if ($F.length)
-					//spaceBelow = (LastFooter.top + LastFooter.height) [footerBottom] - Content.bottom + max(LastFooter.marginBottom, pane.paddingBotom)
-					m.spaceBelow = ($F[0].offsetTop + $F.outerHeight()) - m.bottom + _below($F);
-				else // no footer - check marginBottom on Content element itself
-					m.spaceBelow = _below($C);
-			};
-		});
-	}
-
-
-	/**
-	 * Called every time a pane is opened, closed, or resized to slide the togglers to 'center' and adjust their length if necessary
-	 *
-	 * @see  initHandles(), open(), close(), resizeAll()
-	 * @param {(string|Object)=}		evt_or_panes	The pane(s) being resized
-	 */
-,	sizeHandles = function (evt_or_panes) {
-		var panes = evtPane.call(this, evt_or_panes)
-		panes = panes ? panes.split(",") : _c.borderPanes;
-
-		$.each(panes, function (i, pane) {
-			var 
-				o	= options[pane]
-			,	s	= state[pane]
-			,	$P	= $Ps[pane]
-			,	$R	= $Rs[pane]
-			,	$T	= $Ts[pane]
-			,	$TC
-			;
-			if (!$P || !$R) return;
-
-			var
-				dir			= _c[pane].dir
-			,	_state		= (s.isClosed ? "_closed" : "_open")
-			,	spacing		= o["spacing"+ _state]
-			,	togAlign	= o["togglerAlign"+ _state]
-			,	togLen		= o["togglerLength"+ _state]
-			,	paneLen
-			,	left
-			,	offset
-			,	CSS = {}
-			;
-
-			if (spacing === 0) {
-				$R.hide();
-				return;
-			}
-			else if (!s.noRoom && !s.isHidden) // skip if resizer was hidden for any reason
-				$R.show(); // in case was previously hidden
-
-			// Resizer Bar is ALWAYS same width/height of pane it is attached to
-			if (dir === "horz") { // north/south
-				//paneLen = $P.outerWidth(); // s.outerWidth || 
-				paneLen = sC.innerWidth; // handle offscreen-panes
-				s.resizerLength = paneLen;
-				left = $.layout.cssNum($P, "left")
-				$R.css({
-					width:	cssW($R, paneLen) // account for borders & padding
-				,	height:	cssH($R, spacing) // ditto
-				,	left:	left > -9999 ? left : sC.inset.left // handle offscreen-panes
-				});
-			}
-			else { // east/west
-				paneLen = $P.outerHeight(); // s.outerHeight || 
-				s.resizerLength = paneLen;
-				$R.css({
-					height:	cssH($R, paneLen) // account for borders & padding
-				,	width:	cssW($R, spacing) // ditto
-				,	top:	sC.inset.top + getPaneSize("north", true) // TODO: what if no North pane?
-				//,	top:	$.layout.cssNum($Ps["center"], "top")
-				});
-			}
-
-			// remove hover classes
-			removeHover( o, $R );
-
-			if ($T) {
-				if (togLen === 0 || (s.isSliding && o.hideTogglerOnSlide)) {
-					$T.hide(); // always HIDE the toggler when 'sliding'
-					return;
-				}
-				else
-					$T.show(); // in case was previously hidden
-
-				if (!(togLen > 0) || togLen === "100%" || togLen > paneLen) {
-					togLen = paneLen;
-					offset = 0;
-				}
-				else { // calculate 'offset' based on options.PANE.togglerAlign_open/closed
-					if (isStr(togAlign)) {
-						switch (togAlign) {
-							case "top":
-							case "left":	offset = 0;
-											break;
-							case "bottom":
-							case "right":	offset = paneLen - togLen;
-											break;
-							case "middle":
-							case "center":
-							default:		offset = round((paneLen - togLen) / 2); // 'default' catches typos
-						}
-					}
-					else { // togAlign = number
-						var x = parseInt(togAlign, 10); //
-						if (togAlign >= 0) offset = x;
-						else offset = paneLen - togLen + x; // NOTE: x is negative!
-					}
-				}
-
-				if (dir === "horz") { // north/south
-					var width = cssW($T, togLen);
-					$T.css({
-						width:	width  // account for borders & padding
-					,	height:	cssH($T, spacing) // ditto
-					,	left:	offset // TODO: VERIFY that toggler  positions correctly for ALL values
-					,	top:	0
-					});
-					// CENTER the toggler content SPAN
-					$T.children(".content").each(function(){
-						$TC = $(this);
-						$TC.css("marginLeft", round((width-$TC.outerWidth())/2)); // could be negative
-					});
-				}
-				else { // east/west
-					var height = cssH($T, togLen);
-					$T.css({
-						height:	height // account for borders & padding
-					,	width:	cssW($T, spacing) // ditto
-					,	top:	offset // POSITION the toggler
-					,	left:	0
-					});
-					// CENTER the toggler content SPAN
-					$T.children(".content").each(function(){
-						$TC = $(this);
-						$TC.css("marginTop", round((height-$TC.outerHeight())/2)); // could be negative
-					});
-				}
-
-				// remove ALL hover classes
-				removeHover( 0, $T );
-			}
-
-			// DONE measuring and sizing this resizer/toggler, so can be 'hidden' now
-			if (!state.initialized && (o.initHidden || s.isHidden)) {
-				$R.hide();
-				if ($T) $T.hide();
-			}
-		});
-	}
-
-
-	/**
-	 * @param {(string|Object)}	evt_or_pane
-	 */
-,	enableClosable = function (evt_or_pane) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$T	= $Ts[pane]
-		,	o	= options[pane]
-		;
-		if (!$T) return;
-		o.closable = true;
-		$T	.bind("click."+ sID, function(evt){ evt.stopPropagation(); toggle(pane); })
-			.css("visibility", "visible")
-			.css("cursor", "pointer")
-			.attr("title", state[pane].isClosed ? o.tips.Open : o.tips.Close) // may be blank
-			.show();
-	}
-	/**
-	 * @param {(string|Object)}	evt_or_pane
-	 * @param {boolean=}			[hide=false]
-	 */
-,	disableClosable = function (evt_or_pane, hide) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$T	= $Ts[pane]
-		;
-		if (!$T) return;
-		options[pane].closable = false;
-		// is closable is disable, then pane MUST be open!
-		if (state[pane].isClosed) open(pane, false, true);
-		$T	.unbind("."+ sID)
-			.css("visibility", hide ? "hidden" : "visible") // instead of hide(), which creates logic issues
-			.css("cursor", "default")
-			.attr("title", "");
-	}
-
-
-	/**
-	 * @param {(string|Object)}	evt_or_pane
-	 */
-,	enableSlidable = function (evt_or_pane) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$R	= $Rs[pane]
-		;
-		if (!$R || !$R.data('draggable')) return;
-		options[pane].slidable = true; 
-		if (state[pane].isClosed)
-			bindStartSlidingEvents(pane, true);
-	}
-	/**
-	 * @param {(string|Object)}	evt_or_pane
-	 */
-,	disableSlidable = function (evt_or_pane) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$R	= $Rs[pane]
-		;
-		if (!$R) return;
-		options[pane].slidable = false; 
-		if (state[pane].isSliding)
-			close(pane, false, true);
-		else {
-			bindStartSlidingEvents(pane, false);
-			$R	.css("cursor", "default")
-				.attr("title", "");
-			removeHover(null, $R[0]); // in case currently hovered
-		}
-	}
-
-
-	/**
-	 * @param {(string|Object)}	evt_or_pane
-	 */
-,	enableResizable = function (evt_or_pane) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$R	= $Rs[pane]
-		,	o	= options[pane]
-		;
-		if (!$R || !$R.data('draggable')) return;
-		o.resizable = true; 
-		$R.draggable("enable");
-		if (!state[pane].isClosed)
-			$R	.css("cursor", o.resizerCursor)
-			 	.attr("title", o.tips.Resize);
-	}
-	/**
-	 * @param {(string|Object)}	evt_or_pane
-	 */
-,	disableResizable = function (evt_or_pane) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$R	= $Rs[pane]
-		;
-		if (!$R || !$R.data('draggable')) return;
-		options[pane].resizable = false; 
-		$R	.draggable("disable")
-			.css("cursor", "default")
-			.attr("title", "");
-		removeHover(null, $R[0]); // in case currently hovered
-	}
-
-
-	/**
-	 * Move a pane from source-side (eg, west) to target-side (eg, east)
-	 * If pane exists on target-side, move that to source-side, ie, 'swap' the panes
-	 *
-	 * @param {(string|Object)}	evt_or_pane1	The pane/edge being swapped
-	 * @param {string}			pane2			ditto
-	 */
-,	swapPanes = function (evt_or_pane1, pane2) {
-		if (!isInitialized()) return;
-		var pane1 = evtPane.call(this, evt_or_pane1);
-		// change state.edge NOW so callbacks can know where pane is headed...
-		state[pane1].edge = pane2;
-		state[pane2].edge = pane1;
-		// run these even if NOT state.initialized
-		if (false === _runCallbacks("onswap_start", pane1)
-		 ||	false === _runCallbacks("onswap_start", pane2)
-		) {
-			state[pane1].edge = pane1; // reset
-			state[pane2].edge = pane2;
-			return;
-		}
-
-		var
-			oPane1	= copy( pane1 )
-		,	oPane2	= copy( pane2 )
-		,	sizes	= {}
-		;
-		sizes[pane1] = oPane1 ? oPane1.state.size : 0;
-		sizes[pane2] = oPane2 ? oPane2.state.size : 0;
-
-		// clear pointers & state
-		$Ps[pane1] = false; 
-		$Ps[pane2] = false;
-		state[pane1] = {};
-		state[pane2] = {};
-		
-		// ALWAYS remove the resizer & toggler elements
-		if ($Ts[pane1]) $Ts[pane1].remove();
-		if ($Ts[pane2]) $Ts[pane2].remove();
-		if ($Rs[pane1]) $Rs[pane1].remove();
-		if ($Rs[pane2]) $Rs[pane2].remove();
-		$Rs[pane1] = $Rs[pane2] = $Ts[pane1] = $Ts[pane2] = false;
-
-		// transfer element pointers and data to NEW Layout keys
-		move( oPane1, pane2 );
-		move( oPane2, pane1 );
-
-		// cleanup objects
-		oPane1 = oPane2 = sizes = null;
-
-		// make panes 'visible' again
-		if ($Ps[pane1]) $Ps[pane1].css(_c.visible);
-		if ($Ps[pane2]) $Ps[pane2].css(_c.visible);
-
-		// fix any size discrepancies caused by swap
-		resizeAll();
-
-		// run these even if NOT state.initialized
-		_runCallbacks("onswap_end", pane1);
-		_runCallbacks("onswap_end", pane2);
-
-		return;
-
-		function copy (n) { // n = pane
-			var
-				$P	= $Ps[n]
-			,	$C	= $Cs[n]
-			;
-			return !$P ? false : {
-				pane:		n
-			,	P:			$P ? $P[0] : false
-			,	C:			$C ? $C[0] : false
-			,	state:		$.extend(true, {}, state[n])
-			,	options:	$.extend(true, {}, options[n])
-			}
-		};
-
-		function move (oPane, pane) {
-			if (!oPane) return;
-			var
-				P		= oPane.P
-			,	C		= oPane.C
-			,	oldPane = oPane.pane
-			,	c		= _c[pane]
-			//	save pane-options that should be retained
-			,	s		= $.extend(true, {}, state[pane])
-			,	o		= options[pane]
-			//	RETAIN side-specific FX Settings - more below
-			,	fx		= { resizerCursor: o.resizerCursor }
-			,	re, size, pos
-			;
-			$.each("fxName,fxSpeed,fxSettings".split(","), function (i, k) {
-				fx[k +"_open"]  = o[k +"_open"];
-				fx[k +"_close"] = o[k +"_close"];
-				fx[k +"_size"]  = o[k +"_size"];
-			});
-
-			// update object pointers and attributes
-			$Ps[pane] = $(P)
-				.data({
-					layoutPane:		Instance[pane]	// NEW pointer to pane-alias-object
-				,	layoutEdge:		pane
-				})
-				.css(_c.hidden)
-				.css(c.cssReq)
-			;
-			$Cs[pane] = C ? $(C) : false;
-
-			// set options and state
-			options[pane]	= $.extend(true, {}, oPane.options, fx);
-			state[pane]		= $.extend(true, {}, oPane.state);
-
-			// change classNames on the pane, eg: ui-layout-pane-east ==> ui-layout-pane-west
-			re = new RegExp(o.paneClass +"-"+ oldPane, "g");
-			P.className = P.className.replace(re, o.paneClass +"-"+ pane);
-
-			// ALWAYS regenerate the resizer & toggler elements
-			initHandles(pane); // create the required resizer & toggler
-
-			// if moving to different orientation, then keep 'target' pane size
-			if (c.dir != _c[oldPane].dir) {
-				size = sizes[pane] || 0;
-				setSizeLimits(pane); // update pane-state
-				size = max(size, state[pane].minSize);
-				// use manualSizePane to disable autoResize - not useful after panes are swapped
-				manualSizePane(pane, size, true, true); // true/true = skipCallback/noAnimation
-			}
-			else // move the resizer here
-				$Rs[pane].css(c.side, sC.inset[c.side] + (state[pane].isVisible ? getPaneSize(pane) : 0));
-
-
-			// ADD CLASSNAMES & SLIDE-BINDINGS
-			if (oPane.state.isVisible && !s.isVisible)
-				setAsOpen(pane, true); // true = skipCallback
-			else {
-				setAsClosed(pane);
-				bindStartSlidingEvents(pane, true); // will enable events IF option is set
-			}
-
-			// DESTROY the object
-			oPane = null;
-		};
-	}
-
-
-	/**
-	 * INTERNAL method to sync pin-buttons when pane is opened or closed
-	 * Unpinned means the pane is 'sliding' - ie, over-top of the adjacent panes
-	 *
-	 * @see  open(), setAsOpen(), setAsClosed()
-	 * @param {string}	pane   These are the params returned to callbacks by layout()
-	 * @param {boolean}	doPin  True means set the pin 'down', False means 'up'
-	 */
-,	syncPinBtns = function (pane, doPin) {
-		if ($.layout.plugins.buttons)
-			$.each(state[pane].pins, function (i, selector) {
-				$.layout.buttons.setPinState(Instance, $(selector), pane, doPin);
-			});
-	}
-
-;	// END var DECLARATIONS
-
-	/**
-	 * Capture keys when enableCursorHotkey - toggle pane if hotkey pressed
-	 *
-	 * @see  document.keydown()
-	 */
-	function keyDown (evt) {
-		if (!evt) return true;
-		var code = evt.keyCode;
-		if (code < 33) return true; // ignore special keys: ENTER, TAB, etc
-
-		var
-			PANE = {
-				38: "north" // Up Cursor	- $.ui.keyCode.UP
-			,	40: "south" // Down Cursor	- $.ui.keyCode.DOWN
-			,	37: "west"  // Left Cursor	- $.ui.keyCode.LEFT
-			,	39: "east"  // Right Cursor	- $.ui.keyCode.RIGHT
-			}
-		,	ALT		= evt.altKey // no worky!
-		,	SHIFT	= evt.shiftKey
-		,	CTRL	= evt.ctrlKey
-		,	CURSOR	= (CTRL && code >= 37 && code <= 40)
-		,	o, k, m, pane
-		;
-
-		if (CURSOR && options[PANE[code]].enableCursorHotkey) // valid cursor-hotkey
-			pane = PANE[code];
-		else if (CTRL || SHIFT) // check to see if this matches a custom-hotkey
-			$.each(_c.borderPanes, function (i, p) { // loop each pane to check its hotkey
-				o = options[p];
-				k = o.customHotkey;
-				m = o.customHotkeyModifier; // if missing or invalid, treated as "CTRL+SHIFT"
-				if ((SHIFT && m=="SHIFT") || (CTRL && m=="CTRL") || (CTRL && SHIFT)) { // Modifier matches
-					if (k && code === (isNaN(k) || k <= 9 ? k.toUpperCase().charCodeAt(0) : k)) { // Key matches
-						pane = p;
-						return false; // BREAK
-					}
-				}
-			});
-
-		// validate pane
-		if (!pane || !$Ps[pane] || !options[pane].closable || state[pane].isHidden)
-			return true;
-
-		toggle(pane);
-
-		evt.stopPropagation();
-		evt.returnValue = false; // CANCEL key
-		return false;
-	};
-
-
-/*
- * ######################################
- *	UTILITY METHODS
- *	called externally or by initButtons
- * ######################################
- */
-
-	/**
-	 * Change/reset a pane overflow setting & zIndex to allow popups/drop-downs to work
-	 *
-	 * @param {Object=}   [el]	(optional) Can also be 'bound' to a click, mouseOver, or other event
-	 */
-	function allowOverflow (el) {
-		if (!isInitialized()) return;
-		if (this && this.tagName) el = this; // BOUND to element
-		var $P;
-		if (isStr(el))
-			$P = $Ps[el];
-		else if ($(el).data("layoutRole"))
-			$P = $(el);
-		else
-			$(el).parents().each(function(){
-				if ($(this).data("layoutRole")) {
-					$P = $(this);
-					return false; // BREAK
-				}
-			});
-		if (!$P || !$P.length) return; // INVALID
-
-		var
-			pane	= $P.data("layoutEdge")
-		,	s		= state[pane]
-		;
-
-		// if pane is already raised, then reset it before doing it again!
-		// this would happen if allowOverflow is attached to BOTH the pane and an element 
-		if (s.cssSaved)
-			resetOverflow(pane); // reset previous CSS before continuing
-
-		// if pane is raised by sliding or resizing, or its closed, then abort
-		if (s.isSliding || s.isResizing || s.isClosed) {
-			s.cssSaved = false;
-			return;
-		}
-
-		var
-			newCSS	= { zIndex: (options.zIndexes.resizer_normal + 1) }
-		,	curCSS	= {}
-		,	of		= $P.css("overflow")
-		,	ofX		= $P.css("overflowX")
-		,	ofY		= $P.css("overflowY")
-		;
-		// determine which, if any, overflow settings need to be changed
-		if (of != "visible") {
-			curCSS.overflow = of;
-			newCSS.overflow = "visible";
-		}
-		if (ofX && !ofX.match(/(visible|auto)/)) {
-			curCSS.overflowX = ofX;
-			newCSS.overflowX = "visible";
-		}
-		if (ofY && !ofY.match(/(visible|auto)/)) {
-			curCSS.overflowY = ofX;
-			newCSS.overflowY = "visible";
-		}
-
-		// save the current overflow settings - even if blank!
-		s.cssSaved = curCSS;
-
-		// apply new CSS to raise zIndex and, if necessary, make overflow 'visible'
-		$P.css( newCSS );
-
-		// make sure the zIndex of all other panes is normal
-		$.each(_c.allPanes, function(i, p) {
-			if (p != pane) resetOverflow(p);
-		});
-
-	};
-	/**
-	 * @param {Object=}   [el]	(optional) Can also be 'bound' to a click, mouseOver, or other event
-	 */
-	function resetOverflow (el) {
-		if (!isInitialized()) return;
-		if (this && this.tagName) el = this; // BOUND to element
-		var $P;
-		if (isStr(el))
-			$P = $Ps[el];
-		else if ($(el).data("layoutRole"))
-			$P = $(el);
-		else
-			$(el).parents().each(function(){
-				if ($(this).data("layoutRole")) {
-					$P = $(this);
-					return false; // BREAK
-				}
-			});
-		if (!$P || !$P.length) return; // INVALID
-
-		var
-			pane	= $P.data("layoutEdge")
-		,	s		= state[pane]
-		,	CSS		= s.cssSaved || {}
-		;
-		// reset the zIndex
-		if (!s.isSliding && !s.isResizing)
-			$P.css("zIndex", options.zIndexes.pane_normal);
-
-		// reset Overflow - if necessary
-		$P.css( CSS );
-
-		// clear var
-		s.cssSaved = false;
-	};
-
-/*
- * #####################
- * CREATE/RETURN LAYOUT
- * #####################
- */
-
-	// validate that container exists
-	var $N = $(this).eq(0); // FIRST matching Container element
-	if (!$N.length) {
-		return _log( options.errors.containerMissing );
-	};
-
-	// Users retrieve Instance of a layout with: $N.layout() OR $N.data("layout")
-	// return the Instance-pointer if layout has already been initialized
-	if ($N.data("layoutContainer") && $N.data("layout"))
-		return $N.data("layout"); // cached pointer
-
-	// init global vars
-	var 
-		$Ps	= {}	// Panes x5		- set in initPanes()
-	,	$Cs	= {}	// Content x5	- set in initPanes()
-	,	$Rs	= {}	// Resizers x4	- set in initHandles()
-	,	$Ts	= {}	// Togglers x4	- set in initHandles()
-	,	$Ms	= $([])	// Masks - up to 2 masks per pane (IFRAME + DIV)
-	//	aliases for code brevity
-	,	sC	= state.container // alias for easy access to 'container dimensions'
-	,	sID	= state.id // alias for unique layout ID/namespace - eg: "layout435"
-	;
-
-	// create Instance object to expose data & option Properties, and primary action Methods
-	var Instance = {
-	//	layout data
-		options:			options			// property - options hash
-	,	state:				state			// property - dimensions hash
-	//	object pointers
-	,	container:			$N				// property - object pointers for layout container
-	,	panes:				$Ps				// property - object pointers for ALL Panes: panes.north, panes.center
-	,	contents:			$Cs				// property - object pointers for ALL Content: contents.north, contents.center
-	,	resizers:			$Rs				// property - object pointers for ALL Resizers, eg: resizers.north
-	,	togglers:			$Ts				// property - object pointers for ALL Togglers, eg: togglers.north
-	//	border-pane open/close
-	,	hide:				hide			// method - ditto
-	,	show:				show			// method - ditto
-	,	toggle:				toggle			// method - pass a 'pane' ("north", "west", etc)
-	,	open:				open			// method - ditto
-	,	close:				close			// method - ditto
-	,	slideOpen:			slideOpen		// method - ditto
-	,	slideClose:			slideClose		// method - ditto
-	,	slideToggle:		slideToggle		// method - ditto
-	//	pane actions
-	,	setSizeLimits:		setSizeLimits	// method - pass a 'pane' - update state min/max data
-	,	_sizePane:			sizePane		// method -intended for user by plugins only!
-	,	sizePane:			manualSizePane	// method - pass a 'pane' AND an 'outer-size' in pixels or percent, or 'auto'
-	,	sizeContent:		sizeContent		// method - pass a 'pane'
-	,	swapPanes:			swapPanes		// method - pass TWO 'panes' - will swap them
-	,	showMasks:			showMasks		// method - pass a 'pane' OR list of panes - default = all panes with mask option set
-	,	hideMasks:			hideMasks		// method - ditto'
-	//	pane element methods
-	,	initContent:		initContent		// method - ditto
-	,	addPane:			addPane			// method - pass a 'pane'
-	,	removePane:			removePane		// method - pass a 'pane' to remove from layout, add 'true' to delete the pane-elem
-	,	createChildren:		createChildren	// method - pass a 'pane' and (optional) layout-options (OVERRIDES options[pane].children
-	,	refreshChildren:	refreshChildren	// method - pass a 'pane' and a layout-instance
-	//	special pane option setting
-	,	enableClosable:		enableClosable	// method - pass a 'pane'
-	,	disableClosable:	disableClosable	// method - ditto
-	,	enableSlidable:		enableSlidable	// method - ditto
-	,	disableSlidable:	disableSlidable	// method - ditto
-	,	enableResizable:	enableResizable	// method - ditto
-	,	disableResizable:	disableResizable// method - ditto
-	//	utility methods for panes
-	,	allowOverflow:		allowOverflow	// utility - pass calling element (this)
-	,	resetOverflow:		resetOverflow	// utility - ditto
-	//	layout control
-	,	destroy:			destroy			// method - no parameters
-	,	initPanes:			isInitialized	// method - no parameters
-	,	resizeAll:			resizeAll		// method - no parameters
-	//	callback triggering
-	,	runCallbacks:		_runCallbacks	// method - pass evtName & pane (if a pane-event), eg: trigger("onopen", "west")
-	//	alias collections of options, state and children - created in addPane and extended elsewhere
-	,	hasParentLayout:	false			// set by initContainer()
-	,	children:			children		// pointers to child-layouts, eg: Instance.children.west.layoutName
-	,	north:				false			// alias group: { name: pane, pane: $Ps[pane], options: options[pane], state: state[pane], children: children[pane] }
-	,	south:				false			// ditto
-	,	west:				false			// ditto
-	,	east:				false			// ditto
-	,	center:				false			// ditto
-	};
-
-	// create the border layout NOW
-	if (_create() === 'cancel') // onload_start callback returned false to CANCEL layout creation
-		return null;
-	else // true OR false -- if layout-elements did NOT init (hidden or do not exist), can auto-init later
-		return Instance; // return the Instance object
-
-}
-
-
-})( jQuery );
-
-
-
-
-/**
- * jquery.layout.state 1.2
- * $Date: 2015/03/13 22:37:04 $
- *
- * Copyright (c) 2014 
- *   Kevin Dalman (http://allpro.net)
- *
- * Dual licensed under the GPL (http://www.gnu.org/licenses/gpl.html)
- * and MIT (http://www.opensource.org/licenses/mit-license.php) licenses.
- *
- * @requires: UI Layout 1.4.0 or higher
- * @requires: $.ui.cookie (above)
- *
- * @see: http://groups.google.com/group/jquery-ui-layout
- */
-;(function ($) {
-
-if (!$.layout) return;
-
-
-/**
- *	UI COOKIE UTILITY
- *
- *	A $.cookie OR $.ui.cookie namespace *should be standard*, but until then...
- *	This creates $.ui.cookie so Layout does not need the cookie.jquery.js plugin
- *	NOTE: This utility is REQUIRED by the layout.state plugin
- *
- *	Cookie methods in Layout are created as part of State Management 
- */
-if (!$.ui) $.ui = {};
-$.ui.cookie = {
-
-	// cookieEnabled is not in DOM specs, but DOES works in all browsers,including IE6
-	acceptsCookies: !!navigator.cookieEnabled
-
-,	read: function (name) {
-		var
-			c	= document.cookie
-		,	cs	= c ? c.split(';') : []
-		,	pair, data, i
-		;
-		for (i=0; pair=cs[i]; i++) {
-			data = $.trim(pair).split('='); // name=value => [ name, value ]
-			if (data[0] == name) // found the layout cookie
-				return decodeURIComponent(data[1]);
-		}
-		return null;
-	}
-
-,	write: function (name, val, cookieOpts) {
-		var	params	= ""
-		,	date	= ""
-		,	clear	= false
-		,	o		= cookieOpts || {}
-		,	x		= o.expires  || null
-		,	t		= $.type(x)
-		;
-		if (t === "date")
-			date = x;
-		else if (t === "string" && x > 0) {
-			x = parseInt(x,10);
-			t = "number";
-		}
-		if (t === "number") {
-			date = new Date();
-			if (x > 0)
-				date.setDate(date.getDate() + x);
-			else {
-				date.setFullYear(1970);
-				clear = true;
-			}
-		}
-		if (date)		params += ";expires="+ date.toUTCString();
-		if (o.path)		params += ";path="+ o.path;
-		if (o.domain)	params += ";domain="+ o.domain;
-		if (o.secure)	params += ";secure";
-		document.cookie = name +"="+ (clear ? "" : encodeURIComponent( val )) + params; // write or clear cookie
-	}
-
-,	clear: function (name) {
-		$.ui.cookie.write(name, "", {expires: -1});
-	}
-
-};
-// if cookie.jquery.js is not loaded, create an alias to replicate it
-// this may be useful to other plugins or code dependent on that plugin
-if (!$.cookie) $.cookie = function (k, v, o) {
-	var C = $.ui.cookie;
-	if (v === null)
-		C.clear(k);
-	else if (v === undefined)
-		return C.read(k);
-	else
-		C.write(k, v, o);
-};
-
-
-
-/**
- *	State-management options stored in options.stateManagement, which includes a .cookie hash
- *	Default options saves ALL KEYS for ALL PANES, ie: pane.size, pane.isClosed, pane.isHidden
- *
- *	// STATE/COOKIE OPTIONS
- *	@example $(el).layout({
-				stateManagement: {
-					enabled:	true
-				,	stateKeys:	"east.size,west.size,east.isClosed,west.isClosed"
-				,	cookie:		{ name: "appLayout", path: "/" }
-				}
-			})
- *	@example $(el).layout({ stateManagement__enabled: true }) // enable auto-state-management using cookies
- *	@example $(el).layout({ stateManagement__cookie: { name: "appLayout", path: "/" } })
- *	@example $(el).layout({ stateManagement__cookie__name: "appLayout", stateManagement__cookie__path: "/" })
- *
- *	// STATE/COOKIE METHODS
- *	@example myLayout.saveCookie( "west.isClosed,north.size,south.isHidden", {expires: 7} );
- *	@example myLayout.loadCookie();
- *	@example myLayout.deleteCookie();
- *	@example var JSON = myLayout.readState();	// CURRENT Layout State
- *	@example var JSON = myLayout.readCookie();	// SAVED Layout State (from cookie)
- *	@example var JSON = myLayout.state.stateData;	// LAST LOADED Layout State (cookie saved in layout.state hash)
- *
- *	CUSTOM STATE-MANAGEMENT (eg, saved in a database)
- *	@example var JSON = myLayout.readState( "west.isClosed,north.size,south.isHidden" );
- *	@example myLayout.loadState( JSON );
- */
-
-// tell Layout that the state plugin is available
-$.layout.plugins.stateManagement = true;
-
-//	Add State-Management options to layout.defaults
-$.layout.defaults.stateManagement = {
-	enabled:		false	// true = enable state-management, even if not using cookies
-,	autoSave:		true	// Save a state-cookie when page exits?
-,	autoLoad:		true	// Load the state-cookie when Layout inits?
-,	animateLoad:	true	// animate panes when loading state into an active layout
-,	includeChildren: true	// recurse into child layouts to include their state as well
-	// List state-data to save - must be pane-specific
-,	stateKeys:	"north.size,south.size,east.size,west.size,"+
-				"north.isClosed,south.isClosed,east.isClosed,west.isClosed,"+
-				"north.isHidden,south.isHidden,east.isHidden,west.isHidden"
-,	cookie: {
-		name:	""	// If not specified, will use Layout.name, else just "Layout"
-	,	domain:	""	// blank = current domain
-	,	path:	""	// blank = current page, "/" = entire website
-	,	expires: ""	// 'days' to keep cookie - leave blank for 'session cookie'
-	,	secure:	false
-	}
-};
-
-// Set stateManagement as a 'layout-option', NOT a 'pane-option'
-$.layout.optionsMap.layout.push("stateManagement");
-// Update config so layout does not move options into the pane-default branch (panes)
-$.layout.config.optionRootKeys.push("stateManagement");
-
-/*
- *	State Management methods
- */
-$.layout.state = {
-
-	/**
-	 * Get the current layout state and save it to a cookie
-	 *
-	 * myLayout.saveCookie( keys, cookieOpts )
-	 *
-	 * @param {Object}			inst
-	 * @param {(string|Array)=}	keys
-	 * @param {Object=}			cookieOpts
-	 */
-	saveCookie: function (inst, keys, cookieOpts) {
-		var o	= inst.options
-		,	sm	= o.stateManagement
-		,	oC	= $.extend(true, {}, sm.cookie, cookieOpts || null)
-		,	data = inst.state.stateData = inst.readState( keys || sm.stateKeys ) // read current panes-state
-		;
-		$.ui.cookie.write( oC.name || o.name || "Layout", $.layout.state.encodeJSON(data), oC );
-		return $.extend(true, {}, data); // return COPY of state.stateData data
-	}
-
-	/**
-	 * Remove the state cookie
-	 *
-	 * @param {Object}	inst
-	 */
-,	deleteCookie: function (inst) {
-		var o = inst.options;
-		$.ui.cookie.clear( o.stateManagement.cookie.name || o.name || "Layout" );
-	}
-
-	/**
-	 * Read & return data from the cookie - as JSON
-	 *
-	 * @param {Object}	inst
-	 */
-,	readCookie: function (inst) {
-		var o = inst.options;
-		var c = $.ui.cookie.read( o.stateManagement.cookie.name || o.name || "Layout" );
-		// convert cookie string back to a hash and return it
-		return c ? $.layout.state.decodeJSON(c) : {};
-	}
-
-	/**
-	 * Get data from the cookie and USE IT to loadState
-	 *
-	 * @param {Object}	inst
-	 */
-,	loadCookie: function (inst) {
-		var c = $.layout.state.readCookie(inst); // READ the cookie
-		if (c && !$.isEmptyObject( c )) {
-			inst.state.stateData = $.extend(true, {}, c); // SET state.stateData
-			inst.loadState(c); // LOAD the retrieved state
-		}
-		return c;
-	}
-
-	/**
-	 * Update layout options from the cookie, if one exists
-	 *
-	 * @param {Object}		inst
-	 * @param {Object=}		stateData
-	 * @param {boolean=}	animate
-	 */
-,	loadState: function (inst, data, opts) {
-		if (!$.isPlainObject( data ) || $.isEmptyObject( data )) return;
-
-		// normalize data & cache in the state object
-		data = inst.state.stateData = $.layout.transformData( data ); // panes = default subkey
-
-		// add missing/default state-restore options
-		var smo = inst.options.stateManagement;
-		opts = $.extend({
-			animateLoad:		false //smo.animateLoad
-		,	includeChildren:	smo.includeChildren
-		}, opts );
-
-		if (!inst.state.initialized) {
-			/*
-			 *	layout NOT initialized, so just update its options
-			 */
-			// MUST remove pane.children keys before applying to options
-			// use a copy so we don't remove keys from original data
-			var o = $.extend(true, {}, data);
-			//delete o.center; // center has no state-data - only children
-			$.each($.layout.config.allPanes, function (idx, pane) {
-				if (o[pane]) delete o[pane].children;		   
-			 });
-			// update CURRENT layout-options with saved state data
-			$.extend(true, inst.options, o);
-		}
-		else {
-			/*
-			 *	layout already initialized, so modify layout's configuration
-			 */
-			var noAnimate = !opts.animateLoad
-			,	o, c, h, state, open
-			;
-			$.each($.layout.config.borderPanes, function (idx, pane) {
-				o = data[ pane ];
-				if (!$.isPlainObject( o )) return; // no key, skip pane
-
-				s	= o.size;
-				c	= o.initClosed;
-				h	= o.initHidden;
-				ar	= o.autoResize
-				state	= inst.state[pane];
-				open	= state.isVisible;
-
-				// reset autoResize
-				if (ar)
-					state.autoResize = ar;
-				// resize BEFORE opening
-				if (!open)
-					inst._sizePane(pane, s, false, false, false); // false=skipCallback/noAnimation/forceResize
-				// open/close as necessary - DO NOT CHANGE THIS ORDER!
-				if (h === true)			inst.hide(pane, noAnimate);
-				else if (c === true)	inst.close(pane, false, noAnimate);
-				else if (c === false)	inst.open (pane, false, noAnimate);
-				else if (h === false)	inst.show (pane, false, noAnimate);
-				// resize AFTER any other actions
-				if (open)
-					inst._sizePane(pane, s, false, false, noAnimate); // animate resize if option passed
-			});
-
-			/*
-			 *	RECURSE INTO CHILD-LAYOUTS
-			 */
-			if (opts.includeChildren) {
-				var paneStateChildren, childState;
-				$.each(inst.children, function (pane, paneChildren) {
-					paneStateChildren = data[pane] ? data[pane].children : 0;
-					if (paneStateChildren && paneChildren) {
-						$.each(paneChildren, function (stateKey, child) {
-							childState = paneStateChildren[stateKey];
-							if (child && childState)
-								child.loadState( childState );
-						});
-					}
-				});
-			}
-		}
-	}
-
-	/**
-	 * Get the *current layout state* and return it as a hash
-	 *
-	 * @param {Object=}		inst	// Layout instance to get state for
-	 * @param {object=}		[opts]	// State-Managements override options
-	 */
-,	readState: function (inst, opts) {
-		// backward compatility
-		if ($.type(opts) === 'string') opts = { keys: opts };
-		if (!opts) opts = {};
-		var	sm		= inst.options.stateManagement
-		,	ic		= opts.includeChildren
-		,	recurse	= ic !== undefined ? ic : sm.includeChildren
-		,	keys	= opts.stateKeys || sm.stateKeys
-		,	alt		= { isClosed: 'initClosed', isHidden: 'initHidden' }
-		,	state	= inst.state
-		,	panes	= $.layout.config.allPanes
-		,	data	= {}
-		,	pair, pane, key, val
-		,	ps, pC, child, array, count, branch
-		;
-		if ($.isArray(keys)) keys = keys.join(",");
-		// convert keys to an array and change delimiters from '__' to '.'
-		keys = keys.replace(/__/g, ".").split(',');
-		// loop keys and create a data hash
-		for (var i=0, n=keys.length; i < n; i++) {
-			pair = keys[i].split(".");
-			pane = pair[0];
-			key  = pair[1];
-			if ($.inArray(pane, panes) < 0) continue; // bad pane!
-			val = state[ pane ][ key ];
-			if (val == undefined) continue;
-			if (key=="isClosed" && state[pane]["isSliding"])
-				val = true; // if sliding, then *really* isClosed
-			( data[pane] || (data[pane]={}) )[ alt[key] ? alt[key] : key ] = val;
-		}
-
-		// recurse into the child-layouts for each pane
-		if (recurse) {
-			$.each(panes, function (idx, pane) {
-				pC = inst.children[pane];
-				ps = state.stateData[pane];
-				if ($.isPlainObject( pC ) && !$.isEmptyObject( pC )) {
-					// ensure a key exists for this 'pane', eg: branch = data.center
-					branch = data[pane] || (data[pane] = {});
-					if (!branch.children) branch.children = {};
-					$.each( pC, function (key, child) {
-						// ONLY read state from an initialize layout
-						if ( child.state.initialized )
-							branch.children[ key ] = $.layout.state.readState( child );
-						// if we have PREVIOUS (onLoad) state for this child-layout, KEEP IT!
-						else if ( ps && ps.children && ps.children[ key ] ) {
-							branch.children[ key ] = $.extend(true, {}, ps.children[ key ] );
-						}
-					});
-				}
-			});
-		}
-
-		return data;
-	}
-
-	/**
-	 *	Stringify a JSON hash so can save in a cookie or db-field
-	 */
-,	encodeJSON: function (json) {
-		var local = window.JSON || {};
-		return (local.stringify || stringify)(json);
-
-		function stringify (h) {
-			var D=[], i=0, k, v, t // k = key, v = value
-			,	a = $.isArray(h)
-			;
-			for (k in h) {
-				v = h[k];
-				t = typeof v;
-				if (t == 'string')		// STRING - add quotes
-					v = '"'+ v +'"';
-				else if (t == 'object')	// SUB-KEY - recurse into it
-					v = parse(v);
-				D[i++] = (!a ? '"'+ k +'":' : '') + v;
-			}
-			return (a ? '[' : '{') + D.join(',') + (a ? ']' : '}');
-		};
-	}
-
-	/**
-	 *	Convert stringified JSON back to a hash object
-	 *	@see		$.parseJSON(), adding in jQuery 1.4.1
-	 */
-,	decodeJSON: function (str) {
-		try { return $.parseJSON ? $.parseJSON(str) : window["eval"]("("+ str +")") || {}; }
-		catch (e) { return {}; }
-	}
-
-
-,	_create: function (inst) {
-		var s	= $.layout.state
-		,	o	= inst.options
-		,	sm	= o.stateManagement
-		;
-		//	ADD State-Management plugin methods to inst
-		 $.extend( inst, {
-		//	readCookie - update options from cookie - returns hash of cookie data
-			readCookie:		function () { return s.readCookie(inst); }
-		//	deleteCookie
-		,	deleteCookie:	function () { s.deleteCookie(inst); }
-		//	saveCookie - optionally pass keys-list and cookie-options (hash)
-		,	saveCookie:		function (keys, cookieOpts) { return s.saveCookie(inst, keys, cookieOpts); }
-		//	loadCookie - readCookie and use to loadState() - returns hash of cookie data
-		,	loadCookie:		function () { return s.loadCookie(inst); }
-		//	loadState - pass a hash of state to use to update options
-		,	loadState:		function (stateData, opts) { s.loadState(inst, stateData, opts); }
-		//	readState - returns hash of current layout-state
-		,	readState:		function (keys) { return s.readState(inst, keys); }
-		//	add JSON utility methods too...
-		,	encodeJSON:		s.encodeJSON
-		,	decodeJSON:		s.decodeJSON
-		});
-
-		// init state.stateData key, even if plugin is initially disabled
-		inst.state.stateData = {};
-
-		// autoLoad MUST BE one of: data-array, data-hash, callback-function, or TRUE
-		if ( !sm.autoLoad ) return;
-
-		//	When state-data exists in the autoLoad key USE IT,
-		//	even if stateManagement.enabled == false
-		if ($.isPlainObject( sm.autoLoad )) {
-			if (!$.isEmptyObject( sm.autoLoad )) {
-				inst.loadState( sm.autoLoad );
-			}
-		}
-		else if ( sm.enabled ) {
-			// update the options from cookie or callback
-			// if options is a function, call it to get stateData
-			if ($.isFunction( sm.autoLoad )) {
-				var d = {};
-				try {
-					d = sm.autoLoad( inst, inst.state, inst.options, inst.options.name || '' ); // try to get data from fn
-				} catch (e) {}
-				if (d && $.isPlainObject( d ) && !$.isEmptyObject( d ))
-					inst.loadState(d);
-			}
-			else // any other truthy value will trigger loadCookie
-				inst.loadCookie();
-		}
-	}
-
-,	_unload: function (inst) {
-		var sm = inst.options.stateManagement;
-		if (sm.enabled && sm.autoSave) {
-			// if options is a function, call it to save the stateData
-			if ($.isFunction( sm.autoSave )) {
-				try {
-					sm.autoSave( inst, inst.state, inst.options, inst.options.name || '' ); // try to get data from fn
-				} catch (e) {}
-			}
-			else // any truthy value will trigger saveCookie
-				inst.saveCookie();
-		}
-	}
-
-};
-
-// add state initialization method to Layout's onCreate array of functions
-$.layout.onCreate.push( $.layout.state._create );
-$.layout.onUnload.push( $.layout.state._unload );
-
-})( jQuery );
-
-
-
-/**
- * @preserve jquery.layout.buttons 1.0
- * $Date: 2015/03/13 22:37:04 $
- *
- * Copyright (c) 2011 
- *   Kevin Dalman (http://allpro.net)
- *
- * Dual licensed under the GPL (http://www.gnu.org/licenses/gpl.html)
- * and MIT (http://www.opensource.org/licenses/mit-license.php) licenses.
- *
- * @dependancies: UI Layout 1.3.0.rc30.1 or higher
- *
- * @support: http://groups.google.com/group/jquery-ui-layout
- *
- * Docs: [ to come ]
- * Tips: [ to come ]
- */
-;(function ($) {
-
-if (!$.layout) return;
-
-
-// tell Layout that the state plugin is available
-$.layout.plugins.buttons = true;
-
-//	Add State-Management options to layout.defaults
-$.layout.defaults.autoBindCustomButtons = false;
-// Set stateManagement as a layout-option, NOT a pane-option
-$.layout.optionsMap.layout.push("autoBindCustomButtons");
-
-var lang = $.layout.language;
-
-/*
- *	Button methods
- */
-$.layout.buttons = {
-	// set data used by multiple methods below
-	config: {
-		borderPanes:	"north,south,west,east"
-	}
-
-	/**
-	* Searches for .ui-layout-button-xxx elements and auto-binds them as layout-buttons
-	*
-	* @see  _create()
-	*/
-,	init: function (inst) {
-		var pre		= "ui-layout-button-"
-		,	layout	= inst.options.name || ""
-		,	name;
-		$.each("toggle,open,close,pin,toggle-slide,open-slide".split(","), function (i, action) {
-			$.each($.layout.buttons.config.borderPanes.split(","), function (ii, pane) {
-				$("."+pre+action+"-"+pane).each(function(){
-					// if button was previously 'bound', data.layoutName was set, but is blank if layout has no 'name'
-					name = $(this).data("layoutName") || $(this).attr("layoutName");
-					if (name == undefined || name === layout)
-						inst.bindButton(this, action, pane);
-				});
-			});
-		});
-	}
-
-	/**
-	* Helper function to validate params received by addButton utilities
-	*
-	* Two classes are added to the element, based on the buttonClass...
-	* The type of button is appended to create the 2nd className:
-	*  - ui-layout-button-pin
-	*  - ui-layout-pane-button-toggle
-	*  - ui-layout-pane-button-open
-	*  - ui-layout-pane-button-close
-	*
-	* @param  {(string|!Object)}	selector	jQuery selector (or element) for button, eg: ".ui-layout-north .toggle-button"
-	* @param  {string}   			pane 		Name of the pane the button is for: 'north', 'south', etc.
-	* @return {Array.}		If both params valid, the element matching 'selector' in a jQuery wrapper - otherwise returns null
-	*/
-,	get: function (inst, selector, pane, action) {
-		var $E	= $(selector)
-		,	o	= inst.options
-		,	err	= o.showErrorMessages
-		;
-		if (!$E.length) { // element not found
-			if (err) alert(lang.errButton + lang.selector +": "+ selector);
-		}
-		else if ($.layout.buttons.config.borderPanes.indexOf(pane) === -1) { // invalid 'pane' sepecified
-			if (err) alert(lang.errButton + lang.pane +": "+ pane);
-			$E = $("");  // NO BUTTON
-		}
-		else { // VALID
-			var btn = o[pane].buttonClass +"-"+ action;
-			$E	.addClass( btn +" "+ btn +"-"+ pane )
-				.data("layoutName", o.name); // add layout identifier - even if blank!
-		}
-		return $E;
-	}
-
-
-	/**
-	* NEW syntax for binding layout-buttons - will eventually replace addToggle, addOpen, etc.
-	*
-	* @param {(string|!Object)}	sel		jQuery selector (or element) for button, eg: ".ui-layout-north .toggle-button"
-	* @param {string}			action
-	* @param {string}			pane
-	*/
-,	bind: function (inst, sel, action, pane) {
-		var _ = $.layout.buttons;
-		switch (action.toLowerCase()) {
-			case "toggle":			_.addToggle	(inst, sel, pane); break;	
-			case "open":			_.addOpen	(inst, sel, pane); break;
-			case "close":			_.addClose	(inst, sel, pane); break;
-			case "pin":				_.addPin	(inst, sel, pane); break;
-			case "toggle-slide":	_.addToggle	(inst, sel, pane, true); break;	
-			case "open-slide":		_.addOpen	(inst, sel, pane, true); break;
-		}
-		return inst;
-	}
-
-	/**
-	* Add a custom Toggler button for a pane
-	*
-	* @param {(string|!Object)}	selector	jQuery selector (or element) for button, eg: ".ui-layout-north .toggle-button"
-	* @param {string}  			pane 		Name of the pane the button is for: 'north', 'south', etc.
-	* @param {boolean=}			slide 		true = slide-open, false = pin-open
-	*/
-,	addToggle: function (inst, selector, pane, slide) {
-		$.layout.buttons.get(inst, selector, pane, "toggle")
-			.click(function(evt){
-				inst.toggle(pane, !!slide);
-				evt.stopPropagation();
-			});
-		return inst;
-	}
-
-	/**
-	* Add a custom Open button for a pane
-	*
-	* @param {(string|!Object)}	selector	jQuery selector (or element) for button, eg: ".ui-layout-north .toggle-button"
-	* @param {string}			pane 		Name of the pane the button is for: 'north', 'south', etc.
-	* @param {boolean=}			slide 		true = slide-open, false = pin-open
-	*/
-,	addOpen: function (inst, selector, pane, slide) {
-		$.layout.buttons.get(inst, selector, pane, "open")
-			.attr("title", lang.Open)
-			.click(function (evt) {
-				inst.open(pane, !!slide);
-				evt.stopPropagation();
-			});
-		return inst;
-	}
-
-	/**
-	* Add a custom Close button for a pane
-	*
-	* @param {(string|!Object)}	selector	jQuery selector (or element) for button, eg: ".ui-layout-north .toggle-button"
-	* @param {string}   		pane 		Name of the pane the button is for: 'north', 'south', etc.
-	*/
-,	addClose: function (inst, selector, pane) {
-		$.layout.buttons.get(inst, selector, pane, "close")
-			.attr("title", lang.Close)
-			.click(function (evt) {
-				inst.close(pane);
-				evt.stopPropagation();
-			});
-		return inst;
-	}
-
-	/**
-	* Add a custom Pin button for a pane
-	*
-	* Four classes are added to the element, based on the paneClass for the associated pane...
-	* Assuming the default paneClass and the pin is 'up', these classes are added for a west-pane pin:
-	*  - ui-layout-pane-pin
-	*  - ui-layout-pane-west-pin
-	*  - ui-layout-pane-pin-up
-	*  - ui-layout-pane-west-pin-up
-	*
-	* @param {(string|!Object)}	selector	jQuery selector (or element) for button, eg: ".ui-layout-north .toggle-button"
-	* @param {string}   		pane 		Name of the pane the pin is for: 'north', 'south', etc.
-	*/
-,	addPin: function (inst, selector, pane) {
-		var $E = $.layout.buttons.get(inst, selector, pane, "pin");
-		if ($E.length) {
-			var s = inst.state[pane];
-			$E.click(function (evt) {
-				$.layout.buttons.setPinState(inst, $(this), pane, (s.isSliding || s.isClosed));
-				if (s.isSliding || s.isClosed) inst.open( pane ); // change from sliding to open
-				else inst.close( pane ); // slide-closed
-				evt.stopPropagation();
-			});
-			// add up/down pin attributes and classes
-			$.layout.buttons.setPinState(inst, $E, pane, (!s.isClosed && !s.isSliding));
-			// add this pin to the pane data so we can 'sync it' automatically
-			// PANE.pins key is an array so we can store multiple pins for each pane
-			s.pins.push( selector ); // just save the selector string
-		}
-		return inst;
-	}
-
-	/**
-	* Change the class of the pin button to make it look 'up' or 'down'
-	*
-	* @see  addPin(), syncPins()
-	* @param {Array.}	$Pin	The pin-span element in a jQuery wrapper
-	* @param {string}	pane	These are the params returned to callbacks by layout()
-	* @param {boolean}	doPin	true = set the pin 'down', false = set it 'up'
-	*/
-,	setPinState: function (inst, $Pin, pane, doPin) {
-		var updown = $Pin.attr("pin");
-		if (updown && doPin === (updown=="down")) return; // already in correct state
-		var
-			pin		= inst.options[pane].buttonClass +"-pin"
-		,	side	= pin +"-"+ pane
-		,	UP		= pin +"-up "+	side +"-up"
-		,	DN		= pin +"-down "+side +"-down"
-		;
-		$Pin
-			.attr("pin", doPin ? "down" : "up") // logic
-			.attr("title", doPin ? lang.Unpin : lang.Pin)
-			.removeClass( doPin ? UP : DN ) 
-			.addClass( doPin ? DN : UP ) 
-		;
-	}
-
-	/**
-	* INTERNAL function to sync 'pin buttons' when pane is opened or closed
-	* Unpinned means the pane is 'sliding' - ie, over-top of the adjacent panes
-	*
-	* @see  open(), close()
-	* @param {string}	pane   These are the params returned to callbacks by layout()
-	* @param {boolean}	doPin  True means set the pin 'down', False means 'up'
-	*/
-,	syncPinBtns: function (inst, pane, doPin) {
-		// REAL METHOD IS _INSIDE_ LAYOUT - THIS IS HERE JUST FOR REFERENCE
-		$.each(state[pane].pins, function (i, selector) {
-			$.layout.buttons.setPinState(inst, $(selector), pane, doPin);
-		});
-	}
-
-
-,	_load: function (inst) {
-		//	ADD Button methods to Layout Instance
-		$.extend( inst, {
-			bindButton:		function (selector, action, pane) { return $.layout.buttons.bind(inst, selector, action, pane); }
-		//	DEPRECATED METHODS...
-		,	addToggleBtn:	function (selector, pane, slide) { return $.layout.buttons.addToggle(inst, selector, pane, slide); }
-		,	addOpenBtn:		function (selector, pane, slide) { return $.layout.buttons.addOpen(inst, selector, pane, slide); }
-		,	addCloseBtn:	function (selector, pane) { return $.layout.buttons.addClose(inst, selector, pane); }
-		,	addPinBtn:		function (selector, pane) { return $.layout.buttons.addPin(inst, selector, pane); }
-		});
-
-		// init state array to hold pin-buttons
-		for (var i=0; i<4; i++) {
-			var pane = $.layout.buttons.config.borderPanes[i];
-			inst.state[pane].pins = [];
-		}
-
-		// auto-init buttons onLoad if option is enabled
-		if ( inst.options.autoBindCustomButtons )
-			$.layout.buttons.init(inst);
-	}
-
-,	_unload: function (inst) {
-		// TODO: unbind all buttons???
-	}
-
-};
-
-// add initialization method to Layout's onLoad array of functions
-$.layout.onLoad.push(  $.layout.buttons._load );
-//$.layout.onUnload.push( $.layout.buttons._unload );
-
-})( jQuery );
-
-
-
-
-/**
- * jquery.layout.browserZoom 1.0
- * $Date: 2015/03/13 22:37:04 $
- *
- * Copyright (c) 2012 
- *   Kevin Dalman (http://allpro.net)
- *
- * Dual licensed under the GPL (http://www.gnu.org/licenses/gpl.html)
- * and MIT (http://www.opensource.org/licenses/mit-license.php) licenses.
- *
- * @requires: UI Layout 1.3.0.rc30.1 or higher
- *
- * @see: http://groups.google.com/group/jquery-ui-layout
- *
- * TODO: Extend logic to handle other problematic zooming in browsers
- * TODO: Add hotkey/mousewheel bindings to _instantly_ respond to these zoom event
- */
-(function ($) {
-
-// tell Layout that the plugin is available
-$.layout.plugins.browserZoom = true;
-
-$.layout.defaults.browserZoomCheckInterval = 1000;
-$.layout.optionsMap.layout.push("browserZoomCheckInterval");
-
-/*
- *	browserZoom methods
- */
-$.layout.browserZoom = {
-
-	_init: function (inst) {
-		// abort if browser does not need this check
-		if ($.layout.browserZoom.ratio() !== false)
-			$.layout.browserZoom._setTimer(inst);
-	}
-
-,	_setTimer: function (inst) {
-		// abort if layout destroyed or browser does not need this check
-		if (inst.destroyed) return;
-		var o	= inst.options
-		,	s	= inst.state
-		//	don't need check if inst has parentLayout, but check occassionally in case parent destroyed!
-		//	MINIMUM 100ms interval, for performance
-		,	ms	= inst.hasParentLayout ?  5000 : Math.max( o.browserZoomCheckInterval, 100 )
-		;
-		// set the timer
-		setTimeout(function(){
-			if (inst.destroyed || !o.resizeWithWindow) return;
-			var d = $.layout.browserZoom.ratio();
-			if (d !== s.browserZoom) {
-				s.browserZoom = d;
-				inst.resizeAll();
-			}
-			// set a NEW timeout
-			$.layout.browserZoom._setTimer(inst);
-		}
-		,	ms );
-	}
-
-,	ratio: function () {
-		var w	= window
-		,	s	= screen
-		,	d	= document
-		,	dE	= d.documentElement || d.body
-		,	b	= $.layout.browser
-		,	v	= b.version
-		,	r, sW, cW
-		;
-		// we can ignore all browsers that fire window.resize event onZoom
-		if (!b.msie || v > 8)
-			return false; // don't need to track zoom
-		if (s.deviceXDPI && s.systemXDPI) // syntax compiler hack
-			return calc(s.deviceXDPI, s.systemXDPI);
-		// everything below is just for future reference!
-		if (b.webkit && (r = d.body.getBoundingClientRect))
-			return calc((r.left - r.right), d.body.offsetWidth);
-		if (b.webkit && (sW = w.outerWidth))
-			return calc(sW, w.innerWidth);
-		if ((sW = s.width) && (cW = dE.clientWidth))
-			return calc(sW, cW);
-		return false; // no match, so cannot - or don't need to - track zoom
-
-		function calc (x,y) { return (parseInt(x,10) / parseInt(y,10) * 100).toFixed(); }
-	}
-
-};
-// add initialization method to Layout's onLoad array of functions
-$.layout.onReady.push( $.layout.browserZoom._init );
-
-
-})( jQuery );
-
-
-
-
-/**
- *	UI Layout Plugin: Slide-Offscreen Animation
- *
- *	Prevent panes from being 'hidden' so that an iframes/objects 
- *	does not reload/refresh when pane 'opens' again.
- *	This plug-in adds a new animation called "slideOffscreen".
- *	It is identical to the normal "slide" effect, but avoids hiding the element
- *
- *	Requires Layout 1.3.0.RC30.1 or later for Close offscreen
- *	Requires Layout 1.3.0.RC30.5 or later for Hide, initClosed & initHidden offscreen
- *
- *	Version:	1.1 - 2012-11-18
- *	Author:		Kevin Dalman (kevin@jquery-dev.com)
- *	@preserve	jquery.layout.slideOffscreen-1.1.js
- */
-;(function ($) {
-
-// Add a new "slideOffscreen" effect
-if ($.effects) {
-
-	// add an option so initClosed and initHidden will work
-	$.layout.defaults.panes.useOffscreenClose = false; // user must enable when needed
-	/* set the new animation as the default for all panes
-	$.layout.defaults.panes.fxName = "slideOffscreen";
-	*/
-
-	if ($.layout.plugins)
-		$.layout.plugins.effects.slideOffscreen = true;
-
-	// dupe 'slide' effect defaults as new effect defaults
-	$.layout.effects.slideOffscreen = $.extend(true, {}, $.layout.effects.slide);
-
-	// add new effect to jQuery UI
-	$.effects.slideOffscreen = function(o) {
-		return this.queue(function(){
-
-			var fx		= $.effects
-			,	opt		= o.options
-			,	$el		= $(this)
-			,	pane	= $el.data('layoutEdge')
-			,	state	= $el.data('parentLayout').state
-			,	dist	= state[pane].size
-			,	s		= this.style
-			,	props	= ['top','bottom','left','right']
-				// Set options
-			,	mode	= fx.setMode($el, opt.mode || 'show') // Set Mode
-			,	show	= (mode == 'show')
-			,	dir		= opt.direction || 'left' // Default Direction
-			,	ref	 	= (dir == 'up' || dir == 'down') ? 'top' : 'left'
-			,	pos		= (dir == 'up' || dir == 'left')
-			,	offscrn	= $.layout.config.offscreenCSS || {}
-			,	keyLR	= $.layout.config.offscreenReset
-			,	keyTB	= 'offscreenResetTop' // only used internally
-			,	animation = {}
-			;
-			// Animation settings
-			animation[ref]	= (show ? (pos ? '+=' : '-=') : (pos ? '-=' : '+=')) + dist;
-
-			if (show) { // show() animation, so save top/bottom but retain left/right set when 'hidden'
-				$el.data(keyTB, { top: s.top, bottom: s.bottom });
-
-				// set the top or left offset in preparation for animation
-				// Note: ALL animations work by shifting the top or left edges
-				if (pos) { // top (north) or left (west)
-					$el.css(ref, isNaN(dist) ? "-" + dist : -dist); // Shift outside the left/top edge
-				}
-				else { // bottom (south) or right (east) - shift all the way across container
-					if (dir === 'right')
-						$el.css({ left: state.container.layoutWidth, right: 'auto' });
-					else // dir === bottom
-						$el.css({ top: state.container.layoutHeight, bottom: 'auto' });
-				}
-				// restore the left/right setting if is a top/bottom animation
-				if (ref === 'top')
-					$el.css( $el.data( keyLR ) || {} );
-			}
-			else { // hide() animation, so save ALL CSS
-				$el.data(keyTB, { top: s.top, bottom: s.bottom });
-				$el.data(keyLR, { left: s.left, right: s.right });
-			}
-
-			// Animate
-			$el.show().animate(animation, { queue: false, duration: o.duration, easing: opt.easing, complete: function(){
-				// Restore top/bottom
-				if ($el.data( keyTB ))
-					$el.css($el.data( keyTB )).removeData( keyTB );
-				if (show) // Restore left/right too
-					$el.css($el.data( keyLR ) || {}).removeData( keyLR );
-				else // Move the pane off-screen (left: -99999, right: 'auto')
-					$el.css( offscrn );
-
-				if (o.callback) o.callback.apply(this, arguments); // Callback
-				$el.dequeue();
-			}});
-
-		});
-	};
-
-}
-
-})( jQuery );
\ No newline at end of file
diff --git a/vid/src/main/webapp/app/fusion/scripts/modalService.js b/vid/src/main/webapp/app/fusion/scripts/modalService.js
deleted file mode 100644
index 74c848e8d..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/modalService.js
+++ /dev/null
@@ -1,185 +0,0 @@
-angular.module("modalServices",[]).service('modalService', ['$modal', function ($modal) {
-	
-														
-        	this.showSuccess = function(heading, messageBody){
-        		var modalInstance = $modal.open({
-        	        templateUrl: 'modal_informative.html',
-        	        controller: 'modalpopupController',
-        	        resolve: {
-        	           message: function () {
-        	        		$(".overlayed").css("display","none");
-                		  	$(".loadingId").css("display","none");
-        	        	   var message = {
-        	        			   title:    heading,
-                              		text:     messageBody
-                              	};
-     			          return message;
-   			        	}
-        	        }
-        	      }); 
-        	};
-        	this.showFailure = function(heading, messageBody){
-        	var modalInstance = $modal.open({
-        	        templateUrl: 'modal_warning.html',
-        	        controller: 'modalpopupController',
-        	        resolve: {
-         	           message: function () {
-         	        	  var message = {
-                               	 title:    heading,
-                               	 text:     messageBody
-                               	};
-      			          return message;
-    			        	}
-         	        }
-        	      }); 
-        	};
-        	
-        	this.showMessage = function(heading, messageBody){
-            	var modalInstance = $modal.open({
-            	        templateUrl: 'modal_message.html',
-            	        controller: 'modalpopupController',
-            	        resolve: {
-             	           message: function () {
-             	        	  var message = {
-                                   	 title:    heading,
-                                   	 text:     messageBody
-                                   	};
-          			          return message;
-        			        	}
-             	        }
-            	      }); 
-            	};
-        	
-        	this.showWarning = function(heading, messageBody){
-            	var modalInstance = $modal.open({
-            	        templateUrl: 'modal_warning_message.html',
-            	        controller: 'modalpopupController',
-            	        resolve: {
-             	           message: function () {
-             	        	  var message = {
-                                   	 title:    heading,
-                                   	 text:     messageBody
-                                   	};
-          			          return message;
-        			        	}
-             	        }
-            	      }); 
-            	};
-        	
-        	this.popupConfirmWin = function(title, msgBody, callback){
-   			 var modalInstance = $modal.open({
-   	 	        templateUrl: 'confirmation_informative.html',
-   	 	        controller: 'modalpopupController',
-   	 	        resolve: {
-   	 	           message: function () {
-   	 	        	   var message = {
-   	 	        			   title:    title,
-   	                       		text:    msgBody
-   	                       	};
-   				          return message;
-   			        	}
-   	 	        }
-   	 	      }); 
-   			 var args = Array.prototype.slice.call( arguments, 0 );
-   		     args.splice( 0, 3); 
-   	 		modalInstance.result.then(function(){
-   		 			callback.apply(null, args);
-   	 			}, function() {
-   	 		  })['finally'](function(){
-   	 		   modalInstance = undefined;
-   	 		  });
-   			
-   		};
-   		this.popupConfirmWinWithCancel = function(title, msgBody, callback,dismissCallback){
- 			 var modalInstance = $modal.open({
- 	 	        templateUrl: 'confirmation_informative.html',
- 	 	        controller: 'modalpopupController',
- 	 	        resolve: {
- 	 	           message: function () {
- 	 	        	   var message = {
- 	 	        			   title:    title,
- 	                       		text:    msgBody
- 	                       	};
- 				          return message;
- 			        	}
- 	 	        }
- 	 	      }); 
- 			 var args = Array.prototype.slice.call( arguments, 0 );
- 		     args.splice( 0, 3); 
- 	 		modalInstance.result.then(function(){
- 		 			callback.apply(null, args);
- 	 			}, function() {
- 	 			  dismissCallback();
- 	 		  })['finally'](function(){
- 	 		   modalInstance = undefined;
- 	 		  });
- 			
- 		};
-        this.popupDeleteConfirmWin = function(title, msgBody, callback, argForCallBack){
-   			 var modalInstance = $modal.open({
-   	 	        templateUrl: 'confirmation_for_delete.html',
-   	 	        controller: 'modalpopupController',
-   	 	        resolve: {
-   	 	           message: function () {
-   	 	        	   var message = {
-   	 	        			   title:    title,
-   	                       		text:    msgBody
-   	                       	};
-   				          return message;
-   			        	}
-   	 	        }
-   	 	      }); 
-   			 
-   	 		modalInstance.result.then(function(){
-   		 			callback(argForCallBack);
-   	 			}, function() {
-   	 		  })['finally'](function(){
-   	 		   modalInstance = undefined;
-   	 		  });
-   			
-   		};		
-   		
-   	 this.popupSuccessRedirectWin = function(title, msgBody, redirectUrl){
-   		var modalInstance = $modal.open({
-	        templateUrl: 'modal_informative.html',
-	        controller: 'modalpopupController',
-	        resolve: {
-	           message: function () {
-	        	   var message = {
-	        			   title:    title,
-	                       text:    msgBody
-                      	};
-			          return message;
-		        	}
-	        }
-	      }); 
-		modalInstance.result.then(function() {
-		  }, function() {
-			  window.location.href=redirectUrl;
-		  })['finally'](function(){
-		   modalInstance = undefined;
-		  });	
-   	};	
-   	
-   	this.popupWarningRedirectWin = function(title, msgBody, redirectUrl){
-   		var modalInstance = $modal.open({
-   			templateUrl: 'modal_warning_message.html',
-	        controller: 'modalpopupController',
-	        resolve: {
-	           message: function () {
-	        	   var message = {
-	        			   title:    title,
-	                       text:    msgBody
-                      	};
-			          return message;
-		        	}
-	        }
-	      }); 
-		modalInstance.result.then(function() {
-		  }, function() {
-			  window.location.href=redirectUrl;
-		  })['finally'](function(){
-		   modalInstance = undefined;
-		  });	
-   	};	
- }]);
\ No newline at end of file
diff --git a/vid/src/main/webapp/app/fusion/scripts/moment.min.js b/vid/src/main/webapp/app/fusion/scripts/moment.min.js
deleted file mode 100644
index 62b1697b6..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/moment.min.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// moment.js
-// version : 2.1.0
-// author : Tim Wood
-// license : MIT
-// momentjs.com
-!function(t){function e(t,e){return function(n){return u(t.call(this,n),e)}}function n(t,e){return function(n){return this.lang().ordinal(t.call(this,n),e)}}function s(){}function i(t){a(this,t)}function r(t){var e=t.years||t.year||t.y||0,n=t.months||t.month||t.M||0,s=t.weeks||t.week||t.w||0,i=t.days||t.day||t.d||0,r=t.hours||t.hour||t.h||0,a=t.minutes||t.minute||t.m||0,o=t.seconds||t.second||t.s||0,u=t.milliseconds||t.millisecond||t.ms||0;this._input=t,this._milliseconds=u+1e3*o+6e4*a+36e5*r,this._days=i+7*s,this._months=n+12*e,this._data={},this._bubble()}function a(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n]);return t}function o(t){return 0>t?Math.ceil(t):Math.floor(t)}function u(t,e){for(var n=t+"";n.lengthn;n++)~~t[n]!==~~e[n]&&r++;return r+i}function f(t){return t?ie[t]||t.toLowerCase().replace(/(.)s$/,"$1"):t}function l(t,e){return e.abbr=t,x[t]||(x[t]=new s),x[t].set(e),x[t]}function _(t){if(!t)return H.fn._lang;if(!x[t]&&A)try{require("./lang/"+t)}catch(e){return H.fn._lang}return x[t]}function m(t){return t.match(/\[.*\]/)?t.replace(/^\[|\]$/g,""):t.replace(/\\/g,"")}function y(t){var e,n,s=t.match(E);for(e=0,n=s.length;n>e;e++)s[e]=ue[s[e]]?ue[s[e]]:m(s[e]);return function(i){var r="";for(e=0;n>e;e++)r+=s[e]instanceof Function?s[e].call(i,t):s[e];return r}}function M(t,e){function n(e){return t.lang().longDateFormat(e)||e}for(var s=5;s--&&N.test(e);)e=e.replace(N,n);return re[e]||(re[e]=y(e)),re[e](t)}function g(t,e){switch(t){case"DDDD":return V;case"YYYY":return X;case"YYYYY":return $;case"S":case"SS":case"SSS":case"DDD":return I;case"MMM":case"MMMM":case"dd":case"ddd":case"dddd":return R;case"a":case"A":return _(e._l)._meridiemParse;case"X":return B;case"Z":case"ZZ":return j;case"T":return q;case"MM":case"DD":case"YY":case"HH":case"hh":case"mm":case"ss":case"M":case"D":case"d":case"H":case"h":case"m":case"s":return J;default:return new RegExp(t.replace("\\",""))}}function p(t){var e=(j.exec(t)||[])[0],n=(e+"").match(ee)||["-",0,0],s=+(60*n[1])+~~n[2];return"+"===n[0]?-s:s}function D(t,e,n){var s,i=n._a;switch(t){case"M":case"MM":i[1]=null==e?0:~~e-1;break;case"MMM":case"MMMM":s=_(n._l).monthsParse(e),null!=s?i[1]=s:n._isValid=!1;break;case"D":case"DD":case"DDD":case"DDDD":null!=e&&(i[2]=~~e);break;case"YY":i[0]=~~e+(~~e>68?1900:2e3);break;case"YYYY":case"YYYYY":i[0]=~~e;break;case"a":case"A":n._isPm=_(n._l).isPM(e);break;case"H":case"HH":case"h":case"hh":i[3]=~~e;break;case"m":case"mm":i[4]=~~e;break;case"s":case"ss":i[5]=~~e;break;case"S":case"SS":case"SSS":i[6]=~~(1e3*("0."+e));break;case"X":n._d=new Date(1e3*parseFloat(e));break;case"Z":case"ZZ":n._useUTC=!0,n._tzm=p(e)}null==e&&(n._isValid=!1)}function Y(t){var e,n,s=[];if(!t._d){for(e=0;7>e;e++)t._a[e]=s[e]=null==t._a[e]?2===e?1:0:t._a[e];s[3]+=~~((t._tzm||0)/60),s[4]+=~~((t._tzm||0)%60),n=new Date(0),t._useUTC?(n.setUTCFullYear(s[0],s[1],s[2]),n.setUTCHours(s[3],s[4],s[5],s[6])):(n.setFullYear(s[0],s[1],s[2]),n.setHours(s[3],s[4],s[5],s[6])),t._d=n}}function w(t){var e,n,s=t._f.match(E),i=t._i;for(t._a=[],e=0;eo&&(u=o,s=n);a(t,s)}function v(t){var e,n=t._i,s=K.exec(n);if(s){for(t._f="YYYY-MM-DD"+(s[2]||" "),e=0;4>e;e++)if(te[e][1].exec(n)){t._f+=te[e][0];break}j.exec(n)&&(t._f+=" Z"),w(t)}else t._d=new Date(n)}function T(e){var n=e._i,s=G.exec(n);n===t?e._d=new Date:s?e._d=new Date(+s[1]):"string"==typeof n?v(e):d(n)?(e._a=n.slice(0),Y(e)):e._d=n instanceof Date?new Date(+n):new Date(n)}function b(t,e,n,s,i){return i.relativeTime(e||1,!!n,t,s)}function S(t,e,n){var s=W(Math.abs(t)/1e3),i=W(s/60),r=W(i/60),a=W(r/24),o=W(a/365),u=45>s&&["s",s]||1===i&&["m"]||45>i&&["mm",i]||1===r&&["h"]||22>r&&["hh",r]||1===a&&["d"]||25>=a&&["dd",a]||45>=a&&["M"]||345>a&&["MM",W(a/30)]||1===o&&["y"]||["yy",o];return u[2]=e,u[3]=t>0,u[4]=n,b.apply({},u)}function F(t,e,n){var s,i=n-e,r=n-t.day();return r>i&&(r-=7),i-7>r&&(r+=7),s=H(t).add("d",r),{week:Math.ceil(s.dayOfYear()/7),year:s.year()}}function O(t){var e=t._i,n=t._f;return null===e||""===e?null:("string"==typeof e&&(t._i=e=_().preparse(e)),H.isMoment(e)?(t=a({},e),t._d=new Date(+e._d)):n?d(n)?k(t):w(t):T(t),new i(t))}function z(t,e){H.fn[t]=H.fn[t+"s"]=function(t){var n=this._isUTC?"UTC":"";return null!=t?(this._d["set"+n+e](t),H.updateOffset(this),this):this._d["get"+n+e]()}}function C(t){H.duration.fn[t]=function(){return this._data[t]}}function L(t,e){H.duration.fn["as"+t]=function(){return+this/e}}for(var H,P,U="2.1.0",W=Math.round,x={},A="undefined"!=typeof module&&module.exports,G=/^\/?Date\((\-?\d+)/i,Z=/(\-)?(\d*)?\.?(\d+)\:(\d+)\:(\d+)\.?(\d{3})?/,E=/(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|SS?S?|X|zz?|ZZ?|.)/g,N=/(\[[^\[]*\])|(\\)?(LT|LL?L?L?|l{1,4})/g,J=/\d\d?/,I=/\d{1,3}/,V=/\d{3}/,X=/\d{1,4}/,$=/[+\-]?\d{1,6}/,R=/[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i,j=/Z|[\+\-]\d\d:?\d\d/i,q=/T/i,B=/[\+\-]?\d+(\.\d{1,3})?/,K=/^\s*\d{4}-\d\d-\d\d((T| )(\d\d(:\d\d(:\d\d(\.\d\d?\d?)?)?)?)?([\+\-]\d\d:?\d\d)?)?/,Q="YYYY-MM-DDTHH:mm:ssZ",te=[["HH:mm:ss.S",/(T| )\d\d:\d\d:\d\d\.\d{1,3}/],["HH:mm:ss",/(T| )\d\d:\d\d:\d\d/],["HH:mm",/(T| )\d\d:\d\d/],["HH",/(T| )\d\d/]],ee=/([\+\-]|\d\d)/gi,ne="Date|Hours|Minutes|Seconds|Milliseconds".split("|"),se={Milliseconds:1,Seconds:1e3,Minutes:6e4,Hours:36e5,Days:864e5,Months:2592e6,Years:31536e6},ie={ms:"millisecond",s:"second",m:"minute",h:"hour",d:"day",w:"week",M:"month",y:"year"},re={},ae="DDD w W M D d".split(" "),oe="M D H h m s w W".split(" "),ue={M:function(){return this.month()+1},MMM:function(t){return this.lang().monthsShort(this,t)},MMMM:function(t){return this.lang().months(this,t)},D:function(){return this.date()},DDD:function(){return this.dayOfYear()},d:function(){return this.day()},dd:function(t){return this.lang().weekdaysMin(this,t)},ddd:function(t){return this.lang().weekdaysShort(this,t)},dddd:function(t){return this.lang().weekdays(this,t)},w:function(){return this.week()},W:function(){return this.isoWeek()},YY:function(){return u(this.year()%100,2)},YYYY:function(){return u(this.year(),4)},YYYYY:function(){return u(this.year(),5)},gg:function(){return u(this.weekYear()%100,2)},gggg:function(){return this.weekYear()},ggggg:function(){return u(this.weekYear(),5)},GG:function(){return u(this.isoWeekYear()%100,2)},GGGG:function(){return this.isoWeekYear()},GGGGG:function(){return u(this.isoWeekYear(),5)},e:function(){return this.weekday()},E:function(){return this.isoWeekday()},a:function(){return this.lang().meridiem(this.hours(),this.minutes(),!0)},A:function(){return this.lang().meridiem(this.hours(),this.minutes(),!1)},H:function(){return this.hours()},h:function(){return this.hours()%12||12},m:function(){return this.minutes()},s:function(){return this.seconds()},S:function(){return~~(this.milliseconds()/100)},SS:function(){return u(~~(this.milliseconds()/10),2)},SSS:function(){return u(this.milliseconds(),3)},Z:function(){var t=-this.zone(),e="+";return 0>t&&(t=-t,e="-"),e+u(~~(t/60),2)+":"+u(~~t%60,2)},ZZ:function(){var t=-this.zone(),e="+";return 0>t&&(t=-t,e="-"),e+u(~~(10*t/6),4)},z:function(){return this.zoneAbbr()},zz:function(){return this.zoneName()},X:function(){return this.unix()}};ae.length;)P=ae.pop(),ue[P+"o"]=n(ue[P],P);for(;oe.length;)P=oe.pop(),ue[P+P]=e(ue[P],2);for(ue.DDDD=e(ue.DDD,3),s.prototype={set:function(t){var e,n;for(n in t)e=t[n],"function"==typeof e?this[n]=e:this["_"+n]=e},_months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),months:function(t){return this._months[t.month()]},_monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),monthsShort:function(t){return this._monthsShort[t.month()]},monthsParse:function(t){var e,n,s;for(this._monthsParse||(this._monthsParse=[]),e=0;12>e;e++)if(this._monthsParse[e]||(n=H([2e3,e]),s="^"+this.months(n,"")+"|^"+this.monthsShort(n,""),this._monthsParse[e]=new RegExp(s.replace(".",""),"i")),this._monthsParse[e].test(t))return e},_weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdays:function(t){return this._weekdays[t.day()]},_weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysShort:function(t){return this._weekdaysShort[t.day()]},_weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),weekdaysMin:function(t){return this._weekdaysMin[t.day()]},weekdaysParse:function(t){var e,n,s;for(this._weekdaysParse||(this._weekdaysParse=[]),e=0;7>e;e++)if(this._weekdaysParse[e]||(n=H([2e3,1]).day(e),s="^"+this.weekdays(n,"")+"|^"+this.weekdaysShort(n,"")+"|^"+this.weekdaysMin(n,""),this._weekdaysParse[e]=new RegExp(s.replace(".",""),"i")),this._weekdaysParse[e].test(t))return e},_longDateFormat:{LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D YYYY",LLL:"MMMM D YYYY LT",LLLL:"dddd, MMMM D YYYY LT"},longDateFormat:function(t){var e=this._longDateFormat[t];return!e&&this._longDateFormat[t.toUpperCase()]&&(e=this._longDateFormat[t.toUpperCase()].replace(/MMMM|MM|DD|dddd/g,function(t){return t.slice(1)}),this._longDateFormat[t]=e),e},isPM:function(t){return"p"===(t+"").toLowerCase()[0]},_meridiemParse:/[ap]\.?m?\.?/i,meridiem:function(t,e,n){return t>11?n?"pm":"PM":n?"am":"AM"},_calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},calendar:function(t,e){var n=this._calendar[t];return"function"==typeof n?n.apply(e):n},_relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},relativeTime:function(t,e,n,s){var i=this._relativeTime[n];return"function"==typeof i?i(t,e,n,s):i.replace(/%d/i,t)},pastFuture:function(t,e){var n=this._relativeTime[t>0?"future":"past"];return"function"==typeof n?n(e):n.replace(/%s/i,e)},ordinal:function(t){return this._ordinal.replace("%d",t)},_ordinal:"%d",preparse:function(t){return t},postformat:function(t){return t},week:function(t){return F(t,this._week.dow,this._week.doy).week},_week:{dow:0,doy:6}},H=function(t,e,n){return O({_i:t,_f:e,_l:n,_isUTC:!1})},H.utc=function(t,e,n){return O({_useUTC:!0,_isUTC:!0,_l:n,_i:t,_f:e})},H.unix=function(t){return H(1e3*t)},H.duration=function(t,e){var n,s,i=H.isDuration(t),a="number"==typeof t,o=i?t._input:a?{}:t,u=Z.exec(t);return a?e?o[e]=t:o.milliseconds=t:u&&(n="-"===u[1]?-1:1,o={y:0,d:~~u[2]*n,h:~~u[3]*n,m:~~u[4]*n,s:~~u[5]*n,ms:~~u[6]*n}),s=new r(o),i&&t.hasOwnProperty("_lang")&&(s._lang=t._lang),s},H.version=U,H.defaultFormat=Q,H.updateOffset=function(){},H.lang=function(t,e){return t?(e?l(t,e):x[t]||_(t),H.duration.fn._lang=H.fn._lang=_(t),void 0):H.fn._lang._abbr},H.langData=function(t){return t&&t._lang&&t._lang._abbr&&(t=t._lang._abbr),_(t)},H.isMoment=function(t){return t instanceof i},H.isDuration=function(t){return t instanceof r},H.fn=i.prototype={clone:function(){return H(this)},valueOf:function(){return+this._d+6e4*(this._offset||0)},unix:function(){return Math.floor(+this/1e3)},toString:function(){return this.format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")},toDate:function(){return this._offset?new Date(+this):this._d},toISOString:function(){return M(H(this).utc(),"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]")},toArray:function(){var t=this;return[t.year(),t.month(),t.date(),t.hours(),t.minutes(),t.seconds(),t.milliseconds()]},isValid:function(){return null==this._isValid&&(this._isValid=this._a?!c(this._a,(this._isUTC?H.utc(this._a):H(this._a)).toArray()):!isNaN(this._d.getTime())),!!this._isValid},utc:function(){return this.zone(0)},local:function(){return this.zone(0),this._isUTC=!1,this},format:function(t){var e=M(this,t||H.defaultFormat);return this.lang().postformat(e)},add:function(t,e){var n;return n="string"==typeof t?H.duration(+e,t):H.duration(t,e),h(this,n,1),this},subtract:function(t,e){var n;return n="string"==typeof t?H.duration(+e,t):H.duration(t,e),h(this,n,-1),this},diff:function(t,e,n){var s,i,r=this._isUTC?H(t).zone(this._offset||0):H(t).local(),a=6e4*(this.zone()-r.zone());return e=f(e),"year"===e||"month"===e?(s=432e5*(this.daysInMonth()+r.daysInMonth()),i=12*(this.year()-r.year())+(this.month()-r.month()),i+=(this-H(this).startOf("month")-(r-H(r).startOf("month")))/s,i-=6e4*(this.zone()-H(this).startOf("month").zone()-(r.zone()-H(r).startOf("month").zone()))/s,"year"===e&&(i/=12)):(s=this-r,i="second"===e?s/1e3:"minute"===e?s/6e4:"hour"===e?s/36e5:"day"===e?(s-a)/864e5:"week"===e?(s-a)/6048e5:s),n?i:o(i)},from:function(t,e){return H.duration(this.diff(t)).lang(this.lang()._abbr).humanize(!e)},fromNow:function(t){return this.from(H(),t)},calendar:function(){var t=this.diff(H().startOf("day"),"days",!0),e=-6>t?"sameElse":-1>t?"lastWeek":0>t?"lastDay":1>t?"sameDay":2>t?"nextDay":7>t?"nextWeek":"sameElse";return this.format(this.lang().calendar(e,this))},isLeapYear:function(){var t=this.year();return 0===t%4&&0!==t%100||0===t%400},isDST:function(){return this.zone()+H(t).startOf(e)},isBefore:function(t,e){return e="undefined"!=typeof e?e:"millisecond",+this.clone().startOf(e)<+H(t).startOf(e)},isSame:function(t,e){return e="undefined"!=typeof e?e:"millisecond",+this.clone().startOf(e)===+H(t).startOf(e)},min:function(t){return t=H.apply(null,arguments),this>t?this:t},max:function(t){return t=H.apply(null,arguments),t>this?this:t},zone:function(t){var e=this._offset||0;return null==t?this._isUTC?e:this._d.getTimezoneOffset():("string"==typeof t&&(t=p(t)),Math.abs(t)<16&&(t=60*t),this._offset=t,this._isUTC=!0,e!==t&&h(this,H.duration(e-t,"m"),1,!0),this)},zoneAbbr:function(){return this._isUTC?"UTC":""},zoneName:function(){return this._isUTC?"Coordinated Universal Time":""},daysInMonth:function(){return H.utc([this.year(),this.month()+1,0]).date()},dayOfYear:function(t){var e=W((H(this).startOf("day")-H(this).startOf("year"))/864e5)+1;return null==t?e:this.add("d",t-e)},weekYear:function(t){var e=F(this,this.lang()._week.dow,this.lang()._week.doy).year;return null==t?e:this.add("y",t-e)},isoWeekYear:function(t){var e=F(this,1,4).year;return null==t?e:this.add("y",t-e)},week:function(t){var e=this.lang().week(this);return null==t?e:this.add("d",7*(t-e))},isoWeek:function(t){var e=F(this,1,4).week;return null==t?e:this.add("d",7*(t-e))},weekday:function(t){var e=(this._d.getDay()+7-this.lang()._week.dow)%7;return null==t?e:this.add("d",t-e)},isoWeekday:function(t){return null==t?this.day()||7:this.day(this.day()%7?t:t-7)},lang:function(e){return e===t?this._lang:(this._lang=_(e),this)}},P=0;PERROR: ' + evt.data);
-}
-
-function writeToScreen(message) {
-    var pre = document.createElement("p");
-    pre.style.wordWrap = "break-word";
-    pre.innerHTML = message;
-    output.append(pre);
-}
diff --git a/vid/src/main/webapp/app/fusion/scripts/utils/dummy.txt b/vid/src/main/webapp/app/fusion/scripts/utils/dummy.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/vid/src/main/webapp/app/fusion/scripts/utils/page-resource.js b/vid/src/main/webapp/app/fusion/scripts/utils/page-resource.js
deleted file mode 100644
index 8449ecfce..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/utils/page-resource.js
+++ /dev/null
@@ -1,95 +0,0 @@
-function loadjscssfile(filename, filetype){
-    if (filetype=="js"){ //if filename is a external JavaScript file
-    	var done = false;
-        var script = document.createElement('script');	
-  		script.src = filename;
-  		script.async = false; 			
- 		document.head.appendChild(script);
-    }else if (filetype=="css"){ //if filename is an external CSS file
-        var fileref=document.createElement("link")
-        fileref.setAttribute("rel", "stylesheet")
-        fileref.setAttribute("type", "text/css")
-        fileref.setAttribute("async", false)
-        fileref.setAttribute("href", filename)
-        document.head.appendChild(fileref);
-    } 
-}
-
-function loadResource(){
-	//css
-	loadjscssfile("app/fusion/external/ebz/fn-ebz.css", "css");	
-	loadjscssfile("app/fusion/external/ebz/sandbox/styles/demo.css", "css");	
-	loadjscssfile("app/fusion/external/ebz/sandbox/styles/base.css", "css");	
-	loadjscssfile("app/fusion/external/ebz/sandbox/styles/btn.css", "css");	
-	loadjscssfile("app/fusion/external/ebz/sandbox/styles/dtpk.css", "css");	
-	loadjscssfile("app/fusion/external/ebz/sandbox/styles/frms.css", "css");	
-	loadjscssfile("app/fusion/external/ebz/sandbox/styles/sldr.css", "css");	
-	loadjscssfile("app/fusion/external/ebz/sandbox/styles/style.css", "css");	
-	loadjscssfile("app/fusion/external/ebz/sandbox/styles/tbs.css", "css");	
-	loadjscssfile("app/fusion/external/ebz/ebz_header/portal_ebz_header.css", "css");	
-	loadjscssfile("static/fusion/css/jquery-ui.css", "css");	
-	
-	
-	loadjscssfile("app/fusion/external/ebz/ebz_header/header.css", "css");	
-	loadjscssfile("app/fusion/external/ebz/ebz_header/footer.css", "css");	
-	// Basic AngularJS -->
-	loadjscssfile("app/fusion/external/ebz/angular_js/angular.js", "js");
-	loadjscssfile("app/fusion/external/ebz/angular_js/angular-sanitize.js", "js");
-	loadjscssfile("app/fusion/external/ebz/angular_js/angular-route.min.js", "js");
-	loadjscssfile("app/fusion/external/ebz/angular_js/angular-cookies.js", "js");
-	loadjscssfile("app/fusion/external/ebz/angular_js/gestures.js", "js");
-	loadjscssfile("app/fusion/external/ebz/angular_js/app.js", "js");
-
-	loadjscssfile("app/fusion/external/ebz/sandbox/att-abs-tpls.js", "js");
-		
-	// jQuery -->	
-	loadjscssfile("static/js/jquery-1.10.2.js", "js");
-	loadjscssfile("static/js/jquery.mask.min.js", "js");	
-	loadjscssfile("static/js/jquery-ui.js", "js");
-	
-	// AngularJS Gridster -->
-	loadjscssfile("static/fusion/js/att_angular_gridster/ui-gridster-tpls.js", "js");
-	loadjscssfile("static/fusion/js/att_angular_gridster/angular-gridster.js", "js");
-	
-	// AngularJS Config -->
-	loadjscssfile("app/fusion/external/ebz/angular_js/checklist-model.js", "js");
-	
-	// Utility -->
-	loadjscssfile("app/fusion/scripts/modalService.js", "js");
-	loadjscssfile("app/fusion/external/angular-ui/ui-bootstrap-tpls-1.1.2.min.js", "js");	
-	
-	// Controller js -->
-	loadjscssfile("app/fusion/scripts/controllers/profile-search-controller.js", "js");
-	loadjscssfile("app/fusion/scripts/controllers/profile-controller.js", "js");
-	loadjscssfile("app/fusion/scripts/controllers/post-search-controller.js", "js");
-	loadjscssfile("app/fusion/scripts/controllers/self-profile-controller.js", "js");
-	loadjscssfile("app/fusion/scripts/controllers/rolefunctionpopupController.js", "js");	
-	loadjscssfile("app/fusion/scripts/controllers/modelpopupController.js", "js");
-	
-	// Header and Footer -->
-	loadjscssfile("app/fusion/scripts/directives/footer.js", "js");
-	loadjscssfile("app/fusion/external/ebz/js/footer.js", "js");
-	loadjscssfile("app/fusion/scripts/directives/header.js", "js");		
-	loadjscssfile("app/fusion/scripts/directives/leftMenu.js", "js");
-	
-	// Services -->
-	loadjscssfile("app/fusion/scripts/services/profileService.js", "js");	
-	loadjscssfile("app/fusion/scripts/services/userInfoService.js", "js");
-	loadjscssfile("app/fusion/scripts/services/leftMenuService.js", "js");	
-	loadjscssfile("app/fusion/scripts/controllers/profileController.js", "js");			
-}
-
-window.onload = loadResource();
-window.onload = function(){
-	var appLoadingInterval = setInterval(function(){ loadApp() }, 500);
-	var count=0;
-	function loadApp(){	
-		count++
-		if(typeof angular !== 'undefined') {
-			angular.bootstrap(document, ['abs']);
-			clearInterval(appLoadingInterval);
-		}else if(count>10){
-			clearInterval(appLoadingInterval);
-		}
-	}
-}
diff --git a/vid/src/main/webapp/app/fusion/scripts/utils/sandbox-resources.html b/vid/src/main/webapp/app/fusion/scripts/utils/sandbox-resources.html
deleted file mode 100644
index d04eba9ce..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/utils/sandbox-resources.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
-	
-	
-	
-	
-	
-	
-	
-	
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/admin-page/admin.html b/vid/src/main/webapp/app/fusion/scripts/view-models/admin-page/admin.html
deleted file mode 100644
index f83888d91..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/view-models/admin-page/admin.html
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
-
-	
-	
-	
-    
-    
-    
-    
-	
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-	
-		 
-		 
-		
-		
-	 	 
-		
-		
-		
-		
-		
-		
-		
-		
-		
-	
-		
-		
-	
-		
-		
-	
-		
-	
-	
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-	
-		
-		
-		
-		
-		
-		
-		
-		
-	
-		
-		
-		
-	
-        
-    
-        
-        
-        
-    
-    	
-    
-	
-	
-		
        
-	    
        
-		
        
-		
        
-		
        
-		
        
-		
        		
-		
        
-	
-
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/admin-page/profile.html b/vid/src/main/webapp/app/fusion/scripts/view-models/admin-page/profile.html
deleted file mode 100644
index 7ee430206..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/view-models/admin-page/profile.html
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-	
-	
-	
-    
-    
-    
-    
-	
-		
-	 
-	
-	
-	
-	
-	
-	    
        
-		
        
-		
        
-		
        
-		
        		
-		
          
-	
-
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/dummy.txt b/vid/src/main/webapp/app/fusion/scripts/view-models/dummy.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/footer.html b/vid/src/main/webapp/app/fusion/scripts/view-models/footer.html
deleted file mode 100644
index 561487316..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/view-models/footer.html
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
        
-
-
        
-	
        
-
-			
        
-		
-			
        
-		
        
-			
        
-				
-				
-					
        
-					
        
-					
-					
        
-				
        
-			
        
-		
        
-	
        
-
        
-
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/header.html b/vid/src/main/webapp/app/fusion/scripts/view-models/header.html
deleted file mode 100644
index adb5be35a..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/view-models/header.html
+++ /dev/null
@@ -1,186 +0,0 @@
-
-
        
-    
        
-        
        
-            
        
-                
        
-                    
-                    
-                    
        
-                        
        
-                            
        
-                                
        
-                                    
      • 
-                                       
        
-                                        ECOMP Portal
-                                    
        • 
-                                    
        
-                                        
        
-
-                              
-                                            
        
-                                                
-                                                
-											
        
-                                                
        
-                                                    
-									
-                                                    
        
-                                                        
        
-                                                            
-                                                            
        
-                                                                
        
-                                                                
        
-                                                                    Manage favorites on ECOMP Portal.
-                                                                
        
-                                                            
        
-                                                        
        
-                                                        
-                                                        
        
-                                                            
        
-                                                                
-                                                                
        No Favorites
        
-                                                                
        Manage favorites on ECOMP Portal.
        
-                                                            
        
-                                                        
        
-                                                    
        
-                                                
        
-                                            
        
-                                        
        
-                                    
        
-                                    
      • 
-                                        Unable to load menus
-                                    
        • 
-                                    
        
-	                                    
      • 
-	                                        
        
-	                                            
-	                                            
-	                                        
        
-	                                    
        • 
-	                                    
      •  
        • 
-                                    
        
-                                    
-                                
        
-                               
-                            
        
-                        
        
-                        
        
-                    
        
-                
        
-            
        
-        
        
-    
        
-
-
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/left_menu.html b/vid/src/main/webapp/app/fusion/scripts/view-models/left_menu.html
deleted file mode 100644
index 84ee6eadd..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/view-models/left_menu.html
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
        
-	
-		
-			
-		    {{app_name}}
-	
-	
        
-		
        
-		    
           
-		    	
        
-		    		
-						
-							
-	                   
-					
-				
        
-		    
        
-		
        	
-	
        
-
        
\ No newline at end of file
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/admin_menu_edit.html b/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/admin_menu_edit.html
deleted file mode 100644
index ee23635fa..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/admin_menu_edit.html
+++ /dev/null
@@ -1,175 +0,0 @@
-
-
-
        
-	
        
-		
        
-	    
        Admin Menu Items
        
-	    
        
-	
        
-		Add menu item here:
-	
        
-		
        
-	    
-	
        
-	
        
-	
        
-		Existing menu items:
-	
        
-	
        
-
-
-
-
        
-
      
-  
-  
      
-    
      
-  
-    
-  
-
      Number of records to show:
-	    
      
-	    	
-	    
      
-    
      	
-  
- 
-
-
-		
-
-
-
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/broadcast.html b/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/broadcast.html
deleted file mode 100644
index a14da0565..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/broadcast.html
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
      
-		
      
-	      
      Broadcast Message Edit
      
-	    
      
-		
-		
          
-				 Please edit the broadcast message details below: 

      
-			
      
-			        
      
-			        
-			
      
-			
      
-			
      
-			          
      
-			          
-			          
-			
      
-			
-			
      
-			          
      
-			          
-			          
-			
      
-		
-			
      
-				
      
-				 
-			
      
-		 
-		        
      	
-						
      
-						
      
-				
      
-		          
-				
      
-			
      
-				
-				
-			
      
-		
      
-
      
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/broadcast_list.html b/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/broadcast_list.html
deleted file mode 100644
index e9c4c291c..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/broadcast_list.html
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
      
-    
-
       	
-	
-	
      Broadcast Messages
      
-	
      
-		
      
-			{{location.label}} Messages
-			
      
-				
-			  	
-				  	
-				  		
-				  			
-				  			
-				  			
-				  			
-				  			
-				  			
-				  			
-				  			
-				  		
-				  	
-				  	
-					  
-					   {{message.id}}
-					    
-					    
-					    
-					    
-					    
-					    
-					    
-					     
-					  
-					 
-					
-				
      No.Message TextStart DateEnd DateSort OrderServerActive?Delete?
      {{$index+1}}{{message.messageText}}
-					    	{{message.displayStartDate}}
-					    {{message.displayEndDate}}{{message.sortOrder}}{{message.siteCd}}
-					    	
      
-					    		
-					    	
      
-					          		
-						    
      
-					     
      
-			
      
-			
-	  	  


      
-		
      
-	
      
-
      
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/collaborate_list.html b/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/collaborate_list.html
deleted file mode 100644
index 5f07a47b8..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/collaborate_list.html
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
      
-	
      
-		
      User List
      
-		
      
-			
-
-			    
-					
-						
-			                    
-			                
-			            
-			                    
-			                     
-			        
-			    
-			    
-			        
-		            	
-		            	
-		            	
-		            	
-		            	
-		        		
-			             
-			    	  
-			
      User IDLast NameFirst NameEmailUser IDOnline/Offline
      {{rowData.id}}{{rowData.lastName}}{{rowData.firstName}}{{rowData.email}}{{rowData.orgUserId}}
-		        		   Offline
-						   Online				
-		        	   
      
-		
      
-	
      	
-	
-	
-	
-		Add the Chrome Extension for DescktopCapture and refresh page
-
      
-
      
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/jcs_admin.html b/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/jcs_admin.html
deleted file mode 100644
index 7da457803..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/jcs_admin.html
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
      
-	
-	
      Cache Regions
      
-	
      
-  	
      
-  	These are the regions which are currently defined in the cache. 'Items'	and 'Bytes' refer to the elements currently in memory (not spooled).
-  	You can clear all items for a region by clicking on the Clear icon next	to the desired region below. You can also clear all regions 
-  	which empties the entire cache.
-  	
      
-	
-		
      
-		
      
-			
      Cache Name
      
-			
      # of Items
      
-			
      Bytes
      
-			
      Status
      
-			
      Memory Hits
      
-			
      Aux Hits
      
-			
      Not Found Misses
      
-			
      Expired Misses
      
-			
      Clear?
      
-			
      Items
      
-		
      
-		
      
-			
      
-				
      {{region.cacheName}}
      
-				
      {{region.size}}
      
-				
      {{region.byteCount}}
      
-				
      {{region.status}}
      
-				
      {{region.hitCountRam}}
      
-				
      {{region.hitCountAux}}
      
-				
      {{region.missCountNotFound}}
      
-				
      {{region.missCountExpired}}
      
-				
      
-					
      
-				
      
-				
      
-					
-					
-				
      
-			
      
-			
      
-				
-				
      Key
      
-				
      Eternal?
      
-				
      Created
      
-				
      Max Life
      
-				
      Expires
      
-				
      Clear?
      
-			
      
-			
      
-				
      
-					
-					
      {{item.key}}
      
-					
      {{item.eternal}}
      
-					
      {{item.createTime}}
      
-					
      {{item.maxLifeSeconds}}
      
-					
      {{item.expiresInSeconds}}
      
-					
      
-						
      
-					
      
-				
      
-			
      
-			
      
-		
      
-	
      
-
      
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/popup_modal.html b/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/popup_modal.html
deleted file mode 100644
index 3cde902c2..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/popup_modal.html
+++ /dev/null
@@ -1,282 +0,0 @@
-
-
-   
-   
-    
-   
-    
-     
-    
-     
-    
-    
-    
-   
-    
-   
-   
-    
-    
-
-
-    
-    
-     
-     
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/popup_modal_fn_menu_add.html b/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/popup_modal_fn_menu_add.html
deleted file mode 100644
index 760f10b55..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/popup_modal_fn_menu_add.html
+++ /dev/null
@@ -1,155 +0,0 @@
-
-
-
-
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/popup_modal_fn_menu_edit.html b/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/popup_modal_fn_menu_edit.html
deleted file mode 100644
index 4c23ba6fc..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/popup_modal_fn_menu_edit.html
+++ /dev/null
@@ -1,148 +0,0 @@
-
-
-
-
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/popup_modal_role.html b/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/popup_modal_role.html
deleted file mode 100644
index 4663bd466..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/popup_modal_role.html
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
-
-
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/popup_modal_rolefunction.html b/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/popup_modal_rolefunction.html
deleted file mode 100644
index b9e8ef0e8..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/popup_modal_rolefunction.html
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/post_search.html b/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/post_search.html
deleted file mode 100644
index 2c4846ddc..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/post_search.html
+++ /dev/null
@@ -1,139 +0,0 @@
-
-
      
-
      User Search
      
-      
      
-  		Please enter search criteria below:
      
-
-            
      
-	          Last Name:
      
-	          
-            
      
-          
-            
      
-	          First Name:
      
-	          
-            
      
-         
-            
      
-	          User ID:
      
-	          
-            
      
-           
-            
      
-	          Manager User ID:
      
-	          
-            
      
-           
      
-            
      
-	          Organization:
      
-	          
-            
      
-           
-            
      
-	          Email:
      
-	          
-            
      
-     
      
-     
      
-		 	
-		
-		    
-	 
      
-	 
      
-	 
-		{{noResultsString}}
-     
-     
      
-  	    
-		  
-		    
-  			
-  			
-  			
-  			
-  			
-  			
-  			
-  			
-		  
-         	
-            	
-              
-              	
-            	
-            	
-            	
-            	
-            	
-                
-            	
-              
-              
-	    
      NoNameOrgUserIdOrganizationPhoneEmailImport?
      
-                {{$index + 1}}
-                                	
-	              
      
-        	          {{profile.lastName}}, {{profile.firstName}}
-            	  
      
-	              
-               
-                      		
-                {{profile.orgUserId}}
-                
-                {{profile.orgCode}}
-                
-                {{profile.phone}}
-                
-                {{profile.email}}
-                
-		            
      
-		            	
      
-		                
-		                
      
-		             
      
-		             
      
-		                Exists
-		             
      
-                
      
-	    
      
-	          Rows Per Page:
-	          
-        
      
-		
      
-	          Current Page:
-	          
-        
      
-        
      
-	          Total Page(s):
-	          
-        
      
-		
-        
      
-          
-        
      
-
-      
      
-      
-
      
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/profile_detail.html b/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/profile_detail.html
deleted file mode 100644
index 31f68577d..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/profile_detail.html
+++ /dev/null
@@ -1,188 +0,0 @@
-
-
      
-     
      
-     
      Profile Edit
      
-     
      
-     Please edit the profile details below: 

      
-
-	
      
-		
      
-		 
-	
      
-
-	
      
-		
      
-		 
-	
      
-     
-	
      
-		
      
-		 		
-	
      
-     
-	
      
-	
      
-		
-	
      
-
      
-	
      
-		
      
-		 
-	
      
-
-	
      
-		
      
-		 
-	
      
-
-	
      
-		
      
-		 
-	
      
-
-	
      
-	
      
-		 
-	
      
-
      
-	
      
-	
      
-		 
-	
      
-
-	
      
-		
      
-		 
-	
      
-
-	
      
-		
      
-		 
-	
      
-
-	
      
-		
      
-		 
-	
      
-
      
-	
      
-	
      
-		 
-	
      
-
-	
      	
-		
      
-		
      
-	
      
-
-	
      
-		
      
-		 
-	
      
-
-	
      	
-		
      
-		
      
-	
      
-	
      
-	
      	
-		
      
-		
      
-	
      
-	
-	
      
-		
-	
      
-	
-
      
-	
      
-		
-		
-   
-	
      
-
-	
-
-	     
-  		
-  			
-  			
-  		
-  		 
-  		 
-
-		  
-		    
-		    
-		  
-		 
-	
      NameRemove?
      {{ role.name }}
-		    	
-		     
      
-	
-	
-	
-	
      
-            
      
-                
      Select Roles
      
-            
      
-            
-            
        
-            
                 	 	
-				
-			        
-				  		
-				  			
-				  			
-				  		
-			  		
-				  
-				    
-				  	  
-					  	
-					    
-				  	  
-				    
-		        
       Role
      
-					  		
      
-					    	
-					    	
      
-					          		{{ availableRole.name }}
      
-            
      
-    
      
-	
-	
-
      
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/profile_search.html b/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/profile_search.html
deleted file mode 100644
index 9f49a80ff..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/profile_search.html
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
      
-	
-		
      Profile Search
      
-		
-		
-
-			    
-					
-						
-			                    
-			                
-			            
-			                    
-			             
-			            
-			                     
-			        
-			    
-			    
-			        
-		            	
-		            	
-		            	
-		            	
-		            	
-		            	
-		            	
-		        		
-			             
-			    	  
-	
      User IDLast NameFirst NameEmailUser IDManager User IDEditActive?
      
-		        		   
      
-		        		     
-		        		   
      
-		        	   
      
-	
-  	    
      
-	          Records Per Page:
-	          
-        
      
- 
-
-        
-
-
      
-
-
      
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/role.html b/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/role.html
deleted file mode 100644
index d372f9159..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/role.html
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
      
-	
      
-	    
-	
      
-	
      Role Edit
      
-	
      
-		
      
-	     Please edit the role details below: 
      
-	
-		
      
-			
      
-			 
-		
      
-	
-		
      
-			
      
-			 
-		
      
-		
-		
      
-			
-		
      
-		
-		
      
-		
      
-			
-			
-		
      
-	
-		
-		     
-	  		
-	  			
-	  			
-	  		
-	  		 
-	  		 
-			  
-			    
-			    
-			  
-			 
-		
      NameRemove?
      {{ roleFunction.name }}
-			    	
      
-			     
      
-		Manage Role Functions

      
-		
-		
      
-			
-			
-		
      
-		
-		
-		     
-	  		
-	  			
-	  			
-	  		
-	  		 
-	  		 
-			  
-			    
-			    
-			  
-			 
-		
      NameRemove?
      {{ role.name }}
-			    	
      
-			     
      
-		
-		
      
-		  
-		  	
-		  		
-		  			
-		  			
-		  		
-		  		
-		  		
-			  	
-			  	
-			    
-			    
-			  
-			  
-			
       Role
      
-			  		
      
-			    	
-			    	
      
-			          		{{ availableRole.name }}
      
-		
      
-	
      
-
      
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/role_function_list.html b/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/role_function_list.html
deleted file mode 100644
index b08510368..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/role_function_list.html
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
       	
-	
      
-			
-	        
      Role Functions
      
-	        
      
-	        
-	        
      
-				
-			
      
-	 

      
-	        
-	
      
-	 
-	
      
-	
      
-	Click on the edit icon to update a role function, the plus icon to add additional role functions, or the delete icon to remove them.
-	
      
-	
      
-	
      
-	  
-	  	
-	  		
-	  			
-	  			
-	  			
-	  			
-	  		
-	  	
-	  	
-		  
-		    
-		    
-		    
-		     
-		  
-		
-		
      NameCodeEdit?Delete?
      
-		    
-		    
      
-		          		
-		    	
-		    	
      
-		     
      
-	
      
-	
-	
-	
      
-	   	
-	   	
      
-		
      
-		 
-		
      
-	   	
      
-	   	
      
-		
      
-		 
-		
      
-		
      
-		
-		
-	
      
-	
-
      
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/role_list.html b/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/role_list.html
deleted file mode 100644
index 1100cbb07..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/role_list.html
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
      
-	
-	
      Roles
      
-
      
-
      
-Click on a Role to view its details.
-     
-
       
-	
      
-	  
-	  	
-	  		
-	  			
-	  			
-	  			
-	  			
-	  		
-	  	
-	  	
-
-		  
-		    
-		    
-		    
-		     
-		  
-		
-		
      NamePriorityActive?Delete?
      {{ availableRole.name }}{{ availableRole.priority }}
-		    	
      
-		    	
-		    	
      
-		          		
-		    	
      
-		     
      
-	
      
-	
-	
      
-		
-	
      
-	
-
      
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/self_profile.html b/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/self_profile.html
deleted file mode 100644
index 0f1877c58..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/self_profile.html
+++ /dev/null
@@ -1,183 +0,0 @@
-
-
-     
-     
      Self Profile
      
-     
      
-     Please edit the profile details below: 

      
-
-	
      
-		
      
-		 
-	
      
-
-	
      
-		
      
-		 
-	
      
-     
-	
      
-		
      
-		 
-	
      
-
-	
      
-	
      
-		 
-	
      
-
      
-	
      
-		
      
-		 
-	
      
-
-	
      
-		
      
-		 
-	
      
-
-	
      
-		
      
-		 
-	
      
-
-	
      
-	
      
-		 
-	
      
-
      
-	
      
-	
      
-		 
-	
      
-
-	
      
-		
      
-		 
-	
      
-
-	
      
-		
      
-		 
-	
      
-
-	
      
-		
      
-		 
-	
      
-
      
-	
      
-	
      
-		 
-	
      
-
-	
      	
-		
      
-		
      
-	
      
-
-	
      
-		
      
-		 
-	
      
-
-	
      	
-		
      
-		
      
-	
      
-	
      
-	
      	
-		
      
-		
      
-	
      
-	
-	
      
-		
-	
      
-	
-
      
-	
      
-		
-		
-   
-	
      
-
-	
-
-	     
-  		
-  			
-  			
-  		
-  		 
-  		 
-
-		  
-		    
-		    
-		  
-		 
-	
      NameRemove?
      {{ role.name }}
-		    	
-		     
      
-	
-	
      
-            
      
-                
      Select Roles
      
-            
      
-            
-            
                 	 	
-				
-			        
-				  		
-				  			
-				  			
-				  		
-			  		
-				  
-				    
-				  	  
-					  	
-					    
-				  	  
-				    
-		        
       Role
      
-					  		
      
-					    	
-					    	
      
-					          		{{ availableRole.name }}
      
-            
      
-    
      
-	
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/usage_list.html b/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/usage_list.html
deleted file mode 100644
index 9bb2c8695..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/view-models/profile-page/usage_list.html
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
       	
-	
      
-	   
      Users
      
-	
      
-    
-    
      
-	    The following shows all users currently logged into the application. Click the icon to expel a user from the application.
-	
      
-	
      
-	  
-	  	
-	  	
-	  		
-	  			
-	  			
-	  			
-	  			
-	  			
-	  			
-	  		
-	  		
-	  			
-	  			
-	  			
-	  			
-	  			
-	  			
-	  		
-	  	
-	  	 
-		  
-		    
-		    
-		    
-		    
-		    
-		    
-		  
-		
-		
      Current User Sessions
      User IdUser NameEmailLast Access Time (minutes)Time Remaining (minutes)Expire User Session?
      {{user.id}}{{user.lastName}}{{user.email}}{{user.lastAccess}}{{user.remaining}}
      Current Session
      
-		  
-		    	
      
-		    
      
-	
      
-
      
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/workflows/workflow-landing.html b/vid/src/main/webapp/app/fusion/scripts/view-models/workflows/workflow-landing.html
deleted file mode 100644
index 2b5e3b602..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/view-models/workflows/workflow-landing.html
+++ /dev/null
@@ -1,130 +0,0 @@
-
-
-
-
-	
-	
-	
-    
-    
-    
-    
-	
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-	
-		
-  		 
-		 
-		
- 				
-	 	 
-		
-		
-		
-		
-		
-		
-		
-	
-		
-		
-	
-
-		
-	
-	
- 		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-	
-		
-		
-			
-		
-		
-		
-		
-		
-		
-				
-		
-		
-	
-		
-		
-		
-	
-        
-        
-        
-        
-				
-                        			 
-    
-        
-        
-        
-        
-        
-        
-		
-		
-	
-		
- 		
-        
-	
-	
-		
      
-	    
      
-		
      
-		
      
-		
      
-		
      
-		
      		
-		
      
-	
-
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/workflows/workflow-listing.html b/vid/src/main/webapp/app/fusion/scripts/view-models/workflows/workflow-listing.html
deleted file mode 100644
index ceb886778..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/view-models/workflows/workflow-listing.html
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
      
-
      
-	
      
-		
      
-			
      
-				
      
-		
      
-		
      
-			
      
-				
      
-					
-				
      
-			
      
-		
      
-	
      
-
      
-  	
-
-
-
-
-    	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-						
-			
-			
-			
-			
-		
-	
-	  
-
-	
-				
-			
-			
-			
-			
-			
-						
-			
-			
-			
-			
-			
-						
-			
-			
-		
-	
-
      IdNameKeyDescriptionWorkflow Server URLViewActiveCreated Created ByActionScheduleEditDelete?
      {{workflow.id}}{{workflow.name}}{{workflow.workflowKey}}{{workflow.description}}{{workflow.runLink}}
      		{{workflow.active}}{{workflow.created}}{{workflow.createdBy}}
      
-			
      
-  
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/workflows/workflow-new.html b/vid/src/main/webapp/app/fusion/scripts/view-models/workflows/workflow-new.html
deleted file mode 100644
index 4622b928f..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/view-models/workflows/workflow-new.html
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
      
-	
      
-		
      Create Workflows
      
-	
      
-	
      
-		
      
-			
-			
      
-				
-
-				
      
-					
-
-					
      
-						Workflow Name is required !!! 
-					
      
-
-				
      
-			
      
-			
-			
-			
      
-				
-				
      
-					
-
-					
      
-						Workflow Key is required !!! 
-					
      
-
-				
      
-			
      
-			
-
-			
      
-				
-
-				
      
-																		
-				
      
-			
      
-
-			
      
-				
-				
      
-					
-				
      
-								
-				
      
-					Run Link is required !!!
-					Not valid url! 
-				
      				
-				
-			
      
-			
-			
-			
-			
      
-				
-				
      
-					
-					
-					Active
-					Inactive
-					
-					
-				
      
-			
      
-			
-			
      
-				OK
-				Cancel				
-			
      
-		
      
-		
      
-	
      
-
      
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/workflows/workflow-preview.html b/vid/src/main/webapp/app/fusion/scripts/view-models/workflows/workflow-preview.html
deleted file mode 100644
index 80fece4ef..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/view-models/workflows/workflow-preview.html
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
      
-	
      
-		
      View Workflow
      
-	
      
-	
      
-		
      
-			
-			
      			
-			
-			
      
-			
      
-				
-			
      
-		
      
-		
      
-	
      
-
      
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/workflows/workflow-remove.html b/vid/src/main/webapp/app/fusion/scripts/view-models/workflows/workflow-remove.html
deleted file mode 100644
index e21efad8e..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/view-models/workflows/workflow-remove.html
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
      
-	
      
-		
      Remove Workflow?
      
-	
      
-	
      
-		
      
-			
-			
      
-				
-			
      
-						
-			
      
-				OK
-				Cancel
-			
      
-		
      
-		
      
-	
      
-
      
diff --git a/vid/src/main/webapp/app/fusion/scripts/view-models/workflows/workflow-schedule.html b/vid/src/main/webapp/app/fusion/scripts/view-models/workflows/workflow-schedule.html
deleted file mode 100644
index aebc04fbd..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/view-models/workflows/workflow-schedule.html
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
      
-	
      
-		
      Workflow: {{workflowToSchedule.name}}
      
-						
-			
- 			
- 			
      Workflow Key: {{workflowToSchedule.workflowKey}}
      Workflow Description: {{workflowToSchedule.description}}
      
-	
      
-
-	
      
-		
      
-		
- 
- 
-	  
-	  
-	    
-	    
-	  
- 
-
-
-
-
-
-
- 
-		
-	    
-	    
-	    
-
-		
-
-		
-	    
-	    
-	    
-	    :
-
-
- 
-
-
-
-
-
      
-	    
-	    
-
      
-	    
      
-	          		              
      
- 
-
-Pick a date:
-
-Hour:
-
-Minute:
-
      
-			
      
-	    		
-	  		
      
-	          		
-			
-			
-	    
-	    
      
-	          		
-	   	
        
-	    
      
-			
      
-	    		
-	  		
      
-	          		
-			
-	    
-	    
        
-	          		
-	   	
        
-	    
      
-			
      
-				OK
-				Cancel
-			
      
-			
-		
-		
      
-	
      
-
      
diff --git a/vid/src/main/webapp/app/fusion/scripts/webrtc/RTCMultiConnection.js b/vid/src/main/webapp/app/fusion/scripts/webrtc/RTCMultiConnection.js
deleted file mode 100644
index 449e8d591..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/webrtc/RTCMultiConnection.js
+++ /dev/null
@@ -1,6788 +0,0 @@
-// Last time updated at Monday, December 21st, 2015, 5:25:26 PM 
-
-// Quick-Demo for newbies: http://jsfiddle.net/c46de0L8/
-// Another simple demo: http://jsfiddle.net/zar6fg60/
-
-// Latest file can be found here: https://cdn.webrtc-experiment.com/RTCMultiConnection.js
-
-// Muaz Khan     - www.MuazKhan.com
-// MIT License   - www.WebRTC-Experiment.com/licence
-// Documentation - www.RTCMultiConnection.org/docs
-// FAQ           - www.RTCMultiConnection.org/FAQ
-// Changes log   - www.RTCMultiConnection.org/changes-log/
-// Demos         - www.WebRTC-Experiment.com/RTCMultiConnection
-
-// _________________________
-// RTCMultiConnection-v2.2.2
-
-(function() {
-
-    // RMC == RTCMultiConnection
-    // usually page-URL is used as channel-id
-    // you can always override it!
-    // www.RTCMultiConnection.org/docs/channel-id/
-    window.RMCDefaultChannel = location.href.replace(/\/|:|#|\?|\$|\^|%|\.|`|~|!|\+|@|\[|\||]|\|*. /g, '').split('\n').join('').split('\r').join('');
-
-    // www.RTCMultiConnection.org/docs/constructor/
-    window.RTCMultiConnection = function(channel) {
-        // an instance of constructor
-        var connection = this;
-
-        // a reference to RTCMultiSession
-        var rtcMultiSession;
-
-        // setting default channel or channel passed through constructor
-        connection.channel = channel || RMCDefaultChannel;
-
-        // to allow single user to join multiple rooms;
-        // you can change this property at runtime!
-        connection.isAcceptNewSession = true;
-
-        // www.RTCMultiConnection.org/docs/open/
-        connection.open = function(args) {
-            connection.isAcceptNewSession = false;
-
-            // www.RTCMultiConnection.org/docs/session-initiator/
-            // you can always use this property to determine room owner!
-            connection.isInitiator = true;
-
-            var dontTransmit = false;
-
-            // a channel can contain multiple rooms i.e. sessions
-            if (args) {
-                if (isString(args)) {
-                    connection.sessionid = args;
-                } else {
-                    if (!isNull(args.transmitRoomOnce)) {
-                        connection.transmitRoomOnce = args.transmitRoomOnce;
-                    }
-
-                    if (!isNull(args.dontTransmit)) {
-                        dontTransmit = args.dontTransmit;
-                    }
-
-                    if (!isNull(args.sessionid)) {
-                        connection.sessionid = args.sessionid;
-                    }
-                }
-            }
-
-            // if firebase && if session initiator
-            if (connection.socket && connection.socket.remove) {
-                connection.socket.remove();
-            }
-
-            if (!connection.sessionid) connection.sessionid = connection.channel;
-            connection.sessionDescription = {
-                sessionid: connection.sessionid,
-                userid: connection.userid,
-                session: connection.session,
-                extra: connection.extra
-            };
-
-            if (!connection.sessionDescriptions[connection.sessionDescription.sessionid]) {
-                connection.numberOfSessions++;
-                connection.sessionDescriptions[connection.sessionDescription.sessionid] = connection.sessionDescription;
-            }
-
-            // connect with signaling channel
-            initRTCMultiSession(function() {
-                // "captureUserMediaOnDemand" is disabled by default.
-                // invoke "getUserMedia" only when first participant found.
-                rtcMultiSession.captureUserMediaOnDemand = args ? !!args.captureUserMediaOnDemand : false;
-
-                if (args && args.onMediaCaptured) {
-                    connection.onMediaCaptured = args.onMediaCaptured;
-                }
-
-                // for session-initiator, user-media is captured as soon as "open" is invoked.
-                if (!rtcMultiSession.captureUserMediaOnDemand) captureUserMedia(function() {
-                    rtcMultiSession.initSession({
-                        sessionDescription: connection.sessionDescription,
-                        dontTransmit: dontTransmit
-                    });
-
-                    invokeMediaCaptured(connection);
-                });
-
-                if (rtcMultiSession.captureUserMediaOnDemand) {
-                    rtcMultiSession.initSession({
-                        sessionDescription: connection.sessionDescription,
-                        dontTransmit: dontTransmit
-                    });
-                }
-            });
-            return connection.sessionDescription;
-        };
-
-        // www.RTCMultiConnection.org/docs/connect/
-        connection.connect = function(sessionid) {
-            // a channel can contain multiple rooms i.e. sessions
-            if (sessionid) {
-                connection.sessionid = sessionid;
-            }
-
-            // connect with signaling channel
-            initRTCMultiSession(function() {
-                log('Signaling channel is ready.');
-            });
-
-            return this;
-        };
-
-        // www.RTCMultiConnection.org/docs/join/
-        connection.join = joinSession;
-
-        // www.RTCMultiConnection.org/docs/send/
-        connection.send = function(data, _channel) {
-            if (connection.numberOfConnectedUsers <= 0) {
-                // no connections
-                setTimeout(function() {
-                    // try again
-                    connection.send(data, _channel);
-                }, 1000);
-                return;
-            }
-
-            // send file/data or /text
-            if (!data)
-                throw 'No file, data or text message to share.';
-
-            // connection.send([file1, file2, file3])
-            // you can share multiple files, strings or data objects using "send" method!
-            if (data instanceof Array && !isNull(data[0].size) && !isNull(data[0].type)) {
-                // this mechanism can cause failure for subsequent packets/data 
-                // on Firefox especially; and on chrome as well!
-                // todo: need to use setTimeout instead.
-                for (var i = 0; i < data.length; i++) {
-                    data[i].size && data[i].type && connection.send(data[i], _channel);
-                }
-                return;
-            }
-
-            // File or Blob object MUST have "type" and "size" properties
-            if (!isNull(data.size) && !isNull(data.type)) {
-                if (!connection.enableFileSharing) {
-                    throw '"enableFileSharing" boolean MUST be "true" to support file sharing.';
-                }
-
-                if (!rtcMultiSession.fileBufferReader) {
-                    initFileBufferReader(connection, function(fbr) {
-                        rtcMultiSession.fileBufferReader = fbr;
-                        connection.send(data, _channel);
-                    });
-                    return;
-                }
-
-                var extra = merge({
-                    userid: connection.userid
-                }, data.extra || connection.extra);
-
-                rtcMultiSession.fileBufferReader.readAsArrayBuffer(data, function(uuid) {
-                    rtcMultiSession.fileBufferReader.getNextChunk(uuid, function(nextChunk, isLastChunk, extra) {
-                        if (_channel) _channel.send(nextChunk);
-                        else rtcMultiSession.send(nextChunk);
-                    });
-                }, extra);
-            } else {
-                // to allow longest string messages
-                // and largest data objects
-                // or anything of any size!
-                // to send multiple data objects concurrently!
-
-                TextSender.send({
-                    text: data,
-                    channel: rtcMultiSession,
-                    _channel: _channel,
-                    connection: connection
-                });
-            }
-        };
-
-        function initRTCMultiSession(onSignalingReady) {
-            if (screenFrame) {
-                loadScreenFrame();
-            }
-
-            // RTCMultiSession is the backbone object;
-            // this object MUST be initialized once!
-            if (rtcMultiSession) return onSignalingReady();
-
-            // your everything is passed over RTCMultiSession constructor!
-            rtcMultiSession = new RTCMultiSession(connection, onSignalingReady);
-        }
-
-        connection.disconnect = function() {
-            if (rtcMultiSession) rtcMultiSession.disconnect();
-            rtcMultiSession = null;
-        };
-
-        function joinSession(session, joinAs) {
-            if (isString(session)) {
-                connection.skipOnNewSession = true;
-            }
-
-            if (!rtcMultiSession) {
-                log('Signaling channel is not ready. Connecting...');
-                // connect with signaling channel
-                initRTCMultiSession(function() {
-                    log('Signaling channel is connected. Joining the session again...');
-                    setTimeout(function() {
-                        joinSession(session, joinAs);
-                    }, 1000);
-                });
-                return;
-            }
-
-            // connection.join('sessionid');
-            if (isString(session)) {
-                if (connection.sessionDescriptions[session]) {
-                    session = connection.sessionDescriptions[session];
-                } else
-                    return setTimeout(function() {
-                        log('Session-Descriptions not found. Rechecking..');
-                        joinSession(session, joinAs);
-                    }, 1000);
-            }
-
-            // connection.join('sessionid', { audio: true });
-            if (joinAs) {
-                return captureUserMedia(function() {
-                    session.oneway = true;
-                    joinSession(session);
-                }, joinAs);
-            }
-
-            if (!session || !session.userid || !session.sessionid) {
-                error('missing arguments', arguments);
-
-                var error = 'Invalid data passed over "connection.join" method.';
-                connection.onstatechange({
-                    userid: 'browser',
-                    extra: {},
-                    name: 'Unexpected data detected.',
-                    reason: error
-                });
-
-                throw error;
-            }
-
-            if (!connection.dontOverrideSession) {
-                connection.session = session.session;
-            }
-
-            var extra = connection.extra || session.extra || {};
-
-            // todo: need to verify that if-block statement works as expected.
-            // expectations: if it is oneway streaming; or if it is data-only connection
-            // then, it shouldn't capture user-media on participant's side.
-            if (session.oneway || isData(session)) {
-                rtcMultiSession.joinSession(session, extra);
-            } else {
-                captureUserMedia(function() {
-                    rtcMultiSession.joinSession(session, extra);
-                });
-            }
-        }
-
-        var isFirstSession = true;
-
-        // www.RTCMultiConnection.org/docs/captureUserMedia/
-
-        function captureUserMedia(callback, _session, dontCheckChromExtension) {
-            // capture user's media resources
-            var session = _session || connection.session;
-
-            if (isEmpty(session)) {
-                if (callback) callback();
-                return;
-            }
-
-            // you can force to skip media capturing!
-            if (connection.dontCaptureUserMedia) {
-                return callback();
-            }
-
-            // if it is data-only connection
-            // if it is one-way connection and current user is participant
-            if (isData(session) || (!connection.isInitiator && session.oneway)) {
-                // www.RTCMultiConnection.org/docs/attachStreams/
-                connection.attachStreams = [];
-                return callback();
-            }
-
-            var constraints = {
-                audio: !!session.audio ? {
-                    mandatory: {},
-                    optional: [{
-                        chromeRenderToAssociatedSink: true
-                    }]
-                } : false,
-                video: !!session.video
-            };
-
-            // if custom audio device is selected
-            if (connection._mediaSources.audio) {
-                constraints.audio.optional.push({
-                    sourceId: connection._mediaSources.audio
-                });
-            }
-
-            // if custom video device is selected
-            if (connection._mediaSources.video) {
-                constraints.video = {
-                    optional: [{
-                        sourceId: connection._mediaSources.video
-                    }]
-                };
-            }
-
-            // for connection.session = {};
-            if (!session.screen && !constraints.audio && !constraints.video) {
-                return callback();
-            }
-
-            var screen_constraints = {
-                audio: false,
-                video: {
-                    mandatory: {
-                        chromeMediaSource: DetectRTC.screen.chromeMediaSource,
-                        maxWidth: screen.width > 1920 ? screen.width : 1920,
-                        maxHeight: screen.height > 1080 ? screen.height : 1080
-                    },
-                    optional: []
-                }
-            };
-
-            if (isFirefox && session.screen) {
-                if (location.protocol !== 'https:') {
-                    return error(SCREEN_COMMON_FAILURE);
-                }
-                warn(Firefox_Screen_Capturing_Warning);
-
-                screen_constraints.video = merge(screen_constraints.video.mandatory, {
-                    mozMediaSource: 'window', // mozMediaSource is redundant here
-                    mediaSource: 'window' // 'screen' || 'window'
-                });
-
-                // Firefox is supporting audio+screen from single getUserMedia request
-                // audio+video+screen will become audio+screen for Firefox
-                // because Firefox isn't supporting multi-streams feature version < 38
-                // version >38 supports multi-stream sharing.
-                // we can use:  firefoxVersion < 38
-                // however capturing audio and screen using single getUserMedia is a better option
-                if (constraints.audio /* && !session.video */ ) {
-                    screen_constraints.audio = true;
-                    constraints = {};
-                }
-
-                delete screen_constraints.video.chromeMediaSource;
-            }
-
-            // if screen is prompted
-            if (session.screen) {
-                if (isChrome && DetectRTC.screen.extensionid != ReservedExtensionID) {
-                    useCustomChromeExtensionForScreenCapturing = true;
-                }
-
-                if (isChrome && !useCustomChromeExtensionForScreenCapturing && !dontCheckChromExtension && !DetectRTC.screen.sourceId) {
-                    listenEventHandler('message', onIFrameCallback);
-
-                    function onIFrameCallback(event) {
-                        if (event.data && event.data.chromeMediaSourceId) {
-                            // this event listener is no more needed
-                            window.removeEventListener('message', onIFrameCallback);
-
-                            var sourceId = event.data.chromeMediaSourceId;
-
-                            DetectRTC.screen.sourceId = sourceId;
-                            DetectRTC.screen.chromeMediaSource = 'desktop';
-
-                            if (sourceId == 'PermissionDeniedError') {
-                                var mediaStreamError = {
-                                    message: location.protocol == 'https:' ? 'User denied to share content of his screen.' : SCREEN_COMMON_FAILURE,
-                                    name: 'PermissionDeniedError',
-                                    constraintName: screen_constraints,
-                                    session: session
-                                };
-                                currentUserMediaRequest.mutex = false;
-                                DetectRTC.screen.sourceId = null;
-                                return connection.onMediaError(mediaStreamError);
-                            }
-
-                            captureUserMedia(callback, _session);
-                        }
-
-                        if (event.data && event.data.chromeExtensionStatus) {
-                            warn('Screen capturing extension status is:', event.data.chromeExtensionStatus);
-                            DetectRTC.screen.chromeMediaSource = 'screen';
-                            captureUserMedia(callback, _session, true);
-                        }
-                    }
-
-                    if (!screenFrame) {
-                        loadScreenFrame();
-                    }
-
-                    screenFrame.postMessage();
-                    return;
-                }
-
-                // check if screen capturing extension is installed.
-                if (isChrome && useCustomChromeExtensionForScreenCapturing && !dontCheckChromExtension && DetectRTC.screen.chromeMediaSource == 'screen' && DetectRTC.screen.extensionid) {
-                    if (DetectRTC.screen.extensionid == ReservedExtensionID && document.domain.indexOf('webrtc-experiment.com') == -1) {
-                        return captureUserMedia(callback, _session, true);
-                    }
-
-                    log('checking if chrome extension is installed.');
-                    DetectRTC.screen.getChromeExtensionStatus(function(status) {
-                        if (status == 'installed-enabled') {
-                            DetectRTC.screen.chromeMediaSource = 'desktop';
-                        }
-
-                        captureUserMedia(callback, _session, true);
-                        log('chrome extension is installed?', DetectRTC.screen.chromeMediaSource == 'desktop');
-                    });
-                    return;
-                }
-
-                if (isChrome && useCustomChromeExtensionForScreenCapturing && DetectRTC.screen.chromeMediaSource == 'desktop' && !DetectRTC.screen.sourceId) {
-                    DetectRTC.screen.getSourceId(function(sourceId) {
-                        if (sourceId == 'PermissionDeniedError') {
-                            var mediaStreamError = {
-                                message: 'User denied to share content of his screen.',
-                                name: 'PermissionDeniedError',
-                                constraintName: screen_constraints,
-                                session: session
-                            };
-                            currentUserMediaRequest.mutex = false;
-                            DetectRTC.screen.chromeMediaSource = 'desktop';
-                            return connection.onMediaError(mediaStreamError);
-                        }
-
-                        if (sourceId == 'No-Response') {
-                            error('Chrome extension seems not available. Make sure that manifest.json#L16 has valid content-script matches pointing to your URL.');
-                            DetectRTC.screen.chromeMediaSource = 'screen';
-                            return captureUserMedia(callback, _session, true);
-                        }
-
-                        captureUserMedia(callback, _session, true);
-                    });
-                    return;
-                }
-
-                if (isChrome && DetectRTC.screen.chromeMediaSource == 'desktop') {
-                    screen_constraints.video.mandatory.chromeMediaSourceId = DetectRTC.screen.sourceId;
-                }
-
-                var _isFirstSession = isFirstSession;
-
-                _captureUserMedia(screen_constraints, constraints.audio || constraints.video ? function() {
-
-                    if (_isFirstSession) isFirstSession = true;
-
-                    _captureUserMedia(constraints, callback);
-                } : callback);
-            } else _captureUserMedia(constraints, callback, session.audio && !session.video);
-
-            function _captureUserMedia(forcedConstraints, forcedCallback, isRemoveVideoTracks, dontPreventSSLAutoAllowed) {
-                connection.onstatechange({
-                    userid: 'browser',
-                    extra: {},
-                    name: 'fetching-usermedia',
-                    reason: 'About to capture user-media with constraints: ' + toStr(forcedConstraints)
-                });
-
-
-                if (connection.preventSSLAutoAllowed && !dontPreventSSLAutoAllowed && isChrome) {
-                    // if navigator.customGetUserMediaBar.js is missing
-                    if (!navigator.customGetUserMediaBar) {
-                        loadScript(connection.resources.customGetUserMediaBar, function() {
-                            _captureUserMedia(forcedConstraints, forcedCallback, isRemoveVideoTracks, dontPreventSSLAutoAllowed);
-                        });
-                        return;
-                    }
-
-                    navigator.customGetUserMediaBar(forcedConstraints, function() {
-                        _captureUserMedia(forcedConstraints, forcedCallback, isRemoveVideoTracks, true);
-                    }, function() {
-                        connection.onMediaError({
-                            name: 'PermissionDeniedError',
-                            message: 'User denied permission.',
-                            constraintName: forcedConstraints,
-                            session: session
-                        });
-                    });
-                    return;
-                }
-
-                var mediaConfig = {
-                    onsuccess: function(stream, returnBack, idInstance, streamid) {
-                        onStreamSuccessCallback(stream, returnBack, idInstance, streamid, forcedConstraints, forcedCallback, isRemoveVideoTracks, screen_constraints, constraints, session);
-                    },
-                    onerror: function(e, constraintUsed) {
-                        // http://goo.gl/hrwF1a
-                        if (isFirefox) {
-                            if (e == 'PERMISSION_DENIED') {
-                                e = {
-                                    message: '',
-                                    name: 'PermissionDeniedError',
-                                    constraintName: constraintUsed,
-                                    session: session
-                                };
-                            }
-                        }
-
-                        if (isFirefox && constraintUsed.video && constraintUsed.video.mozMediaSource) {
-                            mediaStreamError = {
-                                message: Firefox_Screen_Capturing_Warning,
-                                name: e.name || 'PermissionDeniedError',
-                                constraintName: constraintUsed,
-                                session: session
-                            };
-
-                            connection.onMediaError(mediaStreamError);
-                            return;
-                        }
-
-                        if (isString(e)) {
-                            return connection.onMediaError({
-                                message: 'Unknown Error',
-                                name: e,
-                                constraintName: constraintUsed,
-                                session: session
-                            });
-                        }
-
-                        // it seems that chrome 35+ throws "DevicesNotFoundError" exception 
-                        // when any of the requested media is either denied or absent
-                        if (e.name && (e.name == 'PermissionDeniedError' || e.name == 'DevicesNotFoundError')) {
-                            var mediaStreamError = 'Either: ';
-                            mediaStreamError += '\n Media resolutions are not permitted.';
-                            mediaStreamError += '\n Another application is using same media device.';
-                            mediaStreamError += '\n Media device is not attached or drivers not installed.';
-                            mediaStreamError += '\n You denied access once and it is still denied.';
-
-                            if (e.message && e.message.length) {
-                                mediaStreamError += '\n ' + e.message;
-                            }
-
-                            mediaStreamError = {
-                                message: mediaStreamError,
-                                name: e.name,
-                                constraintName: constraintUsed,
-                                session: session
-                            };
-
-                            connection.onMediaError(mediaStreamError);
-
-                            if (isChrome && (session.audio || session.video)) {
-                                // todo: this snippet fails if user has two or more 
-                                // microphone/webcam attached.
-                                DetectRTC.load(function() {
-                                    // it is possible to check presence of the microphone before using it!
-                                    if (session.audio && !DetectRTC.hasMicrophone) {
-                                        warn('It seems that you have no microphone attached to your device/system.');
-                                        session.audio = session.audio = false;
-
-                                        if (!session.video) {
-                                            alert('It seems that you are capturing microphone and there is no device available or access is denied. Reloading...');
-                                            location.reload();
-                                        }
-                                    }
-
-                                    // it is possible to check presence of the webcam before using it!
-                                    if (session.video && !DetectRTC.hasWebcam) {
-                                        warn('It seems that you have no webcam attached to your device/system.');
-                                        session.video = session.video = false;
-
-                                        if (!session.audio) {
-                                            alert('It seems that you are capturing webcam and there is no device available or access is denied. Reloading...');
-                                            location.reload();
-                                        }
-                                    }
-
-                                    if (!DetectRTC.hasMicrophone && !DetectRTC.hasWebcam) {
-                                        alert('It seems that either both microphone/webcam are not available or access is denied. Reloading...');
-                                        location.reload();
-                                    } else if (!connection.getUserMediaPromptedOnce) {
-                                        // make maximum two tries!
-                                        connection.getUserMediaPromptedOnce = true;
-                                        captureUserMedia(callback, session);
-                                    }
-                                });
-                            }
-                        }
-
-                        if (e.name && e.name == 'ConstraintNotSatisfiedError') {
-                            var mediaStreamError = 'Either: ';
-                            mediaStreamError += '\n You are prompting unknown media resolutions.';
-                            mediaStreamError += '\n You are using invalid media constraints.';
-
-                            if (e.message && e.message.length) {
-                                mediaStreamError += '\n ' + e.message;
-                            }
-
-                            mediaStreamError = {
-                                message: mediaStreamError,
-                                name: e.name,
-                                constraintName: constraintUsed,
-                                session: session
-                            };
-
-                            connection.onMediaError(mediaStreamError);
-                        }
-
-                        if (session.screen) {
-                            if (isFirefox) {
-                                error(Firefox_Screen_Capturing_Warning);
-                            } else if (location.protocol !== 'https:') {
-                                if (!isNodeWebkit && (location.protocol == 'file:' || location.protocol == 'http:')) {
-                                    error('You cannot use HTTP or file protocol for screen capturing. You must either use HTTPs or chrome extension page or Node-Webkit page.');
-                                }
-                            } else {
-                                error('Unable to detect actual issue. Maybe "deprecated" screen capturing flag was not set using command line or maybe you clicked "No" button or maybe chrome extension returned invalid "sourceId". Please install chrome-extension: http://bit.ly/webrtc-screen-extension');
-                            }
-                        }
-
-                        currentUserMediaRequest.mutex = false;
-
-                        // to make sure same stream can be captured again!
-                        var idInstance = JSON.stringify(constraintUsed);
-                        if (currentUserMediaRequest.streams[idInstance]) {
-                            delete currentUserMediaRequest.streams[idInstance];
-                        }
-                    },
-                    mediaConstraints: connection.mediaConstraints || {}
-                };
-
-                mediaConfig.constraints = forcedConstraints || constraints;
-                mediaConfig.connection = connection;
-                getUserMedia(mediaConfig);
-            }
-        }
-
-        function onStreamSuccessCallback(stream, returnBack, idInstance, streamid, forcedConstraints, forcedCallback, isRemoveVideoTracks, screen_constraints, constraints, session) {
-            if (!streamid) streamid = getRandomString();
-
-            connection.onstatechange({
-                userid: 'browser',
-                extra: {},
-                name: 'usermedia-fetched',
-                reason: 'Captured user media using constraints: ' + toStr(forcedConstraints)
-            });
-
-            if (isRemoveVideoTracks) {
-                stream = convertToAudioStream(stream);
-            }
-
-            connection.localStreamids.push(streamid);
-            stream.onended = function() {
-                if (streamedObject.mediaElement && !streamedObject.mediaElement.parentNode && document.getElementById(stream.streamid)) {
-                    streamedObject.mediaElement = document.getElementById(stream.streamid);
-                }
-
-                // when a stream is stopped; it must be removed from "attachStreams" array
-                connection.attachStreams.forEach(function(_stream, index) {
-                    if (_stream == stream) {
-                        delete connection.attachStreams[index];
-                        connection.attachStreams = swap(connection.attachStreams);
-                    }
-                });
-
-                onStreamEndedHandler(streamedObject, connection);
-
-                if (connection.streams[streamid]) {
-                    connection.removeStream(streamid);
-                }
-
-                // if user clicks "stop" button to close screen sharing
-                var _stream = connection.streams[streamid];
-                if (_stream && _stream.sockets.length) {
-                    _stream.sockets.forEach(function(socket) {
-                        socket.send({
-                            streamid: _stream.streamid,
-                            stopped: true
-                        });
-                    });
-                }
-
-                currentUserMediaRequest.mutex = false;
-                // to make sure same stream can be captured again!
-                if (currentUserMediaRequest.streams[idInstance]) {
-                    delete currentUserMediaRequest.streams[idInstance];
-                }
-
-                // to allow re-capturing of the screen
-                DetectRTC.screen.sourceId = null;
-            };
-
-            if (!isIE) {
-                stream.streamid = streamid;
-                stream.isScreen = forcedConstraints == screen_constraints;
-                stream.isVideo = forcedConstraints == constraints && !!constraints.video;
-                stream.isAudio = forcedConstraints == constraints && !!constraints.audio && !constraints.video;
-
-                // if muted stream is negotiated
-                stream.preMuted = {
-                    audio: stream.getAudioTracks().length && !stream.getAudioTracks()[0].enabled,
-                    video: stream.getVideoTracks().length && !stream.getVideoTracks()[0].enabled
-                };
-            }
-
-            var mediaElement = createMediaElement(stream, session);
-            mediaElement.muted = true;
-
-            var streamedObject = {
-                stream: stream,
-                streamid: streamid,
-                mediaElement: mediaElement,
-                blobURL: mediaElement.mozSrcObject ? URL.createObjectURL(stream) : mediaElement.src,
-                type: 'local',
-                userid: connection.userid,
-                extra: connection.extra,
-                session: session,
-                isVideo: !!stream.isVideo,
-                isAudio: !!stream.isAudio,
-                isScreen: !!stream.isScreen,
-                isInitiator: !!connection.isInitiator,
-                rtcMultiConnection: connection
-            };
-
-            if (isFirstSession) {
-                connection.attachStreams.push(stream);
-            }
-            isFirstSession = false;
-
-            connection.streams[streamid] = connection._getStream(streamedObject);
-
-            if (!returnBack) {
-                connection.onstream(streamedObject);
-            }
-
-            if (connection.setDefaultEventsForMediaElement) {
-                connection.setDefaultEventsForMediaElement(mediaElement, streamid);
-            }
-
-            if (forcedCallback) forcedCallback(stream, streamedObject);
-
-            if (connection.onspeaking) {
-                initHark({
-                    stream: stream,
-                    streamedObject: streamedObject,
-                    connection: connection
-                });
-            }
-        }
-
-        // www.RTCMultiConnection.org/docs/captureUserMedia/
-        connection.captureUserMedia = captureUserMedia;
-
-        // www.RTCMultiConnection.org/docs/leave/
-        connection.leave = function(userid) {
-            if (!rtcMultiSession) return;
-
-            isFirstSession = true;
-
-            if (userid) {
-                connection.eject(userid);
-                return;
-            }
-
-            rtcMultiSession.leave();
-        };
-
-        // www.RTCMultiConnection.org/docs/eject/
-        connection.eject = function(userid) {
-            if (!connection.isInitiator) throw 'Only session-initiator can eject a user.';
-            if (!connection.peers[userid]) throw 'You ejected invalid user.';
-            connection.peers[userid].sendCustomMessage({
-                ejected: true
-            });
-        };
-
-        // www.RTCMultiConnection.org/docs/close/
-        connection.close = function() {
-            // close entire session
-            connection.autoCloseEntireSession = true;
-            connection.leave();
-        };
-
-        // www.RTCMultiConnection.org/docs/renegotiate/
-        connection.renegotiate = function(stream, session) {
-            if (connection.numberOfConnectedUsers <= 0) {
-                // no connections
-                setTimeout(function() {
-                    // try again
-                    connection.renegotiate(stream, session);
-                }, 1000);
-                return;
-            }
-
-            rtcMultiSession.addStream({
-                renegotiate: session || merge({
-                    oneway: true
-                }, connection.session),
-                stream: stream
-            });
-        };
-
-        connection.attachExternalStream = function(stream, isScreen) {
-            var constraints = {};
-            if (stream.getAudioTracks && stream.getAudioTracks().length) {
-                constraints.audio = true;
-            }
-            if (stream.getVideoTracks && stream.getVideoTracks().length) {
-                constraints.video = true;
-            }
-
-            var screen_constraints = {
-                video: {
-                    chromeMediaSource: 'fake'
-                }
-            };
-            var forcedConstraints = isScreen ? screen_constraints : constraints;
-            onStreamSuccessCallback(stream, false, '', null, forcedConstraints, false, false, screen_constraints, constraints, constraints);
-        };
-
-        // www.RTCMultiConnection.org/docs/addStream/
-        connection.addStream = function(session, socket) {
-            // www.RTCMultiConnection.org/docs/renegotiation/
-
-            if (connection.numberOfConnectedUsers <= 0) {
-                // no connections
-                setTimeout(function() {
-                    // try again
-                    connection.addStream(session, socket);
-                }, 1000);
-                return;
-            }
-
-            // renegotiate new media stream
-            if (session) {
-                var isOneWayStreamFromParticipant;
-                if (!connection.isInitiator && session.oneway) {
-                    session.oneway = false;
-                    isOneWayStreamFromParticipant = true;
-                }
-
-                captureUserMedia(function(stream) {
-                    if (isOneWayStreamFromParticipant) {
-                        session.oneway = true;
-                    }
-                    addStream(stream);
-                }, session);
-            } else addStream();
-
-            function addStream(stream) {
-                rtcMultiSession.addStream({
-                    stream: stream,
-                    renegotiate: session || connection.session,
-                    socket: socket
-                });
-            }
-        };
-
-        // www.RTCMultiConnection.org/docs/removeStream/
-        connection.removeStream = function(streamid, dontRenegotiate) {
-            if (connection.numberOfConnectedUsers <= 0) {
-                // no connections
-                setTimeout(function() {
-                    // try again
-                    connection.removeStream(streamid, dontRenegotiate);
-                }, 1000);
-                return;
-            }
-
-            if (!streamid) streamid = 'all';
-            if (!isString(streamid) || streamid.search(/all|audio|video|screen/gi) != -1) {
-                function _detachStream(_stream, config) {
-                    if (config.local && _stream.type != 'local') return;
-                    if (config.remote && _stream.type != 'remote') return;
-
-                    // connection.removeStream({screen:true});
-                    if (config.screen && !!_stream.isScreen) {
-                        connection.detachStreams.push(_stream.streamid);
-                    }
-
-                    // connection.removeStream({audio:true});
-                    if (config.audio && !!_stream.isAudio) {
-                        connection.detachStreams.push(_stream.streamid);
-                    }
-
-                    // connection.removeStream({video:true});
-                    if (config.video && !!_stream.isVideo) {
-                        connection.detachStreams.push(_stream.streamid);
-                    }
-
-                    // connection.removeStream({});
-                    if (!config.audio && !config.video && !config.screen) {
-                        connection.detachStreams.push(_stream.streamid);
-                    }
-
-                    if (connection.detachStreams.indexOf(_stream.streamid) != -1) {
-                        log('removing stream', _stream.streamid);
-                        onStreamEndedHandler(_stream, connection);
-
-                        if (config.stop) {
-                            connection.stopMediaStream(_stream.stream);
-                        }
-                    }
-                }
-
-                for (var stream in connection.streams) {
-                    if (connection._skip.indexOf(stream) == -1) {
-                        _stream = connection.streams[stream];
-
-                        if (streamid == 'all') _detachStream(_stream, {
-                            audio: true,
-                            video: true,
-                            screen: true
-                        });
-
-                        else if (isString(streamid)) {
-                            // connection.removeStream('screen');
-                            var config = {};
-                            config[streamid] = true;
-                            _detachStream(_stream, config);
-                        } else _detachStream(_stream, streamid);
-                    }
-                }
-
-                if (!dontRenegotiate && connection.detachStreams.length) {
-                    connection.renegotiate();
-                }
-
-                return;
-            }
-
-            var stream = connection.streams[streamid];
-
-            // detach pre-attached streams
-            if (!stream) return warn('No such stream exists. Stream-id:', streamid);
-
-            // www.RTCMultiConnection.org/docs/detachStreams/
-            connection.detachStreams.push(stream.streamid);
-
-            log('removing stream', stream.streamid);
-            onStreamEndedHandler(stream, connection);
-
-            // todo: how to allow "stop" function?
-            // connection.stopMediaStream(stream.stream)
-
-            if (!dontRenegotiate) {
-                connection.renegotiate();
-            }
-        };
-
-        connection.switchStream = function(session) {
-            if (connection.numberOfConnectedUsers <= 0) {
-                // no connections
-                setTimeout(function() {
-                    // try again
-                    connection.switchStream(session);
-                }, 1000);
-                return;
-            }
-
-            connection.removeStream('all', true);
-            connection.addStream(session);
-        };
-
-        // www.RTCMultiConnection.org/docs/sendCustomMessage/
-        connection.sendCustomMessage = function(message) {
-            if (!rtcMultiSession || !rtcMultiSession.defaultSocket) {
-                return setTimeout(function() {
-                    connection.sendCustomMessage(message);
-                }, 1000);
-            }
-
-            rtcMultiSession.defaultSocket.send({
-                customMessage: true,
-                message: message
-            });
-        };
-
-        // set RTCMultiConnection defaults on constructor invocation
-        setDefaults(connection);
-    };
-
-    function RTCMultiSession(connection, callbackForSignalingReady) {
-        var socketObjects = {};
-        var sockets = [];
-        var rtcMultiSession = this;
-        var participants = {};
-
-        if (!rtcMultiSession.fileBufferReader && connection.session.data && connection.enableFileSharing) {
-            initFileBufferReader(connection, function(fbr) {
-                rtcMultiSession.fileBufferReader = fbr;
-            });
-        }
-
-        var textReceiver = new TextReceiver(connection);
-
-        function onDataChannelMessage(e) {
-            if (e.data.checkingPresence && connection.channels[e.userid]) {
-                connection.channels[e.userid].send({
-                    presenceDetected: true
-                });
-                return;
-            }
-
-            if (e.data.presenceDetected && connection.peers[e.userid]) {
-                connection.peers[e.userid].connected = true;
-                return;
-            }
-
-            if (e.data.type === 'text') {
-                textReceiver.receive(e.data, e.userid, e.extra);
-            } else {
-                if (connection.autoTranslateText) {
-                    e.original = e.data;
-                    connection.Translator.TranslateText(e.data, function(translatedText) {
-                        e.data = translatedText;
-                        connection.onmessage(e);
-                    });
-                } else connection.onmessage(e);
-            }
-        }
-
-        function onNewSession(session) {
-            if (connection.skipOnNewSession) return;
-
-            if (!session.session) session.session = {};
-            if (!session.extra) session.extra = {};
-
-            // todo: make sure this works as expected.
-            // i.e. "onNewSession" should be fired only for 
-            // sessionid that is passed over "connect" method.
-            if (connection.sessionid && session.sessionid != connection.sessionid) return;
-
-            if (connection.onNewSession) {
-                session.join = function(forceSession) {
-                    if (!forceSession) return connection.join(session);
-
-                    for (var f in forceSession) {
-                        session.session[f] = forceSession[f];
-                    }
-
-                    // keeping previous state
-                    var isDontCaptureUserMedia = connection.dontCaptureUserMedia;
-
-                    connection.dontCaptureUserMedia = false;
-                    connection.captureUserMedia(function() {
-                        connection.dontCaptureUserMedia = true;
-                        connection.join(session);
-
-                        // returning back previous state
-                        connection.dontCaptureUserMedia = isDontCaptureUserMedia;
-                    }, forceSession);
-                };
-                if (!session.extra) session.extra = {};
-
-                return connection.onNewSession(session);
-            }
-
-            connection.join(session);
-        }
-
-        function updateSocketForLocalStreams(socket) {
-            for (var i = 0; i < connection.localStreamids.length; i++) {
-                var streamid = connection.localStreamids[i];
-                if (connection.streams[streamid]) {
-                    // using "sockets" array to keep references of all sockets using 
-                    // this media stream; so we can fire "onStreamEndedHandler" among all users.
-                    connection.streams[streamid].sockets.push(socket);
-                }
-            }
-        }
-
-        function newPrivateSocket(_config) {
-            var socketConfig = {
-                channel: _config.channel,
-                onmessage: socketResponse,
-                onopen: function(_socket) {
-                    if (_socket) socket = _socket;
-
-                    if (isofferer && !peer) {
-                        peerConfig.session = connection.session;
-                        if (!peer) peer = new PeerConnection();
-                        peer.create('offer', peerConfig);
-                    }
-
-                    _config.socketIndex = socket.index = sockets.length;
-                    socketObjects[socketConfig.channel] = socket;
-                    sockets[_config.socketIndex] = socket;
-
-                    updateSocketForLocalStreams(socket);
-
-                    if (!socket.__push) {
-                        socket.__push = socket.send;
-                        socket.send = function(message) {
-                            message.userid = message.userid || connection.userid;
-                            message.extra = message.extra || connection.extra || {};
-
-                            socket.__push(message);
-                        };
-                    }
-                }
-            };
-
-            socketConfig.callback = function(_socket) {
-                socket = _socket;
-                socketConfig.onopen();
-            };
-
-            var socket = connection.openSignalingChannel(socketConfig);
-            if (socket) socketConfig.onopen(socket);
-
-            var isofferer = _config.isofferer,
-                peer;
-
-            var peerConfig = {
-                onopen: onChannelOpened,
-                onicecandidate: function(candidate) {
-                    if (!connection.candidates) throw 'ICE candidates are mandatory.';
-                    if (!connection.iceProtocols) throw 'At least one must be true; UDP or TCP.';
-
-                    var iceCandidates = connection.candidates;
-
-                    var stun = iceCandidates.stun;
-                    var turn = iceCandidates.turn;
-
-                    if (!isNull(iceCandidates.reflexive)) stun = iceCandidates.reflexive;
-                    if (!isNull(iceCandidates.relay)) turn = iceCandidates.relay;
-
-                    if (!iceCandidates.host && !!candidate.candidate.match(/a=candidate.*typ host/g)) return;
-                    if (!turn && !!candidate.candidate.match(/a=candidate.*typ relay/g)) return;
-                    if (!stun && !!candidate.candidate.match(/a=candidate.*typ srflx/g)) return;
-
-                    var protocol = connection.iceProtocols;
-
-                    if (!protocol.udp && !!candidate.candidate.match(/a=candidate.* udp/g)) return;
-                    if (!protocol.tcp && !!candidate.candidate.match(/a=candidate.* tcp/g)) return;
-
-                    if (!window.selfNPObject) window.selfNPObject = candidate;
-
-                    socket && socket.send({
-                        candidate: JSON.stringify({
-                            candidate: candidate.candidate,
-                            sdpMid: candidate.sdpMid,
-                            sdpMLineIndex: candidate.sdpMLineIndex
-                        })
-                    });
-                },
-                onmessage: function(data) {
-                    if (!data) return;
-
-                    var abToStr = ab2str(data);
-                    if (abToStr.indexOf('"userid":') != -1) {
-                        abToStr = JSON.parse(abToStr);
-                        onDataChannelMessage(abToStr);
-                    } else if (data instanceof ArrayBuffer || data instanceof DataView) {
-                        if (!connection.enableFileSharing) {
-                            throw 'It seems that receiving data is either "Blob" or "File" but file sharing is disabled.';
-                        }
-
-                        if (!rtcMultiSession.fileBufferReader) {
-                            var that = this;
-                            initFileBufferReader(connection, function(fbr) {
-                                rtcMultiSession.fileBufferReader = fbr;
-                                that.onmessage(data);
-                            });
-                            return;
-                        }
-
-                        var fileBufferReader = rtcMultiSession.fileBufferReader;
-
-                        fileBufferReader.convertToObject(data, function(chunk) {
-                            if (chunk.maxChunks || chunk.readyForNextChunk) {
-                                // if target peer requested next chunk
-                                if (chunk.readyForNextChunk) {
-                                    fileBufferReader.getNextChunk(chunk.uuid, function(nextChunk, isLastChunk, extra) {
-                                        rtcMultiSession.send(nextChunk);
-                                    });
-                                    return;
-                                }
-
-                                // if chunk is received
-                                fileBufferReader.addChunk(chunk, function(promptNextChunk) {
-                                    // request next chunk
-                                    rtcMultiSession.send(promptNextChunk);
-                                });
-                                return;
-                            }
-
-                            connection.onmessage({
-                                data: chunk,
-                                userid: _config.userid,
-                                extra: _config.extra
-                            });
-                        });
-                        return;
-                    }
-                },
-                onaddstream: function(stream, session) {
-                    session = session || _config.renegotiate || connection.session;
-
-                    // if it is data-only connection; then return.
-                    if (isData(session)) return;
-
-                    if (session.screen && (session.audio || session.video)) {
-                        if (!_config.gotAudioOrVideo) {
-                            // audio/video are fired earlier than screen
-                            _config.gotAudioOrVideo = true;
-                            session.screen = false;
-                        } else {
-                            // screen stream is always fired later
-                            session.audio = false;
-                            session.video = false;
-                        }
-                    }
-
-                    var preMuted = {};
-
-                    if (_config.streaminfo) {
-                        var streaminfo = _config.streaminfo.split('----');
-                        var strInfo = JSON.parse(streaminfo[streaminfo.length - 1]);
-
-                        if (!isIE) {
-                            stream.streamid = strInfo.streamid;
-                            stream.isScreen = !!strInfo.isScreen;
-                            stream.isVideo = !!strInfo.isVideo;
-                            stream.isAudio = !!strInfo.isAudio;
-                            preMuted = strInfo.preMuted;
-                        }
-
-                        streaminfo.pop();
-                        _config.streaminfo = streaminfo.join('----');
-                    }
-
-                    var mediaElement = createMediaElement(stream, merge({
-                        remote: true
-                    }, session));
-
-                    if (connection.setDefaultEventsForMediaElement) {
-                        connection.setDefaultEventsForMediaElement(mediaElement, stream.streamid);
-                    }
-
-                    if (!isPluginRTC && !stream.getVideoTracks().length) {
-                        function eventListener() {
-                            setTimeout(function() {
-                                mediaElement.muted = false;
-                                afterRemoteStreamStartedFlowing({
-                                    mediaElement: mediaElement,
-                                    session: session,
-                                    stream: stream,
-                                    preMuted: preMuted
-                                });
-                            }, 3000);
-
-                            mediaElement.removeEventListener('play', eventListener);
-                        }
-                        return mediaElement.addEventListener('play', eventListener, false);
-                    }
-
-                    waitUntilRemoteStreamStartsFlowing({
-                        mediaElement: mediaElement,
-                        session: session,
-                        stream: stream,
-                        preMuted: preMuted
-                    });
-                },
-
-                onremovestream: function(stream) {
-                    if (stream && stream.streamid) {
-                        stream = connection.streams[stream.streamid];
-                        if (stream) {
-                            log('on:stream:ended via on:remove:stream', stream);
-                            onStreamEndedHandler(stream, connection);
-                        }
-                    } else log('on:remove:stream', stream);
-                },
-
-                onclose: function(e) {
-                    e.extra = _config.extra;
-                    e.userid = _config.userid;
-                    connection.onclose(e);
-
-                    // suggested in #71 by "efaj"
-                    if (connection.channels[e.userid]) {
-                        delete connection.channels[e.userid];
-                    }
-                },
-                onerror: function(e) {
-                    e.extra = _config.extra;
-                    e.userid = _config.userid;
-                    connection.onerror(e);
-                },
-
-                oniceconnectionstatechange: function(event) {
-                    log('oniceconnectionstatechange', toStr(event));
-
-                    if (peer.connection && peer.connection.iceConnectionState == 'connected' && peer.connection.iceGatheringState == 'complete' && peer.connection.signalingState == 'stable' && connection.numberOfConnectedUsers == 1) {
-                        connection.onconnected({
-                            userid: _config.userid,
-                            extra: _config.extra,
-                            peer: connection.peers[_config.userid],
-                            targetuser: _config.userinfo
-                        });
-                    }
-
-                    if (!connection.isInitiator && peer.connection && peer.connection.iceConnectionState == 'connected' && peer.connection.iceGatheringState == 'complete' && peer.connection.signalingState == 'stable' && connection.numberOfConnectedUsers == 1) {
-                        connection.onstatechange({
-                            userid: _config.userid,
-                            extra: _config.extra,
-                            name: 'connected-with-initiator',
-                            reason: 'ICE connection state seems connected; gathering state is completed; and signaling state is stable.'
-                        });
-                    }
-
-                    if (connection.peers[_config.userid] && connection.peers[_config.userid].oniceconnectionstatechange) {
-                        connection.peers[_config.userid].oniceconnectionstatechange(event);
-                    }
-
-                    // if ICE connectivity check is failed; renegotiate or redial
-                    if (connection.peers[_config.userid] && connection.peers[_config.userid].peer.connection.iceConnectionState == 'failed') {
-                        connection.onfailed({
-                            userid: _config.userid,
-                            extra: _config.extra,
-                            peer: connection.peers[_config.userid],
-                            targetuser: _config.userinfo
-                        });
-                    }
-
-                    if (connection.peers[_config.userid] && connection.peers[_config.userid].peer.connection.iceConnectionState == 'disconnected') {
-                        !peer.connection.renegotiate && connection.ondisconnected({
-                            userid: _config.userid,
-                            extra: _config.extra,
-                            peer: connection.peers[_config.userid],
-                            targetuser: _config.userinfo
-                        });
-                        peer.connection.renegotiate = false;
-                    }
-
-                    if (!connection.autoReDialOnFailure) return;
-
-                    if (connection.peers[_config.userid]) {
-                        if (connection.peers[_config.userid].peer.connection.iceConnectionState != 'disconnected') {
-                            _config.redialing = false;
-                        }
-
-                        if (connection.peers[_config.userid].peer.connection.iceConnectionState == 'disconnected' && !_config.redialing) {
-                            _config.redialing = true;
-                            warn('Peer connection is closed.', toStr(connection.peers[_config.userid].peer.connection), 'ReDialing..');
-                            connection.peers[_config.userid].socket.send({
-                                redial: true
-                            });
-
-                            // to make sure all old "remote" streams are also removed!
-                            connection.streams.remove({
-                                remote: true,
-                                userid: _config.userid
-                            });
-                        }
-                    }
-                },
-
-                onsignalingstatechange: function(event) {
-                    log('onsignalingstatechange', toStr(event));
-                },
-
-                attachStreams: connection.dontAttachStream ? [] : connection.attachStreams,
-                iceServers: connection.iceServers,
-                rtcConfiguration: connection.rtcConfiguration,
-                bandwidth: connection.bandwidth,
-                sdpConstraints: connection.sdpConstraints,
-                optionalArgument: connection.optionalArgument,
-                disableDtlsSrtp: connection.disableDtlsSrtp,
-                dataChannelDict: connection.dataChannelDict,
-                preferSCTP: connection.preferSCTP,
-
-                onSessionDescription: function(sessionDescription, streaminfo) {
-                    sendsdp({
-                        sdp: sessionDescription,
-                        socket: socket,
-                        streaminfo: streaminfo
-                    });
-                },
-                trickleIce: connection.trickleIce,
-                processSdp: connection.processSdp,
-                sendStreamId: function(stream) {
-                    socket && socket.send({
-                        streamid: stream.streamid,
-                        isScreen: !!stream.isScreen,
-                        isAudio: !!stream.isAudio,
-                        isVideo: !!stream.isVideo
-                    });
-                },
-                rtcMultiConnection: connection
-            };
-
-            function waitUntilRemoteStreamStartsFlowing(args) {
-                // chrome for android may have some features missing
-                if (isMobileDevice || isPluginRTC || (isNull(connection.waitUntilRemoteStreamStartsFlowing) || !connection.waitUntilRemoteStreamStartsFlowing)) {
-                    return afterRemoteStreamStartedFlowing(args);
-                }
-
-                if (!args.numberOfTimes) args.numberOfTimes = 0;
-                args.numberOfTimes++;
-
-                if (!(args.mediaElement.readyState <= HTMLMediaElement.HAVE_CURRENT_DATA || args.mediaElement.paused || args.mediaElement.currentTime <= 0)) {
-                    return afterRemoteStreamStartedFlowing(args);
-                }
-
-                if (args.numberOfTimes >= 60) { // wait 60 seconds while video is delivered!
-                    return socket.send({
-                        failedToReceiveRemoteVideo: true,
-                        streamid: args.stream.streamid
-                    });
-                }
-
-                setTimeout(function() {
-                    log('Waiting for incoming remote stream to be started flowing: ' + args.numberOfTimes + ' seconds.');
-                    waitUntilRemoteStreamStartsFlowing(args);
-                }, 900);
-            }
-
-            function initFakeChannel() {
-                if (!connection.fakeDataChannels || connection.channels[_config.userid]) return;
-
-                // for non-data connections; allow fake data sender!
-                if (!connection.session.data) {
-                    var fakeChannel = {
-                        send: function(data) {
-                            socket.send({
-                                fakeData: data
-                            });
-                        },
-                        readyState: 'open'
-                    };
-                    // connection.channels['user-id'].send(data);
-                    connection.channels[_config.userid] = {
-                        channel: fakeChannel,
-                        send: function(data) {
-                            this.channel.send(data);
-                        }
-                    };
-                    peerConfig.onopen(fakeChannel);
-                }
-            }
-
-            function afterRemoteStreamStartedFlowing(args) {
-                var mediaElement = args.mediaElement;
-                var session = args.session;
-                var stream = args.stream;
-
-                stream.onended = function() {
-                    if (streamedObject.mediaElement && !streamedObject.mediaElement.parentNode && document.getElementById(stream.streamid)) {
-                        streamedObject.mediaElement = document.getElementById(stream.streamid);
-                    }
-
-                    onStreamEndedHandler(streamedObject, connection);
-                };
-
-                var streamedObject = {
-                    mediaElement: mediaElement,
-
-                    stream: stream,
-                    streamid: stream.streamid,
-                    session: session || connection.session,
-
-                    blobURL: isPluginRTC ? '' : mediaElement.mozSrcObject ? URL.createObjectURL(stream) : mediaElement.src,
-                    type: 'remote',
-
-                    extra: _config.extra,
-                    userid: _config.userid,
-
-                    isVideo: isPluginRTC ? !!session.video : !!stream.isVideo,
-                    isAudio: isPluginRTC ? !!session.audio && !session.video : !!stream.isAudio,
-                    isScreen: !!stream.isScreen,
-                    isInitiator: !!_config.isInitiator,
-
-                    rtcMultiConnection: connection,
-                    socket: socket
-                };
-
-                // connection.streams['stream-id'].mute({audio:true})
-                connection.streams[stream.streamid] = connection._getStream(streamedObject);
-                connection.onstream(streamedObject);
-
-                if (!isEmpty(args.preMuted) && (args.preMuted.audio || args.preMuted.video)) {
-                    var fakeObject = merge({}, streamedObject);
-                    fakeObject.session = merge(fakeObject.session, args.preMuted);
-
-                    fakeObject.isAudio = !!fakeObject.session.audio && !fakeObject.session.video;
-                    fakeObject.isVideo = !!fakeObject.session.video;
-                    fakeObject.isScreen = false;
-
-                    connection.onmute(fakeObject);
-                }
-
-                log('on:add:stream', streamedObject);
-
-                onSessionOpened();
-
-                if (connection.onspeaking) {
-                    initHark({
-                        stream: stream,
-                        streamedObject: streamedObject,
-                        connection: connection
-                    });
-                }
-            }
-
-            function onChannelOpened(channel) {
-                _config.channel = channel;
-
-                // connection.channels['user-id'].send(data);
-                connection.channels[_config.userid] = {
-                    channel: _config.channel,
-                    send: function(data) {
-                        connection.send(data, this.channel);
-                    }
-                };
-
-                connection.onopen({
-                    extra: _config.extra,
-                    userid: _config.userid,
-                    channel: channel
-                });
-
-                // fetch files from file-queue
-                for (var q in connection.fileQueue) {
-                    connection.send(connection.fileQueue[q], channel);
-                }
-
-                if (isData(connection.session)) onSessionOpened();
-
-                if (connection.partOfScreen && connection.partOfScreen.sharing) {
-                    connection.peers[_config.userid].sharePartOfScreen(connection.partOfScreen);
-                }
-            }
-
-            function updateSocket() {
-                // todo: need to check following {if-block} MUST not affect "redial" process
-                if (socket.userid == _config.userid)
-                    return;
-
-                socket.userid = _config.userid;
-                sockets[_config.socketIndex] = socket;
-
-                connection.numberOfConnectedUsers++;
-                // connection.peers['user-id'].addStream({audio:true})
-                connection.peers[_config.userid] = {
-                    socket: socket,
-                    peer: peer,
-                    userid: _config.userid,
-                    extra: _config.extra,
-                    userinfo: _config.userinfo,
-                    addStream: function(session00) {
-                        // connection.peers['user-id'].addStream({audio: true, video: true);
-
-                        connection.addStream(session00, this.socket);
-                    },
-                    removeStream: function(streamid) {
-                        if (!connection.streams[streamid])
-                            return warn('No such stream exists. Stream-id:', streamid);
-
-                        this.peer.connection.removeStream(connection.streams[streamid].stream);
-                        this.renegotiate();
-                    },
-                    renegotiate: function(stream, session) {
-                        // connection.peers['user-id'].renegotiate();
-
-                        connection.renegotiate(stream, session);
-                    },
-                    changeBandwidth: function(bandwidth) {
-                        // connection.peers['user-id'].changeBandwidth();
-
-                        if (!bandwidth) throw 'You MUST pass bandwidth object.';
-                        if (isString(bandwidth)) throw 'Pass object for bandwidth instead of string; e.g. {audio:10, video:20}';
-
-                        // set bandwidth for self
-                        this.peer.bandwidth = bandwidth;
-
-                        // ask remote user to synchronize bandwidth
-                        this.socket.send({
-                            changeBandwidth: true,
-                            bandwidth: bandwidth
-                        });
-                    },
-                    sendCustomMessage: function(message) {
-                        // connection.peers['user-id'].sendCustomMessage();
-
-                        this.socket.send({
-                            customMessage: true,
-                            message: message
-                        });
-                    },
-                    onCustomMessage: function(message) {
-                        log('Received "private" message from', this.userid,
-                            isString(message) ? message : toStr(message));
-                    },
-                    drop: function(dontSendMessage) {
-                        // connection.peers['user-id'].drop();
-
-                        for (var stream in connection.streams) {
-                            if (connection._skip.indexOf(stream) == -1) {
-                                stream = connection.streams[stream];
-
-                                if (stream.userid == connection.userid && stream.type == 'local') {
-                                    this.peer.connection.removeStream(stream.stream);
-                                    onStreamEndedHandler(stream, connection);
-                                }
-
-                                if (stream.type == 'remote' && stream.userid == this.userid) {
-                                    onStreamEndedHandler(stream, connection);
-                                }
-                            }
-                        }
-
-                        !dontSendMessage && this.socket.send({
-                            drop: true
-                        });
-                    },
-                    hold: function(holdMLine) {
-                        // connection.peers['user-id'].hold();
-
-                        if (peer.prevCreateType == 'answer') {
-                            this.socket.send({
-                                unhold: true,
-                                holdMLine: holdMLine || 'both',
-                                takeAction: true
-                            });
-                            return;
-                        }
-
-                        this.socket.send({
-                            hold: true,
-                            holdMLine: holdMLine || 'both'
-                        });
-
-                        this.peer.hold = true;
-                        this.fireHoldUnHoldEvents({
-                            kind: holdMLine,
-                            isHold: true,
-                            userid: connection.userid,
-                            remoteUser: this.userid
-                        });
-                    },
-                    unhold: function(holdMLine) {
-                        // connection.peers['user-id'].unhold();
-
-                        if (peer.prevCreateType == 'answer') {
-                            this.socket.send({
-                                unhold: true,
-                                holdMLine: holdMLine || 'both',
-                                takeAction: true
-                            });
-                            return;
-                        }
-
-                        this.socket.send({
-                            unhold: true,
-                            holdMLine: holdMLine || 'both'
-                        });
-
-                        this.peer.hold = false;
-                        this.fireHoldUnHoldEvents({
-                            kind: holdMLine,
-                            isHold: false,
-                            userid: connection.userid,
-                            remoteUser: this.userid
-                        });
-                    },
-                    fireHoldUnHoldEvents: function(e) {
-                        // this method is for inner usages only!
-
-                        var isHold = e.isHold;
-                        var kind = e.kind;
-                        var userid = e.remoteUser || e.userid;
-
-                        // hold means inactive a specific media line!
-                        // a media line can contain multiple synced sources (ssrc)
-                        // i.e. a media line can reference multiple tracks!
-                        // that's why hold will affect all relevant tracks in a specific media line!
-                        for (var stream in connection.streams) {
-                            if (connection._skip.indexOf(stream) == -1) {
-                                stream = connection.streams[stream];
-
-                                if (stream.userid == userid) {
-                                    // www.RTCMultiConnection.org/docs/onhold/
-                                    if (isHold)
-                                        connection.onhold(merge({
-                                            kind: kind
-                                        }, stream));
-
-                                    // www.RTCMultiConnection.org/docs/onunhold/
-                                    if (!isHold)
-                                        connection.onunhold(merge({
-                                            kind: kind
-                                        }, stream));
-                                }
-                            }
-                        }
-                    },
-                    redial: function() {
-                        // connection.peers['user-id'].redial();
-
-                        // 1st of all; remove all relevant remote media streams
-                        for (var stream in connection.streams) {
-                            if (connection._skip.indexOf(stream) == -1) {
-                                stream = connection.streams[stream];
-
-                                if (stream.userid == this.userid && stream.type == 'remote') {
-                                    onStreamEndedHandler(stream, connection);
-                                }
-                            }
-                        }
-
-                        log('ReDialing...');
-
-                        socket.send({
-                            recreatePeer: true
-                        });
-
-                        peer = new PeerConnection();
-                        peer.create('offer', peerConfig);
-                    },
-                    sharePartOfScreen: function(args) {
-                        // www.RTCMultiConnection.org/docs/onpartofscreen/
-                        var that = this;
-                        var lastScreenshot = '';
-
-                        function partOfScreenCapturer() {
-                            // if stopped
-                            if (that.stopPartOfScreenSharing) {
-                                that.stopPartOfScreenSharing = false;
-
-                                if (connection.onpartofscreenstopped) {
-                                    connection.onpartofscreenstopped();
-                                }
-                                return;
-                            }
-
-                            // if paused
-                            if (that.pausePartOfScreenSharing) {
-                                if (connection.onpartofscreenpaused) {
-                                    connection.onpartofscreenpaused();
-                                }
-
-                                return setTimeout(partOfScreenCapturer, args.interval || 200);
-                            }
-
-                            capturePartOfScreen({
-                                element: args.element,
-                                connection: connection,
-                                callback: function(screenshot) {
-                                    if (!connection.channels[that.userid]) {
-                                        throw 'No such data channel exists.';
-                                    }
-
-                                    // don't share repeated content
-                                    if (screenshot != lastScreenshot) {
-                                        lastScreenshot = screenshot;
-                                        connection.channels[that.userid].send({
-                                            screenshot: screenshot,
-                                            isPartOfScreen: true
-                                        });
-                                    }
-
-                                    // "once" can be used to share single screenshot
-                                    !args.once && setTimeout(partOfScreenCapturer, args.interval || 200);
-                                }
-                            });
-                        }
-
-                        partOfScreenCapturer();
-                    },
-                    getConnectionStats: function(callback, interval) {
-                        if (!callback) throw 'callback is mandatory.';
-
-                        if (!window.getConnectionStats) {
-                            loadScript(connection.resources.getConnectionStats, invoker);
-                        } else invoker();
-
-                        function invoker() {
-                            RTCPeerConnection.prototype.getConnectionStats = window.getConnectionStats;
-                            peer.connection && peer.connection.getConnectionStats(callback, interval);
-                        }
-                    },
-                    takeSnapshot: function(callback) {
-                        takeSnapshot({
-                            userid: this.userid,
-                            connection: connection,
-                            callback: callback
-                        });
-                    }
-                };
-            }
-
-            function onSessionOpened() {
-                // original conferencing infrastructure!
-                if (connection.isInitiator && getLength(participants) && getLength(participants) <= connection.maxParticipantsAllowed) {
-                    if (!connection.session.oneway && !connection.session.broadcast) {
-                        defaultSocket.send({
-                            sessionid: connection.sessionid,
-                            newParticipant: _config.userid || socket.channel,
-                            userData: {
-                                userid: _config.userid || socket.channel,
-                                extra: _config.extra
-                            }
-                        });
-                    }
-                }
-
-                // 1st: renegotiation is supported only on chrome
-                // 2nd: must not renegotiate same media multiple times
-                // 3rd: todo: make sure that target-user has no such "renegotiated" media.
-                if (_config.userinfo.browser == 'chrome' && !_config.renegotiatedOnce) {
-                    // this code snippet is added to make sure that "previously-renegotiated" streams are also 
-                    // renegotiated to this new user
-                    for (var rSession in connection.renegotiatedSessions) {
-                        _config.renegotiatedOnce = true;
-
-                        if (connection.renegotiatedSessions[rSession] && connection.renegotiatedSessions[rSession].stream) {
-                            connection.peers[_config.userid].renegotiate(connection.renegotiatedSessions[rSession].stream, connection.renegotiatedSessions[rSession].session);
-                        }
-                    }
-                }
-            }
-
-            function socketResponse(response) {
-                if (isRMSDeleted) return;
-
-                if (response.userid == connection.userid)
-                    return;
-
-                if (response.sdp) {
-                    _config.userid = response.userid;
-                    _config.extra = response.extra || {};
-                    _config.renegotiate = response.renegotiate;
-                    _config.streaminfo = response.streaminfo;
-                    _config.isInitiator = response.isInitiator;
-                    _config.userinfo = response.userinfo;
-
-                    var sdp = JSON.parse(response.sdp);
-
-                    if (sdp.type == 'offer') {
-                        // to synchronize SCTP or RTP
-                        peerConfig.preferSCTP = !!response.preferSCTP;
-                        connection.fakeDataChannels = !!response.fakeDataChannels;
-                    }
-
-                    // initializing fake channel
-                    initFakeChannel();
-
-                    sdpInvoker(sdp, response.labels);
-                }
-
-                if (response.candidate) {
-                    peer && peer.addIceCandidate(JSON.parse(response.candidate));
-                }
-
-                if (response.streamid) {
-                    if (!rtcMultiSession.streamids) {
-                        rtcMultiSession.streamids = {};
-                    }
-                    if (!rtcMultiSession.streamids[response.streamid]) {
-                        rtcMultiSession.streamids[response.streamid] = response.streamid;
-                        connection.onstreamid(response);
-                    }
-                }
-
-                if (response.mute || response.unmute) {
-                    if (response.promptMuteUnmute) {
-                        if (!connection.privileges.canMuteRemoteStream) {
-                            connection.onstatechange({
-                                userid: response.userid,
-                                extra: response.extra,
-                                name: 'mute-request-denied',
-                                reason: response.userid + ' tried to mute your stream; however "privileges.canMuteRemoteStream" is "false".'
-                            });
-                            return;
-                        }
-
-                        if (connection.streams[response.streamid]) {
-                            if (response.mute && !connection.streams[response.streamid].muted) {
-                                connection.streams[response.streamid].mute(response.session);
-                            }
-                            if (response.unmute && connection.streams[response.streamid].muted) {
-                                connection.streams[response.streamid].unmute(response.session);
-                            }
-                        }
-                    } else {
-                        var streamObject = {};
-                        if (connection.streams[response.streamid]) {
-                            streamObject = connection.streams[response.streamid];
-                        }
-
-                        var session = response.session;
-                        var fakeObject = merge({}, streamObject);
-                        fakeObject.session = session;
-
-                        fakeObject.isAudio = !!fakeObject.session.audio && !fakeObject.session.video;
-                        fakeObject.isVideo = !!fakeObject.session.video;
-                        fakeObject.isScreen = !!fakeObject.session.screen;
-
-                        if (response.mute) connection.onmute(fakeObject || response);
-                        if (response.unmute) connection.onunmute(fakeObject || response);
-                    }
-                }
-
-                if (response.isVolumeChanged) {
-                    log('Volume of stream: ' + response.streamid + ' has changed to: ' + response.volume);
-                    if (connection.streams[response.streamid]) {
-                        var mediaElement = connection.streams[response.streamid].mediaElement;
-                        if (mediaElement) mediaElement.volume = response.volume;
-                    }
-                }
-
-                // to stop local stream
-                if (response.stopped) {
-                    if (connection.streams[response.streamid]) {
-                        onStreamEndedHandler(connection.streams[response.streamid], connection);
-                    }
-                }
-
-                // to stop remote stream
-                if (response.promptStreamStop /* && !connection.isInitiator */ ) {
-                    if (!connection.privileges.canStopRemoteStream) {
-                        connection.onstatechange({
-                            userid: response.userid,
-                            extra: response.extra,
-                            name: 'stop-request-denied',
-                            reason: response.userid + ' tried to stop your stream; however "privileges.canStopRemoteStream" is "false".'
-                        });
-                        return;
-                    }
-                    warn('Remote stream has been manually stopped!');
-                    if (connection.streams[response.streamid]) {
-                        connection.streams[response.streamid].stop();
-                    }
-                }
-
-                if (response.left) {
-                    // firefox is unable to stop remote streams
-                    // firefox doesn't auto stop streams when peer.close() is called.
-                    if (isFirefox) {
-                        var userLeft = response.userid;
-                        for (var stream in connection.streams) {
-                            stream = connection.streams[stream];
-                            if (stream.userid == userLeft) {
-                                connection.stopMediaStream(stream);
-                                onStreamEndedHandler(stream, connection);
-                            }
-                        }
-                    }
-
-                    if (peer && peer.connection) {
-                        // todo: verify if-block's 2nd condition
-                        if (peer.connection.signalingState != 'closed' && peer.connection.iceConnectionState.search(/disconnected|failed/gi) == -1) {
-                            peer.connection.close();
-                        }
-                        peer.connection = null;
-                    }
-
-                    if (participants[response.userid]) delete participants[response.userid];
-
-                    if (response.closeEntireSession) {
-                        connection.onSessionClosed(response);
-                        connection.leave();
-                        return;
-                    }
-
-                    connection.remove(response.userid);
-
-                    onLeaveHandler({
-                        userid: response.userid,
-                        extra: response.extra || {},
-                        entireSessionClosed: !!response.closeEntireSession
-                    }, connection);
-                }
-
-                // keeping session active even if initiator leaves
-                if (response.playRoleOfBroadcaster) {
-                    if (response.extra) {
-                        // clone extra-data from initial moderator
-                        connection.extra = merge(connection.extra, response.extra);
-                    }
-                    if (response.participants) {
-                        participants = response.participants;
-
-                        // make sure that if 2nd initiator leaves; control is shifted to 3rd person.
-                        if (participants[connection.userid]) {
-                            delete participants[connection.userid];
-                        }
-
-                        if (sockets[0] && sockets[0].userid == response.userid) {
-                            delete sockets[0];
-                            sockets = swap(sockets);
-                        }
-
-                        if (socketObjects[response.userid]) {
-                            delete socketObjects[response.userid];
-                        }
-                    }
-
-                    setTimeout(connection.playRoleOfInitiator, 2000);
-                }
-
-                if (response.changeBandwidth) {
-                    if (!connection.peers[response.userid]) throw 'No such peer exists.';
-
-                    // synchronize bandwidth
-                    connection.peers[response.userid].peer.bandwidth = response.bandwidth;
-
-                    // renegotiate to apply bandwidth
-                    connection.peers[response.userid].renegotiate();
-                }
-
-                if (response.customMessage) {
-                    if (!connection.peers[response.userid]) throw 'No such peer exists.';
-                    if (response.message.ejected) {
-                        if (connection.sessionDescriptions[connection.sessionid].userid != response.userid) {
-                            throw 'only initiator can eject a user.';
-                        }
-                        // initiator ejected this user
-                        connection.leave();
-
-                        connection.onSessionClosed({
-                            userid: response.userid,
-                            extra: response.extra || _config.extra,
-                            isEjected: true
-                        });
-                    } else connection.peers[response.userid].onCustomMessage(response.message);
-                }
-
-                if (response.drop) {
-                    if (!connection.peers[response.userid]) throw 'No such peer exists.';
-                    connection.peers[response.userid].drop(true);
-                    connection.peers[response.userid].renegotiate();
-
-                    connection.ondrop(response.userid);
-                }
-
-                if (response.hold || response.unhold) {
-                    if (!connection.peers[response.userid]) throw 'No such peer exists.';
-
-                    if (response.takeAction) {
-                        connection.peers[response.userid][!!response.hold ? 'hold' : 'unhold'](response.holdMLine);
-                        return;
-                    }
-
-                    connection.peers[response.userid].peer.hold = !!response.hold;
-                    connection.peers[response.userid].peer.holdMLine = response.holdMLine;
-
-                    socket.send({
-                        isRenegotiate: true
-                    });
-
-                    connection.peers[response.userid].fireHoldUnHoldEvents({
-                        kind: response.holdMLine,
-                        isHold: !!response.hold,
-                        userid: response.userid
-                    });
-                }
-
-                if (response.isRenegotiate) {
-                    connection.peers[response.userid].renegotiate(null, connection.peers[response.userid].peer.session);
-                }
-
-                // fake data channels!
-                if (response.fakeData) {
-                    peerConfig.onmessage(response.fakeData);
-                }
-
-                // sometimes we don't need to renegotiate e.g. when peers are disconnected
-                // or if it is firefox
-                if (response.recreatePeer) {
-                    peer = new PeerConnection();
-                }
-
-                // remote video failed either out of ICE gathering process or ICE connectivity check-up
-                // or IceAgent was unable to locate valid candidates/ports.
-                if (response.failedToReceiveRemoteVideo) {
-                    log('Remote peer hasn\'t received stream: ' + response.streamid + '. Renegotiating...');
-                    if (connection.peers[response.userid]) {
-                        connection.peers[response.userid].renegotiate();
-                    }
-                }
-
-                if (response.redial) {
-                    if (connection.peers[response.userid]) {
-                        if (connection.peers[response.userid].peer.connection.iceConnectionState != 'disconnected') {
-                            _config.redialing = false;
-                        }
-
-                        if (connection.peers[response.userid].peer.connection.iceConnectionState == 'disconnected' && !_config.redialing) {
-                            _config.redialing = true;
-
-                            warn('Peer connection is closed.', toStr(connection.peers[response.userid].peer.connection), 'ReDialing..');
-                            connection.peers[response.userid].redial();
-                        }
-                    }
-                }
-            }
-
-            connection.playRoleOfInitiator = function() {
-                connection.dontCaptureUserMedia = true;
-                connection.open();
-                sockets = swap(sockets);
-                connection.dontCaptureUserMedia = false;
-            };
-
-            connection.askToShareParticipants = function() {
-                defaultSocket && defaultSocket.send({
-                    askToShareParticipants: true
-                });
-            };
-
-            connection.shareParticipants = function(args) {
-                var message = {
-                    joinUsers: participants,
-                    userid: connection.userid,
-                    extra: connection.extra
-                };
-
-                if (args) {
-                    if (args.dontShareWith) message.dontShareWith = args.dontShareWith;
-                    if (args.shareWith) message.shareWith = args.shareWith;
-                }
-
-                defaultSocket.send(message);
-            };
-
-            function sdpInvoker(sdp, labels) {
-                if (sdp.type == 'answer') {
-                    peer.setRemoteDescription(sdp);
-                    updateSocket();
-                    return;
-                }
-                if (!_config.renegotiate && sdp.type == 'offer') {
-                    peerConfig.offerDescription = sdp;
-
-                    peerConfig.session = connection.session;
-                    if (!peer) peer = new PeerConnection();
-                    peer.create('answer', peerConfig);
-
-                    updateSocket();
-                    return;
-                }
-
-                var session = _config.renegotiate;
-                // detach streams
-                detachMediaStream(labels, peer.connection);
-
-                if (session.oneway || isData(session)) {
-                    createAnswer();
-                    delete _config.renegotiate;
-                } else {
-                    if (_config.capturing)
-                        return;
-
-                    _config.capturing = true;
-
-                    connection.captureUserMedia(function(stream) {
-                        _config.capturing = false;
-
-                        peer.addStream(stream);
-
-                        connection.renegotiatedSessions[JSON.stringify(_config.renegotiate)] = {
-                            session: _config.renegotiate,
-                            stream: stream
-                        };
-
-                        delete _config.renegotiate;
-
-                        createAnswer();
-                    }, _config.renegotiate);
-                }
-
-                function createAnswer() {
-                    peer.recreateAnswer(sdp, session, function(_sdp, streaminfo) {
-                        sendsdp({
-                            sdp: _sdp,
-                            socket: socket,
-                            streaminfo: streaminfo
-                        });
-                        connection.detachStreams = [];
-                    });
-                }
-            }
-        }
-
-        function detachMediaStream(labels, peer) {
-            if (!labels) return;
-            for (var i = 0; i < labels.length; i++) {
-                var label = labels[i];
-                if (connection.streams[label]) {
-                    peer.removeStream(connection.streams[label].stream);
-                }
-            }
-        }
-
-        function sendsdp(e) {
-            e.socket.send({
-                sdp: JSON.stringify({
-                    sdp: e.sdp.sdp,
-                    type: e.sdp.type
-                }),
-                renegotiate: !!e.renegotiate ? e.renegotiate : false,
-                streaminfo: e.streaminfo || '',
-                labels: e.labels || [],
-                preferSCTP: !!connection.preferSCTP,
-                fakeDataChannels: !!connection.fakeDataChannels,
-                isInitiator: !!connection.isInitiator,
-                userinfo: {
-                    browser: isFirefox ? 'firefox' : 'chrome'
-                }
-            });
-        }
-
-        // sharing new user with existing participants
-
-        function onNewParticipant(response) {
-            var channel = response.newParticipant;
-
-            if (!channel || !!participants[channel] || channel == connection.userid)
-                return;
-
-            var new_channel = connection.token();
-            newPrivateSocket({
-                channel: new_channel,
-                extra: response.userData ? response.userData.extra : response.extra,
-                userid: response.userData ? response.userData.userid : response.userid
-            });
-
-            defaultSocket.send({
-                participant: true,
-                targetUser: channel,
-                channel: new_channel
-            });
-        }
-
-        // if a user leaves
-
-        function clearSession() {
-            connection.numberOfConnectedUsers--;
-
-            var alertMessage = {
-                left: true,
-                extra: connection.extra || {},
-                userid: connection.userid,
-                sessionid: connection.sessionid
-            };
-
-            if (connection.isInitiator) {
-                // if initiator wants to close entire session
-                if (connection.autoCloseEntireSession) {
-                    alertMessage.closeEntireSession = true;
-                } else if (sockets[0]) {
-                    // shift initiation control to another user
-                    sockets[0].send({
-                        playRoleOfBroadcaster: true,
-                        userid: connection.userid,
-                        extra: connection.extra,
-                        participants: participants
-                    });
-                }
-            }
-
-            sockets.forEach(function(socket, i) {
-                socket.send(alertMessage);
-
-                if (socketObjects[socket.channel]) {
-                    delete socketObjects[socket.channel];
-                }
-
-                delete sockets[i];
-            });
-
-            sockets = swap(sockets);
-
-            connection.refresh();
-
-            webAudioMediaStreamSources.forEach(function(mediaStreamSource) {
-                // if source is connected; then chrome will crash on unload.
-                mediaStreamSource.disconnect();
-            });
-
-            webAudioMediaStreamSources = [];
-        }
-
-        // www.RTCMultiConnection.org/docs/remove/
-        connection.remove = function(userid) {
-            if (rtcMultiSession.requestsFrom && rtcMultiSession.requestsFrom[userid]) delete rtcMultiSession.requestsFrom[userid];
-
-            if (connection.peers[userid]) {
-                if (connection.peers[userid].peer && connection.peers[userid].peer.connection) {
-                    if (connection.peers[userid].peer.connection.signalingState != 'closed') {
-                        connection.peers[userid].peer.connection.close();
-                    }
-                    connection.peers[userid].peer.connection = null;
-                }
-                delete connection.peers[userid];
-            }
-            if (participants[userid]) {
-                delete participants[userid];
-            }
-
-            for (var stream in connection.streams) {
-                stream = connection.streams[stream];
-                if (stream.userid == userid) {
-                    onStreamEndedHandler(stream, connection);
-                    delete connection.streams[stream];
-                }
-            }
-
-            if (socketObjects[userid]) {
-                delete socketObjects[userid];
-            }
-        };
-
-        // www.RTCMultiConnection.org/docs/refresh/
-        connection.refresh = function() {
-            // if firebase; remove data from firebase servers
-            if (connection.isInitiator && !!connection.socket && !!connection.socket.remove) {
-                connection.socket.remove();
-            }
-
-            participants = {};
-
-            // to stop/remove self streams
-            for (var i = 0; i < connection.attachStreams.length; i++) {
-                connection.stopMediaStream(connection.attachStreams[i]);
-            }
-
-            // to allow capturing of identical streams
-            currentUserMediaRequest = {
-                streams: [],
-                mutex: false,
-                queueRequests: []
-            };
-
-            rtcMultiSession.isOwnerLeaving = true;
-
-            connection.isInitiator = false;
-            connection.isAcceptNewSession = true;
-            connection.attachMediaStreams = [];
-            connection.sessionDescription = null;
-            connection.sessionDescriptions = {};
-            connection.localStreamids = [];
-            connection.preRecordedMedias = {};
-            connection.snapshots = {};
-
-            connection.numberOfConnectedUsers = 0;
-            connection.numberOfSessions = 0;
-
-            connection.attachStreams = [];
-            connection.detachStreams = [];
-            connection.fileQueue = {};
-            connection.channels = {};
-            connection.renegotiatedSessions = {};
-
-            for (var peer in connection.peers) {
-                if (peer != connection.userid) {
-                    delete connection.peers[peer];
-                }
-            }
-
-            // to make sure remote streams are also removed!
-            for (var stream in connection.streams) {
-                if (connection._skip.indexOf(stream) == -1) {
-                    onStreamEndedHandler(connection.streams[stream], connection);
-                    delete connection.streams[stream];
-                }
-            }
-
-            socketObjects = {};
-            sockets = [];
-            participants = {};
-        };
-
-        // www.RTCMultiConnection.org/docs/reject/
-        connection.reject = function(userid) {
-            if (!isString(userid)) userid = userid.userid;
-            defaultSocket.send({
-                rejectedRequestOf: userid
-            });
-
-            // remove relevant data to allow him join again
-            connection.remove(userid);
-        };
-
-        rtcMultiSession.leaveHandler = function(e) {
-            if (!connection.leaveOnPageUnload) return;
-
-            if (isNull(e.keyCode)) {
-                return clearSession();
-            }
-
-            if (e.keyCode == 116) {
-                clearSession();
-            }
-        };
-
-        listenEventHandler('beforeunload', rtcMultiSession.leaveHandler);
-        listenEventHandler('keyup', rtcMultiSession.leaveHandler);
-
-        rtcMultiSession.onLineOffLineHandler = function() {
-            if (!navigator.onLine) {
-                rtcMultiSession.isOffLine = true;
-            } else if (rtcMultiSession.isOffLine) {
-                rtcMultiSession.isOffLine = !navigator.onLine;
-
-                // defaultSocket = getDefaultSocketRef();
-
-                // pending tasks should be resumed?
-                // sockets should be reconnected?
-                // peers should be re-established?
-            }
-        };
-
-        listenEventHandler('load', rtcMultiSession.onLineOffLineHandler);
-        listenEventHandler('online', rtcMultiSession.onLineOffLineHandler);
-        listenEventHandler('offline', rtcMultiSession.onLineOffLineHandler);
-
-        function onSignalingReady() {
-            if (rtcMultiSession.signalingReady) return;
-            rtcMultiSession.signalingReady = true;
-
-            setTimeout(callbackForSignalingReady, 1000);
-
-            if (!connection.isInitiator) {
-                // as soon as signaling gateway is connected;
-                // user should check existing rooms!
-                defaultSocket && defaultSocket.send({
-                    searchingForRooms: true
-                });
-            }
-        }
-
-        function joinParticipants(joinUsers) {
-            for (var user in joinUsers) {
-                if (!participants[joinUsers[user]]) {
-                    onNewParticipant({
-                        sessionid: connection.sessionid,
-                        newParticipant: joinUsers[user],
-                        userid: connection.userid,
-                        extra: connection.extra
-                    });
-                }
-            }
-        }
-
-        function getDefaultSocketRef() {
-            return connection.openSignalingChannel({
-                onmessage: function(response) {
-                    // RMS == RTCMultiSession
-                    if (isRMSDeleted) return;
-
-                    // if message is sent by same user
-                    if (response.userid == connection.userid) return;
-
-                    if (response.sessionid && response.userid) {
-                        if (!connection.sessionDescriptions[response.sessionid]) {
-                            connection.numberOfSessions++;
-                            connection.sessionDescriptions[response.sessionid] = response;
-
-                            // fire "onNewSession" only if:
-                            // 1) "isAcceptNewSession" boolean is true
-                            // 2) "sessionDescriptions" object isn't having same session i.e. to prevent duplicate invocations
-                            if (connection.isAcceptNewSession) {
-
-                                if (!connection.dontOverrideSession) {
-                                    connection.session = response.session;
-                                }
-
-                                onNewSession(response);
-                            }
-                        }
-                    }
-
-                    if (response.newParticipant && !connection.isAcceptNewSession && rtcMultiSession.broadcasterid === response.userid) {
-                        if (response.newParticipant != connection.userid) {
-                            onNewParticipant(response);
-                        }
-                    }
-
-                    if (getLength(participants) < connection.maxParticipantsAllowed && response.targetUser == connection.userid && response.participant) {
-                        if (connection.peers[response.userid] && !connection.peers[response.userid].peer) {
-                            delete participants[response.userid];
-                            delete connection.peers[response.userid];
-                            connection.isAcceptNewSession = true;
-                            return acceptRequest(response);
-                        }
-
-                        if (!participants[response.userid]) {
-                            acceptRequest(response);
-                        }
-                    }
-
-                    if (response.acceptedRequestOf == connection.userid) {
-                        connection.onstatechange({
-                            userid: response.userid,
-                            extra: response.extra,
-                            name: 'request-accepted',
-                            reason: response.userid + ' accepted your participation request.'
-                        });
-                    }
-
-                    if (response.rejectedRequestOf == connection.userid) {
-                        connection.onstatechange({
-                            userid: response.userid,
-                            extra: response.extra,
-                            name: 'request-rejected',
-                            reason: response.userid + ' rejected your participation request.'
-                        });
-                    }
-
-                    if (response.customMessage) {
-                        if (response.message.drop) {
-                            connection.ondrop(response.userid);
-
-                            connection.attachStreams = [];
-                            // "drop" should detach all local streams
-                            for (var stream in connection.streams) {
-                                if (connection._skip.indexOf(stream) == -1) {
-                                    stream = connection.streams[stream];
-                                    if (stream.type == 'local') {
-                                        connection.detachStreams.push(stream.streamid);
-                                        onStreamEndedHandler(stream, connection);
-                                    } else onStreamEndedHandler(stream, connection);
-                                }
-                            }
-
-                            if (response.message.renegotiate) {
-                                // renegotiate; so "peer.removeStream" happens.
-                                connection.renegotiate();
-                            }
-                        } else if (connection.onCustomMessage) {
-                            connection.onCustomMessage(response.message);
-                        }
-                    }
-
-                    if (connection.isInitiator && response.searchingForRooms) {
-                        defaultSocket && defaultSocket.send({
-                            sessionDescription: connection.sessionDescription,
-                            responseFor: response.userid
-                        });
-                    }
-
-                    if (response.sessionDescription && response.responseFor == connection.userid) {
-                        var sessionDescription = response.sessionDescription;
-                        if (!connection.sessionDescriptions[sessionDescription.sessionid]) {
-                            connection.numberOfSessions++;
-                            connection.sessionDescriptions[sessionDescription.sessionid] = sessionDescription;
-                        }
-                    }
-
-                    if (connection.isInitiator && response.askToShareParticipants && defaultSocket) {
-                        connection.shareParticipants({
-                            shareWith: response.userid
-                        });
-                    }
-
-                    // participants are shared with single user
-                    if (response.shareWith == connection.userid && response.dontShareWith != connection.userid && response.joinUsers) {
-                        joinParticipants(response.joinUsers);
-                    }
-
-                    // participants are shared with all users
-                    if (!response.shareWith && response.joinUsers) {
-                        if (response.dontShareWith) {
-                            if (connection.userid != response.dontShareWith) {
-                                joinParticipants(response.joinUsers);
-                            }
-                        } else joinParticipants(response.joinUsers);
-                    }
-
-                    if (response.messageFor == connection.userid && response.presenceState) {
-                        if (response.presenceState == 'checking') {
-                            defaultSocket.send({
-                                messageFor: response.userid,
-                                presenceState: 'available',
-                                _config: response._config
-                            });
-                            log('participant asked for availability');
-                        }
-
-                        if (response.presenceState == 'available') {
-                            rtcMultiSession.presenceState = 'available';
-
-                            connection.onstatechange({
-                                userid: 'browser',
-                                extra: {},
-                                name: 'room-available',
-                                reason: 'Initiator is available and room is active.'
-                            });
-
-                            joinSession(response._config);
-                        }
-                    }
-
-                    if (response.donotJoin && response.messageFor == connection.userid) {
-                        log(response.userid, 'is not joining your room.');
-                    }
-
-                    // if initiator disconnects sockets, participants should also disconnect
-                    if (response.isDisconnectSockets) {
-                        log('Disconnecting your sockets because initiator also disconnected his sockets.');
-                        connection.disconnect();
-                    }
-                },
-                callback: function(socket) {
-                    socket && this.onopen(socket);
-                },
-                onopen: function(socket) {
-                    if (socket) defaultSocket = socket;
-                    if (onSignalingReady) onSignalingReady();
-
-                    rtcMultiSession.defaultSocket = defaultSocket;
-
-                    if (!defaultSocket.__push) {
-                        defaultSocket.__push = defaultSocket.send;
-                        defaultSocket.send = function(message) {
-                            message.userid = message.userid || connection.userid;
-                            message.extra = message.extra || connection.extra || {};
-
-                            defaultSocket.__push(message);
-                        };
-                    }
-                }
-            });
-        }
-
-        // default-socket is a common socket shared among all users in a specific channel;
-        // to share participation requests; room descriptions; and other stuff.
-        var defaultSocket = getDefaultSocketRef();
-
-        rtcMultiSession.defaultSocket = defaultSocket;
-
-        if (defaultSocket && onSignalingReady) setTimeout(onSignalingReady, 2000);
-
-        if (connection.session.screen) {
-            loadScreenFrame();
-        }
-        // CUSTOM CODE //
-        
-        /* Commenting this
-        connection.getExternalIceServers  && loadIceFrame(function(iceServers)
-        		{
-            connection.iceServers = connection.iceServers.concat(iceServers);
-        });
-        */
-        
-       // CUSTOM CODE //
-
-        if (connection.log == false) connection.skipLogs();
-        if (connection.onlog) {
-            log = warn = error = function() {
-                var log = {};
-                var index = 0;
-                Array.prototype.slice.call(arguments).forEach(function(argument) {
-                    log[index++] = toStr(argument);
-                });
-                toStr = function(str) {
-                    return str;
-                };
-                connection.onlog(log);
-            };
-        }
-
-        function setDirections() {
-            var userMaxParticipantsAllowed = 0;
-
-            // if user has set a custom max participant setting, remember it
-            if (connection.maxParticipantsAllowed != 256) {
-                userMaxParticipantsAllowed = connection.maxParticipantsAllowed;
-            }
-
-            if (connection.direction == 'one-way') connection.session.oneway = true;
-            if (connection.direction == 'one-to-one') connection.maxParticipantsAllowed = 1;
-            if (connection.direction == 'one-to-many') connection.session.broadcast = true;
-            if (connection.direction == 'many-to-many') {
-                if (!connection.maxParticipantsAllowed || connection.maxParticipantsAllowed == 1) {
-                    connection.maxParticipantsAllowed = 256;
-                }
-            }
-
-            // if user has set a custom max participant setting, set it back
-            if (userMaxParticipantsAllowed && connection.maxParticipantsAllowed != 1) {
-                connection.maxParticipantsAllowed = userMaxParticipantsAllowed;
-            }
-        }
-
-        // open new session
-        this.initSession = function(args) {
-            rtcMultiSession.isOwnerLeaving = false;
-
-            setDirections();
-            participants = {};
-
-            rtcMultiSession.isOwnerLeaving = false;
-
-            if (!isNull(args.transmitRoomOnce)) {
-                connection.transmitRoomOnce = args.transmitRoomOnce;
-            }
-
-            function transmit() {
-                if (defaultSocket && getLength(participants) < connection.maxParticipantsAllowed && !rtcMultiSession.isOwnerLeaving) {
-                    defaultSocket.send(connection.sessionDescription);
-                }
-
-                if (!connection.transmitRoomOnce && !rtcMultiSession.isOwnerLeaving)
-                    setTimeout(transmit, connection.interval || 3000);
-            }
-
-            // todo: test and fix next line.
-            if (!args.dontTransmit /* || connection.transmitRoomOnce */ ) transmit();
-        };
-
-        function joinSession(_config, skipOnStateChange) {
-            if (rtcMultiSession.donotJoin && rtcMultiSession.donotJoin == _config.sessionid) {
-                return;
-            }
-
-            // dontOverrideSession allows you force RTCMultiConnection
-            // to not override default session for participants;
-            // by default, session is always overridden and set to the session coming from initiator!
-            if (!connection.dontOverrideSession) {
-                connection.session = _config.session || {};
-            }
-
-            // make sure that inappropriate users shouldn't receive onNewSession event
-            rtcMultiSession.broadcasterid = _config.userid;
-
-            if (_config.sessionid) {
-                // used later to prevent external rooms messages to be used by this user!
-                connection.sessionid = _config.sessionid;
-            }
-
-            connection.isAcceptNewSession = false;
-
-            var channel = getRandomString();
-            newPrivateSocket({
-                channel: channel,
-                extra: _config.extra || {},
-                userid: _config.userid
-            });
-
-            var offers = {};
-            if (connection.attachStreams.length) {
-                var stream = connection.attachStreams[connection.attachStreams.length - 1];
-                if (!!stream.getAudioTracks && stream.getAudioTracks().length) {
-                    offers.audio = true;
-                }
-                if (stream.getVideoTracks().length) {
-                    offers.video = true;
-                }
-            }
-
-            if (!isEmpty(offers)) {
-                log(toStr(offers));
-            } else log('Seems data-only connection.');
-
-            connection.onstatechange({
-                userid: _config.userid,
-                extra: {},
-                name: 'connecting-with-initiator',
-                reason: 'Checking presence of the initiator; and the room.'
-            });
-
-            defaultSocket.send({
-                participant: true,
-                channel: channel,
-                targetUser: _config.userid,
-                session: connection.session,
-                offers: {
-                    audio: !!offers.audio,
-                    video: !!offers.video
-                }
-            });
-
-            connection.skipOnNewSession = false;
-            invokeMediaCaptured(connection);
-        }
-
-        // join existing session
-        this.joinSession = function(_config) {
-            if (!defaultSocket)
-                return setTimeout(function() {
-                    warn('Default-Socket is not yet initialized.');
-                    rtcMultiSession.joinSession(_config);
-                }, 1000);
-
-            _config = _config || {};
-            participants = {};
-
-            rtcMultiSession.presenceState = 'checking';
-
-            connection.onstatechange({
-                userid: _config.userid,
-                extra: _config.extra || {},
-                name: 'detecting-room-presence',
-                reason: 'Checking presence of the room.'
-            });
-
-            function contactInitiator() {
-                defaultSocket.send({
-                    messageFor: _config.userid,
-                    presenceState: rtcMultiSession.presenceState,
-                    _config: {
-                        userid: _config.userid,
-                        extra: _config.extra || {},
-                        sessionid: _config.sessionid,
-                        session: _config.session || false
-                    }
-                });
-            }
-            contactInitiator();
-
-            function checker() {
-                if (rtcMultiSession.presenceState == 'checking') {
-                    warn('Unable to reach initiator. Trying again...');
-                    contactInitiator();
-                    setTimeout(function() {
-                        if (rtcMultiSession.presenceState == 'checking') {
-                            connection.onstatechange({
-                                userid: _config.userid,
-                                extra: _config.extra || {},
-                                name: 'room-not-available',
-                                reason: 'Initiator seems absent. Waiting for someone to open the room.'
-                            });
-
-                            connection.isAcceptNewSession = true;
-                            setTimeout(checker, 2000);
-                        }
-                    }, 2000);
-                }
-            }
-
-            setTimeout(checker, 3000);
-        };
-
-        connection.donotJoin = function(sessionid) {
-            rtcMultiSession.donotJoin = sessionid;
-
-            var session = connection.sessionDescriptions[sessionid];
-            if (!session) return;
-
-            defaultSocket.send({
-                donotJoin: true,
-                messageFor: session.userid,
-                sessionid: sessionid
-            });
-
-            participants = {};
-            connection.isAcceptNewSession = true;
-            connection.sessionid = null;
-        };
-
-        // send file/data or text message
-        this.send = function(message, _channel) {
-            if (!(message instanceof ArrayBuffer || message instanceof DataView)) {
-                message = str2ab({
-                    extra: connection.extra,
-                    userid: connection.userid,
-                    data: message
-                });
-            }
-
-            if (_channel) {
-                if (_channel.readyState == 'open') {
-                    _channel.send(message);
-                }
-                return;
-            }
-
-            for (var dataChannel in connection.channels) {
-                var channel = connection.channels[dataChannel].channel;
-                if (channel.readyState == 'open') {
-                    channel.send(message);
-                }
-            }
-        };
-
-        // leave session
-        this.leave = function() {
-            clearSession();
-        };
-
-        // renegotiate new stream
-        this.addStream = function(e) {
-            var session = e.renegotiate;
-
-            if (!connection.renegotiatedSessions[JSON.stringify(e.renegotiate)]) {
-                connection.renegotiatedSessions[JSON.stringify(e.renegotiate)] = {
-                    session: e.renegotiate,
-                    stream: e.stream
-                };
-            }
-
-            if (e.socket) {
-                if (e.socket.userid != connection.userid) {
-                    addStream(connection.peers[e.socket.userid]);
-                }
-            } else {
-                for (var peer in connection.peers) {
-                    if (peer != connection.userid) {
-                        addStream(connection.peers[peer]);
-                    }
-                }
-            }
-
-            function addStream(_peer) {
-                var socket = _peer.socket;
-
-                if (!socket) {
-                    warn(_peer, 'doesn\'t has socket.');
-                    return;
-                }
-
-                updateSocketForLocalStreams(socket);
-
-                if (!_peer || !_peer.peer) {
-                    throw 'No peer to renegotiate.';
-                }
-
-                var peer = _peer.peer;
-
-                if (e.stream) {
-                    if (!peer.attachStreams) {
-                        peer.attachStreams = [];
-                    }
-
-                    peer.attachStreams.push(e.stream);
-                }
-
-                // detaching old streams
-                detachMediaStream(connection.detachStreams, peer.connection);
-
-                if (e.stream && (session.audio || session.video || session.screen)) {
-                    peer.addStream(e.stream);
-                }
-
-                peer.recreateOffer(session, function(sdp, streaminfo) {
-                    sendsdp({
-                        sdp: sdp,
-                        socket: socket,
-                        renegotiate: session,
-                        labels: connection.detachStreams,
-                        streaminfo: streaminfo
-                    });
-                    connection.detachStreams = [];
-                });
-            }
-        };
-
-        // www.RTCMultiConnection.org/docs/request/
-        connection.request = function(userid, extra) {
-            connection.captureUserMedia(function() {
-                // open private socket that will be used to receive offer-sdp
-                newPrivateSocket({
-                    channel: connection.userid,
-                    extra: extra || {},
-                    userid: userid
-                });
-
-                // ask other user to create offer-sdp
-                defaultSocket.send({
-                    participant: true,
-                    targetUser: userid
-                });
-            });
-        };
-
-        function acceptRequest(response) {
-            if (!rtcMultiSession.requestsFrom) rtcMultiSession.requestsFrom = {};
-            if (rtcMultiSession.requestsFrom[response.userid]) return;
-
-            var obj = {
-                userid: response.userid,
-                extra: response.extra,
-                channel: response.channel || response.userid,
-                session: response.session || connection.session
-            };
-
-            // check how participant is willing to join
-            if (response.offers) {
-                if (response.offers.audio && response.offers.video) {
-                    log('target user has both audio/video streams.');
-                } else if (response.offers.audio && !response.offers.video) {
-                    log('target user has only audio stream.');
-                } else if (!response.offers.audio && response.offers.video) {
-                    log('target user has only video stream.');
-                } else {
-                    log('target user has no stream; it seems one-way streaming or data-only connection.');
-                }
-
-                var mandatory = connection.sdpConstraints.mandatory;
-                if (isNull(mandatory.OfferToReceiveAudio)) {
-                    connection.sdpConstraints.mandatory.OfferToReceiveAudio = !!response.offers.audio;
-                }
-                if (isNull(mandatory.OfferToReceiveVideo)) {
-                    connection.sdpConstraints.mandatory.OfferToReceiveVideo = !!response.offers.video;
-                }
-
-                log('target user\'s SDP has?', toStr(connection.sdpConstraints.mandatory));
-            }
-
-            rtcMultiSession.requestsFrom[response.userid] = obj;
-
-            // www.RTCMultiConnection.org/docs/onRequest/
-            if (connection.onRequest && connection.isInitiator) {
-                connection.onRequest(obj);
-            } else _accept(obj);
-        }
-
-        function _accept(e) {
-            if (rtcMultiSession.captureUserMediaOnDemand) {
-                rtcMultiSession.captureUserMediaOnDemand = false;
-                connection.captureUserMedia(function() {
-                    _accept(e);
-
-                    invokeMediaCaptured(connection);
-                });
-                return;
-            }
-
-            log('accepting request from', e.userid);
-            participants[e.userid] = e.userid;
-            newPrivateSocket({
-                isofferer: true,
-                userid: e.userid,
-                channel: e.channel,
-                extra: e.extra || {},
-                session: e.session || connection.session
-            });
-        }
-
-        // www.RTCMultiConnection.org/docs/accept/
-        connection.accept = function(e) {
-            // for backward compatibility
-            if (arguments.length > 1 && isString(arguments[0])) {
-                e = {};
-                if (arguments[0]) e.userid = arguments[0];
-                if (arguments[1]) e.extra = arguments[1];
-                if (arguments[2]) e.channel = arguments[2];
-            }
-
-            connection.captureUserMedia(function() {
-                _accept(e);
-            });
-        };
-
-        var isRMSDeleted = false;
-        this.disconnect = function() {
-            this.isOwnerLeaving = true;
-
-            if (!connection.keepStreamsOpened) {
-                for (var streamid in connection.localStreams) {
-                    connection.localStreams[streamid].stop();
-                }
-                connection.localStreams = {};
-
-                currentUserMediaRequest = {
-                    streams: [],
-                    mutex: false,
-                    queueRequests: []
-                };
-            }
-
-            if (connection.isInitiator) {
-                defaultSocket.send({
-                    isDisconnectSockets: true
-                });
-            }
-
-            connection.refresh();
-
-            rtcMultiSession.defaultSocket = defaultSocket = null;
-            isRMSDeleted = true;
-
-            connection.ondisconnected({
-                userid: connection.userid,
-                extra: connection.extra,
-                peer: connection.peers[connection.userid],
-                isSocketsDisconnected: true
-            });
-
-            // if there is any peer still opened; close it.
-            connection.close();
-
-            window.removeEventListener('beforeunload', rtcMultiSession.leaveHandler);
-            window.removeEventListener('keyup', rtcMultiSession.leaveHandler);
-
-            // it will not work, though :)
-            delete this;
-
-            log('Disconnected your sockets, peers, streams and everything except RTCMultiConnection object.');
-        };
-    }
-
-    var webAudioMediaStreamSources = [];
-
-    function convertToAudioStream(mediaStream) {
-        if (!mediaStream) throw 'MediaStream is mandatory.';
-
-        if (mediaStream.getVideoTracks && !mediaStream.getVideoTracks().length) {
-            return mediaStream;
-        }
-
-        var context = new AudioContext();
-        var mediaStreamSource = context.createMediaStreamSource(mediaStream);
-
-        var destination = context.createMediaStreamDestination();
-        mediaStreamSource.connect(destination);
-
-        webAudioMediaStreamSources.push(mediaStreamSource);
-
-        return destination.stream;
-    }
-
-    var isOpera = !!window.opera || navigator.userAgent.indexOf(' OPR/') >= 0;
-    var isFirefox = typeof window.InstallTrigger !== 'undefined';
-    var isSafari = Object.prototype.toString.call(window.HTMLElement).indexOf('Constructor') > 0;
-    var isChrome = !!window.chrome && !isOpera;
-    var isIE = !!document.documentMode;
-
-    var isPluginRTC = isSafari || isIE;
-
-    var isMobileDevice = !!navigator.userAgent.match(/Android|iPhone|iPad|iPod|BlackBerry|IEMobile/i);
-
-    // detect node-webkit
-    var isNodeWebkit = !!(window.process && (typeof window.process == 'object') && window.process.versions && window.process.versions['node-webkit']);
-
-    window.MediaStream = window.MediaStream || window.webkitMediaStream;
-    window.AudioContext = window.AudioContext || window.webkitAudioContext;
-
-    function getRandomString() {
-        // suggested by @rvulpescu from #154
-        if (window.crypto && crypto.getRandomValues && navigator.userAgent.indexOf('Safari') == -1) {
-            var a = window.crypto.getRandomValues(new Uint32Array(3)),
-                token = '';
-            for (var i = 0, l = a.length; i < l; i++) {
-                token += a[i].toString(36);
-            }
-            return token;
-        } else {
-            return (Math.random() * new Date().getTime()).toString(36).replace(/\./g, '');
-        }
-    }
-
-    var chromeVersion = 50;
-    var matchArray = navigator.userAgent.match(/Chrom(e|ium)\/([0-9]+)\./);
-    if (isChrome && matchArray && matchArray[2]) {
-        chromeVersion = parseInt(matchArray[2], 10);
-    }
-
-    var firefoxVersion = 50;
-    matchArray = navigator.userAgent.match(/Firefox\/(.*)/);
-    if (isFirefox && matchArray && matchArray[1]) {
-        firefoxVersion = parseInt(matchArray[1], 10);
-    }
-
-    function isData(session) {
-        return !session.audio && !session.video && !session.screen && session.data;
-    }
-
-    function isNull(obj) {
-        return typeof obj == 'undefined';
-    }
-
-    function isString(obj) {
-        return typeof obj == 'string';
-    }
-
-    function isEmpty(session) {
-        var length = 0;
-        for (var s in session) {
-            length++;
-        }
-        return length == 0;
-    }
-
-    // this method converts array-buffer into string
-    function ab2str(buf) {
-        var result = '';
-        try {
-            result = String.fromCharCode.apply(null, new Uint16Array(buf));
-        } catch (e) {}
-        return result;
-    }
-
-    // this method converts string into array-buffer
-    function str2ab(str) {
-        if (!isString(str)) str = JSON.stringify(str);
-
-        var buf = new ArrayBuffer(str.length * 2); // 2 bytes for each char
-        var bufView = new Uint16Array(buf);
-        for (var i = 0, strLen = str.length; i < strLen; i++) {
-            bufView[i] = str.charCodeAt(i);
-        }
-        return buf;
-    }
-
-    function swap(arr) {
-        var swapped = [],
-            length = arr.length;
-        for (var i = 0; i < length; i++)
-            if (arr[i] && arr[i] !== true)
-                swapped.push(arr[i]);
-        return swapped;
-    }
-
-    function forEach(obj, callback) {
-        for (var item in obj) {
-            callback(obj[item], item);
-        }
-    }
-
-    var console = window.console || {
-        log: function() {},
-        error: function() {},
-        warn: function() {}
-    };
-
-    function log() {
-        console.log(arguments);
-    }
-
-    function error() {
-        console.error(arguments);
-    }
-
-    function warn() {
-        console.warn(arguments);
-    }
-
-    if (isChrome || isFirefox || isSafari) {
-        var log = console.log.bind(console);
-        var error = console.error.bind(console);
-        var warn = console.warn.bind(console);
-    }
-
-    function toStr(obj) {
-        return JSON.stringify(obj, function(key, value) {
-            if (value && value.sdp) {
-                log(value.sdp.type, '\t', value.sdp.sdp);
-                return '';
-            } else return value;
-        }, '\t');
-    }
-
-    function getLength(obj) {
-        var length = 0;
-        for (var o in obj)
-            if (o) length++;
-        return length;
-    }
-
-    // Get HTMLAudioElement/HTMLVideoElement accordingly
-
-    function createMediaElement(stream, session) {
-        var mediaElement = document.createElement(stream.isAudio ? 'audio' : 'video');
-        mediaElement.id = stream.streamid;
-
-        if (isPluginRTC) {
-            var body = (document.body || document.documentElement);
-            body.insertBefore(mediaElement, body.firstChild);
-
-            setTimeout(function() {
-                Plugin.attachMediaStream(mediaElement, stream)
-            }, 1000);
-
-            return Plugin.attachMediaStream(mediaElement, stream);
-        }
-
-        // "mozSrcObject" is always preferred over "src"!!
-        mediaElement[isFirefox ? 'mozSrcObject' : 'src'] = isFirefox ? stream : (window.URL || window.webkitURL).createObjectURL(stream);
-
-        mediaElement.controls = true;
-        mediaElement.autoplay = !!session.remote;
-        mediaElement.muted = session.remote ? false : true;
-
-        // http://goo.gl/WZ5nFl
-        // Firefox don't yet support onended for any stream (remote/local)
-        isFirefox && mediaElement.addEventListener('ended', function() {
-            stream.onended();
-        }, false);
-
-        mediaElement.play();
-
-        return mediaElement;
-    }
-
-    var onStreamEndedHandlerFiredFor = {};
-
-    function onStreamEndedHandler(streamedObject, connection) {
-        if (streamedObject.mediaElement && !streamedObject.mediaElement.parentNode) return;
-
-        if (onStreamEndedHandlerFiredFor[streamedObject.streamid]) return;
-        onStreamEndedHandlerFiredFor[streamedObject.streamid] = streamedObject;
-        connection.onstreamended(streamedObject);
-    }
-
-    var onLeaveHandlerFiredFor = {};
-
-    function onLeaveHandler(event, connection) {
-        if (onLeaveHandlerFiredFor[event.userid]) return;
-        onLeaveHandlerFiredFor[event.userid] = event;
-        connection.onleave(event);
-    }
-
-    function takeSnapshot(args) {
-        var userid = args.userid;
-        var connection = args.connection;
-
-        function _takeSnapshot(video) {
-            var canvas = document.createElement('canvas');
-            canvas.width = video.videoWidth || video.clientWidth;
-            canvas.height = video.videoHeight || video.clientHeight;
-
-            var context = canvas.getContext('2d');
-            context.drawImage(video, 0, 0, canvas.width, canvas.height);
-
-            connection.snapshots[userid] = canvas.toDataURL('image/png');
-            args.callback && args.callback(connection.snapshots[userid]);
-        }
-
-        if (args.mediaElement) return _takeSnapshot(args.mediaElement);
-
-        for (var stream in connection.streams) {
-            stream = connection.streams[stream];
-            if (stream.userid == userid && stream.stream && stream.stream.getVideoTracks && stream.stream.getVideoTracks().length) {
-                _takeSnapshot(stream.mediaElement);
-                continue;
-            }
-        }
-    }
-
-    function invokeMediaCaptured(connection) {
-        // to let user know that media resource has been captured
-        // now, he can share "sessionDescription" using sockets
-        if (connection.onMediaCaptured) {
-            connection.onMediaCaptured();
-            delete connection.onMediaCaptured;
-        }
-    }
-
-    function merge(mergein, mergeto) {
-        if (!mergein) mergein = {};
-        if (!mergeto) return mergein;
-
-        for (var item in mergeto) {
-            mergein[item] = mergeto[item];
-        }
-        return mergein;
-    }
-
-    function loadScript(src, onload) {
-        var script = document.createElement('script');
-        script.src = src;
-        script.onload = function() {
-            log('loaded resource:', src);
-            if (onload) onload();
-        };
-        document.documentElement.appendChild(script);
-    }
-
-    function capturePartOfScreen(args) {
-        var connection = args.connection;
-        var element = args.element;
-
-        if (!window.html2canvas) {
-            return loadScript(connection.resources.html2canvas, function() {
-                capturePartOfScreen(args);
-            });
-        }
-
-        if (isString(element)) {
-            element = document.querySelector(element);
-            if (!element) element = document.getElementById(element);
-        }
-        if (!element) throw 'HTML DOM Element is not accessible!';
-
-        // todo: store DOM element somewhere to minimize DOM querying issues
-
-        // html2canvas.js is used to take screenshots
-        html2canvas(element, {
-            onrendered: function(canvas) {
-                args.callback(canvas.toDataURL());
-            }
-        });
-    }
-
-    function initFileBufferReader(connection, callback) {
-        if (!window.FileBufferReader) {
-            loadScript(connection.resources.FileBufferReader, function() {
-                initFileBufferReader(connection, callback);
-            });
-            return;
-        }
-
-        function _private(chunk) {
-            chunk.userid = chunk.extra.userid;
-            return chunk;
-        }
-
-        var fileBufferReader = new FileBufferReader();
-        fileBufferReader.onProgress = function(chunk) {
-            connection.onFileProgress(_private(chunk), chunk.uuid);
-        };
-
-        fileBufferReader.onBegin = function(file) {
-            connection.onFileStart(_private(file));
-        };
-
-        fileBufferReader.onEnd = function(file) {
-            connection.onFileEnd(_private(file));
-        };
-
-        callback(fileBufferReader);
-    }
-
-    var screenFrame, loadedScreenFrame;
-
-    function loadScreenFrame(skip) {
-        if (DetectRTC.screen.extensionid != ReservedExtensionID) {
-            return;
-        }
-
-        if (loadedScreenFrame) return;
-        if (!skip) return loadScreenFrame(true);
-
-        loadedScreenFrame = true;
-
-        var iframe = document.createElement('iframe');
-        iframe.onload = function() {
-            iframe.isLoaded = true;
-            log('Screen Capturing frame is loaded.');
-        };
-        //iframe.src = 'https://www.webrtc-experiment.com/getSourceId/';
-        // CUSTOM CODE //
-        iframe.src = 'app/fusion/scripts/webrtc/getSourceId.html';
-        //  CUSTOM CODE //
-        iframe.style.display = 'none';
-        (document.body || document.documentElement).appendChild(iframe);
-
-        screenFrame = {
-            postMessage: function() {
-                if (!iframe.isLoaded) {
-                    setTimeout(screenFrame.postMessage, 100);
-                    return;
-                }
-                iframe.contentWindow.postMessage({
-                    captureSourceId: true
-                }, '*');
-            }
-        };
-    }
-
-    var iceFrame, loadedIceFrame;
-
-    function loadIceFrame(callback, skip) {
-        if (loadedIceFrame) return;
-        if (!skip) return loadIceFrame(callback, true);
-
-        loadedIceFrame = true;
-
-        var iframe = document.createElement('iframe');
-        iframe.onload = function() {
-            iframe.isLoaded = true;
-
-            listenEventHandler('message', iFrameLoaderCallback);
-
-            function iFrameLoaderCallback(event) {
-                if (!event.data || !event.data.iceServers) return;
-                callback(event.data.iceServers);
-
-                // this event listener is no more needed
-                window.removeEventListener('message', iFrameLoaderCallback);
-            }
-
-            iframe.contentWindow.postMessage('get-ice-servers', '*');
-        };
-        iframe.src = 'https://cdn.webrtc-experiment.com/getIceServers/';
-        iframe.style.display = 'none';
-        (document.body || document.documentElement).appendChild(iframe);
-    }
-
-    function muteOrUnmute(e) {
-        var stream = e.stream,
-            root = e.root,
-            session = e.session || {},
-            enabled = e.enabled;
-
-        if (!session.audio && !session.video) {
-            if (!isString(session)) {
-                session = merge(session, {
-                    audio: true,
-                    video: true
-                });
-            } else {
-                session = {
-                    audio: true,
-                    video: true
-                };
-            }
-        }
-
-        // implementation from #68
-        if (session.type) {
-            if (session.type == 'remote' && root.type != 'remote') return;
-            if (session.type == 'local' && root.type != 'local') return;
-        }
-
-        log(enabled ? 'Muting' : 'UnMuting', 'session', toStr(session));
-
-        // enable/disable audio/video tracks
-
-        if (root.type == 'local' && session.audio && !!stream.getAudioTracks) {
-            var audioTracks = stream.getAudioTracks()[0];
-            if (audioTracks)
-                audioTracks.enabled = !enabled;
-        }
-
-        if (root.type == 'local' && (session.video || session.screen) && !!stream.getVideoTracks) {
-            var videoTracks = stream.getVideoTracks()[0];
-            if (videoTracks)
-                videoTracks.enabled = !enabled;
-        }
-
-        root.sockets.forEach(function(socket) {
-            if (root.type == 'local') {
-                socket.send({
-                    streamid: root.streamid,
-                    mute: !!enabled,
-                    unmute: !enabled,
-                    session: session
-                });
-            }
-
-            if (root.type == 'remote') {
-                socket.send({
-                    promptMuteUnmute: true,
-                    streamid: root.streamid,
-                    mute: !!enabled,
-                    unmute: !enabled,
-                    session: session
-                });
-            }
-        });
-
-        if (root.type == 'remote') return;
-
-        // According to issue #135, onmute/onumute must be fired for self
-        // "fakeObject" is used because we need to keep session for renegotiated streams; 
-        // and MUST pass exact session over onStreamEndedHandler/onmute/onhold/etc. events.
-        var fakeObject = merge({}, root);
-        fakeObject.session = session;
-
-        fakeObject.isAudio = !!fakeObject.session.audio && !fakeObject.session.video;
-        fakeObject.isVideo = !!fakeObject.session.video;
-        fakeObject.isScreen = !!fakeObject.session.screen;
-
-        if (!!enabled) {
-            // if muted stream is negotiated
-            stream.preMuted = {
-                audio: stream.getAudioTracks().length && !stream.getAudioTracks()[0].enabled,
-                video: stream.getVideoTracks().length && !stream.getVideoTracks()[0].enabled
-            };
-            root.rtcMultiConnection.onmute(fakeObject);
-        }
-
-        if (!enabled) {
-            stream.preMuted = {};
-            root.rtcMultiConnection.onunmute(fakeObject);
-        }
-    }
-
-    var Firefox_Screen_Capturing_Warning = 'Make sure that you are using Firefox Nightly and you enabled: media.getusermedia.screensharing.enabled flag from about:config page. You also need to add your domain in "media.getusermedia.screensharing.allowed_domains" flag. If you are using WinXP then also enable "media.getusermedia.screensharing.allow_on_old_platforms" flag. NEVER forget to use "only" HTTPs for screen capturing!';
-    var SCREEN_COMMON_FAILURE = 'HTTPs i.e. SSL-based URI is mandatory to use screen capturing.';
-    // CUSTOM CODE //
-    var ReservedExtensionID = 'icgmlogfeajbfdffajhoebcfbibfhaen';
-    //var ReservedExtensionID = 'ajhifddimkapgcifgcodmmfdlknahffk';
-    
-    // if application-developer deployed his own extension on Google App Store
-    var useCustomChromeExtensionForScreenCapturing = document.domain.indexOf('webrtc-experiment.com') != -1;
-
-    function initHark(args) {
-        if (!window.hark) {
-            loadScript(args.connection.resources.hark, function() {
-                initHark(args);
-            });
-            return;
-        }
-
-        var connection = args.connection;
-        var streamedObject = args.streamedObject;
-        var stream = args.stream;
-
-        var options = {};
-        var speechEvents = hark(stream, options);
-
-        speechEvents.on('speaking', function() {
-            if (connection.onspeaking) {
-                connection.onspeaking(streamedObject);
-            }
-        });
-
-        speechEvents.on('stopped_speaking', function() {
-            if (connection.onsilence) {
-                connection.onsilence(streamedObject);
-            }
-        });
-
-        speechEvents.on('volume_change', function(volume, threshold) {
-            if (connection.onvolumechange) {
-                connection.onvolumechange(merge({
-                    volume: volume,
-                    threshold: threshold
-                }, streamedObject));
-            }
-        });
-    }
-
-    attachEventListener = function(video, type, listener, useCapture) {
-        video.addEventListener(type, listener, useCapture);
-    };
-
-    var Plugin = window.PluginRTC || {};
-    window.onPluginRTCInitialized = function(pluginRTCObject) {
-        Plugin = pluginRTCObject;
-        MediaStreamTrack = Plugin.MediaStreamTrack;
-        RTCPeerConnection = Plugin.RTCPeerConnection;
-        RTCIceCandidate = Plugin.RTCIceCandidate;
-        RTCSessionDescription = Plugin.RTCSessionDescription;
-
-        log(isPluginRTC ? 'Java-Applet' : 'ActiveX', 'plugin has been loaded.');
-    };
-    if (!isEmpty(Plugin)) window.onPluginRTCInitialized(Plugin);
-
-    // if IE or Safari
-    if (isPluginRTC) {
-        loadScript('https://cdn.webrtc-experiment.com/Plugin.EveryWhere.js');
-        // loadScript('https://cdn.webrtc-experiment.com/Plugin.Temasys.js');
-    }
-
-    var MediaStream = window.MediaStream;
-
-    if (typeof MediaStream === 'undefined' && typeof webkitMediaStream !== 'undefined') {
-        MediaStream = webkitMediaStream;
-    }
-
-    /*global MediaStream:true */
-    if (typeof MediaStream !== 'undefined' && !('stop' in MediaStream.prototype)) {
-        MediaStream.prototype.stop = function() {
-            this.getAudioTracks().forEach(function(track) {
-                track.stop();
-            });
-
-            this.getVideoTracks().forEach(function(track) {
-                track.stop();
-            });
-        };
-    }
-
-    var defaultConstraints = {
-        mandatory: {},
-        optional: []
-    };
-
-    /* by @FreCap pull request #41 */
-    var currentUserMediaRequest = {
-        streams: [],
-        mutex: false,
-        queueRequests: []
-    };
-
-    function getUserMedia(options) {
-        if (isPluginRTC) {
-            if (!Plugin.getUserMedia) {
-                setTimeout(function() {
-                    getUserMedia(options);
-                }, 1000);
-                return;
-            }
-
-            return Plugin.getUserMedia(options.constraints || {
-                audio: true,
-                video: true
-            }, options.onsuccess, options.onerror);
-        }
-
-        if (currentUserMediaRequest.mutex === true) {
-            currentUserMediaRequest.queueRequests.push(options);
-            return;
-        }
-        currentUserMediaRequest.mutex = true;
-
-        var connection = options.connection;
-
-        // tools.ietf.org/html/draft-alvestrand-constraints-resolution-00
-        var mediaConstraints = options.mediaConstraints || {};
-        var videoConstraints = typeof mediaConstraints.video == 'boolean' ? mediaConstraints.video : mediaConstraints.video || mediaConstraints;
-        var audioConstraints = typeof mediaConstraints.audio == 'boolean' ? mediaConstraints.audio : mediaConstraints.audio || defaultConstraints;
-
-        var n = navigator;
-        var hints = options.constraints || {
-            audio: defaultConstraints,
-            video: defaultConstraints
-        };
-
-        if (hints.video && hints.video.mozMediaSource) {
-            // "mozMediaSource" is redundant
-            // need to check "mediaSource" instead.
-            videoConstraints = {};
-        }
-
-        if (hints.video == true) hints.video = defaultConstraints;
-        if (hints.audio == true) hints.audio = defaultConstraints;
-
-        // connection.mediaConstraints.audio = false;
-        if (typeof audioConstraints == 'boolean' && hints.audio) {
-            hints.audio = audioConstraints;
-        }
-
-        // connection.mediaConstraints.video = false;
-        if (typeof videoConstraints == 'boolean' && hints.video) {
-            hints.video = videoConstraints;
-        }
-
-        // connection.mediaConstraints.audio.mandatory = {prop:true};
-        var audioMandatoryConstraints = audioConstraints.mandatory;
-        if (!isEmpty(audioMandatoryConstraints)) {
-            hints.audio.mandatory = merge(hints.audio.mandatory, audioMandatoryConstraints);
-        }
-
-        // connection.media.min(320,180);
-        // connection.media.max(1920,1080);
-        var videoMandatoryConstraints = videoConstraints.mandatory;
-        if (videoMandatoryConstraints) {
-            var mandatory = {};
-
-            if (videoMandatoryConstraints.minWidth) {
-                mandatory.minWidth = videoMandatoryConstraints.minWidth;
-            }
-
-            if (videoMandatoryConstraints.minHeight) {
-                mandatory.minHeight = videoMandatoryConstraints.minHeight;
-            }
-
-            if (videoMandatoryConstraints.maxWidth) {
-                mandatory.maxWidth = videoMandatoryConstraints.maxWidth;
-            }
-
-            if (videoMandatoryConstraints.maxHeight) {
-                mandatory.maxHeight = videoMandatoryConstraints.maxHeight;
-            }
-
-            if (videoMandatoryConstraints.minAspectRatio) {
-                mandatory.minAspectRatio = videoMandatoryConstraints.minAspectRatio;
-            }
-
-            if (videoMandatoryConstraints.maxFrameRate) {
-                mandatory.maxFrameRate = videoMandatoryConstraints.maxFrameRate;
-            }
-
-            if (videoMandatoryConstraints.minFrameRate) {
-                mandatory.minFrameRate = videoMandatoryConstraints.minFrameRate;
-            }
-
-            if (mandatory.minWidth && mandatory.minHeight) {
-                // http://goo.gl/IZVYsj
-                var allowed = ['1920:1080', '1280:720', '960:720', '640:360', '640:480', '320:240', '320:180'];
-
-                if (allowed.indexOf(mandatory.minWidth + ':' + mandatory.minHeight) == -1 ||
-                    allowed.indexOf(mandatory.maxWidth + ':' + mandatory.maxHeight) == -1) {
-                    error('The min/max width/height constraints you passed "seems" NOT supported.', toStr(mandatory));
-                }
-
-                if (mandatory.minWidth > mandatory.maxWidth || mandatory.minHeight > mandatory.maxHeight) {
-                    error('Minimum value must not exceed maximum value.', toStr(mandatory));
-                }
-
-                if (mandatory.minWidth >= 1280 && mandatory.minHeight >= 720) {
-                    warn('Enjoy HD video! min/' + mandatory.minWidth + ':' + mandatory.minHeight + ', max/' + mandatory.maxWidth + ':' + mandatory.maxHeight);
-                }
-            }
-
-            hints.video.mandatory = merge(hints.video.mandatory, mandatory);
-        }
-
-        if (videoMandatoryConstraints) {
-            hints.video.mandatory = merge(hints.video.mandatory, videoMandatoryConstraints);
-        }
-
-        // videoConstraints.optional = [{prop:true}];
-        if (videoConstraints.optional && videoConstraints.optional instanceof Array && videoConstraints.optional.length) {
-            hints.video.optional = hints.video.optional ? hints.video.optional.concat(videoConstraints.optional) : videoConstraints.optional;
-        }
-
-        // audioConstraints.optional = [{prop:true}];
-        if (audioConstraints.optional && audioConstraints.optional instanceof Array && audioConstraints.optional.length) {
-            hints.audio.optional = hints.audio.optional ? hints.audio.optional.concat(audioConstraints.optional) : audioConstraints.optional;
-        }
-
-        if (hints.video.mandatory && !isEmpty(hints.video.mandatory) && connection._mediaSources.video) {
-            hints.video.optional.forEach(function(video, index) {
-                if (video.sourceId == connection._mediaSources.video) {
-                    delete hints.video.optional[index];
-                }
-            });
-
-            hints.video.optional = swap(hints.video.optional);
-
-            hints.video.optional.push({
-                sourceId: connection._mediaSources.video
-            });
-        }
-
-        if (hints.audio.mandatory && !isEmpty(hints.audio.mandatory) && connection._mediaSources.audio) {
-            hints.audio.optional.forEach(function(audio, index) {
-                if (audio.sourceId == connection._mediaSources.audio) {
-                    delete hints.audio.optional[index];
-                }
-            });
-
-            hints.audio.optional = swap(hints.audio.optional);
-
-            hints.audio.optional.push({
-                sourceId: connection._mediaSources.audio
-            });
-        }
-
-        if (hints.video && !hints.video.mozMediaSource && hints.video.optional && hints.video.mandatory) {
-            if (!hints.video.optional.length && isEmpty(hints.video.mandatory)) {
-                hints.video = true;
-            }
-        }
-
-        if (isMobileDevice) {
-            // Android fails for some constraints
-            // so need to force {audio:true,video:true}
-            hints = {
-                audio: !!hints.audio,
-                video: !!hints.video
-            };
-        }
-
-        // connection.mediaConstraints always overrides constraints
-        // passed from "captureUserMedia" function.
-        // todo: need to verify all possible situations
-        log('invoked getUserMedia with constraints:', toStr(hints));
-
-        // easy way to match 
-        var idInstance = JSON.stringify(hints);
-
-        function streaming(stream, returnBack, streamid) {
-            if (!streamid) streamid = getRandomString();
-
-            // localStreams object will store stream
-            // until it is removed using native-stop method.
-            connection.localStreams[streamid] = stream;
-
-            var video = options.video;
-            if (video) {
-                video[isFirefox ? 'mozSrcObject' : 'src'] = isFirefox ? stream : (window.URL || window.webkitURL).createObjectURL(stream);
-                video.play();
-            }
-
-            options.onsuccess(stream, returnBack, idInstance, streamid);
-            currentUserMediaRequest.streams[idInstance] = {
-                stream: stream,
-                streamid: streamid
-            };
-            currentUserMediaRequest.mutex = false;
-            if (currentUserMediaRequest.queueRequests.length)
-                getUserMedia(currentUserMediaRequest.queueRequests.shift());
-        }
-
-        if (currentUserMediaRequest.streams[idInstance]) {
-            streaming(currentUserMediaRequest.streams[idInstance].stream, true, currentUserMediaRequest.streams[idInstance].streamid);
-        } else {
-            n.getMedia = n.webkitGetUserMedia || n.mozGetUserMedia;
-
-            // http://goo.gl/eETIK4
-            n.getMedia(hints, streaming, function(error) {
-                options.onerror(error, hints);
-            });
-        }
-    }
-
-    var RTCSessionDescription = window.RTCSessionDescription || window.mozRTCSessionDescription;
-    var RTCIceCandidate = window.RTCIceCandidate || window.mozRTCIceCandidate;
-
-    var RTCPeerConnection;
-    if (typeof mozRTCPeerConnection !== 'undefined') {
-        RTCPeerConnection = mozRTCPeerConnection;
-    } else if (typeof webkitRTCPeerConnection !== 'undefined') {
-        RTCPeerConnection = webkitRTCPeerConnection;
-    } else if (typeof window.RTCPeerConnection !== 'undefined') {
-        RTCPeerConnection = window.RTCPeerConnection;
-    } else {
-        console.error('WebRTC 1.0 (RTCPeerConnection) API seems NOT available in this browser.');
-    }
-
-    function setSdpConstraints(config) {
-        var sdpConstraints;
-
-        var sdpConstraints_mandatory = {
-            OfferToReceiveAudio: !!config.OfferToReceiveAudio,
-            OfferToReceiveVideo: !!config.OfferToReceiveVideo
-        };
-
-        sdpConstraints = {
-            mandatory: sdpConstraints_mandatory,
-            optional: [{
-                VoiceActivityDetection: false
-            }]
-        };
-
-        if (!!navigator.mozGetUserMedia && firefoxVersion > 34) {
-            sdpConstraints = {
-                OfferToReceiveAudio: !!config.OfferToReceiveAudio,
-                OfferToReceiveVideo: !!config.OfferToReceiveVideo
-            };
-        }
-
-        return sdpConstraints;
-    }
-
-    function PeerConnection() {
-        return {
-            create: function(type, options) {
-                merge(this, options);
-
-                var self = this;
-
-                this.type = type;
-                this.init();
-                this.attachMediaStreams();
-
-                if (isFirefox && this.session.data) {
-                    if (this.session.data && type == 'offer') {
-                        this.createDataChannel();
-                    }
-
-                    this.getLocalDescription(type);
-
-                    if (this.session.data && type == 'answer') {
-                        this.createDataChannel();
-                    }
-                } else self.getLocalDescription(type);
-
-                return this;
-            },
-            getLocalDescription: function(createType) {
-                log('(getLocalDescription) peer createType is', createType);
-
-                if (this.session.inactive && isNull(this.rtcMultiConnection.waitUntilRemoteStreamStartsFlowing)) {
-                    // inactive session returns blank-stream
-                    this.rtcMultiConnection.waitUntilRemoteStreamStartsFlowing = false;
-                }
-
-                var self = this;
-
-                if (createType == 'answer') {
-                    this.setRemoteDescription(this.offerDescription, createDescription);
-                } else createDescription();
-
-                function createDescription() {
-                    self.connection[createType == 'offer' ? 'createOffer' : 'createAnswer'](function(sessionDescription) {
-                        sessionDescription.sdp = self.serializeSdp(sessionDescription.sdp, createType);
-                        self.connection.setLocalDescription(sessionDescription);
-
-                        if (self.trickleIce) {
-                            self.onSessionDescription(sessionDescription, self.streaminfo);
-                        }
-
-                        if (sessionDescription.type == 'offer') {
-                            log('offer sdp', sessionDescription.sdp);
-                        }
-
-                        self.prevCreateType = createType;
-                    }, self.onSdpError, self.constraints);
-                }
-            },
-            serializeSdp: function(sdp, createType) {
-                // it is "connection.processSdp=function(sdp){return sdp;}"
-                sdp = this.processSdp(sdp);
-
-                if (isFirefox) return sdp;
-
-                if (this.session.inactive && !this.holdMLine) {
-                    this.hold = true;
-                    if ((this.session.screen || this.session.video) && this.session.audio) {
-                        this.holdMLine = 'both';
-                    } else if (this.session.screen || this.session.video) {
-                        this.holdMLine = 'video';
-                    } else if (this.session.audio) {
-                        this.holdMLine = 'audio';
-                    }
-                }
-
-                sdp = this.setBandwidth(sdp);
-                if (this.holdMLine == 'both') {
-                    if (this.hold) {
-                        this.prevSDP = sdp;
-                        sdp = sdp.replace(/a=sendonly|a=recvonly|a=sendrecv/g, 'a=inactive');
-                    } else if (this.prevSDP) {
-                        if (!this.session.inactive) {
-                            // it means that DTSL key exchange already happened for single or multiple media lines.
-                            // this block checks, key-exchange must be happened for all media lines.
-                            sdp = this.prevSDP;
-
-                            // todo: test it: makes sense?
-                            if (chromeVersion <= 35) {
-                                return sdp;
-                            }
-                        }
-                    }
-                } else if (this.holdMLine == 'audio' || this.holdMLine == 'video') {
-                    sdp = sdp.split('m=');
-
-                    var audio = '';
-                    var video = '';
-
-                    if (sdp[1] && sdp[1].indexOf('audio') == 0) {
-                        audio = 'm=' + sdp[1];
-                    }
-                    if (sdp[2] && sdp[2].indexOf('audio') == 0) {
-                        audio = 'm=' + sdp[2];
-                    }
-
-                    if (sdp[1] && sdp[1].indexOf('video') == 0) {
-                        video = 'm=' + sdp[1];
-                    }
-                    if (sdp[2] && sdp[2].indexOf('video') == 0) {
-                        video = 'm=' + sdp[2];
-                    }
-
-                    if (this.holdMLine == 'audio') {
-                        if (this.hold) {
-                            this.prevSDP = sdp[0] + audio + video;
-                            sdp = sdp[0] + audio.replace(/a=sendonly|a=recvonly|a=sendrecv/g, 'a=inactive') + video;
-                        } else if (this.prevSDP) {
-                            sdp = this.prevSDP;
-                        }
-                    }
-
-                    if (this.holdMLine == 'video') {
-                        if (this.hold) {
-                            this.prevSDP = sdp[0] + audio + video;
-                            sdp = sdp[0] + audio + video.replace(/a=sendonly|a=recvonly|a=sendrecv/g, 'a=inactive');
-                        } else if (this.prevSDP) {
-                            sdp = this.prevSDP;
-                        }
-                    }
-                }
-
-                if (!this.hold && this.session.inactive) {
-                    // transport.cc&l=852 - http://goo.gl/0FxxqG
-                    // dtlstransport.h&l=234 - http://goo.gl/7E4sYF
-                    // http://tools.ietf.org/html/rfc4340
-
-                    // From RFC 4145, SDP setup attribute values.
-                    // http://goo.gl/xETJEp && http://goo.gl/3Wgcau
-                    if (createType == 'offer') {
-                        sdp = sdp.replace(/a=setup:passive|a=setup:active|a=setup:holdconn/g, 'a=setup:actpass');
-                    } else {
-                        sdp = sdp.replace(/a=setup:actpass|a=setup:passive|a=setup:holdconn/g, 'a=setup:active');
-                    }
-
-                    // whilst doing handshake, either media lines were "inactive"
-                    // or no media lines were present
-                    sdp = sdp.replace(/a=inactive/g, 'a=sendrecv');
-                }
-                // this.session.inactive = false;
-                return sdp;
-            },
-            init: function() {
-                this.setConstraints();
-                this.connection = new RTCPeerConnection(this.iceServers, this.optionalArgument);
-
-                if (this.session.data) {
-                    log('invoked: createDataChannel');
-                    this.createDataChannel();
-                }
-
-                this.connection.onicecandidate = function(event) {
-                    if (!event.candidate) {
-                        if (!self.trickleIce) {
-                            returnSDP();
-                        }
-
-                        return;
-                    }
-
-                    if (!self.trickleIce) return;
-
-                    self.onicecandidate(event.candidate);
-                };
-
-                function returnSDP() {
-                    if (self.returnedSDP) {
-                        self.returnedSDP = false;
-                        return;
-                    };
-                    self.returnedSDP = true;
-
-                    self.onSessionDescription(self.connection.localDescription, self.streaminfo);
-                }
-
-                this.connection.onaddstream = function(e) {
-                    log('onaddstream', isPluginRTC ? e.stream : toStr(e.stream));
-
-                    self.onaddstream(e.stream, self.session);
-                };
-
-                this.connection.onremovestream = function(e) {
-                    self.onremovestream(e.stream);
-                };
-
-                this.connection.onsignalingstatechange = function() {
-                    self.connection && self.oniceconnectionstatechange({
-                        iceConnectionState: self.connection.iceConnectionState,
-                        iceGatheringState: self.connection.iceGatheringState,
-                        signalingState: self.connection.signalingState
-                    });
-                };
-
-                this.connection.oniceconnectionstatechange = function() {
-                    if (!self.connection) return;
-
-                    self.oniceconnectionstatechange({
-                        iceConnectionState: self.connection.iceConnectionState,
-                        iceGatheringState: self.connection.iceGatheringState,
-                        signalingState: self.connection.signalingState
-                    });
-
-                    if (self.trickleIce) return;
-
-                    if (self.connection.iceGatheringState == 'complete') {
-                        log('iceGatheringState', self.connection.iceGatheringState);
-                        returnSDP();
-                    }
-                };
-
-                var self = this;
-            },
-            setBandwidth: function(sdp) {
-                if (isMobileDevice || isFirefox || !this.bandwidth) return sdp;
-
-                var bandwidth = this.bandwidth;
-
-                if (this.session.screen) {
-                    if (!bandwidth.screen) {
-                        warn('It seems that you are not using bandwidth for screen. Screen sharing is expected to fail.');
-                    } else if (bandwidth.screen < 300) {
-                        warn('It seems that you are using wrong bandwidth value for screen. Screen sharing is expected to fail.');
-                    }
-                }
-
-                // if screen; must use at least 300kbs
-                if (bandwidth.screen && this.session.screen) {
-                    sdp = sdp.replace(/b=AS([^\r\n]+\r\n)/g, '');
-                    sdp = sdp.replace(/a=mid:video\r\n/g, 'a=mid:video\r\nb=AS:' + bandwidth.screen + '\r\n');
-                }
-
-                // remove existing bandwidth lines
-                if (bandwidth.audio || bandwidth.video || bandwidth.data) {
-                    sdp = sdp.replace(/b=AS([^\r\n]+\r\n)/g, '');
-                }
-
-                if (bandwidth.audio) {
-                    sdp = sdp.replace(/a=mid:audio\r\n/g, 'a=mid:audio\r\nb=AS:' + bandwidth.audio + '\r\n');
-                }
-
-                if (bandwidth.video) {
-                    sdp = sdp.replace(/a=mid:video\r\n/g, 'a=mid:video\r\nb=AS:' + (this.session.screen ? bandwidth.screen : bandwidth.video) + '\r\n');
-                }
-
-                if (bandwidth.data && !this.preferSCTP) {
-                    sdp = sdp.replace(/a=mid:data\r\n/g, 'a=mid:data\r\nb=AS:' + bandwidth.data + '\r\n');
-                }
-
-                return sdp;
-            },
-            setConstraints: function() {
-                var sdpConstraints = setSdpConstraints({
-                    OfferToReceiveAudio: !!this.session.audio,
-                    OfferToReceiveVideo: !!this.session.video || !!this.session.screen
-                });
-
-                if (this.sdpConstraints.mandatory) {
-                    sdpConstraints = setSdpConstraints(this.sdpConstraints.mandatory);
-                }
-
-                this.constraints = sdpConstraints;
-
-                if (this.constraints) {
-                    log('sdp-constraints', toStr(this.constraints));
-                }
-
-                this.optionalArgument = {
-                    optional: this.optionalArgument.optional || [],
-                    mandatory: this.optionalArgument.mandatory || {}
-                };
-
-                if (!this.preferSCTP) {
-                    this.optionalArgument.optional.push({
-                        RtpDataChannels: true
-                    });
-                }
-
-                log('optional-argument', toStr(this.optionalArgument));
-
-                if (!isNull(this.iceServers)) {
-                    var iceCandidates = this.rtcMultiConnection.candidates;
-
-                    var stun = iceCandidates.stun;
-                    var turn = iceCandidates.turn;
-                    var host = iceCandidates.host;
-
-                    if (!isNull(iceCandidates.reflexive)) stun = iceCandidates.reflexive;
-                    if (!isNull(iceCandidates.relay)) turn = iceCandidates.relay;
-
-                    if (!host && !stun && turn) {
-                        this.rtcConfiguration.iceTransports = 'relay';
-                    } else if (!host && !stun && !turn) {
-                        this.rtcConfiguration.iceTransports = 'none';
-                    }
-
-                    this.iceServers = {
-                        iceServers: this.iceServers,
-                        iceTransports: this.rtcConfiguration.iceTransports
-                    };
-                } else this.iceServers = null;
-
-                log('rtc-configuration', toStr(this.iceServers));
-            },
-            onSdpError: function(e) {
-                var message = toStr(e);
-
-                if (message && message.indexOf('RTP/SAVPF Expects at least 4 fields') != -1) {
-                    message = 'It seems that you are trying to interop RTP-datachannels with SCTP. It is not supported!';
-                }
-                error('onSdpError:', message);
-            },
-            onSdpSuccess: function() {
-                log('sdp success');
-            },
-            onMediaError: function(err) {
-                error(toStr(err));
-            },
-            setRemoteDescription: function(sessionDescription, onSdpSuccess) {
-                if (!sessionDescription) throw 'Remote session description should NOT be NULL.';
-
-                if (!this.connection) return;
-
-                log('setting remote description', sessionDescription.type, sessionDescription.sdp);
-
-                var self = this;
-                this.connection.setRemoteDescription(
-                    new RTCSessionDescription(sessionDescription),
-                    onSdpSuccess || this.onSdpSuccess,
-                    function(error) {
-                        if (error.search(/STATE_SENTINITIATE|STATE_INPROGRESS/gi) == -1) {
-                            self.onSdpError(error);
-                        }
-                    }
-                );
-            },
-            addIceCandidate: function(candidate) {
-                var self = this;
-                if (isPluginRTC) {
-                    RTCIceCandidate(candidate, function(iceCandidate) {
-                        onAddIceCandidate(iceCandidate);
-                    });
-                } else onAddIceCandidate(new RTCIceCandidate(candidate));
-
-                function onAddIceCandidate(iceCandidate) {
-                    self.connection.addIceCandidate(iceCandidate, function() {
-                        log('added:', candidate.sdpMid, candidate.candidate);
-                    }, function() {
-                        error('onIceFailure', arguments, candidate.candidate);
-                    });
-                }
-            },
-            createDataChannel: function(channelIdentifier) {
-                // skip 2nd invocation of createDataChannel
-                if (this.channels && this.channels.length) return;
-
-                var self = this;
-
-                if (!this.channels) this.channels = [];
-
-                // protocol: 'text/chat', preset: true, stream: 16
-                // maxRetransmits:0 && ordered:false && outOfOrderAllowed: false
-                var dataChannelDict = {};
-
-                if (this.dataChannelDict) dataChannelDict = this.dataChannelDict;
-
-                if (isChrome && !this.preferSCTP) {
-                    dataChannelDict.reliable = false; // Deprecated!
-                }
-
-                log('dataChannelDict', toStr(dataChannelDict));
-
-                if (this.type == 'answer' || isFirefox) {
-                    this.connection.ondatachannel = function(event) {
-                        self.setChannelEvents(event.channel);
-                    };
-                }
-
-                if ((isChrome && this.type == 'offer') || isFirefox) {
-                    this.setChannelEvents(
-                        this.connection.createDataChannel(channelIdentifier || 'channel', dataChannelDict)
-                    );
-                }
-            },
-            setChannelEvents: function(channel) {
-                var self = this;
-
-                channel.binaryType = 'arraybuffer';
-
-                if (this.dataChannelDict.binaryType) {
-                    channel.binaryType = this.dataChannelDict.binaryType;
-                }
-
-                channel.onmessage = function(event) {
-                    self.onmessage(event.data);
-                };
-
-                var numberOfTimes = 0;
-                channel.onopen = function() {
-                    channel.push = channel.send;
-                    channel.send = function(data) {
-                        if (self.connection.iceConnectionState == 'disconnected') {
-                            return;
-                        }
-
-                        if (channel.readyState.search(/closing|closed/g) != -1) {
-                            return;
-                        }
-
-                        if (channel.readyState.search(/connecting|open/g) == -1) {
-                            return;
-                        }
-
-                        if (channel.readyState == 'connecting') {
-                            numberOfTimes++;
-                            return setTimeout(function() {
-                                if (numberOfTimes < 20) {
-                                    channel.send(data);
-                                } else throw 'Number of times exceeded to wait for WebRTC data connection to be opened.';
-                            }, 1000);
-                        }
-                        try {
-                            channel.push(data);
-                        } catch (e) {
-                            numberOfTimes++;
-                            warn('Data transmission failed. Re-transmitting..', numberOfTimes, toStr(e));
-                            if (numberOfTimes >= 20) throw 'Number of times exceeded to resend data packets over WebRTC data channels.';
-                            setTimeout(function() {
-                                channel.send(data);
-                            }, 100);
-                        }
-                    };
-                    self.onopen(channel);
-                };
-
-                channel.onerror = function(event) {
-                    self.onerror(event);
-                };
-
-                channel.onclose = function(event) {
-                    self.onclose(event);
-                };
-
-                this.channels.push(channel);
-            },
-            addStream: function(stream) {
-                if (!stream.streamid && !isIE) {
-                    stream.streamid = getRandomString();
-                }
-
-                // todo: maybe need to add isAudio/isVideo/isScreen if missing?
-
-                log('attaching stream:', stream.streamid, isPluginRTC ? stream : toStr(stream));
-
-                this.connection.addStream(stream);
-
-                this.sendStreamId(stream);
-                this.getStreamInfo();
-            },
-            attachMediaStreams: function() {
-                var streams = this.attachStreams;
-                for (var i = 0; i < streams.length; i++) {
-                    this.addStream(streams[i]);
-                }
-            },
-            getStreamInfo: function() {
-                this.streaminfo = '';
-                var streams = this.connection.getLocalStreams();
-                for (var i = 0; i < streams.length; i++) {
-                    if (i == 0) {
-                        this.streaminfo = JSON.stringify({
-                            streamid: streams[i].streamid || '',
-                            isScreen: !!streams[i].isScreen,
-                            isAudio: !!streams[i].isAudio,
-                            isVideo: !!streams[i].isVideo,
-                            preMuted: streams[i].preMuted || {}
-                        });
-                    } else {
-                        this.streaminfo += '----' + JSON.stringify({
-                            streamid: streams[i].streamid || '',
-                            isScreen: !!streams[i].isScreen,
-                            isAudio: !!streams[i].isAudio,
-                            isVideo: !!streams[i].isVideo,
-                            preMuted: streams[i].preMuted || {}
-                        });
-                    }
-                }
-            },
-            recreateOffer: function(renegotiate, callback) {
-                log('recreating offer');
-
-                this.type = 'offer';
-                this.session = renegotiate;
-
-                // todo: make sure this doesn't affect renegotiation scenarios
-                // this.setConstraints();
-
-                this.onSessionDescription = callback;
-                this.getStreamInfo();
-
-                // one can renegotiate data connection in existing audio/video/screen connection!
-                if (this.session.data) {
-                    this.createDataChannel();
-                }
-
-                this.getLocalDescription('offer');
-            },
-            recreateAnswer: function(sdp, session, callback) {
-                // if(isFirefox) this.create(this.type, this);
-
-                log('recreating answer');
-
-                this.type = 'answer';
-                this.session = session;
-
-                // todo: make sure this doesn't affect renegotiation scenarios
-                // this.setConstraints();
-
-                this.onSessionDescription = callback;
-                this.offerDescription = sdp;
-                this.getStreamInfo();
-
-                // one can renegotiate data connection in existing audio/video/screen connection!
-                if (this.session.data) {
-                    this.createDataChannel();
-                }
-
-                this.getLocalDescription('answer');
-            }
-        };
-    }
-
-    var FileSaver = {
-        SaveToDisk: invokeSaveAsDialog
-    };
-
-
-    function invokeSaveAsDialog(fileUrl, fileName) {
-        /*
-        if (typeof navigator.msSaveOrOpenBlob !== 'undefined') {
-            return navigator.msSaveOrOpenBlob(file, fileFullName);
-        } else if (typeof navigator.msSaveBlob !== 'undefined') {
-            return navigator.msSaveBlob(file, fileFullName);
-        }
-        */
-
-        var hyperlink = document.createElement('a');
-        hyperlink.href = fileUrl;
-        hyperlink.target = '_blank';
-        hyperlink.download = fileName || fileUrl;
-
-        if (!!navigator.mozGetUserMedia) {
-            hyperlink.onclick = function() {
-                (document.body || document.documentElement).removeChild(hyperlink);
-            };
-            (document.body || document.documentElement).appendChild(hyperlink);
-        }
-
-        var evt = new MouseEvent('click', {
-            view: window,
-            bubbles: true,
-            cancelable: true
-        });
-
-        hyperlink.dispatchEvent(evt);
-
-        if (!navigator.mozGetUserMedia) {
-            URL.revokeObjectURL(hyperlink.href);
-        }
-    }
-
-    var TextSender = {
-        send: function(config) {
-            var connection = config.connection;
-
-            if (config.text instanceof ArrayBuffer || config.text instanceof DataView) {
-                return config.channel.send(config.text, config._channel);
-            }
-
-            var channel = config.channel,
-                _channel = config._channel,
-                initialText = config.text,
-                packetSize = connection.chunkSize || 1000,
-                textToTransfer = '',
-                isobject = false;
-
-            if (!isString(initialText)) {
-                isobject = true;
-                initialText = JSON.stringify(initialText);
-            }
-
-            // uuid is used to uniquely identify sending instance
-            var uuid = getRandomString();
-            var sendingTime = new Date().getTime();
-
-            sendText(initialText);
-
-            function sendText(textMessage, text) {
-                var data = {
-                    type: 'text',
-                    uuid: uuid,
-                    sendingTime: sendingTime
-                };
-
-                if (textMessage) {
-                    text = textMessage;
-                    data.packets = parseInt(text.length / packetSize);
-                }
-
-                if (text.length > packetSize)
-                    data.message = text.slice(0, packetSize);
-                else {
-                    data.message = text;
-                    data.last = true;
-                    data.isobject = isobject;
-                }
-
-                channel.send(data, _channel);
-
-                textToTransfer = text.slice(data.message.length);
-
-                if (textToTransfer.length) {
-                    setTimeout(function() {
-                        sendText(null, textToTransfer);
-                    }, connection.chunkInterval || 100);
-                }
-            }
-        }
-    };
-
-    function TextReceiver(connection) {
-        var content = {};
-
-        function receive(data, userid, extra) {
-            // uuid is used to uniquely identify sending instance
-            var uuid = data.uuid;
-            if (!content[uuid]) content[uuid] = [];
-
-            content[uuid].push(data.message);
-            if (data.last) {
-                var message = content[uuid].join('');
-                if (data.isobject) message = JSON.parse(message);
-
-                // latency detection
-                var receivingTime = new Date().getTime();
-                var latency = receivingTime - data.sendingTime;
-
-                var e = {
-                    data: message,
-                    userid: userid,
-                    extra: extra,
-                    latency: latency
-                };
-
-                if (message.preRecordedMediaChunk) {
-                    if (!connection.preRecordedMedias[message.streamerid]) {
-                        connection.shareMediaFile(null, null, message.streamerid);
-                    }
-                    connection.preRecordedMedias[message.streamerid].onData(message.chunk);
-                } else if (connection.autoTranslateText) {
-                    e.original = e.data;
-                    connection.Translator.TranslateText(e.data, function(translatedText) {
-                        e.data = translatedText;
-                        connection.onmessage(e);
-                    });
-                } else if (message.isPartOfScreen) {
-                    connection.onpartofscreen(message);
-                } else connection.onmessage(e);
-
-                delete content[uuid];
-            }
-        }
-
-        return {
-            receive: receive
-        };
-    }
-
-    // Last time updated at Sep 25, 2015, 08:32:23
-
-    // Latest file can be found here: https://cdn.webrtc-experiment.com/DetectRTC.js
-
-    // Muaz Khan     - www.MuazKhan.com
-    // MIT License   - www.WebRTC-Experiment.com/licence
-    // Documentation - github.com/muaz-khan/DetectRTC
-    // ____________
-    // DetectRTC.js
-
-    // DetectRTC.hasWebcam (has webcam device!)
-    // DetectRTC.hasMicrophone (has microphone device!)
-    // DetectRTC.hasSpeakers (has speakers!)
-
-    (function() {
-
-        'use strict';
-
-        var navigator = window.navigator;
-
-        if (navigator.mediaDevices && navigator.mediaDevices.enumerateDevices) {
-            // Firefox 38+ seems having support of enumerateDevices
-            // Thanks @xdumaine/enumerateDevices
-            navigator.enumerateDevices = function(callback) {
-                navigator.mediaDevices.enumerateDevices().then(callback);
-            };
-        }
-
-        if (typeof navigator !== 'undefined') {
-            if (typeof navigator.webkitGetUserMedia !== 'undefined') {
-                navigator.getUserMedia = navigator.webkitGetUserMedia;
-            }
-
-            if (typeof navigator.mozGetUserMedia !== 'undefined') {
-                navigator.getUserMedia = navigator.mozGetUserMedia;
-            }
-        } else {
-            navigator = {
-                getUserMedia: function() {}
-            };
-        }
-
-        var isMobileDevice = !!navigator.userAgent.match(/Android|iPhone|iPad|iPod|BlackBerry|IEMobile/i);
-        var isEdge = navigator.userAgent.indexOf('Edge') !== -1 && (!!navigator.msSaveOrOpenBlob || !!navigator.msSaveBlob);
-
-        // this one can also be used:
-        // https://www.websocket.org/js/stuff.js (DetectBrowser.js)
-
-        function getBrowserInfo() {
-            var nVer = navigator.appVersion;
-            var nAgt = navigator.userAgent;
-            var browserName = navigator.appName;
-            var fullVersion = '' + parseFloat(navigator.appVersion);
-            var majorVersion = parseInt(navigator.appVersion, 10);
-            var nameOffset, verOffset, ix;
-
-            // In Opera, the true version is after 'Opera' or after 'Version'
-            if ((verOffset = nAgt.indexOf('Opera')) !== -1) {
-                browserName = 'Opera';
-                fullVersion = nAgt.substring(verOffset + 6);
-
-                if ((verOffset = nAgt.indexOf('Version')) !== -1) {
-                    fullVersion = nAgt.substring(verOffset + 8);
-                }
-            }
-            // In MSIE, the true version is after 'MSIE' in userAgent
-            else if ((verOffset = nAgt.indexOf('MSIE')) !== -1) {
-                browserName = 'IE';
-                fullVersion = nAgt.substring(verOffset + 5);
-            }
-            // In Chrome, the true version is after 'Chrome' 
-            else if ((verOffset = nAgt.indexOf('Chrome')) !== -1) {
-                browserName = 'Chrome';
-                fullVersion = nAgt.substring(verOffset + 7);
-            }
-            // In Safari, the true version is after 'Safari' or after 'Version' 
-            else if ((verOffset = nAgt.indexOf('Safari')) !== -1) {
-                browserName = 'Safari';
-                fullVersion = nAgt.substring(verOffset + 7);
-
-                if ((verOffset = nAgt.indexOf('Version')) !== -1) {
-                    fullVersion = nAgt.substring(verOffset + 8);
-                }
-            }
-            // In Firefox, the true version is after 'Firefox' 
-            else if ((verOffset = nAgt.indexOf('Firefox')) !== -1) {
-                browserName = 'Firefox';
-                fullVersion = nAgt.substring(verOffset + 8);
-            }
-
-            // In most other browsers, 'name/version' is at the end of userAgent 
-            else if ((nameOffset = nAgt.lastIndexOf(' ') + 1) < (verOffset = nAgt.lastIndexOf('/'))) {
-                browserName = nAgt.substring(nameOffset, verOffset);
-                fullVersion = nAgt.substring(verOffset + 1);
-
-                if (browserName.toLowerCase() === browserName.toUpperCase()) {
-                    browserName = navigator.appName;
-                }
-            }
-
-            if (isEdge) {
-                browserName = 'Edge';
-                // fullVersion = navigator.userAgent.split('Edge/')[1];
-                fullVersion = parseInt(navigator.userAgent.match(/Edge\/(\d+).(\d+)$/)[2], 10);
-            }
-
-            // trim the fullVersion string at semicolon/space if present
-            if ((ix = fullVersion.indexOf(';')) !== -1) {
-                fullVersion = fullVersion.substring(0, ix);
-            }
-
-            if ((ix = fullVersion.indexOf(' ')) !== -1) {
-                fullVersion = fullVersion.substring(0, ix);
-            }
-
-            majorVersion = parseInt('' + fullVersion, 10);
-
-            if (isNaN(majorVersion)) {
-                fullVersion = '' + parseFloat(navigator.appVersion);
-                majorVersion = parseInt(navigator.appVersion, 10);
-            }
-
-            return {
-                fullVersion: fullVersion,
-                version: majorVersion,
-                name: browserName
-            };
-        }
-
-        var isMobile = {
-            Android: function() {
-                return navigator.userAgent.match(/Android/i);
-            },
-            BlackBerry: function() {
-                return navigator.userAgent.match(/BlackBerry/i);
-            },
-            iOS: function() {
-                return navigator.userAgent.match(/iPhone|iPad|iPod/i);
-            },
-            Opera: function() {
-                return navigator.userAgent.match(/Opera Mini/i);
-            },
-            Windows: function() {
-                return navigator.userAgent.match(/IEMobile/i);
-            },
-            any: function() {
-                return (isMobile.Android() || isMobile.BlackBerry() || isMobile.iOS() || isMobile.Opera() || isMobile.Windows());
-            },
-            getOsName: function() {
-                var osName = 'Unknown OS';
-                if (isMobile.Android()) {
-                    osName = 'Android';
-                }
-
-                if (isMobile.BlackBerry()) {
-                    osName = 'BlackBerry';
-                }
-
-                if (isMobile.iOS()) {
-                    osName = 'iOS';
-                }
-
-                if (isMobile.Opera()) {
-                    osName = 'Opera Mini';
-                }
-
-                if (isMobile.Windows()) {
-                    osName = 'Windows';
-                }
-
-                return osName;
-            }
-        };
-
-        var osName = 'Unknown OS';
-
-        if (isMobile.any()) {
-            osName = isMobile.getOsName();
-        } else {
-            if (navigator.appVersion.indexOf('Win') !== -1) {
-                osName = 'Windows';
-            }
-
-            if (navigator.appVersion.indexOf('Mac') !== -1) {
-                osName = 'MacOS';
-            }
-
-            if (navigator.appVersion.indexOf('X11') !== -1) {
-                osName = 'UNIX';
-            }
-
-            if (navigator.appVersion.indexOf('Linux') !== -1) {
-                osName = 'Linux';
-            }
-        }
-
-
-        var isCanvasSupportsStreamCapturing = false;
-        var isVideoSupportsStreamCapturing = false;
-        ['captureStream', 'mozCaptureStream', 'webkitCaptureStream'].forEach(function(item) {
-            // asdf
-            if (item in document.createElement('canvas')) {
-                isCanvasSupportsStreamCapturing = true;
-            }
-
-            if (item in document.createElement('video')) {
-                isVideoSupportsStreamCapturing = true;
-            }
-        });
-
-        // via: https://github.com/diafygi/webrtc-ips
-        function DetectLocalIPAddress(callback) {
-            getIPs(function(ip) {
-                //local IPs
-                if (ip.match(/^(192\.168\.|169\.254\.|10\.|172\.(1[6-9]|2\d|3[01]))/)) {
-                    callback('Local: ' + ip);
-                }
-
-                //assume the rest are public IPs
-                else {
-                    callback('Public: ' + ip);
-                }
-            });
-        }
-
-        //get the IP addresses associated with an account
-        function getIPs(callback) {
-            var ipDuplicates = {};
-
-            //compatibility for firefox and chrome
-            var RTCPeerConnection = window.RTCPeerConnection || window.mozRTCPeerConnection || window.webkitRTCPeerConnection;
-            var useWebKit = !!window.webkitRTCPeerConnection;
-
-            // bypass naive webrtc blocking using an iframe
-            if (!RTCPeerConnection) {
-                var iframe = document.getElementById('iframe');
-                if (!iframe) {
-                    //
-                    throw 'NOTE: you need to have an iframe in the page right above the script tag.';
-                }
-                var win = iframe.contentWindow;
-                RTCPeerConnection = win.RTCPeerConnection || win.mozRTCPeerConnection || win.webkitRTCPeerConnection;
-                useWebKit = !!win.webkitRTCPeerConnection;
-            }
-
-            //minimal requirements for data connection
-            var mediaConstraints = {
-                optional: [{
-                    RtpDataChannels: true
-                }]
-            };
-
-            //firefox already has a default stun server in about:config
-            //    media.peerconnection.default_iceservers =
-            //    [{"url": "stun:stun.services.mozilla.com"}]
-            var servers;
-
-            //add same stun server for chrome
-            if (useWebKit) {
-                servers = {
-                    iceServers: [{
-                        urls: 'stun:stun.services.mozilla.com'
-                    }]
-                };
-
-                if (typeof DetectRTC !== 'undefined' && DetectRTC.browser.isFirefox && DetectRTC.browser.version <= 38) {
-                    servers[0] = {
-                        url: servers[0].urls
-                    };
-                }
-            }
-
-            //construct a new RTCPeerConnection
-            var pc = new RTCPeerConnection(servers, mediaConstraints);
-
-            function handleCandidate(candidate) {
-                //match just the IP address
-                var ipRegex = /([0-9]{1,3}(\.[0-9]{1,3}){3})/;
-                var ipAddress = ipRegex.exec(candidate)[1];
-
-                //remove duplicates
-                if (ipDuplicates[ipAddress] === undefined) {
-                    callback(ipAddress);
-                }
-
-                ipDuplicates[ipAddress] = true;
-            }
-
-            //listen for candidate events
-            pc.onicecandidate = function(ice) {
-                //skip non-candidate events
-                if (ice.candidate) {
-                    handleCandidate(ice.candidate.candidate);
-                }
-            };
-
-            //create a bogus data channel
-            pc.createDataChannel('');
-
-            //create an offer sdp
-            pc.createOffer(function(result) {
-
-                //trigger the stun server request
-                pc.setLocalDescription(result, function() {}, function() {});
-
-            }, function() {});
-
-            //wait for a while to let everything done
-            setTimeout(function() {
-                //read candidate info from local description
-                var lines = pc.localDescription.sdp.split('\n');
-
-                lines.forEach(function(line) {
-                    if (line.indexOf('a=candidate:') === 0) {
-                        handleCandidate(line);
-                    }
-                });
-            }, 1000);
-        }
-
-        var MediaDevices = [];
-
-        // ---------- Media Devices detection
-        var canEnumerate = false;
-
-        /*global MediaStreamTrack:true */
-        if (typeof MediaStreamTrack !== 'undefined' && 'getSources' in MediaStreamTrack) {
-            canEnumerate = true;
-        } else if (navigator.mediaDevices && !!navigator.mediaDevices.enumerateDevices) {
-            canEnumerate = true;
-        }
-
-        var hasMicrophone = canEnumerate;
-        var hasSpeakers = canEnumerate;
-        var hasWebcam = canEnumerate;
-
-        // http://dev.w3.org/2011/webrtc/editor/getusermedia.html#mediadevices
-        // todo: switch to enumerateDevices when landed in canary.
-        function checkDeviceSupport(callback) {
-            // This method is useful only for Chrome!
-
-            if (!navigator.enumerateDevices && window.MediaStreamTrack && window.MediaStreamTrack.getSources) {
-                navigator.enumerateDevices = window.MediaStreamTrack.getSources.bind(window.MediaStreamTrack);
-            }
-
-            if (!navigator.enumerateDevices && navigator.enumerateDevices) {
-                navigator.enumerateDevices = navigator.enumerateDevices.bind(navigator);
-            }
-
-            if (!navigator.enumerateDevices) {
-                if (callback) {
-                    callback();
-                }
-                return;
-            }
-
-            MediaDevices = [];
-            navigator.enumerateDevices(function(devices) {
-                devices.forEach(function(_device) {
-                    var device = {};
-                    for (var d in _device) {
-                        device[d] = _device[d];
-                    }
-
-                    var skip;
-                    MediaDevices.forEach(function(d) {
-                        if (d.id === device.id) {
-                            skip = true;
-                        }
-                    });
-
-                    if (skip) {
-                        return;
-                    }
-
-                    // if it is MediaStreamTrack.getSources
-                    if (device.kind === 'audio') {
-                        device.kind = 'audioinput';
-                    }
-
-                    if (device.kind === 'video') {
-                        device.kind = 'videoinput';
-                    }
-
-                    if (!device.deviceId) {
-                        device.deviceId = device.id;
-                    }
-
-                    if (!device.id) {
-                        device.id = device.deviceId;
-                    }
-
-                    if (!device.label) {
-                        device.label = 'Please invoke getUserMedia once.';
-                        if (!isHTTPs) {
-                            device.label = 'HTTPs is required to get label of this ' + device.kind + ' device.';
-                        }
-                    }
-
-                    if (device.kind === 'audioinput' || device.kind === 'audio') {
-                        hasMicrophone = true;
-                    }
-
-                    if (device.kind === 'audiooutput') {
-                        hasSpeakers = true;
-                    }
-
-                    if (device.kind === 'videoinput' || device.kind === 'video') {
-                        hasWebcam = true;
-                    }
-
-                    // there is no 'videoouput' in the spec.
-
-                    MediaDevices.push(device);
-                });
-
-                if (typeof DetectRTC !== 'undefined') {
-                    DetectRTC.MediaDevices = MediaDevices;
-                    DetectRTC.hasMicrophone = hasMicrophone;
-                    DetectRTC.hasSpeakers = hasSpeakers;
-                    DetectRTC.hasWebcam = hasWebcam;
-                }
-
-                if (callback) {
-                    callback();
-                }
-            });
-        }
-
-        // check for microphone/camera support!
-        checkDeviceSupport();
-
-        var DetectRTC = {};
-        
-        // ----------
-        // DetectRTC.browser.name || DetectRTC.browser.version || DetectRTC.browser.fullVersion
-        DetectRTC.browser = getBrowserInfo();
-
-        // DetectRTC.isChrome || DetectRTC.isFirefox || DetectRTC.isEdge
-        DetectRTC.browser['is' + DetectRTC.browser.name] = true;
-
-        var isHTTPs = location.protocol === 'https:';
-        var isNodeWebkit = !!(window.process && (typeof window.process === 'object') && window.process.versions && window.process.versions['node-webkit']);
-
-        // --------- Detect if system supports WebRTC 1.0 or WebRTC 1.1.
-        var isWebRTCSupported = false;
-        ['webkitRTCPeerConnection', 'mozRTCPeerConnection', 'RTCIceGatherer'].forEach(function(item) {
-            if (item in window) {
-                isWebRTCSupported = true;
-            }
-        });
-        DetectRTC.isWebRTCSupported = isWebRTCSupported;
-
-        //-------
-        DetectRTC.isORTCSupported = typeof RTCIceGatherer !== 'undefined';
-
-        // --------- Detect if system supports screen capturing API
-        var isScreenCapturingSupported = false;
-        if (DetectRTC.browser.isChrome && DetectRTC.browser.version >= 35) {
-            isScreenCapturingSupported = true;
-        } else if (DetectRTC.browser.isFirefox && DetectRTC.browser.version >= 34) {
-            isScreenCapturingSupported = true;
-        }
-
-        if (!isHTTPs) {
-            isScreenCapturingSupported = false;
-        }
-        DetectRTC.isScreenCapturingSupported = isScreenCapturingSupported;
-
-        // --------- Detect if WebAudio API are supported
-        var webAudio = {};
-        ['AudioContext', 'webkitAudioContext', 'mozAudioContext', 'msAudioContext'].forEach(function(item) {
-            if (webAudio.isSupported && webAudio.isCreateMediaStreamSourceSupported) {
-                return;
-            }
-            if (item in window) {
-                webAudio.isSupported = true;
-
-                if ('createMediaStreamSource' in window[item].prototype) {
-                    webAudio.isCreateMediaStreamSourceSupported = true;
-                }
-            }
-        });
-        DetectRTC.isAudioContextSupported = webAudio.isSupported;
-        DetectRTC.isCreateMediaStreamSourceSupported = webAudio.isCreateMediaStreamSourceSupported;
-
-        // ---------- Detect if SCTP/RTP channels are supported.
-
-        var isRtpDataChannelsSupported = false;
-        if (DetectRTC.browser.isChrome && DetectRTC.browser.version > 31) {
-            isRtpDataChannelsSupported = true;
-        }
-        DetectRTC.isRtpDataChannelsSupported = isRtpDataChannelsSupported;
-
-        var isSCTPSupportd = false;
-        if (DetectRTC.browser.isFirefox && DetectRTC.browser.version > 28) {
-            isSCTPSupportd = true;
-        } else if (DetectRTC.browser.isChrome && DetectRTC.browser.version > 25) {
-            isSCTPSupportd = true;
-        } else if (DetectRTC.browser.isOpera && DetectRTC.browser.version >= 11) {
-            isSCTPSupportd = true;
-        }
-        DetectRTC.isSctpDataChannelsSupported = isSCTPSupportd;
-
-        // ---------
-
-        DetectRTC.isMobileDevice = isMobileDevice; // "isMobileDevice" boolean is defined in "getBrowserInfo.js"
-
-        // ------
-
-        DetectRTC.isWebSocketsSupported = 'WebSocket' in window && 2 === window.WebSocket.CLOSING;
-        DetectRTC.isWebSocketsBlocked = 'Checking';
-
-        if (DetectRTC.isWebSocketsSupported) {
-        	/* CUSTOM CODE */
-        	var href = window.location.href;
-            var hostPatt = new RegExp(window.location.host +"/[^/]*");
-            var res = hostPatt.exec(href);
-            var protocol = window.location.protocol.replace("http","ws");
-            
-            var signalingServerPath = protocol + "//" + res + "/contact"; 
-            var websocket = new WebSocket(signalingServerPath)
-        	// var websocket = new WebSocket('wss://echo.websocket.org:443/');
-            /* CUSTOM CODE */
-            websocket.onopen = function() {
-                DetectRTC.isWebSocketsBlocked = false;
-
-                if (DetectRTC.loadCallback) {
-                    DetectRTC.loadCallback();
-                }
-            };
-            websocket.onerror = function() {
-                DetectRTC.isWebSocketsBlocked = true;
-
-                if (DetectRTC.loadCallback) {
-                    DetectRTC.loadCallback();
-                }
-            };
-        }
-
-        // ------
-        var isGetUserMediaSupported = false;
-        if (navigator.getUserMedia) {
-            isGetUserMediaSupported = true;
-        } else if (navigator.mediaDevices && navigator.mediaDevices.getUserMedia) {
-            isGetUserMediaSupported = true;
-        }
-        if (DetectRTC.browser.isChrome && DetectRTC.browser.version >= 47 && !isHTTPs) {
-            DetectRTC.isGetUserMediaSupported = 'Requires HTTPs';
-        }
-        DetectRTC.isGetUserMediaSupported = isGetUserMediaSupported;
-
-        // -----------
-        DetectRTC.osName = osName; // "osName" is defined in "detectOSName.js"
-
-        // ----------
-        DetectRTC.isCanvasSupportsStreamCapturing = isCanvasSupportsStreamCapturing;
-        DetectRTC.isVideoSupportsStreamCapturing = isVideoSupportsStreamCapturing;
-
-        // ------
-        DetectRTC.DetectLocalIPAddress = DetectLocalIPAddress;
-
-        // -------
-        DetectRTC.load = function(callback) {
-            this.loadCallback = callback;
-
-            checkDeviceSupport(callback);
-        };
-
-        DetectRTC.MediaDevices = MediaDevices;
-        DetectRTC.hasMicrophone = hasMicrophone;
-        DetectRTC.hasSpeakers = hasSpeakers;
-        DetectRTC.hasWebcam = hasWebcam;
-
-        // ------
-        var isSetSinkIdSupported = false;
-        if ('setSinkId' in document.createElement('video')) {
-            isSetSinkIdSupported = true;
-        }
-        DetectRTC.isSetSinkIdSupported = isSetSinkIdSupported;
-
-        // -----
-        var isRTPSenderReplaceTracksSupported = false;
-        if (DetectRTC.browser.isFirefox /*&& DetectRTC.browser.version > 39*/ ) {
-            /*global mozRTCPeerConnection:true */
-            if ('getSenders' in mozRTCPeerConnection.prototype) {
-                isRTPSenderReplaceTracksSupported = true;
-            }
-        } else if (DetectRTC.browser.isChrome) {
-            /*global webkitRTCPeerConnection:true */
-            if ('getSenders' in webkitRTCPeerConnection.prototype) {
-                isRTPSenderReplaceTracksSupported = true;
-            }
-        }
-        DetectRTC.isRTPSenderReplaceTracksSupported = isRTPSenderReplaceTracksSupported;
-
-        //------
-        var isRemoteStreamProcessingSupported = false;
-        if (DetectRTC.browser.isFirefox && DetectRTC.browser.version > 38) {
-            isRemoteStreamProcessingSupported = true;
-        }
-        DetectRTC.isRemoteStreamProcessingSupported = isRemoteStreamProcessingSupported;
-
-        //-------
-        var isApplyConstraintsSupported = false;
-
-        /*global MediaStreamTrack:true */
-        if (typeof MediaStreamTrack !== 'undefined' && 'applyConstraints' in MediaStreamTrack.prototype) {
-            isApplyConstraintsSupported = true;
-        }
-        DetectRTC.isApplyConstraintsSupported = isApplyConstraintsSupported;
-
-        //-------
-        var isMultiMonitorScreenCapturingSupported = false;
-        if (DetectRTC.browser.isFirefox && DetectRTC.browser.version >= 43) {
-            // version 43 merely supports platforms for multi-monitors
-            // version 44 will support exact multi-monitor selection i.e. you can select any monitor for screen capturing.
-            isMultiMonitorScreenCapturingSupported = true;
-        }
-        DetectRTC.isMultiMonitorScreenCapturingSupported = isMultiMonitorScreenCapturingSupported;
-
-        window.DetectRTC = DetectRTC;
-
-    })();
-
-    // DetectRTC extender
-    var screenCallback;
-
-    DetectRTC.screen = {
-        chromeMediaSource: 'screen',
-        extensionid: ReservedExtensionID,
-        getSourceId: function(callback) {
-            if (!callback) throw '"callback" parameter is mandatory.';
-
-            // make sure that chrome extension is installed.
-            if (!!DetectRTC.screen.status) {
-                onstatus(DetectRTC.screen.status);
-            } else DetectRTC.screen.getChromeExtensionStatus(onstatus);
-
-            function onstatus(status) {
-                if (status == 'installed-enabled') {
-                    screenCallback = callback;
-                    window.postMessage('get-sourceId', '*');
-                    return;
-                }
-
-                DetectRTC.screen.chromeMediaSource = 'screen';
-                callback('No-Response'); // chrome extension isn't available
-            }
-        },
-        onMessageCallback: function(data) {
-            if (!(isString(data) || !!data.sourceId)) return;
-
-            log('chrome message', data);
-
-            // "cancel" button is clicked
-            if (data == 'PermissionDeniedError') {
-                DetectRTC.screen.chromeMediaSource = 'PermissionDeniedError';
-                if (screenCallback) return screenCallback('PermissionDeniedError');
-                else throw new Error('PermissionDeniedError');
-            }
-
-            // extension notified his presence
-            if (data == 'rtcmulticonnection-extension-loaded') {
-                DetectRTC.screen.chromeMediaSource = 'desktop';
-                if (DetectRTC.screen.onScreenCapturingExtensionAvailable) {
-                    DetectRTC.screen.onScreenCapturingExtensionAvailable();
-
-                    // make sure that this event isn't fired multiple times
-                    DetectRTC.screen.onScreenCapturingExtensionAvailable = null;
-                }
-            }
-
-            // extension shared temp sourceId
-            if (data.sourceId) {
-                DetectRTC.screen.sourceId = data.sourceId;
-                if (screenCallback) screenCallback(DetectRTC.screen.sourceId);
-            }
-        },
-        getChromeExtensionStatus: function(extensionid, callback) {
-            function _callback(status) {
-                DetectRTC.screen.status = status;
-                callback(status);
-            }
-
-            if (isFirefox) return _callback('not-chrome');
-
-            if (arguments.length != 2) {
-                callback = extensionid;
-                extensionid = this.extensionid;
-            }
-
-            var image = document.createElement('img');
-            image.src = 'chrome-extension://' + extensionid + '/icon.png';
-            image.onload = function() {
-                DetectRTC.screen.chromeMediaSource = 'screen';
-                window.postMessage('are-you-there', '*');
-                setTimeout(function() {
-                    if (DetectRTC.screen.chromeMediaSource == 'screen') {
-                        _callback(
-                            DetectRTC.screen.chromeMediaSource == 'desktop' ? 'installed-enabled' : 'installed-disabled' /* if chrome extension isn't permitted for current domain, then it will be installed-disabled all the time even if extension is enabled. */
-                        );
-                    } else _callback('installed-enabled');
-                }, 2000);
-            };
-            image.onerror = function() {
-                _callback('not-installed');
-            };
-        }
-    };
-
-    // if IE
-    if (!window.addEventListener) {
-        window.addEventListener = function(el, eventName, eventHandler) {
-            if (!el.attachEvent) return;
-            el.attachEvent('on' + eventName, eventHandler);
-        };
-    }
-
-    function listenEventHandler(eventName, eventHandler) {
-        window.removeEventListener(eventName, eventHandler);
-        window.addEventListener(eventName, eventHandler, false);
-    }
-
-    window.addEventListener('message', function(event) {
-        if (event.origin != window.location.origin) {
-            return;
-        }
-
-        DetectRTC.screen.onMessageCallback(event.data);
-    });
-
-    function setDefaults(connection) {
-        var DetectRTC = window.DetectRTC || {};
-
-        // www.RTCMultiConnection.org/docs/userid/
-        connection.userid = getRandomString();
-
-        // www.RTCMultiConnection.org/docs/session/
-        connection.session = {
-            audio: true,
-            video: true
-        };
-
-        // www.RTCMultiConnection.org/docs/maxParticipantsAllowed/
-        connection.maxParticipantsAllowed = 256;
-
-        // www.RTCMultiConnection.org/docs/direction/
-        // 'many-to-many' / 'one-to-many' / 'one-to-one' / 'one-way'
-        connection.direction = 'many-to-many';
-
-        // www.RTCMultiConnection.org/docs/mediaConstraints/
-        connection.mediaConstraints = {
-            mandatory: {}, // kept for backward compatibility
-            optional: [], // kept for backward compatibility
-            audio: {
-                mandatory: {},
-                optional: []
-            },
-            video: {
-                mandatory: {},
-                optional: []
-            }
-        };
-
-        // www.RTCMultiConnection.org/docs/candidates/
-        connection.candidates = {
-            host: true,
-            stun: true,
-            turn: true
-        };
-
-        connection.sdpConstraints = {};
-
-        // as @serhanters proposed in #225
-        // it will auto fix "all" renegotiation scenarios
-        connection.sdpConstraints.mandatory = {
-            OfferToReceiveAudio: true,
-            OfferToReceiveVideo: true
-        };
-
-        connection.privileges = {
-            canStopRemoteStream: false, // user can stop remote streams
-            canMuteRemoteStream: false // user can mute remote streams
-        };
-
-        connection.iceProtocols = {
-            tcp: true,
-            udp: true
-        };
-
-        // www.RTCMultiConnection.org/docs/preferSCTP/
-        connection.preferSCTP = isFirefox || chromeVersion >= 32 ? true : false;
-        connection.chunkInterval = isFirefox || chromeVersion >= 32 ? 100 : 500; // 500ms for RTP and 100ms for SCTP
-        connection.chunkSize = isFirefox || chromeVersion >= 32 ? 13 * 1000 : 1000; // 1000 chars for RTP and 13000 chars for SCTP
-
-        // www.RTCMultiConnection.org/docs/fakeDataChannels/
-        connection.fakeDataChannels = false;
-
-        connection.waitUntilRemoteStreamStartsFlowing = null; // NULL == true
-
-        // auto leave on page unload
-        connection.leaveOnPageUnload = true;
-
-        // get ICE-servers from XirSys
-        connection.getExternalIceServers = isChrome;
-
-        // www.RTCMultiConnection.org/docs/UA/
-        connection.UA = {
-            isFirefox: isFirefox,
-            isChrome: isChrome,
-            isMobileDevice: isMobileDevice,
-            version: isChrome ? chromeVersion : firefoxVersion,
-            isNodeWebkit: isNodeWebkit,
-            isSafari: isSafari,
-            isIE: isIE,
-            isOpera: isOpera
-        };
-
-        // file queue: to store previous file objects in memory;
-        // and stream over newly connected peers
-        // www.RTCMultiConnection.org/docs/fileQueue/
-        connection.fileQueue = {};
-
-        // this array is aimed to store all renegotiated streams' session-types
-        connection.renegotiatedSessions = {};
-
-        // www.RTCMultiConnection.org/docs/channels/
-        connection.channels = {};
-
-        // www.RTCMultiConnection.org/docs/extra/
-        connection.extra = {};
-
-        // www.RTCMultiConnection.org/docs/bandwidth/
-        connection.bandwidth = {
-            screen: 300 // 300kbps (dirty workaround)
-        };
-
-        // www.RTCMultiConnection.org/docs/caniuse/
-        connection.caniuse = {
-            RTCPeerConnection: DetectRTC.isWebRTCSupported,
-            getUserMedia: !!navigator.webkitGetUserMedia || !!navigator.mozGetUserMedia,
-            AudioContext: DetectRTC.isAudioContextSupported,
-
-            // there is no way to check whether "getUserMedia" flag is enabled or not!
-            ScreenSharing: DetectRTC.isScreenCapturingSupported,
-            RtpDataChannels: DetectRTC.isRtpDataChannelsSupported,
-            SctpDataChannels: DetectRTC.isSctpDataChannelsSupported
-        };
-
-        // www.RTCMultiConnection.org/docs/snapshots/
-        connection.snapshots = {};
-
-        // www.WebRTC-Experiment.com/demos/MediaStreamTrack.getSources.html
-        connection._mediaSources = {};
-
-        // www.RTCMultiConnection.org/docs/devices/
-        connection.devices = {};
-
-        // www.RTCMultiConnection.org/docs/language/ (to see list of all supported languages)
-        connection.language = 'en';
-
-        // www.RTCMultiConnection.org/docs/autoTranslateText/
-        connection.autoTranslateText = false;
-
-        // please use your own Google Translate API key
-        // Google Translate is a paid service.
-        connection.googKey = 'AIzaSyCgB5hmFY74WYB-EoWkhr9cAGr6TiTHrEE';
-
-        connection.localStreamids = [];
-        connection.localStreams = {};
-
-        // this object stores pre-recorded media streaming uids
-        // multiple pre-recorded media files can be streamed concurrently.
-        connection.preRecordedMedias = {};
-
-        // www.RTCMultiConnection.org/docs/attachStreams/
-        connection.attachStreams = [];
-
-        // www.RTCMultiConnection.org/docs/detachStreams/
-        connection.detachStreams = [];
-
-        connection.optionalArgument = {
-            optional: [{
-                DtlsSrtpKeyAgreement: true
-            }, {
-                googImprovedWifiBwe: true
-            }, {
-                googScreencastMinBitrate: 300
-            }],
-            mandatory: {}
-        };
-
-        connection.dataChannelDict = {};
-
-        // www.RTCMultiConnection.org/docs/dontAttachStream/
-        connection.dontAttachStream = false;
-
-        // www.RTCMultiConnection.org/docs/dontCaptureUserMedia/
-        connection.dontCaptureUserMedia = false;
-
-        // this feature added to keep users privacy and 
-        // make sure HTTPs pages NEVER auto capture users media
-        // isChrome && location.protocol == 'https:'
-        connection.preventSSLAutoAllowed = false;
-
-        connection.autoReDialOnFailure = true;
-        connection.isInitiator = false;
-
-        // access DetectRTC.js features directly!
-        connection.DetectRTC = DetectRTC;
-
-        // you can falsify it to merge all ICE in SDP and share only SDP!
-        // such mechanism is useful for SIP/XMPP and XMLHttpRequest signaling
-        // bug: renegotiation fails if "trickleIce" is false
-        connection.trickleIce = true;
-
-        // this object stores list of all sessions in current channel
-        connection.sessionDescriptions = {};
-
-        // this object stores current user's session-description
-        // it is set only for initiator
-        // it is set as soon as "open" method is invoked.
-        connection.sessionDescription = null;
-
-        // resources used in RTCMultiConnection
-        connection.resources = {
-            // CUSTOM CODE //	
-        	/*	Commenting this block as we do not wasnt external dependencies
-        	 * 
-            RecordRTC: 'https://cdn.webrtc-experiment.com/RecordRTC.js',
-            PreRecordedMediaStreamer: 'https://cdn.webrtc-experiment.com/PreRecordedMediaStreamer.js',
-            customGetUserMediaBar: 'https://cdn.webrtc-experiment.com/navigator.customGetUserMediaBar.js',
-            html2canvas: 'https://cdn.webrtc-experiment.com/screenshot.js',
-            hark: 'https://cdn.webrtc-experiment.com/hark.js',
-            firebase: 'https://cdn.webrtc-experiment.com/firebase.js',
-            firebaseio: 'https://webrtc-signaling.firebaseio.com/',
-            
-           
-           
-            getConnectionStats: 'https://cdn.webrtc-experiment.com/getConnectionStats.js',
-            FileBufferReader: 'https://cdn.webrtc-experiment.com/FileBufferReader.js'
-            */
-        	
-            // CUSTOM CODE //	
-        		
-        		
-        };
-
-        // www.RTCMultiConnection.org/docs/body/
-        connection.body = document.body || document.documentElement;
-        connection.screenbody = null;// document.body || document.documentElement;
-        connection.videobody = null;//document.body || document.documentElement;
-
-        // www.RTCMultiConnection.org/docs/peers/
-        connection.peers = {};
-
-        // www.RTCMultiConnection.org/docs/firebase/
-        connection.firebase = 'chat';
-
-        connection.numberOfSessions = 0;
-        connection.numberOfConnectedUsers = 0;
-
-        // by default, data-connections will always be getting
-        // FileBufferReader.js if absent.
-        connection.enableFileSharing = true;
-
-        // www.RTCMultiConnection.org/docs/autoSaveToDisk/
-        // to make sure file-saver dialog is not invoked.
-        connection.autoSaveToDisk = false;
-
-        connection.processSdp = function(sdp) {
-            // process sdp here
-            return sdp;
-        };
-
-        // www.RTCMultiConnection.org/docs/onmessage/
-        connection.onmessage = function(e) {
-            log('onmessage', toStr(e));
-        };
-
-        // www.RTCMultiConnection.org/docs/onopen/
-        connection.onopen = function(e) {
-            log('Data connection is opened between you and', e.userid);
-        };
-
-        // www.RTCMultiConnection.org/docs/onerror/
-        connection.onerror = function(e) {
-            error(onerror, toStr(e));
-        };
-
-        // www.RTCMultiConnection.org/docs/onclose/
-        connection.onclose = function(e) {
-            warn('onclose', toStr(e));
-
-            // todo: should we use "stop" or "remove"?
-            // BTW, it is remote user!
-            connection.streams.remove({
-                userid: e.userid
-            });
-        };
-
-        var progressHelper = {};
-
-        // www.RTCMultiConnection.org/docs/onFileStart/
-        connection.onFileStart = function(file) {
-            var div = document.createElement('div');
-            div.title = file.name;
-            div.innerHTML = ' ';
-            connection.body.insertBefore(div, connection.body.firstChild);
-            progressHelper[file.uuid] = {
-                div: div,
-                progress: div.querySelector('progress'),
-                label: div.querySelector('label')
-            };
-            progressHelper[file.uuid].progress.max = file.maxChunks;
-        };
-
-        // www.RTCMultiConnection.org/docs/onFileProgress/
-        connection.onFileProgress = function(chunk) {
-            var helper = progressHelper[chunk.uuid];
-            if (!helper) return;
-            helper.progress.value = chunk.currentPosition || chunk.maxChunks || helper.progress.max;
-            updateLabel(helper.progress, helper.label);
-        };
-
-        // www.RTCMultiConnection.org/docs/onFileEnd/
-        connection.onFileEnd = function(file) {
-            if (progressHelper[file.uuid]) progressHelper[file.uuid].div.innerHTML = '' + file.name + '';
-
-            // for backward compatibility
-            if (connection.onFileSent || connection.onFileReceived) {
-                if (connection.onFileSent) connection.onFileSent(file, file.uuid);
-                if (connection.onFileReceived) connection.onFileReceived(file.name, file);
-            }
-        };
-
-        function updateLabel(progress, label) {
-            if (progress.position == -1) return;
-            var position = +progress.position.toFixed(2).split('.')[1] || 100;
-            label.innerHTML = position + '%';
-        }
-
-        // www.RTCMultiConnection.org/docs/onstream/
-        connection.onstream = function(e) {
-            //  CUSTOM CODE  //        
-        
-        	if(e.isVideo || e.isAudio)
-        		{
-        		    var videoTag = e.mediaElement;
-        		    var videoType = e.type;
-        		    var parentDiv = connection.videobody;
-        		    
-        		    if(videoType == "local")
-        		    	{
-        		    		videoTag.style.top = "auto";
-        		    		videoTag.style.position = "absolute";
-        		    		//videoTag.style.left = (parentDiv.offsetWidth - 160) + "px";
-        		    		videoTag.style.height = "150px";
-        		    		videoTag.style.width = "150px";
-        		    		videoTag.style.zIndex = 1;
-        		    		
-        		    	}
-        		    else if(videoType == "remote")
-        		    	{
-	        		    	videoTag.style.top = "auto";
-	    		    		videoTag.style.position = "absolute";
-	    		    		videoTag.style.zIndex = -1;
-        		    	}
-        		    		
-        		    parentDiv.appendChild(videoTag);
-        		}
-        	else if(e.isScreen)
-               {
-	        		var screenTag = e.mediaElement;
-	    		    var screenType = e.type;
-	    		    var parentDiv = connection.screenbody;
-	    		    
-	    		    if(screenType == "local")
-    		    		{
-    		    			// no need to display this because the person sharing his/her screen doesn't have to see whats being shared 
-    		    			// enabled for demo purposes
-	    		    		parentDiv.appendChild(screenTag);
-				}
-	    		    else if(screenType == "remote")
-    		    		{
-    		    			parentDiv.appendChild(screenTag);
-    		    		}
-	    		    
-        			
-               }
-               
-            else            
-              connection.body.insertBefore(e.mediaElement, connection.body.firstChild);
-              
-            //  CUSTOM CODE  //    
-        };
-
-        // www.RTCMultiConnection.org/docs/onStreamEndedHandler/
-        connection.onstreamended = function(e) {
-            log('onStreamEndedHandler:', e);
-
-            if (!e.mediaElement) {
-                return warn('Event.mediaElement is undefined', e);
-            }
-            if (!e.mediaElement.parentNode) {
-                e.mediaElement = document.getElementById(e.streamid);
-
-                if (!e.mediaElement) {
-                    return warn('Event.mediaElement is undefined', e);
-                }
-
-                if (!e.mediaElement.parentNode) {
-                    return warn('Event.mediElement.parentNode is null.', e);
-                }
-            }
-
-            e.mediaElement.parentNode.removeChild(e.mediaElement);
-        };
-
-        // todo: need to write documentation link
-        connection.onSessionClosed = function(session) {
-            if (session.isEjected) {
-                warn(session.userid, 'ejected you.');
-            } else warn('Session has been closed.', session);
-        };
-
-        // www.RTCMultiConnection.org/docs/onmute/
-        connection.onmute = function(e) {
-            if (e.isVideo && e.mediaElement) {
-                e.mediaElement.pause();
-                e.mediaElement.setAttribute('poster', e.snapshot || connection.resources.muted);
-            }
-            if (e.isAudio && e.mediaElement) {
-                e.mediaElement.muted = true;
-            }
-        };
-
-        // www.RTCMultiConnection.org/docs/onunmute/
-        connection.onunmute = function(e) {
-            if (e.isVideo && e.mediaElement) {
-                e.mediaElement.play();
-                e.mediaElement.removeAttribute('poster');
-            }
-            if (e.isAudio && e.mediaElement) {
-                e.mediaElement.muted = false;
-            }
-        };
-
-        // www.RTCMultiConnection.org/docs/onleave/
-        connection.onleave = function(e) {
-            log('onleave', toStr(e));
-        };
-
-        connection.token = getRandomString;
-
-        connection.peers[connection.userid] = {
-            drop: function() {
-                connection.drop();
-            },
-            renegotiate: function() {},
-            addStream: function() {},
-            hold: function() {},
-            unhold: function() {},
-            changeBandwidth: function() {},
-            sharePartOfScreen: function() {}
-        };
-
-        connection._skip = ['stop', 'mute', 'unmute', '_private', '_selectStreams', 'selectFirst', 'selectAll', 'remove'];
-
-        // www.RTCMultiConnection.org/docs/streams/
-        connection.streams = {
-            mute: function(session) {
-                this._private(session, true);
-            },
-            unmute: function(session) {
-                this._private(session, false);
-            },
-            _private: function(session, enabled) {
-                if (session && !isString(session)) {
-                    for (var stream in this) {
-                        if (connection._skip.indexOf(stream) == -1) {
-                            _muteOrUnMute(this[stream], session, enabled);
-                        }
-                    }
-
-                    function _muteOrUnMute(stream, session, isMute) {
-                        if (session.local && stream.type != 'local') return;
-                        if (session.remote && stream.type != 'remote') return;
-
-                        if (session.isScreen && !stream.isScreen) return;
-                        if (session.isAudio && !stream.isAudio) return;
-                        if (session.isVideo && !stream.isVideo) return;
-
-                        if (isMute) stream.mute(session);
-                        else stream.unmute(session);
-                    }
-                    return;
-                }
-
-                // implementation from #68
-                for (var stream in this) {
-                    if (connection._skip.indexOf(stream) == -1) {
-                        this[stream]._private(session, enabled);
-                    }
-                }
-            },
-            stop: function(type) {
-                var _stream;
-                for (var stream in this) {
-                    if (connection._skip.indexOf(stream) == -1) {
-                        _stream = this[stream];
-
-                        if (!type) _stream.stop();
-
-                        else if (isString(type)) {
-                            // connection.streams.stop('screen');
-                            var config = {};
-                            config[type] = true;
-                            _stopStream(_stream, config);
-                        } else _stopStream(_stream, type);
-                    }
-                }
-
-                function _stopStream(_stream, config) {
-                    // connection.streams.stop({ remote: true, userid: 'remote-userid' });
-                    if (config.userid && _stream.userid != config.userid) return;
-
-                    if (config.local && _stream.type != 'local') return;
-                    if (config.remote && _stream.type != 'remote') return;
-
-                    if (config.screen && !!_stream.isScreen) {
-                        _stream.stop();
-                    }
-
-                    if (config.audio && !!_stream.isAudio) {
-                        _stream.stop();
-                    }
-
-                    if (config.video && !!_stream.isVideo) {
-                        _stream.stop();
-                    }
-
-                    // connection.streams.stop('local');
-                    if (!config.audio && !config.video && !config.screen) {
-                        _stream.stop();
-                    }
-                }
-            },
-            remove: function(type) {
-                var _stream;
-                for (var stream in this) {
-                    if (connection._skip.indexOf(stream) == -1) {
-                        _stream = this[stream];
-
-                        if (!type) _stopAndRemoveStream(_stream, {
-                            local: true,
-                            remote: true
-                        });
-
-                        else if (isString(type)) {
-                            // connection.streams.stop('screen');
-                            var config = {};
-                            config[type] = true;
-                            _stopAndRemoveStream(_stream, config);
-                        } else _stopAndRemoveStream(_stream, type);
-                    }
-                }
-
-                function _stopAndRemoveStream(_stream, config) {
-                    // connection.streams.remove({ remote: true, userid: 'remote-userid' });
-                    if (config.userid && _stream.userid != config.userid) return;
-
-                    if (config.local && _stream.type != 'local') return;
-                    if (config.remote && _stream.type != 'remote') return;
-
-                    if (config.screen && !!_stream.isScreen) {
-                        endStream(_stream);
-                    }
-
-                    if (config.audio && !!_stream.isAudio) {
-                        endStream(_stream);
-                    }
-
-                    if (config.video && !!_stream.isVideo) {
-                        endStream(_stream);
-                    }
-
-                    // connection.streams.remove('local');
-                    if (!config.audio && !config.video && !config.screen) {
-                        endStream(_stream);
-                    }
-                }
-
-                function endStream(_stream) {
-                    onStreamEndedHandler(_stream, connection);
-                    delete connection.streams[_stream.streamid];
-                }
-            },
-            selectFirst: function(args) {
-                return this._selectStreams(args, false);
-            },
-            selectAll: function(args) {
-                return this._selectStreams(args, true);
-            },
-            _selectStreams: function(args, all) {
-                if (!args || isString(args) || isEmpty(args)) throw 'Invalid arguments.';
-
-                // if userid is used then both local/remote shouldn't be auto-set
-                if (isNull(args.local) && isNull(args.remote) && isNull(args.userid)) {
-                    args.local = args.remote = true;
-                }
-
-                if (!args.isAudio && !args.isVideo && !args.isScreen) {
-                    args.isAudio = args.isVideo = args.isScreen = true;
-                }
-
-                var selectedStreams = [];
-                for (var stream in this) {
-                    if (connection._skip.indexOf(stream) == -1 && (stream = this[stream]) && ((args.local && stream.type == 'local') || (args.remote && stream.type == 'remote') || (args.userid && stream.userid == args.userid))) {
-                        if (args.isVideo && stream.isVideo) {
-                            selectedStreams.push(stream);
-                        }
-
-                        if (args.isAudio && stream.isAudio) {
-                            selectedStreams.push(stream);
-                        }
-
-                        if (args.isScreen && stream.isScreen) {
-                            selectedStreams.push(stream);
-                        }
-                    }
-                }
-
-                return !!all ? selectedStreams : selectedStreams[0];
-            }
-        };
-
-        var iceServers = [];
-
-        //  CUSTOM CODE  // 
-        // these servers are provided by research
-        iceServers.push({
-            url: '' /*TODO To test this WebRTC with some open stun and turn test servers*/
-        });
-
-        iceServers.push({
-            url: 'turn:207.140.168.120:3478',
-            credential: 'xxx',
-            username: 'xxx'
-        });
-
-        iceServers.push({
-            url: 'turn:207.140.168.120:443?transport=tcp',
-            credential: 'harmfulmustard',
-            username: 'ambient'
-        });
-        
-        /* CHANGED: Fusion: These are servers for testing purposes
-
-		 iceServers.push({
-            url: 'stun:stun.l.google.com:19302'
-        });
-
-        iceServers.push({
-            url: 'stun:stun.anyfirewall.com:3478'
-        });
-
-        iceServers.push({
-            url: 'turn:turn.bistri.com:80',
-            credential: 'homeo',
-            username: 'homeo'
-        });
-
-        iceServers.push({
-            url: 'turn:turn.anyfirewall.com:443?transport=tcp',
-            credential: 'webrtc',
-            username: 'webrtc'
-        });
-
-		*/
-         //  CUSTOM CODE  // 
-        connection.iceServers = iceServers;
-
-        connection.rtcConfiguration = {
-            iceServers: null,
-            iceTransports: 'all', // none || relay || all - ref: http://goo.gl/40I39K
-            peerIdentity: false
-        };
-
-        // www.RTCMultiConnection.org/docs/media/
-        connection.media = {
-            min: function(width, height) {
-                if (!connection.mediaConstraints.video) return;
-
-                if (!connection.mediaConstraints.video.mandatory) {
-                    connection.mediaConstraints.video.mandatory = {};
-                }
-                connection.mediaConstraints.video.mandatory.minWidth = width;
-                connection.mediaConstraints.video.mandatory.minHeight = height;
-            },
-            max: function(width, height) {
-                if (!connection.mediaConstraints.video) return;
-
-                if (!connection.mediaConstraints.video.mandatory) {
-                    connection.mediaConstraints.video.mandatory = {};
-                }
-
-                connection.mediaConstraints.video.mandatory.maxWidth = width;
-                connection.mediaConstraints.video.mandatory.maxHeight = height;
-            }
-        };
-
-        connection._getStream = function(event) {
-            var resultingObject = merge({
-                sockets: event.socket ? [event.socket] : []
-            }, event);
-
-            resultingObject.stop = function() {
-                var self = this;
-
-                self.sockets.forEach(function(socket) {
-                    if (self.type == 'local') {
-                        socket.send({
-                            streamid: self.streamid,
-                            stopped: true
-                        });
-                    }
-
-                    if (self.type == 'remote') {
-                        socket.send({
-                            promptStreamStop: true,
-                            streamid: self.streamid
-                        });
-                    }
-                });
-
-                if (self.type == 'remote') return;
-
-                var stream = self.stream;
-                if (stream) self.rtcMultiConnection.stopMediaStream(stream);
-            };
-
-            resultingObject.mute = function(session) {
-                this.muted = true;
-                this._private(session, true);
-            };
-
-            resultingObject.unmute = function(session) {
-                this.muted = false;
-                this._private(session, false);
-            };
-
-            function muteOrUnmuteLocally(session, isPause, mediaElement) {
-                if (!mediaElement) return;
-                var lastPauseState = mediaElement.onpause;
-                var lastPlayState = mediaElement.onplay;
-                mediaElement.onpause = mediaElement.onplay = function() {};
-
-                if (isPause) mediaElement.pause();
-                else mediaElement.play();
-
-                mediaElement.onpause = lastPauseState;
-                mediaElement.onplay = lastPlayState;
-            }
-
-            resultingObject._private = function(session, enabled) {
-                if (session && !isNull(session.sync) && session.sync == false) {
-                    muteOrUnmuteLocally(session, enabled, this.mediaElement);
-                    return;
-                }
-
-                muteOrUnmute({
-                    root: this,
-                    session: session,
-                    enabled: enabled,
-                    stream: this.stream
-                });
-            };
-
-            resultingObject.startRecording = function(session) {
-                var self = this;
-
-                if (!session) {
-                    session = {
-                        audio: true,
-                        video: true
-                    };
-                }
-
-                if (isString(session)) {
-                    session = {
-                        audio: session == 'audio',
-                        video: session == 'video'
-                    };
-                }
-
-                if (!window.RecordRTC) {
-                    return loadScript(self.rtcMultiConnection.resources.RecordRTC, function() {
-                        self.startRecording(session);
-                    });
-                }
-
-                log('started recording session', session);
-
-                self.videoRecorder = self.audioRecorder = null;
-
-                if (isFirefox) {
-                    // firefox supports both audio/video recording in single webm file
-                    if (session.video) {
-                        self.videoRecorder = RecordRTC(self.stream, {
-                            type: 'video'
-                        });
-                    } else if (session.audio) {
-                        self.audioRecorder = RecordRTC(self.stream, {
-                            type: 'audio'
-                        });
-                    }
-                } else if (isChrome) {
-                    // chrome supports recording in two separate files: WAV and WebM
-                    if (session.video) {
-                        self.videoRecorder = RecordRTC(self.stream, {
-                            type: 'video'
-                        });
-                    }
-
-                    if (session.audio) {
-                        self.audioRecorder = RecordRTC(self.stream, {
-                            type: 'audio'
-                        });
-                    }
-                }
-
-                if (self.audioRecorder) {
-                    self.audioRecorder.startRecording();
-                }
-
-                if (self.videoRecorder) self.videoRecorder.startRecording();
-            };
-
-            resultingObject.stopRecording = function(callback, session) {
-                if (!session) {
-                    session = {
-                        audio: true,
-                        video: true
-                    };
-                }
-
-                if (isString(session)) {
-                    session = {
-                        audio: session == 'audio',
-                        video: session == 'video'
-                    };
-                }
-
-                log('stopped recording session', session);
-
-                var self = this;
-
-                if (session.audio && self.audioRecorder) {
-                    self.audioRecorder.stopRecording(function() {
-                        if (session.video && self.videoRecorder) {
-                            self.videoRecorder.stopRecording(function() {
-                                callback({
-                                    audio: self.audioRecorder.getBlob(),
-                                    video: self.videoRecorder.getBlob()
-                                });
-                            });
-                        } else callback({
-                            audio: self.audioRecorder.getBlob()
-                        });
-                    });
-                } else if (session.video && self.videoRecorder) {
-                    self.videoRecorder.stopRecording(function() {
-                        callback({
-                            video: self.videoRecorder.getBlob()
-                        });
-                    });
-                }
-            };
-
-            resultingObject.takeSnapshot = function(callback) {
-                takeSnapshot({
-                    mediaElement: this.mediaElement,
-                    userid: this.userid,
-                    connection: connection,
-                    callback: callback
-                });
-            };
-
-            // redundant: kept only for backward compatibility
-            resultingObject.streamObject = resultingObject;
-
-            return resultingObject;
-        };
-
-        // new RTCMultiConnection().set({properties}).connect()
-        connection.set = function(properties) {
-            for (var property in properties) {
-                this[property] = properties[property];
-            }
-            return this;
-        };
-
-        // www.RTCMultiConnection.org/docs/onMediaError/
-        connection.onMediaError = function(event) {
-            error('name', event.name);
-            error('constraintName', toStr(event.constraintName));
-            error('message', event.message);
-            error('original session', event.session);
-        };
-
-        // www.RTCMultiConnection.org/docs/takeSnapshot/
-        connection.takeSnapshot = function(userid, callback) {
-            takeSnapshot({
-                userid: userid,
-                connection: connection,
-                callback: callback
-            });
-        };
-
-        connection.saveToDisk = function(blob, fileName) {
-            if (blob.size && blob.type) FileSaver.SaveToDisk(URL.createObjectURL(blob), fileName || blob.name || blob.type.replace('/', '-') + blob.type.split('/')[1]);
-            else FileSaver.SaveToDisk(blob, fileName);
-        };
-
-        // www.RTCMultiConnection.org/docs/selectDevices/
-        connection.selectDevices = function(device1, device2) {
-            if (device1) select(this.devices[device1]);
-            if (device2) select(this.devices[device2]);
-
-            function select(device) {
-                if (!device) return;
-                connection._mediaSources[device.kind] = device.id;
-            }
-        };
-
-        // www.RTCMultiConnection.org/docs/getDevices/
-        connection.getDevices = function(callback) {
-            // if, not yet fetched.
-            if (!DetectRTC.MediaDevices.length) {
-                return setTimeout(function() {
-                    connection.getDevices(callback);
-                }, 1000);
-            }
-
-            // loop over all audio/video input/output devices
-            DetectRTC.MediaDevices.forEach(function(device) {
-                connection.devices[device.deviceId] = device;
-            });
-
-            if (callback) callback(connection.devices);
-        };
-
-        connection.getMediaDevices = connection.enumerateDevices = function(callback) {
-            if (!callback) throw 'callback is mandatory.';
-            connection.getDevices(function() {
-                callback(connection.DetectRTC.MediaDevices);
-            });
-        };
-
-        // www.RTCMultiConnection.org/docs/onCustomMessage/
-        connection.onCustomMessage = function(message) {
-            log('Custom message', message);
-        };
-
-        // www.RTCMultiConnection.org/docs/ondrop/
-        connection.ondrop = function(droppedBy) {
-            log('Media connection is dropped by ' + droppedBy);
-        };
-
-        // www.RTCMultiConnection.org/docs/drop/
-        connection.drop = function(config) {
-            config = config || {};
-            connection.attachStreams = [];
-
-            // "drop" should detach all local streams
-            for (var stream in connection.streams) {
-                if (connection._skip.indexOf(stream) == -1) {
-                    stream = connection.streams[stream];
-                    if (stream.type == 'local') {
-                        connection.detachStreams.push(stream.streamid);
-                        onStreamEndedHandler(stream, connection);
-                    } else onStreamEndedHandler(stream, connection);
-                }
-            }
-
-            // www.RTCMultiConnection.org/docs/sendCustomMessage/
-            connection.sendCustomMessage({
-                drop: true,
-                dontRenegotiate: isNull(config.renegotiate) ? true : config.renegotiate
-            });
-        };
-
-        // www.RTCMultiConnection.org/docs/Translator/
-        connection.Translator = {
-            TranslateText: function(text, callback) {
-                // if(location.protocol === 'https:') return callback(text);
-
-                var newScript = document.createElement('script');
-                newScript.type = 'text/javascript';
-
-                var sourceText = encodeURIComponent(text); // escape
-
-                var randomNumber = 'method' + connection.token();
-                window[randomNumber] = function(response) {
-                    if (response.data && response.data.translations[0] && callback) {
-                        callback(response.data.translations[0].translatedText);
-                    }
-
-                    if (response.error && response.error.message == 'Daily Limit Exceeded') {
-                        warn('Text translation failed. Error message: "Daily Limit Exceeded."');
-
-                        // returning original text
-                        callback(text);
-                    }
-                };
-
-                var source = 'https://www.googleapis.com/language/translate/v2?key=' + connection.googKey + '&target=' + (connection.language || 'en-US') + '&callback=window.' + randomNumber + '&q=' + sourceText;
-                newScript.src = source;
-                document.getElementsByTagName('head')[0].appendChild(newScript);
-            }
-        };
-
-        // you can easily override it by setting it NULL!
-        connection.setDefaultEventsForMediaElement = function(mediaElement, streamid) {
-            mediaElement.onpause = function() {
-                if (connection.streams[streamid] && !connection.streams[streamid].muted) {
-                    connection.streams[streamid].mute();
-                }
-            };
-
-            // todo: need to make sure that "onplay" EVENT doesn't play self-voice!
-            mediaElement.onplay = function() {
-                if (connection.streams[streamid] && connection.streams[streamid].muted) {
-                    connection.streams[streamid].unmute();
-                }
-            };
-
-            var volumeChangeEventFired = false;
-            mediaElement.onvolumechange = function() {
-                if (!volumeChangeEventFired) {
-                    volumeChangeEventFired = true;
-                    connection.streams[streamid] && setTimeout(function() {
-                        var root = connection.streams[streamid];
-                        connection.streams[streamid].sockets.forEach(function(socket) {
-                            socket.send({
-                                streamid: root.streamid,
-                                isVolumeChanged: true,
-                                volume: mediaElement.volume
-                            });
-                        });
-                        volumeChangeEventFired = false;
-                    }, 2000);
-                }
-            };
-        };
-
-        // www.RTCMultiConnection.org/docs/onMediaFile/
-        connection.onMediaFile = function(e) {
-            log('onMediaFile', e);
-            connection.body.appendChild(e.mediaElement);
-        };
-
-        // www.RTCMultiConnection.org/docs/shareMediaFile/
-        // this method handles pre-recorded media streaming
-        connection.shareMediaFile = function(file, video, streamerid) {
-            streamerid = streamerid || connection.token();
-
-            if (!PreRecordedMediaStreamer) {
-                loadScript(connection.resources.PreRecordedMediaStreamer, function() {
-                    connection.shareMediaFile(file, video, streamerid);
-                });
-                return streamerid;
-            }
-
-            return PreRecordedMediaStreamer.shareMediaFile({
-                file: file,
-                video: video,
-                streamerid: streamerid,
-                connection: connection
-            });
-        };
-
-        // www.RTCMultiConnection.org/docs/onpartofscreen/
-        connection.onpartofscreen = function(e) {
-            var image = document.createElement('img');
-            image.src = e.screenshot;
-            connection.body.appendChild(image);
-        };
-
-        connection.skipLogs = function() {
-            log = error = warn = function() {};
-        };
-
-        // www.RTCMultiConnection.org/docs/hold/
-        connection.hold = function(mLine) {
-            for (var peer in connection.peers) {
-                connection.peers[peer].hold(mLine);
-            }
-        };
-
-        // www.RTCMultiConnection.org/docs/onhold/
-        connection.onhold = function(track) {
-            log('onhold', track);
-
-            if (track.kind != 'audio') {
-                track.mediaElement.pause();
-                track.mediaElement.setAttribute('poster', track.screenshot || connection.resources.muted);
-            }
-            if (track.kind == 'audio') {
-                track.mediaElement.muted = true;
-            }
-        };
-
-        // www.RTCMultiConnection.org/docs/unhold/
-        connection.unhold = function(mLine) {
-            for (var peer in connection.peers) {
-                connection.peers[peer].unhold(mLine);
-            }
-        };
-
-        // www.RTCMultiConnection.org/docs/onunhold/
-        connection.onunhold = function(track) {
-            log('onunhold', track);
-
-            if (track.kind != 'audio') {
-                track.mediaElement.play();
-                track.mediaElement.removeAttribute('poster');
-            }
-            if (track.kind != 'audio') {
-                track.mediaElement.muted = false;
-            }
-        };
-
-        connection.sharePartOfScreen = function(args) {
-            var lastScreenshot = '';
-
-            function partOfScreenCapturer() {
-                // if stopped
-                if (connection.partOfScreen && !connection.partOfScreen.sharing) {
-                    return;
-                }
-
-                capturePartOfScreen({
-                    element: args.element,
-                    connection: connection,
-                    callback: function(screenshot) {
-                        // don't share repeated content
-                        if (screenshot != lastScreenshot) {
-                            lastScreenshot = screenshot;
-
-                            for (var channel in connection.channels) {
-                                connection.channels[channel].send({
-                                    screenshot: screenshot,
-                                    isPartOfScreen: true
-                                });
-                            }
-                        }
-
-                        // "once" can be used to share single screenshot
-                        !args.once && setTimeout(partOfScreenCapturer, args.interval || 200);
-                    }
-                });
-            }
-
-            partOfScreenCapturer();
-
-            connection.partOfScreen = merge({
-                sharing: true
-            }, args);
-        };
-
-        connection.pausePartOfScreenSharing = function() {
-            for (var peer in connection.peers) {
-                connection.peers[peer].pausePartOfScreenSharing = true;
-            }
-
-            if (connection.partOfScreen) {
-                connection.partOfScreen.sharing = false;
-            }
-        };
-
-        connection.resumePartOfScreenSharing = function() {
-            for (var peer in connection.peers) {
-                connection.peers[peer].pausePartOfScreenSharing = false;
-            }
-
-            if (connection.partOfScreen) {
-                connection.partOfScreen.sharing = true;
-            }
-        };
-
-        connection.stopPartOfScreenSharing = function() {
-            for (var peer in connection.peers) {
-                connection.peers[peer].stopPartOfScreenSharing = true;
-            }
-
-            if (connection.partOfScreen) {
-                connection.partOfScreen.sharing = false;
-            }
-        };
-
-        connection.takeScreenshot = function(element, callback) {
-            if (!element || !callback) throw 'Invalid number of arguments.';
-
-            if (!window.html2canvas) {
-                return loadScript(connection.resources.html2canvas, function() {
-                    connection.takeScreenshot(element);
-                });
-            }
-
-            if (isString(element)) {
-                element = document.querySelector(element);
-                if (!element) element = document.getElementById(element);
-            }
-            if (!element) throw 'HTML Element is inaccessible!';
-
-            // html2canvas.js is used to take screenshots
-            html2canvas(element, {
-                onrendered: function(canvas) {
-                    callback(canvas.toDataURL());
-                }
-            });
-        };
-
-        // this event is fired when RTCMultiConnection detects that chrome extension
-        // for screen capturing is installed and available
-        connection.onScreenCapturingExtensionAvailable = function() {
-            log('It seems that screen capturing extension is installed and available on your system!');
-        };
-
-        if (!isPluginRTC && DetectRTC.screen.onScreenCapturingExtensionAvailable) {
-            DetectRTC.screen.onScreenCapturingExtensionAvailable = function() {
-                connection.onScreenCapturingExtensionAvailable();
-            };
-        }
-
-        connection.changeBandwidth = function(bandwidth) {
-            for (var peer in connection.peers) {
-                connection.peers[peer].changeBandwidth(bandwidth);
-            }
-        };
-
-        connection.convertToAudioStream = function(mediaStream) {
-            convertToAudioStream(mediaStream);
-        };
-
-        connection.onstatechange = function(state) {
-            log('on:state:change (' + state.userid + '):', state.name + ':', state.reason || '');
-        };
-
-        connection.onfailed = function(event) {
-            if (!event.peer.numOfRetries) event.peer.numOfRetries = 0;
-            event.peer.numOfRetries++;
-
-            error('ICE connectivity check is failed. Renegotiating peer connection.');
-            event.peer.numOfRetries < 2 && event.peer.renegotiate();
-
-            if (event.peer.numOfRetries >= 2) event.peer.numOfRetries = 0;
-        };
-
-        connection.onconnected = function(event) {
-            // event.peer.addStream || event.peer.getConnectionStats
-            log('Peer connection has been established between you and', event.userid);
-        };
-
-        connection.ondisconnected = function(event) {
-            error('Peer connection seems has been disconnected between you and', event.userid);
-
-            if (isEmpty(connection.channels)) return;
-            if (!connection.channels[event.userid]) return;
-
-            // use WebRTC data channels to detect user's presence
-            connection.channels[event.userid].send({
-                checkingPresence: true
-            });
-
-            // wait 5 seconds, if target peer didn't response, simply disconnect
-            setTimeout(function() {
-                // iceConnectionState == 'disconnected' occurred out of low-bandwidth
-                // or internet connectivity issues
-                if (connection.peers[event.userid].connected) {
-                    delete connection.peers[event.userid].connected;
-                    return;
-                }
-
-                // to make sure this user's all remote streams are removed.
-                connection.streams.remove({
-                    remote: true,
-                    userid: event.userid
-                });
-
-                connection.remove(event.userid);
-            }, 3000);
-        };
-
-        connection.onstreamid = function(event) {
-            // event.isScreen || event.isVideo || event.isAudio
-            log('got remote streamid', event.streamid, 'from', event.userid);
-        };
-
-        connection.stopMediaStream = function(mediaStream) {
-            if (!mediaStream) throw 'MediaStream argument is mandatory.';
-
-            if (connection.keepStreamsOpened) {
-                if (mediaStream.onended) mediaStream.onended();
-                return;
-            }
-
-            // remove stream from "localStreams" object
-            // when native-stop method invoked.
-            if (connection.localStreams[mediaStream.streamid]) {
-                delete connection.localStreams[mediaStream.streamid];
-            }
-
-            if (isFirefox) {
-                // Firefox don't yet support onended for any stream (remote/local)
-                if (mediaStream.onended) mediaStream.onended();
-            }
-
-            // Latest firefox does support mediaStream.getAudioTrack but doesn't support stop on MediaStreamTrack
-            var checkForMediaStreamTrackStop = Boolean(
-                (mediaStream.getAudioTracks || mediaStream.getVideoTracks) && (
-                    (mediaStream.getAudioTracks()[0] && !mediaStream.getAudioTracks()[0].stop) ||
-                    (mediaStream.getVideoTracks()[0] && !mediaStream.getVideoTracks()[0].stop)
-                )
-            );
-
-            if (!mediaStream.getAudioTracks || checkForMediaStreamTrackStop) {
-                if (mediaStream.stop) {
-                    mediaStream.stop();
-                }
-                return;
-            }
-
-            if (mediaStream.getAudioTracks().length && mediaStream.getAudioTracks()[0].stop) {
-                mediaStream.getAudioTracks().forEach(function(track) {
-                    track.stop();
-                });
-            }
-
-            if (mediaStream.getVideoTracks().length && mediaStream.getVideoTracks()[0].stop) {
-                mediaStream.getVideoTracks().forEach(function(track) {
-                    track.stop();
-                });
-            }
-        };
-
-        connection.changeBandwidth = function(bandwidth) {
-            if (!bandwidth || isString(bandwidth) || isEmpty(bandwidth)) {
-                throw 'Invalid "bandwidth" arguments.';
-            }
-
-            forEach(connection.peers, function(peer) {
-                peer.peer.bandwidth = bandwidth;
-            });
-
-            connection.renegotiate();
-        };
-
-        // www.RTCMultiConnection.org/docs/openSignalingChannel/
-        // http://goo.gl/uvoIcZ
-
-        // CUSTOM CODE
-        var href = window.location.href;
-        var hostPatt = new RegExp(window.location.host +"/[^/]*");
-        var res = hostPatt.exec(href);
-        var protocol = window.location.protocol.replace("http","ws");
-        
-        var signalingServerPath = protocol + "//" + res + "/webrtc"; 
-        var SIGNALING_SERVER = signalingServerPath; //"ws://localhost:80/quantum/webrtc"; //"wss://localhost:80/quantum/webrtc"; --> ws for http and wss for https
-        
-        connection.openSignalingChannel = function(config) {
-           
-            
-            config.channel = config.channel || this.channel;
-            var websocket = new WebSocket(SIGNALING_SERVER);
-            websocket.channel = config.channel;
-            websocket.onopen = function() {
-                websocket.push(JSON.stringify({
-                    open: true,
-                    channel: config.channel
-                }));
-                if (config.callback)
-                    config.callback(websocket);
-            };
-            websocket.onmessage = function(event) {
-                config.onmessage(JSON.parse(event.data));
-            };
-            websocket.push = websocket.send;
-            websocket.send = function(data) {
-                websocket.push(JSON.stringify({
-                    data: data,
-                    channel: config.channel
-                }));
-            };
-            
-            /*
-            // make sure firebase.js is loaded
-            if (!window.Firebase) {
-                return loadScript(connection.resources.firebase, function() {
-                    connection.openSignalingChannel(config);
-                });
-            }
-
-            var channel = config.channel || connection.channel;
-
-            if (connection.firebase) {
-                // for custom firebase instances
-                connection.resources.firebaseio = connection.resources.firebaseio.replace('//chat.', '//' + connection.firebase + '.');
-            }
-
-            var firebase = new Firebase(connection.resources.firebaseio + channel);
-            firebase.channel = channel;
-            firebase.on('child_added', function(data) {
-                config.onmessage(data.val());
-            });
-
-            firebase.send = function(data) {
-                // a quick dirty workaround to make sure firebase
-                // shouldn't fail for NULL values.
-                for (var prop in data) {
-                    if (isNull(data[prop]) || typeof data[prop] == 'function') {
-                        data[prop] = false;
-                    }
-                }
-
-                this.push(data);
-            };
-
-            if (!connection.socket)
-                connection.socket = firebase;
-
-            firebase.onDisconnect().remove();
-
-            setTimeout(function() {
-                config.callback(firebase);
-            }, 1);
-            
-            */
-            // CUSTOM CODE //
-            
-        };
-
-        connection.Plugin = Plugin;
-    }
-
-})();
\ No newline at end of file
diff --git a/vid/src/main/webapp/app/fusion/scripts/webrtc/getSourceId.html b/vid/src/main/webapp/app/fusion/scripts/webrtc/getSourceId.html
deleted file mode 100644
index 6f660025e..000000000
--- a/vid/src/main/webapp/app/fusion/scripts/webrtc/getSourceId.html
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
diff --git a/vid/src/main/webapp/app/fusion/styles/att_angular_gridster/sandbox-gridster.css b/vid/src/main/webapp/app/fusion/styles/att_angular_gridster/sandbox-gridster.css
deleted file mode 100644
index a9edba8ff..000000000
--- a/vid/src/main/webapp/app/fusion/styles/att_angular_gridster/sandbox-gridster.css
+++ /dev/null
@@ -1,173 +0,0 @@
-.gridster {
-    position: relative;
-    margin: auto;
-    /* height: 0
- */}
-
-.gridster>ul {
-    margin: 0;
-    list-style: none;
-    padding: 0
-}
-
-.gridster-item {
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    list-style: none;
-    z-index: 2;
-    position: absolute;
-    display: none
-}
-
-.gridster-loaded {
-    -webkit-transition: height .3s;
-    -moz-transition: height .3s;
-    -o-transition: height .3s;
-    transition: height .3s
-}
-
-.gridster-loaded .gridster-item {
-    display: block;
-    position: absolute;
-    -webkit-transition: opacity .3s, left .3s, top .3s, width .3s, height .3s;
-    -moz-transition: opacity .3s, left .3s, top .3s, width .3s, height .3s;
-    -o-transition: opacity .3s, left .3s, top .3s, width .3s, height .3s;
-    transition: opacity .3s, left .3s, top .3s, width .3s, height .3s;
-    -webkit-transition-delay: 50ms;
-    -moz-transition-delay: 50ms;
-    -o-transition-delay: 50ms;
-    transition-delay: 50ms
-}
-
-.gridster-loaded .gridster-preview-holder {
-    display: none;
-    z-index: 1;
-    position: absolute;
-    background-color: #067ab4;
-    /*
-    background-color: rgb(6, 122, 180);
-    -ms-filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#067ab4', endColorstr='#067ab4');  IE 
-    opacity: 0.2;
-    */
-    border-color: #fff;
-    -webkit-transition: width .2s, height .3s;
-    -moz-transition: width .2s, height .3s;
-    -o-transition: width .2s, height .3s;
-    transition: width .2s, height .3s;
-    -webkit-transition-delay: 50ms;
-    -moz-transition-delay: 50ms;
-    -o-transition-delay: 50ms;
-    transition-delay: 50ms
-}
-
-.gridster-loaded .gridster-item.gridster-item-moving {
-    -webkit-transition: none;
-    -moz-transition: none;
-    -o-transition: none;
-    transition: none;
-    opacity: 0.9;
-}
-
-.gridster-mobile {
-    height: auto !important
-}
-
-.gridster-mobile .gridster-item {
-    height: auto;
-    position: static;
-    float: none
-}
-
-.gridster-item.ng-leave.ng-leave-active {
-    opacity: 0
-}
-
-.gridster-item.ng-enter {
-    opacity: 1
-}
-
-.gridster-item-moving {
-    z-index: 3
-}
-
-.gridster-item-resizable-handler {
-    position: absolute;
-    font-size: 1px;
-    display: block
-}
-
-.handle-se {
-    cursor: se-resize;
-    width: 0;
-    height: 0;
-    right: 1px;
-    bottom: 1px;
-    border-style: solid;
-    border-width: 0 0 12px 12px;
-    border-color: transparent
-}
-
-.handle-ne {
-    cursor: ne-resize;
-    width: 12px;
-    height: 12px;
-    right: 1px;
-    top: 1px
-}
-
-.handle-nw {
-    cursor: nw-resize;
-    width: 12px;
-    height: 12px;
-    left: 1px;
-    top: 1px
-}
-
-.handle-sw {
-    cursor: sw-resize;
-    width: 12px;
-    height: 12px;
-    left: 1px;
-    bottom: 1px
-}
-
-.handle-e {
-    cursor: e-resize;
-    width: 12px;
-    bottom: 0;
-    right: 1px;
-    top: 0
-}
-
-.handle-s {
-    cursor: s-resize;
-    height: 12px;
-    right: 0;
-    bottom: 1px;
-    left: 0
-}
-
-.handle-n {
-    cursor: n-resize;
-    height: 12px;
-    right: 0;
-    top: 1px;
-    left: 0
-}
-
-.handle-w {
-    cursor: w-resize;
-    width: 12px;
-    left: 1px;
-    top: 0;
-    bottom: 0
-}
-
-.gridster .gridster-item:hover .gridster-box {
-    border: 1.5px solid #B3B2B3
-}
-
-.gridster .gridster-item:hover .handle-se {
-    border-color: transparent transparent #ccc
-}
diff --git a/vid/src/main/webapp/app/fusion/styles/att_angular_gridster/ui-gridster.css b/vid/src/main/webapp/app/fusion/styles/att_angular_gridster/ui-gridster.css
deleted file mode 100644
index 827e354ec..000000000
--- a/vid/src/main/webapp/app/fusion/styles/att_angular_gridster/ui-gridster.css
+++ /dev/null
@@ -1,116 +0,0 @@
-/* ui-gridster.css */
-.gridster-container {
-  background-color: #EFEFEF;
-  color: #fff;
-  border: 1px dashed;
-  overflow-y: auto;
-  overflow-x: hidden; }
-
-/* app css for attGridtser */
-.gridster-item-container {
-  background-color: #FFFFFF;
-  position: relative;
-  margin-left: auto;
-  margin-right: auto;
-  min-height: 79px;
-  height: 100%; }
-  .gridster-item-container .gridster-item-header {
-    /* gridster-item Header */
-    position: relative;
-    height: 50px !important;
-    border: 1px solid #d3d3d3;
-    border-bottom: 0;
-    background-color: #E5E5E5;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    z-index: 1;
-    -webkit-border-radius: 2px 2px 0 0;
-    -moz-border-radius: 2px 2px 0 0;
-    -ms-border-radius: 2px 2px 0 0;
-    -o-border-radius: 2px 2px 0 0;
-    border-radius: 2px 2px 0 0;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    overflow: hidden;
-    /* IE6-8 */ }
-    .gridster-item-container .gridster-item-header .gridster-item-handle {
-      cursor: move;
-      margin: 12px;
-      position: absolute;
-      top: 0;
-      left: 0;
-      border: 0;
-      vertical-align: middle;
-      -ms-interpolation-mode: bicubic;
-      display: block; }
-    .gridster-item-container .gridster-item-header .gridster-item-header-content {
-      line-height: 44px;
-      margin-left: 26px;
-      font-family: clearviewatt;
-      font-size: 18px;
-      color: #444444;
-      float: left; }
-    .gridster-item-container .gridster-item-header .gridster-item-sub-header-content {
-      position: absolute;
-      top: 29.5px;
-      left: 26px;
-      font-family: clearviewatt;
-      font-size: 12px;
-      color: #444444; }
-    .gridster-item-container .gridster-item-header .gridster-item-header-buttons-container {
-      position: absolute;
-      right: 10px;
-      top: 10px;
-      overflow: hidden;
-      text-align: right;
-      height: 30px;
-      color: #444444; }
-  .gridster-item-container .gridster-item-body {
-    /* gridster-item Body */
-    position: absolute;
-    width: 100%;
-    top: 50px;
-    left: 0;
-    right: 0;
-    bottom: 29px;
-    border: 1px solid #d3d3d3;
-    box-sizing: border-box;
-    overflow: auto;
-    color: #444444;
-    /* text-align: center; */ }
-  .gridster-item-container .gridster-item-footer {
-    /* gridster-item Footer */
-    position: absolute;
-    bottom: 0;
-    width: 100%;
-    height: 29px !important;
-    text-align: left;
-    cursor: pointer;
-    border: 1px solid #d3d3d3;
-    border-top: 0;
-    background-color: #F2F2F2;
-    -webkit-border-radius: 0 0 2px 2px;
-    -moz-border-radius: 0 0 2px 2px;
-    -ms-border-radius: 0 0 2px 2px;
-    -o-border-radius: 0 0 2px 2px;
-    border-radius: 0 0 2px 2px;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    text-decoration: none;
-    /* IE6-8 */ }
-    .gridster-item-container .gridster-item-footer:hover {
-      background-color: #E5E5E5;
-      color: #565656;
-      text-decoration: underline; }
-    .gridster-item-container .gridster-item-footer .gridster-item-footer-content {
-      line-height: 30px;
-      font-family: clearviewatt;
-      font-size: 12px;
-      color: #565656;
-      margin: 20px;
-      text-decoration: none; }
-      .gridster-item-container .gridster-item-footer .gridster-item-footer-content:hover {
-        color: #199ddf;
-        text-decoration: underline; }
diff --git a/vid/src/main/webapp/app/fusion/styles/fusion-sunny.css b/vid/src/main/webapp/app/fusion/styles/fusion-sunny.css
deleted file mode 100644
index c83061567..000000000
--- a/vid/src/main/webapp/app/fusion/styles/fusion-sunny.css
+++ /dev/null
@@ -1,362 +0,0 @@
-  input, textarea, select, div {
-    font-family: Arial;
-    font-size: 11px;
-    font-weight: normal;
-  }
-  
-  form {
-    margin-top: 5px;  
-  }
-  
-
-  .applicationWindow { border-width:  0px 0px 1px 0px;
-                       border-style:  solid;
-                       border-color:  #959595;
-                       box-shadow:    inset 0 0 10px #000000;
-                       margin-top:    10px;
-                       margin-bottom: 10px;
-                       margin-left:   10px;
-                       margin-right:  10px;
-  }  
-
-  .feedbackMessage  { width: 99%;
-  					  font-family: Arial;
-    				  font-size: 11px;
-					  color: #1f1f1f;
-                      padding: 3px;
-                      border: 1px #eeb420 solid;
-                      margin: 3px;
-                      background: #fff9e5;
-                    }                      
-
-  .menubar {
-    border-width: 0px 0px 0px 1px; border-style: solid; border-color: #959595;
-  }
-
-  .footer {
-    /*clear: both;*/
-    border-width: 0px 1px 0px 1px; border-style: solid; border-color: #959595;
-  	font-family: Verdana,Arial,Helvetica, sans-serif;
-    font-size: 9px;    
-    padding:   10px 10px 30px 10px;
-    background: white;
-  }
-
-  .pageTitle {
-    font-family: Arial;
-    font-size: 18px;
-    font-weight: bold;
-    margin-top: 5px;    
-  }
-
-  .content {
-	border-width:  0px 1px 0px 1px;
-    border-style:  solid;
-    border-color:  #959595;
-  	font-family: Arial;
-    font-size: 11px;
-    padding: 5px;
-    background:   white;
-    /*height: 600px;*/
-  }
-
-  .popupContent {
-    font-family: Arial;
-    font-size: 11px;
-    padding: 3px;
-  }
-
-  .logo {
-	border-width:  0px 1px 0px 1px;
-    border-style:  solid;
-    border-color:  #959595;
-  	text-align: right;
-  }
-
-  .sep {
-    border: 1px solid black
-  }
-
-  .attLogo		{  /*position: relative;*/
-                   float:left;
-                   padding-top: 25px;
-                   padding-left: 25px;   
-                }
-
-  .applicationLogo		{ float:right; 
-                          padding-top: 25px;
-                          padding-right: 25px;                          
-                        }
-
-  .applinkWhite		{ font-family: Arial;
-                          font-size: 13px;
-                          font-weight: 900;
-                          color: #FFFFFF;
-                          text-decoration: none; }
-
-  .terms                { font-family: Verdana, Arial, Helvetica, sans-serif;
-                          font-size: 9px;
-                        }
-
-  .broadcastMessage     { color: red; }
-  .broadcastMessageList { color: red; }
-
-  .button               {  
-					      margin: 5px 1px 5px 1px;
-                          padding: 3px; }
-
-  .toolbarbutton:hover {
-    color:#005491;
-  }
-
-  .headerText		{ font-family: Arial;
-                      font-size: 15px;
-			          font-weight: 700;
-                      color: #000000; }
-
-  .headerBackground	{ background: #336699; }
-
-  .errorMessageText { font-family: Arial;
-                      font-size: 11px;
-                      font-weight: bold; 
-                      color: red;   }
-   
-
-  .normalText		{ font-family: Arial;
-                      font-size: 11px;
-                      color: #000000; }
-
-  .normalTextRed	{ font-family: Arial;
-                      font-size: 11px;
-                      color: red; }
-
-
-  .smallNormalText	{ font-family: Arial;
-                      font-size: 9px;
-                      color: #000000; }
-
-  .tableBorder          { border:1px outset teal }
-
-  .validationError      { background: #b9eaff; }
-
-  .templatebody         {  
-  						  background: url(../images/body_graphic.jpg) repeat-x;
-                          /*margin: 40px 80px 40px 80px;*/  						   
-  						}
-
-  /*--------------------- General Content ------------------------------------*/	  
-
-  .relative {
-    position:relative;
-  }
-  
-  .clear{
-    clear:both;
-  } 
-
-  .left {
-    float:      left;
-  } 
-
-  .leftCentered{
-    float:      left;
-    text-align: center;
-  } 
-
-  .right {
-    float:      right;
-  } 
-
-  .rightAligned{
-    text-align: right;
-  } 
-
-  .centered {
-    text-align: center;
-    align:      center;
-  } 
-
-
-  .noWrap{
-  	white-space:nowrap;
-  }
-
-  .disabled {
-	color:gray;
-	cursor:hand;
-  }
-
-  /*--------------------- Tab styles -------------------------------------*/
-  
-  .current {
-	font-weight: bold;
-  	border-width: 1px 1px 1px 1px; 
-  	border-color: silver;
-  	border-style: solid;
-  }
- 
-  .subTab {
-	font-weight:bold;
-	font-family: Arial;
-	font-size:   11px;
-	color:     #0F3B82;
-  }
-  
-
-  /*--------------------- Grid styles ------------------------------------*/	  
-
-  /* Grid navigation and header styles */
-	.gridFilterLabel {font-size:   7pt;
-	                  font-align:  justify;
-	                  font-weight: bold;
-	                  display:     block;}
-
-    .gridFilterText  {height:     17px;
-	                  font-size:  8pt;
-	                  width:      60%;
-	                  font-align: justify;}
-
-    .gridNavigationBar { font-family:Arial,Verdana;
-		                  font-size:11px;
-		                  font-weight:normal;
-		                  color:#000;
-                          margin: 0px;
-                          width: 100%;
-                          vertical-align: middle;
-    }
-    
-    .gridNavigationBar .navLinks { float: left;
-                                   margin-right:15px;
-                                   padding-top: 2px;
-                                   height:      19px;
-                                   line-height: 19px;                                   
-                                 }
-
-    .gridNavigationBar .pageControls  { float:        left;
-                                        margin-right: 15px;
-                                        height:       19px;  
-                                        line-height:  19px;                                        
-                                      }
-
-    .gridNavigationBar .pageControls input { font-size:      8pt;
-									         height:         17px;
-									         vertical-align: middle;                                    
-                                           }
-
-    .gridNavigationBar .pageInfo {  float:          right; 
-                                    vertical-align: middle;
-                                    height:         19px;
-                                    line-height:    19px;
-                                 }
-
-    .gridNavigationBar .pageInfo input { font-size:      8pt;
-								         height:         17px;
-								         vertical-align: middle;                                    
-                                       }
-
-
-    .gridNavigationBar span { padding: 3px; }
-
-    .gridNavigationBar a {
-	  text-decoration:underline;
-	  color:#000;
-	  font-weight:normal;
-	}
-
-    .gridNavigationBar img { vertical-align: middle; }
-  
-    .gridBulkUpdateRow {
-      height: 35px; 
-      line-height: 35px;
-    } 
-
-    .gridBulkUpdateRow input {
-      vertical-align: middle;
-    } 
-
-
-    /* dummy class used to lock the form elements of a grid - ex. bulk transaction processing */
-    .alwaysEnabled {}
-
-    .hidden {
-	  display: none;
-    }
-  
-    .selectedPage {
-		background-color:#C4DFFB;
-		color:          white;
-        border-style:   solid;
-        border-width:   1px;
-        border-color:  gray;
-        padding-left:   3px;
-        padding-right:  3px;
-		vertical-align: middle;
-	}
-
-    .selectedRow{
-	  /*background-color:#C4DFFB;*/
-	}
-	
-	/* Action Item styles */
-	.actionList {
-	  margin-left:  -20px;
-	  margin-right: -10px;
-	  padding-left:   5px;
-	}
-
-    .actionList li {
-	  float:left;
-	  padding-left:  3px;
-	  padding-right: 3px;
-	}
-	
-	.actionList li a {
-	  text-decoration:none;
-	  color:#000;
-	}
-
-	/* Filter Operator List styles */
-	
-	.filterList {
-	  margin: 0px;
-	}
-
-    .filterList li {
-      list-style-type: none;
-      padding:3px 3px 3px 2px;
-	  cursor:hand;
-	  font-size:11px;
-	}
-
-    .filterList li:hover {
-      background: #404040;      
-    }
-
-    .filterList li a {
-      color: #000;
-	  text-decoration: none;
-    }
-
-    .filterList li:hover a {
-	  color: white;
-    }
-
-    .filterList li a:hover {
-	  text-decoration: none;
-	  color: white;
-    }
-
-	.filterListItem a {
-	  text-decoration:none;
-	  padding:3px 2px 3px 2px;
-	}
-
-
-  /*---------------------- Customized ZK Styles ------------------------------*/
-  
-  .z-datebox input, .z-timebox input {
-    font-family: Arial;
-    font-size: 11px;
-    height: 15px;
-    margin-top:1px;  	
-  }
diff --git a/vid/src/main/webapp/app/fusion/styles/jquery-ui.css b/vid/src/main/webapp/app/fusion/styles/jquery-ui.css
deleted file mode 100644
index 1c22746c8..000000000
--- a/vid/src/main/webapp/app/fusion/styles/jquery-ui.css
+++ /dev/null
@@ -1,1225 +0,0 @@
-/*! jQuery UI - v1.11.4 - 2015-03-11
-* http://jqueryui.com
-* Includes: core.css, accordion.css, autocomplete.css, button.css, datepicker.css, dialog.css, draggable.css, menu.css, progressbar.css, resizable.css, selectable.css, selectmenu.css, slider.css, sortable.css, spinner.css, tabs.css, tooltip.css, theme.css
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
-* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */
-
-/* Layout helpers
-----------------------------------*/
-.ui-helper-hidden {
-	display: none;
-}
-.ui-helper-hidden-accessible {
-	border: 0;
-	clip: rect(0 0 0 0);
-	height: 1px;
-	margin: -1px;
-	overflow: hidden;
-	padding: 0;
-	position: absolute;
-	width: 1px;
-}
-.ui-helper-reset {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	outline: 0;
-	line-height: 1.3;
-	text-decoration: none;
-	font-size: 100%;
-	list-style: none;
-}
-.ui-helper-clearfix:before,
-.ui-helper-clearfix:after {
-	content: "";
-	display: table;
-	border-collapse: collapse;
-}
-.ui-helper-clearfix:after {
-	clear: both;
-}
-.ui-helper-clearfix {
-	min-height: 0; /* support: IE7 */
-}
-.ui-helper-zfix {
-	width: 100%;
-	height: 100%;
-	top: 0;
-	left: 0;
-	position: absolute;
-	opacity: 0;
-	filter:Alpha(Opacity=0); /* support: IE8 */
-}
-
-.ui-front {
-	z-index: 100;
-}
-
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled {
-	cursor: default !important;
-}
-
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon {
-	display: block;
-	text-indent: -99999px;
-	overflow: hidden;
-	background-repeat: no-repeat;
-}
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-}
-.ui-accordion .ui-accordion-header {
-	display: block;
-	cursor: pointer;
-	position: relative;
-	margin: 2px 0 0 0;
-	padding: .5em .5em .5em .7em;
-	min-height: 0; /* support: IE7 */
-	font-size: 100%;
-}
-.ui-accordion .ui-accordion-icons {
-	padding-left: 2.2em;
-}
-.ui-accordion .ui-accordion-icons .ui-accordion-icons {
-	padding-left: 2.2em;
-}
-.ui-accordion .ui-accordion-header .ui-accordion-header-icon {
-	position: absolute;
-	left: .5em;
-	top: 50%;
-	margin-top: -8px;
-}
-.ui-accordion .ui-accordion-content {
-	padding: 1em 2.2em;
-	border-top: 0;
-	overflow: auto;
-}
-.ui-autocomplete {
-	position: absolute;
-	top: 0;
-	left: 0;
-	cursor: default;
-}
-.ui-button {
-	display: inline-block;
-	position: relative;
-	padding: 0;
-	line-height: normal;
-	margin-right: .1em;
-	cursor: pointer;
-	vertical-align: middle;
-	text-align: center;
-	overflow: visible; /* removes extra width in IE */
-}
-.ui-button,
-.ui-button:link,
-.ui-button:visited,
-.ui-button:hover,
-.ui-button:active {
-	text-decoration: none;
-}
-/* to make room for the icon, a width needs to be set here */
-.ui-button-icon-only {
-	width: 2.2em;
-}
-/* button elements seem to need a little more width */
-button.ui-button-icon-only {
-	width: 2.4em;
-}
-.ui-button-icons-only {
-	width: 3.4em;
-}
-button.ui-button-icons-only {
-	width: 3.7em;
-}
-
-/* button text element */
-.ui-button .ui-button-text {
-	display: block;
-	line-height: normal;
-}
-.ui-button-text-only .ui-button-text {
-	padding: .4em 1em;
-}
-.ui-button-icon-only .ui-button-text,
-.ui-button-icons-only .ui-button-text {
-	padding: .4em;
-	text-indent: -9999999px;
-}
-.ui-button-text-icon-primary .ui-button-text,
-.ui-button-text-icons .ui-button-text {
-	padding: .4em 1em .4em 2.1em;
-}
-.ui-button-text-icon-secondary .ui-button-text,
-.ui-button-text-icons .ui-button-text {
-	padding: .4em 2.1em .4em 1em;
-}
-.ui-button-text-icons .ui-button-text {
-	padding-left: 2.1em;
-	padding-right: 2.1em;
-}
-/* no icon support for input elements, provide padding by default */
-input.ui-button {
-	padding: .4em 1em;
-}
-
-/* button icon element(s) */
-.ui-button-icon-only .ui-icon,
-.ui-button-text-icon-primary .ui-icon,
-.ui-button-text-icon-secondary .ui-icon,
-.ui-button-text-icons .ui-icon,
-.ui-button-icons-only .ui-icon {
-	position: absolute;
-	top: 50%;
-	margin-top: -8px;
-}
-.ui-button-icon-only .ui-icon {
-	left: 50%;
-	margin-left: -8px;
-}
-.ui-button-text-icon-primary .ui-button-icon-primary,
-.ui-button-text-icons .ui-button-icon-primary,
-.ui-button-icons-only .ui-button-icon-primary {
-	left: .5em;
-}
-.ui-button-text-icon-secondary .ui-button-icon-secondary,
-.ui-button-text-icons .ui-button-icon-secondary,
-.ui-button-icons-only .ui-button-icon-secondary {
-	right: .5em;
-}
-
-/* button sets */
-.ui-buttonset {
-	margin-right: 7px;
-}
-.ui-buttonset .ui-button {
-	margin-left: 0;
-	margin-right: -.3em;
-}
-
-/* workarounds */
-/* reset extra padding in Firefox, see h5bp.com/l */
-input.ui-button::-moz-focus-inner,
-button.ui-button::-moz-focus-inner {
-	border: 0;
-	padding: 0;
-}
-.ui-datepicker {
-	width: 17em;
-	padding: .2em .2em 0;
-	display: none;
-}
-.ui-datepicker .ui-datepicker-header {
-	position: relative;
-	padding: .2em 0;
-}
-.ui-datepicker .ui-datepicker-prev,
-.ui-datepicker .ui-datepicker-next {
-	position: absolute;
-	top: 2px;
-	width: 1.8em;
-	height: 1.8em;
-}
-.ui-datepicker .ui-datepicker-prev-hover,
-.ui-datepicker .ui-datepicker-next-hover {
-	top: 1px;
-}
-.ui-datepicker .ui-datepicker-prev {
-	left: 2px;
-}
-.ui-datepicker .ui-datepicker-next {
-	right: 2px;
-}
-.ui-datepicker .ui-datepicker-prev-hover {
-	left: 1px;
-}
-.ui-datepicker .ui-datepicker-next-hover {
-	right: 1px;
-}
-.ui-datepicker .ui-datepicker-prev span,
-.ui-datepicker .ui-datepicker-next span {
-	display: block;
-	position: absolute;
-	left: 50%;
-	margin-left: -8px;
-	top: 50%;
-	margin-top: -8px;
-}
-.ui-datepicker .ui-datepicker-title {
-	margin: 0 2.3em;
-	line-height: 1.8em;
-	text-align: center;
-}
-.ui-datepicker .ui-datepicker-title select {
-	font-size: 1em;
-	margin: 1px 0;
-}
-.ui-datepicker select.ui-datepicker-month,
-.ui-datepicker select.ui-datepicker-year {
-	width: 45%;
-}
-.ui-datepicker table {
-	width: 100%;
-	font-size: .9em;
-	border-collapse: collapse;
-	margin: 0 0 .4em;
-}
-.ui-datepicker th {
-	padding: .7em .3em;
-	text-align: center;
-	font-weight: bold;
-	border: 0;
-}
-.ui-datepicker td {
-	border: 0;
-	padding: 1px;
-}
-.ui-datepicker td span,
-.ui-datepicker td a {
-	display: block;
-	padding: .2em;
-	text-align: right;
-	text-decoration: none;
-}
-.ui-datepicker .ui-datepicker-buttonpane {
-	background-image: none;
-	margin: .7em 0 0 0;
-	padding: 0 .2em;
-	border-left: 0;
-	border-right: 0;
-	border-bottom: 0;
-}
-.ui-datepicker .ui-datepicker-buttonpane button {
-	float: right;
-	margin: .5em .2em .4em;
-	cursor: pointer;
-	padding: .2em .6em .3em .6em;
-	width: auto;
-	overflow: visible;
-}
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current {
-	float: left;
-}
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi {
-	width: auto;
-}
-.ui-datepicker-multi .ui-datepicker-group {
-	float: left;
-}
-.ui-datepicker-multi .ui-datepicker-group table {
-	width: 95%;
-	margin: 0 auto .4em;
-}
-.ui-datepicker-multi-2 .ui-datepicker-group {
-	width: 50%;
-}
-.ui-datepicker-multi-3 .ui-datepicker-group {
-	width: 33.3%;
-}
-.ui-datepicker-multi-4 .ui-datepicker-group {
-	width: 25%;
-}
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header {
-	border-left-width: 0;
-}
-.ui-datepicker-multi .ui-datepicker-buttonpane {
-	clear: left;
-}
-.ui-datepicker-row-break {
-	clear: both;
-	width: 100%;
-	font-size: 0;
-}
-
-/* RTL support */
-.ui-datepicker-rtl {
-	direction: rtl;
-}
-.ui-datepicker-rtl .ui-datepicker-prev {
-	right: 2px;
-	left: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-next {
-	left: 2px;
-	right: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-prev:hover {
-	right: 1px;
-	left: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-next:hover {
-	left: 1px;
-	right: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-buttonpane {
-	clear: right;
-}
-.ui-datepicker-rtl .ui-datepicker-buttonpane button {
-	float: left;
-}
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,
-.ui-datepicker-rtl .ui-datepicker-group {
-	float: right;
-}
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header {
-	border-right-width: 0;
-	border-left-width: 1px;
-}
-.ui-dialog {
-	overflow: hidden;
-	position: absolute;
-	top: 0;
-	left: 0;
-	padding: .2em;
-	outline: 0;
-}
-.ui-dialog .ui-dialog-titlebar {
-	padding: .4em 1em;
-	position: relative;
-}
-.ui-dialog .ui-dialog-title {
-	float: left;
-	margin: .1em 0;
-	white-space: nowrap;
-	width: 90%;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-.ui-dialog .ui-dialog-titlebar-close {
-	position: absolute;
-	right: .3em;
-	top: 50%;
-	width: 20px;
-	margin: -10px 0 0 0;
-	padding: 1px;
-	height: 20px;
-}
-.ui-dialog .ui-dialog-content {
-	position: relative;
-	border: 0;
-	padding: .5em 1em;
-	background: none;
-	overflow: auto;
-}
-.ui-dialog .ui-dialog-buttonpane {
-	text-align: left;
-	border-width: 1px 0 0 0;
-	background-image: none;
-	margin-top: .5em;
-	padding: .3em 1em .5em .4em;
-}
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
-	float: right;
-}
-.ui-dialog .ui-dialog-buttonpane button {
-	margin: .5em .4em .5em 0;
-	cursor: pointer;
-}
-.ui-dialog .ui-resizable-se {
-	width: 12px;
-	height: 12px;
-	right: -5px;
-	bottom: -5px;
-	background-position: 16px 16px;
-}
-.ui-draggable .ui-dialog-titlebar {
-	cursor: move;
-}
-.ui-draggable-handle {
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-menu {
-	list-style: none;
-	padding: 0;
-	margin: 0;
-	display: block;
-	outline: none;
-}
-.ui-menu .ui-menu {
-	position: absolute;
-}
-.ui-menu .ui-menu-item {
-	position: relative;
-	margin: 0;
-	padding: 3px 1em 3px .4em;
-	cursor: pointer;
-	min-height: 0; /* support: IE7 */
-	/* support: IE10, see #8844 */
-	list-style-image: url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7");
-}
-.ui-menu .ui-menu-divider {
-	margin: 5px 0;
-	height: 0;
-	font-size: 0;
-	line-height: 0;
-	border-width: 1px 0 0 0;
-}
-.ui-menu .ui-state-focus,
-.ui-menu .ui-state-active {
-	margin: -1px;
-}
-
-/* icon support */
-.ui-menu-icons {
-	position: relative;
-}
-.ui-menu-icons .ui-menu-item {
-	padding-left: 2em;
-}
-
-/* left-aligned */
-.ui-menu .ui-icon {
-	position: absolute;
-	top: 0;
-	bottom: 0;
-	left: .2em;
-	margin: auto 0;
-}
-
-/* right-aligned */
-.ui-menu .ui-menu-icon {
-	left: auto;
-	right: 0;
-}
-.ui-progressbar {
-	height: 2em;
-	text-align: left;
-	overflow: hidden;
-}
-.ui-progressbar .ui-progressbar-value {
-	margin: -1px;
-	height: 100%;
-}
-.ui-progressbar .ui-progressbar-overlay {
-	background: url("data:image/gif;base64,R0lGODlhKAAoAIABAAAAAP///yH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAQABACwAAAAAKAAoAAACkYwNqXrdC52DS06a7MFZI+4FHBCKoDeWKXqymPqGqxvJrXZbMx7Ttc+w9XgU2FB3lOyQRWET2IFGiU9m1frDVpxZZc6bfHwv4c1YXP6k1Vdy292Fb6UkuvFtXpvWSzA+HycXJHUXiGYIiMg2R6W459gnWGfHNdjIqDWVqemH2ekpObkpOlppWUqZiqr6edqqWQAAIfkECQEAAQAsAAAAACgAKAAAApSMgZnGfaqcg1E2uuzDmmHUBR8Qil95hiPKqWn3aqtLsS18y7G1SzNeowWBENtQd+T1JktP05nzPTdJZlR6vUxNWWjV+vUWhWNkWFwxl9VpZRedYcflIOLafaa28XdsH/ynlcc1uPVDZxQIR0K25+cICCmoqCe5mGhZOfeYSUh5yJcJyrkZWWpaR8doJ2o4NYq62lAAACH5BAkBAAEALAAAAAAoACgAAAKVDI4Yy22ZnINRNqosw0Bv7i1gyHUkFj7oSaWlu3ovC8GxNso5fluz3qLVhBVeT/Lz7ZTHyxL5dDalQWPVOsQWtRnuwXaFTj9jVVh8pma9JjZ4zYSj5ZOyma7uuolffh+IR5aW97cHuBUXKGKXlKjn+DiHWMcYJah4N0lYCMlJOXipGRr5qdgoSTrqWSq6WFl2ypoaUAAAIfkECQEAAQAsAAAAACgAKAAAApaEb6HLgd/iO7FNWtcFWe+ufODGjRfoiJ2akShbueb0wtI50zm02pbvwfWEMWBQ1zKGlLIhskiEPm9R6vRXxV4ZzWT2yHOGpWMyorblKlNp8HmHEb/lCXjcW7bmtXP8Xt229OVWR1fod2eWqNfHuMjXCPkIGNileOiImVmCOEmoSfn3yXlJWmoHGhqp6ilYuWYpmTqKUgAAIfkECQEAAQAsAAAAACgAKAAAApiEH6kb58biQ3FNWtMFWW3eNVcojuFGfqnZqSebuS06w5V80/X02pKe8zFwP6EFWOT1lDFk8rGERh1TTNOocQ61Hm4Xm2VexUHpzjymViHrFbiELsefVrn6XKfnt2Q9G/+Xdie499XHd2g4h7ioOGhXGJboGAnXSBnoBwKYyfioubZJ2Hn0RuRZaflZOil56Zp6iioKSXpUAAAh+QQJAQABACwAAAAAKAAoAAACkoQRqRvnxuI7kU1a1UU5bd5tnSeOZXhmn5lWK3qNTWvRdQxP8qvaC+/yaYQzXO7BMvaUEmJRd3TsiMAgswmNYrSgZdYrTX6tSHGZO73ezuAw2uxuQ+BbeZfMxsexY35+/Qe4J1inV0g4x3WHuMhIl2jXOKT2Q+VU5fgoSUI52VfZyfkJGkha6jmY+aaYdirq+lQAACH5BAkBAAEALAAAAAAoACgAAAKWBIKpYe0L3YNKToqswUlvznigd4wiR4KhZrKt9Upqip61i9E3vMvxRdHlbEFiEXfk9YARYxOZZD6VQ2pUunBmtRXo1Lf8hMVVcNl8JafV38aM2/Fu5V16Bn63r6xt97j09+MXSFi4BniGFae3hzbH9+hYBzkpuUh5aZmHuanZOZgIuvbGiNeomCnaxxap2upaCZsq+1kAACH5BAkBAAEALAAAAAAoACgAAAKXjI8By5zf4kOxTVrXNVlv1X0d8IGZGKLnNpYtm8Lr9cqVeuOSvfOW79D9aDHizNhDJidFZhNydEahOaDH6nomtJjp1tutKoNWkvA6JqfRVLHU/QUfau9l2x7G54d1fl995xcIGAdXqMfBNadoYrhH+Mg2KBlpVpbluCiXmMnZ2Sh4GBqJ+ckIOqqJ6LmKSllZmsoq6wpQAAAh+QQJAQABACwAAAAAKAAoAAAClYx/oLvoxuJDkU1a1YUZbJ59nSd2ZXhWqbRa2/gF8Gu2DY3iqs7yrq+xBYEkYvFSM8aSSObE+ZgRl1BHFZNr7pRCavZ5BW2142hY3AN/zWtsmf12p9XxxFl2lpLn1rseztfXZjdIWIf2s5dItwjYKBgo9yg5pHgzJXTEeGlZuenpyPmpGQoKOWkYmSpaSnqKileI2FAAACH5BAkBAAEALAAAAAAoACgAAAKVjB+gu+jG4kORTVrVhRlsnn2dJ3ZleFaptFrb+CXmO9OozeL5VfP99HvAWhpiUdcwkpBH3825AwYdU8xTqlLGhtCosArKMpvfa1mMRae9VvWZfeB2XfPkeLmm18lUcBj+p5dnN8jXZ3YIGEhYuOUn45aoCDkp16hl5IjYJvjWKcnoGQpqyPlpOhr3aElaqrq56Bq7VAAAOw==");
-	height: 100%;
-	filter: alpha(opacity=25); /* support: IE8 */
-	opacity: 0.25;
-}
-.ui-progressbar-indeterminate .ui-progressbar-value {
-	background-image: none;
-}
-.ui-resizable {
-	position: relative;
-}
-.ui-resizable-handle {
-	position: absolute;
-	font-size: 0.1px;
-	display: block;
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-resizable-disabled .ui-resizable-handle,
-.ui-resizable-autohide .ui-resizable-handle {
-	display: none;
-}
-.ui-resizable-n {
-	cursor: n-resize;
-	height: 7px;
-	width: 100%;
-	top: -5px;
-	left: 0;
-}
-.ui-resizable-s {
-	cursor: s-resize;
-	height: 7px;
-	width: 100%;
-	bottom: -5px;
-	left: 0;
-}
-.ui-resizable-e {
-	cursor: e-resize;
-	width: 7px;
-	right: -5px;
-	top: 0;
-	height: 100%;
-}
-.ui-resizable-w {
-	cursor: w-resize;
-	width: 7px;
-	left: -5px;
-	top: 0;
-	height: 100%;
-}
-.ui-resizable-se {
-	cursor: se-resize;
-	width: 12px;
-	height: 12px;
-	right: 1px;
-	bottom: 1px;
-}
-.ui-resizable-sw {
-	cursor: sw-resize;
-	width: 9px;
-	height: 9px;
-	left: -5px;
-	bottom: -5px;
-}
-.ui-resizable-nw {
-	cursor: nw-resize;
-	width: 9px;
-	height: 9px;
-	left: -5px;
-	top: -5px;
-}
-.ui-resizable-ne {
-	cursor: ne-resize;
-	width: 9px;
-	height: 9px;
-	right: -5px;
-	top: -5px;
-}
-.ui-selectable {
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-selectable-helper {
-	position: absolute;
-	z-index: 100;
-	border: 1px dotted black;
-}
-.ui-selectmenu-menu {
-	padding: 0;
-	margin: 0;
-	position: absolute;
-	top: 0;
-	left: 0;
-	display: none;
-}
-.ui-selectmenu-menu .ui-menu {
-	overflow: auto;
-	/* Support: IE7 */
-	overflow-x: hidden;
-	padding-bottom: 1px;
-}
-.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup {
-	font-size: 1em;
-	font-weight: bold;
-	line-height: 1.5;
-	padding: 2px 0.4em;
-	margin: 0.5em 0 0 0;
-	height: auto;
-	border: 0;
-}
-.ui-selectmenu-open {
-	display: block;
-}
-.ui-selectmenu-button {
-	display: inline-block;
-	overflow: hidden;
-	position: relative;
-	text-decoration: none;
-	cursor: pointer;
-}
-.ui-selectmenu-button span.ui-icon {
-	right: 0.5em;
-	left: auto;
-	margin-top: -8px;
-	position: absolute;
-	top: 50%;
-}
-.ui-selectmenu-button span.ui-selectmenu-text {
-	text-align: left;
-	padding: 0.4em 2.1em 0.4em 1em;
-	display: block;
-	line-height: 1.4;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-}
-.ui-slider {
-	position: relative;
-	text-align: left;
-}
-.ui-slider .ui-slider-handle {
-	position: absolute;
-	z-index: 2;
-	width: 1.2em;
-	height: 1.2em;
-	cursor: default;
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-slider .ui-slider-range {
-	position: absolute;
-	z-index: 1;
-	font-size: .7em;
-	display: block;
-	border: 0;
-	background-position: 0 0;
-}
-
-/* support: IE8 - See #6727 */
-.ui-slider.ui-state-disabled .ui-slider-handle,
-.ui-slider.ui-state-disabled .ui-slider-range {
-	filter: inherit;
-}
-
-.ui-slider-horizontal {
-	height: .8em;
-}
-.ui-slider-horizontal .ui-slider-handle {
-	top: -.3em;
-	margin-left: -.6em;
-}
-.ui-slider-horizontal .ui-slider-range {
-	top: 0;
-	height: 100%;
-}
-.ui-slider-horizontal .ui-slider-range-min {
-	left: 0;
-}
-.ui-slider-horizontal .ui-slider-range-max {
-	right: 0;
-}
-
-.ui-slider-vertical {
-	width: .8em;
-	height: 100px;
-}
-.ui-slider-vertical .ui-slider-handle {
-	left: -.3em;
-	margin-left: 0;
-	margin-bottom: -.6em;
-}
-.ui-slider-vertical .ui-slider-range {
-	left: 0;
-	width: 100%;
-}
-.ui-slider-vertical .ui-slider-range-min {
-	bottom: 0;
-}
-.ui-slider-vertical .ui-slider-range-max {
-	top: 0;
-}
-.ui-sortable-handle {
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-spinner {
-	position: relative;
-	display: inline-block;
-	overflow: hidden;
-	padding: 0;
-	vertical-align: middle;
-}
-.ui-spinner-input {
-	border: none;
-	background: none;
-	color: inherit;
-	padding: 0;
-	margin: .2em 0;
-	vertical-align: middle;
-	margin-left: .4em;
-	margin-right: 22px;
-}
-.ui-spinner-button {
-	width: 16px;
-	height: 50%;
-	font-size: .5em;
-	padding: 0;
-	margin: 0;
-	text-align: center;
-	position: absolute;
-	cursor: default;
-	display: block;
-	overflow: hidden;
-	right: 0;
-}
-/* more specificity required here to override default borders */
-.ui-spinner a.ui-spinner-button {
-	border-top: none;
-	border-bottom: none;
-	border-right: none;
-}
-/* vertically center icon */
-.ui-spinner .ui-icon {
-	position: absolute;
-	margin-top: -8px;
-	top: 50%;
-	left: 0;
-}
-.ui-spinner-up {
-	top: 0;
-}
-.ui-spinner-down {
-	bottom: 0;
-}
-
-/* TR overrides */
-.ui-spinner .ui-icon-triangle-1-s {
-	/* need to fix icons sprite */
-	background-position: -65px -16px;
-}
-.ui-tabs {
-	position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
-	padding: .2em;
-}
-.ui-tabs .ui-tabs-nav {
-	margin: 0;
-	padding: .2em .2em 0;
-}
-.ui-tabs .ui-tabs-nav li {
-	list-style: none;
-	float: left;
-	position: relative;
-	top: 0;
-	margin: 1px .2em 0 0;
-	border-bottom-width: 0;
-	padding: 0;
-	white-space: nowrap;
-}
-.ui-tabs .ui-tabs-nav .ui-tabs-anchor {
-	float: left;
-	padding: .5em 1em;
-	text-decoration: none;
-}
-.ui-tabs .ui-tabs-nav li.ui-tabs-active {
-	margin-bottom: -1px;
-	padding-bottom: 1px;
-}
-.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,
-.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,
-.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor {
-	cursor: text;
-}
-.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor {
-	cursor: pointer;
-}
-.ui-tabs .ui-tabs-panel {
-	display: block;
-	border-width: 0;
-	padding: 1em 1.4em;
-	background: none;
-}
-.ui-tooltip {
-	padding: 8px;
-	position: absolute;
-	z-index: 9999;
-	max-width: 300px;
-	-webkit-box-shadow: 0 0 5px #aaa;
-	box-shadow: 0 0 5px #aaa;
-}
-body .ui-tooltip {
-	border-width: 2px;
-}
-
-/* Component containers
-----------------------------------*/
-.ui-widget {
-	font-family: Verdana,Arial,sans-serif;
-	font-size: 1.1em;
-}
-.ui-widget .ui-widget {
-	font-size: 1em;
-}
-.ui-widget input,
-.ui-widget select,
-.ui-widget textarea,
-.ui-widget button {
-	font-family: Verdana,Arial,sans-serif;
-	font-size: 1em;
-}
-.ui-widget-content {
-	border: 1px solid #aaaaaa;
-	background: #ffffff url("images/ui-bg_flat_75_ffffff_40x100.png") 50% 50% repeat-x;
-	color: #222222;
-}
-.ui-widget-content a {
-	color: #222222;
-}
-.ui-widget-header {
-	border: 1px solid #aaaaaa;
-	background: #cccccc url("images/ui-bg_highlight-soft_75_cccccc_1x100.png") 50% 50% repeat-x;
-	color: #222222;
-	font-weight: bold;
-}
-.ui-widget-header a {
-	color: #222222;
-}
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default,
-.ui-widget-content .ui-state-default,
-.ui-widget-header .ui-state-default {
-	border: 1px solid #d3d3d3;
-	background: #e6e6e6 url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x;
-	font-weight: normal;
-	color: #555555;
-}
-.ui-state-default a,
-.ui-state-default a:link,
-.ui-state-default a:visited {
-	color: #555555;
-	text-decoration: none;
-}
-.ui-state-hover,
-.ui-widget-content .ui-state-hover,
-.ui-widget-header .ui-state-hover,
-.ui-state-focus,
-.ui-widget-content .ui-state-focus,
-.ui-widget-header .ui-state-focus {
-	border: 1px solid #999999;
-	background: #dadada url("images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x;
-	font-weight: normal;
-	color: #212121;
-}
-.ui-state-hover a,
-.ui-state-hover a:hover,
-.ui-state-hover a:link,
-.ui-state-hover a:visited,
-.ui-state-focus a,
-.ui-state-focus a:hover,
-.ui-state-focus a:link,
-.ui-state-focus a:visited {
-	color: #212121;
-	text-decoration: none;
-}
-.ui-state-active,
-.ui-widget-content .ui-state-active,
-.ui-widget-header .ui-state-active {
-	border: 1px solid #aaaaaa;
-	background: #ffffff url("images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x;
-	font-weight: normal;
-	color: #212121;
-}
-.ui-state-active a,
-.ui-state-active a:link,
-.ui-state-active a:visited {
-	color: #212121;
-	text-decoration: none;
-}
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight,
-.ui-widget-content .ui-state-highlight,
-.ui-widget-header .ui-state-highlight {
-	border: 1px solid #fcefa1;
-	background: #fbf9ee url("images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x;
-	color: #363636;
-}
-.ui-state-highlight a,
-.ui-widget-content .ui-state-highlight a,
-.ui-widget-header .ui-state-highlight a {
-	color: #363636;
-}
-.ui-state-error,
-.ui-widget-content .ui-state-error,
-.ui-widget-header .ui-state-error {
-	border: 1px solid #cd0a0a;
-	background: #fef1ec url("images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x;
-	color: #cd0a0a;
-}
-.ui-state-error a,
-.ui-widget-content .ui-state-error a,
-.ui-widget-header .ui-state-error a {
-	color: #cd0a0a;
-}
-.ui-state-error-text,
-.ui-widget-content .ui-state-error-text,
-.ui-widget-header .ui-state-error-text {
-	color: #cd0a0a;
-}
-.ui-priority-primary,
-.ui-widget-content .ui-priority-primary,
-.ui-widget-header .ui-priority-primary {
-	font-weight: bold;
-}
-.ui-priority-secondary,
-.ui-widget-content .ui-priority-secondary,
-.ui-widget-header .ui-priority-secondary {
-	opacity: .7;
-	filter:Alpha(Opacity=70); /* support: IE8 */
-	font-weight: normal;
-}
-.ui-state-disabled,
-.ui-widget-content .ui-state-disabled,
-.ui-widget-header .ui-state-disabled {
-	opacity: .35;
-	filter:Alpha(Opacity=35); /* support: IE8 */
-	background-image: none;
-}
-.ui-state-disabled .ui-icon {
-	filter:Alpha(Opacity=35); /* support: IE8 - See #6059 */
-}
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon {
-	width: 16px;
-	height: 16px;
-}
-.ui-icon,
-.ui-widget-content .ui-icon {
-	background-image: url("images/ui-icons_222222_256x240.png");
-}
-.ui-widget-header .ui-icon {
-	background-image: url("images/ui-icons_222222_256x240.png");
-}
-.ui-state-default .ui-icon {
-	background-image: url("images/ui-icons_888888_256x240.png");
-}
-.ui-state-hover .ui-icon,
-.ui-state-focus .ui-icon {
-	background-image: url("images/ui-icons_454545_256x240.png");
-}
-.ui-state-active .ui-icon {
-	background-image: url("images/ui-icons_454545_256x240.png");
-}
-.ui-state-highlight .ui-icon {
-	background-image: url("images/ui-icons_2e83ff_256x240.png");
-}
-.ui-state-error .ui-icon,
-.ui-state-error-text .ui-icon {
-	background-image: url("images/ui-icons_cd0a0a_256x240.png");
-}
-
-/* positioning */
-.ui-icon-blank { background-position: 16px 16px; }
-.ui-icon-carat-1-n { background-position: 0 0; }
-.ui-icon-carat-1-ne { background-position: -16px 0; }
-.ui-icon-carat-1-e { background-position: -32px 0; }
-.ui-icon-carat-1-se { background-position: -48px 0; }
-.ui-icon-carat-1-s { background-position: -64px 0; }
-.ui-icon-carat-1-sw { background-position: -80px 0; }
-.ui-icon-carat-1-w { background-position: -96px 0; }
-.ui-icon-carat-1-nw { background-position: -112px 0; }
-.ui-icon-carat-2-n-s { background-position: -128px 0; }
-.ui-icon-carat-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -64px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -64px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-on { background-position: -96px -144px; }
-.ui-icon-radio-off { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-start { background-position: -80px -160px; }
-/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.ui-corner-all,
-.ui-corner-top,
-.ui-corner-left,
-.ui-corner-tl {
-	border-top-left-radius: 4px;
-}
-.ui-corner-all,
-.ui-corner-top,
-.ui-corner-right,
-.ui-corner-tr {
-	border-top-right-radius: 4px;
-}
-.ui-corner-all,
-.ui-corner-bottom,
-.ui-corner-left,
-.ui-corner-bl {
-	border-bottom-left-radius: 4px;
-}
-.ui-corner-all,
-.ui-corner-bottom,
-.ui-corner-right,
-.ui-corner-br {
-	border-bottom-right-radius: 4px;
-}
-
-/* Overlays */
-.ui-widget-overlay {
-	background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;
-	opacity: .3;
-	filter: Alpha(Opacity=30); /* support: IE8 */
-}
-.ui-widget-shadow {
-	margin: -8px 0 0 -8px;
-	padding: 8px;
-	background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;
-	opacity: .3;
-	filter: Alpha(Opacity=30); /* support: IE8 */
-	border-radius: 8px;
-}
diff --git a/vid/src/main/webapp/app/fusion/styles/layout/layout-default-latest.css b/vid/src/main/webapp/app/fusion/styles/layout/layout-default-latest.css
deleted file mode 100644
index aa382de3a..000000000
--- a/vid/src/main/webapp/app/fusion/styles/layout/layout-default-latest.css
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Default Layout Theme
- *
- * Created for jquery.layout 
- *
- * Copyright (c) 2010 
- *   Fabrizio Balliano (http://www.fabrizioballiano.net)
- *   Kevin Dalman (http://allpro.net)
- *
- * Dual licensed under the GPL (http://www.gnu.org/licenses/gpl.html)
- * and MIT (http://www.opensource.org/licenses/mit-license.php) licenses.
- *
- * Last Updated: 2010-02-10
- * NOTE: For best code readability, view this with a fixed-space font and tabs equal to 4-chars
- */
-
-/*
- *	DEFAULT FONT
- *	Just to make demo-pages look better - not actually relevant to Layout!
- */
-body {
-	font-family: Geneva, Arial, Helvetica, sans-serif;
-	font-size:   100%;
-	*font-size:  80%;
-}
-
-/*
- *	PANES & CONTENT-DIVs
- */
-.ui-layout-pane { /* all 'panes' */
-	background:	#FFF; 
-	border:		1px solid #BBB;
-	padding:	10px; 
-	overflow:	auto;
-	/* DO NOT add scrolling (or padding) to 'panes' that have a content-div,
-	   otherwise you may get double-scrollbars - on the pane AND on the content-div
-	   - use ui-layout-wrapper class if pane has a content-div
-	   - use ui-layout-container if pane has an inner-layout
-	*/
-	}
-	/* (scrolling) content-div inside pane allows for fixed header(s) and/or footer(s) */
-	.ui-layout-content {
-		padding:	10px;
-		position:	relative; /* contain floated or positioned elements */
-		overflow:	auto; /* add scrolling to content-div */
-	}
-
-/*
- *	UTILITY CLASSES
- *	Must come AFTER pane-class above so will override
- *	These classes are NOT auto-generated and are NOT used by Layout
- */
-.layout-child-container,
-.layout-content-container {
-	padding:	0;
-	overflow:	hidden;
-}
-.layout-child-container {
-	border:		0; /* remove border because inner-layout-panes probably have borders */
-}
-.layout-scroll {
-	overflow:	auto;
-}
-.layout-hide {
-	display:	none;
-}
-
-/*
- *	RESIZER-BARS
- */
-.ui-layout-resizer	{ /* all 'resizer-bars' */
-	background:		#DDD;
-	border:			1px solid #BBB;
-	border-width:	0;
-	}
-	.ui-layout-resizer-drag {		/* REAL resizer while resize in progress */
-	}
-	.ui-layout-resizer-hover	{	/* affects both open and closed states */
-	}
-	/* NOTE: It looks best when 'hover' and 'dragging' are set to the same color,
-		otherwise color shifts while dragging when bar can't keep up with mouse */
-	.ui-layout-resizer-open-hover ,	/* hover-color to 'resize' */
-	.ui-layout-resizer-dragging {	/* resizer beging 'dragging' */
-		background: #C4E1A4;
-	}
-	.ui-layout-resizer-dragging {	/* CLONED resizer being dragged */
-		border: 	 1px solid #BBB;
-	}
-	.ui-layout-resizer-north-dragging,
-	.ui-layout-resizer-south-dragging {
-		border-width:	1px 0;
-	}
-	.ui-layout-resizer-west-dragging,
-	.ui-layout-resizer-east-dragging {
-		border-width:	0 1px;
-	}
-	/* NOTE: Add a 'dragging-limit' color to provide visual feedback when resizer hits min/max size limits */
-	.ui-layout-resizer-dragging-limit {	/* CLONED resizer at min or max size-limit */
-		background: #E1A4A4; /* red */
-	}
-
-	.ui-layout-resizer-closed-hover	{ /* hover-color to 'slide open' */
-		background: #EBD5AA;
-	}
-	.ui-layout-resizer-sliding {	/* resizer when pane is 'slid open' */
-		opacity: .10; /* show only a slight shadow */
-		filter:  alpha(opacity=10);
-		}
-		.ui-layout-resizer-sliding-hover {	/* sliding resizer - hover */
-			opacity: 1.00; /* on-hover, show the resizer-bar normally */
-			filter:  alpha(opacity=100);
-		}
-		/* sliding resizer - add 'outside-border' to resizer on-hover 
-		 * this sample illustrates how to target specific panes and states */
-		.ui-layout-resizer-north-sliding-hover	{ border-bottom-width:	1px; }
-		.ui-layout-resizer-south-sliding-hover	{ border-top-width:		1px; }
-		.ui-layout-resizer-west-sliding-hover	{ border-right-width:	1px; }
-		.ui-layout-resizer-east-sliding-hover	{ border-left-width:	1px; }
-
-/*
- *	TOGGLER-BUTTONS
- */
-.ui-layout-toggler {
-	border: 1px solid #BBB; /* match pane-border */
-	background-color: #BBB;
-	}
-	.ui-layout-resizer-hover .ui-layout-toggler {
-		opacity: .60;
-		filter:  alpha(opacity=60);
-	}
-	.ui-layout-toggler-hover , /* need when NOT resizable */
-	.ui-layout-resizer-hover .ui-layout-toggler-hover { /* need specificity when IS resizable */
-		background-color: #FC6;
-		opacity: 1.00;
-		filter:  alpha(opacity=100);
-	}
-	.ui-layout-toggler-north ,
-	.ui-layout-toggler-south {
-		border-width: 0 1px; /* left/right borders */
-	}
-	.ui-layout-toggler-west ,
-	.ui-layout-toggler-east {
-		border-width: 1px 0; /* top/bottom borders */
-	}
-	/* hide the toggler-button when the pane is 'slid open' */
-	.ui-layout-resizer-sliding  .ui-layout-toggler {
-		display: none;
-	}
-	/*
-	 *	style the text we put INSIDE the togglers
-	 */
-	.ui-layout-toggler .content {
-		color:			#666;
-		font-size:		12px;
-		font-weight:	bold;
-		width:			100%;
-		padding-bottom:	0.35ex; /* to 'vertically center' text inside text-span */
-	}
-
-/*
- *	PANE-MASKS
- *	these styles are hard-coded on mask elems, but are also 
- *	included here as !important to ensure will overrides any generic styles
- */
-.ui-layout-mask {
-	border:		none !important;
-	padding:	0 !important;
-	margin:		0 !important;
-	overflow:	hidden !important;
-	position:	absolute !important;
-	opacity:	0 !important;
-	filter:		Alpha(Opacity="0") !important;
-}
-.ui-layout-mask-inside-pane { /* masks always inside pane EXCEPT when pane is an iframe */
-	top:		0 !important;
-	left:		0 !important;
-	width:		100% !important;
-	height:		100% !important;
-}
-div.ui-layout-mask {}		/* standard mask for iframes */
-iframe.ui-layout-mask {}	/* extra mask for objects/applets */
-
-/*
- *	Default printing styles
- */
-@media print {
-	/*
-	 *	Unless you want to print the layout as it appears onscreen,
-	 *	these html/body styles are needed to allow the content to 'flow'
-	 */
-	html {
-		height:		auto !important;
-		overflow:	visible !important;
-	}
-	body.ui-layout-container {
-		position:	static !important;
-		top:		auto !important;
-		bottom:		auto !important;
-		left:		auto !important;
-		right:		auto !important;
-		/* only IE6 has container width & height set by Layout */
-		_width:		auto !important;
-		_height:	auto !important;
-	}
-	.ui-layout-resizer, .ui-layout-toggler {
-		display:	none !important;
-	}
-	/*
-	 *	Default pane print styles disables positioning, borders and backgrounds.
-	 *	You can modify these styles however it suit your needs.
-	 */
-	.ui-layout-pane {
-		border:		none !important;
-		background:	 transparent !important;
-		position:	relative !important;
-		top:		auto !important;
-		bottom:		auto !important;
-		left:		auto !important;
-		right:		auto !important;
-		width:		auto !important;
-		height:		auto !important;
-		overflow:	visible !important;
-	}
-}
\ No newline at end of file
diff --git a/vid/src/main/webapp/app/fusion/styles/workflows/workflows.css b/vid/src/main/webapp/app/fusion/styles/workflows/workflows.css
deleted file mode 100644
index b9d0146c1..000000000
--- a/vid/src/main/webapp/app/fusion/styles/workflows/workflows.css
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-.scrolling-table{
-   width: 1200px;
-}
-.scrolling-table .scroll-viewport { 
-    height: 200px !important;
-    width: 99.5% !important;
-    background-color:white;
-}
-
-.scrolling-table .scroll-overview{
-    margin-top:-14px !important;
-}
-
-.scrolling-table .scroll-viewport:hover{
-    background-color:white;
-}
-
-.scrolling-table #att-scroll-table-content{
-    height:200px;
-    position: absolute !important;
-    width:700px;
-    padding-left: 0px;
-    padding-top: 0px;
-    padding-bottom: 0px;
-    padding-right:5px;
-}
-
-.workflow-popup-body{
-	position: relative;
-    padding: 30px;
-} 
diff --git a/vid/src/main/webapp/app/vid/drools/controller/drools-list-controller.js b/vid/src/main/webapp/app/vid/drools/controller/drools-list-controller.js
deleted file mode 100644
index 4e6243458..000000000
--- a/vid/src/main/webapp/app/vid/drools/controller/drools-list-controller.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-app.controller("droolsListController", function ($scope,$http,droolsService, modalService, $modal) { 
-	// Table Data
-	droolsService.getDrools().then(function(data){
-		
-		var j = data;
-  		$scope.tableData = JSON.parse(j.data);
-  		//$scope.resetMenu();
-	
-	},function(error){
-		console.log("failed");
-		reloadPageOnce();
-	});
-	
-	$scope.viewPerPage = 20;
-    $scope.scrollViewsPerPage = 2;
-    $scope.currentPage = 1;
-    $scope.totalPage;
-    $scope.searchCategory = "";
-    $scope.searchString = "";
- /*    modalService.showSuccess('','Modal Sample') ; */
-	for(x in $scope.tableData){
-		if($scope.tableData[x].active_yn=='Y')
-			$scope.tableData[x].active_yn=true;
-		else
-			$scope.tableData[x].active_yn=false;
-	}
-    $scope.openDialog = function(droolFile){
-    	droolsService.setSelectedFile(droolFile);
-    	$modal.open({
-            templateUrl: 'app/fusionapp/drools/view-models/droolsView.html',
-            controller: 'droolsViewController'
-          
-        })
-    }
-   
-
-   
-});
-
-function openInNewTab(url) {
-	  var win = window.open(url, '_blank');
-	  win.focus();
-};
diff --git a/vid/src/main/webapp/app/vid/drools/controller/drools-view-controller.js b/vid/src/main/webapp/app/vid/drools/controller/drools-view-controller.js
deleted file mode 100644
index c475e175b..000000000
--- a/vid/src/main/webapp/app/vid/drools/controller/drools-view-controller.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-app.controller('droolsViewController', function ($scope,modalService,droolsService){ 
-
-
-		$scope.resultsString = "";
-		// Table Data
-	    droolsService.getDroolDetails(droolsService.getSelectedFile()).then(function(data){
-			
-			var j = data;
-			$scope.postDroolsBean = JSON.parse(j.data);
-			//execute($scope.postDroolsBean);
-		
-		},function(error){
-			console.log("failed");
-			//reloadPageOnce();
-		});
-		
-	
-		
-		$scope.execute = function(postDroolsBean) {
-				console.log(postDroolsBean);
-				var uuu = "post_drools/execute";
-				  var postData={postDroolsBean:postDroolsBean};
-			  	  $.ajax({
-			  		 type : 'POST',
-			  		 url : uuu,
-			  		 dataType: 'json',
-			  		 contentType: 'application/json',
-			  		 data: JSON.stringify(postData),
-			  		 success : function(data){
-			  			$scope.$apply(function(){
-			  				$scope.resultsString=data.resultsString;
-			  				console.log($scope.resultsString);
-			  				});  
-					 },
-					 error : function(data){
-						 console.log(data);
-						 modalService.showFailure("Fail","Error while executing: "+ data.responseText);
-					 }
-			  	  });
-			
-		};
-		
-		
-		
-	});	
diff --git a/vid/src/main/webapp/app/vid/drools/controller/droolsController.js b/vid/src/main/webapp/app/vid/drools/controller/droolsController.js
deleted file mode 100644
index f9c0e234f..000000000
--- a/vid/src/main/webapp/app/vid/drools/controller/droolsController.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-app.config(function($routeProvider) {
-	$routeProvider
-	.when('/view', {
-		templateUrl: 'app/fusionapp/drools/view-models/droolsView.html',
-		controller : "droolsViewController"
-	})
-	.otherwise({
-		templateUrl: 'app/fusionapp/drools/view-models/droolsList.html',
-		controller : "droolsListController"
-	});
-});
diff --git a/vid/src/main/webapp/app/vid/drools/controller/dummy.txt b/vid/src/main/webapp/app/vid/drools/controller/dummy.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/vid/src/main/webapp/app/vid/drools/directives/dummy.txt b/vid/src/main/webapp/app/vid/drools/directives/dummy.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/vid/src/main/webapp/app/vid/drools/services/droolsService.js b/vid/src/main/webapp/app/vid/drools/services/droolsService.js
deleted file mode 100644
index d1dbfa6c3..000000000
--- a/vid/src/main/webapp/app/vid/drools/services/droolsService.js
+++ /dev/null
@@ -1,76 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-app.factory('droolsService', function ($http, $q) {
-	return {
-		getDrools: function() {
-			return $http.get('getDrools')
-			.then(function(response) {
-				if (typeof response.data === 'object') {
-					return response.data;
-				} else {
-					return $q.reject(response.data);
-				}
-
-			}, function(response) {
-				// something went wrong
-				return $q.reject(response.data);
-			});
-		},
-		
-		getDroolDetails: function(selectedFile) {
-			return $http.get('getDroolDetails'+'?selectedFile=' + selectedFile )
-			.then(function(response) {
-				if (typeof response.data === 'object') {
-					return response.data;
-				} else {
-					return $q.reject(response.data);
-				}
-
-			}, function(response) {
-				// something went wrong
-				return $q.reject(response.data);
-			});
-		},
-		
-		getRole: function(roleId) {
-			
-			return $http.get('get_role?role_id=' + roleId)
-			.then(function(response) {
-				if (typeof response.data === 'object') {
-					return response.data;
-				} else {
-					return $q.reject(response.data);
-				}
-	
-			}, function(response) {
-				// something went wrong
-				return $q.reject(response.data);
-			});
-		},
-		
-		getSelectedFile: function() {
-			return this.selectedFile;
-		},
-		
-		setSelectedFile: function(_selectedFile) {
-			this.selectedFile = _selectedFile;
-		}
-	};
-});
diff --git a/vid/src/main/webapp/app/vid/drools/utils/dummy.txt b/vid/src/main/webapp/app/vid/drools/utils/dummy.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/vid/src/main/webapp/app/vid/drools/view-models/droolsList.html b/vid/src/main/webapp/app/vid/drools/view-models/droolsList.html
deleted file mode 100644
index ca06b3c3e..000000000
--- a/vid/src/main/webapp/app/vid/drools/view-models/droolsList.html
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
      
-	
      
-		
      Drools List
      
-		
      
-			
-
-			    
-					
-						
-			                 
-			               
-       
-			        
-			    
-			    
-			        
-		            	
-		            	
-
-		        		
-			             
-			    	  
-			
      Drools File NameClass NameRun Rule
      {{rowData.droolsFile}}{{rowData.className}}
-		        			
      
-					    
      
-		
      
-	
      	
-	
diff --git a/vid/src/main/webapp/app/vid/drools/view-models/droolsSinglePage.html b/vid/src/main/webapp/app/vid/drools/view-models/droolsSinglePage.html
deleted file mode 100644
index 1d4f1bfd2..000000000
--- a/vid/src/main/webapp/app/vid/drools/view-models/droolsSinglePage.html
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
-	
-		
-		
-	    
-	    
-	    
-	    
-	
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-	
-		
-	
-		 
-		 
-		
-	 	 
-		
-		
-		
-		
-		
-		
-		
-		
-	
-		
-		
-	
-		
-		
-	
-		
-	
-		
-		
-		
-		
-		
-	
-		
-		
-		
-		
-		
-		
-		
-		
-	
-		
-												
-	
-	
-		
      
-		
      
-		
      
-		
      
-		
      		
-		
      
-	
-
diff --git a/vid/src/main/webapp/app/vid/drools/view-models/droolsView.html b/vid/src/main/webapp/app/vid/drools/view-models/droolsView.html
deleted file mode 100644
index dbe9121aa..000000000
--- a/vid/src/main/webapp/app/vid/drools/view-models/droolsView.html
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
      
-
-
      Drools Rule Engine
      
-      
      
-  		Please enter below details:
      
-
-            
      
-	          Drools File:
      
-	          
-            
      
-            
-            
      
-	          Class Name:
      
-	          
-            
      
-          
-            
      
-	          Selected Rules:
      
-	          
-            
      
-         
-            
-		
      
-		 	
-		
      
-		
      
-		{{resultsString}}
-      	
      
-      	
      
-      	
      
-      	
      
-      	
      
-      	
      
-      	
      
-      	
      
-      	
      
-      	
-      
-      
-      
-
      
-
diff --git a/vid/src/main/webapp/app/vid/drools/view-models/dummy.txt b/vid/src/main/webapp/app/vid/drools/view-models/dummy.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/vid/src/main/webapp/app/vid/external/bootstrap/css/bootstrap-theme.css b/vid/src/main/webapp/app/vid/external/bootstrap/css/bootstrap-theme.css
deleted file mode 100644
index 6b58b389b..000000000
--- a/vid/src/main/webapp/app/vid/external/bootstrap/css/bootstrap-theme.css
+++ /dev/null
@@ -1,596 +0,0 @@
-/*!
- * Bootstrap v3.3.7 (http://getbootstrap.com)
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */
-
-/*!
- * Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=a8e01e20fdf5ffe2a0df475294b45f64)
- * Config saved to config.json and https://gist.github.com/a8e01e20fdf5ffe2a0df475294b45f64
- */
-/*!
- * Bootstrap v3.3.7 (http://getbootstrap.com)
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */
-.btn-default,
-.btn-primary,
-.btn-success,
-.btn-info,
-.btn-warning,
-.btn-danger {
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075);
-  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-.btn-default:active,
-.btn-primary:active,
-.btn-success:active,
-.btn-info:active,
-.btn-warning:active,
-.btn-danger:active,
-.btn-default.active,
-.btn-primary.active,
-.btn-success.active,
-.btn-info.active,
-.btn-warning.active,
-.btn-danger.active {
-  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
-  box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
-}
-.btn-default.disabled,
-.btn-primary.disabled,
-.btn-success.disabled,
-.btn-info.disabled,
-.btn-warning.disabled,
-.btn-danger.disabled,
-.btn-default[disabled],
-.btn-primary[disabled],
-.btn-success[disabled],
-.btn-info[disabled],
-.btn-warning[disabled],
-.btn-danger[disabled],
-fieldset[disabled] .btn-default,
-fieldset[disabled] .btn-primary,
-fieldset[disabled] .btn-success,
-fieldset[disabled] .btn-info,
-fieldset[disabled] .btn-warning,
-fieldset[disabled] .btn-danger {
-  -webkit-box-shadow: none;
-  box-shadow: none;
-}
-.btn-default .badge,
-.btn-primary .badge,
-.btn-success .badge,
-.btn-info .badge,
-.btn-warning .badge,
-.btn-danger .badge {
-  text-shadow: none;
-}
-.btn:active,
-.btn.active {
-  background-image: none;
-}
-.btn-default {
-  background-image: -webkit-linear-gradient(top, #ffffff 0%, #e0e0e0 100%);
-  background-image: -o-linear-gradient(top, #ffffff 0%, #e0e0e0 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#e0e0e0));
-  background-image: linear-gradient(to bottom, #ffffff 0%, #e0e0e0 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #dbdbdb;
-  text-shadow: 0 1px 0 #fff;
-  border-color: #ccc;
-}
-.btn-default:hover,
-.btn-default:focus {
-  background-color: #e0e0e0;
-  background-position: 0 -15px;
-}
-.btn-default:active,
-.btn-default.active {
-  background-color: #e0e0e0;
-  border-color: #dbdbdb;
-}
-.btn-default.disabled,
-.btn-default[disabled],
-fieldset[disabled] .btn-default,
-.btn-default.disabled:hover,
-.btn-default[disabled]:hover,
-fieldset[disabled] .btn-default:hover,
-.btn-default.disabled:focus,
-.btn-default[disabled]:focus,
-fieldset[disabled] .btn-default:focus,
-.btn-default.disabled.focus,
-.btn-default[disabled].focus,
-fieldset[disabled] .btn-default.focus,
-.btn-default.disabled:active,
-.btn-default[disabled]:active,
-fieldset[disabled] .btn-default:active,
-.btn-default.disabled.active,
-.btn-default[disabled].active,
-fieldset[disabled] .btn-default.active {
-  background-color: #e0e0e0;
-  background-image: none;
-}
-.btn-primary {
-  background-image: -webkit-linear-gradient(top, #337ab7 0%, #265a88 100%);
-  background-image: -o-linear-gradient(top, #337ab7 0%, #265a88 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#265a88));
-  background-image: linear-gradient(to bottom, #337ab7 0%, #265a88 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff265a88', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #245580;
-}
-.btn-primary:hover,
-.btn-primary:focus {
-  background-color: #265a88;
-  background-position: 0 -15px;
-}
-.btn-primary:active,
-.btn-primary.active {
-  background-color: #265a88;
-  border-color: #245580;
-}
-.btn-primary.disabled,
-.btn-primary[disabled],
-fieldset[disabled] .btn-primary,
-.btn-primary.disabled:hover,
-.btn-primary[disabled]:hover,
-fieldset[disabled] .btn-primary:hover,
-.btn-primary.disabled:focus,
-.btn-primary[disabled]:focus,
-fieldset[disabled] .btn-primary:focus,
-.btn-primary.disabled.focus,
-.btn-primary[disabled].focus,
-fieldset[disabled] .btn-primary.focus,
-.btn-primary.disabled:active,
-.btn-primary[disabled]:active,
-fieldset[disabled] .btn-primary:active,
-.btn-primary.disabled.active,
-.btn-primary[disabled].active,
-fieldset[disabled] .btn-primary.active {
-  background-color: #265a88;
-  background-image: none;
-}
-.btn-success {
-  background-image: -webkit-linear-gradient(top, #5cb85c 0%, #419641 100%);
-  background-image: -o-linear-gradient(top, #5cb85c 0%, #419641 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#5cb85c), to(#419641));
-  background-image: linear-gradient(to bottom, #5cb85c 0%, #419641 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #3e8f3e;
-}
-.btn-success:hover,
-.btn-success:focus {
-  background-color: #419641;
-  background-position: 0 -15px;
-}
-.btn-success:active,
-.btn-success.active {
-  background-color: #419641;
-  border-color: #3e8f3e;
-}
-.btn-success.disabled,
-.btn-success[disabled],
-fieldset[disabled] .btn-success,
-.btn-success.disabled:hover,
-.btn-success[disabled]:hover,
-fieldset[disabled] .btn-success:hover,
-.btn-success.disabled:focus,
-.btn-success[disabled]:focus,
-fieldset[disabled] .btn-success:focus,
-.btn-success.disabled.focus,
-.btn-success[disabled].focus,
-fieldset[disabled] .btn-success.focus,
-.btn-success.disabled:active,
-.btn-success[disabled]:active,
-fieldset[disabled] .btn-success:active,
-.btn-success.disabled.active,
-.btn-success[disabled].active,
-fieldset[disabled] .btn-success.active {
-  background-color: #419641;
-  background-image: none;
-}
-.btn-info {
-  background-image: -webkit-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
-  background-image: -o-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#5bc0de), to(#2aabd2));
-  background-image: linear-gradient(to bottom, #5bc0de 0%, #2aabd2 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #28a4c9;
-}
-.btn-info:hover,
-.btn-info:focus {
-  background-color: #2aabd2;
-  background-position: 0 -15px;
-}
-.btn-info:active,
-.btn-info.active {
-  background-color: #2aabd2;
-  border-color: #28a4c9;
-}
-.btn-info.disabled,
-.btn-info[disabled],
-fieldset[disabled] .btn-info,
-.btn-info.disabled:hover,
-.btn-info[disabled]:hover,
-fieldset[disabled] .btn-info:hover,
-.btn-info.disabled:focus,
-.btn-info[disabled]:focus,
-fieldset[disabled] .btn-info:focus,
-.btn-info.disabled.focus,
-.btn-info[disabled].focus,
-fieldset[disabled] .btn-info.focus,
-.btn-info.disabled:active,
-.btn-info[disabled]:active,
-fieldset[disabled] .btn-info:active,
-.btn-info.disabled.active,
-.btn-info[disabled].active,
-fieldset[disabled] .btn-info.active {
-  background-color: #2aabd2;
-  background-image: none;
-}
-.btn-warning {
-  background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
-  background-image: -o-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#f0ad4e), to(#eb9316));
-  background-image: linear-gradient(to bottom, #f0ad4e 0%, #eb9316 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #e38d13;
-}
-.btn-warning:hover,
-.btn-warning:focus {
-  background-color: #eb9316;
-  background-position: 0 -15px;
-}
-.btn-warning:active,
-.btn-warning.active {
-  background-color: #eb9316;
-  border-color: #e38d13;
-}
-.btn-warning.disabled,
-.btn-warning[disabled],
-fieldset[disabled] .btn-warning,
-.btn-warning.disabled:hover,
-.btn-warning[disabled]:hover,
-fieldset[disabled] .btn-warning:hover,
-.btn-warning.disabled:focus,
-.btn-warning[disabled]:focus,
-fieldset[disabled] .btn-warning:focus,
-.btn-warning.disabled.focus,
-.btn-warning[disabled].focus,
-fieldset[disabled] .btn-warning.focus,
-.btn-warning.disabled:active,
-.btn-warning[disabled]:active,
-fieldset[disabled] .btn-warning:active,
-.btn-warning.disabled.active,
-.btn-warning[disabled].active,
-fieldset[disabled] .btn-warning.active {
-  background-color: #eb9316;
-  background-image: none;
-}
-.btn-danger {
-  background-image: -webkit-linear-gradient(top, #d9534f 0%, #c12e2a 100%);
-  background-image: -o-linear-gradient(top, #d9534f 0%, #c12e2a 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#d9534f), to(#c12e2a));
-  background-image: linear-gradient(to bottom, #d9534f 0%, #c12e2a 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #b92c28;
-}
-.btn-danger:hover,
-.btn-danger:focus {
-  background-color: #c12e2a;
-  background-position: 0 -15px;
-}
-.btn-danger:active,
-.btn-danger.active {
-  background-color: #c12e2a;
-  border-color: #b92c28;
-}
-.btn-danger.disabled,
-.btn-danger[disabled],
-fieldset[disabled] .btn-danger,
-.btn-danger.disabled:hover,
-.btn-danger[disabled]:hover,
-fieldset[disabled] .btn-danger:hover,
-.btn-danger.disabled:focus,
-.btn-danger[disabled]:focus,
-fieldset[disabled] .btn-danger:focus,
-.btn-danger.disabled.focus,
-.btn-danger[disabled].focus,
-fieldset[disabled] .btn-danger.focus,
-.btn-danger.disabled:active,
-.btn-danger[disabled]:active,
-fieldset[disabled] .btn-danger:active,
-.btn-danger.disabled.active,
-.btn-danger[disabled].active,
-fieldset[disabled] .btn-danger.active {
-  background-color: #c12e2a;
-  background-image: none;
-}
-.thumbnail,
-.img-thumbnail {
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
-  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
-}
-.dropdown-menu > li > a:hover,
-.dropdown-menu > li > a:focus {
-  background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
-  background-image: -o-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#f5f5f5), to(#e8e8e8));
-  background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
-  background-color: #e8e8e8;
-}
-.dropdown-menu > .active > a,
-.dropdown-menu > .active > a:hover,
-.dropdown-menu > .active > a:focus {
-  background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
-  background-image: -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2e6da4));
-  background-image: linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
-  background-color: #2e6da4;
-}
-.navbar-default {
-  background-image: -webkit-linear-gradient(top, #ffffff 0%, #f8f8f8 100%);
-  background-image: -o-linear-gradient(top, #ffffff 0%, #f8f8f8 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#f8f8f8));
-  background-image: linear-gradient(to bottom, #ffffff 0%, #f8f8f8 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 5px rgba(0, 0, 0, 0.075);
-  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 5px rgba(0, 0, 0, 0.075);
-}
-.navbar-default .navbar-nav > .open > a,
-.navbar-default .navbar-nav > .active > a {
-  background-image: -webkit-linear-gradient(top, #dbdbdb 0%, #e2e2e2 100%);
-  background-image: -o-linear-gradient(top, #dbdbdb 0%, #e2e2e2 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#dbdbdb), to(#e2e2e2));
-  background-image: linear-gradient(to bottom, #dbdbdb 0%, #e2e2e2 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdbdbdb', endColorstr='#ffe2e2e2', GradientType=0);
-  -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, 0.075);
-  box-shadow: inset 0 3px 9px rgba(0, 0, 0, 0.075);
-}
-.navbar-brand,
-.navbar-nav > li > a {
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
-}
-.navbar-inverse {
-  background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #222222 100%);
-  background-image: -o-linear-gradient(top, #3c3c3c 0%, #222222 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#3c3c3c), to(#222222));
-  background-image: linear-gradient(to bottom, #3c3c3c 0%, #222222 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  border-radius: 4px;
-}
-.navbar-inverse .navbar-nav > .open > a,
-.navbar-inverse .navbar-nav > .active > a {
-  background-image: -webkit-linear-gradient(top, #080808 0%, #0f0f0f 100%);
-  background-image: -o-linear-gradient(top, #080808 0%, #0f0f0f 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#080808), to(#0f0f0f));
-  background-image: linear-gradient(to bottom, #080808 0%, #0f0f0f 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff080808', endColorstr='#ff0f0f0f', GradientType=0);
-  -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, 0.25);
-  box-shadow: inset 0 3px 9px rgba(0, 0, 0, 0.25);
-}
-.navbar-inverse .navbar-brand,
-.navbar-inverse .navbar-nav > li > a {
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-}
-.navbar-static-top,
-.navbar-fixed-top,
-.navbar-fixed-bottom {
-  border-radius: 0;
-}
-@media (max-width: 767px) {
-  .navbar .navbar-nav .open .dropdown-menu > .active > a,
-  .navbar .navbar-nav .open .dropdown-menu > .active > a:hover,
-  .navbar .navbar-nav .open .dropdown-menu > .active > a:focus {
-    color: #fff;
-    background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
-    background-image: -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
-    background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2e6da4));
-    background-image: linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
-    background-repeat: repeat-x;
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
-  }
-}
-.alert {
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.2);
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
-  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-.alert-success {
-  background-image: -webkit-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
-  background-image: -o-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#dff0d8), to(#c8e5bc));
-  background-image: linear-gradient(to bottom, #dff0d8 0%, #c8e5bc 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);
-  border-color: #b2dba1;
-}
-.alert-info {
-  background-image: -webkit-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
-  background-image: -o-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#d9edf7), to(#b9def0));
-  background-image: linear-gradient(to bottom, #d9edf7 0%, #b9def0 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);
-  border-color: #9acfea;
-}
-.alert-warning {
-  background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
-  background-image: -o-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#fcf8e3), to(#f8efc0));
-  background-image: linear-gradient(to bottom, #fcf8e3 0%, #f8efc0 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);
-  border-color: #f5e79e;
-}
-.alert-danger {
-  background-image: -webkit-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
-  background-image: -o-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#f2dede), to(#e7c3c3));
-  background-image: linear-gradient(to bottom, #f2dede 0%, #e7c3c3 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);
-  border-color: #dca7a7;
-}
-.progress {
-  background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
-  background-image: -o-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#ebebeb), to(#f5f5f5));
-  background-image: linear-gradient(to bottom, #ebebeb 0%, #f5f5f5 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);
-}
-.progress-bar {
-  background-image: -webkit-linear-gradient(top, #337ab7 0%, #286090 100%);
-  background-image: -o-linear-gradient(top, #337ab7 0%, #286090 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#286090));
-  background-image: linear-gradient(to bottom, #337ab7 0%, #286090 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff286090', GradientType=0);
-}
-.progress-bar-success {
-  background-image: -webkit-linear-gradient(top, #5cb85c 0%, #449d44 100%);
-  background-image: -o-linear-gradient(top, #5cb85c 0%, #449d44 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#5cb85c), to(#449d44));
-  background-image: linear-gradient(to bottom, #5cb85c 0%, #449d44 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);
-}
-.progress-bar-info {
-  background-image: -webkit-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
-  background-image: -o-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#5bc0de), to(#31b0d5));
-  background-image: linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
-}
-.progress-bar-warning {
-  background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
-  background-image: -o-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#f0ad4e), to(#ec971f));
-  background-image: linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);
-}
-.progress-bar-danger {
-  background-image: -webkit-linear-gradient(top, #d9534f 0%, #c9302c 100%);
-  background-image: -o-linear-gradient(top, #d9534f 0%, #c9302c 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#d9534f), to(#c9302c));
-  background-image: linear-gradient(to bottom, #d9534f 0%, #c9302c 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);
-}
-.progress-bar-striped {
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-.list-group {
-  border-radius: 4px;
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
-  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
-}
-.list-group-item.active,
-.list-group-item.active:hover,
-.list-group-item.active:focus {
-  text-shadow: 0 -1px 0 #286090;
-  background-image: -webkit-linear-gradient(top, #337ab7 0%, #2b669a 100%);
-  background-image: -o-linear-gradient(top, #337ab7 0%, #2b669a 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2b669a));
-  background-image: linear-gradient(to bottom, #337ab7 0%, #2b669a 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2b669a', GradientType=0);
-  border-color: #2b669a;
-}
-.list-group-item.active .badge,
-.list-group-item.active:hover .badge,
-.list-group-item.active:focus .badge {
-  text-shadow: none;
-}
-.panel {
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-.panel-default > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
-  background-image: -o-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#f5f5f5), to(#e8e8e8));
-  background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
-}
-.panel-primary > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
-  background-image: -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2e6da4));
-  background-image: linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
-}
-.panel-success > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
-  background-image: -o-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#dff0d8), to(#d0e9c6));
-  background-image: linear-gradient(to bottom, #dff0d8 0%, #d0e9c6 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);
-}
-.panel-info > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
-  background-image: -o-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#d9edf7), to(#c4e3f3));
-  background-image: linear-gradient(to bottom, #d9edf7 0%, #c4e3f3 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);
-}
-.panel-warning > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
-  background-image: -o-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#fcf8e3), to(#faf2cc));
-  background-image: linear-gradient(to bottom, #fcf8e3 0%, #faf2cc 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);
-}
-.panel-danger > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
-  background-image: -o-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#f2dede), to(#ebcccc));
-  background-image: linear-gradient(to bottom, #f2dede 0%, #ebcccc 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);
-}
-.well {
-  background-image: -webkit-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
-  background-image: -o-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#f5f5f5));
-  background-image: linear-gradient(to bottom, #e8e8e8 0%, #f5f5f5 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);
-  border-color: #dcdcdc;
-  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(255, 255, 255, 0.1);
-  box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(255, 255, 255, 0.1);
-}
diff --git a/vid/src/main/webapp/app/vid/external/bootstrap/css/bootstrap-theme.min.css b/vid/src/main/webapp/app/vid/external/bootstrap/css/bootstrap-theme.min.css
deleted file mode 100644
index 4d5937742..000000000
--- a/vid/src/main/webapp/app/vid/external/bootstrap/css/bootstrap-theme.min.css
+++ /dev/null
@@ -1,14 +0,0 @@
-/*!
- * Bootstrap v3.3.7 (http://getbootstrap.com)
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */
-
-/*!
- * Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=a8e01e20fdf5ffe2a0df475294b45f64)
- * Config saved to config.json and https://gist.github.com/a8e01e20fdf5ffe2a0df475294b45f64
- *//*!
- * Bootstrap v3.3.7 (http://getbootstrap.com)
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */.btn-default,.btn-primary,.btn-success,.btn-info,.btn-warning,.btn-danger{text-shadow:0 -1px 0 rgba(0,0,0,0.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075)}.btn-default:active,.btn-primary:active,.btn-success:active,.btn-info:active,.btn-warning:active,.btn-danger:active,.btn-default.active,.btn-primary.active,.btn-success.active,.btn-info.active,.btn-warning.active,.btn-danger.active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn-default.disabled,.btn-primary.disabled,.btn-success.disabled,.btn-info.disabled,.btn-warning.disabled,.btn-danger.disabled,.btn-default[disabled],.btn-primary[disabled],.btn-success[disabled],.btn-info[disabled],.btn-warning[disabled],.btn-danger[disabled],fieldset[disabled] .btn-default,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-success,fieldset[disabled] .btn-info,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-danger{-webkit-box-shadow:none;box-shadow:none}.btn-default .badge,.btn-primary .badge,.btn-success .badge,.btn-info .badge,.btn-warning .badge,.btn-danger .badge{text-shadow:none}.btn:active,.btn.active{background-image:none}.btn-default{background-image:-webkit-linear-gradient(top, #fff 0, #e0e0e0 100%);background-image:-o-linear-gradient(top, #fff 0, #e0e0e0 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #fff), to(#e0e0e0));background-image:linear-gradient(to bottom, #fff 0, #e0e0e0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#dbdbdb;text-shadow:0 1px 0 #fff;border-color:#ccc}.btn-default:hover,.btn-default:focus{background-color:#e0e0e0;background-position:0 -15px}.btn-default:active,.btn-default.active{background-color:#e0e0e0;border-color:#dbdbdb}.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled.focus,.btn-default[disabled].focus,fieldset[disabled] .btn-default.focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.disabled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active{background-color:#e0e0e0;background-image:none}.btn-primary{background-image:-webkit-linear-gradient(top, #337ab7 0, #265a88 100%);background-image:-o-linear-gradient(top, #337ab7 0, #265a88 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #337ab7), to(#265a88));background-image:linear-gradient(to bottom, #337ab7 0, #265a88 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff265a88', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#245580}.btn-primary:hover,.btn-primary:focus{background-color:#265a88;background-position:0 -15px}.btn-primary:active,.btn-primary.active{background-color:#265a88;border-color:#245580}.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled.focus,.btn-primary[disabled].focus,fieldset[disabled] .btn-primary.focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#265a88;background-image:none}.btn-success{background-image:-webkit-linear-gradient(top, #5cb85c 0, #419641 100%);background-image:-o-linear-gradient(top, #5cb85c 0, #419641 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #5cb85c), to(#419641));background-image:linear-gradient(to bottom, #5cb85c 0, #419641 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#3e8f3e}.btn-success:hover,.btn-success:focus{background-color:#419641;background-position:0 -15px}.btn-success:active,.btn-success.active{background-color:#419641;border-color:#3e8f3e}.btn-success.disabled,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled.focus,.btn-success[disabled].focus,fieldset[disabled] .btn-success.focus,.btn-success.disabled:active,.btn-success[disabled]:active,fieldset[disabled] .btn-success:active,.btn-success.disabled.active,.btn-success[disabled].active,fieldset[disabled] .btn-success.active{background-color:#419641;background-image:none}.btn-info{background-image:-webkit-linear-gradient(top, #5bc0de 0, #2aabd2 100%);background-image:-o-linear-gradient(top, #5bc0de 0, #2aabd2 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #5bc0de), to(#2aabd2));background-image:linear-gradient(to bottom, #5bc0de 0, #2aabd2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#28a4c9}.btn-info:hover,.btn-info:focus{background-color:#2aabd2;background-position:0 -15px}.btn-info:active,.btn-info.active{background-color:#2aabd2;border-color:#28a4c9}.btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disabled]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled.focus,.btn-info[disabled].focus,fieldset[disabled] .btn-info.focus,.btn-info.disabled:active,.btn-info[disabled]:active,fieldset[disabled] .btn-info:active,.btn-info.disabled.active,.btn-info[disabled].active,fieldset[disabled] .btn-info.active{background-color:#2aabd2;background-image:none}.btn-warning{background-image:-webkit-linear-gradient(top, #f0ad4e 0, #eb9316 100%);background-image:-o-linear-gradient(top, #f0ad4e 0, #eb9316 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #f0ad4e), to(#eb9316));background-image:linear-gradient(to bottom, #f0ad4e 0, #eb9316 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#e38d13}.btn-warning:hover,.btn-warning:focus{background-color:#eb9316;background-position:0 -15px}.btn-warning:active,.btn-warning.active{background-color:#eb9316;border-color:#e38d13}.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled.focus,.btn-warning[disabled].focus,fieldset[disabled] .btn-warning.focus,.btn-warning.disabled:active,.btn-warning[disabled]:active,fieldset[disabled] .btn-warning:active,.btn-warning.disabled.active,.btn-warning[disabled].active,fieldset[disabled] .btn-warning.active{background-color:#eb9316;background-image:none}.btn-danger{background-image:-webkit-linear-gradient(top, #d9534f 0, #c12e2a 100%);background-image:-o-linear-gradient(top, #d9534f 0, #c12e2a 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #d9534f), to(#c12e2a));background-image:linear-gradient(to bottom, #d9534f 0, #c12e2a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#b92c28}.btn-danger:hover,.btn-danger:focus{background-color:#c12e2a;background-position:0 -15px}.btn-danger:active,.btn-danger.active{background-color:#c12e2a;border-color:#b92c28}.btn-danger.disabled,.btn-danger[disabled],fieldset[disabled] .btn-danger,.btn-danger.disabled:hover,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger:hover,.btn-danger.disabled:focus,.btn-danger[disabled]:focus,fieldset[disabled] .btn-danger:focus,.btn-danger.disabled.focus,.btn-danger[disabled].focus,fieldset[disabled] .btn-danger.focus,.btn-danger.disabled:active,.btn-danger[disabled]:active,fieldset[disabled] .btn-danger:active,.btn-danger.disabled.active,.btn-danger[disabled].active,fieldset[disabled] .btn-danger.active{background-color:#c12e2a;background-image:none}.thumbnail,.img-thumbnail{-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.075);box-shadow:0 1px 2px rgba(0,0,0,0.075)}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{background-image:-webkit-linear-gradient(top, #f5f5f5 0, #e8e8e8 100%);background-image:-o-linear-gradient(top, #f5f5f5 0, #e8e8e8 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #f5f5f5), to(#e8e8e8));background-image:linear-gradient(to bottom, #f5f5f5 0, #e8e8e8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);background-color:#e8e8e8}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{background-image:-webkit-linear-gradient(top, #337ab7 0, #2e6da4 100%);background-image:-o-linear-gradient(top, #337ab7 0, #2e6da4 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #337ab7), to(#2e6da4));background-image:linear-gradient(to bottom, #337ab7 0, #2e6da4 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);background-color:#2e6da4}.navbar-default{background-image:-webkit-linear-gradient(top, #fff 0, #f8f8f8 100%);background-image:-o-linear-gradient(top, #fff 0, #f8f8f8 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #fff), to(#f8f8f8));background-image:linear-gradient(to bottom, #fff 0, #f8f8f8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 5px rgba(0,0,0,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 5px rgba(0,0,0,0.075)}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.active>a{background-image:-webkit-linear-gradient(top, #dbdbdb 0, #e2e2e2 100%);background-image:-o-linear-gradient(top, #dbdbdb 0, #e2e2e2 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #dbdbdb), to(#e2e2e2));background-image:linear-gradient(to bottom, #dbdbdb 0, #e2e2e2 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdbdbdb', endColorstr='#ffe2e2e2', GradientType=0);-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,0.075);box-shadow:inset 0 3px 9px rgba(0,0,0,0.075)}.navbar-brand,.navbar-nav>li>a{text-shadow:0 1px 0 rgba(255,255,255,0.25)}.navbar-inverse{background-image:-webkit-linear-gradient(top, #3c3c3c 0, #222 100%);background-image:-o-linear-gradient(top, #3c3c3c 0, #222 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #3c3c3c), to(#222));background-image:linear-gradient(to bottom, #3c3c3c 0, #222 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border-radius:4px}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.active>a{background-image:-webkit-linear-gradient(top, #080808 0, #0f0f0f 100%);background-image:-o-linear-gradient(top, #080808 0, #0f0f0f 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #080808), to(#0f0f0f));background-image:linear-gradient(to bottom, #080808 0, #0f0f0f 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff080808', endColorstr='#ff0f0f0f', GradientType=0);-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,0.25);box-shadow:inset 0 3px 9px rgba(0,0,0,0.25)}.navbar-inverse .navbar-brand,.navbar-inverse .navbar-nav>li>a{text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.navbar-static-top,.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}@media (max-width:767px){.navbar .navbar-nav .open .dropdown-menu>.active>a,.navbar .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar .navbar-nav .open .dropdown-menu>.active>a:focus{color:#fff;background-image:-webkit-linear-gradient(top, #337ab7 0, #2e6da4 100%);background-image:-o-linear-gradient(top, #337ab7 0, #2e6da4 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #337ab7), to(#2e6da4));background-image:linear-gradient(to bottom, #337ab7 0, #2e6da4 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0)}}.alert{text-shadow:0 1px 0 rgba(255,255,255,0.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.25),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.25),0 1px 2px rgba(0,0,0,0.05)}.alert-success{background-image:-webkit-linear-gradient(top, #dff0d8 0, #c8e5bc 100%);background-image:-o-linear-gradient(top, #dff0d8 0, #c8e5bc 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #dff0d8), to(#c8e5bc));background-image:linear-gradient(to bottom, #dff0d8 0, #c8e5bc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);border-color:#b2dba1}.alert-info{background-image:-webkit-linear-gradient(top, #d9edf7 0, #b9def0 100%);background-image:-o-linear-gradient(top, #d9edf7 0, #b9def0 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #d9edf7), to(#b9def0));background-image:linear-gradient(to bottom, #d9edf7 0, #b9def0 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);border-color:#9acfea}.alert-warning{background-image:-webkit-linear-gradient(top, #fcf8e3 0, #f8efc0 100%);background-image:-o-linear-gradient(top, #fcf8e3 0, #f8efc0 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #fcf8e3), to(#f8efc0));background-image:linear-gradient(to bottom, #fcf8e3 0, #f8efc0 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);border-color:#f5e79e}.alert-danger{background-image:-webkit-linear-gradient(top, #f2dede 0, #e7c3c3 100%);background-image:-o-linear-gradient(top, #f2dede 0, #e7c3c3 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #f2dede), to(#e7c3c3));background-image:linear-gradient(to bottom, #f2dede 0, #e7c3c3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);border-color:#dca7a7}.progress{background-image:-webkit-linear-gradient(top, #ebebeb 0, #f5f5f5 100%);background-image:-o-linear-gradient(top, #ebebeb 0, #f5f5f5 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #ebebeb), to(#f5f5f5));background-image:linear-gradient(to bottom, #ebebeb 0, #f5f5f5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0)}.progress-bar{background-image:-webkit-linear-gradient(top, #337ab7 0, #286090 100%);background-image:-o-linear-gradient(top, #337ab7 0, #286090 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #337ab7), to(#286090));background-image:linear-gradient(to bottom, #337ab7 0, #286090 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff286090', GradientType=0)}.progress-bar-success{background-image:-webkit-linear-gradient(top, #5cb85c 0, #449d44 100%);background-image:-o-linear-gradient(top, #5cb85c 0, #449d44 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #5cb85c), to(#449d44));background-image:linear-gradient(to bottom, #5cb85c 0, #449d44 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0)}.progress-bar-info{background-image:-webkit-linear-gradient(top, #5bc0de 0, #31b0d5 100%);background-image:-o-linear-gradient(top, #5bc0de 0, #31b0d5 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #5bc0de), to(#31b0d5));background-image:linear-gradient(to bottom, #5bc0de 0, #31b0d5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0)}.progress-bar-warning{background-image:-webkit-linear-gradient(top, #f0ad4e 0, #ec971f 100%);background-image:-o-linear-gradient(top, #f0ad4e 0, #ec971f 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #f0ad4e), to(#ec971f));background-image:linear-gradient(to bottom, #f0ad4e 0, #ec971f 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0)}.progress-bar-danger{background-image:-webkit-linear-gradient(top, #d9534f 0, #c9302c 100%);background-image:-o-linear-gradient(top, #d9534f 0, #c9302c 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #d9534f), to(#c9302c));background-image:linear-gradient(to bottom, #d9534f 0, #c9302c 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0)}.progress-bar-striped{background-image:-webkit-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent)}.list-group{border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.075);box-shadow:0 1px 2px rgba(0,0,0,0.075)}.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{text-shadow:0 -1px 0 #286090;background-image:-webkit-linear-gradient(top, #337ab7 0, #2b669a 100%);background-image:-o-linear-gradient(top, #337ab7 0, #2b669a 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #337ab7), to(#2b669a));background-image:linear-gradient(to bottom, #337ab7 0, #2b669a 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2b669a', GradientType=0);border-color:#2b669a}.list-group-item.active .badge,.list-group-item.active:hover .badge,.list-group-item.active:focus .badge{text-shadow:none}.panel{-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.05);box-shadow:0 1px 2px rgba(0,0,0,0.05)}.panel-default>.panel-heading{background-image:-webkit-linear-gradient(top, #f5f5f5 0, #e8e8e8 100%);background-image:-o-linear-gradient(top, #f5f5f5 0, #e8e8e8 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #f5f5f5), to(#e8e8e8));background-image:linear-gradient(to bottom, #f5f5f5 0, #e8e8e8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0)}.panel-primary>.panel-heading{background-image:-webkit-linear-gradient(top, #337ab7 0, #2e6da4 100%);background-image:-o-linear-gradient(top, #337ab7 0, #2e6da4 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #337ab7), to(#2e6da4));background-image:linear-gradient(to bottom, #337ab7 0, #2e6da4 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0)}.panel-success>.panel-heading{background-image:-webkit-linear-gradient(top, #dff0d8 0, #d0e9c6 100%);background-image:-o-linear-gradient(top, #dff0d8 0, #d0e9c6 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #dff0d8), to(#d0e9c6));background-image:linear-gradient(to bottom, #dff0d8 0, #d0e9c6 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0)}.panel-info>.panel-heading{background-image:-webkit-linear-gradient(top, #d9edf7 0, #c4e3f3 100%);background-image:-o-linear-gradient(top, #d9edf7 0, #c4e3f3 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #d9edf7), to(#c4e3f3));background-image:linear-gradient(to bottom, #d9edf7 0, #c4e3f3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0)}.panel-warning>.panel-heading{background-image:-webkit-linear-gradient(top, #fcf8e3 0, #faf2cc 100%);background-image:-o-linear-gradient(top, #fcf8e3 0, #faf2cc 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #fcf8e3), to(#faf2cc));background-image:linear-gradient(to bottom, #fcf8e3 0, #faf2cc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0)}.panel-danger>.panel-heading{background-image:-webkit-linear-gradient(top, #f2dede 0, #ebcccc 100%);background-image:-o-linear-gradient(top, #f2dede 0, #ebcccc 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #f2dede), to(#ebcccc));background-image:linear-gradient(to bottom, #f2dede 0, #ebcccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0)}.well{background-image:-webkit-linear-gradient(top, #e8e8e8 0, #f5f5f5 100%);background-image:-o-linear-gradient(top, #e8e8e8 0, #f5f5f5 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #e8e8e8), to(#f5f5f5));background-image:linear-gradient(to bottom, #e8e8e8 0, #f5f5f5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);border-color:#dcdcdc;-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,0.05),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 3px rgba(0,0,0,0.05),0 1px 0 rgba(255,255,255,0.1)}
\ No newline at end of file
diff --git a/vid/src/main/webapp/app/vid/external/bootstrap/css/bootstrap.css b/vid/src/main/webapp/app/vid/external/bootstrap/css/bootstrap.css
deleted file mode 100644
index 21a14fade..000000000
--- a/vid/src/main/webapp/app/vid/external/bootstrap/css/bootstrap.css
+++ /dev/null
@@ -1,820 +0,0 @@
-/*!
- * Bootstrap v3.3.7 (http://getbootstrap.com)
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */
-
-/*!
- * Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=a8e01e20fdf5ffe2a0df475294b45f64)
- * Config saved to config.json and https://gist.github.com/a8e01e20fdf5ffe2a0df475294b45f64
- */
-/*!
- * Bootstrap v3.3.7 (http://getbootstrap.com)
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */
-/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
-
-@font-face {
-  font-family: 'Glyphicons Halflings';
-  src: url('../fonts/glyphicons-halflings-regular.eot');
-  src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
-}
-.glyphicon {
-  position: relative;
-  top: 1px;
-  display: inline-block;
-  font-family: 'Glyphicons Halflings';
-  font-style: normal;
-  font-weight: normal;
-  line-height: 1;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-.glyphicon-asterisk:before {
-  content: "\002a";
-}
-.glyphicon-plus:before {
-  content: "\002b";
-}
-.glyphicon-euro:before,
-.glyphicon-eur:before {
-  content: "\20ac";
-}
-.glyphicon-minus:before {
-  content: "\2212";
-}
-.glyphicon-cloud:before {
-  content: "\2601";
-}
-.glyphicon-envelope:before {
-  content: "\2709";
-}
-.glyphicon-pencil:before {
-  content: "\270f";
-}
-.glyphicon-glass:before {
-  content: "\e001";
-}
-.glyphicon-music:before {
-  content: "\e002";
-}
-.glyphicon-search:before {
-  content: "\e003";
-}
-.glyphicon-heart:before {
-  content: "\e005";
-}
-.glyphicon-star:before {
-  content: "\e006";
-}
-.glyphicon-star-empty:before {
-  content: "\e007";
-}
-.glyphicon-user:before {
-  content: "\e008";
-}
-.glyphicon-film:before {
-  content: "\e009";
-}
-.glyphicon-th-large:before {
-  content: "\e010";
-}
-.glyphicon-th:before {
-  content: "\e011";
-}
-.glyphicon-th-list:before {
-  content: "\e012";
-}
-.glyphicon-ok:before {
-  content: "\e013";
-}
-.glyphicon-remove:before {
-  content: "\e014";
-}
-.glyphicon-zoom-in:before {
-  content: "\e015";
-}
-.glyphicon-zoom-out:before {
-  content: "\e016";
-}
-.glyphicon-off:before {
-  content: "\e017";
-}
-.glyphicon-signal:before {
-  content: "\e018";
-}
-.glyphicon-cog:before {
-  content: "\e019";
-}
-.glyphicon-trash:before {
-  content: "\e020";
-}
-.glyphicon-home:before {
-  content: "\e021";
-}
-.glyphicon-file:before {
-  content: "\e022";
-}
-.glyphicon-time:before {
-  content: "\e023";
-}
-.glyphicon-road:before {
-  content: "\e024";
-}
-.glyphicon-download-alt:before {
-  content: "\e025";
-}
-.glyphicon-download:before {
-  content: "\e026";
-}
-.glyphicon-upload:before {
-  content: "\e027";
-}
-.glyphicon-inbox:before {
-  content: "\e028";
-}
-.glyphicon-play-circle:before {
-  content: "\e029";
-}
-.glyphicon-repeat:before {
-  content: "\e030";
-}
-.glyphicon-refresh:before {
-  content: "\e031";
-}
-.glyphicon-list-alt:before {
-  content: "\e032";
-}
-.glyphicon-lock:before {
-  content: "\e033";
-}
-.glyphicon-flag:before {
-  content: "\e034";
-}
-.glyphicon-headphones:before {
-  content: "\e035";
-}
-.glyphicon-volume-off:before {
-  content: "\e036";
-}
-.glyphicon-volume-down:before {
-  content: "\e037";
-}
-.glyphicon-volume-up:before {
-  content: "\e038";
-}
-.glyphicon-qrcode:before {
-  content: "\e039";
-}
-.glyphicon-barcode:before {
-  content: "\e040";
-}
-.glyphicon-tag:before {
-  content: "\e041";
-}
-.glyphicon-tags:before {
-  content: "\e042";
-}
-.glyphicon-book:before {
-  content: "\e043";
-}
-.glyphicon-bookmark:before {
-  content: "\e044";
-}
-.glyphicon-print:before {
-  content: "\e045";
-}
-.glyphicon-camera:before {
-  content: "\e046";
-}
-.glyphicon-font:before {
-  content: "\e047";
-}
-.glyphicon-bold:before {
-  content: "\e048";
-}
-.glyphicon-italic:before {
-  content: "\e049";
-}
-.glyphicon-text-height:before {
-  content: "\e050";
-}
-.glyphicon-text-width:before {
-  content: "\e051";
-}
-.glyphicon-align-left:before {
-  content: "\e052";
-}
-.glyphicon-align-center:before {
-  content: "\e053";
-}
-.glyphicon-align-right:before {
-  content: "\e054";
-}
-.glyphicon-align-justify:before {
-  content: "\e055";
-}
-.glyphicon-list:before {
-  content: "\e056";
-}
-.glyphicon-indent-left:before {
-  content: "\e057";
-}
-.glyphicon-indent-right:before {
-  content: "\e058";
-}
-.glyphicon-facetime-video:before {
-  content: "\e059";
-}
-.glyphicon-picture:before {
-  content: "\e060";
-}
-.glyphicon-map-marker:before {
-  content: "\e062";
-}
-.glyphicon-adjust:before {
-  content: "\e063";
-}
-.glyphicon-tint:before {
-  content: "\e064";
-}
-.glyphicon-edit:before {
-  content: "\e065";
-}
-.glyphicon-share:before {
-  content: "\e066";
-}
-.glyphicon-check:before {
-  content: "\e067";
-}
-.glyphicon-move:before {
-  content: "\e068";
-}
-.glyphicon-step-backward:before {
-  content: "\e069";
-}
-.glyphicon-fast-backward:before {
-  content: "\e070";
-}
-.glyphicon-backward:before {
-  content: "\e071";
-}
-.glyphicon-play:before {
-  content: "\e072";
-}
-.glyphicon-pause:before {
-  content: "\e073";
-}
-.glyphicon-stop:before {
-  content: "\e074";
-}
-.glyphicon-forward:before {
-  content: "\e075";
-}
-.glyphicon-fast-forward:before {
-  content: "\e076";
-}
-.glyphicon-step-forward:before {
-  content: "\e077";
-}
-.glyphicon-eject:before {
-  content: "\e078";
-}
-.glyphicon-chevron-left:before {
-  content: "\e079";
-}
-.glyphicon-chevron-right:before {
-  content: "\e080";
-}
-.glyphicon-plus-sign:before {
-  content: "\e081";
-}
-.glyphicon-minus-sign:before {
-  content: "\e082";
-}
-.glyphicon-remove-sign:before {
-  content: "\e083";
-}
-.glyphicon-ok-sign:before {
-  content: "\e084";
-}
-.glyphicon-question-sign:before {
-  content: "\e085";
-}
-.glyphicon-info-sign:before {
-  content: "\e086";
-}
-.glyphicon-screenshot:before {
-  content: "\e087";
-}
-.glyphicon-remove-circle:before {
-  content: "\e088";
-}
-.glyphicon-ok-circle:before {
-  content: "\e089";
-}
-.glyphicon-ban-circle:before {
-  content: "\e090";
-}
-.glyphicon-arrow-left:before {
-  content: "\e091";
-}
-.glyphicon-arrow-right:before {
-  content: "\e092";
-}
-.glyphicon-arrow-up:before {
-  content: "\e093";
-}
-.glyphicon-arrow-down:before {
-  content: "\e094";
-}
-.glyphicon-share-alt:before {
-  content: "\e095";
-}
-.glyphicon-resize-full:before {
-  content: "\e096";
-}
-.glyphicon-resize-small:before {
-  content: "\e097";
-}
-.glyphicon-exclamation-sign:before {
-  content: "\e101";
-}
-.glyphicon-gift:before {
-  content: "\e102";
-}
-.glyphicon-leaf:before {
-  content: "\e103";
-}
-.glyphicon-fire:before {
-  content: "\e104";
-}
-.glyphicon-eye-open:before {
-  content: "\e105";
-}
-.glyphicon-eye-close:before {
-  content: "\e106";
-}
-.glyphicon-warning-sign:before {
-  content: "\e107";
-}
-.glyphicon-plane:before {
-  content: "\e108";
-}
-.glyphicon-calendar:before {
-  content: "\e109";
-}
-.glyphicon-random:before {
-  content: "\e110";
-}
-.glyphicon-comment:before {
-  content: "\e111";
-}
-.glyphicon-magnet:before {
-  content: "\e112";
-}
-.glyphicon-chevron-up:before {
-  content: "\e113";
-}
-.glyphicon-chevron-down:before {
-  content: "\e114";
-}
-.glyphicon-retweet:before {
-  content: "\e115";
-}
-.glyphicon-shopping-cart:before {
-  content: "\e116";
-}
-.glyphicon-folder-close:before {
-  content: "\e117";
-}
-.glyphicon-folder-open:before {
-  content: "\e118";
-}
-.glyphicon-resize-vertical:before {
-  content: "\e119";
-}
-.glyphicon-resize-horizontal:before {
-  content: "\e120";
-}
-.glyphicon-hdd:before {
-  content: "\e121";
-}
-.glyphicon-bullhorn:before {
-  content: "\e122";
-}
-.glyphicon-bell:before {
-  content: "\e123";
-}
-.glyphicon-certificate:before {
-  content: "\e124";
-}
-.glyphicon-thumbs-up:before {
-  content: "\e125";
-}
-.glyphicon-thumbs-down:before {
-  content: "\e126";
-}
-.glyphicon-hand-right:before {
-  content: "\e127";
-}
-.glyphicon-hand-left:before {
-  content: "\e128";
-}
-.glyphicon-hand-up:before {
-  content: "\e129";
-}
-.glyphicon-hand-down:before {
-  content: "\e130";
-}
-.glyphicon-circle-arrow-right:before {
-  content: "\e131";
-}
-.glyphicon-circle-arrow-left:before {
-  content: "\e132";
-}
-.glyphicon-circle-arrow-up:before {
-  content: "\e133";
-}
-.glyphicon-circle-arrow-down:before {
-  content: "\e134";
-}
-.glyphicon-globe:before {
-  content: "\e135";
-}
-.glyphicon-wrench:before {
-  content: "\e136";
-}
-.glyphicon-tasks:before {
-  content: "\e137";
-}
-.glyphicon-filter:before {
-  content: "\e138";
-}
-.glyphicon-briefcase:before {
-  content: "\e139";
-}
-.glyphicon-fullscreen:before {
-  content: "\e140";
-}
-.glyphicon-dashboard:before {
-  content: "\e141";
-}
-.glyphicon-paperclip:before {
-  content: "\e142";
-}
-.glyphicon-heart-empty:before {
-  content: "\e143";
-}
-.glyphicon-link:before {
-  content: "\e144";
-}
-.glyphicon-phone:before {
-  content: "\e145";
-}
-.glyphicon-pushpin:before {
-  content: "\e146";
-}
-.glyphicon-usd:before {
-  content: "\e148";
-}
-.glyphicon-gbp:before {
-  content: "\e149";
-}
-.glyphicon-sort:before {
-  content: "\e150";
-}
-.glyphicon-sort-by-alphabet:before {
-  content: "\e151";
-}
-.glyphicon-sort-by-alphabet-alt:before {
-  content: "\e152";
-}
-.glyphicon-sort-by-order:before {
-  content: "\e153";
-}
-.glyphicon-sort-by-order-alt:before {
-  content: "\e154";
-}
-.glyphicon-sort-by-attributes:before {
-  content: "\e155";
-}
-.glyphicon-sort-by-attributes-alt:before {
-  content: "\e156";
-}
-.glyphicon-unchecked:before {
-  content: "\e157";
-}
-.glyphicon-expand:before {
-  content: "\e158";
-}
-.glyphicon-collapse-down:before {
-  content: "\e159";
-}
-.glyphicon-collapse-up:before {
-  content: "\e160";
-}
-.glyphicon-log-in:before {
-  content: "\e161";
-}
-.glyphicon-flash:before {
-  content: "\e162";
-}
-.glyphicon-log-out:before {
-  content: "\e163";
-}
-.glyphicon-new-window:before {
-  content: "\e164";
-}
-.glyphicon-record:before {
-  content: "\e165";
-}
-.glyphicon-save:before {
-  content: "\e166";
-}
-.glyphicon-open:before {
-  content: "\e167";
-}
-.glyphicon-saved:before {
-  content: "\e168";
-}
-.glyphicon-import:before {
-  content: "\e169";
-}
-.glyphicon-export:before {
-  content: "\e170";
-}
-.glyphicon-send:before {
-  content: "\e171";
-}
-.glyphicon-floppy-disk:before {
-  content: "\e172";
-}
-.glyphicon-floppy-saved:before {
-  content: "\e173";
-}
-.glyphicon-floppy-remove:before {
-  content: "\e174";
-}
-.glyphicon-floppy-save:before {
-  content: "\e175";
-}
-.glyphicon-floppy-open:before {
-  content: "\e176";
-}
-.glyphicon-credit-card:before {
-  content: "\e177";
-}
-.glyphicon-transfer:before {
-  content: "\e178";
-}
-.glyphicon-cutlery:before {
-  content: "\e179";
-}
-.glyphicon-header:before {
-  content: "\e180";
-}
-.glyphicon-compressed:before {
-  content: "\e181";
-}
-.glyphicon-earphone:before {
-  content: "\e182";
-}
-.glyphicon-phone-alt:before {
-  content: "\e183";
-}
-.glyphicon-tower:before {
-  content: "\e184";
-}
-.glyphicon-stats:before {
-  content: "\e185";
-}
-.glyphicon-sd-video:before {
-  content: "\e186";
-}
-.glyphicon-hd-video:before {
-  content: "\e187";
-}
-.glyphicon-subtitles:before {
-  content: "\e188";
-}
-.glyphicon-sound-stereo:before {
-  content: "\e189";
-}
-.glyphicon-sound-dolby:before {
-  content: "\e190";
-}
-.glyphicon-sound-5-1:before {
-  content: "\e191";
-}
-.glyphicon-sound-6-1:before {
-  content: "\e192";
-}
-.glyphicon-sound-7-1:before {
-  content: "\e193";
-}
-.glyphicon-copyright-mark:before {
-  content: "\e194";
-}
-.glyphicon-registration-mark:before {
-  content: "\e195";
-}
-.glyphicon-cloud-download:before {
-  content: "\e197";
-}
-.glyphicon-cloud-upload:before {
-  content: "\e198";
-}
-.glyphicon-tree-conifer:before {
-  content: "\e199";
-}
-.glyphicon-tree-deciduous:before {
-  content: "\e200";
-}
-.glyphicon-cd:before {
-  content: "\e201";
-}
-.glyphicon-save-file:before {
-  content: "\e202";
-}
-.glyphicon-open-file:before {
-  content: "\e203";
-}
-.glyphicon-level-up:before {
-  content: "\e204";
-}
-.glyphicon-copy:before {
-  content: "\e205";
-}
-.glyphicon-paste:before {
-  content: "\e206";
-}
-.glyphicon-alert:before {
-  content: "\e209";
-}
-.glyphicon-equalizer:before {
-  content: "\e210";
-}
-.glyphicon-king:before {
-  content: "\e211";
-}
-.glyphicon-queen:before {
-  content: "\e212";
-}
-.glyphicon-pawn:before {
-  content: "\e213";
-}
-.glyphicon-bishop:before {
-  content: "\e214";
-}
-.glyphicon-knight:before {
-  content: "\e215";
-}
-.glyphicon-baby-formula:before {
-  content: "\e216";
-}
-.glyphicon-tent:before {
-  content: "\26fa";
-}
-.glyphicon-blackboard:before {
-  content: "\e218";
-}
-.glyphicon-bed:before {
-  content: "\e219";
-}
-.glyphicon-apple:before {
-  content: "\f8ff";
-}
-.glyphicon-erase:before {
-  content: "\e221";
-}
-.glyphicon-hourglass:before {
-  content: "\231b";
-}
-.glyphicon-lamp:before {
-  content: "\e223";
-}
-.glyphicon-duplicate:before {
-  content: "\e224";
-}
-.glyphicon-piggy-bank:before {
-  content: "\e225";
-}
-.glyphicon-scissors:before {
-  content: "\e226";
-}
-.glyphicon-bitcoin:before {
-  content: "\e227";
-}
-.glyphicon-btc:before {
-  content: "\e227";
-}
-.glyphicon-xbt:before {
-  content: "\e227";
-}
-.glyphicon-yen:before {
-  content: "\00a5";
-}
-.glyphicon-jpy:before {
-  content: "\00a5";
-}
-.glyphicon-ruble:before {
-  content: "\20bd";
-}
-.glyphicon-rub:before {
-  content: "\20bd";
-}
-.glyphicon-scale:before {
-  content: "\e230";
-}
-.glyphicon-ice-lolly:before {
-  content: "\e231";
-}
-.glyphicon-ice-lolly-tasted:before {
-  content: "\e232";
-}
-.glyphicon-education:before {
-  content: "\e233";
-}
-.glyphicon-option-horizontal:before {
-  content: "\e234";
-}
-.glyphicon-option-vertical:before {
-  content: "\e235";
-}
-.glyphicon-menu-hamburger:before {
-  content: "\e236";
-}
-.glyphicon-modal-window:before {
-  content: "\e237";
-}
-.glyphicon-oil:before {
-  content: "\e238";
-}
-.glyphicon-grain:before {
-  content: "\e239";
-}
-.glyphicon-sunglasses:before {
-  content: "\e240";
-}
-.glyphicon-text-size:before {
-  content: "\e241";
-}
-.glyphicon-text-color:before {
-  content: "\e242";
-}
-.glyphicon-text-background:before {
-  content: "\e243";
-}
-.glyphicon-object-align-top:before {
-  content: "\e244";
-}
-.glyphicon-object-align-bottom:before {
-  content: "\e245";
-}
-.glyphicon-object-align-horizontal:before {
-  content: "\e246";
-}
-.glyphicon-object-align-left:before {
-  content: "\e247";
-}
-.glyphicon-object-align-vertical:before {
-  content: "\e248";
-}
-.glyphicon-object-align-right:before {
-  content: "\e249";
-}
-.glyphicon-triangle-right:before {
-  content: "\e250";
-}
-.glyphicon-triangle-left:before {
-  content: "\e251";
-}
-.glyphicon-triangle-bottom:before {
-  content: "\e252";
-}
-.glyphicon-triangle-top:before {
-  content: "\e253";
-}
-.glyphicon-console:before {
-  content: "\e254";
-}
-.glyphicon-superscript:before {
-  content: "\e255";
-}
-.glyphicon-subscript:before {
-  content: "\e256";
-}
-.glyphicon-menu-left:before {
-  content: "\e257";
-}
-.glyphicon-menu-right:before {
-  content: "\e258";
-}
-.glyphicon-menu-down:before {
-  content: "\e259";
-}
-.glyphicon-menu-up:before {
-  content: "\e260";
-}
diff --git a/vid/src/main/webapp/app/vid/external/bootstrap/css/bootstrap.min.css b/vid/src/main/webapp/app/vid/external/bootstrap/css/bootstrap.min.css
deleted file mode 100644
index 033b7889e..000000000
--- a/vid/src/main/webapp/app/vid/external/bootstrap/css/bootstrap.min.css
+++ /dev/null
@@ -1,14 +0,0 @@
-/*!
- * Bootstrap v3.3.7 (http://getbootstrap.com)
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */
-
-/*!
- * Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=a8e01e20fdf5ffe2a0df475294b45f64)
- * Config saved to config.json and https://gist.github.com/a8e01e20fdf5ffe2a0df475294b45f64
- *//*!
- * Bootstrap v3.3.7 (http://getbootstrap.com)
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace, monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}@font-face{font-family:'Glyphicons Halflings';src:url('../fonts/glyphicons-halflings-regular.eot');src:url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'),url('../fonts/glyphicons-halflings-regular.woff') format('woff'),url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'),url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\002a"}.glyphicon-plus:before{content:"\002b"}.glyphicon-euro:before,.glyphicon-eur:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:hover,a:focus{color:#23527c;text-decoration:underline}a:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.img-responsive{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role="button"]{cursor:pointer}.clearfix:before,.clearfix:after{content:" ";display:table}.clearfix:after{clear:both}.center-block{display:block;margin-left:auto;margin-right:auto}.pull-right{float:right !important}.pull-left{float:left !important}.hide{display:none !important}.show{display:block !important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none !important}.affix{position:fixed}
\ No newline at end of file
diff --git a/vid/src/main/webapp/app/vid/external/bootstrap/fonts/glyphicons-halflings-regular.svg b/vid/src/main/webapp/app/vid/external/bootstrap/fonts/glyphicons-halflings-regular.svg
deleted file mode 100644
index 94fb5490a..000000000
--- a/vid/src/main/webapp/app/vid/external/bootstrap/fonts/glyphicons-halflings-regular.svg
+++ /dev/null
@@ -1,288 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
\ No newline at end of file
diff --git a/vid/src/main/webapp/app/vid/external/bootstrap/fonts/glyphicons-halflings-regular.woff b/vid/src/main/webapp/app/vid/external/bootstrap/fonts/glyphicons-halflings-regular.woff
deleted file mode 100644
index 9e612858f802245ddcbf59788a0db942224bab35..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 23424
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
G`u_lkUM?>H

diff --git a/vid/src/main/webapp/app/vid/external/bootstrap/js/bootstrap.js b/vid/src/main/webapp/app/vid/external/bootstrap/js/bootstrap.js
deleted file mode 100644
index ab35981c2..000000000
--- a/vid/src/main/webapp/app/vid/external/bootstrap/js/bootstrap.js
+++ /dev/null
@@ -1,2380 +0,0 @@
-/*!
- * Bootstrap v3.3.7 (http://getbootstrap.com)
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */
-
-/*!
- * Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=a8e01e20fdf5ffe2a0df475294b45f64)
- * Config saved to config.json and https://gist.github.com/a8e01e20fdf5ffe2a0df475294b45f64
- */
-if (typeof jQuery === 'undefined') {
-  throw new Error('Bootstrap\'s JavaScript requires jQuery')
-}
-+function ($) {
-  'use strict';
-  var version = $.fn.jquery.split(' ')[0].split('.')
-  if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] > 3)) {
-    throw new Error('Bootstrap\'s JavaScript requires jQuery version 1.9.1 or higher, but lower than version 4')
-  }
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: alert.js v3.3.7
- * http://getbootstrap.com/javascript/#alerts
- * ========================================================================
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // ALERT CLASS DEFINITION
-  // ======================
-
-  var dismiss = '[data-dismiss="alert"]'
-  var Alert   = function (el) {
-    $(el).on('click', dismiss, this.close)
-  }
-
-  Alert.VERSION = '3.3.7'
-
-  Alert.TRANSITION_DURATION = 150
-
-  Alert.prototype.close = function (e) {
-    var $this    = $(this)
-    var selector = $this.attr('data-target')
-
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
-    }
-
-    var $parent = $(selector === '#' ? [] : selector)
-
-    if (e) e.preventDefault()
-
-    if (!$parent.length) {
-      $parent = $this.closest('.alert')
-    }
-
-    $parent.trigger(e = $.Event('close.bs.alert'))
-
-    if (e.isDefaultPrevented()) return
-
-    $parent.removeClass('in')
-
-    function removeElement() {
-      // detach from parent, fire event then clean up data
-      $parent.detach().trigger('closed.bs.alert').remove()
-    }
-
-    $.support.transition && $parent.hasClass('fade') ?
-      $parent
-        .one('bsTransitionEnd', removeElement)
-        .emulateTransitionEnd(Alert.TRANSITION_DURATION) :
-      removeElement()
-  }
-
-
-  // ALERT PLUGIN DEFINITION
-  // =======================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this = $(this)
-      var data  = $this.data('bs.alert')
-
-      if (!data) $this.data('bs.alert', (data = new Alert(this)))
-      if (typeof option == 'string') data[option].call($this)
-    })
-  }
-
-  var old = $.fn.alert
-
-  $.fn.alert             = Plugin
-  $.fn.alert.Constructor = Alert
-
-
-  // ALERT NO CONFLICT
-  // =================
-
-  $.fn.alert.noConflict = function () {
-    $.fn.alert = old
-    return this
-  }
-
-
-  // ALERT DATA-API
-  // ==============
-
-  $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: button.js v3.3.7
- * http://getbootstrap.com/javascript/#buttons
- * ========================================================================
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // BUTTON PUBLIC CLASS DEFINITION
-  // ==============================
-
-  var Button = function (element, options) {
-    this.$element  = $(element)
-    this.options   = $.extend({}, Button.DEFAULTS, options)
-    this.isLoading = false
-  }
-
-  Button.VERSION  = '3.3.7'
-
-  Button.DEFAULTS = {
-    loadingText: 'loading...'
-  }
-
-  Button.prototype.setState = function (state) {
-    var d    = 'disabled'
-    var $el  = this.$element
-    var val  = $el.is('input') ? 'val' : 'html'
-    var data = $el.data()
-
-    state += 'Text'
-
-    if (data.resetText == null) $el.data('resetText', $el[val]())
-
-    // push to event loop to allow forms to submit
-    setTimeout($.proxy(function () {
-      $el[val](data[state] == null ? this.options[state] : data[state])
-
-      if (state == 'loadingText') {
-        this.isLoading = true
-        $el.addClass(d).attr(d, d).prop(d, true)
-      } else if (this.isLoading) {
-        this.isLoading = false
-        $el.removeClass(d).removeAttr(d).prop(d, false)
-      }
-    }, this), 0)
-  }
-
-  Button.prototype.toggle = function () {
-    var changed = true
-    var $parent = this.$element.closest('[data-toggle="buttons"]')
-
-    if ($parent.length) {
-      var $input = this.$element.find('input')
-      if ($input.prop('type') == 'radio') {
-        if ($input.prop('checked')) changed = false
-        $parent.find('.active').removeClass('active')
-        this.$element.addClass('active')
-      } else if ($input.prop('type') == 'checkbox') {
-        if (($input.prop('checked')) !== this.$element.hasClass('active')) changed = false
-        this.$element.toggleClass('active')
-      }
-      $input.prop('checked', this.$element.hasClass('active'))
-      if (changed) $input.trigger('change')
-    } else {
-      this.$element.attr('aria-pressed', !this.$element.hasClass('active'))
-      this.$element.toggleClass('active')
-    }
-  }
-
-
-  // BUTTON PLUGIN DEFINITION
-  // ========================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.button')
-      var options = typeof option == 'object' && option
-
-      if (!data) $this.data('bs.button', (data = new Button(this, options)))
-
-      if (option == 'toggle') data.toggle()
-      else if (option) data.setState(option)
-    })
-  }
-
-  var old = $.fn.button
-
-  $.fn.button             = Plugin
-  $.fn.button.Constructor = Button
-
-
-  // BUTTON NO CONFLICT
-  // ==================
-
-  $.fn.button.noConflict = function () {
-    $.fn.button = old
-    return this
-  }
-
-
-  // BUTTON DATA-API
-  // ===============
-
-  $(document)
-    .on('click.bs.button.data-api', '[data-toggle^="button"]', function (e) {
-      var $btn = $(e.target).closest('.btn')
-      Plugin.call($btn, 'toggle')
-      if (!($(e.target).is('input[type="radio"], input[type="checkbox"]'))) {
-        // Prevent double click on radios, and the double selections (so cancellation) on checkboxes
-        e.preventDefault()
-        // The target component still receive the focus
-        if ($btn.is('input,button')) $btn.trigger('focus')
-        else $btn.find('input:visible,button:visible').first().trigger('focus')
-      }
-    })
-    .on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) {
-      $(e.target).closest('.btn').toggleClass('focus', /^focus(in)?$/.test(e.type))
-    })
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: carousel.js v3.3.7
- * http://getbootstrap.com/javascript/#carousel
- * ========================================================================
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // CAROUSEL CLASS DEFINITION
-  // =========================
-
-  var Carousel = function (element, options) {
-    this.$element    = $(element)
-    this.$indicators = this.$element.find('.carousel-indicators')
-    this.options     = options
-    this.paused      = null
-    this.sliding     = null
-    this.interval    = null
-    this.$active     = null
-    this.$items      = null
-
-    this.options.keyboard && this.$element.on('keydown.bs.carousel', $.proxy(this.keydown, this))
-
-    this.options.pause == 'hover' && !('ontouchstart' in document.documentElement) && this.$element
-      .on('mouseenter.bs.carousel', $.proxy(this.pause, this))
-      .on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
-  }
-
-  Carousel.VERSION  = '3.3.7'
-
-  Carousel.TRANSITION_DURATION = 600
-
-  Carousel.DEFAULTS = {
-    interval: 5000,
-    pause: 'hover',
-    wrap: true,
-    keyboard: true
-  }
-
-  Carousel.prototype.keydown = function (e) {
-    if (/input|textarea/i.test(e.target.tagName)) return
-    switch (e.which) {
-      case 37: this.prev(); break
-      case 39: this.next(); break
-      default: return
-    }
-
-    e.preventDefault()
-  }
-
-  Carousel.prototype.cycle = function (e) {
-    e || (this.paused = false)
-
-    this.interval && clearInterval(this.interval)
-
-    this.options.interval
-      && !this.paused
-      && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
-
-    return this
-  }
-
-  Carousel.prototype.getItemIndex = function (item) {
-    this.$items = item.parent().children('.item')
-    return this.$items.index(item || this.$active)
-  }
-
-  Carousel.prototype.getItemForDirection = function (direction, active) {
-    var activeIndex = this.getItemIndex(active)
-    var willWrap = (direction == 'prev' && activeIndex === 0)
-                || (direction == 'next' && activeIndex == (this.$items.length - 1))
-    if (willWrap && !this.options.wrap) return active
-    var delta = direction == 'prev' ? -1 : 1
-    var itemIndex = (activeIndex + delta) % this.$items.length
-    return this.$items.eq(itemIndex)
-  }
-
-  Carousel.prototype.to = function (pos) {
-    var that        = this
-    var activeIndex = this.getItemIndex(this.$active = this.$element.find('.item.active'))
-
-    if (pos > (this.$items.length - 1) || pos < 0) return
-
-    if (this.sliding)       return this.$element.one('slid.bs.carousel', function () { that.to(pos) }) // yes, "slid"
-    if (activeIndex == pos) return this.pause().cycle()
-
-    return this.slide(pos > activeIndex ? 'next' : 'prev', this.$items.eq(pos))
-  }
-
-  Carousel.prototype.pause = function (e) {
-    e || (this.paused = true)
-
-    if (this.$element.find('.next, .prev').length && $.support.transition) {
-      this.$element.trigger($.support.transition.end)
-      this.cycle(true)
-    }
-
-    this.interval = clearInterval(this.interval)
-
-    return this
-  }
-
-  Carousel.prototype.next = function () {
-    if (this.sliding) return
-    return this.slide('next')
-  }
-
-  Carousel.prototype.prev = function () {
-    if (this.sliding) return
-    return this.slide('prev')
-  }
-
-  Carousel.prototype.slide = function (type, next) {
-    var $active   = this.$element.find('.item.active')
-    var $next     = next || this.getItemForDirection(type, $active)
-    var isCycling = this.interval
-    var direction = type == 'next' ? 'left' : 'right'
-    var that      = this
-
-    if ($next.hasClass('active')) return (this.sliding = false)
-
-    var relatedTarget = $next[0]
-    var slideEvent = $.Event('slide.bs.carousel', {
-      relatedTarget: relatedTarget,
-      direction: direction
-    })
-    this.$element.trigger(slideEvent)
-    if (slideEvent.isDefaultPrevented()) return
-
-    this.sliding = true
-
-    isCycling && this.pause()
-
-    if (this.$indicators.length) {
-      this.$indicators.find('.active').removeClass('active')
-      var $nextIndicator = $(this.$indicators.children()[this.getItemIndex($next)])
-      $nextIndicator && $nextIndicator.addClass('active')
-    }
-
-    var slidEvent = $.Event('slid.bs.carousel', { relatedTarget: relatedTarget, direction: direction }) // yes, "slid"
-    if ($.support.transition && this.$element.hasClass('slide')) {
-      $next.addClass(type)
-      $next[0].offsetWidth // force reflow
-      $active.addClass(direction)
-      $next.addClass(direction)
-      $active
-        .one('bsTransitionEnd', function () {
-          $next.removeClass([type, direction].join(' ')).addClass('active')
-          $active.removeClass(['active', direction].join(' '))
-          that.sliding = false
-          setTimeout(function () {
-            that.$element.trigger(slidEvent)
-          }, 0)
-        })
-        .emulateTransitionEnd(Carousel.TRANSITION_DURATION)
-    } else {
-      $active.removeClass('active')
-      $next.addClass('active')
-      this.sliding = false
-      this.$element.trigger(slidEvent)
-    }
-
-    isCycling && this.cycle()
-
-    return this
-  }
-
-
-  // CAROUSEL PLUGIN DEFINITION
-  // ==========================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.carousel')
-      var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option)
-      var action  = typeof option == 'string' ? option : options.slide
-
-      if (!data) $this.data('bs.carousel', (data = new Carousel(this, options)))
-      if (typeof option == 'number') data.to(option)
-      else if (action) data[action]()
-      else if (options.interval) data.pause().cycle()
-    })
-  }
-
-  var old = $.fn.carousel
-
-  $.fn.carousel             = Plugin
-  $.fn.carousel.Constructor = Carousel
-
-
-  // CAROUSEL NO CONFLICT
-  // ====================
-
-  $.fn.carousel.noConflict = function () {
-    $.fn.carousel = old
-    return this
-  }
-
-
-  // CAROUSEL DATA-API
-  // =================
-
-  var clickHandler = function (e) {
-    var href
-    var $this   = $(this)
-    var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7
-    if (!$target.hasClass('carousel')) return
-    var options = $.extend({}, $target.data(), $this.data())
-    var slideIndex = $this.attr('data-slide-to')
-    if (slideIndex) options.interval = false
-
-    Plugin.call($target, options)
-
-    if (slideIndex) {
-      $target.data('bs.carousel').to(slideIndex)
-    }
-
-    e.preventDefault()
-  }
-
-  $(document)
-    .on('click.bs.carousel.data-api', '[data-slide]', clickHandler)
-    .on('click.bs.carousel.data-api', '[data-slide-to]', clickHandler)
-
-  $(window).on('load', function () {
-    $('[data-ride="carousel"]').each(function () {
-      var $carousel = $(this)
-      Plugin.call($carousel, $carousel.data())
-    })
-  })
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: dropdown.js v3.3.7
- * http://getbootstrap.com/javascript/#dropdowns
- * ========================================================================
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // DROPDOWN CLASS DEFINITION
-  // =========================
-
-  var backdrop = '.dropdown-backdrop'
-  var toggle   = '[data-toggle="dropdown"]'
-  var Dropdown = function (element) {
-    $(element).on('click.bs.dropdown', this.toggle)
-  }
-
-  Dropdown.VERSION = '3.3.7'
-
-  function getParent($this) {
-    var selector = $this.attr('data-target')
-
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
-    }
-
-    var $parent = selector && $(selector)
-
-    return $parent && $parent.length ? $parent : $this.parent()
-  }
-
-  function clearMenus(e) {
-    if (e && e.which === 3) return
-    $(backdrop).remove()
-    $(toggle).each(function () {
-      var $this         = $(this)
-      var $parent       = getParent($this)
-      var relatedTarget = { relatedTarget: this }
-
-      if (!$parent.hasClass('open')) return
-
-      if (e && e.type == 'click' && /input|textarea/i.test(e.target.tagName) && $.contains($parent[0], e.target)) return
-
-      $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget))
-
-      if (e.isDefaultPrevented()) return
-
-      $this.attr('aria-expanded', 'false')
-      $parent.removeClass('open').trigger($.Event('hidden.bs.dropdown', relatedTarget))
-    })
-  }
-
-  Dropdown.prototype.toggle = function (e) {
-    var $this = $(this)
-
-    if ($this.is('.disabled, :disabled')) return
-
-    var $parent  = getParent($this)
-    var isActive = $parent.hasClass('open')
-
-    clearMenus()
-
-    if (!isActive) {
-      if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
-        // if mobile we use a backdrop because click events don't delegate
-        $(document.createElement('div'))
-          .addClass('dropdown-backdrop')
-          .insertAfter($(this))
-          .on('click', clearMenus)
-      }
-
-      var relatedTarget = { relatedTarget: this }
-      $parent.trigger(e = $.Event('show.bs.dropdown', relatedTarget))
-
-      if (e.isDefaultPrevented()) return
-
-      $this
-        .trigger('focus')
-        .attr('aria-expanded', 'true')
-
-      $parent
-        .toggleClass('open')
-        .trigger($.Event('shown.bs.dropdown', relatedTarget))
-    }
-
-    return false
-  }
-
-  Dropdown.prototype.keydown = function (e) {
-    if (!/(38|40|27|32)/.test(e.which) || /input|textarea/i.test(e.target.tagName)) return
-
-    var $this = $(this)
-
-    e.preventDefault()
-    e.stopPropagation()
-
-    if ($this.is('.disabled, :disabled')) return
-
-    var $parent  = getParent($this)
-    var isActive = $parent.hasClass('open')
-
-    if (!isActive && e.which != 27 || isActive && e.which == 27) {
-      if (e.which == 27) $parent.find(toggle).trigger('focus')
-      return $this.trigger('click')
-    }
-
-    var desc = ' li:not(.disabled):visible a'
-    var $items = $parent.find('.dropdown-menu' + desc)
-
-    if (!$items.length) return
-
-    var index = $items.index(e.target)
-
-    if (e.which == 38 && index > 0)                 index--         // up
-    if (e.which == 40 && index < $items.length - 1) index++         // down
-    if (!~index)                                    index = 0
-
-    $items.eq(index).trigger('focus')
-  }
-
-
-  // DROPDOWN PLUGIN DEFINITION
-  // ==========================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this = $(this)
-      var data  = $this.data('bs.dropdown')
-
-      if (!data) $this.data('bs.dropdown', (data = new Dropdown(this)))
-      if (typeof option == 'string') data[option].call($this)
-    })
-  }
-
-  var old = $.fn.dropdown
-
-  $.fn.dropdown             = Plugin
-  $.fn.dropdown.Constructor = Dropdown
-
-
-  // DROPDOWN NO CONFLICT
-  // ====================
-
-  $.fn.dropdown.noConflict = function () {
-    $.fn.dropdown = old
-    return this
-  }
-
-
-  // APPLY TO STANDARD DROPDOWN ELEMENTS
-  // ===================================
-
-  $(document)
-    .on('click.bs.dropdown.data-api', clearMenus)
-    .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
-    .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
-    .on('keydown.bs.dropdown.data-api', toggle, Dropdown.prototype.keydown)
-    .on('keydown.bs.dropdown.data-api', '.dropdown-menu', Dropdown.prototype.keydown)
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: modal.js v3.3.7
- * http://getbootstrap.com/javascript/#modals
- * ========================================================================
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // MODAL CLASS DEFINITION
-  // ======================
-
-  var Modal = function (element, options) {
-    this.options             = options
-    this.$body               = $(document.body)
-    this.$element            = $(element)
-    this.$dialog             = this.$element.find('.modal-dialog')
-    this.$backdrop           = null
-    this.isShown             = null
-    this.originalBodyPad     = null
-    this.scrollbarWidth      = 0
-    this.ignoreBackdropClick = false
-
-    if (this.options.remote) {
-      this.$element
-        .find('.modal-content')
-        .load(this.options.remote, $.proxy(function () {
-          this.$element.trigger('loaded.bs.modal')
-        }, this))
-    }
-  }
-
-  Modal.VERSION  = '3.3.7'
-
-  Modal.TRANSITION_DURATION = 300
-  Modal.BACKDROP_TRANSITION_DURATION = 150
-
-  Modal.DEFAULTS = {
-    backdrop: true,
-    keyboard: true,
-    show: true
-  }
-
-  Modal.prototype.toggle = function (_relatedTarget) {
-    return this.isShown ? this.hide() : this.show(_relatedTarget)
-  }
-
-  Modal.prototype.show = function (_relatedTarget) {
-    var that = this
-    var e    = $.Event('show.bs.modal', { relatedTarget: _relatedTarget })
-
-    this.$element.trigger(e)
-
-    if (this.isShown || e.isDefaultPrevented()) return
-
-    this.isShown = true
-
-    this.checkScrollbar()
-    this.setScrollbar()
-    this.$body.addClass('modal-open')
-
-    this.escape()
-    this.resize()
-
-    this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
-
-    this.$dialog.on('mousedown.dismiss.bs.modal', function () {
-      that.$element.one('mouseup.dismiss.bs.modal', function (e) {
-        if ($(e.target).is(that.$element)) that.ignoreBackdropClick = true
-      })
-    })
-
-    this.backdrop(function () {
-      var transition = $.support.transition && that.$element.hasClass('fade')
-
-      if (!that.$element.parent().length) {
-        that.$element.appendTo(that.$body) // don't move modals dom position
-      }
-
-      that.$element
-        .show()
-        .scrollTop(0)
-
-      that.adjustDialog()
-
-      if (transition) {
-        that.$element[0].offsetWidth // force reflow
-      }
-
-      that.$element.addClass('in')
-
-      that.enforceFocus()
-
-      var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget })
-
-      transition ?
-        that.$dialog // wait for modal to slide in
-          .one('bsTransitionEnd', function () {
-            that.$element.trigger('focus').trigger(e)
-          })
-          .emulateTransitionEnd(Modal.TRANSITION_DURATION) :
-        that.$element.trigger('focus').trigger(e)
-    })
-  }
-
-  Modal.prototype.hide = function (e) {
-    if (e) e.preventDefault()
-
-    e = $.Event('hide.bs.modal')
-
-    this.$element.trigger(e)
-
-    if (!this.isShown || e.isDefaultPrevented()) return
-
-    this.isShown = false
-
-    this.escape()
-    this.resize()
-
-    $(document).off('focusin.bs.modal')
-
-    this.$element
-      .removeClass('in')
-      .off('click.dismiss.bs.modal')
-      .off('mouseup.dismiss.bs.modal')
-
-    this.$dialog.off('mousedown.dismiss.bs.modal')
-
-    $.support.transition && this.$element.hasClass('fade') ?
-      this.$element
-        .one('bsTransitionEnd', $.proxy(this.hideModal, this))
-        .emulateTransitionEnd(Modal.TRANSITION_DURATION) :
-      this.hideModal()
-  }
-
-  Modal.prototype.enforceFocus = function () {
-    $(document)
-      .off('focusin.bs.modal') // guard against infinite focus loop
-      .on('focusin.bs.modal', $.proxy(function (e) {
-        if (document !== e.target &&
-            this.$element[0] !== e.target &&
-            !this.$element.has(e.target).length) {
-          this.$element.trigger('focus')
-        }
-      }, this))
-  }
-
-  Modal.prototype.escape = function () {
-    if (this.isShown && this.options.keyboard) {
-      this.$element.on('keydown.dismiss.bs.modal', $.proxy(function (e) {
-        e.which == 27 && this.hide()
-      }, this))
-    } else if (!this.isShown) {
-      this.$element.off('keydown.dismiss.bs.modal')
-    }
-  }
-
-  Modal.prototype.resize = function () {
-    if (this.isShown) {
-      $(window).on('resize.bs.modal', $.proxy(this.handleUpdate, this))
-    } else {
-      $(window).off('resize.bs.modal')
-    }
-  }
-
-  Modal.prototype.hideModal = function () {
-    var that = this
-    this.$element.hide()
-    this.backdrop(function () {
-      that.$body.removeClass('modal-open')
-      that.resetAdjustments()
-      that.resetScrollbar()
-      that.$element.trigger('hidden.bs.modal')
-    })
-  }
-
-  Modal.prototype.removeBackdrop = function () {
-    this.$backdrop && this.$backdrop.remove()
-    this.$backdrop = null
-  }
-
-  Modal.prototype.backdrop = function (callback) {
-    var that = this
-    var animate = this.$element.hasClass('fade') ? 'fade' : ''
-
-    if (this.isShown && this.options.backdrop) {
-      var doAnimate = $.support.transition && animate
-
-      this.$backdrop = $(document.createElement('div'))
-        .addClass('modal-backdrop ' + animate)
-        .appendTo(this.$body)
-
-      this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) {
-        if (this.ignoreBackdropClick) {
-          this.ignoreBackdropClick = false
-          return
-        }
-        if (e.target !== e.currentTarget) return
-        this.options.backdrop == 'static'
-          ? this.$element[0].focus()
-          : this.hide()
-      }, this))
-
-      if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
-
-      this.$backdrop.addClass('in')
-
-      if (!callback) return
-
-      doAnimate ?
-        this.$backdrop
-          .one('bsTransitionEnd', callback)
-          .emulateTransitionEnd(Modal.BACKDROP_TRANSITION_DURATION) :
-        callback()
-
-    } else if (!this.isShown && this.$backdrop) {
-      this.$backdrop.removeClass('in')
-
-      var callbackRemove = function () {
-        that.removeBackdrop()
-        callback && callback()
-      }
-      $.support.transition && this.$element.hasClass('fade') ?
-        this.$backdrop
-          .one('bsTransitionEnd', callbackRemove)
-          .emulateTransitionEnd(Modal.BACKDROP_TRANSITION_DURATION) :
-        callbackRemove()
-
-    } else if (callback) {
-      callback()
-    }
-  }
-
-  // these following methods are used to handle overflowing modals
-
-  Modal.prototype.handleUpdate = function () {
-    this.adjustDialog()
-  }
-
-  Modal.prototype.adjustDialog = function () {
-    var modalIsOverflowing = this.$element[0].scrollHeight > document.documentElement.clientHeight
-
-    this.$element.css({
-      paddingLeft:  !this.bodyIsOverflowing && modalIsOverflowing ? this.scrollbarWidth : '',
-      paddingRight: this.bodyIsOverflowing && !modalIsOverflowing ? this.scrollbarWidth : ''
-    })
-  }
-
-  Modal.prototype.resetAdjustments = function () {
-    this.$element.css({
-      paddingLeft: '',
-      paddingRight: ''
-    })
-  }
-
-  Modal.prototype.checkScrollbar = function () {
-    var fullWindowWidth = window.innerWidth
-    if (!fullWindowWidth) { // workaround for missing window.innerWidth in IE8
-      var documentElementRect = document.documentElement.getBoundingClientRect()
-      fullWindowWidth = documentElementRect.right - Math.abs(documentElementRect.left)
-    }
-    this.bodyIsOverflowing = document.body.clientWidth < fullWindowWidth
-    this.scrollbarWidth = this.measureScrollbar()
-  }
-
-  Modal.prototype.setScrollbar = function () {
-    var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10)
-    this.originalBodyPad = document.body.style.paddingRight || ''
-    if (this.bodyIsOverflowing) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
-  }
-
-  Modal.prototype.resetScrollbar = function () {
-    this.$body.css('padding-right', this.originalBodyPad)
-  }
-
-  Modal.prototype.measureScrollbar = function () { // thx walsh
-    var scrollDiv = document.createElement('div')
-    scrollDiv.className = 'modal-scrollbar-measure'
-    this.$body.append(scrollDiv)
-    var scrollbarWidth = scrollDiv.offsetWidth - scrollDiv.clientWidth
-    this.$body[0].removeChild(scrollDiv)
-    return scrollbarWidth
-  }
-
-
-  // MODAL PLUGIN DEFINITION
-  // =======================
-
-  function Plugin(option, _relatedTarget) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.modal')
-      var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option)
-
-      if (!data) $this.data('bs.modal', (data = new Modal(this, options)))
-      if (typeof option == 'string') data[option](_relatedTarget)
-      else if (options.show) data.show(_relatedTarget)
-    })
-  }
-
-  var old = $.fn.modal
-
-  $.fn.modal             = Plugin
-  $.fn.modal.Constructor = Modal
-
-
-  // MODAL NO CONFLICT
-  // =================
-
-  $.fn.modal.noConflict = function () {
-    $.fn.modal = old
-    return this
-  }
-
-
-  // MODAL DATA-API
-  // ==============
-
-  $(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) {
-    var $this   = $(this)
-    var href    = $this.attr('href')
-    var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) // strip for ie7
-    var option  = $target.data('bs.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())
-
-    if ($this.is('a')) e.preventDefault()
-
-    $target.one('show.bs.modal', function (showEvent) {
-      if (showEvent.isDefaultPrevented()) return // only register focus restorer if modal will actually get shown
-      $target.one('hidden.bs.modal', function () {
-        $this.is(':visible') && $this.trigger('focus')
-      })
-    })
-    Plugin.call($target, option, this)
-  })
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: tooltip.js v3.3.7
- * http://getbootstrap.com/javascript/#tooltip
- * Inspired by the original jQuery.tipsy by Jason Frame
- * ========================================================================
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // TOOLTIP PUBLIC CLASS DEFINITION
-  // ===============================
-
-  var Tooltip = function (element, options) {
-    this.type       = null
-    this.options    = null
-    this.enabled    = null
-    this.timeout    = null
-    this.hoverState = null
-    this.$element   = null
-    this.inState    = null
-
-    this.init('tooltip', element, options)
-  }
-
-  Tooltip.VERSION  = '3.3.7'
-
-  Tooltip.TRANSITION_DURATION = 150
-
-  Tooltip.DEFAULTS = {
-    animation: true,
-    placement: 'top',
-    selector: false,
-    template: '',
-    trigger: 'hover focus',
-    title: '',
-    delay: 0,
-    html: false,
-    container: false,
-    viewport: {
-      selector: 'body',
-      padding: 0
-    }
-  }
-
-  Tooltip.prototype.init = function (type, element, options) {
-    this.enabled   = true
-    this.type      = type
-    this.$element  = $(element)
-    this.options   = this.getOptions(options)
-    this.$viewport = this.options.viewport && $($.isFunction(this.options.viewport) ? this.options.viewport.call(this, this.$element) : (this.options.viewport.selector || this.options.viewport))
-    this.inState   = { click: false, hover: false, focus: false }
-
-    if (this.$element[0] instanceof document.constructor && !this.options.selector) {
-      throw new Error('`selector` option must be specified when initializing ' + this.type + ' on the window.document object!')
-    }
-
-    var triggers = this.options.trigger.split(' ')
-
-    for (var i = triggers.length; i--;) {
-      var trigger = triggers[i]
-
-      if (trigger == 'click') {
-        this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
-      } else if (trigger != 'manual') {
-        var eventIn  = trigger == 'hover' ? 'mouseenter' : 'focusin'
-        var eventOut = trigger == 'hover' ? 'mouseleave' : 'focusout'
-
-        this.$element.on(eventIn  + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
-        this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
-      }
-    }
-
-    this.options.selector ?
-      (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
-      this.fixTitle()
-  }
-
-  Tooltip.prototype.getDefaults = function () {
-    return Tooltip.DEFAULTS
-  }
-
-  Tooltip.prototype.getOptions = function (options) {
-    options = $.extend({}, this.getDefaults(), this.$element.data(), options)
-
-    if (options.delay && typeof options.delay == 'number') {
-      options.delay = {
-        show: options.delay,
-        hide: options.delay
-      }
-    }
-
-    return options
-  }
-
-  Tooltip.prototype.getDelegateOptions = function () {
-    var options  = {}
-    var defaults = this.getDefaults()
-
-    this._options && $.each(this._options, function (key, value) {
-      if (defaults[key] != value) options[key] = value
-    })
-
-    return options
-  }
-
-  Tooltip.prototype.enter = function (obj) {
-    var self = obj instanceof this.constructor ?
-      obj : $(obj.currentTarget).data('bs.' + this.type)
-
-    if (!self) {
-      self = new this.constructor(obj.currentTarget, this.getDelegateOptions())
-      $(obj.currentTarget).data('bs.' + this.type, self)
-    }
-
-    if (obj instanceof $.Event) {
-      self.inState[obj.type == 'focusin' ? 'focus' : 'hover'] = true
-    }
-
-    if (self.tip().hasClass('in') || self.hoverState == 'in') {
-      self.hoverState = 'in'
-      return
-    }
-
-    clearTimeout(self.timeout)
-
-    self.hoverState = 'in'
-
-    if (!self.options.delay || !self.options.delay.show) return self.show()
-
-    self.timeout = setTimeout(function () {
-      if (self.hoverState == 'in') self.show()
-    }, self.options.delay.show)
-  }
-
-  Tooltip.prototype.isInStateTrue = function () {
-    for (var key in this.inState) {
-      if (this.inState[key]) return true
-    }
-
-    return false
-  }
-
-  Tooltip.prototype.leave = function (obj) {
-    var self = obj instanceof this.constructor ?
-      obj : $(obj.currentTarget).data('bs.' + this.type)
-
-    if (!self) {
-      self = new this.constructor(obj.currentTarget, this.getDelegateOptions())
-      $(obj.currentTarget).data('bs.' + this.type, self)
-    }
-
-    if (obj instanceof $.Event) {
-      self.inState[obj.type == 'focusout' ? 'focus' : 'hover'] = false
-    }
-
-    if (self.isInStateTrue()) return
-
-    clearTimeout(self.timeout)
-
-    self.hoverState = 'out'
-
-    if (!self.options.delay || !self.options.delay.hide) return self.hide()
-
-    self.timeout = setTimeout(function () {
-      if (self.hoverState == 'out') self.hide()
-    }, self.options.delay.hide)
-  }
-
-  Tooltip.prototype.show = function () {
-    var e = $.Event('show.bs.' + this.type)
-
-    if (this.hasContent() && this.enabled) {
-      this.$element.trigger(e)
-
-      var inDom = $.contains(this.$element[0].ownerDocument.documentElement, this.$element[0])
-      if (e.isDefaultPrevented() || !inDom) return
-      var that = this
-
-      var $tip = this.tip()
-
-      var tipId = this.getUID(this.type)
-
-      this.setContent()
-      $tip.attr('id', tipId)
-      this.$element.attr('aria-describedby', tipId)
-
-      if (this.options.animation) $tip.addClass('fade')
-
-      var placement = typeof this.options.placement == 'function' ?
-        this.options.placement.call(this, $tip[0], this.$element[0]) :
-        this.options.placement
-
-      var autoToken = /\s?auto?\s?/i
-      var autoPlace = autoToken.test(placement)
-      if (autoPlace) placement = placement.replace(autoToken, '') || 'top'
-
-      $tip
-        .detach()
-        .css({ top: 0, left: 0, display: 'block' })
-        .addClass(placement)
-        .data('bs.' + this.type, this)
-
-      this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
-      this.$element.trigger('inserted.bs.' + this.type)
-
-      var pos          = this.getPosition()
-      var actualWidth  = $tip[0].offsetWidth
-      var actualHeight = $tip[0].offsetHeight
-
-      if (autoPlace) {
-        var orgPlacement = placement
-        var viewportDim = this.getPosition(this.$viewport)
-
-        placement = placement == 'bottom' && pos.bottom + actualHeight > viewportDim.bottom ? 'top'    :
-                    placement == 'top'    && pos.top    - actualHeight < viewportDim.top    ? 'bottom' :
-                    placement == 'right'  && pos.right  + actualWidth  > viewportDim.width  ? 'left'   :
-                    placement == 'left'   && pos.left   - actualWidth  < viewportDim.left   ? 'right'  :
-                    placement
-
-        $tip
-          .removeClass(orgPlacement)
-          .addClass(placement)
-      }
-
-      var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
-
-      this.applyPlacement(calculatedOffset, placement)
-
-      var complete = function () {
-        var prevHoverState = that.hoverState
-        that.$element.trigger('shown.bs.' + that.type)
-        that.hoverState = null
-
-        if (prevHoverState == 'out') that.leave(that)
-      }
-
-      $.support.transition && this.$tip.hasClass('fade') ?
-        $tip
-          .one('bsTransitionEnd', complete)
-          .emulateTransitionEnd(Tooltip.TRANSITION_DURATION) :
-        complete()
-    }
-  }
-
-  Tooltip.prototype.applyPlacement = function (offset, placement) {
-    var $tip   = this.tip()
-    var width  = $tip[0].offsetWidth
-    var height = $tip[0].offsetHeight
-
-    // manually read margins because getBoundingClientRect includes difference
-    var marginTop = parseInt($tip.css('margin-top'), 10)
-    var marginLeft = parseInt($tip.css('margin-left'), 10)
-
-    // we must check for NaN for ie 8/9
-    if (isNaN(marginTop))  marginTop  = 0
-    if (isNaN(marginLeft)) marginLeft = 0
-
-    offset.top  += marginTop
-    offset.left += marginLeft
-
-    // $.fn.offset doesn't round pixel values
-    // so we use setOffset directly with our own function B-0
-    $.offset.setOffset($tip[0], $.extend({
-      using: function (props) {
-        $tip.css({
-          top: Math.round(props.top),
-          left: Math.round(props.left)
-        })
-      }
-    }, offset), 0)
-
-    $tip.addClass('in')
-
-    // check to see if placing tip in new offset caused the tip to resize itself
-    var actualWidth  = $tip[0].offsetWidth
-    var actualHeight = $tip[0].offsetHeight
-
-    if (placement == 'top' && actualHeight != height) {
-      offset.top = offset.top + height - actualHeight
-    }
-
-    var delta = this.getViewportAdjustedDelta(placement, offset, actualWidth, actualHeight)
-
-    if (delta.left) offset.left += delta.left
-    else offset.top += delta.top
-
-    var isVertical          = /top|bottom/.test(placement)
-    var arrowDelta          = isVertical ? delta.left * 2 - width + actualWidth : delta.top * 2 - height + actualHeight
-    var arrowOffsetPosition = isVertical ? 'offsetWidth' : 'offsetHeight'
-
-    $tip.offset(offset)
-    this.replaceArrow(arrowDelta, $tip[0][arrowOffsetPosition], isVertical)
-  }
-
-  Tooltip.prototype.replaceArrow = function (delta, dimension, isVertical) {
-    this.arrow()
-      .css(isVertical ? 'left' : 'top', 50 * (1 - delta / dimension) + '%')
-      .css(isVertical ? 'top' : 'left', '')
-  }
-
-  Tooltip.prototype.setContent = function () {
-    var $tip  = this.tip()
-    var title = this.getTitle()
-
-    $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
-    $tip.removeClass('fade in top bottom left right')
-  }
-
-  Tooltip.prototype.hide = function (callback) {
-    var that = this
-    var $tip = $(this.$tip)
-    var e    = $.Event('hide.bs.' + this.type)
-
-    function complete() {
-      if (that.hoverState != 'in') $tip.detach()
-      if (that.$element) { // TODO: Check whether guarding this code with this `if` is really necessary.
-        that.$element
-          .removeAttr('aria-describedby')
-          .trigger('hidden.bs.' + that.type)
-      }
-      callback && callback()
-    }
-
-    this.$element.trigger(e)
-
-    if (e.isDefaultPrevented()) return
-
-    $tip.removeClass('in')
-
-    $.support.transition && $tip.hasClass('fade') ?
-      $tip
-        .one('bsTransitionEnd', complete)
-        .emulateTransitionEnd(Tooltip.TRANSITION_DURATION) :
-      complete()
-
-    this.hoverState = null
-
-    return this
-  }
-
-  Tooltip.prototype.fixTitle = function () {
-    var $e = this.$element
-    if ($e.attr('title') || typeof $e.attr('data-original-title') != 'string') {
-      $e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
-    }
-  }
-
-  Tooltip.prototype.hasContent = function () {
-    return this.getTitle()
-  }
-
-  Tooltip.prototype.getPosition = function ($element) {
-    $element   = $element || this.$element
-
-    var el     = $element[0]
-    var isBody = el.tagName == 'BODY'
-
-    var elRect    = el.getBoundingClientRect()
-    if (elRect.width == null) {
-      // width and height are missing in IE8, so compute them manually; see https://github.com/twbs/bootstrap/issues/14093
-      elRect = $.extend({}, elRect, { width: elRect.right - elRect.left, height: elRect.bottom - elRect.top })
-    }
-    var isSvg = window.SVGElement && el instanceof window.SVGElement
-    // Avoid using $.offset() on SVGs since it gives incorrect results in jQuery 3.
-    // See https://github.com/twbs/bootstrap/issues/20280
-    var elOffset  = isBody ? { top: 0, left: 0 } : (isSvg ? null : $element.offset())
-    var scroll    = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() }
-    var outerDims = isBody ? { width: $(window).width(), height: $(window).height() } : null
-
-    return $.extend({}, elRect, scroll, outerDims, elOffset)
-  }
-
-  Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) {
-    return placement == 'bottom' ? { top: pos.top + pos.height,   left: pos.left + pos.width / 2 - actualWidth / 2 } :
-           placement == 'top'    ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } :
-           placement == 'left'   ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } :
-        /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width }
-
-  }
-
-  Tooltip.prototype.getViewportAdjustedDelta = function (placement, pos, actualWidth, actualHeight) {
-    var delta = { top: 0, left: 0 }
-    if (!this.$viewport) return delta
-
-    var viewportPadding = this.options.viewport && this.options.viewport.padding || 0
-    var viewportDimensions = this.getPosition(this.$viewport)
-
-    if (/right|left/.test(placement)) {
-      var topEdgeOffset    = pos.top - viewportPadding - viewportDimensions.scroll
-      var bottomEdgeOffset = pos.top + viewportPadding - viewportDimensions.scroll + actualHeight
-      if (topEdgeOffset < viewportDimensions.top) { // top overflow
-        delta.top = viewportDimensions.top - topEdgeOffset
-      } else if (bottomEdgeOffset > viewportDimensions.top + viewportDimensions.height) { // bottom overflow
-        delta.top = viewportDimensions.top + viewportDimensions.height - bottomEdgeOffset
-      }
-    } else {
-      var leftEdgeOffset  = pos.left - viewportPadding
-      var rightEdgeOffset = pos.left + viewportPadding + actualWidth
-      if (leftEdgeOffset < viewportDimensions.left) { // left overflow
-        delta.left = viewportDimensions.left - leftEdgeOffset
-      } else if (rightEdgeOffset > viewportDimensions.right) { // right overflow
-        delta.left = viewportDimensions.left + viewportDimensions.width - rightEdgeOffset
-      }
-    }
-
-    return delta
-  }
-
-  Tooltip.prototype.getTitle = function () {
-    var title
-    var $e = this.$element
-    var o  = this.options
-
-    title = $e.attr('data-original-title')
-      || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
-
-    return title
-  }
-
-  Tooltip.prototype.getUID = function (prefix) {
-    do prefix += ~~(Math.random() * 1000000)
-    while (document.getElementById(prefix))
-    return prefix
-  }
-
-  Tooltip.prototype.tip = function () {
-    if (!this.$tip) {
-      this.$tip = $(this.options.template)
-      if (this.$tip.length != 1) {
-        throw new Error(this.type + ' `template` option must consist of exactly 1 top-level element!')
-      }
-    }
-    return this.$tip
-  }
-
-  Tooltip.prototype.arrow = function () {
-    return (this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow'))
-  }
-
-  Tooltip.prototype.enable = function () {
-    this.enabled = true
-  }
-
-  Tooltip.prototype.disable = function () {
-    this.enabled = false
-  }
-
-  Tooltip.prototype.toggleEnabled = function () {
-    this.enabled = !this.enabled
-  }
-
-  Tooltip.prototype.toggle = function (e) {
-    var self = this
-    if (e) {
-      self = $(e.currentTarget).data('bs.' + this.type)
-      if (!self) {
-        self = new this.constructor(e.currentTarget, this.getDelegateOptions())
-        $(e.currentTarget).data('bs.' + this.type, self)
-      }
-    }
-
-    if (e) {
-      self.inState.click = !self.inState.click
-      if (self.isInStateTrue()) self.enter(self)
-      else self.leave(self)
-    } else {
-      self.tip().hasClass('in') ? self.leave(self) : self.enter(self)
-    }
-  }
-
-  Tooltip.prototype.destroy = function () {
-    var that = this
-    clearTimeout(this.timeout)
-    this.hide(function () {
-      that.$element.off('.' + that.type).removeData('bs.' + that.type)
-      if (that.$tip) {
-        that.$tip.detach()
-      }
-      that.$tip = null
-      that.$arrow = null
-      that.$viewport = null
-      that.$element = null
-    })
-  }
-
-
-  // TOOLTIP PLUGIN DEFINITION
-  // =========================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.tooltip')
-      var options = typeof option == 'object' && option
-
-      if (!data && /destroy|hide/.test(option)) return
-      if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  var old = $.fn.tooltip
-
-  $.fn.tooltip             = Plugin
-  $.fn.tooltip.Constructor = Tooltip
-
-
-  // TOOLTIP NO CONFLICT
-  // ===================
-
-  $.fn.tooltip.noConflict = function () {
-    $.fn.tooltip = old
-    return this
-  }
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: popover.js v3.3.7
- * http://getbootstrap.com/javascript/#popovers
- * ========================================================================
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // POPOVER PUBLIC CLASS DEFINITION
-  // ===============================
-
-  var Popover = function (element, options) {
-    this.init('popover', element, options)
-  }
-
-  if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
-
-  Popover.VERSION  = '3.3.7'
-
-  Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
-    placement: 'right',
-    trigger: 'click',
-    content: '',
-    template: ''
-  })
-
-
-  // NOTE: POPOVER EXTENDS tooltip.js
-  // ================================
-
-  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype)
-
-  Popover.prototype.constructor = Popover
-
-  Popover.prototype.getDefaults = function () {
-    return Popover.DEFAULTS
-  }
-
-  Popover.prototype.setContent = function () {
-    var $tip    = this.tip()
-    var title   = this.getTitle()
-    var content = this.getContent()
-
-    $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
-    $tip.find('.popover-content').children().detach().end()[ // we use append for html objects to maintain js events
-      this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text'
-    ](content)
-
-    $tip.removeClass('fade top bottom left right in')
-
-    // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do
-    // this manually by checking the contents.
-    if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide()
-  }
-
-  Popover.prototype.hasContent = function () {
-    return this.getTitle() || this.getContent()
-  }
-
-  Popover.prototype.getContent = function () {
-    var $e = this.$element
-    var o  = this.options
-
-    return $e.attr('data-content')
-      || (typeof o.content == 'function' ?
-            o.content.call($e[0]) :
-            o.content)
-  }
-
-  Popover.prototype.arrow = function () {
-    return (this.$arrow = this.$arrow || this.tip().find('.arrow'))
-  }
-
-
-  // POPOVER PLUGIN DEFINITION
-  // =========================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.popover')
-      var options = typeof option == 'object' && option
-
-      if (!data && /destroy|hide/.test(option)) return
-      if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  var old = $.fn.popover
-
-  $.fn.popover             = Plugin
-  $.fn.popover.Constructor = Popover
-
-
-  // POPOVER NO CONFLICT
-  // ===================
-
-  $.fn.popover.noConflict = function () {
-    $.fn.popover = old
-    return this
-  }
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: tab.js v3.3.7
- * http://getbootstrap.com/javascript/#tabs
- * ========================================================================
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // TAB CLASS DEFINITION
-  // ====================
-
-  var Tab = function (element) {
-    // jscs:disable requireDollarBeforejQueryAssignment
-    this.element = $(element)
-    // jscs:enable requireDollarBeforejQueryAssignment
-  }
-
-  Tab.VERSION = '3.3.7'
-
-  Tab.TRANSITION_DURATION = 150
-
-  Tab.prototype.show = function () {
-    var $this    = this.element
-    var $ul      = $this.closest('ul:not(.dropdown-menu)')
-    var selector = $this.data('target')
-
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
-    }
-
-    if ($this.parent('li').hasClass('active')) return
-
-    var $previous = $ul.find('.active:last a')
-    var hideEvent = $.Event('hide.bs.tab', {
-      relatedTarget: $this[0]
-    })
-    var showEvent = $.Event('show.bs.tab', {
-      relatedTarget: $previous[0]
-    })
-
-    $previous.trigger(hideEvent)
-    $this.trigger(showEvent)
-
-    if (showEvent.isDefaultPrevented() || hideEvent.isDefaultPrevented()) return
-
-    var $target = $(selector)
-
-    this.activate($this.closest('li'), $ul)
-    this.activate($target, $target.parent(), function () {
-      $previous.trigger({
-        type: 'hidden.bs.tab',
-        relatedTarget: $this[0]
-      })
-      $this.trigger({
-        type: 'shown.bs.tab',
-        relatedTarget: $previous[0]
-      })
-    })
-  }
-
-  Tab.prototype.activate = function (element, container, callback) {
-    var $active    = container.find('> .active')
-    var transition = callback
-      && $.support.transition
-      && ($active.length && $active.hasClass('fade') || !!container.find('> .fade').length)
-
-    function next() {
-      $active
-        .removeClass('active')
-        .find('> .dropdown-menu > .active')
-          .removeClass('active')
-        .end()
-        .find('[data-toggle="tab"]')
-          .attr('aria-expanded', false)
-
-      element
-        .addClass('active')
-        .find('[data-toggle="tab"]')
-          .attr('aria-expanded', true)
-
-      if (transition) {
-        element[0].offsetWidth // reflow for transition
-        element.addClass('in')
-      } else {
-        element.removeClass('fade')
-      }
-
-      if (element.parent('.dropdown-menu').length) {
-        element
-          .closest('li.dropdown')
-            .addClass('active')
-          .end()
-          .find('[data-toggle="tab"]')
-            .attr('aria-expanded', true)
-      }
-
-      callback && callback()
-    }
-
-    $active.length && transition ?
-      $active
-        .one('bsTransitionEnd', next)
-        .emulateTransitionEnd(Tab.TRANSITION_DURATION) :
-      next()
-
-    $active.removeClass('in')
-  }
-
-
-  // TAB PLUGIN DEFINITION
-  // =====================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this = $(this)
-      var data  = $this.data('bs.tab')
-
-      if (!data) $this.data('bs.tab', (data = new Tab(this)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  var old = $.fn.tab
-
-  $.fn.tab             = Plugin
-  $.fn.tab.Constructor = Tab
-
-
-  // TAB NO CONFLICT
-  // ===============
-
-  $.fn.tab.noConflict = function () {
-    $.fn.tab = old
-    return this
-  }
-
-
-  // TAB DATA-API
-  // ============
-
-  var clickHandler = function (e) {
-    e.preventDefault()
-    Plugin.call($(this), 'show')
-  }
-
-  $(document)
-    .on('click.bs.tab.data-api', '[data-toggle="tab"]', clickHandler)
-    .on('click.bs.tab.data-api', '[data-toggle="pill"]', clickHandler)
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: affix.js v3.3.7
- * http://getbootstrap.com/javascript/#affix
- * ========================================================================
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // AFFIX CLASS DEFINITION
-  // ======================
-
-  var Affix = function (element, options) {
-    this.options = $.extend({}, Affix.DEFAULTS, options)
-
-    this.$target = $(this.options.target)
-      .on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this))
-      .on('click.bs.affix.data-api',  $.proxy(this.checkPositionWithEventLoop, this))
-
-    this.$element     = $(element)
-    this.affixed      = null
-    this.unpin        = null
-    this.pinnedOffset = null
-
-    this.checkPosition()
-  }
-
-  Affix.VERSION  = '3.3.7'
-
-  Affix.RESET    = 'affix affix-top affix-bottom'
-
-  Affix.DEFAULTS = {
-    offset: 0,
-    target: window
-  }
-
-  Affix.prototype.getState = function (scrollHeight, height, offsetTop, offsetBottom) {
-    var scrollTop    = this.$target.scrollTop()
-    var position     = this.$element.offset()
-    var targetHeight = this.$target.height()
-
-    if (offsetTop != null && this.affixed == 'top') return scrollTop < offsetTop ? 'top' : false
-
-    if (this.affixed == 'bottom') {
-      if (offsetTop != null) return (scrollTop + this.unpin <= position.top) ? false : 'bottom'
-      return (scrollTop + targetHeight <= scrollHeight - offsetBottom) ? false : 'bottom'
-    }
-
-    var initializing   = this.affixed == null
-    var colliderTop    = initializing ? scrollTop : position.top
-    var colliderHeight = initializing ? targetHeight : height
-
-    if (offsetTop != null && scrollTop <= offsetTop) return 'top'
-    if (offsetBottom != null && (colliderTop + colliderHeight >= scrollHeight - offsetBottom)) return 'bottom'
-
-    return false
-  }
-
-  Affix.prototype.getPinnedOffset = function () {
-    if (this.pinnedOffset) return this.pinnedOffset
-    this.$element.removeClass(Affix.RESET).addClass('affix')
-    var scrollTop = this.$target.scrollTop()
-    var position  = this.$element.offset()
-    return (this.pinnedOffset = position.top - scrollTop)
-  }
-
-  Affix.prototype.checkPositionWithEventLoop = function () {
-    setTimeout($.proxy(this.checkPosition, this), 1)
-  }
-
-  Affix.prototype.checkPosition = function () {
-    if (!this.$element.is(':visible')) return
-
-    var height       = this.$element.height()
-    var offset       = this.options.offset
-    var offsetTop    = offset.top
-    var offsetBottom = offset.bottom
-    var scrollHeight = Math.max($(document).height(), $(document.body).height())
-
-    if (typeof offset != 'object')         offsetBottom = offsetTop = offset
-    if (typeof offsetTop == 'function')    offsetTop    = offset.top(this.$element)
-    if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element)
-
-    var affix = this.getState(scrollHeight, height, offsetTop, offsetBottom)
-
-    if (this.affixed != affix) {
-      if (this.unpin != null) this.$element.css('top', '')
-
-      var affixType = 'affix' + (affix ? '-' + affix : '')
-      var e         = $.Event(affixType + '.bs.affix')
-
-      this.$element.trigger(e)
-
-      if (e.isDefaultPrevented()) return
-
-      this.affixed = affix
-      this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null
-
-      this.$element
-        .removeClass(Affix.RESET)
-        .addClass(affixType)
-        .trigger(affixType.replace('affix', 'affixed') + '.bs.affix')
-    }
-
-    if (affix == 'bottom') {
-      this.$element.offset({
-        top: scrollHeight - height - offsetBottom
-      })
-    }
-  }
-
-
-  // AFFIX PLUGIN DEFINITION
-  // =======================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.affix')
-      var options = typeof option == 'object' && option
-
-      if (!data) $this.data('bs.affix', (data = new Affix(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  var old = $.fn.affix
-
-  $.fn.affix             = Plugin
-  $.fn.affix.Constructor = Affix
-
-
-  // AFFIX NO CONFLICT
-  // =================
-
-  $.fn.affix.noConflict = function () {
-    $.fn.affix = old
-    return this
-  }
-
-
-  // AFFIX DATA-API
-  // ==============
-
-  $(window).on('load', function () {
-    $('[data-spy="affix"]').each(function () {
-      var $spy = $(this)
-      var data = $spy.data()
-
-      data.offset = data.offset || {}
-
-      if (data.offsetBottom != null) data.offset.bottom = data.offsetBottom
-      if (data.offsetTop    != null) data.offset.top    = data.offsetTop
-
-      Plugin.call($spy, data)
-    })
-  })
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: collapse.js v3.3.7
- * http://getbootstrap.com/javascript/#collapse
- * ========================================================================
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-/* jshint latedef: false */
-
-+function ($) {
-  'use strict';
-
-  // COLLAPSE PUBLIC CLASS DEFINITION
-  // ================================
-
-  var Collapse = function (element, options) {
-    this.$element      = $(element)
-    this.options       = $.extend({}, Collapse.DEFAULTS, options)
-    this.$trigger      = $('[data-toggle="collapse"][href="#' + element.id + '"],' +
-                           '[data-toggle="collapse"][data-target="#' + element.id + '"]')
-    this.transitioning = null
-
-    if (this.options.parent) {
-      this.$parent = this.getParent()
-    } else {
-      this.addAriaAndCollapsedClass(this.$element, this.$trigger)
-    }
-
-    if (this.options.toggle) this.toggle()
-  }
-
-  Collapse.VERSION  = '3.3.7'
-
-  Collapse.TRANSITION_DURATION = 350
-
-  Collapse.DEFAULTS = {
-    toggle: true
-  }
-
-  Collapse.prototype.dimension = function () {
-    var hasWidth = this.$element.hasClass('width')
-    return hasWidth ? 'width' : 'height'
-  }
-
-  Collapse.prototype.show = function () {
-    if (this.transitioning || this.$element.hasClass('in')) return
-
-    var activesData
-    var actives = this.$parent && this.$parent.children('.panel').children('.in, .collapsing')
-
-    if (actives && actives.length) {
-      activesData = actives.data('bs.collapse')
-      if (activesData && activesData.transitioning) return
-    }
-
-    var startEvent = $.Event('show.bs.collapse')
-    this.$element.trigger(startEvent)
-    if (startEvent.isDefaultPrevented()) return
-
-    if (actives && actives.length) {
-      Plugin.call(actives, 'hide')
-      activesData || actives.data('bs.collapse', null)
-    }
-
-    var dimension = this.dimension()
-
-    this.$element
-      .removeClass('collapse')
-      .addClass('collapsing')[dimension](0)
-      .attr('aria-expanded', true)
-
-    this.$trigger
-      .removeClass('collapsed')
-      .attr('aria-expanded', true)
-
-    this.transitioning = 1
-
-    var complete = function () {
-      this.$element
-        .removeClass('collapsing')
-        .addClass('collapse in')[dimension]('')
-      this.transitioning = 0
-      this.$element
-        .trigger('shown.bs.collapse')
-    }
-
-    if (!$.support.transition) return complete.call(this)
-
-    var scrollSize = $.camelCase(['scroll', dimension].join('-'))
-
-    this.$element
-      .one('bsTransitionEnd', $.proxy(complete, this))
-      .emulateTransitionEnd(Collapse.TRANSITION_DURATION)[dimension](this.$element[0][scrollSize])
-  }
-
-  Collapse.prototype.hide = function () {
-    if (this.transitioning || !this.$element.hasClass('in')) return
-
-    var startEvent = $.Event('hide.bs.collapse')
-    this.$element.trigger(startEvent)
-    if (startEvent.isDefaultPrevented()) return
-
-    var dimension = this.dimension()
-
-    this.$element[dimension](this.$element[dimension]())[0].offsetHeight
-
-    this.$element
-      .addClass('collapsing')
-      .removeClass('collapse in')
-      .attr('aria-expanded', false)
-
-    this.$trigger
-      .addClass('collapsed')
-      .attr('aria-expanded', false)
-
-    this.transitioning = 1
-
-    var complete = function () {
-      this.transitioning = 0
-      this.$element
-        .removeClass('collapsing')
-        .addClass('collapse')
-        .trigger('hidden.bs.collapse')
-    }
-
-    if (!$.support.transition) return complete.call(this)
-
-    this.$element
-      [dimension](0)
-      .one('bsTransitionEnd', $.proxy(complete, this))
-      .emulateTransitionEnd(Collapse.TRANSITION_DURATION)
-  }
-
-  Collapse.prototype.toggle = function () {
-    this[this.$element.hasClass('in') ? 'hide' : 'show']()
-  }
-
-  Collapse.prototype.getParent = function () {
-    return $(this.options.parent)
-      .find('[data-toggle="collapse"][data-parent="' + this.options.parent + '"]')
-      .each($.proxy(function (i, element) {
-        var $element = $(element)
-        this.addAriaAndCollapsedClass(getTargetFromTrigger($element), $element)
-      }, this))
-      .end()
-  }
-
-  Collapse.prototype.addAriaAndCollapsedClass = function ($element, $trigger) {
-    var isOpen = $element.hasClass('in')
-
-    $element.attr('aria-expanded', isOpen)
-    $trigger
-      .toggleClass('collapsed', !isOpen)
-      .attr('aria-expanded', isOpen)
-  }
-
-  function getTargetFromTrigger($trigger) {
-    var href
-    var target = $trigger.attr('data-target')
-      || (href = $trigger.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') // strip for ie7
-
-    return $(target)
-  }
-
-
-  // COLLAPSE PLUGIN DEFINITION
-  // ==========================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.collapse')
-      var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
-
-      if (!data && options.toggle && /show|hide/.test(option)) options.toggle = false
-      if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  var old = $.fn.collapse
-
-  $.fn.collapse             = Plugin
-  $.fn.collapse.Constructor = Collapse
-
-
-  // COLLAPSE NO CONFLICT
-  // ====================
-
-  $.fn.collapse.noConflict = function () {
-    $.fn.collapse = old
-    return this
-  }
-
-
-  // COLLAPSE DATA-API
-  // =================
-
-  $(document).on('click.bs.collapse.data-api', '[data-toggle="collapse"]', function (e) {
-    var $this   = $(this)
-
-    if (!$this.attr('data-target')) e.preventDefault()
-
-    var $target = getTargetFromTrigger($this)
-    var data    = $target.data('bs.collapse')
-    var option  = data ? 'toggle' : $this.data()
-
-    Plugin.call($target, option)
-  })
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: scrollspy.js v3.3.7
- * http://getbootstrap.com/javascript/#scrollspy
- * ========================================================================
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // SCROLLSPY CLASS DEFINITION
-  // ==========================
-
-  function ScrollSpy(element, options) {
-    this.$body          = $(document.body)
-    this.$scrollElement = $(element).is(document.body) ? $(window) : $(element)
-    this.options        = $.extend({}, ScrollSpy.DEFAULTS, options)
-    this.selector       = (this.options.target || '') + ' .nav li > a'
-    this.offsets        = []
-    this.targets        = []
-    this.activeTarget   = null
-    this.scrollHeight   = 0
-
-    this.$scrollElement.on('scroll.bs.scrollspy', $.proxy(this.process, this))
-    this.refresh()
-    this.process()
-  }
-
-  ScrollSpy.VERSION  = '3.3.7'
-
-  ScrollSpy.DEFAULTS = {
-    offset: 10
-  }
-
-  ScrollSpy.prototype.getScrollHeight = function () {
-    return this.$scrollElement[0].scrollHeight || Math.max(this.$body[0].scrollHeight, document.documentElement.scrollHeight)
-  }
-
-  ScrollSpy.prototype.refresh = function () {
-    var that          = this
-    var offsetMethod  = 'offset'
-    var offsetBase    = 0
-
-    this.offsets      = []
-    this.targets      = []
-    this.scrollHeight = this.getScrollHeight()
-
-    if (!$.isWindow(this.$scrollElement[0])) {
-      offsetMethod = 'position'
-      offsetBase   = this.$scrollElement.scrollTop()
-    }
-
-    this.$body
-      .find(this.selector)
-      .map(function () {
-        var $el   = $(this)
-        var href  = $el.data('target') || $el.attr('href')
-        var $href = /^#./.test(href) && $(href)
-
-        return ($href
-          && $href.length
-          && $href.is(':visible')
-          && [[$href[offsetMethod]().top + offsetBase, href]]) || null
-      })
-      .sort(function (a, b) { return a[0] - b[0] })
-      .each(function () {
-        that.offsets.push(this[0])
-        that.targets.push(this[1])
-      })
-  }
-
-  ScrollSpy.prototype.process = function () {
-    var scrollTop    = this.$scrollElement.scrollTop() + this.options.offset
-    var scrollHeight = this.getScrollHeight()
-    var maxScroll    = this.options.offset + scrollHeight - this.$scrollElement.height()
-    var offsets      = this.offsets
-    var targets      = this.targets
-    var activeTarget = this.activeTarget
-    var i
-
-    if (this.scrollHeight != scrollHeight) {
-      this.refresh()
-    }
-
-    if (scrollTop >= maxScroll) {
-      return activeTarget != (i = targets[targets.length - 1]) && this.activate(i)
-    }
-
-    if (activeTarget && scrollTop < offsets[0]) {
-      this.activeTarget = null
-      return this.clear()
-    }
-
-    for (i = offsets.length; i--;) {
-      activeTarget != targets[i]
-        && scrollTop >= offsets[i]
-        && (offsets[i + 1] === undefined || scrollTop < offsets[i + 1])
-        && this.activate(targets[i])
-    }
-  }
-
-  ScrollSpy.prototype.activate = function (target) {
-    this.activeTarget = target
-
-    this.clear()
-
-    var selector = this.selector +
-      '[data-target="' + target + '"],' +
-      this.selector + '[href="' + target + '"]'
-
-    var active = $(selector)
-      .parents('li')
-      .addClass('active')
-
-    if (active.parent('.dropdown-menu').length) {
-      active = active
-        .closest('li.dropdown')
-        .addClass('active')
-    }
-
-    active.trigger('activate.bs.scrollspy')
-  }
-
-  ScrollSpy.prototype.clear = function () {
-    $(this.selector)
-      .parentsUntil(this.options.target, '.active')
-      .removeClass('active')
-  }
-
-
-  // SCROLLSPY PLUGIN DEFINITION
-  // ===========================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.scrollspy')
-      var options = typeof option == 'object' && option
-
-      if (!data) $this.data('bs.scrollspy', (data = new ScrollSpy(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  var old = $.fn.scrollspy
-
-  $.fn.scrollspy             = Plugin
-  $.fn.scrollspy.Constructor = ScrollSpy
-
-
-  // SCROLLSPY NO CONFLICT
-  // =====================
-
-  $.fn.scrollspy.noConflict = function () {
-    $.fn.scrollspy = old
-    return this
-  }
-
-
-  // SCROLLSPY DATA-API
-  // ==================
-
-  $(window).on('load.bs.scrollspy.data-api', function () {
-    $('[data-spy="scroll"]').each(function () {
-      var $spy = $(this)
-      Plugin.call($spy, $spy.data())
-    })
-  })
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: transition.js v3.3.7
- * http://getbootstrap.com/javascript/#transitions
- * ========================================================================
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
-  // ============================================================
-
-  function transitionEnd() {
-    var el = document.createElement('bootstrap')
-
-    var transEndEventNames = {
-      WebkitTransition : 'webkitTransitionEnd',
-      MozTransition    : 'transitionend',
-      OTransition      : 'oTransitionEnd otransitionend',
-      transition       : 'transitionend'
-    }
-
-    for (var name in transEndEventNames) {
-      if (el.style[name] !== undefined) {
-        return { end: transEndEventNames[name] }
-      }
-    }
-
-    return false // explicit for ie8 (  ._.)
-  }
-
-  // http://blog.alexmaccaw.com/css-transitions
-  $.fn.emulateTransitionEnd = function (duration) {
-    var called = false
-    var $el = this
-    $(this).one('bsTransitionEnd', function () { called = true })
-    var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
-    setTimeout(callback, duration)
-    return this
-  }
-
-  $(function () {
-    $.support.transition = transitionEnd()
-
-    if (!$.support.transition) return
-
-    $.event.special.bsTransitionEnd = {
-      bindType: $.support.transition.end,
-      delegateType: $.support.transition.end,
-      handle: function (e) {
-        if ($(e.target).is(this)) return e.handleObj.handler.apply(this, arguments)
-      }
-    }
-  })
-
-}(jQuery);
diff --git a/vid/src/main/webapp/app/vid/external/bootstrap/js/bootstrap.min.js b/vid/src/main/webapp/app/vid/external/bootstrap/js/bootstrap.min.js
deleted file mode 100644
index 7e4fb0d59..000000000
--- a/vid/src/main/webapp/app/vid/external/bootstrap/js/bootstrap.min.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*!
- * Bootstrap v3.3.7 (http://getbootstrap.com)
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */
-
-/*!
- * Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=a8e01e20fdf5ffe2a0df475294b45f64)
- * Config saved to config.json and https://gist.github.com/a8e01e20fdf5ffe2a0df475294b45f64
- */
-if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(t){"use strict";var e=t.fn.jquery.split(" ")[0].split(".");if(e[0]<2&&e[1]<9||1==e[0]&&9==e[1]&&e[2]<1||e[0]>3)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher, but lower than version 4")}(jQuery),+function(t){"use strict";function e(e){return this.each(function(){var i=t(this),n=i.data("bs.alert");n||i.data("bs.alert",n=new o(this)),"string"==typeof e&&n[e].call(i)})}var i='[data-dismiss="alert"]',o=function(e){t(e).on("click",i,this.close)};o.VERSION="3.3.7",o.TRANSITION_DURATION=150,o.prototype.close=function(e){function i(){a.detach().trigger("closed.bs.alert").remove()}var n=t(this),s=n.attr("data-target");s||(s=n.attr("href"),s=s&&s.replace(/.*(?=#[^\s]*$)/,""));var a=t("#"===s?[]:s);e&&e.preventDefault(),a.length||(a=n.closest(".alert")),a.trigger(e=t.Event("close.bs.alert")),e.isDefaultPrevented()||(a.removeClass("in"),t.support.transition&&a.hasClass("fade")?a.one("bsTransitionEnd",i).emulateTransitionEnd(o.TRANSITION_DURATION):i())};var n=t.fn.alert;t.fn.alert=e,t.fn.alert.Constructor=o,t.fn.alert.noConflict=function(){return t.fn.alert=n,this},t(document).on("click.bs.alert.data-api",i,o.prototype.close)}(jQuery),+function(t){"use strict";function e(e){return this.each(function(){var o=t(this),n=o.data("bs.button"),s="object"==typeof e&&e;n||o.data("bs.button",n=new i(this,s)),"toggle"==e?n.toggle():e&&n.setState(e)})}var i=function(e,o){this.$element=t(e),this.options=t.extend({},i.DEFAULTS,o),this.isLoading=!1};i.VERSION="3.3.7",i.DEFAULTS={loadingText:"loading..."},i.prototype.setState=function(e){var i="disabled",o=this.$element,n=o.is("input")?"val":"html",s=o.data();e+="Text",null==s.resetText&&o.data("resetText",o[n]()),setTimeout(t.proxy(function(){o[n](null==s[e]?this.options[e]:s[e]),"loadingText"==e?(this.isLoading=!0,o.addClass(i).attr(i,i).prop(i,!0)):this.isLoading&&(this.isLoading=!1,o.removeClass(i).removeAttr(i).prop(i,!1))},this),0)},i.prototype.toggle=function(){var t=!0,e=this.$element.closest('[data-toggle="buttons"]');if(e.length){var i=this.$element.find("input");"radio"==i.prop("type")?(i.prop("checked")&&(t=!1),e.find(".active").removeClass("active"),this.$element.addClass("active")):"checkbox"==i.prop("type")&&(i.prop("checked")!==this.$element.hasClass("active")&&(t=!1),this.$element.toggleClass("active")),i.prop("checked",this.$element.hasClass("active")),t&&i.trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active")),this.$element.toggleClass("active")};var o=t.fn.button;t.fn.button=e,t.fn.button.Constructor=i,t.fn.button.noConflict=function(){return t.fn.button=o,this},t(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(i){var o=t(i.target).closest(".btn");e.call(o,"toggle"),t(i.target).is('input[type="radio"], input[type="checkbox"]')||(i.preventDefault(),o.is("input,button")?o.trigger("focus"):o.find("input:visible,button:visible").first().trigger("focus"))}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(e){t(e.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(e.type))})}(jQuery),+function(t){"use strict";function e(e){return this.each(function(){var o=t(this),n=o.data("bs.carousel"),s=t.extend({},i.DEFAULTS,o.data(),"object"==typeof e&&e),a="string"==typeof e?e:s.slide;n||o.data("bs.carousel",n=new i(this,s)),"number"==typeof e?n.to(e):a?n[a]():s.interval&&n.pause().cycle()})}var i=function(e,i){this.$element=t(e),this.$indicators=this.$element.find(".carousel-indicators"),this.options=i,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",t.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",t.proxy(this.pause,this)).on("mouseleave.bs.carousel",t.proxy(this.cycle,this))};i.VERSION="3.3.7",i.TRANSITION_DURATION=600,i.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},i.prototype.keydown=function(t){if(!/input|textarea/i.test(t.target.tagName)){switch(t.which){case 37:this.prev();break;case 39:this.next();break;default:return}t.preventDefault()}},i.prototype.cycle=function(e){return e||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(t.proxy(this.next,this),this.options.interval)),this},i.prototype.getItemIndex=function(t){return this.$items=t.parent().children(".item"),this.$items.index(t||this.$active)},i.prototype.getItemForDirection=function(t,e){var i=this.getItemIndex(e),o="prev"==t&&0===i||"next"==t&&i==this.$items.length-1;if(o&&!this.options.wrap)return e;var n="prev"==t?-1:1,s=(i+n)%this.$items.length;return this.$items.eq(s)},i.prototype.to=function(t){var e=this,i=this.getItemIndex(this.$active=this.$element.find(".item.active"));return t>this.$items.length-1||0>t?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){e.to(t)}):i==t?this.pause().cycle():this.slide(t>i?"next":"prev",this.$items.eq(t))},i.prototype.pause=function(e){return e||(this.paused=!0),this.$element.find(".next, .prev").length&&t.support.transition&&(this.$element.trigger(t.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},i.prototype.next=function(){return this.sliding?void 0:this.slide("next")},i.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},i.prototype.slide=function(e,o){var n=this.$element.find(".item.active"),s=o||this.getItemForDirection(e,n),a=this.interval,r="next"==e?"left":"right",l=this;if(s.hasClass("active"))return this.sliding=!1;var h=s[0],d=t.Event("slide.bs.carousel",{relatedTarget:h,direction:r});if(this.$element.trigger(d),!d.isDefaultPrevented()){if(this.sliding=!0,a&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var p=t(this.$indicators.children()[this.getItemIndex(s)]);p&&p.addClass("active")}var c=t.Event("slid.bs.carousel",{relatedTarget:h,direction:r});return t.support.transition&&this.$element.hasClass("slide")?(s.addClass(e),s[0].offsetWidth,n.addClass(r),s.addClass(r),n.one("bsTransitionEnd",function(){s.removeClass([e,r].join(" ")).addClass("active"),n.removeClass(["active",r].join(" ")),l.sliding=!1,setTimeout(function(){l.$element.trigger(c)},0)}).emulateTransitionEnd(i.TRANSITION_DURATION)):(n.removeClass("active"),s.addClass("active"),this.sliding=!1,this.$element.trigger(c)),a&&this.cycle(),this}};var o=t.fn.carousel;t.fn.carousel=e,t.fn.carousel.Constructor=i,t.fn.carousel.noConflict=function(){return t.fn.carousel=o,this};var n=function(i){var o,n=t(this),s=t(n.attr("data-target")||(o=n.attr("href"))&&o.replace(/.*(?=#[^\s]+$)/,""));if(s.hasClass("carousel")){var a=t.extend({},s.data(),n.data()),r=n.attr("data-slide-to");r&&(a.interval=!1),e.call(s,a),r&&s.data("bs.carousel").to(r),i.preventDefault()}};t(document).on("click.bs.carousel.data-api","[data-slide]",n).on("click.bs.carousel.data-api","[data-slide-to]",n),t(window).on("load",function(){t('[data-ride="carousel"]').each(function(){var i=t(this);e.call(i,i.data())})})}(jQuery),+function(t){"use strict";function e(e){var i=e.attr("data-target");i||(i=e.attr("href"),i=i&&/#[A-Za-z]/.test(i)&&i.replace(/.*(?=#[^\s]*$)/,""));var o=i&&t(i);return o&&o.length?o:e.parent()}function i(i){i&&3===i.which||(t(n).remove(),t(s).each(function(){var o=t(this),n=e(o),s={relatedTarget:this};n.hasClass("open")&&(i&&"click"==i.type&&/input|textarea/i.test(i.target.tagName)&&t.contains(n[0],i.target)||(n.trigger(i=t.Event("hide.bs.dropdown",s)),i.isDefaultPrevented()||(o.attr("aria-expanded","false"),n.removeClass("open").trigger(t.Event("hidden.bs.dropdown",s)))))}))}function o(e){return this.each(function(){var i=t(this),o=i.data("bs.dropdown");o||i.data("bs.dropdown",o=new a(this)),"string"==typeof e&&o[e].call(i)})}var n=".dropdown-backdrop",s='[data-toggle="dropdown"]',a=function(e){t(e).on("click.bs.dropdown",this.toggle)};a.VERSION="3.3.7",a.prototype.toggle=function(o){var n=t(this);if(!n.is(".disabled, :disabled")){var s=e(n),a=s.hasClass("open");if(i(),!a){"ontouchstart"in document.documentElement&&!s.closest(".navbar-nav").length&&t(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(t(this)).on("click",i);var r={relatedTarget:this};if(s.trigger(o=t.Event("show.bs.dropdown",r)),o.isDefaultPrevented())return;n.trigger("focus").attr("aria-expanded","true"),s.toggleClass("open").trigger(t.Event("shown.bs.dropdown",r))}return!1}},a.prototype.keydown=function(i){if(/(38|40|27|32)/.test(i.which)&&!/input|textarea/i.test(i.target.tagName)){var o=t(this);if(i.preventDefault(),i.stopPropagation(),!o.is(".disabled, :disabled")){var n=e(o),a=n.hasClass("open");if(!a&&27!=i.which||a&&27==i.which)return 27==i.which&&n.find(s).trigger("focus"),o.trigger("click");var r=" li:not(.disabled):visible a",l=n.find(".dropdown-menu"+r);if(l.length){var h=l.index(i.target);38==i.which&&h>0&&h--,40==i.which&&hdocument.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&t?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!t?this.scrollbarWidth:""})},i.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},i.prototype.checkScrollbar=function(){var t=window.innerWidth;if(!t){var e=document.documentElement.getBoundingClientRect();t=e.right-Math.abs(e.left)}this.bodyIsOverflowing=document.body.clientWidth
      ',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},i.prototype.init=function(e,i,o){if(this.enabled=!0,this.type=e,this.$element=t(i),this.options=this.getOptions(o),this.$viewport=this.options.viewport&&t(t.isFunction(this.options.viewport)?this.options.viewport.call(this,this.$element):this.options.viewport.selector||this.options.viewport),this.inState={click:!1,hover:!1,focus:!1},this.$element[0]instanceof document.constructor&&!this.options.selector)throw new Error("`selector` option must be specified when initializing "+this.type+" on the window.document object!");for(var n=this.options.trigger.split(" "),s=n.length;s--;){var a=n[s];if("click"==a)this.$element.on("click."+this.type,this.options.selector,t.proxy(this.toggle,this));else if("manual"!=a){var r="hover"==a?"mouseenter":"focusin",l="hover"==a?"mouseleave":"focusout";this.$element.on(r+"."+this.type,this.options.selector,t.proxy(this.enter,this)),this.$element.on(l+"."+this.type,this.options.selector,t.proxy(this.leave,this))}}this.options.selector?this._options=t.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},i.prototype.getDefaults=function(){return i.DEFAULTS},i.prototype.getOptions=function(e){return e=t.extend({},this.getDefaults(),this.$element.data(),e),e.delay&&"number"==typeof e.delay&&(e.delay={show:e.delay,hide:e.delay}),e},i.prototype.getDelegateOptions=function(){var e={},i=this.getDefaults();return this._options&&t.each(this._options,function(t,o){i[t]!=o&&(e[t]=o)}),e},i.prototype.enter=function(e){var i=e instanceof this.constructor?e:t(e.currentTarget).data("bs."+this.type);return i||(i=new this.constructor(e.currentTarget,this.getDelegateOptions()),t(e.currentTarget).data("bs."+this.type,i)),e instanceof t.Event&&(i.inState["focusin"==e.type?"focus":"hover"]=!0),i.tip().hasClass("in")||"in"==i.hoverState?void(i.hoverState="in"):(clearTimeout(i.timeout),i.hoverState="in",i.options.delay&&i.options.delay.show?void(i.timeout=setTimeout(function(){"in"==i.hoverState&&i.show()},i.options.delay.show)):i.show())},i.prototype.isInStateTrue=function(){for(var t in this.inState)if(this.inState[t])return!0;return!1},i.prototype.leave=function(e){var i=e instanceof this.constructor?e:t(e.currentTarget).data("bs."+this.type);return i||(i=new this.constructor(e.currentTarget,this.getDelegateOptions()),t(e.currentTarget).data("bs."+this.type,i)),e instanceof t.Event&&(i.inState["focusout"==e.type?"focus":"hover"]=!1),i.isInStateTrue()?void 0:(clearTimeout(i.timeout),i.hoverState="out",i.options.delay&&i.options.delay.hide?void(i.timeout=setTimeout(function(){"out"==i.hoverState&&i.hide()},i.options.delay.hide)):i.hide())},i.prototype.show=function(){var e=t.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(e);var o=t.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(e.isDefaultPrevented()||!o)return;var n=this,s=this.tip(),a=this.getUID(this.type);this.setContent(),s.attr("id",a),this.$element.attr("aria-describedby",a),this.options.animation&&s.addClass("fade");var r="function"==typeof this.options.placement?this.options.placement.call(this,s[0],this.$element[0]):this.options.placement,l=/\s?auto?\s?/i,h=l.test(r);h&&(r=r.replace(l,"")||"top"),s.detach().css({top:0,left:0,display:"block"}).addClass(r).data("bs."+this.type,this),this.options.container?s.appendTo(this.options.container):s.insertAfter(this.$element),this.$element.trigger("inserted.bs."+this.type);var d=this.getPosition(),p=s[0].offsetWidth,c=s[0].offsetHeight;if(h){var f=r,u=this.getPosition(this.$viewport);r="bottom"==r&&d.bottom+c>u.bottom?"top":"top"==r&&d.top-cu.width?"left":"left"==r&&d.left-pa.top+a.height&&(n.top=a.top+a.height-l)}else{var h=e.left-s,d=e.left+s+i;ha.right&&(n.left=a.left+a.width-d)}return n},i.prototype.getTitle=function(){var t,e=this.$element,i=this.options;return t=e.attr("data-original-title")||("function"==typeof i.title?i.title.call(e[0]):i.title)},i.prototype.getUID=function(t){do t+=~~(1e6*Math.random());while(document.getElementById(t));return t},i.prototype.tip=function(){if(!this.$tip&&(this.$tip=t(this.options.template),1!=this.$tip.length))throw new Error(this.type+" `template` option must consist of exactly 1 top-level element!");return this.$tip},i.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},i.prototype.enable=function(){this.enabled=!0},i.prototype.disable=function(){this.enabled=!1},i.prototype.toggleEnabled=function(){this.enabled=!this.enabled},i.prototype.toggle=function(e){var i=this;e&&(i=t(e.currentTarget).data("bs."+this.type),i||(i=new this.constructor(e.currentTarget,this.getDelegateOptions()),t(e.currentTarget).data("bs."+this.type,i))),e?(i.inState.click=!i.inState.click,i.isInStateTrue()?i.enter(i):i.leave(i)):i.tip().hasClass("in")?i.leave(i):i.enter(i)},i.prototype.destroy=function(){var t=this;clearTimeout(this.timeout),this.hide(function(){t.$element.off("."+t.type).removeData("bs."+t.type),t.$tip&&t.$tip.detach(),t.$tip=null,t.$arrow=null,t.$viewport=null,t.$element=null})};var o=t.fn.tooltip;t.fn.tooltip=e,t.fn.tooltip.Constructor=i,t.fn.tooltip.noConflict=function(){return t.fn.tooltip=o,this}}(jQuery),+function(t){"use strict";function e(e){return this.each(function(){var o=t(this),n=o.data("bs.popover"),s="object"==typeof e&&e;!n&&/destroy|hide/.test(e)||(n||o.data("bs.popover",n=new i(this,s)),"string"==typeof e&&n[e]())})}var i=function(t,e){this.init("popover",t,e)};if(!t.fn.tooltip)throw new Error("Popover requires tooltip.js");i.VERSION="3.3.7",i.DEFAULTS=t.extend({},t.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:''}),i.prototype=t.extend({},t.fn.tooltip.Constructor.prototype),i.prototype.constructor=i,i.prototype.getDefaults=function(){return i.DEFAULTS},i.prototype.setContent=function(){var t=this.tip(),e=this.getTitle(),i=this.getContent();t.find(".popover-title")[this.options.html?"html":"text"](e),t.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof i?"html":"append":"text"](i),t.removeClass("fade top bottom left right in"),t.find(".popover-title").html()||t.find(".popover-title").hide()},i.prototype.hasContent=function(){return this.getTitle()||this.getContent()},i.prototype.getContent=function(){var t=this.$element,e=this.options;return t.attr("data-content")||("function"==typeof e.content?e.content.call(t[0]):e.content)},i.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};var o=t.fn.popover;t.fn.popover=e,t.fn.popover.Constructor=i,t.fn.popover.noConflict=function(){return t.fn.popover=o,this}}(jQuery),+function(t){"use strict";function e(e){return this.each(function(){var o=t(this),n=o.data("bs.tab");n||o.data("bs.tab",n=new i(this)),"string"==typeof e&&n[e]()})}var i=function(e){this.element=t(e)};i.VERSION="3.3.7",i.TRANSITION_DURATION=150,i.prototype.show=function(){var e=this.element,i=e.closest("ul:not(.dropdown-menu)"),o=e.data("target");if(o||(o=e.attr("href"),o=o&&o.replace(/.*(?=#[^\s]*$)/,"")),!e.parent("li").hasClass("active")){var n=i.find(".active:last a"),s=t.Event("hide.bs.tab",{relatedTarget:e[0]}),a=t.Event("show.bs.tab",{relatedTarget:n[0]});if(n.trigger(s),e.trigger(a),!a.isDefaultPrevented()&&!s.isDefaultPrevented()){var r=t(o);this.activate(e.closest("li"),i),this.activate(r,r.parent(),function(){n.trigger({type:"hidden.bs.tab",relatedTarget:e[0]}),e.trigger({type:"shown.bs.tab",relatedTarget:n[0]})})}}},i.prototype.activate=function(e,o,n){function s(){a.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),e.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),r?(e[0].offsetWidth,e.addClass("in")):e.removeClass("fade"),e.parent(".dropdown-menu").length&&e.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),n&&n()}var a=o.find("> .active"),r=n&&t.support.transition&&(a.length&&a.hasClass("fade")||!!o.find("> .fade").length);a.length&&r?a.one("bsTransitionEnd",s).emulateTransitionEnd(i.TRANSITION_DURATION):s(),a.removeClass("in")};var o=t.fn.tab;t.fn.tab=e,t.fn.tab.Constructor=i,t.fn.tab.noConflict=function(){return t.fn.tab=o,this};var n=function(i){i.preventDefault(),e.call(t(this),"show")};t(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',n).on("click.bs.tab.data-api",'[data-toggle="pill"]',n)}(jQuery),+function(t){"use strict";function e(e){return this.each(function(){var o=t(this),n=o.data("bs.affix"),s="object"==typeof e&&e;n||o.data("bs.affix",n=new i(this,s)),"string"==typeof e&&n[e]()})}var i=function(e,o){this.options=t.extend({},i.DEFAULTS,o),this.$target=t(this.options.target).on("scroll.bs.affix.data-api",t.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",t.proxy(this.checkPositionWithEventLoop,this)),this.$element=t(e),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};i.VERSION="3.3.7",i.RESET="affix affix-top affix-bottom",i.DEFAULTS={offset:0,target:window},i.prototype.getState=function(t,e,i,o){var n=this.$target.scrollTop(),s=this.$element.offset(),a=this.$target.height();if(null!=i&&"top"==this.affixed)return i>n?"top":!1;if("bottom"==this.affixed)return null!=i?n+this.unpin<=s.top?!1:"bottom":t-o>=n+a?!1:"bottom";var r=null==this.affixed,l=r?n:s.top,h=r?a:e;return null!=i&&i>=n?"top":null!=o&&l+h>=t-o?"bottom":!1},i.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(i.RESET).addClass("affix");var t=this.$target.scrollTop(),e=this.$element.offset();return this.pinnedOffset=e.top-t},i.prototype.checkPositionWithEventLoop=function(){setTimeout(t.proxy(this.checkPosition,this),1)},i.prototype.checkPosition=function(){if(this.$element.is(":visible")){var e=this.$element.height(),o=this.options.offset,n=o.top,s=o.bottom,a=Math.max(t(document).height(),t(document.body).height());"object"!=typeof o&&(s=n=o),"function"==typeof n&&(n=o.top(this.$element)),"function"==typeof s&&(s=o.bottom(this.$element));var r=this.getState(a,e,n,s);if(this.affixed!=r){null!=this.unpin&&this.$element.css("top","");var l="affix"+(r?"-"+r:""),h=t.Event(l+".bs.affix");if(this.$element.trigger(h),h.isDefaultPrevented())return;this.affixed=r,this.unpin="bottom"==r?this.getPinnedOffset():null,this.$element.removeClass(i.RESET).addClass(l).trigger(l.replace("affix","affixed")+".bs.affix")}"bottom"==r&&this.$element.offset({top:a-e-s})}};var o=t.fn.affix;t.fn.affix=e,t.fn.affix.Constructor=i,t.fn.affix.noConflict=function(){return t.fn.affix=o,this},t(window).on("load",function(){t('[data-spy="affix"]').each(function(){var i=t(this),o=i.data();o.offset=o.offset||{},null!=o.offsetBottom&&(o.offset.bottom=o.offsetBottom),null!=o.offsetTop&&(o.offset.top=o.offsetTop),e.call(i,o)})})}(jQuery),+function(t){"use strict";function e(e){var i,o=e.attr("data-target")||(i=e.attr("href"))&&i.replace(/.*(?=#[^\s]+$)/,"");return t(o)}function i(e){return this.each(function(){var i=t(this),n=i.data("bs.collapse"),s=t.extend({},o.DEFAULTS,i.data(),"object"==typeof e&&e);!n&&s.toggle&&/show|hide/.test(e)&&(s.toggle=!1),n||i.data("bs.collapse",n=new o(this,s)),"string"==typeof e&&n[e]()})}var o=function(e,i){this.$element=t(e),this.options=t.extend({},o.DEFAULTS,i),this.$trigger=t('[data-toggle="collapse"][href="#'+e.id+'"],[data-toggle="collapse"][data-target="#'+e.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};o.VERSION="3.3.7",o.TRANSITION_DURATION=350,o.DEFAULTS={toggle:!0},o.prototype.dimension=function(){var t=this.$element.hasClass("width");return t?"width":"height"},o.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var e,n=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing");if(!(n&&n.length&&(e=n.data("bs.collapse"),e&&e.transitioning))){var s=t.Event("show.bs.collapse");if(this.$element.trigger(s),!s.isDefaultPrevented()){n&&n.length&&(i.call(n,"hide"),e||n.data("bs.collapse",null));var a=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[a](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var r=function(){this.$element.removeClass("collapsing").addClass("collapse in")[a](""),this.transitioning=0,
-this.$element.trigger("shown.bs.collapse")};if(!t.support.transition)return r.call(this);var l=t.camelCase(["scroll",a].join("-"));this.$element.one("bsTransitionEnd",t.proxy(r,this)).emulateTransitionEnd(o.TRANSITION_DURATION)[a](this.$element[0][l])}}}},o.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var e=t.Event("hide.bs.collapse");if(this.$element.trigger(e),!e.isDefaultPrevented()){var i=this.dimension();this.$element[i](this.$element[i]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var n=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};return t.support.transition?void this.$element[i](0).one("bsTransitionEnd",t.proxy(n,this)).emulateTransitionEnd(o.TRANSITION_DURATION):n.call(this)}}},o.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},o.prototype.getParent=function(){return t(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(t.proxy(function(i,o){var n=t(o);this.addAriaAndCollapsedClass(e(n),n)},this)).end()},o.prototype.addAriaAndCollapsedClass=function(t,e){var i=t.hasClass("in");t.attr("aria-expanded",i),e.toggleClass("collapsed",!i).attr("aria-expanded",i)};var n=t.fn.collapse;t.fn.collapse=i,t.fn.collapse.Constructor=o,t.fn.collapse.noConflict=function(){return t.fn.collapse=n,this},t(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(o){var n=t(this);n.attr("data-target")||o.preventDefault();var s=e(n),a=s.data("bs.collapse"),r=a?"toggle":n.data();i.call(s,r)})}(jQuery),+function(t){"use strict";function e(i,o){this.$body=t(document.body),this.$scrollElement=t(t(i).is(document.body)?window:i),this.options=t.extend({},e.DEFAULTS,o),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",t.proxy(this.process,this)),this.refresh(),this.process()}function i(i){return this.each(function(){var o=t(this),n=o.data("bs.scrollspy"),s="object"==typeof i&&i;n||o.data("bs.scrollspy",n=new e(this,s)),"string"==typeof i&&n[i]()})}e.VERSION="3.3.7",e.DEFAULTS={offset:10},e.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},e.prototype.refresh=function(){var e=this,i="offset",o=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),t.isWindow(this.$scrollElement[0])||(i="position",o=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var e=t(this),n=e.data("target")||e.attr("href"),s=/^#./.test(n)&&t(n);return s&&s.length&&s.is(":visible")&&[[s[i]().top+o,n]]||null}).sort(function(t,e){return t[0]-e[0]}).each(function(){e.offsets.push(this[0]),e.targets.push(this[1])})},e.prototype.process=function(){var t,e=this.$scrollElement.scrollTop()+this.options.offset,i=this.getScrollHeight(),o=this.options.offset+i-this.$scrollElement.height(),n=this.offsets,s=this.targets,a=this.activeTarget;if(this.scrollHeight!=i&&this.refresh(),e>=o)return a!=(t=s[s.length-1])&&this.activate(t);if(a&&e=n[t]&&(void 0===n[t+1]||e -1;
-        };
-
-        $scope.prev = function () {
-          var index = $scope.index();
-          if (index > 0) {
-            return $scope.siblings()[index - 1];
-          }
-          return null;
-        };
-
-        $scope.siblings = function () {
-          return $scope.$parentNodesScope.childNodes();
-        };
-
-        $scope.childNodesCount = function () {
-          return $scope.childNodes() ? $scope.childNodes().length : 0;
-        };
-
-        $scope.hasChild = function () {
-          return $scope.childNodesCount() > 0;
-        };
-
-        $scope.childNodes = function () {
-          return $scope.$childNodesScope && $scope.$childNodesScope.$modelValue ?
-            $scope.$childNodesScope.childNodes() :
-            null;
-        };
-
-        $scope.accept = function (sourceNode, destIndex) {
-          return $scope.$childNodesScope &&
-            $scope.$childNodesScope.$modelValue &&
-            $scope.$childNodesScope.accept(sourceNode, destIndex);
-        };
-
-        $scope.remove = function () {
-          return $scope.$parentNodesScope.removeNode($scope);
-        };
-
-        $scope.toggle = function () {
-          $scope.collapsed = !$scope.collapsed;
-          $scope.$treeScope.$callbacks.toggle($scope.collapsed, $scope);
-        };
-
-        $scope.collapse = function () {
-          $scope.collapsed = true;
-        };
-
-        $scope.expand = function () {
-          $scope.collapsed = false;
-        };
-
-        $scope.depth = function () {
-          var parentNode = $scope.$parentNodeScope;
-          if (parentNode) {
-            return parentNode.depth() + 1;
-          }
-          return 1;
-        };
-
-        /**
-        * Returns the depth of the deepest subtree under this node
-        * @param scope a TreeNodesController scope object
-        * @returns Depth of all nodes *beneath* this node. If scope belongs to a leaf node, the
-        *   result is 0 (it has no subtree).
-        */
-        function countSubTreeDepth(scope) {
-          var thisLevelDepth = 0,
-              childNodes = scope.childNodes(),
-              childNode,
-              childDepth,
-              i;
-          if (!childNodes || childNodes.length === 0) {
-            return 0;
-          }
-          for (i = childNodes.length - 1; i >= 0 ; i--) {
-            childNode = childNodes[i],
-            childDepth = 1 + countSubTreeDepth(childNode);
-            thisLevelDepth = Math.max(thisLevelDepth, childDepth);
-          }
-          return thisLevelDepth;
-        }
-
-        $scope.maxSubDepth = function () {
-          return $scope.$childNodesScope ? countSubTreeDepth($scope.$childNodesScope) : 0;
-        };
-      }
-    ]);
-})();
-
-(function () {
-  'use strict';
-
-  angular.module('ui.tree')
-
-    .controller('TreeNodesController', ['$scope', '$element',
-      function ($scope, $element) {
-        this.scope = $scope;
-
-        $scope.$element = $element;
-        $scope.$modelValue = null;
-        $scope.$nodeScope = null; // the scope of node which the nodes belongs to
-        $scope.$treeScope = null;
-        $scope.$type = 'uiTreeNodes';
-        $scope.$nodesMap = {};
-
-        $scope.nodropEnabled = false;
-        $scope.maxDepth = 0;
-        $scope.cloneEnabled = false;
-
-        $scope.initSubNode = function (subNode) {
-          if (!subNode.$modelValue) {
-            return null;
-          }
-          $scope.$nodesMap[subNode.$modelValue.$$hashKey] = subNode;
-        };
-
-        $scope.destroySubNode = function (subNode) {
-          if (!subNode.$modelValue) {
-            return null;
-          }
-          $scope.$nodesMap[subNode.$modelValue.$$hashKey] = null;
-        };
-
-        $scope.accept = function (sourceNode, destIndex) {
-          return $scope.$treeScope.$callbacks.accept(sourceNode, $scope, destIndex);
-        };
-
-        $scope.beforeDrag = function (sourceNode) {
-          return $scope.$treeScope.$callbacks.beforeDrag(sourceNode);
-        };
-
-        $scope.isParent = function (node) {
-          return node.$parentNodesScope == $scope;
-        };
-
-        $scope.hasChild = function () {
-          return $scope.$modelValue.length > 0;
-        };
-
-        $scope.safeApply = function (fn) {
-          var phase = this.$root.$$phase;
-          if (phase == '$apply' || phase == '$digest') {
-            if (fn && (typeof (fn) === 'function')) {
-              fn();
-            }
-          } else {
-            this.$apply(fn);
-          }
-        };
-
-        $scope.removeNode = function (node) {
-          var index = $scope.$modelValue.indexOf(node.$modelValue);
-          if (index > -1) {
-            $scope.safeApply(function () {
-              $scope.$modelValue.splice(index, 1)[0];
-            });
-            return $scope.$treeScope.$callbacks.removed(node);
-          }
-          return null;
-        };
-
-        $scope.insertNode = function (index, nodeData) {
-          $scope.safeApply(function () {
-            $scope.$modelValue.splice(index, 0, nodeData);
-          });
-        };
-
-        $scope.childNodes = function () {
-          var i, nodes = [];
-          if ($scope.$modelValue) {
-            for (i = 0; i < $scope.$modelValue.length; i++) {
-              nodes.push($scope.$nodesMap[$scope.$modelValue[i].$$hashKey]);
-            }
-          }
-          return nodes;
-        };
-
-        $scope.depth = function () {
-          if ($scope.$nodeScope) {
-            return $scope.$nodeScope.depth();
-          }
-          return 0; // if it has no $nodeScope, it's root
-        };
-
-        // check if depth limit has reached
-        $scope.outOfDepth = function (sourceNode) {
-          var maxDepth = $scope.maxDepth || $scope.$treeScope.maxDepth;
-          if (maxDepth > 0) {
-            return $scope.depth() + sourceNode.maxSubDepth() + 1 > maxDepth;
-          }
-          return false;
-        };
-
-      }
-    ]);
-})();
-
-(function () {
-  'use strict';
-
-  angular.module('ui.tree')
-
-    .controller('TreeController', ['$scope', '$element',
-      function ($scope, $element) {
-        this.scope = $scope;
-
-        $scope.$element = $element;
-        $scope.$nodesScope = null; // root nodes
-        $scope.$type = 'uiTree';
-        $scope.$emptyElm = null;
-        $scope.$callbacks = null;
-
-        $scope.dragEnabled = true;
-        $scope.emptyPlaceholderEnabled = true;
-        $scope.maxDepth = 0;
-        $scope.dragDelay = 0;
-        $scope.cloneEnabled = false;
-        $scope.nodropEnabled = false;
-
-        // Check if it's a empty tree
-        $scope.isEmpty = function () {
-          return ($scope.$nodesScope && $scope.$nodesScope.$modelValue
-          && $scope.$nodesScope.$modelValue.length === 0);
-        };
-
-        // add placeholder to empty tree
-        $scope.place = function (placeElm) {
-          $scope.$nodesScope.$element.append(placeElm);
-          $scope.$emptyElm.remove();
-        };
-
-        this.resetEmptyElement = function () {
-          if ((!$scope.$nodesScope.$modelValue || $scope.$nodesScope.$modelValue.length === 0) &&
-            $scope.emptyPlaceholderEnabled) {
-            $element.append($scope.$emptyElm);
-          } else {
-            $scope.$emptyElm.remove();
-          }
-        };
-
-        $scope.resetEmptyElement = this.resetEmptyElement;
-      }
-    ]);
-})();
-
-(function () {
-  'use strict';
-
-  angular.module('ui.tree')
-    .directive('uiTree', ['treeConfig', '$window',
-      function (treeConfig, $window) {
-        return {
-          restrict: 'A',
-          scope: true,
-          controller: 'TreeController',
-          link: function (scope, element, attrs, ctrl) {
-            var callbacks = {
-              accept: null,
-              beforeDrag: null
-            },
-              config = {},
-              tdElm,
-              $trElm,
-              emptyElmColspan;
-
-            angular.extend(config, treeConfig);
-            if (config.treeClass) {
-              element.addClass(config.treeClass);
-            }
-
-            if (element.prop('tagName').toLowerCase() === 'table') {
-              scope.$emptyElm = angular.element($window.document.createElement('tr'));
-              $trElm = element.find('tr');
-              // If we can find a tr, then we can use its td children as the empty element colspan.
-              if ($trElm.length > 0) {
-                emptyElmColspan = angular.element($trElm).children().length;
-              } else {
-                // If not, by setting a huge colspan we make sure it takes full width.
-                emptyElmColspan = 1000000;
-              }
-              tdElm = angular.element($window.document.createElement('td'))
-                .attr('colspan', emptyElmColspan);
-              scope.$emptyElm.append(tdElm);
-            } else {
-              scope.$emptyElm = angular.element($window.document.createElement('div'));
-            }
-
-            if (config.emptyTreeClass) {
-              scope.$emptyElm.addClass(config.emptyTreeClass);
-            }
-
-            scope.$watch('$nodesScope.$modelValue.length', function (val) {
-              if (!angular.isNumber(val)) {
-                return;
-              }
-
-              ctrl.resetEmptyElement();
-            }, true);
-
-            scope.$watch(attrs.dragEnabled, function (val) {
-              if ((typeof val) == 'boolean') {
-                scope.dragEnabled = val;
-              }
-            });
-
-            scope.$watch(attrs.emptyPlaceholderEnabled, function (val) {
-              if ((typeof val) == 'boolean') {
-                scope.emptyPlaceholderEnabled = val;
-                ctrl.resetEmptyElement();
-              }
-            });
-
-            scope.$watch(attrs.nodropEnabled, function (val) {
-              if ((typeof val) == 'boolean') {
-                scope.nodropEnabled = val;
-              }
-            });
-
-            scope.$watch(attrs.cloneEnabled, function (val) {
-              if ((typeof val) == 'boolean') {
-                scope.cloneEnabled = val;
-              }
-            });
-
-            scope.$watch(attrs.maxDepth, function (val) {
-              if ((typeof val) == 'number') {
-                scope.maxDepth = val;
-              }
-            });
-
-            scope.$watch(attrs.dragDelay, function (val) {
-              if ((typeof val) == 'number') {
-                scope.dragDelay = val;
-              }
-            });
-
-            /**
-             * Callback checks if the destination node can accept the dragged node.
-             * By default, ui-tree will check that 'data-nodrop-enabled' is not set for the
-             * destination ui-tree-nodes, and that the 'max-depth' attribute will not be exceeded
-             * if it is set on the ui-tree or ui-tree-nodes.
-             * This callback can be overridden, but callers must manually enforce nodrop and max-depth
-             * themselves if they need those to be enforced.
-             * @param sourceNodeScope Scope of the ui-tree-node being dragged
-             * @param destNodesScope Scope of the ui-tree-nodes where the node is hovering
-             * @param destIndex Index in the destination nodes array where the source node will drop
-             * @returns {boolean} True if the node is permitted to be dropped here
-             */
-            callbacks.accept = function (sourceNodeScope, destNodesScope, destIndex) {
-              return !(destNodesScope.nodropEnabled || destNodesScope.$treeScope.nodropEnabled || destNodesScope.outOfDepth(sourceNodeScope));
-            };
-
-            callbacks.beforeDrag = function (sourceNodeScope) {
-              return true;
-            };
-
-            callbacks.expandTimeoutStart = function()
-            {
-
-            };
-
-            callbacks.expandTimeoutCancel = function()
-            {
-
-            };
-
-            callbacks.expandTimeoutEnd = function()
-            {
-
-            };
-
-            callbacks.removed = function (node) {
-
-            };
-
-            /**
-             * Callback is fired when a node is successfully dropped in a new location
-             * @param event
-             */
-            callbacks.dropped = function (event) {
-
-            };
-
-            /**
-             * Callback is fired each time the user starts dragging a node
-             * @param event
-             */
-            callbacks.dragStart = function (event) {
-
-            };
-
-            /**
-             * Callback is fired each time a dragged node is moved with the mouse/touch.
-             * @param event
-             */
-            callbacks.dragMove = function (event) {
-
-            };
-
-            /**
-             * Callback is fired when the tree exits drag mode. If the user dropped a node, the drop may have been
-             * accepted or reverted.
-             * @param event
-             */
-            callbacks.dragStop = function (event) {
-
-            };
-
-            /**
-             * Callback is fired when a user drops a node (but prior to processing the drop action)
-             * beforeDrop can return a Promise, truthy, or falsy (returning nothing is falsy).
-             * If it returns falsy, or a resolve Promise, the node move is accepted
-             * If it returns truthy, or a rejected Promise, the node move is reverted
-             * @param event
-             * @returns {Boolean|Promise} Truthy (or rejected Promise) to cancel node move; falsy (or resolved promise)
-             */
-            callbacks.beforeDrop = function (event) {
-
-            };
-
-            /**
-             * Callback is fired when a user toggles node (but after processing the toggle action)
-             * @param sourceNodeScope
-             * @param collapsed
-             */
-            callbacks.toggle = function (collapsed, sourceNodeScope) {
-
-            };
-
-            scope.$watch(attrs.uiTree, function (newVal, oldVal) {
-              angular.forEach(newVal, function (value, key) {
-                if (callbacks[key]) {
-                  if (typeof value === 'function') {
-                    callbacks[key] = value;
-                  }
-                }
-              });
-
-              scope.$callbacks = callbacks;
-            }, true);
-
-
-          }
-        };
-      }
-    ]);
-})();
-
-(function () {
-  'use strict';
-
-  angular.module('ui.tree')
-    .directive('uiTreeHandle', ['treeConfig',
-      function (treeConfig) {
-        return {
-          require: '^uiTreeNode',
-          restrict: 'A',
-          scope: true,
-          controller: 'TreeHandleController',
-          link: function (scope, element, attrs, treeNodeCtrl) {
-            var config = {};
-            angular.extend(config, treeConfig);
-            if (config.handleClass) {
-              element.addClass(config.handleClass);
-            }
-            // connect with the tree node.
-            if (scope != treeNodeCtrl.scope) {
-              scope.$nodeScope = treeNodeCtrl.scope;
-              treeNodeCtrl.scope.$handleScope = scope;
-            }
-          }
-        };
-      }
-    ]);
-})();
-
-(function () {
-  'use strict';
-
-  angular.module('ui.tree')
-
-    .directive('uiTreeNode', ['treeConfig', 'UiTreeHelper', '$window', '$document', '$timeout', '$q',
-      function (treeConfig, UiTreeHelper, $window, $document, $timeout, $q) {
-        return {
-          require: ['^uiTreeNodes', '^uiTree'],
-          restrict: 'A',
-          controller: 'TreeNodeController',
-          link: function (scope, element, attrs, controllersArr) {
-            // todo startPos is unused
-            var config = {},
-              hasTouch = 'ontouchstart' in window,
-              startPos, firstMoving, dragInfo, pos,
-              placeElm, hiddenPlaceElm, dragElm,
-              treeScope = null,
-              elements, // As a parameter for callbacks
-              dragDelaying = true,
-              dragStarted = false,
-              dragTimer = null,
-              body = document.body,
-              html = document.documentElement,
-              document_height,
-              document_width,
-              dragStart,
-              tagName,
-              dragMove,
-              dragEnd,
-              dragStartEvent,
-              dragMoveEvent,
-              dragEndEvent,
-              dragCancelEvent,
-              dragDelay,
-              bindDragStartEvents,
-              bindDragMoveEvents,
-              unbindDragMoveEvents,
-              keydownHandler,
-              outOfBounds,
-              isHandleChild,
-              el;
-
-            angular.extend(config, treeConfig);
-            if (config.nodeClass) {
-              element.addClass(config.nodeClass);
-            }
-            scope.init(controllersArr);
-
-            scope.collapsed = !!UiTreeHelper.getNodeAttribute(scope, 'collapsed') || treeConfig.defaultCollapsed;
-			scope.expandOnHover = !!UiTreeHelper.getNodeAttribute(scope, 'expandOnHover');
-            scope.sourceOnly = scope.nodropEnabled || scope.$treeScope.nodropEnabled;
-
-            scope.$watch(attrs.collapsed, function (val) {
-              if ((typeof val) == 'boolean') {
-                scope.collapsed = val;
-              }
-            });
-
-            scope.$watch('collapsed', function (val) {
-              UiTreeHelper.setNodeAttribute(scope, 'collapsed', val);
-              attrs.$set('collapsed', val);
-            });
-
-            scope.$watch(attrs.expandOnHover, function(val) {
-              if ((typeof val) == 'boolean') {
-                scope.expandOnHover = val;
-              }
-            });
-
-			scope.$watch('expandOnHover', function (val) {
-              UiTreeHelper.setNodeAttribute(scope, 'expandOnHover', val);
-              attrs.$set('expandOnHover', val);
-            });
-
-            scope.$on('angular-ui-tree:collapse-all', function () {
-              scope.collapsed = true;
-            });
-
-            scope.$on('angular-ui-tree:expand-all', function () {
-              scope.collapsed = false;
-            });
-
-            /**
-             * Called when the user has grabbed a node and started dragging it
-             * @param e
-             */
-            dragStart = function (e) {
-              // disable right click
-              if (!hasTouch && (e.button === 2 || e.which === 3)) {
-                return;
-              }
-
-              // event has already fired in other scope
-              if (e.uiTreeDragging || (e.originalEvent && e.originalEvent.uiTreeDragging)) {
-                return;
-              }
-
-              // the node being dragged
-              var eventElm = angular.element(e.target),
-                isHandleChild, cloneElm, eventElmTagName, tagName,
-                eventObj, tdElm, hStyle,
-                isTreeNode,
-                isTreeNodeHandle;
-
-              // if the target element is a child element of a ui-tree-handle,
-              // use the containing handle element as target element
-              isHandleChild = UiTreeHelper.treeNodeHandlerContainerOfElement(eventElm);
-              if (isHandleChild) {
-                eventElm = angular.element(isHandleChild);
-              }
-
-              cloneElm = element.clone();
-              isTreeNode = UiTreeHelper.elementIsTreeNode(eventElm);
-              isTreeNodeHandle = UiTreeHelper.elementIsTreeNodeHandle(eventElm);
-
-              if (!isTreeNode && !isTreeNodeHandle) {
-                return;
-              }
-
-              if (isTreeNode && UiTreeHelper.elementContainsTreeNodeHandler(eventElm)) {
-                return;
-              }
-
-              eventElmTagName = eventElm.prop('tagName').toLowerCase();
-              if (eventElmTagName == 'input' ||
-                eventElmTagName == 'textarea' ||
-                eventElmTagName == 'button' ||
-                eventElmTagName == 'select') { // if it's a input or button, ignore it
-                return;
-              }
-
-              // check if it or it's parents has a 'data-nodrag' attribute
-              el = angular.element(e.target);
-              while (el && el[0] && el[0] !== element) {
-                if (UiTreeHelper.nodrag(el)) { // if the node mark as `nodrag`, DONOT drag it.
-                  return;
-                }
-                el = el.parent();
-              }
-
-              if (!scope.beforeDrag(scope)) {
-                return;
-              }
-
-              e.uiTreeDragging = true; // stop event bubbling
-              if (e.originalEvent) {
-                e.originalEvent.uiTreeDragging = true;
-              }
-              e.preventDefault();
-              eventObj = UiTreeHelper.eventObj(e);
-
-              firstMoving = true;
-              dragInfo = UiTreeHelper.dragInfo(scope);
-
-              tagName = element.prop('tagName');
-
-              if (tagName.toLowerCase() === 'tr') {
-                placeElm = angular.element($window.document.createElement(tagName));
-                tdElm = angular.element($window.document.createElement('td'))
-                  .addClass(config.placeholderClass)
-                  .attr('colspan', element[0].children.length);
-                placeElm.append(tdElm);
-              } else {
-                placeElm = angular.element($window.document.createElement(tagName))
-                  .addClass(config.placeholderClass);
-              }
-              hiddenPlaceElm = angular.element($window.document.createElement(tagName));
-              if (config.hiddenClass) {
-                hiddenPlaceElm.addClass(config.hiddenClass);
-              }
-
-              pos = UiTreeHelper.positionStarted(eventObj, element);
-              placeElm.css('height', UiTreeHelper.height(element) + 'px');
-
-              dragElm = angular.element($window.document.createElement(scope.$parentNodesScope.$element.prop('tagName')))
-                .addClass(scope.$parentNodesScope.$element.attr('class')).addClass(config.dragClass);
-              dragElm.css('width', UiTreeHelper.width(element) + 'px');
-              dragElm.css('z-index', 9999);
-
-              // Prevents cursor to change rapidly in Opera 12.16 and IE when dragging an element
-              hStyle = (element[0].querySelector('.angular-ui-tree-handle') || element[0]).currentStyle;
-              if (hStyle) {
-                document.body.setAttribute('ui-tree-cursor', $document.find('body').css('cursor') || '');
-                $document.find('body').css({'cursor': hStyle.cursor + '!important'});
-              }
-
-              if (scope.sourceOnly) {
-                placeElm.css('display', 'none');
-              }
-              element.after(placeElm);
-              element.after(hiddenPlaceElm);
-              if (dragInfo.isClone() && scope.sourceOnly) {
-                dragElm.append(cloneElm);
-              } else {
-                dragElm.append(element);
-              }
-
-              $document.find('body').append(dragElm);
-
-              dragElm.css({
-                'left': eventObj.pageX - pos.offsetX + 'px',
-                'top': eventObj.pageY - pos.offsetY + 'px'
-              });
-              elements = {
-                placeholder: placeElm,
-                dragging: dragElm
-              };
-
-              bindDragMoveEvents();
-              // Fire dragStart callback
-              scope.$apply(function () {
-                scope.$treeScope.$callbacks.dragStart(dragInfo.eventArgs(elements, pos));
-              });
-
-              document_height = Math.max(body.scrollHeight, body.offsetHeight, html.clientHeight, html.scrollHeight, html.offsetHeight);
-              document_width = Math.max(body.scrollWidth, body.offsetWidth, html.clientWidth, html.scrollWidth, html.offsetWidth);
-            };
-
-            dragMove = function (e) {
-              var eventObj = UiTreeHelper.eventObj(e),
-                prev,
-                next,
-                leftElmPos,
-                topElmPos,
-                top_scroll,
-                bottom_scroll,
-                target,
-                decrease,
-                targetX,
-                targetY,
-                displayElm,
-                targetNode,
-                targetElm,
-                isEmpty,
-                scrollDownBy,
-                targetOffset,
-                targetBefore;
-
-              if (dragElm) {
-                e.preventDefault();
-
-                if ($window.getSelection) {
-                  $window.getSelection().removeAllRanges();
-                } else if ($window.document.selection) {
-                  $window.document.selection.empty();
-                }
-
-                leftElmPos = eventObj.pageX - pos.offsetX;
-                topElmPos = eventObj.pageY - pos.offsetY;
-
-                //dragElm can't leave the screen on the left
-                if (leftElmPos < 0) {
-                  leftElmPos = 0;
-                }
-
-                //dragElm can't leave the screen on the top
-                if (topElmPos < 0) {
-                  topElmPos = 0;
-                }
-
-                //dragElm can't leave the screen on the bottom
-                if ((topElmPos + 10) > document_height) {
-                  topElmPos = document_height - 10;
-                }
-
-                //dragElm can't leave the screen on the right
-                if ((leftElmPos + 10) > document_width) {
-                  leftElmPos = document_width - 10;
-                }
-
-                dragElm.css({
-                  'left': leftElmPos + 'px',
-                  'top': topElmPos + 'px'
-                });
-
-                top_scroll = window.pageYOffset || $window.document.documentElement.scrollTop;
-                bottom_scroll = top_scroll + (window.innerHeight || $window.document.clientHeight || $window.document.clientHeight);
-
-                // to scroll down if cursor y-position is greater than the bottom position the vertical scroll
-                if (bottom_scroll < eventObj.pageY && bottom_scroll < document_height) {
-                  scrollDownBy = Math.min(document_height - bottom_scroll, 10);
-                  window.scrollBy(0, scrollDownBy);
-                }
-
-                // to scroll top if cursor y-position is less than the top position the vertical scroll
-                if (top_scroll > eventObj.pageY) {
-                  window.scrollBy(0, -10);
-                }
-
-                UiTreeHelper.positionMoved(e, pos, firstMoving);
-                if (firstMoving) {
-                  firstMoving = false;
-                  return;
-                }
-
-                // check if add it as a child node first
-                // todo decrease is unused
-                decrease = (UiTreeHelper.offset(dragElm).left - UiTreeHelper.offset(placeElm).left) >= config.threshold;
-
-                targetX = eventObj.pageX - ($window.pageXOffset ||
-                  $window.document.body.scrollLeft ||
-                  $window.document.documentElement.scrollLeft) -
-                  ($window.document.documentElement.clientLeft || 0);
-
-                targetY = eventObj.pageY - ($window.pageYOffset ||
-                  $window.document.body.scrollTop ||
-                  $window.document.documentElement.scrollTop) -
-                  ($window.document.documentElement.clientTop || 0);
-
-                // Select the drag target. Because IE does not support CSS 'pointer-events: none', it will always
-                // pick the drag element itself as the target. To prevent this, we hide the drag element while
-                // selecting the target.
-                if (angular.isFunction(dragElm.hide)) {
-                  dragElm.hide();
-                } else {
-                  displayElm = dragElm[0].style.display;
-                  dragElm[0].style.display = 'none';
-                }
-
-                // when using elementFromPoint() inside an iframe, you have to call
-                // elementFromPoint() twice to make sure IE8 returns the correct value
-                $window.document.elementFromPoint(targetX, targetY);
-
-                targetElm = angular.element($window.document.elementFromPoint(targetX, targetY));
-
-                // if the target element is a child element of a ui-tree-handle,
-                // use the containing handle element as target element
-                isHandleChild = UiTreeHelper.treeNodeHandlerContainerOfElement(targetElm);
-                if (isHandleChild) {
-                  targetElm = angular.element(isHandleChild);
-                }
-
-                if (angular.isFunction(dragElm.show)) {
-                  dragElm.show();
-                } else {
-                  dragElm[0].style.display = displayElm;
-                }
-
-                outOfBounds = !UiTreeHelper.elementIsTreeNodeHandle(targetElm) &&
-                              !UiTreeHelper.elementIsTreeNode(targetElm) &&
-                              !UiTreeHelper.elementIsTreeNodes(targetElm) &&
-                              !UiTreeHelper.elementIsTree(targetElm) &&
-                              !UiTreeHelper.elementIsPlaceholder(targetElm);
-
-                // Detect out of bounds condition, update drop target display, and prevent drop
-                if (outOfBounds) {
-
-                  // Remove the placeholder
-                  placeElm.remove();
-
-                  // If the target was an empty tree, replace the empty element placeholder
-                  if (treeScope) {
-                    treeScope.resetEmptyElement();
-                    treeScope = null;
-                  }
-                }
-
-                // move horizontal
-                if (pos.dirAx && pos.distAxX >= config.levelThreshold) {
-                  pos.distAxX = 0;
-
-                  // increase horizontal level if previous sibling exists and is not collapsed
-                  if (pos.distX > 0) {
-                    prev = dragInfo.prev();
-                    if (prev && !prev.collapsed
-                      && prev.accept(scope, prev.childNodesCount())) {
-                      prev.$childNodesScope.$element.append(placeElm);
-                      dragInfo.moveTo(prev.$childNodesScope, prev.childNodes(), prev.childNodesCount());
-                    }
-                  }
-
-                  // decrease horizontal level
-                  if (pos.distX < 0) {
-                    // we can't decrease a level if an item preceeds the current one
-                    next = dragInfo.next();
-                    if (!next) {
-                      target = dragInfo.parentNode(); // As a sibling of it's parent node
-                      if (target
-                        && target.$parentNodesScope.accept(scope, target.index() + 1)) {
-                        target.$element.after(placeElm);
-                        dragInfo.moveTo(target.$parentNodesScope, target.siblings(), target.index() + 1);
-                      }
-                    }
-                  }
-                }
-
-                // move vertical
-                if (!pos.dirAx) {
-                  if (UiTreeHelper.elementIsTree(targetElm)) {
-                    targetNode = targetElm.controller('uiTree').scope;
-                  } else if (UiTreeHelper.elementIsTreeNodeHandle(targetElm)) {
-                    targetNode = targetElm.controller('uiTreeHandle').scope;
-                  } else if (UiTreeHelper.elementIsTreeNode(targetElm)) {
-                    targetNode = targetElm.controller('uiTreeNode').scope;
-                  } else if (UiTreeHelper.elementIsTreeNodes(targetElm)) {
-                    targetNode = targetElm.controller('uiTreeNodes').scope;
-                  } else if (UiTreeHelper.elementIsPlaceholder(targetElm)) {
-                    targetNode = targetElm.controller('uiTreeNodes').scope;
-                  } else if (targetElm.controller('uiTreeNode')) {
-                    // is a child element of a node
-                    targetNode = targetElm.controller('uiTreeNode').scope;
-                  }
-
-                  // check it's new position
-                  isEmpty = false;
-                  if (!targetNode) {
-                    return;
-                  }
-
-                  // Show the placeholder if it was hidden for nodrop-enabled and this is a new tree
-                  if (targetNode.$treeScope && !targetNode.$parent.nodropEnabled && !targetNode.$treeScope.nodropEnabled) {
-                    placeElm.css('display', '');
-                  }
-
-                  if (targetNode.$type == 'uiTree' && targetNode.dragEnabled) {
-                    isEmpty = targetNode.isEmpty(); // Check if it's empty tree
-                  }
-
-                  if (targetNode.$type == 'uiTreeHandle') {
-                    targetNode = targetNode.$nodeScope;
-                  }
-
-                  if (targetNode.$type != 'uiTreeNode'
-                    && !isEmpty) { // Check if it is a uiTreeNode or it's an empty tree
-                    return;
-                  }
-
-                  // if placeholder move from empty tree, reset it.
-                  if (treeScope && placeElm.parent()[0] != treeScope.$element[0]) {
-                    treeScope.resetEmptyElement();
-                    treeScope = null;
-                  }
-
-                  if (isEmpty) { // it's an empty tree
-                    treeScope = targetNode;
-                    if (targetNode.$nodesScope.accept(scope, 0)) {
-                      targetNode.place(placeElm);
-                      dragInfo.moveTo(targetNode.$nodesScope, targetNode.$nodesScope.childNodes(), 0);
-                    }
-                  } else if (targetNode.dragEnabled()) { // drag enabled
-                      if (angular.isDefined(scope.expandTimeoutOn) && scope.expandTimeoutOn !== targetNode.id) {
-                        $timeout.cancel(scope.expandTimeout);
-                        delete scope.expandTimeout;
-                        delete scope.expandTimeoutOn;
-
-                        scope.$callbacks.expandTimeoutCancel();
-                      }
-
-                      if (targetNode.collapsed) {
-                        if (scope.expandOnHover === true || (angular.isNumber(scope.expandOnHover) && scope.expandOnHover === 0)) {
-                          targetNode.collapsed = false;
-                        } else if (scope.expandOnHover !== false && angular.isNumber(scope.expandOnHover) && scope.expandOnHover > 0) {
-                          if (angular.isUndefined(scope.expandTimeoutOn)) {
-                            scope.expandTimeoutOn = targetNode.$id;
-
-                            scope.$callbacks.expandTimeoutStart();
-                            scope.expandTimeout = $timeout(function()
-                            {
-                              scope.$callbacks.expandTimeoutEnd();
-                              targetNode.collapsed = false;
-                            }, scope.expandOnHover);
-                          }
-                        }
-                      }
-
-                    targetElm = targetNode.$element; // Get the element of ui-tree-node
-                    targetOffset = UiTreeHelper.offset(targetElm);
-                    targetBefore = targetNode.horizontal ? eventObj.pageX < (targetOffset.left + UiTreeHelper.width(targetElm) / 2)
-                      : eventObj.pageY < (targetOffset.top + UiTreeHelper.height(targetElm) / 2);
-
-                    if (targetNode.$parentNodesScope.accept(scope, targetNode.index())) {
-                      if (targetBefore) {
-                        targetElm[0].parentNode.insertBefore(placeElm[0], targetElm[0]);
-                        dragInfo.moveTo(targetNode.$parentNodesScope, targetNode.siblings(), targetNode.index());
-                      } else {
-                        targetElm.after(placeElm);
-                        dragInfo.moveTo(targetNode.$parentNodesScope, targetNode.siblings(), targetNode.index() + 1);
-                      }
-                    } else if (!targetBefore && targetNode.accept(scope, targetNode.childNodesCount())) { // we have to check if it can add the dragging node as a child
-                      targetNode.$childNodesScope.$element.append(placeElm);
-                      dragInfo.moveTo(targetNode.$childNodesScope, targetNode.childNodes(), targetNode.childNodesCount());
-                    } else {
-                      outOfBounds = true;
-                    }
-                  }
-                }
-
-                scope.$apply(function () {
-                  scope.$treeScope.$callbacks.dragMove(dragInfo.eventArgs(elements, pos));
-                });
-              }
-            };
-
-            dragEnd = function (e) {
-              var dragEventArgs = dragInfo.eventArgs(elements, pos);
-              e.preventDefault();
-              unbindDragMoveEvents();
-
-              $timeout.cancel(scope.expandTimeout);
-
-              scope.$treeScope.$apply(function () {
-                $q.when(scope.$treeScope.$callbacks.beforeDrop(dragEventArgs))
-                    // promise resolved (or callback didn't return false)
-                    .then(function (allowDrop) {
-                      if (allowDrop !== false && scope.$$allowNodeDrop && !outOfBounds) { // node drop accepted)
-                        dragInfo.apply();
-                        // fire the dropped callback only if the move was successful
-                        scope.$treeScope.$callbacks.dropped(dragEventArgs);
-                      } else { // drop canceled - revert the node to its original position
-                        bindDragStartEvents();
-                      }
-                    })
-                    // promise rejected - revert the node to its original position
-                    .catch(function () {
-                      bindDragStartEvents();
-                    })
-                    .finally(function () {
-                      hiddenPlaceElm.replaceWith(scope.$element);
-                      placeElm.remove();
-
-                      if (dragElm) { // drag element is attached to the mouse pointer
-                        dragElm.remove();
-                        dragElm = null;
-                      }
-                      scope.$treeScope.$callbacks.dragStop(dragEventArgs);
-                      scope.$$allowNodeDrop = false;
-                      dragInfo = null;
-
-                      // Restore cursor in Opera 12.16 and IE
-                      var oldCur = document.body.getAttribute('ui-tree-cursor');
-                      if (oldCur !== null) {
-                        $document.find('body').css({'cursor': oldCur});
-                        document.body.removeAttribute('ui-tree-cursor');
-                      }
-                    });
-              });
-            };
-
-            dragStartEvent = function (e) {
-              if (scope.dragEnabled()) {
-                dragStart(e);
-              }
-            };
-
-            dragMoveEvent = function (e) {
-              dragMove(e);
-            };
-
-            dragEndEvent = function (e) {
-              scope.$$allowNodeDrop = true;
-              dragEnd(e);
-            };
-
-            dragCancelEvent = function (e) {
-              dragEnd(e);
-            };
-
-            dragDelay = (function () {
-              var to;
-
-              return {
-                exec: function (fn, ms) {
-                  if (!ms) {
-                    ms = 0;
-                  }
-                  this.cancel();
-                  to = $timeout(fn, ms);
-                },
-                cancel: function () {
-                  $timeout.cancel(to);
-                }
-              };
-            })();
-
-            /**
-             * Binds the mouse/touch events to enable drag start for this node
-             */
-            bindDragStartEvents = function () {
-              element.bind('touchstart mousedown', function (e) {
-                dragDelay.exec(function () {
-                  dragStartEvent(e);
-                }, scope.dragDelay || 0);
-              });
-              element.bind('touchend touchcancel mouseup', function () {
-                dragDelay.cancel();
-              });
-            };
-            bindDragStartEvents();
-
-            /**
-             * Binds mouse/touch events that handle moving/dropping this dragged node
-             */
-            bindDragMoveEvents = function () {
-              angular.element($document).bind('touchend', dragEndEvent);
-              angular.element($document).bind('touchcancel', dragEndEvent);
-              angular.element($document).bind('touchmove', dragMoveEvent);
-              angular.element($document).bind('mouseup', dragEndEvent);
-              angular.element($document).bind('mousemove', dragMoveEvent);
-              angular.element($document).bind('mouseleave', dragCancelEvent);
-            };
-
-            /**
-             * Unbinds mouse/touch events that handle moving/dropping this dragged node
-             */
-            unbindDragMoveEvents = function () {
-              angular.element($document).unbind('touchend', dragEndEvent);
-              angular.element($document).unbind('touchcancel', dragEndEvent);
-              angular.element($document).unbind('touchmove', dragMoveEvent);
-              angular.element($document).unbind('mouseup', dragEndEvent);
-              angular.element($document).unbind('mousemove', dragMoveEvent);
-              angular.element($document).unbind('mouseleave', dragCancelEvent);
-            };
-
-            keydownHandler = function (e) {
-              if (e.keyCode == 27) {
-                scope.$$allowNodeDrop = false;
-                dragEnd(e);
-              }
-            };
-
-            angular.element($window.document).bind('keydown', keydownHandler);
-
-            //unbind handler that retains scope
-            scope.$on('$destroy', function () {
-              angular.element($window.document).unbind('keydown', keydownHandler);
-            });
-          }
-        };
-      }
-    ]);
-
-})();
-
-(function () {
-  'use strict';
-
-  angular.module('ui.tree')
-    .directive('uiTreeNodes', ['treeConfig', '$window',
-      function (treeConfig) {
-        return {
-          require: ['ngModel', '?^uiTreeNode', '^uiTree'],
-          restrict: 'A',
-          scope: true,
-          controller: 'TreeNodesController',
-          link: function (scope, element, attrs, controllersArr) {
-
-            var config = {},
-                ngModel = controllersArr[0],
-                treeNodeCtrl = controllersArr[1],
-                treeCtrl = controllersArr[2];
-
-            angular.extend(config, treeConfig);
-            if (config.nodesClass) {
-              element.addClass(config.nodesClass);
-            }
-
-            if (treeNodeCtrl) {
-              treeNodeCtrl.scope.$childNodesScope = scope;
-              scope.$nodeScope = treeNodeCtrl.scope;
-            } else {
-              // find the root nodes if there is no parent node and have a parent ui-tree
-              treeCtrl.scope.$nodesScope = scope;
-            }
-            scope.$treeScope = treeCtrl.scope;
-
-            if (ngModel) {
-              ngModel.$render = function () {
-                scope.$modelValue = ngModel.$modelValue;
-              };
-            }
-
-            scope.$watch(function () {
-              return attrs.maxDepth;
-            }, function (val) {
-              if ((typeof val) == 'number') {
-                scope.maxDepth = val;
-              }
-            });
-
-            scope.$watch(function () {
-              return attrs.nodropEnabled;
-            }, function (newVal) {
-              if ((typeof newVal) != 'undefined') {
-                scope.nodropEnabled = true;
-              }
-            }, true);
-
-            attrs.$observe('horizontal', function (val) {
-              scope.horizontal = ((typeof val) != 'undefined');
-            });
-
-          }
-        };
-      }
-    ]);
-})();
-
-(function () {
-  'use strict';
-
-  angular.module('ui.tree')
-
-  /**
-   * @ngdoc service
-   * @name ui.tree.service:UiTreeHelper
-   * @requires ng.$document
-   * @requires ng.$window
-   *
-   * @description
-   * angular-ui-tree.
-   */
-    .factory('UiTreeHelper', ['$document', '$window', 'treeConfig',
-      function ($document, $window, treeConfig) {
-        return {
-
-          /**
-           * A hashtable used to storage data of nodes
-           * @type {Object}
-           */
-          nodesData: {},
-
-          setNodeAttribute: function (scope, attrName, val) {
-            if (!scope.$modelValue) {
-              return null;
-            }
-            var data = this.nodesData[scope.$modelValue.$$hashKey];
-            if (!data) {
-              data = {};
-              this.nodesData[scope.$modelValue.$$hashKey] = data;
-            }
-            data[attrName] = val;
-          },
-
-          getNodeAttribute: function (scope, attrName) {
-            if (!scope.$modelValue) {
-              return null;
-            }
-            var data = this.nodesData[scope.$modelValue.$$hashKey];
-            if (data) {
-              return data[attrName];
-            }
-            return null;
-          },
-
-          /**
-           * @ngdoc method
-           * @methodOf ui.tree.service:$nodrag
-           * @param  {Object} targetElm angular element
-           * @return {Bool} check if the node can be dragged.
-           */
-          nodrag: function (targetElm) {
-            if (typeof targetElm.attr('data-nodrag') != 'undefined') {
-              return targetElm.attr('data-nodrag') !== 'false';
-            }
-            return false;
-          },
-
-          /**
-           * get the event object for touches
-           * @param  {[type]} e [description]
-           * @return {[type]}   [description]
-           */
-          eventObj: function (e) {
-            var obj = e;
-            if (e.targetTouches !== undefined) {
-              obj = e.targetTouches.item(0);
-            } else if (e.originalEvent !== undefined && e.originalEvent.targetTouches !== undefined) {
-              obj = e.originalEvent.targetTouches.item(0);
-            }
-            return obj;
-          },
-
-          dragInfo: function (node) {
-            return {
-              source: node,
-              sourceInfo: {
-                cloneModel: node.$treeScope.cloneEnabled === true ? angular.copy(node.$modelValue) : undefined,
-                nodeScope: node,
-                index: node.index(),
-                nodesScope: node.$parentNodesScope
-              },
-              index: node.index(),
-              siblings: node.siblings().slice(0),
-              parent: node.$parentNodesScope,
-
-              // Move the node to a new position
-              moveTo: function (parent, siblings, index) {
-                this.parent = parent;
-                this.siblings = siblings.slice(0);
-
-                // If source node is in the target nodes
-                var i = this.siblings.indexOf(this.source);
-                if (i > -1) {
-                  this.siblings.splice(i, 1);
-                  if (this.source.index() < index) {
-                    index--;
-                  }
-                }
-
-                this.siblings.splice(index, 0, this.source);
-                this.index = index;
-              },
-
-              parentNode: function () {
-                return this.parent.$nodeScope;
-              },
-
-              prev: function () {
-                if (this.index > 0) {
-                  return this.siblings[this.index - 1];
-                }
-
-                return null;
-              },
-
-              next: function () {
-                if (this.index < this.siblings.length - 1) {
-                  return this.siblings[this.index + 1];
-                }
-
-                return null;
-              },
-
-              isClone: function () {
-                return this.source.$treeScope.cloneEnabled === true;
-              },
-
-              clonedNode: function (node) {
-                return angular.copy(node);
-              },
-
-              isDirty: function () {
-                return this.source.$parentNodesScope != this.parent ||
-                  this.source.index() != this.index;
-              },
-
-              isForeign: function () {
-                return this.source.$treeScope !== this.parent.$treeScope;
-              },
-
-              eventArgs: function (elements, pos) {
-                return {
-                  source: this.sourceInfo,
-                  dest: {
-                    index: this.index,
-                    nodesScope: this.parent
-                  },
-                  elements: elements,
-                  pos: pos
-                };
-              },
-
-              apply: function () {
-
-                var nodeData = this.source.$modelValue;
-
-                // nodrop enabled on tree or parent
-                if (this.parent.nodropEnabled || this.parent.$treeScope.nodropEnabled) {
-                  return;
-                }
-
-                // node was dropped in the same place - do nothing
-                if (!this.isDirty()) {
-                  return;
-                }
-
-                // cloneEnabled and cross-tree so copy and do not remove from source
-                if (this.isClone() && this.isForeign()) {
-                  this.parent.insertNode(this.index, this.sourceInfo.cloneModel);
-                } else { // Any other case, remove and reinsert
-                  this.source.remove();
-                  this.parent.insertNode(this.index, nodeData);
-                }
-              }
-            };
-          },
-
-          /**
-           * @ngdoc method
-           * @name ui.tree#height
-           * @methodOf ui.tree.service:UiTreeHelper
-           *
-           * @description
-           * Get the height of an element.
-           *
-           * @param {Object} element Angular element.
-           * @returns {String} Height
-           */
-          height: function (element) {
-            return element.prop('scrollHeight');
-          },
-
-          /**
-           * @ngdoc method
-           * @name ui.tree#width
-           * @methodOf ui.tree.service:UiTreeHelper
-           *
-           * @description
-           * Get the width of an element.
-           *
-           * @param {Object} element Angular element.
-           * @returns {String} Width
-           */
-          width: function (element) {
-            return element.prop('scrollWidth');
-          },
-
-          /**
-           * @ngdoc method
-           * @name ui.tree#offset
-           * @methodOf ui.nestedSortable.service:UiTreeHelper
-           *
-           * @description
-           * Get the offset values of an element.
-           *
-           * @param {Object} element Angular element.
-           * @returns {Object} Object with properties width, height, top and left
-           */
-          offset: function (element) {
-            var boundingClientRect = element[0].getBoundingClientRect();
-
-            return {
-              width: element.prop('offsetWidth'),
-              height: element.prop('offsetHeight'),
-              top: boundingClientRect.top + ($window.pageYOffset || $document[0].body.scrollTop || $document[0].documentElement.scrollTop),
-              left: boundingClientRect.left + ($window.pageXOffset || $document[0].body.scrollLeft || $document[0].documentElement.scrollLeft)
-            };
-          },
-
-          /**
-           * @ngdoc method
-           * @name ui.tree#positionStarted
-           * @methodOf ui.tree.service:UiTreeHelper
-           *
-           * @description
-           * Get the start position of the target element according to the provided event properties.
-           *
-           * @param {Object} e Event
-           * @param {Object} target Target element
-           * @returns {Object} Object with properties offsetX, offsetY, startX, startY, nowX and dirX.
-           */
-          positionStarted: function (e, target) {
-            var pos = {},
-              pageX = e.pageX,
-              pageY = e.pageY;
-
-            if (e.originalEvent && e.originalEvent.touches && (e.originalEvent.touches.length > 0)) {
-              pageX = e.originalEvent.touches[0].pageX;
-              pageY = e.originalEvent.touches[0].pageY;
-            }
-            pos.offsetX = pageX - this.offset(target).left;
-            pos.offsetY = pageY - this.offset(target).top;
-            pos.startX = pos.lastX = pageX;
-            pos.startY = pos.lastY = pageY;
-            pos.nowX = pos.nowY = pos.distX = pos.distY = pos.dirAx = 0;
-            pos.dirX = pos.dirY = pos.lastDirX = pos.lastDirY = pos.distAxX = pos.distAxY = 0;
-            return pos;
-          },
-
-          positionMoved: function (e, pos, firstMoving) {
-            var pageX = e.pageX,
-              pageY = e.pageY,
-              newAx;
-            if (e.originalEvent && e.originalEvent.touches && (e.originalEvent.touches.length > 0)) {
-              pageX = e.originalEvent.touches[0].pageX;
-              pageY = e.originalEvent.touches[0].pageY;
-            }
-            // mouse position last events
-            pos.lastX = pos.nowX;
-            pos.lastY = pos.nowY;
-
-            // mouse position this events
-            pos.nowX = pageX;
-            pos.nowY = pageY;
-
-            // distance mouse moved between events
-            pos.distX = pos.nowX - pos.lastX;
-            pos.distY = pos.nowY - pos.lastY;
-
-            // direction mouse was moving
-            pos.lastDirX = pos.dirX;
-            pos.lastDirY = pos.dirY;
-
-            // direction mouse is now moving (on both axis)
-            pos.dirX = pos.distX === 0 ? 0 : pos.distX > 0 ? 1 : -1;
-            pos.dirY = pos.distY === 0 ? 0 : pos.distY > 0 ? 1 : -1;
-
-            // axis mouse is now moving on
-            newAx = Math.abs(pos.distX) > Math.abs(pos.distY) ? 1 : 0;
-
-            // do nothing on first move
-            if (firstMoving) {
-              pos.dirAx = newAx;
-              pos.moving = true;
-              return;
-            }
-
-            // calc distance moved on this axis (and direction)
-            if (pos.dirAx !== newAx) {
-              pos.distAxX = 0;
-              pos.distAxY = 0;
-            } else {
-              pos.distAxX += Math.abs(pos.distX);
-              if (pos.dirX !== 0 && pos.dirX !== pos.lastDirX) {
-                pos.distAxX = 0;
-              }
-
-              pos.distAxY += Math.abs(pos.distY);
-              if (pos.dirY !== 0 && pos.dirY !== pos.lastDirY) {
-                pos.distAxY = 0;
-              }
-            }
-
-            pos.dirAx = newAx;
-          },
-
-          elementIsTreeNode: function (element) {
-            return typeof element.attr('ui-tree-node') !== 'undefined';
-          },
-
-          elementIsTreeNodeHandle: function (element) {
-            return typeof element.attr('ui-tree-handle') !== 'undefined';
-          },
-          elementIsTree: function (element) {
-            return typeof element.attr('ui-tree') !== 'undefined';
-          },
-          elementIsTreeNodes: function (element) {
-            return typeof element.attr('ui-tree-nodes') !== 'undefined';
-          },
-          elementIsPlaceholder: function (element) {
-            return element.hasClass(treeConfig.placeholderClass);
-          },
-          elementContainsTreeNodeHandler: function (element) {
-            return element[0].querySelectorAll('[ui-tree-handle]').length >= 1;
-          },
-          treeNodeHandlerContainerOfElement: function (element) {
-            return findFirstParentElementWithAttribute('ui-tree-handle', element[0]);
-          }
-        };
-      }
-    ]);
-
-  // TODO: optimize this loop
-  function findFirstParentElementWithAttribute(attributeName, childObj) {
-    // undefined if the mouse leaves the browser window
-    if (childObj === undefined) {
-      return null;
-    }
-    var testObj = childObj.parentNode,
-      count = 1,
-      // check for setAttribute due to exception thrown by Firefox when a node is dragged outside the browser window
-      res = (typeof testObj.setAttribute === 'function' && testObj.hasAttribute(attributeName)) ? testObj : null;
-    while (testObj && typeof testObj.setAttribute === 'function' && !testObj.hasAttribute(attributeName)) {
-      testObj = testObj.parentNode;
-      res = testObj;
-      if (testObj === document.documentElement) {
-        res = null;
-        break;
-      }
-      count++;
-    }
-
-    return res;
-  }
-
-})();
diff --git a/vid/src/main/webapp/app/vid/scripts/constants/componentConstants.js b/vid/src/main/webapp/app/vid/scripts/constants/componentConstants.js
deleted file mode 100644
index b2a9f0a53..000000000
--- a/vid/src/main/webapp/app/vid/scripts/constants/componentConstants.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-"use strict";
-
-app.constant("COMPONENT", (function() {
-    return {
-	NETWORK : "network",
-	SERVICE : "service",
-	VF_MODULE : "vfModule",
-	VNF : "vnf",
-	VOLUME_GROUP : "volumeGroup",
-	FULL_NAME_MAP : {
-	    "persona-model-id" : "Model ID",
-	    "persona-model-version" : "Model Version"
-	},
-	PARTIAL_NAME_MAP : {
-	    "id" : "ID",
-	    "uuid" : "UUID",
-	    "vfmodule" : "VF Module",
-	    "vnf" : "VNF",
-	    "volumegroup" : "Volume Group"
-	}
-    };
-})())
diff --git a/vid/src/main/webapp/app/vid/scripts/constants/fieldConstants.js b/vid/src/main/webapp/app/vid/scripts/constants/fieldConstants.js
deleted file mode 100644
index 4663ee821..000000000
--- a/vid/src/main/webapp/app/vid/scripts/constants/fieldConstants.js
+++ /dev/null
@@ -1,182 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-"use strict";
-
-app.factory("FIELD", [ "PARAMETER", function(PARAMETER) {
-
-    /*
-     * ID values are typically used internally.
-     */
-    var ID = {
-	AVAILABLE_VOLUME_GROUP : "availableVolumeGroup",
-	INSTANCE_NAME : "instanceName",
-	LCP_REGION : "lcpRegion",
-	LCP_REGION_TEXT : "lcpRegionText",
-	PRODUCT_FAMILY : "productFamily",
-	SERVICE_TYPE : "serviceType",
-	SUBSCRIBER_NAME : "subscriberName",
-	SUPPRESS_ROLLBACK : "suppressRollback",
-	TENANT : "tenant"
-    };
-
-    var KEY = {
-	LCP_REGION_TEXT : "DEFAULTREGION"
-    };
-
-    /*
-     * NAME values are displayed on GUI pages.
-     */
-    var NAME = {
-	AVAILABLE_VOLUME_GROUP : "Available Volume Group",
-	INSTANCE_NAME : "Instance Name",
-	CUSTOMER_ID : "Customer ID",
-	LCP_REGION : "LCP Region",
-	LCP_REGION_TEXT : "AIC 2.5 Region",
-	MODEL_INVARIANT_UUID: "Model Invariant UUID",
-	MODEL_NAME: "Model Name",
-	MODEL_VERSION: "Model Version",
-	MODEL_UUID: "Model UUID",
-	PRODUCT_FAMILY : "Product Family",
-	RESOURCE_DESCRIPTION : "Resource Description",
-	RESOURCE_NAME : "Resource Name",
-	SERVICE_CATEGORY : "Service Category",
-	SERVICE_DESCRIPTION : "Service Description",
-	SERVICE_INSTANCE_ID : "Service Instance ID",
-	SERVICE_INSTANCE_NAME : "Service Instance Name",
-	SERVICE_INVARIANT_UUID : "Service Invariant UUID",
-	SERVICE_NAME : "Service Name",
-	SERVICE_TYPE : "Service Type",
-	SERVICE_UUID : "Service UUID",
-	SERVICE_VERSION : "Service Version",
-	SUBSCRIBER_NAME : "Subscriber Name",
-	SUPPRESS_ROLLBACK : "Suppress Rollback on Failure",
-	TENANT : "Tenant",
-	USER_SERVICE_INSTANCE_NAME : "User Service Instance Name",
-	VF_MODULE_DESCRIPTION : "VF Module Description",
-	VF_MODULE_LABEL : "VF Module Label",
-	VF_MODULE_TYPE : "VF Module Type"
-    };
-
-    /*
-     * PROMPT values are initial values displayed in select lists.
-     */
-    var PROMPT = {
-	AVAILABLE_VOLUME_GROUP : "Select Volume Group",
-	LCP_REGION : "Select LCP Region",
-	PRODUCT_FAMILY : "Select Product Family",
-	SERVICE_TYPE : "Select Service Type",
-	SUBSCRIBER_NAME : "Select Subscriber Name",
-	TENANT : "Select Tenant Name"
-    };
-
-    /*
-     * PARAMETER values indicate field configurations that are provided to
-     * parameter block directives.
-     */
-
-    var PARAMETER = {
-	AVAILABLE_VOLUME_GROUP : {
-	    name : NAME.AVAILABLE_VOLUME_GROUP,
-	    id : ID.AVAILABLE_VOLUME_GROUP,
-	    type : PARAMETER.SELECT,
-	    prompt : PROMPT.AVAILABLE_VOLUME_GROUP,
-	    isRequired : true
-	},
-	INSTANCE_NAME : {
-	    name : NAME.INSTANCE_NAME,
-	    id : ID.INSTANCE_NAME,
-	    isRequired : true
-	},
-	LCP_REGION : {
-	    name : NAME.LCP_REGION,
-	    id : ID.LCP_REGION,
-	    type : PARAMETER.SELECT,
-	    prompt : PROMPT.LCP_REGION,
-	    isRequired : true
-	},
-	LCP_REGION_TEXT_HIDDEN : {
-	    id : ID.LCP_REGION_TEXT,
-	    isVisible : false
-	},
-	LCP_REGION_TEXT_VISIBLE : {
-	    name : NAME.LCP_REGION_TEXT,
-	    id : ID.LCP_REGION_TEXT,
-	    isRequired : true,
-	    isVisible : true
-	},
-	PRODUCT_FAMILY : {
-	    name : NAME.PRODUCT_FAMILY,
-	    id : ID.PRODUCT_FAMILY,
-	    type : PARAMETER.SELECT,
-	    prompt : PROMPT.PRODUCT_FAMILY,
-	    isRequired : true
-	},
-	SERVICE_TYPE : {
-	    name : NAME.SERVICE_TYPE,
-	    id : ID.SERVICE_TYPE,
-	    type : PARAMETER.SELECT,
-	    prompt : PROMPT.SERVICE_TYPE,
-	    isRequired : true
-	},
-	SERVICE_TYPE_DISABLED : {
-	    name : NAME.SERVICE_TYPE,
-	    id : ID.SERVICE_TYPE,
-	    type : PARAMETER.SELECT,
-	    isEnabled : false,
-	    isRequired : true
-	},
-	SUPPRESS_ROLLBACK : {
-	    name : NAME.SUPPRESS_ROLLBACK,
-	    id : ID.SUPPRESS_ROLLBACK,
-	    type : PARAMETER.BOOLEAN,
-	    value : false
-	},
-	SUBSCRIBER_NAME : {
-		name : NAME.SUBSCRIBER_NAME,
-		id : ID.SUBSCRIBER_NAME,
-	    type : PARAMETER.SELECT,
-	    prompt : PROMPT.SUBSCRIBER_NAME,
-		isRequired : true
-	},
-	TENANT_DISABLED : {
-	    name : NAME.TENANT,
-	    id : ID.TENANT,
-	    type : PARAMETER.SELECT,
-	    isEnabled : false,
-	    isRequired : true
-	},
-	TENANT_ENABLED : {
-	    name : NAME.TENANT,
-	    id : ID.TENANT,
-	    type : PARAMETER.SELECT,
-	    isEnabled : true,
-	    prompt : PROMPT.TENANT,
-	    isRequired : true
-	}
-    };
-
-    return {
-	ID : ID,
-	KEY : KEY,
-	NAME : NAME,
-	PARAMETER : PARAMETER
-    }
-} ]);
diff --git a/vid/src/main/webapp/app/vid/scripts/constants/parameterConstants.js b/vid/src/main/webapp/app/vid/scripts/constants/parameterConstants.js
deleted file mode 100644
index 466d188dc..000000000
--- a/vid/src/main/webapp/app/vid/scripts/constants/parameterConstants.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-"use strict";
-
-app.constant("PARAMETER", (function() {
-    return {
-	BOOLEAN : "boolean",
-	SELECT : "select",
-	STRING : "string"
-    };
-})())
diff --git a/vid/src/main/webapp/app/vid/scripts/controller/InstantiationController.js b/vid/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
deleted file mode 100644
index fb9baa4b8..000000000
--- a/vid/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
+++ /dev/null
@@ -1,1028 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * The Instantiation (or View/Edit) Controller controls the instantiation/removal of
- * deployable objects (Services, VNFs, VF-Modules, Networks, and Volume-Groups)
- */
-(function () {
-	"use strict";
-
-	app.requires.push('ui.tree');
-	
-	app.controller("InstantiationController", function ($scope, $route, $location, $timeout, COMPONENT, DataService, PropertyService, UtilityService, $http, vidService) {
-		
-		$scope.popup = new Object();
-		$scope.defaultBaseUrl = "";
-		$scope.responseTimeoutMsec = 60000;
-		$scope.properties = UtilityService.getProperties();
-        $scope.init = function() {
-
-            /*
-             * These 2 statements should be included in non-test code.
-             */
-        	// takes a default value, retrieves the prop value from the file system and sets it
-    		var msecs = PropertyService.retrieveMsoMaxPollingIntervalMsec(1000);
-    		PropertyService.setMsoMaxPollingIntervalMsec(msecs);
-    		
-    		// takes a default value, retrieves the prop value from the file system and sets it
-    		var polls = PropertyService.retrieveMsoMaxPolls(7);
-    		PropertyService.setMsoMaxPolls(polls);
-    		
-    		//PropertyService.setMsoBaseUrl("testmso");
-    		PropertyService.setServerResponseTimeoutMsec(10000);
-
-            /*
-             * Common parameters that shows an example of how the view edit screen
-             * is expected to pass some common service instance values to the
-             * popups.
-             */
-
-//            DataService.setSubscriberName("Mobility");
-//            DataService.setGlobalCustomerId("CUSTID12345")
-//            DataService.setServiceType("Mobility Type 1");
-//            DataService.setServiceInstanceName("Example Service Instance Name");
-//            DataService.setServiceName("Mobility Service 1");
-//            DataService.setServiceInstanceId("mmsc-test-service-instance");
-//            DataService.setServiceUuid("XXXX-YYYY-ZZZZ");
-//            DataService.setUserServiceInstanceName("USER_SERVICE_INSTANCE_NAME");
-        }
-        
-        //PropertyService.setMsoBaseUrl("testmso");
-
-		$scope.convertModel = function(asdcModel) {
-			
-			if (!asdcModel) return undefined;
-			
-			var convertedAsdcModel = {
-				"service": asdcModel.service,
-				"networks": {},
-				"vnfs": {}
-			};
-			
-			for (var networkUuid in asdcModel.networks) {
-				var networkModel = asdcModel.networks[networkUuid];
-				convertedAsdcModel.networks[networkModel.invariantUuid] = {};
-				convertedAsdcModel.networks[networkModel.invariantUuid][networkModel.version] = networkModel;
-			}
-			
-			for (var vnfUuid in asdcModel.vnfs) {
-				var vnfModel = asdcModel.vnfs[vnfUuid];
-				convertedAsdcModel.vnfs[vnfModel.invariantUuid] = {};
-				convertedAsdcModel.vnfs[vnfModel.invariantUuid][vnfModel.version] = {
-						"uuid": vnfModel.uuid,
-						"invariantUuid": vnfModel.invariantUuid,
-						"version": vnfModel.version,
-						"name": vnfModel.name,
-						"modelCustomizationName": vnfModel.modelCustomizationName,
-						"inputs": "",
-						"description": vnfModel.description,
-						"vfModules": {},
-						"volumeGroups": {}
-				}
-				
-				for (var vfModuleUuid in asdcModel.vnfs[vnfUuid].vfModules) {
-					var vfModuleModel = asdcModel.vnfs[vnfUuid].vfModules[vfModuleUuid];
-					convertedAsdcModel.vnfs[vnfModel.invariantUuid][vnfModel.version].vfModules[vfModuleModel.invariantUuid] = {};
-					convertedAsdcModel.vnfs[vnfModel.invariantUuid][vnfModel.version].vfModules[vfModuleModel.invariantUuid][vfModuleModel.version] = vfModuleModel;
-				}
-				
-				for (var volumeGroupUuid in asdcModel.vnfs[vnfUuid].volumeGroups) {
-					var volumeGroupModel = asdcModel.vnfs[vnfUuid].volumeGroups[volumeGroupUuid];
-					convertedAsdcModel.vnfs[vnfModel.invariantUuid][vnfModel.version].volumeGroups[volumeGroupModel.invariantUuid] = {};
-					convertedAsdcModel.vnfs[vnfModel.invariantUuid][vnfModel.version].volumeGroups[volumeGroupModel.invariantUuid][volumeGroupModel.version] = volumeGroupModel;
-				}
-			}
-			console.log ("convertedAsdcModel: "); console.log (JSON.stringify ( convertedAsdcModel, null, 4 ) );
-			return convertedAsdcModel;
-		};
-		
-		$scope.service = {
-			"model": vidService.getModel(),
-			"modelByInvariantUuid": $scope.convertModel(vidService.getModel()),
-			"instance": vidService.getInstance()
-		};
-
-		$scope.deleteNetwork = function(serviceObject, network) {
-
-			console.log("Removing Network " + network.name);
-
-			//Send delete network request to MSO
-
-			//var networks = this.service.instance.networks;
-
-			//networks.splice(networks.indexOf(network), 1);
-
-			//Retrieve updated data from A&AI
-            var serviceInstance = serviceObject.object;
-			
-			DataService.setInventoryItem(network);
-			DataService.setModelInfo(COMPONENT.NETWORK, $scope.service.model);
-			
-			DataService.setSubscriberName(serviceObject['subscriberName']);
-			DataService.setServiceType(serviceObject['serviceType']);
-			DataService.setServiceInstanceId(serviceInstance['service-instance-id']);
-	
-			DataService.setGlobalCustomerId(serviceObject['globalCustomerId']);
-			DataService.setServiceInstanceName($scope.service.instance.name);
-			
-			//DataService.setServiceName($scope.service.model.name);
-			
-			//DataService.setServiceUuid("XXXX-YYYY-ZZZZ");
-			//DataService.setUserServiceInstanceName("USER_SERVICE_INSTANCE_NAME");
-			
-			$scope.$broadcast("deleteComponent", {
-			    componentId : COMPONENT.NETWORK,
-			    callbackFunction : deleteCallbackFunction
-			});
-		};
-
-		$scope.deleteService = function(serviceObject) {
-
-			var serviceInstance = serviceObject.object;
-			
-			console.log("Removing Service " + $scope.service.instance.name);
-
-			DataService.setInventoryItem(serviceInstance);
-			//DataService.setModelInfo(COMPONENT.SERVICE, $scope.service.model);
-			
-			DataService.setModelInfo(COMPONENT.SERVICE, {
-				"modelInvariantId": $scope.service.model.service.invariantUuid,
-				"modelVersion": $scope.service.model.service.version,
-				"modelNameVersionId": $scope.service.model.service.uuid,
-				"modelCustomizationName": "",
-				"modelName": $scope.service.model.service.name,
-				"inputs": ""
-			});
-			
-			DataService.setSubscriberName(serviceObject['subscriberName']);
-			DataService.setServiceType(serviceObject['serviceType']);
-			DataService.setServiceInstanceId(serviceInstance['service-instance-id']);
-	
-			DataService.setGlobalCustomerId(serviceObject['globalCustomerId']);
-			DataService.setServiceInstanceName($scope.service.instance.name);
-			
-			DataService.setServiceName($scope.service.model.service.name);
-			
-			DataService.setServiceUuid($scope.service.model.service.uuid);
-			//DataService.setUserServiceInstanceName("USER_SERVICE_INSTANCE_NAME");
-			
-			$scope.$broadcast("deleteComponent", {
-			    componentId : COMPONENT.SERVICE,
-			    callbackFunction : deleteServiceInstanceCallbackFunction
-			});
-		
-		};
-
-		$scope.deleteVfModule = function(serviceObject, vfModule, vnf) {
-
-			console.log("Removing VF-Module " + vfModule.name);
-			
-            var serviceInstance = serviceObject.object;
-
-			DataService.setInventoryItem(vfModule.object);
-			
-			var svcModel = $scope.service.modelByInvariantUuid;
-			var vnfModelInvariantUuid = vnf.object["persona-model-id"];
-			var vnfModelVersion = vnf.object["persona-model-version"];
-			if (svcModel != null && vnfModelInvariantUuid != null && vnfModelVersion != null )
-		    {
-				if ( ( UtilityService.hasContents(svcModel.vnfs) && UtilityService.hasContents(svcModel.vnfs[vnfModelInvariantUuid] ) ) &&
-						( UtilityService.hasContents(svcModel.vnfs[vnfModelInvariantUuid][vnfModelVersion] ) ) ) {
-					var vnfModel = svcModel.vnfs[vnfModelInvariantUuid][vnfModelVersion];
-					
-					// volume groups don't have persona-model-id/version in a&ai.
-					// Their persona-model-id/version is the one for the associated vfModule
-					
-					var vfModuleInvariantUuid = vfModule.object["persona-model-id"];
-					var vfModuleModelVersion = vfModule.object["persona-model-version"];
-					
-					if ( UtilityService.hasContents(vnfModel) && UtilityService.hasContents(vnfModel.vfModules) && UtilityService.hasContents(vfModuleInvariantUuid)  &&  UtilityService.hasContents(vfModuleModelVersion) ) 
-					{
-						var vfModelGroupModel = vnfModel.vfModules[vfModuleInvariantUuid][vfModuleModelVersion];
-						
-						var vfModeluuid = vfModelGroupModel.uuid;
-						if (vfModeluuid == null)
-							vfModeluuid = "";
-						
-						var vnfModelCustomizationName = vnfModel.modelCustomizationName;
-						if (vnfModelCustomizationName == null)
-							vnfModelCustomizationName = "";
-						
-						var vfModelName = vfModelGroupModel.name;
-						if (vfModelName == null)
-							vfModelName = "";
-						
-						var vfModelVersionID = vfModule.object['vf-module-id'];
-						if (vfModelVersionID == null)
-							vfModelVersionID = "";
-						
-						DataService.setModelInfo(COMPONENT.VF_MODULE, {
-							"modelInvariantId": vfModuleInvariantUuid,
-							"modelVersion": vfModuleModelVersion,
-							"modelNameVersionId": vfModeluuid,
-							"modelCustomizationName": vnfModelCustomizationName,
-							"modelName": vfModelName,
-							"inputs": ""
-						});
-						
-						DataService.setVnfInstanceId(vnf.object['vnf-id']);
-						DataService.setVfModuleInstanceId(vfModelVersionID);
-						
-						DataService.setSubscriberName(serviceObject['subscriberName']);
-						DataService.setServiceType(serviceObject['serviceType']);
-						DataService.setServiceInstanceId(serviceInstance['service-instance-id']);
-				
-						DataService.setGlobalCustomerId(serviceObject['globalCustomerId']);
-						DataService.setServiceInstanceName($scope.service.instance.name);
-						
-						DataService.setServiceName($scope.service.model.service.name);
-						
-						DataService.setServiceUuid($scope.service.model.service.uuid);
-						//DataService.setUserServiceInstanceName("USER_SERVICE_INSTANCE_NAME");
-						
-						$scope.$broadcast("deleteComponent", {
-						    componentId : COMPONENT.VF_MODULE,
-						    callbackFunction : deleteCallbackFunction
-						});
-						
-						return;
-					}
-					
-				}
-		    }
-		
-		   console.log("Removing VNF " + vnf.name + " could not proceed due to missing ASDC model information.");
-		
-			
-			//Retrieve updated data from A&AI
-		};
-
-		$scope.deleteVnf = function(serviceObject, vnf) {
-
-			console.log("Removing VNF " + vnf.name);
-			
-			var serviceInstance = serviceObject.object;
-			
-			DataService.setInventoryItem(vnf.object);
-			
-			var vnftype = vnf.object['vnf-type'];
-			if (vnftype == null)
-				vnftype = "";
-			else
-			{
-				var n = vnftype.search("/");
-				if (n >= 0)
-					vnftype = vnftype.substring(n+1);
-			}
-			
-
-			var svcModel = $scope.service.modelByInvariantUuid;
-			var vnfModelInvariantUuid = vnf.object["persona-model-id"];
-			var vnfModelVersion = vnf.object["persona-model-version"];
-			if (svcModel != null && vnfModelInvariantUuid != null && vnfModelVersion != null )
-		    {
-				
-				console.log ( "vnf models: "); console.log ( JSON.stringify ($scope.service.modelByInvariantUuid.vnfs, null, 4) );
-
-				var vnfModel = $scope.service.modelByInvariantUuid.vnfs[vnfModelInvariantUuid][vnfModelVersion];
-				if (vnfModel == null)
-					{
-						DataService.setModelInfo(COMPONENT.VNF, {
-							"modelInvariantId": vnfModelInvariantUuid,
-							"modelVersion": vnfModelVersion,
-							"modelNameVersionId": "",
-							"modelCustomizationName": vnftype,
-							"modelName": "",
-							"inputs": ""
-						});
-					}
-				else
-					{
-						DataService.setModelInfo(COMPONENT.VNF, {
-							"modelInvariantId": vnfModelInvariantUuid,
-							"modelVersion": vnfModelVersion,
-							"modelNameVersionId": vnfModel.uuid,
-							"modelCustomizationName": vnftype,
-							"modelName": vnfModel.name,
-							"inputs": ""
-						});
-					}
-		    }
-			else
-			{
-			   console.log("Removing VNF name = " + vnf.name + " didn't get the correponding model details so sending empty model values to MSO!");
-			   DataService.setModelInfo(COMPONENT.VNF, {
-					"modelInvariantId": "",
-					"modelVersion": "",
-					"modelNameVersionId": "",
-					"modelCustomizationName": vnftype,
-					"modelName": "",
-					"inputs": ""
-				});
-			}
-				
-			DataService.setVnfInstanceId(vnf.object['vnf-id']);
-	
-			DataService.setSubscriberName(serviceObject['subscriberName']);
-			DataService.setServiceType(serviceObject['serviceType']);
-			DataService.setServiceInstanceId(serviceInstance['service-instance-id']);
-	
-			DataService.setGlobalCustomerId(serviceObject['globalCustomerId']);
-			DataService.setServiceInstanceName($scope.service.instance.name);
-			
-			DataService.setServiceName($scope.service.model.service.name);
-			
-			DataService.setServiceUuid($scope.service.model.service.uuid);
-			//DataService.setUserServiceInstanceName("USER_SERVICE_INSTANCE_NAME");
-			
-			$scope.$broadcast("deleteComponent", {
-			    componentId : COMPONENT.VNF,
-			    callbackFunction : deleteCallbackFunction
-			});
-		
-		};
-		
-		/*
-		$scope.deleteVnf = function(serviceObject, vnf) {
-
-			console.log("Removing VNF " + vnf.name);
-
-			//Send delete VF-Module request to MSO
-
-			var svcModel = $scope.service.modelByInvariantUuid;
-			var vnfModelInvariantUuid = vnf.object["persona-model-id"];
-			var vnfModelVersion = vnf.object["persona-model-version"];
-			console.log ( "vnf models: "); console.log ( JSON.stringify ($scope.service.modelByInvariantUuid.vnfs, null, 4) );
-
-			DataService.setInventoryItem(vnf);
-			
-			var vnfModel = $scope.service.modelByInvariantUuid.vnfs[vnfModelInvariantUuid][vnfModelVersion];
-			
-			DataService.setModelInfo(COMPONENT.VNF, {
-				"modelInvariantId": vnfModelInvariantUuid,
-				"modelVersion": vnfModelVersion,
-				"modelNameVersionId": vnfModel.uuid,
-				"modelCustomizationName": vnfModel.modelCustomizationName,
-				"modelName": vnfModel.name,
-				"inputs": vnfModel.inputs
-			});
-			
-			DataService.setSubscriberName(serviceObject['globalCustomerId']);
-			DataService.setServiceType(serviceObject['serviceType']);
-			DataService.setServiceInstanceId(serviceObject['service-instance-id']);
-	
-			DataService.setGlobalCustomerId(serviceObject['globalCustomerId']);
-			DataService.setServiceInstanceName($scope.service.instance.name);
-			
-			DataService.setServiceName(vnf.name);
-			
-			DataService.setServiceUuid($scope.service.model.service.uuid);
-			//DataService.setUserServiceInstanceName("USER_SERVICE_INSTANCE_NAME");
-			
-			$scope.$broadcast("deleteComponent", {
-			    componentId : COMPONENT.VNF,
-			    callbackFunction : deleteCallbackFunction
-			});
-			
-			//var vnfs = this.service.instance.vnfs;
-
-			//vnfs.splice(vnfs.indexOf(vnf), 1);
-
-			//Retrieve updated data from A&AI
-		};*/
-
-		$scope.deleteVolumeGroup = function(serviceObject, vnf, vfModule, volumeGroup) {
-
-			console.log("Removing Volume Group " + volumeGroup.name);
-			var haveModel = false;
-			var svcModel = $scope.service.modelByInvariantUuid;
-			
-			var vnfModelInvariantUuid = vnf.object["persona-model-id"]; 
-			var vnfModelVersion = vnf.object["persona-model-version"];
-			
-			if ( ( UtilityService.hasContents(vnfModelInvariantUuid) ) && (UtilityService.hasContents(vnfModelVersion) ) ) {
-				if ( UtilityService.hasContents(svcModel) && UtilityService.hasContents($scope.service.modelByInvariantUuid.vnfs) ) {
-					//console.log ( "vnf models "); console.log (JSON.stringify ($scope.service.modelByInvariantUuid.vnfs, null, 4) );
-					if ( ( UtilityService.hasContents($scope.service.modelByInvariantUuid.vnfs[vnfModelInvariantUuid] ) ) &&
-							( UtilityService.hasContents($scope.service.modelByInvariantUuid.vnfs[vnfModelInvariantUuid][vnfModelVersion] ) ) ) {
-						var vnfModel = $scope.service.modelByInvariantUuid.vnfs[vnfModelInvariantUuid][vnfModelVersion];
-						
-						// volume groups don't have persona-model-id/version in a&ai.
-						// Their persona-model-id/version is the one for the associated vfModule
-						
-						var vfModuleInvariantUuid = vfModule.object["persona-model-id"];
-						var vfModuleModelVersion = vfModule.object["persona-model-version"];
-				
-						if ( UtilityService.hasContents(vnfModel.volumeGroups) && UtilityService.hasContents(vfModuleInvariantUuid)  &&  UtilityService.hasContents(vfModuleModelVersion) ) {
-							
-							if ( ( UtilityService.hasContents (vnfModel.volumeGroups[vfModuleInvariantUuid]) ) && 
-									(UtilityService.hasContents (vnfModel.volumeGroups[vfModuleInvariantUuid][vfModuleModelVersion]) ) ) {
-								var volGroupModel = vnfModel.volumeGroups[vfModuleInvariantUuid][vfModuleModelVersion];
-								
-								DataService.setModelInfo(COMPONENT.VOLUME_GROUP, {
-									"modelInvariantId": vfModuleInvariantUuid,
-									"modelVersion": vfModuleModelVersion,
-									"modelNameVersionId": volGroupModel.uuid,
-									"modelCustomizationName": vnfModel.modelCustomizationName,
-									"modelName": volGroupModel.name,
-									"inputs": ""
-								});
-								haveModel = true;
-						
-							}
-						}
-					}
-				}
-			}
-			if ( !haveModel ) {
-				DataService.setModelInfo(COMPONENT.VOLUME_GROUP, {
-					"modelInvariantId": "",
-					"modelVersion": "",
-					"modelNameVersionId": "",
-					"modelCustomizationName": "",
-					"modelName": "",
-					"inputs": ""
-				});
-			}
-
-			var serviceInstance = serviceObject.object;
-			
-            DataService.setInventoryItem(volumeGroup.object);
-		
-			DataService.setSubscriberName(serviceObject['subscriberName']);
-			DataService.setServiceType(serviceObject['serviceType']);
-			DataService.setServiceInstanceId(serviceInstance['service-instance-id']);
-	
-			DataService.setGlobalCustomerId(serviceObject['globalCustomerId']);
-			DataService.setServiceInstanceName($scope.service.instance.name);
-			
-			DataService.setServiceName($scope.service.model.service.name);
-			
-			DataService.setServiceUuid($scope.service.model.service.uuid);
-			DataService.setVnfInstanceId(vnf.nodeId);
-			DataService.setVolumeGroupInstanceId(volumeGroup.nodeId);
-		
-			//DataService.setUserServiceInstanceName("USER_SERVICE_INSTANCE_NAME");
-			
-			$scope.$broadcast("deleteComponent", {
-			    componentId : COMPONENT.VOLUME_GROUP,
-			    callbackFunction : deleteCallbackFunction
-			});
-		};
-		
-		$scope.deleteVnfVolumeGroup = function(serviceObject, vnf, volumeGroup) {
-
-			console.log("Removing Volume Group " + volumeGroup.name);
-            var serviceInstance = serviceObject.object;
-			
-            DataService.setInventoryItem(volumeGroup.object);
-        
-			var svcModel = $scope.service.modelByInvariantUuid;
-			var vnfModelInvariantUuid = vnf.object["persona-model-id"];
-			var vnfModelVersion = vnf.object["persona-model-version"];
-			var vnfModel = null;
-			
-			var volGroupModelInvariantUuid = null;
-			var volGroupModelVersion = null;
-			
-			// send an empty model by default since model is not required for deletes
-			DataService.setModelInfo(COMPONENT.VOLUME_GROUP, {});
-			
-			if ( (volumeGroup.object != null) && ( volumeGroup.object["persona-model-id"] != null ) && 
-					(volumeGroup.object["persona-model-version"] != null) ) {
-				
-				volGroupModelInvariantUuid = volumeGroup.object["persona-model-id"];
-				volGroupModelVersion = volumeGroup.object["persona-model-version"];
-				
-				if (svcModel != null && vnfModelInvariantUuid != null && vnfModelVersion != null ) {
-					console.log ( "vnf models: "); console.log ( JSON.stringify ($scope.service.modelByInvariantUuid.vnfs, null, 4) );
-					if ( ($scope.service.modelByInvariantUuid.vnfs[vnfModelInvariantUuid] != null) && 
-							($scope.service.modelByInvariantUuid.vnfs[vnfModelInvariantUuid][vnfModelVersion]) != null ) {
-						
-						vnfModel = $scope.service.modelByInvariantUuid.vnfs[vnfModelInvariantUuid][vnfModelVersion];
-						if ( (vnfModel.volumeGroups != null) && ( vnfModel.volumeGroups[volGroupModelInvariantUuid] != null ) 
-								&& ( vnfModel.volumeGroups[volGroupModelInvariantUuid][volGroupModelVersion] != null ) ) {
-							
-							var volumeGroupModel = vnfModel.volumeGroups[volGroupModelInvariantUuid][volGroupModelVersion];
-						
-							DataService.setModelInfo(COMPONENT.VOLUME_GROUP, {		
-								"modelInvariantId": volumeGroupModel.invariantUuid,
-								"modelVersion": volumeGroupModel.version,
-								"modelNameVersionId": volumeGroupModel.uuid,
-								"modelName": volumeGroupModel.name,
-								"modelCustomizationName": volumeGroupModel.modelCustomizationName,
-								"inputs": ""
-							});		
-						}
-					}
-			    }
-			}
-				
-			DataService.setVnfInstanceId(vnf.object['vnf-id']);
-		
-			DataService.setSubscriberName(serviceObject['subscriberName']);
-			DataService.setServiceType(serviceObject['serviceType']);
-			DataService.setServiceInstanceId(serviceInstance['service-instance-id']);
-	
-			DataService.setGlobalCustomerId(serviceObject['globalCustomerId']);
-			DataService.setServiceInstanceName($scope.service.instance.name);
-			
-			DataService.setServiceName($scope.service.model.service.name);
-			
-			DataService.setServiceUuid($scope.service.model.service.uuid);
-			DataService.setVnfInstanceId(vnf.nodeId);
-			DataService.setVolumeGroupInstanceId(volumeGroup.nodeId);
-		
-			//DataService.setUserServiceInstanceName("USER_SERVICE_INSTANCE_NAME");
-			
-			$scope.$broadcast("deleteComponent", {
-			    componentId : COMPONENT.VOLUME_GROUP,
-			    callbackFunction : deleteCallbackFunction
-			});
-		};
-
-		$scope.describeNetwork = function(serviceObject, networkObject) {
-			var serviceInstance = serviceObject.object;
-			var network = networkObject.object;
-
-			//Display popup with additional network information
-			DataService.setNetworkInstanceId(network['network-id']);
-			DataService.setInventoryItem(network);
-			//DataService.setModelInfo(network['network-id'], network);
-			
-			DataService.setSubscriberName(serviceObject['subscriber-name']);
-			DataService.setServiceType(serviceObject['serviceType']);
-			DataService.setServiceInstanceId(serviceInstance['service-instance-id']);
-			
-			//DataService.setVnfInstanceId("Testing");
-			$scope.$broadcast("showComponentDetails", {
-			    componentId : COMPONENT.NETWORK
-			});
-		};
-
-		// for service instance id - no need for this!
-		$scope.describeService = function(serviceObject) {
-			var serviceInstance = serviceObject.object;
-		
-			DataService.setInventoryItem(serviceInstance);
-			//DataService.setModelInfo(serviceInstance['service-instance-id'], serviceInstance);
-			
-			DataService.setSubscriberName(serviceObject['subscriberName']);
-			DataService.setServiceType(serviceObject['serviceType']);
-			DataService.setServiceInstanceId(serviceInstance['service-instance-id']);
-			
-			//Display popup with additional service information
-			$scope.$broadcast("showComponentDetails", {
-			    componentId : COMPONENT.SERVICE
-			});
-			
-		};
-
-		$scope.describeVfModule = function(serviceObject, vfModuleObject) {
-			var serviceInstance = serviceObject.object;
-			var vfModule = vfModuleObject.object;
-
-			//Display popup with additional VF-Module information
-			DataService.setVfModuleInstanceId(vfModule['vf-module-id']);
-			DataService.setInventoryItem(vfModule);
-			//DataService.setModelInfo(vfModule['vf-module-id'], vfModule);
-			
-			DataService.setSubscriberName(serviceObject['subscriberName']);
-			DataService.setServiceType(serviceObject['serviceType']);
-			DataService.setServiceInstanceId(serviceInstance['service-instance-id']);
-			
-			$scope.$broadcast("showComponentDetails", {
-			    componentId : COMPONENT.VF_MODULE
-			});
-		};
-
-		$scope.describeVnf = function(serviceObject, vnfObject) {
-			var serviceInstance = serviceObject.object;
-			var vnf = vnfObject.object;
-
-			//Display popup with additional VNF information
-			DataService.setVnfInstanceId(vnf['vnf-id']);
-			DataService.setInventoryItem(vnf);
-			//DataService.setModelInfo(vnf['vnf-id'], vnf);
-			
-			DataService.setSubscriberName(serviceObject['subscriberName']);
-			DataService.setServiceType(serviceObject['serviceType']);
-			DataService.setServiceInstanceId(serviceInstance['service-instance-id']);
-			
-			$scope.$broadcast("showComponentDetails", {
-			    componentId : COMPONENT.VNF
-			});
-		};
-
-		$scope.describeVolumeGroup = function(serviceObject, volumeGroupObject) {
-			var serviceInstance = serviceObject.object;
-			var volumeGroup = volumeGroupObject.object;
-
-			DataService.setVolumeGroupInstanceId(volumeGroup['volume-group-id']);
-			DataService.setInventoryItem(volumeGroup);
-			DataService.setModelInfo(volumeGroup['volume-group-id'], volumeGroup);
-			
-			DataService.setSubscriberName(serviceObject['subscriberName']);
-			DataService.setServiceType(serviceObject['serviceType']);
-			DataService.setServiceInstanceId(serviceInstance['service-instance-id']);
-			
-			//Display popup with additional Volume Group information
-			//DataService.setVnfInstanceId("Testing");
-			$scope.$broadcast("showComponentDetails", {
-			    componentId : COMPONENT.VOLUME_GROUP
-			});
-		};
-
-		$scope.addNetworkInstance = function(network) {
-			console.log("Unsupported in 1610: Adding Network instance of type " + network.name + " to service instance" + this.service.instance.name);
-		};
-
-		$scope.addVnfInstance = function(vnf) {
-			//console.log ("addVnfInstance invoked VNF="); console.log (JSON.stringify (vnf,null,4));
-				
-			DataService.setSubscriberName($scope.service.instance.subscriberName);
-			DataService.setGlobalCustomerId($scope.service.instance.globalCustomerId);
-			DataService.setServiceType($scope.service.instance.serviceType);
-			DataService.setServiceInstanceName($scope.service.instance.name);
-			DataService.setServiceInstanceId($scope.service.instance.id);
-			DataService.setServiceName($scope.service.model.service.name);
-			
-			DataService.setModelInfo(COMPONENT.VNF, {
-				"modelType": "vnf",
-				"modelInvariantId": vnf.invariantUuid,
-				"modelVersion": vnf.version,
-				"modelNameVersionId": vnf.uuid,
-				"modelName": vnf.name,
-				"modelCustomizationName": vnf.modelCustomizationName,
-				"inputs": ""
-			});
-			
-			DataService.setModelInstanceName($scope.service.model.service.name);
-			
-			DataService.setModelInfo(COMPONENT.SERVICE, {
-				"modelInvariantId": $scope.service.model.service.invariantUuid, 
-				"modelVersion": $scope.service.model.service.version,
-				"modelNameVersionId": $scope.service.model.service.uuid,
-				"modelName": $scope.service.model.service.name,
-				"inputs": ""
-			});
-			
-			$scope.$broadcast("createComponent", {
-			    componentId : COMPONENT.VNF,
-			    callbackFunction : createVnfCallbackFunction
-			});		
-		};
-
-		$scope.addVfModuleInstance = function(vnfInstance, vfModuleModel) {
-			
-			DataService.setSubscriberName($scope.service.instance.subscriberName);
-			DataService.setGlobalCustomerId($scope.service.instance.globalCustomerId);
-			DataService.setServiceType($scope.service.instance.serviceType);
-			DataService.setServiceInstanceName($scope.service.instance.name);
-			DataService.setServiceInstanceId($scope.service.instance.id);
-			DataService.setServiceName($scope.service.model.service.name);
-
-			var vnfModelInvariantUuid = vnfInstance.object["persona-model-id"];
-			var vnfModelVersion = vnfInstance.object["persona-model-version"];
-			var vnfModel = $scope.service.modelByInvariantUuid.vnfs[vnfModelInvariantUuid][vnfModelVersion];
-			
-			var availableVolumeGroupList = [];
-			angular.forEach(vnfInstance["availableVolumeGroups"], function(volumeGroupInstance, key) {
-				availableVolumeGroupList.push({"instance": volumeGroupInstance});
-			});
-			
-			if (vfModuleModel.volumeGroupAllowed) {
-				DataService.setAvailableVolumeGroupList(availableVolumeGroupList);
-			}
-			
-			DataService.setModelInfo(COMPONENT.SERVICE, {
-				"modelInvariantId": $scope.service.model.service.invariantUuid,
-				"modelVersion": $scope.service.model.service.version,
-				"modelNameVersionId": $scope.service.model.service.uuid,
-				"modelName": $scope.service.model.service.name,
-				"inputs": ""
-			});
-
-			DataService.setVnfInstanceId(vnfInstance.object["vnf-id"]);
-			
-			DataService.setModelInfo(COMPONENT.VNF, {
-				"modelInvariantId": vnfModel.invariantUuid,
-				"modelVersion": vnfModel.version,
-				"modelNameVersionId": vnfModel.uuid,
-				"modelName": vnfModel.name,
-				"modelCustomizationName": vnfModel.modelCustomizationName,
-				"inputs": ""
-			});
-			
-			DataService.setModelInfo(COMPONENT.VF_MODULE, {
-				"modelInvariantId": vfModuleModel.invariantUuid,
-				"modelVersion": vfModuleModel.version,
-				"modelNameVersionId": vfModuleModel.uuid,
-				"modelName": vfModuleModel.name,
-				"inputs": ""
-			});
-			
-			$scope.$broadcast("createComponent", {
-			    componentId : COMPONENT.VF_MODULE,
-			    callbackFunction : createVfModuleCallbackFunction
-			});
-		
-		};
-
-		$scope.addVolumeGroupInstance = function(vnfInstance, volumeGroupModel) {
-			
-			DataService.setSubscriberName($scope.service.instance.subscriberName);
-			DataService.setGlobalCustomerId($scope.service.instance.globalCustomerId);
-			DataService.setServiceType($scope.service.instance.serviceType);
-			DataService.setServiceInstanceName($scope.service.instance.name);
-			DataService.setServiceInstanceId($scope.service.instance.id);
-			DataService.setServiceName($scope.service.model.service.name);
-
-			DataService.setModelInfo(COMPONENT.SERVICE, {
-				"modelInvariantId": $scope.service.model.service.invariantUuid,
-				"modelVersion": $scope.service.model.service.version,
-				"modelNameVersionId": $scope.service.model.service.uuid,
-				"modelName": $scope.service.model.service.name,
-				"inputs": ""
-			});
-
-			DataService.setVnfInstanceId(vnfInstance.object["vnf-id"]);
-
-			var vnfModelInvariantUuid = vnfInstance.object["persona-model-id"];
-			var vnfModelVersion = vnfInstance.object["persona-model-version"];
-			var vnfModel = $scope.service.modelByInvariantUuid.vnfs[vnfModelInvariantUuid][vnfModelVersion];
-			
-			DataService.setModelInfo(COMPONENT.VNF, {
-				"modelInvariantId": vnfModel.invariantUuid,
-				"modelVersion": vnfModel.version,
-				"modelNameVersionId": vnfModel.uuid,
-				"modelName": vnfModel.name,
-				"modelCustomizationName": vnfModel.modelCustomizationName,
-				"inputs": ""
-			});
-			
-			DataService.setModelInfo(COMPONENT.VOLUME_GROUP, {
-				"modelInvariantId": volumeGroupModel.invariantUuid,
-				"modelVersion": volumeGroupModel.version,
-				"modelNameVersionId": volumeGroupModel.uuid,
-				"modelName": volumeGroupModel.name,
-				"inputs": ""
-			});
-			
-			$scope.$broadcast("createComponent", {
-			    componentId : COMPONENT.VOLUME_GROUP,
-			    callbackFunction : createVolumeGroupCallbackFunction
-			});
-		};
-
-		$scope.attachVolumeGroupInstance = function(vfModuleInstance, volumeGroupInstance) {
-
-			var vnfInstance = this.vnf;
-			var vnfModelInvariantUuid = vnfInstance.object["persona-model-id"];
-			var vnfModelVersion = vnfInstance.object["persona-model-version"];
-			var vnfModel = $scope.service.modelByInvariantUuid.vnfs[vnfModelInvariantUuid][vnfModelVersion];
-			
-			var vfModuleModelInvariantUuid = vfModuleInstance.object["persona-model-id"];
-			var vfModuleVersion = vfModuleInstance.object["persona-model-version"];
-			var vfModuleModel = vnfModel.vfModules[vfModuleModelInvariantUuid][vfModuleVersion];
-			
-			var volumeGroupModelInvariantUuid = volumeGroupInstance.object["persona-model-id"];
-			var volumeGroupModelVersion = volumeGroupInstance.object["persona-model-version"];
-			var volumeGroupModel = vnfModel.volumeGroups[volumeGroupModelInvariantUuid][volumeGroupModelVersion];
-			
-			if (vfModuleModel.uuid != volumeGroupModel.uuid) alert("Cannot attach this volume group to this VF module (models do not match)");
-			
-			DataService.setSubscriberName($scope.service.instance.subscriberName);
-			DataService.setGlobalCustomerId($scope.service.instance.globalCustomerId);
-			DataService.setServiceName($scope.service.model.name);
-			DataService.setServiceType($scope.service.instance.serviceType);
-			DataService.setServiceInstanceName($scope.service.instance.name);
-			DataService.setServiceInstanceId($scope.service.instance.id);
-
-			DataService.setModelInfo(COMPONENT.SERVICE, {
-				"modelInvariantId": $scope.service.model.service.invariantUuid,
-				"modelVersion": $scope.service.model.service.version,
-				"modelNameVersionId": $scope.service.model.service.uuid,
-				"modelName": $scope.service.model.service.name,
-				"inputs": ""
-			});
-
-			DataService.setVnfInstanceId(vnfInstance.object["vnf-id"]);
-
-			DataService.setModelInfo(COMPONENT.VNF, {
-				"modelInvariantId": vnfModel.invariantUuid,
-				"modelVersion": vnfModel.version,
-				"modelNameVersionId": vnfModel.uuid,
-				"modelName": vnfModel.name,
-				"modelCustomizationName": vnfModel.modelCustomizationName,
-				"inputs": ""
-			});
-			
-			DataService.setModelInfo(COMPONENT.VOLUME_GROUP, {
-				"modelInvariantId": volumeGroupModel.invariantUuid,
-				"modelVersion": volumeGroupModel.version,
-				"modelNameVersionId": volumeGroupModel.uuid,
-				"modelName": volumeGroupModel.name,
-				"inputs": ""
-			});
-			
-			$scope.$broadcast("createComponent", {
-			    componentId : COMPONENT.VOLUME_GROUP,
-			    callbackFunction : createVolumeGroupCallbackFunction
-			});
-			/*
-			 * Code to manipulate the angular ui-tree
-			var volumeGroups = this.vnf.volumeGroups;
-			volumeGroups.splice(volumeGroups.indexOf(volumeGroup), 1);
-			vfModule.volumeGroups.push(volumeGroup);
-			*/
-		};
-
-		$scope.resetProgress = function() {
-			$scope.percentProgress = 0;
-			$scope.progressClass = "progress-bar progress-bar-info";
-		};
-
-		$scope.setProgress = function(percentProgress) {
-			percentProgress = parseInt(percentProgress);
-			if (percentProgress >= 100) {
-				$scope.progressClass = "progress-bar progress-bar-success";					
-			}
-
-			if (percentProgress < $scope.percentProgress) {
-				return;
-			}
-
-			$scope.percentProgress = percentProgress;
-			$scope.progressWidth = {width: percentProgress + "%"};
-			if (percentProgress >= 5) {
-				$scope.progressText =  percentProgress + " %";
-			} else {
-				// Hidden since color combination is barely visible when progress portion is narrow.
-				$scope.progressText = "";
-			}
-		};
-		
-		$scope.reloadRoute = function() {
-			$route.reload();
-		}
-
-		var createVnfCallbackFunction = function(response) {
-			$scope.callbackResults = "";
-			var color = "none";
-			$scope.callbackStyle = {
-					"background-color" : color
-			};
-			
-			/*
-			 * This 1/2 delay was only added to visually highlight the status
-			 * change. Probably not needed in the real application code.
-			 */
-			$timeout(function() {
-				$scope.callbackResults = UtilityService.getCurrentTime()
-				+ " isSuccessful: " + response.isSuccessful;
-				if (response.isSuccessful) {
-					color = "#8F8";
-					$scope.reloadRoute();
-				} else {
-					color = "#F88";
-				}
-				$scope.callbackStyle = {
-						"background-color" : color
-				};
-			}, 500);
-			
-		
-			
-		};
-		
-		var deleteCallbackFunction = function(response) {
-			$scope.callbackResults = "";
-			var color = "none";
-			$scope.callbackStyle = {
-					"background-color" : color
-			};
-			
-			/*
-			 * This 1/2 delay was only added to visually highlight the status
-			 * change. Probably not needed in the real application code.
-			 */
-			$timeout(function() {
-				$scope.callbackResults = UtilityService.getCurrentTime()
-				+ " isSuccessful: " + response.isSuccessful;
-				if (response.isSuccessful) {
-					color = "#8F8";
-					$scope.reloadRoute();
-				} else {
-					color = "#F88";
-				}
-				$scope.callbackStyle = {
-						"background-color" : color
-				};
-			}, 500);
-			
-		};
-		
-		var createVfModuleCallbackFunction = function(response) {
-			$scope.callbackResults = "";
-			var color = "none";
-			$scope.callbackStyle = {
-					"background-color" : color
-			};
-			
-			/*
-			 * This 1/2 delay was only added to visually highlight the status
-			 * change. Probably not needed in the real application code.
-			 */
-			$timeout(function() {
-				$scope.callbackResults = UtilityService.getCurrentTime()
-				+ " isSuccessful: " + response.isSuccessful;
-				if (response.isSuccessful) {
-					color = "#8F8";
-					$scope.reloadRoute();
-				} else {
-					color = "#F88";
-				}
-				$scope.callbackStyle = {
-						"background-color" : color
-				};
-			}, 500);
-
-		};
-			
-		var deleteServiceInstanceCallbackFunction = function(response) {
-			$scope.callbackResults = "";
-			var color = "none";
-			$scope.callbackStyle = {
-					"background-color" : color
-			};
-			
-			/*
-			 * This 1/2 delay was only added to visually highlight the status
-			 * change. Probably not needed in the real application code.
-			 */
-			$timeout(function() {
-				$scope.callbackResults = UtilityService.getCurrentTime()
-				+ " isSuccessful: " + response.isSuccessful;
-				if (response.isSuccessful) {
-					color = "#8F8";
-					$location.path("/instances/services")
-				} else {
-					color = "#F88";
-				}
-				$scope.callbackStyle = {
-						"background-color" : color
-				};
-			}, 500);
-
-		};
-	
-		var createVolumeGroupCallbackFunction = function(response) {
-			$scope.callbackResults = "";
-			var color = "none";
-			$scope.callbackStyle = {
-					"background-color" : color
-			};
-			
-			/*
-			 * This 1/2 delay was only added to visually highlight the status
-			 * change. Probably not needed in the real application code.
-			 */
-			$timeout(function() {
-				$scope.callbackResults = UtilityService.getCurrentTime()
-				+ " isSuccessful: " + response.isSuccessful;
-				if (response.isSuccessful) {
-					color = "#8F8";
-					$scope.reloadRoute();
-				} else {
-					color = "#F88";
-				}
-				$scope.callbackStyle = {
-						"background-color" : color
-				};
-			}, 500);
-			
-			
-		
-		};
-			
-	});
-})();
diff --git a/vid/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js b/vid/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js
deleted file mode 100644
index 855c23dde..000000000
--- a/vid/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js
+++ /dev/null
@@ -1,196 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-(function () {
-	'use strict';
-
-	app.controller("ServiceModelController", function ($scope, $http, $location, COMPONENT, DataService, vidService,
-			PropertyService) {
-
-		$scope.popup = {};
-		var re = /.*?:\/\/.*?:.*?\/(.*?)\//g;
-		var baseEndpoint = re.exec($location.absUrl())[1];
-		
-		$scope.getServiceModels = function() {
-			$scope.status = "Fetching service catalog from ASDC.  Please wait.";
-			$http.get('/' + baseEndpoint + '/rest/models/services?distributionStatus=DISTRIBUTED')
-			.then(function(response) {
-				$scope.services = [];
-				if (angular.isArray(response.data)) {
-					$scope.services = response.data;
-					$scope.viewPerPage=10;
-					$scope.totalPage=$scope.services.length/$scope.viewPerPage;
-					$scope.sortBy="name";
-					$scope.scrollViewPerPage=2;
-					$scope.currentPage=1;
-					$scope.searchCategory;
-					$scope.searchString="";
-					$scope.currentPageNum=1;
-					$scope.isSpinnerVisible = false;
-					$scope.isProgressVisible = false;
-				} else {
-					$scope.status = "Failed to get service models from ASDC.";
-					$scope.error = true;
-					$scope.isSpinnerVisible = false;
-				}
-			}, function (response) {
-				console.log("Error: " + response);
-			});
-		}
-		$scope.init = function() {
-        	// takes a default value, retrieves the prop value from the file system and sets it
-    		var msecs = PropertyService.retrieveMsoMaxPollingIntervalMsec(1000);
-    		PropertyService.setMsoMaxPollingIntervalMsec(msecs);
-    		
-    		// takes a default value, retrieves the prop value from the file system and sets it
-    		var polls = PropertyService.retrieveMsoMaxPolls(7);
-    		PropertyService.setMsoMaxPolls(polls);
-    		
-    		//PropertyService.setMsoBaseUrl("testmso");
-    		PropertyService.setServerResponseTimeoutMsec(10000);
-        }
-		
-		$scope.prevPage = function() {
-			$scope.currentPage--;
-		}
-		
-		$scope.nextPage = function() {
-			$scope.currentPage++;
-		}
-		
-		$scope.deployService = function(service) {
-
-			console.log("Instantiating ASDC service " + service.uuid);
-			
-			$http.get('/' + baseEndpoint + '/rest/models/services/' + service.uuid)
-				.then(function successCallback(getServiceResponse) {
-					
-					var serviceModel = getServiceResponse.data;
-					DataService.setServiceName(serviceModel.service.name);
-					
-					DataService.setModelInfo(COMPONENT.SERVICE, {
-						"modelInvariantId": serviceModel.service.invariantUuid,
-						"modelVersion": serviceModel.service.version,
-						"modelNameVersionId": serviceModel.service.uuid,
-						"modelName": serviceModel.service.name,
-						"description": serviceModel.service.description,
-						"category":serviceModel.service.category
-					});
-					
-					$scope.$broadcast("createComponent", {
-					    componentId : COMPONENT.SERVICE,
-					    callbackFunction : function(response) {
-					    	if (response.isSuccessful) {
-								vidService.setModel(serviceModel);
-								
-								var subscriberId = "Not Found";
-								var serviceType = "Not Found";
-								
-								var serviceInstanceId = response.instanceId;
-								
-								for (var i = 0; i < response.control.length; i++) {
-									if (response.control[i].id == "subscriberName") {
-										subscriberId = response.control[i].value;
-									} else if (response.control[i].id == "serviceType") {
-										serviceType = response.control[i].value;
-									}
-								}
-								
-								
-								$scope.refreshSubs(subscriberId,serviceType,serviceInstanceId);
-							
-					    	}
-					    }
-					});
-					
-				}, function errorCallback(response) {
-					console.log("Error: " + response);
-				});
-		};
-		
-		$scope.refreshSubs = function(subscriberId, serviceType, serviceInstanceId) {
-			$scope.status = "Fetching subscriber list from A&AI...";
-			$scope.init();
-			$http.get(  PropertyService.getAaiBaseUrl() + "/aai_refresh_full_subscribers", {
-
-			},{
-				timeout: $scope.responseTimeoutMsec
-			}).then(function(response){
-				
-				if (response.data.status < 200 || response.data.status > 202) {
-					$scope.showError("MSO failure - see log below for details")
-					return;
-				}
-
-				$scope.customer = response.data.customer; // get data from json
-				
-				$scope.customerList = [];
-
-				$scope.serviceInstanceToCustomer = [];
-				
-				angular.forEach($scope.customer, function(subVal, subKey) {
-					var cust = { "globalCustomerId": subVal["global-customer-id"], "subscriberName": subVal["subscriber-name"] };
-					$scope.customerList.push(cust);
-					if (subVal["service-subscriptions"] != null) {
-							angular.forEach(subVal["service-subscriptions"]["service-subscription"], function(serviceSubscription, key) {
-								$scope.serviceInstanceId = [];
-								if (serviceSubscription["service-type"] != null) {
-									$scope.serviceType = serviceSubscription["service-type"];
-								} else {
-									$scope.serviceType = "No Service Subscription Found";
-								}
-								if (serviceSubscription["service-instances"] != null) {
-									angular.forEach(serviceSubscription["service-instances"]["service-instance"], function(instValue, instKey) {
-										var foo = { "serviceInstanceId": instValue["service-instance-id"], 
-												"globalCustomerId": subVal["global-customer-id"],
-												"subscriberName": subVal["subscriber-name"] };
-										$scope.serviceInstanceToCustomer.push(foo);
-									});
-								}
-							});
-					}
-				});	
-				DataService.setServiceInstanceToCustomer($scope.serviceInstanceToCustomer);
-				var serviceIdList = [];
-				$http.get(PropertyService.getAaiBaseUrl() + "/aai_get_services", {
-				},{
-					timeout: $scope.responseTimeoutMsec
-				}).then(function(response) {
-				angular.forEach(response.data, function(value, key) {
-					angular.forEach(value, function(subVal, key) {
-						var newVal = { "id" : subVal["service-id"], "description" : subVal["service-description"] };
-						serviceIdList.push(newVal);
-						DataService.setServiceIdList(serviceIdList);
-						
-						$location.search({
-							"subscriberId": subscriberId,
-							"serviceType": serviceType,
-							"serviceInstanceId": serviceInstanceId
-						});
-						
-						$location.path("/instantiate");
-					});
-					});
-				});
-			})
-			["catch"]($scope.handleServerError);
-		};
-	});
-})();
diff --git a/vid/src/main/webapp/app/vid/scripts/controller/VidApp.js b/vid/src/main/webapp/app/vid/scripts/controller/VidApp.js
deleted file mode 100644
index acc185cf8..000000000
--- a/vid/src/main/webapp/app/vid/scripts/controller/VidApp.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-(function () {
-  'use strict';
-  
-  app.config(['$routeProvider', '$locationProvider', function ($routeProvider) {
-      $routeProvider
-        .when('/models/services', {
-          controller: 'ServiceModelController',
-          templateUrl: 'app/vid/scripts/view-models/serviceModels.htm'
-        })
-        .when('/instances/services', {
-    		templateUrl : "app/vid/scripts/view-models/aaiGetSubs.htm", 
-    		controller : "aaiSubscriberController"
-        })
-        .when('/instances/subdetails', {
-    		templateUrl : "app/vid/scripts/view-models/aaiSubDetails.htm", 
-    		controller : "aaiSubscriberController"
-        })
-        .when('/instantiate', {
-          controller: 'InstantiationController',
-          templateUrl: 'app/vid/scripts/view-models/instantiate.htm'
-        })
-        .otherwise({
-        	redirectTo: '/models/services'
-        });
-    }]);
-  
-  app.service('vidService', function() {
-	  var _model = undefined;
-	  var _instance = undefined;
-	  
-	  this.setModel = function(model) {
-		  _model = model;
-	  };
-	  
-	  this.getModel = function() {
-		  return _model;
-	  };
-	  
-	  this.setInstance = function(instance) {
-		  _instance = instance;
-	  };
-	  
-	  this.getInstance = function() {
-		  return _instance;
-	  };
-  });
-})();
diff --git a/vid/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js b/vid/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js
deleted file mode 100644
index aa3b5223a..000000000
--- a/vid/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js
+++ /dev/null
@@ -1,763 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-"use strict";
-
-app.controller("aaiSubscriberController", [ "COMPONENT", "DataService", "PropertyService", "$scope", "$http", "$timeout", "$location", "$log", "$route", "UtilityService", "vidService",
-                                            function(COMPONENT, DataService, PropertyService, $scope, $http, $timeout, $location, $log, $route, UtilityService, vidService) {
-
-	$scope.showVnfDetails = function(vnf) {
-		console.log("showVnfDetails");
-		DataService.setVnfInstanceId("VNF_INSTANCE_ID_12345");
-		DataService
-		.setInventoryItem(aaiResult["inventory-response-items"]["inventory-response-item"][0]);
-
-		$scope.$broadcast("showComponentDetails", {
-			componentId : COMPONENT.VNF,
-			callbackFunction : callbackFunction
-		});
-	}
-	$scope.popup = new Object();
-
-
-	$scope.isPopupVisible = false;
-	$scope.defaultBaseUrl = "";
-	$scope.responseTimeoutMsec = 60000;
-
-	$scope.serviceTypes=[ "Select a service type" ];
-	$scope.defaultSubscriberName=[ "Select a subscriber name" ];
-
-	var callbackFunction = function(response) {
-		alert(response);
-	};
-
-	$scope.getSubs = function() {
-		$scope.status = "Fetching subscriber list from A&AI...";
-		$scope.init();
-		$http.get(  PropertyService.getAaiBaseUrl() + "/aai_get_full_subscribers" + '?r=' + Math.random(), {
-
-		},{
-			timeout: $scope.responseTimeoutMsec
-		}).then($scope.handleInitialResponse)
-		["catch"]($scope.handleServerError);
-		var serviceIdList = [];
-		$http.get(PropertyService.getAaiBaseUrl() + "/aai_get_services" + '?r=' + Math.random(), {
-		},{
-			timeout: $scope.responseTimeoutMsec
-		}).then(function(response) {
-			angular.forEach(response.data, function(value, key) {
-				angular.forEach(value, function(subVal, key) {
-					var newVal = { "id" : subVal["service-id"], "description" : subVal["service-description"] };
-					serviceIdList.push(newVal);
-					DataService.setServiceIdList(serviceIdList);
-				});
-			});
-		});	
-	};
-
-	$scope.refreshSubs = function() {
-		$scope.status = "Fetching subscriber list from A&AI...";
-		$scope.init();
-		$http.get(PropertyService.getAaiBaseUrl() + "/aai_refresh_full_subscribers" + '?r=' + Math.random(), {
-
-		},{
-			timeout: $scope.responseTimeoutMsec
-		}).then($scope.handleInitialResponse)
-		["catch"]($scope.handleServerError);
-	};
-	
-	$scope.getSubDetails = function(request) {
-
-		$scope.init();
-		$scope.selectedSubscriber = $location.search().selectedSubscriber;
-		$scope.selectedServiceInstance = $location.search().selectedServiceInstance;
-		$scope.status = "Fetching subscriber details from A&AI for " + $scope.selectedSubscriber;
-		$http.get(PropertyService.getAaiBaseUrl() + "/aai_sub_details/"  + $scope.selectedSubscriber + '?r=' + Math.random(), {
-
-		},{
-			timeout: $scope.responseTimeoutMsec
-		}).then(function(response) {
-			$scope.subscriber = response.data;
-			$scope.selectedSubscriberName = $scope.subscriber["subscriber-name"];
-			
-			$scope.displayData= [];
-			if ($scope.subscriber["service-subscriptions"] != null) {
-				angular.forEach($scope.subscriber["service-subscriptions"]["service-subscription"], function(serviceSubscription, key) {
-					$scope.serviceInstanceId = [];
-					if (serviceSubscription["service-type"] != null) {
-						$scope.serviceType = serviceSubscription["service-type"];
-					} else {
-						$scope.serviceType = "No Service Subscription Found";
-					}
-					if (serviceSubscription["service-instances"] != null) {
-						angular.forEach(serviceSubscription["service-instances"]["service-instance"], function(instValue, instKey) {
-							// put them together, i guess
-							var inst = { "serviceInstanceId": instValue["service-instance-id"], 
-										 "personaModelId": instValue["persona-model-id"],
-										 "personaModelVersion": instValue["persona-model-version"],
-									     "serviceInstanceName": instValue["service-instance-name"]
-							};
-							if ($scope.selectedServiceInstance != null) {
-								if (instValue["service-instance-id"] == $scope.selectedServiceInstance) {
-									$scope.serviceInstanceId.push(inst);
-								}
-							} else {
-								$scope.serviceInstanceId.push(inst);
-							}
-						});
-					} else {
-						if ($scope.serviceInstanceId == []) {
-							$scope.serviceInstanceId = [ "No Service Instance Found" ];
-						}
-					}
-					angular.forEach($scope.serviceInstanceId, function(subVal, subKey) {
-						$scope.displayData.push({
-							globalCustomerId 	: $scope.selectedSubscriber,
-							subscriberName   	: $scope.selectedSubscriberName,
-							serviceType 		: $scope.serviceType,
-							serviceInstanceId 	: subVal.serviceInstanceId,
-							personaModelId		: subVal.personaModelId,
-							personaModelVersion : subVal.personaModelVersion,
-							serviceInstanceName	: subVal.serviceInstanceName
-						});
-					});
-				});
-			} else { 
-				$scope.displayData.push({
-					globalCustomerId 	: $scope.selectedSubscriber,
-					subscriberName   	: $scope.selectedSubscriberName,
-					serviceType 		: "No Service Subscription Found",
-					serviceInstanceId 	: "No Service Instance Found"
-				});  
-			}
-			$scope.viewPerPage=10;
-			$scope.totalPage=$scope.displayData.length/$scope.viewPerPage;
-			$scope.scrollViewPerPage=2;
-			$scope.currentPage=1;
-			$scope.searchCategory;
-			$scope.searchString="";
-			$scope.currentPageNum=1;
-			$scope.defaultSort="subscriberName"
-			$scope.setProgress(100); // done
-			$scope.status = "Done";
-			$scope.isSpinnerVisible = false;
-		});
-	}
-
-
-	$scope.$on("deleteInstance", function(event, request) {
-		// $log.debug("deleteInstance: request:");
-		// $log.debug(request);
-		$scope.init();
-		// Use this line instead of the subsequent $http.post to change from POST to DELETE
-		// $http["delete"]($scope.baseUrl + request.url,{timeout: $scope.responseTimeoutMsec}).then($scope.requestOkay
-		$http.post($scope.baseUrl + request.url, {
-			requestDetails: request.requestDetails
-		},{
-			timeout: $scope.responseTimeoutMsec
-		}).then($scope.handleInitialResponse)
-		["catch"]($scope.handleServerError);
-	});
-
-	$scope.init = function() {
-
-		//PropertyService.setAaiBaseUrl("testaai");
-		//PropertyService.setAsdcBaseUrl("testasdc");
-		
-		// takes a default value, retrieves the prop value from the file system and sets it
-		var msecs = PropertyService.retrieveMsoMaxPollingIntervalMsec(1000);
-		PropertyService.setMsoMaxPollingIntervalMsec(msecs);
-		
-		// takes a default value, retrieves the prop value from the file system and sets it
-		var polls = PropertyService.retrieveMsoMaxPolls(7);
-		PropertyService.setMsoMaxPolls(polls);
-		
-		//PropertyService.setMsoBaseUrl("testmso");
-		PropertyService.setServerResponseTimeoutMsec(10000);
-
-		/*
-		 * Common parameters that would typically be set when the page is
-		 * displayed for a specific service instance id.
-		 */
-
-//		DataService.setSubscriberName("Mobility");
-//		DataService.setGlobalCustomerId("CUSTID12345")
-//		DataService.setServiceType("Mobility Type 1");
-//		DataService.setServiceName("Mobility Service 1");
-//		DataService.setServiceInstanceId("mmsc-test-service-instance");
-
-		$scope.baseUrl = $scope.defaultBaseUrl;
-
-		$scope.isSpinnerVisible = true;
-		$scope.isProgressVisible = true;
-		$scope.isPopupVisible = true;
-		$scope.requestId = "";
-		$scope.error = "";
-		$scope.pollAttempts = 0;
-		$scope.log = "";				
-		$scope.enableCloseButton(false);
-		$scope.resetProgress();
-		$scope.setProgress(2); // Show "a little" progress
-	}
-
-	$scope.getComponentList = function(event, request) {
-
-		$scope.isSpinnerVisible = true;
-		$scope.isProgressVisible = true;
-		$scope.isPopupVisible = true;
-		$scope.requestId = "";
-		$scope.error = "";
-		$scope.pollAttempts = 0;
-		$scope.log = "";				
-
-		$scope.resetProgress();
-		$scope.setProgress(2); // Show "a little" progress
-
-		//subscriberId=jimmy-testing&serviceType=gamma-01%2F1&serviceInstanceId=jimmy2-01%2F01%2F%2F01
-		$scope.globalCustomerId = $location.search().subscriberId;
-		$scope.serviceType = $location.search().serviceType;
-		$scope.serviceInstanceId = $location.search().serviceInstanceId;
-		
-		//$scope.getAsdcModel($location.search().modelUuid);
-		
-		// this should be in a config file?
-		$scope.namedQueryId = "ed0a0f5b-cf79-4784-88b2-911cd726cd3d";
-		$scope.url = PropertyService.getAaiBaseUrl() + "/aai_sub_viewedit" +
-		"/" + encodeURIComponent($scope.namedQueryId) +
-		"/" + encodeURIComponent($scope.globalCustomerId) + 
-		"/" + encodeURIComponent($scope.serviceType) + 
-		"/" + encodeURIComponent($scope.serviceInstanceId) + '?r=' + Math.random();
-
-		$scope.status = "Fetching service instance data from A&AI for service-instance-id=" + $scope.serviceInstanceId;
-		$http.get($scope.url, {
-		},{
-			timeout: $scope.responseTimeoutMsec
-		}).then($scope.handleInitialResponseInventoryItems)
-		["catch"]($scope.handleServerError);
-	}
-
-	$scope.handleServerError = function(response, status) {				
-		alert(response.statusText);
-	}
-	
-	$scope.getAsdcModel = function(disData) {
-		$http.get(PropertyService.getAaiBaseUrl() + '/rest/models/services')
-		.then(function successCallback(response) {
-			var myUuid = null;
-			var lastVersion = -1;
-			angular.forEach(response.data, function(model, key) {
-				if (angular.equals(model.invariantUUID,disData.personaModelId)) {
-					if (model.version > lastVersion) {
-						lastVersion = model.version;
-						myUuid = model.uuid;
-					}
-					
-				}
-			});
-			if (myUuid == null)
-			{
-				console.log("aaiSubscriber getAsdcModel - No matching model found matching the persona Model Id = " + disData.personaModelId);
-			}
-			else
-			{
-				console.log(myUuid);
-				$http.get(PropertyService.getAaiBaseUrl() + '/rest/models/services/' + myUuid)
-				.then(function successCallback(response2) {
-					vidService.setModel(response2.data);
-					window.location.href = "#/instantiate?subscriberId=" + disData.globalCustomerId + "&serviceType=" + disData.serviceType + "&serviceInstanceId=" + disData.serviceInstanceId;
-					console.log("aaiSubscriber getAsdcModel DONE!!!!");
-				});
-			}
-		}, function errorCallback(response) {
-			//TODO
-		});
-	}
-	
-	$scope.getTenants = function(globalCustomerId) {
-		$http.get(PropertyService.getAaiBaseUrl() + '/aai_get_tenants' + globalCustomerId + '?r=' + Math.random())
-		.then(function successCallback(response) {
-			return response.data;
-			//$location.path("/instantiate");
-		}, function errorCallback(response) {
-			//TODO
-		});
-	}
-	
-	$scope.handleInitialResponseInventoryItems = function(response) {
-		// $log.debug("handleInitialResponse: response contents:");
-		// $log.debug(response);
-		try {
-
-			if (response.status < 200 || response.status > 202) {
-				$scope.handleServerError(response, response.status);
-				return;
-			}
-
-			$scope.inventoryResponseItemList = response.data["inventory-response-item"]; // get data from json
-			console.log($scope.inventoryResponseItemList.toString());
-
-			$scope.displayData = [];
-			$scope.vnfs = [];
-
-			$scope.counter = 100;
-
-			angular.forEach($scope.inventoryResponseItemList, function(inventoryResponseItem, key) {
-
-				$scope.inventoryResponseItem = inventoryResponseItem;
-
-				$scope.serviceInstanceToCustomer = DataService.getServiceInstanceToCustomer();
-				var subscriberName = "";
-				angular.forEach($scope.serviceInstanceToCustomer, function(servInst, key2) {
-					if (servInst.serviceInstanceId === $scope.serviceInstanceId) {
-						subscriberName = servInst.subscriberName;
-					}
-				});
-				$scope.service.instance = {
-						"name": $scope.inventoryResponseItem["service-instance"]["service-instance-name"],
-						"serviceInstanceId": $scope.serviceInstanceId,
-						"serviceType": $scope.serviceType,
-						"globalCustomerId": $scope.globalCustomerId,
-						"subscriberName": subscriberName,
-						"id": $scope.serviceInstanceId,
-						"inputs": {
-							"a": {
-								"type": "String",
-								"description": "This variable is 'a'",
-								"default": "A default"
-							},
-							"b": {
-								"type": "String",
-								"description": "This variable is 'b'",
-								"default": "B default"
-							},
-						},
-						"object": $scope.inventoryResponseItem["service-instance"],
-						"vnfs": [],
-						"networks": []
-				}
-
-				if (inventoryResponseItem["inventory-response-items"] != null) {
-
-					angular.forEach(inventoryResponseItem["inventory-response-items"]["inventory-response-item"], function(subInventoryResponseItem, key) {
-						// i expect to find vnfs now
-
-						if (subInventoryResponseItem["l3-network"] != null) { 
-							var l3NetworkObject = subInventoryResponseItem["l3-network"];
-							var l3Network = { "id": $scope.counter++, 
-									"name": l3NetworkObject["network-name"],
-									"itemType": "l3-network",
-									"nodeId": l3NetworkObject["network-id"],
-									"nodeType": l3NetworkObject["network-type"],
-									"nodeStatus": l3NetworkObject["orchestration-status"],
-									"object": l3NetworkObject,
-									"nodes": []
-							};
-							$scope.service.instance["networks"].push(l3Network);
-						}
-
-						if (subInventoryResponseItem["generic-vnf"] != null) {
-							var genericVnfObject = subInventoryResponseItem["generic-vnf"];
-
-							var genericVnf = {
-									"name": genericVnfObject["vnf-name"],
-									"id": $scope.counter++, 
-									"itemType": "vnf", 
-									"nodeType": genericVnfObject["vnf-type"],
-									"nodeId": genericVnfObject["vnf-id"],
-									"nodeStatus": genericVnfObject["orchestration-status"],
-									"object": genericVnfObject,
-									"vfModules": [],
-									"volumeGroups": [],
-									"availableVolumeGroups": []
-							};
-							$scope.service.instance["vnfs"].push(genericVnf);
-
-							// look for volume-groups
-							if (subInventoryResponseItem["inventory-response-items"] != null) {
-								angular.forEach(subInventoryResponseItem["inventory-response-items"]["inventory-response-item"], function(vfmodules, key) {
-
-									if (vfmodules["volume-group"] != null) { 
-										var volumeGroupObject = vfmodules["volume-group"];
-										var volumeGroup = { "id": $scope.counter++, 
-												"name": volumeGroupObject["volume-group-name"],
-												"itemType": "volume-group",
-												"nodeId": volumeGroupObject["volume-group-id"],
-												"nodeType": volumeGroupObject["vnf-type"],
-												"nodeStatus": volumeGroupObject["orchestration-status"],
-												"object": volumeGroupObject,
-												"nodes": []
-										};
-										genericVnf["volumeGroups"].push(volumeGroup);
-										genericVnf["availableVolumeGroups"].push(volumeGroup);
-									}
-								});
-							}
-							// now we've loaded up the availableVolumeGroups, we can use it
-							if (subInventoryResponseItem["inventory-response-items"] != null) {
-								angular.forEach(subInventoryResponseItem["inventory-response-items"]["inventory-response-item"], function(vfmodules, key) {
-
-									if (vfmodules["vf-module"] != null) { 
-										var vfModuleObject = vfmodules["vf-module"];
-										var vfModule = { "id": $scope.counter++,
-												"name": vfModuleObject["vf-module-name"],
-												"itemType": "vf-module",
-												"nodeType": "vf-module", 
-												"nodeStatus": vfModuleObject["orchestration-status"],
-												"volumeGroups": [],
-												"object": vfModuleObject,
-												"networks": []
-										};
-										genericVnf["vfModules"].push(vfModule);
-										if (vfmodules["inventory-response-items"] != null) {
-											angular.forEach(vfmodules["inventory-response-items"]["inventory-response-item"], function(networks, key) {
-												if (networks["l3-network"] != null) { 
-													var l3NetworkObject = networks["l3-network"];
-													var l3Network = { "id": $scope.counter++, 
-															"name": l3NetworkObject["network-name"],
-															"itemType": "l3-network",
-															"nodeId": l3NetworkObject["network-id"],
-															"nodeType": l3NetworkObject["network-type"],
-															"nodeStatus": l3NetworkObject["orchestration-status"],
-															"object": l3NetworkObject,
-															"nodes": []
-													};
-													vfModule["networks"].push(l3Network);
-												}
-												if (networks["volume-group"] != null) { 
-													var volumeGroupObject = networks["volume-group"];
-
-													var volumeGroup = { "id": $scope.counter++, 
-															"name": volumeGroupObject["volume-group-name"],
-															"itemType": "volume-group",
-															"nodeId": volumeGroupObject["volume-group-id"],
-															"nodeType": volumeGroupObject["vnf-type"],
-															"nodeStatus": volumeGroupObject["orchestration-status"],
-															"object": volumeGroupObject,
-															"nodes": []
-													};
-													var tmpVolGroup = [];
-
-													angular.forEach(genericVnf["availableVolumeGroups"], function(avgroup, key) {
-														if (avgroup.name != volumeGroup.name) { 
-															tmpVolGroup.push(avgroup);
-														}
-													});
-
-													genericVnf["availableVolumeGroups"] = tmpVolGroup;
-
-													vfModule["volumeGroups"].push(volumeGroup);
-												}
-
-											});
-										}
-									}
-								});
-							}
-						}
-					});
-				}
-			});
-			
-			$scope.setProgress(100); // done
-			$scope.status = "Done";
-			$scope.isSpinnerVisible = false;
-			console.log("HERE!!!");
-		} catch (error) {
-			console.log(error);
-		}
-	}
-
-	$scope.handleInitialResponse = function(response) {
-		try {
-			$scope.enableCloseButton(true);
-			$scope.updateLog(response);
-			if (response.data.status < 200 || response.data.status > 202) {
-				$scope.showError("MSO failure - see log below for details")
-				return;
-			}
-
-			$scope.setProgress(100); // done
-			$scope.status = "Done";
-			$scope.isSpinnerVisible = false;
-
-			$scope.customer = response.data.customer; // get data from json
-
-			$scope.customerList = [];
-
-			$scope.serviceInstanceToCustomer = [];
-			//$scope.serviceIdList = [];
-			angular.forEach($scope.customer, function(subVal, subKey) {
-				var cust = { "globalCustomerId": subVal["global-customer-id"], "subscriberName": subVal["subscriber-name"] };
-				$scope.customerList.push(cust);
-				if (subVal["service-subscriptions"] != null) {
-				
-					
-						angular.forEach(subVal["service-subscriptions"]["service-subscription"], function(serviceSubscription, key) {
-							$scope.serviceInstanceId = [];
-							if (serviceSubscription["service-type"] != null) {
-//								var newVal = { "id" : serviceSubscription["service-type"], "description" : serviceSubscription["service-type"] };
-//								if ($scope.serviceIdList.indexOf(newVal) == -1) { 
-//									$scope.serviceIdList.push(newVal);
-//								}
-								$scope.serviceType = serviceSubscription["service-type"];
-							} else {
-								$scope.serviceType = "No Service Subscription Found";
-							}
-							if (serviceSubscription["service-instances"] != null) {
-								angular.forEach(serviceSubscription["service-instances"]["service-instance"], function(instValue, instKey) {
-									var foo = { "serviceInstanceId": instValue["service-instance-id"], 
-											"globalCustomerId": subVal["global-customer-id"],
-											"subscriberName": subVal["subscriber-name"] };
-									$scope.serviceInstanceToCustomer.push(foo);
-								});
-							}
-						});
-				}
-			});	
-//			DataService.setServiceIdList($scope.serviceIdList);
-			DataService.setServiceInstanceToCustomer($scope.serviceInstanceToCustomer);
-		} catch (error) {
-			$scope.showContentError(error);
-		}
-	}
-
-	$scope.autoGetSubs = function() {
-		/*
-		 * Optionally comment in / out one of these method calls (or add a similar
-		 * entry) to auto-invoke an entry when the test screen is redrawn.
-		 */
-		$scope.getSubs();
-
-	}
-
-	$scope.pollStatus = function () {
-		/*
-		 * The "?r=" argument overrides caching. This was needed for Internet Explorer 11.
-		 * 
-		 * Ideally this should NOT be needed and appears to be an Angular bug.
-		 */
-		$http.get($scope.baseUrl + "mso_get_orch_req/" + $scope.requestId + "?r=" + Math.random(), {
-			cache: false, // This alternative did NOT seem to disable caching but was retained as a reference
-			timeout: $scope.responseTimeoutMsec
-		}).then($scope.handlePollResponse)
-		["catch"]($scope.handleServerError);
-	}
-
-	$scope.handlePollResponse = function(response) {
-		try {
-			// $log.debug("handlePollResponse: response contents:");
-			// $log.debug(response);
-			$scope.updateLog(response);
-
-			if (response.data.status < 200 || response.data.status > 202) {
-				$scope.showError("MSO failure - see log below for details")
-				return;
-			}
-
-//			UtilityService.checkUndefined("request", response.data.entity.request);
-//			UtilityService.checkUndefined("requestStatus", response.data.entity.request.requestStatus);
-
-//			$scope.setProgress(response.data.entity.request.requestStatus.percentProgress);
-
-//			var requestState = response.data.entity.request.requestStatus.requestState;
-//			if (requestState == "InProgress") {
-//			requestState = "In Progress";
-//			}
-//			var statusMessage = response.data.entity.request.requestStatus.statusMessage;
-//			if (UtilityService.hasContents(statusMessage)) {
-//			$scope.status = requestState + " - " + statusMessage;
-//			} else {
-//			$scope.status = requestState;
-//			}
-//			if (requestState == "Complete") {
-//			$scope.isSpinnerVisible = false;
-//			return;
-//			}
-//			if (requestState == "Failure") {
-//			$scope.showError("MSO failure - see log below for details")
-//			return;
-//			}
-//			if (++$scope.pollAttempts > $scope.properties.msoMaxPolls) {
-//			$scope.showError("Maximum number of poll attempts exceeded");
-//			} else {
-//			$scope.timer = $timeout($scope.pollStatus, $scope.properties.msoMaxPollingIntervalMsec);
-//			}
-		} catch (error) {
-			$scope.showContentError(error);
-		}				
-	}
-
-	$scope.updateLog = function(response) {
-//		$scope.log = UtilityService.getCurrentTime() + " HTTP Status: " + 
-//		UtilityService.getHttpStatusText(response.data.status) + "\n" +
-//		angular.toJson(response.data.entity, true) + "\n\n" + $scope.log;
-//		UtilityService.checkUndefined("entity", response.data.entity);
-//		UtilityService.checkUndefined("status", response.data.status);				
-	}
-
-	$scope.handleServerError = function(response, status) {				
-		$scope.enableCloseButton(true);
-		var message = UtilityService.getHttpErrorMessage(response);
-		if (message != ""){
-			message = " (" + message + ")";
-		}
-		$scope.showError("System failure" + message);
-	}
-
-	$scope.showContentError = function(message) {
-		// $log.debug(message);
-		console.log(message);
-		if (UtilityService.hasContents(message)) {
-			$scope.showError("System failure (" + message + ")");
-		} else {
-			$scope.showError("System failure");
-		}
-	}
-
-	$scope.showError = function(message) {
-		$scope.isSpinnerVisible = false;
-		$scope.isProgressVisible = false;
-		$scope.error = message;
-		$scope.status = "Error";
-	}
-
-	$scope.close = function() {
-		if ($scope.timer != undefined) {
-			$timeout.cancel($scope.timer);					
-		}
-		$scope.isPopupVisible = false;
-	}
-
-
-
-	/*
-	 * Consider converting the progress bar mechanism, the disabled button handling
-	 * and the following methods to generic Angular directive(s) and/or approach.
-	 */
-
-	$scope.enableCloseButton = function(isEnabled) {
-		var selector = "div[ng-controller=msoCommitController] button";
-
-		$scope.isCloseEnabled = isEnabled;
-
-		if (isEnabled) {
-			$(selector).addClass("button--primary").removeClass("button--inactive").attr("btn-type", "primary");
-		} else {
-			$(selector).removeClass("button--primary").addClass("button--inactive").attr("btn-type", "disabled");					
-		}
-	}
-
-	$scope.resetProgress = function() {
-		$scope.percentProgress = 0;
-		$scope.progressClass = "progress-bar progress-bar-info";
-	}
-
-	$scope.setProgress = function(percentProgress) {
-		percentProgress = parseInt(percentProgress);
-		if (percentProgress >= 100) {
-			$scope.progressClass = "progress-bar progress-bar-success";					
-		}
-
-		if (percentProgress < $scope.percentProgress) {
-			return;
-		}
-
-		$scope.percentProgress = percentProgress;
-		$scope.progressWidth = {width: percentProgress + "%"};
-		if (percentProgress >= 5) {
-			$scope.progressText =  percentProgress + " %";
-		} else {
-			// Hidden since color combination is barely visible when progress portion is narrow.
-			$scope.progressText = "";
-		}
-	}
-	
-	$scope.reloadRoute = function() {
-		$route.reload();
-	}
-	
-	$scope.prevPage = function() {
-		$scope.currentPage--;
-	}
-	
-	$scope.nextPage = function() {
-		$scope.currentPage++;
-	}
-	$scope.getSubscriberDet = function(selectedCustomer,selectedServiceInstance){
-		if (selectedCustomer != null) { 
-			window.location.href = '#/instances/subdetails?selectedSubscriber=' + selectedCustomer;
-		} else if (selectedServiceInstance != null) {
-			selectedServiceInstance.trim();
-			var serviceInstanceToCustomer = $scope.serviceInstanceToCustomer;
-			var notFound = true;
-			angular.forEach(serviceInstanceToCustomer, function(inst, key) {
-				if (inst.serviceInstanceId == selectedServiceInstance) {
-					
-					notFound = false;
-					window.location.href = '#/instances/subdetails?selectedSubscriber=' + inst.globalCustomerId + '&selectedServiceInstance=' + selectedServiceInstance;
-				}
-			});
-			if (notFound) {
-				alert("That service instance does not exist.  Please try again.");
-			}
-		} else {
-			alert("Please select a subscriber or enter a service instance");
-		}
-	};
-}
-]);
-
-
-app.controller('TreeCtrl', ['$scope', function ($scope) {
-	$scope.remove = function (scope) {
-		scope.remove();
-	};
-
-	$scope.toggle = function (scope) {
-		scope.toggle();
-	};
-
-	$scope.moveLastToTheBeginning = function () {
-		var a = $scope.data.pop();
-		$scope.data.splice(0, 0, a);
-	};
-
-	$scope.newSubItem = function (scope) {
-		var nodeData = scope.$modelValue;
-		nodeData.nodes.push({
-			id: nodeData.id * 10 + nodeData.nodes.length,
-			title: nodeData.title + '.' + (nodeData.nodes.length + 1),
-			nodes: []
-		});
-	};
-
-	$scope.collapseAll = function () {
-		$scope.$broadcast('angular-ui-tree:collapse-all');
-	};
-
-	$scope.expandAll = function () {
-		$scope.$broadcast('angular-ui-tree:expand-all');
-	};
-
-
-}]);
-
-
-
diff --git a/vid/src/main/webapp/app/vid/scripts/controller/creationDialogController.js b/vid/src/main/webapp/app/vid/scripts/controller/creationDialogController.js
deleted file mode 100644
index 5e5c51d6e..000000000
--- a/vid/src/main/webapp/app/vid/scripts/controller/creationDialogController.js
+++ /dev/null
@@ -1,162 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-"use strict";
-
-var creationDialogController = function( COMPONENT, FIELD, $scope, $http, $timeout, $log,
-		CreationService, UtilityService) {
-
-	$scope.isDialogVisible = false;
-	$scope.summaryControl = {};
-	$scope.userProvidedControl = {};
-
-	var callbackFunction = undefined;
-	var componentId = undefined;
-
-	$scope.$on("createComponent", function(event, request) {
-
-		$scope.isSpinnerVisible = true;
-		$scope.isErrorVisible = false;
-		$scope.isDataVisible = false;
-		$scope.isConfirmEnabled = false;
-		$scope.isDialogVisible = true;
-		$scope.popup.isVisible = true;
-
-		callbackFunction = request.callbackFunction;
-		componentId = request.componentId;
-		CreationService.initializeComponent(request.componentId);
-
-		CreationService.setHttpErrorHandler(function(response) {
-			showError("System failure", UtilityService
-					.getHttpErrorMessage(response));
-		});
-
-		$scope.componentName = CreationService.getComponentDisplayName();
-
-		CreationService.getParameters(handleGetParametersResponse);
-
-	});
-
-	var handleGetParametersResponse = function(parameters) {
-		$scope.summaryControl.setList(parameters.summaryList);
-		$scope.userProvidedControl.setList(parameters.userProvidedList);
-
-		$scope.isSpinnerVisible = false;
-		$scope.isDataVisible = true;
-		$scope.isConfirmEnabled = true;
-	};
-	
-	var validateInstanceName = function(iname) {
-		var patt1 = /^([a-z])+([0-9a-z\-_]*)$/i;
-		
-		if ( iname == null ){
-			return false;
-		}
-		if ( !iname.match(patt1) ) {
-			return false;
-		}
-		return true;
-	}
-
-	$scope.userParameterChanged = function(id) {
-		CreationService.updateUserParameterList(id, $scope.userProvidedControl);
-	}
-
-	$scope.confirm = function() {
-
-		var requiredFields = $scope.userProvidedControl.getRequiredFields();
-		if (requiredFields !== "") {
-			showError("Missing data", requiredFields);
-			return;
-		}
-		// validate the instance names for volumeGroup, vfModule, network
-		
-		if  ( componentId != COMPONENT.SERVICE ) {
-			var paramList = $scope.userProvidedControl.getList();
-			var instanceName = "";
-			
-			if ( paramList != null ) {
-				for (var i = 0; i < paramList.length; i++) {
-					if (paramList[i].id === FIELD.ID.INSTANCE_NAME) {
-						instanceName = paramList[i].value;
-						break;
-					}
-				}
-			}
-			var isValid = validateInstanceName (instanceName);
-			if ( isValid ) {
-				$scope.isErrorVisible = false;
-			} else {
-				showError("Invalid instance name: " + instanceName, 
-						"The instance name must contain only alphanumeric or \"_-.\" characters, and must start with an alphabetic character");
-				return;
-			}
-		}
-		var requestDetails = CreationService
-				.getMsoRequestDetails($scope.userProvidedControl.getList());
-
-		$scope.isDialogVisible = false;
-
-		$scope.$broadcast("createInstance", {
-			url : CreationService.getMsoUrl(),
-			requestDetails : requestDetails,
-			callbackFunction : function(response) {
-				if (response.isSuccessful) {
-					$scope.popup.isVisible = false;
-					runCallback(response);
-				} else {
-					$scope.isDialogVisible = true;
-				}
-			}
-		});
-	}
-
-	$scope.cancel = function() {
-		$scope.isDialogVisible = false;
-		$scope.popup.isVisible = false;
-		runCallback(false);
-	}
-
-	var runCallback = function(response) {
-		if (angular.isFunction(callbackFunction)) {
-			callbackFunction({
-				isSuccessful : response.isSuccessful,
-				control : $scope.userProvidedControl.getList(),
-				instanceId : response.instanceId
-			});
-		}
-	}
-
-	var showError = function(summary, details) {
-		var message = summary;
-		if (UtilityService.hasContents(details)) {
-			message += " (" + details + ")";
-		}
-		$scope.isSpinnerVisible = false;
-		$scope.isErrorVisible = true;
-		$scope.error = message;
-	}
-	
-}
-
-app
-		.controller("creationDialogController", [ "COMPONENT", "FIELD", "$scope", "$http",
-				"$timeout", "$log", "CreationService", "UtilityService",
-				creationDialogController ]);
diff --git a/vid/src/main/webapp/app/vid/scripts/controller/deletionDialogController.js b/vid/src/main/webapp/app/vid/scripts/controller/deletionDialogController.js
deleted file mode 100644
index caac6de9b..000000000
--- a/vid/src/main/webapp/app/vid/scripts/controller/deletionDialogController.js
+++ /dev/null
@@ -1,117 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-"use strict";
-
-var deletionDialogController = function($scope, $http, $timeout, $log,
-	DeletionService, UtilityService) {
-
-    $scope.isDialogVisible = false;
-    $scope.summaryControl = {};
-    $scope.userProvidedControl = {};
-    
-    var callbackFunction = undefined;
-
-    $scope.$on("deleteComponent", function(event, request) {
-
-    $scope.isDataVisible = false;
-	$scope.isSpinnerVisible = false;
-	$scope.isErrorVisible = false;
-	$scope.isDialogVisible = true;
-	$scope.popup.isVisible = true;
-	$scope.isConfirmEnabled = false;
-
-	callbackFunction = request.callbackFunction;
-
-	DeletionService.initializeComponent(request.componentId);
-
-	$scope.componentName = DeletionService.getComponentDisplayName();
-
-	$scope.summaryControl.setList(DeletionService.getSummaryList());
-	
-	DeletionService.getParameters(handleGetParametersResponse);
-
-    });
-    
-    var handleGetParametersResponse = function(parameters, dontshow) {
-		$scope.summaryControl.setList(parameters.summaryList);
-		$scope.userProvidedControl.setList(parameters.userProvidedList);
-
-		$scope.isSpinnerVisible = false;
-		if (dontshow)
-		  $scope.isDataVisible = false;
-		else
-			$scope.isDataVisible = true;
-		$scope.isConfirmEnabled = true;
-	};
-
-	$scope.userParameterChanged = function(id) {
-		DeletionService.updateUserParameterList(id, $scope.userProvidedControl);
-	}
-
-    $scope.confirm = function() {
-
-    	var requiredFields = $scope.userProvidedControl.getRequiredFields();
-		if (requiredFields === "") {
-			$scope.isErrorVisible = false;
-		} else {
-			showError("Missing data", requiredFields);
-			return;
-		}
-
-		
-	var requestDetails = DeletionService.getMsoRequestDetails($scope.userProvidedControl.getList());
-
-	$scope.isDialogVisible = false;
-
-	$scope.$broadcast("deleteInstance", {
-	    url : DeletionService.getMsoUrl(),
-	    requestDetails : requestDetails,
-	    callbackFunction : function(isSuccessful) {
-		if (isSuccessful) {
-		    $scope.popup.isVisible = false;
-		    runCallback(true);
-		} else {
-		    $scope.isDialogVisible = true;
-		}
-	    }
-	});
-
-    }
-
-    $scope.cancel = function() {
-	$scope.isDialogVisible = false;
-	$scope.popup.isVisible = false;
-	runCallback(false);
-    }
-
-    var runCallback = function(isSuccessful) {
-	if (angular.isFunction(callbackFunction)) {
-	    callbackFunction({
-		isSuccessful : isSuccessful
-	    });
-	}
-    }
-}
-
-app
-	.controller("deletionDialogController", [ "$scope", "$http",
-		"$timeout", "$log", "DeletionService", "UtilityService",
-		deletionDialogController ]);
diff --git a/vid/src/main/webapp/app/vid/scripts/controller/detailsDialogController.js b/vid/src/main/webapp/app/vid/scripts/controller/detailsDialogController.js
deleted file mode 100644
index 5f58ae319..000000000
--- a/vid/src/main/webapp/app/vid/scripts/controller/detailsDialogController.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-"use strict";
-
-var detailsDialogController = function($scope, $http, $timeout, $log,
-	MsoService, DetailsService, UtilityService) {
-
-    $scope.isDialogVisible = false;
-    $scope.summaryControl = {};
-    $scope.detailsControl = {};
-
-    $scope.$on("showComponentDetails", function(event, request) {
-
-	$scope.log = "";
-	$scope.isSpinnerVisible = true;
-	$scope.isErrorVisible = false;
-	$scope.isDialogVisible = true;
-	$scope.popup.isVisible = true;
-
-	DetailsService.initializeComponent(request.componentId);
-
-	$scope.componentName = DetailsService.getComponentDisplayName();
-
-	$scope.summaryControl.setList(DetailsService.getSummaryList());
-
-	$scope.detailsControl.setList(DetailsService.getDetailsList());
-
-	UtilityService.setHttpErrorHandler(function(response) {
-	    showError("System failure", UtilityService
-		    .getHttpErrorMessage(response));
-	});
-
-	MsoService.getOrchestrationRequests(
-		DetailsService.getMsoFilterString(), handleGetResponse);
-    });
-
-    var handleGetResponse = function(response) {
-	$scope.isSpinnerVisible = false;
-	try {
-	    $scope.log = MsoService
-		    .getFormattedGetOrchestrationRequestsResponse(response);
-	} catch (error) {
-	    $scope.log = MsoService.getFormattedCommonResponse(response);
-	    MsoService.showResponseContentError(error, showError);
-	}
-    }
-
-    $scope.close = function() {
-	$scope.isDialogVisible = false;
-	$scope.popup.isVisible = false;
-    }
-
-    var showError = function(summary, details) {
-	var message = summary;
-	if (UtilityService.hasContents(details)) {
-	    message += " (" + details + ")";
-	}
-	$scope.isSpinnerVisible = false;
-	$scope.isErrorVisible = true;
-	$scope.error = message;
-    }
-}
-
-app.controller("detailsDialogController", [ "$scope", "$http", "$timeout",
-	"$log", "MsoService", "DetailsService", "UtilityService",
-	detailsDialogController ]);
diff --git a/vid/src/main/webapp/app/vid/scripts/controller/dummy.txt b/vid/src/main/webapp/app/vid/scripts/controller/dummy.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/vid/src/main/webapp/app/vid/scripts/controller/msoCommitController.js b/vid/src/main/webapp/app/vid/scripts/controller/msoCommitController.js
deleted file mode 100644
index ef3adeb32..000000000
--- a/vid/src/main/webapp/app/vid/scripts/controller/msoCommitController.js
+++ /dev/null
@@ -1,249 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-"use strict";
-
-/*
- * "msoCommitController.js" provides controller code to commit MSO requests.
- * 
- * HIGHLIGHTS:
- * 
- * Parent HTML/JSP code is expected to include "msoCommit.htm" (via
- * "ng-include") and this file (via "
-
      
-
-	
      
-		
      
-			
-			{{status}}
-		
      
-
-		 
      Search Existing Service Instances
      
-     		
      
-    	 Please search by the Subscriber name or enter Service Instance Id below: 

      
-    	 
-		 
-			
-				
-				
-	 		
-			
-			
-				
-    			
-				
-    		
-    		
-				
-				
-			
-		
      
-				
      	
-					
-				
      
-				      		
-					
      
-						
-					    
-					
      
-				
      
-					
      	
-					 
-					
      
-				      		
-    				
      
-						
-					
       
-				
      
-				
-					
      	
-						
-					
      
-				
      	
-		
-	
-	
      
-
-
      
diff --git a/vid/src/main/webapp/app/vid/scripts/view-models/aaiSubDetails.htm b/vid/src/main/webapp/app/vid/scripts/view-models/aaiSubDetails.htm
deleted file mode 100644
index 90932875a..000000000
--- a/vid/src/main/webapp/app/vid/scripts/view-models/aaiSubDetails.htm
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-	
      
-	
-		
      
-			
      
-				
-					
-				{{status}}
-			
      
-	
-			 
      Subscriber Details for {{selectedSubscriber}} ({{selectedSubscriberName}})
      
-	     		
      
-		
      
-		         Filter:
-		          
-	    
      
-			
      
-				
-				
      
-					
-	
-						
-							
-								
-								
-								
-								
-								
-								
-							
-						
-						
-							
-								  
-							
-								
-								
-								
-								
-								
-							
-						
-					
      View/EditGlobal Customer IDSubscriber NameService TypeService Instance NameService Instance ID
      
-									
-								
      
-					
-					
-					
-					
-	    			
-					
-					
      
-						
-					
-						Jump to page:
-		          		
-		    			Results per page: 10 
-	    				| 25 
-	    				| 50 
-	    			
-	    			 	
-					
      
-					 
-	    			
-				
      
-	
-			
      
-	
-	
-		
      
-	
-	
      
diff --git a/vid/src/main/webapp/app/vid/scripts/view-models/aaiSubViewEdit.htm b/vid/src/main/webapp/app/vid/scripts/view-models/aaiSubViewEdit.htm
deleted file mode 100644
index 53c9a6b04..000000000
--- a/vid/src/main/webapp/app/vid/scripts/view-models/aaiSubViewEdit.htm
+++ /dev/null
@@ -1,147 +0,0 @@
-
-
-
      
-
-	
      
-		
      
-		
      
-		
      
-	
       
-
-	
      
-		
      
-			
-			{{status}}
-		
      
-
-		
      
-			
      VIEW/EDIT SERVICE INSTANCE 
      
-			
      
-			
-		
-		
      
-
-
-		
      
-			
-				
-					
-					
-					
-				
-				
-					
-				
-			
      SUBSCRIBER:
-						{{globalCustomerId}}SERVICE TYPE:
-						{{serviceType}}SERVICE INSTANCE
-						ID: {{serviceInstanceId}}
      Service Instance
-						Name: {{serviceInstanceName || "Not defined"}}
-					
      
-
-		
      
-
-
-		
      
-
-		
      
-			
-			EXISTING
-			
      
-				
      
-					
      
-						
        
-							
      1. 
-						
      
-					
      
-				
      
-
-			
      
-			AVAILABLE
-			
-						
-				
-			
      
-				
      
-					
      
-						
        
-							
      1. 
-						
      
-					
      
-				
      
-			
      
-		
      
-		
      
-		
-		
-		
-			
      -  				{{inventoryResponseItem | json}}
-			
      
-		
      
-	
      
diff --git a/vid/src/main/webapp/app/vid/scripts/view-models/creationDialog.htm b/vid/src/main/webapp/app/vid/scripts/view-models/creationDialog.htm
deleted file mode 100644
index d016b8f5d..000000000
--- a/vid/src/main/webapp/app/vid/scripts/view-models/creationDialog.htm
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
      
-
-	
      
-		
      
-			
-			
      Create {{componentName}}
      
-		
      
-
-		
      
-			{{error}}
-		
      
-
-		
      
-			
-			
      
-				User Provided Data ( indicates required field)
-			
      
-			
-
-			
      
-				
      
-					Enter Data and Confirm to
      Create {{componentName}}
-				
      
-				
      
-					Cancel to Return to Previous Page.
      Data entered
-					will be lost
-				
      
-			
      
-
-		
      
-		
      
-			
-			
-		
      
-	
      
-
-	
      
-
-
      
diff --git a/vid/src/main/webapp/app/vid/scripts/view-models/deletionDialog.htm b/vid/src/main/webapp/app/vid/scripts/view-models/deletionDialog.htm
deleted file mode 100644
index 029d6eaa8..000000000
--- a/vid/src/main/webapp/app/vid/scripts/view-models/deletionDialog.htm
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-
      
-
-	
      
-		
      
-			
-			
      Delete {{componentName}}
      
-		
      
-
-		
      
-			{{error}}
-		
      
-
-      
-      
-      
      
-		
-        
      
-				User Provided Data ( indicates required field)
-			
      
-			
-
-			
      
-				
      
-					Enter Data and Confirm to
      Delete {{componentName}}
-				
      
-				
      
-					Cancel to Return to Previous Page.
      Data entered
-					will be lost
-				
      
-			
      
-        
      
-
-
-
-		
      
-			
-			
-			
-		
      
-	
      
-
-	
      
-
-
      
diff --git a/vid/src/main/webapp/app/vid/scripts/view-models/detailsDialog.htm b/vid/src/main/webapp/app/vid/scripts/view-models/detailsDialog.htm
deleted file mode 100644
index 82afcbf50..000000000
--- a/vid/src/main/webapp/app/vid/scripts/view-models/detailsDialog.htm
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
      
-
-	
      
-		
-		
      Service Instance Details
       
-	
      
-
-	
      
-		{{error}}
-	
      
-
-	
-
-	
      {{componentName}} Details
      
-
-	
-
-	
      Instantiation Transactions
      
-
-	
      {{log}}
      
-
-	
      
-		
-	
      
-
-
      
diff --git a/vid/src/main/webapp/app/vid/scripts/view-models/dummy.txt b/vid/src/main/webapp/app/vid/scripts/view-models/dummy.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/vid/src/main/webapp/app/vid/scripts/view-models/instantiate.htm b/vid/src/main/webapp/app/vid/scripts/view-models/instantiate.htm
deleted file mode 100644
index 1cfa4fb2d..000000000
--- a/vid/src/main/webapp/app/vid/scripts/view-models/instantiate.htm
+++ /dev/null
@@ -1,204 +0,0 @@
-
-
-
      
-
-    
      
-		
      
-		
      
-		
      
-	
       
-	
      
-	
      
-			
-			{{status}}
-	
      
-	
-			
      View/Edit Service Instance
      
-			
-		
-		
      
-
-		
      
-			
-				
-					
-					
-					
-				
-				
-					
-				
-			
      SUBSCRIBER:
-						{{service.instance.globalCustomerId}}SERVICE TYPE:
-						{{service.instance.serviceType}}SERVICE INSTANCE
-						ID: {{service.instance.serviceInstanceId}}
      Service Instance
-						Name: {{service.instance.name || "Not defined"}}
-					
      
-
-		
      
-	
-	
      
-		
-		
        
-			
      1. 
-				
        
-					
-						
-					
-					SERVICE INSTANCE: {{aService.instance.name}}
-					
-						
-					
-					
-					
        
-					  
-					  
-					
        
-					
-					
-						
-					
-				
        
-				
          
-					
        1. 
-						
          
-							
-								
-							
-							VNF: {{vnf.name}} | TYPE: {{vnf.nodeType}} | ORCH STATUS: {{vnf.nodeStatus}}
-							
-								
-							
-							
          
-							  
-							  
-							
          
-							
          
-							  
-							  
-							
          
-							
-								
-							
-						
          
-						
            
-							
          1. 
-								
            
-									
-										
-									
-									VFMODULE: {{vfModule.name}} | TYPE: {{vfModule.nodeType}} | ORCH STATUS: {{vfModule.nodeStatus}}
-									
-									
-										
-									
-									
            
-									
-									
            
-									
-										
-									
-								
            
-								
              
-									
            1. 
-										
              
-											VOLUME GROUP: {{volumeGroup.name}} | TYPE: {{volumeGroup.nodeType}} | ORCH STATUS: {{volumeGroup.nodeStatus}}
-											
-											
-												
-											
-										
              
-									
              2. 
-								
            
-							
            2. 
-						
          
-						
            
-							
          1. 
-								
            
-									VOLUME GROUP: {{volumeGroup.name}} | TYPE: {{volumeGroup.nodeType}} | ORCH STATUS: {{volumeGroup.nodeStatus}}
-									
-										
-									
-									
-										
-									
-								
            
-							
            2. 
-						
          
-					
          2. 
-				
        
-				
          
-					
        1. 
-						
          
-							NETWORK: {{network.name}} | TYPE: {{network.nodeType}} | ORCH	STATUS: {{network.nodeStatus}}
-							
-							
-								
-							
-						
          
-					
          2. 
-				
        
-			
        2. 
-		
      
-		
      
-	
      
-
      
diff --git a/vid/src/main/webapp/app/vid/scripts/view-models/msoCommit.htm b/vid/src/main/webapp/app/vid/scripts/view-models/msoCommit.htm
deleted file mode 100644
index a47b98323..000000000
--- a/vid/src/main/webapp/app/vid/scripts/view-models/msoCommit.htm
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
      
-
-	
      
-		  {{status}}
-	
      
-
-	
-
-	
      {{log}}
      
-
-	
      
-		
-	
      
-
      
diff --git a/vid/src/main/webapp/app/vid/scripts/view-models/popupWindow.htm b/vid/src/main/webapp/app/vid/scripts/view-models/popupWindow.htm
deleted file mode 100644
index 57c40f3f6..000000000
--- a/vid/src/main/webapp/app/vid/scripts/view-models/popupWindow.htm
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	
-		
-	
-
      
diff --git a/vid/src/main/webapp/app/vid/scripts/view-models/sample.html b/vid/src/main/webapp/app/vid/scripts/view-models/sample.html
deleted file mode 100644
index 9cfb10e49..000000000
--- a/vid/src/main/webapp/app/vid/scripts/view-models/sample.html
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
      
-	
-		
      Profile Search
      
-		
-		
-
-			    
-					
-						
-			                    
-			                
-			            
-			                    
-			                  
-			        
-			    
-			    
-			        
-		            	
-		            	
-		            	
-		            	
-		            	
-		            	
-			             
-			    	  
-	
      User IDLast NameFirst NameEmailUser IDManager User ID
      
-	
-	
      
-	          Rows Per Page:
-	          
-    
      
-	
      
-	          Current Page:
-	          
-    
      
-    
      
-	          Total Page(s):
-	          
-    
      
-
      
diff --git a/vid/src/main/webapp/app/vid/scripts/view-models/sampleWithIframe.html b/vid/src/main/webapp/app/vid/scripts/view-models/sampleWithIframe.html
deleted file mode 100644
index ea128ece8..000000000
--- a/vid/src/main/webapp/app/vid/scripts/view-models/sampleWithIframe.html
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
      
-	
-
      
diff --git a/vid/src/main/webapp/app/vid/scripts/view-models/serviceModels.htm b/vid/src/main/webapp/app/vid/scripts/view-models/serviceModels.htm
deleted file mode 100644
index 84f14ab6b..000000000
--- a/vid/src/main/webapp/app/vid/scripts/view-models/serviceModels.htm
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-
      
-	
      
-
      
-
      
-
-	
-			
-			
-			
-			Error: {{status}}
-		
-	

      
-
-	
      
-		         Filter:
-		          
-	
      
-
-	
      Browse SDC Service Models
      
-	
      
-		
-		
-		    
-				
-					
-					
-					
-					
-		            
-		            
-		            
-		            
-		            
-		        
-		    
-		    
-		        
-		        	
-	            	
-	            	
-	            	
-	            	
-	            	
-	            	
-	            	
-	            	
-		             
-		    	  
-		
      ActionUUIDInvariant UUIDNameVersionCategoryDistribution StatusLast Updated ByTosca Model
      
-		
-			
-					
-					
-	    			
-			
-		
      
-						
-					
-						Jump to page:
-		          		
-		    			Results per page: 10 
-	    				| 25 
-	    				| 50 
-	    			
-	    			 	
-					
      
-		
-	
      
-	
      
-
diff --git a/vid/src/main/webapp/app/vid/scripts/view-models/singlePageSample.html b/vid/src/main/webapp/app/vid/scripts/view-models/singlePageSample.html
deleted file mode 100644
index 0e6c6f2a4..000000000
--- a/vid/src/main/webapp/app/vid/scripts/view-models/singlePageSample.html
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-
-
-	
-	
-	
-    
-    
-    
-    
-	
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-	
-		 
-		 
-		
-	 	 
-		
-		
-		
-		
-		
-		
-	
-		
-		
-	
-		
-		
-	
-		
-	
-		
-		
-		
-		
-		
-	
-
-		
-		
-		
-		
-		
-		
-	
-		
-	
-	
-	
-	    
      
-		
      
-		
      
-		
      
-		
      		
-		
      
-	
-
diff --git a/vid/src/main/webapp/app/vid/scripts/view-models/vidhome.htm b/vid/src/main/webapp/app/vid/scripts/view-models/vidhome.htm
deleted file mode 100644
index 41b3b2a77..000000000
--- a/vid/src/main/webapp/app/vid/scripts/view-models/vidhome.htm
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
      
-     
      OpenECOMP
      
-     
      
-     
      Welcome to VID
      
-     
      
-   The Virtual Infrastructure Deployment (VID) application allows infrastructure service deployment operators 
-   to instantiate service instances and their constituent parts for Distributed service models required by the 
-   OpenECOMP service operations that manage them, such as Mobility Network Services, etc. The models are defined by OpenECOMP component SDC. The service 
-   deployment operator selects the service operations owner and model that they wish to instantiate. After 
-   entry of appropriate data, the operator instructs VID to direct another OpenECOMP component, MSO, to instantiate 
-   the selected service model. Once the service instance has been instantiated, the service operator can instruct 
-   VID to direct MSO to instantiate the service instance's component VNFs, VF Modules, Networks and Volume Groups. 
-   The VID user can also search for, and display, existing service instances and direct the instantiation of 
-   subsequent instance components.
-     

      
- 
-    
      Contact Us
      
-    Please click here to contact us.
-
      
diff --git a/vid/src/main/webapp/app/vid/styles/aaiGetSubs.css b/vid/src/main/webapp/app/vid/styles/aaiGetSubs.css
deleted file mode 100644
index 5a7717ef2..000000000
--- a/vid/src/main/webapp/app/vid/styles/aaiGetSubs.css
+++ /dev/null
@@ -1,62 +0,0 @@
-div[ng-controller=aaiSubscriberController] .popupContents {
-	text-align: left;
-}
-
-div[ng-controller=aaiSubscriberController] .statusLine {
-	vertical-align: center;
-}
-
-div[ng-controller=aaiSubscriberController] .statusLine img {
-	width: 20px;
-	margin: 10px;
-}
-
-div[ng-controller=aaiSubscriberController] .status {
-	margin-left: 5px;
-}
-
-div[ng-controller=aaiSubscriberController] .feedback {
-	height: 35px;
-	vertical-align: center;
-}
-
-div[ng-controller=aaiSubscriberController] .progress {
-	margin: 0px 10px;
-	font-weight: bold;
-}
-
-div[ng-controller=aaiSubscriberController] .error {
-	width: 630px;
-	font-weight: bold;
-	font-size: 16px;
-	color: red;
-	margin: 0px 10px 0px 45px;
-}
-
-div[ng-controller=aaiSubscriberController] .error img {
-	width: 25px;
-	margin: 0px 10px;
-}
-
-div[ng-controller=aaiSubscriberController] .buttonRow {
-	text-align: center;
-	margin-bottom: 10px;
-}
-
-div[ng-controller=aaiSubscriberController] .log {
-	width: 700px;
-	height: 500px;
-	border: solid black 1px;
-	text-align: left !important;
-	margin: 10px;
-	padding: 10px;
-	overflow: auto;
-}
-
-div[ng-controller=aaiSubscriberController] .aaiHidden {
-	visibility: hidden;
-}
-
-div[ng-controller=aaiSubscriberController] .aaiVisible {
-	visibility: visible;
-}
\ No newline at end of file
diff --git a/vid/src/main/webapp/app/vid/styles/aaiSubDetails.css b/vid/src/main/webapp/app/vid/styles/aaiSubDetails.css
deleted file mode 100644
index 5a7717ef2..000000000
--- a/vid/src/main/webapp/app/vid/styles/aaiSubDetails.css
+++ /dev/null
@@ -1,62 +0,0 @@
-div[ng-controller=aaiSubscriberController] .popupContents {
-	text-align: left;
-}
-
-div[ng-controller=aaiSubscriberController] .statusLine {
-	vertical-align: center;
-}
-
-div[ng-controller=aaiSubscriberController] .statusLine img {
-	width: 20px;
-	margin: 10px;
-}
-
-div[ng-controller=aaiSubscriberController] .status {
-	margin-left: 5px;
-}
-
-div[ng-controller=aaiSubscriberController] .feedback {
-	height: 35px;
-	vertical-align: center;
-}
-
-div[ng-controller=aaiSubscriberController] .progress {
-	margin: 0px 10px;
-	font-weight: bold;
-}
-
-div[ng-controller=aaiSubscriberController] .error {
-	width: 630px;
-	font-weight: bold;
-	font-size: 16px;
-	color: red;
-	margin: 0px 10px 0px 45px;
-}
-
-div[ng-controller=aaiSubscriberController] .error img {
-	width: 25px;
-	margin: 0px 10px;
-}
-
-div[ng-controller=aaiSubscriberController] .buttonRow {
-	text-align: center;
-	margin-bottom: 10px;
-}
-
-div[ng-controller=aaiSubscriberController] .log {
-	width: 700px;
-	height: 500px;
-	border: solid black 1px;
-	text-align: left !important;
-	margin: 10px;
-	padding: 10px;
-	overflow: auto;
-}
-
-div[ng-controller=aaiSubscriberController] .aaiHidden {
-	visibility: hidden;
-}
-
-div[ng-controller=aaiSubscriberController] .aaiVisible {
-	visibility: visible;
-}
\ No newline at end of file
diff --git a/vid/src/main/webapp/app/vid/styles/aaiSubViewEdit.css b/vid/src/main/webapp/app/vid/styles/aaiSubViewEdit.css
deleted file mode 100644
index 5a7717ef2..000000000
--- a/vid/src/main/webapp/app/vid/styles/aaiSubViewEdit.css
+++ /dev/null
@@ -1,62 +0,0 @@
-div[ng-controller=aaiSubscriberController] .popupContents {
-	text-align: left;
-}
-
-div[ng-controller=aaiSubscriberController] .statusLine {
-	vertical-align: center;
-}
-
-div[ng-controller=aaiSubscriberController] .statusLine img {
-	width: 20px;
-	margin: 10px;
-}
-
-div[ng-controller=aaiSubscriberController] .status {
-	margin-left: 5px;
-}
-
-div[ng-controller=aaiSubscriberController] .feedback {
-	height: 35px;
-	vertical-align: center;
-}
-
-div[ng-controller=aaiSubscriberController] .progress {
-	margin: 0px 10px;
-	font-weight: bold;
-}
-
-div[ng-controller=aaiSubscriberController] .error {
-	width: 630px;
-	font-weight: bold;
-	font-size: 16px;
-	color: red;
-	margin: 0px 10px 0px 45px;
-}
-
-div[ng-controller=aaiSubscriberController] .error img {
-	width: 25px;
-	margin: 0px 10px;
-}
-
-div[ng-controller=aaiSubscriberController] .buttonRow {
-	text-align: center;
-	margin-bottom: 10px;
-}
-
-div[ng-controller=aaiSubscriberController] .log {
-	width: 700px;
-	height: 500px;
-	border: solid black 1px;
-	text-align: left !important;
-	margin: 10px;
-	padding: 10px;
-	overflow: auto;
-}
-
-div[ng-controller=aaiSubscriberController] .aaiHidden {
-	visibility: hidden;
-}
-
-div[ng-controller=aaiSubscriberController] .aaiVisible {
-	visibility: visible;
-}
\ No newline at end of file
diff --git a/vid/src/main/webapp/app/vid/styles/angular-ui-tree.css b/vid/src/main/webapp/app/vid/styles/angular-ui-tree.css
deleted file mode 100644
index 836566936..000000000
--- a/vid/src/main/webapp/app/vid/styles/angular-ui-tree.css
+++ /dev/null
@@ -1,61 +0,0 @@
-.angular-ui-tree {
-}
-
-.angular-ui-tree-empty {
-    border: 1px dashed #bbb;
-    min-height: 100px;
-    background-color: #e5e5e5;
-    background-image: -webkit-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff), -webkit-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff);
-    background-image: -moz-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff), -moz-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff);
-    background-image: linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff), linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff);
-    background-size: 60px 60px;
-    background-position: 0 0, 30px 30px;
-    pointer-events: none;
-}
-
-.angular-ui-tree-nodes {
-    position: relative;
-    margin: 0;
-    padding: 0;
-    list-style: none;
-}
-
-.angular-ui-tree-nodes .angular-ui-tree-nodes {
-    padding-left: 20px;
-}
-
-.angular-ui-tree-node, .angular-ui-tree-placeholder {
-    position: relative;
-    margin: 0;
-    padding: 0;
-    min-height: 20px;
-    line-height: 20px;
-}
-
-.angular-ui-tree-hidden {
-    display: none;
-}
-
-.angular-ui-tree-placeholder {
-    margin: 5px 0;
-    padding: 0;
-    min-height: 30px;
-}
-
-.angular-ui-tree-handle {
-    cursor: move;
-    text-decoration: none;
-    font-weight: bold;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    min-height: 20px;
-    line-height: 20px;
-}
-
-.angular-ui-tree-drag {
-    position: absolute;
-    pointer-events: none;
-    z-index: 999;
-    opacity: .8;
-}
diff --git a/vid/src/main/webapp/app/vid/styles/dialogs.css b/vid/src/main/webapp/app/vid/styles/dialogs.css
deleted file mode 100644
index f701cf359..000000000
--- a/vid/src/main/webapp/app/vid/styles/dialogs.css
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Common style sheet for the pop-up dialogs.
- */
-
-/*
- * Common style settings ...
- */
-.popupContents .titleLine img {
-	float: left;
-	margin: 5px;
-	width: 20px;
-}
-
-.popupContents .titleLine>h3 {
-	display: inline-block;
-	padding-right: 40px;
-}
-
-.popupContents .requiredIndicator {
-	width: 14px;
-	padding-bottom: 5px;
-}
-
-.popupContents div[control=summaryControl] {
-	display: inline-block;
-	width: 600px;
-	margin: 0px 10px 10px 10px;
-}
-
-.popupContents div[control=detailsControl], .popupContents div[control=userProvidedControl]
-	{
-	display: inline-block;
-	border: solid black 1px;
-	margin: 10px;
-	padding: 10px;
-	max-height: 300px;
-	width: 600px;
-	overflow: auto;
-}
-
-.popupContents .prompt {
-	margin: 10px;
-}
-
-.popupContents .prompt p {
-	margin: 5px;
-}
-
-.popupContents .prompt span {
-	font-weight: bold;
-}
-
-.popupContents .statusLine {
-	vertical-align: center;
-}
-
-.popupContents .statusLine img {
-	width: 20px;
-	margin: 10px;
-}
-
-.popupContents .status {
-	margin-left: 5px;
-}
-
-.popupContents .feedback {
-	height: 35px;
-	vertical-align: center;
-}
-
-.popupContents .progress {
-	margin: 0px 10px;
-}
-
-.popupContents .error {
-	width: 630px;
-	text-align: left;
-	font-weight: bold;
-	font-size: 16px;
-	color: red;
-	margin: 0px 10px 0px 45px;
-	font-weight: bold;
-}
-
-.popupContents .error img {
-	width: 25px;
-	margin: 0px 10px;
-}
-
-.popupContents .buttonRow {
-	text-align: center;
-	margin-bottom: 10px;
-}
-
-.popupContents .log {
-	width: 700px;
-	height: 500px;
-	border: solid black 1px;
-	text-align: left !important;
-	margin: 10px;
-	padding: 10px;
-	overflow: auto;
-}
-
-::-webkit-input-placeholder {
-	text-align: center;
-}
-
-::-moz-placeholder {
-	text-align: center;
-}
-
-:-ms-input-placeholder {
-	text-align: center;
-}
-
-/*
- * Styling for specific screens ...
- */
-div[ng-controller=detailsDialogController] .log {
-	height: 200px;
-}
-
-div[ng-controller=msoCommitController] {
-	text-align: left;
-}
\ No newline at end of file
diff --git a/vid/src/main/webapp/app/vid/styles/dummy.txt b/vid/src/main/webapp/app/vid/styles/dummy.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/vid/src/main/webapp/app/vid/styles/instantiate.css b/vid/src/main/webapp/app/vid/styles/instantiate.css
deleted file mode 100644
index 81a76f420..000000000
--- a/vid/src/main/webapp/app/vid/styles/instantiate.css
+++ /dev/null
@@ -1,62 +0,0 @@
-div[ng-controller=InstantiationController] .popupContents {
-	text-align: left;
-}
-
-div[ng-controller=InstantiationController] .statusLine {
-	vertical-align: center;
-}
-
-div[ng-controller=InstantiationController] .statusLine img {
-	width: 20px;
-	margin: 10px;
-}
-
-div[ng-controller=InstantiationController] .status {
-	margin-left: 5px;
-}
-
-div[ng-controller=InstantiationController] .feedback {
-	height: 35px;
-	vertical-align: center;
-}
-
-div[ng-controller=InstantiationController] .progress {
-	margin: 0px 10px;
-	font-weight: bold;
-}
-
-div[ng-controller=InstantiationController] .error {
-	width: 630px;
-	font-weight: bold;
-	font-size: 16px;
-	color: red;
-	margin: 0px 10px 0px 45px;
-}
-
-div[ng-controller=InstantiationController] .error img {
-	width: 25px;
-	margin: 0px 10px;
-}
-
-div[ng-controller=InstantiationController] .buttonRow {
-	text-align: center;
-	margin-bottom: 10px;
-}
-
-div[ng-controller=InstantiationController] .log {
-	width: 700px;
-	height: 500px;
-	border: solid black 1px;
-	text-align: left !important;
-	margin: 10px;
-	padding: 10px;
-	overflow: auto;
-}
-
-div[ng-controller=InstantiationController] .aaiHidden {
-	visibility: hidden;
-}
-
-div[ng-controller=InstantiationController] .aaiVisible {
-	visibility: visible;
-}
\ No newline at end of file
diff --git a/vid/src/main/webapp/app/vid/styles/serviceModels.css b/vid/src/main/webapp/app/vid/styles/serviceModels.css
deleted file mode 100644
index c1e3c6654..000000000
--- a/vid/src/main/webapp/app/vid/styles/serviceModels.css
+++ /dev/null
@@ -1,70 +0,0 @@
-div[ng-controller=ServiceModelController] .popupContents {
-	text-align: left;
-}
-
-div[ng-controller=ServiceModelController] .statusLine {
-	vertical-align: center;
-}
-
-div[ng-controller=ServiceModelController] .statusLine img {
-	width: 20px;
-	margin: 10px;
-}
-
-div[ng-controller=ServiceModelController] .status {
-	margin-left: 5px;
-}
-
-div[ng-controller=ServiceModelController] .feedback {
-	height: 35px;
-	vertical-align: center;
-}
-
-div[ng-controller=ServiceModelController] .progress {
-	margin: 0px 10px;
-	font-weight: bold;
-}
-
-div[ng-controller=ServiceModelController] .error {
-	width: 630px;
-	font-weight: bold;
-	font-size: 16px;
-	color: red;
-	margin: 0px 10px 0px 45px;
-}
-
-div[ng-controller=ServiceModelController] .error img {
-	width: 25px;
-	margin: 0px 10px;
-}
-
-div[ng-controller=ServiceModelController] .buttonRow {
-	text-align: center;
-	margin-bottom: 10px;
-}
-
-div[ng-controller=ServiceModelController] .log {
-	width: 700px;
-	height: 500px;
-	border: solid black 1px;
-	text-align: left !important;
-	margin: 10px;
-	padding: 10px;
-	overflow: auto;
-}
-
-div[ng-controller=ServiceModelController] .smcHidden {
-	visibility: hidden;
-}
-
-div[ng-controller=ServiceModelController] .smcVisible {
-	visibility: visible;
-}
-
-div[ng-controller=ServiceModelController] .progHidden {
-	visibility: hidden;
-}
-
-div[ng-controller=ServiceModelController] .progVisible {
-	visibility: visible;
-}
\ No newline at end of file
diff --git a/vid/src/main/webapp/app/vid/styles/subscriberSearch.css b/vid/src/main/webapp/app/vid/styles/subscriberSearch.css
deleted file mode 100644
index 2f5bc61fa..000000000
--- a/vid/src/main/webapp/app/vid/styles/subscriberSearch.css
+++ /dev/null
@@ -1,8 +0,0 @@
-div[ng-controller=aaiSubscriberSearchController] button {
-	width: 200px;
-	margin: 3px;
-}
-
-h3 {
-	margin-bottom: 5px;
-}
diff --git a/vid/src/main/webapp/app/vid/styles/vidTree.css b/vid/src/main/webapp/app/vid/styles/vidTree.css
deleted file mode 100644
index fe3a18c57..000000000
--- a/vid/src/main/webapp/app/vid/styles/vidTree.css
+++ /dev/null
@@ -1,67 +0,0 @@
-
-.btn {
-    margin-right: 8px;
-}
-
-.angular-ui-tree-handle {
-    background: #f8faff;
-    border: 1px solid #dae2ea;
-    color: #7c9eb2;
-    padding: 10px 10px;
-}
-
-.angular-ui-tree-handle:hover {
-    color: #438eb9;
-    background: #f4f6f7;
-    border-color: #dce2e8;
-}
-
-.angular-ui-tree-placeholder {
-    background: #f0f9ff;
-    border: 2px dashed #bed2db;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-}
-
-tr.angular-ui-tree-empty {
-    height:100px
-}
-
-.group-title {
-    background-color: #687074 !important;
-    color: #FFF !important;
-}
-
-
-/* --- Tree --- */
-.tree-node {
-    border: 1px solid #dae2ea;
-    background: #f8faff;
-    color: #7c9eb2;
-}
-
-.nodrop {
-    background-color: #f2dede;
-}
-
-.tree-node-content {
-    margin: 10px;
-}
-.tree-handle {
-    padding: 10px;
-    background: #428bca;
-    color: #FFF;
-    margin-right: 10px;
-}
-
-.angular-ui-tree-handle:hover {
-}
-
-.angular-ui-tree-placeholder {
-    background: #f0f9ff;
-    border: 2px dashed #bed2db;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-}
\ No newline at end of file
diff --git a/vid/src/main/webapp/app/vid/test/testAaiData.js b/vid/src/main/webapp/app/vid/test/testAaiData.js
deleted file mode 100644
index 266cfe412..000000000
--- a/vid/src/main/webapp/app/vid/test/testAaiData.js
+++ /dev/null
@@ -1,254 +0,0 @@
-var exampleServiceModelInfo = {
-    modelInvariantId : "SERVICE_INVARIANT_ID_c99-b43e0d88a9a1",
-    modelNameVersionId : "SERVICE_NAME_VERSION_ID-4d54-8548-5d0ed23e962b",
-    modelName : "SERVICE_NAME_DE220127",
-    modelVersion : "SERVICE_VERSION_0.1"
-};
-
-var exampleVnfModelInfo = {
-    modelInvariantId : "VNF_INVARIANT_ID_c99-b43e0d88a9a1",
-    modelNameVersionId : "VNF_NAME_VERSION_ID-4d54-8548-5d0ed23e962b",
-    modelName : "VNF_NAME_DE220127",
-    modelVersion : "VNF_VERSION_0.1"
-};
-
-var exampleVfModuleModelInfo = {
-    modelInvariantId : "VF_MODULE_INVARIANT_ID_c99-b43e0d88a9a1",
-    modelNameVersionId : "VF_MODULE_NAME_VERSION_ID-4d54-8548-5d0ed23e962b",
-    modelName : "VF_MODULE_NAME_DE220127",
-    modelVersion : "VF_MODULE_VERSION_0.1"
-};
-
-var exampleVolumeGroupModelInfo = {
-    modelInvariantId : "VOLUME_GROUP_INVARIANT_ID_c99-b43e0d88a9a1",
-    modelNameVersionId : "VOLUME_GROUP_NAME_VERSION_ID-4d54-8548-5d0ed23e962b",
-    modelName : "VOLUME_GROUP_NAME_DE220127",
-    modelVersion : "VOLUME_GROUP_VERSION_0.1"
-};
-
-var exampleAvailableVolumeGroupList = [ "Volume Group Alpha",
-	"Volume Group Baker", "Volume Group Charlie" ];
-
-var exampleNetworkModelInfo = {
-    modelInvariantId : "NETWORK_INVARIANT_ID_c99-b43e0d88a9a1",
-    modelNameVersionId : "NETWORK_NAME_VERSION_ID-4d54-8548-5d0ed23e962b",
-    modelName : "NETWORK_NAME_DE220127",
-    modelVersion : "NETWORK_VERSION_0.1"
-};
-
-var exampleCloudRegionTenantList = [ {
-    cloudRegionId : "DEFAULTREGION",
-    tenantId : "ebe382f38e414b4dbf45b408c7e5bf9f",
-    tenantName : "vMOG-AKRON-123"
-}, {
-    cloudRegionId : "DEFAULTREGION",
-    tenantId : "abcdefhi38e414b4dbf45b408c7e5bf9f",
-    tenantName : "tenant 2"
-}, {
-    cloudRegionId : "DEFAULTREGION",
-    tenantId : "rstuvwzyx38e414b4dbf45b408c7e5bf9f",
-    tenantName : "tenant 3"
-}, {
-    cloudRegionId : "cloudR2",
-    tenantId : "jklmnop38e414b4dbf45b408c7e5bf9f",
-    tenantName : "tenant4"
-}, {
-    cloudRegionId : "cloudR2",
-    tenantId : "qurstuv38e414b4dbf45b408c7e5bf9f",
-    tenantName : "tenant 5"
-}, {
-    cloudRegionId : "cloudR3",
-    tenantId : "zyxw38e414b4dbf45b408c7e5bf9f",
-    tenantName : "tenant 6"
-} ];
-
-var exampleServiceIdList = [ {
-    id : "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-    description : "Mobility"
-}, {
-    id : "e433710f-9217-458d-a79d-1c7aff376d89",
-    description : "VIRTUAL USP"
-}, {
-    id : "c7611ebe-c324-48f1-8085-94aef0c6ef3d",
-    description : "HOSTED COMMUNICATIONS"
-} ];
-
-var exampleServiceItem = {
-    "generic-service" : {
-	"service-id" : "415d4d6c-19e8-44ed-bd28-28d41c5b5185",
-	"service-name" : "ZRDM1MMSC01",
-	"service-type" : "vMMSC Svc Jul 12/vMMSC VOLUME VF new Jul 12 13",
-	"service-id" : "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-	"orchestration-status" : "active",
-	"in-maint" : false,
-	"is-closed-loop-disabled" : false,
-	"resource-version" : "1469558690",
-	"persona-model-id" : "1fe5c0e1-7ae8-4a3b-bf06-e64b9fa7e7c9",
-	"persona-model-version" : "1.0"
-    }
-};
-
-var exampleVfModuleItem = {
-    "generic-vfModule" : {
-	"vfModule-id" : "415d4d6c-19e8-44ed-bd28-28d41c5b5185",
-	"vfModule-name" : "ZRDM1MMSC01",
-	"vfModule-type" : "vMMSC Svc Jul 12/vMMSC VOLUME VF new Jul 12 13",
-	"vfModule-id" : "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-	"orchestration-status" : "active",
-	"in-maint" : false,
-	"is-closed-loop-disabled" : false,
-	"resource-version" : "1469558690",
-	"persona-model-id" : "1fe5c0e1-7ae8-4a3b-bf06-e64b9fa7e7c9",
-	"persona-model-version" : "1.0"
-    }
-};
-
-var exampleVolumeGroupItem = {
-    "generic-volumeGroup" : {
-	"volumeGroup-id" : "415d4d6c-19e8-44ed-bd28-28d41c5b5185",
-	"volumeGroup-name" : "ZRDM1MMSC01",
-	"volumeGroup-type" : "vMMSC Svc Jul 12/vMMSC VOLUME VF new Jul 12 13",
-	"volumeGroup-id" : "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-	"orchestration-status" : "active",
-	"in-maint" : false,
-	"is-closed-loop-disabled" : false,
-	"resource-version" : "1469558690",
-	"persona-model-id" : "1fe5c0e1-7ae8-4a3b-bf06-e64b9fa7e7c9",
-	"persona-model-version" : "1.0"
-    }
-};
-
-var exampleNetworkItem = {
-    "generic-network" : {
-	"network-id" : "415d4d6c-19e8-44ed-bd28-28d41c5b5185",
-	"network-name" : "ZRDM1MMSC01",
-	"network-type" : "vMMSC Svc Jul 12/vMMSC VOLUME VF new Jul 12 13",
-	"network-id" : "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-	"orchestration-status" : "active",
-	"in-maint" : false,
-	"is-closed-loop-disabled" : false,
-	"resource-version" : "1469558690",
-	"persona-model-id" : "1fe5c0e1-7ae8-4a3b-bf06-e64b9fa7e7c9",
-	"persona-model-version" : "1.0"
-    }
-};
-
-/*
- * Sample query provided by Jimmy on 8/11/16.
- */
-
-var exampleAaiResult = {
-    "service-instance" : {
-	"service-instance-id" : "mmsc-test-service-instance",
-	"resource-version" : "1470921501"
-    },
-    "extra-properties" : {},
-    "inventory-response-items" : {
-	"inventory-response-item" : [ {
-	    "generic-vnf" : {
-		"vnf-id" : "415d4d6c-19e8-44ed-bd28-28d41c5b5185",
-		"vnf-name" : "ZRDM1MMSC01",
-		"vnf-type" : "vMMSC Svc Jul 12/vMMSC VOLUME VF new Jul 12 13",
-		"service-id" : "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-		"orchestration-status" : "active",
-		"in-maint" : false,
-		"is-closed-loop-disabled" : false,
-		"resource-version" : "1469558690",
-		"persona-model-id" : "1fe5c0e1-7ae8-4a3b-bf06-e64b9fa7e7c9",
-		"persona-model-version" : "1.0"
-	    },
-	    "extra-properties" : {},
-	    "inventory-response-items" : {
-		"inventory-response-item" : [ {
-		    "vf-module" : {
-			"vf-module-id" : "4dd25057-0b2b-4255-b9cd-669443c9b470",
-			"vf-module-name" : "ZRDM1MMSC01_base",
-			"heat-stack-id" : "ZRDM1MMSC01_base/6261554c-6c34-4604-b91c-68afd148a096",
-			"orchestration-status" : "active",
-			"is-base-vf-module" : true,
-			"resource-version" : "1469559159",
-			"persona-model-id" : "6e3b9ac7-cb21-4f39-99ba-f248ba2a597a",
-			"persona-model-version" : "1"
-		    },
-		    "extra-properties" : {},
-		    "inventory-response-items" : {
-			"inventory-response-item" : [
-				{
-				    "l3-network" : {
-					"network-id" : "b13635a1-5ab8-4dee-9598-768a83eea099",
-					"network-name" : "MMS-24413-LAB-vMMSC-01_int_eca_mgmt_net_1",
-					"network-type" : "CONTRAIL_BASIC",
-					"network-role" : "int_eca_mgmt",
-					"network-technology" : "contrail",
-					"neutron-network-id" : "07919187-754f-49c2-abb3-9888cfd8ec7d",
-					"is-bound-to-vpn" : false,
-					"service-id" : "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-					"network-role-instance" : 0,
-					"resource-version" : "1469558694",
-					"orchestration-status" : "active",
-					"heat-stack-id" : "MMS-24413-LAB-vMMSC-01_int_eca_mgmt_net_1/8d34d139-c95f-4d80-86df-d7d13af01067"
-				    },
-				    "extra-properties" : {},
-				    "inventory-response-items" : {}
-				},
-				{
-				    "l3-network" : {
-					"network-id" : "44e0d9e0-9334-4ec6-9344-07a96dac629f",
-					"network-name" : "dmz_protected_net_0",
-					"network-type" : "CONTRAIL_EXTERNAL",
-					"network-role" : "dmz_protected",
-					"network-technology" : "contrail",
-					"neutron-network-id" : "1ad6b2c5-97d0-4298-b016-7e28939e0baf",
-					"is-bound-to-vpn" : false,
-					"service-id" : "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-					"resource-version" : "1469563787",
-					"orchestration-status" : "active",
-					"heat-stack-id" : "dmz_protected_net_0/3f93df5c-f4f1-484f-a269-12d3a6b1ec82"
-				    },
-				    "extra-properties" : {},
-				    "inventory-response-items" : {}
-				},
-				{
-				    "l3-network" : {
-					"network-id" : "ac49d99b-5daf-4624-9f8e-188b126ea166",
-					"network-name" : "cor_direct_net_0",
-					"network-type" : "CONTRAIL_BASIC",
-					"network-role" : "cor_direct",
-					"network-technology" : "contrail",
-					"neutron-network-id" : "ac49d99b-5daf-4624-9f8e-188b126ea166",
-					"is-bound-to-vpn" : false,
-					"service-id" : "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-					"network-role-instance" : 0,
-					"resource-version" : "1470846979",
-					"orchestration-status" : "active",
-					"heat-stack-id" : "",
-					"mso-catalog-key" : ""
-				    },
-				    "extra-properties" : {},
-				    "inventory-response-items" : {}
-				},
-				{
-				    "l3-network" : {
-					"network-id" : "c597ab81-fece-49f4-a4f5-710cebb13c29",
-					"network-name" : "oam_protected_net_0",
-					"network-type" : "CONTRAIL_BASIC",
-					"network-role" : "oam_protected",
-					"network-technology" : "contrail",
-					"neutron-network-id" : "c597ab81-fece-49f4-a4f5-710cebb13c29",
-					"is-bound-to-vpn" : false,
-					"service-id" : "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-					"network-role-instance" : 0,
-					"resource-version" : "1470846979",
-					"orchestration-status" : "active",
-					"heat-stack-id" : "",
-					"mso-catalog-key" : ""
-				    },
-				    "extra-properties" : {},
-				    "inventory-response-items" : {}
-				} ]
-		    }
-		} ]
-	    }
-	} ]
-    }
-};
diff --git a/vid/src/main/webapp/app/vid/test/testMso.css b/vid/src/main/webapp/app/vid/test/testMso.css
deleted file mode 100644
index 077866be3..000000000
--- a/vid/src/main/webapp/app/vid/test/testMso.css
+++ /dev/null
@@ -1,22 +0,0 @@
-div[ng-controller=testController] button {
-	width: 200px;
-	margin: 3px;
-}
-
-h3 {
-	margin-bottom: 5px;
-}
-
-ol, li {
-	list-style-type: decimal !important;
-}
-
-div[ng-controller=testController]>div>span {
-	font-size: 20px;
-	margin-left: 10px;
-}
-
-div[ng-controller=testController] input[type=checkbox] {
-	height: 20px;
-	width: 20px;
-}
\ No newline at end of file
diff --git a/vid/src/main/webapp/app/vid/test/testMso.js b/vid/src/main/webapp/app/vid/test/testMso.js
deleted file mode 100644
index 979ca18ec..000000000
--- a/vid/src/main/webapp/app/vid/test/testMso.js
+++ /dev/null
@@ -1,486 +0,0 @@
-"use strict";
-
-app.config(function($logProvider){
-    // Optionally set to "false" to disable debug logging.
-    $logProvider.debugEnabled(true);
-});
-
-app.controller("testController", [ "$scope", "$timeout", "$cookieStore", "$log", "COMPONENT", "DataService", "PropertyService",
-    function($scope, $timeout, $cookieStore, $log, COMPONENT, DataService, PropertyService) {
-
-		$scope.popup = new Object();
-		$scope.isTestMode = false;
-
-		$scope.init = function(properties) {
-	    		/*
-	    		 * These 2 statements should be included in non-test code.
-	    		 */
-			PropertyService.setMsoMaxPollingIntervalMsec(properties.msoMaxPollingIntervalMsec);
-			PropertyService.setMsoMaxPolls(properties.msoMaxPolls);
-
-			/*
-			 * "setTestMode" is only used for testing.
-			 */
-
-			setTestMode();
-			
-			DataService.setSubscriberName("Mobility");
-			DataService.setGlobalCustomerId("CUSTID12345")
-			DataService.setServiceType("Mobility Type 1");
-			DataService.setServiceName("Mobility Service 1");
-			DataService.setServiceInstanceId("mmsc-test-service-instance");
-			DataService.setVnfInstanceId("abcd-12345-56789");
-			DataService.setVfModuleInstanceId("xye-99990123213");
-		}
-		
-		var TEST_MODE_COOKIE = "isTestModeEnabled";
-
-		var defaultMsoBaseUrl = PropertyService.getMsoBaseUrl();
-
-		var setTestMode = function() {
-		    setTestMsoMode($cookieStore.get(TEST_MODE_COOKIE));
-		    PropertyService.setMsoMaxPollingIntervalMsec(1000);
-		    PropertyService.setMsoMaxPolls(7);
-		    PropertyService.setServerResponseTimeoutMsec(10000);
-		};
-
-		$scope.testMsoModeChanged = function() {
-		    setTestMsoMode($scope.isTestMsoMode);
-		};
-
-		var setTestMsoMode = function(isEnabled) {
-		    $scope.isTestMsoMode = isEnabled;
-		    $cookieStore.put(TEST_MODE_COOKIE, isEnabled);
-		    if (isEnabled) {
-			PropertyService.setMsoBaseUrl("testmso");
-		    } else {
-			PropertyService.setMsoBaseUrl(defaultMsoBaseUrl);
-		    }
-		}
-		
-		$scope.autoStartCommitTest = function() {
-			/*
-			 * Optionally comment in / out one of these method calls (or add a similar
-			 * entry) to auto-invoke an entry when the test screen is redrawn.
-			 */
-			$timeout(function() {
-				// $scope.createServiceInstance();
-				// $scope.deleteServiceInstance();
-				// $scope.generateInvalidUrl404();			
-			}, 500);
-		}
-		
-		$scope.autoStartQueryTest = function() {
-			/*
-			 * Optionally comment in / out one of these method calls (or add a similar
-			 * entry) to auto-invoke an entry when the test screen is redrawn.
-			 */
-			$timeout(function() {
-				// $scope.queryServiceInstance();
-			}, 500);
-		}
-		
-		$scope.queryServiceInstance = function() {
-			/*
-			 * Example of method call needed to show service instance details.
-			 */
-			$scope.$broadcast("showComponentDetails", {
-			    componentId : COMPONENT.SERVICE
-			});
-		}
-	
-		$scope.createServiceInstance = function() {
-			/*
-			 * Example of method call needed to commit an instance creation request.
-			 */
-			$scope.$broadcast("createInstance", {
-				url : "mso_create_svc_instance",
-				requestDetails : createServiceRequestDetails
-			});
-		}
-	
-		$scope.deleteServiceInstance = function() {
-			/*
-			 * Example of method call needed to commit an instance deletion request.
-			 */
-			$scope.$broadcast("deleteInstance",	{
-				url : "mso_delete_svc_instance/bc305d54-75b4-431b-adb2-eb6b9e546014",
-				requestDetails : deleteServiceRequestDetails
-			});
-		}
-	
-		$scope.createVNFInstance = function() {
-			/*
-			 * Example of method call needed to commit an instance creation request.
-			 */
-			$scope.$broadcast("createInstance", {
-				url : "mso_create_vnf_instance/bc305d54-75b4-431b-adb2-eb6b9e546099",
-				requestDetails : createVnfRequestDetails
-			});
-		}
-	
-		$scope.deleteVNFInstance = function() {
-			/*
-			 * Example of method call needed to commit an instance deletion request.
-			 */
-			$scope.$broadcast("deleteInstance",	{
-				url : "mso_delete_vnf_instance/bc305d54-75b4-431b-adb2-eb6b9e546014/vnfs/ab9000-0009-9999",
-				requestDetails : deleteVnfRequestDetails
-			});
-		}
-		
-		$scope.createVolumeGroupInstance = function() {
-			/*
-			 * Example of method call needed to commit an instance creation request.
-			 */
-			$scope.$broadcast("createInstance", {
-				url : "mso_create_volumegroup_instance/bc305d54-75b4-431b-adb2-eb6b9e546099/vnfs/fe305d54-75b4-431b-adb2-eb6b9e546fea",
-				requestDetails : createVolumeGroupRequestDetails
-			});
-		}
-	
-		$scope.deleteVolumeGroupInstance = function() {
-			/*
-			 * Example of method call needed to commit an instance deletion request.
-			 */
-			$scope.$broadcast("deleteInstance",	{
-				url : "mso_delete_volumegroup_instance/bc305d54-75b4-431b-adb2-eb6b9e546014/vnfs/fe305d54-75b4-431b-adb2-eb6b9e546fea/volumeGroups/fe9000-0009-9999",
-				requestDetails : deleteVolumeGroupRequestDetails
-			});
-		}
-		$scope.createVFModuleInstance = function() {
-			/*
-			 * Example of method call needed to commit an instance creation request.
-			 */
-			$scope.$broadcast("createInstance", {
-				url : "mso_create_vfmodule_instance/bc305d54-75b4-431b-adb2-eb6b9e546099/vnfs/111-111-111-111",
-				requestDetails : createVFModuleRequestDetails
-			});
-		}
-	
-		$scope.deleteVFModuleInstance = function() {
-			/*
-			 * Example of method call needed to commit an instance deletion request.
-			 * 
-			 */
-			$scope.$broadcast("deleteInstance",	{
-				url : "mso_delete_vfmodule_instance/2/vnfs/ab/vfModules/a1",
-				requestDetails : deleteVFModuleRequestDetails
-			});
-		}
-		$scope.createNetworkInstance = function() {
-			$scope.$broadcast("createInstance", {
-				url : "mso_create_nw_instance/789098877777",
-				requestDetails : createNetworkRequestDetails
-			});
-		}
-	
-		$scope.deleteNetworkInstance = function() {
-			$scope.$broadcast("deleteInstance",	{
-				url : "mso_delete_nw_instance/bc305d54-75b4-431b-adb2-eb6b9e546014/networks/ff305d54-75b4-ff1b-fff1-eb6b9e5460ff",
-				requestDetails : deleteNetworkRequestDetails
-			});
-		}
-	
-		$scope.generateError = function(testName) {
-			// Clone example request object
-			var request = JSON.parse(JSON.stringify(createServiceRequestDetails));
-			request.modelInfo.modelName = testName;
-			$scope.$broadcast("createInstance", {
-				url : "mso_create_svc_instance",
-				requestDetails : request
-			});
-		}
-	
-		$scope.generateInvalidUrl404 = function() {
-		    	var baseUrl = PropertyService.getMsoBaseUrl();
-		    	PropertyService.setMsoBaseUrl("/INVALID_STRING/");
-
-			$scope.$broadcast("createInstance", {
-				url : "mso_create_svc_instance",
-				requestDetails : createServiceRequestDetails,
-				callbackFunction : function() {
-				    PropertyService.setMsoBaseUrl(baseUrl);
-				    $scope.popup.isVisible = false;
-				}
-			});	
-		}
-	
-		$scope.generateInvalidUrl405 = function() {
-			$scope.$broadcast("createInstance", {
-				url : "INVALID_STRING_mso_create_svc_instance",
-				requestDetails : createServiceRequestDetails
-			});
-		}
-	
-		/*
-		 * Test data objects:
-		 */
-		/*var requestParameters = {
-				"subscriptionServiceType":"ef5256d1-5a33-aadf-13ab-12abad84e764",
-				"userParams":[{"name":"goldenr","value":"Willie"}, {"name":"lab","value":"Jackson"}, {"name":"goldend","value":"Max"}]} */
-		var requestParameters = { "subscriptionServiceType":"ef5256d1-5a33-aadf-13ab-12abad84e764", userParams:[] };
-		var requestInfo = {
-				instanceName: "sn5256d1-5a33-55df-13ab-12abad84e764",
-				productFamilyId: "sn5256d1-5a33-55df-13ab-12abad84edde",
-				source: "VID",
-				suppressRollback: true
-		};
-		var subscriberInfo = {
-			globalSubscriberId : "C12345",
-			subscriberName : "General Electric Division 12"
-		};
-	
-		var cloudConfiguration = {
-				lcpCloudRegionId: "cloudregion1",
-				tenantId: "df5256d1-5a33-55df-13ab-12abad843456"
-				
-		};
-		var createServiceRequestDetails = {
-			modelInfo : {
-				modelType : "service",
-				modelInvariantId : "sn5256d1-5a33-55df-13ab-12abad84e764",
-				modelNameVersionId : "ab6478e4-ea33-3346-ac12-ab121484adca",
-				modelName : "WanBonding",
-				modelVersion : "1",
-				modelCustomizationName: ""
-			},
-			subscriberInfo : subscriberInfo,
-			requestInfo : requestInfo,
-			requestParameters : requestParameters
-		};
-	
-		var deleteServiceRequestDetails = {
-				modelInfo : {
-					modelType : "service",
-					modelInvariantId : "sn5256d1-5a33-55df-13ab-12abad84e764",
-					modelNameVersionId : "ab6478e4-ea33-3346-ac12-ab121484adca",
-					modelName : "WanBonding",
-					modelVersion : "1",
-					modelCustomizationName: ""
-				},
-				requestInfo : requestInfo
-		};
-		
-		var createVFModuleRequestDetails = {
-				modelInfo : {
-					modelType : "VFModule",
-					modelInvariantId : "ab5256d1-5a33-55df-13ab-12abad84e764",
-					modelNameVersionId : "9b6478e4-ea33-3346-ac12-ab121484adc2",
-					modelName : "model1",
-					modelVersion : "1",
-					modelCustomizationName: ""
-				},
-				cloudConfiguration: cloudConfiguration,
-				requestInfo : requestInfo,
-				relatedInstanceList: [
-										{
-										    relatedInstance: {
-										       instanceId: "c3514e3-5a33-55df-13ab-12abad84e7cc",
-										       modelInfo: {   
-										          modelType: "volumeGroup",
-										          modelInvariantId: "ff3514e3-5a33-55df-13ab-12abad84e7ff",
-										          modelNameVersionId: "fe6985cd-ea33-3346-ac12-ab121484a3fe",
-										          modelName: "parentServiceModelName",
-										          modelVersion: "1.0"
-										       }
-										    }
-										 },
-				                        {
-				                           relatedInstance: {
-				                              instanceId: "c3514e3-5a33-55df-13ab-12abad84e7cc",
-				                              modelInfo: {   
-				                                 modelType: "service",
-				                                 modelInvariantId: "ff3514e3-5a33-55df-13ab-12abad84e7ff",
-				                                 modelNameVersionId: "fe6985cd-ea33-3346-ac12-ab121484a3fe",
-				                                 modelName: "parentServiceModelName",
-				                                 modelVersion: "1.0"
-				                              }
-				                           }
-				                        },
-				                        {
-				                           relatedInstance: {
-				                              instanceId: "fab256d1-5a33-55df-13ab-12abad8445ff34",
-				                              modelInfo: {
-				                                 modelType: "vnf",
-				                                 modelInvariantId: "ff5256d1-5a33-55df-13ab-12abad84e7ff",
-				                                 modelNameVersionId: "fe6478e4-ea33-3346-ac12-ab121484a3fe",
-				                                 modelName: "vSAMP12",
-				                                 modelVersion: "1.0",
-				                                 modelCustomizationName: "vSAMP12 1"
-				                              }
-				                           }
-				                        }
-
-				                     ],
-				                     requestParameters : requestParameters
-			};
-		
-			var deleteVFModuleRequestDetails = {
-					modelInfo : {
-						modelType : "VFModule",
-						modelInvariantId : "ab5256d1-5a33-55df-13ab-12abad84e764",
-						modelNameVersionId : "9b6478e4-ea33-3346-ac12-ab121484adc2",
-						modelName : "model1",
-						modelVersion : "1",
-						modelCustomizationName: ""
-					},
-					cloudConfiguration: cloudConfiguration,
-					requestInfo : requestInfo,
-					
-			};
-			
-		var createVnfRequestDetails = {
-				modelInfo : {
-					modelType : "vnf",
-					modelInvariantId : "ab5256d1-5a33-55df-13ab-12abad84efc2",
-					modelNameVersionId : "9b6478e4-ea33-3346-ac12-ab1214847890",
-					modelName : "model1",
-					modelVersion : "1",
-					modelCustomizationName: ""
-				},
-				requestInfo : requestInfo,
-				cloudConfiguration : cloudConfiguration,
-				relatedInstanceList: [
-					{
-					    relatedInstance: {
-					       instanceId: "c3514e3-5a09-55df-13ab-1babad84e7cc",
-					       modelInfo: {   
-					          modelType: "service",
-					          modelInvariantId: "ff3514e3-5a33-55df-13ab-12abad84e7ff",
-					          modelNameVersionId: "fe6985cd-ea33-3346-ac12-ab121484a3fe",
-					          modelName: "parentServiceModelName",
-					          modelVersion: "1.0"
-					       }
-					    }
-					 }
-					]
-			};
-		
-			var deleteVnfRequestDetails = {
-					modelInfo : {
-						modelType : "vnf",
-						modelInvariantId : "ab5256d1-5a33-55df-13ab-12abad84efc2",
-						modelNameVersionId : "9b6478e4-ea33-3346-ac12-ab1214847890",
-						modelName : "model1",
-						modelVersion : "1",
-						modelCustomizationName: ""
-					},
-					cloudConfiguration : cloudConfiguration,
-					requestInfo : requestInfo	
-			};
-			var createVolumeGroupRequestDetails = {
-				modelInfo : {
-						modelType : "volumeGroup",
-						modelInvariantId : "ab5256d1-5a33-55df-13ab-12abad84efda",
-						modelNameVersionId : "9b6478e4-ea33-3346-ac12-ab12148478fa",
-						modelName : "model1",
-						modelVersion : "1",
-						modelCustomizationName: ""
-					},
-					cloudConfiguration : cloudConfiguration,
-					requestInfo : requestInfo,
-					relatedInstanceList: [
-                      {
-                    	  relatedInstance: {
-                    		  instanceId: "c3514e3-5a33-55df-13ab-12abad84e7cc",
-                    		  modelInfo: {   
-                    			  modelType: "service",
-                    			  modelInvariantId: "ff3514e3-5a33-55df-13ab-12abad84e7ff",
-                    			  modelNameVersionId: "fe6985cd-ea33-3346-ac12-ab121484a3fe",
-                    			  modelName: "parentServiceModelName",
-                    			  modelVersion: "1.0"
-                    		  }
-                    	  }
-                      },
-                      {
-                    	  relatedInstance: {
-                    		  instanceId: "fab256d1-5a33-55df-13ab-12abad8445ff34",
-                    		  modelInfo: {
-                    			  modelType: "vnf",
-                    			  modelInvariantId: "ff5256d1-5a33-55df-13ab-12abad84e7ff",
-                    			  modelNameVersionId: "fe6478e4-ea33-3346-ac12-ab121484a3fe",
-                    			  modelName: "vSAMP12",
-                    			  modelVersion: "1.0",
-                    			  modelCustomizationName: "vSAMP12 1"
-                    		  }
-                    	  }
-                      }
-                      ]
-
-				};
-			
-				var deleteVolumeGroupRequestDetails = {
-					modelInfo : {
-						modelType : "volumeGroup",
-						modelInvariantId : "ab5256d1-5a33-55df-13ab-12abad84efda",
-						modelNameVersionId : "9b6478e4-ea33-3346-ac12-ab12148478fa",
-						modelName : "vIsbcOamNetwork",
-						modelVersion : "1",
-						modelCustomizationName: ""
-					},
-					cloudConfiguration : cloudConfiguration,
-					requestInfo : requestInfo
-				};
-			
-		var createNetworkRequestDetails = {
-			modelInfo : {
-				modelType : "network",
-				modelInvariantId : "ab5256d1-5a33-55df-13ab-12abad84e890",
-				modelNameVersionId : "fe6478e4-ea33-3346-aaaa-ab121484a3fa",
-				modelName : "vIsbcOamNetwork",
-				modelVersion : "1",
-				modelCustomizationName: ""
-			},
-			cloudConfiguration: cloudConfiguration,
-			requestInfo : requestInfo
-		};
-	
-		var deleteNetworkRequestDetails = {
-			modelInfo : {
-				modelType : "network",
-				modelId : "ff5256d1-5a33-55df-aaaa-12abad84e7ff",
-				modelNameVersionId : "fe6478e4-ea33-3346-aaaa-ab121484a3fe",
-				modelName : "vIsbcOamNetwork",
-				modelVersion : "1"
-			},
-			relatedModelList : [
-					{
-						relatedModel : {
-							instanceId : "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
-							modelInfo : {
-								modelType : "service",
-								modelId : "ff3514e3-5a33-55df-13ab-12abad84e7ff",
-								modelNameVersionId : "fe6985cd-ea33-3346-ac12-ab121484a3fe",
-								modelName : "Intercarrier Interconnect Session Border Controller",
-								modelVersion : "1"
-							}
-						}
-					},
-					{
-						relatedModel : {
-							instanceId : "ff305d54-75b4-ff1b-adb2-eb6b9e5460ff",
-							modelInfo : {
-								modelType : "vnf",
-								modelId : "ff5256d1-5a33-55df-13ab-12abad84e7ff",
-								modelNameVersionId : "fe6478e4-ea33-3346-ac12-ab121484a3fe",
-								modelName : "vIsbc",
-								modelVersion : "1"
-							}
-						}
-					},
-					{
-						relatedModel : {
-							instanceId : "ff305d54-75b4-ff1b-bdb2-eb6b9e5460ff",
-							modelInfo : {
-								modelType : "vfModule",
-								modelId : "ff5256d1-5a33-55df-13ab-22abad84e7ff",
-								modelNameVersionId : "fe6478e4-ea33-3346-bc12-ab121484a3fe",
-								modelName : "vIsbcRtpExpansionModule",
-								modelVersion : "1"
-							}
-						}
-					} ]
-		};
-	}
-]);
diff --git a/vid/src/main/webapp/app/vid/test/testViewEdit.css b/vid/src/main/webapp/app/vid/test/testViewEdit.css
deleted file mode 100644
index 7255c767e..000000000
--- a/vid/src/main/webapp/app/vid/test/testViewEdit.css
+++ /dev/null
@@ -1,30 +0,0 @@
-div[ng-controller=testViewEditController] button {
-	width: 120px;
-}
-
-div[ng-controller=testViewEditController]>table {
-	border: solid black 1px;
-	width: auto;
-}
-
-div[ng-controller=testViewEditController]>table td {
-	border: solid black 1px;
-}
-
-h3 {
-	margin-bottom: 5px;
-}
-
-ol, li {
-	list-style-type: decimal !important;
-}
-
-div[ng-controller=testViewEditController]>div>span {
-	font-size: 20px;
-	margin-left: 10px;
-}
-
-div[ng-controller=testViewEditController] input[type=checkbox] {
-	height: 20px;
-	width: 20px;
-}
\ No newline at end of file
diff --git a/vid/src/main/webapp/app/vid/test/testViewEdit.js b/vid/src/main/webapp/app/vid/test/testViewEdit.js
deleted file mode 100644
index 003d7f43b..000000000
--- a/vid/src/main/webapp/app/vid/test/testViewEdit.js
+++ /dev/null
@@ -1,376 +0,0 @@
-"use strict";
-
-app.config(function($logProvider) {
-    // Optionally set to "false" to disable debug logging.
-    $logProvider.debugEnabled(true);
-});
-
-var testViewEditController = function(COMPONENT, DataService, PropertyService,
-	UtilityService, $scope, $timeout, $cookieStore, $log) {
-
-    $scope.popup = new Object();
-    $scope.isTestMode = false;
-
-    $scope.init = function(properties) {
-
-	/*
-	 * These 2 statements should be included in non-test code.
-	 */
-	PropertyService
-		.setMsoMaxPollingIntervalMsec(properties.msoMaxPollingIntervalMsec);
-	PropertyService.setMsoMaxPolls(properties.msoMaxPolls);
-
-	/*
-	 * Common parameters that shows an example of how the view edit screen
-	 * is expected to pass some common service instance values to the
-	 * popups.
-	 */
-
-	DataService.setSubscriberName("Mobility");
-	DataService.setGlobalCustomerId("CUSTID12345")
-	DataService.setServiceType("Mobility Type 1");
-	DataService.setServiceInstanceName("Example Service Instance Name");
-	DataService.setServiceName("Mobility Service 1");
-	DataService.setServiceInstanceId("mmsc-test-service-instance");
-	DataService.setServiceUuid("XXXX-YYYY-ZZZZ");
-	DataService.setUserServiceInstanceName("USER_SERVICE_INSTANCE_NAME");
-
-	/*
-	 * "setTestMode" is only used for testing.
-	 */
-
-	setTestMode();
-
-    }
-
-    $scope.autoStartTest = function() {
-	/*
-	 * Optionally comment in / out one of these method calls (or add a
-	 * similar entry) to auto-invoke an entry as soon as the page is
-	 * refreshed.
-	 */
-	$timeout(function() {
-	    // $scope.showServiceDetails();
-	    // $scope.showVnfDetails();
-	    // $scope.createService();
-	    // $scope.deleteService();
-	    // $scope.createNetwork();
-	    // $scope.createVnf();
-	    // $scope.createVfModule();
-	    // $scope.deleteVnf();
-	    // $scope.createVfModule();
-	}, 500);
-    }
-
-    /*
-     * This block of code is only used for testing.
-     */
-
-    /*
-     * The first 3 functions override default values set in the server
-     * properties file.
-     * 
-     * 1) The URL for the MSO controller is set to either the "real" controller
-     * or the test version depending on the "Use test MSO controller" checkbox.
-     * 
-     * 2) SDC and AAI are set to use test controller versions.
-     * 
-     * 3) Maximum polling and timeout values are set to lower values to lessen
-     * the time required to run tests.
-     * 
-     */
-
-    var TEST_MODE_COOKIE = "isTestModeEnabled";
-
-    var defaultMsoBaseUrl = PropertyService.getMsoBaseUrl();
-
-    var setTestMode = function() {
-	setTestMsoMode($cookieStore.get(TEST_MODE_COOKIE));
-	PropertyService.setAaiBaseUrl("testaai");
-	PropertyService.setAsdcBaseUrl("testasdc");
-	PropertyService.setMsoMaxPollingIntervalMsec(1000);
-	PropertyService.setMsoMaxPolls(7);
-	PropertyService.setServerResponseTimeoutMsec(10000);
-    };
-
-    $scope.testMsoModeChanged = function() {
-	setTestMsoMode($scope.isTestMsoMode);
-    };
-
-    var setTestMsoMode = function(isEnabled) {
-	$scope.isTestMsoMode = isEnabled;
-	$cookieStore.put(TEST_MODE_COOKIE, isEnabled);
-	if (isEnabled) {
-	    PropertyService.setMsoBaseUrl("testmso");
-	} else {
-	    PropertyService.setMsoBaseUrl(defaultMsoBaseUrl);
-	}
-    };
-
-    var callbackFunction = function(response) {
-	$scope.callbackResults = "";
-	var color = "none";
-	$scope.callbackStyle = {
-	    "background-color" : color
-	};
-	/*
-	 * This 1/2 delay was only added to visually highlight the status
-	 * change. Probably not needed in the real application code.
-	 */
-	$timeout(function() {
-	    $scope.callbackResults = UtilityService.getCurrentTime()
-		    + " isSuccessful: " + response.isSuccessful;
-	    if (response.isSuccessful) {
-		color = "#8F8";
-	    } else {
-		color = "#F88";
-	    }
-	    $scope.callbackStyle = {
-		"background-color" : color
-	    };
-	}, 500);
-    };
-
-    /*
-     * End of block of test-specific code
-     */
-
-    /*
-     * Create functions
-     */
-    $scope.createService = function() {
-
-	DataService.setModelId("91238134091820938018230918230989");
-
-	$scope.$broadcast("createComponent", {
-	    componentId : COMPONENT.SERVICE,
-	    callbackFunction : callbackFunction
-	});
-    }
-
-    $scope.createVnf = function() {
-
-	DataService.setModelId("91238134091820938018230918230989");
-	DataService.setModelInstanceName("VNF_MODEL_INSTANCE_NAME");
-
-	DataService.setCloudRegionTenantList(exampleCloudRegionTenantList)
-	DataService.setServiceIdList(exampleServiceIdList);
-
-	// Data used to create MSO "relatedInstanceList" object
-
-	DataService.setModelInfo(COMPONENT.SERVICE, exampleServiceModelInfo);
-
-	$scope.$broadcast("createComponent", {
-	    componentId : COMPONENT.VNF,
-	    callbackFunction : callbackFunction
-	});
-    }
-
-    $scope.createVfModule = function() {
-	DataService
-		.setInventoryItem(exampleAaiResult["inventory-response-items"][0]);
-
-	DataService.setModelId("91238134091820938018230918230989");
-	DataService.setModelInstanceName("VF_MODULE_MODEL_INSTANCE_NAME");
-
-	DataService.setLcpRegion("Region2");
-	DataService.setTenant("Tenant2");
-	// Data used to create MSO "relatedInstanceList" object
-
-	DataService.setModelInfo(COMPONENT.SERVICE, exampleServiceModelInfo);
-
-	DataService.setVnfInstanceId("VNF_INSTANCE_ID_12345");
-	DataService.setModelInfo(COMPONENT.VNF, exampleVnfModelInfo);
-
-	DataService.setVolumeGroupInstanceId("VOLUME_GROUP_INSTANCE_ID_12345");
-	DataService
-		.setAvailableVolumeGroupList(exampleAvailableVolumeGroupList);
-	DataService.setModelInfo(COMPONENT.VOLUME_GROUP,
-		exampleVolumeGroupModelInfo);
-
-	$scope.$broadcast("createComponent", {
-	    componentId : COMPONENT.VF_MODULE,
-	    callbackFunction : callbackFunction
-	});
-    }
-
-    $scope.createVolumeGroup = function() {
-
-	DataService.setModelId("91238134091820938018230918230989");
-	DataService.setModelInstanceName("VOLUME_GROUP_MODEL_INSTANCE_NAME");
-	DataService.setLcpRegion("Region1");
-	DataService.setTenant("Tenant1");
-	// Data used to create MSO "relatedInstanceList" object
-
-	DataService.setModelInfo(COMPONENT.SERVICE, exampleServiceModelInfo);
-
-	DataService.setVnfInstanceId("VNF_INSTANCE_ID_12345");
-	DataService.setModelInfo(COMPONENT.VNF, exampleVnfModelInfo);
-
-	$scope.$broadcast("createComponent", {
-	    componentId : COMPONENT.VOLUME_GROUP,
-	    callbackFunction : callbackFunction
-	});
-    }
-
-    $scope.createNetwork = function() {
-
-	DataService.setModelId("91238134091820938018230918230989");
-	DataService.setModelInstanceName("NETWORK_MODEL_INSTANCE_NAME");
-
-	DataService.setCloudRegionTenantList(exampleCloudRegionTenantList)
-	DataService.setServiceIdList(exampleServiceIdList);
-
-	// Data used to create MSO "relatedInstanceList" object
-
-	DataService.setModelInfo(COMPONENT.SERVICE, exampleServiceModelInfo);
-
-	$scope.$broadcast("createComponent", {
-	    componentId : COMPONENT.NETWORK,
-	    callbackFunction : callbackFunction
-	});
-    }
-
-    /*
-     * Delete functions
-     */
-    $scope.deleteService = function() {
-
-	DataService.setInventoryItem(exampleServiceItem);
-
-	DataService.setModelInfo(COMPONENT.SERVICE, exampleServiceModelInfo);
-
-	$scope.$broadcast("deleteComponent", {
-	    componentId : COMPONENT.SERVICE,
-	    callbackFunction : callbackFunction
-	});
-    }
-
-    $scope.deleteVnf = function() {
-
-	DataService
-		.setInventoryItem(exampleAaiResult["inventory-response-items"]["inventory-response-item"][0]);
-
-	DataService.setVnfInstanceId("VNF_INSTANCE_ID_12345");
-	DataService.setModelInfo(COMPONENT.VNF, exampleVnfModelInfo);
-	DataService.setLcpRegion("Region3");
-	DataService.setTenant("Tenant3");
-
-	$scope.$broadcast("deleteComponent", {
-	    componentId : COMPONENT.VNF,
-	    callbackFunction : callbackFunction
-	});
-    }
-
-    $scope.deleteVfModule = function() {
-
-	DataService.setInventoryItem(exampleVfModuleItem);
-
-	DataService.setVnfInstanceId("VNF_INSTANCE_ID_12345");
-
-	DataService.setVfModuleInstanceId("VF_MODULE_INSTANCE_ID_12345");
-	DataService.setModelInfo(COMPONENT.VF_MODULE, exampleVfModuleModelInfo);
-	DataService.setLcpRegion("Region4");
-	DataService.setTenant("Tenant4");
-
-	$scope.$broadcast("deleteComponent", {
-	    componentId : COMPONENT.VF_MODULE,
-	    callbackFunction : callbackFunction
-	});
-    }
-
-    $scope.deleteVolumeGroup = function() {
-
-	DataService.setInventoryItem(exampleVolumeGroupItem);
-
-	DataService.setVolumeGroupInstanceId("VOLUME_GROUP_INSTANCE_ID_12345");
-	DataService.setModelInfo(COMPONENT.VOLUME_GROUP,
-		exampleVolumeGroupModelInfo);
-	DataService.setLcpRegion("Region3");
-	DataService.setTenant("Tenant3");
-
-
-	$scope.$broadcast("deleteComponent", {
-	    componentId : COMPONENT.VOLUME_GROUP,
-	    callbackFunction : callbackFunction
-	});
-    }
-
-    $scope.deleteNetwork = function() {
-
-	DataService.setInventoryItem(exampleNetworkItem);
-
-	DataService.setNetworkInstanceId("NETWORK_INSTANCE_ID_12345");
-	DataService.setModelInfo(COMPONENT.NETWORK, exampleNetworkModelInfo);
-	DataService.setLcpRegion("Region5");
-	DataService.setTenant("Tenant5");
-
-	$scope.$broadcast("deleteComponent", {
-	    componentId : COMPONENT.NETWORK,
-	    callbackFunction : callbackFunction
-	});
-    }
-
-    /*
-     * Show Details functions
-     */
-    $scope.showServiceDetails = function() {
-
-	DataService.setInventoryItem(exampleServiceItem);
-
-	$scope.$broadcast("showComponentDetails", {
-	    componentId : COMPONENT.SERVICE,
-	    callbackFunction : callbackFunction
-	});
-    }
-
-    $scope.showVnfDetails = function() {
-
-	DataService.setVnfInstanceId("VNF_INSTANCE_ID_12345");
-	DataService
-		.setInventoryItem(exampleAaiResult["inventory-response-items"]["inventory-response-item"][0]);
-
-	$scope.$broadcast("showComponentDetails", {
-	    componentId : COMPONENT.VNF,
-	    callbackFunction : callbackFunction
-	});
-    }
-
-    $scope.showVfModuleDetails = function() {
-
-	DataService.setVnfInstanceId("VNF_INSTANCE_ID_12345");
-	DataService.setVfModuleInstanceId("VF_MODULE_INSTANCE_ID_12345");
-	DataService.setInventoryItem(exampleVfModuleItem);
-
-	$scope.$broadcast("showComponentDetails", {
-	    componentId : COMPONENT.VF_MODULE,
-	    callbackFunction : callbackFunction
-	});
-    }
-
-    $scope.showVolumeGroupDetails = function() {
-
-	DataService.setVolumeGroupInstanceId("VOLUME_GROUP_INSTANCE_ID_12345");
-	DataService.setInventoryItem(exampleVolumeGroupItem);
-
-	$scope.$broadcast("showComponentDetails", {
-	    componentId : COMPONENT.VOLUME_GROUP,
-	    callbackFunction : callbackFunction
-	});
-    }
-
-    $scope.showNetworkDetails = function() {
-
-	DataService.setNetworkInstanceId("NETWORK_INSTANCE_ID_12345");
-	DataService.setInventoryItem(exampleNetworkItem);
-
-	$scope.$broadcast("showComponentDetails", {
-	    componentId : COMPONENT.NETWORK,
-	    callbackFunction : callbackFunction
-	});
-    }
-}
-
-app.controller("testViewEditController", [ "COMPONENT", "DataService",
-	"PropertyService", "UtilityService", "$scope", "$timeout",
-	"$cookieStore", "$log", testViewEditController ]);
\ No newline at end of file
diff --git a/vid/src/main/webapp/index.jsp b/vid/src/main/webapp/index.jsp
deleted file mode 100644
index c4dafe647..000000000
--- a/vid/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
-<%-- Redirected because we can't set the welcome page to a virtual URL. --%>
-<%-- Forward to the intended start page to reduce frustration for new users. --%> 
-
diff --git a/vid/src/main/webapp/manifest.jsp b/vid/src/main/webapp/manifest.jsp
deleted file mode 100644
index 417825fa2..000000000
--- a/vid/src/main/webapp/manifest.jsp
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<%
-	// Read contents of maven-generated manifest file.
-	final String path = "/META-INF/MANIFEST.MF";
-	java.io.InputStream input = getServletContext().getResourceAsStream(path);
-	java.io.InputStreamReader reader = new java.io.InputStreamReader(input, "UTF-8");
-	char [] buf = new char[1024];
-	int length = reader.read(buf, 0, buf.length);
-	final String manifest = new String(buf, 0, length);
-	reader.close();
-	input.close();
-%>
-
-
-
-
-Manifest
-
-
-
      
-Contents of file <%= path %>:
-
      
-
      -<%= manifest %>
-
      
-
-
diff --git a/vid/src/main/webapp/static/fusion/css/att_angular_gridster/sandbox-gridster.css b/vid/src/main/webapp/static/fusion/css/att_angular_gridster/sandbox-gridster.css
deleted file mode 100644
index a9edba8ff..000000000
--- a/vid/src/main/webapp/static/fusion/css/att_angular_gridster/sandbox-gridster.css
+++ /dev/null
@@ -1,173 +0,0 @@
-.gridster {
-    position: relative;
-    margin: auto;
-    /* height: 0
- */}
-
-.gridster>ul {
-    margin: 0;
-    list-style: none;
-    padding: 0
-}
-
-.gridster-item {
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    list-style: none;
-    z-index: 2;
-    position: absolute;
-    display: none
-}
-
-.gridster-loaded {
-    -webkit-transition: height .3s;
-    -moz-transition: height .3s;
-    -o-transition: height .3s;
-    transition: height .3s
-}
-
-.gridster-loaded .gridster-item {
-    display: block;
-    position: absolute;
-    -webkit-transition: opacity .3s, left .3s, top .3s, width .3s, height .3s;
-    -moz-transition: opacity .3s, left .3s, top .3s, width .3s, height .3s;
-    -o-transition: opacity .3s, left .3s, top .3s, width .3s, height .3s;
-    transition: opacity .3s, left .3s, top .3s, width .3s, height .3s;
-    -webkit-transition-delay: 50ms;
-    -moz-transition-delay: 50ms;
-    -o-transition-delay: 50ms;
-    transition-delay: 50ms
-}
-
-.gridster-loaded .gridster-preview-holder {
-    display: none;
-    z-index: 1;
-    position: absolute;
-    background-color: #067ab4;
-    /*
-    background-color: rgb(6, 122, 180);
-    -ms-filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#067ab4', endColorstr='#067ab4');  IE 
-    opacity: 0.2;
-    */
-    border-color: #fff;
-    -webkit-transition: width .2s, height .3s;
-    -moz-transition: width .2s, height .3s;
-    -o-transition: width .2s, height .3s;
-    transition: width .2s, height .3s;
-    -webkit-transition-delay: 50ms;
-    -moz-transition-delay: 50ms;
-    -o-transition-delay: 50ms;
-    transition-delay: 50ms
-}
-
-.gridster-loaded .gridster-item.gridster-item-moving {
-    -webkit-transition: none;
-    -moz-transition: none;
-    -o-transition: none;
-    transition: none;
-    opacity: 0.9;
-}
-
-.gridster-mobile {
-    height: auto !important
-}
-
-.gridster-mobile .gridster-item {
-    height: auto;
-    position: static;
-    float: none
-}
-
-.gridster-item.ng-leave.ng-leave-active {
-    opacity: 0
-}
-
-.gridster-item.ng-enter {
-    opacity: 1
-}
-
-.gridster-item-moving {
-    z-index: 3
-}
-
-.gridster-item-resizable-handler {
-    position: absolute;
-    font-size: 1px;
-    display: block
-}
-
-.handle-se {
-    cursor: se-resize;
-    width: 0;
-    height: 0;
-    right: 1px;
-    bottom: 1px;
-    border-style: solid;
-    border-width: 0 0 12px 12px;
-    border-color: transparent
-}
-
-.handle-ne {
-    cursor: ne-resize;
-    width: 12px;
-    height: 12px;
-    right: 1px;
-    top: 1px
-}
-
-.handle-nw {
-    cursor: nw-resize;
-    width: 12px;
-    height: 12px;
-    left: 1px;
-    top: 1px
-}
-
-.handle-sw {
-    cursor: sw-resize;
-    width: 12px;
-    height: 12px;
-    left: 1px;
-    bottom: 1px
-}
-
-.handle-e {
-    cursor: e-resize;
-    width: 12px;
-    bottom: 0;
-    right: 1px;
-    top: 0
-}
-
-.handle-s {
-    cursor: s-resize;
-    height: 12px;
-    right: 0;
-    bottom: 1px;
-    left: 0
-}
-
-.handle-n {
-    cursor: n-resize;
-    height: 12px;
-    right: 0;
-    top: 1px;
-    left: 0
-}
-
-.handle-w {
-    cursor: w-resize;
-    width: 12px;
-    left: 1px;
-    top: 0;
-    bottom: 0
-}
-
-.gridster .gridster-item:hover .gridster-box {
-    border: 1.5px solid #B3B2B3
-}
-
-.gridster .gridster-item:hover .handle-se {
-    border-color: transparent transparent #ccc
-}
diff --git a/vid/src/main/webapp/static/fusion/css/att_angular_gridster/ui-gridster.css b/vid/src/main/webapp/static/fusion/css/att_angular_gridster/ui-gridster.css
deleted file mode 100644
index 827e354ec..000000000
--- a/vid/src/main/webapp/static/fusion/css/att_angular_gridster/ui-gridster.css
+++ /dev/null
@@ -1,116 +0,0 @@
-/* ui-gridster.css */
-.gridster-container {
-  background-color: #EFEFEF;
-  color: #fff;
-  border: 1px dashed;
-  overflow-y: auto;
-  overflow-x: hidden; }
-
-/* app css for attGridtser */
-.gridster-item-container {
-  background-color: #FFFFFF;
-  position: relative;
-  margin-left: auto;
-  margin-right: auto;
-  min-height: 79px;
-  height: 100%; }
-  .gridster-item-container .gridster-item-header {
-    /* gridster-item Header */
-    position: relative;
-    height: 50px !important;
-    border: 1px solid #d3d3d3;
-    border-bottom: 0;
-    background-color: #E5E5E5;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    z-index: 1;
-    -webkit-border-radius: 2px 2px 0 0;
-    -moz-border-radius: 2px 2px 0 0;
-    -ms-border-radius: 2px 2px 0 0;
-    -o-border-radius: 2px 2px 0 0;
-    border-radius: 2px 2px 0 0;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    overflow: hidden;
-    /* IE6-8 */ }
-    .gridster-item-container .gridster-item-header .gridster-item-handle {
-      cursor: move;
-      margin: 12px;
-      position: absolute;
-      top: 0;
-      left: 0;
-      border: 0;
-      vertical-align: middle;
-      -ms-interpolation-mode: bicubic;
-      display: block; }
-    .gridster-item-container .gridster-item-header .gridster-item-header-content {
-      line-height: 44px;
-      margin-left: 26px;
-      font-family: clearviewatt;
-      font-size: 18px;
-      color: #444444;
-      float: left; }
-    .gridster-item-container .gridster-item-header .gridster-item-sub-header-content {
-      position: absolute;
-      top: 29.5px;
-      left: 26px;
-      font-family: clearviewatt;
-      font-size: 12px;
-      color: #444444; }
-    .gridster-item-container .gridster-item-header .gridster-item-header-buttons-container {
-      position: absolute;
-      right: 10px;
-      top: 10px;
-      overflow: hidden;
-      text-align: right;
-      height: 30px;
-      color: #444444; }
-  .gridster-item-container .gridster-item-body {
-    /* gridster-item Body */
-    position: absolute;
-    width: 100%;
-    top: 50px;
-    left: 0;
-    right: 0;
-    bottom: 29px;
-    border: 1px solid #d3d3d3;
-    box-sizing: border-box;
-    overflow: auto;
-    color: #444444;
-    /* text-align: center; */ }
-  .gridster-item-container .gridster-item-footer {
-    /* gridster-item Footer */
-    position: absolute;
-    bottom: 0;
-    width: 100%;
-    height: 29px !important;
-    text-align: left;
-    cursor: pointer;
-    border: 1px solid #d3d3d3;
-    border-top: 0;
-    background-color: #F2F2F2;
-    -webkit-border-radius: 0 0 2px 2px;
-    -moz-border-radius: 0 0 2px 2px;
-    -ms-border-radius: 0 0 2px 2px;
-    -o-border-radius: 0 0 2px 2px;
-    border-radius: 0 0 2px 2px;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    text-decoration: none;
-    /* IE6-8 */ }
-    .gridster-item-container .gridster-item-footer:hover {
-      background-color: #E5E5E5;
-      color: #565656;
-      text-decoration: underline; }
-    .gridster-item-container .gridster-item-footer .gridster-item-footer-content {
-      line-height: 30px;
-      font-family: clearviewatt;
-      font-size: 12px;
-      color: #565656;
-      margin: 20px;
-      text-decoration: none; }
-      .gridster-item-container .gridster-item-footer .gridster-item-footer-content:hover {
-        color: #199ddf;
-        text-decoration: underline; }
diff --git a/vid/src/main/webapp/static/fusion/css/bootstrap.min.css b/vid/src/main/webapp/static/fusion/css/bootstrap.min.css
deleted file mode 100644
index 4cf729e43..000000000
--- a/vid/src/main/webapp/static/fusion/css/bootstrap.min.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/*!
- * Bootstrap v3.3.6 (http://getbootstrap.com)
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff2) format('woff2'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\002a"}.glyphicon-plus:before{content:"\002b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:focus,a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:focus,a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:focus,a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:focus,a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:focus,a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:focus,a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:focus,a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:focus,a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:focus,a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:focus,a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control::-ms-expand{background-color:transparent;border:0}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date].form-control,input[type=time].form-control,input[type=datetime-local].form-control,input[type=month].form-control{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=time],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=time],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px\9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.form-control-static{min-height:34px;padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.form-group-sm select.form-control{height:30px;line-height:30px}.form-group-sm select[multiple].form-control,.form-group-sm textarea.form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:6px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.form-group-lg select.form-control{height:46px;line-height:46px}.form-group-lg select[multiple].form-control,.form-group-lg textarea.form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:11px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.form-group-lg .form-control+.form-control-feedback,.input-group-lg+.form-control-feedback,.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.form-group-sm .form-control+.form-control-feedback,.input-group-sm+.form-control-feedback,.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:11px;font-size:18px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.focus,.btn-default:focus{color:#333;background-color:#e6e6e6;border-color:#8c8c8c}.btn-default:hover{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open>.dropdown-toggle.btn-default.focus,.open>.dropdown-toggle.btn-default:focus,.open>.dropdown-toggle.btn-default:hover{color:#333;background-color:#d4d4d4;border-color:#8c8c8c}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled.focus,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled].focus,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#286090;border-color:#122b40}.btn-primary:hover{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open>.dropdown-toggle.btn-primary.focus,.open>.dropdown-toggle.btn-primary:focus,.open>.dropdown-toggle.btn-primary:hover{color:#fff;background-color:#204d74;border-color:#122b40}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled.focus,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled].focus,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#449d44;border-color:#255625}.btn-success:hover{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active.focus,.btn-success.active:focus,.btn-success.active:hover,.btn-success:active.focus,.btn-success:active:focus,.btn-success:active:hover,.open>.dropdown-toggle.btn-success.focus,.open>.dropdown-toggle.btn-success:focus,.open>.dropdown-toggle.btn-success:hover{color:#fff;background-color:#398439;border-color:#255625}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled.focus,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled].focus,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.focus,.btn-info:focus{color:#fff;background-color:#31b0d5;border-color:#1b6d85}.btn-info:hover{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active.focus,.btn-info.active:focus,.btn-info.active:hover,.btn-info:active.focus,.btn-info:active:focus,.btn-info:active:hover,.open>.dropdown-toggle.btn-info.focus,.open>.dropdown-toggle.btn-info:focus,.open>.dropdown-toggle.btn-info:hover{color:#fff;background-color:#269abc;border-color:#1b6d85}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled.focus,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled].focus,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.focus,.btn-warning:focus{color:#fff;background-color:#ec971f;border-color:#985f0d}.btn-warning:hover{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active.focus,.btn-warning.active:focus,.btn-warning.active:hover,.btn-warning:active.focus,.btn-warning:active:focus,.btn-warning:active:hover,.open>.dropdown-toggle.btn-warning.focus,.open>.dropdown-toggle.btn-warning:focus,.open>.dropdown-toggle.btn-warning:hover{color:#fff;background-color:#d58512;border-color:#985f0d}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled.focus,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled].focus,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c9302c;border-color:#761c19}.btn-danger:hover{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open>.dropdown-toggle.btn-danger.focus,.open>.dropdown-toggle.btn-danger:focus,.open>.dropdown-toggle.btn-danger:hover{color:#fff;background-color:#ac2925;border-color:#761c19}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled.focus,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled].focus,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px dashed;border-bottom:4px solid\9}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group .form-control:focus{z-index:3}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:2;color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:3;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.3333333}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding-top:30px;padding-bottom:30px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{padding-right:15px;padding-left:15px;border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-object.img-thumbnail{max-width:none}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item,button.list-group-item{color:#555}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover,button.list-group-item:focus,button.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}button.list-group-item{width:100%;text-align:left}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover,button.list-group-item-success:focus,button.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover,button.list-group-item-success.active,button.list-group-item-success.active:focus,button.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover,button.list-group-item-info:focus,button.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover,button.list-group-item-info.active,button.list-group-item-info.active:focus,button.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover,button.list-group-item-warning:focus,button.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover,button.list-group-item-warning.active,button.list-group-item-warning.active:focus,button.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover,button.list-group-item-danger:focus,button.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover,button.list-group-item-danger.active,button.list-group-item-danger.active:focus,button.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-left-radius:0;border-top-right-radius:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-right:15px;padding-left:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;filter:alpha(opacity=0);opacity:0;line-break:auto}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);line-break:auto}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);background-color:rgba(0,0,0,0);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block;margin-top:-10px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000\9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-10px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-10px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.modal-header:after,.modal-header:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.modal-header:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs{display:none!important}.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table!important}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table!important}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table!important}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table!important}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table!important}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}}
-/*# sourceMappingURL=bootstrap.min.css.map */
\ No newline at end of file
diff --git a/vid/src/main/webapp/static/fusion/css/fusion-sunny.css b/vid/src/main/webapp/static/fusion/css/fusion-sunny.css
deleted file mode 100644
index c83061567..000000000
--- a/vid/src/main/webapp/static/fusion/css/fusion-sunny.css
+++ /dev/null
@@ -1,362 +0,0 @@
-  input, textarea, select, div {
-    font-family: Arial;
-    font-size: 11px;
-    font-weight: normal;
-  }
-  
-  form {
-    margin-top: 5px;  
-  }
-  
-
-  .applicationWindow { border-width:  0px 0px 1px 0px;
-                       border-style:  solid;
-                       border-color:  #959595;
-                       box-shadow:    inset 0 0 10px #000000;
-                       margin-top:    10px;
-                       margin-bottom: 10px;
-                       margin-left:   10px;
-                       margin-right:  10px;
-  }  
-
-  .feedbackMessage  { width: 99%;
-  					  font-family: Arial;
-    				  font-size: 11px;
-					  color: #1f1f1f;
-                      padding: 3px;
-                      border: 1px #eeb420 solid;
-                      margin: 3px;
-                      background: #fff9e5;
-                    }                      
-
-  .menubar {
-    border-width: 0px 0px 0px 1px; border-style: solid; border-color: #959595;
-  }
-
-  .footer {
-    /*clear: both;*/
-    border-width: 0px 1px 0px 1px; border-style: solid; border-color: #959595;
-  	font-family: Verdana,Arial,Helvetica, sans-serif;
-    font-size: 9px;    
-    padding:   10px 10px 30px 10px;
-    background: white;
-  }
-
-  .pageTitle {
-    font-family: Arial;
-    font-size: 18px;
-    font-weight: bold;
-    margin-top: 5px;    
-  }
-
-  .content {
-	border-width:  0px 1px 0px 1px;
-    border-style:  solid;
-    border-color:  #959595;
-  	font-family: Arial;
-    font-size: 11px;
-    padding: 5px;
-    background:   white;
-    /*height: 600px;*/
-  }
-
-  .popupContent {
-    font-family: Arial;
-    font-size: 11px;
-    padding: 3px;
-  }
-
-  .logo {
-	border-width:  0px 1px 0px 1px;
-    border-style:  solid;
-    border-color:  #959595;
-  	text-align: right;
-  }
-
-  .sep {
-    border: 1px solid black
-  }
-
-  .attLogo		{  /*position: relative;*/
-                   float:left;
-                   padding-top: 25px;
-                   padding-left: 25px;   
-                }
-
-  .applicationLogo		{ float:right; 
-                          padding-top: 25px;
-                          padding-right: 25px;                          
-                        }
-
-  .applinkWhite		{ font-family: Arial;
-                          font-size: 13px;
-                          font-weight: 900;
-                          color: #FFFFFF;
-                          text-decoration: none; }
-
-  .terms                { font-family: Verdana, Arial, Helvetica, sans-serif;
-                          font-size: 9px;
-                        }
-
-  .broadcastMessage     { color: red; }
-  .broadcastMessageList { color: red; }
-
-  .button               {  
-					      margin: 5px 1px 5px 1px;
-                          padding: 3px; }
-
-  .toolbarbutton:hover {
-    color:#005491;
-  }
-
-  .headerText		{ font-family: Arial;
-                      font-size: 15px;
-			          font-weight: 700;
-                      color: #000000; }
-
-  .headerBackground	{ background: #336699; }
-
-  .errorMessageText { font-family: Arial;
-                      font-size: 11px;
-                      font-weight: bold; 
-                      color: red;   }
-   
-
-  .normalText		{ font-family: Arial;
-                      font-size: 11px;
-                      color: #000000; }
-
-  .normalTextRed	{ font-family: Arial;
-                      font-size: 11px;
-                      color: red; }
-
-
-  .smallNormalText	{ font-family: Arial;
-                      font-size: 9px;
-                      color: #000000; }
-
-  .tableBorder          { border:1px outset teal }
-
-  .validationError      { background: #b9eaff; }
-
-  .templatebody         {  
-  						  background: url(../images/body_graphic.jpg) repeat-x;
-                          /*margin: 40px 80px 40px 80px;*/  						   
-  						}
-
-  /*--------------------- General Content ------------------------------------*/	  
-
-  .relative {
-    position:relative;
-  }
-  
-  .clear{
-    clear:both;
-  } 
-
-  .left {
-    float:      left;
-  } 
-
-  .leftCentered{
-    float:      left;
-    text-align: center;
-  } 
-
-  .right {
-    float:      right;
-  } 
-
-  .rightAligned{
-    text-align: right;
-  } 
-
-  .centered {
-    text-align: center;
-    align:      center;
-  } 
-
-
-  .noWrap{
-  	white-space:nowrap;
-  }
-
-  .disabled {
-	color:gray;
-	cursor:hand;
-  }
-
-  /*--------------------- Tab styles -------------------------------------*/
-  
-  .current {
-	font-weight: bold;
-  	border-width: 1px 1px 1px 1px; 
-  	border-color: silver;
-  	border-style: solid;
-  }
- 
-  .subTab {
-	font-weight:bold;
-	font-family: Arial;
-	font-size:   11px;
-	color:     #0F3B82;
-  }
-  
-
-  /*--------------------- Grid styles ------------------------------------*/	  
-
-  /* Grid navigation and header styles */
-	.gridFilterLabel {font-size:   7pt;
-	                  font-align:  justify;
-	                  font-weight: bold;
-	                  display:     block;}
-
-    .gridFilterText  {height:     17px;
-	                  font-size:  8pt;
-	                  width:      60%;
-	                  font-align: justify;}
-
-    .gridNavigationBar { font-family:Arial,Verdana;
-		                  font-size:11px;
-		                  font-weight:normal;
-		                  color:#000;
-                          margin: 0px;
-                          width: 100%;
-                          vertical-align: middle;
-    }
-    
-    .gridNavigationBar .navLinks { float: left;
-                                   margin-right:15px;
-                                   padding-top: 2px;
-                                   height:      19px;
-                                   line-height: 19px;                                   
-                                 }
-
-    .gridNavigationBar .pageControls  { float:        left;
-                                        margin-right: 15px;
-                                        height:       19px;  
-                                        line-height:  19px;                                        
-                                      }
-
-    .gridNavigationBar .pageControls input { font-size:      8pt;
-									         height:         17px;
-									         vertical-align: middle;                                    
-                                           }
-
-    .gridNavigationBar .pageInfo {  float:          right; 
-                                    vertical-align: middle;
-                                    height:         19px;
-                                    line-height:    19px;
-                                 }
-
-    .gridNavigationBar .pageInfo input { font-size:      8pt;
-								         height:         17px;
-								         vertical-align: middle;                                    
-                                       }
-
-
-    .gridNavigationBar span { padding: 3px; }
-
-    .gridNavigationBar a {
-	  text-decoration:underline;
-	  color:#000;
-	  font-weight:normal;
-	}
-
-    .gridNavigationBar img { vertical-align: middle; }
-  
-    .gridBulkUpdateRow {
-      height: 35px; 
-      line-height: 35px;
-    } 
-
-    .gridBulkUpdateRow input {
-      vertical-align: middle;
-    } 
-
-
-    /* dummy class used to lock the form elements of a grid - ex. bulk transaction processing */
-    .alwaysEnabled {}
-
-    .hidden {
-	  display: none;
-    }
-  
-    .selectedPage {
-		background-color:#C4DFFB;
-		color:          white;
-        border-style:   solid;
-        border-width:   1px;
-        border-color:  gray;
-        padding-left:   3px;
-        padding-right:  3px;
-		vertical-align: middle;
-	}
-
-    .selectedRow{
-	  /*background-color:#C4DFFB;*/
-	}
-	
-	/* Action Item styles */
-	.actionList {
-	  margin-left:  -20px;
-	  margin-right: -10px;
-	  padding-left:   5px;
-	}
-
-    .actionList li {
-	  float:left;
-	  padding-left:  3px;
-	  padding-right: 3px;
-	}
-	
-	.actionList li a {
-	  text-decoration:none;
-	  color:#000;
-	}
-
-	/* Filter Operator List styles */
-	
-	.filterList {
-	  margin: 0px;
-	}
-
-    .filterList li {
-      list-style-type: none;
-      padding:3px 3px 3px 2px;
-	  cursor:hand;
-	  font-size:11px;
-	}
-
-    .filterList li:hover {
-      background: #404040;      
-    }
-
-    .filterList li a {
-      color: #000;
-	  text-decoration: none;
-    }
-
-    .filterList li:hover a {
-	  color: white;
-    }
-
-    .filterList li a:hover {
-	  text-decoration: none;
-	  color: white;
-    }
-
-	.filterListItem a {
-	  text-decoration:none;
-	  padding:3px 2px 3px 2px;
-	}
-
-
-  /*---------------------- Customized ZK Styles ------------------------------*/
-  
-  .z-datebox input, .z-timebox input {
-    font-family: Arial;
-    font-size: 11px;
-    height: 15px;
-    margin-top:1px;  	
-  }
diff --git a/vid/src/main/webapp/static/fusion/css/jquery-ui.css b/vid/src/main/webapp/static/fusion/css/jquery-ui.css
deleted file mode 100644
index 1c22746c8..000000000
--- a/vid/src/main/webapp/static/fusion/css/jquery-ui.css
+++ /dev/null
@@ -1,1225 +0,0 @@
-/*! jQuery UI - v1.11.4 - 2015-03-11
-* http://jqueryui.com
-* Includes: core.css, accordion.css, autocomplete.css, button.css, datepicker.css, dialog.css, draggable.css, menu.css, progressbar.css, resizable.css, selectable.css, selectmenu.css, slider.css, sortable.css, spinner.css, tabs.css, tooltip.css, theme.css
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
-* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */
-
-/* Layout helpers
-----------------------------------*/
-.ui-helper-hidden {
-	display: none;
-}
-.ui-helper-hidden-accessible {
-	border: 0;
-	clip: rect(0 0 0 0);
-	height: 1px;
-	margin: -1px;
-	overflow: hidden;
-	padding: 0;
-	position: absolute;
-	width: 1px;
-}
-.ui-helper-reset {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	outline: 0;
-	line-height: 1.3;
-	text-decoration: none;
-	font-size: 100%;
-	list-style: none;
-}
-.ui-helper-clearfix:before,
-.ui-helper-clearfix:after {
-	content: "";
-	display: table;
-	border-collapse: collapse;
-}
-.ui-helper-clearfix:after {
-	clear: both;
-}
-.ui-helper-clearfix {
-	min-height: 0; /* support: IE7 */
-}
-.ui-helper-zfix {
-	width: 100%;
-	height: 100%;
-	top: 0;
-	left: 0;
-	position: absolute;
-	opacity: 0;
-	filter:Alpha(Opacity=0); /* support: IE8 */
-}
-
-.ui-front {
-	z-index: 100;
-}
-
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled {
-	cursor: default !important;
-}
-
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon {
-	display: block;
-	text-indent: -99999px;
-	overflow: hidden;
-	background-repeat: no-repeat;
-}
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-}
-.ui-accordion .ui-accordion-header {
-	display: block;
-	cursor: pointer;
-	position: relative;
-	margin: 2px 0 0 0;
-	padding: .5em .5em .5em .7em;
-	min-height: 0; /* support: IE7 */
-	font-size: 100%;
-}
-.ui-accordion .ui-accordion-icons {
-	padding-left: 2.2em;
-}
-.ui-accordion .ui-accordion-icons .ui-accordion-icons {
-	padding-left: 2.2em;
-}
-.ui-accordion .ui-accordion-header .ui-accordion-header-icon {
-	position: absolute;
-	left: .5em;
-	top: 50%;
-	margin-top: -8px;
-}
-.ui-accordion .ui-accordion-content {
-	padding: 1em 2.2em;
-	border-top: 0;
-	overflow: auto;
-}
-.ui-autocomplete {
-	position: absolute;
-	top: 0;
-	left: 0;
-	cursor: default;
-}
-.ui-button {
-	display: inline-block;
-	position: relative;
-	padding: 0;
-	line-height: normal;
-	margin-right: .1em;
-	cursor: pointer;
-	vertical-align: middle;
-	text-align: center;
-	overflow: visible; /* removes extra width in IE */
-}
-.ui-button,
-.ui-button:link,
-.ui-button:visited,
-.ui-button:hover,
-.ui-button:active {
-	text-decoration: none;
-}
-/* to make room for the icon, a width needs to be set here */
-.ui-button-icon-only {
-	width: 2.2em;
-}
-/* button elements seem to need a little more width */
-button.ui-button-icon-only {
-	width: 2.4em;
-}
-.ui-button-icons-only {
-	width: 3.4em;
-}
-button.ui-button-icons-only {
-	width: 3.7em;
-}
-
-/* button text element */
-.ui-button .ui-button-text {
-	display: block;
-	line-height: normal;
-}
-.ui-button-text-only .ui-button-text {
-	padding: .4em 1em;
-}
-.ui-button-icon-only .ui-button-text,
-.ui-button-icons-only .ui-button-text {
-	padding: .4em;
-	text-indent: -9999999px;
-}
-.ui-button-text-icon-primary .ui-button-text,
-.ui-button-text-icons .ui-button-text {
-	padding: .4em 1em .4em 2.1em;
-}
-.ui-button-text-icon-secondary .ui-button-text,
-.ui-button-text-icons .ui-button-text {
-	padding: .4em 2.1em .4em 1em;
-}
-.ui-button-text-icons .ui-button-text {
-	padding-left: 2.1em;
-	padding-right: 2.1em;
-}
-/* no icon support for input elements, provide padding by default */
-input.ui-button {
-	padding: .4em 1em;
-}
-
-/* button icon element(s) */
-.ui-button-icon-only .ui-icon,
-.ui-button-text-icon-primary .ui-icon,
-.ui-button-text-icon-secondary .ui-icon,
-.ui-button-text-icons .ui-icon,
-.ui-button-icons-only .ui-icon {
-	position: absolute;
-	top: 50%;
-	margin-top: -8px;
-}
-.ui-button-icon-only .ui-icon {
-	left: 50%;
-	margin-left: -8px;
-}
-.ui-button-text-icon-primary .ui-button-icon-primary,
-.ui-button-text-icons .ui-button-icon-primary,
-.ui-button-icons-only .ui-button-icon-primary {
-	left: .5em;
-}
-.ui-button-text-icon-secondary .ui-button-icon-secondary,
-.ui-button-text-icons .ui-button-icon-secondary,
-.ui-button-icons-only .ui-button-icon-secondary {
-	right: .5em;
-}
-
-/* button sets */
-.ui-buttonset {
-	margin-right: 7px;
-}
-.ui-buttonset .ui-button {
-	margin-left: 0;
-	margin-right: -.3em;
-}
-
-/* workarounds */
-/* reset extra padding in Firefox, see h5bp.com/l */
-input.ui-button::-moz-focus-inner,
-button.ui-button::-moz-focus-inner {
-	border: 0;
-	padding: 0;
-}
-.ui-datepicker {
-	width: 17em;
-	padding: .2em .2em 0;
-	display: none;
-}
-.ui-datepicker .ui-datepicker-header {
-	position: relative;
-	padding: .2em 0;
-}
-.ui-datepicker .ui-datepicker-prev,
-.ui-datepicker .ui-datepicker-next {
-	position: absolute;
-	top: 2px;
-	width: 1.8em;
-	height: 1.8em;
-}
-.ui-datepicker .ui-datepicker-prev-hover,
-.ui-datepicker .ui-datepicker-next-hover {
-	top: 1px;
-}
-.ui-datepicker .ui-datepicker-prev {
-	left: 2px;
-}
-.ui-datepicker .ui-datepicker-next {
-	right: 2px;
-}
-.ui-datepicker .ui-datepicker-prev-hover {
-	left: 1px;
-}
-.ui-datepicker .ui-datepicker-next-hover {
-	right: 1px;
-}
-.ui-datepicker .ui-datepicker-prev span,
-.ui-datepicker .ui-datepicker-next span {
-	display: block;
-	position: absolute;
-	left: 50%;
-	margin-left: -8px;
-	top: 50%;
-	margin-top: -8px;
-}
-.ui-datepicker .ui-datepicker-title {
-	margin: 0 2.3em;
-	line-height: 1.8em;
-	text-align: center;
-}
-.ui-datepicker .ui-datepicker-title select {
-	font-size: 1em;
-	margin: 1px 0;
-}
-.ui-datepicker select.ui-datepicker-month,
-.ui-datepicker select.ui-datepicker-year {
-	width: 45%;
-}
-.ui-datepicker table {
-	width: 100%;
-	font-size: .9em;
-	border-collapse: collapse;
-	margin: 0 0 .4em;
-}
-.ui-datepicker th {
-	padding: .7em .3em;
-	text-align: center;
-	font-weight: bold;
-	border: 0;
-}
-.ui-datepicker td {
-	border: 0;
-	padding: 1px;
-}
-.ui-datepicker td span,
-.ui-datepicker td a {
-	display: block;
-	padding: .2em;
-	text-align: right;
-	text-decoration: none;
-}
-.ui-datepicker .ui-datepicker-buttonpane {
-	background-image: none;
-	margin: .7em 0 0 0;
-	padding: 0 .2em;
-	border-left: 0;
-	border-right: 0;
-	border-bottom: 0;
-}
-.ui-datepicker .ui-datepicker-buttonpane button {
-	float: right;
-	margin: .5em .2em .4em;
-	cursor: pointer;
-	padding: .2em .6em .3em .6em;
-	width: auto;
-	overflow: visible;
-}
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current {
-	float: left;
-}
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi {
-	width: auto;
-}
-.ui-datepicker-multi .ui-datepicker-group {
-	float: left;
-}
-.ui-datepicker-multi .ui-datepicker-group table {
-	width: 95%;
-	margin: 0 auto .4em;
-}
-.ui-datepicker-multi-2 .ui-datepicker-group {
-	width: 50%;
-}
-.ui-datepicker-multi-3 .ui-datepicker-group {
-	width: 33.3%;
-}
-.ui-datepicker-multi-4 .ui-datepicker-group {
-	width: 25%;
-}
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header {
-	border-left-width: 0;
-}
-.ui-datepicker-multi .ui-datepicker-buttonpane {
-	clear: left;
-}
-.ui-datepicker-row-break {
-	clear: both;
-	width: 100%;
-	font-size: 0;
-}
-
-/* RTL support */
-.ui-datepicker-rtl {
-	direction: rtl;
-}
-.ui-datepicker-rtl .ui-datepicker-prev {
-	right: 2px;
-	left: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-next {
-	left: 2px;
-	right: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-prev:hover {
-	right: 1px;
-	left: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-next:hover {
-	left: 1px;
-	right: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-buttonpane {
-	clear: right;
-}
-.ui-datepicker-rtl .ui-datepicker-buttonpane button {
-	float: left;
-}
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,
-.ui-datepicker-rtl .ui-datepicker-group {
-	float: right;
-}
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header {
-	border-right-width: 0;
-	border-left-width: 1px;
-}
-.ui-dialog {
-	overflow: hidden;
-	position: absolute;
-	top: 0;
-	left: 0;
-	padding: .2em;
-	outline: 0;
-}
-.ui-dialog .ui-dialog-titlebar {
-	padding: .4em 1em;
-	position: relative;
-}
-.ui-dialog .ui-dialog-title {
-	float: left;
-	margin: .1em 0;
-	white-space: nowrap;
-	width: 90%;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-.ui-dialog .ui-dialog-titlebar-close {
-	position: absolute;
-	right: .3em;
-	top: 50%;
-	width: 20px;
-	margin: -10px 0 0 0;
-	padding: 1px;
-	height: 20px;
-}
-.ui-dialog .ui-dialog-content {
-	position: relative;
-	border: 0;
-	padding: .5em 1em;
-	background: none;
-	overflow: auto;
-}
-.ui-dialog .ui-dialog-buttonpane {
-	text-align: left;
-	border-width: 1px 0 0 0;
-	background-image: none;
-	margin-top: .5em;
-	padding: .3em 1em .5em .4em;
-}
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
-	float: right;
-}
-.ui-dialog .ui-dialog-buttonpane button {
-	margin: .5em .4em .5em 0;
-	cursor: pointer;
-}
-.ui-dialog .ui-resizable-se {
-	width: 12px;
-	height: 12px;
-	right: -5px;
-	bottom: -5px;
-	background-position: 16px 16px;
-}
-.ui-draggable .ui-dialog-titlebar {
-	cursor: move;
-}
-.ui-draggable-handle {
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-menu {
-	list-style: none;
-	padding: 0;
-	margin: 0;
-	display: block;
-	outline: none;
-}
-.ui-menu .ui-menu {
-	position: absolute;
-}
-.ui-menu .ui-menu-item {
-	position: relative;
-	margin: 0;
-	padding: 3px 1em 3px .4em;
-	cursor: pointer;
-	min-height: 0; /* support: IE7 */
-	/* support: IE10, see #8844 */
-	list-style-image: url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7");
-}
-.ui-menu .ui-menu-divider {
-	margin: 5px 0;
-	height: 0;
-	font-size: 0;
-	line-height: 0;
-	border-width: 1px 0 0 0;
-}
-.ui-menu .ui-state-focus,
-.ui-menu .ui-state-active {
-	margin: -1px;
-}
-
-/* icon support */
-.ui-menu-icons {
-	position: relative;
-}
-.ui-menu-icons .ui-menu-item {
-	padding-left: 2em;
-}
-
-/* left-aligned */
-.ui-menu .ui-icon {
-	position: absolute;
-	top: 0;
-	bottom: 0;
-	left: .2em;
-	margin: auto 0;
-}
-
-/* right-aligned */
-.ui-menu .ui-menu-icon {
-	left: auto;
-	right: 0;
-}
-.ui-progressbar {
-	height: 2em;
-	text-align: left;
-	overflow: hidden;
-}
-.ui-progressbar .ui-progressbar-value {
-	margin: -1px;
-	height: 100%;
-}
-.ui-progressbar .ui-progressbar-overlay {
-	background: url("data:image/gif;base64,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");
-	height: 100%;
-	filter: alpha(opacity=25); /* support: IE8 */
-	opacity: 0.25;
-}
-.ui-progressbar-indeterminate .ui-progressbar-value {
-	background-image: none;
-}
-.ui-resizable {
-	position: relative;
-}
-.ui-resizable-handle {
-	position: absolute;
-	font-size: 0.1px;
-	display: block;
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-resizable-disabled .ui-resizable-handle,
-.ui-resizable-autohide .ui-resizable-handle {
-	display: none;
-}
-.ui-resizable-n {
-	cursor: n-resize;
-	height: 7px;
-	width: 100%;
-	top: -5px;
-	left: 0;
-}
-.ui-resizable-s {
-	cursor: s-resize;
-	height: 7px;
-	width: 100%;
-	bottom: -5px;
-	left: 0;
-}
-.ui-resizable-e {
-	cursor: e-resize;
-	width: 7px;
-	right: -5px;
-	top: 0;
-	height: 100%;
-}
-.ui-resizable-w {
-	cursor: w-resize;
-	width: 7px;
-	left: -5px;
-	top: 0;
-	height: 100%;
-}
-.ui-resizable-se {
-	cursor: se-resize;
-	width: 12px;
-	height: 12px;
-	right: 1px;
-	bottom: 1px;
-}
-.ui-resizable-sw {
-	cursor: sw-resize;
-	width: 9px;
-	height: 9px;
-	left: -5px;
-	bottom: -5px;
-}
-.ui-resizable-nw {
-	cursor: nw-resize;
-	width: 9px;
-	height: 9px;
-	left: -5px;
-	top: -5px;
-}
-.ui-resizable-ne {
-	cursor: ne-resize;
-	width: 9px;
-	height: 9px;
-	right: -5px;
-	top: -5px;
-}
-.ui-selectable {
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-selectable-helper {
-	position: absolute;
-	z-index: 100;
-	border: 1px dotted black;
-}
-.ui-selectmenu-menu {
-	padding: 0;
-	margin: 0;
-	position: absolute;
-	top: 0;
-	left: 0;
-	display: none;
-}
-.ui-selectmenu-menu .ui-menu {
-	overflow: auto;
-	/* Support: IE7 */
-	overflow-x: hidden;
-	padding-bottom: 1px;
-}
-.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup {
-	font-size: 1em;
-	font-weight: bold;
-	line-height: 1.5;
-	padding: 2px 0.4em;
-	margin: 0.5em 0 0 0;
-	height: auto;
-	border: 0;
-}
-.ui-selectmenu-open {
-	display: block;
-}
-.ui-selectmenu-button {
-	display: inline-block;
-	overflow: hidden;
-	position: relative;
-	text-decoration: none;
-	cursor: pointer;
-}
-.ui-selectmenu-button span.ui-icon {
-	right: 0.5em;
-	left: auto;
-	margin-top: -8px;
-	position: absolute;
-	top: 50%;
-}
-.ui-selectmenu-button span.ui-selectmenu-text {
-	text-align: left;
-	padding: 0.4em 2.1em 0.4em 1em;
-	display: block;
-	line-height: 1.4;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-}
-.ui-slider {
-	position: relative;
-	text-align: left;
-}
-.ui-slider .ui-slider-handle {
-	position: absolute;
-	z-index: 2;
-	width: 1.2em;
-	height: 1.2em;
-	cursor: default;
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-slider .ui-slider-range {
-	position: absolute;
-	z-index: 1;
-	font-size: .7em;
-	display: block;
-	border: 0;
-	background-position: 0 0;
-}
-
-/* support: IE8 - See #6727 */
-.ui-slider.ui-state-disabled .ui-slider-handle,
-.ui-slider.ui-state-disabled .ui-slider-range {
-	filter: inherit;
-}
-
-.ui-slider-horizontal {
-	height: .8em;
-}
-.ui-slider-horizontal .ui-slider-handle {
-	top: -.3em;
-	margin-left: -.6em;
-}
-.ui-slider-horizontal .ui-slider-range {
-	top: 0;
-	height: 100%;
-}
-.ui-slider-horizontal .ui-slider-range-min {
-	left: 0;
-}
-.ui-slider-horizontal .ui-slider-range-max {
-	right: 0;
-}
-
-.ui-slider-vertical {
-	width: .8em;
-	height: 100px;
-}
-.ui-slider-vertical .ui-slider-handle {
-	left: -.3em;
-	margin-left: 0;
-	margin-bottom: -.6em;
-}
-.ui-slider-vertical .ui-slider-range {
-	left: 0;
-	width: 100%;
-}
-.ui-slider-vertical .ui-slider-range-min {
-	bottom: 0;
-}
-.ui-slider-vertical .ui-slider-range-max {
-	top: 0;
-}
-.ui-sortable-handle {
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-spinner {
-	position: relative;
-	display: inline-block;
-	overflow: hidden;
-	padding: 0;
-	vertical-align: middle;
-}
-.ui-spinner-input {
-	border: none;
-	background: none;
-	color: inherit;
-	padding: 0;
-	margin: .2em 0;
-	vertical-align: middle;
-	margin-left: .4em;
-	margin-right: 22px;
-}
-.ui-spinner-button {
-	width: 16px;
-	height: 50%;
-	font-size: .5em;
-	padding: 0;
-	margin: 0;
-	text-align: center;
-	position: absolute;
-	cursor: default;
-	display: block;
-	overflow: hidden;
-	right: 0;
-}
-/* more specificity required here to override default borders */
-.ui-spinner a.ui-spinner-button {
-	border-top: none;
-	border-bottom: none;
-	border-right: none;
-}
-/* vertically center icon */
-.ui-spinner .ui-icon {
-	position: absolute;
-	margin-top: -8px;
-	top: 50%;
-	left: 0;
-}
-.ui-spinner-up {
-	top: 0;
-}
-.ui-spinner-down {
-	bottom: 0;
-}
-
-/* TR overrides */
-.ui-spinner .ui-icon-triangle-1-s {
-	/* need to fix icons sprite */
-	background-position: -65px -16px;
-}
-.ui-tabs {
-	position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
-	padding: .2em;
-}
-.ui-tabs .ui-tabs-nav {
-	margin: 0;
-	padding: .2em .2em 0;
-}
-.ui-tabs .ui-tabs-nav li {
-	list-style: none;
-	float: left;
-	position: relative;
-	top: 0;
-	margin: 1px .2em 0 0;
-	border-bottom-width: 0;
-	padding: 0;
-	white-space: nowrap;
-}
-.ui-tabs .ui-tabs-nav .ui-tabs-anchor {
-	float: left;
-	padding: .5em 1em;
-	text-decoration: none;
-}
-.ui-tabs .ui-tabs-nav li.ui-tabs-active {
-	margin-bottom: -1px;
-	padding-bottom: 1px;
-}
-.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,
-.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,
-.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor {
-	cursor: text;
-}
-.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor {
-	cursor: pointer;
-}
-.ui-tabs .ui-tabs-panel {
-	display: block;
-	border-width: 0;
-	padding: 1em 1.4em;
-	background: none;
-}
-.ui-tooltip {
-	padding: 8px;
-	position: absolute;
-	z-index: 9999;
-	max-width: 300px;
-	-webkit-box-shadow: 0 0 5px #aaa;
-	box-shadow: 0 0 5px #aaa;
-}
-body .ui-tooltip {
-	border-width: 2px;
-}
-
-/* Component containers
-----------------------------------*/
-.ui-widget {
-	font-family: Verdana,Arial,sans-serif;
-	font-size: 1.1em;
-}
-.ui-widget .ui-widget {
-	font-size: 1em;
-}
-.ui-widget input,
-.ui-widget select,
-.ui-widget textarea,
-.ui-widget button {
-	font-family: Verdana,Arial,sans-serif;
-	font-size: 1em;
-}
-.ui-widget-content {
-	border: 1px solid #aaaaaa;
-	background: #ffffff url("images/ui-bg_flat_75_ffffff_40x100.png") 50% 50% repeat-x;
-	color: #222222;
-}
-.ui-widget-content a {
-	color: #222222;
-}
-.ui-widget-header {
-	border: 1px solid #aaaaaa;
-	background: #cccccc url("images/ui-bg_highlight-soft_75_cccccc_1x100.png") 50% 50% repeat-x;
-	color: #222222;
-	font-weight: bold;
-}
-.ui-widget-header a {
-	color: #222222;
-}
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default,
-.ui-widget-content .ui-state-default,
-.ui-widget-header .ui-state-default {
-	border: 1px solid #d3d3d3;
-	background: #e6e6e6 url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x;
-	font-weight: normal;
-	color: #555555;
-}
-.ui-state-default a,
-.ui-state-default a:link,
-.ui-state-default a:visited {
-	color: #555555;
-	text-decoration: none;
-}
-.ui-state-hover,
-.ui-widget-content .ui-state-hover,
-.ui-widget-header .ui-state-hover,
-.ui-state-focus,
-.ui-widget-content .ui-state-focus,
-.ui-widget-header .ui-state-focus {
-	border: 1px solid #999999;
-	background: #dadada url("images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x;
-	font-weight: normal;
-	color: #212121;
-}
-.ui-state-hover a,
-.ui-state-hover a:hover,
-.ui-state-hover a:link,
-.ui-state-hover a:visited,
-.ui-state-focus a,
-.ui-state-focus a:hover,
-.ui-state-focus a:link,
-.ui-state-focus a:visited {
-	color: #212121;
-	text-decoration: none;
-}
-.ui-state-active,
-.ui-widget-content .ui-state-active,
-.ui-widget-header .ui-state-active {
-	border: 1px solid #aaaaaa;
-	background: #ffffff url("images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x;
-	font-weight: normal;
-	color: #212121;
-}
-.ui-state-active a,
-.ui-state-active a:link,
-.ui-state-active a:visited {
-	color: #212121;
-	text-decoration: none;
-}
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight,
-.ui-widget-content .ui-state-highlight,
-.ui-widget-header .ui-state-highlight {
-	border: 1px solid #fcefa1;
-	background: #fbf9ee url("images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x;
-	color: #363636;
-}
-.ui-state-highlight a,
-.ui-widget-content .ui-state-highlight a,
-.ui-widget-header .ui-state-highlight a {
-	color: #363636;
-}
-.ui-state-error,
-.ui-widget-content .ui-state-error,
-.ui-widget-header .ui-state-error {
-	border: 1px solid #cd0a0a;
-	background: #fef1ec url("images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x;
-	color: #cd0a0a;
-}
-.ui-state-error a,
-.ui-widget-content .ui-state-error a,
-.ui-widget-header .ui-state-error a {
-	color: #cd0a0a;
-}
-.ui-state-error-text,
-.ui-widget-content .ui-state-error-text,
-.ui-widget-header .ui-state-error-text {
-	color: #cd0a0a;
-}
-.ui-priority-primary,
-.ui-widget-content .ui-priority-primary,
-.ui-widget-header .ui-priority-primary {
-	font-weight: bold;
-}
-.ui-priority-secondary,
-.ui-widget-content .ui-priority-secondary,
-.ui-widget-header .ui-priority-secondary {
-	opacity: .7;
-	filter:Alpha(Opacity=70); /* support: IE8 */
-	font-weight: normal;
-}
-.ui-state-disabled,
-.ui-widget-content .ui-state-disabled,
-.ui-widget-header .ui-state-disabled {
-	opacity: .35;
-	filter:Alpha(Opacity=35); /* support: IE8 */
-	background-image: none;
-}
-.ui-state-disabled .ui-icon {
-	filter:Alpha(Opacity=35); /* support: IE8 - See #6059 */
-}
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon {
-	width: 16px;
-	height: 16px;
-}
-.ui-icon,
-.ui-widget-content .ui-icon {
-	background-image: url("images/ui-icons_222222_256x240.png");
-}
-.ui-widget-header .ui-icon {
-	background-image: url("images/ui-icons_222222_256x240.png");
-}
-.ui-state-default .ui-icon {
-	background-image: url("images/ui-icons_888888_256x240.png");
-}
-.ui-state-hover .ui-icon,
-.ui-state-focus .ui-icon {
-	background-image: url("images/ui-icons_454545_256x240.png");
-}
-.ui-state-active .ui-icon {
-	background-image: url("images/ui-icons_454545_256x240.png");
-}
-.ui-state-highlight .ui-icon {
-	background-image: url("images/ui-icons_2e83ff_256x240.png");
-}
-.ui-state-error .ui-icon,
-.ui-state-error-text .ui-icon {
-	background-image: url("images/ui-icons_cd0a0a_256x240.png");
-}
-
-/* positioning */
-.ui-icon-blank { background-position: 16px 16px; }
-.ui-icon-carat-1-n { background-position: 0 0; }
-.ui-icon-carat-1-ne { background-position: -16px 0; }
-.ui-icon-carat-1-e { background-position: -32px 0; }
-.ui-icon-carat-1-se { background-position: -48px 0; }
-.ui-icon-carat-1-s { background-position: -64px 0; }
-.ui-icon-carat-1-sw { background-position: -80px 0; }
-.ui-icon-carat-1-w { background-position: -96px 0; }
-.ui-icon-carat-1-nw { background-position: -112px 0; }
-.ui-icon-carat-2-n-s { background-position: -128px 0; }
-.ui-icon-carat-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -64px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -64px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-on { background-position: -96px -144px; }
-.ui-icon-radio-off { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-start { background-position: -80px -160px; }
-/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.ui-corner-all,
-.ui-corner-top,
-.ui-corner-left,
-.ui-corner-tl {
-	border-top-left-radius: 4px;
-}
-.ui-corner-all,
-.ui-corner-top,
-.ui-corner-right,
-.ui-corner-tr {
-	border-top-right-radius: 4px;
-}
-.ui-corner-all,
-.ui-corner-bottom,
-.ui-corner-left,
-.ui-corner-bl {
-	border-bottom-left-radius: 4px;
-}
-.ui-corner-all,
-.ui-corner-bottom,
-.ui-corner-right,
-.ui-corner-br {
-	border-bottom-right-radius: 4px;
-}
-
-/* Overlays */
-.ui-widget-overlay {
-	background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;
-	opacity: .3;
-	filter: Alpha(Opacity=30); /* support: IE8 */
-}
-.ui-widget-shadow {
-	margin: -8px 0 0 -8px;
-	padding: 8px;
-	background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;
-	opacity: .3;
-	filter: Alpha(Opacity=30); /* support: IE8 */
-	border-radius: 8px;
-}
diff --git a/vid/src/main/webapp/static/fusion/css/layout/layout-default-latest.css b/vid/src/main/webapp/static/fusion/css/layout/layout-default-latest.css
deleted file mode 100644
index aa382de3a..000000000
--- a/vid/src/main/webapp/static/fusion/css/layout/layout-default-latest.css
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Default Layout Theme
- *
- * Created for jquery.layout 
- *
- * Copyright (c) 2010 
- *   Fabrizio Balliano (http://www.fabrizioballiano.net)
- *   Kevin Dalman (http://allpro.net)
- *
- * Dual licensed under the GPL (http://www.gnu.org/licenses/gpl.html)
- * and MIT (http://www.opensource.org/licenses/mit-license.php) licenses.
- *
- * Last Updated: 2010-02-10
- * NOTE: For best code readability, view this with a fixed-space font and tabs equal to 4-chars
- */
-
-/*
- *	DEFAULT FONT
- *	Just to make demo-pages look better - not actually relevant to Layout!
- */
-body {
-	font-family: Geneva, Arial, Helvetica, sans-serif;
-	font-size:   100%;
-	*font-size:  80%;
-}
-
-/*
- *	PANES & CONTENT-DIVs
- */
-.ui-layout-pane { /* all 'panes' */
-	background:	#FFF; 
-	border:		1px solid #BBB;
-	padding:	10px; 
-	overflow:	auto;
-	/* DO NOT add scrolling (or padding) to 'panes' that have a content-div,
-	   otherwise you may get double-scrollbars - on the pane AND on the content-div
-	   - use ui-layout-wrapper class if pane has a content-div
-	   - use ui-layout-container if pane has an inner-layout
-	*/
-	}
-	/* (scrolling) content-div inside pane allows for fixed header(s) and/or footer(s) */
-	.ui-layout-content {
-		padding:	10px;
-		position:	relative; /* contain floated or positioned elements */
-		overflow:	auto; /* add scrolling to content-div */
-	}
-
-/*
- *	UTILITY CLASSES
- *	Must come AFTER pane-class above so will override
- *	These classes are NOT auto-generated and are NOT used by Layout
- */
-.layout-child-container,
-.layout-content-container {
-	padding:	0;
-	overflow:	hidden;
-}
-.layout-child-container {
-	border:		0; /* remove border because inner-layout-panes probably have borders */
-}
-.layout-scroll {
-	overflow:	auto;
-}
-.layout-hide {
-	display:	none;
-}
-
-/*
- *	RESIZER-BARS
- */
-.ui-layout-resizer	{ /* all 'resizer-bars' */
-	background:		#DDD;
-	border:			1px solid #BBB;
-	border-width:	0;
-	}
-	.ui-layout-resizer-drag {		/* REAL resizer while resize in progress */
-	}
-	.ui-layout-resizer-hover	{	/* affects both open and closed states */
-	}
-	/* NOTE: It looks best when 'hover' and 'dragging' are set to the same color,
-		otherwise color shifts while dragging when bar can't keep up with mouse */
-	.ui-layout-resizer-open-hover ,	/* hover-color to 'resize' */
-	.ui-layout-resizer-dragging {	/* resizer beging 'dragging' */
-		background: #C4E1A4;
-	}
-	.ui-layout-resizer-dragging {	/* CLONED resizer being dragged */
-		border: 	 1px solid #BBB;
-	}
-	.ui-layout-resizer-north-dragging,
-	.ui-layout-resizer-south-dragging {
-		border-width:	1px 0;
-	}
-	.ui-layout-resizer-west-dragging,
-	.ui-layout-resizer-east-dragging {
-		border-width:	0 1px;
-	}
-	/* NOTE: Add a 'dragging-limit' color to provide visual feedback when resizer hits min/max size limits */
-	.ui-layout-resizer-dragging-limit {	/* CLONED resizer at min or max size-limit */
-		background: #E1A4A4; /* red */
-	}
-
-	.ui-layout-resizer-closed-hover	{ /* hover-color to 'slide open' */
-		background: #EBD5AA;
-	}
-	.ui-layout-resizer-sliding {	/* resizer when pane is 'slid open' */
-		opacity: .10; /* show only a slight shadow */
-		filter:  alpha(opacity=10);
-		}
-		.ui-layout-resizer-sliding-hover {	/* sliding resizer - hover */
-			opacity: 1.00; /* on-hover, show the resizer-bar normally */
-			filter:  alpha(opacity=100);
-		}
-		/* sliding resizer - add 'outside-border' to resizer on-hover 
-		 * this sample illustrates how to target specific panes and states */
-		.ui-layout-resizer-north-sliding-hover	{ border-bottom-width:	1px; }
-		.ui-layout-resizer-south-sliding-hover	{ border-top-width:		1px; }
-		.ui-layout-resizer-west-sliding-hover	{ border-right-width:	1px; }
-		.ui-layout-resizer-east-sliding-hover	{ border-left-width:	1px; }
-
-/*
- *	TOGGLER-BUTTONS
- */
-.ui-layout-toggler {
-	border: 1px solid #BBB; /* match pane-border */
-	background-color: #BBB;
-	}
-	.ui-layout-resizer-hover .ui-layout-toggler {
-		opacity: .60;
-		filter:  alpha(opacity=60);
-	}
-	.ui-layout-toggler-hover , /* need when NOT resizable */
-	.ui-layout-resizer-hover .ui-layout-toggler-hover { /* need specificity when IS resizable */
-		background-color: #FC6;
-		opacity: 1.00;
-		filter:  alpha(opacity=100);
-	}
-	.ui-layout-toggler-north ,
-	.ui-layout-toggler-south {
-		border-width: 0 1px; /* left/right borders */
-	}
-	.ui-layout-toggler-west ,
-	.ui-layout-toggler-east {
-		border-width: 1px 0; /* top/bottom borders */
-	}
-	/* hide the toggler-button when the pane is 'slid open' */
-	.ui-layout-resizer-sliding  .ui-layout-toggler {
-		display: none;
-	}
-	/*
-	 *	style the text we put INSIDE the togglers
-	 */
-	.ui-layout-toggler .content {
-		color:			#666;
-		font-size:		12px;
-		font-weight:	bold;
-		width:			100%;
-		padding-bottom:	0.35ex; /* to 'vertically center' text inside text-span */
-	}
-
-/*
- *	PANE-MASKS
- *	these styles are hard-coded on mask elems, but are also 
- *	included here as !important to ensure will overrides any generic styles
- */
-.ui-layout-mask {
-	border:		none !important;
-	padding:	0 !important;
-	margin:		0 !important;
-	overflow:	hidden !important;
-	position:	absolute !important;
-	opacity:	0 !important;
-	filter:		Alpha(Opacity="0") !important;
-}
-.ui-layout-mask-inside-pane { /* masks always inside pane EXCEPT when pane is an iframe */
-	top:		0 !important;
-	left:		0 !important;
-	width:		100% !important;
-	height:		100% !important;
-}
-div.ui-layout-mask {}		/* standard mask for iframes */
-iframe.ui-layout-mask {}	/* extra mask for objects/applets */
-
-/*
- *	Default printing styles
- */
-@media print {
-	/*
-	 *	Unless you want to print the layout as it appears onscreen,
-	 *	these html/body styles are needed to allow the content to 'flow'
-	 */
-	html {
-		height:		auto !important;
-		overflow:	visible !important;
-	}
-	body.ui-layout-container {
-		position:	static !important;
-		top:		auto !important;
-		bottom:		auto !important;
-		left:		auto !important;
-		right:		auto !important;
-		/* only IE6 has container width & height set by Layout */
-		_width:		auto !important;
-		_height:	auto !important;
-	}
-	.ui-layout-resizer, .ui-layout-toggler {
-		display:	none !important;
-	}
-	/*
-	 *	Default pane print styles disables positioning, borders and backgrounds.
-	 *	You can modify these styles however it suit your needs.
-	 */
-	.ui-layout-pane {
-		border:		none !important;
-		background:	 transparent !important;
-		position:	relative !important;
-		top:		auto !important;
-		bottom:		auto !important;
-		left:		auto !important;
-		right:		auto !important;
-		width:		auto !important;
-		height:		auto !important;
-		overflow:	visible !important;
-	}
-}
\ No newline at end of file
diff --git a/vid/src/main/webapp/static/fusion/gis/js/local.js b/vid/src/main/webapp/static/fusion/gis/js/local.js
deleted file mode 100644
index ccddd9b20..000000000
--- a/vid/src/main/webapp/static/fusion/gis/js/local.js
+++ /dev/null
@@ -1,178 +0,0 @@
-var pointLayer= null;
-var animateFlag = false;
-var frame = 0;
-var dates = [];
-var delay = 1000;
-var intervalId = null;
-$( document ).ready(function() {
-    map(data2.map.lat,data2.map.lon,data2.map.zoom);
-    pointLayer = new L.layerGroup().addTo(map);
-    var point = getDates(data2.points);
-    drawPoints(data2,point);
-    
-    
-    $('#timeUp').bind('click',function(){
-        delay += 500; 
-        if ( animateFlag ) {
-           clearInterval(intervalId);
-           intervalId = window.setInterval(function(){animate(data2);},delay);
-        }
-    });
-    $('#timeDown').bind('click',function(){
-        if ( delay === 500 ) { return false; }
-        delay -= 500; 
-        if ( animateFlag ) {
-            clearInterval(intervalId);
-           intervalId = window.setInterval(function(){animate(data2);},delay);
-        }
-    });
-    
-    
-    $('#date').bind('change',function(){
-        drawPoints(data2,$('#date').val());
-    });
-    $('#animate').bind('click',function(){
-        if ( animateFlag ) {
-            animateFlag = false; 
-            $('#animate_color').html('Off');
-            $('#animate_color').removeClass('animateOn');
-            $('#animate_color').addClass('animateOff');
-            clearInterval(intervalId);
-        } else {
-            animateFlag = true;
-            $('#animate_color').html('On');
-            $('#animate_color').removeClass('animateOff');
-            $('#animate_color').addClass('animateOn');
-            intervalId = window.setInterval(function(){animate(data2);},delay);
-        }
-    });
-
-    
-});
-
-function abc() {
-	var abc = 1;
-	var xyz = "";
-	return nul;
-	
-}
-
-
-
-function animate(obj){
-    var point =  dates[frame];
-    drawPoints(obj,point);
-    frame++;
-    if ( frame >= dates.length ) {
-        frame = 0;
-    }
-    $('#currDate').val(point);
-    $('#showDelay').html(delay);
-}
-
-function someFunction() {
-	
-	var self = this;
-	var x = 1;
-	var z = self + x;
-}
-
-
-/**
-* drawPoints - Draw the points provided by point(date)     
-* obj JSON Object - Data for Map
-* p String - Key (date) from the JSON object. 
-*/
-function drawPoints(obj,p){
-    pointLayer.clearLayers();
-    var lats = obj.points[p].lats;
-    var lons = obj.points[p].lons;
-    var txt = obj.points[p].text;
-    var fills = obj.points[p].colors;
-    points(lats, lons,txt,fills);
-}
-
-/**
-* Get dates from the list provided in pIn and put them in Select.
-* then return the fist date.
-*
-*/
-function getDates(pIn) {
-    var html = "";
-    var c = 0;
-    var ret = 0;
-    for (var d in pIn ) {
-        var val = d.replace('"','');
-        if ( c === 0 ) { ret = val;};
-        html += "";   
-        dates[c] = val;
-        c++;
-    }
-    $('#date').html(html);
-    return ret;
-}
-
-/**
-* Map - pass argumets to build map as specified Lat/Lon and zoom level
-* String lat - Latitude
-* String lon - Longitude 
-* String zoom - Zoom Level (1-18)
-*
-*/
-function map(lat,lon,zoom){ 
-    var map = L.map('map').setView([lat,lon],zoom);
-    map.addControl(new L.control.scale());
-    L.tileLayer('http://gis.openecomp.org/tiles-light/{z}/{x}/{y}.png', {maxZoom:18}).addTo(map);
-    window.L=L;
-    window.map=map;
-}
-
-/**
-* points - pass argumets to points specified Lat/Lon. Text and color for point is also passed. 
-* Input is either all singe values or all arrays. 
-* String[] lat - Latitude
-* String[] lon - Longitude 
-* String[] text - Single/Array of Text for points
-* String[] fill - Single/Array of Fill colors.
-*/
-function points(lat,lon,text,fill){
-    if(lat.length) {
-        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
Q77znZpKPs0K>T?8-{n}!bpQYW

diff --git a/vid/src/main/webapp/static/fusion/images/Thumbs.db b/vid/src/main/webapp/static/fusion/images/Thumbs.db
deleted file mode 100644
index f504b226e0c9df7df0a87443578ebea2feca7186..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 102912
zcmeF)2_RP6-Z=h8WF9ilR0s)Wo;8^gLI|NU6Ee?~qRb(bLS;@!=DEyMWDc20$W(^M
z{QvGw-Fwct=ltHzIrn|k)v;W@(uQ9&1=O$BYtSf!zQ(=D2_i
z-~oJq9A`p61c(6%fKvcP3djLHpa4{W9Z&-rKnv&q1Kf-
zOA0yJVLAavzyVx_cL90N|LC;mPvlPunY=>^5lqOr`&TB|e+=ZEM9S^A?mtpqDUpK!
z6SC|sfc%KOCCGY^@{a?M81O%pe}g
z4o-lR09nu1@{hy_BnJGv{3CG$i2=V?{*icr!~mrHBkTIT@{h!j3*aKS1Pp-@_^tAf
ztmoI|ABh)83_!|15=W32@O$MSSssZ2zb^k*;r|E$96A&q9Q>U(JHx0wr(_jmQ5bMi
zT|hQ)ryt%L%w4;Xzc69J-`%*ocVl7g#>c_I#wEljBqYEmARr6n}Wyd4VFug>#Go6JtMW7bylN
zDaKAUavj0g4O@$B@Rtc=7i=Ro4lW)(0VK$S5{iL|xeE&u*=k7b3BN~Sk?tnjcjOp0
zx#~rn{k9Z**TNp*vK-HTNvYPhz{-Eg&Ib>likgO&j_m+D2j@WnK_OugQLz&zWn|^#
z6;7$2)zH*Br>$dXWNcz;W^Q5c;OOM+;_7z&hOghvTmAvz5qBb^qVL{|d7O}#l$?^9
z_T+g^ZeD&tVNr2qRdr2mU427idq-zich8&NzLC+f@rien@2930KYm(TURg!2tt0z|
zfx`T0xBjtbzuGTS*son!SeRHi$bMn$at4^BSiAQf!6rMVigVGHd_UhcT#DmikFsCl
zvGA)cP+qcY!>3{u7-3sPcJ1??ecO)t{HZ6*IFiD{RZgHcd$4Yqp
zys)}UmAo=o={&Gye6jUi6$ltkiRToZW%|H1DSgd=dfAhClr1iP)SIei^qj=m)9Q)N
zY4%M1=|nC0{<+(8?4fYY8p7GoNL#e59vgM8IhJsIWK(dss9W(W9)aVN$VSc&Cvp2L
zhHT@DxhA}OvqoBd9f?ki=|$apGOa~Tchg_THKn+{y!tW^nYIoK!CLUUTSJFvtk#LT
z(5c1kSqKXx%q<9?uK70qo;+JW2x6=AZ^((fmHSc>ny+|Dp=W~pNQ1LmQAu;%KNvwUV
zq2%6x;S3SZ4r&(Wz!Yju4p6_i0#S|!elq`D)A=dR??MXimt`(OG<1O9I{hjga;?Pt
zMLN5G#4kMf#rF`u_MrCsh+m)M^7kLV)UytEZkngg#FORDvK+s&71gb>l+0|~N%}70
z15TrKpVV-dO@Nw9mRwIlr$aAWRHaLK9fi}AmbMZn<2p@A`c8~G%65;#3;Zt93gL=1
zC(`w9cige66l8Wf?0zj=VVOOjYr?XX`mP}r+2KgBD;8>zv&~W2s+J|_;>3*3wZ4w(
zu_IiB4@Ypt8x4N?#n5xjX>X)he)Git%_)C7;h(90?}b%G!KE0Pka+P|CZzt0tO}{K
zLN(``>i@_-n|{e3sW1MO>Cf!H3}hJoC4Z!@`d21o|B;x8)YHFp|B=t79$)hRTK@}x
zpTCFr$$(<`5kLPX@e?1NvuIpO+})=faaoX=R6nQ&W8#wjwY$VBdxvdbhs%n75^gW`
z&Wz8q&=)M}n6&l?JYX!dQprd1dRxF;*>NavP_Q$z-1WnpQlfZ;?+HFaFVfKF^`6#(
zid^i9g{qO(8p#VX-lGKQP1m$3O>#Z)S2iiNSYGEYDfH8g&mOy~P)D0(N#b{>hg)#o
z937|3LP@8;tdzG&lHf4p?{x%i=#0BaQLzw)_I$%~K6PtJdp<64L+IEtW7iX=VuDkEQDjC`}^L#8=i;_9^c$B3^Gi{
z7Sk&5YIb|jceCmQMdI_`!6q9f?~)td@7@(WAuaa+y%{~+zo&470
z2s%ReR%vuZ)p|G9EZt;dbh+n8VUjbt?axc87iKD*+^7RG4!zqRXx~&x8?abi7%V;&
zXEfqbjpC>zO2BwtRg{&qOeEE#krUOvGAN#|t#$c!^P|X{g@O~s@gM4j2ab<7k#-6!
zvrB1Yyx`nHg{Cui2WS)}G`UNEeB;Q;^+{(3wV=Y-VYL)`V-PEEf%(Qnv|1sV3S}aP
zNAG^}(;ux^9l73FF}7d`F42xNpdmiRqmj@V1s^~p`G0D;i8ps+))Q@!a%tO<3*P`j#)EwfsXJejH^ojScghvg6yl4h0C1iLvS-qH@aC;6)ds4Yirb)fJ?J48A
zJ7t<`J;S$bHZff?qxzD3;)yCwTI^DL&5lQ1xlQS!FOI0t%C=q(sko`rwsm(|G>^p3
zk5j=orz~nvVh81nyMuc5>PlC@9ntn2IV+*gBJH|O#SUvJnoWiK)%uDJBU_fcoPzBq
z6o;hN=x?TSPicFTZZo^6kJb4kw>we=%=OmYvvI}5?D=3KMxs>0;8S|#Evbwyk44+YLx-)lBwiH4`qQ~Dl&9`D^+UmD1B)qg5
zmd1QzZf_<0;FXB=we@sNJ<_FQeBadC7M
zr%nsTyW^6cS_v3$u3Gk2T})D2NRH;y+RWWlVWA8NCe}XNTjJ$C?#Z9Lskj(gMPDd)
zD+!vVLaXLp(oM+CKW_C{X77DYlA84}ckB3&#-xHB+s$4?ojj+r8BeIF
z*-z-a-4%~s&)zai(wVBA71!+|&YGB=CNQuFj%Vw(S!I
zJmWi6wzj!q$u%^XW_>B#5eX*)9O`kGPy|&A5ZQD_KiI*|YuI
zAN#mY$oAzZH%}*t_q9xYu-!qCE%k@`Nt2l@Qip$Z@z!|}n{a+jZMC&rc4V5sO_MjE
zoDQu%I`1#RIm#_7pJ!=966nwU;UgU<>zx|E+s?fco*kWWZWp#hQ_WY3Galqe=PwTE
zG?p0o852I0e3`}Fxq~v1#-64=a4zIgN}A}$3~LOPP0w@Nc@CBqF;)tW2DXA`X$KNB
z<5jAMH*LmTtTN&i+6`vcyN2fW`}I$9=!Oie4Li1Q^=?zRaF^l?yA$zPC4ah?d1~ns
zeYiA+Z)+YC0a|q=3!@@7=?$ifY=`reL8HPIcHd1@W_i(cr;?qVq06z9=GLDg)z|n_
z{++bnlcK2pR_#y7ee%CDA?=SyyW`jCTh@j2XKDO=Bj=|+I^VL)@1;TVNBSus{SJ_A
z_`P&L|9_<4%%Ly&i~jrmm8XLi4uXn;9wQ=X|e(A4r_=esbtJzeR!5^rbxp$9*`)0wiCsH)4p2
zz8Ei6efri#R?}~_MvADY=-iyKrRQOn@b#1D3@-5O>ojO0^L*dClFrd0;}(Bo^J0>@
z8+Gqcb$7AHjN719u|@G^;tb+ESJ6*o6IFh=?;Eb=M$td#y4QWPcbR#Q1rr6d^i2uV
ztxt2O)uau+F9>_ZTFV-g+@IPk^VsjmzO}2yYt&ei3YQL6a;hurp!&1DHS+RYs)~qmp
z?6ftTTBBCxky-_{sWWCeCV5Fy>j&~<`l7oX@siv(#M8q+l|PtgtuQvEv$>Lg4-Yrgo6lh2Sfs7*=U&G1@}M<
zxDOtHSP%!|!9(x}JO&9M5hQ_RkOGkPq`~|NNC!_r2FL_i;2FpU&p{5z1$iJJ6o5id
z1d2fkCOli&1WlkByaFwt6}$#*pdEC8PS6FqK@WHX
zkbALxpdY*i17Hv!`!)>o5iknIz&Mxy@4zH@52nC0m;oOEvfLcZ=fMJ41RudCumqOD
z3Rnebum;w_2G|5!U>gDJK{{&u7svnQVCR?W7Eu)zize4`0tA(WnlwT@k8jine^lUT
zf5YAKx-It6K-2!~p?4>(9G-2`qKiiR0|UKrT#8CrlFS|xiA+`1hy`W)2`wro^G|F(
z*kekY#1>yL{=_3qffs$AGCy|e8DkHS9xy?3aZzScE`G4GXV0Aakw|a7aV9jKu;00aU*S-A6Z@eAHJivXX?mv})b&+oJ&Gp>`823zET_vow@4m1
z@S+cNl}A1{Ur}1D8Z9f))vdz|R9Iy0J@op?wR~KOl#h>TD(i~!GqJ~l+6+wEbnWD_
zy>*_h$NzTGg;M*^`p*Td@1y+w=zsgQU-5U}e{H?B#+zKib8&2xID0tDw_wr5xoVxY
zTsdPjn*QE+1Gb3EGEs18{@XbXi3J0SrHWh7W)ml!1L<0Uz8iuPhotQoP9sX(rM#D_Obd;Vi>s&$6gG(YrT}UtE*kG>UJ;5qjQ@z
zYA>Emch6a&?eJ5P(#Z~};^L@_;)``Q&gip#Ro0R
zxnSOe@2kqR0Ao~a(lc#&COc;
z6v^woxPVPid-R~J%j06RcfHqB=r2ClL6sJ-ZMHCI5gR?pji@`Q41H<4>NYZllIyxE
z@|a)jpa@)=Dpv=&;|4v&tNYGc9uiBAWsl_d6~UdvI!uejU`;PeLwNmT-G@&jGg*Bk
zb({}fW~#SYdIS_X>5QKhb{V_GU#Qn4R6t$xIh*!!I3!n9-^qriPA~;4H!`zirl+EL
z1#O);QMEjMN~w|IZPrtV4c?UcE%G)2N$Dy#rOfCg?W&Zi?o<}PzJXnd7UC$5#{pZU
ztdU{p2Z`fv6X$w=I|v>5>+KJpzf(m8u?(t|-_-t+3TbnQkm!ee|K-R}FaG4e(EjoH
z`(D(r{I}*m1ZmGgeF>TP|9buyg0LPM@U8jJLRv$J_sAshZ^&N=)1
zVES5rOo8L^J@o$*LS6V#fBc*D|5JY)FzK}qJ$V9cIUH+PJ;>U%ugyV8Y#_O)yzmm$
zk=G96;qveeELIerK=;$r71I6!CFVu}itjb$TNs^9&6h-`G(Y6g>&f!+b&qo0*j`em
zXO48udchn#h>NZn5jXdsPg8VfplYih9c^^i3_JIHEtO4%k3~#mut@D}(7TeRSpuc<
z+s&$0b0z2d3!*u8P}hhnPK4H_;f@$=}zua|Kbkns(wXTpwjc0=}RYV
zISsFcd)_RX($*~A)A{=RjA}-6yGLc$w%J3*JG{p|&#g|?7){#^^;@iH3iAo28RBi6
z_v5IGqg194VL1Hughzrj=V)<>)$zWMUDg-lME6>UV~=K@iKJm?D$|-6KWX%&AhAS7s+uh_w*U+nP#i~eYJy+4?C0Ypmv!s`&w)CD5#8=Z*Xn1syT-ats0y-
zxKTrAXH;9ge1&$E;SS
z;p2O@H=XO?GnPlYib-%=cl#Dk@yq5HKVVr+l_lIkEp@3ZV)jVNxlM7M3W(*j`&cmP
zxw(T%uD>2D^XipN^sqV-4gS5J?`yv{#O2D_yTeA4SfNb
z=SGgU3@h6jh-|kQkZkgf+K`~tylFiSEN*8!nT}>Qi?1Ux&`wJ
zVkz-W&C;@CJPGL*T2Y(=rT5((Y&g%7cZf2$Y27CA9porSV=VZsGm}g+2`wxqYSE?m
zmr9y@wG9|}J_@W7j(W;;Gypvo5w9$l{eCF>PTYYGM{a86#qOeH58mQVqe3YfQ(4Ue
zO3n8>t$X8M7A?054s6P7MLE3RJcbkGAbm?Kp3qU`kh)Ubyt4eIe0Rr<0M&YYIg__a
zmh5!gX_8($C^Yi{VFJvYd#d5>IiEx_mpDxr8@JSd_Nzw1!&H!J)_@
zrTnSM-U!u}*vyQqECXJaYMxS!QEA%kW}$c@fi0a4bt|n=au@sKT|5lYQI!V<6U&e7
zlV?6wM?=}ODTL0;@VJ7$zo013dBx+{2qUwqr~cb=l78|nQoUL?pU2AXG3!)4!!|yp
z(&-+D!}}CliKg^1HqJ)5DK#^*H9t@8;A*Nj#o>M_%DSPMQfbiJe{w;(rh;Zu<+%
zu;#_aGv5nua7rE+VkXSsoz9(NzhF;66
z)eefM*k=vG$_w?mf_FnYCXZ5fP!@U$LXp-!EpJ@aYvcD1&R)LjcldDWr`O?H$(HKX
zd#6A01n*HZ)?4MH#Ayudm#%($4IS5+HX?sHOzU(>amTI@GEU*T9h8TZ+(f{84MTe6
z6`K^5%I*p!i47VtyT~!iq@JuX_qDBodJobo(K=S+Vd?wxmS5t}wCmjCgNS
z%vVeAS!V9bsnPKcPAXG6*mBv$tF4JZBYUr_-Epa@LsA>W&ek}|IJ3#2h8gDT`Dv2(
zUpg%gJSz^6Jwp3Z%~rjRN2MCJJ>&Zp
zT$UIQa*a%g7PYTN^eAo5HYMmE@d;L9fi4{PyuIee&x;f;I(fF@26xi-N7uskw?)W)iK3jM#b`cIms-
z)nUeY6XrW~l-6#)*f>+vx>?yehp~gQbe=0On;uLUF0`JF?9=9%e^_;lt(Wj>5Mv1n
zpJEvE+NQ6iS}sG-1q;htR5YY#vO}uf4c6mC~Te0$Z
zL3)-t!8ML7zoNag#IZP}N-cn6!qRS*=FTBC5rQ&?i?^)#vsRZitp=CO3M`&`*9
zhe=3F>YMB6L)zl-L>OWw-Z_pxdc4#(sd6xZT5<;^&J@pnvyClWSG*)va-8kn1!InL
z%i=VYwDVW_4Wi4*7I5lf306LIWh|5Ur=>m>^Y5B0j!-S%Yo6UODVgi^@F{a?AnDz=
zd^~oEdx$7BEtKs}=|qhtP>p&;o6*T8uPC~#rz&I}EsSm|P;Y>qzHz7*lqp;O;yb8}
zZr<@_f(fXF)SZDZ8F1-z8PBriZ$+=swx=-3R17w|s}R2lrI@DrRJ&@~imd#c?&
z>O?G5oxBfr7B0NioGYL^Rg*lpf0pU|1-bn@D927imZ8*H8A|(fDVLcxFZlq6k;bKI
z2wTjj?|JRzZ*aC@(A2bBvq7!JXk+6w8O{+d;OK8h@;n+D5Z@-#;~Av4$>9uez1v@M
z(giy3t#K5UI#gS=2nLOU%+%^~Se(0TzP7sCq
zslLpu_RZj$g{@xc(w;o*6;-kw)Q3pPEWZyKb1a3nYy-{SPL^qOng+HJ*U%U;l+80r
zQ|@l&YmE4JsPZc^D?Wee_NR|-zxezn|DCk||M>pv-=_U=19MEPhJ?|p)tg+srugQ)
zQ59dhln5(lONvu$?F>XEuY*i&*~%}^Z4{~Jc9GnWrjc;pII(%2ZuZG@9+S72HQW;-CB1nruTAh?v;tZ?@z$J%)dX7}t^8VGsD|hn
z5|q*8AqxXvZ)}N+8xkH`R>GAZ^9vTz&znYBD&F&UPdZI~^ZbI{6=Jcg{EYz%uC~nQ
z%FCPXTh4fGt?{;Rd*iKF6g2FhvWs|CX0}^LCsswJqu0E$n^uaPR&8b-|6ossuk9yV
zKicnq^q>8|?LWKGxPww%B&n6Avn*!1nW^WZ^>UD@kcuuOE&0ZVQ<7`8-mssX=AODe
z4kUYb_uh*PTtltc2pieVumRY8^Gpn6kMX!zcTO%0(ZQMIG00
zdiW`$Z||Uq)?AqW{gGLf%60bZ<$P%Rx|Z8h#g4TF>C@RqZcDcKdwkN%otfBPymRQ&
z@zdUi&Ey$I%SCojJ`ye!a&37P0qaW3n@-U^R6=5R%sCFmn-rLLyV5S^9lw9qYY}U{
zzMd$w@0kdGSbdI!EFFHQWGMH@tLDV62`?zfQs$hM7DvqGqEliyvn;U&S7)}oaNZYG
zW--U#8YI&@K3ccIrIl9{uiPat#NWKZHcmz}5hR5@QU5k0^q#hg8&~93tg)5zsm16Z
zmRnWHE;-c^)5R8%{pD?Y3vvT4JCOw%h`9M5o0suYz1QZ)Osf_tXcRZpxL&*EsyF7%
zQcP5s+>$biQyGgnDt_**g@Utby7@-1Uv|=fWYTQ%2kVa$$B8?x-MO58!C09qGJ3^6
zyGKW)^x~K_6?*=3kdHvH^$PBXc$~e8lur-)zu3#5RBBr!XeZJ(+>*?&U@L*wiP82k(x@X?s5zuj#Aj~c+&__O*a;}0@y
z&MpAMvY@cQZh#GN04~4-_<#Tq0wO>RNWdOI3djICK>CzW!kh|F0~$aJ=m0%n0E~bM
z!1y+(yR5-OxB{jR+F2{qN`B_i&cnUn7K1$m>l8rOC87xMT_1HPbEkB|x
zqStcLuqC0Z)Q~%7An9GR=NY1THaBR(GDbP
zon*gosqQvjoE$>y-t?flu{
zwDV+^?4xzH%s4JNFJe~i8#=IcDP@!jMP!r)PNtP;8wE{Z3*lDnlE-P@Yp>IUC;Pyd
zW0bPJxW_4Law28zo_cLhnnJfSong-XFvt|VsnB}^2%TCm4+Q;&$706iL
z2-(~AHhlVFSXf@scu1*jXM9lq_@%`0>p^WY7vtMfPS9Fd^aR*+6>Q5TRNf6J3_6sc
zsio?qf2v-oD}6YWL^?#mIK_;>;n41hX3ck#O`q^>F7Owyh_q%v&&#yK
zgpy5;NVLProcYlZ-Zq6<1+E8AjBL1{!uhpm=jWk=1BwIpUpo=JCQ(yhqtKcan5qn-
z6tiexZp}NWoI7wTWOnY$*GT?xJ^Z6DzFt2EaleoIp9lWU_df;y4fmgg;Z3Ila5?#=
z`~MVh?U{!68<~Xu4f!93^&oj8)901`5C4cj{;FT@{|o>1{Qr^nx8^Sk`Cs4l(?*K?
z2l7{i{CmIT|6}~aZy4C|e`)*(iLPZ!D*~ms^*I%u!QDJ{X~RxgWDD_ix+H<*N(^+l
zZif`$UZk4*{(GGa*sSXtnk2K@i(Kaxq6$Vvl8^H`lnC>t_FubQQ_BKP@(~el13spj
zqQ%Et%iHYM<8L^MhD=3u9}&1%685rg!a(tAWB2~h+|(q~oPe^70c#I0^Vm{0N7*}%
z6ARQm3Y5ETqxvk1mNT+^1+q2yO(YGVCrrZh
z-3
zxE3X$ITtnUL+>^g$@s79?RItc+f+<<$*MVnzHQ!NHc0JZEsxa1G?o6uGeqTj}dv@ZZQ~{oz
zR$^jokGsyc(}#60Iywif7AD%QvTYi4V0E!_D67=|*R>gked^S@1(FML3Z3?HXyb`C
zu;9>4KG3>@Zd&;mA+we0@QR6>xh8(Wug|=P)WF>Q@sX0kVy&=~*$3>}Hq$>566duz
zG26B2V=l6+G%jRS)eBH=S1uA~Ke6b>IZLMzc}-X-KfS4e&vg97>{&07?XGn#KW|eK
zw2A~Tc9z@v%DpS=f?dgRCR7o(w8Q3PZRxl$3Lk_JVP-EGQ+`VMaC1YMy^aLeoX&CO
zepc44*`?074Yl$PLMmsH2jmn*RbIQw1M$sBp&P?2xqT*DdW^9pFX05$BTIWj{AnHI
zM%S<=+_zZ1V#{w6S6;O0jONH4sNJvU(Cr7&i)=jip9j?E)
zMN*g*Sbd5w^6}GXnH?04*33Hd;}OnA(s%c*$}@X51r(nf+&6ufHS7KmT_KCM86i@v
zlct^B)Oc#)mX}de;k)!o4A<(ybnQt8@mr^_6<&+&T9OX6d7A5u=D1nKX_M^NP9KW<
z_83FNp45*fHh0KtU77D@&M0sBc;T79R$|`VPvBs5@MHlspLi|BIF@+1YW%5rFW&7|
zFKqNwO0TX;!#oL^yh@*hRaP*yro6S3VzvxS=Q{VnxAA;^xDq~!
z()fax7mnLh={{&1mRg{`m6=yT;$qPwUsjy0Cp2Q^%&LC05JO*L*6_u6(DJeX@g(;K
z)r^~U-Uk1sv?W0*4-?~&eRod2crKPrNaG~RIMZL_db6^%x8z0q?oEZKmii>^pIyV4+Wt)RJjI{n$;W=jKg=(r
zyOm@pueDz#>_~ll&6h&;=x!0hHW}3K4q@}P{wwpH+&>~l5&vjE_?xsJv{p0YFG~lB
z#m^GQcn6fKCZV4n0zgN&QKr!9{S&6pfG-vzrRQM+k*bL9GHLjjQ!;~{Pp~O^_`r*_$d4z=kMR+
z{GIjMvt6$fTJ7!Qwu1^t)V5mokM_EDxy~%saH0vbPgzxkA!uoT`IR_4Zqsnu1Q(Ow
z00}!zO-&rEJ#Ks4)j6^{rz#VT*+un)lcNeoy{yz6CTLP+U)jL;f!DsdRD3=Ek>{y=
z5AmB2Mf8jFU-UoF{-g)(Py4>Kza9RIPryOG|3d&Fi5Yxr`rKRo`8
zf$VQ2iCmLf@#U#(6G`
zNY;yY{AjVr4eAVtH~ANZG(@m;pb!*+Vo(B*^kpzF2NmE2cnK;&6{rR^pcd4Dde8tGK@(^O
zeV_%jg4du8w1W=N3A#Wx=mBp)FF^9uhU?>7cs&3H!4Mb*BVZJafpIVa-hoN*9!!C0
zFath-Suh9Y!2(zWAHgTE1eU=HSOsXX29W$WV7>{qke|U0fU5I9zW*)yC;JcnU-uvT
zG5*Nk=KBNdIW-0pQu{od(4kLVct;$^^_gBfXcLOX`!g8FzC5TwOe{)B!OLABel^w6
zz$c!eoUXULXe2(sxty=0z(7oo<*WkDX`Dl0Ps8PD;#F?1@3B?bAhU=nCoEp9sEWOG
zvS86TE{nVBPzs5|HA+17P2JPR#Y?wIYn42YWm?8~`#A)bX=#)MR4L~MHAz;#%2SoI
z-)3CbiaZsQMPjL@yq#aLd1L|2z`%c+zjpLV!&$3Yc4kwPB?WOV$71J!ILif<6`!{9
zgJ?3MODnpbN`8+t(4=v`cQrA;10@7C+R@GQDMzokm-U~;NHDcuQA@I7p!S&Ojdg18{|*r>T24|
zyDG-F(qw3>Qg8%{MC=;za|Rp3Mv^dBAgh
zn8~NTn7T5O%sNgKMc&-4);mzK*rv^gmewz`xnC8X9lCCTb<}&vMQ|mmjD__yWx%yJ
z3|jYG!nO95JI&1KFCRLe^m?rkt)Y_9`oIM3X&*G$#Pp!7i=uJp?(kX85l@!W*z!k9
zyw_$~a3ND#1CO8GhKC4kC@bt87SHF{IigO_UTfU0-_4>gD
z=kxc_{{DBne*725kHz^sr5%)H;tr}jnAzg~wmXc>?MW9Buobjf9Wkr!-D)m9pCH$l
zyn~8s_a2f>czl(0}c;z@N0Z>~gauM2oSv00mC-&(Q|
z0@PhM`=n%Mpj*h0S`LHDuP!Fz^!
znk%l1LnDbpNsr%xKT<55om9^3=P2|HgKq^tO-1c|*Y_wggUvnorz+
z;Y%QPC>xYB$^dm4o;7X)PaWs`#goYoL#^s_MfD#~Cbxs9ng4Q$pFhc50MdURSnoH|
z+rbmfO;Kk5k_R6wgAM-q^z(n_@y}&`p35OfjPtW43{e+9Z@)Fl2wvI!%N~6Gs>PQr
zGJ^d?_SFHH!*kYc;JNI-UN_#))@=;yH2?fG_J2)_ygT^6Nc+>4+rj(!d(U}C?$v(X
zQxlXU${yDKTibxdrLXCbXUG5EGvRq4+2^4ozw959)&$o0+gpGfAL5^_`7)$Lo
z+Z!MzqG`}FJ79FUL_N&RK7>>+35==`+z$h&ER
z{Py#cy^&Et|C!DaQX%Q=;m>a$A7tIgNS^;(#u>KT2GX1TVv7$#5@f{9ujw3M3ofC!
zA*BiY`T4#fYedGz{MVGfJnxaCjC_abYdS+HB}l%;u%$np`A8nfnexm1{CfT5{7&kh
zf4ApX{1?|h*QdLCWESH6B*YyZM+WG%l~fc9!qjv*PUg4cs(U;yuRM(v+sa~;CRv55
zklOB!B6B%WSIic9XHj=8=8%1}!~3XiT2}MPCah3Q)b2CN%9M5r@6yrUE2WDDezR)y
zdL&iPMe_aHQsM}1I)||026%g4J=e4|HRJdjp+
z!`FcE^Q(dZ#H@=DUy%6r%j+5v-x$Ex^5+Q`#P8wrANBvw+7E^Q4ed|J(L?G2-`f7v
z5A9F>pDQrP^S_Y#&!3-==U*Y`0TcMv{MRA>uirlv{Ws)~j9`uI#kc0q1fR92zqG#{
zh7qX$%7pAck}tBBZ_S?z@@M>#zp0tIg}sBLle3Gf+w~j1em8IV2ZTr5iHwTAdoSj3
zLSj;KN^07Z=Q+7~`2~eV#g$dnHMMp14UO#`on75MZ+icW{kD(T0JYMW*Y-S2{{IO`wHi7Eaq4WC+>xg2M7rCv3(v2d>sUY&%I<9v`7=h!^%`=LF#{o+n>AKfj*3vI0T1-z5r
zobWGr%pXNqcqIh?Q{-&S`xNEr_m%efKGMOPm=fORWu2Si#CNan8a`iX_0BF8J@i6E
zfyF8%D<&n53$vE4;(DpZ$V@PS@?ve|$cc2C(T?Rn@jyd6){7L^_6>!7I+RTscdA)v
z>|ocZcdp<~pKYv7kuC}QG2T7X3urH;Q;JH`in-4e*KVwmPy{_~=Zm_mbD+m0I03I}
z{$+-WZ#=OC{~}AJj%kpD^yrr2+1JY^p3<7(TaR4lsK{x|23>;uVXV#6P}a*YuMYcQ
z@@$6LIjpa27vHs4;PHxWedIv1$tzjr8*)Fb*Rt=%F*1c4ZLe4#F+PrxJG&;ULwjc!
z#dr>d`(noX+0xKD4h&B@6uE=K|EO|f2-ib=!P-i5cCy4Wa6|Xp(5%s(KzyM!?4hD}
z3arn|KX`l;bc^?c!JZn;6UWB?W
z78d7cK>r?(A;~dTN-jvqP`9wa$Z6s#PJ!SjTD0mT0xsi@%iJtEzT6j!d^V~VUaXoN
zFl6YU*%RCRktM$uWg_2iEhl>Xe%vdMK7)H22W#V|HY2>lrLLAP7F_+{DBF=#*zxK;
zCaK(IqeG|luV@@h#Sl?=#YC6yA66O4Z)642u~Zo_MBEk14~;PoK%3
zz&*RiDc<5!g|8Pq+Iykc^6rxEthfrFw(c=jlXaY<&-{)~_Yz{%vCK^e7qPF4fz7DZ}qs2eWd#f)#SVAymnn_@xrr?I7FON~Xbgoq2{tMMycnP6chFFG-uH&jQ
z=S{}4dGK|k1@A6N?|EaPNq0ND)1f4dGO0sQT;1K~%0u2kZR*TpGw&sXdF}~Crf8ez
zYre8HPwXvNm%3+p+3Mo8nmcHg0+s6E=Tg|%Wb17_8#ipK^YM%w0OS%
z3y=T%NB!-;b^MM0^!;B9s0-`@m;ejx2G{@x-~v2=4+sDuAOggI1ndE%fDDiW3P1^{
z05zZiw15uK0|vkdkp4)_Fy9OIf&G95umU!40I&lNzzGflWSK)S=LS507aRsh03YB7
z0zeQ50bzhFBMNgdAPyveB#;8q;3zl-j)N26B#;5JKn}~iCh{CM2xWPN8Iy+io4bBqd)cyAkqGuwUq
zCwvMbyZq3WkJmaH7-Gr_;sv5f7&8mp3B8O$^y*LEJvebM1ck}k-QxR58*QVcNPrc_
z9X1|8*8EA-*~!_&neA?r32V69Yn)%*A^3l_kA7|cC;d@=evH5Ve>?vAdR1MVME55D
zXef4{j*D=u7q<$jONvIvob^)co{ZAVVLa*kb#)VCA`2C6Yo8o{j$8V0_{i-iJ!Kw(
z=F%fH;iBw?MIQyZWd~S`W8XzIg{(Ln)oU=Rd=eC{jCxc~_rBcWquhZktI1bvRdtpb
zgH_D;SfcGn58xM>7+ys+2|gqy^Zy(2
z-v@a!{(=0hAb-6t`3w9T@<)27ApK0fb^pB~|4x8RU*jha9FOne{^|bzpWQ$GasTXh
z?+lKPjZeIrd_Oh)@zc`s$|`zoeWwpah>3yPMT$v^l16Q*KM{LZU^r67^hu+0&M@a$
zj(>8Tt1=}8VYtPz%h0U%u)!V=xvf}_ix1HknXF7)Si-rCM9jO`f9*>;a*{rZMmpvgZv$oKlf6@rn&J#^x1N>I@U|(>PxeR
z_eKZFTjlY`GgY1~Uo=p3v9B9sS~Q7ZN=TZaiq_0BXI$jsn+u`VYn&@;^bwt8B=Yir
z&3I}JwWAyGTzGteA)MBSx)x$qAwJfEW=1)5R^7wl{@S&bH*Fg2QfONX(#^z-q*0~E
zM!gB9NrzeryeJCVa~rIz;%xH7s&eo2i5bNw6WNYD5sL_aSFAaptLG^o6)5&ny>jGz
zL)+PDg(mri#)VTtR{2{q`LP+Evz7)kmP7O|-pU=^%k;4}Dn6BCTS`rDABL!`>WWDF
zD)I(8h#Z==9`8QHl2?rNQvCcwg`>3Mx*{SgSpo0vac}NkC?-;o^J|pOep}e>NF=2A
zI`I|HzC8{+c1H@0tm~6q+~wkR7fh=%_HWmIv=o&vw%z?IH~-`QTS2$ULJ~cm$j*^e
zl)2&5GwZvAjuzZ>V8$^(hcL?atLNtJKHhhpg_adl>fGeKbKQA+9eswyZvW9hZXS2;
zQ(Y6CR=%B7l@8|G(t#5=u_=4U9$}X&FB)9;NRtvXFLnxM)pSZXmW(actY$Tm--z3b
zV`La!QK@24kbsUjzHl?Zi`?aTcjddL$}48=z49w7HrE{eHIF?bDb>rFFOkZ{ST3gk%OtBUzn}@vd1J4#ov9#YH+2?O095%}%mTBJ;wibYH
zci{q&7WY9DUKoM!jY_x*AE4n`6ZaH^wF
zI?{%LUjzh2K#>jtN|UZg5kaugL_|=EAVrEa>AfQe2+|Qys?s~sJ4lxYklMreC)
z(`UFE=sTSmU%XULaU(s#-upVuv&t_b$0jxABvu0JK
zFY?;BdXb6;h{1~M+>tU@PfHY)hcG3IopuT`APanmuO)j%Ap&uA&ZPjkH8xj&YVe_6
zr$mu-EKkh2co((PwC5*_9!-;pP9skD=~JERTdJ5m5&wt!#b2JY@9e(jxbRkUB@l-SkB{-~Qp5D4GRYC{Z(OBJE4-2`?x`CT
z6l~%`?fdN;Zx-@Dh{#V89Jy|MMqIj+j`HNSxw()IK`I4Zxv2Z9dc87~i;?Sm?IV13
zmX|5feGy;rRrC{mFm#eQZ#W+v7vB}1>qbVHCq-ni|6nxW0-;Y*XN*GdJwVY|DR(5XFP^E
znW*`&27hrk)O=2wUz~}WpR4)POj#qi^Wl8o!}bpaw8#Dk?H@7(+4ugJKS}($yi7{f
zU70M2Hd4Jyb58m->5o~{@-M0dzN5j?CcFFuvrM7q9FnmLALn-Y>5c*V%j~S7I@=NQ
zIHQraz4siBH!jZi4Ybi2H<{1!RC$kHiimP1a5}z|QzdwG*&=lQ05Kj()j5tCx$(@*
zRfNRv
zH6IOS@+C2j!{?;Z2uj{*G#Naad4Q-k+r1A9nxd#-w_K6~#6)n_u5_r#vXd7#F3Zi{
z&YEI#<77#ZA$d(Ve}bdOC<#PWy2qTB{WEt|gRd0cHj@rzA5VM{LE+O{K3%=-;g;Y)
zEteZoeLsrcEMYe=J1BzcE~$=lhSy@W4RCp9^C%6GFF*bq<;VIGk#)NOcl?_gC!ONp8lL>h
z{5SD@RnzYg1X5~o8=3sDr1@_C)Kbm+o8xD0OTGD0s=QLa-z;W&O7t4m)dspi8=Mhx
zju-0<+z;uG8IkI+J~nd+n4a?YZJtD*eAKWEAH?Vi`BAV~s
zz2q!)8J#Z;c7hk5fTCvxR$0oUjr%yz^%^R*+>flN-T#=THx{Tw-kCPYpLxdG=2oEI
zM(S!&%K%=@0isEIeV@ZAyyVo!rr8z7HDmeG*(GgAnJ9RnQDLI{m=XtwI-LWA8`HSo
z)=Zq!=!1&gC&i9gQWaAg^V)r*8}cOMgz)HDTfd8SfVfVyu&}ID^ASg&_;%7{aM7y(
zq|ME(PPOH`FEOsO8xU`sL~asj;Y7a`z^m>%UX^Ywu6QM^GoJ2O?rd~e{(OY~oZr%Z
zc?Q?H09WuFxB++I0bT%4-~~|gMZ6*P0lvTw_=5lt2!g;X5DY>
zQIJN1x8NO!0kI$s#DfHo2$DcDNCBxJ4Wxq%kO|&{ERYRyKrYAw`Jez4f+A21N$a|Py=c~9jFJW_p|{tf+o-mT0kpk1D`-U=m4Dn)u+}CdO$De1N{J%
z*C3>y!4Mb*BVZJafpIVaCIRZ)DM+WmS12zh2G+p_*aS#`
zy5BaWJ75>=fs?4Q5=aq{{-@(N;UciV*FS%b`e%EpsWz-_erZMAo;OAB5;D5lcD`=>
zbLd*8!O#eW7yj$OdjF#oDQm$oB}T3l$I>A%(Mf$3j-JfP6_OWU$_oo5nqF6JF$Z$l
z2sa@7%S5lc!KQ(4@qg8@#s6=D9hQGr|1j+@ivOzLf9`*M`~g7=KMmAsFDPn$)%eRx
zD0{@==Y=|W{`LI->G;c$kpGjP#-Dh9hx{ubfA=4je52mCe|`K5^}Zh-KfbH~_~QWN
zkE%0K$M^Az-#mV?E;PWqk%E4%08uozYfM?!wBYQ3omnElwpj`Uq-LtAs0-{m{Dx*4RKk}>ZE@ntUMonca(2Sd{_S~^e5WTLaSH$
z)B)n7{xxbL$L``g@9o9k>(Vk+h~=Zx7JepmJQ}{txZzxcJTu1eLXoK4jW{ieBTIsb
zA#k$Bz@`3*A%baWzcj*R(_!wL$Hd6|o3RRS%LU^}h2gWh1j3|!^??t3oukBN!nSx0
z5E~eQ!!v4Mys1grh%`v4coK7Ld9a@Ry;qW+xo7zUYr0!>*mEAnu
zD$ZC$7j%vKpR06!{L}g2<6-@y_y-w3W%@pTdhGb0r2WOYB=26=qvSbxs+u6w>MG)l
zeiG8@U7~L;lAA)}RY0TmeV0c?=16pnxsf2SL+h8L^EqsMEBuMy-(Z6
zw^!-9CN4;Ko$>^N4Tt3N#<~1&ZT(GE#RBcKQG6>bNcUL={78{Wy0acTbZd{Aa6I18
z&8pk%#)KO!Ws9_3sO$Afe#|FS#wSca9Y1)P!a>q7U9IrW*8MtqpBJ>I0sguN2m`8^
zVvZMAz9jluP!ufZC57Mol#V~ZG47`+#lBu+64b?P#7NaWH6cScN*UHtnNF9sW1*7x
z?sl$TeHh-HetKj_#*K-8VU+&%R*?LMICOSdR+Fo3O>v>xgZie%e_{W2!TIQTDU~>f(ZD6>=Ga
zHms_tTih(RrK*=)_wgM%N7}|y{jVum1!p`H{8;K}QR!9N6+Cf#)oCnIdo$m+nd;~(
zg5W!>SGASiIF0gjm90?M!p>rj)Oul9&lWVK@DvC6RrHq6OXzeTy>-!Kr(PX#d6WtE
zxU}a94co}XO%K{SJ=!px6MTx$Yn7|ydvU1|>-quA%
z>k2DA>a?!D&5vlx<44CV@Nc$1JbX!!6PtFOfE8vjOY
z)>uK;a;6pBNv9LzZ`kSY=u6k!_-Ixz-x1-!NwP{6{HlT=ZJsrcLXxAp$JU;A!?eG3
zSij+{{EgC!UyqvkBFVVJ$D%3N-5xt6D)-$?nF)2HlCXJ{EPrRg{PCt#vtwS}`?c=D
zl!dj`s~q}gxEF01pG~_cV_Z)ea&R*;w4cNDooEV~y+wMy#pTqo4|sNA&0X5vPwk~O
zl13Oelot~%J1FQs2UeA9LOmse)U{^H&T4U+z7tZ!~l5#ljL$-}AZqWFdCHV(jBa
zz!$~&r`FX}$-}|H4OkBL{G^*dbLi9}7O5`pDm4hDP+^+uiZglf{B<;AibJ|J%-K(C7XV8k-
z-|n->=Lrqmp2g8H8Y{!AzUIABe!f}^E9=9)>;$2lnO`n)&@sKD#W#{v21%ge$x%z!
zf-9v|+{2+&QWm+$PR}1EjwhZ{p_8QZj?VXGkVA}L?gOs-?;nLP5IV%Xi+PFJP~I*&
zz)XJr{iA=>I5}*8*uwL~Z|VR0Pxt?@AlUw^o`1hT|NQ3XpKTWDUbftDvL*H@1va&t
zbb-9W(p|mUqf6LL%IRm#MuB)|E&QaXrP!o)-r%swHu+OB_wad5}CmJX037
z-iO>Sib#I2*TSJsWZtD(8s?x;R)K$MINkB&z!lu3vl=6gEF^WRxN6HAerCxpzb>#X
z#A=(FLT4*u^3u26)Bumlkz9+hi$b2}bLaciN`sha_qV)z@}qZ{hpl6D7R%|ZVZnCI
z{PT-h?hlDixJD2(TOT0InZBKSza4)Z_jW!ro2Ad>0pgbGMid7@kuj2qaoEyJ^`+6I
zFTP|i+q#3`@J5F;ciLPrAC?Fi&Hk-Z>qpb}az4vHUb!)MJzS>4o@{hS!Y({rkW9PS
z}zRIK}5*G!Tv=8d{^BR?o
z=RO`&r5=_{uy$FnXPdy`{B$#ow6sb5-S8cCsl~{`YP{Go^L(cqDep9o!QA`$<6J{U
zMqDko1$f^fvd2r876z_1SJl@%nYbG=F2&xYn)O_)vBcU}XPMWHuTu3j6ZP$dQjTRi
zr9w@rBP*6ZN#6V0`fQ@}o7c9vBwcVFLda9&g-yFBmE$t0`ESoQ?s2RNU8o!DetIib
z#xFO}u1;L4aYZ*_VI#2Hf?t_>tfD^Hgp%=I=NQK04DL?|>TAtT%uD7={eCrq^ga}I
z`&YWP{aiK_9VX+Yx+5l56{pRmTt>(nUwm0{+w&Gh#`naTATe7kiJgw*^%>APQSQoi
zFPYcMXckDg8aiu4G`4)Kf1i1Y$oGrm)VT=N&2xi$PB*(Nzbs@9kLfiybvD!r+YXEb
zap#3D*H^P0QN=`_YoK4jd+Sc*+qIQ_vktem`FS7_r_vPPjsSSqLMg+TCYmE=*;%R7=@BU09{mGuiPedX(puoew*d5cjz8+aQO#WJOu
zyVDy)LBYtLM{~T!hrB?(@(Dq}vLeRg_>h3WQr>>kHGxVU~
zjtWk)Zrr3xEACoiwOJR`t}ux9vELEaVtNq1naEMb(Qqz#^s9`VH|?hC0phl)>a%|2
z+PGZu#NI7QyK}YrBuz%z*n@-;eVFU@wqJH3JaV$IHfd5SZTZ6D-`!jI7mvw*_tV4r
z3pM8R$Ed%)?|=Gdd49IqF`e6YOn?|KiMu)(Qaci#9nIy-KH5-DGw!8C562W$e|~qUd2w{V
zxW`}5+xzQimOtl?if~2$H?RE5_?JIlfqG@AxqpY>FY3EN&AmgtBdBO@Kc9(u&lvy4
znSbv+Lwzsje>nfJ{J4r5)9gDKMV!1XA})eJLqkKT!9R$DLBvf6ZgB+lFB}-~FD5o7
zCI$xPaV)H(*eCwe?O!SweMS2(T0hD6JB&ZfL0K;jKQGjA;fFY(KYspOKBD&jJRJK#
zrN8DL`;fopPvcJ)|MmQT7=J>=p#8P^qt+_s|CB%HzbXI2_u$vOemcls<){3=KmYvZ
z=bz5}b}lIbCE;Xi_eNYJnd0kQfvOx~NebGUdi~h3ml3wMfjUKS3hrQ2G6dejJuQ=W
zlgm^g^Hs(JZB4I2yhKu(?QLg${|J8KT)tI_kQa(+Qkhm+6?lc$ZbXFuTdWF6C0FfcJ>tl;HU_X2c7%FpPJ_iXg|B?{*vg1ZjZ38V4QK{X`>FqME-I?5@$N)K@0F(d~cajQF0~&A^
zoCCA~bw7GY82}?V4^VNHnE`5l4_3ei*Z~K)04@Sfa0ze$)V?;T`=IvsxeWNg6~GS!
z0IHoJ2!y~ja2?zLH^D6+3{cmLLW%^adg?Zi0C#{SxC^AfJs=HazQ0Ci72NcF)}U;qq(5ikZOz!aDPb6^21
zffcX@Hoz9x0ej#89Dx&X286%*IQW1#g$=*YXa1|&FW>90-&}v~P>l2XK!<@+-DWw?
zvSlLsv$wh#>fL#%PnfuTkIDPcslGW9k=c;f-!&FY7*ZXyA&4|dS_pqAv8R8JcC#Rq
zfmr)$tESIjh7_yqdOY&9*(6eZUw&#zskwn^r)?+qanQP@kY}d&J}jHka~5b-?JpKW
zzrHczu5zwhfIImbPQ6|b^UX_6<|!#Pwh^oW*?~5LJ!MX#PPI1W=f3h9>)#ViM23s|
zUr$nsc_qTguO+K~+kK!~pE8ve?;6IG6Aby~sq*g1mKS#l*rW=E^Y^E9(29SdG%{i%
z4MLVs*L=d#Urrcf6X53*NO4QVb${yAL^_wV-|4Y$2lM_N{8lorEWgs!mGB+Ebb#;=
z%-h`piSI#WCm2#&@#OU;}_iPUM#6>CBHm6qC1>%Qs
z-CqqXG;K7Nz0NkqONF^?7|Rqb2gOmo;oy?8@^c%CsD*PS)U{;}`m{B+%^?Mi88shQ
z(tIaZYbGc6>Gmyx4iLvqJ6ZP*Xl+R{zoM0kDG8X8tGRv2L>X`GR*ovhXSOz%b^Q^X
z&myJ)3XQZrenK`_i_w`w<}A=3Ja6=jnq+X?$vu%g?56%WE?)?L-`JMA{{?=AYvRo5
zdF~yiWD2GT#);V3;>LoS^y@`X}ose#&
z@#w0ybYad*WcU?D{rr>;X5wtm_sv)ukNh^gRo4cDcIM?JS29MdJaZ=sGTxvaAU>tG
zl{Y(;sG0-|3*d6xY^)Jy&W5Q~x$02HwL=-FUM62PDluBdAgfk6>?nGbs#IvcekX4+
z3io9r(qL@yVrbC;qCI$Wg;l0XWTd%*!CXzt)~|EdvqHxSLs`f1Y(8gArNO%$oamcm
zmxW&NQM=iY^rfy-k9$#eF1dDei@S=tk6D95*(%#0b8QV%z{vfHtj?
zvdTm8?AcX|u?gSnYqwrF$~1Yf;$cg#?fN9?Z&M|kZ;}k)CM5Gy8FKWt2A5~-c<%1$
zMc1<#>Xb@pV+3BJ&Sq^^*qgFcmzq#9*~@h*+x~=AWX(AKaM|)5VL5e4@p42;zetDH
z#TtAeM|KT=v-VHEd-~rvMmg#@kcy5Z!Fi`J%S+UxIf(Jj1uLAUYv}D
z%AS7toAcs{%}1_LLF8K$^VOf^`>2nOpRzx_oLDmK^mXkTscOD^sUjXXh`q%USr~7}!AaB%qDAd9Iujl_yuRl(sVS#O_R
z`sCyESp#FU!N;_J*6=Z^}!;%K6N|j?}L~-vs4B}tYo}?i7%o*h0
z!Rd>Qaqcb6nf{d#q%yhu-ciceldyS`t;$!(N(LSsk58IJUZE
zirvJ+dG|_?usyxa%1x<|RV(tyEL>Vj&)(iSVT6P90RmHD&%FZF@trk;KcWmjmH_f&)vf@DS9=k7S!V`#Pv0E
z_yB?DRC%HNxXwOR$2jc{$lJD)ys_P{XTpm|L5*_SpT5bll~s{&p%uK;6M-b_wwhU29b9Pc78g7fq{;J
z1*6#rv?Epk{S*e~*^5UBu1jM*HaUHc^BFebjevJqmB(l=$t)A8o3dAgHpw5M{2_+Xtv^%wvj=TP7pOd*gV(?fxPuqq74QUJ
z;3e<|KEN0F0e=tx0znW625&(K2nBCI3J3$?AOb{!C=d;WP#h?LJUS1mQF+!bpve&*Lj-NlWhTABbRBIo~bpfcd?m47xz#Vvi7r+yEftSD=_yAwv2mC<*2n0dk6$l2X
zx;zxT25&$Z2nVPu^uD2FgJN_y8(F6{rR^pcd4Ddhii6fJV>+nn4R_1#RFHXa^mj
z6QJ_#hO`ItfHk!(arAf-x`-Ccq^40;a$;K;3T!(pfME=D`A31WRBU
ztbkRp2EKuHumLs!>iR86x4~H$-`It85B2}S0YJe2`vX5eZ1XNu_hhdx5!a6eB&w(k
z3`xYcm>Mi*vfXdq;cW^CUX*%V`vf&hAXlHZ@-)&#S^GixGOwqBK^{x;ZM`Ux9?e@g
zG+U;r91U0e(MV~$$IEkYJ$!U`S{tm|9cK7#^YmxBwpi=Q1lYLeJ5B8#GVD+F^2X>6
z%H~{cyRouVnWI6OgG^~AC{6Du786VnRc!9!cEGP6$P4zUcHofdrL%D^?z+WrMsWD-
z=If86T4jWI`m|yt$e_f=EQw{K>s?P;C9A%!+=$y=#P_Q!6CB3(3X6)s%SyJk8f$e=
zx>cd>En!A(HPAf#NP8s0qE`746$O5pX84S)XJ+xmDJPFN)1R8N3gdN!Qw@U|qW3ZR
zOgWV8{g{j2q%9^C1cWxbH5=tl9>v0VplV2!r&MRA8|IjfS^f;8x_V{s+<@w%9Inu2
zvfTzxLj~e}L7xUn_4iH?qi2A-W~P5|d%v`p`ugq6T$gC4lF99iwv;aD#Lo-wTu-ZD
z?v&}08Ik=IUUMo*_pv_CGtBL^O>8wei${}3c+u)iWF0$~q+8oR*U8A@mAjWQ6VczW
zU)e98^5dm&^W_OjmVuqT=44+yB5%P2=OPo2^@c+b(U4
zLPjiy2X~7)Hr{%dy_I#7{xO7q6J?qNweSOma_jb8t8v^TpRXs*ZO7-*sEHJ02cv&F
zQcooHUa8Id@4u
z&I_1Kc-r3|=l8iG-qNmiO7qwkhEErcFfJ#}A7kvAdhhhZi>8L902|S^WB0PNzL8|T
z+3;GGwA*kAs*d6;=-?<7qU5e=r6bs*fMpbkq@18ayp+$b|XZkx!AsV%`LPxnoz~5s+T;x
z^6h{w4jqr;^XynrE%pzzH&RL>vJ3``rg2<9q&f9B)rYwqAYO0?9xR#&f>bkB{TCH5NHYoY5`;nLQ~)LW}7J!&yB4ZnTC0jb%z
zT1eK)c`>X_s(UDbWxU}pB_};du_u22uASlDIzwi1{
za^OMw#rIe2(5&T%lnXz5<~lnGM*A?AcS=1`7F4!rx`b4{?XiFI0Fix+n=I3-bmOBp
zxp@P7KjU!(X+2fZlDs3MPX0#NQz4Dcu`n~%P#lW{#d$Y2QBu=VVhr!75kG;A@D=i_
zSJ;kUPk6(To2$e7CW|tQ$CPK`qoM6|!QF1%as~xOq~*ko>~^ZFoaXjvy=n6qpIz`S
z-xD2LLPo5a%E{dAE!fI&)U!_~vVR<-Yb)eojuXxw%{eto%_)5G{Tdo0ThNC}G!tYm
z^@i6#kAQ?hnzhyKY&%|wL5vIORZXj$n$ab`W&FKD%C9EqDI^^3>gJ9V|N14#hwX>E
zP#^pe`k%k|U;KIIuYP}i{r>#=yFI_IN8*gSSih_yA9_j{>7lN?po|oOGI`vT7@;3pgyz@5g*hO(Dz|Ycv=k6nuER-o-5HDF0Nj
zs;<_2Q({vlpW)hAf%^h})yRBzv~o%J0H5JEq`HOO$ATbQca6LwZi5BBoThx-={q-&
zg7tSlu?b~=<5vo=Ho5xE*3Tn%iMfZ3%l@5~W@CvvOX&QS_34+N%K5Lq8?@%J_;hEx
z!b3f3f^3}%um+Nmv$i0Lxn1a!xN=sO}RHs7D99d*?6}3odpz~z$
ze~_y77>(?_;O13Mv%h$D)v}jfHu4bQ7*)j_nUS9|xG9}?>5dPM>t(vBJ3(&8uSu4z
zMJui@<;p)EkET{YCVm*E>|p4K_mFK@=V>2~Z(EEas4em{v@+!z^2MiIsp-|a+#u31
zazD&~cQN|c%>6^PzYpslb$A~5Bh)`c-{VLAMgRF9xc_wL{zlneg3^ZdvX6@{Pr$4S
zTTlE2-JWb0X++)3qa(-AnGt8i&pgYFvcI0`*fWAxdi(%!dR>)3L3t+RV}ZQwiTw5_
zm&MP>YG9!YjAdgvGPf;sv#OB5;MOVY*cy|H-Lvm2DP@`;WYc+?(27SpWS-i@S&-iE
z8Yy6SIi87$oExiqmRQyk>$swzJKz&sW5u&+*_K=C{ElD2`2h#x6vn6v%ZE%^z6WOE
zcdrOD8irOx?zZ);rj;AVy7-dd9uG(5LApWO3@S9mmUIaOO3eb@{?K=?(W
zcUp*cPOo6F2pDQuDh$QSQJz#_XVF(dz8P~mafW|K>R~~y
zXw&UkQfDvBIg<3|Ib0I?liyyP=$mHXLjX}+#m
z%pWN2dLjH5ksvkFNfcSXJa;XpQ@xo@J#5<6_FsLG~K|H!*}L370k70gK4|u
zTlX&>AY82MnWL+-eU9QR;p%;AF5uaY%xh|(yOVgino4x`GGB~Wow;sTkI9{H7y5lK
z9W63m*CHwlvfN6KZr-FOw5M9$tii|CRWy1r7IZ(bkzQd*@kS8rCs$}Y5tcZn+Q0T;
z|3nXKo+OL-1y#km_P7LXgTZGQ?-?=tVRToC%H|Ene9rQ?gWUMmHxV|$`6_nGTXE~m
zZ&wy(6g%yYEI-&b^w3~Rp;t+-aW#}FASbW;cTI!
zXE`Aoert$z=jAm96TFFT7j$QR5hG`+W6@Rlf@gvxEIZ~i$fvNImx`2&Bl{cL;!(Ml
zEN50b(ylQ0WsE4i;l4^Q%f>*EJ%3yr;cRRyJ~tO(Q9}wF2|GN
z1U6!~sLoNkh43EM->Q=j>)$Hq5Bnq3zqGJo{?9c3=>PEilRcUYb)grQzciah?H;
zl4L?$chZAhyq4BfQTy)bm9w$w%Jv#mRZD^k971dp4I`U5p#-V(00)AgQRDb@{3
ztJN8U6!D~bG^Ktz{Wlrh$KtG`&2p+q1LVYspA7o9mUk`>ikG+BGoC4r2@67GG|L*+TAwGHM6z{t>g@boX~BSoLq{HsmF8+9iyX
z6z6m*FRdyI6G|(K268G42%~B0ywKwJKjDu}XNr$SdUe^la;j8nBgD=Kfs_zOy0K>r
zSjN898&FQw>*SJ7vm~+giOicfJNcH24Tqn|=#^kU0+;Yk)X2kfy7t~0@-xE`lTQop
zrBN)t|41+P^*TDn1uYu?#@X8;xoS2>^XX%KZ;_`*%Nz`~_j^|agSEzS)fZg2LPHCP
zm&I9qYfVKlWzC-7IAxh4LNGnQv+SXYyb*m;V+G%9dL?3?X64TIm;6+_XXXZz`T3sb
z-pI-l#a_rpBR!UNU#|{7Br5jt)2C?$>HWY=N
z=kqaMh(mv?d_z5B{G;RIzdru(!?*)#>;ZNBqr48k_7%n-Q1c;B2j{;be^lHTA@FPS
z-+{bQb3ahWrGG>ItZ<)e;MeAV9O{}(Ot=6Ju75p$G*ncY>)_YsPYe0$|MdC~>p#?d
zmOn!M_kI1*pQiuwN$LdJM47I=e5Uf}N5~M%ojZyypRY)0N}XlvJE<;swBxiiK
zd%jYkOYJjbVo!m<*`3??Xx2I6E9{;bebp&5W}c%Q#wC;*_!Oh7zVX2xu_msr*QiS#
z$hSCBL7V)!J$X+q?j`AHmBRO7i#;qJdHQ6N7jkIS-MWwGAFF%dZxT>Th_<`l+Zp}d
zXx=Kxu^U#HYWQw2rI+Hw7Pq90u*)}}k?W_}SsJ0XFtxti);>Z~F&bbSfczRVOuAwj
z{&*CgsN%#HC;W#LVhx?x9;TEYfdm
zKtrumLajxzgjDq}Vr2dO_*y^gh4fQ|FjKg*HpCS(|GP28P_Zlz%P-X2zdu6x_20IB
z01fJbBLE%1G9m;fI0~=;HaG@Q^9XSuJpph59>51D!6`rhP6I+f1c(6%AO&QA9H92s
zrUYjI6`%$*0Cn$kkX{6IfF3XaMsOZ50cOAgSOFVg2OQu6KwWkP7nxzYv4LS-Qymlw}3DZ0ir+*p!O-d4J5!FAPMdQDS)~z1X5J&i2L9%
zkOgu;9-v~nJp_tC2|NPI02O;t6{rE!J=7u90GdDxJOSE32j~Jlpbwq`17HY@fH5!u
zsC$?}Y7Q)bC9ne4zy{a?J75nSfFp1M&fxp}kKa81WA7~T*$SEcF^f1QALfY%fqU`l
z@2{lNNjqyYA8Yn=#}Fxff5P-)>xl~LZ~Q*;cRa-Mi+aol-*gN(+`v44E?|G0&Jg|1
zQ2#wG`6wwO(G8ER-gP@_eBJH4J|?M(;?__6`)ksfA0>1?J>mAug>$f}IhKa~bH=`-
zO87Xw=RU=*a97QC%@y~OxU1bkEv8LYC!}aFM#!_6E?Xq2qxp+d6O3}t0PD^wrF7Kx%&lK=j7Uz|yD^Ykp
zwjPfl(o*|6-8}XT!vZS+mYY7?KfZf;B_TRPVNOxii_3{@=Ap92t?>GR`N})xPD`;)
z`F?`KMpwSZeL(C#ovox>i&bFzYR7eepeUtHlrq4a$}!NUdr1mC_mtO?mHR(GI-wSE
z;UlvtC*4ac)p)%S#ag$rjc^ORciQLPoQvwYWuZ}cBKeW;UBuic--zC3Cp?QYEFUU}
zEDjL3U&)CJ#yvAw7r2k*)_2o&$q-94(Erpw6Zd(3xsFaYQ26!2XR_Yma^kNA!&J-m
zasz3m)zCq+-ubfLC%&dv<|FSGjcA3YtLeMCMXWpWgv?#R+Q-|xJ
ztf6@NuDqfdW3jHww36UeqtftFkA$pLHc5Np4k`n6(*Y$DS^i_u^7Tihbi>
z5OVXKIVz_duWXv0_v|ChGxrn61AJy@Z|C&kv+MMqR+Nfidtm8xRADVn@(T!=_2Q&BI}
z=Vg9DU{A;S4o%qyM}_Fy?c=ctE;puWY>Lm4TckczP*M^Il=@Pe^|~a>#M`i`NFz{G
zPQ6CkMBq);r~$vt1f8+Sb=ot9m7^1kG|$4=F`{);x8@EI0Zuyxgd=%U2M8gL)tB%)
z7?bkxWq=^z$9M8Nx*|M&qhzX6j%70+wgNHL;sgTRw?z401#NFG40ti)&R3ih;tnI2
zWP0K)W*QqZQgHR^v3&>KRZ1?`<03P*Nql{rMeDPUWoyEOn4wd=J92aTwg-rb*j?yd
z`Z5)2RuFjA?{9Q4p`H{F(FHpu(BeOgh^zWTl!Bkz{*NJ&;M4!{tnkCUSCcMo)Rn*P
zS>fkr4b*c64=U%n!}>$@57PcW@jZUQpJx30hNQC50YY8%g#Ix7ihI`BjUqvrs*_T9
zf-X^Kc%}P?aN2Ux&Yc|eX^^_4gT;R_dTc>8MRi#+@^Pu~4jGa})=tTevAnp4-6t<5
z*qvZIZ{q2-8h;2+9%zikP}t2>{64v5F|Jc?Xhz$iJCw82(ZG`btn&SMnJ~r1#(nt`
zmGq=J2Lk=%zwx(^`UCti{x|AxUGs;Y0Mu?2hvmR8dk0W)uz67z$TFZkYHL8#fGdn4
zlF8xUFKVscAEEt61W~U4Oyh6d|Azi&)X(-5fXC2Z)&I{4&z-2XmZ*d0U(f%Cd{KF$
zjvw#(k3Zgo{P};%pZ9mj|G_Wvzx+GoFAez*1Jv<Hz8V?49=s!?SWeMw$!S^K>C
zoW2ATj^4>z9pY@&!zZx9wtFrd8Nh!iCd@|moJgTL8
zY2xU9W`m%nvgy%HH|?THHn&-P6E)yVY*i3|E=4AdJOQBscc
z?ob`dcDC=vV9Bs0e67xjwp32ILZ9eue=%+@AFZcNCeLe;K9r(c`6i~?F*JAMYm69F
zIvJuHHV246>QTQP%>qb#IIKT7{vh=S{(ss2
zKi~WReslldwot7KU8q#oqKXrNvQmqQQ*xF>^ht3%B5wY|d*^uawDXSK@;Xu@|7E9U
zl5GTMSG>EFCB2s0H#^KX((G~k=b^z7M1J((b(-*k;%j6d8_B(3_%DkWY*!EJ;xpWLU2a%{5ZsmN5cwgmOscbK|
zT<@7D9@1OGlQ6YnZot_l;k72)MgJzI+pVdAzP9Tk2M#TQk{@v)!wx;?kI;Ujfn7&_*?v3x
z{=b(W*uQE0@b~iL|7`hzDg_YK2m~4??6!y6aPOxB!Vvy)pMjIGLKz+X2nIT8*F8Af
z0ltpFIE6`Y_Tu%Ur==fboiicid=~KT`|sa>IR4_EXb%T0{mgwi*G?T~@YbgEy-A5)
zkY7E~sLF}G*mV}2sI{7qrnH$*-)fr7EXS9{BSdsu
zZ`g01JmSqGaoS6V{7RdzV&d~$CokSB3CZ!I2C2HlGpzDGmU{HBBq)yRYLT)cFt3^A
zBBU4-jGWigamIW6xOa_PiBGzXT2U9V;v5y%pvk{Bi*FeG&Eth5g|&Qbab8AZy0z2Y
zZli@)toMfo)1D*55tC}p;PCa>FLNv`dgKHD
z_}S;<8qfIgMW0YMQgurz&g)EX?|dnxPPV>Z+dgYaMfsqx`<-fDEyFt_I(=5xbG-DP
z+On6i1k0E+U3W=V5>?y3%~|E;+DVkSgz|1$U1*>W=`XkZFi;t!J3uHzV~WN7wV)!a
z)gxBNzhMklNv300%7{E>R=&6MZcY+u->lLk*(4#tb@mumx8o@!@!HtPvjr|6DLDtT
z2W#|2B^Ab^;jF&O?~gH}pB0h1c3zC)S3MaV*1zxmAme|`up8Mg+Yf*A@{jL#=zlPU
zY9Rfm`HvTV?8iT>JO1eu75@U&?}KWc{@VT@PspF|r~aRd|AzcgV<2MxME-9ef7YM!
z=lnP1k9ytW|3v-|An)cQZ~+|8;CpcauHZRv1Ma{Bya1@VC0>xe1m3_0_yRxR4+20S
z2m-G_FhE@s3h8S=3P0yCNW(z{hy+m}8oUMXKn#claUdR`u0NCv|D6I-K^jO0sIO&0
z`W|F~Y>)$TK_18l1)vZV0o3^=kd}fnP!1}<2T%#BKsBfVwE%T~J)|E&184+Ipc%A)
zR?r4Mfp&m8zZ23f&<%P(FX#jPU;qq)&tM3k&L4qv6pVp!FaajP7cd2;!B;Q?W&!G&
zc}N$)B3J^;UjkRrhr*akab7wmz3Z~zeSv-v;V|F?HPEt<$WRbpAr
z)hum}S5>ofVFSxwWcAXe!dtg)VMg}%%SvB=@&s{2j3`|NeaBcg%xCk1(qJlo(Yx%<
z%=E=|76mmM$)We^;o^5n^(p-b7tXmnPzpqQdyLCz&}{5(@;F5#yMy|K_=6}GJN>yG
z_54k@q1exE5}fCX7c7G{jw_>8K907{tUExQnzPJKNIgMC-_0#4vZR!)W8cEobCryj
z?@_FV9S^#jgYyetPEP&x)DKbTJJuJ@QAlu{>bDNuuNo#@GBjWiWw=o|Tq!O
zJecXTwxlqjEH-m~eA1vUxkJnP{EUIF0fhutM}GG$>A;!|gnY<;dj(mBAU@Je{L15O
z10%UIB_+*L&uQ$}O%0Q=v0~_?U1Pm!K{g+6Bu=nI57O3`pY7nrrP@(~*$y#t#m|eC
zyVvS-cFt;wViE|8b){X4MW=ZZy14t?_4W)}>_p~ig-6!a^;h;rudwB1Bop?QGjvW4
zgt?WZMLoJaK=g|Fy_%`%^^YGjRGKF0q7xtPimyz$jw|acb*}TNS#@$1_T7Hsb?$xb
zRLF^!Yauiog0V*nePj+0$_1VF;<_s@Yo(PHRQ1IZXF?{_C0LG{F)4@&%bj`_Rdn@Y
zP>Xd*?f&WINBifOd!Mh1d@7X`Fjki2u1)eKy@mb7_?Vjb+UqD=g9#U@)21Z`vj*`2
z+mbtEFc{~^w0p8Wqg28S2bs~&qenc$Fmo0&ym1ZdUM*sluhuTzUi1KgQL?;W4r^hB
zCnSyJ!sVO@heXc@>f~#Dynk|VzX74~taG^hb4GWT=OlG*W~JQ$!rPIkBj{$3c>W4;
zP?D&Pu3-ATQP)j{bP>=Pq**V$LhCO
z2}T>}WaBEH>bXxIBGcha=y`W?%=OZFqRlcw1$-|j9o7HW-nBqOxqb0ZikLDtiBPGi
z#n%LD-D{`V+8Rk85phK1ubdBa{4}GOJ$_UCPU5dWapSLJCI8OkFC=%^
zU=PF#1@5Hi3pCr$q+Vkl-G9ZdX{TDniwX^81>yA7mbXfdCq`CB3aLhF;}$^s?Sl4j
z(2$D9V1ow`VdWAj$^7$*>bTf_*RLmRlZ@L}jqUB}?|$8)8wA4f3{$FPA*?ywoJdiY
zxO2Is;^dPnzSB~=&fh&=ByU#3yZ(lt_!AzPTJZ%b1Y(B;w8m==0<(W%9HY*?GoPBB
zJg-zEv`no@&{$Zj5kGMN$tAW2J#%fh8%mmNLY#r&?g80w{NFO?AI_adN0&P2Q0o{JML$G~#!5h$O~A+@fR3FY|AALOobivASc;a2
z+ED0Ha-Ro1)0%+zf({2b1(aQSc!?DttT&XupZ%S*e+-;vJ(lKgKk)dCsayzqFcco@
z7iTGStU4N-umvaa_*uA9r(d{T=FjQ3-O_@M{9In0xyWa6I@5@MPMU+P1+|i5m|tS{
zTA!-o=9E7_Ra;i3;h+#QE6)+v<9XX>HZnF|wsHZPoGiBeNnR
z9$C8^P4z8)S3$1-wEIM`Lp=f7_&C2}vF106w_go@Uca_$WV)t25B4rIva6CdAfCm~KFbOtWEILFzQJ?Dy08_}
zq+J`kNx!ePj=RfW)+Q=7ztd4Tp>tVf76B(jURb+8>#@kh&%WwU{wLVur`IqaAC3H(
z`ZtO{n8DM*wDXJjH`ihA**qA3(D-`&9P@vE1^w*!$D&ctUjX{+2A^N^>-F=Xxm#fl
z-hT<`?;q69`T1L8>-?b~xc`HZaD_Vk5!JiAoE#ju^g?qSU#5HMqxf}uQ+8NIPOs+6
zH}kzC?zCjQn+WbHc-o?U8k33DxuIR&2Bx=emv3)TRx9bbFwW1!XBkdPv+4w`fnPUF
z{_V|ED{hHBT>WfUm!7hkb(6JS>F@N$fAD@E)^FyGQvb)be@g9}y84F3re-Rw^IaFc
zo6*A@$Va4j5Z=Gix)goqcml=Re{mA7+GQc
zuk-&ex%SWHpZvS$FVe9uA42!_D%$*nJ!_Nm~r*8ZO{7@
z6y@c+b+Z-anh*OY@BZYrTSH@E_V}0f-Pk`jejtbe2l4%%KgukG{+~D1*1p2MA~ErK
zsCSj=jg(`Ta-U!(x%78T(p-KAIq@4Noi46kIhcQ-YY*nZ^P-p5H_(qpM@0Z%I{$0|
z{pSYfKTE!Wel*gGR`;d)>7YMhP`}DwtD>Ov|91iZf#dlv59EE>`Z*u}a{IqA(*J$A
z|F^fGhS!Qkr00g`Xr-l53lFs^v~@jf+?2WBCd-6knB|k43_K{C#B@0BgpDx)C?f=u2T5>4oigeN8NYu+`C=g
zDVetRrb9#JIV$7c`e=!G-F704WijHwn%#e%{7%LXvk)F`{$Xs4ANq{?i!uk0c)!cZ
zIf3>mhFc#z@-N=sciuf&&u0Lc8`hq_+IK|TMVk!UexpXoeo?N_IPeF&fboC{06qXe
zU?M;OAPB$!P}#|F7Xn}bKLMrygaK0lB7kWCQGgf#l^2J*1V9on127XX3m^rU4VVL%
z3(y0|0OkSa0~P>e0Sf_g0C|7{KoOt>PzI;~P#tP;R|jYS76CK?ive1IB>-)J4nP;M
z6o8gN!Mz3sIQ9P`-2Q8<@F(cR*5dXatBp9i>AL}>&^@)dDEvk$eScqhAF&`z_8Pw6
zAEUNt&-K?e+Wi-&_AAD<-!Wsq7QY0qpcyZ%mViMGK?LnC7o(|>vWUGL(171?cQ#E|75!K3;
z_kt(+nA7-qjRv2oVYo(1kX<=U-t9f#(gofs9(4ZD3KeeUq~Hi5J&lyrdq&&c)IKpp5A#q2ln;dh}sF?oSz@AnK;&T2)U^!>g7
zBeF(Ee#3H52l|xky{1t+^nl-jvRes%+cgf2Go$OA*pjIAu*aXq(4US5e~MH8jYY8B
z_|Mpg|1kOK2l_5*#1iwhqvOvpVrsn8mzFfcf^nb6^3Cmmy(R13TSo;TF(^$Qs
zuI}dy=7!P$^7Ut(IeWff%7?bVp^M%AG`Q`L%U}3+`3oz=3{K5|=6aSJi6AS%$bn%wH&Uwr9>-K!0i>+g%k
z21&QCs1(5Qm}jWq6mAy?$u-i$lc2vG0H#}Z6P=bu@Dw4L$$WS|dk>;2lw`lX!mE#KHY{jJmqTP7w^6t;Z
z9SI?oC9P31w>agTceloK%~f$T?ZEWXvVoV*;N`r)-=SU@T>;_^p4jXC_+a?%i9^lp
Hn}7Hdau=UZ

diff --git a/vid/src/main/webapp/static/fusion/images/action_icon.png b/vid/src/main/webapp/static/fusion/images/action_icon.png
deleted file mode 100644
index f2d1bc0b6a4d6637faab32d4e15351a7de39de94..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2388
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
a3_t)e

diff --git a/vid/src/main/webapp/static/fusion/images/active.png b/vid/src/main/webapp/static/fusion/images/active.png
deleted file mode 100644
index 4524177685d013019b7d6ff8c0b6a8a4b7d6f486..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 682
zcmV;b0#*HqP)djvRmvxnun58#g3e;_h37eVuR)H~l@~P}Eu>A$|#Rn;pz(^w~
zP0$FY4@PCCmqf@6U1oDbb5}PvHg&g$FhoY_dHitB`JB)BFgOajArppl@RXMY%KLcA
z-D8g+mIy;eugOl?EEZsS%a4z1Q!+WMo-(xklDS5vgY-uRS7~;Mz0#!M
zXJQHE*_8-HgP8d>>!XCa|D4bT1q2EhsAz+_C(h_GN`xUESJ_R3lNxdjc@Q}xp3S`g
zOW4-QCRHQog2y5iO*>B3_2i@-n?^T0`-<~4S)5X?n1d~ZQJirK?^h-e-HCQiHmPF(
zz=A>h?XngaI02XCTJ+BKx6eNOB8i;gaejK9>#C&zft_VoGD_f&tY9jr`Y1!)drJry
zz{rbOORQpZH-tOq+h8xOa#2D@ThFy%ha@2KA~?ch=-V(Tq0R3aC$+yR(FiG&&@S4|
zR>buf;(83WLK})D85O3p*uXkY7>eNajbTCax!+!y=-Xd1#SmWmYXkD;_NHPpTMI=&$sFP`xHcwj)Y)K@|vPu$l}alh1;I
zi0J+N6x+#!!}sJzAf*8S#9t-`Vvd+RADUOJ<{D%PnaC4N@Gg#FL0fct9pilm#VK*-
z`RN|#n>u}PyeTB-tkeJEGpU9b1}pCiRJbcpUZaFIkJNkBR6GFq4J)tFe*XqI
Q5dZ)H07*qoM6N<$g1HzuTmS$7

diff --git a/vid/src/main/webapp/static/fusion/images/add.png b/vid/src/main/webapp/static/fusion/images/add.png
deleted file mode 100644
index 46d944b3d69a5c23fb13a0b5bbf88720424d2d05..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 352
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
      4pD0wV
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
a5t{~9nuOMuz5ZjDwW6$=Oudv@#Qy*)VLAo?

diff --git a/vid/src/main/webapp/static/fusion/images/addicon.png b/vid/src/main/webapp/static/fusion/images/addicon.png
deleted file mode 100644
index 6cb5042f2be71e2fbc5bc1beef88d79df0003c0b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 463
zcmV;=0WkiFP)hG98X{hTw1Nz|2if|P_3OO^-P3|u|S*iLP7I%Yp0e29LRxeuHV1P
zn;#QK6OoeHd-rLc&b*ljIXB$lpriXd!O%<7@x`002ovPDHLk
FV1m0e&c6Tv

diff --git a/vid/src/main/webapp/static/fusion/images/application_window_bg.jpg b/vid/src/main/webapp/static/fusion/images/application_window_bg.jpg
deleted file mode 100644
index c559e590a06c4c0e393928c37ffa6f55f5da99d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 914
zcmex=^(PF6}rMnOeST|r4lSw=>~TvNxu(8R<ECr+Na
zbot8FYu9hwy!G(W<0ns_J%91?)yGetzkL1n{m0K=Ab&9e{RsmQkD>WX5a=%^78Yg}
zc96dqnaY8fS&)TQ(U48ZF_1m6P*};Rkwe63;=+vwIhBorK8Pk2UE~r|F?p!^5#%+n
z&xrF_6Inikdko>PTMRtRjKIia7G$tz_-;M#Yk%>*E)C{+*Xkc1^FREv>)DD$4Yqk*
l8Vi_465gP{|B0sgANKzYjv|2$VrzGY9o?R#v4H>oO#q+WG|~V7

diff --git a/vid/src/main/webapp/static/fusion/images/arrow-next.png b/vid/src/main/webapp/static/fusion/images/arrow-next.png
deleted file mode 100644
index 1a4f72c68b4baee6fddb1a81bf2605c0b3289d22..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1561
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
Hu0mjfDDUGo

diff --git a/vid/src/main/webapp/static/fusion/images/att_angular_gridster/grips.png b/vid/src/main/webapp/static/fusion/images/att_angular_gridster/grips.png
deleted file mode 100644
index 29b92cc572cd7523c7756a228ba12f4df3f2b945..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 951
zcmaJ=O^ee&7)}vH78bqQ(~$Mxg87(sn>Mj=iAn1QO{s0b9yd*%kh5%*@O4Jn!c`Xt!=`ZWK2dhS@atj1FDT
z(yw?f`#<@}J*CS<(&&*c9+0UMBS!OZ9|1FPhNy!aZ+7=Bsx!=)OTOJBJ?oa@;(&KD
z44(!OWiw2DH;o*3j0otXp&zR3@yk~%@I95iQ?W!V($UD@o5!d-Z`tmA?8+Xydkxf6
zg$e|SI3NuU!bC|`cA=}#eP$L|uz--U%AN$(v)Vw%F#;97%()_jK$3X4Q;{Ti1(ZZs
z5=8n+9NbYVl2WRI<-<~Mu{TgUMsw+lo>X>3NTdkDbUNjyWgf>v0m`zRX_QJFMR3V1
zBu>hO$yTmlpu~;+i1;`JnWEFj6QZ&-(vuW|XeApa%QDe|38@nakQcL*a-e1X9~uNJ
zbV54lG~Ry-C-y8tLI)*y61%io
z4K6*bMjwTA-eWr0@ay4CdMUO|L$lLQ{U1k1zuq&2hwb9KVgGfZ_t-9h?{5y>507qN
d{rS0YVV^mEcK+LoFTdIBDw&Oz@%;M!{Xa}^Dpmjh

diff --git a/vid/src/main/webapp/static/fusion/images/backButton.png b/vid/src/main/webapp/static/fusion/images/backButton.png
deleted file mode 100644
index e27ea8cdf9a4f3b35c78f6bb0a407a4047e72e12..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 816
zcmV-01JC@4P)bjHXOOu;C=bm%!b8qQKFBYiNkNO|%7ySIJu2Y@Z0Ra$@|h{{KDF!wUiay4ePIl$1|oy7p)(1ow7
zpJZTzo@Ujo_5>tq2Mlrozr48EHFO7XNgA_29ANiNAo}}5{S52Sbo1IDYVdhwS+_Wy
zoKFX!%mpCCX3~4hOG}-xdkE2FW}D0a0cPL4n(>DQ$e1)=fCCL&TtG%ONRX*&K$Hs1
z^0Wo3~(tBk?t!FTGG|Z4oXdx
zId|<57s|Dp6h>m#K}vyEsFVO0D?%#V(Rz3m{w?xMP4Uv?Xp}Cb@AZxCtZ0}cc6*JNbM-_bh@vw>o;~9>&@|ZG&9()b
uZiGWt*08@evNu^#lbM`SC`$WRfB^uXx!j#d-gDys0000DzfNY>Fh|Ltj$Y2csQN9XW

diff --git a/vid/src/main/webapp/static/fusion/images/blueButton.png b/vid/src/main/webapp/static/fusion/images/blueButton.png
deleted file mode 100644
index 0cfbee119e4c686cf761bce3f33f701d78bd108a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1468
zcmV;t1w;CYP)n0!c8w1!9Ll93Kn`z9sP?
z1S~L^pj#XQamYEB5Xc9zBRjTY8_SZlTHC9YytA{To{ygXs;V4%dNq=E7hBBu4-clB
zp8EBB_1>$l682XaI1YRjXaXkycbDf<;0(|P{tlc4g1rWnJ?_r|-vJ&6J^`)(G0@%T
z1sgyCSOo3>eh<6?j6MzYPT(Z)5pW66fSs`Y9LUWXkMl*~C*yJUgnk8h1~?6bfVuC%
zFW>dGZ+!p6Lr0G<&6P@Cvw3L#W?H-584iO{^6oolFaPbYFQ56~+-sKr1(bltfZqWB
z+6{Uy@N?jQKw3YzSbg%RFMRvxvEzpa!&nDlYK*ovPRuRd7Ca@&5h>4k>cG6`oPG0+
zk6$|Zv%g&1zS1MhffeAFz=cU@8F&$R8;I_{|Is_2e)i;dqr`LigIMnq(p^=p6dcEi
z(%(M+<3Fukczq2h0>^--fFOtd05}W`8;4r8U;OHoANoB=(p$aywDLS9mATaX`nm6&
z>UP$BU>>*({J|MtJVBPF=0{Ke?(t!KpfrlKO||8AEsBkeQb$&fKYI78|NQeCWC^(f
z{KF-yy)__taOLYqi0iZo8m-Mtt{8?y6>@jR?nY4Kjxfpf&0m7&>nl_o5wb{
zM#(gQxx#Q{Rv!7*(be;(-yd`Cb%6uG5Rh{1NF$2Usdzc5+M#=zWJ#-mx=U712~Z5<
zq8r7jnKraks1(MW7!Y?%x23sSc^GJIZ#!T2meI%
z8z*{}&>c<=)z(@YCuWvVGYQQk*eII0rxva+$Ogn{JyTEf@ZyR{-hXW}liba89g~%e
z1vFS=wEbM?)Bq+;XBu8j9$xYZw%FMP7r3cp01P75&K7$;d-Dml#+XYV_ip)eo0i6$
zost1sDDE|jJX
zb%qzV#!x8~3O!XSl|B)XqKFu_U;PM2n5rpjt^eP35iue%S1cCW3RorExg|+&^|JKd
z>Y!j+ruuJgCB3yPWV?tmuvF?%Juh
zFv+Hf3>u9_?EC&Zj@DY&>vcw>(P1F6I#SN?TwB>V`b~#o6f~k?~(L3
zfwqVQtyat5*w{E{j4=*?F~(SH2hC>l;BYw17IYJ%uD#ut&KVyQ8Brj5kW#FAC?(`=
zQ?!*}J&?E^$<}Kfwf4tLYU@86SiLPGZKYIiad9!~cDwHdK@h-Ai`l}$!a}W9`_lUQ
z`n(^SXR&e#|)r*}@
zr!&dfby@K|&s$nrTB_A*&0eqP_WONLYwbl*RJ7LSd(B)%L~OBGj9k}EDwRr7tyWXt
z_uCsA8yiWI+;W_-?^@=0p4VtJ8ns%j=DMz1E|<%DJsSi;kfv$s`@Y}pcDuX5a{V82
W2G{K9;uqEc0000aSnFK7aoF(W6HP4jg#$EgwUD^{#1EG#TK`lABq0ppS&zhH*dH!?59vUyuRT(|De+n=95ANYH~_0J#I$C)#q
zBuKnHmbo#FjqUIg@4B5+++FR=wPXcZc4Tfi4b*;La5lf3&Xx3m8j>Mf|*d8T;ci}%UJ`QaWM+v0>aK3K@!Dp2%y&6BnL
z=LH;U4w+2dvt;wL$Jra__BjW=-uyjp?K<1cud{+Z9p7F1=*@KXt#$PBL$z$1j;&Z?
z81CY7G4-gS#Ci*+%>lY!xU{1FsrdMYuk2Qvm^yPtNt#%~+Qr>k6PdRe^4}L*bz_Q+
z|DxujOCOxpo^HPSp_}raeH$ffva5G&=B|J9R$fLPx#AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy24YJ`L;wH)0002_L%V+f000SaNLh0L002k;002k;M#*bF000A!
zNklWLoRe2amMwcOvJfRWl=FTb~mmCvxeera6#A`Gj9O^2msvtt%PFU
zNc_9w&8+PN*ESpc*;bbyJIgH+*I6``A?qi`#r0G?_%@70kM3@*
zsE0g#xwOMRnkxl4rypW$NEVqPN^)r#`7}^o3*h^GVcVf(JN$&;>L+qe+8fkbH>ndC
z`NuWy>e5=6wR;?etcscQNs>-Vq`udIZFk{$E?DS+F@}RKLwPeOBu(ROb;Mke+BSdX
zzk2vw%L?R^Ifa}n>O_-#>{}fiIt~C1LzAE>5p;!PJf(|>3tDNoXFE=GnsyGO=bIK1
zDy8D(Q!(;%P9wMHwy;!cV!AMhLOz9)lS80XgR06HJR+0rMi-CP>qB-gnx>u~X54X?c%#RPO!0+k6&T|#B2sfA%UMg`}LN1=$KkThFe
z?2`a{2Oj(MdH_}a4ZRMx~x#R0@)6h71NVBJA;-xtFjS1rK!OQWD<0
zkVd89A~_&oY)}P}b+o%2wU!J`(J_+Xb&b0BXu{-wO^ir?lnp-d>q1@WSgLsSg<(t{
zH%U6laU=#9x{8e&5ldwO+cC*Rn)s=tdnXF4W%&u^i{HiQpnYkw7IOC{X7Dp4-7wuYUHa%Wo1OR@xaSJlDG$)LmYaFnvwN`Mx>yXiq
zDLRBEVutRG4eO1}Fq>6K>-&xM`T5f?z7|}%bn%H60B-;E9SGr)$FvcyPPO`q)5XVL-^93YUR$_Df&i_MrSNGiaJRqP&9!7$ey3!e$n;Fh
z)Z`nghz!rL49$?b^hoz~OV@O%w-#xhW@(xx)vA%|sg|m#QrZ$Jo?9H#T|pu
zMj9=er3_WgF?V&B^2b;zGdFdUvI_;5YOd-kxCe^2F6N>x*dq@x=_U^R1A#-R5d#`Z
zp2ERkw2?+jD!IC*=BSxekoaRPm8z+bD|Vsa(nL+jk)#O#E}j!KZi$jSz@(cvV8SpC
zp+*d7I>Ca2!Du5bwW4~>H8n@r7(wEXu~aHj3vAY36wO9!pUsjAs>!|9+eBH6O**yh
z#&97w9%}gwRyk-UAcJNM@14&D3uZGZLMz1HyL*m(cxjEwg8blbADb~YEemQk%ES2UP)?>W_kNBNuc5uPZ!6Kia9wKHgYj5
z@-#fOsS;xs6ghhE=*{azB?68Ik3QA=7L~b`k^MhE569l}_q9DAf5{e{Q&dXMF%Iy0
zm~GY^wffpGlLeQfjF088^-qq>-p_k&amm5+7ao~EnX`0?zo^raDG&1JT6<}x&)uN)
vyyhzB7y0zL2FExQbEZCHV_^9IpP7Lx=JN&nMiT>|dl)=j{an^LB{Ts51xH>~

diff --git a/vid/src/main/webapp/static/fusion/images/close_container.gif b/vid/src/main/webapp/static/fusion/images/close_container.gif
deleted file mode 100644
index e2f67d72efc158da4e069822cbe338915761e396..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 85
zcmZ?wbhEHbz
lf$Gy9znh?Y?^x%Bps9Cfw!UsJn!aoAS>7kV)`>G%0|4uCA&me4

diff --git a/vid/src/main/webapp/static/fusion/images/collapsed-icon.png b/vid/src/main/webapp/static/fusion/images/collapsed-icon.png
deleted file mode 100644
index 000cbec5ad9e0fd1df366ec901aafe54065fa805..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1379
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ
za0`Jj+tIX_n~5oC^DMQ#CujeSKy
zVsdtBi9%9pdS;%jl7fPQl0s&Rtx~wDuYqrYb81GWM^#a3aFt(3a#eP+Wr~u$9hXgo
z6;N|-YDuC(MQ%=Bu~mhw64*>DAR8pCucQE0Qj%?}1aWkPZ-9bxeo?A|iJqZuvVpOQ
zf{B@)k-3qjxtWeaaAJvqS7M%mk-37AfdP;(vNANZGBE@?1`L$!xPY`xQA(Oskc%7C
zP9V=#DWjyMz)D}gyu4hm+*mKaC|%#s($Z4jz)0W7NEfI=x41H|B(Xv_uUHvk2+SOp
z)Z*l#%mQ$5fy_-z$}cUkRZ;?31P4&hB^JOf$}5Hj9xxd7D-sLz4fPE4;U)t$+5iQu
zz!8yO6q28xV}~WqY(P3u6d`Oy=udS?EJ?KkhKGf&fswAEd5D3Lm9d$XiD?v)euyG8
z?Y{XbnQ4_s+KqLMOhODTtqcsTOpKt~krY9-+vtM=0x4j?p$_sBnz#ai082@RhgU&q
zQ4Tm-Qj+ykb5e6t^Gb?=VP=RLW+};5Y57IDi6wTKxryni`UQFEHu?xbyzYaz8kj7A
z$xhYxrBYctQ72>n$?(tJ=cGd^JfrQaW+x-&bkTrAO396adujxx{^8MWN{owWf;`jdL`2Ohm{_Fbw?fd`l{QvO%
z|4GLg6aWAKCrLy>RCr$9zy$$-FaQ9s-4*R0mLAOOal4!j+cFJZ)f8D01wZxyqrm{I
TO5f>(00000NkvXXu0mjf7cErM

diff --git a/vid/src/main/webapp/static/fusion/images/copyicon-highlighted.png b/vid/src/main/webapp/static/fusion/images/copyicon-highlighted.png
deleted file mode 100644
index 312c43984ec7a2068594cb31e93565fca17f3f26..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 264
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~q!3HGX7W?Z1DaPU;cPEB*=VV?2Ic!PZ?k)`f
z7)~-sehCWj0g7-IctjR6FmMZlFeAgPITAoY_7YEDSN1!MTw*dTOfEl{0fjm|T^vI+
z&L@k!x2T-e=<;EM!+nusX^9C52_NqJPYUo+(a0){^luF_e%GqizjV(@hJb6Mw<&;$Ux
CZB>r|

diff --git a/vid/src/main/webapp/static/fusion/images/copyicon.png b/vid/src/main/webapp/static/fusion/images/copyicon.png
deleted file mode 100644
index 6c1c3c155f6d2dbaf649a4f5094ff679b95960c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 235
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~q!3HGX7W?Z1DaPU;cPEB*=VV?2Ic!PZ?k)`C
z3>^$7)npGG1d4DLctjR6FmMZlFeAgPITAoY_7YEDSN1!MTw=l^GqS((0)?_YT^vI+
z&flH1oA-bLhf9A)V!q0;B$;wQVb_0}$I8UDRQM|9Oqe3%=fv2M(q}efW(o7WLtAD(
zneo8;f}Td^S)US>S#tt(Z!1<5mmfDf*vWo%g1kV?>h-sSvRLY0IsUw_Qv77fLiW`r
b37?=bZ
znFSgDA7Ky!JCy+maIkR##pMJTn3$MB`e0IQ?98l8EF6rSLLxwUQ6w3N3RZTYu%aLX
z6C)ElLKg!g6Elk-11lT5kfNceJj{$h>zM@^>={a|XKqppdC)SI^TXb)wY#3r
z*?#J_AD=4!EW_X3AAU)^?+{Txa=K73TvMkmKDED5HAq5ocC}grgLLv7wutOdLGDkv
z@k(3d{~UW1u(rB>%K7TZw~Ksw*FW!&pU(8?uF!*z^$-8*UD(;Vm21D^iUTYkB_}H?
za$Z_8X^~ogY*Fe9pYDBYvi>~!dE?$1w{5fLMlc5(nTFP_iE8`u{epMZt*p7)#|_R|
zhMutbJSC~4p4WlPO2W*)1jc!t{Tlh8v
zZEUTQm~|&3a*G4oy~2phIU7&*x^}(2{Z{3qi{(4f)>cV(b%z;q4JF*=mRw4xSiDU-
zaZSpV`&p};^&ED&26nM(oD^9rvVeVKMGCi;Wy+2K-kll}b6lr|UI^dR&g1x^Z>k5E
SvofFV`|09hZ~i6!zX<>U9I`3^

diff --git a/vid/src/main/webapp/static/fusion/images/csv_icon.png b/vid/src/main/webapp/static/fusion/images/csv_icon.png
deleted file mode 100644
index bfae8fc31a546895dbec642834d1f1b4509b21b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 938
zcmV;b16BNqP)5r00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyS$
z6afNV8CzKZ00SyXL_t(2&n3Z6Y*Pgs!13?vd;Pz*>nM!G0grGzYWQxXwc;f28WQp-I@i6B+5MdM%Sw`j#1`!QvXqk0DxBgw%e{1{t+PSB;;?&Nld)M9w~@OswQ%A_7_?DH6?qWIV`#enqIH+
z{lX>g-ie~BPClJDPb7JVg~d6NsTD>J9OBTkBLKJ@uu;e}@!=$bg@XrQ7ERMsj=nTX
zFu0rW)t@-=-Z7ro-Gyq~WIeY=V5^UOF@sJOD=to+I?T?&5H6>}xsT4Gfr&|zYOT!v
z1A7Q;bF=XC6>3I`3m49_r*j|P4mT>G^1p%5Adeo#aJs!%G^+&*P%ajjpT9|0_ZC7s
zgQyzJg)ftl1et6S3kt=mAV6?H#T3}cm(ddORi?w!T)F%s?f$JyO-(WO)+jb-mGIST
zJpI&u`uqDaFt9nC0K{Sd8VbZ+-ktD3aAwlh6@iOJ7q>G1Xu
zyD-znzy&QzTvx$&1Kxt|*aoS^oI9E{nGtGI!mO$7>=_4xN^-zWz&w_r4*T
zf&~RDD$uN1S&2Y&If808$rZBnbnjp}lEGrO6X*zX>t=o$d%PmbdkN^Mx
M07*qoM6N<$f@vGH@c;k-

diff --git a/vid/src/main/webapp/static/fusion/images/customers-add.png b/vid/src/main/webapp/static/fusion/images/customers-add.png
deleted file mode 100644
index 127cdac404209bf7d70a321fdc02d228eeb628d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 755
zcmVPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyVz
z7A7|uDHQeq0013nR9JLFZ*6U5Zgc_CX>@2HM@dakWG-a~0006?
zNklGT6vscm*>T*RMH2t5L6nEkbRF!U1zLgNp^lymDUrgAg0dnALhw|0
z&_i81m=wfPM#m5dv5>$Z>`+Qe9mGH>WnFijnVtPPGaXWq+^Adc^4{aU@Ap04_rd=*
z@wbMKdu6wP^MC{fA6@w|@Xze+17$6@V-4o##0zhFY1qB__~7c<{<6bcd(_`SM&Hop
z#Ci7(9re+CM@a~w2+>$~QhWYtunTyflc4tQU`wR5q~}y~Q^@sPMn*#{ttAL#=Me}Z
zk#bd4^IFgJM=n3P@jaVsgUhhPQCxlR_jvBn28u68q4}4o$1rUMaitK3nTe)q6
zn%?_6@`J(S=mpAxz6f<=1n`DE40My;xLP-M{llLvZO!j}U8L35Ubzx=u72
z1z>u58q2aUO_Qu`zf-qd{~Er3!OLa>s^^MyVv4r5Hh@h4fMFQux(+}r7CWjMeM3>-
z^EzwxRd&@FwOTr$DYK@7<2cOC&29S)+qO4j$8k`7&+BYF)^I7jyCN^1ktD4QtI~sT
zEn{P2ghC;7U8kz53V?V#j%8WcwvA`nv#L;(bAerZ@;126oEP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyVz
z7CJ7NHQ{Rj0013nR9JLFZ*6U5Zgc_CX>@2HM@dakWG-a~0009g
zNklJ3co%^ZB+w9-El#YxMi)0zHq&?E^>X=?n63zXz`j7t^O%SpAe&o;k^bvBRW`
z=P~ravE6;cGk-2#(g76UM02Ry6YM*TudRi%i+|Ba;Jqo(Stix)jcx!zzC{ou$WrH+tG_D5q3
z?B2)Hb(z0z7Vvp3$&zNqSk{xl6rLGPtIjWU4kL%SE$XGF6*p-Q;S?
zKni!chA}|fnLM$JC8kGD@>JHER;-HtPA5nisum=*YX-0{m*e~
y^)m#}1cbNd-RRwVI(MkkKRgntzWKX62*5uqu~dT1h5Q}>0000i7f7Z2at6g=k
znyx)m)b5HYN})zXKG=&T1P1*{AwohAMi4|{FGUYZKd(zzNk2v}L6r3*A_!ShB4j8;
z;x4x9?#kW0yZ6qWndUC8Sz$eR;9~~P`Mz`Jn;FCygY|>}>kRb2g7&+f%X~S1u%Ke*sy3f;k<#B!LOY8-miVl)X4{DO9dOfwd{F&Pxkp3i9-nzfiF+_%;z0RMf
z3o(QQgc_=vZO`8YJ9%#0s$~rQE)cjGY*mU1uO4nXm`^By*F*UbHDe$eA%0c_ic%~|
zlH7K(SLqtKxL{EFw}~Bls;ly%n4$y~&~ASvdi7BQgIGwz+`RN1#Rn2Zq(+;=-@gh$9Dz0+BTi&>-OGMP|F7ryVEWy(ES(sTQ
zpy4zqt_Y-w3QRDNe|xp;aws)ZGoMX~6a9?R4&SbwoxaL|O%-jzx0DXtA82ej22N_g
z?MtkkB%a#5C)YMl;}&MX0E)
zhs10FJbHOYFEWP=Yhn|#7*5kC5)y>7Vp)Yexuin^bHBKGx$mW#1R^?xMT3G@DQ9uC
zFEnz!|H$$!s2mZ=OeLR=3_d%))^p}Y!#u~Fp~pyCd&swwxm@eDlI&-4a45^`TCvj6
fI@xN0p8^a30zf2z)9rq)00000NkvXXu0mjf`VUaC

diff --git a/vid/src/main/webapp/static/fusion/images/decrypted.png b/vid/src/main/webapp/static/fusion/images/decrypted.png
deleted file mode 100644
index 236cbeb8098f5b2a7c63493fcf451f3c97ed4c19..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 628
zcmV-)0*n2LP)wXB?l|(f7e%yOHCB3(%J#gSXAJ316^8)unmP)0{
z;o;%;lamwEXf*V}!NIq3xm*FD#_Z=~b93_@5mBvH`%$e{_bQdjr`_G%4iVAT*4F#~
zis$C$o?l#C(E9rNX8;c~qv^G^wU3=nhnAO@UuHEtTNI1M*X?#2M@L6*0rWDXUsqRG
z`>j?BD=RCn{t1|!oqbxb*KMIt$SncD)YR02BuRQpOG}TkeVHwekB>jh%*;I5-rj!m
zH-LzkwU&ipD8>Q2g@uL3=jZ3mv$M0WtE;Oof*{}k5Cp+IV~iMMQNQ00CMPEgi;Ii%
zmzS4u*50#nxx5$0F~xCA-ENm|Zf?jJL)jP%2GndeX=7ufmUCc?QCe#+iX!xSJ@os1
zIOpK|K0MEZQVPEB!&-}WyN&DX>*?GPl~N>x!0qiVthE4uG);4vBngNJLI_Ct=X9f&
zloDENSZk3aNiI3(aL&Ow2gVpU=Xroq3Q|hk-QB@CHxfGMa?3-&SO=cx!59N;Eu3?Z
zQi3ry{6Y{BthL~r-v=nA5QZU)G0<8gO;ZRVM&jWOwASF9k7ij1Y+_;pLI^O%;CWsy
zrIZjtfQS%95yCLc1G?Sr&z+r}{YIlP;GFAmfHX~EtpySJr>Cc1hJfEJnJ&`MhuEzF%z`1D?`s3%jufI0#KBi$}ACsD|ZRYsk#YasOhpTs=O`N;x
z;Mtoyj-20r>Pkdn_PnKQb{x5|>*$4vbC=Irw6d_et$pI`MXR@InL5;WOuts
z!{ReH9XR*l^OrfxHWk*i$ED>L)phmETzdTC&4XvIH}*`w^W=3_aZP4XT~1k3YF>q!
zk==&f$751*tJ@~Nc>neI`Rjet=g(NQZpwnyvsY~S@%R7YRH%<=E7`yz-`<
zM=rSeMLd4>Au+4i(L40~m0LRwpSy7D$@%LKrp{TqVehH3#_rw6uUx(T=;r-rx)#nU
zc@@9_p&L;A$->CMP|u*l00f{oabREDP~X%P!O+GK(cBzi!N|tK$;!^b%p~L0*~(`o
z8Eh=eWuxgLWzl$P)5386+4J)Oj~EQK+~k!*992y<)a;f=SRP+HHBe>y
zwh!KF4hMUqMcH;mJ$iDji@_txM6ijqg@aMCD&z2{6n0h~bse1xn;JUTI51cP06PL*
Ag8%>k

diff --git a/vid/src/main/webapp/static/fusion/images/deleteicon-highlighted.png b/vid/src/main/webapp/static/fusion/images/deleteicon-highlighted.png
deleted file mode 100644
index aee193def999904183810416966b2742e5d0bacf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}P)Px#24YJ`L;(H($p9JjQcz3)000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyS)
z792Lplc**D00Fj1L_t(I%cYY|Yg0iKhM!3zArz_wG09
zGosLFwX1_>Y5Ht;snY3fub2PSn(3k>uMV1}M-Lz1L;yIE&GNYZjNPS5C($G@^S6%2
zMe3-~XtirQb^Vuk|LKd?cIsMawA$H(*dGc%`hDWqVXb9sW5%(=TE}QKCK`fPH!V%XZaLhH(S3rU04O0pQ#W2jbkESG6sXe7%;}9OI2AZoZ;iuTKctr0W;$qUp8VzQ~&?~07*qoM6N<$
Eg6N|5DF6Tf

diff --git a/vid/src/main/webapp/static/fusion/images/deleteicon.gif b/vid/src/main/webapp/static/fusion/images/deleteicon.gif
deleted file mode 100644
index 4b07af82662b62f35cec00a27928410b3a500703..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 579
zcmZ?wbhEHb6krfwcoxG@Sk?Of|NnJ64o{l5^5f?(vzBZ)a{9`(JCAl8x%lMu$DK#c
z>zF%z`1D?`s3%jufI0#KBi$}ACsD|ZRYsk#YasOhpTs=O`N;x
z;Mtoyj-20r>Pkdn_PnKQb{x5|>*$4vbC=Irw6d_et$pI`MXR@InL5;WOuts
z!{ReH9XR*l^OrfxHWk*i$ED>L)phmETzdTC&4XvIH}*`w^W=3_aZP4XT~1k3YF>q!
zk==&f$751*tJ@~Nc>neI`Rjet=g(NQZpwnyvsY~S@%R7YRH%<=E7`yz-`<
zM=rSeMLd4>Au+4i(L40~m0LRwpSy7D$@%LKrp{TqVehH3#_rw6uUx(T=;r-rx)#nU
zc@@9_VW1aK{K>+|z!1Zr1F{elCk*Th8e*E78Cn^dJ31J6czJo+J7d}=PibMCK4T_h
zzyt<9Gs$3MSuPt*7b&B;hFWg&${~)brW$H?6Jqok9R%(5BEy}9xxzXu8QEAkS=l+5
znF3WhEKZy{bB;;It0VgA>9gm#%scq+U4LlRA^PkAleb@o+?yNj1|8ar9=g6x5eiC7
mPG1~Y9tH_=iZ97Y2yAtmDOAtqh!89ZDp4AuZRknPU^

diff --git a/vid/src/main/webapp/static/fusion/images/editicon.gif b/vid/src/main/webapp/static/fusion/images/editicon.gif
deleted file mode 100644
index 48538c18c3c6a711ecd71d14d7b80e9608cec27f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 360
zcmZ?wbhEHb6k_0ISgOVV1dmQkPfqs!^y$OQnKQqBdf6i({#+3=9uW%+h9HxN>Iu$4_5A-dvlQ6!iJa
zv+v*E|9}4c?Ty`2q<9q=7;c?j_x}6$|8HMEKRV;V=>`9(3KahdIv1rTmZYXAlxLP?
zD7bt21~4f8WMLFxuxHQ#c@N}K2DX9&^9ww5nj9uAD#|F-;A>c6l4VjOqi`T$w<-gN
zGZ%B>hCf?om(2RLIK^W^bHHlB8>Y+-w}mwV+cJckSfle873&+AOPMN|MQZ9?qnd=J
o1=~8jN~EM%MfgQ0&5mK7&n@0LTVjm_!^%~&g9ACeogEph0o|0zssI20

diff --git a/vid/src/main/webapp/static/fusion/images/error_type.gif b/vid/src/main/webapp/static/fusion/images/error_type.gif
deleted file mode 100644
index bd51e815567e4f51c77e22ffeefc948dd09cbac1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 398
zcmZ?wbhEHb6k!lyxXQrr|NsB*_pW`taqh{D+n>)JdVKcur&D_$9Xs@X@7lN9mp`TOuh-9hux`FM;^CzHw__ZHsnD0tA4daEVtMn%+};(%M(Za32$
zZY0}WO|rWdZFD6_{j#s(B~O`)?vfW=#m+klp0ngQW6VHZp!k!8RRn0H4#-%LpBUIy
zJ2Vt{=ty;QpIILAD?#k|!-OMi!rYsa51(3V)-^?IxkHK0%qb5SuCkD_y4pM;Doa{W
zQn1sK$zq1MJCCf2ioBu^pOjCetAJdqys&^zw~w2sLaUqrBSWmKgtCgVG>`KFCvK_5
z$`Twdq0<8RT2vH7SzM>qtI7$<&lYqO?_?-htRledA875EL2H=$(dCq
ZG}DDYHa6b9B(^qim6wlSfU6^eH2~($fK~ti

diff --git a/vid/src/main/webapp/static/fusion/images/example-frame.png b/vid/src/main/webapp/static/fusion/images/example-frame.png
deleted file mode 100644
index 31f2fe1cc66141a21c93cc3b9fdc53e09fd4a742..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 33699
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
z
zwrAa=-!uq7RgItl)*^%-Rt3UXdkT|W>xDi7r=zQvT#pKCfAkf6$UUe@b=22Iu!vdd+l1+Ju@RyuqR)W*
m{5rqRuk-8tntT1f00RI`ky)sPHFZM(0000!b)qDdy}i44Ywv_D6M8rIc5dnH-O$^$sjG2IWAB>Y_OzkX_H}$RVt6W>T
zaNfe2RW$`G3Z_n-I%U$7$&)6hEJ;aToSe2WEo)v@;=;tl1&LiWA`P_yHI*zC8Fx0&0hV
z;!hSv5r+Q^It)Mn$`cG64;fCcdDxtOUe2cS&x?h^&*mRCjrD4I!0?!jn^$*6j^l<0
z@e6o(vL0{8e|N&9B*kBbo+9^GFjb`L)*Sj
zgDHjCp@rA!$(2lo1FTb*bbdJ_@j&%li$eK{3mYbU_E=;im-5B&vzwEkqrP0iL9P{t
zIZcz#ED=1|+AEegG2*^oMwqa;3DITb5ykhRs=XMVq)V8o@2tcd1;rJcG#AT
zg^N_VI%Iu?{#r9E+4}l=`z(cD+aGvNQr=Pg_}j<)iHGZ3ggE8x<^(QoV6X-NwpWjC

diff --git a/vid/src/main/webapp/static/fusion/images/executeicon.png b/vid/src/main/webapp/static/fusion/images/executeicon.png
deleted file mode 100644
index 295c429baeb10748cd179674cc29e8f1cc90b4a4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1076
zcmV-41k3x0P)KLZ*U+
zMZqD61UKR0ATHv^)-h>I5gck1NwPJ`rHVGW++068`4T>agNvh}Z%}a%oO}c~K^z<$
zB4lt7!84uz8UFmBvEp_7ZetEcxivx0mthpknMbB+0>B_Gwb$=&1LQ@n_`&-#0^n)Y
z>-b&%#%!vM1wMhzOqD5!bs#&l+Jd+Q+~i1G5LbX}_JTHuJHQ!MJ^`Gh@)y7{VHAUS
z1>9j6#n1q7lgeGdwd&jgvH7ey+o)$(IW?)qYRQsyk
zp4P`o20fquC5&QO+1m~R5DSyK)ubop^jn2^`2DVbjPJnEQ_@xV|$`ith~00004XF*Lt007wQ^&Awc0000WV@Og>004R=004l4008tQ004y1
z003=Y008K0002CT000|UgXaf$0007SNkl2*CQn^$#CpHZ`mLpxv
zIUPUjP+4QB%yqT3Cfd3vTFJCFqsGh_qAhEr+HpxKxpXjnw{#?~*ov{oIYH;98)Clijn>yk6YZNnAD?cO~I5dRXQY9YKDLMkEf)*!ko{iw1AQJw8(
zSJ@Dm@5ada03olzep}LB5fO1aQf7#5gdHy-_!$ILfp5tmzPATSsE5oJ$Z8&AU*#~`
z^e&uF_u^a(Qv(wdMW#3@w8h<~%|=*T51Z;Cr3JD-!^L(;dJDP-pe%;jc`)nTD2@pY
z=4k;Lbry~beZ*Sr@29PT;AS|{4tZbU@JCqn92QrBvJ#XJVP4({P6w(#P4!ymFX;Q>`T%Tb1+OM>ZvrBxemfL=PiLM7U
zUqIano^L>@H+Ih0ajeK%rHd937ZI`it3Yna*#@l%R3)uFirBO}lNNc$ideaeh}F0h
u4h&7&W9{l4EtYl~5wV%@hyM4@KL!BqOVCyRu$`;`000080W_Ob&&61=|o7PrLscpolV7u9!rc0CEWp``R
zQmpY1tWwc~(t{o_4?J;!S;do2V()OL4;`tZ8bm^EhnJ@|8t!%MZ+)*Y$AW1>d5iqG4WuCp3JY~O86
z)4QchD>%4c?}+OC@{pe5R73;?Ifg)|sG^jtj%c90-#PQKvkK$(7`S#7ak?l=AR;Ca
z!9dyrsb+9@E{c=wG62!=NtTzB4$jbVq>~EaYe_2{KZ0}+Lvc~^lK=n`h=QLy(-fw{
zN;?`ByT(=2Ki(7J$47XtK(+)dzBG%;Nu+ZiolHm?oA#4=O&0HsFeE`9qL28=LebH1
zFKCxl1Y8c<&QneoaJe0fhw*yc$3Q=)gA<$t7!P153V#@urdbz_i^&f%V8N?T6^7Wp
zP-ihGKKaRET~}BLQ>m0A<#fnu9MWE|7g7vl7&}JTwJ}NO(soH}EQqY@gpkIoqLR1E
z(B)$CsO~38BT;D-FUKjRM3PoC58DXSoC0YF1xw19=)*xa-w0Wa$Z{g^m!A0y<_1tX
zYnhKioQ?w6k7hf?*lACMVpyk}bv2!<;1@uf=wVq9hsG-CPCMg@&|a3JSQk^ISAdFi
zA2f`pFedN1ai>jj@E^kjzT}rOswVPn5qO9aD2XIp!=BL_Jrj6#NLG`a9uSjU96?2j
z`(Qcv&-w~g<7a`NB`m$m_0mhN+>%Y%_brhxh;C()rUQKf{(H=Hhk}vjX?|sGt)=Sl
z&~pp!!$h_sgT7>*r0z$r_wpe!6geI%b+PUDs?4HruMRI@`KD
zx!QUB>n?#JXQcjLABTklPcjSi)xh-_48G
zx1Tak;DyYy8<}*~U>3Z{&Nk!-b#d{?gN%nDzTI@cs=pKH!Zi}z9X+APZG%_-0IiX3
Axc~qF

diff --git a/vid/src/main/webapp/static/fusion/images/file-add.png b/vid/src/main/webapp/static/fusion/images/file-add.png
deleted file mode 100644
index 076bd8986edcacf8a5eed2548d83b5299c84535f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 675
zcmV;U0$lxxP)z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA
zFaQARU;qF*m;eA5Z<1fdMgRZ;8A(JzRCwB?kv~Y3aTv!xzxRFb&a?A~BT&hRM01Lu
zY-wl-hZ+MIH5j)tc8pa`-WY$}{Wq9LRpf@;VX!KE4`GDVL}y?gJy_s{Ro(_nWJ
zXazm{=fn5=eUymsKNnno4zC_Pyah}E#ed{t;KA9kD_7O2OH)1hj^gU@=tai*Ka$V+
zeQfzF>xHDohJ4|uodUym7??PhJm5LP1StD#awu+WP#3AVJd73_?-BWOku7{#5TX=-MZyQ_1|CsQO=
z@T(oLe2%WAgCxDL&j%?DLMT!(i5hWEJ4g^J_Oo2oy5RuY3^e7QE(D;{Ui;MVLtD)Iy{k0svt1_UpR(sv`)1UN_aUIjh3(G^S>UhuVXkI;z~A)*Zcd(rPD|y5(v7(kR@1_
z%0Q&X$8njWaa#O9Q$%{ay^R}lbC}NMsJG&RfF>IfDj`l0Xv1qGeeSKSz~vDppRMpF
zgnqmhvPifDgU2=S{b7(KNhY6ZVG(8$$55oRrW&ef;AnojJb9XLr6|t{00000NkvXXu0mjfDPbaJ

diff --git a/vid/src/main/webapp/static/fusion/images/file_save-all.png b/vid/src/main/webapp/static/fusion/images/file_save-all.png
deleted file mode 100644
index 3c300ecb502f1e95b589ba613c0346c21181da68..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 610
zcmV-o0-gPdP)gJMAySh8-G3_dLC(E|4oe2=^}4oLpt>zv>s#MB!qH!cJ3Las@(e|}d`i-jrJp0}2_43@x
w#CyH^a$o&lVEojZ25g-BK7dmw;I9A!0CuTRyqGS&b^rhX07*qoM6N<$f_!8YPyhe`

diff --git a/vid/src/main/webapp/static/fusion/images/filter_icon.png b/vid/src/main/webapp/static/fusion/images/filter_icon.png
deleted file mode 100644
index c36ad2c23764324a90f6d61bf76ab56f10dd1e86..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 29069
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
WZvfRJyZV3D-l{5UD%8lCNBjo?pEA<`

diff --git a/vid/src/main/webapp/static/fusion/images/folder_add.png b/vid/src/main/webapp/static/fusion/images/folder_add.png
deleted file mode 100644
index 83761c296f342bf0fcfbc22f12f2421833d6ce0a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 772
zcmV+f1N;1mP)wAQ5gRIIcIj=)oi^5
zrD-Zz5^5x3y>_vnAVL!CA%dXnAu2JDAP9OYBYG&YUWDkuvdcrzgY;@4qPV6=Vv{bV
znPPd_HTN>7|IBzJ3i_FUX3l@U|Nc>b%Yh$uJQ`4T0$RurAR)gJ8Hf4g)h4V6IgbQU
z*NRzc=d!w1AQpE)LZJ8lsca51K(yw&8iNxU(wrhgZgK)B+h*q_M2DN86v51{#-6$-
zfI+KS-IsDd(nPTNbe1qh1y|B79gqt1g^%wA;*)Py!MXzCK;-;upbew&3STP>g=VA0
zc>(T6BNGuWi`yl!)-rz#Vc>K3N6dsK_^6x!M74~SDBA4pyAk}*7W-IE)8Lop(QgBYKRwMpJL
z<|f9FnzIv#Sg@x%bPgvMi6jW^D12xgc#8HJbre5hW9^vu)iEQv#$XuY40!;nZ>pv@Edwf^WP@n&)>@6B~VI$
zb)%z5)|!UrBi$&?2g1DV(u^jABfzd)hTFI(ZAEjumek^?e;*!I1xwC#jJON_tJp^mq1_tC$=pn!bF`895AYd_Gk8H90RIwR9{kFK{PVAK
ztMA}$ayqIt9W-^cb9)2o3I8uVHe{_kPqBu63ornQFypdoHl1n!0000

diff --git a/vid/src/main/webapp/static/fusion/images/folder_closed.png b/vid/src/main/webapp/static/fusion/images/folder_closed.png
deleted file mode 100644
index 1b365fd8a17bbb7d6cd53600d76dcf5184b3fd8f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 559
zcmV+~0?_@5P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyY(
z6D=;0!+w+i00FN_L_t(I%cYY)YZOrw#ee6{o87o^AV?&jDA=i>k$eTCZ3;UJD~m1s
zCRT!ovCzg3U?Y~6cIsxEXptz0XpCTX$^M;r*J5VT&8i@K;5P5wKkuA-p4^>zV9bfo
z-dukc^U;RK0svWplF*jyGH5zm)rrL9F2sDavD$nB}^-f>p&*HL)5R0<8zP&L^@AsT%vGBUz1}juv9EA9G@Z*^D&Jy4IYanE0r07
ztkTBIAY!IJuP&slHXmP&`FJ_V1bK&9!Af{BF2f_Z1Ep{JpWeLMKNwvM=-*awtAlE&
zD#RlIKX$ijANB_Cf{rwh3CF6XC)kwN9I4d(`%bHS``+6@NdXwfQ`GGPrB8{5EK;oXif@dU&lPVixlPkFjF<_XZNU
x>|pKA%d_oA*E<5P0Lg#;p&V$H-kS3}{{%M$nMDzvmXZJf002ovPDHLkV1gm9?|A?K

diff --git a/vid/src/main/webapp/static/fusion/images/folder_delete.png b/vid/src/main/webapp/static/fusion/images/folder_delete.png
deleted file mode 100644
index bb56a9e6f9b274f40000c2b79208c7343c61c651..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 767
zcmV>wa6MEbuIXhZn!v0Gs}
z6iwDtdYO+CnciYpOqYxtW!{7#FhBGaze3A=RJs6B8^=nVIAo4--}*8IunoiQ6p;F<
z3~EAfa0&%p6TWLq$fg;YVgP2cA@g@aTHgSAQgO^Nz9ta
zuRv0qM0Cpu!!PkT6=^!@P^S~lz!;S)yORPHRwFt-h3{*L9?A2@
z#_|F@6{mo$AnervouqLZrsga1CFZ+F5$>OX<0AAUub~9Do{YTG6k_2;l$}1$THL3!g}I4o3^$#7D4a3H!Vw%eb{KFcKm}g5qO5rU
zPZ5^-rcmuGhx#3X{WAo$9)a&@8I+;!N?Xwe!}J86KZ7GGl~a$_08Cbgn`ty&1)6W<
zbp7cK)R#$pu6xi{Q=hWZY4wk6Z3R0TPsRQ5;&=5`9w;ltJ+`$z$i<3Wia}0vHw9|%
z49sR{wBNE@E_&Y1uEnoc6*xUqP+Vkg!$LS=^=c_|kQWXFI

diff --git a/vid/src/main/webapp/static/fusion/images/folder_edit.png b/vid/src/main/webapp/static/fusion/images/folder_edit.png
deleted file mode 100644
index fe774a62c05e53701780c26c3a9eec0042b1cfa8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 829
zcmV-D1H$}?P)cJi&*(l1Sryz(fM)V?NW*MYm*h@wT1y{OOp+%U<434xF@~^G
znEA?Jtb1ixHo!Tqr$9&z2T2k>)t*Wrk}r&{Vj~>10GE|1#^p^WfzWjVFC#c~4?-{~
zDW%ABH3OVQRt^6|xRMpP>&lZPMRJmo9@z{M0h-uA^Ac3wn@F&sfDsWh+eV-co^jcn
z|2pOmW~bZ9j}fUYk}R^zq*cpQaf#z+&v(p@dZ}xW>g4bQq-Yu0=~4Y)q1G?~mLNqL
z1hTnQST%#Edl0d93o=T`lAs)MvKysg;I<0EIr!#^rzi-lM+Zx`VkN7KzxT1Z>$;0Bb@b#L@`K|3^UTV6mX%Rx=7qw+g=I6(U
zXN?`pxq31?H>7Hs0oHY){hnJ2JgCfjZF3d^GxI=KE$aKS;2!gq#m6ev>XvVA0=vzl
zY&3RPwEqaN8!6hMqGBWm7H~8t4h?gdxujH?3_pTT8SAYQkra%asw>Z1e00000NkvXX
Hu0mjfgbI9H

diff --git a/vid/src/main/webapp/static/fusion/images/folder_open.png b/vid/src/main/webapp/static/fusion/images/folder_open.png
deleted file mode 100644
index f1ed9abe0338be5a0401f4aee1b3bb168b4d815f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 632
zcmV-;0*C#HP)4gUbq(tw1lgoXx`HVs0gK|-QT;Nk*gBnKlTn_z-{
zmhYU)-7d3t&KJ-ik94}dotgJ$-pr9P27{QufTqgxGmAP3uNoaE7bGM|sxpx{$6x!S
zseeO+ZJ)Bq=VzY*TTvP$C03r?ILjc0=nnu+A|W7D<`Wa0NdS!2oVvxShDKmPGuu1Z{X#D3g|-0BZ&qN9*G%zO46N
zD4sVu^%@Qrc`Ds1baRPAMG7LbeA>HftOGIA&>{S+y14WB!(!4xyYUUh=}X*79hA*;
zs@NUjK4So91b$-;-y6->tMfCSvO&Q{3%OG#fnJLTF^s=9aIa;Dv9bIfwI98O6QfM#
z&RzC+V0j(IuuEljHs;@Ei!vnIlXu^Ym7iYmY~+PRvHvr>_inmd1OCpx1sDLU%fF)P
S!b7P50000

diff --git a/vid/src/main/webapp/static/fusion/images/folder_user.png b/vid/src/main/webapp/static/fusion/images/folder_user.png
deleted file mode 100644
index 2cd28412b415b4491c3a15106b647feba5f572b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 887
zcmV--1Bm>IP)^ETwEew!5>tv%51pGoINkjSqU}-g!7T=XcKi-*ePp-?Qh!hTju~0kJ8=
zM45U>DdS$eX)0wKqA95(Aq*<32~dv<2W`9
zqLV=wz9OJdw=$df+2cZ1SWCCjeW^7gS1-}%C(3F8D8GHY**&?MVo^l
zyr`RHc~eB*Y@D9P)G4Veg<%NRPV(XYk9ndyMP^9{#S&b&I8Og}L+seOvA*u^MG_GM
z!YYQNq-*%@YLt8}iiee
z+SDX`&6h|qP{9m<_%ho4H@yZU5zx6Ey!NO~BqmTDK?d9sg
zAjxEsa?xQjd!3KIdYAm=Gfd1@zt{5KIFsX~R&J1+OcT!iLhO?zVnWvH5p88TT9Ou|`hN`^j(pMtp_R%?Z-?u7&!DsP9T6l_*p__MhI(H{<(Qz4AVyz@=K6
zA(2RNY`BNla!2w{9nCswu=X6wo-qeJ}IgO@~#1kO_!wJLl`yqVX%%Ra(uAWBJy2MT(-nt
z;)OK|w^Gr%>(JRP@AP(bd44vCn>>=%EIJi8*X{gtbt=vDw2Lpg?maf&`=X5&;D~Kg
zskrE&FSq}(>A=r_&A0h23))xAa^cEimS*hM@Z36W&X?l+@Ep}j4JCkuC_{zZrae}j
zdY|OYGjEu8J$h8SP5*oPnv52tp>hLnEB@cove(Ve@PAp1z4ng)0|55|Noj(bCItWh
N002ovPDHLkV1oM`ug(Af

diff --git a/vid/src/main/webapp/static/fusion/images/funnel.png b/vid/src/main/webapp/static/fusion/images/funnel.png
deleted file mode 100644
index 35f1d2596041194e48eb476b141bbd22ff247594..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 543
zcmV+)0^t3LP)$2syY3<$
zJPP75Pag6Tcqj;hJ%!@Eg}QX?5CsJZ-6iZ#=#tSX2>*u&B0`~yr$sNj<|o?B>gGqQ
z1r5wT-kUeSH($$*MkDx-2=vi3ZMRmdMXS{+bUGd9TxE>Oe!m}r!Qeoa<*uSAU0gf3
z|0tKs_ul}NXr)pq4F&@n&~CS()#`#_d;-sV5Fi0Mf+PijfV#eSFc$$yCX>;N#bU`c
zO>}O7X1S|A9b?X0RQghC-G6i$yYg83Bi>kjrgf;rvib&`&3Nl{C)Nk+MX@TvhCC*s?!g^Dj_&2LH?40
zBhHKue;s9xn*WQ0r-lWO_U^wY;0wLD7<()?q)hiy}*jE
hQ`Hxh{7An97yzXKrVmzF7S8|x002ovPDHLkV1kLD?DYTu

diff --git a/vid/src/main/webapp/static/fusion/images/fusion.gif b/vid/src/main/webapp/static/fusion/images/fusion.gif
deleted file mode 100644
index 368319e6d8136be080ea9afd6f7925df58912563..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8821
zcmWlc_czs#R}D
zin2%6C1e#6+V}hUKK_8mFOPGc=R8f#O|;IrUH~-$>%jk$)yay8i1_h`rKYA!e6&34WkF~Y6J32ZF
z-fUUexuw*;3oBa9cri6JG<5WfmHhhXf41`X$4{qNH~d0lV`FQ3H!?f7CMPGa+zidj
z%L^!38D2Vk{^85hj`z)TtT)T7|MC7aYvVgh;mq02`JZw1Q;Um>g>SzuuCv_z!-jZp`o`u>O-&u|mjVL=J16%G`VY6i{j#vI_@6l_>uF-)Gky`w{o>y1
zcatT4LZN7Y1)To>693->U}urs$uY5U@d=c~he^pPscF=7cX`unQ?HD?{DQ)w$4_X*
zC8acVnKS6>n(7B=d+xG^=Z!C#nqR)q(yeW8zks$-Z+X-6wzseU;j3C*85yl^G6G@I
zE;BkX`*Ci5Azr<$MprADn^-Hm*yy$Mg}$}7-y_q$nO3o~`YrwZc@U@rTwl`gjHYkB
zOt|{)E_gxT_#c3@kuD|_l0cEV^Zldv?zjR*_4B@lrPqno|87csFTVK<5O+UsY4-ez
z!O6E-6XxBS9w(&{e0haGR*ZY2k|e)*V;bdk^Gp0!$OZsuveqG!v4=I2?=8)bq!D1_
z)w8~MQ+3O@M!O<*2i7MySO)XPnNqV0KOGKN>XzKpOa`4Uy7r!~348`VM_t9))}FD?
z;JbMAY|SY)XGGHF%0zUJosP?8u(5eEBtV+r$;g_zW(z&@PSChT>8Ui?R2tx-!H{xZ
zVp{l&QV8ihdT^0o<=Px{Nxf$osp*zQ{Xlbe8C?M~6HfJluyPt2KMxM__}m%=-XB$-
zZ3nd{f=)$0f(B(UU?Zh7+cqM_vY1oRFg+nV4`LCAXk;E
z#AvyjgGyl>!8FpYX~fy(uRy6&ylArnlcyi;ATEce_7?!Xf2Qq|bfc(qDu`Eo2poJy
zXd2>jwaS7;()HFNC(OpqBwj%85vA-*F^z7SBK5FR4VXd;BKyYGyja13s$Qv_q?x!e
z1(xT56fEB_lbM|HCx;+1^R_PzHCr_xV>HwuPrcC-Hp}JD_U+0^*cmM1tw8v9)CrUd
zt$O&uX>M(^;u^H{R;iqX_q)R2z@X2kZd4G^lH53n+B#BTX=!ELi!JZ6qF?TW%jNaL
zNhOPBdFbmpgLf6{$s2iv^pqP$3WXzNvVyLv%%NwcxKdJWWAWV$_pY9JN>PDWpkePbAv};Y4-vZksWRR
zvd@bjCG^%~RM=)9#`>e!#yo%4j|(H!&LY6zAI;wcR?ge!hd2&K&2YE)PP`E5o8vS?v5>BcfB8U`a786+Vjt}=`qKbp)^X-Znb
zk_knOyf(Y8It4OY5;w{qfQA7+^^kbgJpnEm^8pK|ZyA~2_0eo9B$&fDmcNBdtgLyq
zYVigQsWTI;KnTBJl%=2X$ORB$S83bkbpvV3;Xrl`F$$KnkmS8G>31U(Gp8~3MzoQr
z-Wsjv1%}Oq)P0{wDw2|t=XIrZb2SeP``=I#(0u3b(u|hfy9k$
zu)GA@kF($G(m^%YRKLnD_eWJ?YVhD3Clc7t0ebbzmg#>xxZ2xs+uS`Q3L9y%TxX_C
z!W%*6fIcc0rOTZ{GUIc;GHWPsLtdAA;M99rjuu!+ClCNhJbBbWSilLeH9!|eB4)c->Ta;kKMN725fOq_s^>=;+apNwj
zYkAn^`7_AMXai{JU)zB~N2eZ%V45iuFf3Plz;*`HuDGD|q6T~Q(L-WWyw-*wQ*=oj
zzEf$~0l+e};YcHa3dld3iDXSSG_47eJL1E-|1;u)xY4KDGwPy7RYXTu{5m_j(*uE|
z4o$@e*Ttb?5)CbZ8on@2eywPmYMP5dR%p5Z##XR>zXrRgIj~?{?c-<(}bv&d>7PBK^0Lqnn%M05RB?eV?D`eQB3FQ5^-S6k(%K*YY+Zh2GWW3|u@5ic8Nhs`u!
zJVjeKI6M7x^*pqM*Jt6wq6n|o9^=`GJAU3CqI?+|x8?YYuN`qq);{xdk?5yG-nl*M
zbdEa^5}`vrzq$+ichg6p$M3rM(sQPNiVuNnek^xvWNKFf`a>jo&s0&2Pbfs*T6)m6
z$1P?UbV5t^ih?IosjYeKBo6d(Xv|LNG*YwD|D&7O3}sGhBw%tMZCDS#pdmSQS2tM=Gb&i?qWj>MF{Nu(=`c{D>gyDrkP}Ki
z!S}BI`@6iUF1#+CpShH`C@k7D8%VNAY^kC({8i(N3G4r2c)Ia%3WZMW{J08?%$67Z
zwG9aEVsv-H+5^qgJ$YMT?;dr2j6XSa^Zq5HRet@LM;ve|Y|ll&t4JN~;0PXO>W
zobc3#e@8DL%w+V1U3?JGWRR=(RZMBHwt&GwQ;I4-R)^mpMx=$ZS2GM#D!c>A1AelR
zm@txHr7C+f0n!WB6^uy0MkMS#IFRe(*Vf8XF|7tc2sGE`UY9m18zKX^YlT4k{wJ_=-#=RU??Ldr7vC+<*j@Oh0$Uq
zXl%;H&OUg9&rdZWjTC52`u{a=nE<;`bz|V|fZyjQC4ikU8
zK*shVRKmeBm^82o1wRkT
zQg(!M%BDxhg+1gCgJMF1vb{u6SJN_)QYgx}0af8dj#fZ+-mHk&G=Ucd?)A+3dR8cC
zmLsGZ(e@)L(h>5fs-TFG`877r7y$2_E$kVv?qFmnt&t_NV)8=l8^YmG(>#A$VcDv{
z8PdJg7RdF@1pa*~F($!|>K7Om;Z9H2F#~;O&$@k%BXEGD$(1;tqH}l1@C%!XUIcWf?_fVRz+R+1qnD(+uEz$ot2=EW20L1+mo+l=6W1
zZ-fh&V0AiBrvl1*>2eki*kGd-*TC(>5-2rYAMdg>OQ4(Q*n%y!;ZY3!FkyN4QXfH@
zSbQRuvsj*6feJU{M+xAbyhN#}!OO3UAi`e~G!G%%dopFMA$1i6wG&ooZ@3%Y_mS<%
z{sBT1Jz;JCn$lYkQj+sYA}NLuaIGb7_iiE-?~zjzr#y+QZIG)4662T!5wjIrdycl%
zh}VYENibjy(u-j&h$5l)`z?kH}ta<_2@Xtyamwk9}Zwiq`^*`mUz
zpAsWBD~219{FQNlkq6XsqWTB%9&=asTsk}>c)jVxj>QVbUNT`4ur1x#iC$P*_21+
zyxl~6D>4gB0;ypk%c$py<-i3LD-%sD)}YsgB~<5|fZS+o><$ox5b(GeAgUgaTT?Cn
zs8;ci{leV;)FBbor-elAlxh(vzX^6DsOlaI8z#-MKvA{U^IvO&MO#S2(Nne&!$=0%!_r7eYuFJ(Gj>aTq?64+Gqi+z3D
zjwqM*-GW@(SnYqaQ+S);=&bX}oNR5@nP%F!M>-o{j6`mutLUADx#X7PSEoZD1kGw2
zpd(E^8{_=^wFWRecs-K%d|j|4deG})_$9C{N}~Xozx?`E!wE`Kln%8y6}ZLu$L=ZO
zfjYeijqh$gihl^cxK=bXb$^=-c2tgvtGlfZ=Xm9FL^AP2
zx${~``U=K7I#X*AkO2Jid}kX0HtamdH_ukKWG88cvxRzd$GsDl&jH&2u&r<80^0*f
zM99Mt(#dp+_`9Bdy?m&l*w={|>tPPe82(}J_L^2qL)P7q`kJoGl
zco|lB7jGQU^U4<55&JG44^)R;@{@Ib@Fy%H*~s@Y(MpVeO8{j{>PTiLXyT!wM9>2w
zNQ20N$kN+tFlo;U;T*3n+MqzU*4ZNIAYL5I)>i3#339R!10E3D5V<6aza_>1i7?rD
zCjFp=@VyC+a-C{^-ujR9Y|Cb3iLTjQH6)A-;i5reReEE02Kf~&+ycC_L%s8IdP-!&
z;{)rnGzBj(>t7Hrj5PCp(TDrZ876qDR1=}@02=|HNx(uxzi>5rlF*py=ObBS%L(?M
z3mk~TYsDjXYmo7xC_(^us!*l|1v)2=`f66!K#b=7i;8M7>HPWHLn4ZXcM%>OztYio
zv83SNX6k>sz3TMjBF0!X{qfe`WCFe7qk?fPn$M90to(uK4o~a6nYw_fiyLKeh!sr5
z;-;T$P1aDe$haCeKS3jLM2uy>!F|EhVM#ADS-FOpypg9=uI?ngp6#1(wRpa-*bb9jeP82KnQwpZYt{C@ciH%&5U0!f9mp%`@vKF
zrsqiuAbG@W{*aZ5aoFB;Z1R*kRDSE5nBVGRN$C8Ib4!;6^Y$gQD;81vm}Jb2I;63(EjX{
zI8SWx!V~%u+Ml!c3kS9yu1LWAzQtjHfm#3%>wl}x#kdCi$FzGOhPHW$C&Ne-Y|Lb_MSB{=FpxFIA0R
zD89xV9-DR#*eInz&o^K7DuduQICdFkOiauu$S47`^rUevqb*#Jvw%Rcp6x5jn
zrfLm0^5n=?{i28dI-;@-L&YyZyQaPsm9}t)H7~BU&{<3OEjX_`E{=T-t+ARXQ+FQI
zph=56fuj)mNhH2Uuwxp2_?Ij6{SsdX^87W<&ia++y`?svMeSPIvQLJwq_2f2ryXla
zITVs2&Yj1cIq?57eG-{t{b)XlbCG+e1oib-)Z!oJqw>Yh7}8!oZI9ytAjjYzz9GQH
zLhvk2rZG6e95ZjsBAop*=cy~c`CrJu-q*Y1@tffGGe`8G)EgfbmR3lhr{Ap0#lFwBp&X!|YDDdpPMP56|DPBN5^V+y~B2
z^@upW`a3K*c4SA1p>L06x4=M8GPt|@VZnHL`#ZoByxO7iWy!RI;-bv7|0XonDco7ngXLrGydSRdo>1>&j0F=H_fBi3ef6DBcJQ7aA
zY+vx~34ri9L-5C%4K<5?3Px_N
zMs5N^e>b=N`!_06jXisvNxj9291J8Ic-=ko!b`a-lO_oJ8
z{1U$*UQKVM(`?qxM(ZYKEXYCB%m`G~Hzx|)%_CMlw>USv&4AS0RUKce@N3>-dtF6J%G7|=N2NNHCg^Bpy_H^b
zNY!|)^j#q%ZR*T!F_o*+Fzw`flAuXw?&Z_SJL*puTJUg5Q)Tvaja7-)Q9K5ZmmbzX
z)Z2~@Su&sYa}x=1AByAVWasFi
z-+eF>qap!*PrBe+{?Um{>|>s@!1b5vvy-x}#VzRCiAB3&KZ9^xq#1m+xkGlqu~Tb-Zi#Xq2DOs1?_S^<-W+yiBxx1ct;-CkW&dP4_G|}l-wD#&vGdQDG5MA6$WvCpV
zOz%?;@|E#Br=V-HL`tLDeL6>{-rzGsl!@KZN82aEd&Obz5PhY4jOtsGtnVg#;4%P)
zW|_iqqaWNsmeEh&->kkFR1@yicn7^2$;XL0cG-2vLO!LqKa7+(!kEdn&W_HUakdKcL}
z<9%9aAm17l6E?YMZb93V3zK7DQk*s&ueECA@?Sj8vd_xvbFlT+)4mb&?)08)&2-=?
z$CHczW1fcJl3N0HnZZJ@gplU?_LwLaUCEQc=%>RC4Cp`bK*BBsJx>U=Rse2a$V7cG
zeNa+`WzdWsd~ii;BIP!ri$N!TbXUUJsXV$$Rfb=1B~?xmBm6a+sUSzUd}gb{7mm77#BicKV1)vSMOL
z!qGfik)Ck&3DiJS2;zY;Je0dQ5Ys<;+aG(JAJ
z_0-|llo()6GCQ-+s7^M)-N7JID-k!2XJjN%Mrkr#MMKGVP~Y2D&x**y`E6G8(j!lB
zC9YdYe@W+m{5@OIr@!Wki6ptk<)(B{I5%k+lOcSLnX^K%>`!*P-@*EGBy1$9x5bFveWY5$1rJfk5znK!_8>XsC*>{`I}vN>l}I=W^g<
zCjgxlOCP)3&H$ahI%=P1K82w!t6dwcj@EFxqGw=xQgD2ewY+5kLO)WiEk#M&On#fD
zN1cYp<5K`0R|jQ@<_c*6rto;!u!EJnse|ge*OZ#E!h8OVe08wL6*Z}mUwqO&Ryz{&
z3h*<@U0Tlzw>=ZyI9X4uR;F(}JoP6L@-aWCF?p{}^8Cb19%}04!*a%nUM!{T+>}i1
z;d&k0eq0wa6CCDwJK8%S<|g>jt3tZJq(7E2S7ZD*QAu3zQOuyHi1*!h7rhl3Kj+))
zO<{jqK}yqxc5~$J&g0={x9$}=>ys-(xEq+5KRr70(WdKp4%Gw#xezAnP!(FU5t
z!rGYt;v||@`sNKrO4R*}?`W5RIO?1g~sH*{MfSCB;ENmgiL7n
zA5ZX2hWC2fKo97$%P!6sv0^AB+oo}AO?%rHPWl;SabcLF<&gUrT1Hww{lhht|9bTuVq1I&b;2o*h
zBsiv*kNV%^V#+D|6&OMqX8jMiGvrB0t&>mR*4wb423t8tueDXQaP5J&=k
zNjL4QRb%Hd?b{dFU7nu?)7*`@=9OO#vs{=y%^wC{!h?+>pr?3=pr=$#K55}Vw={N4|3m7dYtG;JK7
zsO_BgPx)zXO=?8~Kt*$!AZqP{4g=@67G}AC3pOZ}An)y#1JQL+GDnxq(0D
zGbQ^i^un)Wko6M(6*Nxr(2?L
z*gg;!(q0I$gW=5uoen!gwimYko6*J
z6fN_QH^EnvEVnNKa?o|3Nu*)*UXy|nS3O6iG#X?)DqjfDjX-j_28BN!J|=;0?j7fPl9Iz5z>`=sO_Hc6v4+T;x}*g?WLQA{G2(r248
aT$$Ye!XrQWer2&no4WplgGn?1==>iO8RL8a

diff --git a/vid/src/main/webapp/static/fusion/images/grayButton.png b/vid/src/main/webapp/static/fusion/images/grayButton.png
deleted file mode 100644
index 83f2c45e7e128763d0171d9225d7c53a209b0f17..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1361
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
F{u`nG-e>>-

diff --git a/vid/src/main/webapp/static/fusion/images/headerChatIcon.png b/vid/src/main/webapp/static/fusion/images/headerChatIcon.png
deleted file mode 100644
index 9b0840ad94c08535d8d899c66efb67776e8bf78d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 465
zcmV;?0WSWDP)P000;W0ssI2fY-s100001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0cJ@=K~zXfV_>V=
zLM=3M&El)uma*>Q=IbwBe*XFI-+v%@{q^UrTdxW?UlDEEfu|EMB5yGsVLqz!w8LYYV46YrB5N6$c{ROIoXz=CdAGmfPLYPIW2O$8i
z9f%NSLDCUP;O{>iX5D&2vL7!${{+_#LZLoim00000NkvXX
Hu0mjfyKc%{

diff --git a/vid/src/main/webapp/static/fusion/images/icon_remove_all.gif b/vid/src/main/webapp/static/fusion/images/icon_remove_all.gif
deleted file mode 100644
index 0912b4a368eec3241d14daa06fc3d7691697edd1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 982
zcmYk5U1%It7>1uSGnE<|EeZKPF)
zIP2^}C;>MmS5n!n=Ax8%_?{=do!QTjGfL+el+R7?VtVN?8KRg;Wvhtep;G1Gd6W$a`4r`
zvD0I@_i}5EwW$kJ=8OB#QsfuV2e_xCkp>-Aq9V{Bqh$ZiLY1@?_p2>G|3Pb(1)l*D
zTVPdSDbEWWhlk*R(k{7W;x3$^!p1&9BUd%B9#(duNP1+s8are~$TC>fBscO-L?NUN!+#Q#Q>imFlsVbi9@)cv$m
zgh1V<(2}guuwuHRK^?NH3y1VgzisF=oPy`o${1saTO#%k8gVNg=2I-U-_G!f^H7Td
zErWT9wLMs2w5fwxrC1>F@!cpeIga#^k)kLGB>oY)75sS2P}|wP(m@d7E1>y)YJb^Q
z9M+0tk0exfsg4-h$d=^yqEW|=J>J)NPZJ(i=dQ|`6Hy
z&h|JS*1v&uz5VsiN!3_5s9x6t{}}3BHPaDIMgPPm^D}mt_hzO`S3}d<{n9tn=gP+B
z&AT(@PN9$L+s%yQp2IM^ny#6T^^k8pbj=Cb#v<}=gsnW;iD(){cb4;^etc9mkcf?ziPU(EAHU8eq@!%CVf0w2oyH)z+mpn~R?pQq8IX7qg`_$6>TW*@}{{W6F
B1gii5

diff --git a/vid/src/main/webapp/static/fusion/images/inactive.png b/vid/src/main/webapp/static/fusion/images/inactive.png
deleted file mode 100644
index e9920bf47d78cdf4c3ab8f7642cbf3bd981ced21..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 842
zcmV-Q1GW5#P))_`%oDz7N*vvT4qUVYa}$i$!RF&xK8@m>Xi~}+|C=4xYM~~k8C>R{xUVr}QXmr9(By2m8
zu&*9C@Drf?AN*%Le%GFxv+Z-|?9W1>5kL@LhMuU;_d1#e*)09>_`q~;@7Q*eFtkh!
z4P9yI?+>xI22Lk2ulGaX1yO)D-_p{tmM2e;o0_0lB-Gj2wl9-;g$@C?*y+`#N`6NpGTPtzu&sW=Eeq|x;m6yyFd_d$?|hCw>y^B^?SEVr3GnZd}W&7-!aX5t?TO@u22Xi7zD#W6a?phstzt`+M*ON&4}%E
z;!ss+Y$Th@u`)Bmr-mBEtV~Qecv$I?*m8MW3{3Xoiy1VT;
zw_D#0Cw6#7M<0yb^mvSot}gpDTmynno2|os|5#WM-rNCxrah7rf7jY{=a+ofB*jffq@{A
zXV3mCDgCdi`oC`7|A!C%fB*hJD(Zhp$$t)x|7XtpU$_vY5o8z!Q2fclD#9SapaYTt
z*~!4VKtZi9C39NWLxzTAjprG>9HJtw2?EWfQ7p|%78F>Bw4P{rpvyP1NYBS8)S@7Xjyn&8L6KX*B+5P!sKHo-zpZ(mho7GVKFK>=KKW(G{

diff --git a/vid/src/main/webapp/static/fusion/images/layout/panel-e-w-toggle.png b/vid/src/main/webapp/static/fusion/images/layout/panel-e-w-toggle.png
deleted file mode 100644
index b3863ee71056de0837ed27c74f7db176b87903d5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 459
zcmeAS@N?(olHy`uVBq!ia0vp^k|4~%1|*NXY)uAIjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sDEfH31!Z9ZwBAX}2Ry9>jA5L~c#`DCC7dx@v7EBhTrHX%t9
z5mPN~psCiLE{-7{-pPOXS$Is?d;(@IOSmF5iQ(cj3zN4En-m!4_KPu*nI9vEZ?R%gP&<#u)pz<*&T*w?p89N
zxgYuPtM~e1c)Uf8C#-+{f1B=m;20i{ngV;@9?Pl0H}tF`wyqwMQSkO*s&dqs;lN
z+2Q@f=RDEhV-sF{6J!3|+uI9N=`j6)lGgG0mc?u{c5ipA6kvGNe58}nC6bBh1)ESd
tBL`2-Mkied@%cSbPC^TsRe5+Awx^bA+jA5L~c#`DCC7dx@v7EBhTrHX%t9
z5mPN~pwNC#7sn6}@8m!HEIcM`J^{0qC0r4j#Na7d|Lsj=+a}rkg*I$$d#~mNh}9WX
z)G&QwWBO1+aGxI-oDlldTuqI$8;8G+yn&0H?`
zu23k1qR}XQW`n_i^?JQ|zu$i}8jYSG1i4%;wOXxyZZ?~O&*x(fhl5$IRyLo{*<>J67Ac(BY_>Oix7+RGbrw$Y`TT84>|(JvSPTl8|Ifov
zDwR4-CX*V(2#DU<0YxH_Q+Pz8`E)up?Xb1D63qnXTa`Fs2x)fvw
z1fRS?r6ek|(U5j>`vvoJ)1y|aT}Rpfm#!d-3y}RHyVv&K@diI5WKQLweK7}kbnrSR_iW2`+FNg1p(v*8QRe4rb^;|
zyO~a>-(so(5YBfzdk7ONhVTB(p9miJe=Z)6AES$YLk}ANg3cgX|0}=%-#1t%MEx6~
P00000NkvXXu0mjfK3FXE

diff --git a/vid/src/main/webapp/static/fusion/images/loading.gif b/vid/src/main/webapp/static/fusion/images/loading.gif
deleted file mode 100644
index cccb0fc9fc763bc5f1a7418c69ce02af37e65ae4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6820
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
Li@*OP`t$q`mG8q8

diff --git a/vid/src/main/webapp/static/fusion/images/loading_bar.gif b/vid/src/main/webapp/static/fusion/images/loading_bar.gif
deleted file mode 100644
index eed8a505e7772839854a867ea79a3733fbc10755..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 28954
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

diff --git a/vid/src/main/webapp/static/fusion/images/login_button.gif b/vid/src/main/webapp/static/fusion/images/login_button.gif
deleted file mode 100644
index 990b52276cce04bb52b03aac671c0ab8301539a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1222
zcmZ?wbhEHbRAmrl_|Cxa9|->a`}g#>%%N7lSKy#Dp!^=}TZ`gElK>yhS9hkD)}n)~{|$}b12
z-tX&qx2Najo~3VgPkz2*{^wo!FSkv6wq^FGE%8q`&G@t_^5e#cR~yQntef(2L)5!<
z;cwQ3KU&%QWM%iG72S_lbU$5L`*KCr)AHvtBv7T8bUAE23@Z9
zyHw?KsnX|axx=M$ul;rQXDe+km3dw+wYyN_cCpCvLXq=@Ld&BiRu>8!FBI7CF15ap
zXMZlw_FRtT`5dzYg%;;>thW_ep35*llVN%WNT!*dNi*J_V|Fgp@N}y2fpp^&DMrVV
z4UZ-p9#1wpoM?C`$zVsa;lV_M{qY8y6Abpo>FnWPj{ChdS73y=27TFWQb%@KC*oh~J;pYmX$
z+p_cX^9#7H2s~t)J>MgBnxWzaW==!T#Z`ZpRfRhEU0)QOIUM@R-@Yznj=;sIeAjJs
zqcZNCXgS!tDOb{B=ix=`T5P=E&Epl};N%g>JyTTr;DOF$1`ZCM7eWmTjEv2A9p7k
zO~Gq(HGP~doNdjLV?&SitKT}U@a>}7jrp3622xMfXxv<=85_=9?k~NnOtm6VI@D53
zSyn76EO=kD`hf!nPEXakaN$CxtJszr6&GEBjWrr?cc_>8O4=H0WjeHI*htn_yw?*mdhTW9O%;1XbxWLd|-vw_c*SBZW7ll9zOLJ!$Rn4ZS6hzY)6P-PR7e9FYiBF?8HXSrjJ
zM#BS9#wGzZmd1xiPqi~M6^H~JTF_*s8MA`r!=prwcJ5e~fC(2_53%aGIq)zwv~)Id
raEqxJJaB05_GxCi67lKaF=h=_l^+LgW-zp|g$E@tDl7?9V6X-N@P@)S

diff --git a/vid/src/main/webapp/static/fusion/images/mail.png b/vid/src/main/webapp/static/fusion/images/mail.png
deleted file mode 100644
index bcf7d25482f8b02d730264f6c8844194eee51345..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 449
zcmV;y0Y3hTP)oSdB4*x2OcFMd7o}I|Z$oTj5;NRP#qM_d1
z*u=!detv%C<>jHFozKtDwY9OhxV5#lwcp?0%*)2~^z^8wq^PK-o}QlA*3sYI*t@&C
zzP-Dio}Ap;)u^ba_4W1h^YfXRm!+kp`1ttw`T6VX>$kVJ`1tp_y0^Kxw#37~{QUdS
z&&rLBjQsrkq@<+T*V5M2&iniO%F4>q)6<8Chk}BF!NI|rnwt9h`s?cD$;ru+lat2A
z#_;g)dU|?`i;I<&m4ShQgM)*BfPgbJ-n;++00DGTPE!Ct=GbNc004zaL_t(|UcJe~
z6+=-J1<-Tfw-wvAZKMBok`)ZnK=yRwPuMRY!6f27qAUR9Vsf0`)KotNWUaBG5S566
zPTC3s5fWX;e7;$9MM?r1Q7>b7LoZ)wP0JOaTB|pj+cxWTHT9?ufQzn-ILV&a{7jzn
r3t+igZ+QR9ZhsJf(^>F+U2pdXFNF=whC;kt00000NkvXXu0mjfrX~bE

diff --git a/vid/src/main/webapp/static/fusion/images/map.png b/vid/src/main/webapp/static/fusion/images/map.png
deleted file mode 100644
index 9ecb79abe6dbbe5c7995d03d93b8a884223e0a7a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 611
zcmV-p0-XJcP)X&c)Rx=`*9wEGOQHJxO4U4IRT*X
zDE9`L^b(eXD|ly4aChqnMn~9bf5Or5I2oPN8V4tbM1XUGGdafY;jVKCQUOjwN&f}(
ze+?j&yfA-j`=
zh~Q$9$&^58DkGAJX)LzO<2c5jD4HXfwQ&+sQi2l_4OW|pIA~GxNNw885zN{Q)02iy
xg%tQ%JbUo+zb;auM7oXJ^?H5b>-<-M0RXPuEzWw!vCIGf002ovPDHLkV1fp46B7Uc

diff --git a/vid/src/main/webapp/static/fusion/images/menu/bubble.png b/vid/src/main/webapp/static/fusion/images/menu/bubble.png
deleted file mode 100644
index dd5abd37cca4d12193e4078e0a4c1fcd3a470fa4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 662
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl47+nHaSnFK7aoF(W6HP4jg#$EgwUD^{#1EG#TK`lABq0ppS&zhH*dH!?59vUyuRT(|De+n=95ANYH~_0J#I$C)#q
zBuKnHmbo#FjqUIg@4B5+++FR=wPXcZc4Tfi4b*;La5lf3&Xx3m8j>Mf|*d8T;ci}%UJ`QaWM+v0>aK3K@!Dp2%y&6BnL
z=LH;U4w+2dvt;wL$Jra__BjW=-uyjp?K<1cud{+Z9p7F1=*@KXt#$PBL$z$1j;&Z?
z81CY7G4-gS#Ci*+%>lY!xU{1FsrdMYuk2Qvm^yPtNt#%~+Qr>k6PdRe^4}L*bz_Q+
z|DxujOCOxpo^HPSp_}raeH$ffva5G&=B|J9R$fL?DLMT!(i5hWEJ4g^J_Oo2oy5RuY3^e7QE(D;{Ui;MVLtD)Iy{k0svt1_UpR(sv`)1UN_aUIjh3(G^S>UhuVXkI;z~A)*Zcd(rPD|y5(v7(kR@1_
z%0Q&X$8njWaa#O9Q$%{ay^R}lbC}NMsJG&RfF>IfDj`l0Xv1qGeeSKSz~vDppRMpF
zgnqmhvPifDgU2=S{b7(KNhY6ZVG(8$$55oRrW&ef;AnojJb9XLr6|t{00000NkvXXu0mjfDPbaJ

diff --git a/vid/src/main/webapp/static/fusion/images/menu/file_save-all.png b/vid/src/main/webapp/static/fusion/images/menu/file_save-all.png
deleted file mode 100644
index 3c300ecb502f1e95b589ba613c0346c21181da68..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 610
zcmV-o0-gPdP)gJMAySh8-G3_dLC(E|4oe2=^}4oLpt>zv>s#MB!qH!cJ3Las@(e|}d`i-jrJp0}2_43@x
w#CyH^a$o&lVEojZ25g-BK7dmw;I9A!0CuTRyqGS&b^rhX07*qoM6N<$f_!8YPyhe`

diff --git a/vid/src/main/webapp/static/fusion/images/menu/mail.png b/vid/src/main/webapp/static/fusion/images/menu/mail.png
deleted file mode 100644
index bcf7d25482f8b02d730264f6c8844194eee51345..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 449
zcmV;y0Y3hTP)oSdB4*x2OcFMd7o}I|Z$oTj5;NRP#qM_d1
z*u=!detv%C<>jHFozKtDwY9OhxV5#lwcp?0%*)2~^z^8wq^PK-o}QlA*3sYI*t@&C
zzP-Dio}Ap;)u^ba_4W1h^YfXRm!+kp`1ttw`T6VX>$kVJ`1tp_y0^Kxw#37~{QUdS
z&&rLBjQsrkq@<+T*V5M2&iniO%F4>q)6<8Chk}BF!NI|rnwt9h`s?cD$;ru+lat2A
z#_;g)dU|?`i;I<&m4ShQgM)*BfPgbJ-n;++00DGTPE!Ct=GbNc004zaL_t(|UcJe~
z6+=-J1<-Tfw-wvAZKMBok`)ZnK=yRwPuMRY!6f27qAUR9Vsf0`)KotNWUaBG5S566
zPTC3s5fWX;e7;$9MM?r1Q7>b7LoZ)wP0JOaTB|pj+cxWTHT9?ufQzn-ILV&a{7jzn
r3t+igZ+QR9ZhsJf(^>F+U2pdXFNF=whC;kt00000NkvXXu0mjfrX~bE

diff --git a/vid/src/main/webapp/static/fusion/images/menu/profile.png b/vid/src/main/webapp/static/fusion/images/menu/profile.png
deleted file mode 100644
index a3998fca6945bc0a43c58e9eeaf1e64e2818ba99..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 462
zcmV;<0WtoGP)*!?eEmp*ZKPTGg*C9Yj$8_W>ac**xB39(9-z$_z5plOKN~LQ)!2X
zhlPcO0001WdV61akw18!($dm@e}932fti_^01q>Wi;plZExF3z(AVCHkCnQ{)rW_N
zKv!cZB_$F#T)D;6kCvC8sJVy0=U4nJ
za0`Jj2Bb7NKdq!Zu_%?nF(p4KRlzN@D78GlD7#p}IoRyQo=rVK
zbv7V%KvO~z)5&w%jqDdkfabJ#x;Tbd^uC?6QLx!SfF)c?^ns8@t5^urNzt#I?;3=B
z)XUTb7#dsMe~1>p%zj^LFRo(S!1>~1CR?o@V|@MY0j4~AkEqiEf`1{3@%zqiR&&AJ&-yz=e?p>>jfSpQF1a`AH=
ZE5`$kWlBE^?f~7x;OXk;vd$@?2>=o0o`wJb

diff --git a/vid/src/main/webapp/static/fusion/images/menu/users.png b/vid/src/main/webapp/static/fusion/images/menu/users.png
deleted file mode 100644
index 13fec65e4830ca3ad6f139b614f290fc80209200..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 938
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
KMNUMnLSTY{;oH0b

diff --git a/vid/src/main/webapp/static/fusion/images/mobile_logo_att_header_horizontal.png b/vid/src/main/webapp/static/fusion/images/mobile_logo_att_header_horizontal.png
deleted file mode 100644
index 44a9eb47363e19cae9e860708902ff82f1fbe9b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5202
zcmV-Y6s_xtP)ZKfhg7=hS)k`vna&
zG!5+o5RjmNK%z+uDk~aSbjHM$WHK|}i8s#7UCuQZi%{usZ|BQSdQqzH9Au)~UVsulDa-yMC|Q
zvT4&M{u37t=G&Rv+S+PdfBp5fwrw{nMWa$?g))_`Ftyft7=jMpR|k4}I$rJU>>NB_
zi+(@hEfL(@+}v!M<~0i!E?gI~LJLFTP|C7GwjHstOcN1>ANb^Rd9Bf-Wo60ExpU?|
zmn-D996x^ixz5hcp7X89dlkPE!3_-!3!?G(=OW?o&8bwXHXODIg+f>%3)3)BhJj%y
zlv0Q&01+XfgCOB~{@jt#kY_-W0*D>2U007ti=Y
zX-WL9lCrXzNZ7`-Ou}KCP&kBTg)mJ6!!S`wVJL-&fCy-fM&tVd(O8t~>YAlPgM&-M
zcI=kDW8tqe7_n%Ch#kR>M6hkU*dh@kktnffjCedjBw|xrQ_ZCpHLbKOYX14JjzsR+xbX+p
zJE82mfj1;LR@1P!B%XMT#gA0l&ZE!OUJ_8%mknx9oUD#}WD
zt|LS1Q-_#a(ao~@au&}lXGVE~R3wCLfn_QzqxeDufyN6oInQS#>(MckrS;SZ&%f5s
z&f^0d>=`BJ`6#VeKd*|4G|nQ}aUA23M;`uis-*OaS)-%G
z<6{ixHAuj*{w&7^3;f%OVUjO(P?3yMm5NXj2@wsML@W~oa$Z2j3+NlmacU?>-&l^3
zjK^5cBUcE}z^w8ZpIbJAKVC75@~A~N?-4Ig|F>|%;umvAcR%?qaB)F!7Qwe|y6=Yd
z3uk^ti^1x-H5|{F{BUm%I%H6mj9`Z>lw}ZTMR&G9$5?@auPON8`2oJK2?C9#Xy7&A
z1scN;N~0m>RL1y7QzbXduco;=4itC1sf1b6rbWB*2U@=I%|kD2x~sAKou%T!;B^Fl
zvptfSV9t-BwvgJ@eZM|uRa~^)irw|C94;le2=wd{M)*3(1
zc)mt!O?fm#Q+15R^(9<2r<|+iR8Ss$eb7*}&lY3(EJw1|g3CU8)gMAf%lTH;ah!{R
z>w+NYZE0!w&Uuj60Nfk|!LU;5d#>wd&K&bPf-i}sZaUN#Ec@QhlSm}a#}}ojPe%CE
zl2Sf;(RB9pWY~3bh}Ki1bZ7F6`HJJJ`dno*bW9-0&G^?FYZ>e*2-0w@bnqSPy(vM2-P(n_yri@HM4W5AZl}Zi1a#
zmW5yZ&c2&XTO@CoJos`KyZe2voma=o#%eCAE2XZYjH{dLin~+`-ncW1Ae%>ox7jdLsi`5rseZzzc$pj9{ASVP<|?80kqa5=Tjaq45X(TaGKy#1Lpk3
zn&j$NG8x1UllL@F@9*WgBSS1|=w;cgau!c7=hE5|>PwBWyc1)6Y6L5791frCB8hFHYU2l@SB|vo$1S^zM0P!FQKJGY9
zH(&uTxvqQsbp-$XP}c{RH`c|r_nhQVe*qOTC{08OM{SM{WjL~@gP-i}!a$J-nanJU
z(@-9#zAQp*(xy6L6AKwcEQM_vn2OUoIalx*%lQmvJ^Ismj`XM5b847ZdPeC?=jqQB
zSkh3+J!=|Se@P9#@00dr`3pxf(*=&4gV+$TUTb}ah%gCkKL~)&0ZSdn`I76pIUuC9zE4E181DzDR!TiMN#4Cc
z%j*b!`tZQA&t6r>CoZn#uXlFgg+oN6A;d7ihp|k7{(K&dA{4ebnf7_Ua|FXs7)mgd
z5VZ_qA%kehz!V{D78j7o`wXWGbPi?d9m$f-2l##fKz(_XKl#8+{&@LJrYCJcV+i!-
zsC{K9-FV442nGbWRYcZmt$Rh}m%tdXNJN^n)_*G^qps^dv|+=Br$ywL)_Sgp%+Xqp
z0lyLvUu$iO$ZO*=R{(baL*pa`!2blk;CbGUfSrJ^wSEQ|5|Mh~Vj!cnenCXiT5C&d
z-8QjE6JX;H`mDLDRMUc!gRHxFIwfVLe807i!$Wy|-=|Q}7?w$C(k5buP^N(>1I8l<
zD28K&AfP`J(3>fM)&%2yGHyu>+aRTEk^$63EY{2}=eDKOSu`zmnl-IKl;WjR8HV!A
zMVPV}7aVOs`B3}WHiO3Cr
z77+m^%+NfF(d9F)>)sD=@4ff_fru;u%E#~PIgWELMbq+ozym<1h}?eg;K9zOrX~@Q
z(`L;CxO&aSk(WnLRz0}$1T|$PT-RLB!kJb4;N>o!+}FdHAw;8LtdM~|ZFe;w69qE}
zieVWVv>)JW2(%^u3?+mugJ~(7rPETZm{H2|`VwjrXO|yDg#Fz^Y;PZ6O=IQs!r{YH
z@jF3sE6{qzwQk38egb?_L>hn@uIugta2#jCDFx%N`yG_$P
z{U*7t>jVB|c|iI{Kl;&G{=x)US(mlCI_yMO#^W2$zecZbaMQwBY`*p)ZvQ}zU$+nQ
z{K+AX59R331q|jq@`WOKg+f3fAK>{uzOV7LCZrT45sUIzh`N-`qUkBt&aGrYO@e93
zFiOtt9J@xc{Kb>4)R)J&etsnN=(+i2oU|I?nji?)Dy8NDQLS}K{{0@4gKlH|_go8j
zItYSClv1~9t+$9s6~zeQ9@ljbPBDJ6yeZ2LCcw=rYB~ITw|cJIr)xOJSGOME*<&Nz
zw!D$Gjn!N>tCBwq;Mic6L;Y!v4`pc|$kH>KCzJOn_yJ)<5eXTTL@lb~VP=#>m{SpB
zc6pSDWlVMNv(VZ#!kv%2MEk%98`mx(n(uqVc+YX1Piw935s~?m9L|`COpvO_+nYrh
z#mE8?snS~eB65f8x<4FufPWqYL8Vgan-fvOZ-WU?TZ(sieQIp~*a*k^^Jp{7_LGC`
z`&k>8?(O7*bE~;xW(Bj$9}|&>JL|kP${(zIIOi+
z<0j^#j^jKA+z4zIk>kME-mGpWz|#Nz^W2@ctn9nCv0~2OY(Ie=j}f;m@}9?zlLPE*
zA42)BGOH}k<+CbSG_#b3vN+R{Hr4U)TZ)Gd_l~irW0+?T_wm%>Ub+iDt7n$-Kh|8r
zqM8^TU486nA3k*sGD@`8_fT|5n?z)j>$-YUe+|WOYV3@ulO4#J_mO(OPP-0u8A{Mr(2%84BWgrT2fu=80
z;P_yM_K_T~^^LLX=m6=F98GmeHmsh_?Mv!O*@{9o%kI~@*}DJas|%)nKJ_BfptT+p
zk-wcxELfw8Hf;E$i2T7B1We#CfQU>>
zrBc@eKL&7JS8v#`Aq$|Cs-GC_y6#TLah{|YNdTCRo5#Mi%2bS9aE(C
zGI8)^e-K-}?a1ga=GIrMKl{+d#G)}CY3t*s`+7->BA$p~StcRNpx_CEqj~b4CKd@1
zjf5~Qg&NP?^mvGt_XBbTpL{;R&-;W0=GUe8(ELhP&MaeLZGuvJ+#l%x1iA-D`PTNs
z=>AjBe)-Dk>)nU844=7Z$8l_}^}mY98m)D!hu#;}ca%~)fS&^EfJcEGa395_VkvNk);cUASs+QVNOYI$x}%QcB(&C#i^vCo
ze&D;nZeXkHx_vO|lhN%fE+2aFM9($*hWxtUoEo7r8R3?N(^bmd)4?OX+DU*zC+qQWtSFUUokt;>y65tx(W55Ef^(n3O
z-vbRIQUg4?ZQHgZWME+iD{ZSEF1w>b`Uj3Boy16xL*6gKN<7lK<^SBAvx^3IGqfC0zY}vkj@FPt#
z9+#8prELSFeEpXPcw$c%zjs9=H(fl9PupRJ3-D@hngiWq^yYm=ynu|SLBKXmQW1-)
zSeUwGnA${`nt1WoHs3f*^E{u&_MG5b+YYjFMv@QL8vVJUp(oyG&gRXVcinyW-5;}U
z`v!`yZ~*N0eShob&6^Ky*s$SQ5t#-Ym^{yQ-CsG5b8Qd=Hz=i+iiq|+uOFbLrR7VG
z<2(hd1*(CQz?PPlmfZl3<9rlY475*@_nYy;(e=PGiUp_B{WAG%+PcNfGao-X{Os2D
z{ES0A88QWf^6FA%*OYQ)Lj}ucl(S%3IWx-R7$Fk^@HBv+qO;Ltz3@cgen|2qkLi*OuA&UBJ*Q=W2N_jE)dXCD3=ja1wnNtJ%>
zr)|CL@5@tCS&9{nlJj9?)MH*<375~QWNu}Wc~wc8D&kbfZK7cl!%&&^IdJd|FXO7Lydm#p7W*jyNR>XyTAO#ufKiU
zA1%M`*2U9Ty?A1X7Y7Pt@;L+p34Bftr|E7xg*wnhJZupUTU5lt)Fh+SB*Rq3Y?5{e
z%P1D)NAo`Y={y}HS&k2+X&=sD01>UZYE~JyF0P{?86ulavvtoAezxb>U;alS7pB<3
z02_DaFJC>c{E2HXomrcRgn4?g`?>-!(Pq#^R*=2}vTIPD`o`v-G$WCDir0b{2MIvO9uq|qnHgn2i
z%qfd8t29b=EJVsSKx^_|fw6RkUB`O(^=rKhcc0p^yvn+{t*z}%<@oOxoReUH|9e7z
zYCv1}nejx)g1Qox&#Gc^eL2%Al4Jv6)PuASg+M?FVbdgTTa-t`ltn{CECVTicLu=s
zeewm5kxY)4j`#8GkuK7?JkyQziz}+aw>`aM_knXR=6#AcJY9KRz5JstDI48C;D7yK
z@5roehkJ+_CQIg2v!bzv`86ffl|(6xhDq2V?2w5_k`0b>P^!E~OEp){?h
z2HAC_o3V6`ORH^`RvQ1ZqBeEsx3_Hn54CeA@LP|s%3$|ncP+W}$c~<|uN)bPU;j!^
zj_3Ec^UR@c;_)cesVLJ@QL2+gqGMsRm?{ete9dUiqh~bBKspD3Po-_Js47fjJT#Cr
z{QDM`TYq)`mhI>3EAM*_Z)hSW!@2EBd)vN|Tf4Ktoqaid*_aN|F;<{sG{-2K`Vz4zA_Sig52Z<^ozp3PdnPVH!d)D%RvO83??+`MkGnG@tp&-o0(xE{r9k|FGFKRkLX0Qc-HQh*XM5TnG4w3?aJR_x%HSYVT-vbpO$#N6+_3
zo%cN6GQm@!xw%;-5()F*!GrpXU;LuCY15|jmV&-tab5}jPn?ba4@hS&+XxW@od5s;
M07*qoM6N<$f_-Tt-T(jq

diff --git a/vid/src/main/webapp/static/fusion/images/mobile_logo_att_header_white.png b/vid/src/main/webapp/static/fusion/images/mobile_logo_att_header_white.png
deleted file mode 100644
index 564bf2b528565c83b4f19ac6f30d7c5d77d22440..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 34475
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

diff --git a/vid/src/main/webapp/static/fusion/images/modify_icon.gif b/vid/src/main/webapp/static/fusion/images/modify_icon.gif
deleted file mode 100644
index 994fe6556167a50faaf1f8677802e86cf143da7f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 246
zcmZ?wbhEHbc@X(X6FCDzbp`E1gZz>#SavJvM@3*h%o4Yl!5GYV0BYa?R!!f
zz_ehM%L10nke
zCx~cFaP7rI1viYgOwnF_MN@$+kQ8GGOpe9%ZN#L)1u7#bQcY~mBf3*eMT(nrMhIyA
z^zaM3v(Z6NhPONoE*!U(>IM^y8MK$4jv;WgxwZ+dWk~rKNx2S=Yzk+t;cPa}fkXFb
zm!RyXkW{v&Kzn%^ruYp-aIo)5kkH8pfhVx_VjWOrtahwEm2ZP3I>}=@M+hQ7Qnt@>
zof4eUP09--)T{*y+nE1$Ylz+srJx+nPmba9pHM0k(D9JK5ZO+p1WR+ko9`>}`u^+V
zy9B~sKW{Ct1GXxdaF~MaWcKU5<6Jvnj=i%V9JEVz!dJ?sEb(%-RvvtR_fio!j_9-I
z6KFqODTg+~Xa9Uq6+zN?3}pzEJkGwhC45p;6(8h0RD=38c0RwqUuLg~$*BYzJLe<6
b{s=GtV*W%U)U3y`00000NkvXXu0mjfoOk^b

diff --git a/vid/src/main/webapp/static/fusion/images/note-search.png b/vid/src/main/webapp/static/fusion/images/note-search.png
deleted file mode 100644
index dbdab172b1f7304de5f3f50ba0a8bded20f691a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 876
zcmV-y1C#uTP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FZT01FZU(%pXi00007bV*G`2iyVz
z5IF>FE(gp200QhuL_t(I%XO1aXk1kk#(($Tca!;>naSjtWF})$GA*Sc6I%+RB>^p{
z6)Uc!n^HnI?LtLxr7jetP$*f5D0E?Kk>W~33PFO{7A+A?CQ3<5#xzOOPNvhCCS%Ra
zym{|F7r{)6`0dW({P@ntcLcz>_xJe#RabL!ql?mJ4992yT4jUo&^o*0C0dosqZ<8a
zT3G)MI}Ux!*)J|)bO*6)jzF{Nik9
z0;H5kC5U%*BK#3H7XM`Yr^UwrFU7la1fmh@HHUhwfidQ>un+>R6`@2N;S4b|_YH$v
z86$xmk@ghQQaFzL-(>*b2Mnr36KLyUb-mtnU}^2?7O8w82m~|@S7Hf+kOI#$7_)Uo
zFw}za6spxi$|l<~#=G%wqdb&J_w%5liH0>TVL?Os_{K-o!5BbDw53>DTp^Xz+W=`i
zb7^fkPckXV_9d6#M%|MZDDsvl5w~*JHg&;pa}rR%7tle{Q3)#*cN10
zrz8^>^d}|hlp@_F2?ivS-(6y}TwssgY^1vRd%k+~VB&+RnFXp&oQVA-Lmh&_Hc4Md
z5OCnPWtje9f?Jbc6TUr(wLHnDYGeH8(uWp6SE$0fqx%^9@&fZy6I|`h(bn0El#;*h
zFR{9Goy}5#@ZBl&-}8)qc8zl<4>hX{kjn=7lo&jHg-_pj9tvxu
zLnC}%=s`UC&i|+4Y8BTPtd<|3Or3{!E6l0^0R92jd=Ngo8nm+j0000A#`G))4fTZz_EQHMIXRRv2Vb`c$llXC@kaTc5e2SE`3g1WnigDwtYwMumr
zEhgW5{k=KJIB-uHC~rnJo<-ga>B^ZDF!oHH{PZcZEjv98>D=Z1DROAtF?2~dy#
z7C{4O#591Gm=yStaTadR1JDN$exad*$1n{z%~1_F$x$tdMF*1tq|2~o{jnW@hs8&C
zF!NMAs4318n36(9>-;4o`|tpOWV9~MF$^ka1?_Bo&|f
z!c22aGBg#eegDm;kDvMSHL|+#lFCqRPXjAidi56RuHwD+lVb?9+b39AS>wX>Wnh^1
zZyxet>GE!XNS9O7lXyMQPqtKm=A>d9=KzM;-rC~l@(re@4glc)0;-KMs2aREI|ZczX9Z?bA(S(w@41{m!*|mCcQHjvnmdoafu>I#=)I?hl$Y
VU4|W={|o>C002ovPDHLkV1iI00`33+

diff --git a/vid/src/main/webapp/static/fusion/images/notes.png b/vid/src/main/webapp/static/fusion/images/notes.png
deleted file mode 100644
index f54a9e8d4ef19dcdfa41f100b74e48a631d05336..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 673
zcmV;S0$%-zP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyVz
z5eETWLxKqa00JRNL_t(I%bn7{OO;U=!13>M?)%r}4)BL0k7p2Jegl5#WFd_$v4qk_cQGMEN!|&70Au`@(^$
zqqIK7;_N#z8H4%+yd_N{dV2c^uo&a8rBx&o?myYs$e>=oJ%Zg?;pLON9F!A?2%C$u
ze4Tj3|8N3TM_YRbXD<#g@%HtBIRPjxDPb#{;62SpI_W!q8PwKxbY;|*2#v+3)!nE=
zY7hdvBg_fig`+fb!XN|cP-jsr_!Q?7@?EFMWer*nh=HF!7MYtGr;%gSqP|REJo(lv
zuDT5_LS4e#_c9{80rj4yLxy9;BI}#;dmK>VrQ4kqp_E0{MYN!893m+zznznvL8vwrnfsIRHqM;Tp00000NkvXX
Hu0mjf*E}WQ

diff --git a/vid/src/main/webapp/static/fusion/images/offline.png b/vid/src/main/webapp/static/fusion/images/offline.png
deleted file mode 100644
index 4519ff3228887a44a47c76f8f3b2821d4507da78..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3483
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

diff --git a/vid/src/main/webapp/static/fusion/images/printer.gif b/vid/src/main/webapp/static/fusion/images/printer.gif
deleted file mode 100644
index 37f2d98a5533cd56d46e3e61697a857f6faf59dd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1036
zcmZ?wbhEHbYXe{Lz2&=FP8Ph95t!
ze)a0r%a<=-ym;~a`SZ7Lr#*iB5C|ST`1RnygFAQb+`fJL#*G`7E?v5C;ljCd=T4tK
zeeBq=!-o&=-o1P0&Yj!0Z{NCg>*mdyH*MOqZr!?7t5z*rwruIrrAwA9S-5cF{Q2{z
zPoF+*+O&xiCr+3!p}&7dPft&GcXxaH{Em*6j*iy0w)WQ6{+5=O#>QC<4Gnd5b=B3?
z6%`fb<>jTNrNza?MMXu0g#~$edAYf{IXOAm+1XiHS(%xc85tSr>FKGdsVONbNl8hG
ziHQjb32|{5F){HmF)`86(NR$;QBes|QBjeRkr5ye6BZT<1|cCK(IFv0U=ZN%@9*d5
z=j-e1=;p@xl=H}+?>}+FWV`*t-WhG&5Zf;>AZ)|LAXy|NUV4$z>sH>~1
zt!=KUX`-pAsiC2vs;a7@qN1p%AR{9qA|faxBqS&($j8UW!^6YP&CS8V!N$hMz`*c-
z6bwWNDEL>xaUd&?CmxUGk$0Uv78Vy&s%olgfo*Hx19u&&kTi!2OF8Wc$VA@
zelD+ImH+6-%*D%mB+ZIGNJL&{I3g>plW}21p>i9yt$SOIz>3C`)Acs&EjTE2+=snw
LM=>`K2ZJ>L3sRJQ

diff --git a/vid/src/main/webapp/static/fusion/images/profile.png b/vid/src/main/webapp/static/fusion/images/profile.png
deleted file mode 100644
index a3998fca6945bc0a43c58e9eeaf1e64e2818ba99..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 462
zcmV;<0WtoGP)*!?eEmp*ZKPTGg*C9Yj$8_W>ac**xB39(9-z$_z5plOKN~LQ)!2X
zhlPcO0001WdV61akw18!($dm@e}932fti_^01q>Wi;plZExF3z(AVCHkCnQ{)rW_N
zKv!cZB_$F#T)D;6kCvC8sJVy0=U>*1@G(r(wq$Z-`8fA<^$V}IA
zHI@yff&y_`0eJub@p0X91$-9>41x0Tb1fkR
zxdpYNT>B6Rm}`~~3guQ`6rY%amI=SOoi|J|LIRVRT?AJ;QALxq?^!}?`$Q%Q
zAf%*s$;c|J>{mUYrlYH;Z*b(OsTtPX;-sb3S%-6uPR=f_zUTe?0|JABqoOZej=2(h
zHTlNPl+;^k>38oD?&st_$jc`dKY3b0DkYay*SxHyP+$F0*WA+DMsI)9(b?PAKQK5n
zJTl7s$oe!jJu~}xj=lW#+sf+N`o`}(E)W3u3+o5jKe$j_E--foP#BL31dib*1O??&
z(Bc;}v4eR>h$~_e;SwjZi>hb>O4{~Il0K0=2r0A}`;+Y7fhGMfvL9f7bBzK>
z2#C8p2nsj`Y!9#Jveny}1<#!#s5T0%)
zS=SeRsvKrh=Z8BoQ7*mkFirK&23fIlz7ZNmw+?eS6XE`)tvs$JK`^r8%7U^HRkArv1LYDEcH(CpW$6j60|m8
zp=3O##?*Og=k+|xnkh1snl<>+(aDJG%2)5ItPcofVA+gj4zR9P(8y$nJ*B3X?=Zs7
zFOxDqnTBKTT)b>e7Bg#s#zv{oee`YN&_Z%}LTFa%3tMJaoRMp&|7PnDWl(Q5N2(jW
znql}G_~8?SP4yuk8UNvp%;S=Ih^)8aW8!UlcMZk|DX*pK)Gw&em+c47bSs{23V{Di
z%D-9cRbgyqL9o~j#Q?F0P2kzZ=o8uAv|ay=BqdG7y)^;D&gGxcF-UQq&{5>y7svYPs@k3*`_l5))OOyYd?0S
z1ZfzWl#I5M+^olH|fll@6tXZRV8nV?DeT%h1+VYUE&c;Rs{3YMZ#PHo3(^s&^&BXK)CG
zl{0owaeO{-qrjPq-E##F*GpdraL*sAO%c60d8xae!xAfywKo
N#Or8cx+;V-@&}+YzZ?Jn

diff --git a/vid/src/main/webapp/static/fusion/images/report-add.png b/vid/src/main/webapp/static/fusion/images/report-add.png
deleted file mode 100644
index c75b666365d4f15b0d1dfc138f2f29c53451a50c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 724
zcmV;_0xSKAP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyVz
z6%heP(w_nV0013nR9JLFZ*6U5Zgc_CX>@2HM@dakWG-a~0006j
zNklJ}ou091{r|946=9xtw#}(?Y%Z0YM&k;W_8!!0&x{ALsJ;_(k9Z
z2Rmz?h@5;fG4bFazb}oAUH8No#{w7LfVDO*5kW+-BFN7BR{vH0C}ND`8e?3s7J#81
z2Y^ENU!CuUe8$G_+ghx}7~^_IYsXj%I7}^Cy1fRh1y~UZX~C`uj=BIC
zj;FQWMIb*yMo%3B;Pt`+XR=vtzqrN6UmpM%Xd7g>^(taJ(OT~$fT=}GJ_T==mJktI
znwxn!H^=AoSqg;$05dZ)47Y-@7NfP}YOP%(vde@1t}X^M8S0G&r+a%zCX*^GcQ3)Ghb0
zbTIq$J;h=XfFKB{*Xx@e3=H7=J^-assb`mo+XQnfD@0L5xm@12JYg8dI*KAZt(3c$
zptrr9{9A$)A+tmE|&vfetw=H2nfRvRb$DE8jYsC1YcKI89h50Z{M|NS7HyU
z)hhSTJ*F?0V`yaLp|@VCq!Nh)k8&GZV5xoCs?};JrDC1UW=SLxtXC>2C!NXMaDBh?
zU!h5y|52+9tS1`Y$>e}+*5zyARIe@e62p?P!w0000Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyVz
z6%QUBo2@7S00K2hL_t(I%bk>;o;G}?7lEKIADv`mI2O9fib4kMFbJSh#=+T?e&-O
zgNW9aOKa^CV*ofCwgBi0?dW(2;z3iIFKRIct+mV6N?F<%z+%iXgzOE-{lSRP=MhX!
zu#BP4BS=Xbw5dZYW!Xxp3IbVL=lY3508FOSbVQ>7yqKNEKi3Ap`|uQEno&xX6Tp~b
zh`V7XlR-q-S5reGmBJXq;ja&zfVZU|=aHL{c5c}!pD$gZND%Y;
z0eCx}pzEpwKb{sIemxC9L$sTQXgAcKp~A!>L27Xk5y5JI%(Ia&$6C7xw02f}qJ?CF
z56R2eDxY`lCWtgO0q{-)@5vjiWbP3Nc`6F5d`vO*xpCay+}NnvO)#I$BHP9;rN-!p
z*|45wb!D^Q!4WsXkWJG09=5-&uDYwMt9f|*_jYY}MYdioPvY%_)Eih@>jB_sZh}}0
z>Z=G^o?!5btG2fJUxB&VJAcWyf2%o>t(zE~@lOB@oLcPZZ2H;rWvwc00UqE0VE<Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyVz
z6&)a_4!}?V00Lu4L_t(I%bk-+PZVJghM(@~?qM00L6#_@X+RM}40v1u`=@1Bgo)b(pcIm+!030~12LNhOs!y>Fg+Q)OM7
znYjWSWPkP55s^dpZ{NPNANAGg=^Kt{Z5iO=A{b+KTSO2Mj8dfI3XTd16QSOmMXVGr
z&vznPTaMP+7GnU5sUeF;dBcT4FvenjIpKO&fx&8l;>%}j2Qi#J$31%zF$S%*?P#Se
z-7uId7zUjXz6KZ(F1bJHT6lopo1)zm*r?X|wggiXLuk{3R?2deQVjx_8nTd$I=4<{
z0eJN$Pq%*re|#L@@1#0AOL1eJNw0z!gHmcQ0n8N)=hN_dbrlhzBilj7>jkG7t0hBU
zPb=QfCIGZCXr(M$DP?PsT>^lyqenUA`_$?YUFirm=P^HWcoK2u^f=8EGLN@E;x`>99#aj2B-veICj&S!Fn}?J#Sb5;rG|MI
z3YRAa$Yg%;+ff{zn}8f7D26wr4yEybCf>kQE`My5{j#dQsS$}j
zaa}go*4Qi-DQ|7@yHde+T}DPnd9tz+TFt(H({5=wvY%&?AXu}2W}ppl{!_1j>R(Cz
VVyVaBkNyAv002ovPDHLkV1hyJJU9RV

diff --git a/vid/src/main/webapp/static/fusion/images/report-public.png b/vid/src/main/webapp/static/fusion/images/report-public.png
deleted file mode 100644
index 9ee052ec784998656d880d434a5c0ae7378cd831..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 776
zcmV+j1NZ!iP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyVz
z6&W9O1Sn|$00M|fL_t(I%bk-;NK|1I$A9GKQO-rv)6+!3uU1MGeY#+W}TB8Uh^1ex3an)h`?5v?s-
zYi)}$0CYB50PJe`TX!@-N4>#P1$I_WvMurjiaEp>wAQwxm9n%kfW^HLLxYotl#3Bz
zS5Po1!FWa1ytzek@EMtz@3gnA#ocxit(4^`rREXHSdJ6z6#(=Nzhiyfa^fQi&h}nq
zL(59kVu#-T+k8qML@70w0Pc+#I!d8`bQG;M`s)zaA78|sjsz?QspWoB}^akUJK4MilB9SOs>)8|jB^Zpy
z@zN<)RD{^N{SdYotZb6u$LB~zqxjnoQwY`|T04&Nygw(*Y5;9DHBgK&JW`IDenrN0
zsIJgNqMcabCKk1Ik(&6zhUVt>c_RKM7)m54cp37c7`+cJ;CNrD-qcOYo->4fv;Q)k
z$+2MgeNJbNyI!B8H|@I&2aCNN33b|0lnx=0qLxc=xEcV1j!#uY-r0Fkn?YNwFT
z`{oktu+zL8xJ=p7*HqP(5N=!trV%8Ln|{NG&v7E*7|pfo$hxj^zD-S)`u%<`wq^jB
zNf#M%T}n%Qj7^Lq+(Ja*w*!O%VMI^xeBdtQpNc$u^5m@*tgr93L!sK=2J!i|udXRy
zAFY&1F!sL&@;p1A91VTU{s?3wn@w0i5GVtj|1_fl(mw%y>}~cP2yZ!#Ds#3S1?7A!OK=-T@DNoTAPrw_nt11v6?g@&Bl8B~JR;Y_sApsw|Gn3f4
ztV)hF@;|o!nQxAdwXH(oGk^t5x7vp5x{G_o;oV_LIE~%Et(g50s=)Z4+((Pl@-Y^YBj7U5`7vf^dXZGeOM}i
zJwhM_CJ0J*cS2y9CeEr==^A00o0~C$eu1Z_U<98a9gRv}YBcaB9v6L1`|&QF?$b~q
zDL~$_P4o#W&885Tv$MFOF}Q1(Xif+F;eST<>QqHn6XzhYw1gB<^d29PwQa1%V(9jI
zSfelUHkBHVKwhKQ?aoXRR9h_};8mtE{H_-?#wY=Mjo4002ovPDHLkV1j#5
B_jCXN

diff --git a/vid/src/main/webapp/static/fusion/images/reports.png b/vid/src/main/webapp/static/fusion/images/reports.png
deleted file mode 100644
index 40dca71ee4cfff19cf72f49248602c6a25c91f8d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 769
zcmV+c1OEJpP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyVz
z6)Y}>>+0nI00MzYL_t(I%axNcZyZ$=g}?je&CJ@K^;%jbII-n`WfMg-QG^pjML`1+
zGzbORzk!Aykf7wB(4in|QbZyR6_FwZgcb>`*fE?xhGxLu0<;+~P<_
z=N3mky?y&GB5z=3oCT5AIrr7qw{ATI@T$7;&7C`+4Ffm<3=9xJ?Zq`-h<6|-czX3(mQRKE~+G
zV7{5~-6z*MLlb}Ro%cSMlkxBC+dDt_7=lX%g;RzRK6(t5GdkYLMA<)1tW?Tqrp#rD
z+$nYK`2KBeoT~U3f>VP@t(ZYKgY#ZlFHb2Yu{>w2bOMJ-=wy*x5>qLtqlm^RK7`<+
z8eJbr22}}f7B$=F3i_RlC%d~`+t^^Rzt6ee65aWE9u0nBmX;;P_-_N?q*2u1`3(Ln
zg^?XFu|U7f`DySoWu9~J$AlOomG?wdQrn6PAviU|G!oUg*o6y~@%n4aymjdkO$cmV
zzRX-%vbnm-)|D$HRYHuCUcF#OPC|ik4PzBX$75!a@L9&M&z{kQz`@ZG0yq(Zs-zIa
zHFce<8ROH4nvprk1bmiJc#oP<76l?go@I230t2F|(6-`^Mx&xH4LiMKq8U{IRbec2
zI`pavGo#<@;j@gzg$4RcOPCokC1_jcC&S@`m8yDt@#@vB_dmY*?!gR}3*ou_#l!+J
zB?eEQl2kdKPBAk?gqV_0*W#PKy}JOhEWhkabN$=(qgD}uRWHZ$pFKI}_-%JLa(L)p
zx#im02hHBzB4?#6b#Zm|M*-%5F5vlpL}2<4Pn=Z=XqdT300000NkvXXu0mjftVddJ

diff --git a/vid/src/main/webapp/static/fusion/images/results-first-active.png b/vid/src/main/webapp/static/fusion/images/results-first-active.png
deleted file mode 100644
index 0e54592c8828025b43c987da9388f9bd7c7a7d75..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 545
zcmV++0^a?JP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyS$
z5*02*;+$Oo00E&%L_t(I%cYY|YZFlvhMzN&J9j2h+}5QVLGTNmWyB)XVxWyn-Ksmm
zwWtsS;zscY_#=u{Xk%I{DGo7mo8c|F`0Xh3rX!X6BqWZ?&7@9J?G^;qN*IF
z0*+Xf@ninkhu69D4S-50E1gFRH_8N8pRQ{t^7j41`K7`H&iTg6yER_isWEceC=*|P
z($?0ki{#EPPOKmT58mvsH*l!;6XGkaw%%Vl$IpI_*Afo`pc)(c&LfA!bFH@CTRg+_
z&JNi~0WCK%GKOpj2MKenHNAc9bpGng4`z~>p%X+(Oa#SRL*}$#*v;C>Y~x!$sU{Xx
z$eb1?+y|(FHHKeK3JrtYVWNn{3#!V{2h(z(L?&e5{{l82FQm(#zbEHstHd@Yww9qz
z0VrT2!>HKM-ELk_mp6Kxowe9_4ETqMhkpRNTg`g~1ydX&A134Pb9yH@-#@xd4RYWCOh^
j_j3tws@f|6{v}EvA00000NkvXXu0mjfKo#o9

diff --git a/vid/src/main/webapp/static/fusion/images/results-first-disabled.png b/vid/src/main/webapp/static/fusion/images/results-first-disabled.png
deleted file mode 100644
index f5610ff53a54ccf2547b935f831f2f8c85b7d030..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 421
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgfrQ6p($X9!NApgv=6gP`x=pDm_0-`>qD%T;9esQ@RW5Y6Mp}R
ztNHZq;f`I?0~bu;dz>a%xVb}Lbs_hj%4r_k0}q6}jLl~KR35Np+kxmnrSNuDh6b^A
z_GOZDn8O#j=<$2Gx!+Oivp<@&!lky;_`#Z62U23A7p6vR58QBV;p?6>nH>>)N0ch;
z)=rJyd+|O;(I<Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyS$
z5*8~Sr8^M-00EszL_t(I%cYY~YZO5c#eda1y*;xU#G76{D1xX+j*$e32?*0Dg!NgGmhg$3W1VuwNkP&0`J;JL~N9lm|1*PImTU>Qr=hy?XUtwWunm
z3BxHP$djeFtqreQ@2)OO*~7&*JL{>}20&0TpIR^OJ}59qeO7Niyv6NT+odxNy*A!I
zp5w!lIlRvr6C-2_2mO?1_pdYGoCMJ<<7nV{zOj!;sRl|sRNl4sd0M~5!U+%o`aYu;
z+JbPSTm%v?%tRp{zyIdZ($#dK`9;SO;smPJmb)N8?3G&Ns6~#>&wj8ne<{B6dS?U@
zd&M~m=%fn(NoI(gMMSVw%OD*VM)>0eXD#EaQ`mz<4WV;{F673A8f)KvMcviq*&JYy
z2~}H}#z0Bb;6lfh^MQL70(Y)*K0-AbW|YuPgf^?$F(9P1ig+yi63c(<9b5T)Z_wp|gNtbBnaV+beFIoJEYn-VcPt
zB4(U8v-rYM$+WWMC!zYrpa1Teub6gBOL0R|g=f))SN2}dJ}n4Sx_)?X+WR^+OBM!w
zb-7>De;;pao*D9V_GH~RF}9Z3zb45X6O}JK+CD{Vi&udChI5$>ciVgqdFd7@rSsPr
zzSVF@>}&~=Qjb}~AmGl()terdR`EaOyGYF3Ze{tSuje)1h*3WLcK-1d+%Hy7_6&I2
zXSibOr)|#X@{}0nl)6h?K3I_J6o3JG`E_mT`KZV{^1wBXb2}()mh(LkiY%%(aKNKof*;&dWXx3_!%b6ywB70|Cr3OtW=Br>YHu=!;rz#
L)z4*}Q$iB}=3S=@

diff --git a/vid/src/main/webapp/static/fusion/images/results-next-active.png b/vid/src/main/webapp/static/fusion/images/results-next-active.png
deleted file mode 100644
index 3c0793645478e59a102f8010dd394a213e974ff7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 416
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgf
zi?z4($&*hfZ4~S-u=LAMSUvY=o$>y=f}yJ35=L%13yP|$H`Wy`Ryy>-leOblb5?Hk
z)UAt`{afAKc*xy6sXn_iNLSM65VPtF&Gfb6-&S=`5mwm9Ajt9iP|Ne8e_zh!r7CJ&
zUzeo#GlD_j%haZHLB{`EXW!R6%l7O?RQxI=s;>R_;j>B~=A3g;FybpVo*c8y`cAKgUj?i4
zxxUL8Ha#JJED}Gy%wFsAG=AfbT#<>Q3gY25bMzyx|CF};m~j2#lbl*$@G*G0`njxg
HN@xNA(vPNT

diff --git a/vid/src/main/webapp/static/fusion/images/results-next-disabled.png b/vid/src/main/webapp/static/fusion/images/results-next-disabled.png
deleted file mode 100644
index 12f6d6b6cbd2daee899d27075b13232b2678323f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 326
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgfH&7IPeb5hME_^wnZUhPpAn=v8h
z*jmZuj6OU(@myi|l5Y4r7&8Nb^0qrCPMpX%00ce0#=ENAyfzy%tXtv8!1lMQ66hla
MPgg&ebxsLQ0J#2mEdT%j

diff --git a/vid/src/main/webapp/static/fusion/images/results-prev-active.png b/vid/src/main/webapp/static/fusion/images/results-prev-active.png
deleted file mode 100644
index 2c7246af9ad2de6dc92af38dc3cf4af56ba13eac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 421
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgflFzu{gan
z*w*`SfQYU6##&F;nAb0qIO-bGLUg!9xo?)1UY)OSq+!<&{y&1UF0+1Jj1rj3^Mt=6
zuTSrihi}oGT{E_reLFDs-tOmj%g^m}5_;@#c!q~yhsUaIe)$o$yZ8RN&hq-W+}*vR
zE`>?ybNzX;?-kg}-SYnN!p&nwaC6t|j|buo{JhJ3D4*%U3l`DsC;z^xDf#%NPxG>a
zzF0?!{ghvao}Dx;zn*sZTK09FnOrIY$Bs1o%i-O(NTM}KFilCJGj36DUh?mZ+pFyN
z%{={7h$rWAaEA2bina?+UVEnr2&po%3W;LP?K1M$#E9loTEc%$9ZDX4d4GcpD
MPgg&ebxsLQ07dhy5C8xG

diff --git a/vid/src/main/webapp/static/fusion/images/results-prev-disabled.png b/vid/src/main/webapp/static/fusion/images/results-prev-disabled.png
deleted file mode 100644
index 46c82bd5480ef8dd0300cf8b0b80c0f15328cb9a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 322
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgf6i{|9?)(X{det?f>P)
zS0yEY;NM?$LmnBa?f>UXE$vfjy2~Q=W>)#1`9e$E#LRe(NItl-=`%<%XP)3XvibMx
zy*^xF_mUEl5`HxKGAdW)r5urac#MaKr~d!{|MiUv7?&_H$lr1DSyjiv2=onur>mdK
II;Vst0L^!Oy#N3J

diff --git a/vid/src/main/webapp/static/fusion/images/resultset_last.png b/vid/src/main/webapp/static/fusion/images/resultset_last.png
deleted file mode 100644
index b8c4f09990c51a9bae5efb6e1d0eaaf2b14ae663..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 506
zcmV$fj#M<>ll;!(6K7G7
ze^i58;W1t
zFf$Uu&FiNw$2#u_)HsnP1iCp8wgA;ACWaN<m0ulzrhr3SHOj9(hWTN|k&%H{h4KIp%WqAvZ|=+?HGa
wo!2N;XXPj0M{dH2TaeF26kP)U#jgMZ0FN`6$`slega7~l07*qoM6N<$f|~o?6#xJL

diff --git a/vid/src/main/webapp/static/fusion/images/resultset_previous.png b/vid/src/main/webapp/static/fusion/images/resultset_previous.png
deleted file mode 100644
index 73b833268095f41bfbc7773b6df99f661ece5160..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 381
zcmV-@0fPRCP)`03#zK
z26k@U_1~>+_a?GjVB4_$e`BN(!=JzZe6h*1;L~j1xcz^QuO7quZ+{s6{URUT|vJ`9H!&@%!HU
z-#EEA*%?5w{Qd8L1|0gahry3Oe;HWW*cdqfF*1PC$*+G*#7E=48h4X*M;~zNOK>r8
zuyX)0JHxO4Oe7_wvj^%uP1fzbz@RI^&cMzAGvGf-v2b>Oy_d5TsFtOqc
z1AGYy=n^lJZQBkrFtc+5V}Xf*{{q!sAZP%o
b03g5sqVZ>I!}s|T00000NkvXXu0mjfIohn%

diff --git a/vid/src/main/webapp/static/fusion/images/return_to_top.gif b/vid/src/main/webapp/static/fusion/images/return_to_top.gif
deleted file mode 100644
index f02defb98f0cd06e56f9bf014579557b75cb1779..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 846
zcmcJOp^BDa5QUFm_}yFZS2P(kEF2KUVi0wM)ovNsCT`lMSo8*j!Jx?|2wKFVV4N(j
z3$|@0ikoFcqd!tlRCjhqx4Si2RabUJm%B8@tj_F=
zPIqd0qdKx9I^3Zdb+xk{ZMOwdt6JHLmRlrX0}U3#bZhoZWK~qTO0$+Mvob1OsbN7e
zvLY&6p&>=Dvm9lY1xH3pS&EWNY=t#okcK6+sIeGqpuu8TBWQ9WGM%Z>$6B(83}kJXj1i(3%rXH)V1{Tnr=8
z$67LL9>@5)?mfkI!m)W>WqOy<meE;8Z@$czV(obEPMe|Q+b6I<5ws+sX{_^C9O?v{_e|L&yO~bK5ZT!e}1;Tbbhi3-
zNu^T5bUJ;h-|zoC4J329T(1CfYPH(M0}7eX=R_)%5~Wf}qm_5N-J8{F^#IR1yr6J6
z{KDaIs92U=K$Z^$(g+dh*;cD{tzNGm;JpziC>RVr*6DO)I-PPJ3Z#+Y7@Ezdt=(=X
zxj=H6Ot$c2oy=x4al75O;ad`^zCQt)OeSPF916N(yWLL8_XdN(Ye^swV2`SLQ_(sr6bd~Ue?fF=M?x{H(bR9~
zcXr!@jJ|IT!t^MiUoUS3LVJy((dhj%&{iP7-~UuYhuEP+LC_H&&q2$^i!nEgxqk8Z
z4Q>QMAvWR5Eh!zLVnGs#WEP1;_EfaXIV2c_!S;3s;_I2F5D1#|3ucj%x5Nzw!;f_k
zhGG6-amG&V6}W!~zD@Wb82UBryj?DHS40a6u$R=x;}HDy7d!8+lCBXULUGyR@%Tfe
z`HKQ^DJ*tf63?#l-4N&Qr-Bd6c?iX(MHbOwvG@UdKR2aAM}YndFaYaz&%Qpd1~dQw
N002ovPDHLkV1lWAO%ebA

diff --git a/vid/src/main/webapp/static/fusion/images/search.png b/vid/src/main/webapp/static/fusion/images/search.png
deleted file mode 100644
index 7ff964f83e9bac4d371dc369ab1d075ababc8256..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3501
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
K%U{6^4Auajc@G-^

diff --git a/vid/src/main/webapp/static/fusion/images/spacer.gif b/vid/src/main/webapp/static/fusion/images/spacer.gif
deleted file mode 100644
index fc2560981ee1caca400e225e48d282106f907f2d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 43
ucmZ?wbhEHbWMp7uXkcLY|NlP&1B2pE7Df>utpmhBaYhCPCMFj~25SJyItL8^

diff --git a/vid/src/main/webapp/static/fusion/images/success_type.gif b/vid/src/main/webapp/static/fusion/images/success_type.gif
deleted file mode 100644
index 2f72242ba038e0f7304cbe18f08df3a319e0038a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 260
zcmZ?wbhEHb6k!lyIKsfdFw^+_o0|bUi{+R4^j})~|NsB|qdg9r(*))_y#M*B;mpkW
zH#ZrqiA>nvFy-3Pf@8fv1wc*21I3>#tRf5o3_2h!AUhdY8x>UgQZgr$;u%ZHJ};r}O~>VacctmW4-O^hxMC32rcU
z7CU$Q!W@QO?guKj%cb9c$iSY=keZjlz#_Bnm7hPl{uuF;{t*469xw%6(7?)KK~
z_&|rbw%qdg{ri2p-{kQ3mBZS~=k~VQ>z>f*>G=J<;`00d|NZ{@-SPYX|NE89=N(vz
zuGsJ_cc&G$zh
zmdAaczy169Hh{1}lfs9n#gebd`}+1wkilA`%{hp+oYL}>xzt6Ey8inAc)Hx2*7f!E
z_5c6=soV7b`~PF7&dl=r{r>*__VrJQpnI~
zi_G!<{{L#EzchxpG>y9Z{QUj=@%;Ph_4@t%{{Q{{|9HRSX|K=z|NZ>^{`>y_NSDM;
zrL_3{{{8>|%<%2^{r~s;{`>y?FM_o9{`ma<{`~m#RiM)T|Ni;;`TG9;{`UU;{`)U~
zuKWD{|Nj4IkF@sv|MvX;>FMeI`T6_%`}zI+_WSwx{{Q~^`ZS23{`&d;{`vm<|NH*_
z^85aLsmcHT{`vj;{{8gq_WUh(s`2mc{r~=BtJM7e|Nj2^_xJbs{`vCv{5y`p{`~*_
z^Zxbx{`~&^A^8LV00000EC2ui0Ez-d000R8009UTL$IL1g9QhPQMhp7pob8hD4Zx!
zB0?twF)EZe2n`x1A47T^`J$wglTPxa%#)|2%ah#nCr_$q
z$(>7U*swvk@|N1mGSA*peFF#9*|*dq5{MBWS)91BV^-Ia*N9?EMLaKxijYy
zpudQ|LYj1r)2LafR-J-HiWCiE%bwkUjP2XEH*CPIdjp8yz$1kiPJDQVhQJo?~+7C^$01sp~c>4qCdjkHuKA%Ub6
zN*WckR7PT)bP$wKRw>3yPP_mTMqPHWKeU$VW$zO
z6iH;Bb>iVC9&o4`Mk$~SLJBFfOvM&jWQp>LRbGL`)mPA90?jA;d^M>kXmz@lDxj)D
z%q&fja@Qaz`Be%ktL8E2psRxa;uvC+&06cMBw(g%3!Zrf+ONNsb_Ht0uC^L&vh~&*
zaLg8m+_TU&r(CqlIVat<*jeYDcQJ4`-gx?jEAF_Alv^NycciQCy6H}#?iBFGEAPDY
z)@$#*@J3Ou1pM~vuLM!>t00F27i=(y2q&!Y!VD+Oz{4#@EV0BMLLfnmhBVQHAslzy
z1OOYiVn{1>SYfisHP&b{5=c-o#1O0a5OWbl04d80XL=;YQB0z-6qZ_I3FT2FwUiQ+
zIH8%-OJU@3^H6O5#M9Jt>VzkrZ~#^3opIXvr<_>~88#e6017A^G+9Z|AfX(JXrgU(
z;;2~AXroP7u81WmCa#44#i?3vd7_qEp0E|_sI0w$*9ZL3iKwKHhr3-zTo{
z_yOo2fj0;cpYr1(f9~_ppIgE7)WeHF1yeLQ;r0_6?7jCPiij`-AXfOH`6HeP@x<)6
z$UunwRuJRK^xJ5PDU#F?h{pW)@4x>_sNczGl)se8p+`T`LfDLyB%cxGOD7SGN>cIy
zSLI|SM>|Q*fp+=FbhTqTM@EAGn%0=PFlc2+0OP8n_$Es5K%}{
z#6XIs!0iy7sLECUU~vwvY{eC4K?X9^LXAaGBXDYo;#%7BmU=WG1u)1#34|bo%Txw2
zkBD649!JK>VeX8&>XolbAeuIsW^|`977LI?o75?*S*$}&2w=xY*-49b%DI*xr_+H6
zSjUjKGr;b;!^lQ*>s#6hPw*y5$x5mxKkP|>fHoPR0R;#F*=vv}M@dQtaqpC}pqP>{T1T02(-^=2*z;O#|%6te%3Pb$d(>
zAcsmjq0VlQg2bIt7ioY8IP$5D6b~i8W67$f=RNj8&nCA@A5co5lwd98f<~FjvMz{~
ztV~}lXDQ1UeLw}RBbuLB9gJ(X@2mX^tB6HR
zg%VT2tPz5MD$z=?5v3@WCt|CL9tMFAOyNKPnyWJH`U@U6q6w)8a*zR#ib=>p4kfcf
zVUfw?7+JG^N-#u>nxMZxG?RaLl_oRy+GK&OOq<HBp>;m3R`=sl}ujpG^~IQcY8h?
z{?EV0J>qhIz{Kc2F^W^nVhg43#cP%Ei{W=JPyQ!Hx~#(_0MH1KU6z13l7y8H>rDT3
zc@o%|M3IZE@Qx9)%GInxU;heNCM%)Ji%o1|C&6W4+9*eq2)Q5};RrIv&`x3hunA9O
zvXeFG>E&HZVV(1ghb)-Q&Mo9~*Z?|co)>}4HPb>Ne3bKk63Md&^+=eE0upqV#3m&<
zl90-51Y8(u7Q`r=2pnMDu3MM7p7sFP!|nm#be&lq=&lB0^O_Wpro3OIjAS&!-k8c-
zG&Z$$>FB8IJFf1h&Uzi~l0C?!GTS-EF8u8bSzu>V=K+w9wo|3OE$&$R@((^wdD>H+
zZhOAl$=k33%5$KAjr;WfD&<#8Y2pU8-o)#E5L#8K*7e0$-ZMtQ1>!27{p5H+0_ZX>
z4=eoQ8~^yoFMeaY+*mI2b@@u3ksOdPeL1`g9DmmNnT-(VIt>X9v6Zd=_{ASX8Jd5F
z{|so((_e%_6akz+|2fd(?*sP-o%={Sic1iYXfJsQ5iG%fU4jT~Rs^eXfHLzV+!qH#
zFauw}0>0rMC7<|az9w>=xOVk$;^4?`krczZMEhA%c_wZtEu
z2X3OL0Lhn!dbo#t*oS*)2&NzhV3t`VR|xL6PqJVHiKvL*rzbZ5XLB@DbCNhDf;MRF
zXNZOfPChbpWX6f@M`k_}iY+uG+-DO_vUFmS2LKpBWKt3-o
zD-XC+zu{3XpaGedc5|QsB`9_-zy@rPX&=~iBgh7oPzh;gf+tu4ykcIN18XwXMl~g0
z^F?1a7#sHGQ$Q6|&oVoS2ZYu!dFr?w*+OjR*mwrkcnkJ;)e(h}*Hn=fRumd}g1V8`OpVVx(E;bxFsI6VpJ
zg$#*$4w-ro8IckRArwhI5QCBM7BO&WA}X+Z0#K5`37jiAoWxn2$oEW6c5#J8KP=Nt
zL%<_~Ky>|7TY|@mG-#SC&MyB
zAZDS6iT{M1ph$lRNHg78s3b>n-vpk~`7+P{S${lfBuaUnFJKb{NE1=_0$#uaU@!(d
zzy$PZ2lTlHJ4AH3xOcUBvi-F7Tk%Wp>KA
zX}^&Hbg3I;fJIuQY9_Fkp5d3kQfuCrQ{h;cfERdzrMR>I$Tn_a968uJC%K3K^wfNJ?3Huj&RNC1#s!h>@?fk#Q)85)hJ~
zS7B-@12rH6B8jGK`lb&1uzM({hVWx?+62TjWpqk1Cqr1w>6}D~i9%)EPqHwZ9UBdY5auc7r(BYk34M
zfb^|}7laC?tyI+>jNl$tIHTX1w|N_`IZFdOieCi&Hj;8)$o9YD*kF*tUEd9S<-8Jvwbv
zwRz}ah27Du#%7Mup||7Ox6)ycjC2Bo3spbx18EvP1@gEstfWrbq%$13mOHs6MpiE7
zuj;cRo%>=cHU$ds1HTEn*5-MNi@Iy7x~<#9t-Ei0WinA#2f15iy2NC0N=(SvWQ28O
z)5oaG+nvfwlPt@qF3Yk$K$ARD#=py_K!-w5r)F;81>D=c+k3}6ps8cPv!uEL5wHUC
zIRbP5s&sI^g1iRlyQ=*EX#!!J0>Bu8A}F;`>s?eUg1f3+`wO8VfS4H&p}(;k4R9L3
z;)1kBI<{sywQ++D?7%-YtS{L94w>5MpPo4gudLOf+U69Ap<8s
z%q#3j78Y)uWN(llJr!U}F#N6ud89VnFImbjRPa?7P8mNID;EW>h
zjQ-2X%OPq3d_|)FyhUS+z$ALgvT-`^t2*Miwkry3w}Y$3kZ3lK>$ZOCAUC;;pDVB2-37H19+U3X|kkT7S
zcD(9!*2M-6PyoK|0Bm4gY4;l9HD2#k%4KV|w*ii6>&mapw#w0>>FAh>XTebYnYX-P
zAAD
zOao`Y&j&$1noOtx`CE+aD!|atFTR7vK@Ap43}Hy
z07CvzJUA^fjcYPEzzIxWHMqb&-D}6O$+FYSZrjVuR>9ZJ9rvi+-a0$UVF3kzY{(`Z
z1TX>L4c_4mxN9mP-qJj;Uv0TA#?A8mr7`v*QJ?^FeFFH6!h$~6=UnK5
zF4u7XeR+Ca;EdkrD7j?M2LOaM3H9^fj{TgPwb&8f#xWU_NYLWvo0a&fpFF_O+e-sb
zkm`B7>ZhK^K(MJ=3EDpU;;3D!p-ziD5C{JW1FsPYy}{EP;K-Bwmbe|4K|bWYJuN~d
ztN{#Or;$Z57?`(aI=iMDcogM{NmNE9%X`b16l~q%?Nq|dj@u39zJ2Zm5Ns7(=4Wo*
z7I5a63EtX4df!&WpI6@I{pRQ$uUws^)6AsPLj{2|L%*E{A6i@LLAK;(o=p5hiet6)LE_^R(1%l|sM@D@E?Yx`boL=0!SC*^
z-f97FPypX;Y~TF=XCC-}A9+7&AKjK7!CCM4ejxUy?@QY6PAbFHe7P8j=LEloVk!U#
z>+p6R@pWz26OZu~FZvmu*8=YGsGs_JD9^Z*3PdL96*oWDR0l2JoRrWq&N&400NEz*
z#a8ggE`Iba9`nTSv-qjur9R@T&I73q1tKoudHnNZ&;?ovzQQlsJ+SmezXxgmumbtX
zpF|)8yv}RQo&v+@X~bUa6o8DzejLjvZ4pkt)=uxCejUqrGfaz1HQKeR>@RTY7sud(qfq;U+SFmBl
zjt#3q3IZ83YpgwSqK3=0apSh7dqPHCx-w++6)$Go*zse?
zkpn9MK)Lc|%StqB4iw0W966MRP?Ceh6cS2EN`nTC#EO*&wrs7Sy&}T@?Fa*O4;qLe6jOYtp@~|g=pq;`aA^XIG7`zA1Q3{FiYO$IU<#%L
z;K_g=LW1eYifX#4q#<$QYbTx*2*58Y1qezhERTXDsVyOa1S&6^vQmIAwUXe1uDl{^
zO$Jc#YJmmXl;Vz+UV1|$z1(7}ExF{%3opF%;;SdWBs26-L=#p2bkRiXuZoI}
zNhZOjj@MW-g*4V$Lt+ICFbL1K+tM(#Hu2I3g16qd>tVR#cmM(jD4?K$hUJpufrc}@
zz|~e7c<>@QFvb|e1{>OF1G^rY9f1xy$Q$Fl^say*h4|pB4?b@5o5KZgDG*nL0NE%I
z!3i8N*T9+{IKhAz;=O4C2SLE_-g`C7&_jMjB(X#j2TCXeg;Z40#fV~5I7yODV(Jd2
zvYMiTiSK||0G$Gm!6O0~{$a_RKK^)6lB0~0N|cMrQp+yA+)~RRyTnR@57Kn=W;WS0
zD~dV`kg0~2*815DGy0rsPeAk9i{wHXb^2*Y0cc|CCIGAddN3ufmbwwE7k%_mL?RT7gIo*k5av&N%9fO|}gifS|zyA+F63g!}fR09+UP>(9T23N-Ky83`!)$pkPy
zi4jI(n1F+N@0HL(eA|Pt-wpl!*Pwt2GI)834m=RX=VkOLfE(`M5n>&)!iuUWy6=AC
zst{1A$&o(3Y3bPql@h3(q)gebqg2N7W%`|>>H{?03`_s7_$NyRuc+Vy2?)u7XhHzz
zz2$&Ld&^vsrnHhZ4QdmlU^Fb~3k)_P9lpRoIRMcAk8l`+9lp2+2Fw8uc;v$x=txu(
zdeMw#*rOTV@W$071pre3;D$J);L|eIsoDgQH~w&jGL+$rZ`@`NOJpK%mWa2&iH8o{
z=|UHbWgO$^igA&1+~afwIm+GYR=eUA32<-)G5~@>7VyZC-Vm3NOrQfD=!m;cKs2TO
zK#xDri=g@~Mnr*uKr&#;QN
zF{=0oe;<%Q1-6tikP(TGd|X-|(PxtMy-${YfrR|9QnQ=oQceBK83R;cmH`?7fj)DI
z&xmQjVjfVL1TdP?T=~kB^-!9O;)Xi7VT=R+0KgC1JViD902p@w<`kz`1^~LbO+_65
zoq+MfEpE{Z!C1o@_!vwbayZRHSz$ABV-;?`p^Re$L!igFhBL^)M1(G}pR{2WsUqMT
z>fe+AQlk_+f1i8clZ-`z-
zEWn@;c<4gE!w@5V$}dMAFL?s_PY6fH-j;rbekL-KjsaCbB_Km{Cf@Gzh=w*)s7A#qVQZhjaWhoWt5t?kqRtTfut-Ey71tcJV
z9}Lq#uA6R$5$IR705-6F94t{NdtwwL>J;K!@i!0f*c7X+FsvQGHI|{y&u&u~toX+`
zQ2S%k(zsN3quXtSY-HSw2cp3L5sqwYOC2ajxer=AoaD|BhxAxNjS+bRxlZSS)D;p0
z;}RE`#dYR!oolZaQ1go{Fo7F|q#_FvNQe~KQ}SvkKYNzXfD-cN4%|d1DNzYf6s#2b
zVnwR>#cwESc7Y4%SJEHoUR3}*r33TinSR`hprBcl?fJ;94`#rq+4|tNww2Nd$nYCD
z++jk(+Ib*`i-_B@X+NHfN-^ejuN8yN7B?2gzQ!kG1>=Wmu!6Ke{xNHDvjk`_Aqb|5
z04J<%Dh$v#aG`Q-w;$Rai2h~=Ronq~n9zlC@4yB$n1Lp)zydNvf^^ziq<%aAB0n$W
zKl?UNtP%8P=fzGY9B`b^W(SGqu
z1u9Tgl#?d;e!X{LM_9t94j>9XaEAaOkX&qlt_b>lpjXS9*3GO7
zt_^&pqYzu^OZP)AauJvpFWpdJON_CPO^;;nkG3h+kcAZWXx
zv`M?*yshMCt-%gGh$tAmpaV6$yFGRG5SZ`%FNXWM;c7lm2KG7=H{Pixb0oM%=DeVN
ztBAvI{>YLf{*%jRY)U*aw3UL=d8DWeDxM_0${Bt7{gxckt7kpyVLoctyS%Nhr~Rp2
z-X;i8`UW{CWW(4072TlAny(-x`iOH)sG%T5>dR+-^B*%QLv2$U+SYbvS(}DEglDzU
zmNvIBP?#lTA8)12wzlzRw-LzQJGL25ch>N%DXyVez-a>z@V*}5amzmWi4Vi~9iZqM
zyr2^}nRu=vnF*U12?bO@oRGK}SdsxVpFf(o05gdySqi8^xlh`j(%ZO>leE*bFa2u0
z)^n>1067wTz15>V7KDJ7>k0^vf+$dcLF$iiF%UK@kkg?6pK$=6n>^v`tG{xfqI;&<
zAqwSlJ|$ejC7c?m5sYkrwrnVd#4-%&qdw{zyHIhq+X#Y7khawl6(Y;5z*vGyxCCpX
zKH0E^QE0>e%*q=&aH!Yv4fyj8`J+1~O9Ci(gcitwZP9=Y*t2<)4}d9`aWR?dt9+uC|
z1{+2HPf|r6A;l0BL6&pH7o0hmTS3~B0@%wvAR&N4LLJj7GY|O1z~i?c1U}&-KBOTU
zoV1Jd!L&m&3TXUEpbW~vkVYD_Mx(sOZ0ts*LZW0XMOjMK)U3d9N^eWDs4T~3!NZ6$9A23LGKjZ)^bmUl7Y`7Ku?)`t
zF`LN(89cr+OM#pb8=(o1Xcv$O8S{b8k)b$>+p5rtG{sX~xx73RlFKhh
zqbj!oAhVDHDNukPAfzwrztize_@qqAB#?fr$<4gU&eX{Wf}f--O#ls0Vmr;%QWOF`
z(5C#x*96BAh)v%(M?0{CHHav60|GBd4;BCf4)_)}2u2VgL;>_N`=rUt1V|VuIDsoj
zWeSOp&?D*G3kr;&pBNLnL<&&az=)X`@S&I~7`c|yB>-XoI2lqn8H*xSfwK6eUz(E`
zuz<&e4+)76gP0Hf>y|#F&&m`)=@Pp9tO2^{Of%rmqf5U36i_ogQ#2I}1VvE))7r+@
zM3vhZj}?HHJDkl|Q8(K>1048*92hSUAxp4C9hkIFEu~2l705TEwKxkIhuq1Cq)yPY
z(a~EO9hrg;Fv*zvB_kzLHo*cS9nvQV)lh{KEchitU<3o0fbDVtDh0#~u~M$wKm5Sb
z5#3T)vq>*)3osQ^&{T>v{Z(KM*2bVQ@>9x%n$tKGM`)pqylKA(wS(HUfoVYx9LNE9
z)6GB~5Xs!P5GBqM4Y+`V9%Nckj~K92a#YTP)K08RO5G7rI!{eqlOh$1A^nO^^(8Fu
zR8bYx1t?YZOoSVdmw34WMo54Mq>&8BsX(OCKdjO#tgz_`&@Al}6^4q_Ii1b-n^RY@(`FHl;gB2>z|ed&D$?1?FSA*0<<|QQLbE(P
zVvMsE6&drP3v`90ouE#XxJv|hG?P@)|6!9)jasRVT3<4YDHxvsuo&@407kGFl!%uY
z$ekFVqw5lZdGpFveb~vY)!>^hT>VmuB^ivp&NA&-yS-Zg{aB{NERj7GvpZHgeLp(v
z4s?Xj2(=>GI*v1#0UUsVd8B{>VFOmp#b3->e(SdlvsG9lKyvk}2gubE=!wuRT9a@J
zOO*m8jn^a{3nUE-EXbLuEm9d&fD^zg0L)ys?TE0&9p2^LRONvGU`$(Djo5EJye@^?
zoV-{v^;NuWUgvE-ER43UTTN}GHYIW`s0`dXwNpEA*(ST9^I+UBfH$K`*gE^lGb@)4
z4MzVs7azROiTJncqC7=?31&(z8K{Bi9I$fL3Dd0^*+YTU9bnac+D!$EeEkZu0N4j$
zv#ylY_~0`zV@cETIYMHi2avex@!AJ`09>4p_`FANbzh0i1mpdy2g1pcnK-(w+vj~@
z7)G(^wMOb?P1jt|+JF`vmQ9wu(X$Ky`utNMh58E)z}|v!p2n
zNe~WmfW%Wg#bZtv)ufZyk*aFi2y0!P5#s_b3$R$yM4%J@558IYkdTJ0QaIKC-xO3b
zYhR!7h#0V#JHVZlu&b4%V>Q#k63v7~oHb=a8oW?pxvjXBQH-dIVMvbTL&?IVtl`#F
zP#g}TXpzbuZdp61B6Qn(Fz-N29-2B5mNEbV@SaOe
z6J8!*_4H+6PF)DlR03Adt9`(miq!^40T`I+ndYfyju32Vk7#z-32sTYjZ6bkszfO1
zC`jgEVqXgmM#9TXiUnP`-N|*%l6HRQcb;dfzG}$O+ihg6Htoh^g-TAg)0O4kPX^^s
zE*!&=93D7=nBCKNi#HU}*?#=TiDm<`EEpD1D(lhalJ0BuB!s?J(!f4x1%6#$k^+Ej
z(whq2Hl}IE=BWq~9h`=2o!)8tpy2c^mzm@b0DK+-Fn}9~0;=ksJ=UE9NNN#?sbV@|
znn2_`G6P4AYAi7fs-|kJzHQuo43OpOATU<{?1jpx+~oM{2z?U)ib&<^iWf%EWBN|bVejBE7ZEet1
zWT<9jNo5M!u5At9@Y>F850B?H_3ftwZradcXu-oCrUMAIQ?srjX+>^iITph~9M9pE
zGa!MOW!ycrR{RSo4(Nd0O@!|5<@Ee+@b>Fo{_E~eaBcnrCm-A0$*GvG?-CG#Ef4}B
zm~Z*sau|s3nFg==rs*mG9{j$u%7)|rX}-ratKxpNlRNo=9JvD_KjviafE+B*rhaO4
zm2C{f@WSA5KnL^>A9NTFagfcdHwEq;9!K{ZftJO?9RTPSFY6XZTp33eOrP3_Xn`%L^;+L@T+j9S&Veqs?=i=3
zV0U8-LGv_Mb6w=copp%=bP0H21VRvOCZ`i&BD_4;RoLEh3kO9%9}IV9g+TxIswQ-C
zhh(kZYDCxPy5VQvh)ThwLnhmS*-SU#cvecUblJLe!`T(|@U6UCXcoAF90+(GzYq#x
z5AVV=4av>i?5_66fh#Bh9B2Xm6PWmkpLJTla#^?a64-)`$MP)K_4)4dkQZ|>4|bbA
zb2#QR-=t4()l3g*<_ZMeRq2IUa-eg#DRhvCxRJJgYjKxwO@O+
zFL(-B`+~oh^-%jSz=4RDc#6+^i{E=&@B1tFc#t1?`zHBc4|Zrq`3RQaYJO$SJ)m+8
zfTitjlQ#0A=9rF&9YnqfYbToZsm>bx^P~^`M`n7`@7Q|A#%$Zd>f4PXGg%UcyTLuj
z*>v>ruv6feKXYR;gBBM5cASASa7TAj12x#wFDU-Dcl)_Ne&k;dfxmkbz;P0IguI`A
zir@Q-_xryGe2^b}$1Zu3A9ln~{Dn*35r$Y3>&ghs?MvW#-n}Dh*dgaQOq)L?@ZQ7It)Tk`3
z6vffP1c|I!A92;H)dbkEVq1_c+hPk^v_jUhE#dYpTo`ia%B^CzN{YOC^)~41w}FPh
zfjtl|Oqc><#B4GM2vDZ{<8tL61`^y!Bt-@2(4eIdO2p{IgUSyK1bE>3
z1Z>y=640(qTLA9dxDoJ1aPR=|;KGL!FCLsC^5n{wGjHzvIrQk#CvvnHo#x|R6wdtl?Z@vv=9Fj>AHyx8rI{74&QA#X$*0eA!rebP|i5qoO&h=C*|
zc&G^rmX+3n4@UUbgmYDB;e~l+*w=;{bm+l{i7h4~WRg{u*=3~$5WoqV-7p0qF^UEn
zjWQ;3Lku0naBB<+02$128)P1{e%*We{2J5$%>-
zengVCW72dJPCBjUQ+wsMIfI*UCZ&d)aL)N2x_SP0#urX+k7+5IWJTl1^{4$t+X3mcTuzvcm!?H7^D%wN!zYrhaES8q279B
zkZX0kS)&`DeC~FQ!@5PG>mL#I_6Y^rY5NK28Tq=c)qni<3)a5?J1DRaj~ZMT!UaH!j{4%gJn+}}L
zsjI#^>k%!n1OTtgKKtt%T>^B_vg0oMMbrj?Q3L~gBs|kAl-I==ee{85n&xV~HM&3X
z_x#px;^`l~W+ARav}|!2*MI9vMrW;3wb#?
z0}-x9y(Px$Tw24L*7Q^_v;iRrR!oBTx|g;sLLq$kdRzL^H#fU&fs6qg7{TIqmxS5x
zZ}=;W{u0B#Q2j450TiIdE(1BxaZCXU(BKD9z<|t|tdLK50v4pe2u9q%HVU`{0xoz#
z4I-cdf4JlyI_SZfiLjHN{A6=*H;^Ud@Dj8e1uB7-hS^nV0JNJ{@O)++kOUF`ctaFV
z7mT>Ps+H?`I!GcDgV{u^=^zgDq5%}Hs7x$oF^gQ>q8IyQzCwi&LF+q98O^8`2x><0B-y!fGK=HG$unNjShLplbObXkhCBrD}Vq@
zW^$7s1SLWfs?dnAu%S!1ge@Y9%7ILyqB+DC4{O=1FMaDgU|1gWns+W8khG*(OCs6G
zmNj!(t)#|00}qy&1RKbdnaynGGrJhgKTWfma=Rur7u7y)!Y@(?qf|IE^hUzO5ixV5
zUJ5n?$I9tNQfq
zZ)G$E&q?wIy*Vpd(@LziGPk+QX%=*&yAh?qwYn~}E6{jnoglPQcun(b4|4g@U6Qmt
zi&ZR14^+~WCJ~A!C0j8c>xIb1bf%cSuVpW*SPvBfIm_a0j%n6S4phs8f|WZkVNi_mo(!^f6@5MjM3wK%$zjAVL6_R7lca(<0XHgSvi`-Da5qI``L#e1pLbY?sNZ!-M_&CzMsGZR`jtR@#t2?y&yr8pM2hSeZ*e(
zIzP)UeS}_`#=&95EwbN>TNr~CtSAmEjB$%z03#k?Qi*uP^KgjgGU5^k>68;YOqN#s
z;`YBk{%I}W#s?M*T<&t2sGLnq9s%wE${ipA9w2&T83Q(8mi6D`L7)VJ0T4)*1zsQq
zUf_IfAP0Iu7$sgxY1_6n%IY1=8nKbWgqsGu76l|uV`Ksh#$YDY0u9z6FWevw?t%{L
zU@Y{Y5BeY^1fdWPp`m$3ygeTh*2wfNA?u`v-}*sK`$b{>(fap&$Ms
zAO@l!0wNz2q9Gn4A||3DE+Qiqq9QyZBu1hnP9h~%q9SksCT5~0ZXzdkq9=YLD2Ada
Mjv^=WK|lZiJIGe)lmGw#

diff --git a/vid/src/main/webapp/static/fusion/images/tab-hm.png b/vid/src/main/webapp/static/fusion/images/tab-hm.png
deleted file mode 100644
index 1e75d8d468a3b91c1b0035550ed6b9d628331423..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 249
zcmVHoOt|Gn$~!S4UX?*FUg|I6_It>*vF^8eEG|JC&W*!2I|_W$1W
z|K0Zg;r9RJ_y6Yj|LOSu>-zug`Tw!z|MC0(@%;b&{{Mce#-T7tSpWb40d!JMQvg8b
z*k%9#07^+jK~#8Nz0QXXfG_~WKqsO0-pl@D@a<1imW07!Ywxs-!WcmQKJ&V`W6qO`TW!zV6e!u{tM+irYJ
zQ}becm^XbjmP~&D-Ukl=D*`A~0o;|+#{B?5B2xv>B7o<`x}U4Ez56OqR1O+Y-@UDxgsh
zsjJjxMz5eWO%GL7U7l}YpCrj?P7kc=`#uQ6a5oHtvBf@$qO+{@uLo9jUB_sOsrkXo
zRM#~XMM2;C)dQ=v*2Z9RhCv+1^iMdK=Q$&Rfh7(tk?XohK&ow9wlP2gux18;Z4Ar|
zY!f(+GbU)7hHYm6);a;0PXe16;Jis74}|fErgtz`V8E)fEENXgdEVk7f@R

diff --git a/vid/src/main/webapp/static/fusion/images/table-add.png b/vid/src/main/webapp/static/fusion/images/table-add.png
deleted file mode 100644
index 0c1385767ddd1ebedbcabb6d2dfd8331d22fd5dd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3314
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

diff --git a/vid/src/main/webapp/static/fusion/images/table-delete.png b/vid/src/main/webapp/static/fusion/images/table-delete.png
deleted file mode 100644
index 917d7d28543503da51d5a4bf8f9d70809b88089c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3342
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

diff --git a/vid/src/main/webapp/static/fusion/images/toolButton.gif b/vid/src/main/webapp/static/fusion/images/toolButton.gif
deleted file mode 100644
index 6d3923efc8c59dd706f82c0d3d86650f1900079b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 414
zcmZ?wbhEHb6kw2LxXQp_U}hInwbUbXdQI+o7rze2B^+1U-V+UM*Dh)RztURv6@
z*uf*Dddk*_%=+Ypm2R=sE-C$;3-;x-uWg&WxU_$BazRsk?XrgHJIw=%Jwg(EQ<_84
zn|c=Rvv&5Wo3N^N_MV<8OI@O>0^S9hKuSYc
zPG?Yj(f|Md8At?*KUr8s81xx*K>9#_Vqn{S;ClC@4-9=C{!L0XYbC_4qQtRc(`HT9QRkn(VBtb_b@64(SF8{aU|hRy{dy%Ot}R=)ZBt@p+P!D*URGAN
zLx+zXQB^&9^6>Ffr_P)`dj7&;Ny*Dcu3o=#?H1crrn{2TnzuBinOSbJFzd6k2tGK<
XB*?<XP)jRN0wp49Q(=>PDt*)$slfyumne%b(
zz|EDmc8?ij_jlE^RtksgiA*+sdbDScPbgMuxUjI6
zOpi*k5;8`CeTxq1O4AK9k*=H_fvm=@_3rB0s}O|M9z>S6HqK}fecy~112Ui
z10wSU>iHI#2|x@`7(fV+`@#U30eMIt(F7j$61oA8l)wWNego&gF+>an0WwEVaNLge
z-WCMN3{2`t5FoS6A_}A)CLBQR6glAw6OLdKP(4xJ9KEFIfC@mrx`;IlIe;Q36GqVW
zgj&`2Qb|)T&g9%ygZO^~$W|&$$qMLm`LVZ`2j6q}U(52?wV-N$^>tyVa(R8YE
zS$(d*cwVOu(Dm3zIx#y}QdG6^>Htl)debpBD)z4*}Q$iB}<+eS(

diff --git a/vid/src/main/webapp/static/fusion/images/users.png b/vid/src/main/webapp/static/fusion/images/users.png
deleted file mode 100644
index 13fec65e4830ca3ad6f139b614f290fc80209200..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 938
zcmV;b16BNqP)-4uF*Y|gQCQB|0osNYB008sr=j_nEyM$Tfqj2MzVYh8ElYDDQ
zF&u_)RIzwuu61CVVNQKYIALI96#xLZgK&{pMSx*Qo>v~7Rvd|ALw;sQ90veiK^;_7
zR906`XE7gFCl$rZr9(qQ@z}}v=Gnsj{u*bea$87#V@;PAw_06#Bx|4{aMrLnN
zT~a%Tc2sqBbyr?QT|O9BR$B1TyY_Utv~N
zSV~xDGh>4iKx6HBbRMSpYOt02Va>
z06cvMOpG=e3I;xL2TF$kICks~L16#@06uh5PE!B?BodS95-=n=*6Hap;P2JY@a*;VEbzXh0002VNkl(UF(Ww4Y>dn<@)|E0{&H}I++}0`#mvFS2ve0g;ew9?ecec?zzY7^?d#K++LgGVj?2NTyQZB
ze4CoGd?%A1XDz0w$w7<7_
z#Z7#XP}?G&7Vv;?SK
z7cs72ICwjMtz`$<7nWzVNU`oO`lf0n

diff --git a/vid/src/main/webapp/static/fusion/images/webphone.ico b/vid/src/main/webapp/static/fusion/images/webphone.ico
deleted file mode 100644
index d58e62ab7e13eb1b7ae8dba910a61da1e6be3608..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 241
zcmVwd6H#(;Oki_wC3j4JW@jZ>7$E>V;y!fT

diff --git a/vid/src/main/webapp/static/fusion/images/whiteButton.png b/vid/src/main/webapp/static/fusion/images/whiteButton.png
deleted file mode 100644
index ce8c9cb48c2c3108e1f641d7de361e525745fc36..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1430
zcmV;H1!?+;P)c?MQO$1h5Z<-2w)R9vTw}kdyB@6m?)2KI9N2J=8#u(XJHWfZ2Ji&v1C0X)
z=m9Cfe@^m)E-8Zol8}M`jQ8`~9fX=>$tlORJYIUHS{~LDK)D#NM0xd3qZ76!9pgzuDWvN$`_?l=^o$$=YaQt
z?hyJLU>@k4KYxCqTrU5v-EQ~dIDW>f=ap^SRwk2ii^bygN~N*_WPnxRuaf-uJaIi<
zU0wamvMhNS;802_D~@9`KR^EogWx(1d~5^1Vz5PmYuB#5T`U$)2SE_-6)-QVIF7aJ
zx=yp%>{Tk2Z-EYA3Gg1^0O7rR_dfMJ@5sw~xLd2MtE~$cF8m?k1PYi=Mj)Q&O~r8>
zA2zg5C}bG~Z4BfUU;!cE>O_YPRZ1xaYZ?He61th2oBK(>-+$rl@jNodgbbWBK&$`_
z7{_sx*7~3{_kSy~D+x=hA$<^RFTYI=kV&9Mjs0N4P(2PEjbsu*G;Tj>qXRiM#^@hu
zdQl=W%)iDMGm$_7*uf08%;wt-d6(EX!C*sa`UQxY=w5{O~S%D6P}!L=3Z$Qa#IYoGk{y
zq^s3xdlH^LeE6`Lq*+O&QY|Z;PH%{aD{m5sI@kWi;GpuvSJZA;<|3#0v<8A
zxdoL<<(s>A@76fPsl9XOPHkyv>Awu#ET(`*mhb!Pp64}0BovW$sZ{!^Ua$8K!^@40
zjb5o#`cg!;L?rY)ui^Xtx*f-HoX_Xk-rk-Ef^N4f_wU~i&z?Q|N;aF_>-pxnf!D8J
zU#i#ZE0$$_FCyt|Hv4s>(Wu)1yQX70@GTX
z+qZ9T+_-ULd2@4fT|_oSq_eQF&|F(vd!V(}qr8_N=%?%J>uF<*XN)-pC$+jeVy
ze!k=T{&%%ntv2lNOoq?r^ZA8^g*To)ed_wYKcltI09j*9nn8Ipywi@L44&yC5!nVh
zmSt__a=G@=qep|4m6by4 or
-        // undefined(indicating the use of another browser).
-        {
-            var isIE10 = (eval("/*@cc_on!@*/false") && document.documentMode === 10);
-            if (isIE10) {
-                return 10;
-            }
-            var v = 3,
-                div = document.createElement('div'),
-                all = div.getElementsByTagName('i');
-            do {
-                div.innerHTML = '';
-            } while (all[0]);
-            return v > 4 ? v : undefined;
-        };
-
-    var browserVersion = getInternetExplorerVersion();
-
-    if (browserVersion && browserVersion < 9) {
-        ie8 = true;
-    }
-        
-	// This returned angular module 'gridster' is what is exported.
-	return angular.module('attGridsterLib', [])
-
-	.constant('gridsterConfig', {
-		columns: 6, // number of columns in the grid
-		pushing: true, // whether to push other items out of the way
-		floating: true, // whether to automatically float items up so they stack
-		swapping: true, // whether or not to have items switch places instead of push down if they are the same size
-		width: 'auto', // width of the grid. "auto" will expand the grid to its parent container
-		colWidth: 'auto', // width of grid columns. "auto" will divide the width of the grid evenly among the columns
-		rowHeight: 'match', // height of grid rows. 'match' will make it the same as the column width, a numeric value will be interpreted as pixels, '/2' is half the column width, '*5' is five times the column width, etc.
-		margins: [10, 10], // margins in between grid items
-		outerMargin: false,
-		isMobile: false, // toggle mobile view
-		mobileBreakPoint: 100, // width threshold to toggle mobile mode
-		mobileModeEnabled: true, // whether or not to toggle mobile mode when screen width is less than mobileBreakPoint
-		minColumns: 1, // minimum amount of columns the grid can scale down to
-		minRows: 1, // minimum amount of rows to show if the grid is empty
-		maxRows: 100, // maximum amount of rows in the grid
-		defaultSizeX: 1, // default width of an item in columns
-		defaultSizeY: 1, // default height of an item in rows
-		minSizeX: 1, // minimum column width of an item
-		maxSizeX: null, // maximum column width of an item
-		minSizeY: 1, // minumum row height of an item
-		maxSizeY: null, // maximum row height of an item
-		saveGridItemCalculatedHeightInMobile: false, // grid item height in mobile display. true- to use the calculated height by sizeY given
-		resizable: { // options to pass to resizable handler
-			enabled: false,
-			handles: ['s', 'e', 'n', 'w', 'se', 'ne', 'sw', 'nw']
-		},
-		draggable: { // options to pass to draggable handler
-			enabled: true,
-			scrollSensitivity: 20, // Distance in pixels from the edge of the viewport after which the viewport should scroll, relative to pointer
-			scrollSpeed: 15 // Speed at which the window should scroll once the mouse pointer gets within scrollSensitivity distance
-		}
-	})
-
-	.controller('GridsterCtrl', ['gridsterConfig', '$timeout',
-		function(gridsterConfig, $timeout) {
-
-			var gridster = this;
-
-			/**
-			 * Create options from gridsterConfig constant
-			 */
-			angular.extend(this, gridsterConfig);
-
-			this.resizable = angular.extend({}, gridsterConfig.resizable || {});
-			this.draggable = angular.extend({}, gridsterConfig.draggable || {});
-
-			var flag = false;
-			this.layoutChanged = function() {
-				if (flag) {
-					return;
-				}
-				flag = true;
-				$timeout(function() {
-					flag = false;
-					if (gridster.loaded) {
-						gridster.floatItemsUp();
-					}
-					gridster.updateHeight(gridster.movingItem ? gridster.movingItem.sizeY : 0);
-				}, 30);
-			};
-
-			/**
-			 * A positional array of the items in the grid
-			 */
-			this.grid = [];
-
-			/**
-			 * Clean up after yourself
-			 */
-			this.destroy = function() {
-				// empty the grid to cut back on the possibility
-				// of circular references
-				if (this.grid) {
-					this.grid = [];
-				}
-				this.$element = null;
-			};
-
-			/**
-			 * Overrides default options
-			 *
-			 * @param {Object} options The options to override
-			 */
-			this.setOptions = function(options) {
-				if (!options) {
-					return;
-				}
-
-				options = angular.extend({}, options);
-
-				// all this to avoid using jQuery...
-				if (options.draggable) {
-					angular.extend(this.draggable, options.draggable);
-					delete(options.draggable);
-				}
-				if (options.resizable) {
-					angular.extend(this.resizable, options.resizable);
-					delete(options.resizable);
-				}
-
-				angular.extend(this, options);
-
-				if (!this.margins || this.margins.length !== 2) {
-					this.margins = [0, 0];
-				} else {
-					for (var x = 0, l = this.margins.length; x < l; ++x) {
-						this.margins[x] = parseInt(this.margins[x], 10);
-						if (isNaN(this.margins[x])) {
-							this.margins[x] = 0;
-						}
-					}
-				}
-			};
-
-			/**
-			 * Check if item can occupy a specified position in the grid
-			 *
-			 * @param {Object} item The item in question
-			 * @param {Number} row The row index
-			 * @param {Number} column The column index
-			 * @returns {Boolean} True if if item fits
-			 */
-			this.canItemOccupy = function(item, row, column) {
-				return row > -1 && column > -1 && item.sizeX + column <= this.columns && item.sizeY + row <= this.maxRows;
-			};
-
-			/**
-			 * Set the item in the first suitable position
-			 *
-			 * @param {Object} item The item to insert
-			 */
-			this.autoSetItemPosition = function(item) {
-				// walk through each row and column looking for a place it will fit
-				for (var rowIndex = 0; rowIndex < this.maxRows; ++rowIndex) {
-					for (var colIndex = 0; colIndex < this.columns; ++colIndex) {
-						// only insert if position is not already taken and it can fit
-						var items = this.getItems(rowIndex, colIndex, item.sizeX, item.sizeY, item);
-						if (items.length === 0 && this.canItemOccupy(item, rowIndex, colIndex)) {
-							this.putItem(item, rowIndex, colIndex);
-							return;
-						}
-					}
-				}
-				throw new Error('Unable to place item!');
-			};
-
-			/**
-			 * Gets items at a specific coordinate
-			 *
-			 * @param {Number} row
-			 * @param {Number} column
-			 * @param {Number} sizeX
-			 * @param {Number} sizeY
-			 * @param {Array} excludeItems An array of items to exclude from selection
-			 * @returns {Array} Items that match the criteria
-			 */
-			this.getItems = function(row, column, sizeX, sizeY, excludeItems) {
-				var items = [];
-				if (!sizeX || !sizeY) {
-					sizeX = sizeY = 1;
-				}
-				if (excludeItems && !(excludeItems instanceof Array)) {
-					excludeItems = [excludeItems];
-				}
-				for (var h = 0; h < sizeY; ++h) {
-					for (var w = 0; w < sizeX; ++w) {
-						var item = this.getItem(row + h, column + w, excludeItems);
-						if (item && (!excludeItems || excludeItems.indexOf(item) === -1) && items.indexOf(item) === -1) {
-							items.push(item);
-						}
-					}
-				}
-				return items;
-			};
-
-			/**
-			 * @param {Array} items
-			 * @returns {Object} An item that represents the bounding box of the items
-			 */
-			this.getBoundingBox = function(items) {
-
-				if (items.length === 0) {
-					return null;
-				}
-				if (items.length === 1) {
-					return {
-						row: items[0].row,
-						col: items[0].col,
-						sizeY: items[0].sizeY,
-						sizeX: items[0].sizeX
-					};
-				}
-
-				var maxRow = 0;
-				var maxCol = 0;
-				var minRow = 9999;
-				var minCol = 9999;
-
-				for (var i = 0, l = items.length; i < l; ++i) {
-					var item = items[i];
-					minRow = Math.min(item.row, minRow);
-					minCol = Math.min(item.col, minCol);
-					maxRow = Math.max(item.row + item.sizeY, maxRow);
-					maxCol = Math.max(item.col + item.sizeX, maxCol);
-				}
-
-				return {
-					row: minRow,
-					col: minCol,
-					sizeY: maxRow - minRow,
-					sizeX: maxCol - minCol
-				};
-			};
-
-
-			/**
-			 * Removes an item from the grid
-			 *
-			 * @param {Object} item
-			 */
-			this.removeItem = function(item) {
-				for (var rowIndex = 0, l = this.grid.length; rowIndex < l; ++rowIndex) {
-					var columns = this.grid[rowIndex];
-					if (!columns) {
-						continue;
-					}
-					var index = columns.indexOf(item);
-					if (index !== -1) {
-						columns[index] = null;
-						break;
-					}
-				}
-				this.layoutChanged();
-			};
-
-			/**
-			 * Returns the item at a specified coordinate
-			 *
-			 * @param {Number} row
-			 * @param {Number} column
-			 * @param {Array} excludeItems Items to exclude from selection
-			 * @returns {Object} The matched item or null
-			 */
-			this.getItem = function(row, column, excludeItems) {
-				if (excludeItems && !(excludeItems instanceof Array)) {
-					excludeItems = [excludeItems];
-				}
-				var sizeY = 1;
-				while (row > -1) {
-					var sizeX = 1,
-						col = column;
-					while (col > -1) {
-						var items = this.grid[row];
-						if (items) {
-							var item = items[col];
-							if (item && (!excludeItems || excludeItems.indexOf(item) === -1) && item.sizeX >= sizeX && item.sizeY >= sizeY) {
-								return item;
-							}
-						}
-						++sizeX;
-						--col;
-					}
-					--row;
-					++sizeY;
-				}
-				return null;
-			};
-
-			/**
-			 * Insert an array of items into the grid
-			 *
-			 * @param {Array} items An array of items to insert
-			 */
-			this.putItems = function(items) {
-				for (var i = 0, l = items.length; i < l; ++i) {
-					this.putItem(items[i]);
-				}
-			};
-
-			/**
-			 * Insert a single item into the grid
-			 *
-			 * @param {Object} item The item to insert
-			 * @param {Number} row (Optional) Specifies the items row index
-			 * @param {Number} column (Optional) Specifies the items column index
-			 * @param {Array} ignoreItems
-			 */
-			this.putItem = function(item, row, column, ignoreItems) {
-				// auto place item if no row specified
-				if (typeof row === 'undefined' || row === null) {
-					row = item.row;
-					column = item.col;
-					if (typeof row === 'undefined' || row === null) {
-						this.autoSetItemPosition(item);
-						return;
-					}
-				}
-
-				// keep item within allowed bounds
-				if (!this.canItemOccupy(item, row, column)) {
-					column = Math.min(this.columns - item.sizeX, Math.max(0, column));
-					row = Math.min(this.maxRows - item.sizeY, Math.max(0, row));
-				}
-
-				// check if item is already in grid
-				if (item.oldRow !== null && typeof item.oldRow !== 'undefined') {
-					var samePosition = item.oldRow === row && item.oldColumn === column;
-					var inGrid = this.grid[row] && this.grid[row][column] === item;
-					if (samePosition && inGrid) {
-						item.row = row;
-						item.col = column;
-						return;
-					} else {
-						// remove from old position
-						var oldRow = this.grid[item.oldRow];
-						if (oldRow && oldRow[item.oldColumn] === item) {
-							delete oldRow[item.oldColumn];
-						}
-					}
-				}
-
-				item.oldRow = item.row = row;
-				item.oldColumn = item.col = column;
-
-				this.moveOverlappingItems(item, ignoreItems);
-
-				if (!this.grid[row]) {
-					this.grid[row] = [];
-				}
-				this.grid[row][column] = item;
-
-				if (this.movingItem === item) {
-					this.floatItemUp(item);
-				}
-				this.layoutChanged();
-			};
-
-			/**
-			 * Trade row and column if item1 with item2
-			 *
-			 * @param {Object} item1
-			 * @param {Object} item2
-			 */
-			this.swapItems = function(item1, item2) {
-				this.grid[item1.row][item1.col] = item2;
-				this.grid[item2.row][item2.col] = item1;
-
-				var item1Row = item1.row;
-				var item1Col = item1.col;
-				item1.row = item2.row;
-				item1.col = item2.col;
-				item2.row = item1Row;
-				item2.col = item1Col;
-			};
-
-			/**
-			 * Prevents items from being overlapped
-			 *
-			 * @param {Object} item The item that should remain
-			 * @param {Array} ignoreItems
-			 */
-			this.moveOverlappingItems = function(item, ignoreItems) {
-				// don't move item, so ignore it
-				if (!ignoreItems) {
-					ignoreItems = [item];
-				} else if (ignoreItems.indexOf(item) === -1) {
-					ignoreItems = ignoreItems.slice(0);
-					ignoreItems.push(item);
-				}
-
-				// get the items in the space occupied by the item's coordinates
-				var overlappingItems = this.getItems(
-					item.row,
-					item.col,
-					item.sizeX,
-					item.sizeY,
-					ignoreItems
-				);
-				this.moveItemsDown(overlappingItems, item.row + item.sizeY, ignoreItems);
-			};
-
-			/**
-			 * Moves an array of items to a specified row
-			 *
-			 * @param {Array} items The items to move
-			 * @param {Number} newRow The target row
-			 * @param {Array} ignoreItems
-			 */
-			this.moveItemsDown = function(items, newRow, ignoreItems) {
-				if (!items || items.length === 0) {
-					return;
-				}
-				items.sort(function(a, b) {
-					return a.row - b.row;
-				});
-
-				ignoreItems = ignoreItems ? ignoreItems.slice(0) : [];
-				var topRows = {},
-					item, i, l;
-
-				// calculate the top rows in each column
-				for (i = 0, l = items.length; i < l; ++i) {
-					item = items[i];
-					var topRow = topRows[item.col];
-					if (typeof topRow === 'undefined' || item.row < topRow) {
-						topRows[item.col] = item.row;
-					}
-				}
-
-				// move each item down from the top row in its column to the row
-				for (i = 0, l = items.length; i < l; ++i) {
-					item = items[i];
-					var rowsToMove = newRow - topRows[item.col];
-					this.moveItemDown(item, item.row + rowsToMove, ignoreItems);
-					ignoreItems.push(item);
-				}
-			};
-
-			/**
-			 * Moves an item down to a specified row
-			 *
-			 * @param {Object} item The item to move
-			 * @param {Number} newRow The target row
-			 * @param {Array} ignoreItems
-			 */
-			this.moveItemDown = function(item, newRow, ignoreItems) {
-				if (item.row >= newRow) {
-					return;
-				}
-				while (item.row < newRow) {
-					++item.row;
-					this.moveOverlappingItems(item, ignoreItems);
-				}
-				this.putItem(item, item.row, item.col, ignoreItems);
-			};
-
-			/**
-			 * Moves all items up as much as possible
-			 */
-			this.floatItemsUp = function() {
-				if (this.floating === false) {
-					return;
-				}
-				for (var rowIndex = 0, l = this.grid.length; rowIndex < l; ++rowIndex) {
-					var columns = this.grid[rowIndex];
-					if (!columns) {
-						continue;
-					}
-					for (var colIndex = 0, len = columns.length; colIndex < len; ++colIndex) {
-						var item = columns[colIndex];
-						if (item) {
-							this.floatItemUp(item);
-						}
-					}
-				}
-			};
-
-			/**
-			 * Float an item up to the most suitable row
-			 *
-			 * @param {Object} item The item to move
-			 */
-			this.floatItemUp = function(item) {
-				if (this.floating === false) {
-					return;
-				}
-				var colIndex = item.col,
-					sizeY = item.sizeY,
-					sizeX = item.sizeX,
-					bestRow = null,
-					bestColumn = null,
-					rowIndex = item.row - 1;
-
-				while (rowIndex > -1) {
-					var items = this.getItems(rowIndex, colIndex, sizeX, sizeY, item);
-					if (items.length !== 0) {
-						break;
-					}
-					bestRow = rowIndex;
-					bestColumn = colIndex;
-					--rowIndex;
-				}
-				if (bestRow !== null) {
-					this.putItem(item, bestRow, bestColumn);
-				}
-			};
-
-			/**
-			 * Update gridsters height
-			 *
-			 * @param {Number} plus (Optional) Additional height to add
-			 */
-			this.updateHeight = function(plus) {
-				var maxHeight = this.minRows;
-				plus = plus || 0;
-				for (var rowIndex = this.grid.length; rowIndex >= 0; --rowIndex) {
-					var columns = this.grid[rowIndex];
-					if (!columns) {
-						continue;
-					}
-					for (var colIndex = 0, len = columns.length; colIndex < len; ++colIndex) {
-						if (columns[colIndex]) {
-							maxHeight = Math.max(maxHeight, rowIndex + plus + columns[colIndex].sizeY);
-						}
-					}
-				}
-				this.gridHeight = this.maxRows - maxHeight > 0 ? Math.min(this.maxRows, maxHeight) : Math.max(this.maxRows, maxHeight);
-			};
-
-			/**
-			 * Returns the number of rows that will fit in given amount of pixels
-			 *
-			 * @param {Number} pixels
-			 * @param {Boolean} ceilOrFloor (Optional) Determines rounding method
-			 */
-			this.pixelsToRows = function(pixels, ceilOrFloor) {
-				if (ceilOrFloor === true) {
-					return Math.ceil(pixels / this.curRowHeight);
-				} else if (ceilOrFloor === false) {
-					return Math.floor(pixels / this.curRowHeight);
-				}
-
-				return Math.round(pixels / this.curRowHeight);
-			};
-
-			/**
-			 * Returns the number of columns that will fit in a given amount of pixels
-			 *
-			 * @param {Number} pixels
-			 * @param {Boolean} ceilOrFloor (Optional) Determines rounding method
-			 * @returns {Number} The number of columns
-			 */
-			this.pixelsToColumns = function(pixels, ceilOrFloor) {
-				if (ceilOrFloor === true) {
-					return Math.ceil(pixels / this.curColWidth);
-				} else if (ceilOrFloor === false) {
-					return Math.floor(pixels / this.curColWidth);
-				}
-
-				return Math.round(pixels / this.curColWidth);
-			};
-		}
-	])
-
-	.directive('gridsterPreview', function() {
-		return {
-			replace: true,
-			scope: true,
-			require: '^gridster',
-			template: '
      ',
-			link: function(scope, $el, attrs, gridster) {
-
-				/**
-				 * @returns {Object} style object for preview element
-				 */
-				scope.previewStyle = function() {
-                                    
-					if (!gridster.movingItem) {
-						return {
-							display: 'none'
-						};
-					}
-
-					return {
-						display: 'block',
-						height: (gridster.movingItem.sizeY * gridster.curRowHeight - gridster.margins[0]) + 'px',
-						width: (gridster.movingItem.sizeX * gridster.curColWidth - gridster.margins[1]) + 'px',
-						top: (gridster.movingItem.row * gridster.curRowHeight + (gridster.outerMargin ? gridster.margins[0] : 0)) + 'px',
-						left: (gridster.movingItem.col * gridster.curColWidth + (gridster.outerMargin ? gridster.margins[1] : 0)) + 'px'
-					};
-				};
-			}
-		};
-	})
-
-	/**
-	 * The gridster directive
-	 *
-	 * @param {Function} $timeout
-	 * @param {Object} $window
-	 * @param {Object} $rootScope
-	 * @param {Function} gridsterDebounce
-	 */
-	.directive('gridster', ['$timeout', '$window', '$rootScope', 'gridsterDebounce',
-		function($timeout, $window, $rootScope, gridsterDebounce) {
-			return {
-				scope: true,
-				restrict: 'EAC',
-				controller: 'GridsterCtrl',
-				controllerAs: 'gridster',
-				compile: function($tplElem) {
-                                        
-                                        $tplElem.prepend('
      ');
-                                        
-                                        return function(scope, $elem, attrs, gridster) {
-						gridster.loaded = false;
-
-						gridster.$element = $elem;
-
-						scope.gridster = gridster;
-
-						$elem.addClass('gridster');
-
-						var isVisible = function(ele) {
-							return ele.style.visibility !== 'hidden' && ele.style.display !== 'none';
-						};
-
-						function refresh(config) {
-							gridster.setOptions(config);
-
-							if (!isVisible($elem[0])) {
-								return;
-							}
-
-							// resolve "auto" & "match" values
-							if (gridster.width === 'auto') {
-								gridster.curWidth = $elem[0].offsetWidth || parseInt($elem.css('width'), 10);
-							} else {
-								gridster.curWidth = gridster.width;
-							}
-
-							if (gridster.colWidth === 'auto') {
-								gridster.curColWidth = (gridster.curWidth + (gridster.outerMargin ? -gridster.margins[1] : gridster.margins[1])) / gridster.columns;
-							} else {
-								gridster.curColWidth = gridster.colWidth;
-							}
-
-							gridster.curRowHeight = gridster.rowHeight;
-							if (typeof gridster.rowHeight === 'string') {
-								if (gridster.rowHeight === 'match') {
-									gridster.curRowHeight = Math.round(gridster.curColWidth);
-								} else if (gridster.rowHeight.indexOf('*') !== -1) {
-									gridster.curRowHeight = Math.round(gridster.curColWidth * gridster.rowHeight.replace('*', '').replace(' ', ''));
-								} else if (gridster.rowHeight.indexOf('/') !== -1) {
-									gridster.curRowHeight = Math.round(gridster.curColWidth / gridster.rowHeight.replace('/', '').replace(' ', ''));
-								}
-							}
-
-							gridster.isMobile = gridster.mobileModeEnabled && gridster.curWidth <= gridster.mobileBreakPoint;
-
-							// loop through all items and reset their CSS
-							for (var rowIndex = 0, l = gridster.grid.length; rowIndex < l; ++rowIndex) {
-								var columns = gridster.grid[rowIndex];
-								if (!columns) {
-									continue;
-								}
-
-								for (var colIndex = 0, len = columns.length; colIndex < len; ++colIndex) {
-									if (columns[colIndex]) {
-										var item = columns[colIndex];
-										item.setElementPosition();
-										item.setElementSizeY();
-										item.setElementSizeX();
-									}
-								}
-							}
-
-							updateHeight();
-						}
-
-						var optionsKey = attrs.gridster;
-						if (optionsKey) {
-							scope.$parent.$watch(optionsKey, function(newConfig) {
-								refresh(newConfig);
-							}, true);
-						} else {
-							refresh({});
-						}
-
-						scope.$watch(function() {
-							return gridster.loaded;
-						}, function() {
-							if (gridster.loaded) {
-								$elem.addClass('gridster-loaded');
-							} else {
-								$elem.removeClass('gridster-loaded');
-							}
-						});
-
-						scope.$watch(function() {
-							return gridster.isMobile;
-						}, function() {
-							if (gridster.isMobile) {
-								$elem.addClass('gridster-mobile').removeClass('gridster-desktop');
-							} else {
-								$elem.removeClass('gridster-mobile').addClass('gridster-desktop');
-							}
-							$rootScope.$broadcast('gridster-mobile-changed', gridster);
-						});
-
-						scope.$watch(function() {
-							return gridster.draggable;
-						}, function() {
-							$rootScope.$broadcast('gridster-draggable-changed', gridster);
-						}, true);
-
-						scope.$watch(function() {
-							return gridster.resizable;
-						}, function() {
-							$rootScope.$broadcast('gridster-resizable-changed', gridster);
-						}, true);
-
-						function updateHeight() {
-                                                    if(gridster.gridHeight){ //need to put this check, otherwise fail in IE8
-							$elem.css('height', (gridster.gridHeight * gridster.curRowHeight) + (gridster.outerMargin ? gridster.margins[0] : -gridster.margins[0]) + 'px');
-                                                    }
-						}
-
-						scope.$watch(function() {
-							return gridster.gridHeight;
-						}, updateHeight);
-
-						scope.$watch(function() {
-							return gridster.movingItem;
-						}, function() {
-							gridster.updateHeight(gridster.movingItem ? gridster.movingItem.sizeY : 0);
-						});
-
-						var prevWidth = $elem[0].offsetWidth || parseInt($elem.css('width'), 10);
-
-						var resize = function() {
-							var width = $elem[0].offsetWidth || parseInt($elem.css('width'), 10);
-
-							if (!width || width === prevWidth || gridster.movingItem) {
-								return;
-							}
-							prevWidth = width;
-
-							if (gridster.loaded) {
-								$elem.removeClass('gridster-loaded');
-							}
-
-							refresh();
-
-							if (gridster.loaded) {
-								$elem.addClass('gridster-loaded');
-							}
-
-							$rootScope.$broadcast('gridster-resized', [width, $elem[0].offsetHeight], gridster);
-						};
-
-						// track element width changes any way we can
-						var onResize = gridsterDebounce(function onResize() {
-							resize();
-							$timeout(function() {
-								scope.$apply();
-							});
-						}, 100);
-
-						scope.$watch(function() {
-							return isVisible($elem[0]);
-						}, onResize);
-
-						// see https://github.com/sdecima/javascript-detect-element-resize
-						if (typeof window.addResizeListener === 'function') {
-							window.addResizeListener($elem[0], onResize);
-						} else {
-							scope.$watch(function() {
-								return $elem[0].offsetWidth || parseInt($elem.css('width'), 10);
-							}, resize);
-						}
-						var $win = angular.element($window);
-						$win.on('resize', onResize);
-
-						// be sure to cleanup
-						scope.$on('$destroy', function() {
-							gridster.destroy();
-							$win.off('resize', onResize);
-							if (typeof window.removeResizeListener === 'function') {
-								window.removeResizeListener($elem[0], onResize);
-							}
-						});
-
-						// allow a little time to place items before floating up
-						$timeout(function() {
-							scope.$watch('gridster.floating', function() {
-								gridster.floatItemsUp();
-							});
-							gridster.loaded = true;
-						}, 100);
-					};
-				}
-			};
-		}
-	])
-
-	.controller('GridsterItemCtrl', function() {
-		this.$element = null;
-		this.gridster = null;
-		this.row = null;
-		this.col = null;
-		this.sizeX = null;
-		this.sizeY = null;
-		this.minSizeX = 0;
-		this.minSizeY = 0;
-		this.maxSizeX = null;
-		this.maxSizeY = null;
-
-		this.init = function($element, gridster) {
-			this.$element = $element;
-			this.gridster = gridster;
-			this.sizeX = gridster.defaultSizeX;
-			this.sizeY = gridster.defaultSizeY;
-		};
-
-		this.destroy = function() {
-			// set these to null to avoid the possibility of circular references
-			this.gridster = null;
-			this.$element = null;
-		};
-
-		/**
-		 * Returns the items most important attributes
-		 */
-		this.toJSON = function() {
-			return {
-				row: this.row,
-				col: this.col,
-				sizeY: this.sizeY,
-				sizeX: this.sizeX
-			};
-		};
-
-		this.isMoving = function() {
-			return this.gridster.movingItem === this;
-		};
-
-		/**
-		 * Set the items position
-		 *
-		 * @param {Number} row
-		 * @param {Number} column
-		 */
-		this.setPosition = function(row, column) {
-			this.gridster.putItem(this, row, column);
-
-			if (!this.isMoving()) {
-				this.setElementPosition();
-			}
-		};
-
-		/**
-		 * Sets a specified size property
-		 *
-		 * @param {String} key Can be either "x" or "y"
-		 * @param {Number} value The size amount
-		 * @param {Boolean} preventMove
-		 */
-		this.setSize = function(key, value, preventMove) {
-			key = key.toUpperCase();
-			var camelCase = 'size' + key,
-				titleCase = 'Size' + key;
-			if (value === '') {
-				return;
-			}
-			value = parseInt(value, 10);
-			if (isNaN(value) || value === 0) {
-				value = this.gridster['default' + titleCase];
-			}
-			var max = key === 'X' ? this.gridster.columns : this.gridster.maxRows;
-			if (this['max' + titleCase]) {
-				max = Math.min(this['max' + titleCase], max);
-			}
-			if (this.gridster['max' + titleCase]) {
-				max = Math.min(this.gridster['max' + titleCase], max);
-			}
-			if (key === 'X' && this.cols) {
-				max -= this.cols;
-			} else if (key === 'Y' && this.rows) {
-				max -= this.rows;
-			}
-
-			var min = 0;
-			if (this['min' + titleCase]) {
-				min = Math.max(this['min' + titleCase], min);
-			}
-			if (this.gridster['min' + titleCase]) {
-				min = Math.max(this.gridster['min' + titleCase], min);
-			}
-
-			value = Math.max(Math.min(value, max), min);
-
-			var changed = (this[camelCase] !== value || (this['old' + titleCase] && this['old' + titleCase] !== value));
-			this['old' + titleCase] = this[camelCase] = value;
-
-			if (!this.isMoving()) {
-				this['setElement' + titleCase]();
-			}
-			if (!preventMove && changed) {
-				this.gridster.moveOverlappingItems(this);
-				this.gridster.layoutChanged();
-			}
-
-			return changed;
-		};
-
-		/**
-		 * Sets the items sizeY property
-		 *
-		 * @param {Number} rows
-		 * @param {Boolean} preventMove
-		 */
-		this.setSizeY = function(rows, preventMove) {
-			return this.setSize('Y', rows, preventMove);
-		};
-
-		/**
-		 * Sets the items sizeX property
-		 *
-		 * @param {Number} columns
-		 * @param {Boolean} preventMove
-		 */
-		this.setSizeX = function(columns, preventMove) {
-			return this.setSize('X', columns, preventMove);
-		};
-
-		/**
-		 * Sets an elements position on the page
-		 */
-		this.setElementPosition = function() {
-			if (this.gridster.isMobile) {
-				this.$element.css({
-					marginLeft: this.gridster.margins[0] + 'px',
-					marginRight: this.gridster.margins[0] + 'px',
-					marginTop: this.gridster.margins[1] + 'px',
-					marginBottom: this.gridster.margins[1] + 'px',
-					top: '',
-					left: ''
-				});
-			} else {
-				this.$element.css({
-					margin: 0,
-					top: (this.row * this.gridster.curRowHeight + (this.gridster.outerMargin ? this.gridster.margins[0] : 0)) + 'px',
-					left: (this.col * this.gridster.curColWidth + (this.gridster.outerMargin ? this.gridster.margins[1] : 0)) + 'px'
-				});
-			}
-		};
-
-		/**
-		 * Sets an elements height
-		 */
-		this.setElementSizeY = function() {
-			if (this.gridster.isMobile && !this.gridster.saveGridItemCalculatedHeightInMobile) {
-				this.$element.css('height', '');
-			} else {
-				var computedHeight = (this.sizeY * this.gridster.curRowHeight - this.gridster.margins[0]) + 'px';
-				//this.$element.css('height', computedHeight);
-                this.$element.attr('style', this.$element.attr('style') + '; ' + 'height: '+computedHeight+' !important;');
-			}
-		};
-
-		/**
-		 * Sets an elements width
-		 */
-		this.setElementSizeX = function() {
-			if (this.gridster.isMobile) {
-				this.$element.css('width', '');
-			} else {
-				this.$element.css('width', (this.sizeX * this.gridster.curColWidth - this.gridster.margins[1]) + 'px');
-			}
-		};
-
-		/**
-		 * Gets an element's width
-		 */
-		this.getElementSizeX = function() {
-			return (this.sizeX * this.gridster.curColWidth - this.gridster.margins[1]);
-		};
-
-		/**
-		 * Gets an element's height
-		 */
-		this.getElementSizeY = function() {
-			return (this.sizeY * this.gridster.curRowHeight - this.gridster.margins[0]);
-		};
-
-	})
-
-	.factory('GridsterTouch', [function() {
-		return function GridsterTouch(target, startEvent, moveEvent, endEvent) {
-			var lastXYById = {};
-
-			//  Opera doesn't have Object.keys so we use this wrapper
-			var numberOfKeys = function(theObject) {
-				if (Object.keys) {
-					return Object.keys(theObject).length;
-				}
-
-				var n = 0,
-					key;
-				for (key in theObject) {
-					++n;
-				}
-
-				return n;
-			};
-
-			//  this calculates the delta needed to convert pageX/Y to offsetX/Y because offsetX/Y don't exist in the TouchEvent object or in Firefox's MouseEvent object
-			var computeDocumentToElementDelta = function(theElement) {
-				var elementLeft = 0;
-				var elementTop = 0;
-				var oldIEUserAgent = navigator.userAgent.match(/\bMSIE\b/);
-
-				for (var offsetElement = theElement; offsetElement != null; offsetElement = offsetElement.offsetParent) {
-					//  the following is a major hack for versions of IE less than 8 to avoid an apparent problem on the IEBlog with double-counting the offsets
-					//  this may not be a general solution to IE7's problem with offsetLeft/offsetParent
-					if (oldIEUserAgent &&
-						(!document.documentMode || document.documentMode < 8) &&
-						offsetElement.currentStyle.position === 'relative' && offsetElement.offsetParent && offsetElement.offsetParent.currentStyle.position === 'relative' && offsetElement.offsetLeft === offsetElement.offsetParent.offsetLeft) {
-						// add only the top
-						elementTop += offsetElement.offsetTop;
-					} else {
-						elementLeft += offsetElement.offsetLeft;
-						elementTop += offsetElement.offsetTop;
-					}
-				}
-
-				return {
-					x: elementLeft,
-					y: elementTop
-				};
-			};
-
-			//  cache the delta from the document to our event target (reinitialized each mousedown/MSPointerDown/touchstart)
-			var documentToTargetDelta = computeDocumentToElementDelta(target);
-
-			//  common event handler for the mouse/pointer/touch models and their down/start, move, up/end, and cancel events
-			var doEvent = function(theEvtObj) {
-
-				if (theEvtObj.type === 'mousemove' && numberOfKeys(lastXYById) === 0) {
-					return;
-				}
-
-				var prevent = true;
-
-				var pointerList = theEvtObj.changedTouches ? theEvtObj.changedTouches : [theEvtObj];
-                                
-				for (var i = 0; i < pointerList.length; ++i) {
-					var pointerObj = pointerList[i];
-					var pointerId = (typeof pointerObj.identifier !== 'undefined') ? pointerObj.identifier : (typeof pointerObj.pointerId !== 'undefined') ? pointerObj.pointerId : 1;
-                                        
-                                        //  use the pageX/Y coordinates to compute target-relative coordinates when we have them (in ie < 9, we need to do a little work to put them there)
-					if (typeof pointerObj.pageX === 'undefined') {
-                                                
-                                                //  initialize assuming our source element is our target
-						if(!ie8){
-                                                    pointerObj.pageX = pointerObj.offsetX + documentToTargetDelta.x;
-                                                    pointerObj.pageY = pointerObj.offsetY + documentToTargetDelta.y;
-                                                }
-                                                else{
-                                                    pointerObj.pageX = pointerObj.clientX;
-                                                    pointerObj.pageY = pointerObj.clientY;
-                                                }
-
-						if (pointerObj.srcElement.offsetParent === target && document.documentMode && document.documentMode === 8 && pointerObj.type === 'mousedown') {
-							//  source element is a child piece of VML, we're in IE8, and we've not called setCapture yet - add the origin of the source element
-							pointerObj.pageX += pointerObj.srcElement.offsetLeft;
-							pointerObj.pageY += pointerObj.srcElement.offsetTop;
-						} else if (pointerObj.srcElement !== target && !document.documentMode || document.documentMode < 8) {
-							//  source element isn't the target (most likely it's a child piece of VML) and we're in a version of IE before IE8 -
-							//  the offsetX/Y values are unpredictable so use the clientX/Y values and adjust by the scroll offsets of its parents
-							//  to get the document-relative coordinates (the same as pageX/Y)
-							var sx = -2,
-								sy = -2; // adjust for old IE's 2-pixel border
-							for (var scrollElement = pointerObj.srcElement; scrollElement !== null; scrollElement = scrollElement.parentNode) {
-								sx += scrollElement.scrollLeft ? scrollElement.scrollLeft : 0;
-								sy += scrollElement.scrollTop ? scrollElement.scrollTop : 0;
-							}
-
-							pointerObj.pageX = pointerObj.clientX + sx;
-							pointerObj.pageY = pointerObj.clientY + sy;
-						}
-					}
-
-
-					var pageX = pointerObj.pageX;
-					var pageY = pointerObj.pageY;
-
-					if (theEvtObj.type.match(/(start|down)$/i)) {
-						//  clause for processing MSPointerDown, touchstart, and mousedown
-
-						//  refresh the document-to-target delta on start in case the target has moved relative to document
-						documentToTargetDelta = computeDocumentToElementDelta(target);
-
-						//  protect against failing to get an up or end on this pointerId
-						if (lastXYById[pointerId]) {
-							if (endEvent) {
-								endEvent({
-									target: theEvtObj.target,
-									which: theEvtObj.which,
-									pointerId: pointerId,
-									pageX: pageX,
-									pageY: pageY
-								});
-							}
-
-							delete lastXYById[pointerId];
-						}
-
-						if (startEvent) {
-							if (prevent) {
-								prevent = startEvent({
-									target: theEvtObj.target,
-									which: theEvtObj.which,
-									pointerId: pointerId,
-									pageX: pageX,
-									pageY: pageY
-								});
-							}
-						}
-
-						//  init last page positions for this pointer
-						lastXYById[pointerId] = {
-							x: pageX,
-							y: pageY
-						};
-
-						// IE pointer model
-						if (target.msSetPointerCapture) {
-							target.msSetPointerCapture(pointerId);
-						} else if (theEvtObj.type === 'mousedown' && numberOfKeys(lastXYById) === 1) {
-							if (useSetReleaseCapture) {
-								target.setCapture(true);
-							} else {
-								document.addEventListener('mousemove', doEvent, false);
-								document.addEventListener('mouseup', doEvent, false);
-							}
-						}
-					} else if (theEvtObj.type.match(/move$/i)) {
-						//  clause handles mousemove, MSPointerMove, and touchmove
-
-						if (lastXYById[pointerId] && !(lastXYById[pointerId].x === pageX && lastXYById[pointerId].y === pageY)) {
-							//  only extend if the pointer is down and it's not the same as the last point
-
-							if (moveEvent && prevent) {
-								prevent = moveEvent({
-									target: theEvtObj.target,
-									which: theEvtObj.which,
-									pointerId: pointerId,
-									pageX: pageX,
-									pageY: pageY
-								});
-							}
-
-							//  update last page positions for this pointer
-							lastXYById[pointerId].x = pageX;
-							lastXYById[pointerId].y = pageY;
-						}
-					} else if (lastXYById[pointerId] && theEvtObj.type.match(/(up|end|cancel)$/i)) {
-						//  clause handles up/end/cancel
-
-						if (endEvent && prevent) {
-							prevent = endEvent({
-								target: theEvtObj.target,
-								which: theEvtObj.which,
-								pointerId: pointerId,
-								pageX: pageX,
-								pageY: pageY
-							});
-						}
-
-						//  delete last page positions for this pointer
-						delete lastXYById[pointerId];
-
-						//  in the Microsoft pointer model, release the capture for this pointer
-						//  in the mouse model, release the capture or remove document-level event handlers if there are no down points
-						//  nothing is required for the iOS touch model because capture is implied on touchstart
-						if (target.msReleasePointerCapture) {
-							target.msReleasePointerCapture(pointerId);
-						} else if (theEvtObj.type === 'mouseup' && numberOfKeys(lastXYById) === 0) {
-							if (useSetReleaseCapture) {
-								target.releaseCapture();
-							} else {
-								document.removeEventListener('mousemove', doEvent, false);
-								document.removeEventListener('mouseup', doEvent, false);
-							}
-						}
-					}
-				}
-
-				if (prevent) {
-					if (theEvtObj.preventDefault) {
-						theEvtObj.preventDefault();
-					}
-
-					if (theEvtObj.preventManipulation) {
-						theEvtObj.preventManipulation();
-					}
-
-					if (theEvtObj.preventMouseEvent) {
-						theEvtObj.preventMouseEvent();
-					}
-				}
-			};
-
-			var useSetReleaseCapture = false;
-			// saving the settings for contentZooming and touchaction before activation
-			var contentZooming, msTouchAction;
-
-			this.enable = function() {
-
-				if (window.navigator.msPointerEnabled) {
-					//  Microsoft pointer model
-					target.addEventListener('MSPointerDown', doEvent, false);
-					target.addEventListener('MSPointerMove', doEvent, false);
-					target.addEventListener('MSPointerUp', doEvent, false);
-					target.addEventListener('MSPointerCancel', doEvent, false);
-
-					//  css way to prevent panning in our target area
-					if (typeof target.style.msContentZooming !== 'undefined') {
-						contentZooming = target.style.msContentZooming;
-						target.style.msContentZooming = 'none';
-					}
-
-					//  new in Windows Consumer Preview: css way to prevent all built-in touch actions on our target
-					//  without this, you cannot touch draw on the element because IE will intercept the touch events
-					if (typeof target.style.msTouchAction !== 'undefined') {
-						msTouchAction = target.style.msTouchAction;
-						target.style.msTouchAction = 'none';
-					}
-				} else if (target.addEventListener) {
-					//  iOS touch model
-					target.addEventListener('touchstart', doEvent, false);
-					target.addEventListener('touchmove', doEvent, false);
-					target.addEventListener('touchend', doEvent, false);
-					target.addEventListener('touchcancel', doEvent, false);
-
-					//  mouse model
-					target.addEventListener('mousedown', doEvent, false);
-
-					//  mouse model with capture
-					//  rejecting gecko because, unlike ie, firefox does not send events to target when the mouse is outside target
-					if (target.setCapture && !window.navigator.userAgent.match(/\bGecko\b/)) {
-						useSetReleaseCapture = true;
-
-						target.addEventListener('mousemove', doEvent, false);
-						target.addEventListener('mouseup', doEvent, false);
-					}
-				} else if (target.attachEvent && target.setCapture) {
-					//  legacy IE mode - mouse with capture
-					useSetReleaseCapture = true;
-					target.attachEvent('onmousedown', function() {
-						doEvent(window.event);
-						window.event.returnValue = false;
-						return false;
-					});
-					target.attachEvent('onmousemove', function() {
-						doEvent(window.event);
-						window.event.returnValue = false;
-						return false;
-					});
-					target.attachEvent('onmouseup', function() {
-						doEvent(window.event);
-						window.event.returnValue = false;
-						return false;
-					});
-				}
-			};
-
-			this.disable = function() {
-				if (window.navigator.msPointerEnabled) {
-					//  Microsoft pointer model
-					target.removeEventListener('MSPointerDown', doEvent, false);
-					target.removeEventListener('MSPointerMove', doEvent, false);
-					target.removeEventListener('MSPointerUp', doEvent, false);
-					target.removeEventListener('MSPointerCancel', doEvent, false);
-
-					//  reset zooming to saved value
-					if (contentZooming) {
-						target.style.msContentZooming = contentZooming;
-					}
-
-					// reset touch action setting
-					if (msTouchAction) {
-						target.style.msTouchAction = msTouchAction;
-					}
-				} else if (target.removeEventListener) {
-					//  iOS touch model
-					target.removeEventListener('touchstart', doEvent, false);
-					target.removeEventListener('touchmove', doEvent, false);
-					target.removeEventListener('touchend', doEvent, false);
-					target.removeEventListener('touchcancel', doEvent, false);
-
-					//  mouse model
-					target.removeEventListener('mousedown', doEvent, false);
-
-					//  mouse model with capture
-					//  rejecting gecko because, unlike ie, firefox does not send events to target when the mouse is outside target
-					if (target.setCapture && !window.navigator.userAgent.match(/\bGecko\b/)) {
-						useSetReleaseCapture = true;
-
-						target.removeEventListener('mousemove', doEvent, false);
-						target.removeEventListener('mouseup', doEvent, false);
-					}
-				} else if (target.detachEvent && target.setCapture) {
-					//  legacy IE mode - mouse with capture
-					useSetReleaseCapture = true;
-					target.detachEvent('onmousedown');
-					target.detachEvent('onmousemove');
-					target.detachEvent('onmouseup');
-				}
-			};
-
-			return this;
-		};
-	}])
-
-	.factory('GridsterDraggable', ['$document', '$timeout', '$window', 'GridsterTouch',
-		function($document, $timeout, $window, GridsterTouch) {
-			function GridsterDraggable($el, scope, gridster, item, itemOptions) {
-
-				var elmX, elmY, elmW, elmH,
-
-					mouseX = 0,
-					mouseY = 0,
-					lastMouseX = 0,
-					lastMouseY = 0,
-					mOffX = 0,
-					mOffY = 0,
-
-					minTop = 0,
-					maxTop = 9999,
-					minLeft = 0,
-					realdocument = $document[0];
-
-				var originalCol, originalRow;
-				var inputTags = ['select', 'input', 'textarea', 'button'];
-                                
-                                var gridsterItemDragElement = $el[0].querySelector('[gridster-item-drag]');
-                                //console.log(gridsterItemDragElement);
-                                var isDraggableAreaDefined = gridsterItemDragElement?true:false;
-                               //console.log(isDraggableAreaDefined);
-                                
-				function mouseDown(e) {
-                                    
-                                    if(ie8){
-                                        e.target = window.event.srcElement;
-                                        e.which = window.event.button;
-                                    }
-                                    
-                                    if(isDraggableAreaDefined && (!gridsterItemDragElement.contains(e.target))){
-                                        return false;
-                                    }
-                                    
-                                        if (inputTags.indexOf(e.target.nodeName.toLowerCase()) !== -1) {
-                                            return false;
-                                        }
-
-					var $target = angular.element(e.target);
-
-					// exit, if a resize handle was hit
-					if ($target.hasClass('gridster-item-resizable-handler')) {
-						return false;
-					}
-
-					// exit, if the target has it's own click event
-					if ($target.attr('onclick') || $target.attr('ng-click')) {
-						return false;
-					}
-
-					// only works if you have jQuery
-					if ($target.closest && $target.closest('.gridster-no-drag').length) {
-						return false;
-					}
-                                        
-					switch (e.which) {
-						case 1:
-							// left mouse button
-							break;
-						case 2:
-						case 3:
-							// right or middle mouse button
-							return;
-					}
-
-					lastMouseX = e.pageX;
-					lastMouseY = e.pageY;
-
-					elmX = parseInt($el.css('left'), 10);
-					elmY = parseInt($el.css('top'), 10);
-					elmW = $el[0].offsetWidth;
-					elmH = $el[0].offsetHeight;
-
-					originalCol = item.col;
-					originalRow = item.row;
-
-					dragStart(e);
-
-					return true;
-				}
-
-				function mouseMove(e) {
-					if (!$el.hasClass('gridster-item-moving') || $el.hasClass('gridster-item-resizing')) {
-						return false;
-					}
-
-					var maxLeft = gridster.curWidth - 1;
-
-					// Get the current mouse position.
-					mouseX = e.pageX;
-					mouseY = e.pageY;
-
-					// Get the deltas
-					var diffX = mouseX - lastMouseX + mOffX;
-					var diffY = mouseY - lastMouseY + mOffY;
-					mOffX = mOffY = 0;
-
-					// Update last processed mouse positions.
-					lastMouseX = mouseX;
-					lastMouseY = mouseY;
-
-					var dX = diffX,
-						dY = diffY;
-					if (elmX + dX < minLeft) {
-						diffX = minLeft - elmX;
-						mOffX = dX - diffX;
-					} else if (elmX + elmW + dX > maxLeft) {
-						diffX = maxLeft - elmX - elmW;
-						mOffX = dX - diffX;
-					}
-
-					if (elmY + dY < minTop) {
-						diffY = minTop - elmY;
-						mOffY = dY - diffY;
-					} else if (elmY + elmH + dY > maxTop) {
-						diffY = maxTop - elmY - elmH;
-						mOffY = dY - diffY;
-					}
-					elmX += diffX;
-					elmY += diffY;
-
-					// set new position
-					$el.css({
-						'top': elmY + 'px',
-						'left': elmX + 'px'
-					});
-
-					drag(e);
-
-					return true;
-				}
-
-				function mouseUp(e) {
-					if (!$el.hasClass('gridster-item-moving') || $el.hasClass('gridster-item-resizing')) {
-						return false;
-					}
-
-					mOffX = mOffY = 0;
-
-					dragStop(e);
-
-					return true;
-				}
-
-				function dragStart(event) {
-					$el.addClass('gridster-item-moving');
-					gridster.movingItem = item;
-
-					gridster.updateHeight(item.sizeY);
-					scope.$apply(function() {
-						if (gridster.draggable && gridster.draggable.start) {
-							gridster.draggable.start(event, $el, itemOptions);
-						}
-					});
-				}
-
-				function drag(event) {
-					var oldRow = item.row,
-						oldCol = item.col,
-						hasCallback = gridster.draggable && gridster.draggable.drag,
-						scrollSensitivity = gridster.draggable.scrollSensitivity,
-						scrollSpeed = gridster.draggable.scrollSpeed;
-                                        
-					var row = gridster.pixelsToRows(elmY);
-					var col = gridster.pixelsToColumns(elmX);
-
-					var itemsInTheWay = gridster.getItems(row, col, item.sizeX, item.sizeY, item);
-					var hasItemsInTheWay = itemsInTheWay.length !== 0;
-                                        
-					if (gridster.swapping === true && hasItemsInTheWay) {
-						var boundingBoxItem = gridster.getBoundingBox(itemsInTheWay),
-							sameSize = boundingBoxItem.sizeX === item.sizeX && boundingBoxItem.sizeY === item.sizeY,
-							sameRow = boundingBoxItem.row === oldRow,
-							sameCol = boundingBoxItem.col === oldCol,
-							samePosition = boundingBoxItem.row === row && boundingBoxItem.col === col,
-							inline = sameRow || sameCol;
-
-						if (sameSize && itemsInTheWay.length === 1) {
-							if (samePosition) {
-								gridster.swapItems(item, itemsInTheWay[0]);
-							} else if (inline) {
-								return;
-							}
-						} else if (boundingBoxItem.sizeX <= item.sizeX && boundingBoxItem.sizeY <= item.sizeY && inline) {
-							var emptyRow = item.row <= row ? item.row : row + item.sizeY,
-								emptyCol = item.col <= col ? item.col : col + item.sizeX,
-								rowOffset = emptyRow - boundingBoxItem.row,
-								colOffset = emptyCol - boundingBoxItem.col;
-
-							for (var i = 0, l = itemsInTheWay.length; i < l; ++i) {
-								var itemInTheWay = itemsInTheWay[i];
-
-								var itemsInFreeSpace = gridster.getItems(
-									itemInTheWay.row + rowOffset,
-									itemInTheWay.col + colOffset,
-									itemInTheWay.sizeX,
-									itemInTheWay.sizeY,
-									item
-								);
-
-								if (itemsInFreeSpace.length === 0) {
-									gridster.putItem(itemInTheWay, itemInTheWay.row + rowOffset, itemInTheWay.col + colOffset);
-								}
-							}
-						}
-					}
-
-					if (gridster.pushing !== false || !hasItemsInTheWay) {
-						item.row = row;
-						item.col = col;
-					}
-                                        
-                                        if(($window.navigator.appName === 'Microsoft Internet Explorer' && !ie8) || $window.navigator.userAgent.indexOf("Firefox")!==-1){
-                                            if (event.pageY - realdocument.documentElement.scrollTop < scrollSensitivity) {
-                                                    realdocument.documentElement.scrollTop = realdocument.documentElement.scrollTop - scrollSpeed;
-                                            } else if ($window.innerHeight - (event.pageY - realdocument.documentElement.scrollTop) < scrollSensitivity) {
-                                                    realdocument.documentElement.scrollTop = realdocument.documentElement.scrollTop + scrollSpeed;
-                                            }
-                                        }
-                                        else{
-                                            if (event.pageY - realdocument.body.scrollTop < scrollSensitivity) {
-                                                    realdocument.body.scrollTop = realdocument.body.scrollTop - scrollSpeed;
-                                            } else if ($window.innerHeight - (event.pageY - realdocument.body.scrollTop) < scrollSensitivity) {
-                                                    realdocument.body.scrollTop = realdocument.body.scrollTop + scrollSpeed;
-                                            }
-                                        }
-                                        
-                                        
-
-					if (event.pageX - realdocument.body.scrollLeft < scrollSensitivity) {
-						realdocument.body.scrollLeft = realdocument.body.scrollLeft - scrollSpeed;
-					} else if ($window.innerWidth - (event.pageX - realdocument.body.scrollLeft) < scrollSensitivity) {
-						realdocument.body.scrollLeft = realdocument.body.scrollLeft + scrollSpeed;
-					}
-
-					if (hasCallback || oldRow !== item.row || oldCol !== item.col) {
-						scope.$apply(function() {
-							if (hasCallback) {
-								gridster.draggable.drag(event, $el, itemOptions);
-							}
-						});
-					}
-				}
-
-				function dragStop(event) {
-					$el.removeClass('gridster-item-moving');
-					var row = gridster.pixelsToRows(elmY);
-					var col = gridster.pixelsToColumns(elmX);
-					if (gridster.pushing !== false || gridster.getItems(row, col, item.sizeX, item.sizeY, item).length === 0) {
-						item.row = row;
-						item.col = col;
-					}
-					gridster.movingItem = null;
-					item.setPosition(item.row, item.col);
-
-					scope.$apply(function() {
-						if (gridster.draggable && gridster.draggable.stop) {
-							gridster.draggable.stop(event, $el, itemOptions);
-						}
-					});
-				}
-
-				var enabled = null;
-				var $dragHandles = null;
-				var unifiedInputs = [];
-
-				this.enable = function() {
-					if (enabled === true) {
-						return;
-					}
-
-					// disable and timeout required for some template rendering
-					$timeout(function() {
-						// disable any existing draghandles
-						for (var u = 0, ul = unifiedInputs.length; u < ul; ++u) {
-							unifiedInputs[u].disable();
-						}
-						unifiedInputs = [];
-
-						if (gridster.draggable && gridster.draggable.handle) {
-							$dragHandles = angular.element($el[0].querySelectorAll(gridster.draggable.handle));
-							if ($dragHandles.length === 0) {
-								// fall back to element if handle not found...
-								$dragHandles = $el;
-							}
-						} else {
-							$dragHandles = $el;
-						}
-
-						for (var h = 0, hl = $dragHandles.length; h < hl; ++h) {
-							unifiedInputs[h] = new GridsterTouch($dragHandles[h], mouseDown, mouseMove, mouseUp);
-							unifiedInputs[h].enable();
-						}
-
-						enabled = true;
-					});
-				};
-
-				this.disable = function() {
-					if (enabled === false) {
-						return;
-					}
-
-					// timeout to avoid race contition with the enable timeout
-					$timeout(function() {
-
-						for (var u = 0, ul = unifiedInputs.length; u < ul; ++u) {
-							unifiedInputs[u].disable();
-						}
-
-						unifiedInputs = [];
-						enabled = false;
-					});
-				};
-
-				this.toggle = function(enabled) {
-					if (enabled) {
-						this.enable();
-					} else {
-						this.disable();
-					}
-				};
-
-				this.destroy = function() {
-					this.disable();
-				};
-			}
-
-			return GridsterDraggable;
-		}
-	])
-
-	.factory('GridsterResizable', ['GridsterTouch', function(GridsterTouch) {
-		function GridsterResizable($el, scope, gridster, item, itemOptions) {
-
-			function ResizeHandle(handleClass) {
-
-				var hClass = handleClass;
-
-				var elmX, elmY, elmW, elmH,
-
-					mouseX = 0,
-					mouseY = 0,
-					lastMouseX = 0,
-					lastMouseY = 0,
-					mOffX = 0,
-					mOffY = 0,
-
-					minTop = 0,
-					maxTop = 9999,
-					minLeft = 0;
-
-				var getMinHeight = function() {
-					return (item.minSizeY ? item.minSizeY : 1) * gridster.curRowHeight - gridster.margins[0];
-				};
-				var getMinWidth = function() {
-					return (item.minSizeX ? item.minSizeX : 1) * gridster.curColWidth - gridster.margins[1];
-				};
-
-				var originalWidth, originalHeight;
-				var savedDraggable;
-
-				function mouseDown(e) {
-					switch (e.which) {
-						case 1:
-							// left mouse button
-							break;
-						case 2:
-						case 3:
-							// right or middle mouse button
-							return;
-					}
-
-					// save the draggable setting to restore after resize
-					savedDraggable = gridster.draggable.enabled;
-					if (savedDraggable) {
-						gridster.draggable.enabled = false;
-						scope.$broadcast('gridster-draggable-changed', gridster);
-					}
-
-					// Get the current mouse position.
-					lastMouseX = e.pageX;
-					lastMouseY = e.pageY;
-
-					// Record current widget dimensions
-					elmX = parseInt($el.css('left'), 10);
-					elmY = parseInt($el.css('top'), 10);
-					elmW = $el[0].offsetWidth;
-					elmH = $el[0].offsetHeight;
-
-					originalWidth = item.sizeX;
-					originalHeight = item.sizeY;
-
-					resizeStart(e);
-
-					return true;
-				}
-
-				function resizeStart(e) {
-					$el.addClass('gridster-item-moving');
-					$el.addClass('gridster-item-resizing');
-
-					gridster.movingItem = item;
-
-					item.setElementSizeX();
-					item.setElementSizeY();
-					item.setElementPosition();
-					gridster.updateHeight(1);
-
-					scope.$apply(function() {
-						// callback
-						if (gridster.resizable && gridster.resizable.start) {
-							gridster.resizable.start(e, $el, itemOptions); // options is the item model
-						}
-					});
-				}
-
-				function mouseMove(e) {
-					var maxLeft = gridster.curWidth - 1;
-
-					// Get the current mouse position.
-					mouseX = e.pageX;
-					mouseY = e.pageY;
-
-					// Get the deltas
-					var diffX = mouseX - lastMouseX + mOffX;
-					var diffY = mouseY - lastMouseY + mOffY;
-					mOffX = mOffY = 0;
-
-					// Update last processed mouse positions.
-					lastMouseX = mouseX;
-					lastMouseY = mouseY;
-
-					var dY = diffY,
-						dX = diffX;
-
-					if (hClass.indexOf('n') >= 0) {
-						if (elmH - dY < getMinHeight()) {
-							diffY = elmH - getMinHeight();
-							mOffY = dY - diffY;
-						} else if (elmY + dY < minTop) {
-							diffY = minTop - elmY;
-							mOffY = dY - diffY;
-						}
-						elmY += diffY;
-						elmH -= diffY;
-					}
-					if (hClass.indexOf('s') >= 0) {
-						if (elmH + dY < getMinHeight()) {
-							diffY = getMinHeight() - elmH;
-							mOffY = dY - diffY;
-						} else if (elmY + elmH + dY > maxTop) {
-							diffY = maxTop - elmY - elmH;
-							mOffY = dY - diffY;
-						}
-						elmH += diffY;
-					}
-					if (hClass.indexOf('w') >= 0) {
-						if (elmW - dX < getMinWidth()) {
-							diffX = elmW - getMinWidth();
-							mOffX = dX - diffX;
-						} else if (elmX + dX < minLeft) {
-							diffX = minLeft - elmX;
-							mOffX = dX - diffX;
-						}
-						elmX += diffX;
-						elmW -= diffX;
-					}
-					if (hClass.indexOf('e') >= 0) {
-						if (elmW + dX < getMinWidth()) {
-							diffX = getMinWidth() - elmW;
-							mOffX = dX - diffX;
-						} else if (elmX + elmW + dX > maxLeft) {
-							diffX = maxLeft - elmX - elmW;
-							mOffX = dX - diffX;
-						}
-						elmW += diffX;
-					}
-
-					// set new position
-					$el.css({
-						'top': elmY + 'px',
-						'left': elmX + 'px',
-						'width': elmW + 'px',
-						'height': elmH + 'px'
-					});
-
-					resize(e);
-
-					return true;
-				}
-
-				function mouseUp(e) {
-					// restore draggable setting to its original state
-					if (gridster.draggable.enabled !== savedDraggable) {
-						gridster.draggable.enabled = savedDraggable;
-						scope.$broadcast('gridster-draggable-changed', gridster);
-					}
-
-					mOffX = mOffY = 0;
-
-					resizeStop(e);
-
-					return true;
-				}
-
-				function resize(e) {
-					var oldRow = item.row,
-						oldCol = item.col,
-						oldSizeX = item.sizeX,
-						oldSizeY = item.sizeY,
-						hasCallback = gridster.resizable && gridster.resizable.resize;
-
-					var col = item.col;
-					// only change column if grabbing left edge
-					if (['w', 'nw', 'sw'].indexOf(handleClass) !== -1) {
-						col = gridster.pixelsToColumns(elmX, false);
-					}
-
-					var row = item.row;
-					// only change row if grabbing top edge
-					if (['n', 'ne', 'nw'].indexOf(handleClass) !== -1) {
-						row = gridster.pixelsToRows(elmY, false);
-					}
-
-					var sizeX = item.sizeX;
-					// only change row if grabbing left or right edge
-					if (['n', 's'].indexOf(handleClass) === -1) {
-						sizeX = gridster.pixelsToColumns(elmW, true);
-					}
-
-					var sizeY = item.sizeY;
-					// only change row if grabbing top or bottom edge
-					if (['e', 'w'].indexOf(handleClass) === -1) {
-						sizeY = gridster.pixelsToRows(elmH, true);
-					}
-
-					if (gridster.pushing !== false || gridster.getItems(row, col, sizeX, sizeY, item).length === 0) {
-						item.row = row;
-						item.col = col;
-						item.sizeX = sizeX;
-						item.sizeY = sizeY;
-					}
-					var isChanged = item.row !== oldRow || item.col !== oldCol || item.sizeX !== oldSizeX || item.sizeY !== oldSizeY;
-
-					if (hasCallback || isChanged) {
-						scope.$apply(function() {
-							if (hasCallback) {
-								gridster.resizable.resize(e, $el, itemOptions); // options is the item model
-							}
-						});
-					}
-				}
-
-				function resizeStop(e) {
-					$el.removeClass('gridster-item-moving');
-					$el.removeClass('gridster-item-resizing');
-
-					gridster.movingItem = null;
-
-					item.setPosition(item.row, item.col);
-					item.setSizeY(item.sizeY);
-					item.setSizeX(item.sizeX);
-
-					scope.$apply(function() {
-						if (gridster.resizable && gridster.resizable.stop) {
-							gridster.resizable.stop(e, $el, itemOptions); // options is the item model
-						}
-					});
-				}
-
-				var $dragHandle = null;
-				var unifiedInput;
-
-				this.enable = function() {
-					if (!$dragHandle) {
-						$dragHandle = angular.element('
      ');
-						$el.append($dragHandle);
-					}
-
-					unifiedInput = new GridsterTouch($dragHandle[0], mouseDown, mouseMove, mouseUp);
-					unifiedInput.enable();
-				};
-
-				this.disable = function() {
-					if ($dragHandle) {
-						$dragHandle.remove();
-						$dragHandle = null;
-					}
-
-					unifiedInput.disable();
-					unifiedInput = undefined;
-				};
-
-				this.destroy = function() {
-					this.disable();
-				};
-			}
-
-			var handles = [];
-			var handlesOpts = gridster.resizable.handles;
-			if (typeof handlesOpts === 'string') {
-				handlesOpts = gridster.resizable.handles.split(',');
-			}
-			var enabled = false;
-
-			for (var c = 0, l = handlesOpts.length; c < l; c++) {
-				handles.push(new ResizeHandle(handlesOpts[c]));
-			}
-
-			this.enable = function() {
-				if (enabled) {
-					return;
-				}
-				for (var c = 0, l = handles.length; c < l; c++) {
-					handles[c].enable();
-				}
-				enabled = true;
-			};
-
-			this.disable = function() {
-				if (!enabled) {
-					return;
-				}
-				for (var c = 0, l = handles.length; c < l; c++) {
-					handles[c].disable();
-				}
-				enabled = false;
-			};
-
-			this.toggle = function(enabled) {
-				if (enabled) {
-					this.enable();
-				} else {
-					this.disable();
-				}
-			};
-
-			this.destroy = function() {
-				for (var c = 0, l = handles.length; c < l; c++) {
-					handles[c].destroy();
-				}
-			};
-		}
-		return GridsterResizable;
-	}])
-
-	.factory('gridsterDebounce', function() {
-		return function gridsterDebounce(func, wait, immediate) {
-			var timeout;
-			return function() {
-				var context = this,
-					args = arguments;
-				var later = function() {
-					timeout = null;
-					if (!immediate) {
-						func.apply(context, args);
-					}
-				};
-				var callNow = immediate && !timeout;
-				clearTimeout(timeout);
-				timeout = setTimeout(later, wait);
-				if (callNow) {
-					func.apply(context, args);
-				}
-			};
-		};
-	})
-
-	/**
-	 * GridsterItem directive
-	 * @param $parse
-	 * @param GridsterDraggable
-	 * @param GridsterResizable
-	 * @param gridsterDebounce
-	 */
-	.directive('gridsterItem', ['$parse', 'GridsterDraggable', 'GridsterResizable', 'gridsterDebounce',
-		function($parse, GridsterDraggable, GridsterResizable, gridsterDebounce) {
-			return {
-				scope: true,
-				restrict: 'EA',
-				controller: 'GridsterItemCtrl',
-				controllerAs: 'gridsterItem',
-				require: ['^gridster', 'gridsterItem'],
-				link: function(scope, $el, attrs, controllers) {
-					var optionsKey = attrs.gridsterItem,
-						options;
-                                        
-                                        var gridster = controllers[0],
-						item = controllers[1];
-
-					scope.gridster = gridster;
-                                        
-
-					// bind the item's position properties
-					// options can be an object specified by gridster-item="object"
-					// or the options can be the element html attributes object
-					if (optionsKey) {
-						var $optionsGetter = $parse(optionsKey);
-						options = $optionsGetter(scope) || {};
-						if (!options && $optionsGetter.assign) {
-							options = {
-								row: item.row,
-								col: item.col,
-								sizeX: item.sizeX,
-								sizeY: item.sizeY,
-								minSizeX: 0,
-								minSizeY: 0,
-								maxSizeX: null,
-								maxSizeY: null
-							};
-							$optionsGetter.assign(scope, options);
-						}
-					} else {
-						options = attrs;
-					}
-                                        
-					item.init($el, gridster);
-
-					$el.addClass('gridster-item');
-
-					var aspects = ['minSizeX', 'maxSizeX', 'minSizeY', 'maxSizeY', 'sizeX', 'sizeY', 'row', 'col'],
-						$getters = {};
-
-					var expressions = [];
-					var aspectFn = function(aspect) {
-						var expression;
-						if (typeof options[aspect] === 'string') {
-							// watch the expression in the scope
-							expression = options[aspect];
-						} else if (typeof options[aspect.toLowerCase()] === 'string') {
-							// watch the expression in the scope
-							expression = options[aspect.toLowerCase()];
-						} else if (optionsKey) {
-							// watch the expression on the options object in the scope
-							expression = optionsKey + '.' + aspect;
-						} else {
-							return;
-						}
-						expressions.push('"' + aspect + '":' + expression);
-						$getters[aspect] = $parse(expression);
-
-						// initial set
-						var val = $getters[aspect](scope);
-						if (typeof val === 'number') {
-							item[aspect] = val;
-						}
-					};
-
-					for (var i = 0, l = aspects.length; i < l; ++i) {
-						aspectFn(aspects[i]);
-					}
-
-					var watchExpressions = '{' + expressions.join(',') + '}';
-                                        
-					// when the value changes externally, update the internal item object
-					scope.$watchCollection(watchExpressions, function(newVals, oldVals) {
-						for (var aspect in newVals) {
-							var newVal = newVals[aspect];
-							var oldVal = oldVals[aspect];
-							if (oldVal === newVal) {
-								continue;
-							}
-							newVal = parseInt(newVal, 10);
-							if (!isNaN(newVal)) {
-								item[aspect] = newVal;
-							}
-						}
-					});
-
-					function positionChanged() {
-						// call setPosition so the element and gridster controller are updated
-						item.setPosition(item.row, item.col);
-
-						// when internal item position changes, update externally bound values
-						if ($getters.row && $getters.row.assign) {
-							$getters.row.assign(scope, item.row);
-						}
-						if ($getters.col && $getters.col.assign) {
-							$getters.col.assign(scope, item.col);
-						}
-					}
-					scope.$watch(function() {
-						return item.row + ',' + item.col;
-					}, positionChanged);
-
-					function sizeChanged() {
-						var changedX = item.setSizeX(item.sizeX, true);
-						if (changedX && $getters.sizeX && $getters.sizeX.assign) {
-							$getters.sizeX.assign(scope, item.sizeX);
-						}
-						var changedY = item.setSizeY(item.sizeY, true);
-						if (changedY && $getters.sizeY && $getters.sizeY.assign) {
-							$getters.sizeY.assign(scope, item.sizeY);
-						}
-
-						if (changedX || changedY) {
-							item.gridster.moveOverlappingItems(item);
-							gridster.layoutChanged();
-							scope.$broadcast('gridster-item-resized', item);
-						}
-					}
-
-					scope.$watch(function() {
-						return item.sizeY + ',' + item.sizeX + ',' + item.minSizeX + ',' + item.maxSizeX + ',' + item.minSizeY + ',' + item.maxSizeY;
-					}, sizeChanged);
-
-					var draggable = new GridsterDraggable($el, scope, gridster, item, options);
-					var resizable = new GridsterResizable($el, scope, gridster, item, options);
-
-					var updateResizable = function() {
-						resizable.toggle(!gridster.isMobile && gridster.resizable && gridster.resizable.enabled);
-					};
-					updateResizable();
-
-					var updateDraggable = function() {
-						draggable.toggle(!gridster.isMobile && gridster.draggable && gridster.draggable.enabled);
-					};
-					updateDraggable();
-
-					scope.$on('gridster-draggable-changed', updateDraggable);
-					scope.$on('gridster-resizable-changed', updateResizable);
-					scope.$on('gridster-resized', updateResizable);
-					scope.$on('gridster-mobile-changed', function() {
-						updateResizable();
-						updateDraggable();
-					});
-
-					function whichTransitionEvent() {
-						var el = document.createElement('div');
-						var transitions = {
-							'transition': 'transitionend',
-							'OTransition': 'oTransitionEnd',
-							'MozTransition': 'transitionend',
-							'WebkitTransition': 'webkitTransitionEnd'
-						};
-						for (var t in transitions) {
-                                                        if (el.style[t] !== undefined) {
-								return transitions[t];
-							}
-						}
-					}
-
-					var debouncedTransitionEndPublisher = gridsterDebounce(function() {
-						scope.$apply(function() {
-							scope.$broadcast('gridster-item-transition-end', item);
-						});
-					}, 50);
-
-					if(whichTransitionEvent()){ //check for IE8, as it evaluates to null
-                                            $el.on(whichTransitionEvent(), debouncedTransitionEndPublisher);
-                                        }
-
-					scope.$broadcast('gridster-item-initialized', item);
-
-					return scope.$on('$destroy', function() {
-						try {
-							resizable.destroy();
-							draggable.destroy();
-						} catch (e) {}
-
-						try {
-							gridster.removeItem(item);
-						} catch (e) {}
-
-						try {
-							item.destroy();
-						} catch (e) {}
-					});
-				}
-			};
-		}
-	])
-
-	.directive('gridsterNoDrag', function() {
-		return {
-			restrict: 'A',
-			link: function(scope, $element) {
-				$element.addClass('gridster-no-drag');
-			}
-		};
-	})
-
-	;
-
-}));
diff --git a/vid/src/main/webapp/static/fusion/js/att_angular_gridster/ui-gridster-tpls.js b/vid/src/main/webapp/static/fusion/js/att_angular_gridster/ui-gridster-tpls.js
deleted file mode 100644
index 3ca3db7d8..000000000
--- a/vid/src/main/webapp/static/fusion/js/att_angular_gridster/ui-gridster-tpls.js
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
-* FileName ui-gridster
-* Version 0.0.1
-* Build number ad58c6f4f8f8fd7f04ac457f95d76f09
-* Date 08/17/2015
-*/
-
-
-(function(angular, window){
-angular.module("att.gridster", ["att.gridster.tpls", "att.gridster.utilities","att.gridster.gridster"]);
-angular.module("att.gridster.tpls", ["template/gridster/gridster.html","template/gridster/gridsterItem.html","template/gridster/gridsterItemBody.html","template/gridster/gridsterItemFooter.html","template/gridster/gridsterItemHeader.html"]);
-angular.module('att.gridster.utilities', [])
-        .factory('$extendObj', [function() {
-                var _extendDeep = function(dst) {
-                    angular.forEach(arguments, function(obj) {
-                        if (obj !== dst) {
-                            angular.forEach(obj, function(value, key) {
-                                if (dst[key] && dst[key].constructor && dst[key].constructor === Object) {
-                                    _extendDeep(dst[key], value);
-                                } else {
-                                    dst[key] = value;
-                                }
-                            });
-                        }
-                    });
-                    return dst;
-                };
-                return {
-                    extendDeep: _extendDeep
-                };
-            }]);
-
-angular.module('att.gridster.gridster', ['attGridsterLib', 'att.gridster.utilities'])
-        .config(['$compileProvider', function($compileProvider) {
-                $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|javascript):/);
-            }])
-        .constant('attGridsterConfig',
-                {
-                    columns: 3,
-                    margins: [10, 10],
-                    outerMargin: true,
-                    pushing: true,
-                    floating: true,
-                    swapping: true,
-                    draggable: {
-                        enabled: true
-                    }
-                })
-        .directive('attGridster', ['attGridsterConfig', '$extendObj', function(attGridsterConfig, $extendObj) {
-                return {
-                    restrict: 'EA',
-                    scope: {
-                        attGridsterOptions: '=?'
-                    },
-                    templateUrl: 'template/gridster/gridster.html',
-                    replace: false,
-                    transclude: true,
-                    controller: [function() {}],
-                    link: function(scope) {
-                        if (angular.isDefined(scope.attGridsterOptions)) {
-                            attGridsterConfig = $extendObj.extendDeep(attGridsterConfig, scope.attGridsterOptions);
-                        }
-                        scope.attGridsterConfig = attGridsterConfig;
-                    }
-                };
-            }])
-        .directive('attGridsterItem', ['$timeout', function($timeout) {
-                return {
-                    restrict: 'EA',
-                    require: ['^attGridster'],
-                    scope: {
-                        attGridsterItem: '='
-                    },
-                    templateUrl: 'template/gridster/gridsterItem.html',
-                    replace: false,
-                    transclude: true,
-                    controller: [function() {}]
-                };
-            }])
-        .directive('attGridsterItemHeader', [function() {
-                return {
-                    restrict: 'EA',
-                    require: ['^attGridsterItem'],
-                    scope: {
-                        headerText: '@',
-                        subHeaderText: '@?'
-                    },
-                    templateUrl: 'template/gridster/gridsterItemHeader.html',
-                    replace: true,
-                    transclude: true,
-                    link: function(scope, element) {
-                        if (angular.isDefined(scope.subHeaderText) && scope.subHeaderText) {
-                            angular.element(element[0].querySelector('span.gridster-item-sub-header-content')).attr("tabindex", "0");
-                            angular.element(element[0].querySelector('span.gridster-item-sub-header-content')).attr("aria-label", scope.subHeaderText);
-                        }
-                    }
-                };
-            }])
-        .directive('attGridsterItemBody', [function() {
-                return {
-                    restrict: 'EA',
-                    require: ['^attGridsterItem'],
-                    scope: {},
-                    templateUrl: 'template/gridster/gridsterItemBody.html',
-                    replace: true,
-                    transclude: true
-                };
-            }])
-        .directive('attGridsterItemFooter', ['$location', function($location) {
-                return {
-                    restrict: 'EA',
-                    require: ['^attGridsterItem'],
-                    scope: {
-                        attGridsterItemFooterLink: '@?'
-                    },
-                    templateUrl: 'template/gridster/gridsterItemFooter.html',
-                    replace: true,
-                    transclude: true,
-                    controller: ['$scope', function($scope) {
-                            $scope.clickOnFooterLink = function(evt) {
-                                evt.preventDefault();
-                                evt.stopPropagation();
-                                if ($scope.attGridsterItemFooterLink) {
-                                    $location.url($scope.attGridsterItemFooterLink);
-                                }
-                            };
-                        }],
-                    link: function(scope, element) {
-                        if (angular.isDefined(scope.attGridsterItemFooterLink) && scope.attGridsterItemFooterLink) {
-                            element.attr("role", "link");
-                        }
-                    }
-                };
-            }]);
-angular.module("template/gridster/gridster.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/gridster/gridster.html",
-    "
      ");
-}]);
-
-angular.module("template/gridster/gridsterItem.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/gridster/gridsterItem.html",
-    "
      ");
-}]);
-
-angular.module("template/gridster/gridsterItemBody.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/gridster/gridsterItemBody.html",
-    "
      ");
-}]);
-
-angular.module("template/gridster/gridsterItemFooter.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/gridster/gridsterItemFooter.html",
-    "
      \n" +
-    "    \n" +
-    "
      ");
-}]);
-
-angular.module("template/gridster/gridsterItemHeader.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("template/gridster/gridsterItemHeader.html",
-    "
      \n" +
-    "    \"||\"\n" +
-    "    {{headerText}}\n" +
-    "    {{subHeaderText}}\n" +
-    "    
      \n" +
-    "
      ");
-}]);
-
-return {}
-})(angular, window);
\ No newline at end of file
diff --git a/vid/src/main/webapp/static/fusion/js/jquery.resize.js b/vid/src/main/webapp/static/fusion/js/jquery.resize.js
deleted file mode 100644
index 1ebd6c95b..000000000
--- a/vid/src/main/webapp/static/fusion/js/jquery.resize.js
+++ /dev/null
@@ -1,139 +0,0 @@
-/*!
- * jquery.resize.js 0.0.1 - https://github.com/yckart/jquery.resize.js
- * Resize-event for DOM-Nodes
- *
- * @see http://workingdraft.de/113/
- * @see http://www.backalleycoder.com/2013/03/18/cross-browser-event-based-element-resize-detection/
- *
- * Copyright (c) 2013 Yannick Albert (http://yckart.com)
- * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php).
- * 2013/04/01
- */
-
-(function(factory) {
-    if(typeof define === 'function' && define.amd) {
-        // AMD. Register as an anonymous module.
-        define(['jquery'], factory);
-    } else if(typeof exports === 'object') {
-        // Node/CommonJS style for Browserify
-        module.exports = factory;
-    } else {
-        // Browser globals
-        factory(jQuery);
-    }
-}(function($) {
-
-    function addFlowListener(element, type, fn) {
-        var flow = type == 'over';
-        element.addEventListener('OverflowEvent' in window ? 'overflowchanged' : type + 'flow', function(e) {
-            if(e.type == (type + 'flow') || ((e.orient == 0 && e.horizontalOverflow == flow) || (e.orient == 1 && e.verticalOverflow == flow) || (e.orient == 2 && e.horizontalOverflow == flow && e.verticalOverflow == flow))) {
-                e.flow = type;
-                return fn.call(this, e);
-            }
-        }, false);
-    };
-
-    function fireEvent(element, type, data, options) {
-        var options = options || {},
-            event = document.createEvent('Event');
-        event.initEvent(type, 'bubbles' in options ? options.bubbles : true, 'cancelable' in options ? options.cancelable : true);
-        for(var z in data) event[z] = data[z];
-        element.dispatchEvent(event);
-    };
-
-    $.event.special.resize = {
-        setup: function() {
-            var element = this;
-            var resize = 'onresize' in element;
-            if(!resize && !element._resizeSensor) {
-                var sensor = element._resizeSensor = document.createElement('div');
-                sensor.className = 'resize-sensor';
-                sensor.innerHTML = '
      ';
-
-                var x = 0,
-                    y = 0,
-                    first = sensor.firstElementChild.firstChild,
-                    last = sensor.lastElementChild.firstChild,
-                    matchFlow = function(event) {
-                        var change = false,
-                            width = element.offsetWidth;
-                        if(x != width) {
-                            first.style.width = width - 1 + 'px';
-                            last.style.width = width + 1 + 'px';
-                            change = true;
-                            x = width;
-                        }
-                        var height = element.offsetHeight;
-                        if(y != height) {
-                            first.style.height = height - 1 + 'px';
-                            last.style.height = height + 1 + 'px';
-                            change = true;
-                            y = height;
-                        }
-                        if(change && event.currentTarget != element) fireEvent(element, 'resize');
-                    };
-
-                if(getComputedStyle(element).position == 'static') {
-                    element.style.position = 'relative';
-                    element._resizeSensor._resetPosition = true;
-                }
-                addFlowListener(sensor, 'over', matchFlow);
-                addFlowListener(sensor, 'under', matchFlow);
-                addFlowListener(sensor.firstElementChild, 'over', matchFlow);
-                addFlowListener(sensor.lastElementChild, 'under', matchFlow);
-                element.appendChild(sensor);
-                matchFlow({});
-            }
-            var events = element._flowEvents || (element._flowEvents = []);
-            if(events.indexOf(handler) == -1) events.push(handler);
-            if(!resize) element.addEventListener('resize', handler, false);
-            element.onresize = function(e) {
-                events.forEach(function(fn) {
-                    fn.call(element, e);
-                });
-            };
-        },
-
-        teardown: function() {
-            var element = this;
-            var index = element._flowEvents.indexOf(handler);
-            if(index > -1) element._flowEvents.splice(index, 1);
-            if(!element._flowEvents.length) {
-                var sensor = element._resizeSensor;
-                if(sensor) {
-                    element.removeChild(sensor);
-                    if(sensor._resetPosition) element.style.position = 'static';
-                    delete element._resizeSensor;
-                }
-                if('onresize' in element) element.onresize = null;
-                delete element._flowEvents;
-            }
-            element.removeEventListener('resize', handler);
-        }
-    };
-
-    $.fn.extend({
-        resize: function(fn) {
-            return fn ? this.bind("resize", fn) : this.trigger("resize");
-        },
-
-        unresize: function(fn) {
-            return this.unbind("resize", fn);
-        }
-    });
-
-
-    function handler(event) {
-        var orgEvent = event || window.event,
-            args = [].slice.call(arguments, 1);
-
-        event = $.event.fix(orgEvent);
-        event.type = "resize";
-
-        // Add event to the front of the arguments
-        args.unshift(event);
-
-        return($.event.dispatch || $.event.handle).apply(this, args);
-    }
-
-}));
\ No newline at end of file
diff --git a/vid/src/main/webapp/static/fusion/js/layout/debug.js b/vid/src/main/webapp/static/fusion/js/layout/debug.js
deleted file mode 100644
index eff36a250..000000000
--- a/vid/src/main/webapp/static/fusion/js/layout/debug.js
+++ /dev/null
@@ -1,329 +0,0 @@
-/**
- *	debugData
- *
- *	Pass me a data structure {} and I'll output all the key/value pairs - recursively
- *
- *	@example var HTML = debugData( oElem.style, "Element.style", { keys: "top,left,width,height", recurse: true, sort: true, display: true, returnHTML: true });	
- *
- *	@param Object	o_Data   A JSON-style data structure
- *	@param String	s_Title  Title for dialog (optional)
- *	@param Hash	options  Pass additional options in a hash
- */
-function debugData (o_Data, s_Title, options) {
-	options = options || {};
-	var
-		str=(s_Title||s_Title==='' ? s_Title : 'DATA')
-	,	dType=$.type(o_Data)
-	//	maintain backward compatibility with OLD 'recurseData' param
-	,	recurse=($.type(options)==='boolean' ? options : options.recurse !==false)
-	,	keys=(options.keys?','+options.keys+',':false)
-	,	display=options.display !==false
-	,	html=options.returnHTML !==false
-	,	sort=!!options.sort
-	,	prefix=options.indent ? '    ' : ''
-	,	D=[], i=0 // Array to hold data, i=counter
-	,	hasSubKeys = false
-	,	k, t, skip, x, type	// loop vars
-	;
-	if (dType!=='object' && dType!=='array') {
-		if (options.display) alert( (s_Title || 'debugData') +': '+ o_Data );
-		return o_Data;
-	}
-	if (dType==='object' && $.isPlainObject(o_Data))
-		dType='hash';
-
-	if (o_Data.jquery) {
-		str=s_Title+'jQuery Collection ('+ o_Data.length +')\n    context="'+ o_Data.context +'"';
-	}
-	else if (o_Data.nodeName) {
-		str=s_Title+o_Data.tagName;
-		var id = o_Data.id, cls=o_Data.className, src=o_Data.src, hrf=o_Data.href;
-		if (id)  str+='\n    id="'+		id+'"';
-		if (cls) str+='\n    class="'+	cls+'"';
-		if (src) str+='\n    src="'+	src+'"';
-		if (hrf) str+='\n    href="'+	hrf+'"';
-	}
-	else {
-		parse(o_Data,prefix,dType); // recursive parsing
-		if (sort && !hasSubKeys) D.sort(); // sort by keyName - but NOT if has subKeys!
-		if (str) str += '\n***'+ '****************************'.substr(0,str.length) +'\n';
-		str += D.join('\n'); // add line-breaks
-	}
-
-	if (display) alert(str); // display data
-	if (html) str=str.replace(/\n/g, ' 
      ').replace(/  /g, '  '); // format as HTML
-	return str;
-
-	function parse ( data, prefix, parentType ) {
-		var first = true;
-		try {
-			$.each( data, function (key, val) {
-				skip = (keys && keys.indexOf(','+key+',') === -1);
-				type = $.type(val);
-				if (type==='object' && $.isPlainObject(val))
-					type = 'hash';
-				k = prefix + (first ? '    ' : ',   ');
-				first = false;
-
-				if (parentType!=='array') // no key-names for array items
-					k += key+':  '; // NOT an array
-
-				if (type==="date" || type==="regexp") {
-					val  = val.toString();
-					type = "string";
-				}
-				if (type==="string") {				// STRING
-					if (!skip) D[i++] = k +'"'+ val +'"';
-				}
-													// NULL, UNDEFINED, NUMBER or BOOLEAN
-				else if (/^(null|undefined|number|boolean)/.test(type)) {
-					if (!skip) D[i++] = k + val;
-				}
-				else if (type==="function") {		// FUNCTION
-					if (!skip) D[i++] = k +'function()';
-				}
-				else if (type==="array") {			// ARRAY
-					if (!skip) {
-						D[i++] = k +'[';
-						parse( val, prefix+'    ',type); // RECURSE
-						D[i++] = prefix +'    ]';
-					}
-				}
-				else if (val.jquery) {				// JQUERY OBJECT
-					if (!skip) D[i++] = k +'jQuery ('+ val.length +') context="'+ val.context +'"';
-				}
-				else if (val.nodeName) {			// DOM ELEMENT
-					var id = val.id, cls=val.className, src=val.src, hrf=val.href;
-					if (skip) D[i++] = k +' '+
-						id  ? 'id="'+	id+'"' :
-						src ? 'src="'+	src+'"' :
-						hrf ? 'href="'+	hrf+'"' :
-						cls ? 'class="'+cls+'"' :
-						'';
-				}
-				else if (type==="hash") {			// JSON
-					if (!recurse || $.isEmptyObject(val)) { // show an empty hash
-						if (!skip) D[i++] = k +'{ }';
-					}
-					else { // recurse into JSON hash - indent output
-						D[i++] = k +'{';
-						parse( val, prefix+'    ',type); // RECURSE
-						D[i++] = prefix +'    }';
-					}
-				}
-				else {								// OBJECT
-					if (!skip) D[i++] = k +'OBJECT'; // NOT a hash
-				}
-			});
-		} catch (e) {}
-	}
-};
-
-function debugStackTrace (s_Title, options) {
-	var
-		callstack = []
-	,	isCallstackPopulated = false
-	;
-	try {
-		i.dont.exist += 0; // doesn't exist- that's the point
-	} catch(e) {
-		if (e.stack) { // Firefox
-			var lines = e.stack.split('\n');
-			for (var i=0, len=lines.length; i
      ')
-		.html( content.replace(/\n/g, '
      ').replace(/  /g, '  ') ) // format as HTML
-		.css( options.css )
-		;
-};
diff --git a/vid/src/main/webapp/static/fusion/js/layout/jquery-latest.js b/vid/src/main/webapp/static/fusion/js/layout/jquery-latest.js
deleted file mode 100644
index 1c998babc..000000000
--- a/vid/src/main/webapp/static/fusion/js/layout/jquery-latest.js
+++ /dev/null
@@ -1,9555 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.9.0
- * http://jquery.com/
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- *
- * Copyright 2005, 2012 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2013-1-14
- */
-(function( window, undefined ) {
-"use strict";
-var
-	// A central reference to the root jQuery(document)
-	rootjQuery,
-
-	// The deferred used on DOM ready
-	readyList,
-
-	// Use the correct document accordingly with window argument (sandbox)
-	document = window.document,
-	location = window.location,
-
-	// Map over jQuery in case of overwrite
-	_jQuery = window.jQuery,
-
-	// Map over the $ in case of overwrite
-	_$ = window.$,
-
-	// [[Class]] -> type pairs
-	class2type = {},
-
-	// List of deleted data cache ids, so we can reuse them
-	core_deletedIds = [],
-
-	core_version = "1.9.0",
-
-	// Save a reference to some core methods
-	core_concat = core_deletedIds.concat,
-	core_push = core_deletedIds.push,
-	core_slice = core_deletedIds.slice,
-	core_indexOf = core_deletedIds.indexOf,
-	core_toString = class2type.toString,
-	core_hasOwn = class2type.hasOwnProperty,
-	core_trim = core_version.trim,
-
-	// Define a local copy of jQuery
-	jQuery = function( selector, context ) {
-		// The jQuery object is actually just the init constructor 'enhanced'
-		return new jQuery.fn.init( selector, context, rootjQuery );
-	},
-
-	// Used for matching numbers
-	core_pnum = /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,
-
-	// Used for splitting on whitespace
-	core_rnotwhite = /\S+/g,
-
-	// Make sure we trim BOM and NBSP (here's looking at you, Safari 5.0 and IE)
-	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
-
-	// A simple way to check for HTML strings
-	// Prioritize #id over  to avoid XSS via location.hash (#9521)
-	// Strict HTML recognition (#11290: must start with <)
-	rquickExpr = /^(?:(<[\w\W]+>)[^>]*|#([\w-]*))$/,
-
-	// Match a standalone tag
-	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>|)$/,
-
-	// JSON RegExp
-	rvalidchars = /^[\],:{}\s]*$/,
-	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
-	rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,
-	rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,
-
-	// Matches dashed string for camelizing
-	rmsPrefix = /^-ms-/,
-	rdashAlpha = /-([\da-z])/gi,
-
-	// Used by jQuery.camelCase as callback to replace()
-	fcamelCase = function( all, letter ) {
-		return letter.toUpperCase();
-	},
-
-	// The ready event handler and self cleanup method
-	DOMContentLoaded = function() {
-		if ( document.addEventListener ) {
-			document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-			jQuery.ready();
-		} else if ( document.readyState === "complete" ) {
-			// we're here because readyState === "complete" in oldIE
-			// which is good enough for us to call the dom ready!
-			document.detachEvent( "onreadystatechange", DOMContentLoaded );
-			jQuery.ready();
-		}
-	};
-
-jQuery.fn = jQuery.prototype = {
-	// The current version of jQuery being used
-	jquery: core_version,
-
-	constructor: jQuery,
-	init: function( selector, context, rootjQuery ) {
-		var match, elem;
-
-		// HANDLE: $(""), $(null), $(undefined), $(false)
-		if ( !selector ) {
-			return this;
-		}
-
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
-				// Assume that strings that start and end with <> are HTML and skip the regex check
-				match = [ null, selector, null ];
-
-			} else {
-				match = rquickExpr.exec( selector );
-			}
-
-			// Match html or make sure no context is specified for #id
-			if ( match && (match[1] || !context) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] ) {
-					context = context instanceof jQuery ? context[0] : context;
-
-					// scripts is true for back-compat
-					jQuery.merge( this, jQuery.parseHTML(
-						match[1],
-						context && context.nodeType ? context.ownerDocument || context : document,
-						true
-					) );
-
-					// HANDLE: $(html, props)
-					if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
-						for ( match in context ) {
-							// Properties of context are called as methods if possible
-							if ( jQuery.isFunction( this[ match ] ) ) {
-								this[ match ]( context[ match ] );
-
-							// ...and otherwise set as attributes
-							} else {
-								this.attr( match, context[ match ] );
-							}
-						}
-					}
-
-					return this;
-
-				// HANDLE: $(#id)
-				} else {
-					elem = document.getElementById( match[2] );
-
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE and Opera return items
-						// by name instead of ID
-						if ( elem.id !== match[2] ) {
-							return rootjQuery.find( selector );
-						}
-
-						// Otherwise, we inject the element directly into the jQuery object
-						this.length = 1;
-						this[0] = elem;
-					}
-
-					this.context = document;
-					this.selector = selector;
-					return this;
-				}
-
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return ( context || rootjQuery ).find( selector );
-
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return this.constructor( context ).find( selector );
-			}
-
-		// HANDLE: $(DOMElement)
-		} else if ( selector.nodeType ) {
-			this.context = this[0] = selector;
-			this.length = 1;
-			return this;
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return rootjQuery.ready( selector );
-		}
-
-		if ( selector.selector !== undefined ) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
-		return jQuery.makeArray( selector, this );
-	},
-
-	// Start with an empty selector
-	selector: "",
-
-	// The default length of a jQuery object is 0
-	length: 0,
-
-	// The number of elements contained in the matched element set
-	size: function() {
-		return this.length;
-	},
-
-	toArray: function() {
-		return core_slice.call( this );
-	},
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num == null ?
-
-			// Return a 'clean' array
-			this.toArray() :
-
-			// Return just the object
-			( num < 0 ? this[ this.length + num ] : this[ num ] );
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems ) {
-
-		// Build a new jQuery matched element set
-		var ret = jQuery.merge( this.constructor(), elems );
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-		ret.context = this.context;
-
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
-	},
-
-	ready: function( fn ) {
-		// Add the callback
-		jQuery.ready.promise().done( fn );
-
-		return this;
-	},
-
-	slice: function() {
-		return this.pushStack( core_slice.apply( this, arguments ) );
-	},
-
-	first: function() {
-		return this.eq( 0 );
-	},
-
-	last: function() {
-		return this.eq( -1 );
-	},
-
-	eq: function( i ) {
-		var len = this.length,
-			j = +i + ( i < 0 ? len : 0 );
-		return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		}));
-	},
-
-	end: function() {
-		return this.prevObject || this.constructor(null);
-	},
-
-	// For internal use only.
-	// Behaves like an Array's method, not like a jQuery method.
-	push: core_push,
-	sort: [].sort,
-	splice: [].splice
-};
-
-// Give the init function the jQuery prototype for later instantiation
-jQuery.fn.init.prototype = jQuery.fn;
-
-jQuery.extend = jQuery.fn.extend = function() {
-	var options, name, src, copy, copyIsArray, clone,
-		target = arguments[0] || {},
-		i = 1,
-		length = arguments.length,
-		deep = false;
-
-	// Handle a deep copy situation
-	if ( typeof target === "boolean" ) {
-		deep = target;
-		target = arguments[1] || {};
-		// skip the boolean and the target
-		i = 2;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
-		target = {};
-	}
-
-	// extend jQuery itself if only one argument is passed
-	if ( length === i ) {
-		target = this;
-		--i;
-	}
-
-	for ( ; i < length; i++ ) {
-		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null ) {
-			// Extend the base object
-			for ( name in options ) {
-				src = target[ name ];
-				copy = options[ name ];
-
-				// Prevent never-ending loop
-				if ( target === copy ) {
-					continue;
-				}
-
-				// Recurse if we're merging plain objects or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
-					if ( copyIsArray ) {
-						copyIsArray = false;
-						clone = src && jQuery.isArray(src) ? src : [];
-
-					} else {
-						clone = src && jQuery.isPlainObject(src) ? src : {};
-					}
-
-					// Never move original objects, clone them
-					target[ name ] = jQuery.extend( deep, clone, copy );
-
-				// Don't bring in undefined values
-				} else if ( copy !== undefined ) {
-					target[ name ] = copy;
-				}
-			}
-		}
-	}
-
-	// Return the modified object
-	return target;
-};
-
-jQuery.extend({
-	noConflict: function( deep ) {
-		if ( window.$ === jQuery ) {
-			window.$ = _$;
-		}
-
-		if ( deep && window.jQuery === jQuery ) {
-			window.jQuery = _jQuery;
-		}
-
-		return jQuery;
-	},
-
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
-
-	// A counter to track how many items to wait for before
-	// the ready event fires. See #6781
-	readyWait: 1,
-
-	// Hold (or release) the ready event
-	holdReady: function( hold ) {
-		if ( hold ) {
-			jQuery.readyWait++;
-		} else {
-			jQuery.ready( true );
-		}
-	},
-
-	// Handle when the DOM is ready
-	ready: function( wait ) {
-
-		// Abort if there are pending holds or we're already ready
-		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
-			return;
-		}
-
-		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-		if ( !document.body ) {
-			return setTimeout( jQuery.ready );
-		}
-
-		// Remember that the DOM is ready
-		jQuery.isReady = true;
-
-		// If a normal DOM Ready event fired, decrement, and wait if need be
-		if ( wait !== true && --jQuery.readyWait > 0 ) {
-			return;
-		}
-
-		// If there are functions bound, to execute
-		readyList.resolveWith( document, [ jQuery ] );
-
-		// Trigger any bound ready events
-		if ( jQuery.fn.trigger ) {
-			jQuery( document ).trigger("ready").off("ready");
-		}
-	},
-
-	// See test/unit/core.js for details concerning isFunction.
-	// Since version 1.3, DOM methods and functions like alert
-	// aren't supported. They return false on IE (#2968).
-	isFunction: function( obj ) {
-		return jQuery.type(obj) === "function";
-	},
-
-	isArray: Array.isArray || function( obj ) {
-		return jQuery.type(obj) === "array";
-	},
-
-	isWindow: function( obj ) {
-		return obj != null && obj == obj.window;
-	},
-
-	isNumeric: function( obj ) {
-		return !isNaN( parseFloat(obj) ) && isFinite( obj );
-	},
-
-	type: function( obj ) {
-		if ( obj == null ) {
-			return String( obj );
-		}
-		return typeof obj === "object" || typeof obj === "function" ?
-			class2type[ core_toString.call(obj) ] || "object" :
-			typeof obj;
-	},
-
-	isPlainObject: function( obj ) {
-		// Must be an Object.
-		// Because of IE, we also have to check the presence of the constructor property.
-		// Make sure that DOM nodes and window objects don't pass through, as well
-		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-			return false;
-		}
-
-		try {
-			// Not own constructor property must be Object
-			if ( obj.constructor &&
-				!core_hasOwn.call(obj, "constructor") &&
-				!core_hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
-				return false;
-			}
-		} catch ( e ) {
-			// IE8,9 Will throw exceptions on certain host objects #9897
-			return false;
-		}
-
-		// Own properties are enumerated firstly, so to speed up,
-		// if last one is own, then all properties are own.
-
-		var key;
-		for ( key in obj ) {}
-
-		return key === undefined || core_hasOwn.call( obj, key );
-	},
-
-	isEmptyObject: function( obj ) {
-		var name;
-		for ( name in obj ) {
-			return false;
-		}
-		return true;
-	},
-
-	error: function( msg ) {
-		throw new Error( msg );
-	},
-
-	// data: string of html
-	// context (optional): If specified, the fragment will be created in this context, defaults to document
-	// keepScripts (optional): If true, will include scripts passed in the html string
-	parseHTML: function( data, context, keepScripts ) {
-		if ( !data || typeof data !== "string" ) {
-			return null;
-		}
-		if ( typeof context === "boolean" ) {
-			keepScripts = context;
-			context = false;
-		}
-		context = context || document;
-
-		var parsed = rsingleTag.exec( data ),
-			scripts = !keepScripts && [];
-
-		// Single tag
-		if ( parsed ) {
-			return [ context.createElement( parsed[1] ) ];
-		}
-
-		parsed = jQuery.buildFragment( [ data ], context, scripts );
-		if ( scripts ) {
-			jQuery( scripts ).remove();
-		}
-		return jQuery.merge( [], parsed.childNodes );
-	},
-
-	parseJSON: function( data ) {
-		// Attempt to parse using the native JSON parser first
-		if ( window.JSON && window.JSON.parse ) {
-			return window.JSON.parse( data );
-		}
-
-		if ( data === null ) {
-			return data;
-		}
-
-		if ( typeof data === "string" ) {
-
-			// Make sure leading/trailing whitespace is removed (IE can't handle it)
-			data = jQuery.trim( data );
-
-			if ( data ) {
-				// Make sure the incoming data is actual JSON
-				// Logic borrowed from http://json.org/json2.js
-				if ( rvalidchars.test( data.replace( rvalidescape, "@" )
-					.replace( rvalidtokens, "]" )
-					.replace( rvalidbraces, "")) ) {
-
-					return ( new Function( "return " + data ) )();
-				}
-			}
-		}
-
-		jQuery.error( "Invalid JSON: " + data );
-	},
-
-	// Cross-browser xml parsing
-	parseXML: function( data ) {
-		var xml, tmp;
-		if ( !data || typeof data !== "string" ) {
-			return null;
-		}
-		try {
-			if ( window.DOMParser ) { // Standard
-				tmp = new DOMParser();
-				xml = tmp.parseFromString( data , "text/xml" );
-			} else { // IE
-				xml = new ActiveXObject( "Microsoft.XMLDOM" );
-				xml.async = "false";
-				xml.loadXML( data );
-			}
-		} catch( e ) {
-			xml = undefined;
-		}
-		if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
-			jQuery.error( "Invalid XML: " + data );
-		}
-		return xml;
-	},
-
-	noop: function() {},
-
-	// Evaluates a script in a global context
-	// Workarounds based on findings by Jim Driscoll
-	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
-	globalEval: function( data ) {
-		if ( data && jQuery.trim( data ) ) {
-			// We use execScript on Internet Explorer
-			// We use an anonymous function so that context is window
-			// rather than jQuery in Firefox
-			( window.execScript || function( data ) {
-				window[ "eval" ].call( window, data );
-			} )( data );
-		}
-	},
-
-	// Convert dashed to camelCase; used by the css and data modules
-	// Microsoft forgot to hump their vendor prefix (#9572)
-	camelCase: function( string ) {
-		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
-	},
-
-	// args is for internal usage only
-	each: function( obj, callback, args ) {
-		var value,
-			i = 0,
-			length = obj.length,
-			isArray = isArraylike( obj );
-
-		if ( args ) {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			}
-
-		// A special, fast, case for the most common use of each
-		} else {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			}
-		}
-
-		return obj;
-	},
-
-	// Use native String.trim function wherever possible
-	trim: core_trim && !core_trim.call("\uFEFF\xA0") ?
-		function( text ) {
-			return text == null ?
-				"" :
-				core_trim.call( text );
-		} :
-
-		// Otherwise use our own trimming functionality
-		function( text ) {
-			return text == null ?
-				"" :
-				( text + "" ).replace( rtrim, "" );
-		},
-
-	// results is for internal usage only
-	makeArray: function( arr, results ) {
-		var ret = results || [];
-
-		if ( arr != null ) {
-			if ( isArraylike( Object(arr) ) ) {
-				jQuery.merge( ret,
-					typeof arr === "string" ?
-					[ arr ] : arr
-				);
-			} else {
-				core_push.call( ret, arr );
-			}
-		}
-
-		return ret;
-	},
-
-	inArray: function( elem, arr, i ) {
-		var len;
-
-		if ( arr ) {
-			if ( core_indexOf ) {
-				return core_indexOf.call( arr, elem, i );
-			}
-
-			len = arr.length;
-			i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
-
-			for ( ; i < len; i++ ) {
-				// Skip accessing in sparse arrays
-				if ( i in arr && arr[ i ] === elem ) {
-					return i;
-				}
-			}
-		}
-
-		return -1;
-	},
-
-	merge: function( first, second ) {
-		var l = second.length,
-			i = first.length,
-			j = 0;
-
-		if ( typeof l === "number" ) {
-			for ( ; j < l; j++ ) {
-				first[ i++ ] = second[ j ];
-			}
-		} else {
-			while ( second[j] !== undefined ) {
-				first[ i++ ] = second[ j++ ];
-			}
-		}
-
-		first.length = i;
-
-		return first;
-	},
-
-	grep: function( elems, callback, inv ) {
-		var retVal,
-			ret = [],
-			i = 0,
-			length = elems.length;
-		inv = !!inv;
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( ; i < length; i++ ) {
-			retVal = !!callback( elems[ i ], i );
-			if ( inv !== retVal ) {
-				ret.push( elems[ i ] );
-			}
-		}
-
-		return ret;
-	},
-
-	// arg is for internal usage only
-	map: function( elems, callback, arg ) {
-		var value,
-			i = 0,
-			length = elems.length,
-			isArray = isArraylike( elems ),
-			ret = [];
-
-		// Go through the array, translating each of the items to their
-		if ( isArray ) {
-			for ( ; i < length; i++ ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret[ ret.length ] = value;
-				}
-			}
-
-		// Go through every key on the object,
-		} else {
-			for ( i in elems ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret[ ret.length ] = value;
-				}
-			}
-		}
-
-		// Flatten any nested arrays
-		return core_concat.apply( [], ret );
-	},
-
-	// A global GUID counter for objects
-	guid: 1,
-
-	// Bind a function to a context, optionally partially applying any
-	// arguments.
-	proxy: function( fn, context ) {
-		var tmp, args, proxy;
-
-		if ( typeof context === "string" ) {
-			tmp = fn[ context ];
-			context = fn;
-			fn = tmp;
-		}
-
-		// Quick check to determine if target is callable, in the spec
-		// this throws a TypeError, but we will just return undefined.
-		if ( !jQuery.isFunction( fn ) ) {
-			return undefined;
-		}
-
-		// Simulated bind
-		args = core_slice.call( arguments, 2 );
-		proxy = function() {
-			return fn.apply( context || this, args.concat( core_slice.call( arguments ) ) );
-		};
-
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		proxy.guid = fn.guid = fn.guid || jQuery.guid++;
-
-		return proxy;
-	},
-
-	// Multifunctional method to get and set values of a collection
-	// The value/s can optionally be executed if it's a function
-	access: function( elems, fn, key, value, chainable, emptyGet, raw ) {
-		var i = 0,
-			length = elems.length,
-			bulk = key == null;
-
-		// Sets many values
-		if ( jQuery.type( key ) === "object" ) {
-			chainable = true;
-			for ( i in key ) {
-				jQuery.access( elems, fn, i, key[i], true, emptyGet, raw );
-			}
-
-		// Sets one value
-		} else if ( value !== undefined ) {
-			chainable = true;
-
-			if ( !jQuery.isFunction( value ) ) {
-				raw = true;
-			}
-
-			if ( bulk ) {
-				// Bulk operations run against the entire set
-				if ( raw ) {
-					fn.call( elems, value );
-					fn = null;
-
-				// ...except when executing function values
-				} else {
-					bulk = fn;
-					fn = function( elem, key, value ) {
-						return bulk.call( jQuery( elem ), value );
-					};
-				}
-			}
-
-			if ( fn ) {
-				for ( ; i < length; i++ ) {
-					fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) );
-				}
-			}
-		}
-
-		return chainable ?
-			elems :
-
-			// Gets
-			bulk ?
-				fn.call( elems ) :
-				length ? fn( elems[0], key ) : emptyGet;
-	},
-
-	now: function() {
-		return ( new Date() ).getTime();
-	}
-});
-
-jQuery.ready.promise = function( obj ) {
-	if ( !readyList ) {
-
-		readyList = jQuery.Deferred();
-
-		// Catch cases where $(document).ready() is called after the browser event has already occurred.
-		// we once tried to use readyState "interactive" here, but it caused issues like the one
-		// discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
-		if ( document.readyState === "complete" ) {
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			setTimeout( jQuery.ready );
-
-		// Standards-based browsers support DOMContentLoaded
-		} else if ( document.addEventListener ) {
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", jQuery.ready, false );
-
-		// If IE event model is used
-		} else {
-			// Ensure firing before onload, maybe late but safe also for iframes
-			document.attachEvent( "onreadystatechange", DOMContentLoaded );
-
-			// A fallback to window.onload, that will always work
-			window.attachEvent( "onload", jQuery.ready );
-
-			// If IE and not a frame
-			// continually check to see if the document is ready
-			var top = false;
-
-			try {
-				top = window.frameElement == null && document.documentElement;
-			} catch(e) {}
-
-			if ( top && top.doScroll ) {
-				(function doScrollCheck() {
-					if ( !jQuery.isReady ) {
-
-						try {
-							// Use the trick by Diego Perini
-							// http://javascript.nwbox.com/IEContentLoaded/
-							top.doScroll("left");
-						} catch(e) {
-							return setTimeout( doScrollCheck, 50 );
-						}
-
-						// and execute any waiting functions
-						jQuery.ready();
-					}
-				})();
-			}
-		}
-	}
-	return readyList.promise( obj );
-};
-
-// Populate the class2type map
-jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-});
-
-function isArraylike( obj ) {
-	var length = obj.length,
-		type = jQuery.type( obj );
-
-	if ( jQuery.isWindow( obj ) ) {
-		return false;
-	}
-
-	if ( obj.nodeType === 1 && length ) {
-		return true;
-	}
-
-	return type === "array" || type !== "function" &&
-		( length === 0 ||
-		typeof length === "number" && length > 0 && ( length - 1 ) in obj );
-}
-
-// All jQuery objects should point back to these
-rootjQuery = jQuery(document);
-// String to Object options format cache
-var optionsCache = {};
-
-// Convert String-formatted options into Object-formatted ones and store in cache
-function createOptions( options ) {
-	var object = optionsCache[ options ] = {};
-	jQuery.each( options.match( core_rnotwhite ) || [], function( _, flag ) {
-		object[ flag ] = true;
-	});
-	return object;
-}
-
-/*
- * Create a callback list using the following parameters:
- *
- *	options: an optional list of space-separated options that will change how
- *			the callback list behaves or a more traditional option object
- *
- * By default a callback list will act like an event callback list and can be
- * "fired" multiple times.
- *
- * Possible options:
- *
- *	once:			will ensure the callback list can only be fired once (like a Deferred)
- *
- *	memory:			will keep track of previous values and will call any callback added
- *					after the list has been fired right away with the latest "memorized"
- *					values (like a Deferred)
- *
- *	unique:			will ensure a callback can only be added once (no duplicate in the list)
- *
- *	stopOnFalse:	interrupt callings when a callback returns false
- *
- */
-jQuery.Callbacks = function( options ) {
-
-	// Convert options from String-formatted to Object-formatted if needed
-	// (we check in cache first)
-	options = typeof options === "string" ?
-		( optionsCache[ options ] || createOptions( options ) ) :
-		jQuery.extend( {}, options );
-
-	var // Last fire value (for non-forgettable lists)
-		memory,
-		// Flag to know if list was already fired
-		fired,
-		// Flag to know if list is currently firing
-		firing,
-		// First callback to fire (used internally by add and fireWith)
-		firingStart,
-		// End of the loop when firing
-		firingLength,
-		// Index of currently firing callback (modified by remove if needed)
-		firingIndex,
-		// Actual callback list
-		list = [],
-		// Stack of fire calls for repeatable lists
-		stack = !options.once && [],
-		// Fire callbacks
-		fire = function( data ) {
-			memory = options.memory && data;
-			fired = true;
-			firingIndex = firingStart || 0;
-			firingStart = 0;
-			firingLength = list.length;
-			firing = true;
-			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
-				if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
-					memory = false; // To prevent further calls using add
-					break;
-				}
-			}
-			firing = false;
-			if ( list ) {
-				if ( stack ) {
-					if ( stack.length ) {
-						fire( stack.shift() );
-					}
-				} else if ( memory ) {
-					list = [];
-				} else {
-					self.disable();
-				}
-			}
-		},
-		// Actual Callbacks object
-		self = {
-			// Add a callback or a collection of callbacks to the list
-			add: function() {
-				if ( list ) {
-					// First, we save the current length
-					var start = list.length;
-					(function add( args ) {
-						jQuery.each( args, function( _, arg ) {
-							var type = jQuery.type( arg );
-							if ( type === "function" ) {
-								if ( !options.unique || !self.has( arg ) ) {
-									list.push( arg );
-								}
-							} else if ( arg && arg.length && type !== "string" ) {
-								// Inspect recursively
-								add( arg );
-							}
-						});
-					})( arguments );
-					// Do we need to add the callbacks to the
-					// current firing batch?
-					if ( firing ) {
-						firingLength = list.length;
-					// With memory, if we're not firing then
-					// we should call right away
-					} else if ( memory ) {
-						firingStart = start;
-						fire( memory );
-					}
-				}
-				return this;
-			},
-			// Remove a callback from the list
-			remove: function() {
-				if ( list ) {
-					jQuery.each( arguments, function( _, arg ) {
-						var index;
-						while( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
-							list.splice( index, 1 );
-							// Handle firing indexes
-							if ( firing ) {
-								if ( index <= firingLength ) {
-									firingLength--;
-								}
-								if ( index <= firingIndex ) {
-									firingIndex--;
-								}
-							}
-						}
-					});
-				}
-				return this;
-			},
-			// Control if a given callback is in the list
-			has: function( fn ) {
-				return jQuery.inArray( fn, list ) > -1;
-			},
-			// Remove all callbacks from the list
-			empty: function() {
-				list = [];
-				return this;
-			},
-			// Have the list do nothing anymore
-			disable: function() {
-				list = stack = memory = undefined;
-				return this;
-			},
-			// Is it disabled?
-			disabled: function() {
-				return !list;
-			},
-			// Lock the list in its current state
-			lock: function() {
-				stack = undefined;
-				if ( !memory ) {
-					self.disable();
-				}
-				return this;
-			},
-			// Is it locked?
-			locked: function() {
-				return !stack;
-			},
-			// Call all callbacks with the given context and arguments
-			fireWith: function( context, args ) {
-				args = args || [];
-				args = [ context, args.slice ? args.slice() : args ];
-				if ( list && ( !fired || stack ) ) {
-					if ( firing ) {
-						stack.push( args );
-					} else {
-						fire( args );
-					}
-				}
-				return this;
-			},
-			// Call all the callbacks with the given arguments
-			fire: function() {
-				self.fireWith( this, arguments );
-				return this;
-			},
-			// To know if the callbacks have already been called at least once
-			fired: function() {
-				return !!fired;
-			}
-		};
-
-	return self;
-};
-jQuery.extend({
-
-	Deferred: function( func ) {
-		var tuples = [
-				// action, add listener, listener list, final state
-				[ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
-				[ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
-				[ "notify", "progress", jQuery.Callbacks("memory") ]
-			],
-			state = "pending",
-			promise = {
-				state: function() {
-					return state;
-				},
-				always: function() {
-					deferred.done( arguments ).fail( arguments );
-					return this;
-				},
-				then: function( /* fnDone, fnFail, fnProgress */ ) {
-					var fns = arguments;
-					return jQuery.Deferred(function( newDefer ) {
-						jQuery.each( tuples, function( i, tuple ) {
-							var action = tuple[ 0 ],
-								fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
-							// deferred[ done | fail | progress ] for forwarding actions to newDefer
-							deferred[ tuple[1] ](function() {
-								var returned = fn && fn.apply( this, arguments );
-								if ( returned && jQuery.isFunction( returned.promise ) ) {
-									returned.promise()
-										.done( newDefer.resolve )
-										.fail( newDefer.reject )
-										.progress( newDefer.notify );
-								} else {
-									newDefer[ action + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments );
-								}
-							});
-						});
-						fns = null;
-					}).promise();
-				},
-				// Get a promise for this deferred
-				// If obj is provided, the promise aspect is added to the object
-				promise: function( obj ) {
-					return obj != null ? jQuery.extend( obj, promise ) : promise;
-				}
-			},
-			deferred = {};
-
-		// Keep pipe for back-compat
-		promise.pipe = promise.then;
-
-		// Add list-specific methods
-		jQuery.each( tuples, function( i, tuple ) {
-			var list = tuple[ 2 ],
-				stateString = tuple[ 3 ];
-
-			// promise[ done | fail | progress ] = list.add
-			promise[ tuple[1] ] = list.add;
-
-			// Handle state
-			if ( stateString ) {
-				list.add(function() {
-					// state = [ resolved | rejected ]
-					state = stateString;
-
-				// [ reject_list | resolve_list ].disable; progress_list.lock
-				}, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
-			}
-
-			// deferred[ resolve | reject | notify ]
-			deferred[ tuple[0] ] = function() {
-				deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments );
-				return this;
-			};
-			deferred[ tuple[0] + "With" ] = list.fireWith;
-		});
-
-		// Make the deferred a promise
-		promise.promise( deferred );
-
-		// Call given func if any
-		if ( func ) {
-			func.call( deferred, deferred );
-		}
-
-		// All done!
-		return deferred;
-	},
-
-	// Deferred helper
-	when: function( subordinate /* , ..., subordinateN */ ) {
-		var i = 0,
-			resolveValues = core_slice.call( arguments ),
-			length = resolveValues.length,
-
-			// the count of uncompleted subordinates
-			remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
-
-			// the master Deferred. If resolveValues consist of only a single Deferred, just use that.
-			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
-
-			// Update function for both resolve and progress values
-			updateFunc = function( i, contexts, values ) {
-				return function( value ) {
-					contexts[ i ] = this;
-					values[ i ] = arguments.length > 1 ? core_slice.call( arguments ) : value;
-					if( values === progressValues ) {
-						deferred.notifyWith( contexts, values );
-					} else if ( !( --remaining ) ) {
-						deferred.resolveWith( contexts, values );
-					}
-				};
-			},
-
-			progressValues, progressContexts, resolveContexts;
-
-		// add listeners to Deferred subordinates; treat others as resolved
-		if ( length > 1 ) {
-			progressValues = new Array( length );
-			progressContexts = new Array( length );
-			resolveContexts = new Array( length );
-			for ( ; i < length; i++ ) {
-				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
-					resolveValues[ i ].promise()
-						.done( updateFunc( i, resolveContexts, resolveValues ) )
-						.fail( deferred.reject )
-						.progress( updateFunc( i, progressContexts, progressValues ) );
-				} else {
-					--remaining;
-				}
-			}
-		}
-
-		// if we're not waiting on anything, resolve the master
-		if ( !remaining ) {
-			deferred.resolveWith( resolveContexts, resolveValues );
-		}
-
-		return deferred.promise();
-	}
-});
-jQuery.support = (function() {
-
-	var support, all, a, select, opt, input, fragment, eventName, isSupported, i,
-		div = document.createElement("div");
-
-	// Setup
-	div.setAttribute( "className", "t" );
-	div.innerHTML = "  
      a";
-
-	// Support tests won't run in some limited or non-browser environments
-	all = div.getElementsByTagName("*");
-	a = div.getElementsByTagName("a")[ 0 ];
-	if ( !all || !a || !all.length ) {
-		return {};
-	}
-
-	// First batch of tests
-	select = document.createElement("select");
-	opt = select.appendChild( document.createElement("option") );
-	input = div.getElementsByTagName("input")[ 0 ];
-
-	a.style.cssText = "top:1px;float:left;opacity:.5";
-	support = {
-		// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
-		getSetAttribute: div.className !== "t",
-
-		// IE strips leading whitespace when .innerHTML is used
-		leadingWhitespace: div.firstChild.nodeType === 3,
-
-		// Make sure that tbody elements aren't automatically inserted
-		// IE will insert them into empty tables
-		tbody: !div.getElementsByTagName("tbody").length,
-
-		// Make sure that link elements get serialized correctly by innerHTML
-		// This requires a wrapper element in IE
-		htmlSerialize: !!div.getElementsByTagName("link").length,
-
-		// Get the style information from getAttribute
-		// (IE uses .cssText instead)
-		style: /top/.test( a.getAttribute("style") ),
-
-		// Make sure that URLs aren't manipulated
-		// (IE normalizes it by default)
-		hrefNormalized: a.getAttribute("href") === "/a",
-
-		// Make sure that element opacity exists
-		// (IE uses filter instead)
-		// Use a regex to work around a WebKit issue. See #5145
-		opacity: /^0.5/.test( a.style.opacity ),
-
-		// Verify style float existence
-		// (IE uses styleFloat instead of cssFloat)
-		cssFloat: !!a.style.cssFloat,
-
-		// Check the default checkbox/radio value ("" on WebKit; "on" elsewhere)
-		checkOn: !!input.value,
-
-		// Make sure that a selected-by-default option has a working selected property.
-		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
-		optSelected: opt.selected,
-
-		// Tests for enctype support on a form (#6743)
-		enctype: !!document.createElement("form").enctype,
-
-		// Makes sure cloning an html5 element does not cause problems
-		// Where outerHTML is undefined, this still works
-		html5Clone: document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav>",
-
-		// jQuery.support.boxModel DEPRECATED in 1.8 since we don't support Quirks Mode
-		boxModel: document.compatMode === "CSS1Compat",
-
-		// Will be defined later
-		deleteExpando: true,
-		noCloneEvent: true,
-		inlineBlockNeedsLayout: false,
-		shrinkWrapBlocks: false,
-		reliableMarginRight: true,
-		boxSizingReliable: true,
-		pixelPosition: false
-	};
-
-	// Make sure checked status is properly cloned
-	input.checked = true;
-	support.noCloneChecked = input.cloneNode( true ).checked;
-
-	// Make sure that the options inside disabled selects aren't marked as disabled
-	// (WebKit marks them as disabled)
-	select.disabled = true;
-	support.optDisabled = !opt.disabled;
-
-	// Support: IE<9
-	try {
-		delete div.test;
-	} catch( e ) {
-		support.deleteExpando = false;
-	}
-
-	// Check if we can trust getAttribute("value")
-	input = document.createElement("input");
-	input.setAttribute( "value", "" );
-	support.input = input.getAttribute( "value" ) === "";
-
-	// Check if an input maintains its value after becoming a radio
-	input.value = "t";
-	input.setAttribute( "type", "radio" );
-	support.radioValue = input.value === "t";
-
-	// #11217 - WebKit loses check when the name is after the checked attribute
-	input.setAttribute( "checked", "t" );
-	input.setAttribute( "name", "t" );
-
-	fragment = document.createDocumentFragment();
-	fragment.appendChild( input );
-
-	// Check if a disconnected checkbox will retain its checked
-	// value of true after appended to the DOM (IE6/7)
-	support.appendChecked = input.checked;
-
-	// WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	// Support: IE<9
-	// Opera does not clone events (and typeof div.attachEvent === undefined).
-	// IE9-10 clones events bound via attachEvent, but they don't trigger with .click()
-	if ( div.attachEvent ) {
-		div.attachEvent( "onclick", function() {
-			support.noCloneEvent = false;
-		});
-
-		div.cloneNode( true ).click();
-	}
-
-	// Support: IE<9 (lack submit/change bubble), Firefox 17+ (lack focusin event)
-	// Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP), test/csp.php
-	for ( i in { submit: true, change: true, focusin: true }) {
-		div.setAttribute( eventName = "on" + i, "t" );
-
-		support[ i + "Bubbles" ] = eventName in window || div.attributes[ eventName ].expando === false;
-	}
-
-	div.style.backgroundClip = "content-box";
-	div.cloneNode( true ).style.backgroundClip = "";
-	support.clearCloneStyle = div.style.backgroundClip === "content-box";
-
-	// Run tests that need a body at doc ready
-	jQuery(function() {
-		var container, marginDiv, tds,
-			divReset = "padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",
-			body = document.getElementsByTagName("body")[0];
-
-		if ( !body ) {
-			// Return for frameset docs that don't have a body
-			return;
-		}
-
-		container = document.createElement("div");
-		container.style.cssText = "border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px";
-
-		body.appendChild( container ).appendChild( div );
-
-		// Support: IE8
-		// Check if table cells still have offsetWidth/Height when they are set
-		// to display:none and there are still other visible table cells in a
-		// table row; if so, offsetWidth/Height are not reliable for use when
-		// determining if an element has been hidden directly using
-		// display:none (it is still safe to use offsets if a parent element is
-		// hidden; don safety goggles and see bug #4512 for more information).
-		div.innerHTML = "
      t
      ";
-		tds = div.getElementsByTagName("td");
-		tds[ 0 ].style.cssText = "padding:0;margin:0;border:0;display:none";
-		isSupported = ( tds[ 0 ].offsetHeight === 0 );
-
-		tds[ 0 ].style.display = "";
-		tds[ 1 ].style.display = "none";
-
-		// Support: IE8
-		// Check if empty table cells still have offsetWidth/Height
-		support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
-
-		// Check box-sizing and margin behavior
-		div.innerHTML = "";
-		div.style.cssText = "box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;";
-		support.boxSizing = ( div.offsetWidth === 4 );
-		support.doesNotIncludeMarginInBodyOffset = ( body.offsetTop !== 1 );
-
-		// Use window.getComputedStyle because jsdom on node.js will break without it.
-		if ( window.getComputedStyle ) {
-			support.pixelPosition = ( window.getComputedStyle( div, null ) || {} ).top !== "1%";
-			support.boxSizingReliable = ( window.getComputedStyle( div, null ) || { width: "4px" } ).width === "4px";
-
-			// Check if div with explicit width and no margin-right incorrectly
-			// gets computed margin-right based on width of container. (#3333)
-			// Fails in WebKit before Feb 2011 nightlies
-			// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-			marginDiv = div.appendChild( document.createElement("div") );
-			marginDiv.style.cssText = div.style.cssText = divReset;
-			marginDiv.style.marginRight = marginDiv.style.width = "0";
-			div.style.width = "1px";
-
-			support.reliableMarginRight =
-				!parseFloat( ( window.getComputedStyle( marginDiv, null ) || {} ).marginRight );
-		}
-
-		if ( typeof div.style.zoom !== "undefined" ) {
-			// Support: IE<8
-			// Check if natively block-level elements act like inline-block
-			// elements when setting their display to 'inline' and giving
-			// them layout
-			div.innerHTML = "";
-			div.style.cssText = divReset + "width:1px;padding:1px;display:inline;zoom:1";
-			support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 );
-
-			// Support: IE6
-			// Check if elements with layout shrink-wrap their children
-			div.style.display = "block";
-			div.innerHTML = "
      ";
-			div.firstChild.style.width = "5px";
-			support.shrinkWrapBlocks = ( div.offsetWidth !== 3 );
-
-			// Prevent IE 6 from affecting layout for positioned elements #11048
-			// Prevent IE from shrinking the body in IE 7 mode #12869
-			body.style.zoom = 1;
-		}
-
-		body.removeChild( container );
-
-		// Null elements to avoid leaks in IE
-		container = div = tds = marginDiv = null;
-	});
-
-	// Null elements to avoid leaks in IE
-	all = select = fragment = opt = a = input = null;
-
-	return support;
-})();
-
-var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/,
-	rmultiDash = /([A-Z])/g;
-	
-function internalData( elem, name, data, pvt /* Internal Use Only */ ){
-	if ( !jQuery.acceptData( elem ) ) {
-		return;
-	}
-
-	var thisCache, ret,
-		internalKey = jQuery.expando,
-		getByName = typeof name === "string",
-
-		// We have to handle DOM nodes and JS objects differently because IE6-7
-		// can't GC object references properly across the DOM-JS boundary
-		isNode = elem.nodeType,
-
-		// Only DOM nodes need the global jQuery cache; JS object data is
-		// attached directly to the object so GC can occur automatically
-		cache = isNode ? jQuery.cache : elem,
-
-		// Only defining an ID for JS objects if its cache already exists allows
-		// the code to shortcut on the same path as a DOM node with no cache
-		id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey;
-
-	// Avoid doing any more work than we need to when trying to get data on an
-	// object that has no data at all
-	if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && getByName && data === undefined ) {
-		return;
-	}
-
-	if ( !id ) {
-		// Only DOM nodes need a new unique ID for each element since their data
-		// ends up in the global cache
-		if ( isNode ) {
-			elem[ internalKey ] = id = core_deletedIds.pop() || jQuery.guid++;
-		} else {
-			id = internalKey;
-		}
-	}
-
-	if ( !cache[ id ] ) {
-		cache[ id ] = {};
-
-		// Avoids exposing jQuery metadata on plain JS objects when the object
-		// is serialized using JSON.stringify
-		if ( !isNode ) {
-			cache[ id ].toJSON = jQuery.noop;
-		}
-	}
-
-	// An object can be passed to jQuery.data instead of a key/value pair; this gets
-	// shallow copied over onto the existing cache
-	if ( typeof name === "object" || typeof name === "function" ) {
-		if ( pvt ) {
-			cache[ id ] = jQuery.extend( cache[ id ], name );
-		} else {
-			cache[ id ].data = jQuery.extend( cache[ id ].data, name );
-		}
-	}
-
-	thisCache = cache[ id ];
-
-	// jQuery data() is stored in a separate object inside the object's internal data
-	// cache in order to avoid key collisions between internal data and user-defined
-	// data.
-	if ( !pvt ) {
-		if ( !thisCache.data ) {
-			thisCache.data = {};
-		}
-
-		thisCache = thisCache.data;
-	}
-
-	if ( data !== undefined ) {
-		thisCache[ jQuery.camelCase( name ) ] = data;
-	}
-
-	// Check for both converted-to-camel and non-converted data property names
-	// If a data property was specified
-	if ( getByName ) {
-
-		// First Try to find as-is property data
-		ret = thisCache[ name ];
-
-		// Test for null|undefined property data
-		if ( ret == null ) {
-
-			// Try to find the camelCased property
-			ret = thisCache[ jQuery.camelCase( name ) ];
-		}
-	} else {
-		ret = thisCache;
-	}
-
-	return ret;
-}
-
-function internalRemoveData( elem, name, pvt /* For internal use only */ ){
-	if ( !jQuery.acceptData( elem ) ) {
-		return;
-	}
-
-	var thisCache, i, l,
-
-		isNode = elem.nodeType,
-
-		// See jQuery.data for more information
-		cache = isNode ? jQuery.cache : elem,
-		id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
-
-	// If there is already no cache entry for this object, there is no
-	// purpose in continuing
-	if ( !cache[ id ] ) {
-		return;
-	}
-
-	if ( name ) {
-
-		thisCache = pvt ? cache[ id ] : cache[ id ].data;
-
-		if ( thisCache ) {
-
-			// Support array or space separated string names for data keys
-			if ( !jQuery.isArray( name ) ) {
-
-				// try the string as a key before any manipulation
-				if ( name in thisCache ) {
-					name = [ name ];
-				} else {
-
-					// split the camel cased version by spaces unless a key with the spaces exists
-					name = jQuery.camelCase( name );
-					if ( name in thisCache ) {
-						name = [ name ];
-					} else {
-						name = name.split(" ");
-					}
-				}
-			} else {
-				// If "name" is an array of keys...
-				// When data is initially created, via ("key", "val") signature,
-				// keys will be converted to camelCase.
-				// Since there is no way to tell _how_ a key was added, remove
-				// both plain key and camelCase key. #12786
-				// This will only penalize the array argument path.
-				name = name.concat( jQuery.map( name, jQuery.camelCase ) );
-			}
-
-			for ( i = 0, l = name.length; i < l; i++ ) {
-				delete thisCache[ name[i] ];
-			}
-
-			// If there is no data left in the cache, we want to continue
-			// and let the cache object itself get destroyed
-			if ( !( pvt ? isEmptyDataObject : jQuery.isEmptyObject )( thisCache ) ) {
-				return;
-			}
-		}
-	}
-
-	// See jQuery.data for more information
-	if ( !pvt ) {
-		delete cache[ id ].data;
-
-		// Don't destroy the parent cache unless the internal data object
-		// had been the only thing left in it
-		if ( !isEmptyDataObject( cache[ id ] ) ) {
-			return;
-		}
-	}
-
-	// Destroy the cache
-	if ( isNode ) {
-		jQuery.cleanData( [ elem ], true );
-
-	// Use delete when supported for expandos or `cache` is not a window per isWindow (#10080)
-	} else if ( jQuery.support.deleteExpando || cache != cache.window ) {
-		delete cache[ id ];
-
-	// When all else fails, null
-	} else {
-		cache[ id ] = null;
-	}
-}
-
-jQuery.extend({
-	cache: {},
-
-	// Unique for each copy of jQuery on the page
-	// Non-digits removed to match rinlinejQuery
-	expando: "jQuery" + ( core_version + Math.random() ).replace( /\D/g, "" ),
-
-	// The following elements throw uncatchable exceptions if you
-	// attempt to add expando properties to them.
-	noData: {
-		"embed": true,
-		// Ban all objects except for Flash (which handle expandos)
-		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
-		"applet": true
-	},
-
-	hasData: function( elem ) {
-		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
-		return !!elem && !isEmptyDataObject( elem );
-	},
-
-	data: function( elem, name, data ) {
-		return internalData( elem, name, data, false );
-	},
-
-	removeData: function( elem, name ) {
-		return internalRemoveData( elem, name, false );
-	},
-
-	// For internal use only.
-	_data: function( elem, name, data ) {
-		return internalData( elem, name, data, true );
-	},
-	
-	_removeData: function( elem, name ) {
-		return internalRemoveData( elem, name, true );
-	},
-
-	// A method for determining if a DOM node can handle the data expando
-	acceptData: function( elem ) {
-		var noData = elem.nodeName && jQuery.noData[ elem.nodeName.toLowerCase() ];
-
-		// nodes accept data unless otherwise specified; rejection can be conditional
-		return !noData || noData !== true && elem.getAttribute("classid") === noData;
-	}
-});
-
-jQuery.fn.extend({
-	data: function( key, value ) {
-		var attrs, name,
-			elem = this[0],
-			i = 0,
-			data = null;
-
-		// Gets all values
-		if ( key === undefined ) {
-			if ( this.length ) {
-				data = jQuery.data( elem );
-
-				if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
-					attrs = elem.attributes;
-					for ( ; i < attrs.length; i++ ) {
-						name = attrs[i].name;
-
-						if ( !name.indexOf( "data-" ) ) {
-							name = jQuery.camelCase( name.substring(5) );
-
-							dataAttr( elem, name, data[ name ] );
-						}
-					}
-					jQuery._data( elem, "parsedAttrs", true );
-				}
-			}
-
-			return data;
-		}
-
-		// Sets multiple values
-		if ( typeof key === "object" ) {
-			return this.each(function() {
-				jQuery.data( this, key );
-			});
-		}
-
-		return jQuery.access( this, function( value ) {
-
-			if ( value === undefined ) {
-				// Try to fetch any internally stored data first
-				return elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : null;
-			}
-
-			this.each(function() {
-				jQuery.data( this, key, value );
-			});
-		}, null, value, arguments.length > 1, null, true );
-	},
-
-	removeData: function( key ) {
-		return this.each(function() {
-			jQuery.removeData( this, key );
-		});
-	}
-});
-
-function dataAttr( elem, key, data ) {
-	// If nothing was found internally, try to fetch any
-	// data from the HTML5 data-* attribute
-	if ( data === undefined && elem.nodeType === 1 ) {
-
-		var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
-
-		data = elem.getAttribute( name );
-
-		if ( typeof data === "string" ) {
-			try {
-				data = data === "true" ? true :
-				data === "false" ? false :
-				data === "null" ? null :
-				// Only convert to a number if it doesn't change the string
-				+data + "" === data ? +data :
-				rbrace.test( data ) ? jQuery.parseJSON( data ) :
-					data;
-			} catch( e ) {}
-
-			// Make sure we set the data so it isn't changed later
-			jQuery.data( elem, key, data );
-
-		} else {
-			data = undefined;
-		}
-	}
-
-	return data;
-}
-
-// checks a cache object for emptiness
-function isEmptyDataObject( obj ) {
-	var name;
-	for ( name in obj ) {
-
-		// if the public data object is empty, the private is still empty
-		if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) {
-			continue;
-		}
-		if ( name !== "toJSON" ) {
-			return false;
-		}
-	}
-
-	return true;
-}
-jQuery.extend({
-	queue: function( elem, type, data ) {
-		var queue;
-
-		if ( elem ) {
-			type = ( type || "fx" ) + "queue";
-			queue = jQuery._data( elem, type );
-
-			// Speed up dequeue by getting out quickly if this is just a lookup
-			if ( data ) {
-				if ( !queue || jQuery.isArray(data) ) {
-					queue = jQuery._data( elem, type, jQuery.makeArray(data) );
-				} else {
-					queue.push( data );
-				}
-			}
-			return queue || [];
-		}
-	},
-
-	dequeue: function( elem, type ) {
-		type = type || "fx";
-
-		var queue = jQuery.queue( elem, type ),
-			startLength = queue.length,
-			fn = queue.shift(),
-			hooks = jQuery._queueHooks( elem, type ),
-			next = function() {
-				jQuery.dequeue( elem, type );
-			};
-
-		// If the fx queue is dequeued, always remove the progress sentinel
-		if ( fn === "inprogress" ) {
-			fn = queue.shift();
-			startLength--;
-		}
-
-		hooks.cur = fn;
-		if ( fn ) {
-
-			// Add a progress sentinel to prevent the fx queue from being
-			// automatically dequeued
-			if ( type === "fx" ) {
-				queue.unshift( "inprogress" );
-			}
-
-			// clear up the last queue stop function
-			delete hooks.stop;
-			fn.call( elem, next, hooks );
-		}
-
-		if ( !startLength && hooks ) {
-			hooks.empty.fire();
-		}
-	},
-
-	// not intended for public consumption - generates a queueHooks object, or returns the current one
-	_queueHooks: function( elem, type ) {
-		var key = type + "queueHooks";
-		return jQuery._data( elem, key ) || jQuery._data( elem, key, {
-			empty: jQuery.Callbacks("once memory").add(function() {
-				jQuery._removeData( elem, type + "queue" );
-				jQuery._removeData( elem, key );
-			})
-		});
-	}
-});
-
-jQuery.fn.extend({
-	queue: function( type, data ) {
-		var setter = 2;
-
-		if ( typeof type !== "string" ) {
-			data = type;
-			type = "fx";
-			setter--;
-		}
-
-		if ( arguments.length < setter ) {
-			return jQuery.queue( this[0], type );
-		}
-
-		return data === undefined ?
-			this :
-			this.each(function() {
-				var queue = jQuery.queue( this, type, data );
-
-				// ensure a hooks for this queue
-				jQuery._queueHooks( this, type );
-
-				if ( type === "fx" && queue[0] !== "inprogress" ) {
-					jQuery.dequeue( this, type );
-				}
-			});
-	},
-	dequeue: function( type ) {
-		return this.each(function() {
-			jQuery.dequeue( this, type );
-		});
-	},
-	// Based off of the plugin by Clint Helfers, with permission.
-	// http://blindsignals.com/index.php/2009/07/jquery-delay/
-	delay: function( time, type ) {
-		time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
-		type = type || "fx";
-
-		return this.queue( type, function( next, hooks ) {
-			var timeout = setTimeout( next, time );
-			hooks.stop = function() {
-				clearTimeout( timeout );
-			};
-		});
-	},
-	clearQueue: function( type ) {
-		return this.queue( type || "fx", [] );
-	},
-	// Get a promise resolved when queues of a certain type
-	// are emptied (fx is the type by default)
-	promise: function( type, obj ) {
-		var tmp,
-			count = 1,
-			defer = jQuery.Deferred(),
-			elements = this,
-			i = this.length,
-			resolve = function() {
-				if ( !( --count ) ) {
-					defer.resolveWith( elements, [ elements ] );
-				}
-			};
-
-		if ( typeof type !== "string" ) {
-			obj = type;
-			type = undefined;
-		}
-		type = type || "fx";
-
-		while( i-- ) {
-			tmp = jQuery._data( elements[ i ], type + "queueHooks" );
-			if ( tmp && tmp.empty ) {
-				count++;
-				tmp.empty.add( resolve );
-			}
-		}
-		resolve();
-		return defer.promise( obj );
-	}
-});
-var nodeHook, boolHook,
-	rclass = /[\t\r\n]/g,
-	rreturn = /\r/g,
-	rfocusable = /^(?:input|select|textarea|button|object)$/i,
-	rclickable = /^(?:a|area)$/i,
-	rboolean = /^(?:checked|selected|autofocus|autoplay|async|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped)$/i,
-	ruseDefault = /^(?:checked|selected)$/i,
-	getSetAttribute = jQuery.support.getSetAttribute,
-	getSetInput = jQuery.support.input;
-
-jQuery.fn.extend({
-	attr: function( name, value ) {
-		return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 );
-	},
-
-	removeAttr: function( name ) {
-		return this.each(function() {
-			jQuery.removeAttr( this, name );
-		});
-	},
-
-	prop: function( name, value ) {
-		return jQuery.access( this, jQuery.prop, name, value, arguments.length > 1 );
-	},
-
-	removeProp: function( name ) {
-		name = jQuery.propFix[ name ] || name;
-		return this.each(function() {
-			// try/catch handles cases where IE balks (such as removing a property on window)
-			try {
-				this[ name ] = undefined;
-				delete this[ name ];
-			} catch( e ) {}
-		});
-	},
-
-	addClass: function( value ) {
-		var classes, elem, cur, clazz, j,
-			i = 0,
-			len = this.length,
-			proceed = typeof value === "string" && value;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).addClass( value.call( this, j, this.className ) );
-			});
-		}
-
-		if ( proceed ) {
-			// The disjunction here is for better compressibility (see removeClass)
-			classes = ( value || "" ).match( core_rnotwhite ) || [];
-
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					" "
-				);
-
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
-							cur += clazz + " ";
-						}
-					}
-					elem.className = jQuery.trim( cur );
-
-				}
-			}
-		}
-
-		return this;
-	},
-
-	removeClass: function( value ) {
-		var classes, elem, cur, clazz, j,
-			i = 0,
-			len = this.length,
-			proceed = arguments.length === 0 || typeof value === "string" && value;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).removeClass( value.call( this, j, this.className ) );
-			});
-		}
-		if ( proceed ) {
-			classes = ( value || "" ).match( core_rnotwhite ) || [];
-
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				// This expression is here for better compressibility (see addClass)
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					""
-				);
-
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						// Remove *all* instances
-						while ( cur.indexOf( " " + clazz + " " ) >= 0 ) {
-							cur = cur.replace( " " + clazz + " ", " " );
-						}
-					}
-					elem.className = value ? jQuery.trim( cur ) : "";
-				}
-			}
-		}
-
-		return this;
-	},
-
-	toggleClass: function( value, stateVal ) {
-		var type = typeof value,
-			isBool = typeof stateVal === "boolean";
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( i ) {
-				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
-			});
-		}
-
-		return this.each(function() {
-			if ( type === "string" ) {
-				// toggle individual class names
-				var className,
-					i = 0,
-					self = jQuery( this ),
-					state = stateVal,
-					classNames = value.match( core_rnotwhite ) || [];
-
-				while ( (className = classNames[ i++ ]) ) {
-					// check each className given, space separated list
-					state = isBool ? state : !self.hasClass( className );
-					self[ state ? "addClass" : "removeClass" ]( className );
-				}
-
-			// Toggle whole class name
-			} else if ( type === "undefined" || type === "boolean" ) {
-				if ( this.className ) {
-					// store className if set
-					jQuery._data( this, "__className__", this.className );
-				}
-
-				// If the element has a class name or if we're passed "false",
-				// then remove the whole classname (if there was one, the above saved it).
-				// Otherwise bring back whatever was previously saved (if anything),
-				// falling back to the empty string if nothing was stored.
-				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
-			}
-		});
-	},
-
-	hasClass: function( selector ) {
-		var className = " " + selector + " ",
-			i = 0,
-			l = this.length;
-		for ( ; i < l; i++ ) {
-			if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
-				return true;
-			}
-		}
-
-		return false;
-	},
-
-	val: function( value ) {
-		var hooks, ret, isFunction,
-			elem = this[0];
-
-		if ( !arguments.length ) {
-			if ( elem ) {
-				hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
-
-				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
-					return ret;
-				}
-
-				ret = elem.value;
-
-				return typeof ret === "string" ?
-					// handle most common string cases
-					ret.replace(rreturn, "") :
-					// handle cases where value is null/undef or number
-					ret == null ? "" : ret;
-			}
-
-			return;
-		}
-
-		isFunction = jQuery.isFunction( value );
-
-		return this.each(function( i ) {
-			var val,
-				self = jQuery(this);
-
-			if ( this.nodeType !== 1 ) {
-				return;
-			}
-
-			if ( isFunction ) {
-				val = value.call( this, i, self.val() );
-			} else {
-				val = value;
-			}
-
-			// Treat null/undefined as ""; convert numbers to string
-			if ( val == null ) {
-				val = "";
-			} else if ( typeof val === "number" ) {
-				val += "";
-			} else if ( jQuery.isArray( val ) ) {
-				val = jQuery.map(val, function ( value ) {
-					return value == null ? "" : value + "";
-				});
-			}
-
-			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
-
-			// If set returns undefined, fall back to normal setting
-			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
-				this.value = val;
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	valHooks: {
-		option: {
-			get: function( elem ) {
-				// attributes.value is undefined in Blackberry 4.7 but
-				// uses .value. See #6932
-				var val = elem.attributes.value;
-				return !val || val.specified ? elem.value : elem.text;
-			}
-		},
-		select: {
-			get: function( elem ) {
-				var value, option,
-					options = elem.options,
-					index = elem.selectedIndex,
-					one = elem.type === "select-one" || index < 0,
-					values = one ? null : [],
-					max = one ? index + 1 : options.length,
-					i = index < 0 ?
-						max :
-						one ? index : 0;
-
-				// Loop through all the selected options
-				for ( ; i < max; i++ ) {
-					option = options[ i ];
-
-					// oldIE doesn't update selected after form reset (#2551)
-					if ( ( option.selected || i === index ) &&
-							// Don't return options that are disabled or in a disabled optgroup
-							( jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null ) &&
-							( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
-
-						// Get the specific value for the option
-						value = jQuery( option ).val();
-
-						// We don't need an array for one selects
-						if ( one ) {
-							return value;
-						}
-
-						// Multi-Selects return an array
-						values.push( value );
-					}
-				}
-
-				return values;
-			},
-
-			set: function( elem, value ) {
-				var values = jQuery.makeArray( value );
-
-				jQuery(elem).find("option").each(function() {
-					this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
-				});
-
-				if ( !values.length ) {
-					elem.selectedIndex = -1;
-				}
-				return values;
-			}
-		}
-	},
-
-	attr: function( elem, name, value ) {
-		var ret, hooks, notxml,
-			nType = elem.nodeType;
-
-		// don't get/set attributes on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		// Fallback to prop when attributes are not supported
-		if ( typeof elem.getAttribute === "undefined" ) {
-			return jQuery.prop( elem, name, value );
-		}
-
-		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-		// All attributes are lowercase
-		// Grab necessary hook if one is defined
-		if ( notxml ) {
-			name = name.toLowerCase();
-			hooks = jQuery.attrHooks[ name ] || ( rboolean.test( name ) ? boolHook : nodeHook );
-		}
-
-		if ( value !== undefined ) {
-
-			if ( value === null ) {
-				jQuery.removeAttr( elem, name );
-
-			} else if ( hooks && notxml && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				elem.setAttribute( name, value + "" );
-				return value;
-			}
-
-		} else if ( hooks && notxml && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
-			return ret;
-
-		} else {
-
-			// In IE9+, Flash objects don't have .getAttribute (#12945)
-			// Support: IE9+
-			if ( typeof elem.getAttribute !== "undefined" ) {
-				ret =  elem.getAttribute( name );
-			}
-
-			// Non-existent attributes return null, we normalize to undefined
-			return ret == null ?
-				undefined :
-				ret;
-		}
-	},
-
-	removeAttr: function( elem, value ) {
-		var name, propName,
-			i = 0,
-			attrNames = value && value.match( core_rnotwhite );
-
-		if ( attrNames && elem.nodeType === 1 ) {
-			while ( (name = attrNames[i++]) ) {
-				propName = jQuery.propFix[ name ] || name;
-
-				// Boolean attributes get special treatment (#10870)
-				if ( rboolean.test( name ) ) {
-					// Set corresponding property to false for boolean attributes
-					// Also clear defaultChecked/defaultSelected (if appropriate) for IE<8
-					if ( !getSetAttribute && ruseDefault.test( name ) ) {
-						elem[ jQuery.camelCase( "default-" + name ) ] =
-							elem[ propName ] = false;
-					} else {
-						elem[ propName ] = false;
-					}
-
-				// See #9699 for explanation of this approach (setting first, then removal)
-				} else {
-					jQuery.attr( elem, name, "" );
-				}
-
-				elem.removeAttribute( getSetAttribute ? name : propName );
-			}
-		}
-	},
-
-	attrHooks: {
-		type: {
-			set: function( elem, value ) {
-				if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
-					// Setting the type on a radio button after the value resets the value in IE6-9
-					// Reset value to default in case type is set after value during creation
-					var val = elem.value;
-					elem.setAttribute( "type", value );
-					if ( val ) {
-						elem.value = val;
-					}
-					return value;
-				}
-			}
-		}
-	},
-
-	propFix: {
-		tabindex: "tabIndex",
-		readonly: "readOnly",
-		"for": "htmlFor",
-		"class": "className",
-		maxlength: "maxLength",
-		cellspacing: "cellSpacing",
-		cellpadding: "cellPadding",
-		rowspan: "rowSpan",
-		colspan: "colSpan",
-		usemap: "useMap",
-		frameborder: "frameBorder",
-		contenteditable: "contentEditable"
-	},
-
-	prop: function( elem, name, value ) {
-		var ret, hooks, notxml,
-			nType = elem.nodeType;
-
-		// don't get/set properties on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-		if ( notxml ) {
-			// Fix name and attach hooks
-			name = jQuery.propFix[ name ] || name;
-			hooks = jQuery.propHooks[ name ];
-		}
-
-		if ( value !== undefined ) {
-			if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				return ( elem[ name ] = value );
-			}
-
-		} else {
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
-				return ret;
-
-			} else {
-				return elem[ name ];
-			}
-		}
-	},
-
-	propHooks: {
-		tabIndex: {
-			get: function( elem ) {
-				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
-				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-				var attributeNode = elem.getAttributeNode("tabindex");
-
-				return attributeNode && attributeNode.specified ?
-					parseInt( attributeNode.value, 10 ) :
-					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
-						0 :
-						undefined;
-			}
-		}
-	}
-});
-
-// Hook for boolean attributes
-boolHook = {
-	get: function( elem, name ) {
-		var
-			// Use .prop to determine if this attribute is understood as boolean
-			prop = jQuery.prop( elem, name ),
-
-			// Fetch it accordingly
-			attr = typeof prop === "boolean" && elem.getAttribute( name ),
-			detail = typeof prop === "boolean" ?
-
-				getSetInput && getSetAttribute ?
-					attr != null :
-					// oldIE fabricates an empty string for missing boolean attributes
-					// and conflates checked/selected into attroperties
-					ruseDefault.test( name ) ?
-						elem[ jQuery.camelCase( "default-" + name ) ] :
-						!!attr :
-
-				// fetch an attribute node for properties not recognized as boolean
-				elem.getAttributeNode( name );
-
-		return detail && detail.value !== false ?
-			name.toLowerCase() :
-			undefined;
-	},
-	set: function( elem, value, name ) {
-		if ( value === false ) {
-			// Remove boolean attributes when set to false
-			jQuery.removeAttr( elem, name );
-		} else if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
-			// IE<8 needs the *property* name
-			elem.setAttribute( !getSetAttribute && jQuery.propFix[ name ] || name, name );
-
-		// Use defaultChecked and defaultSelected for oldIE
-		} else {
-			elem[ jQuery.camelCase( "default-" + name ) ] = elem[ name ] = true;
-		}
-
-		return name;
-	}
-};
-
-// fix oldIE value attroperty
-if ( !getSetInput || !getSetAttribute ) {
-	jQuery.attrHooks.value = {
-		get: function( elem, name ) {
-			var ret = elem.getAttributeNode( name );
-			return jQuery.nodeName( elem, "input" ) ?
-
-				// Ignore the value *property* by using defaultValue
-				elem.defaultValue :
-
-				ret && ret.specified ? ret.value : undefined;
-		},
-		set: function( elem, value, name ) {
-			if ( jQuery.nodeName( elem, "input" ) ) {
-				// Does not return so that setAttribute is also used
-				elem.defaultValue = value;
-			} else {
-				// Use nodeHook if defined (#1954); otherwise setAttribute is fine
-				return nodeHook && nodeHook.set( elem, value, name );
-			}
-		}
-	};
-}
-
-// IE6/7 do not support getting/setting some attributes with get/setAttribute
-if ( !getSetAttribute ) {
-
-	// Use this for any attribute in IE6/7
-	// This fixes almost every IE6/7 issue
-	nodeHook = jQuery.valHooks.button = {
-		get: function( elem, name ) {
-			var ret = elem.getAttributeNode( name );
-			return ret && ( name === "id" || name === "name" || name === "coords" ? ret.value !== "" : ret.specified ) ?
-				ret.value :
-				undefined;
-		},
-		set: function( elem, value, name ) {
-			// Set the existing or create a new attribute node
-			var ret = elem.getAttributeNode( name );
-			if ( !ret ) {
-				elem.setAttributeNode(
-					(ret = elem.ownerDocument.createAttribute( name ))
-				);
-			}
-
-			ret.value = value += "";
-
-			// Break association with cloned elements by also using setAttribute (#9646)
-			return name === "value" || value === elem.getAttribute( name ) ?
-				value :
-				undefined;
-		}
-	};
-
-	// Set contenteditable to false on removals(#10429)
-	// Setting to empty string throws an error as an invalid value
-	jQuery.attrHooks.contenteditable = {
-		get: nodeHook.get,
-		set: function( elem, value, name ) {
-			nodeHook.set( elem, value === "" ? false : value, name );
-		}
-	};
-
-	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
-	// This is for removals
-	jQuery.each([ "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
-			set: function( elem, value ) {
-				if ( value === "" ) {
-					elem.setAttribute( name, "auto" );
-					return value;
-				}
-			}
-		});
-	});
-}
-
-
-// Some attributes require a special call on IE
-// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !jQuery.support.hrefNormalized ) {
-	jQuery.each([ "href", "src", "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
-			get: function( elem ) {
-				var ret = elem.getAttribute( name, 2 );
-				return ret == null ? undefined : ret;
-			}
-		});
-	});
-
-	// href/src property should get the full normalized URL (#10299/#12915)
-	jQuery.each([ "href", "src" ], function( i, name ) {
-		jQuery.propHooks[ name ] = {
-			get: function( elem ) {
-				return elem.getAttribute( name, 4 );
-			}
-		};
-	});
-}
-
-if ( !jQuery.support.style ) {
-	jQuery.attrHooks.style = {
-		get: function( elem ) {
-			// Return undefined in the case of empty string
-			// Note: IE uppercases css property names, but if we were to .toLowerCase()
-			// .cssText, that would destroy case senstitivity in URL's, like in "background"
-			return elem.style.cssText || undefined;
-		},
-		set: function( elem, value ) {
-			return ( elem.style.cssText = value + "" );
-		}
-	};
-}
-
-// Safari mis-reports the default selected property of an option
-// Accessing the parent's selectedIndex property fixes it
-if ( !jQuery.support.optSelected ) {
-	jQuery.propHooks.selected = jQuery.extend( jQuery.propHooks.selected, {
-		get: function( elem ) {
-			var parent = elem.parentNode;
-
-			if ( parent ) {
-				parent.selectedIndex;
-
-				// Make sure that it also works with optgroups, see #5701
-				if ( parent.parentNode ) {
-					parent.parentNode.selectedIndex;
-				}
-			}
-			return null;
-		}
-	});
-}
-
-// IE6/7 call enctype encoding
-if ( !jQuery.support.enctype ) {
-	jQuery.propFix.enctype = "encoding";
-}
-
-// Radios and checkboxes getter/setter
-if ( !jQuery.support.checkOn ) {
-	jQuery.each([ "radio", "checkbox" ], function() {
-		jQuery.valHooks[ this ] = {
-			get: function( elem ) {
-				// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
-				return elem.getAttribute("value") === null ? "on" : elem.value;
-			}
-		};
-	});
-}
-jQuery.each([ "radio", "checkbox" ], function() {
-	jQuery.valHooks[ this ] = jQuery.extend( jQuery.valHooks[ this ], {
-		set: function( elem, value ) {
-			if ( jQuery.isArray( value ) ) {
-				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
-			}
-		}
-	});
-});
-var rformElems = /^(?:input|select|textarea)$/i,
-	rkeyEvent = /^key/,
-	rmouseEvent = /^(?:mouse|contextmenu)|click/,
-	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
-	rtypenamespace = /^([^.]*)(?:\.(.+)|)$/;
-
-function returnTrue() {
-	return true;
-}
-
-function returnFalse() {
-	return false;
-}
-
-/*
- * Helper functions for managing events -- not part of the public interface.
- * Props to Dean Edwards' addEvent library for many of the ideas.
- */
-jQuery.event = {
-
-	global: {},
-
-	add: function( elem, types, handler, data, selector ) {
-
-		var handleObjIn, eventHandle, tmp,
-			events, t, handleObj,
-			special, handlers, type, namespaces, origType,
-			// Don't attach events to noData or text/comment nodes (but allow plain objects)
-			elemData = elem.nodeType !== 3 && elem.nodeType !== 8 && jQuery._data( elem );
-
-		if ( !elemData ) {
-			return;
-		}
-
-		// Caller can pass in an object of custom data in lieu of the handler
-		if ( handler.handler ) {
-			handleObjIn = handler;
-			handler = handleObjIn.handler;
-			selector = handleObjIn.selector;
-		}
-
-		// Make sure that the handler has a unique ID, used to find/remove it later
-		if ( !handler.guid ) {
-			handler.guid = jQuery.guid++;
-		}
-
-		// Init the element's event structure and main handler, if this is the first
-		if ( !(events = elemData.events) ) {
-			events = elemData.events = {};
-		}
-		if ( !(eventHandle = elemData.handle) ) {
-			eventHandle = elemData.handle = function( e ) {
-				// Discard the second event of a jQuery.event.trigger() and
-				// when an event is called after a page has unloaded
-				return typeof jQuery !== "undefined" && (!e || jQuery.event.triggered !== e.type) ?
-					jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
-					undefined;
-			};
-			// Add elem as a property of the handle fn to prevent a memory leak with IE non-native events
-			eventHandle.elem = elem;
-		}
-
-		// Handle multiple events separated by a space
-		// jQuery(...).bind("mouseover mouseout", fn);
-		types = ( types || "" ).match( core_rnotwhite ) || [""];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-			// If event changes its type, use the special event handlers for the changed type
-			special = jQuery.event.special[ type ] || {};
-
-			// If selector defined, determine special event api type, otherwise given type
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-
-			// Update special based on newly reset type
-			special = jQuery.event.special[ type ] || {};
-
-			// handleObj is passed to all event handlers
-			handleObj = jQuery.extend({
-				type: type,
-				origType: origType,
-				data: data,
-				handler: handler,
-				guid: handler.guid,
-				selector: selector,
-				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
-				namespace: namespaces.join(".")
-			}, handleObjIn );
-
-			// Init the event handler queue if we're the first
-			if ( !(handlers = events[ type ]) ) {
-				handlers = events[ type ] = [];
-				handlers.delegateCount = 0;
-
-				// Only use addEventListener/attachEvent if the special events handler returns false
-				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-					// Bind the global event handler to the element
-					if ( elem.addEventListener ) {
-						elem.addEventListener( type, eventHandle, false );
-
-					} else if ( elem.attachEvent ) {
-						elem.attachEvent( "on" + type, eventHandle );
-					}
-				}
-			}
-
-			if ( special.add ) {
-				special.add.call( elem, handleObj );
-
-				if ( !handleObj.handler.guid ) {
-					handleObj.handler.guid = handler.guid;
-				}
-			}
-
-			// Add to the element's handler list, delegates in front
-			if ( selector ) {
-				handlers.splice( handlers.delegateCount++, 0, handleObj );
-			} else {
-				handlers.push( handleObj );
-			}
-
-			// Keep track of which events have ever been used, for event optimization
-			jQuery.event.global[ type ] = true;
-		}
-
-		// Nullify elem to prevent memory leaks in IE
-		elem = null;
-	},
-
-	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, selector, mappedTypes ) {
-
-		var j, origCount, tmp,
-			events, t, handleObj,
-			special, handlers, type, namespaces, origType,
-			elemData = jQuery.hasData( elem ) && jQuery._data( elem );
-
-		if ( !elemData || !(events = elemData.events) ) {
-			return;
-		}
-
-		// Once for each type.namespace in types; type may be omitted
-		types = ( types || "" ).match( core_rnotwhite ) || [""];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-			// Unbind all events (on this namespace, if provided) for the element
-			if ( !type ) {
-				for ( type in events ) {
-					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
-				}
-				continue;
-			}
-
-			special = jQuery.event.special[ type ] || {};
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-			handlers = events[ type ] || [];
-			tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" );
-
-			// Remove matching events
-			origCount = j = handlers.length;
-			while ( j-- ) {
-				handleObj = handlers[ j ];
-
-				if ( ( mappedTypes || origType === handleObj.origType ) &&
-					( !handler || handler.guid === handleObj.guid ) &&
-					( !tmp || tmp.test( handleObj.namespace ) ) &&
-					( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
-					handlers.splice( j, 1 );
-
-					if ( handleObj.selector ) {
-						handlers.delegateCount--;
-					}
-					if ( special.remove ) {
-						special.remove.call( elem, handleObj );
-					}
-				}
-			}
-
-			// Remove generic event handler if we removed something and no more handlers exist
-			// (avoids potential for endless recursion during removal of special event handlers)
-			if ( origCount && !handlers.length ) {
-				if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
-					jQuery.removeEvent( elem, type, elemData.handle );
-				}
-
-				delete events[ type ];
-			}
-		}
-
-		// Remove the expando if it's no longer used
-		if ( jQuery.isEmptyObject( events ) ) {
-			delete elemData.handle;
-
-			// removeData also checks for emptiness and clears the expando if empty
-			// so use it instead of delete
-			jQuery._removeData( elem, "events" );
-		}
-	},
-
-	trigger: function( event, data, elem, onlyHandlers ) {
-
-		var i, cur, tmp, bubbleType, ontype, handle, special,
-			eventPath = [ elem || document ],
-			type = event.type || event,
-			namespaces = event.namespace ? event.namespace.split(".") : [];
-
-		cur = tmp = elem = elem || document;
-
-		// Don't do events on text and comment nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		// focus/blur morphs to focusin/out; ensure we're not firing them right now
-		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
-			return;
-		}
-
-		if ( type.indexOf(".") >= 0 ) {
-			// Namespaced trigger; create a regexp to match event type in handle()
-			namespaces = type.split(".");
-			type = namespaces.shift();
-			namespaces.sort();
-		}
-		ontype = type.indexOf(":") < 0 && "on" + type;
-
-		// Caller can pass in a jQuery.Event object, Object, or just an event type string
-		event = event[ jQuery.expando ] ?
-			event :
-			new jQuery.Event( type, typeof event === "object" && event );
-
-		event.isTrigger = true;
-		event.namespace = namespaces.join(".");
-		event.namespace_re = event.namespace ?
-			new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) :
-			null;
-
-		// Clean up the event in case it is being reused
-		event.result = undefined;
-		if ( !event.target ) {
-			event.target = elem;
-		}
-
-		// Clone any incoming data and prepend the event, creating the handler arg list
-		data = data == null ?
-			[ event ] :
-			jQuery.makeArray( data, [ event ] );
-
-		// Allow special events to draw outside the lines
-		special = jQuery.event.special[ type ] || {};
-		if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
-			return;
-		}
-
-		// Determine event propagation path in advance, per W3C events spec (#9951)
-		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
-		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
-
-			bubbleType = special.delegateType || type;
-			if ( !rfocusMorph.test( bubbleType + type ) ) {
-				cur = cur.parentNode;
-			}
-			for ( ; cur; cur = cur.parentNode ) {
-				eventPath.push( cur );
-				tmp = cur;
-			}
-
-			// Only add window if we got to document (e.g., not plain obj or detached DOM)
-			if ( tmp === (elem.ownerDocument || document) ) {
-				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
-			}
-		}
-
-		// Fire handlers on the event path
-		i = 0;
-		while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) {
-
-			event.type = i > 1 ?
-				bubbleType :
-				special.bindType || type;
-
-			// jQuery handler
-			handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" );
-			if ( handle ) {
-				handle.apply( cur, data );
-			}
-
-			// Native handler
-			handle = ontype && cur[ ontype ];
-			if ( handle && jQuery.acceptData( cur ) && handle.apply && handle.apply( cur, data ) === false ) {
-				event.preventDefault();
-			}
-		}
-		event.type = type;
-
-		// If nobody prevented the default action, do it now
-		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
-
-			if ( (!special._default || special._default.apply( elem.ownerDocument, data ) === false) &&
-				!(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) {
-
-				// Call a native DOM method on the target with the same name name as the event.
-				// Can't use an .isFunction() check here because IE6/7 fails that test.
-				// Don't do default actions on window, that's where global variables be (#6170)
-				if ( ontype && elem[ type ] && !jQuery.isWindow( elem ) ) {
-
-					// Don't re-trigger an onFOO event when we call its FOO() method
-					tmp = elem[ ontype ];
-
-					if ( tmp ) {
-						elem[ ontype ] = null;
-					}
-
-					// Prevent re-triggering of the same event, since we already bubbled it above
-					jQuery.event.triggered = type;
-					try {
-						elem[ type ]();
-					} catch ( e ) {
-						// IE<9 dies on focus/blur to hidden element (#1486,#12518)
-						// only reproducible on winXP IE8 native, not IE9 in IE8 mode
-					}
-					jQuery.event.triggered = undefined;
-
-					if ( tmp ) {
-						elem[ ontype ] = tmp;
-					}
-				}
-			}
-		}
-
-		return event.result;
-	},
-
-	dispatch: function( event ) {
-
-		// Make a writable jQuery.Event from the native event object
-		event = jQuery.event.fix( event );
-
-		var i, j, ret, matched, handleObj,
-			handlerQueue = [],
-			args = core_slice.call( arguments ),
-			handlers = ( jQuery._data( this, "events" ) || {} )[ event.type ] || [],
-			special = jQuery.event.special[ event.type ] || {};
-
-		// Use the fix-ed jQuery.Event rather than the (read-only) native event
-		args[0] = event;
-		event.delegateTarget = this;
-
-		// Call the preDispatch hook for the mapped type, and let it bail if desired
-		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
-			return;
-		}
-
-		// Determine handlers
-		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
-
-		// Run delegates first; they may want to stop propagation beneath us
-		i = 0;
-		while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) {
-			event.currentTarget = matched.elem;
-
-			j = 0;
-			while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) {
-
-				// Triggered event must either 1) have no namespace, or
-				// 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
-				if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) {
-
-					event.handleObj = handleObj;
-					event.data = handleObj.data;
-
-					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
-							.apply( matched.elem, args );
-
-					if ( ret !== undefined ) {
-						if ( (event.result = ret) === false ) {
-							event.preventDefault();
-							event.stopPropagation();
-						}
-					}
-				}
-			}
-		}
-
-		// Call the postDispatch hook for the mapped type
-		if ( special.postDispatch ) {
-			special.postDispatch.call( this, event );
-		}
-
-		return event.result;
-	},
-
-	handlers: function( event, handlers ) {
-		var i, matches, sel, handleObj,
-			handlerQueue = [],
-			delegateCount = handlers.delegateCount,
-			cur = event.target;
-
-		// Find delegate handlers
-		// Black-hole SVG  instance trees (#13180)
-		// Avoid non-left-click bubbling in Firefox (#3861)
-		if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) {
-
-			for ( ; cur != this; cur = cur.parentNode || this ) {
-
-				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
-				if ( cur.disabled !== true || event.type !== "click" ) {
-					matches = [];
-					for ( i = 0; i < delegateCount; i++ ) {
-						handleObj = handlers[ i ];
-
-						// Don't conflict with Object.prototype properties (#13203)
-						sel = handleObj.selector + " ";
-
-						if ( matches[ sel ] === undefined ) {
-							matches[ sel ] = handleObj.needsContext ?
-								jQuery( sel, this ).index( cur ) >= 0 :
-								jQuery.find( sel, this, null, [ cur ] ).length;
-						}
-						if ( matches[ sel ] ) {
-							matches.push( handleObj );
-						}
-					}
-					if ( matches.length ) {
-						handlerQueue.push({ elem: cur, handlers: matches });
-					}
-				}
-			}
-		}
-
-		// Add the remaining (directly-bound) handlers
-		if ( delegateCount < handlers.length ) {
-			handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) });
-		}
-
-		return handlerQueue;
-	},
-
-	fix: function( event ) {
-		if ( event[ jQuery.expando ] ) {
-			return event;
-		}
-
-		// Create a writable copy of the event object and normalize some properties
-		var i, prop,
-			originalEvent = event,
-			fixHook = jQuery.event.fixHooks[ event.type ] || {},
-			copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
-
-		event = new jQuery.Event( originalEvent );
-
-		i = copy.length;
-		while ( i-- ) {
-			prop = copy[ i ];
-			event[ prop ] = originalEvent[ prop ];
-		}
-
-		// Support: IE<9
-		// Fix target property (#1925)
-		if ( !event.target ) {
-			event.target = originalEvent.srcElement || document;
-		}
-
-		// Support: Chrome 23+, Safari?
-		// Target should not be a text node (#504, #13143)
-		if ( event.target.nodeType === 3 ) {
-			event.target = event.target.parentNode;
-		}
-
-		// Support: IE<9
-		// For mouse/key events, metaKey==false if it's undefined (#3368, #11328)
-		event.metaKey = !!event.metaKey;
-
-		return fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
-	},
-
-	// Includes some event props shared by KeyEvent and MouseEvent
-	props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
-
-	fixHooks: {},
-
-	keyHooks: {
-		props: "char charCode key keyCode".split(" "),
-		filter: function( event, original ) {
-
-			// Add which for key events
-			if ( event.which == null ) {
-				event.which = original.charCode != null ? original.charCode : original.keyCode;
-			}
-
-			return event;
-		}
-	},
-
-	mouseHooks: {
-		props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
-		filter: function( event, original ) {
-			var eventDoc, doc, body,
-				button = original.button,
-				fromElement = original.fromElement;
-
-			// Calculate pageX/Y if missing and clientX/Y available
-			if ( event.pageX == null && original.clientX != null ) {
-				eventDoc = event.target.ownerDocument || document;
-				doc = eventDoc.documentElement;
-				body = eventDoc.body;
-
-				event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
-				event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
-			}
-
-			// Add relatedTarget, if necessary
-			if ( !event.relatedTarget && fromElement ) {
-				event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
-			}
-
-			// Add which for click: 1 === left; 2 === middle; 3 === right
-			// Note: button is not normalized, so don't use it
-			if ( !event.which && button !== undefined ) {
-				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
-			}
-
-			return event;
-		}
-	},
-
-	special: {
-		load: {
-			// Prevent triggered image.load events from bubbling to window.load
-			noBubble: true
-		},
-		click: {
-			// For checkbox, fire native event so checked state will be right
-			trigger: function() {
-				if ( jQuery.nodeName( this, "input" ) && this.type === "checkbox" && this.click ) {
-					this.click();
-					return false;
-				}
-			}
-		},
-		focus: {
-			// Fire native event if possible so blur/focus sequence is correct
-			trigger: function() {
-				if ( this !== document.activeElement && this.focus ) {
-					try {
-						this.focus();
-						return false;
-					} catch ( e ) {
-						// Support: IE<9
-						// If we error on focus to hidden element (#1486, #12518),
-						// let .trigger() run the handlers
-					}
-				}
-			},
-			delegateType: "focusin"
-		},
-		blur: {
-			trigger: function() {
-				if ( this === document.activeElement && this.blur ) {
-					this.blur();
-					return false;
-				}
-			},
-			delegateType: "focusout"
-		},
-
-		beforeunload: {
-			postDispatch: function( event ) {
-
-				// Even when returnValue equals to undefined Firefox will still show alert
-				if ( event.result !== undefined ) {
-					event.originalEvent.returnValue = event.result;
-				}
-			}
-		}
-	},
-
-	simulate: function( type, elem, event, bubble ) {
-		// Piggyback on a donor event to simulate a different one.
-		// Fake originalEvent to avoid donor's stopPropagation, but if the
-		// simulated event prevents default then we do the same on the donor.
-		var e = jQuery.extend(
-			new jQuery.Event(),
-			event,
-			{ type: type,
-				isSimulated: true,
-				originalEvent: {}
-			}
-		);
-		if ( bubble ) {
-			jQuery.event.trigger( e, null, elem );
-		} else {
-			jQuery.event.dispatch.call( elem, e );
-		}
-		if ( e.isDefaultPrevented() ) {
-			event.preventDefault();
-		}
-	}
-};
-
-jQuery.removeEvent = document.removeEventListener ?
-	function( elem, type, handle ) {
-		if ( elem.removeEventListener ) {
-			elem.removeEventListener( type, handle, false );
-		}
-	} :
-	function( elem, type, handle ) {
-		var name = "on" + type;
-
-		if ( elem.detachEvent ) {
-
-			// #8545, #7054, preventing memory leaks for custom events in IE6-8
-			// detachEvent needed property on element, by name of that event, to properly expose it to GC
-			if ( typeof elem[ name ] === "undefined" ) {
-				elem[ name ] = null;
-			}
-
-			elem.detachEvent( name, handle );
-		}
-	};
-
-jQuery.Event = function( src, props ) {
-	// Allow instantiation without the 'new' keyword
-	if ( !(this instanceof jQuery.Event) ) {
-		return new jQuery.Event( src, props );
-	}
-
-	// Event object
-	if ( src && src.type ) {
-		this.originalEvent = src;
-		this.type = src.type;
-
-		// Events bubbling up the document may have been marked as prevented
-		// by a handler lower down the tree; reflect the correct value.
-		this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false ||
-			src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse;
-
-	// Event type
-	} else {
-		this.type = src;
-	}
-
-	// Put explicitly provided properties onto the event object
-	if ( props ) {
-		jQuery.extend( this, props );
-	}
-
-	// Create a timestamp if incoming event doesn't have one
-	this.timeStamp = src && src.timeStamp || jQuery.now();
-
-	// Mark it as fixed
-	this[ jQuery.expando ] = true;
-};
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
-	isDefaultPrevented: returnFalse,
-	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse,
-
-	preventDefault: function() {
-		var e = this.originalEvent;
-
-		this.isDefaultPrevented = returnTrue;
-		if ( !e ) {
-			return;
-		}
-
-		// If preventDefault exists, run it on the original event
-		if ( e.preventDefault ) {
-			e.preventDefault();
-
-		// Support: IE
-		// Otherwise set the returnValue property of the original event to false
-		} else {
-			e.returnValue = false;
-		}
-	},
-	stopPropagation: function() {
-		var e = this.originalEvent;
-
-		this.isPropagationStopped = returnTrue;
-		if ( !e ) {
-			return;
-		}
-		// If stopPropagation exists, run it on the original event
-		if ( e.stopPropagation ) {
-			e.stopPropagation();
-		}
-
-		// Support: IE
-		// Set the cancelBubble property of the original event to true
-		e.cancelBubble = true;
-	},
-	stopImmediatePropagation: function() {
-		this.isImmediatePropagationStopped = returnTrue;
-		this.stopPropagation();
-	}
-};
-
-// Create mouseenter/leave events using mouseover/out and event-time checks
-jQuery.each({
-	mouseenter: "mouseover",
-	mouseleave: "mouseout"
-}, function( orig, fix ) {
-	jQuery.event.special[ orig ] = {
-		delegateType: fix,
-		bindType: fix,
-
-		handle: function( event ) {
-			var ret,
-				target = this,
-				related = event.relatedTarget,
-				handleObj = event.handleObj;
-
-			// For mousenter/leave call the handler if related is outside the target.
-			// NB: No relatedTarget if the mouse left/entered the browser window
-			if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
-				event.type = handleObj.origType;
-				ret = handleObj.handler.apply( this, arguments );
-				event.type = fix;
-			}
-			return ret;
-		}
-	};
-});
-
-// IE submit delegation
-if ( !jQuery.support.submitBubbles ) {
-
-	jQuery.event.special.submit = {
-		setup: function() {
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
-			}
-
-			// Lazy-add a submit handler when a descendant form may potentially be submitted
-			jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
-				// Node name check avoids a VML-related crash in IE (#9807)
-				var elem = e.target,
-					form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined;
-				if ( form && !jQuery._data( form, "submitBubbles" ) ) {
-					jQuery.event.add( form, "submit._submit", function( event ) {
-						event._submit_bubble = true;
-					});
-					jQuery._data( form, "submitBubbles", true );
-				}
-			});
-			// return undefined since we don't need an event listener
-		},
-
-		postDispatch: function( event ) {
-			// If form was submitted by the user, bubble the event up the tree
-			if ( event._submit_bubble ) {
-				delete event._submit_bubble;
-				if ( this.parentNode && !event.isTrigger ) {
-					jQuery.event.simulate( "submit", this.parentNode, event, true );
-				}
-			}
-		},
-
-		teardown: function() {
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
-			}
-
-			// Remove delegated handlers; cleanData eventually reaps submit handlers attached above
-			jQuery.event.remove( this, "._submit" );
-		}
-	};
-}
-
-// IE change delegation and checkbox/radio fix
-if ( !jQuery.support.changeBubbles ) {
-
-	jQuery.event.special.change = {
-
-		setup: function() {
-
-			if ( rformElems.test( this.nodeName ) ) {
-				// IE doesn't fire change on a check/radio until blur; trigger it on click
-				// after a propertychange. Eat the blur-change in special.change.handle.
-				// This still fires onchange a second time for check/radio after blur.
-				if ( this.type === "checkbox" || this.type === "radio" ) {
-					jQuery.event.add( this, "propertychange._change", function( event ) {
-						if ( event.originalEvent.propertyName === "checked" ) {
-							this._just_changed = true;
-						}
-					});
-					jQuery.event.add( this, "click._change", function( event ) {
-						if ( this._just_changed && !event.isTrigger ) {
-							this._just_changed = false;
-						}
-						// Allow triggered, simulated change events (#11500)
-						jQuery.event.simulate( "change", this, event, true );
-					});
-				}
-				return false;
-			}
-			// Delegated event; lazy-add a change handler on descendant inputs
-			jQuery.event.add( this, "beforeactivate._change", function( e ) {
-				var elem = e.target;
-
-				if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "changeBubbles" ) ) {
-					jQuery.event.add( elem, "change._change", function( event ) {
-						if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
-							jQuery.event.simulate( "change", this.parentNode, event, true );
-						}
-					});
-					jQuery._data( elem, "changeBubbles", true );
-				}
-			});
-		},
-
-		handle: function( event ) {
-			var elem = event.target;
-
-			// Swallow native change events from checkbox/radio, we already triggered them above
-			if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) {
-				return event.handleObj.handler.apply( this, arguments );
-			}
-		},
-
-		teardown: function() {
-			jQuery.event.remove( this, "._change" );
-
-			return !rformElems.test( this.nodeName );
-		}
-	};
-}
-
-// Create "bubbling" focus and blur events
-if ( !jQuery.support.focusinBubbles ) {
-	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-
-		// Attach a single capturing handler while someone wants focusin/focusout
-		var attaches = 0,
-			handler = function( event ) {
-				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
-			};
-
-		jQuery.event.special[ fix ] = {
-			setup: function() {
-				if ( attaches++ === 0 ) {
-					document.addEventListener( orig, handler, true );
-				}
-			},
-			teardown: function() {
-				if ( --attaches === 0 ) {
-					document.removeEventListener( orig, handler, true );
-				}
-			}
-		};
-	});
-}
-
-jQuery.fn.extend({
-
-	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
-		var origFn, type;
-
-		// Types can be a map of types/handlers
-		if ( typeof types === "object" ) {
-			// ( types-Object, selector, data )
-			if ( typeof selector !== "string" ) {
-				// ( types-Object, data )
-				data = data || selector;
-				selector = undefined;
-			}
-			for ( type in types ) {
-				this.on( type, selector, data, types[ type ], one );
-			}
-			return this;
-		}
-
-		if ( data == null && fn == null ) {
-			// ( types, fn )
-			fn = selector;
-			data = selector = undefined;
-		} else if ( fn == null ) {
-			if ( typeof selector === "string" ) {
-				// ( types, selector, fn )
-				fn = data;
-				data = undefined;
-			} else {
-				// ( types, data, fn )
-				fn = data;
-				data = selector;
-				selector = undefined;
-			}
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		} else if ( !fn ) {
-			return this;
-		}
-
-		if ( one === 1 ) {
-			origFn = fn;
-			fn = function( event ) {
-				// Can use an empty set, since event contains the info
-				jQuery().off( event );
-				return origFn.apply( this, arguments );
-			};
-			// Use same guid so caller can remove using origFn
-			fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
-		}
-		return this.each( function() {
-			jQuery.event.add( this, types, fn, data, selector );
-		});
-	},
-	one: function( types, selector, data, fn ) {
-		return this.on( types, selector, data, fn, 1 );
-	},
-	off: function( types, selector, fn ) {
-		var handleObj, type;
-		if ( types && types.preventDefault && types.handleObj ) {
-			// ( event )  dispatched jQuery.Event
-			handleObj = types.handleObj;
-			jQuery( types.delegateTarget ).off(
-				handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
-				handleObj.selector,
-				handleObj.handler
-			);
-			return this;
-		}
-		if ( typeof types === "object" ) {
-			// ( types-object [, selector] )
-			for ( type in types ) {
-				this.off( type, selector, types[ type ] );
-			}
-			return this;
-		}
-		if ( selector === false || typeof selector === "function" ) {
-			// ( types [, fn] )
-			fn = selector;
-			selector = undefined;
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		}
-		return this.each(function() {
-			jQuery.event.remove( this, types, fn, selector );
-		});
-	},
-
-	bind: function( types, data, fn ) {
-		return this.on( types, null, data, fn );
-	},
-	unbind: function( types, fn ) {
-		return this.off( types, null, fn );
-	},
-
-	delegate: function( selector, types, data, fn ) {
-		return this.on( types, selector, data, fn );
-	},
-	undelegate: function( selector, types, fn ) {
-		// ( namespace ) or ( selector, types [, fn] )
-		return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn );
-	},
-
-	trigger: function( type, data ) {
-		return this.each(function() {
-			jQuery.event.trigger( type, data, this );
-		});
-	},
-	triggerHandler: function( type, data ) {
-		var elem = this[0];
-		if ( elem ) {
-			return jQuery.event.trigger( type, data, elem, true );
-		}
-	},
-
-	hover: function( fnOver, fnOut ) {
-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-	}
-});
-
-jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
-	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) {
-
-	// Handle event binding
-	jQuery.fn[ name ] = function( data, fn ) {
-		return arguments.length > 0 ?
-			this.on( name, null, data, fn ) :
-			this.trigger( name );
-	};
-
-	if ( rkeyEvent.test( name ) ) {
-		jQuery.event.fixHooks[ name ] = jQuery.event.keyHooks;
-	}
-
-	if ( rmouseEvent.test( name ) ) {
-		jQuery.event.fixHooks[ name ] = jQuery.event.mouseHooks;
-	}
-});
-/*!
- * Sizzle CSS Selector Engine
- * Copyright 2012 jQuery Foundation and other contributors
- * Released under the MIT license
- * http://sizzlejs.com/
- */
-(function( window, undefined ) {
-
-var i,
-	cachedruns,
-	Expr,
-	getText,
-	isXML,
-	compile,
-	hasDuplicate,
-	outermostContext,
-
-	// Local document vars
-	setDocument,
-	document,
-	docElem,
-	documentIsXML,
-	rbuggyQSA,
-	rbuggyMatches,
-	matches,
-	contains,
-	sortOrder,
-
-	// Instance-specific data
-	expando = "sizzle" + -(new Date()),
-	preferredDoc = window.document,
-	support = {},
-	dirruns = 0,
-	done = 0,
-	classCache = createCache(),
-	tokenCache = createCache(),
-	compilerCache = createCache(),
-
-	// General-purpose constants
-	strundefined = typeof undefined,
-	MAX_NEGATIVE = 1 << 31,
-
-	// Array methods
-	arr = [],
-	pop = arr.pop,
-	push = arr.push,
-	slice = arr.slice,
-	// Use a stripped-down indexOf if we can't use a native one
-	indexOf = arr.indexOf || function( elem ) {
-		var i = 0,
-			len = this.length;
-		for ( ; i < len; i++ ) {
-			if ( this[i] === elem ) {
-				return i;
-			}
-		}
-		return -1;
-	},
-
-
-	// Regular expressions
-
-	// Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
-	whitespace = "[\\x20\\t\\r\\n\\f]",
-	// http://www.w3.org/TR/css3-syntax/#characters
-	characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
-
-	// Loosely modeled on CSS identifier characters
-	// An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors
-	// Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
-	identifier = characterEncoding.replace( "w", "w#" ),
-
-	// Acceptable operators http://www.w3.org/TR/selectors/#attribute-selectors
-	operators = "([*^$|!~]?=)",
-	attributes = "\\[" + whitespace + "*(" + characterEncoding + ")" + whitespace +
-		"*(?:" + operators + whitespace + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + identifier + ")|)|)" + whitespace + "*\\]",
-
-	// Prefer arguments quoted,
-	//   then not containing pseudos/brackets,
-	//   then attribute selectors/non-parenthetical expressions,
-	//   then anything else
-	// These preferences are here to reduce the number of selectors
-	//   needing tokenize in the PSEUDO preFilter
-	pseudos = ":(" + characterEncoding + ")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|" + attributes.replace( 3, 8 ) + ")*)|.*)\\)|)",
-
-	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
-	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
-
-	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
-	rcombinators = new RegExp( "^" + whitespace + "*([\\x20\\t\\r\\n\\f>+~])" + whitespace + "*" ),
-	rpseudo = new RegExp( pseudos ),
-	ridentifier = new RegExp( "^" + identifier + "$" ),
-
-	matchExpr = {
-		"ID": new RegExp( "^#(" + characterEncoding + ")" ),
-		"CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
-		"NAME": new RegExp( "^\\[name=['\"]?(" + characterEncoding + ")['\"]?\\]" ),
-		"TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
-		"ATTR": new RegExp( "^" + attributes ),
-		"PSEUDO": new RegExp( "^" + pseudos ),
-		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
-			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
-			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
-		// For use in libraries implementing .is()
-		// We use this for POS matching in `select`
-		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
-			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
-	},
-
-	rsibling = /[\x20\t\r\n\f]*[+~]/,
-
-	rnative = /\{\s*\[native code\]\s*\}/,
-
-	// Easily-parseable/retrievable ID or TAG or CLASS selectors
-	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
-
-	rinputs = /^(?:input|select|textarea|button)$/i,
-	rheader = /^h\d$/i,
-
-	rescape = /'|\\/g,
-	rattributeQuotes = /\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,
-
-	// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
-	runescape = /\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?|.)/g,
-	funescape = function( _, escaped ) {
-		var high = "0x" + escaped - 0x10000;
-		// NaN means non-codepoint
-		return high !== high ?
-			escaped :
-			// BMP codepoint
-			high < 0 ?
-				String.fromCharCode( high + 0x10000 ) :
-				// Supplemental Plane codepoint (surrogate pair)
-				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
-	};
-
-// Use a stripped-down slice if we can't use a native one
-try {
-	slice.call( docElem.childNodes, 0 )[0].nodeType;
-} catch ( e ) {
-	slice = function( i ) {
-		var elem,
-			results = [];
-		for ( ; (elem = this[i]); i++ ) {
-			results.push( elem );
-		}
-		return results;
-	};
-}
-
-/**
- * For feature detection
- * @param {Function} fn The function to test for native support
- */
-function isNative( fn ) {
-	return rnative.test( fn + "" );
-}
-
-/**
- * Create key-value caches of limited size
- * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
- *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
- *	deleting the oldest entry
- */
-function createCache() {
-	var cache,
-		keys = [];
-
-	return (cache = function( key, value ) {
-		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
-		if ( keys.push( key += " " ) > Expr.cacheLength ) {
-			// Only keep the most recent entries
-			delete cache[ keys.shift() ];
-		}
-		return (cache[ key ] = value);
-	});
-}
-
-/**
- * Mark a function for special use by Sizzle
- * @param {Function} fn The function to mark
- */
-function markFunction( fn ) {
-	fn[ expando ] = true;
-	return fn;
-}
-
-/**
- * Support testing using an element
- * @param {Function} fn Passed the created div and expects a boolean result
- */
-function assert( fn ) {
-	var div = document.createElement("div");
-
-	try {
-		return fn( div );
-	} catch (e) {
-		return false;
-	} finally {
-		// release memory in IE
-		div = null;
-	}
-}
-
-function Sizzle( selector, context, results, seed ) {
-	var match, elem, m, nodeType,
-		// QSA vars
-		i, groups, old, nid, newContext, newSelector;
-
-	if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
-		setDocument( context );
-	}
-
-	context = context || document;
-	results = results || [];
-
-	if ( !selector || typeof selector !== "string" ) {
-		return results;
-	}
-
-	if ( (nodeType = context.nodeType) !== 1 && nodeType !== 9 ) {
-		return [];
-	}
-
-	if ( !documentIsXML && !seed ) {
-
-		// Shortcuts
-		if ( (match = rquickExpr.exec( selector )) ) {
-			// Speed-up: Sizzle("#ID")
-			if ( (m = match[1]) ) {
-				if ( nodeType === 9 ) {
-					elem = context.getElementById( m );
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE, Opera, and Webkit return items
-						// by name instead of ID
-						if ( elem.id === m ) {
-							results.push( elem );
-							return results;
-						}
-					} else {
-						return results;
-					}
-				} else {
-					// Context is not a document
-					if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
-						contains( context, elem ) && elem.id === m ) {
-						results.push( elem );
-						return results;
-					}
-				}
-
-			// Speed-up: Sizzle("TAG")
-			} else if ( match[2] ) {
-				push.apply( results, slice.call(context.getElementsByTagName( selector ), 0) );
-				return results;
-
-			// Speed-up: Sizzle(".CLASS")
-			} else if ( (m = match[3]) && support.getByClassName && context.getElementsByClassName ) {
-				push.apply( results, slice.call(context.getElementsByClassName( m ), 0) );
-				return results;
-			}
-		}
-
-		// QSA path
-		if ( support.qsa && !rbuggyQSA.test(selector) ) {
-			old = true;
-			nid = expando;
-			newContext = context;
-			newSelector = nodeType === 9 && selector;
-
-			// qSA works strangely on Element-rooted queries
-			// We can work around this by specifying an extra ID on the root
-			// and working up from there (Thanks to Andrew Dupont for the technique)
-			// IE 8 doesn't work on object elements
-			if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
-				groups = tokenize( selector );
-
-				if ( (old = context.getAttribute("id")) ) {
-					nid = old.replace( rescape, "\\$&" );
-				} else {
-					context.setAttribute( "id", nid );
-				}
-				nid = "[id='" + nid + "'] ";
-
-				i = groups.length;
-				while ( i-- ) {
-					groups[i] = nid + toSelector( groups[i] );
-				}
-				newContext = rsibling.test( selector ) && context.parentNode || context;
-				newSelector = groups.join(",");
-			}
-
-			if ( newSelector ) {
-				try {
-					push.apply( results, slice.call( newContext.querySelectorAll(
-						newSelector
-					), 0 ) );
-					return results;
-				} catch(qsaError) {
-				} finally {
-					if ( !old ) {
-						context.removeAttribute("id");
-					}
-				}
-			}
-		}
-	}
-
-	// All others
-	return select( selector.replace( rtrim, "$1" ), context, results, seed );
-}
-
-/**
- * Detect xml
- * @param {Element|Object} elem An element or a document
- */
-isXML = Sizzle.isXML = function( elem ) {
-	// documentElement is verified for cases where it doesn't yet exist
-	// (such as loading iframes in IE - #4833)
-	var documentElement = elem && (elem.ownerDocument || elem).documentElement;
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-/**
- * Sets document-related variables once based on the current document
- * @param {Element|Object} [doc] An element or document object to use to set the document
- * @returns {Object} Returns the current document
- */
-setDocument = Sizzle.setDocument = function( node ) {
-	var doc = node ? node.ownerDocument || node : preferredDoc;
-
-	// If no document and documentElement is available, return
-	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
-		return document;
-	}
-
-	// Set our document
-	document = doc;
-	docElem = doc.documentElement;
-
-	// Support tests
-	documentIsXML = isXML( doc );
-
-	// Check if getElementsByTagName("*") returns only elements
-	support.tagNameNoComments = assert(function( div ) {
-		div.appendChild( doc.createComment("") );
-		return !div.getElementsByTagName("*").length;
-	});
-
-	// Check if attributes should be retrieved by attribute nodes
-	support.attributes = assert(function( div ) {
-		div.innerHTML = "";
-		var type = typeof div.lastChild.getAttribute("multiple");
-		// IE8 returns a string for some attributes even when not present
-		return type !== "boolean" && type !== "string";
-	});
-
-	// Check if getElementsByClassName can be trusted
-	support.getByClassName = assert(function( div ) {
-		// Opera can't find a second classname (in 9.6)
-		div.innerHTML = "";
-		if ( !div.getElementsByClassName || !div.getElementsByClassName("e").length ) {
-			return false;
-		}
-
-		// Safari 3.2 caches class attributes and doesn't catch changes
-		div.lastChild.className = "e";
-		return div.getElementsByClassName("e").length === 2;
-	});
-
-	// Check if getElementById returns elements by name
-	// Check if getElementsByName privileges form controls or returns elements by ID
-	support.getByName = assert(function( div ) {
-		// Inject content
-		div.id = expando + 0;
-		div.innerHTML = "
      ";
-		docElem.insertBefore( div, docElem.firstChild );
-
-		// Test
-		var pass = doc.getElementsByName &&
-			// buggy browsers will return fewer than the correct 2
-			doc.getElementsByName( expando ).length === 2 +
-			// buggy browsers will return more than the correct 0
-			doc.getElementsByName( expando + 0 ).length;
-		support.getIdNotName = !doc.getElementById( expando );
-
-		// Cleanup
-		docElem.removeChild( div );
-
-		return pass;
-	});
-
-	// IE6/7 return modified attributes
-	Expr.attrHandle = assert(function( div ) {
-		div.innerHTML = "";
-		return div.firstChild && typeof div.firstChild.getAttribute !== strundefined &&
-			div.firstChild.getAttribute("href") === "#";
-	}) ?
-		{} :
-		{
-			"href": function( elem ) {
-				return elem.getAttribute( "href", 2 );
-			},
-			"type": function( elem ) {
-				return elem.getAttribute("type");
-			}
-		};
-
-	// ID find and filter
-	if ( support.getIdNotName ) {
-		Expr.find["ID"] = function( id, context ) {
-			if ( typeof context.getElementById !== strundefined && !documentIsXML ) {
-				var m = context.getElementById( id );
-				// Check parentNode to catch when Blackberry 4.6 returns
-				// nodes that are no longer in the document #6963
-				return m && m.parentNode ? [m] : [];
-			}
-		};
-		Expr.filter["ID"] = function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				return elem.getAttribute("id") === attrId;
-			};
-		};
-	} else {
-		Expr.find["ID"] = function( id, context ) {
-			if ( typeof context.getElementById !== strundefined && !documentIsXML ) {
-				var m = context.getElementById( id );
-
-				return m ?
-					m.id === id || typeof m.getAttributeNode !== strundefined && m.getAttributeNode("id").value === id ?
-						[m] :
-						undefined :
-					[];
-			}
-		};
-		Expr.filter["ID"] =  function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id");
-				return node && node.value === attrId;
-			};
-		};
-	}
-
-	// Tag
-	Expr.find["TAG"] = support.tagNameNoComments ?
-		function( tag, context ) {
-			if ( typeof context.getElementsByTagName !== strundefined ) {
-				return context.getElementsByTagName( tag );
-			}
-		} :
-		function( tag, context ) {
-			var elem,
-				tmp = [],
-				i = 0,
-				results = context.getElementsByTagName( tag );
-
-			// Filter out possible comments
-			if ( tag === "*" ) {
-				for ( ; (elem = results[i]); i++ ) {
-					if ( elem.nodeType === 1 ) {
-						tmp.push( elem );
-					}
-				}
-
-				return tmp;
-			}
-			return results;
-		};
-
-	// Name
-	Expr.find["NAME"] = support.getByName && function( tag, context ) {
-		if ( typeof context.getElementsByName !== strundefined ) {
-			return context.getElementsByName( name );
-		}
-	};
-
-	// Class
-	Expr.find["CLASS"] = support.getByClassName && function( className, context ) {
-		if ( typeof context.getElementsByClassName !== strundefined && !documentIsXML ) {
-			return context.getElementsByClassName( className );
-		}
-	};
-
-	// QSA and matchesSelector support
-
-	// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
-	rbuggyMatches = [];
-
-	// qSa(:focus) reports false when true (Chrome 21),
-	// no need to also add to buggyMatches since matches checks buggyQSA
-	// A support test would require too much code (would include document ready)
-	rbuggyQSA = [ ":focus" ];
-
-	if ( (support.qsa = isNative(doc.querySelectorAll)) ) {
-		// Build QSA regex
-		// Regex strategy adopted from Diego Perini
-		assert(function( div ) {
-			// Select is set to empty string on purpose
-			// This is to test IE's treatment of not explictly
-			// setting a boolean content attribute,
-			// since its presence should be enough
-			// http://bugs.jquery.com/ticket/12359
-			div.innerHTML = "";
-
-			// IE8 - Some boolean attributes are not treated correctly
-			if ( !div.querySelectorAll("[selected]").length ) {
-				rbuggyQSA.push( "\\[" + whitespace + "*(?:checked|disabled|ismap|multiple|readonly|selected|value)" );
-			}
-
-			// Webkit/Opera - :checked should return selected option elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":checked").length ) {
-				rbuggyQSA.push(":checked");
-			}
-		});
-
-		assert(function( div ) {
-
-			// Opera 10-12/IE8 - ^= $= *= and empty values
-			// Should not select anything
-			div.innerHTML = "";
-			if ( div.querySelectorAll("[i^='']").length ) {
-				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:\"\"|'')" );
-			}
-
-			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":enabled").length ) {
-				rbuggyQSA.push( ":enabled", ":disabled" );
-			}
-
-			// Opera 10-11 does not throw on post-comma invalid pseudos
-			div.querySelectorAll("*,:x");
-			rbuggyQSA.push(",.*:");
-		});
-	}
-
-	if ( (support.matchesSelector = isNative( (matches = docElem.matchesSelector ||
-		docElem.mozMatchesSelector ||
-		docElem.webkitMatchesSelector ||
-		docElem.oMatchesSelector ||
-		docElem.msMatchesSelector) )) ) {
-
-		assert(function( div ) {
-			// Check to see if it's possible to do matchesSelector
-			// on a disconnected node (IE 9)
-			support.disconnectedMatch = matches.call( div, "div" );
-
-			// This should fail with an exception
-			// Gecko does not error, returns false instead
-			matches.call( div, "[s!='']:x" );
-			rbuggyMatches.push( "!=", pseudos );
-		});
-	}
-
-	rbuggyQSA = new RegExp( rbuggyQSA.join("|") );
-	rbuggyMatches = new RegExp( rbuggyMatches.join("|") );
-
-	// Element contains another
-	// Purposefully does not implement inclusive descendent
-	// As in, an element does not contain itself
-	contains = isNative(docElem.contains) || docElem.compareDocumentPosition ?
-		function( a, b ) {
-			var adown = a.nodeType === 9 ? a.documentElement : a,
-				bup = b && b.parentNode;
-			return a === bup || !!( bup && bup.nodeType === 1 && (
-				adown.contains ?
-					adown.contains( bup ) :
-					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
-			));
-		} :
-		function( a, b ) {
-			if ( b ) {
-				while ( (b = b.parentNode) ) {
-					if ( b === a ) {
-						return true;
-					}
-				}
-			}
-			return false;
-		};
-
-	// Document order sorting
-	sortOrder = docElem.compareDocumentPosition ?
-	function( a, b ) {
-		var compare;
-
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		if ( (compare = b.compareDocumentPosition && a.compareDocumentPosition && a.compareDocumentPosition( b )) ) {
-			if ( compare & 1 || a.parentNode && a.parentNode.nodeType === 11 ) {
-				if ( a === doc || contains( preferredDoc, a ) ) {
-					return -1;
-				}
-				if ( b === doc || contains( preferredDoc, b ) ) {
-					return 1;
-				}
-				return 0;
-			}
-			return compare & 4 ? -1 : 1;
-		}
-
-		return a.compareDocumentPosition ? -1 : 1;
-	} :
-	function( a, b ) {
-		var cur,
-			i = 0,
-			aup = a.parentNode,
-			bup = b.parentNode,
-			ap = [ a ],
-			bp = [ b ];
-
-		// The nodes are identical, we can exit early
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-
-		// Fallback to using sourceIndex (in IE) if it's available on both nodes
-		} else if ( a.sourceIndex && b.sourceIndex ) {
-			return ( ~b.sourceIndex || MAX_NEGATIVE ) - ( contains( preferredDoc, a ) && ~a.sourceIndex || MAX_NEGATIVE );
-
-		// Parentless nodes are either documents or disconnected
-		} else if ( !aup || !bup ) {
-			return a === doc ? -1 :
-				b === doc ? 1 :
-				aup ? -1 :
-				bup ? 1 :
-				0;
-
-		// If the nodes are siblings, we can do a quick check
-		} else if ( aup === bup ) {
-			return siblingCheck( a, b );
-		}
-
-		// Otherwise we need full lists of their ancestors for comparison
-		cur = a;
-		while ( (cur = cur.parentNode) ) {
-			ap.unshift( cur );
-		}
-		cur = b;
-		while ( (cur = cur.parentNode) ) {
-			bp.unshift( cur );
-		}
-
-		// Walk down the tree looking for a discrepancy
-		while ( ap[i] === bp[i] ) {
-			i++;
-		}
-
-		return i ?
-			// Do a sibling check if the nodes have a common ancestor
-			siblingCheck( ap[i], bp[i] ) :
-
-			// Otherwise nodes in our document sort first
-			ap[i] === preferredDoc ? -1 :
-			bp[i] === preferredDoc ? 1 :
-			0;
-	};
-
-	// Always assume the presence of duplicates if sort doesn't
-	// pass them to our comparison function (as in Google Chrome).
-	hasDuplicate = false;
-	[0, 0].sort( sortOrder );
-	support.detectDuplicates = hasDuplicate;
-
-	return document;
-};
-
-Sizzle.matches = function( expr, elements ) {
-	return Sizzle( expr, null, null, elements );
-};
-
-Sizzle.matchesSelector = function( elem, expr ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	// Make sure that attribute selectors are quoted
-	expr = expr.replace( rattributeQuotes, "='$1']" );
-
-	// rbuggyQSA always contains :focus, so no need for an existence check
-	if ( support.matchesSelector && !documentIsXML && (!rbuggyMatches || !rbuggyMatches.test(expr)) && !rbuggyQSA.test(expr) ) {
-		try {
-			var ret = matches.call( elem, expr );
-
-			// IE 9's matchesSelector returns false on disconnected nodes
-			if ( ret || support.disconnectedMatch ||
-					// As well, disconnected nodes are said to be in a document
-					// fragment in IE 9
-					elem.document && elem.document.nodeType !== 11 ) {
-				return ret;
-			}
-		} catch(e) {}
-	}
-
-	return Sizzle( expr, document, null, [elem] ).length > 0;
-};
-
-Sizzle.contains = function( context, elem ) {
-	// Set document vars if needed
-	if ( ( context.ownerDocument || context ) !== document ) {
-		setDocument( context );
-	}
-	return contains( context, elem );
-};
-
-Sizzle.attr = function( elem, name ) {
-	var val;
-
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	if ( !documentIsXML ) {
-		name = name.toLowerCase();
-	}
-	if ( (val = Expr.attrHandle[ name ]) ) {
-		return val( elem );
-	}
-	if ( documentIsXML || support.attributes ) {
-		return elem.getAttribute( name );
-	}
-	return ( (val = elem.getAttributeNode( name )) || elem.getAttribute( name ) ) && elem[ name ] === true ?
-		name :
-		val && val.specified ? val.value : null;
-};
-
-Sizzle.error = function( msg ) {
-	throw new Error( "Syntax error, unrecognized expression: " + msg );
-};
-
-// Document sorting and removing duplicates
-Sizzle.uniqueSort = function( results ) {
-	var elem,
-		duplicates = [],
-		i = 1,
-		j = 0;
-
-	// Unless we *know* we can detect duplicates, assume their presence
-	hasDuplicate = !support.detectDuplicates;
-	results.sort( sortOrder );
-
-	if ( hasDuplicate ) {
-		for ( ; (elem = results[i]); i++ ) {
-			if ( elem === results[ i - 1 ] ) {
-				j = duplicates.push( i );
-			}
-		}
-		while ( j-- ) {
-			results.splice( duplicates[ j ], 1 );
-		}
-	}
-
-	return results;
-};
-
-function siblingCheck( a, b ) {
-	var cur = a && b && a.nextSibling;
-
-	for ( ; cur; cur = cur.nextSibling ) {
-		if ( cur === b ) {
-			return -1;
-		}
-	}
-
-	return a ? 1 : -1;
-}
-
-// Returns a function to use in pseudos for input types
-function createInputPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return name === "input" && elem.type === type;
-	};
-}
-
-// Returns a function to use in pseudos for buttons
-function createButtonPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return (name === "input" || name === "button") && elem.type === type;
-	};
-}
-
-// Returns a function to use in pseudos for positionals
-function createPositionalPseudo( fn ) {
-	return markFunction(function( argument ) {
-		argument = +argument;
-		return markFunction(function( seed, matches ) {
-			var j,
-				matchIndexes = fn( [], seed.length, argument ),
-				i = matchIndexes.length;
-
-			// Match elements found at the specified indexes
-			while ( i-- ) {
-				if ( seed[ (j = matchIndexes[i]) ] ) {
-					seed[j] = !(matches[j] = seed[j]);
-				}
-			}
-		});
-	});
-}
-
-/**
- * Utility function for retrieving the text value of an array of DOM nodes
- * @param {Array|Element} elem
- */
-getText = Sizzle.getText = function( elem ) {
-	var node,
-		ret = "",
-		i = 0,
-		nodeType = elem.nodeType;
-
-	if ( !nodeType ) {
-		// If no nodeType, this is expected to be an array
-		for ( ; (node = elem[i]); i++ ) {
-			// Do not traverse comment nodes
-			ret += getText( node );
-		}
-	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
-		// Use textContent for elements
-		// innerText usage removed for consistency of new lines (see #11153)
-		if ( typeof elem.textContent === "string" ) {
-			return elem.textContent;
-		} else {
-			// Traverse its children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				ret += getText( elem );
-			}
-		}
-	} else if ( nodeType === 3 || nodeType === 4 ) {
-		return elem.nodeValue;
-	}
-	// Do not include comment or processing instruction nodes
-
-	return ret;
-};
-
-Expr = Sizzle.selectors = {
-
-	// Can be adjusted by the user
-	cacheLength: 50,
-
-	createPseudo: markFunction,
-
-	match: matchExpr,
-
-	find: {},
-
-	relative: {
-		">": { dir: "parentNode", first: true },
-		" ": { dir: "parentNode" },
-		"+": { dir: "previousSibling", first: true },
-		"~": { dir: "previousSibling" }
-	},
-
-	preFilter: {
-		"ATTR": function( match ) {
-			match[1] = match[1].replace( runescape, funescape );
-
-			// Move the given value to match[3] whether quoted or unquoted
-			match[3] = ( match[4] || match[5] || "" ).replace( runescape, funescape );
-
-			if ( match[2] === "~=" ) {
-				match[3] = " " + match[3] + " ";
-			}
-
-			return match.slice( 0, 4 );
-		},
-
-		"CHILD": function( match ) {
-			/* matches from matchExpr["CHILD"]
-				1 type (only|nth|...)
-				2 what (child|of-type)
-				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
-				4 xn-component of xn+y argument ([+-]?\d*n|)
-				5 sign of xn-component
-				6 x of xn-component
-				7 sign of y-component
-				8 y of y-component
-			*/
-			match[1] = match[1].toLowerCase();
-
-			if ( match[1].slice( 0, 3 ) === "nth" ) {
-				// nth-* requires argument
-				if ( !match[3] ) {
-					Sizzle.error( match[0] );
-				}
-
-				// numeric x and y parameters for Expr.filter.CHILD
-				// remember that false/true cast respectively to 0/1
-				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
-				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
-
-			// other types prohibit arguments
-			} else if ( match[3] ) {
-				Sizzle.error( match[0] );
-			}
-
-			return match;
-		},
-
-		"PSEUDO": function( match ) {
-			var excess,
-				unquoted = !match[5] && match[2];
-
-			if ( matchExpr["CHILD"].test( match[0] ) ) {
-				return null;
-			}
-
-			// Accept quoted arguments as-is
-			if ( match[4] ) {
-				match[2] = match[4];
-
-			// Strip excess characters from unquoted arguments
-			} else if ( unquoted && rpseudo.test( unquoted ) &&
-				// Get excess from tokenize (recursively)
-				(excess = tokenize( unquoted, true )) &&
-				// advance to the next closing parenthesis
-				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
-
-				// excess is a negative index
-				match[0] = match[0].slice( 0, excess );
-				match[2] = unquoted.slice( 0, excess );
-			}
-
-			// Return only captures needed by the pseudo filter method (type and argument)
-			return match.slice( 0, 3 );
-		}
-	},
-
-	filter: {
-
-		"TAG": function( nodeName ) {
-			if ( nodeName === "*" ) {
-				return function() { return true; };
-			}
-
-			nodeName = nodeName.replace( runescape, funescape ).toLowerCase();
-			return function( elem ) {
-				return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
-			};
-		},
-
-		"CLASS": function( className ) {
-			var pattern = classCache[ className + " " ];
-
-			return pattern ||
-				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
-				classCache( className, function( elem ) {
-					return pattern.test( elem.className || (typeof elem.getAttribute !== strundefined && elem.getAttribute("class")) || "" );
-				});
-		},
-
-		"ATTR": function( name, operator, check ) {
-			return function( elem ) {
-				var result = Sizzle.attr( elem, name );
-
-				if ( result == null ) {
-					return operator === "!=";
-				}
-				if ( !operator ) {
-					return true;
-				}
-
-				result += "";
-
-				return operator === "=" ? result === check :
-					operator === "!=" ? result !== check :
-					operator === "^=" ? check && result.indexOf( check ) === 0 :
-					operator === "*=" ? check && result.indexOf( check ) > -1 :
-					operator === "$=" ? check && result.substr( result.length - check.length ) === check :
-					operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 :
-					operator === "|=" ? result === check || result.substr( 0, check.length + 1 ) === check + "-" :
-					false;
-			};
-		},
-
-		"CHILD": function( type, what, argument, first, last ) {
-			var simple = type.slice( 0, 3 ) !== "nth",
-				forward = type.slice( -4 ) !== "last",
-				ofType = what === "of-type";
-
-			return first === 1 && last === 0 ?
-
-				// Shortcut for :nth-*(n)
-				function( elem ) {
-					return !!elem.parentNode;
-				} :
-
-				function( elem, context, xml ) {
-					var cache, outerCache, node, diff, nodeIndex, start,
-						dir = simple !== forward ? "nextSibling" : "previousSibling",
-						parent = elem.parentNode,
-						name = ofType && elem.nodeName.toLowerCase(),
-						useCache = !xml && !ofType;
-
-					if ( parent ) {
-
-						// :(first|last|only)-(child|of-type)
-						if ( simple ) {
-							while ( dir ) {
-								node = elem;
-								while ( (node = node[ dir ]) ) {
-									if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) {
-										return false;
-									}
-								}
-								// Reverse direction for :only-* (if we haven't yet done so)
-								start = dir = type === "only" && !start && "nextSibling";
-							}
-							return true;
-						}
-
-						start = [ forward ? parent.firstChild : parent.lastChild ];
-
-						// non-xml :nth-child(...) stores cache data on `parent`
-						if ( forward && useCache ) {
-							// Seek `elem` from a previously-cached index
-							outerCache = parent[ expando ] || (parent[ expando ] = {});
-							cache = outerCache[ type ] || [];
-							nodeIndex = cache[0] === dirruns && cache[1];
-							diff = cache[0] === dirruns && cache[2];
-							node = nodeIndex && parent.childNodes[ nodeIndex ];
-
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-
-								// Fallback to seeking `elem` from the start
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								// When found, cache indexes on `parent` and break
-								if ( node.nodeType === 1 && ++diff && node === elem ) {
-									outerCache[ type ] = [ dirruns, nodeIndex, diff ];
-									break;
-								}
-							}
-
-						// Use previously-cached element index if available
-						} else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) {
-							diff = cache[1];
-
-						// xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...)
-						} else {
-							// Use the same loop as above to seek `elem` from the start
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) {
-									// Cache the index of each encountered element
-									if ( useCache ) {
-										(node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ];
-									}
-
-									if ( node === elem ) {
-										break;
-									}
-								}
-							}
-						}
-
-						// Incorporate the offset, then check against cycle size
-						diff -= last;
-						return diff === first || ( diff % first === 0 && diff / first >= 0 );
-					}
-				};
-		},
-
-		"PSEUDO": function( pseudo, argument ) {
-			// pseudo-class names are case-insensitive
-			// http://www.w3.org/TR/selectors/#pseudo-classes
-			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
-			// Remember that setFilters inherits from pseudos
-			var args,
-				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
-					Sizzle.error( "unsupported pseudo: " + pseudo );
-
-			// The user may use createPseudo to indicate that
-			// arguments are needed to create the filter function
-			// just as Sizzle does
-			if ( fn[ expando ] ) {
-				return fn( argument );
-			}
-
-			// But maintain support for old signatures
-			if ( fn.length > 1 ) {
-				args = [ pseudo, pseudo, "", argument ];
-				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
-					markFunction(function( seed, matches ) {
-						var idx,
-							matched = fn( seed, argument ),
-							i = matched.length;
-						while ( i-- ) {
-							idx = indexOf.call( seed, matched[i] );
-							seed[ idx ] = !( matches[ idx ] = matched[i] );
-						}
-					}) :
-					function( elem ) {
-						return fn( elem, 0, args );
-					};
-			}
-
-			return fn;
-		}
-	},
-
-	pseudos: {
-		// Potentially complex pseudos
-		"not": markFunction(function( selector ) {
-			// Trim the selector passed to compile
-			// to avoid treating leading and trailing
-			// spaces as combinators
-			var input = [],
-				results = [],
-				matcher = compile( selector.replace( rtrim, "$1" ) );
-
-			return matcher[ expando ] ?
-				markFunction(function( seed, matches, context, xml ) {
-					var elem,
-						unmatched = matcher( seed, null, xml, [] ),
-						i = seed.length;
-
-					// Match elements unmatched by `matcher`
-					while ( i-- ) {
-						if ( (elem = unmatched[i]) ) {
-							seed[i] = !(matches[i] = elem);
-						}
-					}
-				}) :
-				function( elem, context, xml ) {
-					input[0] = elem;
-					matcher( input, null, xml, results );
-					return !results.pop();
-				};
-		}),
-
-		"has": markFunction(function( selector ) {
-			return function( elem ) {
-				return Sizzle( selector, elem ).length > 0;
-			};
-		}),
-
-		"contains": markFunction(function( text ) {
-			return function( elem ) {
-				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
-			};
-		}),
-
-		// "Whether an element is represented by a :lang() selector
-		// is based solely on the element's language value
-		// being equal to the identifier C,
-		// or beginning with the identifier C immediately followed by "-".
-		// The matching of C against the element's language value is performed case-insensitively.
-		// The identifier C does not have to be a valid language name."
-		// http://www.w3.org/TR/selectors/#lang-pseudo
-		"lang": markFunction( function( lang ) {
-			// lang value must be a valid identifider
-			if ( !ridentifier.test(lang || "") ) {
-				Sizzle.error( "unsupported lang: " + lang );
-			}
-			lang = lang.replace( runescape, funescape ).toLowerCase();
-			return function( elem ) {
-				var elemLang;
-				do {
-					if ( (elemLang = documentIsXML ?
-						elem.getAttribute("xml:lang") || elem.getAttribute("lang") :
-						elem.lang) ) {
-
-						elemLang = elemLang.toLowerCase();
-						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
-					}
-				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
-				return false;
-			};
-		}),
-
-		// Miscellaneous
-		"target": function( elem ) {
-			var hash = window.location && window.location.hash;
-			return hash && hash.slice( 1 ) === elem.id;
-		},
-
-		"root": function( elem ) {
-			return elem === docElem;
-		},
-
-		"focus": function( elem ) {
-			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
-		},
-
-		// Boolean properties
-		"enabled": function( elem ) {
-			return elem.disabled === false;
-		},
-
-		"disabled": function( elem ) {
-			return elem.disabled === true;
-		},
-
-		"checked": function( elem ) {
-			// In CSS3, :checked should return both checked and selected elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			var nodeName = elem.nodeName.toLowerCase();
-			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
-		},
-
-		"selected": function( elem ) {
-			// Accessing this property makes selected-by-default
-			// options in Safari work properly
-			if ( elem.parentNode ) {
-				elem.parentNode.selectedIndex;
-			}
-
-			return elem.selected === true;
-		},
-
-		// Contents
-		"empty": function( elem ) {
-			// http://www.w3.org/TR/selectors/#empty-pseudo
-			// :empty is only affected by element nodes and content nodes(including text(3), cdata(4)),
-			//   not comment, processing instructions, or others
-			// Thanks to Diego Perini for the nodeName shortcut
-			//   Greater than "@" means alpha characters (specifically not starting with "#" or "?")
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				if ( elem.nodeName > "@" || elem.nodeType === 3 || elem.nodeType === 4 ) {
-					return false;
-				}
-			}
-			return true;
-		},
-
-		"parent": function( elem ) {
-			return !Expr.pseudos["empty"]( elem );
-		},
-
-		// Element/input types
-		"header": function( elem ) {
-			return rheader.test( elem.nodeName );
-		},
-
-		"input": function( elem ) {
-			return rinputs.test( elem.nodeName );
-		},
-
-		"button": function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return name === "input" && elem.type === "button" || name === "button";
-		},
-
-		"text": function( elem ) {
-			var attr;
-			// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc)
-			// use getAttribute instead to test this case
-			return elem.nodeName.toLowerCase() === "input" &&
-				elem.type === "text" &&
-				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === elem.type );
-		},
-
-		// Position-in-collection
-		"first": createPositionalPseudo(function() {
-			return [ 0 ];
-		}),
-
-		"last": createPositionalPseudo(function( matchIndexes, length ) {
-			return [ length - 1 ];
-		}),
-
-		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			return [ argument < 0 ? argument + length : argument ];
-		}),
-
-		"even": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 0;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"odd": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 1;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; --i >= 0; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; ++i < length; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		})
-	}
-};
-
-// Add button/input type pseudos
-for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
-	Expr.pseudos[ i ] = createInputPseudo( i );
-}
-for ( i in { submit: true, reset: true } ) {
-	Expr.pseudos[ i ] = createButtonPseudo( i );
-}
-
-function tokenize( selector, parseOnly ) {
-	var matched, match, tokens, type,
-		soFar, groups, preFilters,
-		cached = tokenCache[ selector + " " ];
-
-	if ( cached ) {
-		return parseOnly ? 0 : cached.slice( 0 );
-	}
-
-	soFar = selector;
-	groups = [];
-	preFilters = Expr.preFilter;
-
-	while ( soFar ) {
-
-		// Comma and first run
-		if ( !matched || (match = rcomma.exec( soFar )) ) {
-			if ( match ) {
-				// Don't consume trailing commas as valid
-				soFar = soFar.slice( match[0].length ) || soFar;
-			}
-			groups.push( tokens = [] );
-		}
-
-		matched = false;
-
-		// Combinators
-		if ( (match = rcombinators.exec( soFar )) ) {
-			matched = match.shift();
-			tokens.push( {
-				value: matched,
-				// Cast descendant combinators to space
-				type: match[0].replace( rtrim, " " )
-			} );
-			soFar = soFar.slice( matched.length );
-		}
-
-		// Filters
-		for ( type in Expr.filter ) {
-			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
-				(match = preFilters[ type ]( match ))) ) {
-				matched = match.shift();
-				tokens.push( {
-					value: matched,
-					type: type,
-					matches: match
-				} );
-				soFar = soFar.slice( matched.length );
-			}
-		}
-
-		if ( !matched ) {
-			break;
-		}
-	}
-
-	// Return the length of the invalid excess
-	// if we're just parsing
-	// Otherwise, throw an error or return tokens
-	return parseOnly ?
-		soFar.length :
-		soFar ?
-			Sizzle.error( selector ) :
-			// Cache the tokens
-			tokenCache( selector, groups ).slice( 0 );
-}
-
-function toSelector( tokens ) {
-	var i = 0,
-		len = tokens.length,
-		selector = "";
-	for ( ; i < len; i++ ) {
-		selector += tokens[i].value;
-	}
-	return selector;
-}
-
-function addCombinator( matcher, combinator, base ) {
-	var dir = combinator.dir,
-		checkNonElements = base && combinator.dir === "parentNode",
-		doneName = done++;
-
-	return combinator.first ?
-		// Check against closest ancestor/preceding element
-		function( elem, context, xml ) {
-			while ( (elem = elem[ dir ]) ) {
-				if ( elem.nodeType === 1 || checkNonElements ) {
-					return matcher( elem, context, xml );
-				}
-			}
-		} :
-
-		// Check against all ancestor/preceding elements
-		function( elem, context, xml ) {
-			var data, cache, outerCache,
-				dirkey = dirruns + " " + doneName;
-
-			// We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
-			if ( xml ) {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						if ( matcher( elem, context, xml ) ) {
-							return true;
-						}
-					}
-				}
-			} else {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						outerCache = elem[ expando ] || (elem[ expando ] = {});
-						if ( (cache = outerCache[ dir ]) && cache[0] === dirkey ) {
-							if ( (data = cache[1]) === true || data === cachedruns ) {
-								return data === true;
-							}
-						} else {
-							cache = outerCache[ dir ] = [ dirkey ];
-							cache[1] = matcher( elem, context, xml ) || cachedruns;
-							if ( cache[1] === true ) {
-								return true;
-							}
-						}
-					}
-				}
-			}
-		};
-}
-
-function elementMatcher( matchers ) {
-	return matchers.length > 1 ?
-		function( elem, context, xml ) {
-			var i = matchers.length;
-			while ( i-- ) {
-				if ( !matchers[i]( elem, context, xml ) ) {
-					return false;
-				}
-			}
-			return true;
-		} :
-		matchers[0];
-}
-
-function condense( unmatched, map, filter, context, xml ) {
-	var elem,
-		newUnmatched = [],
-		i = 0,
-		len = unmatched.length,
-		mapped = map != null;
-
-	for ( ; i < len; i++ ) {
-		if ( (elem = unmatched[i]) ) {
-			if ( !filter || filter( elem, context, xml ) ) {
-				newUnmatched.push( elem );
-				if ( mapped ) {
-					map.push( i );
-				}
-			}
-		}
-	}
-
-	return newUnmatched;
-}
-
-function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
-	if ( postFilter && !postFilter[ expando ] ) {
-		postFilter = setMatcher( postFilter );
-	}
-	if ( postFinder && !postFinder[ expando ] ) {
-		postFinder = setMatcher( postFinder, postSelector );
-	}
-	return markFunction(function( seed, results, context, xml ) {
-		var temp, i, elem,
-			preMap = [],
-			postMap = [],
-			preexisting = results.length,
-
-			// Get initial elements from seed or context
-			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
-
-			// Prefilter to get matcher input, preserving a map for seed-results synchronization
-			matcherIn = preFilter && ( seed || !selector ) ?
-				condense( elems, preMap, preFilter, context, xml ) :
-				elems,
-
-			matcherOut = matcher ?
-				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
-				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
-
-					// ...intermediate processing is necessary
-					[] :
-
-					// ...otherwise use results directly
-					results :
-				matcherIn;
-
-		// Find primary matches
-		if ( matcher ) {
-			matcher( matcherIn, matcherOut, context, xml );
-		}
-
-		// Apply postFilter
-		if ( postFilter ) {
-			temp = condense( matcherOut, postMap );
-			postFilter( temp, [], context, xml );
-
-			// Un-match failing elements by moving them back to matcherIn
-			i = temp.length;
-			while ( i-- ) {
-				if ( (elem = temp[i]) ) {
-					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
-				}
-			}
-		}
-
-		if ( seed ) {
-			if ( postFinder || preFilter ) {
-				if ( postFinder ) {
-					// Get the final matcherOut by condensing this intermediate into postFinder contexts
-					temp = [];
-					i = matcherOut.length;
-					while ( i-- ) {
-						if ( (elem = matcherOut[i]) ) {
-							// Restore matcherIn since elem is not yet a final match
-							temp.push( (matcherIn[i] = elem) );
-						}
-					}
-					postFinder( null, (matcherOut = []), temp, xml );
-				}
-
-				// Move matched elements from seed to results to keep them synchronized
-				i = matcherOut.length;
-				while ( i-- ) {
-					if ( (elem = matcherOut[i]) &&
-						(temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) {
-
-						seed[temp] = !(results[temp] = elem);
-					}
-				}
-			}
-
-		// Add elements to results, through postFinder if defined
-		} else {
-			matcherOut = condense(
-				matcherOut === results ?
-					matcherOut.splice( preexisting, matcherOut.length ) :
-					matcherOut
-			);
-			if ( postFinder ) {
-				postFinder( null, results, matcherOut, xml );
-			} else {
-				push.apply( results, matcherOut );
-			}
-		}
-	});
-}
-
-function matcherFromTokens( tokens ) {
-	var checkContext, matcher, j,
-		len = tokens.length,
-		leadingRelative = Expr.relative[ tokens[0].type ],
-		implicitRelative = leadingRelative || Expr.relative[" "],
-		i = leadingRelative ? 1 : 0,
-
-		// The foundational matcher ensures that elements are reachable from top-level context(s)
-		matchContext = addCombinator( function( elem ) {
-			return elem === checkContext;
-		}, implicitRelative, true ),
-		matchAnyContext = addCombinator( function( elem ) {
-			return indexOf.call( checkContext, elem ) > -1;
-		}, implicitRelative, true ),
-		matchers = [ function( elem, context, xml ) {
-			return ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
-				(checkContext = context).nodeType ?
-					matchContext( elem, context, xml ) :
-					matchAnyContext( elem, context, xml ) );
-		} ];
-
-	for ( ; i < len; i++ ) {
-		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
-			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
-		} else {
-			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
-
-			// Return special upon seeing a positional matcher
-			if ( matcher[ expando ] ) {
-				// Find the next relative operator (if any) for proper handling
-				j = ++i;
-				for ( ; j < len; j++ ) {
-					if ( Expr.relative[ tokens[j].type ] ) {
-						break;
-					}
-				}
-				return setMatcher(
-					i > 1 && elementMatcher( matchers ),
-					i > 1 && toSelector( tokens.slice( 0, i - 1 ) ).replace( rtrim, "$1" ),
-					matcher,
-					i < j && matcherFromTokens( tokens.slice( i, j ) ),
-					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
-					j < len && toSelector( tokens )
-				);
-			}
-			matchers.push( matcher );
-		}
-	}
-
-	return elementMatcher( matchers );
-}
-
-function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
-	// A counter to specify which element is currently being matched
-	var matcherCachedRuns = 0,
-		bySet = setMatchers.length > 0,
-		byElement = elementMatchers.length > 0,
-		superMatcher = function( seed, context, xml, results, expandContext ) {
-			var elem, j, matcher,
-				setMatched = [],
-				matchedCount = 0,
-				i = "0",
-				unmatched = seed && [],
-				outermost = expandContext != null,
-				contextBackup = outermostContext,
-				// We must always have either seed elements or context
-				elems = seed || byElement && Expr.find["TAG"]( "*", expandContext && context.parentNode || context ),
-				// Nested matchers should use non-integer dirruns
-				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.E);
-
-			if ( outermost ) {
-				outermostContext = context !== document && context;
-				cachedruns = matcherCachedRuns;
-			}
-
-			// Add elements passing elementMatchers directly to results
-			for ( ; (elem = elems[i]) != null; i++ ) {
-				if ( byElement && elem ) {
-					for ( j = 0; (matcher = elementMatchers[j]); j++ ) {
-						if ( matcher( elem, context, xml ) ) {
-							results.push( elem );
-							break;
-						}
-					}
-					if ( outermost ) {
-						dirruns = dirrunsUnique;
-						cachedruns = ++matcherCachedRuns;
-					}
-				}
-
-				// Track unmatched elements for set filters
-				if ( bySet ) {
-					// They will have gone through all possible matchers
-					if ( (elem = !matcher && elem) ) {
-						matchedCount--;
-					}
-
-					// Lengthen the array for every element, matched or not
-					if ( seed ) {
-						unmatched.push( elem );
-					}
-				}
-			}
-
-			// Apply set filters to unmatched elements
-			// `i` starts as a string, so matchedCount would equal "00" if there are no elements
-			matchedCount += i;
-			if ( bySet && i !== matchedCount ) {
-				for ( j = 0; (matcher = setMatchers[j]); j++ ) {
-					matcher( unmatched, setMatched, context, xml );
-				}
-
-				if ( seed ) {
-					// Reintegrate element matches to eliminate the need for sorting
-					if ( matchedCount > 0 ) {
-						while ( i-- ) {
-							if ( !(unmatched[i] || setMatched[i]) ) {
-								setMatched[i] = pop.call( results );
-							}
-						}
-					}
-
-					// Discard index placeholder values to get only actual matches
-					setMatched = condense( setMatched );
-				}
-
-				// Add matches to results
-				push.apply( results, setMatched );
-
-				// Seedless set matches succeeding multiple successful matchers stipulate sorting
-				if ( outermost && !seed && setMatched.length > 0 &&
-					( matchedCount + setMatchers.length ) > 1 ) {
-
-					Sizzle.uniqueSort( results );
-				}
-			}
-
-			// Override manipulation of globals by nested matchers
-			if ( outermost ) {
-				dirruns = dirrunsUnique;
-				outermostContext = contextBackup;
-			}
-
-			return unmatched;
-		};
-
-	return bySet ?
-		markFunction( superMatcher ) :
-		superMatcher;
-}
-
-compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) {
-	var i,
-		setMatchers = [],
-		elementMatchers = [],
-		cached = compilerCache[ selector + " " ];
-
-	if ( !cached ) {
-		// Generate a function of recursive functions that can be used to check each element
-		if ( !group ) {
-			group = tokenize( selector );
-		}
-		i = group.length;
-		while ( i-- ) {
-			cached = matcherFromTokens( group[i] );
-			if ( cached[ expando ] ) {
-				setMatchers.push( cached );
-			} else {
-				elementMatchers.push( cached );
-			}
-		}
-
-		// Cache the compiled function
-		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
-	}
-	return cached;
-};
-
-function multipleContexts( selector, contexts, results ) {
-	var i = 0,
-		len = contexts.length;
-	for ( ; i < len; i++ ) {
-		Sizzle( selector, contexts[i], results );
-	}
-	return results;
-}
-
-function select( selector, context, results, seed ) {
-	var i, tokens, token, type, find,
-		match = tokenize( selector );
-
-	if ( !seed ) {
-		// Try to minimize operations if there is only one group
-		if ( match.length === 1 ) {
-
-			// Take a shortcut and set the context if the root selector is an ID
-			tokens = match[0] = match[0].slice( 0 );
-			if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
-					context.nodeType === 9 && !documentIsXML &&
-					Expr.relative[ tokens[1].type ] ) {
-
-				context = Expr.find["ID"]( token.matches[0].replace( runescape, funescape ), context )[0];
-				if ( !context ) {
-					return results;
-				}
-
-				selector = selector.slice( tokens.shift().value.length );
-			}
-
-			// Fetch a seed set for right-to-left matching
-			for ( i = matchExpr["needsContext"].test( selector ) ? -1 : tokens.length - 1; i >= 0; i-- ) {
-				token = tokens[i];
-
-				// Abort if we hit a combinator
-				if ( Expr.relative[ (type = token.type) ] ) {
-					break;
-				}
-				if ( (find = Expr.find[ type ]) ) {
-					// Search, expanding context for leading sibling combinators
-					if ( (seed = find(
-						token.matches[0].replace( runescape, funescape ),
-						rsibling.test( tokens[0].type ) && context.parentNode || context
-					)) ) {
-
-						// If seed is empty or no tokens remain, we can return early
-						tokens.splice( i, 1 );
-						selector = seed.length && toSelector( tokens );
-						if ( !selector ) {
-							push.apply( results, slice.call( seed, 0 ) );
-							return results;
-						}
-
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	// Compile and execute a filtering function
-	// Provide `match` to avoid retokenization if we modified the selector above
-	compile( selector, match )(
-		seed,
-		context,
-		documentIsXML,
-		results,
-		rsibling.test( selector )
-	);
-	return results;
-}
-
-// Deprecated
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
-
-// Easy API for creating new setFilters
-function setFilters() {}
-Expr.filters = setFilters.prototype = Expr.pseudos;
-Expr.setFilters = new setFilters();
-
-// Initialize with the default document
-setDocument();
-
-// Override sizzle attribute retrieval
-Sizzle.attr = jQuery.attr;
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.pseudos;
-jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-
-
-})( window );
-var runtil = /Until$/,
-	rparentsprev = /^(?:parents|prev(?:Until|All))/,
-	isSimple = /^.[^:#\[\.,]*$/,
-	rneedsContext = jQuery.expr.match.needsContext,
-	// methods guaranteed to produce a unique set when starting from a unique set
-	guaranteedUnique = {
-		children: true,
-		contents: true,
-		next: true,
-		prev: true
-	};
-
-jQuery.fn.extend({
-	find: function( selector ) {
-		var i, ret, self;
-
-		if ( typeof selector !== "string" ) {
-			self = this;
-			return this.pushStack( jQuery( selector ).filter(function() {
-				for ( i = 0; i < self.length; i++ ) {
-					if ( jQuery.contains( self[ i ], this ) ) {
-						return true;
-					}
-				}
-			}) );
-		}
-
-		ret = [];
-		for ( i = 0; i < this.length; i++ ) {
-			jQuery.find( selector, this[ i ], ret );
-		}
-
-		// Needed because $( selector, context ) becomes $( context ).find( selector )
-		ret = this.pushStack( jQuery.unique( ret ) );
-		ret.selector = ( this.selector ? this.selector + " " : "" ) + selector;
-		return ret;
-	},
-
-	has: function( target ) {
-		var i,
-			targets = jQuery( target, this ),
-			len = targets.length;
-
-		return this.filter(function() {
-			for ( i = 0; i < len; i++ ) {
-				if ( jQuery.contains( this, targets[i] ) ) {
-					return true;
-				}
-			}
-		});
-	},
-
-	not: function( selector ) {
-		return this.pushStack( winnow(this, selector, false) );
-	},
-
-	filter: function( selector ) {
-		return this.pushStack( winnow(this, selector, true) );
-	},
-
-	is: function( selector ) {
-		return !!selector && (
-			typeof selector === "string" ?
-				// If this is a positional/relative selector, check membership in the returned set
-				// so $("p:first").is("p:last") won't return true for a doc with two "p".
-				rneedsContext.test( selector ) ?
-					jQuery( selector, this.context ).index( this[0] ) >= 0 :
-					jQuery.filter( selector, this ).length > 0 :
-				this.filter( selector ).length > 0 );
-	},
-
-	closest: function( selectors, context ) {
-		var cur,
-			i = 0,
-			l = this.length,
-			ret = [],
-			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
-				jQuery( selectors, context || this.context ) :
-				0;
-
-		for ( ; i < l; i++ ) {
-			cur = this[i];
-
-			while ( cur && cur.ownerDocument && cur !== context && cur.nodeType !== 11 ) {
-				if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {
-					ret.push( cur );
-					break;
-				}
-				cur = cur.parentNode;
-			}
-		}
-
-		return this.pushStack( ret.length > 1 ? jQuery.unique( ret ) : ret );
-	},
-
-	// Determine the position of an element within
-	// the matched set of elements
-	index: function( elem ) {
-
-		// No argument, return index in parent
-		if ( !elem ) {
-			return ( this[0] && this[0].parentNode ) ? this.first().prevAll().length : -1;
-		}
-
-		// index in selector
-		if ( typeof elem === "string" ) {
-			return jQuery.inArray( this[0], jQuery( elem ) );
-		}
-
-		// Locate the position of the desired element
-		return jQuery.inArray(
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[0] : elem, this );
-	},
-
-	add: function( selector, context ) {
-		var set = typeof selector === "string" ?
-				jQuery( selector, context ) :
-				jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ),
-			all = jQuery.merge( this.get(), set );
-
-		return this.pushStack( jQuery.unique(all) );
-	},
-
-	addBack: function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter(selector)
-		);
-	}
-});
-
-jQuery.fn.andSelf = jQuery.fn.addBack;
-
-function sibling( cur, dir ) {
-	do {
-		cur = cur[ dir ];
-	} while ( cur && cur.nodeType !== 1 );
-
-	return cur;
-}
-
-jQuery.each({
-	parent: function( elem ) {
-		var parent = elem.parentNode;
-		return parent && parent.nodeType !== 11 ? parent : null;
-	},
-	parents: function( elem ) {
-		return jQuery.dir( elem, "parentNode" );
-	},
-	parentsUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "parentNode", until );
-	},
-	next: function( elem ) {
-		return sibling( elem, "nextSibling" );
-	},
-	prev: function( elem ) {
-		return sibling( elem, "previousSibling" );
-	},
-	nextAll: function( elem ) {
-		return jQuery.dir( elem, "nextSibling" );
-	},
-	prevAll: function( elem ) {
-		return jQuery.dir( elem, "previousSibling" );
-	},
-	nextUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "nextSibling", until );
-	},
-	prevUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "previousSibling", until );
-	},
-	siblings: function( elem ) {
-		return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
-	},
-	children: function( elem ) {
-		return jQuery.sibling( elem.firstChild );
-	},
-	contents: function( elem ) {
-		return jQuery.nodeName( elem, "iframe" ) ?
-			elem.contentDocument || elem.contentWindow.document :
-			jQuery.merge( [], elem.childNodes );
-	}
-}, function( name, fn ) {
-	jQuery.fn[ name ] = function( until, selector ) {
-		var ret = jQuery.map( this, fn, until );
-
-		if ( !runtil.test( name ) ) {
-			selector = until;
-		}
-
-		if ( selector && typeof selector === "string" ) {
-			ret = jQuery.filter( selector, ret );
-		}
-
-		ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret;
-
-		if ( this.length > 1 && rparentsprev.test( name ) ) {
-			ret = ret.reverse();
-		}
-
-		return this.pushStack( ret );
-	};
-});
-
-jQuery.extend({
-	filter: function( expr, elems, not ) {
-		if ( not ) {
-			expr = ":not(" + expr + ")";
-		}
-
-		return elems.length === 1 ?
-			jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
-			jQuery.find.matches(expr, elems);
-	},
-
-	dir: function( elem, dir, until ) {
-		var matched = [],
-			cur = elem[ dir ];
-
-		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
-			if ( cur.nodeType === 1 ) {
-				matched.push( cur );
-			}
-			cur = cur[dir];
-		}
-		return matched;
-	},
-
-	sibling: function( n, elem ) {
-		var r = [];
-
-		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType === 1 && n !== elem ) {
-				r.push( n );
-			}
-		}
-
-		return r;
-	}
-});
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, keep ) {
-
-	// Can't pass null or undefined to indexOf in Firefox 4
-	// Set to 0 to skip string check
-	qualifier = qualifier || 0;
-
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep(elements, function( elem, i ) {
-			var retVal = !!qualifier.call( elem, i, elem );
-			return retVal === keep;
-		});
-
-	} else if ( qualifier.nodeType ) {
-		return jQuery.grep(elements, function( elem ) {
-			return ( elem === qualifier ) === keep;
-		});
-
-	} else if ( typeof qualifier === "string" ) {
-		var filtered = jQuery.grep(elements, function( elem ) {
-			return elem.nodeType === 1;
-		});
-
-		if ( isSimple.test( qualifier ) ) {
-			return jQuery.filter(qualifier, filtered, !keep);
-		} else {
-			qualifier = jQuery.filter( qualifier, filtered );
-		}
-	}
-
-	return jQuery.grep(elements, function( elem ) {
-		return ( jQuery.inArray( elem, qualifier ) >= 0 ) === keep;
-	});
-}
-function createSafeFragment( document ) {
-	var list = nodeNames.split( "|" ),
-		safeFrag = document.createDocumentFragment();
-
-	if ( safeFrag.createElement ) {
-		while ( list.length ) {
-			safeFrag.createElement(
-				list.pop()
-			);
-		}
-	}
-	return safeFrag;
-}
-
-var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" +
-		"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
-	rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
-	rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
-	rleadingWhitespace = /^\s+/,
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
-	rtagName = /<([\w:]+)/,
-	rtbody = /\s*$/g,
-
-	// We have to close these tags to support XHTML (#13200)
-	wrapMap = {
-		option: [ 1, "" ],
-		legend: [ 1, "
      ", "
      " ],
-		area: [ 1, "", "" ],
-		param: [ 1, "", "" ],
-		thead: [ 1, "", "
      " ],
-		tr: [ 2, "", "
      " ],
-		col: [ 2, "", "
      " ],
-		td: [ 3, "", "
      " ],
-
-		// IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags,
-		// unless wrapped in a div with non-breaking characters in front of it.
-		_default: jQuery.support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X
      ", "
      "  ]
-	},
-	safeFragment = createSafeFragment( document ),
-	fragmentDiv = safeFragment.appendChild( document.createElement("div") );
-
-wrapMap.optgroup = wrapMap.option;
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-jQuery.fn.extend({
-	text: function( value ) {
-		return jQuery.access( this, function( value ) {
-			return value === undefined ?
-				jQuery.text( this ) :
-				this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) );
-		}, null, value, arguments.length );
-	},
-
-	wrapAll: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapAll( html.call(this, i) );
-			});
-		}
-
-		if ( this[0] ) {
-			// The elements to wrap the target around
-			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
-
-			if ( this[0].parentNode ) {
-				wrap.insertBefore( this[0] );
-			}
-
-			wrap.map(function() {
-				var elem = this;
-
-				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
-					elem = elem.firstChild;
-				}
-
-				return elem;
-			}).append( this );
-		}
-
-		return this;
-	},
-
-	wrapInner: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapInner( html.call(this, i) );
-			});
-		}
-
-		return this.each(function() {
-			var self = jQuery( this ),
-				contents = self.contents();
-
-			if ( contents.length ) {
-				contents.wrapAll( html );
-
-			} else {
-				self.append( html );
-			}
-		});
-	},
-
-	wrap: function( html ) {
-		var isFunction = jQuery.isFunction( html );
-
-		return this.each(function(i) {
-			jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
-		});
-	},
-
-	unwrap: function() {
-		return this.parent().each(function() {
-			if ( !jQuery.nodeName( this, "body" ) ) {
-				jQuery( this ).replaceWith( this.childNodes );
-			}
-		}).end();
-	},
-
-	append: function() {
-		return this.domManip(arguments, true, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				this.appendChild( elem );
-			}
-		});
-	},
-
-	prepend: function() {
-		return this.domManip(arguments, true, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				this.insertBefore( elem, this.firstChild );
-			}
-		});
-	},
-
-	before: function() {
-		return this.domManip( arguments, false, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this );
-			}
-		});
-	},
-
-	after: function() {
-		return this.domManip( arguments, false, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			}
-		});
-	},
-
-	// keepData is for internal use only--do not document
-	remove: function( selector, keepData ) {
-		var elem,
-			i = 0;
-
-		for ( ; (elem = this[i]) != null; i++ ) {
-			if ( !selector || jQuery.filter( selector, [ elem ] ).length > 0 ) {
-				if ( !keepData && elem.nodeType === 1 ) {
-					jQuery.cleanData( getAll( elem ) );
-				}
-
-				if ( elem.parentNode ) {
-					if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) {
-						setGlobalEval( getAll( elem, "script" ) );
-					}
-					elem.parentNode.removeChild( elem );
-				}
-			}
-		}
-
-		return this;
-	},
-
-	empty: function() {
-		var elem,
-			i = 0;
-
-		for ( ; (elem = this[i]) != null; i++ ) {
-			// Remove element nodes and prevent memory leaks
-			if ( elem.nodeType === 1 ) {
-				jQuery.cleanData( getAll( elem, false ) );
-			}
-
-			// Remove any remaining nodes
-			while ( elem.firstChild ) {
-				elem.removeChild( elem.firstChild );
-			}
-
-			// If this is a select, ensure that it displays empty (#12336)
-			// Support: IE<9
-			if ( elem.options && jQuery.nodeName( elem, "select" ) ) {
-				elem.options.length = 0;
-			}
-		}
-
-		return this;
-	},
-
-	clone: function( dataAndEvents, deepDataAndEvents ) {
-		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
-
-		return this.map( function () {
-			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
-		});
-	},
-
-	html: function( value ) {
-		return jQuery.access( this, function( value ) {
-			var elem = this[0] || {},
-				i = 0,
-				l = this.length;
-
-			if ( value === undefined ) {
-				return elem.nodeType === 1 ?
-					elem.innerHTML.replace( rinlinejQuery, "" ) :
-					undefined;
-			}
-
-			// See if we can take a shortcut and just use innerHTML
-			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
-				( jQuery.support.htmlSerialize || !rnoshimcache.test( value )  ) &&
-				( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
-				!wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) {
-
-				value = value.replace( rxhtmlTag, "<$1>" );
-
-				try {
-					for (; i < l; i++ ) {
-						// Remove element nodes and prevent memory leaks
-						elem = this[i] || {};
-						if ( elem.nodeType === 1 ) {
-							jQuery.cleanData( getAll( elem, false ) );
-							elem.innerHTML = value;
-						}
-					}
-
-					elem = 0;
-
-				// If using innerHTML throws an exception, use the fallback method
-				} catch(e) {}
-			}
-
-			if ( elem ) {
-				this.empty().append( value );
-			}
-		}, null, value, arguments.length );
-	},
-
-	replaceWith: function( value ) {
-		var isFunc = jQuery.isFunction( value );
-
-		// Make sure that the elements are removed from the DOM before they are inserted
-		// this can help fix replacing a parent with child elements
-		if ( !isFunc && typeof value !== "string" ) {
-			value = jQuery( value ).not( this ).detach();
-		}
-
-		return this.domManip( [ value ], true, function( elem ) {
-			var next = this.nextSibling,
-				parent = this.parentNode;
-
-			if ( parent && this.nodeType === 1 || this.nodeType === 11 ) {
-
-				jQuery( this ).remove();
-
-				if ( next ) {
-					next.parentNode.insertBefore( elem, next );
-				} else {
-					parent.appendChild( elem );
-				}
-			}
-		});
-	},
-
-	detach: function( selector ) {
-		return this.remove( selector, true );
-	},
-
-	domManip: function( args, table, callback ) {
-
-		// Flatten any nested arrays
-		args = core_concat.apply( [], args );
-
-		var fragment, first, scripts, hasScripts, node, doc,
-			i = 0,
-			l = this.length,
-			set = this,
-			iNoClone = l - 1,
-			value = args[0],
-			isFunction = jQuery.isFunction( value );
-
-		// We can't cloneNode fragments that contain checked, in WebKit
-		if ( isFunction || !( l <= 1 || typeof value !== "string" || jQuery.support.checkClone || !rchecked.test( value ) ) ) {
-			return this.each(function( index ) {
-				var self = set.eq( index );
-				if ( isFunction ) {
-					args[0] = value.call( this, index, table ? self.html() : undefined );
-				}
-				self.domManip( args, table, callback );
-			});
-		}
-
-		if ( l ) {
-			fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, this );
-			first = fragment.firstChild;
-
-			if ( fragment.childNodes.length === 1 ) {
-				fragment = first;
-			}
-
-			if ( first ) {
-				table = table && jQuery.nodeName( first, "tr" );
-				scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
-				hasScripts = scripts.length;
-
-				// Use the original fragment for the last item instead of the first because it can end up
-				// being emptied incorrectly in certain situations (#8070).
-				for ( ; i < l; i++ ) {
-					node = fragment;
-
-					if ( i !== iNoClone ) {
-						node = jQuery.clone( node, true, true );
-
-						// Keep references to cloned scripts for later restoration
-						if ( hasScripts ) {
-							jQuery.merge( scripts, getAll( node, "script" ) );
-						}
-					}
-
-					callback.call(
-						table && jQuery.nodeName( this[i], "table" ) ?
-							findOrAppend( this[i], "tbody" ) :
-							this[i],
-						node,
-						i
-					);
-				}
-
-				if ( hasScripts ) {
-					doc = scripts[ scripts.length - 1 ].ownerDocument;
-
-					// Reenable scripts
-					jQuery.map( scripts, restoreScript );
-
-					// Evaluate executable scripts on first document insertion
-					for ( i = 0; i < hasScripts; i++ ) {
-						node = scripts[ i ];
-						if ( rscriptType.test( node.type || "" ) &&
-							!jQuery._data( node, "globalEval" ) && jQuery.contains( doc, node ) ) {
-
-							if ( node.src ) {
-								// Hope ajax is available...
-								jQuery.ajax({
-									url: node.src,
-									type: "GET",
-									dataType: "script",
-									async: false,
-									global: false,
-									"throws": true
-								});
-							} else {
-								jQuery.globalEval( ( node.text || node.textContent || node.innerHTML || "" ).replace( rcleanScript, "" ) );
-							}
-						}
-					}
-				}
-
-				// Fix #11809: Avoid leaking memory
-				fragment = first = null;
-			}
-		}
-
-		return this;
-	}
-});
-
-function findOrAppend( elem, tag ) {
-	return elem.getElementsByTagName( tag )[0] || elem.appendChild( elem.ownerDocument.createElement( tag ) );
-}
-
-// Replace/restore the type attribute of script elements for safe DOM manipulation
-function disableScript( elem ) {
-	var attr = elem.getAttributeNode("type");
-	elem.type = ( attr && attr.specified ) + "/" + elem.type;
-	return elem;
-}
-function restoreScript( elem ) {
-	var match = rscriptTypeMasked.exec( elem.type );
-	if ( match ) {
-		elem.type = match[1];
-	} else {
-		elem.removeAttribute("type");
-	}
-	return elem;
-}
-
-// Mark scripts as having already been evaluated
-function setGlobalEval( elems, refElements ) {
-	var elem,
-		i = 0;
-	for ( ; (elem = elems[i]) != null; i++ ) {
-		jQuery._data( elem, "globalEval", !refElements || jQuery._data( refElements[i], "globalEval" ) );
-	}
-}
-
-function cloneCopyEvent( src, dest ) {
-
-	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
-		return;
-	}
-
-	var type, i, l,
-		oldData = jQuery._data( src ),
-		curData = jQuery._data( dest, oldData ),
-		events = oldData.events;
-
-	if ( events ) {
-		delete curData.handle;
-		curData.events = {};
-
-		for ( type in events ) {
-			for ( i = 0, l = events[ type ].length; i < l; i++ ) {
-				jQuery.event.add( dest, type, events[ type ][ i ] );
-			}
-		}
-	}
-
-	// make the cloned public data object a copy from the original
-	if ( curData.data ) {
-		curData.data = jQuery.extend( {}, curData.data );
-	}
-}
-
-function fixCloneNodeIssues( src, dest ) {
-	var nodeName, data, e;
-
-	// We do not need to do anything for non-Elements
-	if ( dest.nodeType !== 1 ) {
-		return;
-	}
-
-	nodeName = dest.nodeName.toLowerCase();
-
-	// IE6-8 copies events bound via attachEvent when using cloneNode.
-	if ( !jQuery.support.noCloneEvent && dest[ jQuery.expando ] ) {
-		data = jQuery._data( dest );
-
-		for ( e in data.events ) {
-			jQuery.removeEvent( dest, e, data.handle );
-		}
-
-		// Event data gets referenced instead of copied if the expando gets copied too
-		dest.removeAttribute( jQuery.expando );
-	}
-
-	// IE blanks contents when cloning scripts, and tries to evaluate newly-set text
-	if ( nodeName === "script" && dest.text !== src.text ) {
-		disableScript( dest ).text = src.text;
-		restoreScript( dest );
-
-	// IE6-10 improperly clones children of object elements using classid.
-	// IE10 throws NoModificationAllowedError if parent is null, #12132.
-	} else if ( nodeName === "object" ) {
-		if ( dest.parentNode ) {
-			dest.outerHTML = src.outerHTML;
-		}
-
-		// This path appears unavoidable for IE9. When cloning an object
-		// element in IE9, the outerHTML strategy above is not sufficient.
-		// If the src has innerHTML and the destination does not,
-		// copy the src.innerHTML into the dest.innerHTML. #10324
-		if ( jQuery.support.html5Clone && ( src.innerHTML && !jQuery.trim(dest.innerHTML) ) ) {
-			dest.innerHTML = src.innerHTML;
-		}
-
-	} else if ( nodeName === "input" && manipulation_rcheckableType.test( src.type ) ) {
-		// IE6-8 fails to persist the checked state of a cloned checkbox
-		// or radio button. Worse, IE6-7 fail to give the cloned element
-		// a checked appearance if the defaultChecked value isn't also set
-
-		dest.defaultChecked = dest.checked = src.checked;
-
-		// IE6-7 get confused and end up setting the value of a cloned
-		// checkbox/radio button to an empty string instead of "on"
-		if ( dest.value !== src.value ) {
-			dest.value = src.value;
-		}
-
-	// IE6-8 fails to return the selected option to the default selected
-	// state when cloning options
-	} else if ( nodeName === "option" ) {
-		dest.defaultSelected = dest.selected = src.defaultSelected;
-
-	// IE6-8 fails to set the defaultValue to the correct value when
-	// cloning other types of input fields
-	} else if ( nodeName === "input" || nodeName === "textarea" ) {
-		dest.defaultValue = src.defaultValue;
-	}
-}
-
-jQuery.each({
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var elems,
-			i = 0,
-			ret = [],
-			insert = jQuery( selector ),
-			last = insert.length - 1;
-
-		for ( ; i <= last; i++ ) {
-			elems = i === last ? this : this.clone(true);
-			jQuery( insert[i] )[ original ]( elems );
-
-			// Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get()
-			core_push.apply( ret, elems.get() );
-		}
-
-		return this.pushStack( ret );
-	};
-});
-
-function getAll( context, tag ) {
-	var elems, elem,
-		i = 0,
-		found = typeof context.getElementsByTagName !== "undefined" ? context.getElementsByTagName( tag || "*" ) :
-			typeof context.querySelectorAll !== "undefined" ? context.querySelectorAll( tag || "*" ) :
-			undefined;
-
-	if ( !found ) {
-		for ( found = [], elems = context.childNodes || context; (elem = elems[i]) != null; i++ ) {
-			if ( !tag || jQuery.nodeName( elem, tag ) ) {
-				found.push( elem );
-			} else {
-				jQuery.merge( found, getAll( elem, tag ) );
-			}
-		}
-	}
-
-	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
-		jQuery.merge( [ context ], found ) :
-		found;
-}
-
-// Used in buildFragment, fixes the defaultChecked property
-function fixDefaultChecked( elem ) {
-	if ( manipulation_rcheckableType.test( elem.type ) ) {
-		elem.defaultChecked = elem.checked;
-	}
-}
-
-jQuery.extend({
-	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
-		var destElements, srcElements, node, i, clone,
-			inPage = jQuery.contains( elem.ownerDocument, elem );
-
-		if ( jQuery.support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) {
-			clone = elem.cloneNode( true );
-
-		// IE<=8 does not properly clone detached, unknown element nodes
-		} else {
-			fragmentDiv.innerHTML = elem.outerHTML;
-			fragmentDiv.removeChild( clone = fragmentDiv.firstChild );
-		}
-
-		if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
-				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
-
-			// We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
-			destElements = getAll( clone );
-			srcElements = getAll( elem );
-
-			// Fix all IE cloning issues
-			for ( i = 0; (node = srcElements[i]) != null; ++i ) {
-				// Ensure that the destination node is not null; Fixes #9587
-				if ( destElements[i] ) {
-					fixCloneNodeIssues( node, destElements[i] );
-				}
-			}
-		}
-
-		// Copy the events from the original to the clone
-		if ( dataAndEvents ) {
-			if ( deepDataAndEvents ) {
-				srcElements = srcElements || getAll( elem );
-				destElements = destElements || getAll( clone );
-
-				for ( i = 0; (node = srcElements[i]) != null; i++ ) {
-					cloneCopyEvent( node, destElements[i] );
-				}
-			} else {
-				cloneCopyEvent( elem, clone );
-			}
-		}
-
-		// Preserve script evaluation history
-		destElements = getAll( clone, "script" );
-		if ( destElements.length > 0 ) {
-			setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
-		}
-
-		destElements = srcElements = node = null;
-
-		// Return the cloned set
-		return clone;
-	},
-
-	buildFragment: function( elems, context, scripts, selection ) {
-		var contains, elem, tag, tmp, wrap, tbody, j,
-			l = elems.length,
-
-			// Ensure a safe fragment
-			safe = createSafeFragment( context ),
-
-			nodes = [],
-			i = 0;
-
-		for ( ; i < l; i++ ) {
-			elem = elems[ i ];
-
-			if ( elem || elem === 0 ) {
-
-				// Add nodes directly
-				if ( jQuery.type( elem ) === "object" ) {
-					jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
-
-				// Convert non-html into a text node
-				} else if ( !rhtml.test( elem ) ) {
-					nodes.push( context.createTextNode( elem ) );
-
-				// Convert html into DOM nodes
-				} else {
-					tmp = tmp || safe.appendChild( context.createElement("div") );
-
-					// Deserialize a standard representation
-					tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase();
-					wrap = wrapMap[ tag ] || wrapMap._default;
-
-					tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1>" ) + wrap[2];
-
-					// Descend through wrappers to the right content
-					j = wrap[0];
-					while ( j-- ) {
-						tmp = tmp.lastChild;
-					}
-
-					// Manually add leading whitespace removed by IE
-					if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
-						nodes.push( context.createTextNode( rleadingWhitespace.exec( elem )[0] ) );
-					}
-
-					// Remove IE's autoinserted  from table fragments
-					if ( !jQuery.support.tbody ) {
-
-						// String was a , *may* have spurious 
-						elem = tag === "table" && !rtbody.test( elem ) ?
-							tmp.firstChild :
-
-							// String was a bare  or 
-							wrap[1] === "
      " && !rtbody.test( elem ) ?
-								tmp :
-								0;
-
-						j = elem && elem.childNodes.length;
-						while ( j-- ) {
-							if ( jQuery.nodeName( (tbody = elem.childNodes[j]), "tbody" ) && !tbody.childNodes.length ) {
-								elem.removeChild( tbody );
-							}
-						}
-					}
-
-					jQuery.merge( nodes, tmp.childNodes );
-
-					// Fix #12392 for WebKit and IE > 9
-					tmp.textContent = "";
-
-					// Fix #12392 for oldIE
-					while ( tmp.firstChild ) {
-						tmp.removeChild( tmp.firstChild );
-					}
-
-					// Remember the top-level container for proper cleanup
-					tmp = safe.lastChild;
-				}
-			}
-		}
-
-		// Fix #11356: Clear elements from fragment
-		if ( tmp ) {
-			safe.removeChild( tmp );
-		}
-
-		// Reset defaultChecked for any radios and checkboxes
-		// about to be appended to the DOM in IE 6/7 (#8060)
-		if ( !jQuery.support.appendChecked ) {
-			jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked );
-		}
-
-		i = 0;
-		while ( (elem = nodes[ i++ ]) ) {
-
-			// #4087 - If origin and destination elements are the same, and this is
-			// that element, do not do anything
-			if ( selection && jQuery.inArray( elem, selection ) !== -1 ) {
-				continue;
-			}
-
-			contains = jQuery.contains( elem.ownerDocument, elem );
-
-			// Append to fragment
-			tmp = getAll( safe.appendChild( elem ), "script" );
-
-			// Preserve script evaluation history
-			if ( contains ) {
-				setGlobalEval( tmp );
-			}
-
-			// Capture executables
-			if ( scripts ) {
-				j = 0;
-				while ( (elem = tmp[ j++ ]) ) {
-					if ( rscriptType.test( elem.type || "" ) ) {
-						scripts.push( elem );
-					}
-				}
-			}
-		}
-
-		tmp = null;
-
-		return safe;
-	},
-
-	cleanData: function( elems, /* internal */ acceptData ) {
-		var data, id, elem, type,
-			i = 0,
-			internalKey = jQuery.expando,
-			cache = jQuery.cache,
-			deleteExpando = jQuery.support.deleteExpando,
-			special = jQuery.event.special;
-
-		for ( ; (elem = elems[i]) != null; i++ ) {
-
-			if ( acceptData || jQuery.acceptData( elem ) ) {
-
-				id = elem[ internalKey ];
-				data = id && cache[ id ];
-
-				if ( data ) {
-					if ( data.events ) {
-						for ( type in data.events ) {
-							if ( special[ type ] ) {
-								jQuery.event.remove( elem, type );
-
-							// This is a shortcut to avoid jQuery.event.remove's overhead
-							} else {
-								jQuery.removeEvent( elem, type, data.handle );
-							}
-						}
-					}
-
-					// Remove cache only if it was not already removed by jQuery.event.remove
-					if ( cache[ id ] ) {
-
-						delete cache[ id ];
-
-						// IE does not allow us to delete expando properties from nodes,
-						// nor does it have a removeAttribute function on Document nodes;
-						// we must handle all of these cases
-						if ( deleteExpando ) {
-							delete elem[ internalKey ];
-
-						} else if ( typeof elem.removeAttribute !== "undefined" ) {
-							elem.removeAttribute( internalKey );
-
-						} else {
-							elem[ internalKey ] = null;
-						}
-
-						core_deletedIds.push( id );
-					}
-				}
-			}
-		}
-	}
-});
-var curCSS, getStyles, iframe,
-	ralpha = /alpha\([^)]*\)/i,
-	ropacity = /opacity\s*=\s*([^)]*)/,
-	rposition = /^(top|right|bottom|left)$/,
-	// swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
-	// see here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
-	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
-	rmargin = /^margin/,
-	rnumsplit = new RegExp( "^(" + core_pnum + ")(.*)$", "i" ),
-	rnumnonpx = new RegExp( "^(" + core_pnum + ")(?!px)[a-z%]+$", "i" ),
-	rrelNum = new RegExp( "^([+-])=(" + core_pnum + ")", "i" ),
-	elemdisplay = { BODY: "block" },
-
-	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
-	cssNormalTransform = {
-		letterSpacing: 0,
-		fontWeight: 400
-	},
-
-	cssExpand = [ "Top", "Right", "Bottom", "Left" ],
-	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ];
-
-// return a css property mapped to a potentially vendor prefixed property
-function vendorPropName( style, name ) {
-
-	// shortcut for names that are not vendor prefixed
-	if ( name in style ) {
-		return name;
-	}
-
-	// check for vendor prefixed names
-	var capName = name.charAt(0).toUpperCase() + name.slice(1),
-		origName = name,
-		i = cssPrefixes.length;
-
-	while ( i-- ) {
-		name = cssPrefixes[ i ] + capName;
-		if ( name in style ) {
-			return name;
-		}
-	}
-
-	return origName;
-}
-
-function isHidden( elem, el ) {
-	// isHidden might be called from jQuery#filter function;
-	// in that case, element will be second argument
-	elem = el || elem;
-	return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
-}
-
-function showHide( elements, show ) {
-	var elem,
-		values = [],
-		index = 0,
-		length = elements.length;
-
-	for ( ; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-		values[ index ] = jQuery._data( elem, "olddisplay" );
-		if ( show ) {
-			// Reset the inline display of this element to learn if it is
-			// being hidden by cascaded rules or not
-			if ( !values[ index ] && elem.style.display === "none" ) {
-				elem.style.display = "";
-			}
-
-			// Set elements which have been overridden with display: none
-			// in a stylesheet to whatever the default browser style is
-			// for such an element
-			if ( elem.style.display === "" && isHidden( elem ) ) {
-				values[ index ] = jQuery._data( elem, "olddisplay", css_defaultDisplay(elem.nodeName) );
-			}
-		} else if ( !values[ index ] && !isHidden( elem ) ) {
-			jQuery._data( elem, "olddisplay", jQuery.css( elem, "display" ) );
-		}
-	}
-
-	// Set the display of most of the elements in a second loop
-	// to avoid the constant reflow
-	for ( index = 0; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-		if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
-			elem.style.display = show ? values[ index ] || "" : "none";
-		}
-	}
-
-	return elements;
-}
-
-jQuery.fn.extend({
-	css: function( name, value ) {
-		return jQuery.access( this, function( elem, name, value ) {
-			var styles, len,
-				map = {},
-				i = 0;
-
-			if ( jQuery.isArray( name ) ) {
-				styles = getStyles( elem );
-				len = name.length;
-
-				for ( ; i < len; i++ ) {
-					map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
-				}
-
-				return map;
-			}
-
-			return value !== undefined ?
-				jQuery.style( elem, name, value ) :
-				jQuery.css( elem, name );
-		}, name, value, arguments.length > 1 );
-	},
-	show: function() {
-		return showHide( this, true );
-	},
-	hide: function() {
-		return showHide( this );
-	},
-	toggle: function( state ) {
-		var bool = typeof state === "boolean";
-
-		return this.each(function() {
-			if ( bool ? state : isHidden( this ) ) {
-				jQuery( this ).show();
-			} else {
-				jQuery( this ).hide();
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	// Add in style property hooks for overriding the default
-	// behavior of getting and setting a style property
-	cssHooks: {
-		opacity: {
-			get: function( elem, computed ) {
-				if ( computed ) {
-					// We should always get a number back from opacity
-					var ret = curCSS( elem, "opacity" );
-					return ret === "" ? "1" : ret;
-				}
-			}
-		}
-	},
-
-	// Exclude the following css properties to add px
-	cssNumber: {
-		"columnCount": true,
-		"fillOpacity": true,
-		"fontWeight": true,
-		"lineHeight": true,
-		"opacity": true,
-		"orphans": true,
-		"widows": true,
-		"zIndex": true,
-		"zoom": true
-	},
-
-	// Add in properties whose names you wish to fix before
-	// setting or getting the value
-	cssProps: {
-		// normalize float css property
-		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
-	},
-
-	// Get and set the style property on a DOM Node
-	style: function( elem, name, value, extra ) {
-		// Don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
-			return;
-		}
-
-		// Make sure that we're working with the right name
-		var ret, type, hooks,
-			origName = jQuery.camelCase( name ),
-			style = elem.style;
-
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) );
-
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// Check if we're setting a value
-		if ( value !== undefined ) {
-			type = typeof value;
-
-			// convert relative number strings (+= or -=) to relative numbers. #7345
-			if ( type === "string" && (ret = rrelNum.exec( value )) ) {
-				value = ( ret[1] + 1 ) * ret[2] + parseFloat( jQuery.css( elem, name ) );
-				// Fixes bug #9237
-				type = "number";
-			}
-
-			// Make sure that NaN and null values aren't set. See: #7116
-			if ( value == null || type === "number" && isNaN( value ) ) {
-				return;
-			}
-
-			// If a number was passed in, add 'px' to the (except for certain CSS properties)
-			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
-				value += "px";
-			}
-
-			// Fixes #8908, it can be done more correctly by specifing setters in cssHooks,
-			// but it would mean to define eight (for every problematic property) identical functions
-			if ( !jQuery.support.clearCloneStyle && value === "" && name.indexOf("background") === 0 ) {
-				style[ name ] = "inherit";
-			}
-
-			// If a hook was provided, use that value, otherwise just set the specified value
-			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) {
-
-				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
-				// Fixes bug #5509
-				try {
-					style[ name ] = value;
-				} catch(e) {}
-			}
-
-		} else {
-			// If a hook was provided get the non-computed value from there
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
-				return ret;
-			}
-
-			// Otherwise just get the value from the style object
-			return style[ name ];
-		}
-	},
-
-	css: function( elem, name, extra, styles ) {
-		var val, num, hooks,
-			origName = jQuery.camelCase( name );
-
-		// Make sure that we're working with the right name
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) );
-
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// If a hook was provided get the computed value from there
-		if ( hooks && "get" in hooks ) {
-			val = hooks.get( elem, true, extra );
-		}
-
-		// Otherwise, if a way to get the computed value exists, use that
-		if ( val === undefined ) {
-			val = curCSS( elem, name, styles );
-		}
-
-		//convert "normal" to computed value
-		if ( val === "normal" && name in cssNormalTransform ) {
-			val = cssNormalTransform[ name ];
-		}
-
-		// Return, converting to number if forced or a qualifier was provided and val looks numeric
-		if ( extra ) {
-			num = parseFloat( val );
-			return extra === true || jQuery.isNumeric( num ) ? num || 0 : val;
-		}
-		return val;
-	},
-
-	// A method for quickly swapping in/out CSS properties to get correct calculations
-	swap: function( elem, options, callback, args ) {
-		var ret, name,
-			old = {};
-
-		// Remember the old values, and insert the new ones
-		for ( name in options ) {
-			old[ name ] = elem.style[ name ];
-			elem.style[ name ] = options[ name ];
-		}
-
-		ret = callback.apply( elem, args || [] );
-
-		// Revert the old values
-		for ( name in options ) {
-			elem.style[ name ] = old[ name ];
-		}
-
-		return ret;
-	}
-});
-
-// NOTE: we've included the "window" in window.getComputedStyle
-// because jsdom on node.js will break without it.
-if ( window.getComputedStyle ) {
-	getStyles = function( elem ) {
-		return window.getComputedStyle( elem, null );
-	};
-
-	curCSS = function( elem, name, _computed ) {
-		var width, minWidth, maxWidth,
-			computed = _computed || getStyles( elem ),
-
-			// getPropertyValue is only needed for .css('filter') in IE9, see #12537
-			ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined,
-			style = elem.style;
-
-		if ( computed ) {
-
-			if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
-				ret = jQuery.style( elem, name );
-			}
-
-			// A tribute to the "awesome hack by Dean Edwards"
-			// Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right
-			// Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
-			// this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
-			if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
-
-				// Remember the original values
-				width = style.width;
-				minWidth = style.minWidth;
-				maxWidth = style.maxWidth;
-
-				// Put in the new values to get a computed value out
-				style.minWidth = style.maxWidth = style.width = ret;
-				ret = computed.width;
-
-				// Revert the changed values
-				style.width = width;
-				style.minWidth = minWidth;
-				style.maxWidth = maxWidth;
-			}
-		}
-
-		return ret;
-	};
-} else if ( document.documentElement.currentStyle ) {
-	getStyles = function( elem ) {
-		return elem.currentStyle;
-	};
-
-	curCSS = function( elem, name, _computed ) {
-		var left, rs, rsLeft,
-			computed = _computed || getStyles( elem ),
-			ret = computed ? computed[ name ] : undefined,
-			style = elem.style;
-
-		// Avoid setting ret to empty string here
-		// so we don't default to auto
-		if ( ret == null && style && style[ name ] ) {
-			ret = style[ name ];
-		}
-
-		// From the awesome hack by Dean Edwards
-		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-
-		// If we're not dealing with a regular pixel number
-		// but a number that has a weird ending, we need to convert it to pixels
-		// but not position css attributes, as those are proportional to the parent element instead
-		// and we can't measure the parent instead because it might trigger a "stacking dolls" problem
-		if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) {
-
-			// Remember the original values
-			left = style.left;
-			rs = elem.runtimeStyle;
-			rsLeft = rs && rs.left;
-
-			// Put in the new values to get a computed value out
-			if ( rsLeft ) {
-				rs.left = elem.currentStyle.left;
-			}
-			style.left = name === "fontSize" ? "1em" : ret;
-			ret = style.pixelLeft + "px";
-
-			// Revert the changed values
-			style.left = left;
-			if ( rsLeft ) {
-				rs.left = rsLeft;
-			}
-		}
-
-		return ret === "" ? "auto" : ret;
-	};
-}
-
-function setPositiveNumber( elem, value, subtract ) {
-	var matches = rnumsplit.exec( value );
-	return matches ?
-		// Guard against undefined "subtract", e.g., when used as in cssHooks
-		Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
-		value;
-}
-
-function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
-	var i = extra === ( isBorderBox ? "border" : "content" ) ?
-		// If we already have the right measurement, avoid augmentation
-		4 :
-		// Otherwise initialize for horizontal or vertical properties
-		name === "width" ? 1 : 0,
-
-		val = 0;
-
-	for ( ; i < 4; i += 2 ) {
-		// both box models exclude margin, so add it if we want it
-		if ( extra === "margin" ) {
-			val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
-		}
-
-		if ( isBorderBox ) {
-			// border-box includes padding, so remove it if we want content
-			if ( extra === "content" ) {
-				val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-			}
-
-			// at this point, extra isn't border nor margin, so remove border
-			if ( extra !== "margin" ) {
-				val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		} else {
-			// at this point, extra isn't content, so add padding
-			val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-
-			// at this point, extra isn't content nor padding, so add border
-			if ( extra !== "padding" ) {
-				val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		}
-	}
-
-	return val;
-}
-
-function getWidthOrHeight( elem, name, extra ) {
-
-	// Start with offset property, which is equivalent to the border-box value
-	var valueIsBorderBox = true,
-		val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
-		styles = getStyles( elem ),
-		isBorderBox = jQuery.support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
-
-	// some non-html elements return undefined for offsetWidth, so check for null/undefined
-	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
-	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
-	if ( val <= 0 || val == null ) {
-		// Fall back to computed then uncomputed css if necessary
-		val = curCSS( elem, name, styles );
-		if ( val < 0 || val == null ) {
-			val = elem.style[ name ];
-		}
-
-		// Computed unit is not pixels. Stop here and return.
-		if ( rnumnonpx.test(val) ) {
-			return val;
-		}
-
-		// we need the check for style in case a browser which returns unreliable values
-		// for getComputedStyle silently falls back to the reliable elem.style
-		valueIsBorderBox = isBorderBox && ( jQuery.support.boxSizingReliable || val === elem.style[ name ] );
-
-		// Normalize "", auto, and prepare for extra
-		val = parseFloat( val ) || 0;
-	}
-
-	// use the active box-sizing model to add/subtract irrelevant styles
-	return ( val +
-		augmentWidthOrHeight(
-			elem,
-			name,
-			extra || ( isBorderBox ? "border" : "content" ),
-			valueIsBorderBox,
-			styles
-		)
-	) + "px";
-}
-
-// Try to determine the default display value of an element
-function css_defaultDisplay( nodeName ) {
-	var doc = document,
-		display = elemdisplay[ nodeName ];
-
-	if ( !display ) {
-		display = actualDisplay( nodeName, doc );
-
-		// If the simple way fails, read from inside an iframe
-		if ( display === "none" || !display ) {
-			// Use the already-created iframe if possible
-			iframe = ( iframe ||
-				jQuery("' : '');
-		inst._keyEvent = false;
-		return html;
-	},
-
-	/* Generate the month and year header. */
-	_generateMonthYearHeader: function(inst, drawMonth, drawYear, minDate, maxDate,
-			secondary, monthNames, monthNamesShort) {
-		var changeMonth = this._get(inst, 'changeMonth');
-		var changeYear = this._get(inst, 'changeYear');
-		var showMonthAfterYear = this._get(inst, 'showMonthAfterYear');
-		var html = '
      ';
-		var monthHtml = '';
-		// month selection
-		if (secondary || !changeMonth)
-			monthHtml += '' + monthNames[drawMonth] + '';
-		else {
-			var inMinYear = (minDate && minDate.getFullYear() == drawYear);
-			var inMaxYear = (maxDate && maxDate.getFullYear() == drawYear);
-			monthHtml += '';
-		}
-		if (!showMonthAfterYear)
-			html += monthHtml + (secondary || !(changeMonth && changeYear) ? ' ' : '');
-		// year selection
-		if ( !inst.yearshtml ) {
-			inst.yearshtml = '';
-			if (secondary || !changeYear)
-				html += '' + drawYear + '';
-			else {
-				// determine range of years to display
-				var years = this._get(inst, 'yearRange').split(':');
-				var thisYear = new Date().getFullYear();
-				var determineYear = function(value) {
-					var year = (value.match(/c[+-].*/) ? drawYear + parseInt(value.substring(1), 10) :
-						(value.match(/[+-].*/) ? thisYear + parseInt(value, 10) :
-						parseInt(value, 10)));
-					return (isNaN(year) ? thisYear : year);
-				};
-				var year = determineYear(years[0]);
-				var endYear = Math.max(year, determineYear(years[1] || ''));
-				year = (minDate ? Math.max(year, minDate.getFullYear()) : year);
-				endYear = (maxDate ? Math.min(endYear, maxDate.getFullYear()) : endYear);
-				inst.yearshtml += '';
-
-				html += inst.yearshtml;
-				inst.yearshtml = null;
-			}
-		}
-		html += this._get(inst, 'yearSuffix');
-		if (showMonthAfterYear)
-			html += (secondary || !(changeMonth && changeYear) ? ' ' : '') + monthHtml;
-		html += '
      '; // Close datepicker_header
-		return html;
-	},
-
-	/* Adjust one of the date sub-fields. */
-	_adjustInstDate: function(inst, offset, period) {
-		var year = inst.drawYear + (period == 'Y' ? offset : 0);
-		var month = inst.drawMonth + (period == 'M' ? offset : 0);
-		var day = Math.min(inst.selectedDay, this._getDaysInMonth(year, month)) +
-			(period == 'D' ? offset : 0);
-		var date = this._restrictMinMax(inst,
-			this._daylightSavingAdjust(new Date(year, month, day)));
-		inst.selectedDay = date.getDate();
-		inst.drawMonth = inst.selectedMonth = date.getMonth();
-		inst.drawYear = inst.selectedYear = date.getFullYear();
-		if (period == 'M' || period == 'Y')
-			this._notifyChange(inst);
-	},
-
-	/* Ensure a date is within any min/max bounds. */
-	_restrictMinMax: function(inst, date) {
-		var minDate = this._getMinMaxDate(inst, 'min');
-		var maxDate = this._getMinMaxDate(inst, 'max');
-		var newDate = (minDate && date < minDate ? minDate : date);
-		newDate = (maxDate && newDate > maxDate ? maxDate : newDate);
-		return newDate;
-	},
-
-	/* Notify change of month/year. */
-	_notifyChange: function(inst) {
-		var onChange = this._get(inst, 'onChangeMonthYear');
-		if (onChange)
-			onChange.apply((inst.input ? inst.input[0] : null),
-				[inst.selectedYear, inst.selectedMonth + 1, inst]);
-	},
-
-	/* Determine the number of months to show. */
-	_getNumberOfMonths: function(inst) {
-		var numMonths = this._get(inst, 'numberOfMonths');
-		return (numMonths == null ? [1, 1] : (typeof numMonths == 'number' ? [1, numMonths] : numMonths));
-	},
-
-	/* Determine the current maximum date - ensure no time components are set. */
-	_getMinMaxDate: function(inst, minMax) {
-		return this._determineDate(inst, this._get(inst, minMax + 'Date'), null);
-	},
-
-	/* Find the number of days in a given month. */
-	_getDaysInMonth: function(year, month) {
-		return 32 - this._daylightSavingAdjust(new Date(year, month, 32)).getDate();
-	},
-
-	/* Find the day of the week of the first of a month. */
-	_getFirstDayOfMonth: function(year, month) {
-		return new Date(year, month, 1).getDay();
-	},
-
-	/* Determines if we should allow a "next/prev" month display change. */
-	_canAdjustMonth: function(inst, offset, curYear, curMonth) {
-		var numMonths = this._getNumberOfMonths(inst);
-		var date = this._daylightSavingAdjust(new Date(curYear,
-			curMonth + (offset < 0 ? offset : numMonths[0] * numMonths[1]), 1));
-		if (offset < 0)
-			date.setDate(this._getDaysInMonth(date.getFullYear(), date.getMonth()));
-		return this._isInRange(inst, date);
-	},
-
-	/* Is the given date in the accepted range? */
-	_isInRange: function(inst, date) {
-		var minDate = this._getMinMaxDate(inst, 'min');
-		var maxDate = this._getMinMaxDate(inst, 'max');
-		return ((!minDate || date.getTime() >= minDate.getTime()) &&
-			(!maxDate || date.getTime() <= maxDate.getTime()));
-	},
-
-	/* Provide the configuration settings for formatting/parsing. */
-	_getFormatConfig: function(inst) {
-		var shortYearCutoff = this._get(inst, 'shortYearCutoff');
-		shortYearCutoff = (typeof shortYearCutoff != 'string' ? shortYearCutoff :
-			new Date().getFullYear() % 100 + parseInt(shortYearCutoff, 10));
-		return {shortYearCutoff: shortYearCutoff,
-			dayNamesShort: this._get(inst, 'dayNamesShort'), dayNames: this._get(inst, 'dayNames'),
-			monthNamesShort: this._get(inst, 'monthNamesShort'), monthNames: this._get(inst, 'monthNames')};
-	},
-
-	/* Format the given date for display. */
-	_formatDate: function(inst, day, month, year) {
-		if (!day) {
-			inst.currentDay = inst.selectedDay;
-			inst.currentMonth = inst.selectedMonth;
-			inst.currentYear = inst.selectedYear;
-		}
-		var date = (day ? (typeof day == 'object' ? day :
-			this._daylightSavingAdjust(new Date(year, month, day))) :
-			this._daylightSavingAdjust(new Date(inst.currentYear, inst.currentMonth, inst.currentDay)));
-		return this.formatDate(this._get(inst, 'dateFormat'), date, this._getFormatConfig(inst));
-	}
-});
-
-/*
- * Bind hover events for datepicker elements.
- * Done via delegate so the binding only occurs once in the lifetime of the parent div.
- * Global instActive, set by _updateDatepicker allows the handlers to find their way back to the active picker.
- */
-function bindHover(dpDiv) {
-	var selector = 'button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a';
-	return dpDiv.delegate(selector, 'mouseout', function() {
-			$(this).removeClass('ui-state-hover');
-			if (this.className.indexOf('ui-datepicker-prev') != -1) $(this).removeClass('ui-datepicker-prev-hover');
-			if (this.className.indexOf('ui-datepicker-next') != -1) $(this).removeClass('ui-datepicker-next-hover');
-		})
-		.delegate(selector, 'mouseover', function(){
-			if (!$.datepicker._isDisabledDatepicker( instActive.inline ? dpDiv.parent()[0] : instActive.input[0])) {
-				$(this).parents('.ui-datepicker-calendar').find('a').removeClass('ui-state-hover');
-				$(this).addClass('ui-state-hover');
-				if (this.className.indexOf('ui-datepicker-prev') != -1) $(this).addClass('ui-datepicker-prev-hover');
-				if (this.className.indexOf('ui-datepicker-next') != -1) $(this).addClass('ui-datepicker-next-hover');
-			}
-		});
-}
-
-/* jQuery extend now ignores nulls! */
-function extendRemove(target, props) {
-	$.extend(target, props);
-	for (var name in props)
-		if (props[name] == null || props[name] == undefined)
-			target[name] = props[name];
-	return target;
-};
-
-/* Invoke the datepicker functionality.
-   @param  options  string - a command, optionally followed by additional parameters or
-	                Object - settings for attaching new datepicker functionality
-   @return  jQuery object */
-$.fn.datepicker = function(options){
-
-	/* Verify an empty collection wasn't passed - Fixes #6976 */
-	if ( !this.length ) {
-		return this;
-	}
-
-	/* Initialise the date picker. */
-	if (!$.datepicker.initialized) {
-		$(document).mousedown($.datepicker._checkExternalClick).
-			find(document.body).append($.datepicker.dpDiv);
-		$.datepicker.initialized = true;
-	}
-
-	var otherArgs = Array.prototype.slice.call(arguments, 1);
-	if (typeof options == 'string' && (options == 'isDisabled' || options == 'getDate' || options == 'widget'))
-		return $.datepicker['_' + options + 'Datepicker'].
-			apply($.datepicker, [this[0]].concat(otherArgs));
-	if (options == 'option' && arguments.length == 2 && typeof arguments[1] == 'string')
-		return $.datepicker['_' + options + 'Datepicker'].
-			apply($.datepicker, [this[0]].concat(otherArgs));
-	return this.each(function() {
-		typeof options == 'string' ?
-			$.datepicker['_' + options + 'Datepicker'].
-				apply($.datepicker, [this].concat(otherArgs)) :
-			$.datepicker._attachDatepicker(this, options);
-	});
-};
-
-$.datepicker = new Datepicker(); // singleton instance
-$.datepicker.initialized = false;
-$.datepicker.uuid = new Date().getTime();
-$.datepicker.version = "1.9.2";
-
-// Workaround for #4055
-// Add another global to avoid noConflict issues with inline event handlers
-window['DP_jQuery_' + dpuuid] = $;
-
-})(jQuery);
-(function( $, undefined ) {
-
-var uiDialogClasses = "ui-dialog ui-widget ui-widget-content ui-corner-all ",
-	sizeRelatedOptions = {
-		buttons: true,
-		height: true,
-		maxHeight: true,
-		maxWidth: true,
-		minHeight: true,
-		minWidth: true,
-		width: true
-	},
-	resizableRelatedOptions = {
-		maxHeight: true,
-		maxWidth: true,
-		minHeight: true,
-		minWidth: true
-	};
-
-$.widget("ui.dialog", {
-	version: "1.9.2",
-	options: {
-		autoOpen: true,
-		buttons: {},
-		closeOnEscape: true,
-		closeText: "close",
-		dialogClass: "",
-		draggable: true,
-		hide: null,
-		height: "auto",
-		maxHeight: false,
-		maxWidth: false,
-		minHeight: 150,
-		minWidth: 150,
-		modal: false,
-		position: {
-			my: "center",
-			at: "center",
-			of: window,
-			collision: "fit",
-			// ensure that the titlebar is never outside the document
-			using: function( pos ) {
-				var topOffset = $( this ).css( pos ).offset().top;
-				if ( topOffset < 0 ) {
-					$( this ).css( "top", pos.top - topOffset );
-				}
-			}
-		},
-		resizable: true,
-		show: null,
-		stack: true,
-		title: "",
-		width: 300,
-		zIndex: 1000
-	},
-
-	_create: function() {
-		this.originalTitle = this.element.attr( "title" );
-		// #5742 - .attr() might return a DOMElement
-		if ( typeof this.originalTitle !== "string" ) {
-			this.originalTitle = "";
-		}
-		this.oldPosition = {
-			parent: this.element.parent(),
-			index: this.element.parent().children().index( this.element )
-		};
-		this.options.title = this.options.title || this.originalTitle;
-		var that = this,
-			options = this.options,
-
-			title = options.title || " ",
-			uiDialog,
-			uiDialogTitlebar,
-			uiDialogTitlebarClose,
-			uiDialogTitle,
-			uiDialogButtonPane;
-
-			uiDialog = ( this.uiDialog = $( "
      " ) )
-				.addClass( uiDialogClasses + options.dialogClass )
-				.css({
-					display: "none",
-					outline: 0, // TODO: move to stylesheet
-					zIndex: options.zIndex
-				})
-				// setting tabIndex makes the div focusable
-				.attr( "tabIndex", -1)
-				.keydown(function( event ) {
-					if ( options.closeOnEscape && !event.isDefaultPrevented() && event.keyCode &&
-							event.keyCode === $.ui.keyCode.ESCAPE ) {
-						that.close( event );
-						event.preventDefault();
-					}
-				})
-				.mousedown(function( event ) {
-					that.moveToTop( false, event );
-				})
-				.appendTo( "body" );
-
-			this.element
-				.show()
-				.removeAttr( "title" )
-				.addClass( "ui-dialog-content ui-widget-content" )
-				.appendTo( uiDialog );
-
-			uiDialogTitlebar = ( this.uiDialogTitlebar = $( "
      " ) )
-				.addClass( "ui-dialog-titlebar  ui-widget-header  " +
-					"ui-corner-all  ui-helper-clearfix" )
-				.bind( "mousedown", function() {
-					// Dialog isn't getting focus when dragging (#8063)
-					uiDialog.focus();
-				})
-				.prependTo( uiDialog );
-
-			uiDialogTitlebarClose = $( "" )
-				.addClass( "ui-dialog-titlebar-close  ui-corner-all" )
-				.attr( "role", "button" )
-				.click(function( event ) {
-					event.preventDefault();
-					that.close( event );
-				})
-				.appendTo( uiDialogTitlebar );
-
-			( this.uiDialogTitlebarCloseText = $( "" ) )
-				.addClass( "ui-icon ui-icon-closethick" )
-				.text( options.closeText )
-				.appendTo( uiDialogTitlebarClose );
-
-			uiDialogTitle = $( "" )
-				.uniqueId()
-				.addClass( "ui-dialog-title" )
-				.html( title )
-				.prependTo( uiDialogTitlebar );
-
-			uiDialogButtonPane = ( this.uiDialogButtonPane = $( "
      " ) )
-				.addClass( "ui-dialog-buttonpane ui-widget-content ui-helper-clearfix" );
-
-			( this.uiButtonSet = $( "
      " ) )
-				.addClass( "ui-dialog-buttonset" )
-				.appendTo( uiDialogButtonPane );
-
-		uiDialog.attr({
-			role: "dialog",
-			"aria-labelledby": uiDialogTitle.attr( "id" )
-		});
-
-		uiDialogTitlebar.find( "*" ).add( uiDialogTitlebar ).disableSelection();
-		this._hoverable( uiDialogTitlebarClose );
-		this._focusable( uiDialogTitlebarClose );
-
-		if ( options.draggable && $.fn.draggable ) {
-			this._makeDraggable();
-		}
-		if ( options.resizable && $.fn.resizable ) {
-			this._makeResizable();
-		}
-
-		this._createButtons( options.buttons );
-		this._isOpen = false;
-
-		if ( $.fn.bgiframe ) {
-			uiDialog.bgiframe();
-		}
-
-		// prevent tabbing out of modal dialogs
-		this._on( uiDialog, { keydown: function( event ) {
-			if ( !options.modal || event.keyCode !== $.ui.keyCode.TAB ) {
-				return;
-			}
-
-			var tabbables = $( ":tabbable", uiDialog ),
-				first = tabbables.filter( ":first" ),
-				last  = tabbables.filter( ":last" );
-
-			if ( event.target === last[0] && !event.shiftKey ) {
-				first.focus( 1 );
-				return false;
-			} else if ( event.target === first[0] && event.shiftKey ) {
-				last.focus( 1 );
-				return false;
-			}
-		}});
-	},
-
-	_init: function() {
-		if ( this.options.autoOpen ) {
-			this.open();
-		}
-	},
-
-	_destroy: function() {
-		var next,
-			oldPosition = this.oldPosition;
-
-		if ( this.overlay ) {
-			this.overlay.destroy();
-		}
-		this.uiDialog.hide();
-		this.element
-			.removeClass( "ui-dialog-content ui-widget-content" )
-			.hide()
-			.appendTo( "body" );
-		this.uiDialog.remove();
-
-		if ( this.originalTitle ) {
-			this.element.attr( "title", this.originalTitle );
-		}
-
-		next = oldPosition.parent.children().eq( oldPosition.index );
-		// Don't try to place the dialog next to itself (#8613)
-		if ( next.length && next[ 0 ] !== this.element[ 0 ] ) {
-			next.before( this.element );
-		} else {
-			oldPosition.parent.append( this.element );
-		}
-	},
-
-	widget: function() {
-		return this.uiDialog;
-	},
-
-	close: function( event ) {
-		var that = this,
-			maxZ, thisZ;
-
-		if ( !this._isOpen ) {
-			return;
-		}
-
-		if ( false === this._trigger( "beforeClose", event ) ) {
-			return;
-		}
-
-		this._isOpen = false;
-
-		if ( this.overlay ) {
-			this.overlay.destroy();
-		}
-
-		if ( this.options.hide ) {
-			this._hide( this.uiDialog, this.options.hide, function() {
-				that._trigger( "close", event );
-			});
-		} else {
-			this.uiDialog.hide();
-			this._trigger( "close", event );
-		}
-
-		$.ui.dialog.overlay.resize();
-
-		// adjust the maxZ to allow other modal dialogs to continue to work (see #4309)
-		if ( this.options.modal ) {
-			maxZ = 0;
-			$( ".ui-dialog" ).each(function() {
-				if ( this !== that.uiDialog[0] ) {
-					thisZ = $( this ).css( "z-index" );
-					if ( !isNaN( thisZ ) ) {
-						maxZ = Math.max( maxZ, thisZ );
-					}
-				}
-			});
-			$.ui.dialog.maxZ = maxZ;
-		}
-
-		return this;
-	},
-
-	isOpen: function() {
-		return this._isOpen;
-	},
-
-	// the force parameter allows us to move modal dialogs to their correct
-	// position on open
-	moveToTop: function( force, event ) {
-		var options = this.options,
-			saveScroll;
-
-		if ( ( options.modal && !force ) ||
-				( !options.stack && !options.modal ) ) {
-			return this._trigger( "focus", event );
-		}
-
-		if ( options.zIndex > $.ui.dialog.maxZ ) {
-			$.ui.dialog.maxZ = options.zIndex;
-		}
-		if ( this.overlay ) {
-			$.ui.dialog.maxZ += 1;
-			$.ui.dialog.overlay.maxZ = $.ui.dialog.maxZ;
-			this.overlay.$el.css( "z-index", $.ui.dialog.overlay.maxZ );
-		}
-
-		// Save and then restore scroll
-		// Opera 9.5+ resets when parent z-index is changed.
-		// http://bugs.jqueryui.com/ticket/3193
-		saveScroll = {
-			scrollTop: this.element.scrollTop(),
-			scrollLeft: this.element.scrollLeft()
-		};
-		$.ui.dialog.maxZ += 1;
-		this.uiDialog.css( "z-index", $.ui.dialog.maxZ );
-		this.element.attr( saveScroll );
-		this._trigger( "focus", event );
-
-		return this;
-	},
-
-	open: function() {
-		if ( this._isOpen ) {
-			return;
-		}
-
-		var hasFocus,
-			options = this.options,
-			uiDialog = this.uiDialog;
-
-		this._size();
-		this._position( options.position );
-		uiDialog.show( options.show );
-		this.overlay = options.modal ? new $.ui.dialog.overlay( this ) : null;
-		this.moveToTop( true );
-
-		// set focus to the first tabbable element in the content area or the first button
-		// if there are no tabbable elements, set focus on the dialog itself
-		hasFocus = this.element.find( ":tabbable" );
-		if ( !hasFocus.length ) {
-			hasFocus = this.uiDialogButtonPane.find( ":tabbable" );
-			if ( !hasFocus.length ) {
-				hasFocus = uiDialog;
-			}
-		}
-		hasFocus.eq( 0 ).focus();
-
-		this._isOpen = true;
-		this._trigger( "open" );
-
-		return this;
-	},
-
-	_createButtons: function( buttons ) {
-		var that = this,
-			hasButtons = false;
-
-		// if we already have a button pane, remove it
-		this.uiDialogButtonPane.remove();
-		this.uiButtonSet.empty();
-
-		if ( typeof buttons === "object" && buttons !== null ) {
-			$.each( buttons, function() {
-				return !(hasButtons = true);
-			});
-		}
-		if ( hasButtons ) {
-			$.each( buttons, function( name, props ) {
-				var button, click;
-				props = $.isFunction( props ) ?
-					{ click: props, text: name } :
-					props;
-				// Default to a non-submitting button
-				props = $.extend( { type: "button" }, props );
-				// Change the context for the click callback to be the main element
-				click = props.click;
-				props.click = function() {
-					click.apply( that.element[0], arguments );
-				};
-				button = $( "", props )
-					.appendTo( that.uiButtonSet );
-				if ( $.fn.button ) {
-					button.button();
-				}
-			});
-			this.uiDialog.addClass( "ui-dialog-buttons" );
-			this.uiDialogButtonPane.appendTo( this.uiDialog );
-		} else {
-			this.uiDialog.removeClass( "ui-dialog-buttons" );
-		}
-	},
-
-	_makeDraggable: function() {
-		var that = this,
-			options = this.options;
-
-		function filteredUi( ui ) {
-			return {
-				position: ui.position,
-				offset: ui.offset
-			};
-		}
-
-		this.uiDialog.draggable({
-			cancel: ".ui-dialog-content, .ui-dialog-titlebar-close",
-			handle: ".ui-dialog-titlebar",
-			containment: "document",
-			start: function( event, ui ) {
-				$( this )
-					.addClass( "ui-dialog-dragging" );
-				that._trigger( "dragStart", event, filteredUi( ui ) );
-			},
-			drag: function( event, ui ) {
-				that._trigger( "drag", event, filteredUi( ui ) );
-			},
-			stop: function( event, ui ) {
-				options.position = [
-					ui.position.left - that.document.scrollLeft(),
-					ui.position.top - that.document.scrollTop()
-				];
-				$( this )
-					.removeClass( "ui-dialog-dragging" );
-				that._trigger( "dragStop", event, filteredUi( ui ) );
-				$.ui.dialog.overlay.resize();
-			}
-		});
-	},
-
-	_makeResizable: function( handles ) {
-		handles = (handles === undefined ? this.options.resizable : handles);
-		var that = this,
-			options = this.options,
-			// .ui-resizable has position: relative defined in the stylesheet
-			// but dialogs have to use absolute or fixed positioning
-			position = this.uiDialog.css( "position" ),
-			resizeHandles = typeof handles === 'string' ?
-				handles	:
-				"n,e,s,w,se,sw,ne,nw";
-
-		function filteredUi( ui ) {
-			return {
-				originalPosition: ui.originalPosition,
-				originalSize: ui.originalSize,
-				position: ui.position,
-				size: ui.size
-			};
-		}
-
-		this.uiDialog.resizable({
-			cancel: ".ui-dialog-content",
-			containment: "document",
-			alsoResize: this.element,
-			maxWidth: options.maxWidth,
-			maxHeight: options.maxHeight,
-			minWidth: options.minWidth,
-			minHeight: this._minHeight(),
-			handles: resizeHandles,
-			start: function( event, ui ) {
-				$( this ).addClass( "ui-dialog-resizing" );
-				that._trigger( "resizeStart", event, filteredUi( ui ) );
-			},
-			resize: function( event, ui ) {
-				that._trigger( "resize", event, filteredUi( ui ) );
-			},
-			stop: function( event, ui ) {
-				$( this ).removeClass( "ui-dialog-resizing" );
-				options.height = $( this ).height();
-				options.width = $( this ).width();
-				that._trigger( "resizeStop", event, filteredUi( ui ) );
-				$.ui.dialog.overlay.resize();
-			}
-		})
-		.css( "position", position )
-		.find( ".ui-resizable-se" )
-			.addClass( "ui-icon ui-icon-grip-diagonal-se" );
-	},
-
-	_minHeight: function() {
-		var options = this.options;
-
-		if ( options.height === "auto" ) {
-			return options.minHeight;
-		} else {
-			return Math.min( options.minHeight, options.height );
-		}
-	},
-
-	_position: function( position ) {
-		var myAt = [],
-			offset = [ 0, 0 ],
-			isVisible;
-
-		if ( position ) {
-			// deep extending converts arrays to objects in jQuery <= 1.3.2 :-(
-	//		if (typeof position == 'string' || $.isArray(position)) {
-	//			myAt = $.isArray(position) ? position : position.split(' ');
-
-			if ( typeof position === "string" || (typeof position === "object" && "0" in position ) ) {
-				myAt = position.split ? position.split( " " ) : [ position[ 0 ], position[ 1 ] ];
-				if ( myAt.length === 1 ) {
-					myAt[ 1 ] = myAt[ 0 ];
-				}
-
-				$.each( [ "left", "top" ], function( i, offsetPosition ) {
-					if ( +myAt[ i ] === myAt[ i ] ) {
-						offset[ i ] = myAt[ i ];
-						myAt[ i ] = offsetPosition;
-					}
-				});
-
-				position = {
-					my: myAt[0] + (offset[0] < 0 ? offset[0] : "+" + offset[0]) + " " +
-						myAt[1] + (offset[1] < 0 ? offset[1] : "+" + offset[1]),
-					at: myAt.join( " " )
-				};
-			}
-
-			position = $.extend( {}, $.ui.dialog.prototype.options.position, position );
-		} else {
-			position = $.ui.dialog.prototype.options.position;
-		}
-
-		// need to show the dialog to get the actual offset in the position plugin
-		isVisible = this.uiDialog.is( ":visible" );
-		if ( !isVisible ) {
-			this.uiDialog.show();
-		}
-		this.uiDialog.position( position );
-		if ( !isVisible ) {
-			this.uiDialog.hide();
-		}
-	},
-
-	_setOptions: function( options ) {
-		var that = this,
-			resizableOptions = {},
-			resize = false;
-
-		$.each( options, function( key, value ) {
-			that._setOption( key, value );
-
-			if ( key in sizeRelatedOptions ) {
-				resize = true;
-			}
-			if ( key in resizableRelatedOptions ) {
-				resizableOptions[ key ] = value;
-			}
-		});
-
-		if ( resize ) {
-			this._size();
-		}
-		if ( this.uiDialog.is( ":data(resizable)" ) ) {
-			this.uiDialog.resizable( "option", resizableOptions );
-		}
-	},
-
-	_setOption: function( key, value ) {
-		var isDraggable, isResizable,
-			uiDialog = this.uiDialog;
-
-		switch ( key ) {
-			case "buttons":
-				this._createButtons( value );
-				break;
-			case "closeText":
-				// ensure that we always pass a string
-				this.uiDialogTitlebarCloseText.text( "" + value );
-				break;
-			case "dialogClass":
-				uiDialog
-					.removeClass( this.options.dialogClass )
-					.addClass( uiDialogClasses + value );
-				break;
-			case "disabled":
-				if ( value ) {
-					uiDialog.addClass( "ui-dialog-disabled" );
-				} else {
-					uiDialog.removeClass( "ui-dialog-disabled" );
-				}
-				break;
-			case "draggable":
-				isDraggable = uiDialog.is( ":data(draggable)" );
-				if ( isDraggable && !value ) {
-					uiDialog.draggable( "destroy" );
-				}
-
-				if ( !isDraggable && value ) {
-					this._makeDraggable();
-				}
-				break;
-			case "position":
-				this._position( value );
-				break;
-			case "resizable":
-				// currently resizable, becoming non-resizable
-				isResizable = uiDialog.is( ":data(resizable)" );
-				if ( isResizable && !value ) {
-					uiDialog.resizable( "destroy" );
-				}
-
-				// currently resizable, changing handles
-				if ( isResizable && typeof value === "string" ) {
-					uiDialog.resizable( "option", "handles", value );
-				}
-
-				// currently non-resizable, becoming resizable
-				if ( !isResizable && value !== false ) {
-					this._makeResizable( value );
-				}
-				break;
-			case "title":
-				// convert whatever was passed in o a string, for html() to not throw up
-				$( ".ui-dialog-title", this.uiDialogTitlebar )
-					.html( "" + ( value || " " ) );
-				break;
-		}
-
-		this._super( key, value );
-	},
-
-	_size: function() {
-		/* If the user has resized the dialog, the .ui-dialog and .ui-dialog-content
-		 * divs will both have width and height set, so we need to reset them
-		 */
-		var nonContentHeight, minContentHeight, autoHeight,
-			options = this.options,
-			isVisible = this.uiDialog.is( ":visible" );
-
-		// reset content sizing
-		this.element.show().css({
-			width: "auto",
-			minHeight: 0,
-			height: 0
-		});
-
-		if ( options.minWidth > options.width ) {
-			options.width = options.minWidth;
-		}
-
-		// reset wrapper sizing
-		// determine the height of all the non-content elements
-		nonContentHeight = this.uiDialog.css({
-				height: "auto",
-				width: options.width
-			})
-			.outerHeight();
-		minContentHeight = Math.max( 0, options.minHeight - nonContentHeight );
-
-		if ( options.height === "auto" ) {
-			// only needed for IE6 support
-			if ( $.support.minHeight ) {
-				this.element.css({
-					minHeight: minContentHeight,
-					height: "auto"
-				});
-			} else {
-				this.uiDialog.show();
-				autoHeight = this.element.css( "height", "auto" ).height();
-				if ( !isVisible ) {
-					this.uiDialog.hide();
-				}
-				this.element.height( Math.max( autoHeight, minContentHeight ) );
-			}
-		} else {
-			this.element.height( Math.max( options.height - nonContentHeight, 0 ) );
-		}
-
-		if (this.uiDialog.is( ":data(resizable)" ) ) {
-			this.uiDialog.resizable( "option", "minHeight", this._minHeight() );
-		}
-	}
-});
-
-$.extend($.ui.dialog, {
-	uuid: 0,
-	maxZ: 0,
-
-	getTitleId: function($el) {
-		var id = $el.attr( "id" );
-		if ( !id ) {
-			this.uuid += 1;
-			id = this.uuid;
-		}
-		return "ui-dialog-title-" + id;
-	},
-
-	overlay: function( dialog ) {
-		this.$el = $.ui.dialog.overlay.create( dialog );
-	}
-});
-
-$.extend( $.ui.dialog.overlay, {
-	instances: [],
-	// reuse old instances due to IE memory leak with alpha transparency (see #5185)
-	oldInstances: [],
-	maxZ: 0,
-	events: $.map(
-		"focus,mousedown,mouseup,keydown,keypress,click".split( "," ),
-		function( event ) {
-			return event + ".dialog-overlay";
-		}
-	).join( " " ),
-	create: function( dialog ) {
-		if ( this.instances.length === 0 ) {
-			// prevent use of anchors and inputs
-			// we use a setTimeout in case the overlay is created from an
-			// event that we're going to be cancelling (see #2804)
-			setTimeout(function() {
-				// handle $(el).dialog().dialog('close') (see #4065)
-				if ( $.ui.dialog.overlay.instances.length ) {
-					$( document ).bind( $.ui.dialog.overlay.events, function( event ) {
-						// stop events if the z-index of the target is < the z-index of the overlay
-						// we cannot return true when we don't want to cancel the event (#3523)
-						if ( $( event.target ).zIndex() < $.ui.dialog.overlay.maxZ ) {
-							return false;
-						}
-					});
-				}
-			}, 1 );
-
-			// handle window resize
-			$( window ).bind( "resize.dialog-overlay", $.ui.dialog.overlay.resize );
-		}
-
-		var $el = ( this.oldInstances.pop() || $( "
      " ).addClass( "ui-widget-overlay" ) );
-
-		// allow closing by pressing the escape key
-		$( document ).bind( "keydown.dialog-overlay", function( event ) {
-			var instances = $.ui.dialog.overlay.instances;
-			// only react to the event if we're the top overlay
-			if ( instances.length !== 0 && instances[ instances.length - 1 ] === $el &&
-				dialog.options.closeOnEscape && !event.isDefaultPrevented() && event.keyCode &&
-				event.keyCode === $.ui.keyCode.ESCAPE ) {
-
-				dialog.close( event );
-				event.preventDefault();
-			}
-		});
-
-		$el.appendTo( document.body ).css({
-			width: this.width(),
-			height: this.height()
-		});
-
-		if ( $.fn.bgiframe ) {
-			$el.bgiframe();
-		}
-
-		this.instances.push( $el );
-		return $el;
-	},
-
-	destroy: function( $el ) {
-		var indexOf = $.inArray( $el, this.instances ),
-			maxZ = 0;
-
-		if ( indexOf !== -1 ) {
-			this.oldInstances.push( this.instances.splice( indexOf, 1 )[ 0 ] );
-		}
-
-		if ( this.instances.length === 0 ) {
-			$( [ document, window ] ).unbind( ".dialog-overlay" );
-		}
-
-		$el.height( 0 ).width( 0 ).remove();
-
-		// adjust the maxZ to allow other modal dialogs to continue to work (see #4309)
-		$.each( this.instances, function() {
-			maxZ = Math.max( maxZ, this.css( "z-index" ) );
-		});
-		this.maxZ = maxZ;
-	},
-
-	height: function() {
-		var scrollHeight,
-			offsetHeight;
-		// handle IE
-		if ( $.ui.ie ) {
-			scrollHeight = Math.max(
-				document.documentElement.scrollHeight,
-				document.body.scrollHeight
-			);
-			offsetHeight = Math.max(
-				document.documentElement.offsetHeight,
-				document.body.offsetHeight
-			);
-
-			if ( scrollHeight < offsetHeight ) {
-				return $( window ).height() + "px";
-			} else {
-				return scrollHeight + "px";
-			}
-		// handle "good" browsers
-		} else {
-			return $( document ).height() + "px";
-		}
-	},
-
-	width: function() {
-		var scrollWidth,
-			offsetWidth;
-		// handle IE
-		if ( $.ui.ie ) {
-			scrollWidth = Math.max(
-				document.documentElement.scrollWidth,
-				document.body.scrollWidth
-			);
-			offsetWidth = Math.max(
-				document.documentElement.offsetWidth,
-				document.body.offsetWidth
-			);
-
-			if ( scrollWidth < offsetWidth ) {
-				return $( window ).width() + "px";
-			} else {
-				return scrollWidth + "px";
-			}
-		// handle "good" browsers
-		} else {
-			return $( document ).width() + "px";
-		}
-	},
-
-	resize: function() {
-		/* If the dialog is draggable and the user drags it past the
-		 * right edge of the window, the document becomes wider so we
-		 * need to stretch the overlay. If the user then drags the
-		 * dialog back to the left, the document will become narrower,
-		 * so we need to shrink the overlay to the appropriate size.
-		 * This is handled by shrinking the overlay before setting it
-		 * to the full document size.
-		 */
-		var $overlays = $( [] );
-		$.each( $.ui.dialog.overlay.instances, function() {
-			$overlays = $overlays.add( this );
-		});
-
-		$overlays.css({
-			width: 0,
-			height: 0
-		}).css({
-			width: $.ui.dialog.overlay.width(),
-			height: $.ui.dialog.overlay.height()
-		});
-	}
-});
-
-$.extend( $.ui.dialog.overlay.prototype, {
-	destroy: function() {
-		$.ui.dialog.overlay.destroy( this.$el );
-	}
-});
-
-}( jQuery ) );
-(function( $, undefined ) {
-
-$.widget("ui.draggable", $.ui.mouse, {
-	version: "1.9.2",
-	widgetEventPrefix: "drag",
-	options: {
-		addClasses: true,
-		appendTo: "parent",
-		axis: false,
-		connectToSortable: false,
-		containment: false,
-		cursor: "auto",
-		cursorAt: false,
-		grid: false,
-		handle: false,
-		helper: "original",
-		iframeFix: false,
-		opacity: false,
-		refreshPositions: false,
-		revert: false,
-		revertDuration: 500,
-		scope: "default",
-		scroll: true,
-		scrollSensitivity: 20,
-		scrollSpeed: 20,
-		snap: false,
-		snapMode: "both",
-		snapTolerance: 20,
-		stack: false,
-		zIndex: false
-	},
-	_create: function() {
-
-		if (this.options.helper == 'original' && !(/^(?:r|a|f)/).test(this.element.css("position")))
-			this.element[0].style.position = 'relative';
-
-		(this.options.addClasses && this.element.addClass("ui-draggable"));
-		(this.options.disabled && this.element.addClass("ui-draggable-disabled"));
-
-		this._mouseInit();
-
-	},
-
-	_destroy: function() {
-		this.element.removeClass( "ui-draggable ui-draggable-dragging ui-draggable-disabled" );
-		this._mouseDestroy();
-	},
-
-	_mouseCapture: function(event) {
-
-		var o = this.options;
-
-		// among others, prevent a drag on a resizable-handle
-		if (this.helper || o.disabled || $(event.target).is('.ui-resizable-handle'))
-			return false;
-
-		//Quit if we're not on a valid handle
-		this.handle = this._getHandle(event);
-		if (!this.handle)
-			return false;
-
-		$(o.iframeFix === true ? "iframe" : o.iframeFix).each(function() {
-			$('
      ')
-			.css({
-				width: this.offsetWidth+"px", height: this.offsetHeight+"px",
-				position: "absolute", opacity: "0.001", zIndex: 1000
-			})
-			.css($(this).offset())
-			.appendTo("body");
-		});
-
-		return true;
-
-	},
-
-	_mouseStart: function(event) {
-
-		var o = this.options;
-
-		//Create and append the visible helper
-		this.helper = this._createHelper(event);
-
-		this.helper.addClass("ui-draggable-dragging");
-
-		//Cache the helper size
-		this._cacheHelperProportions();
-
-		//If ddmanager is used for droppables, set the global draggable
-		if($.ui.ddmanager)
-			$.ui.ddmanager.current = this;
-
-		/*
-		 * - Position generation -
-		 * This block generates everything position related - it's the core of draggables.
-		 */
-
-		//Cache the margins of the original element
-		this._cacheMargins();
-
-		//Store the helper's css position
-		this.cssPosition = this.helper.css("position");
-		this.scrollParent = this.helper.scrollParent();
-
-		//The element's absolute position on the page minus margins
-		this.offset = this.positionAbs = this.element.offset();
-		this.offset = {
-			top: this.offset.top - this.margins.top,
-			left: this.offset.left - this.margins.left
-		};
-
-		$.extend(this.offset, {
-			click: { //Where the click happened, relative to the element
-				left: event.pageX - this.offset.left,
-				top: event.pageY - this.offset.top
-			},
-			parent: this._getParentOffset(),
-			relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
-		});
-
-		//Generate the original position
-		this.originalPosition = this.position = this._generatePosition(event);
-		this.originalPageX = event.pageX;
-		this.originalPageY = event.pageY;
-
-		//Adjust the mouse offset relative to the helper if 'cursorAt' is supplied
-		(o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
-
-		//Set a containment if given in the options
-		if(o.containment)
-			this._setContainment();
-
-		//Trigger event + callbacks
-		if(this._trigger("start", event) === false) {
-			this._clear();
-			return false;
-		}
-
-		//Recache the helper size
-		this._cacheHelperProportions();
-
-		//Prepare the droppable offsets
-		if ($.ui.ddmanager && !o.dropBehaviour)
-			$.ui.ddmanager.prepareOffsets(this, event);
-
-
-		this._mouseDrag(event, true); //Execute the drag once - this causes the helper not to be visible before getting its correct position
-
-		//If the ddmanager is used for droppables, inform the manager that dragging has started (see #5003)
-		if ( $.ui.ddmanager ) $.ui.ddmanager.dragStart(this, event);
-
-		return true;
-	},
-
-	_mouseDrag: function(event, noPropagation) {
-
-		//Compute the helpers position
-		this.position = this._generatePosition(event);
-		this.positionAbs = this._convertPositionTo("absolute");
-
-		//Call plugins and callbacks and use the resulting position if something is returned
-		if (!noPropagation) {
-			var ui = this._uiHash();
-			if(this._trigger('drag', event, ui) === false) {
-				this._mouseUp({});
-				return false;
-			}
-			this.position = ui.position;
-		}
-
-		if(!this.options.axis || this.options.axis != "y") this.helper[0].style.left = this.position.left+'px';
-		if(!this.options.axis || this.options.axis != "x") this.helper[0].style.top = this.position.top+'px';
-		if($.ui.ddmanager) $.ui.ddmanager.drag(this, event);
-
-		return false;
-	},
-
-	_mouseStop: function(event) {
-
-		//If we are using droppables, inform the manager about the drop
-		var dropped = false;
-		if ($.ui.ddmanager && !this.options.dropBehaviour)
-			dropped = $.ui.ddmanager.drop(this, event);
-
-		//if a drop comes from outside (a sortable)
-		if(this.dropped) {
-			dropped = this.dropped;
-			this.dropped = false;
-		}
-
-		//if the original element is no longer in the DOM don't bother to continue (see #8269)
-		var element = this.element[0], elementInDom = false;
-		while ( element && (element = element.parentNode) ) {
-			if (element == document ) {
-				elementInDom = true;
-			}
-		}
-		if ( !elementInDom && this.options.helper === "original" )
-			return false;
-
-		if((this.options.revert == "invalid" && !dropped) || (this.options.revert == "valid" && dropped) || this.options.revert === true || ($.isFunction(this.options.revert) && this.options.revert.call(this.element, dropped))) {
-			var that = this;
-			$(this.helper).animate(this.originalPosition, parseInt(this.options.revertDuration, 10), function() {
-				if(that._trigger("stop", event) !== false) {
-					that._clear();
-				}
-			});
-		} else {
-			if(this._trigger("stop", event) !== false) {
-				this._clear();
-			}
-		}
-
-		return false;
-	},
-
-	_mouseUp: function(event) {
-		//Remove frame helpers
-		$("div.ui-draggable-iframeFix").each(function() {
-			this.parentNode.removeChild(this);
-		});
-
-		//If the ddmanager is used for droppables, inform the manager that dragging has stopped (see #5003)
-		if( $.ui.ddmanager ) $.ui.ddmanager.dragStop(this, event);
-
-		return $.ui.mouse.prototype._mouseUp.call(this, event);
-	},
-
-	cancel: function() {
-
-		if(this.helper.is(".ui-draggable-dragging")) {
-			this._mouseUp({});
-		} else {
-			this._clear();
-		}
-
-		return this;
-
-	},
-
-	_getHandle: function(event) {
-
-		var handle = !this.options.handle || !$(this.options.handle, this.element).length ? true : false;
-		$(this.options.handle, this.element)
-			.find("*")
-			.andSelf()
-			.each(function() {
-				if(this == event.target) handle = true;
-			});
-
-		return handle;
-
-	},
-
-	_createHelper: function(event) {
-
-		var o = this.options;
-		var helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event])) : (o.helper == 'clone' ? this.element.clone().removeAttr('id') : this.element);
-
-		if(!helper.parents('body').length)
-			helper.appendTo((o.appendTo == 'parent' ? this.element[0].parentNode : o.appendTo));
-
-		if(helper[0] != this.element[0] && !(/(fixed|absolute)/).test(helper.css("position")))
-			helper.css("position", "absolute");
-
-		return helper;
-
-	},
-
-	_adjustOffsetFromHelper: function(obj) {
-		if (typeof obj == 'string') {
-			obj = obj.split(' ');
-		}
-		if ($.isArray(obj)) {
-			obj = {left: +obj[0], top: +obj[1] || 0};
-		}
-		if ('left' in obj) {
-			this.offset.click.left = obj.left + this.margins.left;
-		}
-		if ('right' in obj) {
-			this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
-		}
-		if ('top' in obj) {
-			this.offset.click.top = obj.top + this.margins.top;
-		}
-		if ('bottom' in obj) {
-			this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
-		}
-	},
-
-	_getParentOffset: function() {
-
-		//Get the offsetParent and cache its position
-		this.offsetParent = this.helper.offsetParent();
-		var po = this.offsetParent.offset();
-
-		// This is a special case where we need to modify a offset calculated on start, since the following happened:
-		// 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
-		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
-		//    the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
-		if(this.cssPosition == 'absolute' && this.scrollParent[0] != document && $.contains(this.scrollParent[0], this.offsetParent[0])) {
-			po.left += this.scrollParent.scrollLeft();
-			po.top += this.scrollParent.scrollTop();
-		}
-
-		if((this.offsetParent[0] == document.body) //This needs to be actually done for all browsers, since pageX/pageY includes this information
-		|| (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() == 'html' && $.ui.ie)) //Ugly IE fix
-			po = { top: 0, left: 0 };
-
-		return {
-			top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
-			left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
-		};
-
-	},
-
-	_getRelativeOffset: function() {
-
-		if(this.cssPosition == "relative") {
-			var p = this.element.position();
-			return {
-				top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.scrollParent.scrollTop(),
-				left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.scrollParent.scrollLeft()
-			};
-		} else {
-			return { top: 0, left: 0 };
-		}
-
-	},
-
-	_cacheMargins: function() {
-		this.margins = {
-			left: (parseInt(this.element.css("marginLeft"),10) || 0),
-			top: (parseInt(this.element.css("marginTop"),10) || 0),
-			right: (parseInt(this.element.css("marginRight"),10) || 0),
-			bottom: (parseInt(this.element.css("marginBottom"),10) || 0)
-		};
-	},
-
-	_cacheHelperProportions: function() {
-		this.helperProportions = {
-			width: this.helper.outerWidth(),
-			height: this.helper.outerHeight()
-		};
-	},
-
-	_setContainment: function() {
-
-		var o = this.options;
-		if(o.containment == 'parent') o.containment = this.helper[0].parentNode;
-		if(o.containment == 'document' || o.containment == 'window') this.containment = [
-			o.containment == 'document' ? 0 : $(window).scrollLeft() - this.offset.relative.left - this.offset.parent.left,
-			o.containment == 'document' ? 0 : $(window).scrollTop() - this.offset.relative.top - this.offset.parent.top,
-			(o.containment == 'document' ? 0 : $(window).scrollLeft()) + $(o.containment == 'document' ? document : window).width() - this.helperProportions.width - this.margins.left,
-			(o.containment == 'document' ? 0 : $(window).scrollTop()) + ($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
-		];
-
-		if(!(/^(document|window|parent)$/).test(o.containment) && o.containment.constructor != Array) {
-			var c = $(o.containment);
-			var ce = c[0]; if(!ce) return;
-			var co = c.offset();
-			var over = ($(ce).css("overflow") != 'hidden');
-
-			this.containment = [
-				(parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0),
-				(parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0),
-				(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left - this.margins.right,
-				(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top  - this.margins.bottom
-			];
-			this.relative_container = c;
-
-		} else if(o.containment.constructor == Array) {
-			this.containment = o.containment;
-		}
-
-	},
-
-	_convertPositionTo: function(d, pos) {
-
-		if(!pos) pos = this.position;
-		var mod = d == "absolute" ? 1 : -1;
-		var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
-
-		return {
-			top: (
-				pos.top																	// The absolute mouse position
-				+ this.offset.relative.top * mod										// Only for relative positioned nodes: Relative offset from element to offset parent
-				+ this.offset.parent.top * mod											// The offsetParent's offset without borders (offset + border)
-				- ( ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod)
-			),
-			left: (
-				pos.left																// The absolute mouse position
-				+ this.offset.relative.left * mod										// Only for relative positioned nodes: Relative offset from element to offset parent
-				+ this.offset.parent.left * mod											// The offsetParent's offset without borders (offset + border)
-				- ( ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod)
-			)
-		};
-
-	},
-
-	_generatePosition: function(event) {
-
-		var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
-		var pageX = event.pageX;
-		var pageY = event.pageY;
-
-		/*
-		 * - Position constraining -
-		 * Constrain the position to a mix of grid, containment.
-		 */
-
-		if(this.originalPosition) { //If we are not dragging yet, we won't check for options
-			var containment;
-			if(this.containment) {
-			if (this.relative_container){
-				var co = this.relative_container.offset();
-				containment = [ this.containment[0] + co.left,
-					this.containment[1] + co.top,
-					this.containment[2] + co.left,
-					this.containment[3] + co.top ];
-			}
-			else {
-				containment = this.containment;
-			}
-
-				if(event.pageX - this.offset.click.left < containment[0]) pageX = containment[0] + this.offset.click.left;
-				if(event.pageY - this.offset.click.top < containment[1]) pageY = containment[1] + this.offset.click.top;
-				if(event.pageX - this.offset.click.left > containment[2]) pageX = containment[2] + this.offset.click.left;
-				if(event.pageY - this.offset.click.top > containment[3]) pageY = containment[3] + this.offset.click.top;
-			}
-
-			if(o.grid) {
-				//Check for grid elements set to 0 to prevent divide by 0 error causing invalid argument errors in IE (see ticket #6950)
-				var top = o.grid[1] ? this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1] : this.originalPageY;
-				pageY = containment ? (!(top - this.offset.click.top < containment[1] || top - this.offset.click.top > containment[3]) ? top : (!(top - this.offset.click.top < containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
-
-				var left = o.grid[0] ? this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0] : this.originalPageX;
-				pageX = containment ? (!(left - this.offset.click.left < containment[0] || left - this.offset.click.left > containment[2]) ? left : (!(left - this.offset.click.left < containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
-			}
-
-		}
-
-		return {
-			top: (
-				pageY																// The absolute mouse position
-				- this.offset.click.top													// Click offset (relative to the element)
-				- this.offset.relative.top												// Only for relative positioned nodes: Relative offset from element to offset parent
-				- this.offset.parent.top												// The offsetParent's offset without borders (offset + border)
-				+ ( ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
-			),
-			left: (
-				pageX																// The absolute mouse position
-				- this.offset.click.left												// Click offset (relative to the element)
-				- this.offset.relative.left												// Only for relative positioned nodes: Relative offset from element to offset parent
-				- this.offset.parent.left												// The offsetParent's offset without borders (offset + border)
-				+ ( ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ))
-			)
-		};
-
-	},
-
-	_clear: function() {
-		this.helper.removeClass("ui-draggable-dragging");
-		if(this.helper[0] != this.element[0] && !this.cancelHelperRemoval) this.helper.remove();
-		//if($.ui.ddmanager) $.ui.ddmanager.current = null;
-		this.helper = null;
-		this.cancelHelperRemoval = false;
-	},
-
-	// From now on bulk stuff - mainly helpers
-
-	_trigger: function(type, event, ui) {
-		ui = ui || this._uiHash();
-		$.ui.plugin.call(this, type, [event, ui]);
-		if(type == "drag") this.positionAbs = this._convertPositionTo("absolute"); //The absolute position has to be recalculated after plugins
-		return $.Widget.prototype._trigger.call(this, type, event, ui);
-	},
-
-	plugins: {},
-
-	_uiHash: function(event) {
-		return {
-			helper: this.helper,
-			position: this.position,
-			originalPosition: this.originalPosition,
-			offset: this.positionAbs
-		};
-	}
-
-});
-
-$.ui.plugin.add("draggable", "connectToSortable", {
-	start: function(event, ui) {
-
-		var inst = $(this).data("draggable"), o = inst.options,
-			uiSortable = $.extend({}, ui, { item: inst.element });
-		inst.sortables = [];
-		$(o.connectToSortable).each(function() {
-			var sortable = $.data(this, 'sortable');
-			if (sortable && !sortable.options.disabled) {
-				inst.sortables.push({
-					instance: sortable,
-					shouldRevert: sortable.options.revert
-				});
-				sortable.refreshPositions();	// Call the sortable's refreshPositions at drag start to refresh the containerCache since the sortable container cache is used in drag and needs to be up to date (this will ensure it's initialised as well as being kept in step with any changes that might have happened on the page).
-				sortable._trigger("activate", event, uiSortable);
-			}
-		});
-
-	},
-	stop: function(event, ui) {
-
-		//If we are still over the sortable, we fake the stop event of the sortable, but also remove helper
-		var inst = $(this).data("draggable"),
-			uiSortable = $.extend({}, ui, { item: inst.element });
-
-		$.each(inst.sortables, function() {
-			if(this.instance.isOver) {
-
-				this.instance.isOver = 0;
-
-				inst.cancelHelperRemoval = true; //Don't remove the helper in the draggable instance
-				this.instance.cancelHelperRemoval = false; //Remove it in the sortable instance (so sortable plugins like revert still work)
-
-				//The sortable revert is supported, and we have to set a temporary dropped variable on the draggable to support revert: 'valid/invalid'
-				if(this.shouldRevert) this.instance.options.revert = true;
-
-				//Trigger the stop of the sortable
-				this.instance._mouseStop(event);
-
-				this.instance.options.helper = this.instance.options._helper;
-
-				//If the helper has been the original item, restore properties in the sortable
-				if(inst.options.helper == 'original')
-					this.instance.currentItem.css({ top: 'auto', left: 'auto' });
-
-			} else {
-				this.instance.cancelHelperRemoval = false; //Remove the helper in the sortable instance
-				this.instance._trigger("deactivate", event, uiSortable);
-			}
-
-		});
-
-	},
-	drag: function(event, ui) {
-
-		var inst = $(this).data("draggable"), that = this;
-
-		var checkPos = function(o) {
-			var dyClick = this.offset.click.top, dxClick = this.offset.click.left;
-			var helperTop = this.positionAbs.top, helperLeft = this.positionAbs.left;
-			var itemHeight = o.height, itemWidth = o.width;
-			var itemTop = o.top, itemLeft = o.left;
-
-			return $.ui.isOver(helperTop + dyClick, helperLeft + dxClick, itemTop, itemLeft, itemHeight, itemWidth);
-		};
-
-		$.each(inst.sortables, function(i) {
-
-			var innermostIntersecting = false;
-			var thisSortable = this;
-			//Copy over some variables to allow calling the sortable's native _intersectsWith
-			this.instance.positionAbs = inst.positionAbs;
-			this.instance.helperProportions = inst.helperProportions;
-			this.instance.offset.click = inst.offset.click;
-
-			if(this.instance._intersectsWith(this.instance.containerCache)) {
-				innermostIntersecting = true;
-				$.each(inst.sortables, function () {
-					this.instance.positionAbs = inst.positionAbs;
-					this.instance.helperProportions = inst.helperProportions;
-					this.instance.offset.click = inst.offset.click;
-					if  (this != thisSortable
-						&& this.instance._intersectsWith(this.instance.containerCache)
-						&& $.ui.contains(thisSortable.instance.element[0], this.instance.element[0]))
-						innermostIntersecting = false;
-						return innermostIntersecting;
-				});
-			}
-
-
-			if(innermostIntersecting) {
-				//If it intersects, we use a little isOver variable and set it once, so our move-in stuff gets fired only once
-				if(!this.instance.isOver) {
-
-					this.instance.isOver = 1;
-					//Now we fake the start of dragging for the sortable instance,
-					//by cloning the list group item, appending it to the sortable and using it as inst.currentItem
-					//We can then fire the start event of the sortable with our passed browser event, and our own helper (so it doesn't create a new one)
-					this.instance.currentItem = $(that).clone().removeAttr('id').appendTo(this.instance.element).data("sortable-item", true);
-					this.instance.options._helper = this.instance.options.helper; //Store helper option to later restore it
-					this.instance.options.helper = function() { return ui.helper[0]; };
-
-					event.target = this.instance.currentItem[0];
-					this.instance._mouseCapture(event, true);
-					this.instance._mouseStart(event, true, true);
-
-					//Because the browser event is way off the new appended portlet, we modify a couple of variables to reflect the changes
-					this.instance.offset.click.top = inst.offset.click.top;
-					this.instance.offset.click.left = inst.offset.click.left;
-					this.instance.offset.parent.left -= inst.offset.parent.left - this.instance.offset.parent.left;
-					this.instance.offset.parent.top -= inst.offset.parent.top - this.instance.offset.parent.top;
-
-					inst._trigger("toSortable", event);
-					inst.dropped = this.instance.element; //draggable revert needs that
-					//hack so receive/update callbacks work (mostly)
-					inst.currentItem = inst.element;
-					this.instance.fromOutside = inst;
-
-				}
-
-				//Provided we did all the previous steps, we can fire the drag event of the sortable on every draggable drag, when it intersects with the sortable
-				if(this.instance.currentItem) this.instance._mouseDrag(event);
-
-			} else {
-
-				//If it doesn't intersect with the sortable, and it intersected before,
-				//we fake the drag stop of the sortable, but make sure it doesn't remove the helper by using cancelHelperRemoval
-				if(this.instance.isOver) {
-
-					this.instance.isOver = 0;
-					this.instance.cancelHelperRemoval = true;
-
-					//Prevent reverting on this forced stop
-					this.instance.options.revert = false;
-
-					// The out event needs to be triggered independently
-					this.instance._trigger('out', event, this.instance._uiHash(this.instance));
-
-					this.instance._mouseStop(event, true);
-					this.instance.options.helper = this.instance.options._helper;
-
-					//Now we remove our currentItem, the list group clone again, and the placeholder, and animate the helper back to it's original size
-					this.instance.currentItem.remove();
-					if(this.instance.placeholder) this.instance.placeholder.remove();
-
-					inst._trigger("fromSortable", event);
-					inst.dropped = false; //draggable revert needs that
-				}
-
-			};
-
-		});
-
-	}
-});
-
-$.ui.plugin.add("draggable", "cursor", {
-	start: function(event, ui) {
-		var t = $('body'), o = $(this).data('draggable').options;
-		if (t.css("cursor")) o._cursor = t.css("cursor");
-		t.css("cursor", o.cursor);
-	},
-	stop: function(event, ui) {
-		var o = $(this).data('draggable').options;
-		if (o._cursor) $('body').css("cursor", o._cursor);
-	}
-});
-
-$.ui.plugin.add("draggable", "opacity", {
-	start: function(event, ui) {
-		var t = $(ui.helper), o = $(this).data('draggable').options;
-		if(t.css("opacity")) o._opacity = t.css("opacity");
-		t.css('opacity', o.opacity);
-	},
-	stop: function(event, ui) {
-		var o = $(this).data('draggable').options;
-		if(o._opacity) $(ui.helper).css('opacity', o._opacity);
-	}
-});
-
-$.ui.plugin.add("draggable", "scroll", {
-	start: function(event, ui) {
-		var i = $(this).data("draggable");
-		if(i.scrollParent[0] != document && i.scrollParent[0].tagName != 'HTML') i.overflowOffset = i.scrollParent.offset();
-	},
-	drag: function(event, ui) {
-
-		var i = $(this).data("draggable"), o = i.options, scrolled = false;
-
-		if(i.scrollParent[0] != document && i.scrollParent[0].tagName != 'HTML') {
-
-			if(!o.axis || o.axis != 'x') {
-				if((i.overflowOffset.top + i.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity)
-					i.scrollParent[0].scrollTop = scrolled = i.scrollParent[0].scrollTop + o.scrollSpeed;
-				else if(event.pageY - i.overflowOffset.top < o.scrollSensitivity)
-					i.scrollParent[0].scrollTop = scrolled = i.scrollParent[0].scrollTop - o.scrollSpeed;
-			}
-
-			if(!o.axis || o.axis != 'y') {
-				if((i.overflowOffset.left + i.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity)
-					i.scrollParent[0].scrollLeft = scrolled = i.scrollParent[0].scrollLeft + o.scrollSpeed;
-				else if(event.pageX - i.overflowOffset.left < o.scrollSensitivity)
-					i.scrollParent[0].scrollLeft = scrolled = i.scrollParent[0].scrollLeft - o.scrollSpeed;
-			}
-
-		} else {
-
-			if(!o.axis || o.axis != 'x') {
-				if(event.pageY - $(document).scrollTop() < o.scrollSensitivity)
-					scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
-				else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity)
-					scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
-			}
-
-			if(!o.axis || o.axis != 'y') {
-				if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity)
-					scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
-				else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity)
-					scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
-			}
-
-		}
-
-		if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour)
-			$.ui.ddmanager.prepareOffsets(i, event);
-
-	}
-});
-
-$.ui.plugin.add("draggable", "snap", {
-	start: function(event, ui) {
-
-		var i = $(this).data("draggable"), o = i.options;
-		i.snapElements = [];
-
-		$(o.snap.constructor != String ? ( o.snap.items || ':data(draggable)' ) : o.snap).each(function() {
-			var $t = $(this); var $o = $t.offset();
-			if(this != i.element[0]) i.snapElements.push({
-				item: this,
-				width: $t.outerWidth(), height: $t.outerHeight(),
-				top: $o.top, left: $o.left
-			});
-		});
-
-	},
-	drag: function(event, ui) {
-
-		var inst = $(this).data("draggable"), o = inst.options;
-		var d = o.snapTolerance;
-
-		var x1 = ui.offset.left, x2 = x1 + inst.helperProportions.width,
-			y1 = ui.offset.top, y2 = y1 + inst.helperProportions.height;
-
-		for (var i = inst.snapElements.length - 1; i >= 0; i--){
-
-			var l = inst.snapElements[i].left, r = l + inst.snapElements[i].width,
-				t = inst.snapElements[i].top, b = t + inst.snapElements[i].height;
-
-			//Yes, I know, this is insane ;)
-			if(!((l-d < x1 && x1 < r+d && t-d < y1 && y1 < b+d) || (l-d < x1 && x1 < r+d && t-d < y2 && y2 < b+d) || (l-d < x2 && x2 < r+d && t-d < y1 && y1 < b+d) || (l-d < x2 && x2 < r+d && t-d < y2 && y2 < b+d))) {
-				if(inst.snapElements[i].snapping) (inst.options.snap.release && inst.options.snap.release.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item })));
-				inst.snapElements[i].snapping = false;
-				continue;
-			}
-
-			if(o.snapMode != 'inner') {
-				var ts = Math.abs(t - y2) <= d;
-				var bs = Math.abs(b - y1) <= d;
-				var ls = Math.abs(l - x2) <= d;
-				var rs = Math.abs(r - x1) <= d;
-				if(ts) ui.position.top = inst._convertPositionTo("relative", { top: t - inst.helperProportions.height, left: 0 }).top - inst.margins.top;
-				if(bs) ui.position.top = inst._convertPositionTo("relative", { top: b, left: 0 }).top - inst.margins.top;
-				if(ls) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l - inst.helperProportions.width }).left - inst.margins.left;
-				if(rs) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r }).left - inst.margins.left;
-			}
-
-			var first = (ts || bs || ls || rs);
-
-			if(o.snapMode != 'outer') {
-				var ts = Math.abs(t - y1) <= d;
-				var bs = Math.abs(b - y2) <= d;
-				var ls = Math.abs(l - x1) <= d;
-				var rs = Math.abs(r - x2) <= d;
-				if(ts) ui.position.top = inst._convertPositionTo("relative", { top: t, left: 0 }).top - inst.margins.top;
-				if(bs) ui.position.top = inst._convertPositionTo("relative", { top: b - inst.helperProportions.height, left: 0 }).top - inst.margins.top;
-				if(ls) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l }).left - inst.margins.left;
-				if(rs) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r - inst.helperProportions.width }).left - inst.margins.left;
-			}
-
-			if(!inst.snapElements[i].snapping && (ts || bs || ls || rs || first))
-				(inst.options.snap.snap && inst.options.snap.snap.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item })));
-			inst.snapElements[i].snapping = (ts || bs || ls || rs || first);
-
-		};
-
-	}
-});
-
-$.ui.plugin.add("draggable", "stack", {
-	start: function(event, ui) {
-
-		var o = $(this).data("draggable").options;
-
-		var group = $.makeArray($(o.stack)).sort(function(a,b) {
-			return (parseInt($(a).css("zIndex"),10) || 0) - (parseInt($(b).css("zIndex"),10) || 0);
-		});
-		if (!group.length) { return; }
-
-		var min = parseInt(group[0].style.zIndex) || 0;
-		$(group).each(function(i) {
-			this.style.zIndex = min + i;
-		});
-
-		this[0].style.zIndex = min + group.length;
-
-	}
-});
-
-$.ui.plugin.add("draggable", "zIndex", {
-	start: function(event, ui) {
-		var t = $(ui.helper), o = $(this).data("draggable").options;
-		if(t.css("zIndex")) o._zIndex = t.css("zIndex");
-		t.css('zIndex', o.zIndex);
-	},
-	stop: function(event, ui) {
-		var o = $(this).data("draggable").options;
-		if(o._zIndex) $(ui.helper).css('zIndex', o._zIndex);
-	}
-});
-
-})(jQuery);
-(function( $, undefined ) {
-
-$.widget("ui.droppable", {
-	version: "1.9.2",
-	widgetEventPrefix: "drop",
-	options: {
-		accept: '*',
-		activeClass: false,
-		addClasses: true,
-		greedy: false,
-		hoverClass: false,
-		scope: 'default',
-		tolerance: 'intersect'
-	},
-	_create: function() {
-
-		var o = this.options, accept = o.accept;
-		this.isover = 0; this.isout = 1;
-
-		this.accept = $.isFunction(accept) ? accept : function(d) {
-			return d.is(accept);
-		};
-
-		//Store the droppable's proportions
-		this.proportions = { width: this.element[0].offsetWidth, height: this.element[0].offsetHeight };
-
-		// Add the reference and positions to the manager
-		$.ui.ddmanager.droppables[o.scope] = $.ui.ddmanager.droppables[o.scope] || [];
-		$.ui.ddmanager.droppables[o.scope].push(this);
-
-		(o.addClasses && this.element.addClass("ui-droppable"));
-
-	},
-
-	_destroy: function() {
-		var drop = $.ui.ddmanager.droppables[this.options.scope];
-		for ( var i = 0; i < drop.length; i++ )
-			if ( drop[i] == this )
-				drop.splice(i, 1);
-
-		this.element.removeClass("ui-droppable ui-droppable-disabled");
-	},
-
-	_setOption: function(key, value) {
-
-		if(key == 'accept') {
-			this.accept = $.isFunction(value) ? value : function(d) {
-				return d.is(value);
-			};
-		}
-		$.Widget.prototype._setOption.apply(this, arguments);
-	},
-
-	_activate: function(event) {
-		var draggable = $.ui.ddmanager.current;
-		if(this.options.activeClass) this.element.addClass(this.options.activeClass);
-		(draggable && this._trigger('activate', event, this.ui(draggable)));
-	},
-
-	_deactivate: function(event) {
-		var draggable = $.ui.ddmanager.current;
-		if(this.options.activeClass) this.element.removeClass(this.options.activeClass);
-		(draggable && this._trigger('deactivate', event, this.ui(draggable)));
-	},
-
-	_over: function(event) {
-
-		var draggable = $.ui.ddmanager.current;
-		if (!draggable || (draggable.currentItem || draggable.element)[0] == this.element[0]) return; // Bail if draggable and droppable are same element
-
-		if (this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
-			if(this.options.hoverClass) this.element.addClass(this.options.hoverClass);
-			this._trigger('over', event, this.ui(draggable));
-		}
-
-	},
-
-	_out: function(event) {
-
-		var draggable = $.ui.ddmanager.current;
-		if (!draggable || (draggable.currentItem || draggable.element)[0] == this.element[0]) return; // Bail if draggable and droppable are same element
-
-		if (this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
-			if(this.options.hoverClass) this.element.removeClass(this.options.hoverClass);
-			this._trigger('out', event, this.ui(draggable));
-		}
-
-	},
-
-	_drop: function(event,custom) {
-
-		var draggable = custom || $.ui.ddmanager.current;
-		if (!draggable || (draggable.currentItem || draggable.element)[0] == this.element[0]) return false; // Bail if draggable and droppable are same element
-
-		var childrenIntersection = false;
-		this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function() {
-			var inst = $.data(this, 'droppable');
-			if(
-				inst.options.greedy
-				&& !inst.options.disabled
-				&& inst.options.scope == draggable.options.scope
-				&& inst.accept.call(inst.element[0], (draggable.currentItem || draggable.element))
-				&& $.ui.intersect(draggable, $.extend(inst, { offset: inst.element.offset() }), inst.options.tolerance)
-			) { childrenIntersection = true; return false; }
-		});
-		if(childrenIntersection) return false;
-
-		if(this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
-			if(this.options.activeClass) this.element.removeClass(this.options.activeClass);
-			if(this.options.hoverClass) this.element.removeClass(this.options.hoverClass);
-			this._trigger('drop', event, this.ui(draggable));
-			return this.element;
-		}
-
-		return false;
-
-	},
-
-	ui: function(c) {
-		return {
-			draggable: (c.currentItem || c.element),
-			helper: c.helper,
-			position: c.position,
-			offset: c.positionAbs
-		};
-	}
-
-});
-
-$.ui.intersect = function(draggable, droppable, toleranceMode) {
-
-	if (!droppable.offset) return false;
-
-	var x1 = (draggable.positionAbs || draggable.position.absolute).left, x2 = x1 + draggable.helperProportions.width,
-		y1 = (draggable.positionAbs || draggable.position.absolute).top, y2 = y1 + draggable.helperProportions.height;
-	var l = droppable.offset.left, r = l + droppable.proportions.width,
-		t = droppable.offset.top, b = t + droppable.proportions.height;
-
-	switch (toleranceMode) {
-		case 'fit':
-			return (l <= x1 && x2 <= r
-				&& t <= y1 && y2 <= b);
-			break;
-		case 'intersect':
-			return (l < x1 + (draggable.helperProportions.width / 2) // Right Half
-				&& x2 - (draggable.helperProportions.width / 2) < r // Left Half
-				&& t < y1 + (draggable.helperProportions.height / 2) // Bottom Half
-				&& y2 - (draggable.helperProportions.height / 2) < b ); // Top Half
-			break;
-		case 'pointer':
-			var draggableLeft = ((draggable.positionAbs || draggable.position.absolute).left + (draggable.clickOffset || draggable.offset.click).left),
-				draggableTop = ((draggable.positionAbs || draggable.position.absolute).top + (draggable.clickOffset || draggable.offset.click).top),
-				isOver = $.ui.isOver(draggableTop, draggableLeft, t, l, droppable.proportions.height, droppable.proportions.width);
-			return isOver;
-			break;
-		case 'touch':
-			return (
-					(y1 >= t && y1 <= b) ||	// Top edge touching
-					(y2 >= t && y2 <= b) ||	// Bottom edge touching
-					(y1 < t && y2 > b)		// Surrounded vertically
-				) && (
-					(x1 >= l && x1 <= r) ||	// Left edge touching
-					(x2 >= l && x2 <= r) ||	// Right edge touching
-					(x1 < l && x2 > r)		// Surrounded horizontally
-				);
-			break;
-		default:
-			return false;
-			break;
-		}
-
-};
-
-/*
-	This manager tracks offsets of draggables and droppables
-*/
-$.ui.ddmanager = {
-	current: null,
-	droppables: { 'default': [] },
-	prepareOffsets: function(t, event) {
-
-		var m = $.ui.ddmanager.droppables[t.options.scope] || [];
-		var type = event ? event.type : null; // workaround for #2317
-		var list = (t.currentItem || t.element).find(":data(droppable)").andSelf();
-
-		droppablesLoop: for (var i = 0; i < m.length; i++) {
-
-			if(m[i].options.disabled || (t && !m[i].accept.call(m[i].element[0],(t.currentItem || t.element)))) continue;	//No disabled and non-accepted
-			for (var j=0; j < list.length; j++) { if(list[j] == m[i].element[0]) { m[i].proportions.height = 0; continue droppablesLoop; } }; //Filter out elements in the current dragged item
-			m[i].visible = m[i].element.css("display") != "none"; if(!m[i].visible) continue; 									//If the element is not visible, continue
-
-			if(type == "mousedown") m[i]._activate.call(m[i], event); //Activate the droppable if used directly from draggables
-
-			m[i].offset = m[i].element.offset();
-			m[i].proportions = { width: m[i].element[0].offsetWidth, height: m[i].element[0].offsetHeight };
-
-		}
-
-	},
-	drop: function(draggable, event) {
-
-		var dropped = false;
-		$.each($.ui.ddmanager.droppables[draggable.options.scope] || [], function() {
-
-			if(!this.options) return;
-			if (!this.options.disabled && this.visible && $.ui.intersect(draggable, this, this.options.tolerance))
-				dropped = this._drop.call(this, event) || dropped;
-
-			if (!this.options.disabled && this.visible && this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
-				this.isout = 1; this.isover = 0;
-				this._deactivate.call(this, event);
-			}
-
-		});
-		return dropped;
-
-	},
-	dragStart: function( draggable, event ) {
-		//Listen for scrolling so that if the dragging causes scrolling the position of the droppables can be recalculated (see #5003)
-		draggable.element.parentsUntil( "body" ).bind( "scroll.droppable", function() {
-			if( !draggable.options.refreshPositions ) $.ui.ddmanager.prepareOffsets( draggable, event );
-		});
-	},
-	drag: function(draggable, event) {
-
-		//If you have a highly dynamic page, you might try this option. It renders positions every time you move the mouse.
-		if(draggable.options.refreshPositions) $.ui.ddmanager.prepareOffsets(draggable, event);
-
-		//Run through all droppables and check their positions based on specific tolerance options
-		$.each($.ui.ddmanager.droppables[draggable.options.scope] || [], function() {
-
-			if(this.options.disabled || this.greedyChild || !this.visible) return;
-			var intersects = $.ui.intersect(draggable, this, this.options.tolerance);
-
-			var c = !intersects && this.isover == 1 ? 'isout' : (intersects && this.isover == 0 ? 'isover' : null);
-			if(!c) return;
-
-			var parentInstance;
-			if (this.options.greedy) {
-				// find droppable parents with same scope
-				var scope = this.options.scope;
-				var parent = this.element.parents(':data(droppable)').filter(function () {
-					return $.data(this, 'droppable').options.scope === scope;
-				});
-
-				if (parent.length) {
-					parentInstance = $.data(parent[0], 'droppable');
-					parentInstance.greedyChild = (c == 'isover' ? 1 : 0);
-				}
-			}
-
-			// we just moved into a greedy child
-			if (parentInstance && c == 'isover') {
-				parentInstance['isover'] = 0;
-				parentInstance['isout'] = 1;
-				parentInstance._out.call(parentInstance, event);
-			}
-
-			this[c] = 1; this[c == 'isout' ? 'isover' : 'isout'] = 0;
-			this[c == "isover" ? "_over" : "_out"].call(this, event);
-
-			// we just moved out of a greedy child
-			if (parentInstance && c == 'isout') {
-				parentInstance['isout'] = 0;
-				parentInstance['isover'] = 1;
-				parentInstance._over.call(parentInstance, event);
-			}
-		});
-
-	},
-	dragStop: function( draggable, event ) {
-		draggable.element.parentsUntil( "body" ).unbind( "scroll.droppable" );
-		//Call prepareOffsets one final time since IE does not fire return scroll events when overflow was caused by drag (see #5003)
-		if( !draggable.options.refreshPositions ) $.ui.ddmanager.prepareOffsets( draggable, event );
-	}
-};
-
-})(jQuery);
-;(jQuery.effects || (function($, undefined) {
-
-var backCompat = $.uiBackCompat !== false,
-	// prefix used for storing data on .data()
-	dataSpace = "ui-effects-";
-
-$.effects = {
-	effect: {}
-};
-
-/*!
- * jQuery Color Animations v2.0.0
- * http://jquery.com/
- *
- * Copyright 2012 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * Date: Mon Aug 13 13:41:02 2012 -0500
- */
-(function( jQuery, undefined ) {
-
-	var stepHooks = "backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor".split(" "),
-
-	// plusequals test for += 100 -= 100
-	rplusequals = /^([\-+])=\s*(\d+\.?\d*)/,
-	// a set of RE's that can match strings and generate color tuples.
-	stringParsers = [{
-			re: /rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,
-			parse: function( execResult ) {
-				return [
-					execResult[ 1 ],
-					execResult[ 2 ],
-					execResult[ 3 ],
-					execResult[ 4 ]
-				];
-			}
-		}, {
-			re: /rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,
-			parse: function( execResult ) {
-				return [
-					execResult[ 1 ] * 2.55,
-					execResult[ 2 ] * 2.55,
-					execResult[ 3 ] * 2.55,
-					execResult[ 4 ]
-				];
-			}
-		}, {
-			// this regex ignores A-F because it's compared against an already lowercased string
-			re: /#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,
-			parse: function( execResult ) {
-				return [
-					parseInt( execResult[ 1 ], 16 ),
-					parseInt( execResult[ 2 ], 16 ),
-					parseInt( execResult[ 3 ], 16 )
-				];
-			}
-		}, {
-			// this regex ignores A-F because it's compared against an already lowercased string
-			re: /#([a-f0-9])([a-f0-9])([a-f0-9])/,
-			parse: function( execResult ) {
-				return [
-					parseInt( execResult[ 1 ] + execResult[ 1 ], 16 ),
-					parseInt( execResult[ 2 ] + execResult[ 2 ], 16 ),
-					parseInt( execResult[ 3 ] + execResult[ 3 ], 16 )
-				];
-			}
-		}, {
-			re: /hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,
-			space: "hsla",
-			parse: function( execResult ) {
-				return [
-					execResult[ 1 ],
-					execResult[ 2 ] / 100,
-					execResult[ 3 ] / 100,
-					execResult[ 4 ]
-				];
-			}
-		}],
-
-	// jQuery.Color( )
-	color = jQuery.Color = function( color, green, blue, alpha ) {
-		return new jQuery.Color.fn.parse( color, green, blue, alpha );
-	},
-	spaces = {
-		rgba: {
-			props: {
-				red: {
-					idx: 0,
-					type: "byte"
-				},
-				green: {
-					idx: 1,
-					type: "byte"
-				},
-				blue: {
-					idx: 2,
-					type: "byte"
-				}
-			}
-		},
-
-		hsla: {
-			props: {
-				hue: {
-					idx: 0,
-					type: "degrees"
-				},
-				saturation: {
-					idx: 1,
-					type: "percent"
-				},
-				lightness: {
-					idx: 2,
-					type: "percent"
-				}
-			}
-		}
-	},
-	propTypes = {
-		"byte": {
-			floor: true,
-			max: 255
-		},
-		"percent": {
-			max: 1
-		},
-		"degrees": {
-			mod: 360,
-			floor: true
-		}
-	},
-	support = color.support = {},
-
-	// element for support tests
-	supportElem = jQuery( "
      " )[ 0 ],
-
-	// colors = jQuery.Color.names
-	colors,
-
-	// local aliases of functions called often
-	each = jQuery.each;
-
-// determine rgba support immediately
-supportElem.style.cssText = "background-color:rgba(1,1,1,.5)";
-support.rgba = supportElem.style.backgroundColor.indexOf( "rgba" ) > -1;
-
-// define cache name and alpha properties
-// for rgba and hsla spaces
-each( spaces, function( spaceName, space ) {
-	space.cache = "_" + spaceName;
-	space.props.alpha = {
-		idx: 3,
-		type: "percent",
-		def: 1
-	};
-});
-
-function clamp( value, prop, allowEmpty ) {
-	var type = propTypes[ prop.type ] || {};
-
-	if ( value == null ) {
-		return (allowEmpty || !prop.def) ? null : prop.def;
-	}
-
-	// ~~ is an short way of doing floor for positive numbers
-	value = type.floor ? ~~value : parseFloat( value );
-
-	// IE will pass in empty strings as value for alpha,
-	// which will hit this case
-	if ( isNaN( value ) ) {
-		return prop.def;
-	}
-
-	if ( type.mod ) {
-		// we add mod before modding to make sure that negatives values
-		// get converted properly: -10 -> 350
-		return (value + type.mod) % type.mod;
-	}
-
-	// for now all property types without mod have min and max
-	return 0 > value ? 0 : type.max < value ? type.max : value;
-}
-
-function stringParse( string ) {
-	var inst = color(),
-		rgba = inst._rgba = [];
-
-	string = string.toLowerCase();
-
-	each( stringParsers, function( i, parser ) {
-		var parsed,
-			match = parser.re.exec( string ),
-			values = match && parser.parse( match ),
-			spaceName = parser.space || "rgba";
-
-		if ( values ) {
-			parsed = inst[ spaceName ]( values );
-
-			// if this was an rgba parse the assignment might happen twice
-			// oh well....
-			inst[ spaces[ spaceName ].cache ] = parsed[ spaces[ spaceName ].cache ];
-			rgba = inst._rgba = parsed._rgba;
-
-			// exit each( stringParsers ) here because we matched
-			return false;
-		}
-	});
-
-	// Found a stringParser that handled it
-	if ( rgba.length ) {
-
-		// if this came from a parsed string, force "transparent" when alpha is 0
-		// chrome, (and maybe others) return "transparent" as rgba(0,0,0,0)
-		if ( rgba.join() === "0,0,0,0" ) {
-			jQuery.extend( rgba, colors.transparent );
-		}
-		return inst;
-	}
-
-	// named colors
-	return colors[ string ];
-}
-
-color.fn = jQuery.extend( color.prototype, {
-	parse: function( red, green, blue, alpha ) {
-		if ( red === undefined ) {
-			this._rgba = [ null, null, null, null ];
-			return this;
-		}
-		if ( red.jquery || red.nodeType ) {
-			red = jQuery( red ).css( green );
-			green = undefined;
-		}
-
-		var inst = this,
-			type = jQuery.type( red ),
-			rgba = this._rgba = [];
-
-		// more than 1 argument specified - assume ( red, green, blue, alpha )
-		if ( green !== undefined ) {
-			red = [ red, green, blue, alpha ];
-			type = "array";
-		}
-
-		if ( type === "string" ) {
-			return this.parse( stringParse( red ) || colors._default );
-		}
-
-		if ( type === "array" ) {
-			each( spaces.rgba.props, function( key, prop ) {
-				rgba[ prop.idx ] = clamp( red[ prop.idx ], prop );
-			});
-			return this;
-		}
-
-		if ( type === "object" ) {
-			if ( red instanceof color ) {
-				each( spaces, function( spaceName, space ) {
-					if ( red[ space.cache ] ) {
-						inst[ space.cache ] = red[ space.cache ].slice();
-					}
-				});
-			} else {
-				each( spaces, function( spaceName, space ) {
-					var cache = space.cache;
-					each( space.props, function( key, prop ) {
-
-						// if the cache doesn't exist, and we know how to convert
-						if ( !inst[ cache ] && space.to ) {
-
-							// if the value was null, we don't need to copy it
-							// if the key was alpha, we don't need to copy it either
-							if ( key === "alpha" || red[ key ] == null ) {
-								return;
-							}
-							inst[ cache ] = space.to( inst._rgba );
-						}
-
-						// this is the only case where we allow nulls for ALL properties.
-						// call clamp with alwaysAllowEmpty
-						inst[ cache ][ prop.idx ] = clamp( red[ key ], prop, true );
-					});
-
-					// everything defined but alpha?
-					if ( inst[ cache ] && $.inArray( null, inst[ cache ].slice( 0, 3 ) ) < 0 ) {
-						// use the default of 1
-						inst[ cache ][ 3 ] = 1;
-						if ( space.from ) {
-							inst._rgba = space.from( inst[ cache ] );
-						}
-					}
-				});
-			}
-			return this;
-		}
-	},
-	is: function( compare ) {
-		var is = color( compare ),
-			same = true,
-			inst = this;
-
-		each( spaces, function( _, space ) {
-			var localCache,
-				isCache = is[ space.cache ];
-			if (isCache) {
-				localCache = inst[ space.cache ] || space.to && space.to( inst._rgba ) || [];
-				each( space.props, function( _, prop ) {
-					if ( isCache[ prop.idx ] != null ) {
-						same = ( isCache[ prop.idx ] === localCache[ prop.idx ] );
-						return same;
-					}
-				});
-			}
-			return same;
-		});
-		return same;
-	},
-	_space: function() {
-		var used = [],
-			inst = this;
-		each( spaces, function( spaceName, space ) {
-			if ( inst[ space.cache ] ) {
-				used.push( spaceName );
-			}
-		});
-		return used.pop();
-	},
-	transition: function( other, distance ) {
-		var end = color( other ),
-			spaceName = end._space(),
-			space = spaces[ spaceName ],
-			startColor = this.alpha() === 0 ? color( "transparent" ) : this,
-			start = startColor[ space.cache ] || space.to( startColor._rgba ),
-			result = start.slice();
-
-		end = end[ space.cache ];
-		each( space.props, function( key, prop ) {
-			var index = prop.idx,
-				startValue = start[ index ],
-				endValue = end[ index ],
-				type = propTypes[ prop.type ] || {};
-
-			// if null, don't override start value
-			if ( endValue === null ) {
-				return;
-			}
-			// if null - use end
-			if ( startValue === null ) {
-				result[ index ] = endValue;
-			} else {
-				if ( type.mod ) {
-					if ( endValue - startValue > type.mod / 2 ) {
-						startValue += type.mod;
-					} else if ( startValue - endValue > type.mod / 2 ) {
-						startValue -= type.mod;
-					}
-				}
-				result[ index ] = clamp( ( endValue - startValue ) * distance + startValue, prop );
-			}
-		});
-		return this[ spaceName ]( result );
-	},
-	blend: function( opaque ) {
-		// if we are already opaque - return ourself
-		if ( this._rgba[ 3 ] === 1 ) {
-			return this;
-		}
-
-		var rgb = this._rgba.slice(),
-			a = rgb.pop(),
-			blend = color( opaque )._rgba;
-
-		return color( jQuery.map( rgb, function( v, i ) {
-			return ( 1 - a ) * blend[ i ] + a * v;
-		}));
-	},
-	toRgbaString: function() {
-		var prefix = "rgba(",
-			rgba = jQuery.map( this._rgba, function( v, i ) {
-				return v == null ? ( i > 2 ? 1 : 0 ) : v;
-			});
-
-		if ( rgba[ 3 ] === 1 ) {
-			rgba.pop();
-			prefix = "rgb(";
-		}
-
-		return prefix + rgba.join() + ")";
-	},
-	toHslaString: function() {
-		var prefix = "hsla(",
-			hsla = jQuery.map( this.hsla(), function( v, i ) {
-				if ( v == null ) {
-					v = i > 2 ? 1 : 0;
-				}
-
-				// catch 1 and 2
-				if ( i && i < 3 ) {
-					v = Math.round( v * 100 ) + "%";
-				}
-				return v;
-			});
-
-		if ( hsla[ 3 ] === 1 ) {
-			hsla.pop();
-			prefix = "hsl(";
-		}
-		return prefix + hsla.join() + ")";
-	},
-	toHexString: function( includeAlpha ) {
-		var rgba = this._rgba.slice(),
-			alpha = rgba.pop();
-
-		if ( includeAlpha ) {
-			rgba.push( ~~( alpha * 255 ) );
-		}
-
-		return "#" + jQuery.map( rgba, function( v ) {
-
-			// default to 0 when nulls exist
-			v = ( v || 0 ).toString( 16 );
-			return v.length === 1 ? "0" + v : v;
-		}).join("");
-	},
-	toString: function() {
-		return this._rgba[ 3 ] === 0 ? "transparent" : this.toRgbaString();
-	}
-});
-color.fn.parse.prototype = color.fn;
-
-// hsla conversions adapted from:
-// https://code.google.com/p/maashaack/source/browse/packages/graphics/trunk/src/graphics/colors/HUE2RGB.as?r=5021
-
-function hue2rgb( p, q, h ) {
-	h = ( h + 1 ) % 1;
-	if ( h * 6 < 1 ) {
-		return p + (q - p) * h * 6;
-	}
-	if ( h * 2 < 1) {
-		return q;
-	}
-	if ( h * 3 < 2 ) {
-		return p + (q - p) * ((2/3) - h) * 6;
-	}
-	return p;
-}
-
-spaces.hsla.to = function ( rgba ) {
-	if ( rgba[ 0 ] == null || rgba[ 1 ] == null || rgba[ 2 ] == null ) {
-		return [ null, null, null, rgba[ 3 ] ];
-	}
-	var r = rgba[ 0 ] / 255,
-		g = rgba[ 1 ] / 255,
-		b = rgba[ 2 ] / 255,
-		a = rgba[ 3 ],
-		max = Math.max( r, g, b ),
-		min = Math.min( r, g, b ),
-		diff = max - min,
-		add = max + min,
-		l = add * 0.5,
-		h, s;
-
-	if ( min === max ) {
-		h = 0;
-	} else if ( r === max ) {
-		h = ( 60 * ( g - b ) / diff ) + 360;
-	} else if ( g === max ) {
-		h = ( 60 * ( b - r ) / diff ) + 120;
-	} else {
-		h = ( 60 * ( r - g ) / diff ) + 240;
-	}
-
-	if ( l === 0 || l === 1 ) {
-		s = l;
-	} else if ( l <= 0.5 ) {
-		s = diff / add;
-	} else {
-		s = diff / ( 2 - add );
-	}
-	return [ Math.round(h) % 360, s, l, a == null ? 1 : a ];
-};
-
-spaces.hsla.from = function ( hsla ) {
-	if ( hsla[ 0 ] == null || hsla[ 1 ] == null || hsla[ 2 ] == null ) {
-		return [ null, null, null, hsla[ 3 ] ];
-	}
-	var h = hsla[ 0 ] / 360,
-		s = hsla[ 1 ],
-		l = hsla[ 2 ],
-		a = hsla[ 3 ],
-		q = l <= 0.5 ? l * ( 1 + s ) : l + s - l * s,
-		p = 2 * l - q;
-
-	return [
-		Math.round( hue2rgb( p, q, h + ( 1 / 3 ) ) * 255 ),
-		Math.round( hue2rgb( p, q, h ) * 255 ),
-		Math.round( hue2rgb( p, q, h - ( 1 / 3 ) ) * 255 ),
-		a
-	];
-};
-
-
-each( spaces, function( spaceName, space ) {
-	var props = space.props,
-		cache = space.cache,
-		to = space.to,
-		from = space.from;
-
-	// makes rgba() and hsla()
-	color.fn[ spaceName ] = function( value ) {
-
-		// generate a cache for this space if it doesn't exist
-		if ( to && !this[ cache ] ) {
-			this[ cache ] = to( this._rgba );
-		}
-		if ( value === undefined ) {
-			return this[ cache ].slice();
-		}
-
-		var ret,
-			type = jQuery.type( value ),
-			arr = ( type === "array" || type === "object" ) ? value : arguments,
-			local = this[ cache ].slice();
-
-		each( props, function( key, prop ) {
-			var val = arr[ type === "object" ? key : prop.idx ];
-			if ( val == null ) {
-				val = local[ prop.idx ];
-			}
-			local[ prop.idx ] = clamp( val, prop );
-		});
-
-		if ( from ) {
-			ret = color( from( local ) );
-			ret[ cache ] = local;
-			return ret;
-		} else {
-			return color( local );
-		}
-	};
-
-	// makes red() green() blue() alpha() hue() saturation() lightness()
-	each( props, function( key, prop ) {
-		// alpha is included in more than one space
-		if ( color.fn[ key ] ) {
-			return;
-		}
-		color.fn[ key ] = function( value ) {
-			var vtype = jQuery.type( value ),
-				fn = ( key === "alpha" ? ( this._hsla ? "hsla" : "rgba" ) : spaceName ),
-				local = this[ fn ](),
-				cur = local[ prop.idx ],
-				match;
-
-			if ( vtype === "undefined" ) {
-				return cur;
-			}
-
-			if ( vtype === "function" ) {
-				value = value.call( this, cur );
-				vtype = jQuery.type( value );
-			}
-			if ( value == null && prop.empty ) {
-				return this;
-			}
-			if ( vtype === "string" ) {
-				match = rplusequals.exec( value );
-				if ( match ) {
-					value = cur + parseFloat( match[ 2 ] ) * ( match[ 1 ] === "+" ? 1 : -1 );
-				}
-			}
-			local[ prop.idx ] = value;
-			return this[ fn ]( local );
-		};
-	});
-});
-
-// add .fx.step functions
-each( stepHooks, function( i, hook ) {
-	jQuery.cssHooks[ hook ] = {
-		set: function( elem, value ) {
-			var parsed, curElem,
-				backgroundColor = "";
-
-			if ( jQuery.type( value ) !== "string" || ( parsed = stringParse( value ) ) ) {
-				value = color( parsed || value );
-				if ( !support.rgba && value._rgba[ 3 ] !== 1 ) {
-					curElem = hook === "backgroundColor" ? elem.parentNode : elem;
-					while (
-						(backgroundColor === "" || backgroundColor === "transparent") &&
-						curElem && curElem.style
-					) {
-						try {
-							backgroundColor = jQuery.css( curElem, "backgroundColor" );
-							curElem = curElem.parentNode;
-						} catch ( e ) {
-						}
-					}
-
-					value = value.blend( backgroundColor && backgroundColor !== "transparent" ?
-						backgroundColor :
-						"_default" );
-				}
-
-				value = value.toRgbaString();
-			}
-			try {
-				elem.style[ hook ] = value;
-			} catch( error ) {
-				// wrapped to prevent IE from throwing errors on "invalid" values like 'auto' or 'inherit'
-			}
-		}
-	};
-	jQuery.fx.step[ hook ] = function( fx ) {
-		if ( !fx.colorInit ) {
-			fx.start = color( fx.elem, hook );
-			fx.end = color( fx.end );
-			fx.colorInit = true;
-		}
-		jQuery.cssHooks[ hook ].set( fx.elem, fx.start.transition( fx.end, fx.pos ) );
-	};
-});
-
-jQuery.cssHooks.borderColor = {
-	expand: function( value ) {
-		var expanded = {};
-
-		each( [ "Top", "Right", "Bottom", "Left" ], function( i, part ) {
-			expanded[ "border" + part + "Color" ] = value;
-		});
-		return expanded;
-	}
-};
-
-// Basic color names only.
-// Usage of any of the other color names requires adding yourself or including
-// jquery.color.svg-names.js.
-colors = jQuery.Color.names = {
-	// 4.1. Basic color keywords
-	aqua: "#00ffff",
-	black: "#000000",
-	blue: "#0000ff",
-	fuchsia: "#ff00ff",
-	gray: "#808080",
-	green: "#008000",
-	lime: "#00ff00",
-	maroon: "#800000",
-	navy: "#000080",
-	olive: "#808000",
-	purple: "#800080",
-	red: "#ff0000",
-	silver: "#c0c0c0",
-	teal: "#008080",
-	white: "#ffffff",
-	yellow: "#ffff00",
-
-	// 4.2.3. "transparent" color keyword
-	transparent: [ null, null, null, 0 ],
-
-	_default: "#ffffff"
-};
-
-})( jQuery );
-
-
-
-/******************************************************************************/
-/****************************** CLASS ANIMATIONS ******************************/
-/******************************************************************************/
-(function() {
-
-var classAnimationActions = [ "add", "remove", "toggle" ],
-	shorthandStyles = {
-		border: 1,
-		borderBottom: 1,
-		borderColor: 1,
-		borderLeft: 1,
-		borderRight: 1,
-		borderTop: 1,
-		borderWidth: 1,
-		margin: 1,
-		padding: 1
-	};
-
-$.each([ "borderLeftStyle", "borderRightStyle", "borderBottomStyle", "borderTopStyle" ], function( _, prop ) {
-	$.fx.step[ prop ] = function( fx ) {
-		if ( fx.end !== "none" && !fx.setAttr || fx.pos === 1 && !fx.setAttr ) {
-			jQuery.style( fx.elem, prop, fx.end );
-			fx.setAttr = true;
-		}
-	};
-});
-
-function getElementStyles() {
-	var style = this.ownerDocument.defaultView ?
-			this.ownerDocument.defaultView.getComputedStyle( this, null ) :
-			this.currentStyle,
-		newStyle = {},
-		key,
-		len;
-
-	// webkit enumerates style porperties
-	if ( style && style.length && style[ 0 ] && style[ style[ 0 ] ] ) {
-		len = style.length;
-		while ( len-- ) {
-			key = style[ len ];
-			if ( typeof style[ key ] === "string" ) {
-				newStyle[ $.camelCase( key ) ] = style[ key ];
-			}
-		}
-	} else {
-		for ( key in style ) {
-			if ( typeof style[ key ] === "string" ) {
-				newStyle[ key ] = style[ key ];
-			}
-		}
-	}
-
-	return newStyle;
-}
-
-
-function styleDifference( oldStyle, newStyle ) {
-	var diff = {},
-		name, value;
-
-	for ( name in newStyle ) {
-		value = newStyle[ name ];
-		if ( oldStyle[ name ] !== value ) {
-			if ( !shorthandStyles[ name ] ) {
-				if ( $.fx.step[ name ] || !isNaN( parseFloat( value ) ) ) {
-					diff[ name ] = value;
-				}
-			}
-		}
-	}
-
-	return diff;
-}
-
-$.effects.animateClass = function( value, duration, easing, callback ) {
-	var o = $.speed( duration, easing, callback );
-
-	return this.queue( function() {
-		var animated = $( this ),
-			baseClass = animated.attr( "class" ) || "",
-			applyClassChange,
-			allAnimations = o.children ? animated.find( "*" ).andSelf() : animated;
-
-		// map the animated objects to store the original styles.
-		allAnimations = allAnimations.map(function() {
-			var el = $( this );
-			return {
-				el: el,
-				start: getElementStyles.call( this )
-			};
-		});
-
-		// apply class change
-		applyClassChange = function() {
-			$.each( classAnimationActions, function(i, action) {
-				if ( value[ action ] ) {
-					animated[ action + "Class" ]( value[ action ] );
-				}
-			});
-		};
-		applyClassChange();
-
-		// map all animated objects again - calculate new styles and diff
-		allAnimations = allAnimations.map(function() {
-			this.end = getElementStyles.call( this.el[ 0 ] );
-			this.diff = styleDifference( this.start, this.end );
-			return this;
-		});
-
-		// apply original class
-		animated.attr( "class", baseClass );
-
-		// map all animated objects again - this time collecting a promise
-		allAnimations = allAnimations.map(function() {
-			var styleInfo = this,
-				dfd = $.Deferred(),
-				opts = jQuery.extend({}, o, {
-					queue: false,
-					complete: function() {
-						dfd.resolve( styleInfo );
-					}
-				});
-
-			this.el.animate( this.diff, opts );
-			return dfd.promise();
-		});
-
-		// once all animations have completed:
-		$.when.apply( $, allAnimations.get() ).done(function() {
-
-			// set the final class
-			applyClassChange();
-
-			// for each animated element,
-			// clear all css properties that were animated
-			$.each( arguments, function() {
-				var el = this.el;
-				$.each( this.diff, function(key) {
-					el.css( key, '' );
-				});
-			});
-
-			// this is guarnteed to be there if you use jQuery.speed()
-			// it also handles dequeuing the next anim...
-			o.complete.call( animated[ 0 ] );
-		});
-	});
-};
-
-$.fn.extend({
-	_addClass: $.fn.addClass,
-	addClass: function( classNames, speed, easing, callback ) {
-		return speed ?
-			$.effects.animateClass.call( this,
-				{ add: classNames }, speed, easing, callback ) :
-			this._addClass( classNames );
-	},
-
-	_removeClass: $.fn.removeClass,
-	removeClass: function( classNames, speed, easing, callback ) {
-		return speed ?
-			$.effects.animateClass.call( this,
-				{ remove: classNames }, speed, easing, callback ) :
-			this._removeClass( classNames );
-	},
-
-	_toggleClass: $.fn.toggleClass,
-	toggleClass: function( classNames, force, speed, easing, callback ) {
-		if ( typeof force === "boolean" || force === undefined ) {
-			if ( !speed ) {
-				// without speed parameter
-				return this._toggleClass( classNames, force );
-			} else {
-				return $.effects.animateClass.call( this,
-					(force ? { add: classNames } : { remove: classNames }),
-					speed, easing, callback );
-			}
-		} else {
-			// without force parameter
-			return $.effects.animateClass.call( this,
-				{ toggle: classNames }, force, speed, easing );
-		}
-	},
-
-	switchClass: function( remove, add, speed, easing, callback) {
-		return $.effects.animateClass.call( this, {
-			add: add,
-			remove: remove
-		}, speed, easing, callback );
-	}
-});
-
-})();
-
-/******************************************************************************/
-/*********************************** EFFECTS **********************************/
-/******************************************************************************/
-
-(function() {
-
-$.extend( $.effects, {
-	version: "1.9.2",
-
-	// Saves a set of properties in a data storage
-	save: function( element, set ) {
-		for( var i=0; i < set.length; i++ ) {
-			if ( set[ i ] !== null ) {
-				element.data( dataSpace + set[ i ], element[ 0 ].style[ set[ i ] ] );
-			}
-		}
-	},
-
-	// Restores a set of previously saved properties from a data storage
-	restore: function( element, set ) {
-		var val, i;
-		for( i=0; i < set.length; i++ ) {
-			if ( set[ i ] !== null ) {
-				val = element.data( dataSpace + set[ i ] );
-				// support: jQuery 1.6.2
-				// http://bugs.jquery.com/ticket/9917
-				// jQuery 1.6.2 incorrectly returns undefined for any falsy value.
-				// We can't differentiate between "" and 0 here, so we just assume
-				// empty string since it's likely to be a more common value...
-				if ( val === undefined ) {
-					val = "";
-				}
-				element.css( set[ i ], val );
-			}
-		}
-	},
-
-	setMode: function( el, mode ) {
-		if (mode === "toggle") {
-			mode = el.is( ":hidden" ) ? "show" : "hide";
-		}
-		return mode;
-	},
-
-	// Translates a [top,left] array into a baseline value
-	// this should be a little more flexible in the future to handle a string & hash
-	getBaseline: function( origin, original ) {
-		var y, x;
-		switch ( origin[ 0 ] ) {
-			case "top": y = 0; break;
-			case "middle": y = 0.5; break;
-			case "bottom": y = 1; break;
-			default: y = origin[ 0 ] / original.height;
-		}
-		switch ( origin[ 1 ] ) {
-			case "left": x = 0; break;
-			case "center": x = 0.5; break;
-			case "right": x = 1; break;
-			default: x = origin[ 1 ] / original.width;
-		}
-		return {
-			x: x,
-			y: y
-		};
-	},
-
-	// Wraps the element around a wrapper that copies position properties
-	createWrapper: function( element ) {
-
-		// if the element is already wrapped, return it
-		if ( element.parent().is( ".ui-effects-wrapper" )) {
-			return element.parent();
-		}
-
-		// wrap the element
-		var props = {
-				width: element.outerWidth(true),
-				height: element.outerHeight(true),
-				"float": element.css( "float" )
-			},
-			wrapper = $( "
      " )
-				.addClass( "ui-effects-wrapper" )
-				.css({
-					fontSize: "100%",
-					background: "transparent",
-					border: "none",
-					margin: 0,
-					padding: 0
-				}),
-			// Store the size in case width/height are defined in % - Fixes #5245
-			size = {
-				width: element.width(),
-				height: element.height()
-			},
-			active = document.activeElement;
-
-		// support: Firefox
-		// Firefox incorrectly exposes anonymous content
-		// https://bugzilla.mozilla.org/show_bug.cgi?id=561664
-		try {
-			active.id;
-		} catch( e ) {
-			active = document.body;
-		}
-
-		element.wrap( wrapper );
-
-		// Fixes #7595 - Elements lose focus when wrapped.
-		if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
-			$( active ).focus();
-		}
-
-		wrapper = element.parent(); //Hotfix for jQuery 1.4 since some change in wrap() seems to actually lose the reference to the wrapped element
-
-		// transfer positioning properties to the wrapper
-		if ( element.css( "position" ) === "static" ) {
-			wrapper.css({ position: "relative" });
-			element.css({ position: "relative" });
-		} else {
-			$.extend( props, {
-				position: element.css( "position" ),
-				zIndex: element.css( "z-index" )
-			});
-			$.each([ "top", "left", "bottom", "right" ], function(i, pos) {
-				props[ pos ] = element.css( pos );
-				if ( isNaN( parseInt( props[ pos ], 10 ) ) ) {
-					props[ pos ] = "auto";
-				}
-			});
-			element.css({
-				position: "relative",
-				top: 0,
-				left: 0,
-				right: "auto",
-				bottom: "auto"
-			});
-		}
-		element.css(size);
-
-		return wrapper.css( props ).show();
-	},
-
-	removeWrapper: function( element ) {
-		var active = document.activeElement;
-
-		if ( element.parent().is( ".ui-effects-wrapper" ) ) {
-			element.parent().replaceWith( element );
-
-			// Fixes #7595 - Elements lose focus when wrapped.
-			if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
-				$( active ).focus();
-			}
-		}
-
-
-		return element;
-	},
-
-	setTransition: function( element, list, factor, value ) {
-		value = value || {};
-		$.each( list, function( i, x ) {
-			var unit = element.cssUnit( x );
-			if ( unit[ 0 ] > 0 ) {
-				value[ x ] = unit[ 0 ] * factor + unit[ 1 ];
-			}
-		});
-		return value;
-	}
-});
-
-// return an effect options object for the given parameters:
-function _normalizeArguments( effect, options, speed, callback ) {
-
-	// allow passing all options as the first parameter
-	if ( $.isPlainObject( effect ) ) {
-		options = effect;
-		effect = effect.effect;
-	}
-
-	// convert to an object
-	effect = { effect: effect };
-
-	// catch (effect, null, ...)
-	if ( options == null ) {
-		options = {};
-	}
-
-	// catch (effect, callback)
-	if ( $.isFunction( options ) ) {
-		callback = options;
-		speed = null;
-		options = {};
-	}
-
-	// catch (effect, speed, ?)
-	if ( typeof options === "number" || $.fx.speeds[ options ] ) {
-		callback = speed;
-		speed = options;
-		options = {};
-	}
-
-	// catch (effect, options, callback)
-	if ( $.isFunction( speed ) ) {
-		callback = speed;
-		speed = null;
-	}
-
-	// add options to effect
-	if ( options ) {
-		$.extend( effect, options );
-	}
-
-	speed = speed || options.duration;
-	effect.duration = $.fx.off ? 0 :
-		typeof speed === "number" ? speed :
-		speed in $.fx.speeds ? $.fx.speeds[ speed ] :
-		$.fx.speeds._default;
-
-	effect.complete = callback || options.complete;
-
-	return effect;
-}
-
-function standardSpeed( speed ) {
-	// valid standard speeds
-	if ( !speed || typeof speed === "number" || $.fx.speeds[ speed ] ) {
-		return true;
-	}
-
-	// invalid strings - treat as "normal" speed
-	if ( typeof speed === "string" && !$.effects.effect[ speed ] ) {
-		// TODO: remove in 2.0 (#7115)
-		if ( backCompat && $.effects[ speed ] ) {
-			return false;
-		}
-		return true;
-	}
-
-	return false;
-}
-
-$.fn.extend({
-	effect: function( /* effect, options, speed, callback */ ) {
-		var args = _normalizeArguments.apply( this, arguments ),
-			mode = args.mode,
-			queue = args.queue,
-			effectMethod = $.effects.effect[ args.effect ],
-
-			// DEPRECATED: remove in 2.0 (#7115)
-			oldEffectMethod = !effectMethod && backCompat && $.effects[ args.effect ];
-
-		if ( $.fx.off || !( effectMethod || oldEffectMethod ) ) {
-			// delegate to the original method (e.g., .show()) if possible
-			if ( mode ) {
-				return this[ mode ]( args.duration, args.complete );
-			} else {
-				return this.each( function() {
-					if ( args.complete ) {
-						args.complete.call( this );
-					}
-				});
-			}
-		}
-
-		function run( next ) {
-			var elem = $( this ),
-				complete = args.complete,
-				mode = args.mode;
-
-			function done() {
-				if ( $.isFunction( complete ) ) {
-					complete.call( elem[0] );
-				}
-				if ( $.isFunction( next ) ) {
-					next();
-				}
-			}
-
-			// if the element is hiddden and mode is hide,
-			// or element is visible and mode is show
-			if ( elem.is( ":hidden" ) ? mode === "hide" : mode === "show" ) {
-				done();
-			} else {
-				effectMethod.call( elem[0], args, done );
-			}
-		}
-
-		// TODO: remove this check in 2.0, effectMethod will always be true
-		if ( effectMethod ) {
-			return queue === false ? this.each( run ) : this.queue( queue || "fx", run );
-		} else {
-			// DEPRECATED: remove in 2.0 (#7115)
-			return oldEffectMethod.call(this, {
-				options: args,
-				duration: args.duration,
-				callback: args.complete,
-				mode: args.mode
-			});
-		}
-	},
-
-	_show: $.fn.show,
-	show: function( speed ) {
-		if ( standardSpeed( speed ) ) {
-			return this._show.apply( this, arguments );
-		} else {
-			var args = _normalizeArguments.apply( this, arguments );
-			args.mode = "show";
-			return this.effect.call( this, args );
-		}
-	},
-
-	_hide: $.fn.hide,
-	hide: function( speed ) {
-		if ( standardSpeed( speed ) ) {
-			return this._hide.apply( this, arguments );
-		} else {
-			var args = _normalizeArguments.apply( this, arguments );
-			args.mode = "hide";
-			return this.effect.call( this, args );
-		}
-	},
-
-	// jQuery core overloads toggle and creates _toggle
-	__toggle: $.fn.toggle,
-	toggle: function( speed ) {
-		if ( standardSpeed( speed ) || typeof speed === "boolean" || $.isFunction( speed ) ) {
-			return this.__toggle.apply( this, arguments );
-		} else {
-			var args = _normalizeArguments.apply( this, arguments );
-			args.mode = "toggle";
-			return this.effect.call( this, args );
-		}
-	},
-
-	// helper functions
-	cssUnit: function(key) {
-		var style = this.css( key ),
-			val = [];
-
-		$.each( [ "em", "px", "%", "pt" ], function( i, unit ) {
-			if ( style.indexOf( unit ) > 0 ) {
-				val = [ parseFloat( style ), unit ];
-			}
-		});
-		return val;
-	}
-});
-
-})();
-
-/******************************************************************************/
-/*********************************** EASING ***********************************/
-/******************************************************************************/
-
-(function() {
-
-// based on easing equations from Robert Penner (http://www.robertpenner.com/easing)
-
-var baseEasings = {};
-
-$.each( [ "Quad", "Cubic", "Quart", "Quint", "Expo" ], function( i, name ) {
-	baseEasings[ name ] = function( p ) {
-		return Math.pow( p, i + 2 );
-	};
-});
-
-$.extend( baseEasings, {
-	Sine: function ( p ) {
-		return 1 - Math.cos( p * Math.PI / 2 );
-	},
-	Circ: function ( p ) {
-		return 1 - Math.sqrt( 1 - p * p );
-	},
-	Elastic: function( p ) {
-		return p === 0 || p === 1 ? p :
-			-Math.pow( 2, 8 * (p - 1) ) * Math.sin( ( (p - 1) * 80 - 7.5 ) * Math.PI / 15 );
-	},
-	Back: function( p ) {
-		return p * p * ( 3 * p - 2 );
-	},
-	Bounce: function ( p ) {
-		var pow2,
-			bounce = 4;
-
-		while ( p < ( ( pow2 = Math.pow( 2, --bounce ) ) - 1 ) / 11 ) {}
-		return 1 / Math.pow( 4, 3 - bounce ) - 7.5625 * Math.pow( ( pow2 * 3 - 2 ) / 22 - p, 2 );
-	}
-});
-
-$.each( baseEasings, function( name, easeIn ) {
-	$.easing[ "easeIn" + name ] = easeIn;
-	$.easing[ "easeOut" + name ] = function( p ) {
-		return 1 - easeIn( 1 - p );
-	};
-	$.easing[ "easeInOut" + name ] = function( p ) {
-		return p < 0.5 ?
-			easeIn( p * 2 ) / 2 :
-			1 - easeIn( p * -2 + 2 ) / 2;
-	};
-});
-
-})();
-
-})(jQuery));
-(function( $, undefined ) {
-
-var rvertical = /up|down|vertical/,
-	rpositivemotion = /up|left|vertical|horizontal/;
-
-$.effects.effect.blind = function( o, done ) {
-	// Create element
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
-		mode = $.effects.setMode( el, o.mode || "hide" ),
-		direction = o.direction || "up",
-		vertical = rvertical.test( direction ),
-		ref = vertical ? "height" : "width",
-		ref2 = vertical ? "top" : "left",
-		motion = rpositivemotion.test( direction ),
-		animation = {},
-		show = mode === "show",
-		wrapper, distance, margin;
-
-	// if already wrapped, the wrapper's properties are my property. #6245
-	if ( el.parent().is( ".ui-effects-wrapper" ) ) {
-		$.effects.save( el.parent(), props );
-	} else {
-		$.effects.save( el, props );
-	}
-	el.show();
-	wrapper = $.effects.createWrapper( el ).css({
-		overflow: "hidden"
-	});
-
-	distance = wrapper[ ref ]();
-	margin = parseFloat( wrapper.css( ref2 ) ) || 0;
-
-	animation[ ref ] = show ? distance : 0;
-	if ( !motion ) {
-		el
-			.css( vertical ? "bottom" : "right", 0 )
-			.css( vertical ? "top" : "left", "auto" )
-			.css({ position: "absolute" });
-
-		animation[ ref2 ] = show ? margin : distance + margin;
-	}
-
-	// start at 0 if we are showing
-	if ( show ) {
-		wrapper.css( ref, 0 );
-		if ( ! motion ) {
-			wrapper.css( ref2, margin + distance );
-		}
-	}
-
-	// Animate
-	wrapper.animate( animation, {
-		duration: o.duration,
-		easing: o.easing,
-		queue: false,
-		complete: function() {
-			if ( mode === "hide" ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		}
-	});
-
-};
-
-})(jQuery);
-(function( $, undefined ) {
-
-$.effects.effect.bounce = function( o, done ) {
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
-
-		// defaults:
-		mode = $.effects.setMode( el, o.mode || "effect" ),
-		hide = mode === "hide",
-		show = mode === "show",
-		direction = o.direction || "up",
-		distance = o.distance,
-		times = o.times || 5,
-
-		// number of internal animations
-		anims = times * 2 + ( show || hide ? 1 : 0 ),
-		speed = o.duration / anims,
-		easing = o.easing,
-
-		// utility:
-		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
-		motion = ( direction === "up" || direction === "left" ),
-		i,
-		upAnim,
-		downAnim,
-
-		// we will need to re-assemble the queue to stack our animations in place
-		queue = el.queue(),
-		queuelen = queue.length;
-
-	// Avoid touching opacity to prevent clearType and PNG issues in IE
-	if ( show || hide ) {
-		props.push( "opacity" );
-	}
-
-	$.effects.save( el, props );
-	el.show();
-	$.effects.createWrapper( el ); // Create Wrapper
-
-	// default distance for the BIGGEST bounce is the outer Distance / 3
-	if ( !distance ) {
-		distance = el[ ref === "top" ? "outerHeight" : "outerWidth" ]() / 3;
-	}
-
-	if ( show ) {
-		downAnim = { opacity: 1 };
-		downAnim[ ref ] = 0;
-
-		// if we are showing, force opacity 0 and set the initial position
-		// then do the "first" animation
-		el.css( "opacity", 0 )
-			.css( ref, motion ? -distance * 2 : distance * 2 )
-			.animate( downAnim, speed, easing );
-	}
-
-	// start at the smallest distance if we are hiding
-	if ( hide ) {
-		distance = distance / Math.pow( 2, times - 1 );
-	}
-
-	downAnim = {};
-	downAnim[ ref ] = 0;
-	// Bounces up/down/left/right then back to 0 -- times * 2 animations happen here
-	for ( i = 0; i < times; i++ ) {
-		upAnim = {};
-		upAnim[ ref ] = ( motion ? "-=" : "+=" ) + distance;
-
-		el.animate( upAnim, speed, easing )
-			.animate( downAnim, speed, easing );
-
-		distance = hide ? distance * 2 : distance / 2;
-	}
-
-	// Last Bounce when Hiding
-	if ( hide ) {
-		upAnim = { opacity: 0 };
-		upAnim[ ref ] = ( motion ? "-=" : "+=" ) + distance;
-
-		el.animate( upAnim, speed, easing );
-	}
-
-	el.queue(function() {
-		if ( hide ) {
-			el.hide();
-		}
-		$.effects.restore( el, props );
-		$.effects.removeWrapper( el );
-		done();
-	});
-
-	// inject all the animations we just queued to be first in line (after "inprogress")
-	if ( queuelen > 1) {
-		queue.splice.apply( queue,
-			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
-	}
-	el.dequeue();
-
-};
-
-})(jQuery);
-(function( $, undefined ) {
-
-$.effects.effect.clip = function( o, done ) {
-	// Create element
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
-		mode = $.effects.setMode( el, o.mode || "hide" ),
-		show = mode === "show",
-		direction = o.direction || "vertical",
-		vert = direction === "vertical",
-		size = vert ? "height" : "width",
-		position = vert ? "top" : "left",
-		animation = {},
-		wrapper, animate, distance;
-
-	// Save & Show
-	$.effects.save( el, props );
-	el.show();
-
-	// Create Wrapper
-	wrapper = $.effects.createWrapper( el ).css({
-		overflow: "hidden"
-	});
-	animate = ( el[0].tagName === "IMG" ) ? wrapper : el;
-	distance = animate[ size ]();
-
-	// Shift
-	if ( show ) {
-		animate.css( size, 0 );
-		animate.css( position, distance / 2 );
-	}
-
-	// Create Animation Object:
-	animation[ size ] = show ? distance : 0;
-	animation[ position ] = show ? 0 : distance / 2;
-
-	// Animate
-	animate.animate( animation, {
-		queue: false,
-		duration: o.duration,
-		easing: o.easing,
-		complete: function() {
-			if ( !show ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		}
-	});
-
-};
-
-})(jQuery);
-(function( $, undefined ) {
-
-$.effects.effect.drop = function( o, done ) {
-
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "opacity", "height", "width" ],
-		mode = $.effects.setMode( el, o.mode || "hide" ),
-		show = mode === "show",
-		direction = o.direction || "left",
-		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
-		motion = ( direction === "up" || direction === "left" ) ? "pos" : "neg",
-		animation = {
-			opacity: show ? 1 : 0
-		},
-		distance;
-
-	// Adjust
-	$.effects.save( el, props );
-	el.show();
-	$.effects.createWrapper( el );
-
-	distance = o.distance || el[ ref === "top" ? "outerHeight": "outerWidth" ]( true ) / 2;
-
-	if ( show ) {
-		el
-			.css( "opacity", 0 )
-			.css( ref, motion === "pos" ? -distance : distance );
-	}
-
-	// Animation
-	animation[ ref ] = ( show ?
-		( motion === "pos" ? "+=" : "-=" ) :
-		( motion === "pos" ? "-=" : "+=" ) ) +
-		distance;
-
-	// Animate
-	el.animate( animation, {
-		queue: false,
-		duration: o.duration,
-		easing: o.easing,
-		complete: function() {
-			if ( mode === "hide" ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		}
-	});
-};
-
-})(jQuery);
-(function( $, undefined ) {
-
-$.effects.effect.explode = function( o, done ) {
-
-	var rows = o.pieces ? Math.round( Math.sqrt( o.pieces ) ) : 3,
-		cells = rows,
-		el = $( this ),
-		mode = $.effects.setMode( el, o.mode || "hide" ),
-		show = mode === "show",
-
-		// show and then visibility:hidden the element before calculating offset
-		offset = el.show().css( "visibility", "hidden" ).offset(),
-
-		// width and height of a piece
-		width = Math.ceil( el.outerWidth() / cells ),
-		height = Math.ceil( el.outerHeight() / rows ),
-		pieces = [],
-
-		// loop
-		i, j, left, top, mx, my;
-
-	// children animate complete:
-	function childComplete() {
-		pieces.push( this );
-		if ( pieces.length === rows * cells ) {
-			animComplete();
-		}
-	}
-
-	// clone the element for each row and cell.
-	for( i = 0; i < rows ; i++ ) { // ===>
-		top = offset.top + i * height;
-		my = i - ( rows - 1 ) / 2 ;
-
-		for( j = 0; j < cells ; j++ ) { // |||
-			left = offset.left + j * width;
-			mx = j - ( cells - 1 ) / 2 ;
-
-			// Create a clone of the now hidden main element that will be absolute positioned
-			// within a wrapper div off the -left and -top equal to size of our pieces
-			el
-				.clone()
-				.appendTo( "body" )
-				.wrap( "
      " )
-				.css({
-					position: "absolute",
-					visibility: "visible",
-					left: -j * width,
-					top: -i * height
-				})
-
-			// select the wrapper - make it overflow: hidden and absolute positioned based on
-			// where the original was located +left and +top equal to the size of pieces
-				.parent()
-				.addClass( "ui-effects-explode" )
-				.css({
-					position: "absolute",
-					overflow: "hidden",
-					width: width,
-					height: height,
-					left: left + ( show ? mx * width : 0 ),
-					top: top + ( show ? my * height : 0 ),
-					opacity: show ? 0 : 1
-				}).animate({
-					left: left + ( show ? 0 : mx * width ),
-					top: top + ( show ? 0 : my * height ),
-					opacity: show ? 1 : 0
-				}, o.duration || 500, o.easing, childComplete );
-		}
-	}
-
-	function animComplete() {
-		el.css({
-			visibility: "visible"
-		});
-		$( pieces ).remove();
-		if ( !show ) {
-			el.hide();
-		}
-		done();
-	}
-};
-
-})(jQuery);
-(function( $, undefined ) {
-
-$.effects.effect.fade = function( o, done ) {
-	var el = $( this ),
-		mode = $.effects.setMode( el, o.mode || "toggle" );
-
-	el.animate({
-		opacity: mode
-	}, {
-		queue: false,
-		duration: o.duration,
-		easing: o.easing,
-		complete: done
-	});
-};
-
-})( jQuery );
-(function( $, undefined ) {
-
-$.effects.effect.fold = function( o, done ) {
-
-	// Create element
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
-		mode = $.effects.setMode( el, o.mode || "hide" ),
-		show = mode === "show",
-		hide = mode === "hide",
-		size = o.size || 15,
-		percent = /([0-9]+)%/.exec( size ),
-		horizFirst = !!o.horizFirst,
-		widthFirst = show !== horizFirst,
-		ref = widthFirst ? [ "width", "height" ] : [ "height", "width" ],
-		duration = o.duration / 2,
-		wrapper, distance,
-		animation1 = {},
-		animation2 = {};
-
-	$.effects.save( el, props );
-	el.show();
-
-	// Create Wrapper
-	wrapper = $.effects.createWrapper( el ).css({
-		overflow: "hidden"
-	});
-	distance = widthFirst ?
-		[ wrapper.width(), wrapper.height() ] :
-		[ wrapper.height(), wrapper.width() ];
-
-	if ( percent ) {
-		size = parseInt( percent[ 1 ], 10 ) / 100 * distance[ hide ? 0 : 1 ];
-	}
-	if ( show ) {
-		wrapper.css( horizFirst ? {
-			height: 0,
-			width: size
-		} : {
-			height: size,
-			width: 0
-		});
-	}
-
-	// Animation
-	animation1[ ref[ 0 ] ] = show ? distance[ 0 ] : size;
-	animation2[ ref[ 1 ] ] = show ? distance[ 1 ] : 0;
-
-	// Animate
-	wrapper
-		.animate( animation1, duration, o.easing )
-		.animate( animation2, duration, o.easing, function() {
-			if ( hide ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		});
-
-};
-
-})(jQuery);
-(function( $, undefined ) {
-
-$.effects.effect.highlight = function( o, done ) {
-	var elem = $( this ),
-		props = [ "backgroundImage", "backgroundColor", "opacity" ],
-		mode = $.effects.setMode( elem, o.mode || "show" ),
-		animation = {
-			backgroundColor: elem.css( "backgroundColor" )
-		};
-
-	if (mode === "hide") {
-		animation.opacity = 0;
-	}
-
-	$.effects.save( elem, props );
-
-	elem
-		.show()
-		.css({
-			backgroundImage: "none",
-			backgroundColor: o.color || "#ffff99"
-		})
-		.animate( animation, {
-			queue: false,
-			duration: o.duration,
-			easing: o.easing,
-			complete: function() {
-				if ( mode === "hide" ) {
-					elem.hide();
-				}
-				$.effects.restore( elem, props );
-				done();
-			}
-		});
-};
-
-})(jQuery);
-(function( $, undefined ) {
-
-$.effects.effect.pulsate = function( o, done ) {
-	var elem = $( this ),
-		mode = $.effects.setMode( elem, o.mode || "show" ),
-		show = mode === "show",
-		hide = mode === "hide",
-		showhide = ( show || mode === "hide" ),
-
-		// showing or hiding leaves of the "last" animation
-		anims = ( ( o.times || 5 ) * 2 ) + ( showhide ? 1 : 0 ),
-		duration = o.duration / anims,
-		animateTo = 0,
-		queue = elem.queue(),
-		queuelen = queue.length,
-		i;
-
-	if ( show || !elem.is(":visible")) {
-		elem.css( "opacity", 0 ).show();
-		animateTo = 1;
-	}
-
-	// anims - 1 opacity "toggles"
-	for ( i = 1; i < anims; i++ ) {
-		elem.animate({
-			opacity: animateTo
-		}, duration, o.easing );
-		animateTo = 1 - animateTo;
-	}
-
-	elem.animate({
-		opacity: animateTo
-	}, duration, o.easing);
-
-	elem.queue(function() {
-		if ( hide ) {
-			elem.hide();
-		}
-		done();
-	});
-
-	// We just queued up "anims" animations, we need to put them next in the queue
-	if ( queuelen > 1 ) {
-		queue.splice.apply( queue,
-			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
-	}
-	elem.dequeue();
-};
-
-})(jQuery);
-(function( $, undefined ) {
-
-$.effects.effect.puff = function( o, done ) {
-	var elem = $( this ),
-		mode = $.effects.setMode( elem, o.mode || "hide" ),
-		hide = mode === "hide",
-		percent = parseInt( o.percent, 10 ) || 150,
-		factor = percent / 100,
-		original = {
-			height: elem.height(),
-			width: elem.width(),
-			outerHeight: elem.outerHeight(),
-			outerWidth: elem.outerWidth()
-		};
-
-	$.extend( o, {
-		effect: "scale",
-		queue: false,
-		fade: true,
-		mode: mode,
-		complete: done,
-		percent: hide ? percent : 100,
-		from: hide ?
-			original :
-			{
-				height: original.height * factor,
-				width: original.width * factor,
-				outerHeight: original.outerHeight * factor,
-				outerWidth: original.outerWidth * factor
-			}
-	});
-
-	elem.effect( o );
-};
-
-$.effects.effect.scale = function( o, done ) {
-
-	// Create element
-	var el = $( this ),
-		options = $.extend( true, {}, o ),
-		mode = $.effects.setMode( el, o.mode || "effect" ),
-		percent = parseInt( o.percent, 10 ) ||
-			( parseInt( o.percent, 10 ) === 0 ? 0 : ( mode === "hide" ? 0 : 100 ) ),
-		direction = o.direction || "both",
-		origin = o.origin,
-		original = {
-			height: el.height(),
-			width: el.width(),
-			outerHeight: el.outerHeight(),
-			outerWidth: el.outerWidth()
-		},
-		factor = {
-			y: direction !== "horizontal" ? (percent / 100) : 1,
-			x: direction !== "vertical" ? (percent / 100) : 1
-		};
-
-	// We are going to pass this effect to the size effect:
-	options.effect = "size";
-	options.queue = false;
-	options.complete = done;
-
-	// Set default origin and restore for show/hide
-	if ( mode !== "effect" ) {
-		options.origin = origin || ["middle","center"];
-		options.restore = true;
-	}
-
-	options.from = o.from || ( mode === "show" ? {
-		height: 0,
-		width: 0,
-		outerHeight: 0,
-		outerWidth: 0
-	} : original );
-	options.to = {
-		height: original.height * factor.y,
-		width: original.width * factor.x,
-		outerHeight: original.outerHeight * factor.y,
-		outerWidth: original.outerWidth * factor.x
-	};
-
-	// Fade option to support puff
-	if ( options.fade ) {
-		if ( mode === "show" ) {
-			options.from.opacity = 0;
-			options.to.opacity = 1;
-		}
-		if ( mode === "hide" ) {
-			options.from.opacity = 1;
-			options.to.opacity = 0;
-		}
-	}
-
-	// Animate
-	el.effect( options );
-
-};
-
-$.effects.effect.size = function( o, done ) {
-
-	// Create element
-	var original, baseline, factor,
-		el = $( this ),
-		props0 = [ "position", "top", "bottom", "left", "right", "width", "height", "overflow", "opacity" ],
-
-		// Always restore
-		props1 = [ "position", "top", "bottom", "left", "right", "overflow", "opacity" ],
-
-		// Copy for children
-		props2 = [ "width", "height", "overflow" ],
-		cProps = [ "fontSize" ],
-		vProps = [ "borderTopWidth", "borderBottomWidth", "paddingTop", "paddingBottom" ],
-		hProps = [ "borderLeftWidth", "borderRightWidth", "paddingLeft", "paddingRight" ],
-
-		// Set options
-		mode = $.effects.setMode( el, o.mode || "effect" ),
-		restore = o.restore || mode !== "effect",
-		scale = o.scale || "both",
-		origin = o.origin || [ "middle", "center" ],
-		position = el.css( "position" ),
-		props = restore ? props0 : props1,
-		zero = {
-			height: 0,
-			width: 0,
-			outerHeight: 0,
-			outerWidth: 0
-		};
-
-	if ( mode === "show" ) {
-		el.show();
-	}
-	original = {
-		height: el.height(),
-		width: el.width(),
-		outerHeight: el.outerHeight(),
-		outerWidth: el.outerWidth()
-	};
-
-	if ( o.mode === "toggle" && mode === "show" ) {
-		el.from = o.to || zero;
-		el.to = o.from || original;
-	} else {
-		el.from = o.from || ( mode === "show" ? zero : original );
-		el.to = o.to || ( mode === "hide" ? zero : original );
-	}
-
-	// Set scaling factor
-	factor = {
-		from: {
-			y: el.from.height / original.height,
-			x: el.from.width / original.width
-		},
-		to: {
-			y: el.to.height / original.height,
-			x: el.to.width / original.width
-		}
-	};
-
-	// Scale the css box
-	if ( scale === "box" || scale === "both" ) {
-
-		// Vertical props scaling
-		if ( factor.from.y !== factor.to.y ) {
-			props = props.concat( vProps );
-			el.from = $.effects.setTransition( el, vProps, factor.from.y, el.from );
-			el.to = $.effects.setTransition( el, vProps, factor.to.y, el.to );
-		}
-
-		// Horizontal props scaling
-		if ( factor.from.x !== factor.to.x ) {
-			props = props.concat( hProps );
-			el.from = $.effects.setTransition( el, hProps, factor.from.x, el.from );
-			el.to = $.effects.setTransition( el, hProps, factor.to.x, el.to );
-		}
-	}
-
-	// Scale the content
-	if ( scale === "content" || scale === "both" ) {
-
-		// Vertical props scaling
-		if ( factor.from.y !== factor.to.y ) {
-			props = props.concat( cProps ).concat( props2 );
-			el.from = $.effects.setTransition( el, cProps, factor.from.y, el.from );
-			el.to = $.effects.setTransition( el, cProps, factor.to.y, el.to );
-		}
-	}
-
-	$.effects.save( el, props );
-	el.show();
-	$.effects.createWrapper( el );
-	el.css( "overflow", "hidden" ).css( el.from );
-
-	// Adjust
-	if (origin) { // Calculate baseline shifts
-		baseline = $.effects.getBaseline( origin, original );
-		el.from.top = ( original.outerHeight - el.outerHeight() ) * baseline.y;
-		el.from.left = ( original.outerWidth - el.outerWidth() ) * baseline.x;
-		el.to.top = ( original.outerHeight - el.to.outerHeight ) * baseline.y;
-		el.to.left = ( original.outerWidth - el.to.outerWidth ) * baseline.x;
-	}
-	el.css( el.from ); // set top & left
-
-	// Animate
-	if ( scale === "content" || scale === "both" ) { // Scale the children
-
-		// Add margins/font-size
-		vProps = vProps.concat([ "marginTop", "marginBottom" ]).concat(cProps);
-		hProps = hProps.concat([ "marginLeft", "marginRight" ]);
-		props2 = props0.concat(vProps).concat(hProps);
-
-		el.find( "*[width]" ).each( function(){
-			var child = $( this ),
-				c_original = {
-					height: child.height(),
-					width: child.width(),
-					outerHeight: child.outerHeight(),
-					outerWidth: child.outerWidth()
-				};
-			if (restore) {
-				$.effects.save(child, props2);
-			}
-
-			child.from = {
-				height: c_original.height * factor.from.y,
-				width: c_original.width * factor.from.x,
-				outerHeight: c_original.outerHeight * factor.from.y,
-				outerWidth: c_original.outerWidth * factor.from.x
-			};
-			child.to = {
-				height: c_original.height * factor.to.y,
-				width: c_original.width * factor.to.x,
-				outerHeight: c_original.height * factor.to.y,
-				outerWidth: c_original.width * factor.to.x
-			};
-
-			// Vertical props scaling
-			if ( factor.from.y !== factor.to.y ) {
-				child.from = $.effects.setTransition( child, vProps, factor.from.y, child.from );
-				child.to = $.effects.setTransition( child, vProps, factor.to.y, child.to );
-			}
-
-			// Horizontal props scaling
-			if ( factor.from.x !== factor.to.x ) {
-				child.from = $.effects.setTransition( child, hProps, factor.from.x, child.from );
-				child.to = $.effects.setTransition( child, hProps, factor.to.x, child.to );
-			}
-
-			// Animate children
-			child.css( child.from );
-			child.animate( child.to, o.duration, o.easing, function() {
-
-				// Restore children
-				if ( restore ) {
-					$.effects.restore( child, props2 );
-				}
-			});
-		});
-	}
-
-	// Animate
-	el.animate( el.to, {
-		queue: false,
-		duration: o.duration,
-		easing: o.easing,
-		complete: function() {
-			if ( el.to.opacity === 0 ) {
-				el.css( "opacity", el.from.opacity );
-			}
-			if( mode === "hide" ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			if ( !restore ) {
-
-				// we need to calculate our new positioning based on the scaling
-				if ( position === "static" ) {
-					el.css({
-						position: "relative",
-						top: el.to.top,
-						left: el.to.left
-					});
-				} else {
-					$.each([ "top", "left" ], function( idx, pos ) {
-						el.css( pos, function( _, str ) {
-							var val = parseInt( str, 10 ),
-								toRef = idx ? el.to.left : el.to.top;
-
-							// if original was "auto", recalculate the new value from wrapper
-							if ( str === "auto" ) {
-								return toRef + "px";
-							}
-
-							return val + toRef + "px";
-						});
-					});
-				}
-			}
-
-			$.effects.removeWrapper( el );
-			done();
-		}
-	});
-
-};
-
-})(jQuery);
-(function( $, undefined ) {
-
-$.effects.effect.shake = function( o, done ) {
-
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
-		mode = $.effects.setMode( el, o.mode || "effect" ),
-		direction = o.direction || "left",
-		distance = o.distance || 20,
-		times = o.times || 3,
-		anims = times * 2 + 1,
-		speed = Math.round(o.duration/anims),
-		ref = (direction === "up" || direction === "down") ? "top" : "left",
-		positiveMotion = (direction === "up" || direction === "left"),
-		animation = {},
-		animation1 = {},
-		animation2 = {},
-		i,
-
-		// we will need to re-assemble the queue to stack our animations in place
-		queue = el.queue(),
-		queuelen = queue.length;
-
-	$.effects.save( el, props );
-	el.show();
-	$.effects.createWrapper( el );
-
-	// Animation
-	animation[ ref ] = ( positiveMotion ? "-=" : "+=" ) + distance;
-	animation1[ ref ] = ( positiveMotion ? "+=" : "-=" ) + distance * 2;
-	animation2[ ref ] = ( positiveMotion ? "-=" : "+=" ) + distance * 2;
-
-	// Animate
-	el.animate( animation, speed, o.easing );
-
-	// Shakes
-	for ( i = 1; i < times; i++ ) {
-		el.animate( animation1, speed, o.easing ).animate( animation2, speed, o.easing );
-	}
-	el
-		.animate( animation1, speed, o.easing )
-		.animate( animation, speed / 2, o.easing )
-		.queue(function() {
-			if ( mode === "hide" ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		});
-
-	// inject all the animations we just queued to be first in line (after "inprogress")
-	if ( queuelen > 1) {
-		queue.splice.apply( queue,
-			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
-	}
-	el.dequeue();
-
-};
-
-})(jQuery);
-(function( $, undefined ) {
-
-$.effects.effect.slide = function( o, done ) {
-
-	// Create element
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "width", "height" ],
-		mode = $.effects.setMode( el, o.mode || "show" ),
-		show = mode === "show",
-		direction = o.direction || "left",
-		ref = (direction === "up" || direction === "down") ? "top" : "left",
-		positiveMotion = (direction === "up" || direction === "left"),
-		distance,
-		animation = {};
-
-	// Adjust
-	$.effects.save( el, props );
-	el.show();
-	distance = o.distance || el[ ref === "top" ? "outerHeight" : "outerWidth" ]( true );
-
-	$.effects.createWrapper( el ).css({
-		overflow: "hidden"
-	});
-
-	if ( show ) {
-		el.css( ref, positiveMotion ? (isNaN(distance) ? "-" + distance : -distance) : distance );
-	}
-
-	// Animation
-	animation[ ref ] = ( show ?
-		( positiveMotion ? "+=" : "-=") :
-		( positiveMotion ? "-=" : "+=")) +
-		distance;
-
-	// Animate
-	el.animate( animation, {
-		queue: false,
-		duration: o.duration,
-		easing: o.easing,
-		complete: function() {
-			if ( mode === "hide" ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		}
-	});
-};
-
-})(jQuery);
-(function( $, undefined ) {
-
-$.effects.effect.transfer = function( o, done ) {
-	var elem = $( this ),
-		target = $( o.to ),
-		targetFixed = target.css( "position" ) === "fixed",
-		body = $("body"),
-		fixTop = targetFixed ? body.scrollTop() : 0,
-		fixLeft = targetFixed ? body.scrollLeft() : 0,
-		endPosition = target.offset(),
-		animation = {
-			top: endPosition.top - fixTop ,
-			left: endPosition.left - fixLeft ,
-			height: target.innerHeight(),
-			width: target.innerWidth()
-		},
-		startPosition = elem.offset(),
-		transfer = $( '
      ' )
-			.appendTo( document.body )
-			.addClass( o.className )
-			.css({
-				top: startPosition.top - fixTop ,
-				left: startPosition.left - fixLeft ,
-				height: elem.innerHeight(),
-				width: elem.innerWidth(),
-				position: targetFixed ? "fixed" : "absolute"
-			})
-			.animate( animation, o.duration, o.easing, function() {
-				transfer.remove();
-				done();
-			});
-};
-
-})(jQuery);
-(function( $, undefined ) {
-
-var mouseHandled = false;
-
-$.widget( "ui.menu", {
-	version: "1.9.2",
-	defaultElement: "
        ",
-	delay: 300,
-	options: {
-		icons: {
-			submenu: "ui-icon-carat-1-e"
-		},
-		menus: "ul",
-		position: {
-			my: "left top",
-			at: "right top"
-		},
-		role: "menu",
-
-		// callbacks
-		blur: null,
-		focus: null,
-		select: null
-	},
-
-	_create: function() {
-		this.activeMenu = this.element;
-		this.element
-			.uniqueId()
-			.addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" )
-			.toggleClass( "ui-menu-icons", !!this.element.find( ".ui-icon" ).length )
-			.attr({
-				role: this.options.role,
-				tabIndex: 0
-			})
-			// need to catch all clicks on disabled menu
-			// not possible through _on
-			.bind( "click" + this.eventNamespace, $.proxy(function( event ) {
-				if ( this.options.disabled ) {
-					event.preventDefault();
-				}
-			}, this ));
-
-		if ( this.options.disabled ) {
-			this.element
-				.addClass( "ui-state-disabled" )
-				.attr( "aria-disabled", "true" );
-		}
-
-		this._on({
-			// Prevent focus from sticking to links inside menu after clicking
-			// them (focus should always stay on UL during navigation).
-			"mousedown .ui-menu-item > a": function( event ) {
-				event.preventDefault();
-			},
-			"click .ui-state-disabled > a": function( event ) {
-				event.preventDefault();
-			},
-			"click .ui-menu-item:has(a)": function( event ) {
-				var target = $( event.target ).closest( ".ui-menu-item" );
-				if ( !mouseHandled && target.not( ".ui-state-disabled" ).length ) {
-					mouseHandled = true;
-
-					this.select( event );
-					// Open submenu on click
-					if ( target.has( ".ui-menu" ).length ) {
-						this.expand( event );
-					} else if ( !this.element.is( ":focus" ) ) {
-						// Redirect focus to the menu
-						this.element.trigger( "focus", [ true ] );
-
-						// If the active item is on the top level, let it stay active.
-						// Otherwise, blur the active item since it is no longer visible.
-						if ( this.active && this.active.parents( ".ui-menu" ).length === 1 ) {
-							clearTimeout( this.timer );
-						}
-					}
-				}
-			},
-			"mouseenter .ui-menu-item": function( event ) {
-				var target = $( event.currentTarget );
-				// Remove ui-state-active class from siblings of the newly focused menu item
-				// to avoid a jump caused by adjacent elements both having a class with a border
-				target.siblings().children( ".ui-state-active" ).removeClass( "ui-state-active" );
-				this.focus( event, target );
-			},
-			mouseleave: "collapseAll",
-			"mouseleave .ui-menu": "collapseAll",
-			focus: function( event, keepActiveItem ) {
-				// If there's already an active item, keep it active
-				// If not, activate the first item
-				var item = this.active || this.element.children( ".ui-menu-item" ).eq( 0 );
-
-				if ( !keepActiveItem ) {
-					this.focus( event, item );
-				}
-			},
-			blur: function( event ) {
-				this._delay(function() {
-					if ( !$.contains( this.element[0], this.document[0].activeElement ) ) {
-						this.collapseAll( event );
-					}
-				});
-			},
-			keydown: "_keydown"
-		});
-
-		this.refresh();
-
-		// Clicks outside of a menu collapse any open menus
-		this._on( this.document, {
-			click: function( event ) {
-				if ( !$( event.target ).closest( ".ui-menu" ).length ) {
-					this.collapseAll( event );
-				}
-
-				// Reset the mouseHandled flag
-				mouseHandled = false;
-			}
-		});
-	},
-
-	_destroy: function() {
-		// Destroy (sub)menus
-		this.element
-			.removeAttr( "aria-activedescendant" )
-			.find( ".ui-menu" ).andSelf()
-				.removeClass( "ui-menu ui-widget ui-widget-content ui-corner-all ui-menu-icons" )
-				.removeAttr( "role" )
-				.removeAttr( "tabIndex" )
-				.removeAttr( "aria-labelledby" )
-				.removeAttr( "aria-expanded" )
-				.removeAttr( "aria-hidden" )
-				.removeAttr( "aria-disabled" )
-				.removeUniqueId()
-				.show();
-
-		// Destroy menu items
-		this.element.find( ".ui-menu-item" )
-			.removeClass( "ui-menu-item" )
-			.removeAttr( "role" )
-			.removeAttr( "aria-disabled" )
-			.children( "a" )
-				.removeUniqueId()
-				.removeClass( "ui-corner-all ui-state-hover" )
-				.removeAttr( "tabIndex" )
-				.removeAttr( "role" )
-				.removeAttr( "aria-haspopup" )
-				.children().each( function() {
-					var elem = $( this );
-					if ( elem.data( "ui-menu-submenu-carat" ) ) {
-						elem.remove();
-					}
-				});
-
-		// Destroy menu dividers
-		this.element.find( ".ui-menu-divider" ).removeClass( "ui-menu-divider ui-widget-content" );
-	},
-
-	_keydown: function( event ) {
-		var match, prev, character, skip, regex,
-			preventDefault = true;
-
-		function escape( value ) {
-			return value.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" );
-		}
-
-		switch ( event.keyCode ) {
-		case $.ui.keyCode.PAGE_UP:
-			this.previousPage( event );
-			break;
-		case $.ui.keyCode.PAGE_DOWN:
-			this.nextPage( event );
-			break;
-		case $.ui.keyCode.HOME:
-			this._move( "first", "first", event );
-			break;
-		case $.ui.keyCode.END:
-			this._move( "last", "last", event );
-			break;
-		case $.ui.keyCode.UP:
-			this.previous( event );
-			break;
-		case $.ui.keyCode.DOWN:
-			this.next( event );
-			break;
-		case $.ui.keyCode.LEFT:
-			this.collapse( event );
-			break;
-		case $.ui.keyCode.RIGHT:
-			if ( this.active && !this.active.is( ".ui-state-disabled" ) ) {
-				this.expand( event );
-			}
-			break;
-		case $.ui.keyCode.ENTER:
-		case $.ui.keyCode.SPACE:
-			this._activate( event );
-			break;
-		case $.ui.keyCode.ESCAPE:
-			this.collapse( event );
-			break;
-		default:
-			preventDefault = false;
-			prev = this.previousFilter || "";
-			character = String.fromCharCode( event.keyCode );
-			skip = false;
-
-			clearTimeout( this.filterTimer );
-
-			if ( character === prev ) {
-				skip = true;
-			} else {
-				character = prev + character;
-			}
-
-			regex = new RegExp( "^" + escape( character ), "i" );
-			match = this.activeMenu.children( ".ui-menu-item" ).filter(function() {
-				return regex.test( $( this ).children( "a" ).text() );
-			});
-			match = skip && match.index( this.active.next() ) !== -1 ?
-				this.active.nextAll( ".ui-menu-item" ) :
-				match;
-
-			// If no matches on the current filter, reset to the last character pressed
-			// to move down the menu to the first item that starts with that character
-			if ( !match.length ) {
-				character = String.fromCharCode( event.keyCode );
-				regex = new RegExp( "^" + escape( character ), "i" );
-				match = this.activeMenu.children( ".ui-menu-item" ).filter(function() {
-					return regex.test( $( this ).children( "a" ).text() );
-				});
-			}
-
-			if ( match.length ) {
-				this.focus( event, match );
-				if ( match.length > 1 ) {
-					this.previousFilter = character;
-					this.filterTimer = this._delay(function() {
-						delete this.previousFilter;
-					}, 1000 );
-				} else {
-					delete this.previousFilter;
-				}
-			} else {
-				delete this.previousFilter;
-			}
-		}
-
-		if ( preventDefault ) {
-			event.preventDefault();
-		}
-	},
-
-	_activate: function( event ) {
-		if ( !this.active.is( ".ui-state-disabled" ) ) {
-			if ( this.active.children( "a[aria-haspopup='true']" ).length ) {
-				this.expand( event );
-			} else {
-				this.select( event );
-			}
-		}
-	},
-
-	refresh: function() {
-		var menus,
-			icon = this.options.icons.submenu,
-			submenus = this.element.find( this.options.menus );
-
-		// Initialize nested menus
-		submenus.filter( ":not(.ui-menu)" )
-			.addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" )
-			.hide()
-			.attr({
-				role: this.options.role,
-				"aria-hidden": "true",
-				"aria-expanded": "false"
-			})
-			.each(function() {
-				var menu = $( this ),
-					item = menu.prev( "a" ),
-					submenuCarat = $( "" )
-						.addClass( "ui-menu-icon ui-icon " + icon )
-						.data( "ui-menu-submenu-carat", true );
-
-				item
-					.attr( "aria-haspopup", "true" )
-					.prepend( submenuCarat );
-				menu.attr( "aria-labelledby", item.attr( "id" ) );
-			});
-
-		menus = submenus.add( this.element );
-
-		// Don't refresh list items that are already adapted
-		menus.children( ":not(.ui-menu-item):has(a)" )
-			.addClass( "ui-menu-item" )
-			.attr( "role", "presentation" )
-			.children( "a" )
-				.uniqueId()
-				.addClass( "ui-corner-all" )
-				.attr({
-					tabIndex: -1,
-					role: this._itemRole()
-				});
-
-		// Initialize unlinked menu-items containing spaces and/or dashes only as dividers
-		menus.children( ":not(.ui-menu-item)" ).each(function() {
-			var item = $( this );
-			// hyphen, em dash, en dash
-			if ( !/[^\-—–\s]/.test( item.text() ) ) {
-				item.addClass( "ui-widget-content ui-menu-divider" );
-			}
-		});
-
-		// Add aria-disabled attribute to any disabled menu item
-		menus.children( ".ui-state-disabled" ).attr( "aria-disabled", "true" );
-
-		// If the active item has been removed, blur the menu
-		if ( this.active && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) {
-			this.blur();
-		}
-	},
-
-	_itemRole: function() {
-		return {
-			menu: "menuitem",
-			listbox: "option"
-		}[ this.options.role ];
-	},
-
-	focus: function( event, item ) {
-		var nested, focused;
-		this.blur( event, event && event.type === "focus" );
-
-		this._scrollIntoView( item );
-
-		this.active = item.first();
-		focused = this.active.children( "a" ).addClass( "ui-state-focus" );
-		// Only update aria-activedescendant if there's a role
-		// otherwise we assume focus is managed elsewhere
-		if ( this.options.role ) {
-			this.element.attr( "aria-activedescendant", focused.attr( "id" ) );
-		}
-
-		// Highlight active parent menu item, if any
-		this.active
-			.parent()
-			.closest( ".ui-menu-item" )
-			.children( "a:first" )
-			.addClass( "ui-state-active" );
-
-		if ( event && event.type === "keydown" ) {
-			this._close();
-		} else {
-			this.timer = this._delay(function() {
-				this._close();
-			}, this.delay );
-		}
-
-		nested = item.children( ".ui-menu" );
-		if ( nested.length && ( /^mouse/.test( event.type ) ) ) {
-			this._startOpening(nested);
-		}
-		this.activeMenu = item.parent();
-
-		this._trigger( "focus", event, { item: item } );
-	},
-
-	_scrollIntoView: function( item ) {
-		var borderTop, paddingTop, offset, scroll, elementHeight, itemHeight;
-		if ( this._hasScroll() ) {
-			borderTop = parseFloat( $.css( this.activeMenu[0], "borderTopWidth" ) ) || 0;
-			paddingTop = parseFloat( $.css( this.activeMenu[0], "paddingTop" ) ) || 0;
-			offset = item.offset().top - this.activeMenu.offset().top - borderTop - paddingTop;
-			scroll = this.activeMenu.scrollTop();
-			elementHeight = this.activeMenu.height();
-			itemHeight = item.height();
-
-			if ( offset < 0 ) {
-				this.activeMenu.scrollTop( scroll + offset );
-			} else if ( offset + itemHeight > elementHeight ) {
-				this.activeMenu.scrollTop( scroll + offset - elementHeight + itemHeight );
-			}
-		}
-	},
-
-	blur: function( event, fromFocus ) {
-		if ( !fromFocus ) {
-			clearTimeout( this.timer );
-		}
-
-		if ( !this.active ) {
-			return;
-		}
-
-		this.active.children( "a" ).removeClass( "ui-state-focus" );
-		this.active = null;
-
-		this._trigger( "blur", event, { item: this.active } );
-	},
-
-	_startOpening: function( submenu ) {
-		clearTimeout( this.timer );
-
-		// Don't open if already open fixes a Firefox bug that caused a .5 pixel
-		// shift in the submenu position when mousing over the carat icon
-		if ( submenu.attr( "aria-hidden" ) !== "true" ) {
-			return;
-		}
-
-		this.timer = this._delay(function() {
-			this._close();
-			this._open( submenu );
-		}, this.delay );
-	},
-
-	_open: function( submenu ) {
-		var position = $.extend({
-			of: this.active
-		}, this.options.position );
-
-		clearTimeout( this.timer );
-		this.element.find( ".ui-menu" ).not( submenu.parents( ".ui-menu" ) )
-			.hide()
-			.attr( "aria-hidden", "true" );
-
-		submenu
-			.show()
-			.removeAttr( "aria-hidden" )
-			.attr( "aria-expanded", "true" )
-			.position( position );
-	},
-
-	collapseAll: function( event, all ) {
-		clearTimeout( this.timer );
-		this.timer = this._delay(function() {
-			// If we were passed an event, look for the submenu that contains the event
-			var currentMenu = all ? this.element :
-				$( event && event.target ).closest( this.element.find( ".ui-menu" ) );
-
-			// If we found no valid submenu ancestor, use the main menu to close all sub menus anyway
-			if ( !currentMenu.length ) {
-				currentMenu = this.element;
-			}
-
-			this._close( currentMenu );
-
-			this.blur( event );
-			this.activeMenu = currentMenu;
-		}, this.delay );
-	},
-
-	// With no arguments, closes the currently active menu - if nothing is active
-	// it closes all menus.  If passed an argument, it will search for menus BELOW
-	_close: function( startMenu ) {
-		if ( !startMenu ) {
-			startMenu = this.active ? this.active.parent() : this.element;
-		}
-
-		startMenu
-			.find( ".ui-menu" )
-				.hide()
-				.attr( "aria-hidden", "true" )
-				.attr( "aria-expanded", "false" )
-			.end()
-			.find( "a.ui-state-active" )
-				.removeClass( "ui-state-active" );
-	},
-
-	collapse: function( event ) {
-		var newItem = this.active &&
-			this.active.parent().closest( ".ui-menu-item", this.element );
-		if ( newItem && newItem.length ) {
-			this._close();
-			this.focus( event, newItem );
-		}
-	},
-
-	expand: function( event ) {
-		var newItem = this.active &&
-			this.active
-				.children( ".ui-menu " )
-				.children( ".ui-menu-item" )
-				.first();
-
-		if ( newItem && newItem.length ) {
-			this._open( newItem.parent() );
-
-			// Delay so Firefox will not hide activedescendant change in expanding submenu from AT
-			this._delay(function() {
-				this.focus( event, newItem );
-			});
-		}
-	},
-
-	next: function( event ) {
-		this._move( "next", "first", event );
-	},
-
-	previous: function( event ) {
-		this._move( "prev", "last", event );
-	},
-
-	isFirstItem: function() {
-		return this.active && !this.active.prevAll( ".ui-menu-item" ).length;
-	},
-
-	isLastItem: function() {
-		return this.active && !this.active.nextAll( ".ui-menu-item" ).length;
-	},
-
-	_move: function( direction, filter, event ) {
-		var next;
-		if ( this.active ) {
-			if ( direction === "first" || direction === "last" ) {
-				next = this.active
-					[ direction === "first" ? "prevAll" : "nextAll" ]( ".ui-menu-item" )
-					.eq( -1 );
-			} else {
-				next = this.active
-					[ direction + "All" ]( ".ui-menu-item" )
-					.eq( 0 );
-			}
-		}
-		if ( !next || !next.length || !this.active ) {
-			next = this.activeMenu.children( ".ui-menu-item" )[ filter ]();
-		}
-
-		this.focus( event, next );
-	},
-
-	nextPage: function( event ) {
-		var item, base, height;
-
-		if ( !this.active ) {
-			this.next( event );
-			return;
-		}
-		if ( this.isLastItem() ) {
-			return;
-		}
-		if ( this._hasScroll() ) {
-			base = this.active.offset().top;
-			height = this.element.height();
-			this.active.nextAll( ".ui-menu-item" ).each(function() {
-				item = $( this );
-				return item.offset().top - base - height < 0;
-			});
-
-			this.focus( event, item );
-		} else {
-			this.focus( event, this.activeMenu.children( ".ui-menu-item" )
-				[ !this.active ? "first" : "last" ]() );
-		}
-	},
-
-	previousPage: function( event ) {
-		var item, base, height;
-		if ( !this.active ) {
-			this.next( event );
-			return;
-		}
-		if ( this.isFirstItem() ) {
-			return;
-		}
-		if ( this._hasScroll() ) {
-			base = this.active.offset().top;
-			height = this.element.height();
-			this.active.prevAll( ".ui-menu-item" ).each(function() {
-				item = $( this );
-				return item.offset().top - base + height > 0;
-			});
-
-			this.focus( event, item );
-		} else {
-			this.focus( event, this.activeMenu.children( ".ui-menu-item" ).first() );
-		}
-	},
-
-	_hasScroll: function() {
-		return this.element.outerHeight() < this.element.prop( "scrollHeight" );
-	},
-
-	select: function( event ) {
-		// TODO: It should never be possible to not have an active item at this
-		// point, but the tests don't trigger mouseenter before click.
-		this.active = this.active || $( event.target ).closest( ".ui-menu-item" );
-		var ui = { item: this.active };
-		if ( !this.active.has( ".ui-menu" ).length ) {
-			this.collapseAll( event, true );
-		}
-		this._trigger( "select", event, ui );
-	}
-});
-
-}( jQuery ));
-(function( $, undefined ) {
-
-$.widget( "ui.progressbar", {
-	version: "1.9.2",
-	options: {
-		value: 0,
-		max: 100
-	},
-
-	min: 0,
-
-	_create: function() {
-		this.element
-			.addClass( "ui-progressbar ui-widget ui-widget-content ui-corner-all" )
-			.attr({
-				role: "progressbar",
-				"aria-valuemin": this.min,
-				"aria-valuemax": this.options.max,
-				"aria-valuenow": this._value()
-			});
-
-		this.valueDiv = $( "
        " )
-			.appendTo( this.element );
-
-		this.oldValue = this._value();
-		this._refreshValue();
-	},
-
-	_destroy: function() {
-		this.element
-			.removeClass( "ui-progressbar ui-widget ui-widget-content ui-corner-all" )
-			.removeAttr( "role" )
-			.removeAttr( "aria-valuemin" )
-			.removeAttr( "aria-valuemax" )
-			.removeAttr( "aria-valuenow" );
-
-		this.valueDiv.remove();
-	},
-
-	value: function( newValue ) {
-		if ( newValue === undefined ) {
-			return this._value();
-		}
-
-		this._setOption( "value", newValue );
-		return this;
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "value" ) {
-			this.options.value = value;
-			this._refreshValue();
-			if ( this._value() === this.options.max ) {
-				this._trigger( "complete" );
-			}
-		}
-
-		this._super( key, value );
-	},
-
-	_value: function() {
-		var val = this.options.value;
-		// normalize invalid value
-		if ( typeof val !== "number" ) {
-			val = 0;
-		}
-		return Math.min( this.options.max, Math.max( this.min, val ) );
-	},
-
-	_percentage: function() {
-		return 100 * this._value() / this.options.max;
-	},
-
-	_refreshValue: function() {
-		var value = this.value(),
-			percentage = this._percentage();
-
-		if ( this.oldValue !== value ) {
-			this.oldValue = value;
-			this._trigger( "change" );
-		}
-
-		this.valueDiv
-			.toggle( value > this.min )
-			.toggleClass( "ui-corner-right", value === this.options.max )
-			.width( percentage.toFixed(0) + "%" );
-		this.element.attr( "aria-valuenow", value );
-	}
-});
-
-})( jQuery );
-(function( $, undefined ) {
-
-$.widget("ui.resizable", $.ui.mouse, {
-	version: "1.9.2",
-	widgetEventPrefix: "resize",
-	options: {
-		alsoResize: false,
-		animate: false,
-		animateDuration: "slow",
-		animateEasing: "swing",
-		aspectRatio: false,
-		autoHide: false,
-		containment: false,
-		ghost: false,
-		grid: false,
-		handles: "e,s,se",
-		helper: false,
-		maxHeight: null,
-		maxWidth: null,
-		minHeight: 10,
-		minWidth: 10,
-		zIndex: 1000
-	},
-	_create: function() {
-
-		var that = this, o = this.options;
-		this.element.addClass("ui-resizable");
-
-		$.extend(this, {
-			_aspectRatio: !!(o.aspectRatio),
-			aspectRatio: o.aspectRatio,
-			originalElement: this.element,
-			_proportionallyResizeElements: [],
-			_helper: o.helper || o.ghost || o.animate ? o.helper || 'ui-resizable-helper' : null
-		});
-
-		//Wrap the element if it cannot hold child nodes
-		if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)) {
-
-			//Create a wrapper element and set the wrapper to the new current internal element
-			this.element.wrap(
-				$('
        ').css({
-					position: this.element.css('position'),
-					width: this.element.outerWidth(),
-					height: this.element.outerHeight(),
-					top: this.element.css('top'),
-					left: this.element.css('left')
-				})
-			);
-
-			//Overwrite the original this.element
-			this.element = this.element.parent().data(
-				"resizable", this.element.data('resizable')
-			);
-
-			this.elementIsWrapper = true;
-
-			//Move margins to the wrapper
-			this.element.css({ marginLeft: this.originalElement.css("marginLeft"), marginTop: this.originalElement.css("marginTop"), marginRight: this.originalElement.css("marginRight"), marginBottom: this.originalElement.css("marginBottom") });
-			this.originalElement.css({ marginLeft: 0, marginTop: 0, marginRight: 0, marginBottom: 0});
-
-			//Prevent Safari textarea resize
-			this.originalResizeStyle = this.originalElement.css('resize');
-			this.originalElement.css('resize', 'none');
-
-			//Push the actual element to our proportionallyResize internal array
-			this._proportionallyResizeElements.push(this.originalElement.css({ position: 'static', zoom: 1, display: 'block' }));
-
-			// avoid IE jump (hard set the margin)
-			this.originalElement.css({ margin: this.originalElement.css('margin') });
-
-			// fix handlers offset
-			this._proportionallyResize();
-
-		}
-
-		this.handles = o.handles || (!$('.ui-resizable-handle', this.element).length ? "e,s,se" : { n: '.ui-resizable-n', e: '.ui-resizable-e', s: '.ui-resizable-s', w: '.ui-resizable-w', se: '.ui-resizable-se', sw: '.ui-resizable-sw', ne: '.ui-resizable-ne', nw: '.ui-resizable-nw' });
-		if(this.handles.constructor == String) {
-
-			if(this.handles == 'all') this.handles = 'n,e,s,w,se,sw,ne,nw';
-			var n = this.handles.split(","); this.handles = {};
-
-			for(var i = 0; i < n.length; i++) {
-
-				var handle = $.trim(n[i]), hname = 'ui-resizable-'+handle;
-				var axis = $('
        ');
-
-				// Apply zIndex to all handles - see #7960
-				axis.css({ zIndex: o.zIndex });
-
-				//TODO : What's going on here?
-				if ('se' == handle) {
-					axis.addClass('ui-icon ui-icon-gripsmall-diagonal-se');
-				};
-
-				//Insert into internal handles object and append to element
-				this.handles[handle] = '.ui-resizable-'+handle;
-				this.element.append(axis);
-			}
-
-		}
-
-		this._renderAxis = function(target) {
-
-			target = target || this.element;
-
-			for(var i in this.handles) {
-
-				if(this.handles[i].constructor == String)
-					this.handles[i] = $(this.handles[i], this.element).show();
-
-				//Apply pad to wrapper element, needed to fix axis position (textarea, inputs, scrolls)
-				if (this.elementIsWrapper && this.originalElement[0].nodeName.match(/textarea|input|select|button/i)) {
-
-					var axis = $(this.handles[i], this.element), padWrapper = 0;
-
-					//Checking the correct pad and border
-					padWrapper = /sw|ne|nw|se|n|s/.test(i) ? axis.outerHeight() : axis.outerWidth();
-
-					//The padding type i have to apply...
-					var padPos = [ 'padding',
-						/ne|nw|n/.test(i) ? 'Top' :
-						/se|sw|s/.test(i) ? 'Bottom' :
-						/^e$/.test(i) ? 'Right' : 'Left' ].join("");
-
-					target.css(padPos, padWrapper);
-
-					this._proportionallyResize();
-
-				}
-
-				//TODO: What's that good for? There's not anything to be executed left
-				if(!$(this.handles[i]).length)
-					continue;
-
-			}
-		};
-
-		//TODO: make renderAxis a prototype function
-		this._renderAxis(this.element);
-
-		this._handles = $('.ui-resizable-handle', this.element)
-			.disableSelection();
-
-		//Matching axis name
-		this._handles.mouseover(function() {
-			if (!that.resizing) {
-				if (this.className)
-					var axis = this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);
-				//Axis, default = se
-				that.axis = axis && axis[1] ? axis[1] : 'se';
-			}
-		});
-
-		//If we want to auto hide the elements
-		if (o.autoHide) {
-			this._handles.hide();
-			$(this.element)
-				.addClass("ui-resizable-autohide")
-				.mouseenter(function() {
-					if (o.disabled) return;
-					$(this).removeClass("ui-resizable-autohide");
-					that._handles.show();
-				})
-				.mouseleave(function(){
-					if (o.disabled) return;
-					if (!that.resizing) {
-						$(this).addClass("ui-resizable-autohide");
-						that._handles.hide();
-					}
-				});
-		}
-
-		//Initialize the mouse interaction
-		this._mouseInit();
-
-	},
-
-	_destroy: function() {
-
-		this._mouseDestroy();
-
-		var _destroy = function(exp) {
-			$(exp).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing")
-				.removeData("resizable").removeData("ui-resizable").unbind(".resizable").find('.ui-resizable-handle').remove();
-		};
-
-		//TODO: Unwrap at same DOM position
-		if (this.elementIsWrapper) {
-			_destroy(this.element);
-			var wrapper = this.element;
-			this.originalElement.css({
-				position: wrapper.css('position'),
-				width: wrapper.outerWidth(),
-				height: wrapper.outerHeight(),
-				top: wrapper.css('top'),
-				left: wrapper.css('left')
-			}).insertAfter( wrapper );
-			wrapper.remove();
-		}
-
-		this.originalElement.css('resize', this.originalResizeStyle);
-		_destroy(this.originalElement);
-
-		return this;
-	},
-
-	_mouseCapture: function(event) {
-		var handle = false;
-		for (var i in this.handles) {
-			if ($(this.handles[i])[0] == event.target) {
-				handle = true;
-			}
-		}
-
-		return !this.options.disabled && handle;
-	},
-
-	_mouseStart: function(event) {
-
-		var o = this.options, iniPos = this.element.position(), el = this.element;
-
-		this.resizing = true;
-		this.documentScroll = { top: $(document).scrollTop(), left: $(document).scrollLeft() };
-
-		// bugfix for http://dev.jquery.com/ticket/1749
-		if (el.is('.ui-draggable') || (/absolute/).test(el.css('position'))) {
-			el.css({ position: 'absolute', top: iniPos.top, left: iniPos.left });
-		}
-
-		this._renderProxy();
-
-		var curleft = num(this.helper.css('left')), curtop = num(this.helper.css('top'));
-
-		if (o.containment) {
-			curleft += $(o.containment).scrollLeft() || 0;
-			curtop += $(o.containment).scrollTop() || 0;
-		}
-
-		//Store needed variables
-		this.offset = this.helper.offset();
-		this.position = { left: curleft, top: curtop };
-		this.size = this._helper ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
-		this.originalSize = this._helper ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
-		this.originalPosition = { left: curleft, top: curtop };
-		this.sizeDiff = { width: el.outerWidth() - el.width(), height: el.outerHeight() - el.height() };
-		this.originalMousePosition = { left: event.pageX, top: event.pageY };
-
-		//Aspect Ratio
-		this.aspectRatio = (typeof o.aspectRatio == 'number') ? o.aspectRatio : ((this.originalSize.width / this.originalSize.height) || 1);
-
-		var cursor = $('.ui-resizable-' + this.axis).css('cursor');
-		$('body').css('cursor', cursor == 'auto' ? this.axis + '-resize' : cursor);
-
-		el.addClass("ui-resizable-resizing");
-		this._propagate("start", event);
-		return true;
-	},
-
-	_mouseDrag: function(event) {
-
-		//Increase performance, avoid regex
-		var el = this.helper, o = this.options, props = {},
-			that = this, smp = this.originalMousePosition, a = this.axis;
-
-		var dx = (event.pageX-smp.left)||0, dy = (event.pageY-smp.top)||0;
-		var trigger = this._change[a];
-		if (!trigger) return false;
-
-		// Calculate the attrs that will be change
-		var data = trigger.apply(this, [event, dx, dy]);
-
-		// Put this in the mouseDrag handler since the user can start pressing shift while resizing
-		this._updateVirtualBoundaries(event.shiftKey);
-		if (this._aspectRatio || event.shiftKey)
-			data = this._updateRatio(data, event);
-
-		data = this._respectSize(data, event);
-
-		// plugins callbacks need to be called first
-		this._propagate("resize", event);
-
-		el.css({
-			top: this.position.top + "px", left: this.position.left + "px",
-			width: this.size.width + "px", height: this.size.height + "px"
-		});
-
-		if (!this._helper && this._proportionallyResizeElements.length)
-			this._proportionallyResize();
-
-		this._updateCache(data);
-
-		// calling the user callback at the end
-		this._trigger('resize', event, this.ui());
-
-		return false;
-	},
-
-	_mouseStop: function(event) {
-
-		this.resizing = false;
-		var o = this.options, that = this;
-
-		if(this._helper) {
-			var pr = this._proportionallyResizeElements, ista = pr.length && (/textarea/i).test(pr[0].nodeName),
-				soffseth = ista && $.ui.hasScroll(pr[0], 'left') /* TODO - jump height */ ? 0 : that.sizeDiff.height,
-				soffsetw = ista ? 0 : that.sizeDiff.width;
-
-			var s = { width: (that.helper.width()  - soffsetw), height: (that.helper.height() - soffseth) },
-				left = (parseInt(that.element.css('left'), 10) + (that.position.left - that.originalPosition.left)) || null,
-				top = (parseInt(that.element.css('top'), 10) + (that.position.top - that.originalPosition.top)) || null;
-
-			if (!o.animate)
-				this.element.css($.extend(s, { top: top, left: left }));
-
-			that.helper.height(that.size.height);
-			that.helper.width(that.size.width);
-
-			if (this._helper && !o.animate) this._proportionallyResize();
-		}
-
-		$('body').css('cursor', 'auto');
-
-		this.element.removeClass("ui-resizable-resizing");
-
-		this._propagate("stop", event);
-
-		if (this._helper) this.helper.remove();
-		return false;
-
-	},
-
-	_updateVirtualBoundaries: function(forceAspectRatio) {
-		var o = this.options, pMinWidth, pMaxWidth, pMinHeight, pMaxHeight, b;
-
-		b = {
-			minWidth: isNumber(o.minWidth) ? o.minWidth : 0,
-			maxWidth: isNumber(o.maxWidth) ? o.maxWidth : Infinity,
-			minHeight: isNumber(o.minHeight) ? o.minHeight : 0,
-			maxHeight: isNumber(o.maxHeight) ? o.maxHeight : Infinity
-		};
-
-		if(this._aspectRatio || forceAspectRatio) {
-			// We want to create an enclosing box whose aspect ration is the requested one
-			// First, compute the "projected" size for each dimension based on the aspect ratio and other dimension
-			pMinWidth = b.minHeight * this.aspectRatio;
-			pMinHeight = b.minWidth / this.aspectRatio;
-			pMaxWidth = b.maxHeight * this.aspectRatio;
-			pMaxHeight = b.maxWidth / this.aspectRatio;
-
-			if(pMinWidth > b.minWidth) b.minWidth = pMinWidth;
-			if(pMinHeight > b.minHeight) b.minHeight = pMinHeight;
-			if(pMaxWidth < b.maxWidth) b.maxWidth = pMaxWidth;
-			if(pMaxHeight < b.maxHeight) b.maxHeight = pMaxHeight;
-		}
-		this._vBoundaries = b;
-	},
-
-	_updateCache: function(data) {
-		var o = this.options;
-		this.offset = this.helper.offset();
-		if (isNumber(data.left)) this.position.left = data.left;
-		if (isNumber(data.top)) this.position.top = data.top;
-		if (isNumber(data.height)) this.size.height = data.height;
-		if (isNumber(data.width)) this.size.width = data.width;
-	},
-
-	_updateRatio: function(data, event) {
-
-		var o = this.options, cpos = this.position, csize = this.size, a = this.axis;
-
-		if (isNumber(data.height)) data.width = (data.height * this.aspectRatio);
-		else if (isNumber(data.width)) data.height = (data.width / this.aspectRatio);
-
-		if (a == 'sw') {
-			data.left = cpos.left + (csize.width - data.width);
-			data.top = null;
-		}
-		if (a == 'nw') {
-			data.top = cpos.top + (csize.height - data.height);
-			data.left = cpos.left + (csize.width - data.width);
-		}
-
-		return data;
-	},
-
-	_respectSize: function(data, event) {
-
-		var el = this.helper, o = this._vBoundaries, pRatio = this._aspectRatio || event.shiftKey, a = this.axis,
-				ismaxw = isNumber(data.width) && o.maxWidth && (o.maxWidth < data.width), ismaxh = isNumber(data.height) && o.maxHeight && (o.maxHeight < data.height),
-					isminw = isNumber(data.width) && o.minWidth && (o.minWidth > data.width), isminh = isNumber(data.height) && o.minHeight && (o.minHeight > data.height);
-
-		if (isminw) data.width = o.minWidth;
-		if (isminh) data.height = o.minHeight;
-		if (ismaxw) data.width = o.maxWidth;
-		if (ismaxh) data.height = o.maxHeight;
-
-		var dw = this.originalPosition.left + this.originalSize.width, dh = this.position.top + this.size.height;
-		var cw = /sw|nw|w/.test(a), ch = /nw|ne|n/.test(a);
-
-		if (isminw && cw) data.left = dw - o.minWidth;
-		if (ismaxw && cw) data.left = dw - o.maxWidth;
-		if (isminh && ch)	data.top = dh - o.minHeight;
-		if (ismaxh && ch)	data.top = dh - o.maxHeight;
-
-		// fixing jump error on top/left - bug #2330
-		var isNotwh = !data.width && !data.height;
-		if (isNotwh && !data.left && data.top) data.top = null;
-		else if (isNotwh && !data.top && data.left) data.left = null;
-
-		return data;
-	},
-
-	_proportionallyResize: function() {
-
-		var o = this.options;
-		if (!this._proportionallyResizeElements.length) return;
-		var element = this.helper || this.element;
-
-		for (var i=0; i < this._proportionallyResizeElements.length; i++) {
-
-			var prel = this._proportionallyResizeElements[i];
-
-			if (!this.borderDif) {
-				var b = [prel.css('borderTopWidth'), prel.css('borderRightWidth'), prel.css('borderBottomWidth'), prel.css('borderLeftWidth')],
-					p = [prel.css('paddingTop'), prel.css('paddingRight'), prel.css('paddingBottom'), prel.css('paddingLeft')];
-
-				this.borderDif = $.map(b, function(v, i) {
-					var border = parseInt(v,10)||0, padding = parseInt(p[i],10)||0;
-					return border + padding;
-				});
-			}
-
-			prel.css({
-				height: (element.height() - this.borderDif[0] - this.borderDif[2]) || 0,
-				width: (element.width() - this.borderDif[1] - this.borderDif[3]) || 0
-			});
-
-		};
-
-	},
-
-	_renderProxy: function() {
-
-		var el = this.element, o = this.options;
-		this.elementOffset = el.offset();
-
-		if(this._helper) {
-
-			this.helper = this.helper || $('
        ');
-
-			// fix ie6 offset TODO: This seems broken
-			var ie6offset = ($.ui.ie6 ? 1 : 0),
-			pxyoffset = ( $.ui.ie6 ? 2 : -1 );
-
-			this.helper.addClass(this._helper).css({
-				width: this.element.outerWidth() + pxyoffset,
-				height: this.element.outerHeight() + pxyoffset,
-				position: 'absolute',
-				left: this.elementOffset.left - ie6offset +'px',
-				top: this.elementOffset.top - ie6offset +'px',
-				zIndex: ++o.zIndex //TODO: Don't modify option
-			});
-
-			this.helper
-				.appendTo("body")
-				.disableSelection();
-
-		} else {
-			this.helper = this.element;
-		}
-
-	},
-
-	_change: {
-		e: function(event, dx, dy) {
-			return { width: this.originalSize.width + dx };
-		},
-		w: function(event, dx, dy) {
-			var o = this.options, cs = this.originalSize, sp = this.originalPosition;
-			return { left: sp.left + dx, width: cs.width - dx };
-		},
-		n: function(event, dx, dy) {
-			var o = this.options, cs = this.originalSize, sp = this.originalPosition;
-			return { top: sp.top + dy, height: cs.height - dy };
-		},
-		s: function(event, dx, dy) {
-			return { height: this.originalSize.height + dy };
-		},
-		se: function(event, dx, dy) {
-			return $.extend(this._change.s.apply(this, arguments), this._change.e.apply(this, [event, dx, dy]));
-		},
-		sw: function(event, dx, dy) {
-			return $.extend(this._change.s.apply(this, arguments), this._change.w.apply(this, [event, dx, dy]));
-		},
-		ne: function(event, dx, dy) {
-			return $.extend(this._change.n.apply(this, arguments), this._change.e.apply(this, [event, dx, dy]));
-		},
-		nw: function(event, dx, dy) {
-			return $.extend(this._change.n.apply(this, arguments), this._change.w.apply(this, [event, dx, dy]));
-		}
-	},
-
-	_propagate: function(n, event) {
-		$.ui.plugin.call(this, n, [event, this.ui()]);
-		(n != "resize" && this._trigger(n, event, this.ui()));
-	},
-
-	plugins: {},
-
-	ui: function() {
-		return {
-			originalElement: this.originalElement,
-			element: this.element,
-			helper: this.helper,
-			position: this.position,
-			size: this.size,
-			originalSize: this.originalSize,
-			originalPosition: this.originalPosition
-		};
-	}
-
-});
-
-/*
- * Resizable Extensions
- */
-
-$.ui.plugin.add("resizable", "alsoResize", {
-
-	start: function (event, ui) {
-		var that = $(this).data("resizable"), o = that.options;
-
-		var _store = function (exp) {
-			$(exp).each(function() {
-				var el = $(this);
-				el.data("resizable-alsoresize", {
-					width: parseInt(el.width(), 10), height: parseInt(el.height(), 10),
-					left: parseInt(el.css('left'), 10), top: parseInt(el.css('top'), 10)
-				});
-			});
-		};
-
-		if (typeof(o.alsoResize) == 'object' && !o.alsoResize.parentNode) {
-			if (o.alsoResize.length) { o.alsoResize = o.alsoResize[0]; _store(o.alsoResize); }
-			else { $.each(o.alsoResize, function (exp) { _store(exp); }); }
-		}else{
-			_store(o.alsoResize);
-		}
-	},
-
-	resize: function (event, ui) {
-		var that = $(this).data("resizable"), o = that.options, os = that.originalSize, op = that.originalPosition;
-
-		var delta = {
-			height: (that.size.height - os.height) || 0, width: (that.size.width - os.width) || 0,
-			top: (that.position.top - op.top) || 0, left: (that.position.left - op.left) || 0
-		},
-
-		_alsoResize = function (exp, c) {
-			$(exp).each(function() {
-				var el = $(this), start = $(this).data("resizable-alsoresize"), style = {},
-					css = c && c.length ? c : el.parents(ui.originalElement[0]).length ? ['width', 'height'] : ['width', 'height', 'top', 'left'];
-
-				$.each(css, function (i, prop) {
-					var sum = (start[prop]||0) + (delta[prop]||0);
-					if (sum && sum >= 0)
-						style[prop] = sum || null;
-				});
-
-				el.css(style);
-			});
-		};
-
-		if (typeof(o.alsoResize) == 'object' && !o.alsoResize.nodeType) {
-			$.each(o.alsoResize, function (exp, c) { _alsoResize(exp, c); });
-		}else{
-			_alsoResize(o.alsoResize);
-		}
-	},
-
-	stop: function (event, ui) {
-		$(this).removeData("resizable-alsoresize");
-	}
-});
-
-$.ui.plugin.add("resizable", "animate", {
-
-	stop: function(event, ui) {
-		var that = $(this).data("resizable"), o = that.options;
-
-		var pr = that._proportionallyResizeElements, ista = pr.length && (/textarea/i).test(pr[0].nodeName),
-					soffseth = ista && $.ui.hasScroll(pr[0], 'left') /* TODO - jump height */ ? 0 : that.sizeDiff.height,
-						soffsetw = ista ? 0 : that.sizeDiff.width;
-
-		var style = { width: (that.size.width - soffsetw), height: (that.size.height - soffseth) },
-					left = (parseInt(that.element.css('left'), 10) + (that.position.left - that.originalPosition.left)) || null,
-						top = (parseInt(that.element.css('top'), 10) + (that.position.top - that.originalPosition.top)) || null;
-
-		that.element.animate(
-			$.extend(style, top && left ? { top: top, left: left } : {}), {
-				duration: o.animateDuration,
-				easing: o.animateEasing,
-				step: function() {
-
-					var data = {
-						width: parseInt(that.element.css('width'), 10),
-						height: parseInt(that.element.css('height'), 10),
-						top: parseInt(that.element.css('top'), 10),
-						left: parseInt(that.element.css('left'), 10)
-					};
-
-					if (pr && pr.length) $(pr[0]).css({ width: data.width, height: data.height });
-
-					// propagating resize, and updating values for each animation step
-					that._updateCache(data);
-					that._propagate("resize", event);
-
-				}
-			}
-		);
-	}
-
-});
-
-$.ui.plugin.add("resizable", "containment", {
-
-	start: function(event, ui) {
-		var that = $(this).data("resizable"), o = that.options, el = that.element;
-		var oc = o.containment,	ce = (oc instanceof $) ? oc.get(0) : (/parent/.test(oc)) ? el.parent().get(0) : oc;
-		if (!ce) return;
-
-		that.containerElement = $(ce);
-
-		if (/document/.test(oc) || oc == document) {
-			that.containerOffset = { left: 0, top: 0 };
-			that.containerPosition = { left: 0, top: 0 };
-
-			that.parentData = {
-				element: $(document), left: 0, top: 0,
-				width: $(document).width(), height: $(document).height() || document.body.parentNode.scrollHeight
-			};
-		}
-
-		// i'm a node, so compute top, left, right, bottom
-		else {
-			var element = $(ce), p = [];
-			$([ "Top", "Right", "Left", "Bottom" ]).each(function(i, name) { p[i] = num(element.css("padding" + name)); });
-
-			that.containerOffset = element.offset();
-			that.containerPosition = element.position();
-			that.containerSize = { height: (element.innerHeight() - p[3]), width: (element.innerWidth() - p[1]) };
-
-			var co = that.containerOffset, ch = that.containerSize.height,	cw = that.containerSize.width,
-						width = ($.ui.hasScroll(ce, "left") ? ce.scrollWidth : cw ), height = ($.ui.hasScroll(ce) ? ce.scrollHeight : ch);
-
-			that.parentData = {
-				element: ce, left: co.left, top: co.top, width: width, height: height
-			};
-		}
-	},
-
-	resize: function(event, ui) {
-		var that = $(this).data("resizable"), o = that.options,
-				ps = that.containerSize, co = that.containerOffset, cs = that.size, cp = that.position,
-				pRatio = that._aspectRatio || event.shiftKey, cop = { top:0, left:0 }, ce = that.containerElement;
-
-		if (ce[0] != document && (/static/).test(ce.css('position'))) cop = co;
-
-		if (cp.left < (that._helper ? co.left : 0)) {
-			that.size.width = that.size.width + (that._helper ? (that.position.left - co.left) : (that.position.left - cop.left));
-			if (pRatio) that.size.height = that.size.width / that.aspectRatio;
-			that.position.left = o.helper ? co.left : 0;
-		}
-
-		if (cp.top < (that._helper ? co.top : 0)) {
-			that.size.height = that.size.height + (that._helper ? (that.position.top - co.top) : that.position.top);
-			if (pRatio) that.size.width = that.size.height * that.aspectRatio;
-			that.position.top = that._helper ? co.top : 0;
-		}
-
-		that.offset.left = that.parentData.left+that.position.left;
-		that.offset.top = that.parentData.top+that.position.top;
-
-		var woset = Math.abs( (that._helper ? that.offset.left - cop.left : (that.offset.left - cop.left)) + that.sizeDiff.width ),
-					hoset = Math.abs( (that._helper ? that.offset.top - cop.top : (that.offset.top - co.top)) + that.sizeDiff.height );
-
-		var isParent = that.containerElement.get(0) == that.element.parent().get(0),
-			isOffsetRelative = /relative|absolute/.test(that.containerElement.css('position'));
-
-		if(isParent && isOffsetRelative) woset -= that.parentData.left;
-
-		if (woset + that.size.width >= that.parentData.width) {
-			that.size.width = that.parentData.width - woset;
-			if (pRatio) that.size.height = that.size.width / that.aspectRatio;
-		}
-
-		if (hoset + that.size.height >= that.parentData.height) {
-			that.size.height = that.parentData.height - hoset;
-			if (pRatio) that.size.width = that.size.height * that.aspectRatio;
-		}
-	},
-
-	stop: function(event, ui){
-		var that = $(this).data("resizable"), o = that.options, cp = that.position,
-				co = that.containerOffset, cop = that.containerPosition, ce = that.containerElement;
-
-		var helper = $(that.helper), ho = helper.offset(), w = helper.outerWidth() - that.sizeDiff.width, h = helper.outerHeight() - that.sizeDiff.height;
-
-		if (that._helper && !o.animate && (/relative/).test(ce.css('position')))
-			$(this).css({ left: ho.left - cop.left - co.left, width: w, height: h });
-
-		if (that._helper && !o.animate && (/static/).test(ce.css('position')))
-			$(this).css({ left: ho.left - cop.left - co.left, width: w, height: h });
-
-	}
-});
-
-$.ui.plugin.add("resizable", "ghost", {
-
-	start: function(event, ui) {
-
-		var that = $(this).data("resizable"), o = that.options, cs = that.size;
-
-		that.ghost = that.originalElement.clone();
-		that.ghost
-			.css({ opacity: .25, display: 'block', position: 'relative', height: cs.height, width: cs.width, margin: 0, left: 0, top: 0 })
-			.addClass('ui-resizable-ghost')
-			.addClass(typeof o.ghost == 'string' ? o.ghost : '');
-
-		that.ghost.appendTo(that.helper);
-
-	},
-
-	resize: function(event, ui){
-		var that = $(this).data("resizable"), o = that.options;
-		if (that.ghost) that.ghost.css({ position: 'relative', height: that.size.height, width: that.size.width });
-	},
-
-	stop: function(event, ui){
-		var that = $(this).data("resizable"), o = that.options;
-		if (that.ghost && that.helper) that.helper.get(0).removeChild(that.ghost.get(0));
-	}
-
-});
-
-$.ui.plugin.add("resizable", "grid", {
-
-	resize: function(event, ui) {
-		var that = $(this).data("resizable"), o = that.options, cs = that.size, os = that.originalSize, op = that.originalPosition, a = that.axis, ratio = o._aspectRatio || event.shiftKey;
-		o.grid = typeof o.grid == "number" ? [o.grid, o.grid] : o.grid;
-		var ox = Math.round((cs.width - os.width) / (o.grid[0]||1)) * (o.grid[0]||1), oy = Math.round((cs.height - os.height) / (o.grid[1]||1)) * (o.grid[1]||1);
-
-		if (/^(se|s|e)$/.test(a)) {
-			that.size.width = os.width + ox;
-			that.size.height = os.height + oy;
-		}
-		else if (/^(ne)$/.test(a)) {
-			that.size.width = os.width + ox;
-			that.size.height = os.height + oy;
-			that.position.top = op.top - oy;
-		}
-		else if (/^(sw)$/.test(a)) {
-			that.size.width = os.width + ox;
-			that.size.height = os.height + oy;
-			that.position.left = op.left - ox;
-		}
-		else {
-			that.size.width = os.width + ox;
-			that.size.height = os.height + oy;
-			that.position.top = op.top - oy;
-			that.position.left = op.left - ox;
-		}
-	}
-
-});
-
-var num = function(v) {
-	return parseInt(v, 10) || 0;
-};
-
-var isNumber = function(value) {
-	return !isNaN(parseInt(value, 10));
-};
-
-})(jQuery);
-(function( $, undefined ) {
-
-$.widget("ui.selectable", $.ui.mouse, {
-	version: "1.9.2",
-	options: {
-		appendTo: 'body',
-		autoRefresh: true,
-		distance: 0,
-		filter: '*',
-		tolerance: 'touch'
-	},
-	_create: function() {
-		var that = this;
-
-		this.element.addClass("ui-selectable");
-
-		this.dragged = false;
-
-		// cache selectee children based on filter
-		var selectees;
-		this.refresh = function() {
-			selectees = $(that.options.filter, that.element[0]);
-			selectees.addClass("ui-selectee");
-			selectees.each(function() {
-				var $this = $(this);
-				var pos = $this.offset();
-				$.data(this, "selectable-item", {
-					element: this,
-					$element: $this,
-					left: pos.left,
-					top: pos.top,
-					right: pos.left + $this.outerWidth(),
-					bottom: pos.top + $this.outerHeight(),
-					startselected: false,
-					selected: $this.hasClass('ui-selected'),
-					selecting: $this.hasClass('ui-selecting'),
-					unselecting: $this.hasClass('ui-unselecting')
-				});
-			});
-		};
-		this.refresh();
-
-		this.selectees = selectees.addClass("ui-selectee");
-
-		this._mouseInit();
-
-		this.helper = $("
        ");
-	},
-
-	_destroy: function() {
-		this.selectees
-			.removeClass("ui-selectee")
-			.removeData("selectable-item");
-		this.element
-			.removeClass("ui-selectable ui-selectable-disabled");
-		this._mouseDestroy();
-	},
-
-	_mouseStart: function(event) {
-		var that = this;
-
-		this.opos = [event.pageX, event.pageY];
-
-		if (this.options.disabled)
-			return;
-
-		var options = this.options;
-
-		this.selectees = $(options.filter, this.element[0]);
-
-		this._trigger("start", event);
-
-		$(options.appendTo).append(this.helper);
-		// position helper (lasso)
-		this.helper.css({
-			"left": event.clientX,
-			"top": event.clientY,
-			"width": 0,
-			"height": 0
-		});
-
-		if (options.autoRefresh) {
-			this.refresh();
-		}
-
-		this.selectees.filter('.ui-selected').each(function() {
-			var selectee = $.data(this, "selectable-item");
-			selectee.startselected = true;
-			if (!event.metaKey && !event.ctrlKey) {
-				selectee.$element.removeClass('ui-selected');
-				selectee.selected = false;
-				selectee.$element.addClass('ui-unselecting');
-				selectee.unselecting = true;
-				// selectable UNSELECTING callback
-				that._trigger("unselecting", event, {
-					unselecting: selectee.element
-				});
-			}
-		});
-
-		$(event.target).parents().andSelf().each(function() {
-			var selectee = $.data(this, "selectable-item");
-			if (selectee) {
-				var doSelect = (!event.metaKey && !event.ctrlKey) || !selectee.$element.hasClass('ui-selected');
-				selectee.$element
-					.removeClass(doSelect ? "ui-unselecting" : "ui-selected")
-					.addClass(doSelect ? "ui-selecting" : "ui-unselecting");
-				selectee.unselecting = !doSelect;
-				selectee.selecting = doSelect;
-				selectee.selected = doSelect;
-				// selectable (UN)SELECTING callback
-				if (doSelect) {
-					that._trigger("selecting", event, {
-						selecting: selectee.element
-					});
-				} else {
-					that._trigger("unselecting", event, {
-						unselecting: selectee.element
-					});
-				}
-				return false;
-			}
-		});
-
-	},
-
-	_mouseDrag: function(event) {
-		var that = this;
-		this.dragged = true;
-
-		if (this.options.disabled)
-			return;
-
-		var options = this.options;
-
-		var x1 = this.opos[0], y1 = this.opos[1], x2 = event.pageX, y2 = event.pageY;
-		if (x1 > x2) { var tmp = x2; x2 = x1; x1 = tmp; }
-		if (y1 > y2) { var tmp = y2; y2 = y1; y1 = tmp; }
-		this.helper.css({left: x1, top: y1, width: x2-x1, height: y2-y1});
-
-		this.selectees.each(function() {
-			var selectee = $.data(this, "selectable-item");
-			//prevent helper from being selected if appendTo: selectable
-			if (!selectee || selectee.element == that.element[0])
-				return;
-			var hit = false;
-			if (options.tolerance == 'touch') {
-				hit = ( !(selectee.left > x2 || selectee.right < x1 || selectee.top > y2 || selectee.bottom < y1) );
-			} else if (options.tolerance == 'fit') {
-				hit = (selectee.left > x1 && selectee.right < x2 && selectee.top > y1 && selectee.bottom < y2);
-			}
-
-			if (hit) {
-				// SELECT
-				if (selectee.selected) {
-					selectee.$element.removeClass('ui-selected');
-					selectee.selected = false;
-				}
-				if (selectee.unselecting) {
-					selectee.$element.removeClass('ui-unselecting');
-					selectee.unselecting = false;
-				}
-				if (!selectee.selecting) {
-					selectee.$element.addClass('ui-selecting');
-					selectee.selecting = true;
-					// selectable SELECTING callback
-					that._trigger("selecting", event, {
-						selecting: selectee.element
-					});
-				}
-			} else {
-				// UNSELECT
-				if (selectee.selecting) {
-					if ((event.metaKey || event.ctrlKey) && selectee.startselected) {
-						selectee.$element.removeClass('ui-selecting');
-						selectee.selecting = false;
-						selectee.$element.addClass('ui-selected');
-						selectee.selected = true;
-					} else {
-						selectee.$element.removeClass('ui-selecting');
-						selectee.selecting = false;
-						if (selectee.startselected) {
-							selectee.$element.addClass('ui-unselecting');
-							selectee.unselecting = true;
-						}
-						// selectable UNSELECTING callback
-						that._trigger("unselecting", event, {
-							unselecting: selectee.element
-						});
-					}
-				}
-				if (selectee.selected) {
-					if (!event.metaKey && !event.ctrlKey && !selectee.startselected) {
-						selectee.$element.removeClass('ui-selected');
-						selectee.selected = false;
-
-						selectee.$element.addClass('ui-unselecting');
-						selectee.unselecting = true;
-						// selectable UNSELECTING callback
-						that._trigger("unselecting", event, {
-							unselecting: selectee.element
-						});
-					}
-				}
-			}
-		});
-
-		return false;
-	},
-
-	_mouseStop: function(event) {
-		var that = this;
-
-		this.dragged = false;
-
-		var options = this.options;
-
-		$('.ui-unselecting', this.element[0]).each(function() {
-			var selectee = $.data(this, "selectable-item");
-			selectee.$element.removeClass('ui-unselecting');
-			selectee.unselecting = false;
-			selectee.startselected = false;
-			that._trigger("unselected", event, {
-				unselected: selectee.element
-			});
-		});
-		$('.ui-selecting', this.element[0]).each(function() {
-			var selectee = $.data(this, "selectable-item");
-			selectee.$element.removeClass('ui-selecting').addClass('ui-selected');
-			selectee.selecting = false;
-			selectee.selected = true;
-			selectee.startselected = true;
-			that._trigger("selected", event, {
-				selected: selectee.element
-			});
-		});
-		this._trigger("stop", event);
-
-		this.helper.remove();
-
-		return false;
-	}
-
-});
-
-})(jQuery);
-(function( $, undefined ) {
-
-// number of pages in a slider
-// (how many times can you page up/down to go through the whole range)
-var numPages = 5;
-
-$.widget( "ui.slider", $.ui.mouse, {
-	version: "1.9.2",
-	widgetEventPrefix: "slide",
-
-	options: {
-		animate: false,
-		distance: 0,
-		max: 100,
-		min: 0,
-		orientation: "horizontal",
-		range: false,
-		step: 1,
-		value: 0,
-		values: null
-	},
-
-	_create: function() {
-		var i, handleCount,
-			o = this.options,
-			existingHandles = this.element.find( ".ui-slider-handle" ).addClass( "ui-state-default ui-corner-all" ),
-			handle = "",
-			handles = [];
-
-		this._keySliding = false;
-		this._mouseSliding = false;
-		this._animateOff = true;
-		this._handleIndex = null;
-		this._detectOrientation();
-		this._mouseInit();
-
-		this.element
-			.addClass( "ui-slider" +
-				" ui-slider-" + this.orientation +
-				" ui-widget" +
-				" ui-widget-content" +
-				" ui-corner-all" +
-				( o.disabled ? " ui-slider-disabled ui-disabled" : "" ) );
-
-		this.range = $([]);
-
-		if ( o.range ) {
-			if ( o.range === true ) {
-				if ( !o.values ) {
-					o.values = [ this._valueMin(), this._valueMin() ];
-				}
-				if ( o.values.length && o.values.length !== 2 ) {
-					o.values = [ o.values[0], o.values[0] ];
-				}
-			}
-
-			this.range = $( "
        " )
-				.appendTo( this.element )
-				.addClass( "ui-slider-range" +
-				// note: this isn't the most fittingly semantic framework class for this element,
-				// but worked best visually with a variety of themes
-				" ui-widget-header" +
-				( ( o.range === "min" || o.range === "max" ) ? " ui-slider-range-" + o.range : "" ) );
-		}
-
-		handleCount = ( o.values && o.values.length ) || 1;
-
-		for ( i = existingHandles.length; i < handleCount; i++ ) {
-			handles.push( handle );
-		}
-
-		this.handles = existingHandles.add( $( handles.join( "" ) ).appendTo( this.element ) );
-
-		this.handle = this.handles.eq( 0 );
-
-		this.handles.add( this.range ).filter( "a" )
-			.click(function( event ) {
-				event.preventDefault();
-			})
-			.mouseenter(function() {
-				if ( !o.disabled ) {
-					$( this ).addClass( "ui-state-hover" );
-				}
-			})
-			.mouseleave(function() {
-				$( this ).removeClass( "ui-state-hover" );
-			})
-			.focus(function() {
-				if ( !o.disabled ) {
-					$( ".ui-slider .ui-state-focus" ).removeClass( "ui-state-focus" );
-					$( this ).addClass( "ui-state-focus" );
-				} else {
-					$( this ).blur();
-				}
-			})
-			.blur(function() {
-				$( this ).removeClass( "ui-state-focus" );
-			});
-
-		this.handles.each(function( i ) {
-			$( this ).data( "ui-slider-handle-index", i );
-		});
-
-		this._on( this.handles, {
-			keydown: function( event ) {
-				var allowed, curVal, newVal, step,
-					index = $( event.target ).data( "ui-slider-handle-index" );
-
-				switch ( event.keyCode ) {
-					case $.ui.keyCode.HOME:
-					case $.ui.keyCode.END:
-					case $.ui.keyCode.PAGE_UP:
-					case $.ui.keyCode.PAGE_DOWN:
-					case $.ui.keyCode.UP:
-					case $.ui.keyCode.RIGHT:
-					case $.ui.keyCode.DOWN:
-					case $.ui.keyCode.LEFT:
-						event.preventDefault();
-						if ( !this._keySliding ) {
-							this._keySliding = true;
-							$( event.target ).addClass( "ui-state-active" );
-							allowed = this._start( event, index );
-							if ( allowed === false ) {
-								return;
-							}
-						}
-						break;
-				}
-
-				step = this.options.step;
-				if ( this.options.values && this.options.values.length ) {
-					curVal = newVal = this.values( index );
-				} else {
-					curVal = newVal = this.value();
-				}
-
-				switch ( event.keyCode ) {
-					case $.ui.keyCode.HOME:
-						newVal = this._valueMin();
-						break;
-					case $.ui.keyCode.END:
-						newVal = this._valueMax();
-						break;
-					case $.ui.keyCode.PAGE_UP:
-						newVal = this._trimAlignValue( curVal + ( (this._valueMax() - this._valueMin()) / numPages ) );
-						break;
-					case $.ui.keyCode.PAGE_DOWN:
-						newVal = this._trimAlignValue( curVal - ( (this._valueMax() - this._valueMin()) / numPages ) );
-						break;
-					case $.ui.keyCode.UP:
-					case $.ui.keyCode.RIGHT:
-						if ( curVal === this._valueMax() ) {
-							return;
-						}
-						newVal = this._trimAlignValue( curVal + step );
-						break;
-					case $.ui.keyCode.DOWN:
-					case $.ui.keyCode.LEFT:
-						if ( curVal === this._valueMin() ) {
-							return;
-						}
-						newVal = this._trimAlignValue( curVal - step );
-						break;
-				}
-
-				this._slide( event, index, newVal );
-			},
-			keyup: function( event ) {
-				var index = $( event.target ).data( "ui-slider-handle-index" );
-
-				if ( this._keySliding ) {
-					this._keySliding = false;
-					this._stop( event, index );
-					this._change( event, index );
-					$( event.target ).removeClass( "ui-state-active" );
-				}
-			}
-		});
-
-		this._refreshValue();
-
-		this._animateOff = false;
-	},
-
-	_destroy: function() {
-		this.handles.remove();
-		this.range.remove();
-
-		this.element
-			.removeClass( "ui-slider" +
-				" ui-slider-horizontal" +
-				" ui-slider-vertical" +
-				" ui-slider-disabled" +
-				" ui-widget" +
-				" ui-widget-content" +
-				" ui-corner-all" );
-
-		this._mouseDestroy();
-	},
-
-	_mouseCapture: function( event ) {
-		var position, normValue, distance, closestHandle, index, allowed, offset, mouseOverHandle,
-			that = this,
-			o = this.options;
-
-		if ( o.disabled ) {
-			return false;
-		}
-
-		this.elementSize = {
-			width: this.element.outerWidth(),
-			height: this.element.outerHeight()
-		};
-		this.elementOffset = this.element.offset();
-
-		position = { x: event.pageX, y: event.pageY };
-		normValue = this._normValueFromMouse( position );
-		distance = this._valueMax() - this._valueMin() + 1;
-		this.handles.each(function( i ) {
-			var thisDistance = Math.abs( normValue - that.values(i) );
-			if ( distance > thisDistance ) {
-				distance = thisDistance;
-				closestHandle = $( this );
-				index = i;
-			}
-		});
-
-		// workaround for bug #3736 (if both handles of a range are at 0,
-		// the first is always used as the one with least distance,
-		// and moving it is obviously prevented by preventing negative ranges)
-		if( o.range === true && this.values(1) === o.min ) {
-			index += 1;
-			closestHandle = $( this.handles[index] );
-		}
-
-		allowed = this._start( event, index );
-		if ( allowed === false ) {
-			return false;
-		}
-		this._mouseSliding = true;
-
-		this._handleIndex = index;
-
-		closestHandle
-			.addClass( "ui-state-active" )
-			.focus();
-
-		offset = closestHandle.offset();
-		mouseOverHandle = !$( event.target ).parents().andSelf().is( ".ui-slider-handle" );
-		this._clickOffset = mouseOverHandle ? { left: 0, top: 0 } : {
-			left: event.pageX - offset.left - ( closestHandle.width() / 2 ),
-			top: event.pageY - offset.top -
-				( closestHandle.height() / 2 ) -
-				( parseInt( closestHandle.css("borderTopWidth"), 10 ) || 0 ) -
-				( parseInt( closestHandle.css("borderBottomWidth"), 10 ) || 0) +
-				( parseInt( closestHandle.css("marginTop"), 10 ) || 0)
-		};
-
-		if ( !this.handles.hasClass( "ui-state-hover" ) ) {
-			this._slide( event, index, normValue );
-		}
-		this._animateOff = true;
-		return true;
-	},
-
-	_mouseStart: function() {
-		return true;
-	},
-
-	_mouseDrag: function( event ) {
-		var position = { x: event.pageX, y: event.pageY },
-			normValue = this._normValueFromMouse( position );
-
-		this._slide( event, this._handleIndex, normValue );
-
-		return false;
-	},
-
-	_mouseStop: function( event ) {
-		this.handles.removeClass( "ui-state-active" );
-		this._mouseSliding = false;
-
-		this._stop( event, this._handleIndex );
-		this._change( event, this._handleIndex );
-
-		this._handleIndex = null;
-		this._clickOffset = null;
-		this._animateOff = false;
-
-		return false;
-	},
-
-	_detectOrientation: function() {
-		this.orientation = ( this.options.orientation === "vertical" ) ? "vertical" : "horizontal";
-	},
-
-	_normValueFromMouse: function( position ) {
-		var pixelTotal,
-			pixelMouse,
-			percentMouse,
-			valueTotal,
-			valueMouse;
-
-		if ( this.orientation === "horizontal" ) {
-			pixelTotal = this.elementSize.width;
-			pixelMouse = position.x - this.elementOffset.left - ( this._clickOffset ? this._clickOffset.left : 0 );
-		} else {
-			pixelTotal = this.elementSize.height;
-			pixelMouse = position.y - this.elementOffset.top - ( this._clickOffset ? this._clickOffset.top : 0 );
-		}
-
-		percentMouse = ( pixelMouse / pixelTotal );
-		if ( percentMouse > 1 ) {
-			percentMouse = 1;
-		}
-		if ( percentMouse < 0 ) {
-			percentMouse = 0;
-		}
-		if ( this.orientation === "vertical" ) {
-			percentMouse = 1 - percentMouse;
-		}
-
-		valueTotal = this._valueMax() - this._valueMin();
-		valueMouse = this._valueMin() + percentMouse * valueTotal;
-
-		return this._trimAlignValue( valueMouse );
-	},
-
-	_start: function( event, index ) {
-		var uiHash = {
-			handle: this.handles[ index ],
-			value: this.value()
-		};
-		if ( this.options.values && this.options.values.length ) {
-			uiHash.value = this.values( index );
-			uiHash.values = this.values();
-		}
-		return this._trigger( "start", event, uiHash );
-	},
-
-	_slide: function( event, index, newVal ) {
-		var otherVal,
-			newValues,
-			allowed;
-
-		if ( this.options.values && this.options.values.length ) {
-			otherVal = this.values( index ? 0 : 1 );
-
-			if ( ( this.options.values.length === 2 && this.options.range === true ) &&
-					( ( index === 0 && newVal > otherVal) || ( index === 1 && newVal < otherVal ) )
-				) {
-				newVal = otherVal;
-			}
-
-			if ( newVal !== this.values( index ) ) {
-				newValues = this.values();
-				newValues[ index ] = newVal;
-				// A slide can be canceled by returning false from the slide callback
-				allowed = this._trigger( "slide", event, {
-					handle: this.handles[ index ],
-					value: newVal,
-					values: newValues
-				} );
-				otherVal = this.values( index ? 0 : 1 );
-				if ( allowed !== false ) {
-					this.values( index, newVal, true );
-				}
-			}
-		} else {
-			if ( newVal !== this.value() ) {
-				// A slide can be canceled by returning false from the slide callback
-				allowed = this._trigger( "slide", event, {
-					handle: this.handles[ index ],
-					value: newVal
-				} );
-				if ( allowed !== false ) {
-					this.value( newVal );
-				}
-			}
-		}
-	},
-
-	_stop: function( event, index ) {
-		var uiHash = {
-			handle: this.handles[ index ],
-			value: this.value()
-		};
-		if ( this.options.values && this.options.values.length ) {
-			uiHash.value = this.values( index );
-			uiHash.values = this.values();
-		}
-
-		this._trigger( "stop", event, uiHash );
-	},
-
-	_change: function( event, index ) {
-		if ( !this._keySliding && !this._mouseSliding ) {
-			var uiHash = {
-				handle: this.handles[ index ],
-				value: this.value()
-			};
-			if ( this.options.values && this.options.values.length ) {
-				uiHash.value = this.values( index );
-				uiHash.values = this.values();
-			}
-
-			this._trigger( "change", event, uiHash );
-		}
-	},
-
-	value: function( newValue ) {
-		if ( arguments.length ) {
-			this.options.value = this._trimAlignValue( newValue );
-			this._refreshValue();
-			this._change( null, 0 );
-			return;
-		}
-
-		return this._value();
-	},
-
-	values: function( index, newValue ) {
-		var vals,
-			newValues,
-			i;
-
-		if ( arguments.length > 1 ) {
-			this.options.values[ index ] = this._trimAlignValue( newValue );
-			this._refreshValue();
-			this._change( null, index );
-			return;
-		}
-
-		if ( arguments.length ) {
-			if ( $.isArray( arguments[ 0 ] ) ) {
-				vals = this.options.values;
-				newValues = arguments[ 0 ];
-				for ( i = 0; i < vals.length; i += 1 ) {
-					vals[ i ] = this._trimAlignValue( newValues[ i ] );
-					this._change( null, i );
-				}
-				this._refreshValue();
-			} else {
-				if ( this.options.values && this.options.values.length ) {
-					return this._values( index );
-				} else {
-					return this.value();
-				}
-			}
-		} else {
-			return this._values();
-		}
-	},
-
-	_setOption: function( key, value ) {
-		var i,
-			valsLength = 0;
-
-		if ( $.isArray( this.options.values ) ) {
-			valsLength = this.options.values.length;
-		}
-
-		$.Widget.prototype._setOption.apply( this, arguments );
-
-		switch ( key ) {
-			case "disabled":
-				if ( value ) {
-					this.handles.filter( ".ui-state-focus" ).blur();
-					this.handles.removeClass( "ui-state-hover" );
-					this.handles.prop( "disabled", true );
-					this.element.addClass( "ui-disabled" );
-				} else {
-					this.handles.prop( "disabled", false );
-					this.element.removeClass( "ui-disabled" );
-				}
-				break;
-			case "orientation":
-				this._detectOrientation();
-				this.element
-					.removeClass( "ui-slider-horizontal ui-slider-vertical" )
-					.addClass( "ui-slider-" + this.orientation );
-				this._refreshValue();
-				break;
-			case "value":
-				this._animateOff = true;
-				this._refreshValue();
-				this._change( null, 0 );
-				this._animateOff = false;
-				break;
-			case "values":
-				this._animateOff = true;
-				this._refreshValue();
-				for ( i = 0; i < valsLength; i += 1 ) {
-					this._change( null, i );
-				}
-				this._animateOff = false;
-				break;
-			case "min":
-			case "max":
-				this._animateOff = true;
-				this._refreshValue();
-				this._animateOff = false;
-				break;
-		}
-	},
-
-	//internal value getter
-	// _value() returns value trimmed by min and max, aligned by step
-	_value: function() {
-		var val = this.options.value;
-		val = this._trimAlignValue( val );
-
-		return val;
-	},
-
-	//internal values getter
-	// _values() returns array of values trimmed by min and max, aligned by step
-	// _values( index ) returns single value trimmed by min and max, aligned by step
-	_values: function( index ) {
-		var val,
-			vals,
-			i;
-
-		if ( arguments.length ) {
-			val = this.options.values[ index ];
-			val = this._trimAlignValue( val );
-
-			return val;
-		} else {
-			// .slice() creates a copy of the array
-			// this copy gets trimmed by min and max and then returned
-			vals = this.options.values.slice();
-			for ( i = 0; i < vals.length; i+= 1) {
-				vals[ i ] = this._trimAlignValue( vals[ i ] );
-			}
-
-			return vals;
-		}
-	},
-
-	// returns the step-aligned value that val is closest to, between (inclusive) min and max
-	_trimAlignValue: function( val ) {
-		if ( val <= this._valueMin() ) {
-			return this._valueMin();
-		}
-		if ( val >= this._valueMax() ) {
-			return this._valueMax();
-		}
-		var step = ( this.options.step > 0 ) ? this.options.step : 1,
-			valModStep = (val - this._valueMin()) % step,
-			alignValue = val - valModStep;
-
-		if ( Math.abs(valModStep) * 2 >= step ) {
-			alignValue += ( valModStep > 0 ) ? step : ( -step );
-		}
-
-		// Since JavaScript has problems with large floats, round
-		// the final value to 5 digits after the decimal point (see #4124)
-		return parseFloat( alignValue.toFixed(5) );
-	},
-
-	_valueMin: function() {
-		return this.options.min;
-	},
-
-	_valueMax: function() {
-		return this.options.max;
-	},
-
-	_refreshValue: function() {
-		var lastValPercent, valPercent, value, valueMin, valueMax,
-			oRange = this.options.range,
-			o = this.options,
-			that = this,
-			animate = ( !this._animateOff ) ? o.animate : false,
-			_set = {};
-
-		if ( this.options.values && this.options.values.length ) {
-			this.handles.each(function( i ) {
-				valPercent = ( that.values(i) - that._valueMin() ) / ( that._valueMax() - that._valueMin() ) * 100;
-				_set[ that.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
-				$( this ).stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
-				if ( that.options.range === true ) {
-					if ( that.orientation === "horizontal" ) {
-						if ( i === 0 ) {
-							that.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { left: valPercent + "%" }, o.animate );
-						}
-						if ( i === 1 ) {
-							that.range[ animate ? "animate" : "css" ]( { width: ( valPercent - lastValPercent ) + "%" }, { queue: false, duration: o.animate } );
-						}
-					} else {
-						if ( i === 0 ) {
-							that.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { bottom: ( valPercent ) + "%" }, o.animate );
-						}
-						if ( i === 1 ) {
-							that.range[ animate ? "animate" : "css" ]( { height: ( valPercent - lastValPercent ) + "%" }, { queue: false, duration: o.animate } );
-						}
-					}
-				}
-				lastValPercent = valPercent;
-			});
-		} else {
-			value = this.value();
-			valueMin = this._valueMin();
-			valueMax = this._valueMax();
-			valPercent = ( valueMax !== valueMin ) ?
-					( value - valueMin ) / ( valueMax - valueMin ) * 100 :
-					0;
-			_set[ this.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
-			this.handle.stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
-
-			if ( oRange === "min" && this.orientation === "horizontal" ) {
-				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { width: valPercent + "%" }, o.animate );
-			}
-			if ( oRange === "max" && this.orientation === "horizontal" ) {
-				this.range[ animate ? "animate" : "css" ]( { width: ( 100 - valPercent ) + "%" }, { queue: false, duration: o.animate } );
-			}
-			if ( oRange === "min" && this.orientation === "vertical" ) {
-				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { height: valPercent + "%" }, o.animate );
-			}
-			if ( oRange === "max" && this.orientation === "vertical" ) {
-				this.range[ animate ? "animate" : "css" ]( { height: ( 100 - valPercent ) + "%" }, { queue: false, duration: o.animate } );
-			}
-		}
-	}
-
-});
-
-}(jQuery));
-(function( $, undefined ) {
-
-$.widget("ui.sortable", $.ui.mouse, {
-	version: "1.9.2",
-	widgetEventPrefix: "sort",
-	ready: false,
-	options: {
-		appendTo: "parent",
-		axis: false,
-		connectWith: false,
-		containment: false,
-		cursor: 'auto',
-		cursorAt: false,
-		dropOnEmpty: true,
-		forcePlaceholderSize: false,
-		forceHelperSize: false,
-		grid: false,
-		handle: false,
-		helper: "original",
-		items: '> *',
-		opacity: false,
-		placeholder: false,
-		revert: false,
-		scroll: true,
-		scrollSensitivity: 20,
-		scrollSpeed: 20,
-		scope: "default",
-		tolerance: "intersect",
-		zIndex: 1000
-	},
-	_create: function() {
-
-		var o = this.options;
-		this.containerCache = {};
-		this.element.addClass("ui-sortable");
-
-		//Get the items
-		this.refresh();
-
-		//Let's determine if the items are being displayed horizontally
-		this.floating = this.items.length ? o.axis === 'x' || (/left|right/).test(this.items[0].item.css('float')) || (/inline|table-cell/).test(this.items[0].item.css('display')) : false;
-
-		//Let's determine the parent's offset
-		this.offset = this.element.offset();
-
-		//Initialize mouse events for interaction
-		this._mouseInit();
-
-		//We're ready to go
-		this.ready = true
-
-	},
-
-	_destroy: function() {
-		this.element
-			.removeClass("ui-sortable ui-sortable-disabled");
-		this._mouseDestroy();
-
-		for ( var i = this.items.length - 1; i >= 0; i-- )
-			this.items[i].item.removeData(this.widgetName + "-item");
-
-		return this;
-	},
-
-	_setOption: function(key, value){
-		if ( key === "disabled" ) {
-			this.options[ key ] = value;
-
-			this.widget().toggleClass( "ui-sortable-disabled", !!value );
-		} else {
-			// Don't call widget base _setOption for disable as it adds ui-state-disabled class
-			$.Widget.prototype._setOption.apply(this, arguments);
-		}
-	},
-
-	_mouseCapture: function(event, overrideHandle) {
-		var that = this;
-
-		if (this.reverting) {
-			return false;
-		}
-
-		if(this.options.disabled || this.options.type == 'static') return false;
-
-		//We have to refresh the items data once first
-		this._refreshItems(event);
-
-		//Find out if the clicked node (or one of its parents) is a actual item in this.items
-		var currentItem = null, nodes = $(event.target).parents().each(function() {
-			if($.data(this, that.widgetName + '-item') == that) {
-				currentItem = $(this);
-				return false;
-			}
-		});
-		if($.data(event.target, that.widgetName + '-item') == that) currentItem = $(event.target);
-
-		if(!currentItem) return false;
-		if(this.options.handle && !overrideHandle) {
-			var validHandle = false;
-
-			$(this.options.handle, currentItem).find("*").andSelf().each(function() { if(this == event.target) validHandle = true; });
-			if(!validHandle) return false;
-		}
-
-		this.currentItem = currentItem;
-		this._removeCurrentsFromItems();
-		return true;
-
-	},
-
-	_mouseStart: function(event, overrideHandle, noActivation) {
-
-		var o = this.options;
-		this.currentContainer = this;
-
-		//We only need to call refreshPositions, because the refreshItems call has been moved to mouseCapture
-		this.refreshPositions();
-
-		//Create and append the visible helper
-		this.helper = this._createHelper(event);
-
-		//Cache the helper size
-		this._cacheHelperProportions();
-
-		/*
-		 * - Position generation -
-		 * This block generates everything position related - it's the core of draggables.
-		 */
-
-		//Cache the margins of the original element
-		this._cacheMargins();
-
-		//Get the next scrolling parent
-		this.scrollParent = this.helper.scrollParent();
-
-		//The element's absolute position on the page minus margins
-		this.offset = this.currentItem.offset();
-		this.offset = {
-			top: this.offset.top - this.margins.top,
-			left: this.offset.left - this.margins.left
-		};
-
-		$.extend(this.offset, {
-			click: { //Where the click happened, relative to the element
-				left: event.pageX - this.offset.left,
-				top: event.pageY - this.offset.top
-			},
-			parent: this._getParentOffset(),
-			relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
-		});
-
-		// Only after we got the offset, we can change the helper's position to absolute
-		// TODO: Still need to figure out a way to make relative sorting possible
-		this.helper.css("position", "absolute");
-		this.cssPosition = this.helper.css("position");
-
-		//Generate the original position
-		this.originalPosition = this._generatePosition(event);
-		this.originalPageX = event.pageX;
-		this.originalPageY = event.pageY;
-
-		//Adjust the mouse offset relative to the helper if 'cursorAt' is supplied
-		(o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
-
-		//Cache the former DOM position
-		this.domPosition = { prev: this.currentItem.prev()[0], parent: this.currentItem.parent()[0] };
-
-		//If the helper is not the original, hide the original so it's not playing any role during the drag, won't cause anything bad this way
-		if(this.helper[0] != this.currentItem[0]) {
-			this.currentItem.hide();
-		}
-
-		//Create the placeholder
-		this._createPlaceholder();
-
-		//Set a containment if given in the options
-		if(o.containment)
-			this._setContainment();
-
-		if(o.cursor) { // cursor option
-			if ($('body').css("cursor")) this._storedCursor = $('body').css("cursor");
-			$('body').css("cursor", o.cursor);
-		}
-
-		if(o.opacity) { // opacity option
-			if (this.helper.css("opacity")) this._storedOpacity = this.helper.css("opacity");
-			this.helper.css("opacity", o.opacity);
-		}
-
-		if(o.zIndex) { // zIndex option
-			if (this.helper.css("zIndex")) this._storedZIndex = this.helper.css("zIndex");
-			this.helper.css("zIndex", o.zIndex);
-		}
-
-		//Prepare scrolling
-		if(this.scrollParent[0] != document && this.scrollParent[0].tagName != 'HTML')
-			this.overflowOffset = this.scrollParent.offset();
-
-		//Call callbacks
-		this._trigger("start", event, this._uiHash());
-
-		//Recache the helper size
-		if(!this._preserveHelperProportions)
-			this._cacheHelperProportions();
-
-
-		//Post 'activate' events to possible containers
-		if(!noActivation) {
-			 for (var i = this.containers.length - 1; i >= 0; i--) { this.containers[i]._trigger("activate", event, this._uiHash(this)); }
-		}
-
-		//Prepare possible droppables
-		if($.ui.ddmanager)
-			$.ui.ddmanager.current = this;
-
-		if ($.ui.ddmanager && !o.dropBehaviour)
-			$.ui.ddmanager.prepareOffsets(this, event);
-
-		this.dragging = true;
-
-		this.helper.addClass("ui-sortable-helper");
-		this._mouseDrag(event); //Execute the drag once - this causes the helper not to be visible before getting its correct position
-		return true;
-
-	},
-
-	_mouseDrag: function(event) {
-
-		//Compute the helpers position
-		this.position = this._generatePosition(event);
-		this.positionAbs = this._convertPositionTo("absolute");
-
-		if (!this.lastPositionAbs) {
-			this.lastPositionAbs = this.positionAbs;
-		}
-
-		//Do scrolling
-		if(this.options.scroll) {
-			var o = this.options, scrolled = false;
-			if(this.scrollParent[0] != document && this.scrollParent[0].tagName != 'HTML') {
-
-				if((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity)
-					this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed;
-				else if(event.pageY - this.overflowOffset.top < o.scrollSensitivity)
-					this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop - o.scrollSpeed;
-
-				if((this.overflowOffset.left + this.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity)
-					this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft + o.scrollSpeed;
-				else if(event.pageX - this.overflowOffset.left < o.scrollSensitivity)
-					this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft - o.scrollSpeed;
-
-			} else {
-
-				if(event.pageY - $(document).scrollTop() < o.scrollSensitivity)
-					scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
-				else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity)
-					scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
-
-				if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity)
-					scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
-				else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity)
-					scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
-
-			}
-
-			if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour)
-				$.ui.ddmanager.prepareOffsets(this, event);
-		}
-
-		//Regenerate the absolute position used for position checks
-		this.positionAbs = this._convertPositionTo("absolute");
-
-		//Set the helper position
-		if(!this.options.axis || this.options.axis != "y") this.helper[0].style.left = this.position.left+'px';
-		if(!this.options.axis || this.options.axis != "x") this.helper[0].style.top = this.position.top+'px';
-
-		//Rearrange
-		for (var i = this.items.length - 1; i >= 0; i--) {
-
-			//Cache variables and intersection, continue if no intersection
-			var item = this.items[i], itemElement = item.item[0], intersection = this._intersectsWithPointer(item);
-			if (!intersection) continue;
-
-			// Only put the placeholder inside the current Container, skip all
-			// items form other containers. This works because when moving
-			// an item from one container to another the
-			// currentContainer is switched before the placeholder is moved.
-			//
-			// Without this moving items in "sub-sortables" can cause the placeholder to jitter
-			// beetween the outer and inner container.
-			if (item.instance !== this.currentContainer) continue;
-
-			if (itemElement != this.currentItem[0] //cannot intersect with itself
-				&&	this.placeholder[intersection == 1 ? "next" : "prev"]()[0] != itemElement //no useless actions that have been done before
-				&&	!$.contains(this.placeholder[0], itemElement) //no action if the item moved is the parent of the item checked
-				&& (this.options.type == 'semi-dynamic' ? !$.contains(this.element[0], itemElement) : true)
-				//&& itemElement.parentNode == this.placeholder[0].parentNode // only rearrange items within the same container
-			) {
-
-				this.direction = intersection == 1 ? "down" : "up";
-
-				if (this.options.tolerance == "pointer" || this._intersectsWithSides(item)) {
-					this._rearrange(event, item);
-				} else {
-					break;
-				}
-
-				this._trigger("change", event, this._uiHash());
-				break;
-			}
-		}
-
-		//Post events to containers
-		this._contactContainers(event);
-
-		//Interconnect with droppables
-		if($.ui.ddmanager) $.ui.ddmanager.drag(this, event);
-
-		//Call callbacks
-		this._trigger('sort', event, this._uiHash());
-
-		this.lastPositionAbs = this.positionAbs;
-		return false;
-
-	},
-
-	_mouseStop: function(event, noPropagation) {
-
-		if(!event) return;
-
-		//If we are using droppables, inform the manager about the drop
-		if ($.ui.ddmanager && !this.options.dropBehaviour)
-			$.ui.ddmanager.drop(this, event);
-
-		if(this.options.revert) {
-			var that = this;
-			var cur = this.placeholder.offset();
-
-			this.reverting = true;
-
-			$(this.helper).animate({
-				left: cur.left - this.offset.parent.left - this.margins.left + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollLeft),
-				top: cur.top - this.offset.parent.top - this.margins.top + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop)
-			}, parseInt(this.options.revert, 10) || 500, function() {
-				that._clear(event);
-			});
-		} else {
-			this._clear(event, noPropagation);
-		}
-
-		return false;
-
-	},
-
-	cancel: function() {
-
-		if(this.dragging) {
-
-			this._mouseUp({ target: null });
-
-			if(this.options.helper == "original")
-				this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
-			else
-				this.currentItem.show();
-
-			//Post deactivating events to containers
-			for (var i = this.containers.length - 1; i >= 0; i--){
-				this.containers[i]._trigger("deactivate", null, this._uiHash(this));
-				if(this.containers[i].containerCache.over) {
-					this.containers[i]._trigger("out", null, this._uiHash(this));
-					this.containers[i].containerCache.over = 0;
-				}
-			}
-
-		}
-
-		if (this.placeholder) {
-			//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
-			if(this.placeholder[0].parentNode) this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
-			if(this.options.helper != "original" && this.helper && this.helper[0].parentNode) this.helper.remove();
-
-			$.extend(this, {
-				helper: null,
-				dragging: false,
-				reverting: false,
-				_noFinalSort: null
-			});
-
-			if(this.domPosition.prev) {
-				$(this.domPosition.prev).after(this.currentItem);
-			} else {
-				$(this.domPosition.parent).prepend(this.currentItem);
-			}
-		}
-
-		return this;
-
-	},
-
-	serialize: function(o) {
-
-		var items = this._getItemsAsjQuery(o && o.connected);
-		var str = []; o = o || {};
-
-		$(items).each(function() {
-			var res = ($(o.item || this).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
-			if(res) str.push((o.key || res[1]+'[]')+'='+(o.key && o.expression ? res[1] : res[2]));
-		});
-
-		if(!str.length && o.key) {
-			str.push(o.key + '=');
-		}
-
-		return str.join('&');
-
-	},
-
-	toArray: function(o) {
-
-		var items = this._getItemsAsjQuery(o && o.connected);
-		var ret = []; o = o || {};
-
-		items.each(function() { ret.push($(o.item || this).attr(o.attribute || 'id') || ''); });
-		return ret;
-
-	},
-
-	/* Be careful with the following core functions */
-	_intersectsWith: function(item) {
-
-		var x1 = this.positionAbs.left,
-			x2 = x1 + this.helperProportions.width,
-			y1 = this.positionAbs.top,
-			y2 = y1 + this.helperProportions.height;
-
-		var l = item.left,
-			r = l + item.width,
-			t = item.top,
-			b = t + item.height;
-
-		var dyClick = this.offset.click.top,
-			dxClick = this.offset.click.left;
-
-		var isOverElement = (y1 + dyClick) > t && (y1 + dyClick) < b && (x1 + dxClick) > l && (x1 + dxClick) < r;
-
-		if(	   this.options.tolerance == "pointer"
-			|| this.options.forcePointerForContainers
-			|| (this.options.tolerance != "pointer" && this.helperProportions[this.floating ? 'width' : 'height'] > item[this.floating ? 'width' : 'height'])
-		) {
-			return isOverElement;
-		} else {
-
-			return (l < x1 + (this.helperProportions.width / 2) // Right Half
-				&& x2 - (this.helperProportions.width / 2) < r // Left Half
-				&& t < y1 + (this.helperProportions.height / 2) // Bottom Half
-				&& y2 - (this.helperProportions.height / 2) < b ); // Top Half
-
-		}
-	},
-
-	_intersectsWithPointer: function(item) {
-
-		var isOverElementHeight = (this.options.axis === 'x') || $.ui.isOverAxis(this.positionAbs.top + this.offset.click.top, item.top, item.height),
-			isOverElementWidth = (this.options.axis === 'y') || $.ui.isOverAxis(this.positionAbs.left + this.offset.click.left, item.left, item.width),
-			isOverElement = isOverElementHeight && isOverElementWidth,
-			verticalDirection = this._getDragVerticalDirection(),
-			horizontalDirection = this._getDragHorizontalDirection();
-
-		if (!isOverElement)
-			return false;
-
-		return this.floating ?
-			( ((horizontalDirection && horizontalDirection == "right") || verticalDirection == "down") ? 2 : 1 )
-			: ( verticalDirection && (verticalDirection == "down" ? 2 : 1) );
-
-	},
-
-	_intersectsWithSides: function(item) {
-
-		var isOverBottomHalf = $.ui.isOverAxis(this.positionAbs.top + this.offset.click.top, item.top + (item.height/2), item.height),
-			isOverRightHalf = $.ui.isOverAxis(this.positionAbs.left + this.offset.click.left, item.left + (item.width/2), item.width),
-			verticalDirection = this._getDragVerticalDirection(),
-			horizontalDirection = this._getDragHorizontalDirection();
-
-		if (this.floating && horizontalDirection) {
-			return ((horizontalDirection == "right" && isOverRightHalf) || (horizontalDirection == "left" && !isOverRightHalf));
-		} else {
-			return verticalDirection && ((verticalDirection == "down" && isOverBottomHalf) || (verticalDirection == "up" && !isOverBottomHalf));
-		}
-
-	},
-
-	_getDragVerticalDirection: function() {
-		var delta = this.positionAbs.top - this.lastPositionAbs.top;
-		return delta != 0 && (delta > 0 ? "down" : "up");
-	},
-
-	_getDragHorizontalDirection: function() {
-		var delta = this.positionAbs.left - this.lastPositionAbs.left;
-		return delta != 0 && (delta > 0 ? "right" : "left");
-	},
-
-	refresh: function(event) {
-		this._refreshItems(event);
-		this.refreshPositions();
-		return this;
-	},
-
-	_connectWith: function() {
-		var options = this.options;
-		return options.connectWith.constructor == String
-			? [options.connectWith]
-			: options.connectWith;
-	},
-
-	_getItemsAsjQuery: function(connected) {
-
-		var items = [];
-		var queries = [];
-		var connectWith = this._connectWith();
-
-		if(connectWith && connected) {
-			for (var i = connectWith.length - 1; i >= 0; i--){
-				var cur = $(connectWith[i]);
-				for (var j = cur.length - 1; j >= 0; j--){
-					var inst = $.data(cur[j], this.widgetName);
-					if(inst && inst != this && !inst.options.disabled) {
-						queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element).not(".ui-sortable-helper").not('.ui-sortable-placeholder'), inst]);
-					}
-				};
-			};
-		}
-
-		queries.push([$.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this.options.items, this.element).not(".ui-sortable-helper").not('.ui-sortable-placeholder'), this]);
-
-		for (var i = queries.length - 1; i >= 0; i--){
-			queries[i][0].each(function() {
-				items.push(this);
-			});
-		};
-
-		return $(items);
-
-	},
-
-	_removeCurrentsFromItems: function() {
-
-		var list = this.currentItem.find(":data(" + this.widgetName + "-item)");
-
-		this.items = $.grep(this.items, function (item) {
-			for (var j=0; j < list.length; j++) {
-				if(list[j] == item.item[0])
-					return false;
-			};
-			return true;
-		});
-
-	},
-
-	_refreshItems: function(event) {
-
-		this.items = [];
-		this.containers = [this];
-		var items = this.items;
-		var queries = [[$.isFunction(this.options.items) ? this.options.items.call(this.element[0], event, { item: this.currentItem }) : $(this.options.items, this.element), this]];
-		var connectWith = this._connectWith();
-
-		if(connectWith && this.ready) { //Shouldn't be run the first time through due to massive slow-down
-			for (var i = connectWith.length - 1; i >= 0; i--){
-				var cur = $(connectWith[i]);
-				for (var j = cur.length - 1; j >= 0; j--){
-					var inst = $.data(cur[j], this.widgetName);
-					if(inst && inst != this && !inst.options.disabled) {
-						queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element[0], event, { item: this.currentItem }) : $(inst.options.items, inst.element), inst]);
-						this.containers.push(inst);
-					}
-				};
-			};
-		}
-
-		for (var i = queries.length - 1; i >= 0; i--) {
-			var targetData = queries[i][1];
-			var _queries = queries[i][0];
-
-			for (var j=0, queriesLength = _queries.length; j < queriesLength; j++) {
-				var item = $(_queries[j]);
-
-				item.data(this.widgetName + '-item', targetData); // Data for target checking (mouse manager)
-
-				items.push({
-					item: item,
-					instance: targetData,
-					width: 0, height: 0,
-					left: 0, top: 0
-				});
-			};
-		};
-
-	},
-
-	refreshPositions: function(fast) {
-
-		//This has to be redone because due to the item being moved out/into the offsetParent, the offsetParent's position will change
-		if(this.offsetParent && this.helper) {
-			this.offset.parent = this._getParentOffset();
-		}
-
-		for (var i = this.items.length - 1; i >= 0; i--){
-			var item = this.items[i];
-
-			//We ignore calculating positions of all connected containers when we're not over them
-			if(item.instance != this.currentContainer && this.currentContainer && item.item[0] != this.currentItem[0])
-				continue;
-
-			var t = this.options.toleranceElement ? $(this.options.toleranceElement, item.item) : item.item;
-
-			if (!fast) {
-				item.width = t.outerWidth();
-				item.height = t.outerHeight();
-			}
-
-			var p = t.offset();
-			item.left = p.left;
-			item.top = p.top;
-		};
-
-		if(this.options.custom && this.options.custom.refreshContainers) {
-			this.options.custom.refreshContainers.call(this);
-		} else {
-			for (var i = this.containers.length - 1; i >= 0; i--){
-				var p = this.containers[i].element.offset();
-				this.containers[i].containerCache.left = p.left;
-				this.containers[i].containerCache.top = p.top;
-				this.containers[i].containerCache.width	= this.containers[i].element.outerWidth();
-				this.containers[i].containerCache.height = this.containers[i].element.outerHeight();
-			};
-		}
-
-		return this;
-	},
-
-	_createPlaceholder: function(that) {
-		that = that || this;
-		var o = that.options;
-
-		if(!o.placeholder || o.placeholder.constructor == String) {
-			var className = o.placeholder;
-			o.placeholder = {
-				element: function() {
-
-					var el = $(document.createElement(that.currentItem[0].nodeName))
-						.addClass(className || that.currentItem[0].className+" ui-sortable-placeholder")
-						.removeClass("ui-sortable-helper")[0];
-
-					if(!className)
-						el.style.visibility = "hidden";
-
-					return el;
-				},
-				update: function(container, p) {
-
-					// 1. If a className is set as 'placeholder option, we don't force sizes - the class is responsible for that
-					// 2. The option 'forcePlaceholderSize can be enabled to force it even if a class name is specified
-					if(className && !o.forcePlaceholderSize) return;
-
-					//If the element doesn't have a actual height by itself (without styles coming from a stylesheet), it receives the inline height from the dragged item
-					if(!p.height()) { p.height(that.currentItem.innerHeight() - parseInt(that.currentItem.css('paddingTop')||0, 10) - parseInt(that.currentItem.css('paddingBottom')||0, 10)); };
-					if(!p.width()) { p.width(that.currentItem.innerWidth() - parseInt(that.currentItem.css('paddingLeft')||0, 10) - parseInt(that.currentItem.css('paddingRight')||0, 10)); };
-				}
-			};
-		}
-
-		//Create the placeholder
-		that.placeholder = $(o.placeholder.element.call(that.element, that.currentItem));
-
-		//Append it after the actual current item
-		that.currentItem.after(that.placeholder);
-
-		//Update the size of the placeholder (TODO: Logic to fuzzy, see line 316/317)
-		o.placeholder.update(that, that.placeholder);
-
-	},
-
-	_contactContainers: function(event) {
-
-		// get innermost container that intersects with item
-		var innermostContainer = null, innermostIndex = null;
-
-
-		for (var i = this.containers.length - 1; i >= 0; i--){
-
-			// never consider a container that's located within the item itself
-			if($.contains(this.currentItem[0], this.containers[i].element[0]))
-				continue;
-
-			if(this._intersectsWith(this.containers[i].containerCache)) {
-
-				// if we've already found a container and it's more "inner" than this, then continue
-				if(innermostContainer && $.contains(this.containers[i].element[0], innermostContainer.element[0]))
-					continue;
-
-				innermostContainer = this.containers[i];
-				innermostIndex = i;
-
-			} else {
-				// container doesn't intersect. trigger "out" event if necessary
-				if(this.containers[i].containerCache.over) {
-					this.containers[i]._trigger("out", event, this._uiHash(this));
-					this.containers[i].containerCache.over = 0;
-				}
-			}
-
-		}
-
-		// if no intersecting containers found, return
-		if(!innermostContainer) return;
-
-		// move the item into the container if it's not there already
-		if(this.containers.length === 1) {
-			this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
-			this.containers[innermostIndex].containerCache.over = 1;
-		} else {
-
-			//When entering a new container, we will find the item with the least distance and append our item near it
-			var dist = 10000; var itemWithLeastDistance = null;
-			var posProperty = this.containers[innermostIndex].floating ? 'left' : 'top';
-			var sizeProperty = this.containers[innermostIndex].floating ? 'width' : 'height';
-			var base = this.positionAbs[posProperty] + this.offset.click[posProperty];
-			for (var j = this.items.length - 1; j >= 0; j--) {
-				if(!$.contains(this.containers[innermostIndex].element[0], this.items[j].item[0])) continue;
-				if(this.items[j].item[0] == this.currentItem[0]) continue;
-				var cur = this.items[j].item.offset()[posProperty];
-				var nearBottom = false;
-				if(Math.abs(cur - base) > Math.abs(cur + this.items[j][sizeProperty] - base)){
-					nearBottom = true;
-					cur += this.items[j][sizeProperty];
-				}
-
-				if(Math.abs(cur - base) < dist) {
-					dist = Math.abs(cur - base); itemWithLeastDistance = this.items[j];
-					this.direction = nearBottom ? "up": "down";
-				}
-			}
-
-			if(!itemWithLeastDistance && !this.options.dropOnEmpty) //Check if dropOnEmpty is enabled
-				return;
-
-			this.currentContainer = this.containers[innermostIndex];
-			itemWithLeastDistance ? this._rearrange(event, itemWithLeastDistance, null, true) : this._rearrange(event, null, this.containers[innermostIndex].element, true);
-			this._trigger("change", event, this._uiHash());
-			this.containers[innermostIndex]._trigger("change", event, this._uiHash(this));
-
-			//Update the placeholder
-			this.options.placeholder.update(this.currentContainer, this.placeholder);
-
-			this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
-			this.containers[innermostIndex].containerCache.over = 1;
-		}
-
-
-	},
-
-	_createHelper: function(event) {
-
-		var o = this.options;
-		var helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event, this.currentItem])) : (o.helper == 'clone' ? this.currentItem.clone() : this.currentItem);
-
-		if(!helper.parents('body').length) //Add the helper to the DOM if that didn't happen already
-			$(o.appendTo != 'parent' ? o.appendTo : this.currentItem[0].parentNode)[0].appendChild(helper[0]);
-
-		if(helper[0] == this.currentItem[0])
-			this._storedCSS = { width: this.currentItem[0].style.width, height: this.currentItem[0].style.height, position: this.currentItem.css("position"), top: this.currentItem.css("top"), left: this.currentItem.css("left") };
-
-		if(helper[0].style.width == '' || o.forceHelperSize) helper.width(this.currentItem.width());
-		if(helper[0].style.height == '' || o.forceHelperSize) helper.height(this.currentItem.height());
-
-		return helper;
-
-	},
-
-	_adjustOffsetFromHelper: function(obj) {
-		if (typeof obj == 'string') {
-			obj = obj.split(' ');
-		}
-		if ($.isArray(obj)) {
-			obj = {left: +obj[0], top: +obj[1] || 0};
-		}
-		if ('left' in obj) {
-			this.offset.click.left = obj.left + this.margins.left;
-		}
-		if ('right' in obj) {
-			this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
-		}
-		if ('top' in obj) {
-			this.offset.click.top = obj.top + this.margins.top;
-		}
-		if ('bottom' in obj) {
-			this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
-		}
-	},
-
-	_getParentOffset: function() {
-
-
-		//Get the offsetParent and cache its position
-		this.offsetParent = this.helper.offsetParent();
-		var po = this.offsetParent.offset();
-
-		// This is a special case where we need to modify a offset calculated on start, since the following happened:
-		// 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
-		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
-		//    the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
-		if(this.cssPosition == 'absolute' && this.scrollParent[0] != document && $.contains(this.scrollParent[0], this.offsetParent[0])) {
-			po.left += this.scrollParent.scrollLeft();
-			po.top += this.scrollParent.scrollTop();
-		}
-
-		if((this.offsetParent[0] == document.body) //This needs to be actually done for all browsers, since pageX/pageY includes this information
-		|| (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() == 'html' && $.ui.ie)) //Ugly IE fix
-			po = { top: 0, left: 0 };
-
-		return {
-			top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
-			left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
-		};
-
-	},
-
-	_getRelativeOffset: function() {
-
-		if(this.cssPosition == "relative") {
-			var p = this.currentItem.position();
-			return {
-				top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.scrollParent.scrollTop(),
-				left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.scrollParent.scrollLeft()
-			};
-		} else {
-			return { top: 0, left: 0 };
-		}
-
-	},
-
-	_cacheMargins: function() {
-		this.margins = {
-			left: (parseInt(this.currentItem.css("marginLeft"),10) || 0),
-			top: (parseInt(this.currentItem.css("marginTop"),10) || 0)
-		};
-	},
-
-	_cacheHelperProportions: function() {
-		this.helperProportions = {
-			width: this.helper.outerWidth(),
-			height: this.helper.outerHeight()
-		};
-	},
-
-	_setContainment: function() {
-
-		var o = this.options;
-		if(o.containment == 'parent') o.containment = this.helper[0].parentNode;
-		if(o.containment == 'document' || o.containment == 'window') this.containment = [
-			0 - this.offset.relative.left - this.offset.parent.left,
-			0 - this.offset.relative.top - this.offset.parent.top,
-			$(o.containment == 'document' ? document : window).width() - this.helperProportions.width - this.margins.left,
-			($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
-		];
-
-		if(!(/^(document|window|parent)$/).test(o.containment)) {
-			var ce = $(o.containment)[0];
-			var co = $(o.containment).offset();
-			var over = ($(ce).css("overflow") != 'hidden');
-
-			this.containment = [
-				co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0) - this.margins.left,
-				co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0) - this.margins.top,
-				co.left+(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left,
-				co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top
-			];
-		}
-
-	},
-
-	_convertPositionTo: function(d, pos) {
-
-		if(!pos) pos = this.position;
-		var mod = d == "absolute" ? 1 : -1;
-		var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
-
-		return {
-			top: (
-				pos.top																	// The absolute mouse position
-				+ this.offset.relative.top * mod										// Only for relative positioned nodes: Relative offset from element to offset parent
-				+ this.offset.parent.top * mod											// The offsetParent's offset without borders (offset + border)
-				- ( ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod)
-			),
-			left: (
-				pos.left																// The absolute mouse position
-				+ this.offset.relative.left * mod										// Only for relative positioned nodes: Relative offset from element to offset parent
-				+ this.offset.parent.left * mod											// The offsetParent's offset without borders (offset + border)
-				- ( ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod)
-			)
-		};
-
-	},
-
-	_generatePosition: function(event) {
-
-		var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
-
-		// This is another very weird special case that only happens for relative elements:
-		// 1. If the css position is relative
-		// 2. and the scroll parent is the document or similar to the offset parent
-		// we have to refresh the relative offset during the scroll so there are no jumps
-		if(this.cssPosition == 'relative' && !(this.scrollParent[0] != document && this.scrollParent[0] != this.offsetParent[0])) {
-			this.offset.relative = this._getRelativeOffset();
-		}
-
-		var pageX = event.pageX;
-		var pageY = event.pageY;
-
-		/*
-		 * - Position constraining -
-		 * Constrain the position to a mix of grid, containment.
-		 */
-
-		if(this.originalPosition) { //If we are not dragging yet, we won't check for options
-
-			if(this.containment) {
-				if(event.pageX - this.offset.click.left < this.containment[0]) pageX = this.containment[0] + this.offset.click.left;
-				if(event.pageY - this.offset.click.top < this.containment[1]) pageY = this.containment[1] + this.offset.click.top;
-				if(event.pageX - this.offset.click.left > this.containment[2]) pageX = this.containment[2] + this.offset.click.left;
-				if(event.pageY - this.offset.click.top > this.containment[3]) pageY = this.containment[3] + this.offset.click.top;
-			}
-
-			if(o.grid) {
-				var top = this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1];
-				pageY = this.containment ? (!(top - this.offset.click.top < this.containment[1] || top - this.offset.click.top > this.containment[3]) ? top : (!(top - this.offset.click.top < this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
-
-				var left = this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0];
-				pageX = this.containment ? (!(left - this.offset.click.left < this.containment[0] || left - this.offset.click.left > this.containment[2]) ? left : (!(left - this.offset.click.left < this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
-			}
-
-		}
-
-		return {
-			top: (
-				pageY																// The absolute mouse position
-				- this.offset.click.top													// Click offset (relative to the element)
-				- this.offset.relative.top												// Only for relative positioned nodes: Relative offset from element to offset parent
-				- this.offset.parent.top												// The offsetParent's offset without borders (offset + border)
-				+ ( ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
-			),
-			left: (
-				pageX																// The absolute mouse position
-				- this.offset.click.left												// Click offset (relative to the element)
-				- this.offset.relative.left												// Only for relative positioned nodes: Relative offset from element to offset parent
-				- this.offset.parent.left												// The offsetParent's offset without borders (offset + border)
-				+ ( ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ))
-			)
-		};
-
-	},
-
-	_rearrange: function(event, i, a, hardRefresh) {
-
-		a ? a[0].appendChild(this.placeholder[0]) : i.item[0].parentNode.insertBefore(this.placeholder[0], (this.direction == 'down' ? i.item[0] : i.item[0].nextSibling));
-
-		//Various things done here to improve the performance:
-		// 1. we create a setTimeout, that calls refreshPositions
-		// 2. on the instance, we have a counter variable, that get's higher after every append
-		// 3. on the local scope, we copy the counter variable, and check in the timeout, if it's still the same
-		// 4. this lets only the last addition to the timeout stack through
-		this.counter = this.counter ? ++this.counter : 1;
-		var counter = this.counter;
-
-		this._delay(function() {
-			if(counter == this.counter) this.refreshPositions(!hardRefresh); //Precompute after each DOM insertion, NOT on mousemove
-		});
-
-	},
-
-	_clear: function(event, noPropagation) {
-
-		this.reverting = false;
-		// We delay all events that have to be triggered to after the point where the placeholder has been removed and
-		// everything else normalized again
-		var delayedTriggers = [];
-
-		// We first have to update the dom position of the actual currentItem
-		// Note: don't do it if the current item is already removed (by a user), or it gets reappended (see #4088)
-		if(!this._noFinalSort && this.currentItem.parent().length) this.placeholder.before(this.currentItem);
-		this._noFinalSort = null;
-
-		if(this.helper[0] == this.currentItem[0]) {
-			for(var i in this._storedCSS) {
-				if(this._storedCSS[i] == 'auto' || this._storedCSS[i] == 'static') this._storedCSS[i] = '';
-			}
-			this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
-		} else {
-			this.currentItem.show();
-		}
-
-		if(this.fromOutside && !noPropagation) delayedTriggers.push(function(event) { this._trigger("receive", event, this._uiHash(this.fromOutside)); });
-		if((this.fromOutside || this.domPosition.prev != this.currentItem.prev().not(".ui-sortable-helper")[0] || this.domPosition.parent != this.currentItem.parent()[0]) && !noPropagation) delayedTriggers.push(function(event) { this._trigger("update", event, this._uiHash()); }); //Trigger update callback if the DOM position has changed
-
-		// Check if the items Container has Changed and trigger appropriate
-		// events.
-		if (this !== this.currentContainer) {
-			if(!noPropagation) {
-				delayedTriggers.push(function(event) { this._trigger("remove", event, this._uiHash()); });
-				delayedTriggers.push((function(c) { return function(event) { c._trigger("receive", event, this._uiHash(this)); };  }).call(this, this.currentContainer));
-				delayedTriggers.push((function(c) { return function(event) { c._trigger("update", event, this._uiHash(this));  }; }).call(this, this.currentContainer));
-			}
-		}
-
-
-		//Post events to containers
-		for (var i = this.containers.length - 1; i >= 0; i--){
-			if(!noPropagation) delayedTriggers.push((function(c) { return function(event) { c._trigger("deactivate", event, this._uiHash(this)); };  }).call(this, this.containers[i]));
-			if(this.containers[i].containerCache.over) {
-				delayedTriggers.push((function(c) { return function(event) { c._trigger("out", event, this._uiHash(this)); };  }).call(this, this.containers[i]));
-				this.containers[i].containerCache.over = 0;
-			}
-		}
-
-		//Do what was originally in plugins
-		if(this._storedCursor) $('body').css("cursor", this._storedCursor); //Reset cursor
-		if(this._storedOpacity) this.helper.css("opacity", this._storedOpacity); //Reset opacity
-		if(this._storedZIndex) this.helper.css("zIndex", this._storedZIndex == 'auto' ? '' : this._storedZIndex); //Reset z-index
-
-		this.dragging = false;
-		if(this.cancelHelperRemoval) {
-			if(!noPropagation) {
-				this._trigger("beforeStop", event, this._uiHash());
-				for (var i=0; i < delayedTriggers.length; i++) { delayedTriggers[i].call(this, event); }; //Trigger all delayed events
-				this._trigger("stop", event, this._uiHash());
-			}
-
-			this.fromOutside = false;
-			return false;
-		}
-
-		if(!noPropagation) this._trigger("beforeStop", event, this._uiHash());
-
-		//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
-		this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
-
-		if(this.helper[0] != this.currentItem[0]) this.helper.remove(); this.helper = null;
-
-		if(!noPropagation) {
-			for (var i=0; i < delayedTriggers.length; i++) { delayedTriggers[i].call(this, event); }; //Trigger all delayed events
-			this._trigger("stop", event, this._uiHash());
-		}
-
-		this.fromOutside = false;
-		return true;
-
-	},
-
-	_trigger: function() {
-		if ($.Widget.prototype._trigger.apply(this, arguments) === false) {
-			this.cancel();
-		}
-	},
-
-	_uiHash: function(_inst) {
-		var inst = _inst || this;
-		return {
-			helper: inst.helper,
-			placeholder: inst.placeholder || $([]),
-			position: inst.position,
-			originalPosition: inst.originalPosition,
-			offset: inst.positionAbs,
-			item: inst.currentItem,
-			sender: _inst ? _inst.element : null
-		};
-	}
-
-});
-
-})(jQuery);
-(function( $ ) {
-
-function modifier( fn ) {
-	return function() {
-		var previous = this.element.val();
-		fn.apply( this, arguments );
-		this._refresh();
-		if ( previous !== this.element.val() ) {
-			this._trigger( "change" );
-		}
-	};
-}
-
-$.widget( "ui.spinner", {
-	version: "1.9.2",
-	defaultElement: "",
-	widgetEventPrefix: "spin",
-	options: {
-		culture: null,
-		icons: {
-			down: "ui-icon-triangle-1-s",
-			up: "ui-icon-triangle-1-n"
-		},
-		incremental: true,
-		max: null,
-		min: null,
-		numberFormat: null,
-		page: 10,
-		step: 1,
-
-		change: null,
-		spin: null,
-		start: null,
-		stop: null
-	},
-
-	_create: function() {
-		// handle string values that need to be parsed
-		this._setOption( "max", this.options.max );
-		this._setOption( "min", this.options.min );
-		this._setOption( "step", this.options.step );
-
-		// format the value, but don't constrain
-		this._value( this.element.val(), true );
-
-		this._draw();
-		this._on( this._events );
-		this._refresh();
-
-		// turning off autocomplete prevents the browser from remembering the
-		// value when navigating through history, so we re-enable autocomplete
-		// if the page is unloaded before the widget is destroyed. #7790
-		this._on( this.window, {
-			beforeunload: function() {
-				this.element.removeAttr( "autocomplete" );
-			}
-		});
-	},
-
-	_getCreateOptions: function() {
-		var options = {},
-			element = this.element;
-
-		$.each( [ "min", "max", "step" ], function( i, option ) {
-			var value = element.attr( option );
-			if ( value !== undefined && value.length ) {
-				options[ option ] = value;
-			}
-		});
-
-		return options;
-	},
-
-	_events: {
-		keydown: function( event ) {
-			if ( this._start( event ) && this._keydown( event ) ) {
-				event.preventDefault();
-			}
-		},
-		keyup: "_stop",
-		focus: function() {
-			this.previous = this.element.val();
-		},
-		blur: function( event ) {
-			if ( this.cancelBlur ) {
-				delete this.cancelBlur;
-				return;
-			}
-
-			this._refresh();
-			if ( this.previous !== this.element.val() ) {
-				this._trigger( "change", event );
-			}
-		},
-		mousewheel: function( event, delta ) {
-			if ( !delta ) {
-				return;
-			}
-			if ( !this.spinning && !this._start( event ) ) {
-				return false;
-			}
-
-			this._spin( (delta > 0 ? 1 : -1) * this.options.step, event );
-			clearTimeout( this.mousewheelTimer );
-			this.mousewheelTimer = this._delay(function() {
-				if ( this.spinning ) {
-					this._stop( event );
-				}
-			}, 100 );
-			event.preventDefault();
-		},
-		"mousedown .ui-spinner-button": function( event ) {
-			var previous;
-
-			// We never want the buttons to have focus; whenever the user is
-			// interacting with the spinner, the focus should be on the input.
-			// If the input is focused then this.previous is properly set from
-			// when the input first received focus. If the input is not focused
-			// then we need to set this.previous based on the value before spinning.
-			previous = this.element[0] === this.document[0].activeElement ?
-				this.previous : this.element.val();
-			function checkFocus() {
-				var isActive = this.element[0] === this.document[0].activeElement;
-				if ( !isActive ) {
-					this.element.focus();
-					this.previous = previous;
-					// support: IE
-					// IE sets focus asynchronously, so we need to check if focus
-					// moved off of the input because the user clicked on the button.
-					this._delay(function() {
-						this.previous = previous;
-					});
-				}
-			}
-
-			// ensure focus is on (or stays on) the text field
-			event.preventDefault();
-			checkFocus.call( this );
-
-			// support: IE
-			// IE doesn't prevent moving focus even with event.preventDefault()
-			// so we set a flag to know when we should ignore the blur event
-			// and check (again) if focus moved off of the input.
-			this.cancelBlur = true;
-			this._delay(function() {
-				delete this.cancelBlur;
-				checkFocus.call( this );
-			});
-
-			if ( this._start( event ) === false ) {
-				return;
-			}
-
-			this._repeat( null, $( event.currentTarget ).hasClass( "ui-spinner-up" ) ? 1 : -1, event );
-		},
-		"mouseup .ui-spinner-button": "_stop",
-		"mouseenter .ui-spinner-button": function( event ) {
-			// button will add ui-state-active if mouse was down while mouseleave and kept down
-			if ( !$( event.currentTarget ).hasClass( "ui-state-active" ) ) {
-				return;
-			}
-
-			if ( this._start( event ) === false ) {
-				return false;
-			}
-			this._repeat( null, $( event.currentTarget ).hasClass( "ui-spinner-up" ) ? 1 : -1, event );
-		},
-		// TODO: do we really want to consider this a stop?
-		// shouldn't we just stop the repeater and wait until mouseup before
-		// we trigger the stop event?
-		"mouseleave .ui-spinner-button": "_stop"
-	},
-
-	_draw: function() {
-		var uiSpinner = this.uiSpinner = this.element
-			.addClass( "ui-spinner-input" )
-			.attr( "autocomplete", "off" )
-			.wrap( this._uiSpinnerHtml() )
-			.parent()
-				// add buttons
-				.append( this._buttonHtml() );
-
-		this.element.attr( "role", "spinbutton" );
-
-		// button bindings
-		this.buttons = uiSpinner.find( ".ui-spinner-button" )
-			.attr( "tabIndex", -1 )
-			.button()
-			.removeClass( "ui-corner-all" );
-
-		// IE 6 doesn't understand height: 50% for the buttons
-		// unless the wrapper has an explicit height
-		if ( this.buttons.height() > Math.ceil( uiSpinner.height() * 0.5 ) &&
-				uiSpinner.height() > 0 ) {
-			uiSpinner.height( uiSpinner.height() );
-		}
-
-		// disable spinner if element was already disabled
-		if ( this.options.disabled ) {
-			this.disable();
-		}
-	},
-
-	_keydown: function( event ) {
-		var options = this.options,
-			keyCode = $.ui.keyCode;
-
-		switch ( event.keyCode ) {
-		case keyCode.UP:
-			this._repeat( null, 1, event );
-			return true;
-		case keyCode.DOWN:
-			this._repeat( null, -1, event );
-			return true;
-		case keyCode.PAGE_UP:
-			this._repeat( null, options.page, event );
-			return true;
-		case keyCode.PAGE_DOWN:
-			this._repeat( null, -options.page, event );
-			return true;
-		}
-
-		return false;
-	},
-
-	_uiSpinnerHtml: function() {
-		return "";
-	},
-
-	_buttonHtml: function() {
-		return "" +
-			"" +
-			"";
-	},
-
-	_start: function( event ) {
-		if ( !this.spinning && this._trigger( "start", event ) === false ) {
-			return false;
-		}
-
-		if ( !this.counter ) {
-			this.counter = 1;
-		}
-		this.spinning = true;
-		return true;
-	},
-
-	_repeat: function( i, steps, event ) {
-		i = i || 500;
-
-		clearTimeout( this.timer );
-		this.timer = this._delay(function() {
-			this._repeat( 40, steps, event );
-		}, i );
-
-		this._spin( steps * this.options.step, event );
-	},
-
-	_spin: function( step, event ) {
-		var value = this.value() || 0;
-
-		if ( !this.counter ) {
-			this.counter = 1;
-		}
-
-		value = this._adjustValue( value + step * this._increment( this.counter ) );
-
-		if ( !this.spinning || this._trigger( "spin", event, { value: value } ) !== false) {
-			this._value( value );
-			this.counter++;
-		}
-	},
-
-	_increment: function( i ) {
-		var incremental = this.options.incremental;
-
-		if ( incremental ) {
-			return $.isFunction( incremental ) ?
-				incremental( i ) :
-				Math.floor( i*i*i/50000 - i*i/500 + 17*i/200 + 1 );
-		}
-
-		return 1;
-	},
-
-	_precision: function() {
-		var precision = this._precisionOf( this.options.step );
-		if ( this.options.min !== null ) {
-			precision = Math.max( precision, this._precisionOf( this.options.min ) );
-		}
-		return precision;
-	},
-
-	_precisionOf: function( num ) {
-		var str = num.toString(),
-			decimal = str.indexOf( "." );
-		return decimal === -1 ? 0 : str.length - decimal - 1;
-	},
-
-	_adjustValue: function( value ) {
-		var base, aboveMin,
-			options = this.options;
-
-		// make sure we're at a valid step
-		// - find out where we are relative to the base (min or 0)
-		base = options.min !== null ? options.min : 0;
-		aboveMin = value - base;
-		// - round to the nearest step
-		aboveMin = Math.round(aboveMin / options.step) * options.step;
-		// - rounding is based on 0, so adjust back to our base
-		value = base + aboveMin;
-
-		// fix precision from bad JS floating point math
-		value = parseFloat( value.toFixed( this._precision() ) );
-
-		// clamp the value
-		if ( options.max !== null && value > options.max) {
-			return options.max;
-		}
-		if ( options.min !== null && value < options.min ) {
-			return options.min;
-		}
-
-		return value;
-	},
-
-	_stop: function( event ) {
-		if ( !this.spinning ) {
-			return;
-		}
-
-		clearTimeout( this.timer );
-		clearTimeout( this.mousewheelTimer );
-		this.counter = 0;
-		this.spinning = false;
-		this._trigger( "stop", event );
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "culture" || key === "numberFormat" ) {
-			var prevValue = this._parse( this.element.val() );
-			this.options[ key ] = value;
-			this.element.val( this._format( prevValue ) );
-			return;
-		}
-
-		if ( key === "max" || key === "min" || key === "step" ) {
-			if ( typeof value === "string" ) {
-				value = this._parse( value );
-			}
-		}
-
-		this._super( key, value );
-
-		if ( key === "disabled" ) {
-			if ( value ) {
-				this.element.prop( "disabled", true );
-				this.buttons.button( "disable" );
-			} else {
-				this.element.prop( "disabled", false );
-				this.buttons.button( "enable" );
-			}
-		}
-	},
-
-	_setOptions: modifier(function( options ) {
-		this._super( options );
-		this._value( this.element.val() );
-	}),
-
-	_parse: function( val ) {
-		if ( typeof val === "string" && val !== "" ) {
-			val = window.Globalize && this.options.numberFormat ?
-				Globalize.parseFloat( val, 10, this.options.culture ) : +val;
-		}
-		return val === "" || isNaN( val ) ? null : val;
-	},
-
-	_format: function( value ) {
-		if ( value === "" ) {
-			return "";
-		}
-		return window.Globalize && this.options.numberFormat ?
-			Globalize.format( value, this.options.numberFormat, this.options.culture ) :
-			value;
-	},
-
-	_refresh: function() {
-		this.element.attr({
-			"aria-valuemin": this.options.min,
-			"aria-valuemax": this.options.max,
-			// TODO: what should we do with values that can't be parsed?
-			"aria-valuenow": this._parse( this.element.val() )
-		});
-	},
-
-	// update the value without triggering change
-	_value: function( value, allowAny ) {
-		var parsed;
-		if ( value !== "" ) {
-			parsed = this._parse( value );
-			if ( parsed !== null ) {
-				if ( !allowAny ) {
-					parsed = this._adjustValue( parsed );
-				}
-				value = this._format( parsed );
-			}
-		}
-		this.element.val( value );
-		this._refresh();
-	},
-
-	_destroy: function() {
-		this.element
-			.removeClass( "ui-spinner-input" )
-			.prop( "disabled", false )
-			.removeAttr( "autocomplete" )
-			.removeAttr( "role" )
-			.removeAttr( "aria-valuemin" )
-			.removeAttr( "aria-valuemax" )
-			.removeAttr( "aria-valuenow" );
-		this.uiSpinner.replaceWith( this.element );
-	},
-
-	stepUp: modifier(function( steps ) {
-		this._stepUp( steps );
-	}),
-	_stepUp: function( steps ) {
-		this._spin( (steps || 1) * this.options.step );
-	},
-
-	stepDown: modifier(function( steps ) {
-		this._stepDown( steps );
-	}),
-	_stepDown: function( steps ) {
-		this._spin( (steps || 1) * -this.options.step );
-	},
-
-	pageUp: modifier(function( pages ) {
-		this._stepUp( (pages || 1) * this.options.page );
-	}),
-
-	pageDown: modifier(function( pages ) {
-		this._stepDown( (pages || 1) * this.options.page );
-	}),
-
-	value: function( newVal ) {
-		if ( !arguments.length ) {
-			return this._parse( this.element.val() );
-		}
-		modifier( this._value ).call( this, newVal );
-	},
-
-	widget: function() {
-		return this.uiSpinner;
-	}
-});
-
-}( jQuery ) );
-(function( $, undefined ) {
-
-var tabId = 0,
-	rhash = /#.*$/;
-
-function getNextTabId() {
-	return ++tabId;
-}
-
-function isLocal( anchor ) {
-	return anchor.hash.length > 1 &&
-		anchor.href.replace( rhash, "" ) ===
-			location.href.replace( rhash, "" )
-				// support: Safari 5.1
-				// Safari 5.1 doesn't encode spaces in window.location
-				// but it does encode spaces from anchors (#8777)
-				.replace( /\s/g, "%20" );
-}
-
-$.widget( "ui.tabs", {
-	version: "1.9.2",
-	delay: 300,
-	options: {
-		active: null,
-		collapsible: false,
-		event: "click",
-		heightStyle: "content",
-		hide: null,
-		show: null,
-
-		// callbacks
-		activate: null,
-		beforeActivate: null,
-		beforeLoad: null,
-		load: null
-	},
-
-	_create: function() {
-		var that = this,
-			options = this.options,
-			active = options.active,
-			locationHash = location.hash.substring( 1 );
-
-		this.running = false;
-
-		this.element
-			.addClass( "ui-tabs ui-widget ui-widget-content ui-corner-all" )
-			.toggleClass( "ui-tabs-collapsible", options.collapsible )
-			// Prevent users from focusing disabled tabs via click
-			.delegate( ".ui-tabs-nav > li", "mousedown" + this.eventNamespace, function( event ) {
-				if ( $( this ).is( ".ui-state-disabled" ) ) {
-					event.preventDefault();
-				}
-			})
-			// support: IE <9
-			// Preventing the default action in mousedown doesn't prevent IE
-			// from focusing the element, so if the anchor gets focused, blur.
-			// We don't have to worry about focusing the previously focused
-			// element since clicking on a non-focusable element should focus
-			// the body anyway.
-			.delegate( ".ui-tabs-anchor", "focus" + this.eventNamespace, function() {
-				if ( $( this ).closest( "li" ).is( ".ui-state-disabled" ) ) {
-					this.blur();
-				}
-			});
-
-		this._processTabs();
-
-		if ( active === null ) {
-			// check the fragment identifier in the URL
-			if ( locationHash ) {
-				this.tabs.each(function( i, tab ) {
-					if ( $( tab ).attr( "aria-controls" ) === locationHash ) {
-						active = i;
-						return false;
-					}
-				});
-			}
-
-			// check for a tab marked active via a class
-			if ( active === null ) {
-				active = this.tabs.index( this.tabs.filter( ".ui-tabs-active" ) );
-			}
-
-			// no active tab, set to false
-			if ( active === null || active === -1 ) {
-				active = this.tabs.length ? 0 : false;
-			}
-		}
-
-		// handle numbers: negative, out of range
-		if ( active !== false ) {
-			active = this.tabs.index( this.tabs.eq( active ) );
-			if ( active === -1 ) {
-				active = options.collapsible ? false : 0;
-			}
-		}
-		options.active = active;
-
-		// don't allow collapsible: false and active: false
-		if ( !options.collapsible && options.active === false && this.anchors.length ) {
-			options.active = 0;
-		}
-
-		// Take disabling tabs via class attribute from HTML
-		// into account and update option properly.
-		if ( $.isArray( options.disabled ) ) {
-			options.disabled = $.unique( options.disabled.concat(
-				$.map( this.tabs.filter( ".ui-state-disabled" ), function( li ) {
-					return that.tabs.index( li );
-				})
-			) ).sort();
-		}
-
-		// check for length avoids error when initializing empty list
-		if ( this.options.active !== false && this.anchors.length ) {
-			this.active = this._findActive( this.options.active );
-		} else {
-			this.active = $();
-		}
-
-		this._refresh();
-
-		if ( this.active.length ) {
-			this.load( options.active );
-		}
-	},
-
-	_getCreateEventData: function() {
-		return {
-			tab: this.active,
-			panel: !this.active.length ? $() : this._getPanelForTab( this.active )
-		};
-	},
-
-	_tabKeydown: function( event ) {
-		var focusedTab = $( this.document[0].activeElement ).closest( "li" ),
-			selectedIndex = this.tabs.index( focusedTab ),
-			goingForward = true;
-
-		if ( this._handlePageNav( event ) ) {
-			return;
-		}
-
-		switch ( event.keyCode ) {
-			case $.ui.keyCode.RIGHT:
-			case $.ui.keyCode.DOWN:
-				selectedIndex++;
-				break;
-			case $.ui.keyCode.UP:
-			case $.ui.keyCode.LEFT:
-				goingForward = false;
-				selectedIndex--;
-				break;
-			case $.ui.keyCode.END:
-				selectedIndex = this.anchors.length - 1;
-				break;
-			case $.ui.keyCode.HOME:
-				selectedIndex = 0;
-				break;
-			case $.ui.keyCode.SPACE:
-				// Activate only, no collapsing
-				event.preventDefault();
-				clearTimeout( this.activating );
-				this._activate( selectedIndex );
-				return;
-			case $.ui.keyCode.ENTER:
-				// Toggle (cancel delayed activation, allow collapsing)
-				event.preventDefault();
-				clearTimeout( this.activating );
-				// Determine if we should collapse or activate
-				this._activate( selectedIndex === this.options.active ? false : selectedIndex );
-				return;
-			default:
-				return;
-		}
-
-		// Focus the appropriate tab, based on which key was pressed
-		event.preventDefault();
-		clearTimeout( this.activating );
-		selectedIndex = this._focusNextTab( selectedIndex, goingForward );
-
-		// Navigating with control key will prevent automatic activation
-		if ( !event.ctrlKey ) {
-			// Update aria-selected immediately so that AT think the tab is already selected.
-			// Otherwise AT may confuse the user by stating that they need to activate the tab,
-			// but the tab will already be activated by the time the announcement finishes.
-			focusedTab.attr( "aria-selected", "false" );
-			this.tabs.eq( selectedIndex ).attr( "aria-selected", "true" );
-
-			this.activating = this._delay(function() {
-				this.option( "active", selectedIndex );
-			}, this.delay );
-		}
-	},
-
-	_panelKeydown: function( event ) {
-		if ( this._handlePageNav( event ) ) {
-			return;
-		}
-
-		// Ctrl+up moves focus to the current tab
-		if ( event.ctrlKey && event.keyCode === $.ui.keyCode.UP ) {
-			event.preventDefault();
-			this.active.focus();
-		}
-	},
-
-	// Alt+page up/down moves focus to the previous/next tab (and activates)
-	_handlePageNav: function( event ) {
-		if ( event.altKey && event.keyCode === $.ui.keyCode.PAGE_UP ) {
-			this._activate( this._focusNextTab( this.options.active - 1, false ) );
-			return true;
-		}
-		if ( event.altKey && event.keyCode === $.ui.keyCode.PAGE_DOWN ) {
-			this._activate( this._focusNextTab( this.options.active + 1, true ) );
-			return true;
-		}
-	},
-
-	_findNextTab: function( index, goingForward ) {
-		var lastTabIndex = this.tabs.length - 1;
-
-		function constrain() {
-			if ( index > lastTabIndex ) {
-				index = 0;
-			}
-			if ( index < 0 ) {
-				index = lastTabIndex;
-			}
-			return index;
-		}
-
-		while ( $.inArray( constrain(), this.options.disabled ) !== -1 ) {
-			index = goingForward ? index + 1 : index - 1;
-		}
-
-		return index;
-	},
-
-	_focusNextTab: function( index, goingForward ) {
-		index = this._findNextTab( index, goingForward );
-		this.tabs.eq( index ).focus();
-		return index;
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "active" ) {
-			// _activate() will handle invalid values and update this.options
-			this._activate( value );
-			return;
-		}
-
-		if ( key === "disabled" ) {
-			// don't use the widget factory's disabled handling
-			this._setupDisabled( value );
-			return;
-		}
-
-		this._super( key, value);
-
-		if ( key === "collapsible" ) {
-			this.element.toggleClass( "ui-tabs-collapsible", value );
-			// Setting collapsible: false while collapsed; open first panel
-			if ( !value && this.options.active === false ) {
-				this._activate( 0 );
-			}
-		}
-
-		if ( key === "event" ) {
-			this._setupEvents( value );
-		}
-
-		if ( key === "heightStyle" ) {
-			this._setupHeightStyle( value );
-		}
-	},
-
-	_tabId: function( tab ) {
-		return tab.attr( "aria-controls" ) || "ui-tabs-" + getNextTabId();
-	},
-
-	_sanitizeSelector: function( hash ) {
-		return hash ? hash.replace( /[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g, "\\$&" ) : "";
-	},
-
-	refresh: function() {
-		var options = this.options,
-			lis = this.tablist.children( ":has(a[href])" );
-
-		// get disabled tabs from class attribute from HTML
-		// this will get converted to a boolean if needed in _refresh()
-		options.disabled = $.map( lis.filter( ".ui-state-disabled" ), function( tab ) {
-			return lis.index( tab );
-		});
-
-		this._processTabs();
-
-		// was collapsed or no tabs
-		if ( options.active === false || !this.anchors.length ) {
-			options.active = false;
-			this.active = $();
-		// was active, but active tab is gone
-		} else if ( this.active.length && !$.contains( this.tablist[ 0 ], this.active[ 0 ] ) ) {
-			// all remaining tabs are disabled
-			if ( this.tabs.length === options.disabled.length ) {
-				options.active = false;
-				this.active = $();
-			// activate previous tab
-			} else {
-				this._activate( this._findNextTab( Math.max( 0, options.active - 1 ), false ) );
-			}
-		// was active, active tab still exists
-		} else {
-			// make sure active index is correct
-			options.active = this.tabs.index( this.active );
-		}
-
-		this._refresh();
-	},
-
-	_refresh: function() {
-		this._setupDisabled( this.options.disabled );
-		this._setupEvents( this.options.event );
-		this._setupHeightStyle( this.options.heightStyle );
-
-		this.tabs.not( this.active ).attr({
-			"aria-selected": "false",
-			tabIndex: -1
-		});
-		this.panels.not( this._getPanelForTab( this.active ) )
-			.hide()
-			.attr({
-				"aria-expanded": "false",
-				"aria-hidden": "true"
-			});
-
-		// Make sure one tab is in the tab order
-		if ( !this.active.length ) {
-			this.tabs.eq( 0 ).attr( "tabIndex", 0 );
-		} else {
-			this.active
-				.addClass( "ui-tabs-active ui-state-active" )
-				.attr({
-					"aria-selected": "true",
-					tabIndex: 0
-				});
-			this._getPanelForTab( this.active )
-				.show()
-				.attr({
-					"aria-expanded": "true",
-					"aria-hidden": "false"
-				});
-		}
-	},
-
-	_processTabs: function() {
-		var that = this;
-
-		this.tablist = this._getList()
-			.addClass( "ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all" )
-			.attr( "role", "tablist" );
-
-		this.tabs = this.tablist.find( "> li:has(a[href])" )
-			.addClass( "ui-state-default ui-corner-top" )
-			.attr({
-				role: "tab",
-				tabIndex: -1
-			});
-
-		this.anchors = this.tabs.map(function() {
-				return $( "a", this )[ 0 ];
-			})
-			.addClass( "ui-tabs-anchor" )
-			.attr({
-				role: "presentation",
-				tabIndex: -1
-			});
-
-		this.panels = $();
-
-		this.anchors.each(function( i, anchor ) {
-			var selector, panel, panelId,
-				anchorId = $( anchor ).uniqueId().attr( "id" ),
-				tab = $( anchor ).closest( "li" ),
-				originalAriaControls = tab.attr( "aria-controls" );
-
-			// inline tab
-			if ( isLocal( anchor ) ) {
-				selector = anchor.hash;
-				panel = that.element.find( that._sanitizeSelector( selector ) );
-			// remote tab
-			} else {
-				panelId = that._tabId( tab );
-				selector = "#" + panelId;
-				panel = that.element.find( selector );
-				if ( !panel.length ) {
-					panel = that._createPanel( panelId );
-					panel.insertAfter( that.panels[ i - 1 ] || that.tablist );
-				}
-				panel.attr( "aria-live", "polite" );
-			}
-
-			if ( panel.length) {
-				that.panels = that.panels.add( panel );
-			}
-			if ( originalAriaControls ) {
-				tab.data( "ui-tabs-aria-controls", originalAriaControls );
-			}
-			tab.attr({
-				"aria-controls": selector.substring( 1 ),
-				"aria-labelledby": anchorId
-			});
-			panel.attr( "aria-labelledby", anchorId );
-		});
-
-		this.panels
-			.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" )
-			.attr( "role", "tabpanel" );
-	},
-
-	// allow overriding how to find the list for rare usage scenarios (#7715)
-	_getList: function() {
-		return this.element.find( "ol,ul" ).eq( 0 );
-	},
-
-	_createPanel: function( id ) {
-		return $( "
        " )
-			.attr( "id", id )
-			.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" )
-			.data( "ui-tabs-destroy", true );
-	},
-
-	_setupDisabled: function( disabled ) {
-		if ( $.isArray( disabled ) ) {
-			if ( !disabled.length ) {
-				disabled = false;
-			} else if ( disabled.length === this.anchors.length ) {
-				disabled = true;
-			}
-		}
-
-		// disable tabs
-		for ( var i = 0, li; ( li = this.tabs[ i ] ); i++ ) {
-			if ( disabled === true || $.inArray( i, disabled ) !== -1 ) {
-				$( li )
-					.addClass( "ui-state-disabled" )
-					.attr( "aria-disabled", "true" );
-			} else {
-				$( li )
-					.removeClass( "ui-state-disabled" )
-					.removeAttr( "aria-disabled" );
-			}
-		}
-
-		this.options.disabled = disabled;
-	},
-
-	_setupEvents: function( event ) {
-		var events = {
-			click: function( event ) {
-				event.preventDefault();
-			}
-		};
-		if ( event ) {
-			$.each( event.split(" "), function( index, eventName ) {
-				events[ eventName ] = "_eventHandler";
-			});
-		}
-
-		this._off( this.anchors.add( this.tabs ).add( this.panels ) );
-		this._on( this.anchors, events );
-		this._on( this.tabs, { keydown: "_tabKeydown" } );
-		this._on( this.panels, { keydown: "_panelKeydown" } );
-
-		this._focusable( this.tabs );
-		this._hoverable( this.tabs );
-	},
-
-	_setupHeightStyle: function( heightStyle ) {
-		var maxHeight, overflow,
-			parent = this.element.parent();
-
-		if ( heightStyle === "fill" ) {
-			// IE 6 treats height like minHeight, so we need to turn off overflow
-			// in order to get a reliable height
-			// we use the minHeight support test because we assume that only
-			// browsers that don't support minHeight will treat height as minHeight
-			if ( !$.support.minHeight ) {
-				overflow = parent.css( "overflow" );
-				parent.css( "overflow", "hidden");
-			}
-			maxHeight = parent.height();
-			this.element.siblings( ":visible" ).each(function() {
-				var elem = $( this ),
-					position = elem.css( "position" );
-
-				if ( position === "absolute" || position === "fixed" ) {
-					return;
-				}
-				maxHeight -= elem.outerHeight( true );
-			});
-			if ( overflow ) {
-				parent.css( "overflow", overflow );
-			}
-
-			this.element.children().not( this.panels ).each(function() {
-				maxHeight -= $( this ).outerHeight( true );
-			});
-
-			this.panels.each(function() {
-				$( this ).height( Math.max( 0, maxHeight -
-					$( this ).innerHeight() + $( this ).height() ) );
-			})
-			.css( "overflow", "auto" );
-		} else if ( heightStyle === "auto" ) {
-			maxHeight = 0;
-			this.panels.each(function() {
-				maxHeight = Math.max( maxHeight, $( this ).height( "" ).height() );
-			}).height( maxHeight );
-		}
-	},
-
-	_eventHandler: function( event ) {
-		var options = this.options,
-			active = this.active,
-			anchor = $( event.currentTarget ),
-			tab = anchor.closest( "li" ),
-			clickedIsActive = tab[ 0 ] === active[ 0 ],
-			collapsing = clickedIsActive && options.collapsible,
-			toShow = collapsing ? $() : this._getPanelForTab( tab ),
-			toHide = !active.length ? $() : this._getPanelForTab( active ),
-			eventData = {
-				oldTab: active,
-				oldPanel: toHide,
-				newTab: collapsing ? $() : tab,
-				newPanel: toShow
-			};
-
-		event.preventDefault();
-
-		if ( tab.hasClass( "ui-state-disabled" ) ||
-				// tab is already loading
-				tab.hasClass( "ui-tabs-loading" ) ||
-				// can't switch durning an animation
-				this.running ||
-				// click on active header, but not collapsible
-				( clickedIsActive && !options.collapsible ) ||
-				// allow canceling activation
-				( this._trigger( "beforeActivate", event, eventData ) === false ) ) {
-			return;
-		}
-
-		options.active = collapsing ? false : this.tabs.index( tab );
-
-		this.active = clickedIsActive ? $() : tab;
-		if ( this.xhr ) {
-			this.xhr.abort();
-		}
-
-		if ( !toHide.length && !toShow.length ) {
-			$.error( "jQuery UI Tabs: Mismatching fragment identifier." );
-		}
-
-		if ( toShow.length ) {
-			this.load( this.tabs.index( tab ), event );
-		}
-		this._toggle( event, eventData );
-	},
-
-	// handles show/hide for selecting tabs
-	_toggle: function( event, eventData ) {
-		var that = this,
-			toShow = eventData.newPanel,
-			toHide = eventData.oldPanel;
-
-		this.running = true;
-
-		function complete() {
-			that.running = false;
-			that._trigger( "activate", event, eventData );
-		}
-
-		function show() {
-			eventData.newTab.closest( "li" ).addClass( "ui-tabs-active ui-state-active" );
-
-			if ( toShow.length && that.options.show ) {
-				that._show( toShow, that.options.show, complete );
-			} else {
-				toShow.show();
-				complete();
-			}
-		}
-
-		// start out by hiding, then showing, then completing
-		if ( toHide.length && this.options.hide ) {
-			this._hide( toHide, this.options.hide, function() {
-				eventData.oldTab.closest( "li" ).removeClass( "ui-tabs-active ui-state-active" );
-				show();
-			});
-		} else {
-			eventData.oldTab.closest( "li" ).removeClass( "ui-tabs-active ui-state-active" );
-			toHide.hide();
-			show();
-		}
-
-		toHide.attr({
-			"aria-expanded": "false",
-			"aria-hidden": "true"
-		});
-		eventData.oldTab.attr( "aria-selected", "false" );
-		// If we're switching tabs, remove the old tab from the tab order.
-		// If we're opening from collapsed state, remove the previous tab from the tab order.
-		// If we're collapsing, then keep the collapsing tab in the tab order.
-		if ( toShow.length && toHide.length ) {
-			eventData.oldTab.attr( "tabIndex", -1 );
-		} else if ( toShow.length ) {
-			this.tabs.filter(function() {
-				return $( this ).attr( "tabIndex" ) === 0;
-			})
-			.attr( "tabIndex", -1 );
-		}
-
-		toShow.attr({
-			"aria-expanded": "true",
-			"aria-hidden": "false"
-		});
-		eventData.newTab.attr({
-			"aria-selected": "true",
-			tabIndex: 0
-		});
-	},
-
-	_activate: function( index ) {
-		var anchor,
-			active = this._findActive( index );
-
-		// trying to activate the already active panel
-		if ( active[ 0 ] === this.active[ 0 ] ) {
-			return;
-		}
-
-		// trying to collapse, simulate a click on the current active header
-		if ( !active.length ) {
-			active = this.active;
-		}
-
-		anchor = active.find( ".ui-tabs-anchor" )[ 0 ];
-		this._eventHandler({
-			target: anchor,
-			currentTarget: anchor,
-			preventDefault: $.noop
-		});
-	},
-
-	_findActive: function( index ) {
-		return index === false ? $() : this.tabs.eq( index );
-	},
-
-	_getIndex: function( index ) {
-		// meta-function to give users option to provide a href string instead of a numerical index.
-		if ( typeof index === "string" ) {
-			index = this.anchors.index( this.anchors.filter( "[href$='" + index + "']" ) );
-		}
-
-		return index;
-	},
-
-	_destroy: function() {
-		if ( this.xhr ) {
-			this.xhr.abort();
-		}
-
-		this.element.removeClass( "ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible" );
-
-		this.tablist
-			.removeClass( "ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all" )
-			.removeAttr( "role" );
-
-		this.anchors
-			.removeClass( "ui-tabs-anchor" )
-			.removeAttr( "role" )
-			.removeAttr( "tabIndex" )
-			.removeData( "href.tabs" )
-			.removeData( "load.tabs" )
-			.removeUniqueId();
-
-		this.tabs.add( this.panels ).each(function() {
-			if ( $.data( this, "ui-tabs-destroy" ) ) {
-				$( this ).remove();
-			} else {
-				$( this )
-					.removeClass( "ui-state-default ui-state-active ui-state-disabled " +
-						"ui-corner-top ui-corner-bottom ui-widget-content ui-tabs-active ui-tabs-panel" )
-					.removeAttr( "tabIndex" )
-					.removeAttr( "aria-live" )
-					.removeAttr( "aria-busy" )
-					.removeAttr( "aria-selected" )
-					.removeAttr( "aria-labelledby" )
-					.removeAttr( "aria-hidden" )
-					.removeAttr( "aria-expanded" )
-					.removeAttr( "role" );
-			}
-		});
-
-		this.tabs.each(function() {
-			var li = $( this ),
-				prev = li.data( "ui-tabs-aria-controls" );
-			if ( prev ) {
-				li.attr( "aria-controls", prev );
-			} else {
-				li.removeAttr( "aria-controls" );
-			}
-		});
-
-		this.panels.show();
-
-		if ( this.options.heightStyle !== "content" ) {
-			this.panels.css( "height", "" );
-		}
-	},
-
-	enable: function( index ) {
-		var disabled = this.options.disabled;
-		if ( disabled === false ) {
-			return;
-		}
-
-		if ( index === undefined ) {
-			disabled = false;
-		} else {
-			index = this._getIndex( index );
-			if ( $.isArray( disabled ) ) {
-				disabled = $.map( disabled, function( num ) {
-					return num !== index ? num : null;
-				});
-			} else {
-				disabled = $.map( this.tabs, function( li, num ) {
-					return num !== index ? num : null;
-				});
-			}
-		}
-		this._setupDisabled( disabled );
-	},
-
-	disable: function( index ) {
-		var disabled = this.options.disabled;
-		if ( disabled === true ) {
-			return;
-		}
-
-		if ( index === undefined ) {
-			disabled = true;
-		} else {
-			index = this._getIndex( index );
-			if ( $.inArray( index, disabled ) !== -1 ) {
-				return;
-			}
-			if ( $.isArray( disabled ) ) {
-				disabled = $.merge( [ index ], disabled ).sort();
-			} else {
-				disabled = [ index ];
-			}
-		}
-		this._setupDisabled( disabled );
-	},
-
-	load: function( index, event ) {
-		index = this._getIndex( index );
-		var that = this,
-			tab = this.tabs.eq( index ),
-			anchor = tab.find( ".ui-tabs-anchor" ),
-			panel = this._getPanelForTab( tab ),
-			eventData = {
-				tab: tab,
-				panel: panel
-			};
-
-		// not remote
-		if ( isLocal( anchor[ 0 ] ) ) {
-			return;
-		}
-
-		this.xhr = $.ajax( this._ajaxSettings( anchor, event, eventData ) );
-
-		// support: jQuery <1.8
-		// jQuery <1.8 returns false if the request is canceled in beforeSend,
-		// but as of 1.8, $.ajax() always returns a jqXHR object.
-		if ( this.xhr && this.xhr.statusText !== "canceled" ) {
-			tab.addClass( "ui-tabs-loading" );
-			panel.attr( "aria-busy", "true" );
-
-			this.xhr
-				.success(function( response ) {
-					// support: jQuery <1.8
-					// http://bugs.jquery.com/ticket/11778
-					setTimeout(function() {
-						panel.html( response );
-						that._trigger( "load", event, eventData );
-					}, 1 );
-				})
-				.complete(function( jqXHR, status ) {
-					// support: jQuery <1.8
-					// http://bugs.jquery.com/ticket/11778
-					setTimeout(function() {
-						if ( status === "abort" ) {
-							that.panels.stop( false, true );
-						}
-
-						tab.removeClass( "ui-tabs-loading" );
-						panel.removeAttr( "aria-busy" );
-
-						if ( jqXHR === that.xhr ) {
-							delete that.xhr;
-						}
-					}, 1 );
-				});
-		}
-	},
-
-	// TODO: Remove this function in 1.10 when ajaxOptions is removed
-	_ajaxSettings: function( anchor, event, eventData ) {
-		var that = this;
-		return {
-			url: anchor.attr( "href" ),
-			beforeSend: function( jqXHR, settings ) {
-				return that._trigger( "beforeLoad", event,
-					$.extend( { jqXHR : jqXHR, ajaxSettings: settings }, eventData ) );
-			}
-		};
-	},
-
-	_getPanelForTab: function( tab ) {
-		var id = $( tab ).attr( "aria-controls" );
-		return this.element.find( this._sanitizeSelector( "#" + id ) );
-	}
-});
-
-// DEPRECATED
-if ( $.uiBackCompat !== false ) {
-
-	// helper method for a lot of the back compat extensions
-	$.ui.tabs.prototype._ui = function( tab, panel ) {
-		return {
-			tab: tab,
-			panel: panel,
-			index: this.anchors.index( tab )
-		};
-	};
-
-	// url method
-	$.widget( "ui.tabs", $.ui.tabs, {
-		url: function( index, url ) {
-			this.anchors.eq( index ).attr( "href", url );
-		}
-	});
-
-	// TODO: Remove _ajaxSettings() method when removing this extension
-	// ajaxOptions and cache options
-	$.widget( "ui.tabs", $.ui.tabs, {
-		options: {
-			ajaxOptions: null,
-			cache: false
-		},
-
-		_create: function() {
-			this._super();
-
-			var that = this;
-
-			this._on({ tabsbeforeload: function( event, ui ) {
-				// tab is already cached
-				if ( $.data( ui.tab[ 0 ], "cache.tabs" ) ) {
-					event.preventDefault();
-					return;
-				}
-
-				ui.jqXHR.success(function() {
-					if ( that.options.cache ) {
-						$.data( ui.tab[ 0 ], "cache.tabs", true );
-					}
-				});
-			}});
-		},
-
-		_ajaxSettings: function( anchor, event, ui ) {
-			var ajaxOptions = this.options.ajaxOptions;
-			return $.extend( {}, ajaxOptions, {
-				error: function( xhr, status ) {
-					try {
-						// Passing index avoid a race condition when this method is
-						// called after the user has selected another tab.
-						// Pass the anchor that initiated this request allows
-						// loadError to manipulate the tab content panel via $(a.hash)
-						ajaxOptions.error(
-							xhr, status, ui.tab.closest( "li" ).index(), ui.tab[ 0 ] );
-					}
-					catch ( error ) {}
-				}
-			}, this._superApply( arguments ) );
-		},
-
-		_setOption: function( key, value ) {
-			// reset cache if switching from cached to not cached
-			if ( key === "cache" && value === false ) {
-				this.anchors.removeData( "cache.tabs" );
-			}
-			this._super( key, value );
-		},
-
-		_destroy: function() {
-			this.anchors.removeData( "cache.tabs" );
-			this._super();
-		},
-
-		url: function( index ){
-			this.anchors.eq( index ).removeData( "cache.tabs" );
-			this._superApply( arguments );
-		}
-	});
-
-	// abort method
-	$.widget( "ui.tabs", $.ui.tabs, {
-		abort: function() {
-			if ( this.xhr ) {
-				this.xhr.abort();
-			}
-		}
-	});
-
-	// spinner
-	$.widget( "ui.tabs", $.ui.tabs, {
-		options: {
-			spinner: "Loading…"
-		},
-		_create: function() {
-			this._super();
-			this._on({
-				tabsbeforeload: function( event, ui ) {
-					// Don't react to nested tabs or tabs that don't use a spinner
-					if ( event.target !== this.element[ 0 ] ||
-							!this.options.spinner ) {
-						return;
-					}
-
-					var span = ui.tab.find( "span" ),
-						html = span.html();
-					span.html( this.options.spinner );
-					ui.jqXHR.complete(function() {
-						span.html( html );
-					});
-				}
-			});
-		}
-	});
-
-	// enable/disable events
-	$.widget( "ui.tabs", $.ui.tabs, {
-		options: {
-			enable: null,
-			disable: null
-		},
-
-		enable: function( index ) {
-			var options = this.options,
-				trigger;
-
-			if ( index && options.disabled === true ||
-					( $.isArray( options.disabled ) && $.inArray( index, options.disabled ) !== -1 ) ) {
-				trigger = true;
-			}
-
-			this._superApply( arguments );
-
-			if ( trigger ) {
-				this._trigger( "enable", null, this._ui( this.anchors[ index ], this.panels[ index ] ) );
-			}
-		},
-
-		disable: function( index ) {
-			var options = this.options,
-				trigger;
-
-			if ( index && options.disabled === false ||
-					( $.isArray( options.disabled ) && $.inArray( index, options.disabled ) === -1 ) ) {
-				trigger = true;
-			}
-
-			this._superApply( arguments );
-
-			if ( trigger ) {
-				this._trigger( "disable", null, this._ui( this.anchors[ index ], this.panels[ index ] ) );
-			}
-		}
-	});
-
-	// add/remove methods and events
-	$.widget( "ui.tabs", $.ui.tabs, {
-		options: {
-			add: null,
-			remove: null,
-			tabTemplate: "
      • #{label}
        • "
-		},
-
-		add: function( url, label, index ) {
-			if ( index === undefined ) {
-				index = this.anchors.length;
-			}
-
-			var doInsertAfter, panel,
-				options = this.options,
-				li = $( options.tabTemplate
-					.replace( /#\{href\}/g, url )
-					.replace( /#\{label\}/g, label ) ),
-				id = !url.indexOf( "#" ) ?
-					url.replace( "#", "" ) :
-					this._tabId( li );
-
-			li.addClass( "ui-state-default ui-corner-top" ).data( "ui-tabs-destroy", true );
-			li.attr( "aria-controls", id );
-
-			doInsertAfter = index >= this.tabs.length;
-
-			// try to find an existing element before creating a new one
-			panel = this.element.find( "#" + id );
-			if ( !panel.length ) {
-				panel = this._createPanel( id );
-				if ( doInsertAfter ) {
-					if ( index > 0 ) {
-						panel.insertAfter( this.panels.eq( -1 ) );
-					} else {
-						panel.appendTo( this.element );
-					}
-				} else {
-					panel.insertBefore( this.panels[ index ] );
-				}
-			}
-			panel.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" ).hide();
-
-			if ( doInsertAfter ) {
-				li.appendTo( this.tablist );
-			} else {
-				li.insertBefore( this.tabs[ index ] );
-			}
-
-			options.disabled = $.map( options.disabled, function( n ) {
-				return n >= index ? ++n : n;
-			});
-
-			this.refresh();
-			if ( this.tabs.length === 1 && options.active === false ) {
-				this.option( "active", 0 );
-			}
-
-			this._trigger( "add", null, this._ui( this.anchors[ index ], this.panels[ index ] ) );
-			return this;
-		},
-
-		remove: function( index ) {
-			index = this._getIndex( index );
-			var options = this.options,
-				tab = this.tabs.eq( index ).remove(),
-				panel = this._getPanelForTab( tab ).remove();
-
-			// If selected tab was removed focus tab to the right or
-			// in case the last tab was removed the tab to the left.
-			// We check for more than 2 tabs, because if there are only 2,
-			// then when we remove this tab, there will only be one tab left
-			// so we don't need to detect which tab to activate.
-			if ( tab.hasClass( "ui-tabs-active" ) && this.anchors.length > 2 ) {
-				this._activate( index + ( index + 1 < this.anchors.length ? 1 : -1 ) );
-			}
-
-			options.disabled = $.map(
-				$.grep( options.disabled, function( n ) {
-					return n !== index;
-				}),
-				function( n ) {
-					return n >= index ? --n : n;
-				});
-
-			this.refresh();
-
-			this._trigger( "remove", null, this._ui( tab.find( "a" )[ 0 ], panel[ 0 ] ) );
-			return this;
-		}
-	});
-
-	// length method
-	$.widget( "ui.tabs", $.ui.tabs, {
-		length: function() {
-			return this.anchors.length;
-		}
-	});
-
-	// panel ids (idPrefix option + title attribute)
-	$.widget( "ui.tabs", $.ui.tabs, {
-		options: {
-			idPrefix: "ui-tabs-"
-		},
-
-		_tabId: function( tab ) {
-			var a = tab.is( "li" ) ? tab.find( "a[href]" ) : tab;
-			a = a[0];
-			return $( a ).closest( "li" ).attr( "aria-controls" ) ||
-				a.title && a.title.replace( /\s/g, "_" ).replace( /[^\w\u00c0-\uFFFF\-]/g, "" ) ||
-				this.options.idPrefix + getNextTabId();
-		}
-	});
-
-	// _createPanel method
-	$.widget( "ui.tabs", $.ui.tabs, {
-		options: {
-			panelTemplate: "
        "
-		},
-
-		_createPanel: function( id ) {
-			return $( this.options.panelTemplate )
-				.attr( "id", id )
-				.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" )
-				.data( "ui-tabs-destroy", true );
-		}
-	});
-
-	// selected option
-	$.widget( "ui.tabs", $.ui.tabs, {
-		_create: function() {
-			var options = this.options;
-			if ( options.active === null && options.selected !== undefined ) {
-				options.active = options.selected === -1 ? false : options.selected;
-			}
-			this._super();
-			options.selected = options.active;
-			if ( options.selected === false ) {
-				options.selected = -1;
-			}
-		},
-
-		_setOption: function( key, value ) {
-			if ( key !== "selected" ) {
-				return this._super( key, value );
-			}
-
-			var options = this.options;
-			this._super( "active", value === -1 ? false : value );
-			options.selected = options.active;
-			if ( options.selected === false ) {
-				options.selected = -1;
-			}
-		},
-
-		_eventHandler: function() {
-			this._superApply( arguments );
-			this.options.selected = this.options.active;
-			if ( this.options.selected === false ) {
-				this.options.selected = -1;
-			}
-		}
-	});
-
-	// show and select event
-	$.widget( "ui.tabs", $.ui.tabs, {
-		options: {
-			show: null,
-			select: null
-		},
-		_create: function() {
-			this._super();
-			if ( this.options.active !== false ) {
-				this._trigger( "show", null, this._ui(
-					this.active.find( ".ui-tabs-anchor" )[ 0 ],
-					this._getPanelForTab( this.active )[ 0 ] ) );
-			}
-		},
-		_trigger: function( type, event, data ) {
-			var tab, panel,
-				ret = this._superApply( arguments );
-
-			if ( !ret ) {
-				return false;
-			}
-
-			if ( type === "beforeActivate" ) {
-				tab = data.newTab.length ? data.newTab : data.oldTab;
-				panel = data.newPanel.length ? data.newPanel : data.oldPanel;
-				ret = this._super( "select", event, {
-					tab: tab.find( ".ui-tabs-anchor" )[ 0],
-					panel: panel[ 0 ],
-					index: tab.closest( "li" ).index()
-				});
-			} else if ( type === "activate" && data.newTab.length ) {
-				ret = this._super( "show", event, {
-					tab: data.newTab.find( ".ui-tabs-anchor" )[ 0 ],
-					panel: data.newPanel[ 0 ],
-					index: data.newTab.closest( "li" ).index()
-				});
-			}
-			return ret;
-		}
-	});
-
-	// select method
-	$.widget( "ui.tabs", $.ui.tabs, {
-		select: function( index ) {
-			index = this._getIndex( index );
-			if ( index === -1 ) {
-				if ( this.options.collapsible && this.options.selected !== -1 ) {
-					index = this.options.selected;
-				} else {
-					return;
-				}
-			}
-			this.anchors.eq( index ).trigger( this.options.event + this.eventNamespace );
-		}
-	});
-
-	// cookie option
-	(function() {
-
-	var listId = 0;
-
-	$.widget( "ui.tabs", $.ui.tabs, {
-		options: {
-			cookie: null // e.g. { expires: 7, path: '/', domain: 'jquery.com', secure: true }
-		},
-		_create: function() {
-			var options = this.options,
-				active;
-			if ( options.active == null && options.cookie ) {
-				active = parseInt( this._cookie(), 10 );
-				if ( active === -1 ) {
-					active = false;
-				}
-				options.active = active;
-			}
-			this._super();
-		},
-		_cookie: function( active ) {
-			var cookie = [ this.cookie ||
-				( this.cookie = this.options.cookie.name || "ui-tabs-" + (++listId) ) ];
-			if ( arguments.length ) {
-				cookie.push( active === false ? -1 : active );
-				cookie.push( this.options.cookie );
-			}
-			return $.cookie.apply( null, cookie );
-		},
-		_refresh: function() {
-			this._super();
-			if ( this.options.cookie ) {
-				this._cookie( this.options.active, this.options.cookie );
-			}
-		},
-		_eventHandler: function() {
-			this._superApply( arguments );
-			if ( this.options.cookie ) {
-				this._cookie( this.options.active, this.options.cookie );
-			}
-		},
-		_destroy: function() {
-			this._super();
-			if ( this.options.cookie ) {
-				this._cookie( null, this.options.cookie );
-			}
-		}
-	});
-
-	})();
-
-	// load event
-	$.widget( "ui.tabs", $.ui.tabs, {
-		_trigger: function( type, event, data ) {
-			var _data = $.extend( {}, data );
-			if ( type === "load" ) {
-				_data.panel = _data.panel[ 0 ];
-				_data.tab = _data.tab.find( ".ui-tabs-anchor" )[ 0 ];
-			}
-			return this._super( type, event, _data );
-		}
-	});
-
-	// fx option
-	// The new animation options (show, hide) conflict with the old show callback.
-	// The old fx option wins over show/hide anyway (always favor back-compat).
-	// If a user wants to use the new animation API, they must give up the old API.
-	$.widget( "ui.tabs", $.ui.tabs, {
-		options: {
-			fx: null // e.g. { height: "toggle", opacity: "toggle", duration: 200 }
-		},
-
-		_getFx: function() {
-			var hide, show,
-				fx = this.options.fx;
-
-			if ( fx ) {
-				if ( $.isArray( fx ) ) {
-					hide = fx[ 0 ];
-					show = fx[ 1 ];
-				} else {
-					hide = show = fx;
-				}
-			}
-
-			return fx ? { show: show, hide: hide } : null;
-		},
-
-		_toggle: function( event, eventData ) {
-			var that = this,
-				toShow = eventData.newPanel,
-				toHide = eventData.oldPanel,
-				fx = this._getFx();
-
-			if ( !fx ) {
-				return this._super( event, eventData );
-			}
-
-			that.running = true;
-
-			function complete() {
-				that.running = false;
-				that._trigger( "activate", event, eventData );
-			}
-
-			function show() {
-				eventData.newTab.closest( "li" ).addClass( "ui-tabs-active ui-state-active" );
-
-				if ( toShow.length && fx.show ) {
-					toShow
-						.animate( fx.show, fx.show.duration, function() {
-							complete();
-						});
-				} else {
-					toShow.show();
-					complete();
-				}
-			}
-
-			// start out by hiding, then showing, then completing
-			if ( toHide.length && fx.hide ) {
-				toHide.animate( fx.hide, fx.hide.duration, function() {
-					eventData.oldTab.closest( "li" ).removeClass( "ui-tabs-active ui-state-active" );
-					show();
-				});
-			} else {
-				eventData.oldTab.closest( "li" ).removeClass( "ui-tabs-active ui-state-active" );
-				toHide.hide();
-				show();
-			}
-		}
-	});
-}
-
-})( jQuery );
-(function( $ ) {
-
-var increments = 0;
-
-function addDescribedBy( elem, id ) {
-	var describedby = (elem.attr( "aria-describedby" ) || "").split( /\s+/ );
-	describedby.push( id );
-	elem
-		.data( "ui-tooltip-id", id )
-		.attr( "aria-describedby", $.trim( describedby.join( " " ) ) );
-}
-
-function removeDescribedBy( elem ) {
-	var id = elem.data( "ui-tooltip-id" ),
-		describedby = (elem.attr( "aria-describedby" ) || "").split( /\s+/ ),
-		index = $.inArray( id, describedby );
-	if ( index !== -1 ) {
-		describedby.splice( index, 1 );
-	}
-
-	elem.removeData( "ui-tooltip-id" );
-	describedby = $.trim( describedby.join( " " ) );
-	if ( describedby ) {
-		elem.attr( "aria-describedby", describedby );
-	} else {
-		elem.removeAttr( "aria-describedby" );
-	}
-}
-
-$.widget( "ui.tooltip", {
-	version: "1.9.2",
-	options: {
-		content: function() {
-			return $( this ).attr( "title" );
-		},
-		hide: true,
-		// Disabled elements have inconsistent behavior across browsers (#8661)
-		items: "[title]:not([disabled])",
-		position: {
-			my: "left top+15",
-			at: "left bottom",
-			collision: "flipfit flip"
-		},
-		show: true,
-		tooltipClass: null,
-		track: false,
-
-		// callbacks
-		close: null,
-		open: null
-	},
-
-	_create: function() {
-		this._on({
-			mouseover: "open",
-			focusin: "open"
-		});
-
-		// IDs of generated tooltips, needed for destroy
-		this.tooltips = {};
-		// IDs of parent tooltips where we removed the title attribute
-		this.parents = {};
-
-		if ( this.options.disabled ) {
-			this._disable();
-		}
-	},
-
-	_setOption: function( key, value ) {
-		var that = this;
-
-		if ( key === "disabled" ) {
-			this[ value ? "_disable" : "_enable" ]();
-			this.options[ key ] = value;
-			// disable element style changes
-			return;
-		}
-
-		this._super( key, value );
-
-		if ( key === "content" ) {
-			$.each( this.tooltips, function( id, element ) {
-				that._updateContent( element );
-			});
-		}
-	},
-
-	_disable: function() {
-		var that = this;
-
-		// close open tooltips
-		$.each( this.tooltips, function( id, element ) {
-			var event = $.Event( "blur" );
-			event.target = event.currentTarget = element[0];
-			that.close( event, true );
-		});
-
-		// remove title attributes to prevent native tooltips
-		this.element.find( this.options.items ).andSelf().each(function() {
-			var element = $( this );
-			if ( element.is( "[title]" ) ) {
-				element
-					.data( "ui-tooltip-title", element.attr( "title" ) )
-					.attr( "title", "" );
-			}
-		});
-	},
-
-	_enable: function() {
-		// restore title attributes
-		this.element.find( this.options.items ).andSelf().each(function() {
-			var element = $( this );
-			if ( element.data( "ui-tooltip-title" ) ) {
-				element.attr( "title", element.data( "ui-tooltip-title" ) );
-			}
-		});
-	},
-
-	open: function( event ) {
-		var that = this,
-			target = $( event ? event.target : this.element )
-				// we need closest here due to mouseover bubbling,
-				// but always pointing at the same event target
-				.closest( this.options.items );
-
-		// No element to show a tooltip for or the tooltip is already open
-		if ( !target.length || target.data( "ui-tooltip-id" ) ) {
-			return;
-		}
-
-		if ( target.attr( "title" ) ) {
-			target.data( "ui-tooltip-title", target.attr( "title" ) );
-		}
-
-		target.data( "ui-tooltip-open", true );
-
-		// kill parent tooltips, custom or native, for hover
-		if ( event && event.type === "mouseover" ) {
-			target.parents().each(function() {
-				var parent = $( this ),
-					blurEvent;
-				if ( parent.data( "ui-tooltip-open" ) ) {
-					blurEvent = $.Event( "blur" );
-					blurEvent.target = blurEvent.currentTarget = this;
-					that.close( blurEvent, true );
-				}
-				if ( parent.attr( "title" ) ) {
-					parent.uniqueId();
-					that.parents[ this.id ] = {
-						element: this,
-						title: parent.attr( "title" )
-					};
-					parent.attr( "title", "" );
-				}
-			});
-		}
-
-		this._updateContent( target, event );
-	},
-
-	_updateContent: function( target, event ) {
-		var content,
-			contentOption = this.options.content,
-			that = this,
-			eventType = event ? event.type : null;
-
-		if ( typeof contentOption === "string" ) {
-			return this._open( event, target, contentOption );
-		}
-
-		content = contentOption.call( target[0], function( response ) {
-			// ignore async response if tooltip was closed already
-			if ( !target.data( "ui-tooltip-open" ) ) {
-				return;
-			}
-			// IE may instantly serve a cached response for ajax requests
-			// delay this call to _open so the other call to _open runs first
-			that._delay(function() {
-				// jQuery creates a special event for focusin when it doesn't
-				// exist natively. To improve performance, the native event
-				// object is reused and the type is changed. Therefore, we can't
-				// rely on the type being correct after the event finished
-				// bubbling, so we set it back to the previous value. (#8740)
-				if ( event ) {
-					event.type = eventType;
-				}
-				this._open( event, target, response );
-			});
-		});
-		if ( content ) {
-			this._open( event, target, content );
-		}
-	},
-
-	_open: function( event, target, content ) {
-		var tooltip, events, delayedShow,
-			positionOption = $.extend( {}, this.options.position );
-
-		if ( !content ) {
-			return;
-		}
-
-		// Content can be updated multiple times. If the tooltip already
-		// exists, then just update the content and bail.
-		tooltip = this._find( target );
-		if ( tooltip.length ) {
-			tooltip.find( ".ui-tooltip-content" ).html( content );
-			return;
-		}
-
-		// if we have a title, clear it to prevent the native tooltip
-		// we have to check first to avoid defining a title if none exists
-		// (we don't want to cause an element to start matching [title])
-		//
-		// We use removeAttr only for key events, to allow IE to export the correct
-		// accessible attributes. For mouse events, set to empty string to avoid
-		// native tooltip showing up (happens only when removing inside mouseover).
-		if ( target.is( "[title]" ) ) {
-			if ( event && event.type === "mouseover" ) {
-				target.attr( "title", "" );
-			} else {
-				target.removeAttr( "title" );
-			}
-		}
-
-		tooltip = this._tooltip( target );
-		addDescribedBy( target, tooltip.attr( "id" ) );
-		tooltip.find( ".ui-tooltip-content" ).html( content );
-
-		function position( event ) {
-			positionOption.of = event;
-			if ( tooltip.is( ":hidden" ) ) {
-				return;
-			}
-			tooltip.position( positionOption );
-		}
-		if ( this.options.track && event && /^mouse/.test( event.type ) ) {
-			this._on( this.document, {
-				mousemove: position
-			});
-			// trigger once to override element-relative positioning
-			position( event );
-		} else {
-			tooltip.position( $.extend({
-				of: target
-			}, this.options.position ) );
-		}
-
-		tooltip.hide();
-
-		this._show( tooltip, this.options.show );
-		// Handle tracking tooltips that are shown with a delay (#8644). As soon
-		// as the tooltip is visible, position the tooltip using the most recent
-		// event.
-		if ( this.options.show && this.options.show.delay ) {
-			delayedShow = setInterval(function() {
-				if ( tooltip.is( ":visible" ) ) {
-					position( positionOption.of );
-					clearInterval( delayedShow );
-				}
-			}, $.fx.interval );
-		}
-
-		this._trigger( "open", event, { tooltip: tooltip } );
-
-		events = {
-			keyup: function( event ) {
-				if ( event.keyCode === $.ui.keyCode.ESCAPE ) {
-					var fakeEvent = $.Event(event);
-					fakeEvent.currentTarget = target[0];
-					this.close( fakeEvent, true );
-				}
-			},
-			remove: function() {
-				this._removeTooltip( tooltip );
-			}
-		};
-		if ( !event || event.type === "mouseover" ) {
-			events.mouseleave = "close";
-		}
-		if ( !event || event.type === "focusin" ) {
-			events.focusout = "close";
-		}
-		this._on( true, target, events );
-	},
-
-	close: function( event ) {
-		var that = this,
-			target = $( event ? event.currentTarget : this.element ),
-			tooltip = this._find( target );
-
-		// disabling closes the tooltip, so we need to track when we're closing
-		// to avoid an infinite loop in case the tooltip becomes disabled on close
-		if ( this.closing ) {
-			return;
-		}
-
-		// only set title if we had one before (see comment in _open())
-		if ( target.data( "ui-tooltip-title" ) ) {
-			target.attr( "title", target.data( "ui-tooltip-title" ) );
-		}
-
-		removeDescribedBy( target );
-
-		tooltip.stop( true );
-		this._hide( tooltip, this.options.hide, function() {
-			that._removeTooltip( $( this ) );
-		});
-
-		target.removeData( "ui-tooltip-open" );
-		this._off( target, "mouseleave focusout keyup" );
-		// Remove 'remove' binding only on delegated targets
-		if ( target[0] !== this.element[0] ) {
-			this._off( target, "remove" );
-		}
-		this._off( this.document, "mousemove" );
-
-		if ( event && event.type === "mouseleave" ) {
-			$.each( this.parents, function( id, parent ) {
-				$( parent.element ).attr( "title", parent.title );
-				delete that.parents[ id ];
-			});
-		}
-
-		this.closing = true;
-		this._trigger( "close", event, { tooltip: tooltip } );
-		this.closing = false;
-	},
-
-	_tooltip: function( element ) {
-		var id = "ui-tooltip-" + increments++,
-			tooltip = $( "
        " )
-				.attr({
-					id: id,
-					role: "tooltip"
-				})
-				.addClass( "ui-tooltip ui-widget ui-corner-all ui-widget-content " +
-					( this.options.tooltipClass || "" ) );
-		$( "
        " )
-			.addClass( "ui-tooltip-content" )
-			.appendTo( tooltip );
-		tooltip.appendTo( this.document[0].body );
-		if ( $.fn.bgiframe ) {
-			tooltip.bgiframe();
-		}
-		this.tooltips[ id ] = element;
-		return tooltip;
-	},
-
-	_find: function( target ) {
-		var id = target.data( "ui-tooltip-id" );
-		return id ? $( "#" + id ) : $();
-	},
-
-	_removeTooltip: function( tooltip ) {
-		tooltip.remove();
-		delete this.tooltips[ tooltip.attr( "id" ) ];
-	},
-
-	_destroy: function() {
-		var that = this;
-
-		// close open tooltips
-		$.each( this.tooltips, function( id, element ) {
-			// Delegate to close method to handle common cleanup
-			var event = $.Event( "blur" );
-			event.target = event.currentTarget = element[0];
-			that.close( event, true );
-
-			// Remove immediately; destroying an open tooltip doesn't use the
-			// hide animation
-			$( "#" + id ).remove();
-
-			// Restore the title
-			if ( element.data( "ui-tooltip-title" ) ) {
-				element.attr( "title", element.data( "ui-tooltip-title" ) );
-				element.removeData( "ui-tooltip-title" );
-			}
-		});
-	}
-});
-
-}( jQuery ) );
\ No newline at end of file
diff --git a/vid/src/main/webapp/static/fusion/js/layout/jquery.layout-latest.js b/vid/src/main/webapp/static/fusion/js/layout/jquery.layout-latest.js
deleted file mode 100644
index 434724d9c..000000000
--- a/vid/src/main/webapp/static/fusion/js/layout/jquery.layout-latest.js
+++ /dev/null
@@ -1,6086 +0,0 @@
-/**
- * @preserve
- * jquery.layout 1.4.3
- * $Date: 2015/03/13 22:37:04 $
- * $Rev: 1.0403 $
- *
- * Copyright (c) 2014 Kevin Dalman (http://jquery-dev.com)
- * Based on work by Fabrizio Balliano (http://www.fabrizioballiano.net)
- *
- * Dual licensed under the GPL (http://www.gnu.org/licenses/gpl.html)
- * and MIT (http://www.opensource.org/licenses/mit-license.php) licenses.
- *
- * SEE: http://layout.jquery-dev.com/LICENSE.txt
- *
- * Changelog: http://layout.jquery-dev.com/changelog.cfm
- *
- * Docs: http://layout.jquery-dev.com/documentation.html
- * Tips: http://layout.jquery-dev.com/tips.html
- * Help: http://groups.google.com/group/jquery-ui-layout
- */
-
-/* JavaDoc Info: http://code.google.com/closure/compiler/docs/js-for-compiler.html
- * {!Object}	non-nullable type (never NULL)
- * {?string}	nullable type (sometimes NULL) - default for {Object}
- * {number=}	optional parameter
- * {*}			ALL types
- */
-/*	TODO for jQ 2.0 
- *	change .andSelf() to .addBack()
- *	check $.fn.disableSelection - this is in jQuery UI 1.9.x
- */
-
-// NOTE: For best readability, view with a fixed-width font and tabs equal to 4-chars
-
-;(function ($) {
-
-// alias Math methods - used a lot!
-var	min		= Math.min
-,	max		= Math.max
-,	round	= Math.floor
-
-,	isStr	=  function (v) { return $.type(v) === "string"; }
-
-	/**
-	 * @param {!Object}			Instance
-	 * @param {Array.}	a_fn
-	 */
-,	runPluginCallbacks = function (Instance, a_fn) {
-		if ($.isArray(a_fn))
-			for (var i=0, c=a_fn.length; i
        ').appendTo("body")
-		,	d	= { width: $c.outerWidth - $c[0].clientWidth, height: 100 - $c[0].clientHeight };
-		$c.remove();
-		window.scrollbarWidth	= d.width;
-		window.scrollbarHeight	= d.height;
-		return dim.match(/^(width|height)$/) ? d[dim] : d;
-	}
-
-
-,	disableTextSelection: function () {
-		var $d	= $(document)
-		,	s	= 'textSelectionDisabled'
-		,	x	= 'textSelectionInitialized'
-		;
-		if ($.fn.disableSelection) {
-			if (!$d.data(x)) // document hasn't been initialized yet
-				$d.on('mouseup', $.layout.enableTextSelection ).data(x, true);
-			if (!$d.data(s))
-				$d.disableSelection().data(s, true);
-		}
-	}
-,	enableTextSelection: function () {
-		var $d	= $(document)
-		,	s	= 'textSelectionDisabled';
-		if ($.fn.enableSelection && $d.data(s))
-			$d.enableSelection().data(s, false);
-	}
-
-
-	/**
-	 * Returns hash container 'display' and 'visibility'
-	 *
-	 * @see	$.swap() - swaps CSS, runs callback, resets CSS
-	 * @param  {!Object}		$E				jQuery element
-	 * @param  {boolean=}	[force=false]	Run even if display != none
-	 * @return {!Object}						Returns current style props, if applicable
-	 */
-,	showInvisibly: function ($E, force) {
-		if ($E && $E.length && (force || $E.css("display") === "none")) { // only if not *already hidden*
-			var s = $E[0].style
-				// save ONLY the 'style' props because that is what we must restore
-			,	CSS = { display: s.display || '', visibility: s.visibility || '' };
-			// show element 'invisibly' so can be measured
-			$E.css({ display: "block", visibility: "hidden" });
-			return CSS;
-		}
-		return {};
-	}
-
-	/**
-	 * Returns data for setting size of an element (container or a pane).
-	 *
-	 * @see  _create(), onWindowResize() for container, plus others for pane
-	 * @return JSON  Returns a hash of all dimensions: top, bottom, left, right, outerWidth, innerHeight, etc
-	 */
-,	getElementDimensions: function ($E, inset) {
-		var
-		//	dimensions hash - start with current data IF passed
-			d	= { css: {}, inset: {} }
-		,	x	= d.css			// CSS hash
-		,	i	= { bottom: 0 }	// TEMP insets (bottom = complier hack)
-		,	N	= $.layout.cssNum
-		,	R	= Math.round
-		,	off = $E.offset()
-		,	b, p, ei			// TEMP border, padding
-		;
-		d.offsetLeft = off.left;
-		d.offsetTop  = off.top;
-
-		if (!inset) inset = {}; // simplify logic below
-
-		$.each("Left,Right,Top,Bottom".split(","), function (idx, e) { // e = edge
-			b = x["border" + e] = $.layout.borderWidth($E, e);
-			p = x["padding"+ e] = $.layout.cssNum($E, "padding"+e);
-			ei = e.toLowerCase();
-			d.inset[ei] = inset[ei] >= 0 ? inset[ei] : p; // any missing insetX value = paddingX
-			i[ei] = d.inset[ei] + b; // total offset of content from outer side
-		});
-
-		x.width		= R($E.width());
-		x.height	= R($E.height());
-		x.top		= N($E,"top",true);
-		x.bottom	= N($E,"bottom",true);
-		x.left		= N($E,"left",true);
-		x.right		= N($E,"right",true);
-
-		d.outerWidth	= R($E.outerWidth());
-		d.outerHeight	= R($E.outerHeight());
-		// calc the TRUE inner-dimensions, even in quirks-mode!
-		d.innerWidth	= max(0, d.outerWidth  - i.left - i.right);
-		d.innerHeight	= max(0, d.outerHeight - i.top  - i.bottom);
-		// layoutWidth/Height is used in calcs for manual resizing
-		// layoutW/H only differs from innerW/H when in quirks-mode - then is like outerW/H
-		d.layoutWidth	= R($E.innerWidth());
-		d.layoutHeight	= R($E.innerHeight());
-
-		//if ($E.prop('tagName') === 'BODY') { debugData( d, $E.prop('tagName') ); } // DEBUG
-
-		//d.visible	= $E.is(":visible");// && x.width > 0 && x.height > 0;
-
-		return d;
-	}
-
-,	getElementStyles: function ($E, list) {
-		var
-			CSS	= {}
-		,	style	= $E[0].style
-		,	props	= list.split(",")
-		,	sides	= "Top,Bottom,Left,Right".split(",")
-		,	attrs	= "Color,Style,Width".split(",")
-		,	p, s, a, i, j, k
-		;
-		for (i=0; i < props.length; i++) {
-			p = props[i];
-			if (p.match(/(border|padding|margin)$/))
-				for (j=0; j < 4; j++) {
-					s = sides[j];
-					if (p === "border")
-						for (k=0; k < 3; k++) {
-							a = attrs[k];
-							CSS[p+s+a] = style[p+s+a];
-						}
-					else
-						CSS[p+s] = style[p+s];
-				}
-			else
-				CSS[p] = style[p];
-		};
-		return CSS
-	}
-
-	/**
-	 * Return the innerWidth for the current browser/doctype
-	 *
-	 * @see  initPanes(), sizeMidPanes(), initHandles(), sizeHandles()
-	 * @param  {Array.}	$E  Must pass a jQuery object - first element is processed
-	 * @param  {number=}			outerWidth (optional) Can pass a width, allowing calculations BEFORE element is resized
-	 * @return {number}			Returns the innerWidth of the elem by subtracting padding and borders
-	 */
-,	cssWidth: function ($E, outerWidth) {
-		// a 'calculated' outerHeight can be passed so borders and/or padding are removed if needed
-		if (outerWidth <= 0) return 0;
-
-		var lb	= $.layout.browser
-		,	bs	= !lb.boxModel ? "border-box" : lb.boxSizing ? $E.css("boxSizing") : "content-box"
-		,	b	= $.layout.borderWidth
-		,	n	= $.layout.cssNum
-		,	W	= outerWidth
-		;
-		// strip border and/or padding from outerWidth to get CSS Width
-		if (bs !== "border-box")
-			W -= (b($E, "Left") + b($E, "Right"));
-		if (bs === "content-box")
-			W -= (n($E, "paddingLeft") + n($E, "paddingRight"));
-		return max(0,W);
-	}
-
-	/**
-	 * Return the innerHeight for the current browser/doctype
-	 *
-	 * @see  initPanes(), sizeMidPanes(), initHandles(), sizeHandles()
-	 * @param  {Array.}	$E  Must pass a jQuery object - first element is processed
-	 * @param  {number=}			outerHeight  (optional) Can pass a width, allowing calculations BEFORE element is resized
-	 * @return {number}			Returns the innerHeight of the elem by subtracting padding and borders
-	 */
-,	cssHeight: function ($E, outerHeight) {
-		// a 'calculated' outerHeight can be passed so borders and/or padding are removed if needed
-		if (outerHeight <= 0) return 0;
-
-		var lb	= $.layout.browser
-		,	bs	= !lb.boxModel ? "border-box" : lb.boxSizing ? $E.css("boxSizing") : "content-box"
-		,	b	= $.layout.borderWidth
-		,	n	= $.layout.cssNum
-		,	H	= outerHeight
-		;
-		// strip border and/or padding from outerHeight to get CSS Height
-		if (bs !== "border-box")
-			H -= (b($E, "Top") + b($E, "Bottom"));
-		if (bs === "content-box")
-			H -= (n($E, "paddingTop") + n($E, "paddingBottom"));
-		return max(0,H);
-	}
-
-	/**
-	 * Returns the 'current CSS numeric value' for a CSS property - 0 if property does not exist
-	 *
-	 * @see  Called by many methods
-	 * @param {Array.}	$E					Must pass a jQuery object - first element is processed
-	 * @param {string}			prop				The name of the CSS property, eg: top, width, etc.
-	 * @param {boolean=}			[allowAuto=false]	true = return 'auto' if that is value; false = return 0
-	 * @return {(string|number)}						Usually used to get an integer value for position (top, left) or size (height, width)
-	 */
-,	cssNum: function ($E, prop, allowAuto) {
-		if (!$E.jquery) $E = $($E);
-		var CSS = $.layout.showInvisibly($E)
-		,	p	= $.css($E[0], prop, true)
-		,	v	= allowAuto && p=="auto" ? p : Math.round(parseFloat(p) || 0);
-		$E.css( CSS ); // RESET
-		return v;
-	}
-
-,	borderWidth: function (el, side) {
-		if (el.jquery) el = el[0];
-		var b = "border"+ side.substr(0,1).toUpperCase() + side.substr(1); // left => Left
-		return $.css(el, b+"Style", true) === "none" ? 0 : Math.round(parseFloat($.css(el, b+"Width", true)) || 0);
-	}
-
-	/**
-	 * Mouse-tracking utility - FUTURE REFERENCE
-	 *
-	 * init: if (!window.mouse) {
-	 *			window.mouse = { x: 0, y: 0 };
-	 *			$(document).mousemove( $.layout.trackMouse );
-	 *		}
-	 *
-	 * @param {Object}		evt
-	 *
-,	trackMouse: function (evt) {
-		window.mouse = { x: evt.clientX, y: evt.clientY };
-	}
-	*/
-
-	/**
-	 * SUBROUTINE for preventPrematureSlideClose option
-	 *
-	 * @param {Object}		evt
-	 * @param {Object=}		el
-	 */
-,	isMouseOverElem: function (evt, el) {
-		var
-			$E	= $(el || this)
-		,	d	= $E.offset()
-		,	T	= d.top
-		,	L	= d.left
-		,	R	= L + $E.outerWidth()
-		,	B	= T + $E.outerHeight()
-		,	x	= evt.pageX	// evt.clientX ?
-		,	y	= evt.pageY	// evt.clientY ?
-		;
-		// if X & Y are < 0, probably means is over an open SELECT
-		return ($.layout.browser.msie && x < 0 && y < 0) || ((x >= L && x <= R) && (y >= T && y <= B));
-	}
-
-	/**
-	 * Message/Logging Utility
-	 *
-	 * @example $.layout.msg("My message");				// log text
-	 * @example $.layout.msg("My message", true);		// alert text
-	 * @example $.layout.msg({ foo: "bar" }, "Title");	// log hash-data, with custom title
-	 * @example $.layout.msg({ foo: "bar" }, true, "Title", { sort: false }); -OR-
-	 * @example $.layout.msg({ foo: "bar" }, "Title", { sort: false, display: true }); // alert hash-data
-	 *
-	 * @param {(Object|string)}			info			String message OR Hash/Array
-	 * @param {(Boolean|string|Object)=}	[popup=false]	True means alert-box - can be skipped
-	 * @param {(Object|string)=}			[debugTitle=""]	Title for Hash data - can be skipped
-	 * @param {Object=}					[debugOpts]		Extra options for debug output
-	 */
-,	msg: function (info, popup, debugTitle, debugOpts) {
-		if ($.isPlainObject(info) && window.debugData) {
-			if (typeof popup === "string") {
-				debugOpts	= debugTitle;
-				debugTitle	= popup;
-			}
-			else if (typeof debugTitle === "object") {
-				debugOpts	= debugTitle;
-				debugTitle	= null;
-			}
-			var t = debugTitle || "log(  )"
-			,	o = $.extend({ sort: false, returnHTML: false, display: false }, debugOpts);
-			if (popup === true || o.display)
-				debugData( info, t, o );
-			else if (window.console)
-				console.log(debugData( info, t, o ));
-		}
-		else if (popup)
-			alert(info);
-		else if (window.console)
-			console.log(info);
-		else {
-			var id	= "#layoutLogger"
-			,	$l = $(id);
-			if (!$l.length)
-				$l = createLog();
-			$l.children("ul").append('
      • '+ info.replace(/\/g,">") +'
        • ');
-		}
-
-		function createLog () {
-			var pos = $.support.fixedPosition ? 'fixed' : 'absolute'
-			,	$e = $('
        '
-				+	'
        '
-				+	'XLayout console.log
        '
-				+	'
          '
-				+ '
          '
-				).appendTo("body");
-			$e.css('left', $(window).width() - $e.outerWidth() - 5)
-			if ($.ui.draggable) $e.draggable({ handle: ':first-child' });
-			return $e;
-		};
-	}
-
-};
-
-
-/*
- *	$.layout.browser REPLACES removed $.browser, with extra data
- *	Parsing code here adapted from jQuery 1.8 $.browse
- */
-(function(){
-	var u = navigator.userAgent.toLowerCase()
-	,	m = /(chrome)[ \/]([\w.]+)/.exec( u )
-		||	/(webkit)[ \/]([\w.]+)/.exec( u )
-		||	/(opera)(?:.*version|)[ \/]([\w.]+)/.exec( u )
-		||	/(msie) ([\w.]+)/.exec( u )
-		||	u.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( u )
-		||	[]
-	,	b = m[1] || ""
-	,	v = m[2] || 0
-	,	ie = b === "msie"
-	,	cm = document.compatMode
-	,	$s = $.support
-	,	bs = $s.boxSizing !== undefined ? $s.boxSizing : $s.boxSizingReliable
-	,	bm = !ie || !cm || cm === "CSS1Compat" || $s.boxModel || false
-	,	lb = $.layout.browser = {
-			version:	v
-		,	safari:		b === "webkit"	// webkit (NOT chrome) = safari
-		,	webkit:		b === "chrome"	// chrome = webkit
-		,	msie:		ie
-		,	isIE6:		ie && v == 6
-			// ONLY IE reverts to old box-model - Note that compatMode was deprecated as of IE8
-		,	boxModel:	bm
-		,	boxSizing:	!!(typeof bs === "function" ? bs() : bs)
-		};
-	;
-	if (b) lb[b] = true; // set CURRENT browser
-	/*	OLD versions of jQuery only set $.support.boxModel after page is loaded
-	 *	so if this is IE, use support.boxModel to test for quirks-mode (ONLY IE changes boxModel) */
-	if (!bm && !cm) $(function(){ lb.boxModel = $s.boxModel; });
-})();
-
-
-// DEFAULT OPTIONS
-$.layout.defaults = {
-/*
- *	LAYOUT & LAYOUT-CONTAINER OPTIONS
- *	- none of these options are applicable to individual panes
- */
-	name:						""			// Not required, but useful for buttons and used for the state-cookie
-,	containerClass:				"ui-layout-container" // layout-container element
-,	inset:						null		// custom container-inset values (override padding)
-,	scrollToBookmarkOnLoad:		true		// after creating a layout, scroll to bookmark in URL (.../page.htm#myBookmark)
-,	resizeWithWindow:			true		// bind thisLayout.resizeAll() to the window.resize event
-,	resizeWithWindowDelay:		200			// delay calling resizeAll because makes window resizing very jerky
-,	resizeWithWindowMaxDelay:	0			// 0 = none - force resize every XX ms while window is being resized
-,	maskPanesEarly:				false		// true = create pane-masks on resizer.mouseDown instead of waiting for resizer.dragstart
-,	onresizeall_start:			null		// CALLBACK when resizeAll() STARTS	- NOT pane-specific
-,	onresizeall_end:			null		// CALLBACK when resizeAll() ENDS	- NOT pane-specific
-,	onload_start:				null		// CALLBACK when Layout inits - after options initialized, but before elements
-,	onload_end:					null		// CALLBACK when Layout inits - after EVERYTHING has been initialized
-,	onunload_start:				null		// CALLBACK when Layout is destroyed OR onWindowUnload
-,	onunload_end:				null		// CALLBACK when Layout is destroyed OR onWindowUnload
-,	initPanes:					true		// false = DO NOT initialize the panes onLoad - will init later
-,	showErrorMessages:			true		// enables fatal error messages to warn developers of common errors
-,	showDebugMessages:			false		// display console-and-alert debug msgs - IF this Layout version _has_ debugging code!
-//	Changing this zIndex value will cause other zIndex values to automatically change
-,	zIndex:						null		// the PANE zIndex - resizers and masks will be +1
-//	DO NOT CHANGE the zIndex values below unless you clearly understand their relationships
-,	zIndexes: {								// set _default_ z-index values here...
-		pane_normal:			0			// normal z-index for panes
-	,	content_mask:			1			// applied to overlays used to mask content INSIDE panes during resizing
-	,	resizer_normal:			2			// normal z-index for resizer-bars
-	,	pane_sliding:			100			// applied to *BOTH* the pane and its resizer when a pane is 'slid open'
-	,	pane_animate:			1000		// applied to the pane when being animated - not applied to the resizer
-	,	resizer_drag:			10000		// applied to the CLONED resizer-bar when being 'dragged'
-	}
-,	errors: {
-		pane:					"pane"		// description of "layout pane element" - used only in error messages
-	,	selector:				"selector"	// description of "jQuery-selector" - used only in error messages
-	,	addButtonError:			"Error Adding Button\nInvalid "
-	,	containerMissing:		"UI Layout Initialization Error\nThe specified layout-container does not exist."
-	,	centerPaneMissing:		"UI Layout Initialization Error\nThe center-pane element does not exist.\nThe center-pane is a required element."
-	,	noContainerHeight:		"UI Layout Initialization Warning\nThe layout-container \"CONTAINER\" has no height.\nTherefore the layout is 0-height and hence 'invisible'!"
-	,	callbackError:			"UI Layout Callback Error\nThe EVENT callback is not a valid function."
-	}
-/*
- *	PANE DEFAULT SETTINGS
- *	- settings under the 'panes' key become the default settings for *all panes*
- *	- ALL pane-options can also be set specifically for each panes, which will override these 'default values'
- */
-,	panes: { // default options for 'all panes' - will be overridden by 'per-pane settings'
-		applyDemoStyles: 		false		// NOTE: renamed from applyDefaultStyles for clarity
-	,	closable:				true		// pane can open & close
-	,	resizable:				true		// when open, pane can be resized 
-	,	slidable:				true		// when closed, pane can 'slide open' over other panes - closes on mouse-out
-	,	initClosed:				false		// true = init pane as 'closed'
-	,	initHidden: 			false 		// true = init pane as 'hidden' - no resizer-bar/spacing
-	//	SELECTORS
-	//,	paneSelector:			""			// MUST be pane-specific - jQuery selector for pane
-	,	contentSelector:		".ui-layout-content" // INNER div/element to auto-size so only it scrolls, not the entire pane!
-	,	contentIgnoreSelector:	".ui-layout-ignore"	// element(s) to 'ignore' when measuring 'content'
-	,	findNestedContent:		false		// true = $P.find(contentSelector), false = $P.children(contentSelector)
-	//	GENERIC ROOT-CLASSES - for auto-generated classNames
-	,	paneClass:				"ui-layout-pane"	// Layout Pane
-	,	resizerClass:			"ui-layout-resizer"	// Resizer Bar
-	,	togglerClass:			"ui-layout-toggler"	// Toggler Button
-	,	buttonClass:			"ui-layout-button"	// CUSTOM Buttons	- eg: '[ui-layout-button]-toggle/-open/-close/-pin'
-	//	ELEMENT SIZE & SPACING
-	//,	size:					100			// MUST be pane-specific -initial size of pane
-	,	minSize:				0			// when manually resizing a pane
-	,	maxSize:				0			// ditto, 0 = no limit
-	,	spacing_open:			6			// space between pane and adjacent panes - when pane is 'open'
-	,	spacing_closed:			6			// ditto - when pane is 'closed'
-	,	togglerLength_open:		50			// Length = WIDTH of toggler button on north/south sides - HEIGHT on east/west sides
-	,	togglerLength_closed: 	50			// 100% OR -1 means 'full height/width of resizer bar' - 0 means 'hidden'
-	,	togglerAlign_open:		"center"	// top/left, bottom/right, center, OR...
-	,	togglerAlign_closed:	"center"	// 1 => nn = offset from top/left, -1 => -nn == offset from bottom/right
-	,	togglerContent_open:	""			// text or HTML to put INSIDE the toggler
-	,	togglerContent_closed:	""			// ditto
-	//	RESIZING OPTIONS
-	,	resizerDblClickToggle:	true		// 
-	,	autoResize:				true		// IF size is 'auto' or a percentage, then recalc 'pixel size' whenever the layout resizes
-	,	autoReopen:				true		// IF a pane was auto-closed due to noRoom, reopen it when there is room? False = leave it closed
-	,	resizerDragOpacity:		1			// option for ui.draggable
-	//,	resizerCursor:			""			// MUST be pane-specific - cursor when over resizer-bar
-	,	maskContents:			false		// true = add DIV-mask over-or-inside this pane so can 'drag' over IFRAMES
-	,	maskObjects:			false		// true = add IFRAME-mask over-or-inside this pane to cover objects/applets - content-mask will overlay this mask
-	,	maskZindex:				null		// will override zIndexes.content_mask if specified - not applicable to iframe-panes
-	,	resizingGrid:			false		// grid size that the resizers will snap-to during resizing, eg: [20,20]
-	,	livePaneResizing:		false		// true = LIVE Resizing as resizer is dragged
-	,	liveContentResizing:	false		// true = re-measure header/footer heights as resizer is dragged
-	,	liveResizingTolerance:	1			// how many px change before pane resizes, to control performance
-	//	SLIDING OPTIONS
-	,	sliderCursor:			"pointer"	// cursor when resizer-bar will trigger 'sliding'
-	,	slideTrigger_open:		"click"		// click, dblclick, mouseenter
-	,	slideTrigger_close:		"mouseleave"// click, mouseleave
-	,	slideDelay_open:		300			// applies only for mouseenter event - 0 = instant open
-	,	slideDelay_close:		300			// applies only for mouseleave event (300ms is the minimum!)
-	,	hideTogglerOnSlide:		false		// when pane is slid-open, should the toggler show?
-	,	preventQuickSlideClose:	$.layout.browser.webkit // Chrome triggers slideClosed as it is opening
-	,	preventPrematureSlideClose: false	// handle incorrect mouseleave trigger, like when over a SELECT-list in IE
-	//	PANE-SPECIFIC TIPS & MESSAGES
-	,	tips: {
-			Open:				"Open"		// eg: "Open Pane"
-		,	Close:				"Close"
-		,	Resize:				"Resize"
-		,	Slide:				"Slide Open"
-		,	Pin:				"Pin"
-		,	Unpin:				"Un-Pin"
-		,	noRoomToOpen:		"Not enough room to show this panel."	// alert if user tries to open a pane that cannot
-		,	minSizeWarning:		"Panel has reached its minimum size"	// displays in browser statusbar
-		,	maxSizeWarning:		"Panel has reached its maximum size"	// ditto
-		}
-	//	HOT-KEYS & MISC
-	,	showOverflowOnHover:	false		// will bind allowOverflow() utility to pane.onMouseOver
-	,	enableCursorHotkey:		true		// enabled 'cursor' hotkeys
-	//,	customHotkey:			""			// MUST be pane-specific - EITHER a charCode OR a character
-	,	customHotkeyModifier:	"SHIFT"		// either 'SHIFT', 'CTRL' or 'CTRL+SHIFT' - NOT 'ALT'
-	//	PANE ANIMATION
-	//	NOTE: fxSss_open, fxSss_close & fxSss_size options (eg: fxName_open) are auto-generated if not passed
-	,	fxName:					"slide" 	// ('none' or blank), slide, drop, scale -- only relevant to 'open' & 'close', NOT 'size'
-	,	fxSpeed:				null		// slow, normal, fast, 200, nnn - if passed, will OVERRIDE fxSettings.duration
-	,	fxSettings:				{}			// can be passed, eg: { easing: "easeOutBounce", duration: 1500 }
-	,	fxOpacityFix:			true		// tries to fix opacity in IE to restore anti-aliasing after animation
-	,	animatePaneSizing:		false		// true = animate resizing after dragging resizer-bar OR sizePane() is called
-	/*  NOTE: Action-specific FX options are auto-generated from the options above if not specifically set:
-		fxName_open:			"slide"		// 'Open' pane animation
-		fnName_close:			"slide"		// 'Close' pane animation
-		fxName_size:			"slide"		// 'Size' pane animation - when animatePaneSizing = true
-		fxSpeed_open:			null
-		fxSpeed_close:			null
-		fxSpeed_size:			null
-		fxSettings_open:		{}
-		fxSettings_close:		{}
-		fxSettings_size:		{}
-	*/
-	//	CHILD/NESTED LAYOUTS
-	,	children:				null		// Layout-options for nested/child layout - even {} is valid as options
-	,	containerSelector:		''			// if child is NOT 'directly nested', a selector to find it/them (can have more than one child layout!)
-	,	initChildren:			true		// true = child layout will be created as soon as _this_ layout completes initialization
-	,	destroyChildren:		true		// true = destroy child-layout if this pane is destroyed
-	,	resizeChildren:			true		// true = trigger child-layout.resizeAll() when this pane is resized
-	//	EVENT TRIGGERING
-	,	triggerEventsOnLoad:	false		// true = trigger onopen OR onclose callbacks when layout initializes
-	,	triggerEventsDuringLiveResize: true	// true = trigger onresize callback REPEATEDLY if livePaneResizing==true
-	//	PANE CALLBACKS
-	,	onshow_start:			null		// CALLBACK when pane STARTS to Show	- BEFORE onopen/onhide_start
-	,	onshow_end:				null		// CALLBACK when pane ENDS being Shown	- AFTER  onopen/onhide_end
-	,	onhide_start:			null		// CALLBACK when pane STARTS to Close	- BEFORE onclose_start
-	,	onhide_end:				null		// CALLBACK when pane ENDS being Closed	- AFTER  onclose_end
-	,	onopen_start:			null		// CALLBACK when pane STARTS to Open
-	,	onopen_end:				null		// CALLBACK when pane ENDS being Opened
-	,	onclose_start:			null		// CALLBACK when pane STARTS to Close
-	,	onclose_end:			null		// CALLBACK when pane ENDS being Closed
-	,	onresize_start:			null		// CALLBACK when pane STARTS being Resized ***FOR ANY REASON***
-	,	onresize_end:			null		// CALLBACK when pane ENDS being Resized ***FOR ANY REASON***
-	,	onsizecontent_start:	null		// CALLBACK when sizing of content-element STARTS
-	,	onsizecontent_end:		null		// CALLBACK when sizing of content-element ENDS
-	,	onswap_start:			null		// CALLBACK when pane STARTS to Swap
-	,	onswap_end:				null		// CALLBACK when pane ENDS being Swapped
-	,	ondrag_start:			null		// CALLBACK when pane STARTS being ***MANUALLY*** Resized
-	,	ondrag_end:				null		// CALLBACK when pane ENDS being ***MANUALLY*** Resized
-	}
-/*
- *	PANE-SPECIFIC SETTINGS
- *	- options listed below MUST be specified per-pane - they CANNOT be set under 'panes'
- *	- all options under the 'panes' key can also be set specifically for any pane
- *	- most options under the 'panes' key apply only to 'border-panes' - NOT the the center-pane
- */
-,	north: {
-		paneSelector:			".ui-layout-north"
-	,	size:					"auto"		// eg: "auto", "30%", .30, 200
-	,	resizerCursor:			"n-resize"	// custom = url(myCursor.cur)
-	,	customHotkey:			""			// EITHER a charCode (43) OR a character ("o")
-	}
-,	south: {
-		paneSelector:			".ui-layout-south"
-	,	size:					"50%"//"auto"
-	,	resizerCursor:			"s-resize"
-	,	customHotkey:			""
-	,   initClosed:				true	
-	}
-,	east: {
-		paneSelector:			".ui-layout-east"
-	,	size:					"5%"//200
-	,	resizerCursor:			"e-resize"
-	,	customHotkey:			""
-	}
-,	west: {
-		paneSelector:			".ui-layout-west"
-	,	size:					"70%" //200
-	,	resizerCursor:			"w-resize"
-	,	customHotkey:			""
-	,   initClosed:				true	
-	}
-,	center: {
-		paneSelector:			".ui-layout-center"
-	,	size:					"30%"//"auto"
-	,	minWidth:				0
-	,	minHeight:				0
-	}
-};
-
-$.layout.optionsMap = {
-	// layout/global options - NOT pane-options
-	layout: ("name,instanceKey,stateManagement,effects,inset,zIndexes,errors,"
-	+	"zIndex,scrollToBookmarkOnLoad,showErrorMessages,maskPanesEarly,"
-	+	"outset,resizeWithWindow,resizeWithWindowDelay,resizeWithWindowMaxDelay,"
-	+	"onresizeall,onresizeall_start,onresizeall_end,onload,onload_start,onload_end,onunload,onunload_start,onunload_end").split(",")
-//	borderPanes: [ ALL options that are NOT specified as 'layout' ]
-	// default.panes options that apply to the center-pane (most options apply _only_ to border-panes)
-,	center: ("paneClass,contentSelector,contentIgnoreSelector,findNestedContent,applyDemoStyles,triggerEventsOnLoad,"
-	+	"showOverflowOnHover,maskContents,maskObjects,liveContentResizing,"
-	+	"containerSelector,children,initChildren,resizeChildren,destroyChildren,"
-	+	"onresize,onresize_start,onresize_end,onsizecontent,onsizecontent_start,onsizecontent_end").split(",")
-	// options that MUST be specifically set 'per-pane' - CANNOT set in the panes (defaults) key
-,	noDefault: ("paneSelector,resizerCursor,customHotkey").split(",")
-};
-
-/**
- * Processes options passed in converts flat-format data into subkey (JSON) format
- * In flat-format, subkeys are _currently_ separated with 2 underscores, like north__optName
- * Plugins may also call this method so they can transform their own data
- *
- * @param  {!Object}	hash			Data/options passed by user - may be a single level or nested levels
- * @param  {boolean=}	[addKeys=false]	Should the primary layout.options keys be added if they do not exist?
- * @return {Object}						Returns hash of minWidth & minHeight
- */
-$.layout.transformData = function (hash, addKeys) {
-	var	json = addKeys ? { panes: {}, center: {} } : {} // init return object
-	,	branch, optKey, keys, key, val, i, c;
-
-	if (typeof hash !== "object") return json; // no options passed
-
-	// convert all 'flat-keys' to 'sub-key' format
-	for (optKey in hash) {
-		branch	= json;
-		val		= hash[ optKey ];
-		keys	= optKey.split("__"); // eg: west__size or north__fxSettings__duration
-		c		= keys.length - 1;
-		// convert underscore-delimited to subkeys
-		for (i=0; i <= c; i++) {
-			key = keys[i];
-			if (i === c) {	// last key = value
-				if ($.isPlainObject( val ))
-					branch[key] = $.layout.transformData( val ); // RECURSE
-				else
-					branch[key] = val;
-			}
-			else {
-				if (!branch[key])
-					branch[key] = {}; // create the subkey
-				// recurse to sub-key for next loop - if not done
-				branch = branch[key];
-			}
-		}
-	}
-	return json;
-};
-
-// INTERNAL CONFIG DATA - DO NOT CHANGE THIS!
-$.layout.backwardCompatibility = {
-	// data used by renameOldOptions()
-	map: {
-	//	OLD Option Name:			NEW Option Name
-		applyDefaultStyles:			"applyDemoStyles"
-	//	CHILD/NESTED LAYOUTS
-	,	childOptions:				"children"
-	,	initChildLayout:			"initChildren"
-	,	destroyChildLayout:			"destroyChildren"
-	,	resizeChildLayout:			"resizeChildren"
-	,	resizeNestedLayout:			"resizeChildren"
-	//	MISC Options
-	,	resizeWhileDragging:		"livePaneResizing"
-	,	resizeContentWhileDragging:	"liveContentResizing"
-	,	triggerEventsWhileDragging:	"triggerEventsDuringLiveResize"
-	,	maskIframesOnResize:		"maskContents"
-	//	STATE MANAGEMENT
-	,	useStateCookie:				"stateManagement.enabled"
-	,	"cookie.autoLoad":			"stateManagement.autoLoad"
-	,	"cookie.autoSave":			"stateManagement.autoSave"
-	,	"cookie.keys":				"stateManagement.stateKeys"
-	,	"cookie.name":				"stateManagement.cookie.name"
-	,	"cookie.domain":			"stateManagement.cookie.domain"
-	,	"cookie.path":				"stateManagement.cookie.path"
-	,	"cookie.expires":			"stateManagement.cookie.expires"
-	,	"cookie.secure":			"stateManagement.cookie.secure"
-	//	OLD Language options
-	,	noRoomToOpenTip:			"tips.noRoomToOpen"
-	,	togglerTip_open:			"tips.Close"	// open   = Close
-	,	togglerTip_closed:			"tips.Open"		// closed = Open
-	,	resizerTip:					"tips.Resize"
-	,	sliderTip:					"tips.Slide"
-	}
-
-/**
-* @param {Object}	opts
-*/
-,	renameOptions: function (opts) {
-		var map = $.layout.backwardCompatibility.map
-		,	oldData, newData, value
-		;
-		for (var itemPath in map) {
-			oldData	= getBranch( itemPath );
-			value	= oldData.branch[ oldData.key ];
-			if (value !== undefined) {
-				newData = getBranch( map[itemPath], true );
-				newData.branch[ newData.key ] = value;
-				delete oldData.branch[ oldData.key ];
-			}
-		}
-
-		/**
-		 * @param {string}	path
-		 * @param {boolean=}	[create=false]	Create path if does not exist
-		 */
-		function getBranch (path, create) {
-			var a = path.split(".") // split keys into array
-			,	c = a.length - 1
-			,	D = { branch: opts, key: a[c] } // init branch at top & set key (last item)
-			,	i = 0, k, undef;
-			for (; i 0) {
-			if (autoHide && $E.data('autoHidden') && $E.innerHeight() > 0) {
-				$E.show().data('autoHidden', false);
-				if (!browser.mozilla) // FireFox refreshes iframes - IE does not
-					// make hidden, then visible to 'refresh' display after animation
-					$E.css(_c.hidden).css(_c.visible);
-			}
-		}
-		else if (autoHide && !$E.data('autoHidden'))
-			$E.hide().data('autoHidden', true);
-	}
-
-	/**
-	 * @param {(string|!Object)}		el
-	 * @param {number=}				outerHeight
-	 * @param {boolean=}				[autoHide=false]
-	 */
-,	setOuterHeight = function (el, outerHeight, autoHide) {
-		var $E = el, h;
-		if (isStr(el)) $E = $Ps[el]; // west
-		else if (!el.jquery) $E = $(el);
-		h = cssH($E, outerHeight);
-		$E.css({ height: h, visibility: "visible" }); // may have been 'hidden' by sizeContent
-		if (h > 0 && $E.innerWidth() > 0) {
-			if (autoHide && $E.data('autoHidden')) {
-				$E.show().data('autoHidden', false);
-				if (!browser.mozilla) // FireFox refreshes iframes - IE does not
-					$E.css(_c.hidden).css(_c.visible);
-			}
-		}
-		else if (autoHide && !$E.data('autoHidden'))
-			$E.hide().data('autoHidden', true);
-	}
-
-
-	/**
-	 * Converts any 'size' params to a pixel/integer size, if not already
-	 * If 'auto' or a decimal/percentage is passed as 'size', a pixel-size is calculated
-	 *
-	/**
-	 * @param  {string}				pane
-	 * @param  {(string|number)=}	size
-	 * @param  {string=}				[dir]
-	 * @return {number}
-	 */
-,	_parseSize = function (pane, size, dir) {
-		if (!dir) dir = _c[pane].dir;
-
-		if (isStr(size) && size.match(/%/))
-			size = (size === '100%') ? -1 : parseInt(size, 10) / 100; // convert % to decimal
-
-		if (size === 0)
-			return 0;
-		else if (size >= 1)
-			return parseInt(size, 10);
-
-		var o = options, avail = 0;
-		if (dir=="horz") // north or south or center.minHeight
-			avail = sC.innerHeight - ($Ps.north ? o.north.spacing_open : 0) - ($Ps.south ? o.south.spacing_open : 0);
-		else if (dir=="vert") // east or west or center.minWidth
-			avail = sC.innerWidth - ($Ps.west ? o.west.spacing_open : 0) - ($Ps.east ? o.east.spacing_open : 0);
-
-		if (size === -1) // -1 == 100%
-			return avail;
-		else if (size > 0) // percentage, eg: .25
-			return round(avail * size);
-		else if (pane=="center")
-			return 0;
-		else { // size < 0 || size=='auto' || size==Missing || size==Invalid
-			// auto-size the pane
-			var	dim	= (dir === "horz" ? "height" : "width")
-			,	$P	= $Ps[pane]
-			,	$C	= dim === 'height' ? $Cs[pane] : false
-			,	vis	= $.layout.showInvisibly($P) // show pane invisibly if hidden
-			,	szP	= $P.css(dim) // SAVE current pane size
-			,	szC	= $C ? $C.css(dim) : 0 // SAVE current content size
-			;
-			$P.css(dim, "auto");
-			if ($C) $C.css(dim, "auto");
-			size = (dim === "height") ? $P.outerHeight() : $P.outerWidth(); // MEASURE
-			$P.css(dim, szP).css(vis); // RESET size & visibility
-			if ($C) $C.css(dim, szC);
-			return size;
-		}
-	}
-
-	/**
-	 * Calculates current 'size' (outer-width or outer-height) of a border-pane - optionally with 'pane-spacing' added
-	 *
-	 * @param  {(string|!Object)}	pane
-	 * @param  {boolean=}			[inclSpace=false]
-	 * @return {number}				Returns EITHER Width for east/west panes OR Height for north/south panes
-	 */
-,	getPaneSize = function (pane, inclSpace) {
-		var 
-			$P	= $Ps[pane]
-		,	o	= options[pane]
-		,	s	= state[pane]
-		,	oSp	= (inclSpace ? o.spacing_open : 0)
-		,	cSp	= (inclSpace ? o.spacing_closed : 0)
-		;
-		if (!$P || s.isHidden)
-			return 0;
-		else if (s.isClosed || (s.isSliding && inclSpace))
-			return cSp;
-		else if (_c[pane].dir === "horz")
-			return $P.outerHeight() + oSp;
-		else // dir === "vert"
-			return $P.outerWidth() + oSp;
-	}
-
-	/**
-	 * Calculate min/max pane dimensions and limits for resizing
-	 *
-	 * @param  {string}		pane
-	 * @param  {boolean=}	[slide=false]
-	 */
-,	setSizeLimits = function (pane, slide) {
-		if (!isInitialized()) return;
-		var 
-			o				= options[pane]
-		,	s				= state[pane]
-		,	c				= _c[pane]
-		,	dir				= c.dir
-		,	type			= c.sizeType.toLowerCase()
-		,	isSliding		= (slide != undefined ? slide : s.isSliding) // only open() passes 'slide' param
-		,	$P				= $Ps[pane]
-		,	paneSpacing		= o.spacing_open
-		//	measure the pane on the *opposite side* from this pane
-		,	altPane			= _c.oppositeEdge[pane]
-		,	altS			= state[altPane]
-		,	$altP			= $Ps[altPane]
-		,	altPaneSize		= (!$altP || altS.isVisible===false || altS.isSliding ? 0 : (dir=="horz" ? $altP.outerHeight() : $altP.outerWidth()))
-		,	altPaneSpacing	= ((!$altP || altS.isHidden ? 0 : options[altPane][ altS.isClosed !== false ? "spacing_closed" : "spacing_open" ]) || 0)
-		//	limitSize prevents this pane from 'overlapping' opposite pane
-		,	containerSize	= (dir=="horz" ? sC.innerHeight : sC.innerWidth)
-		,	minCenterDims	= cssMinDims("center")
-		,	minCenterSize	= dir=="horz" ? max(options.center.minHeight, minCenterDims.minHeight) : max(options.center.minWidth, minCenterDims.minWidth)
-		//	if pane is 'sliding', then ignore center and alt-pane sizes - because 'overlays' them
-		,	limitSize		= (containerSize - paneSpacing - (isSliding ? 0 : (_parseSize("center", minCenterSize, dir) + altPaneSize + altPaneSpacing)))
-		,	minSize			= s.minSize = max( _parseSize(pane, o.minSize), cssMinDims(pane).minSize )
-		,	maxSize			= s.maxSize = min( (o.maxSize ? _parseSize(pane, o.maxSize) : 100000), limitSize )
-		,	r				= s.resizerPosition = {} // used to set resizing limits
-		,	top				= sC.inset.top
-		,	left			= sC.inset.left
-		,	W				= sC.innerWidth
-		,	H				= sC.innerHeight
-		,	rW				= o.spacing_open // subtract resizer-width to get top/left position for south/east
-		;
-		switch (pane) {
-			case "north":	r.min = top + minSize;
-							r.max = top + maxSize;
-							break;
-			case "west":	r.min = left + minSize;
-							r.max = left + maxSize;
-							break;
-			case "south":	r.min = top + H - maxSize - rW;
-							r.max = top + H - minSize - rW;
-							break;
-			case "east":	r.min = left + W - maxSize - rW;
-							r.max = left + W - minSize - rW;
-							break;
-		};
-	}
-
-	/**
-	 * Returns data for setting the size/position of center pane. Also used to set Height for east/west panes
-	 *
-	 * @return JSON  Returns a hash of all dimensions: top, bottom, left, right, (outer) width and (outer) height
-	 */
-,	calcNewCenterPaneDims = function () {
-		var d = {
-			top:	getPaneSize("north", true) // true = include 'spacing' value for pane
-		,	bottom:	getPaneSize("south", true)
-		,	left:	getPaneSize("west", true)
-		,	right:	getPaneSize("east", true)
-		,	width:	0
-		,	height:	0
-		};
-
-		// NOTE: sC = state.container
-		// calc center-pane outer dimensions
-		d.width		= sC.innerWidth - d.left - d.right;  // outerWidth
-		d.height	= sC.innerHeight - d.bottom - d.top; // outerHeight
-		// add the 'container border/padding' to get final positions relative to the container
-		d.top		+= sC.inset.top;
-		d.bottom	+= sC.inset.bottom;
-		d.left		+= sC.inset.left;
-		d.right		+= sC.inset.right;
-
-		return d;
-	}
-
-
-	/**
-	 * @param {!Object}		el
-	 * @param {boolean=}		[allStates=false]
-	 */
-,	getHoverClasses = function (el, allStates) {
-		var
-			$El		= $(el)
-		,	type	= $El.data("layoutRole")
-		,	pane	= $El.data("layoutEdge")
-		,	o		= options[pane]
-		,	root	= o[type +"Class"]
-		,	_pane	= "-"+ pane // eg: "-west"
-		,	_open	= "-open"
-		,	_closed	= "-closed"
-		,	_slide	= "-sliding"
-		,	_hover	= "-hover " // NOTE the trailing space
-		,	_state	= $El.hasClass(root+_closed) ? _closed : _open
-		,	_alt	= _state === _closed ? _open : _closed
-		,	classes = (root+_hover) + (root+_pane+_hover) + (root+_state+_hover) + (root+_pane+_state+_hover)
-		;
-		if (allStates) // when 'removing' classes, also remove alternate-state classes
-			classes += (root+_alt+_hover) + (root+_pane+_alt+_hover);
-
-		if (type=="resizer" && $El.hasClass(root+_slide))
-			classes += (root+_slide+_hover) + (root+_pane+_slide+_hover);
-
-		return $.trim(classes);
-	}
-,	addHover	= function (evt, el) {
-		var $E = $(el || this);
-		if (evt && $E.data("layoutRole") === "toggler")
-			evt.stopPropagation(); // prevent triggering 'slide' on Resizer-bar
-		$E.addClass( getHoverClasses($E) );
-	}
-,	removeHover	= function (evt, el) {
-		var $E = $(el || this);
-		$E.removeClass( getHoverClasses($E, true) );
-	}
-
-,	onResizerEnter	= function (evt) { // ALSO called by toggler.mouseenter
-		var pane	= $(this).data("layoutEdge")
-		,	s		= state[pane]
-		,	$d		= $(document)
-		;
-		// ignore closed-panes and mouse moving back & forth over resizer!
-		// also ignore if ANY pane is currently resizing
-		if ( s.isResizing || state.paneResizing ) return;
-
-		if (options.maskPanesEarly)
-			showMasks( pane, { resizing: true });
-	}
-,	onResizerLeave	= function (evt, el) {
-		var	e		= el || this // el is only passed when called by the timer
-		,	pane	= $(e).data("layoutEdge")
-		,	name	= pane +"ResizerLeave"
-		,	$d		= $(document)
-		;
-		timer.clear(pane+"_openSlider"); // cancel slideOpen timer, if set
-		timer.clear(name); // cancel enableSelection timer - may re/set below
-		// this method calls itself on a timer because it needs to allow
-		// enough time for dragging to kick-in and set the isResizing flag
-		// dragging has a 100ms delay set, so this delay must be >100
-		if (!el) // 1st call - mouseleave event
-			timer.set(name, function(){ onResizerLeave(evt, e); }, 200);
-		// if user is resizing, dragStop will reset everything, so skip it here
-		else if (options.maskPanesEarly && !state.paneResizing) // 2nd call - by timer
-			hideMasks();
-	}
-
-/*
- * ###########################
- *   INITIALIZATION METHODS
- * ###########################
- */
-
-	/**
-	 * Initialize the layout - called automatically whenever an instance of layout is created
-	 *
-	 * @see  none - triggered onInit
-	 * @return  mixed	true = fully initialized | false = panes not initialized (yet) | 'cancel' = abort
-	 */
-,	_create = function () {
-		// initialize config/options
-		initOptions();
-		var o = options
-		,	s = state;
-
-		// TEMP state so isInitialized returns true during init process
-		s.creatingLayout = true;
-
-		// init plugins for this layout, if there are any (eg: stateManagement)
-		runPluginCallbacks( Instance, $.layout.onCreate );
-
-		// options & state have been initialized, so now run beforeLoad callback
-		// onload will CANCEL layout creation if it returns false
-		if (false === _runCallbacks("onload_start"))
-			return 'cancel';
-
-		// initialize the container element
-		_initContainer();
-
-		// bind hotkey function - keyDown - if required
-		initHotkeys();
-
-		// bind window.onunload
-		$(window).bind("unload."+ sID, unload);
-
-		// init plugins for this layout, if there are any (eg: customButtons)
-		runPluginCallbacks( Instance, $.layout.onLoad );
-
-		// if layout elements are hidden, then layout WILL NOT complete initialization!
-		// initLayoutElements will set initialized=true and run the onload callback IF successful
-		if (o.initPanes) _initLayoutElements();
-
-		delete s.creatingLayout;
-
-		return state.initialized;
-	}
-
-	/**
-	 * Initialize the layout IF not already
-	 *
-	 * @see  All methods in Instance run this test
-	 * @return  boolean	true = layoutElements have been initialized | false = panes are not initialized (yet)
-	 */
-,	isInitialized = function () {
-		if (state.initialized || state.creatingLayout) return true;	// already initialized
-		else return _initLayoutElements();	// try to init panes NOW
-	}
-
-	/**
-	 * Initialize the layout - called automatically whenever an instance of layout is created
-	 *
-	 * @see  _create() & isInitialized
-	 * @param {boolean=}		[retry=false]	// indicates this is a 2nd try
-	 * @return  An object pointer to the instance created
-	 */
-,	_initLayoutElements = function (retry) {
-		// initialize config/options
-		var o = options;
-		// CANNOT init panes inside a hidden container!
-		if (!$N.is(":visible")) {
-			// handle Chrome bug where popup window 'has no height'
-			// if layout is BODY element, try again in 50ms
-			// SEE: http://layout.jquery-dev.com/samples/test_popup_window.html
-			if ( !retry && browser.webkit && $N[0].tagName === "BODY" )
-				setTimeout(function(){ _initLayoutElements(true); }, 50);
-			return false;
-		}
-
-		// a center pane is required, so make sure it exists
-		if (!getPane("center").length) {
-			return _log( o.errors.centerPaneMissing );
-		}
-
-		// TEMP state so isInitialized returns true during init process
-		state.creatingLayout = true;
-
-		// update Container dims
-		$.extend(sC, elDims( $N, o.inset )); // passing inset means DO NOT include insetX values
-
-		// initialize all layout elements
-		initPanes();	// size & position panes - calls initHandles() - which calls initResizable()
-
-		if (o.scrollToBookmarkOnLoad) {
-			var l = self.location;
-			if (l.hash) l.replace( l.hash ); // scrollTo Bookmark
-		}
-
-		// check to see if this layout 'nested' inside a pane
-		if (Instance.hasParentLayout)
-			o.resizeWithWindow = false;
-		// bind resizeAll() for 'this layout instance' to window.resize event
-		else if (o.resizeWithWindow)
-			$(window).bind("resize."+ sID, windowResize);
-
-		delete state.creatingLayout;
-		state.initialized = true;
-
-		// init plugins for this layout, if there are any
-		runPluginCallbacks( Instance, $.layout.onReady );
-
-		// now run the onload callback, if exists
-		_runCallbacks("onload_end");
-
-		return true; // elements initialized successfully
-	}
-
-	/**
-	 * Initialize nested layouts for a specific pane - can optionally pass layout-options
-	 *
-	 * @param {(string|Object)}	evt_or_pane	The pane being opened, ie: north, south, east, or west
-	 * @param {Object=}			[opts]		Layout-options - if passed, will OVERRRIDE options[pane].children
-	 * @return  An object pointer to the layout instance created - or null
-	 */
-,	createChildren = function (evt_or_pane, opts) {
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$P	= $Ps[pane]
-		;
-		if (!$P) return;
-		var	$C	= $Cs[pane]
-		,	s	= state[pane]
-		,	o	= options[pane]
-		,	sm	= options.stateManagement || {}
-		,	cos = opts ? (o.children = opts) : o.children
-		;
-		if ( $.isPlainObject( cos ) )
-			cos = [ cos ]; // convert a hash to a 1-elem array
-		else if (!cos || !$.isArray( cos ))
-			return;
-
-		$.each( cos, function (idx, co) {
-			if ( !$.isPlainObject( co ) ) return;
-
-			// determine which element is supposed to be the 'child container'
-			// if pane has a 'containerSelector' OR a 'content-div', use those instead of the pane
-			var $containers = co.containerSelector ? $P.find( co.containerSelector ) : ($C || $P);
-
-			$containers.each(function(){
-				var $cont	= $(this)
-				,	child	= $cont.data("layout") //	see if a child-layout ALREADY exists on this element
-				;
-				// if no layout exists, but children are set, try to create the layout now
-				if (!child) {
-					// TODO: see about moving this to the stateManagement plugin, as a method
-					// set a unique child-instance key for this layout, if not already set
-					setInstanceKey({ container: $cont, options: co }, s );
-					// If THIS layout has a hash in stateManagement.autoLoad,
-					// then see if it also contains state-data for this child-layout
-					// If so, copy the stateData to child.options.stateManagement.autoLoad
-					if ( sm.includeChildren && state.stateData[pane] ) {
-						//	THIS layout's state was cached when its state was loaded
-						var	paneChildren = state.stateData[pane].children || {}
-						,	childState	= paneChildren[ co.instanceKey ]
-						,	co_sm		= co.stateManagement || (co.stateManagement = { autoLoad: true })
-						;
-						// COPY the stateData into the autoLoad key
-						if ( co_sm.autoLoad === true && childState ) {
-							co_sm.autoSave			= false; // disable autoSave because saving handled by parent-layout
-							co_sm.includeChildren	= true;  // cascade option - FOR NOW
-							co_sm.autoLoad = $.extend(true, {}, childState); // COPY the state-hash
-						}
-					}
-
-					// create the layout
-					child = $cont.layout( co );
-
-					// if successful, update data
-					if (child) {
-						// add the child and update all layout-pointers
-						// MAY have already been done by child-layout calling parent.refreshChildren()
-						refreshChildren( pane, child );
-					}
-				}
-			});
-		});
-	}
-
-,	setInstanceKey = function (child, parentPaneState) {
-		// create a named key for use in state and instance branches
-		var	$c	= child.container
-		,	o	= child.options
-		,	sm	= o.stateManagement
-		,	key	= o.instanceKey || $c.data("layoutInstanceKey")
-		;
-		if (!key) key = (sm && sm.cookie ? sm.cookie.name : '') || o.name; // look for a name/key
-		if (!key) key = "layout"+ (++parentPaneState.childIdx);	// if no name/key found, generate one
-		else key = key.replace(/[^\w-]/gi, '_').replace(/_{2,}/g, '_');	 // ensure is valid as a hash key
-		o.instanceKey = key;
-		$c.data("layoutInstanceKey", key); // useful if layout is destroyed and then recreated
-		return key;
-	}
-
-	/**
-	 * @param {string}		pane		The pane being opened, ie: north, south, east, or west
-	 * @param {Object=}		newChild	New child-layout Instance to add to this pane
-	 */
-,	refreshChildren = function (pane, newChild) {
-		var	$P	= $Ps[pane]
-		,	pC	= children[pane]
-		,	s	= state[pane]
-		,	o
-		;
-		// check for destroy()ed layouts and update the child pointers & arrays
-		if ($.isPlainObject( pC )) {
-			$.each( pC, function (key, child) {
-				if (child.destroyed) delete pC[key]
-			});
-			// if no more children, remove the children hash
-			if ($.isEmptyObject( pC ))
-				pC = children[pane] = null; // clear children hash
-		}
-
-		// see if there is a directly-nested layout inside this pane
-		// if there is, then there can be only ONE child-layout, so check that...
-		if (!newChild && !pC) {
-			newChild = $P.data("layout");
-		}
-
-		// if a newChild instance was passed, add it to children[pane]
-		if (newChild) {
-			// update child.state
-			newChild.hasParentLayout = true; // set parent-flag in child
-			// instanceKey is a key-name used in both state and children
-			o = newChild.options;
-			// set a unique child-instance key for this layout, if not already set
-			setInstanceKey( newChild, s );
-			// add pointer to pane.children hash
-			if (!pC) pC = children[pane] = {}; // create an empty children hash
-			pC[ o.instanceKey ] = newChild.container.data("layout"); // add childLayout instance
-		}
-
-		// ALWAYS refresh the pane.children alias, even if null
-		Instance[pane].children = children[pane];
-
-		// if newChild was NOT passed - see if there is a child layout NOW
-		if (!newChild) {
-			createChildren(pane); // MAY create a child and re-call this method
-		}
-	}
-
-,	windowResize = function () {
-		var	o = options
-		,	delay = Number(o.resizeWithWindowDelay);
-		if (delay < 10) delay = 100; // MUST have a delay!
-		// resizing uses a delay-loop because the resize event fires repeatly - except in FF, but delay anyway
-		timer.clear("winResize"); // if already running
-		timer.set("winResize", function(){
-			timer.clear("winResize");
-			timer.clear("winResizeRepeater");
-			var dims = elDims( $N, o.inset );
-			// only trigger resizeAll() if container has changed size
-			if (dims.innerWidth !== sC.innerWidth || dims.innerHeight !== sC.innerHeight)
-				resizeAll();
-		}, delay);
-		// ALSO set fixed-delay timer, if not already running
-		if (!timer.data["winResizeRepeater"]) setWindowResizeRepeater();
-	}
-
-,	setWindowResizeRepeater = function () {
-		var delay = Number(options.resizeWithWindowMaxDelay);
-		if (delay > 0)
-			timer.set("winResizeRepeater", function(){ setWindowResizeRepeater(); resizeAll(); }, delay);
-	}
-
-,	unload = function () {
-		var o = options;
-
-		_runCallbacks("onunload_start");
-
-		// trigger plugin callabacks for this layout (eg: stateManagement)
-		runPluginCallbacks( Instance, $.layout.onUnload );
-
-		_runCallbacks("onunload_end");
-	}
-
-	/**
-	 * Validate and initialize container CSS and events
-	 *
-	 * @see  _create()
-	 */
-,	_initContainer = function () {
-		var
-			N		= $N[0]	
-		,	$H		= $("html")
-		,	tag		= sC.tagName = N.tagName
-		,	id		= sC.id = N.id
-		,	cls		= sC.className = N.className
-		,	o		= options
-		,	name	= o.name
-		,	props	= "position,margin,padding,border"
-		,	css		= "layoutCSS"
-		,	CSS		= {}
-		,	hid		= "hidden" // used A LOT!
-		//	see if this container is a 'pane' inside an outer-layout
-		,	parent	= $N.data("parentLayout")	// parent-layout Instance
-		,	pane	= $N.data("layoutEdge")		// pane-name in parent-layout
-		,	isChild	= parent && pane
-		,	num		= $.layout.cssNum
-		,	$parent, n
-		;
-		// sC = state.container
-		sC.selector = $N.selector.split(".slice")[0];
-		sC.ref		= (o.name ? o.name +' layout / ' : '') + tag + (id ? "#"+id : cls ? '.['+cls+']' : ''); // used in messages
-		sC.isBody	= (tag === "BODY");
-
-		// try to find a parent-layout
-		if (!isChild && !sC.isBody) {
-			$parent = $N.closest("."+ $.layout.defaults.panes.paneClass);
-			parent	= $parent.data("parentLayout");
-			pane	= $parent.data("layoutEdge");
-			isChild	= parent && pane;
-		}
-
-		$N	.data({
-				layout: Instance
-			,	layoutContainer: sID // FLAG to indicate this is a layout-container - contains unique internal ID
-			})
-			.addClass(o.containerClass)
-		;
-		var layoutMethods = {
-			destroy:	''
-		,	initPanes:	''
-		,	resizeAll:	'resizeAll'
-		,	resize:		'resizeAll'
-		};
-		// loop hash and bind all methods - include layoutID namespacing
-		for (name in layoutMethods) {
-			$N.bind("layout"+ name.toLowerCase() +"."+ sID, Instance[ layoutMethods[name] || name ]);
-		}
-
-		// if this container is another layout's 'pane', then set child/parent pointers
-		if (isChild) {
-			// update parent flag
-			Instance.hasParentLayout = true;
-			// set pointers to THIS child-layout (Instance) in parent-layout
-			parent.refreshChildren( pane, Instance );
-		}
-
-		// SAVE original container CSS for use in destroy()
-		if (!$N.data(css)) {
-			// handle props like overflow different for BODY & HTML - has 'system default' values
-			if (sC.isBody) {
-				// SAVE  CSS
-				$N.data(css, $.extend( styles($N, props), {
-					height:		$N.css("height")
-				,	overflow:	$N.css("overflow")
-				,	overflowX:	$N.css("overflowX")
-				,	overflowY:	$N.css("overflowY")
-				}));
-				// ALSO SAVE  CSS
-				$H.data(css, $.extend( styles($H, 'padding'), {
-					height:		"auto" // FF would return a fixed px-size!
-				,	overflow:	$H.css("overflow")
-				,	overflowX:	$H.css("overflowX")
-				,	overflowY:	$H.css("overflowY")
-				}));
-			}
-			else // handle props normally for non-body elements
-				$N.data(css, styles($N, props+",top,bottom,left,right,width,height,overflow,overflowX,overflowY") );
-		}
-
-		try {
-			// common container CSS
-			CSS = {
-				overflow:	hid
-			,	overflowX:	hid
-			,	overflowY:	hid
-			};
-			$N.css( CSS );
-
-			if (o.inset && !$.isPlainObject(o.inset)) {
-				// can specify a single number for equal outset all-around
-				n = parseInt(o.inset, 10) || 0
-				o.inset = {
-					top:	n
-				,	bottom:	n
-				,	left:	n
-				,	right:	n
-				};
-			}
-
-			// format html & body if this is a full page layout
-			if (sC.isBody) {
-				// if HTML has padding, use this as an outer-spacing around BODY
-				if (!o.outset) {
-					// use padding from parent-elem (HTML) as outset
-					o.outset = {
-						top:	num($H, "paddingTop")
-					,	bottom:	num($H, "paddingBottom")
-					,	left:	num($H, "paddingLeft")
-					,	right:	num($H, "paddingRight")
-					};
-				}
-				else if (!$.isPlainObject(o.outset)) {
-					// can specify a single number for equal outset all-around
-					n = parseInt(o.outset, 10) || 0
-					o.outset = {
-						top:	n
-					,	bottom:	n
-					,	left:	n
-					,	right:	n
-					};
-				}
-				// HTML
-				$H.css( CSS ).css({
-					height:		"100%"
-				,	border:		"none"	// no border or padding allowed when using height = 100%
-				,	padding:	0		// ditto
-				,	margin:		0
-				});
-				// BODY
-				if (browser.isIE6) {
-					// IE6 CANNOT use the trick of setting absolute positioning on all 4 sides - must have 'height'
-					$N.css({
-						width:		"100%"
-					,	height:		"100%"
-					,	border:		"none"	// no border or padding allowed when using height = 100%
-					,	padding:	0		// ditto
-					,	margin:		0
-					,	position:	"relative"
-					});
-					// convert body padding to an inset option - the border cannot be measured in IE6!
-					if (!o.inset) o.inset = elDims( $N ).inset;
-				}
-				else { // use absolute positioning for BODY to allow borders & padding without overflow
-					$N.css({
-						width:		"auto"
-					,	height:		"auto"
-					,	margin:		0
-					,	position:	"absolute"	// allows for border and padding on BODY
-					});
-					// apply edge-positioning created above
-					$N.css( o.outset );
-				}
-				// set current layout-container dimensions
-				$.extend(sC, elDims( $N, o.inset )); // passing inset means DO NOT include insetX values
-			}
-			else {
-				// container MUST have 'position'
-				var	p = $N.css("position");
-				if (!p || !p.match(/(fixed|absolute|relative)/))
-					$N.css("position","relative");
-
-				// set current layout-container dimensions
-				if ( $N.is(":visible") ) {
-					$.extend(sC, elDims( $N, o.inset )); // passing inset means DO NOT change insetX (padding) values
-					if (sC.innerHeight < 1) // container has no 'height' - warn developer
-						_log( o.errors.noContainerHeight.replace(/CONTAINER/, sC.ref) );
-				}
-			}
-
-			// if container has min-width/height, then enable scrollbar(s)
-			if ( num($N, "minWidth")  ) $N.parent().css("overflowX","auto");
-			if ( num($N, "minHeight") ) $N.parent().css("overflowY","auto");
-
-		} catch (ex) {}
-	}
-
-	/**
-	 * Bind layout hotkeys - if options enabled
-	 *
-	 * @see  _create() and addPane()
-	 * @param {string=}	[panes=""]	The edge(s) to process
-	 */
-,	initHotkeys = function (panes) {
-		panes = panes ? panes.split(",") : _c.borderPanes;
-		// bind keyDown to capture hotkeys, if option enabled for ANY pane
-		$.each(panes, function (i, pane) {
-			var o = options[pane];
-			if (o.enableCursorHotkey || o.customHotkey) {
-				$(document).bind("keydown."+ sID, keyDown); // only need to bind this ONCE
-				return false; // BREAK - binding was done
-			}
-		});
-	}
-
-	/**
-	 * Build final OPTIONS data
-	 *
-	 * @see  _create()
-	 */
-,	initOptions = function () {
-		var data, d, pane, key, val, i, c, o;
-
-		// reprocess user's layout-options to have correct options sub-key structure
-		opts = $.layout.transformData( opts, true ); // panes = default subkey
-
-		// auto-rename old options for backward compatibility
-		opts = $.layout.backwardCompatibility.renameAllOptions( opts );
-
-		// if user-options has 'panes' key (pane-defaults), clean it...
-		if (!$.isEmptyObject(opts.panes)) {
-			// REMOVE any pane-defaults that MUST be set per-pane
-			data = $.layout.optionsMap.noDefault;
-			for (i=0, c=data.length; i 0) {
-			z.pane_normal		= zo;
-			z.content_mask		= max(zo+1, z.content_mask);	// MIN = +1
-			z.resizer_normal	= max(zo+2, z.resizer_normal);	// MIN = +2
-		}
-
-		// DELETE 'panes' key now that we are done - values were copied to EACH pane
-		delete options.panes;
-
-
-		function createFxOptions ( pane ) {
-			var	o = options[pane]
-			,	d = options.panes;
-			// ensure fxSettings key to avoid errors
-			if (!o.fxSettings) o.fxSettings = {};
-			if (!d.fxSettings) d.fxSettings = {};
-
-			$.each(["_open","_close","_size"], function (i,n) { 
-				var
-					sName		= "fxName"+ n
-				,	sSpeed		= "fxSpeed"+ n
-				,	sSettings	= "fxSettings"+ n
-					// recalculate fxName according to specificity rules
-				,	fxName = o[sName] =
-						o[sName]	// options.west.fxName_open
-					||	d[sName]	// options.panes.fxName_open
-					||	o.fxName	// options.west.fxName
-					||	d.fxName	// options.panes.fxName
-					||	"none"		// MEANS $.layout.defaults.panes.fxName == "" || false || null || 0
-				,	fxExists	= $.effects && ($.effects[fxName] || ($.effects.effect && $.effects.effect[fxName]))
-				;
-				// validate fxName to ensure is valid effect - MUST have effect-config data in options.effects
-				if (fxName === "none" || !options.effects[fxName] || !fxExists)
-					fxName = o[sName] = "none"; // effect not loaded OR unrecognized fxName
-
-				// set vars for effects subkeys to simplify logic
-				var	fx		= options.effects[fxName] || {}	// effects.slide
-				,	fx_all	= fx.all	|| null				// effects.slide.all
-				,	fx_pane	= fx[pane]	|| null				// effects.slide.west
-				;
-				// create fxSpeed[_open|_close|_size]
-				o[sSpeed] =
-					o[sSpeed]				// options.west.fxSpeed_open
-				||	d[sSpeed]				// options.west.fxSpeed_open
-				||	o.fxSpeed				// options.west.fxSpeed
-				||	d.fxSpeed				// options.panes.fxSpeed
-				||	null					// DEFAULT - let fxSetting.duration control speed
-				;
-				// create fxSettings[_open|_close|_size]
-				o[sSettings] = $.extend(
-					true
-				,	{}
-				,	fx_all					// effects.slide.all
-				,	fx_pane					// effects.slide.west
-				,	d.fxSettings			// options.panes.fxSettings
-				,	o.fxSettings			// options.west.fxSettings
-				,	d[sSettings]			// options.panes.fxSettings_open
-				,	o[sSettings]			// options.west.fxSettings_open
-				);
-			});
-
-			// DONE creating action-specific-settings for this pane,
-			// so DELETE generic options - are no longer meaningful
-			delete o.fxName;
-			delete o.fxSpeed;
-			delete o.fxSettings;
-		}
-	}
-
-	/**
-	 * Initialize module objects, styling, size and position for all panes
-	 *
-	 * @see  _initElements()
-	 * @param {string}	pane		The pane to process
-	 */
-,	getPane = function (pane) {
-		var sel = options[pane].paneSelector
-		if (sel.substr(0,1)==="#") // ID selector
-			// NOTE: elements selected 'by ID' DO NOT have to be 'children'
-			return $N.find(sel).eq(0);
-		else { // class or other selector
-			var $P = $N.children(sel).eq(0);
-			// look for the pane nested inside a 'form' element
-			return $P.length ? $P : $N.children("form:first").children(sel).eq(0);
-		}
-	}
-
-	/**
-	 * @param {Object=}		evt
-	 */
-,	initPanes = function (evt) {
-		// stopPropagation if called by trigger("layoutinitpanes") - use evtPane utility 
-		evtPane(evt);
-
-		// NOTE: do north & south FIRST so we can measure their height - do center LAST
-		$.each(_c.allPanes, function (idx, pane) {
-			addPane( pane, true );
-		});
-
-		// init the pane-handles NOW in case we have to hide or close the pane below
-		initHandles();
-
-		// now that all panes have been initialized and initially-sized,
-		// make sure there is really enough space available for each pane
-		$.each(_c.borderPanes, function (i, pane) {
-			if ($Ps[pane] && state[pane].isVisible) { // pane is OPEN
-				setSizeLimits(pane);
-				makePaneFit(pane); // pane may be Closed, Hidden or Resized by makePaneFit()
-			}
-		});
-		// size center-pane AGAIN in case we 'closed' a border-pane in loop above
-		sizeMidPanes("center");
-
-		//	Chrome/Webkit sometimes fires callbacks BEFORE it completes resizing!
-		//	Before RC30.3, there was a 10ms delay here, but that caused layout 
-		//	to load asynchrously, which is BAD, so try skipping delay for now
-
-		// process pane contents and callbacks, and init/resize child-layout if exists
-		$.each(_c.allPanes, function (idx, pane) {
-			afterInitPane(pane);
-		});
-	}
-
-	/**
-	 * Add a pane to the layout - subroutine of initPanes()
-	 *
-	 * @see  initPanes()
-	 * @param {string}	pane			The pane to process
-	 * @param {boolean=}	[force=false]	Size content after init
-	 */
-,	addPane = function (pane, force) {
-		if ( !force && !isInitialized() ) return;
-		var
-			o		= options[pane]
-		,	s		= state[pane]
-		,	c		= _c[pane]
-		,	dir		= c.dir
-		,	fx		= s.fx
-		,	spacing	= o.spacing_open || 0
-		,	isCenter = (pane === "center")
-		,	CSS		= {}
-		,	$P		= $Ps[pane]
-		,	size, minSize, maxSize, child
-		;
-		// if pane-pointer already exists, remove the old one first
-		if ($P)
-			removePane( pane, false, true, false );
-		else
-			$Cs[pane] = false; // init
-
-		$P = $Ps[pane] = getPane(pane);
-		if (!$P.length) {
-			$Ps[pane] = false; // logic
-			return;
-		}
-
-		// SAVE original Pane CSS
-		if (!$P.data("layoutCSS")) {
-			var props = "position,top,left,bottom,right,width,height,overflow,zIndex,display,backgroundColor,padding,margin,border";
-			$P.data("layoutCSS", styles($P, props));
-		}
-
-		// create alias for pane data in Instance - initHandles will add more
-		Instance[pane] = {
-			name:		pane
-		,	pane:		$Ps[pane]
-		,	content:	$Cs[pane]
-		,	options:	options[pane]
-		,	state:		state[pane]
-		,	children:	children[pane]
-		};
-
-		// add classes, attributes & events
-		$P	.data({
-				parentLayout:	Instance		// pointer to Layout Instance
-			,	layoutPane:		Instance[pane]	// NEW pointer to pane-alias-object
-			,	layoutEdge:		pane
-			,	layoutRole:		"pane"
-			})
-			.css(c.cssReq).css("zIndex", options.zIndexes.pane_normal)
-			.css(o.applyDemoStyles ? c.cssDemo : {}) // demo styles
-			.addClass( o.paneClass +" "+ o.paneClass+"-"+pane ) // default = "ui-layout-pane ui-layout-pane-west" - may be a dupe of 'paneSelector'
-			.bind("mouseenter."+ sID, addHover )
-			.bind("mouseleave."+ sID, removeHover )
-			;
-		var paneMethods = {
-				hide:				''
-			,	show:				''
-			,	toggle:				''
-			,	close:				''
-			,	open:				''
-			,	slideOpen:			''
-			,	slideClose:			''
-			,	slideToggle:		''
-			,	size:				'sizePane'
-			,	sizePane:			'sizePane'
-			,	sizeContent:		''
-			,	sizeHandles:		''
-			,	enableClosable:		''
-			,	disableClosable:	''
-			,	enableSlideable:	''
-			,	disableSlideable:	''
-			,	enableResizable:	''
-			,	disableResizable:	''
-			,	swapPanes:			'swapPanes'
-			,	swap:				'swapPanes'
-			,	move:				'swapPanes'
-			,	removePane:			'removePane'
-			,	remove:				'removePane'
-			,	createChildren:		''
-			,	resizeChildren:		''
-			,	resizeAll:			'resizeAll'
-			,	resizeLayout:		'resizeAll'
-			}
-		,	name;
-		// loop hash and bind all methods - include layoutID namespacing
-		for (name in paneMethods) {
-			$P.bind("layoutpane"+ name.toLowerCase() +"."+ sID, Instance[ paneMethods[name] || name ]);
-		}
-
-		// see if this pane has a 'scrolling-content element'
-		initContent(pane, false); // false = do NOT sizeContent() - called later
-
-		if (!isCenter) {
-			// call _parseSize AFTER applying pane classes & styles - but before making visible (if hidden)
-			// if o.size is auto or not valid, then MEASURE the pane and use that as its 'size'
-			size	= s.size = _parseSize(pane, o.size);
-			minSize	= _parseSize(pane,o.minSize) || 1;
-			maxSize	= _parseSize(pane,o.maxSize) || 100000;
-			if (size > 0) size = max(min(size, maxSize), minSize);
-			s.autoResize = o.autoResize; // used with percentage sizes
-
-			// state for border-panes
-			s.isClosed  = false; // true = pane is closed
-			s.isSliding = false; // true = pane is currently open by 'sliding' over adjacent panes
-			s.isResizing= false; // true = pane is in process of being resized
-			s.isHidden	= false; // true = pane is hidden - no spacing, resizer or toggler is visible!
-
-			// array for 'pin buttons' whose classNames are auto-updated on pane-open/-close
-			if (!s.pins) s.pins = [];
-		}
-		//	states common to ALL panes
-		s.tagName	= $P[0].tagName;
-		s.edge		= pane;		// useful if pane is (or about to be) 'swapped' - easy find out where it is (or is going)
-		s.noRoom	= false;	// true = pane 'automatically' hidden due to insufficient room - will unhide automatically
-		s.isVisible	= true;		// false = pane is invisible - closed OR hidden - simplify logic
-
-		// init pane positioning
-		setPanePosition( pane );
-
-		// if pane is not visible, 
-		if (dir === "horz") // north or south pane
-			CSS.height = cssH($P, size);
-		else if (dir === "vert") // east or west pane
-			CSS.width = cssW($P, size);
-		//else if (isCenter) {}
-
-		$P.css(CSS); // apply size -- top, bottom & height will be set by sizeMidPanes
-		if (dir != "horz") sizeMidPanes(pane, true); // true = skipCallback
-
-		// if manually adding a pane AFTER layout initialization, then...
-		if (state.initialized) {
-			initHandles( pane );
-			initHotkeys( pane );
-		}
-
-		// close or hide the pane if specified in settings
-		if (o.initClosed && o.closable && !o.initHidden)
-			close(pane, true, true); // true, true = force, noAnimation
-		else if (o.initHidden || o.initClosed)
-			hide(pane); // will be completely invisible - no resizer or spacing
-		else if (!s.noRoom)
-			// make the pane visible - in case was initially hidden
-			$P.css("display","block");
-		// ELSE setAsOpen() - called later by initHandles()
-
-		// RESET visibility now - pane will appear IF display:block
-		$P.css("visibility","visible");
-
-		// check option for auto-handling of pop-ups & drop-downs
-		if (o.showOverflowOnHover)
-			$P.hover( allowOverflow, resetOverflow );
-
-		// if manually adding a pane AFTER layout initialization, then...
-		if (state.initialized) {
-			afterInitPane( pane );
-		}
-	}
-
-,	afterInitPane = function (pane) {
-		var	$P	= $Ps[pane]
-		,	s	= state[pane]
-		,	o	= options[pane]
-		;
-		if (!$P) return;
-
-		// see if there is a directly-nested layout inside this pane
-		if ($P.data("layout"))
-			refreshChildren( pane, $P.data("layout") );
-
-		// process pane contents and callbacks, and init/resize child-layout if exists
-		if (s.isVisible) { // pane is OPEN
-			if (state.initialized) // this pane was added AFTER layout was created
-				resizeAll(); // will also sizeContent
-			else
-				sizeContent(pane);
-
-			if (o.triggerEventsOnLoad)
-				_runCallbacks("onresize_end", pane);
-			else // automatic if onresize called, otherwise call it specifically
-				// resize child - IF inner-layout already exists (created before this layout)
-				resizeChildren(pane, true); // a previously existing childLayout
-		}
-
-		// init childLayouts - even if pane is not visible
-		if (o.initChildren && o.children)
-			createChildren(pane);
-	}
-
-	/**
-	 * @param {string=}	panes		The pane(s) to process
-	 */
-,	setPanePosition = function (panes) {
-		panes = panes ? panes.split(",") : _c.borderPanes;
-
-		// create toggler DIVs for each pane, and set object pointers for them, eg: $R.north = north toggler DIV
-		$.each(panes, function (i, pane) {
-			var $P	= $Ps[pane]
-			,	$R	= $Rs[pane]
-			,	o	= options[pane]
-			,	s	= state[pane]
-			,	side =  _c[pane].side
-			,	CSS	= {}
-			;
-			if (!$P) return; // pane does not exist - skip
-
-			// set css-position to account for container borders & padding
-			switch (pane) {
-				case "north": 	CSS.top 	= sC.inset.top;
-								CSS.left 	= sC.inset.left;
-								CSS.right	= sC.inset.right;
-								break;
-				case "south": 	CSS.bottom	= sC.inset.bottom;
-								CSS.left 	= sC.inset.left;
-								CSS.right 	= sC.inset.right;
-								break;
-				case "west": 	CSS.left 	= sC.inset.left; // top, bottom & height set by sizeMidPanes()
-								break;
-				case "east": 	CSS.right 	= sC.inset.right; // ditto
-								break;
-				case "center":	// top, left, width & height set by sizeMidPanes()
-			}
-			// apply position
-			$P.css(CSS); 
-
-			// update resizer position
-			if ($R && s.isClosed)
-				$R.css(side, sC.inset[side]);
-			else if ($R && !s.isHidden)
-				$R.css(side, sC.inset[side] + getPaneSize(pane));
-		});
-	}
-
-	/**
-	 * Initialize module objects, styling, size and position for all resize bars and toggler buttons
-	 *
-	 * @see  _create()
-	 * @param {string=}	[panes=""]	The edge(s) to process
-	 */
-,	initHandles = function (panes) {
-		panes = panes ? panes.split(",") : _c.borderPanes;
-
-		// create toggler DIVs for each pane, and set object pointers for them, eg: $R.north = north toggler DIV
-		$.each(panes, function (i, pane) {
-			var $P		= $Ps[pane];
-			$Rs[pane]	= false; // INIT
-			$Ts[pane]	= false;
-			if (!$P) return; // pane does not exist - skip
-
-			var	o		= options[pane]
-			,	s		= state[pane]
-			,	c		= _c[pane]
-			,	paneId	= o.paneSelector.substr(0,1) === "#" ? o.paneSelector.substr(1) : ""
-			,	rClass	= o.resizerClass
-			,	tClass	= o.togglerClass
-			,	spacing	= (s.isVisible ? o.spacing_open : o.spacing_closed)
-			,	_pane	= "-"+ pane // used for classNames
-			,	_state	= (s.isVisible ? "-open" : "-closed") // used for classNames
-			,	I		= Instance[pane]
-				// INIT RESIZER BAR
-			,	$R		= I.resizer = $Rs[pane] = $("
          ")
-				// INIT TOGGLER BUTTON
-			,	$T		= I.toggler = (o.closable ? $Ts[pane] = $("
          ") : false)
-			;
-
-			//if (s.isVisible && o.resizable) ... handled by initResizable
-			if (!s.isVisible && o.slidable)
-				$R.attr("title", o.tips.Slide).css("cursor", o.sliderCursor);
-
-			$R	// if paneSelector is an ID, then create a matching ID for the resizer, eg: "#paneLeft" => "paneLeft-resizer"
-				.attr("id", paneId ? paneId +"-resizer" : "" )
-				.data({
-					parentLayout:	Instance
-				,	layoutPane:		Instance[pane]	// NEW pointer to pane-alias-object
-				,	layoutEdge:		pane
-				,	layoutRole:		"resizer"
-				})
-				.css(_c.resizers.cssReq).css("zIndex", options.zIndexes.resizer_normal)
-				.css(o.applyDemoStyles ? _c.resizers.cssDemo : {}) // add demo styles
-				.addClass(rClass +" "+ rClass+_pane)
-				.hover(addHover, removeHover) // ALWAYS add hover-classes, even if resizing is not enabled - handle with CSS instead
-				.hover(onResizerEnter, onResizerLeave) // ALWAYS NEED resizer.mouseleave to balance toggler.mouseenter
-				.mousedown($.layout.disableTextSelection)	// prevent text-selection OUTSIDE resizer
-				.mouseup($.layout.enableTextSelection)		// not really necessary, but just in case
-				.appendTo($N) // append DIV to container
-			;
-			if ($.fn.disableSelection)
-				$R.disableSelection(); // prevent text-selection INSIDE resizer
-			if (o.resizerDblClickToggle)
-				$R.bind("dblclick."+ sID, toggle );
-
-			if ($T) {
-				$T	// if paneSelector is an ID, then create a matching ID for the resizer, eg: "#paneLeft" => "#paneLeft-toggler"
-					.attr("id", paneId ? paneId +"-toggler" : "" )
-					.data({
-						parentLayout:	Instance
-					,	layoutPane:		Instance[pane]	// NEW pointer to pane-alias-object
-					,	layoutEdge:		pane
-					,	layoutRole:		"toggler"
-					})
-					.css(_c.togglers.cssReq) // add base/required styles
-					.css(o.applyDemoStyles ? _c.togglers.cssDemo : {}) // add demo styles
-					.addClass(tClass +" "+ tClass+_pane)
-					.hover(addHover, removeHover) // ALWAYS add hover-classes, even if toggling is not enabled - handle with CSS instead
-					.bind("mouseenter", onResizerEnter) // NEED toggler.mouseenter because mouseenter MAY NOT fire on resizer
-					.appendTo($R) // append SPAN to resizer DIV
-				;
-				// ADD INNER-SPANS TO TOGGLER
-				if (o.togglerContent_open) // ui-layout-open
-					$(""+ o.togglerContent_open +"")
-						.data({
-							layoutEdge:		pane
-						,	layoutRole:		"togglerContent"
-						})
-						.data("layoutRole", "togglerContent")
-						.data("layoutEdge", pane)
-						.addClass("content content-open")
-						.css("display","none")
-						.appendTo( $T )
-						//.hover( addHover, removeHover ) // use ui-layout-toggler-west-hover .content-open instead!
-					;
-				if (o.togglerContent_closed) // ui-layout-closed
-					$(""+ o.togglerContent_closed +"")
-						.data({
-							layoutEdge:		pane
-						,	layoutRole:		"togglerContent"
-						})
-						.addClass("content content-closed")
-						.css("display","none")
-						.appendTo( $T )
-						//.hover( addHover, removeHover ) // use ui-layout-toggler-west-hover .content-closed instead!
-					;
-				// ADD TOGGLER.click/.hover
-				enableClosable(pane);
-			}
-
-			// add Draggable events
-			initResizable(pane);
-
-			// ADD CLASSNAMES & SLIDE-BINDINGS - eg: class="resizer resizer-west resizer-open"
-			if (s.isVisible)
-				setAsOpen(pane);	// onOpen will be called, but NOT onResize
-			else {
-				setAsClosed(pane);	// onClose will be called
-				bindStartSlidingEvents(pane, true); // will enable events IF option is set
-			}
-
-		});
-
-		// SET ALL HANDLE DIMENSIONS
-		sizeHandles();
-	}
-
-
-	/**
-	 * Initialize scrolling ui-layout-content div - if exists
-	 *
-	 * @see  initPane() - or externally after an Ajax injection
-	 * @param {string}	pane			The pane to process
-	 * @param {boolean=}	[resize=true]	Size content after init
-	 */
-,	initContent = function (pane, resize) {
-		if (!isInitialized()) return;
-		var 
-			o	= options[pane]
-		,	sel	= o.contentSelector
-		,	I	= Instance[pane]
-		,	$P	= $Ps[pane]
-		,	$C
-		;
-		if (sel) $C = I.content = $Cs[pane] = (o.findNestedContent)
-			? $P.find(sel).eq(0) // match 1-element only
-			: $P.children(sel).eq(0)
-		;
-		if ($C && $C.length) {
-			$C.data("layoutRole", "content");
-			// SAVE original Content CSS
-			if (!$C.data("layoutCSS"))
-				$C.data("layoutCSS", styles($C, "height"));
-			$C.css( _c.content.cssReq );
-			if (o.applyDemoStyles) {
-				$C.css( _c.content.cssDemo ); // add padding & overflow: auto to content-div
-				$P.css( _c.content.cssDemoPane ); // REMOVE padding/scrolling from pane
-			}
-			// ensure no vertical scrollbar on pane - will mess up measurements
-			if ($P.css("overflowX").match(/(scroll|auto)/)) {
-				$P.css("overflow", "hidden");
-			}
-			state[pane].content = {}; // init content state
-			if (resize !== false) sizeContent(pane);
-			// sizeContent() is called AFTER init of all elements
-		}
-		else
-			I.content = $Cs[pane] = false;
-	}
-
-
-	/**
-	 * Add resize-bars to all panes that specify it in options
-	 * -dependancy: $.fn.resizable - will skip if not found
-	 *
-	 * @see  _create()
-	 * @param {string=}	[panes=""]	The edge(s) to process
-	 */
-,	initResizable = function (panes) {
-		var	draggingAvailable = $.layout.plugins.draggable
-		,	side // set in start()
-		;
-		panes = panes ? panes.split(",") : _c.borderPanes;
-
-		$.each(panes, function (idx, pane) {
-			var o = options[pane];
-			if (!draggingAvailable || !$Ps[pane] || !o.resizable) {
-				o.resizable = false;
-				return true; // skip to next
-			}
-
-			var s		= state[pane]
-			,	z		= options.zIndexes
-			,	c		= _c[pane]
-			,	side	= c.dir=="horz" ? "top" : "left"
-			,	$P 		= $Ps[pane]
-			,	$R		= $Rs[pane]
-			,	base	= o.resizerClass
-			,	lastPos	= 0 // used when live-resizing
-			,	r, live // set in start because may change
-			//	'drag' classes are applied to the ORIGINAL resizer-bar while dragging is in process
-			,	resizerClass		= base+"-drag"				// resizer-drag
-			,	resizerPaneClass	= base+"-"+pane+"-drag"		// resizer-north-drag
-			//	'helper' class is applied to the CLONED resizer-bar while it is being dragged
-			,	helperClass			= base+"-dragging"			// resizer-dragging
-			,	helperPaneClass		= base+"-"+pane+"-dragging" // resizer-north-dragging
-			,	helperLimitClass	= base+"-dragging-limit"	// resizer-drag
-			,	helperPaneLimitClass = base+"-"+pane+"-dragging-limit"	// resizer-north-drag
-			,	helperClassesSet	= false 					// logic var
-			;
-
-			if (!s.isClosed)
-				$R.attr("title", o.tips.Resize)
-				  .css("cursor", o.resizerCursor); // n-resize, s-resize, etc
-
-			$R.draggable({
-				containment:	$N[0] // limit resizing to layout container
-			,	axis:			(c.dir=="horz" ? "y" : "x") // limit resizing to horz or vert axis
-			,	delay:			0
-			,	distance:		1
-			,	grid:			o.resizingGrid
-			//	basic format for helper - style it using class: .ui-draggable-dragging
-			,	helper:			"clone"
-			,	opacity:		o.resizerDragOpacity
-			,	addClasses:		false // avoid ui-state-disabled class when disabled
-			//,	iframeFix:		o.draggableIframeFix // TODO: consider using when bug is fixed
-			,	zIndex:			z.resizer_drag
-
-			,	start: function (e, ui) {
-					// REFRESH options & state pointers in case we used swapPanes
-					o = options[pane];
-					s = state[pane];
-					// re-read options
-					live = o.livePaneResizing;
-
-					// ondrag_start callback - will CANCEL hide if returns false
-					// TODO: dragging CANNOT be cancelled like this, so see if there is a way?
-					if (false === _runCallbacks("ondrag_start", pane)) return false;
-
-					s.isResizing		= true; // prevent pane from closing while resizing
-					state.paneResizing	= pane; // easy to see if ANY pane is resizing
-					timer.clear(pane+"_closeSlider"); // just in case already triggered
-
-					// SET RESIZER LIMITS - used in drag()
-					setSizeLimits(pane); // update pane/resizer state
-					r = s.resizerPosition;
-					lastPos = ui.position[ side ]
-
-					$R.addClass( resizerClass +" "+ resizerPaneClass ); // add drag classes
-					helperClassesSet = false; // reset logic var - see drag()
-
-					// MASK PANES CONTAINING IFRAMES, APPLETS OR OTHER TROUBLESOME ELEMENTS
-					showMasks( pane, { resizing: true });
-				}
-
-			,	drag: function (e, ui) {
-					if (!helperClassesSet) { // can only add classes after clone has been added to the DOM
-						//$(".ui-draggable-dragging")
-						ui.helper
-							.addClass( helperClass +" "+ helperPaneClass ) // add helper classes
-							.css({ right: "auto", bottom: "auto" })	// fix dir="rtl" issue
-							.children().css("visibility","hidden")	// hide toggler inside dragged resizer-bar
-						;
-						helperClassesSet = true;
-						// draggable bug!? RE-SET zIndex to prevent E/W resize-bar showing through N/S pane!
-						if (s.isSliding) $Ps[pane].css("zIndex", z.pane_sliding);
-					}
-					// CONTAIN RESIZER-BAR TO RESIZING LIMITS
-					var limit = 0;
-					if (ui.position[side] < r.min) {
-						ui.position[side] = r.min;
-						limit = -1;
-					}
-					else if (ui.position[side] > r.max) {
-						ui.position[side] = r.max;
-						limit = 1;
-					}
-					// ADD/REMOVE dragging-limit CLASS
-					if (limit) {
-						ui.helper.addClass( helperLimitClass +" "+ helperPaneLimitClass ); // at dragging-limit
-						window.defaultStatus = (limit>0 && pane.match(/(north|west)/)) || (limit<0 && pane.match(/(south|east)/)) ? o.tips.maxSizeWarning : o.tips.minSizeWarning;
-					}
-					else {
-						ui.helper.removeClass( helperLimitClass +" "+ helperPaneLimitClass ); // not at dragging-limit
-						window.defaultStatus = "";
-					}
-					// DYNAMICALLY RESIZE PANES IF OPTION ENABLED
-					// won't trigger unless resizer has actually moved!
-					if (live && Math.abs(ui.position[side] - lastPos) >= o.liveResizingTolerance) {
-						lastPos = ui.position[side];
-						resizePanes(e, ui, pane)
-					}
-				}
-
-			,	stop: function (e, ui) {
-					$('body').enableSelection(); // RE-ENABLE TEXT SELECTION
-					window.defaultStatus = ""; // clear 'resizing limit' message from statusbar
-					$R.removeClass( resizerClass +" "+ resizerPaneClass ); // remove drag classes from Resizer
-					s.isResizing		= false;
-					state.paneResizing	= false; // easy to see if ANY pane is resizing
-					resizePanes(e, ui, pane, true); // true = resizingDone
-				}
-
-			});
-		});
-
-		/**
-		 * resizePanes
-		 *
-		 * Sub-routine called from stop() - and drag() if livePaneResizing
-		 *
-		 * @param {!Object}		evt
-		 * @param {!Object}		ui
-		 * @param {string}		pane
-		 * @param {boolean=}		[resizingDone=false]
-		 */
-		var resizePanes = function (evt, ui, pane, resizingDone) {
-			var	dragPos	= ui.position
-			,	c		= _c[pane]
-			,	o		= options[pane]
-			,	s		= state[pane]
-			,	resizerPos
-			;
-			switch (pane) {
-				case "north":	resizerPos = dragPos.top; break;
-				case "west":	resizerPos = dragPos.left; break;
-				case "south":	resizerPos = sC.layoutHeight - dragPos.top  - o.spacing_open; break;
-				case "east":	resizerPos = sC.layoutWidth  - dragPos.left - o.spacing_open; break;
-			};
-			// remove container margin from resizer position to get the pane size
-			var newSize = resizerPos - sC.inset[c.side];
-
-			// Disable OR Resize Mask(s) created in drag.start
-			if (!resizingDone) {
-				// ensure we meet liveResizingTolerance criteria
-				if (Math.abs(newSize - s.size) < o.liveResizingTolerance)
-					return; // SKIP resize this time
-				// resize the pane
-				manualSizePane(pane, newSize, false, true); // true = noAnimation
-				sizeMasks(); // resize all visible masks
-			}
-			else { // resizingDone
-				// ondrag_end callback
-				if (false !== _runCallbacks("ondrag_end", pane))
-					manualSizePane(pane, newSize, false, true); // true = noAnimation
-				hideMasks(true); // true = force hiding all masks even if one is 'sliding'
-				if (s.isSliding) // RE-SHOW 'object-masks' so objects won't show through sliding pane
-					showMasks( pane, { resizing: true });
-			}
-		};
-	}
-
-	/**
-	 *	sizeMask
-	 *
-	 *	Needed to overlay a DIV over an IFRAME-pane because mask CANNOT be *inside* the pane
-	 *	Called when mask created, and during livePaneResizing
-	 */
-,	sizeMask = function () {
-		var $M		= $(this)
-		,	pane	= $M.data("layoutMask") // eg: "west"
-		,	s		= state[pane]
-		;
-		// only masks over an IFRAME-pane need manual resizing
-		if (s.tagName == "IFRAME" && s.isVisible) // no need to mask closed/hidden panes
-			$M.css({
-				top:	s.offsetTop
-			,	left:	s.offsetLeft
-			,	width:	s.outerWidth
-			,	height:	s.outerHeight
-			});
-		/* ALT Method...
-		var $P = $Ps[pane];
-		$M.css( $P.position() ).css({ width: $P[0].offsetWidth, height: $P[0].offsetHeight });
-		*/
-	}
-,	sizeMasks = function () {
-		$Ms.each( sizeMask ); // resize all 'visible' masks
-	}
-
-	/**
-	 * @param {string}	pane		The pane being resized, animated or isSliding
-	 * @param {Object=}	[args]		(optional) Options: which masks to apply, and to which panes
-	 */
-,	showMasks = function (pane, args) {
-		var	c		= _c[pane]
-		,	panes	=  ["center"]
-		,	z		= options.zIndexes
-		,	a		= $.extend({
-						objectsOnly:	false
-					,	animation:		false
-					,	resizing:		true
-					,	sliding:		state[pane].isSliding
-					},	args )
-		,	o, s
-		;
-		if (a.resizing)
-			panes.push( pane );
-		if (a.sliding)
-			panes.push( _c.oppositeEdge[pane] ); // ADD the oppositeEdge-pane
-
-		if (c.dir === "horz") {
-			panes.push("west");
-			panes.push("east");
-		}
-
-		$.each(panes, function(i,p){
-			s = state[p];
-			o = options[p];
-			if (s.isVisible && ( o.maskObjects || (!a.objectsOnly && o.maskContents) )) {
-				getMasks(p).each(function(){
-					sizeMask.call(this);
-					this.style.zIndex = s.isSliding ? z.pane_sliding+1 : z.pane_normal+1
-					this.style.display = "block";
-				});
-			}
-		});
-	}
-
-	/**
-	 * @param {boolean=}	force		Hide masks even if a pane is sliding
-	 */
-,	hideMasks = function (force) {
-		// ensure no pane is resizing - could be a timing issue
-		if (force || !state.paneResizing) {
-			$Ms.hide(); // hide ALL masks
-		}
-		// if ANY pane is sliding, then DO NOT remove masks from panes with maskObjects enabled
-		else if (!force && !$.isEmptyObject( state.panesSliding )) {
-			var	i = $Ms.length - 1
-			,	p, $M;
-			for (; i >= 0; i--) {
-				$M	= $Ms.eq(i);
-				p	= $M.data("layoutMask");
-				if (!options[p].maskObjects) {
-					$M.hide();
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param {string}	pane
-	 */
-,	getMasks = function (pane) {
-		var $Masks	= $([])
-		,	$M, i = 0, c = $Ms.length
-		;
-		for (; i CSS
-		if (sC.tagName === "BODY" && ($N = $("html")).data(css)) // RESET  CSS
-			$N.css( $N.data(css) ).removeData(css);
-
-		// trigger plugins for this layout, if there are any
-		runPluginCallbacks( Instance, $.layout.onDestroy );
-
-		// trigger state-management and onunload callback
-		unload();
-
-		// clear the Instance of everything except for container & options (so could recreate)
-		// RE-CREATE: myLayout = myLayout.container.layout( myLayout.options );
-		for (var n in Instance)
-			if (!n.match(/^(container|options)$/)) delete Instance[ n ];
-		// add a 'destroyed' flag to make it easy to check
-		Instance.destroyed = true;
-
-		// if this is a child layout, CLEAR the child-pointer in the parent
-		/* for now the pointer REMAINS, but with only container, options and destroyed keys
-		if (parentPane) {
-			var layout	= parentPane.pane.data("parentLayout")
-			,	key		= layout.options.instanceKey || 'error';
-			// THIS SYNTAX MAY BE WRONG!
-			parentPane.children[key] = layout.children[ parentPane.name ].children[key] = null;
-		}
-		*/
-
-		return Instance; // for coding convenience
-	}
-
-	/**
-	 * Remove a pane from the layout - subroutine of destroy()
-	 *
-	 * @see  destroy()
-	 * @param {(string|Object)}	evt_or_pane			The pane to process
-	 * @param {boolean=}			[remove=false]		Remove the DOM element?
-	 * @param {boolean=}			[skipResize=false]	Skip calling resizeAll()?
-	 * @param {boolean=}			[destroyChild=true]	Destroy Child-layouts? If not passed, obeys options setting
-	 */
-,	removePane = function (evt_or_pane, remove, skipResize, destroyChild) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$P	= $Ps[pane]
-		,	$C	= $Cs[pane]
-		,	$R	= $Rs[pane]
-		,	$T	= $Ts[pane]
-		;
-		// NOTE: elements can still exist even after remove()
-		//		so check for missing data(), which is cleared by removed()
-		if ($P && $.isEmptyObject( $P.data() )) $P = false;
-		if ($C && $.isEmptyObject( $C.data() )) $C = false;
-		if ($R && $.isEmptyObject( $R.data() )) $R = false;
-		if ($T && $.isEmptyObject( $T.data() )) $T = false;
-
-		if ($P) $P.stop(true, true);
-
-		var	o	= options[pane]
-		,	s	= state[pane]
-		,	d	= "layout"
-		,	css	= "layoutCSS"
-		,	pC	= children[pane]
-		,	hasChildren	= $.isPlainObject( pC ) && !$.isEmptyObject( pC )
-		,	destroy		= destroyChild !== undefined ? destroyChild : o.destroyChildren
-		;
-		// FIRST destroy the child-layout(s)
-		if (hasChildren && destroy) {
-			$.each( pC, function (key, child) {
-				if (!child.destroyed)
-					child.destroy(true);// tell child-layout to destroy ALL its child-layouts too
-				if (child.destroyed)	// destroy was successful
-					delete pC[key];
-			});
-			// if no more children, remove the children hash
-			if ($.isEmptyObject( pC )) {
-				pC = children[pane] = null; // clear children hash
-				hasChildren = false;
-			}
-		}
-
-		// Note: can't 'remove' a pane element with non-destroyed children
-		if ($P && remove && !hasChildren)
-			$P.remove(); // remove the pane-element and everything inside it
-		else if ($P && $P[0]) {
-			//	create list of ALL pane-classes that need to be removed
-			var	root	= o.paneClass // default="ui-layout-pane"
-			,	pRoot	= root +"-"+ pane // eg: "ui-layout-pane-west"
-			,	_open	= "-open"
-			,	_sliding= "-sliding"
-			,	_closed	= "-closed"
-			,	classes	= [	root, root+_open, root+_closed, root+_sliding,		// generic classes
-							pRoot, pRoot+_open, pRoot+_closed, pRoot+_sliding ]	// pane-specific classes
-			;
-			$.merge(classes, getHoverClasses($P, true)); // ADD hover-classes
-			// remove all Layout classes from pane-element
-			$P	.removeClass( classes.join(" ") ) // remove ALL pane-classes
-				.removeData("parentLayout")
-				.removeData("layoutPane")
-				.removeData("layoutRole")
-				.removeData("layoutEdge")
-				.removeData("autoHidden")	// in case set
-				.unbind("."+ sID) // remove ALL Layout events
-				// TODO: remove these extra unbind commands when jQuery is fixed
-				//.unbind("mouseenter"+ sID)
-				//.unbind("mouseleave"+ sID)
-			;
-			// do NOT reset CSS if this pane/content is STILL the container of a nested layout!
-			// the nested layout will reset its 'container' CSS when/if it is destroyed
-			if (hasChildren && $C) {
-				// a content-div may not have a specific width, so give it one to contain the Layout
-				$C.width( $C.width() );
-				$.each( pC, function (key, child) {
-					child.resizeAll(); // resize the Layout
-				});
-			}
-			else if ($C)
-				$C.css( $C.data(css) ).removeData(css).removeData("layoutRole");
-			// remove pane AFTER content in case there was a nested layout
-			if (!$P.data(d))
-				$P.css( $P.data(css) ).removeData(css);
-		}
-
-		// REMOVE pane resizer and toggler elements
-		if ($T) $T.remove();
-		if ($R) $R.remove();
-
-		// CLEAR all pointers and state data
-		Instance[pane] = $Ps[pane] = $Cs[pane] = $Rs[pane] = $Ts[pane] = false;
-		s = { removed: true };
-
-		if (!skipResize)
-			resizeAll();
-	}
-
-
-/*
- * ###########################
- *	   ACTION METHODS
- * ###########################
- */
-
-	/**
-	 * @param {string}	pane
-	 */
-,	_hidePane = function (pane) {
-		var $P	= $Ps[pane]
-		,	o	= options[pane]
-		,	s	= $P[0].style
-		;
-		if (o.useOffscreenClose) {
-			if (!$P.data(_c.offscreenReset))
-				$P.data(_c.offscreenReset, { left: s.left, right: s.right });
-			$P.css( _c.offscreenCSS );
-		}
-		else
-			$P.hide().removeData(_c.offscreenReset);
-	}
-
-	/**
-	 * @param {string}	pane
-	 */
-,	_showPane = function (pane) {
-		var $P	= $Ps[pane]
-		,	o	= options[pane]
-		,	off	= _c.offscreenCSS
-		,	old	= $P.data(_c.offscreenReset)
-		,	s	= $P[0].style
-		;
-		$P	.show() // ALWAYS show, just in case
-			.removeData(_c.offscreenReset);
-		if (o.useOffscreenClose && old) {
-			if (s.left == off.left)
-				s.left = old.left;
-			if (s.right == off.right)
-				s.right = old.right;
-		}
-	}
-
-
-	/**
-	 * Completely 'hides' a pane, including its spacing - as if it does not exist
-	 * The pane is not actually 'removed' from the source, so can use 'show' to un-hide it
-	 *
-	 * @param {(string|Object)}	evt_or_pane			The pane being hidden, ie: north, south, east, or west
-	 * @param {boolean=}			[noAnimation=false]	
-	 */
-,	hide = function (evt_or_pane, noAnimation) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	o	= options[pane]
-		,	s	= state[pane]
-		,	$P	= $Ps[pane]
-		,	$R	= $Rs[pane]
-		;
-		if (pane === "center" || !$P || s.isHidden) return; // pane does not exist OR is already hidden
-
-		// onhide_start callback - will CANCEL hide if returns false
-		if (state.initialized && false === _runCallbacks("onhide_start", pane)) return;
-
-		s.isSliding = false; // just in case
-		delete state.panesSliding[pane];
-
-		// now hide the elements
-		if ($R) $R.hide(); // hide resizer-bar
-		if (!state.initialized || s.isClosed) {
-			s.isClosed = true; // to trigger open-animation on show()
-			s.isHidden  = true;
-			s.isVisible = false;
-			if (!state.initialized)
-				_hidePane(pane); // no animation when loading page
-			sizeMidPanes(_c[pane].dir === "horz" ? "" : "center");
-			if (state.initialized || o.triggerEventsOnLoad)
-				_runCallbacks("onhide_end", pane);
-		}
-		else {
-			s.isHiding = true; // used by onclose
-			close(pane, false, noAnimation); // adjust all panes to fit
-		}
-	}
-
-	/**
-	 * Show a hidden pane - show as 'closed' by default unless openPane = true
-	 *
-	 * @param {(string|Object)}	evt_or_pane			The pane being opened, ie: north, south, east, or west
-	 * @param {boolean=}			[openPane=false]
-	 * @param {boolean=}			[noAnimation=false]
-	 * @param {boolean=}			[noAlert=false]
-	 */
-,	show = function (evt_or_pane, openPane, noAnimation, noAlert) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	o	= options[pane]
-		,	s	= state[pane]
-		,	$P	= $Ps[pane]
-		,	$R	= $Rs[pane]
-		;
-		if (pane === "center" || !$P || !s.isHidden) return; // pane does not exist OR is not hidden
-
-		// onshow_start callback - will CANCEL show if returns false
-		if (false === _runCallbacks("onshow_start", pane)) return;
-
-		s.isShowing = true; // used by onopen/onclose
-		//s.isHidden  = false; - will be set by open/close - if not cancelled
-		s.isSliding = false; // just in case
-		delete state.panesSliding[pane];
-
-		// now show the elements
-		//if ($R) $R.show(); - will be shown by open/close
-		if (openPane === false)
-			close(pane, true); // true = force
-		else
-			open(pane, false, noAnimation, noAlert); // adjust all panes to fit
-	}
-
-
-	/**
-	 * Toggles a pane open/closed by calling either open or close
-	 *
-	 * @param {(string|Object)}	evt_or_pane		The pane being toggled, ie: north, south, east, or west
-	 * @param {boolean=}			[slide=false]
-	 */
-,	toggle = function (evt_or_pane, slide) {
-		if (!isInitialized()) return;
-		var	evt		= evtObj(evt_or_pane)
-		,	pane	= evtPane.call(this, evt_or_pane)
-		,	s		= state[pane]
-		;
-		if (evt) // called from to $R.dblclick OR triggerPaneEvent
-			evt.stopImmediatePropagation();
-		if (s.isHidden)
-			show(pane); // will call 'open' after unhiding it
-		else if (s.isClosed)
-			open(pane, !!slide);
-		else
-			close(pane);
-	}
-
-
-	/**
-	 * Utility method used during init or other auto-processes
-	 *
-	 * @param {string}	pane   The pane being closed
-	 * @param {boolean=}	[setHandles=false]
-	 */
-,	_closePane = function (pane, setHandles) {
-		var
-			$P	= $Ps[pane]
-		,	s	= state[pane]
-		;
-		_hidePane(pane);
-		s.isClosed = true;
-		s.isVisible = false;
-		if (setHandles) setAsClosed(pane);
-	}
-
-	/**
-	 * Close the specified pane (animation optional), and resize all other panes as needed
-	 *
-	 * @param {(string|Object)}	evt_or_pane			The pane being closed, ie: north, south, east, or west
-	 * @param {boolean=}			[force=false]
-	 * @param {boolean=}			[noAnimation=false]
-	 * @param {boolean=}			[skipCallback=false]
-	 */
-,	close = function (evt_or_pane, force, noAnimation, skipCallback) {
-		var	pane = evtPane.call(this, evt_or_pane);
-		if (pane === "center") return; // validate
-		// if pane has been initialized, but NOT the complete layout, close pane instantly
-		if (!state.initialized && $Ps[pane]) {
-			_closePane(pane, true); // INIT pane as closed
-			return;
-		}
-		if (!isInitialized()) return;
-
-		var
-			$P	= $Ps[pane]
-		,	$R	= $Rs[pane]
-		,	$T	= $Ts[pane]
-		,	o	= options[pane]
-		,	s	= state[pane]
-		,	c	= _c[pane]
-		,	doFX, isShowing, isHiding, wasSliding;
-
-		// QUEUE in case another action/animation is in progress
-		$N.queue(function( queueNext ){
-
-			if ( !$P
-			||	(!o.closable && !s.isShowing && !s.isHiding)	// invalid request // (!o.resizable && !o.closable) ???
-			||	(!force && s.isClosed && !s.isShowing)			// already closed
-			) return queueNext();
-
-			// onclose_start callback - will CANCEL hide if returns false
-			// SKIP if just 'showing' a hidden pane as 'closed'
-			var abort = !s.isShowing && false === _runCallbacks("onclose_start", pane);
-
-			// transfer logic vars to temp vars
-			isShowing	= s.isShowing;
-			isHiding	= s.isHiding;
-			wasSliding	= s.isSliding;
-			// now clear the logic vars (REQUIRED before aborting)
-			delete s.isShowing;
-			delete s.isHiding;
-
-			if (abort) return queueNext();
-
-			doFX		= !noAnimation && !s.isClosed && (o.fxName_close != "none");
-			s.isMoving	= true;
-			s.isClosed	= true;
-			s.isVisible	= false;
-			// update isHidden BEFORE sizing panes
-			if (isHiding) s.isHidden = true;
-			else if (isShowing) s.isHidden = false;
-
-			if (s.isSliding) // pane is being closed, so UNBIND trigger events
-				bindStopSlidingEvents(pane, false); // will set isSliding=false
-			else // resize panes adjacent to this one
-				sizeMidPanes(_c[pane].dir === "horz" ? "" : "center", false); // false = NOT skipCallback
-
-			// if this pane has a resizer bar, move it NOW - before animation
-			setAsClosed(pane);
-
-			// CLOSE THE PANE
-			if (doFX) { // animate the close
-				lockPaneForFX(pane, true);	// need to set left/top so animation will work
-				$P.hide( o.fxName_close, o.fxSettings_close, o.fxSpeed_close, function () {
-					lockPaneForFX(pane, false); // undo
-					if (s.isClosed) close_2();
-					queueNext();
-				});
-			}
-			else { // hide the pane without animation
-				_hidePane(pane);
-				close_2();
-				queueNext();
-			};
-		});
-
-		// SUBROUTINE
-		function close_2 () {
-			s.isMoving	= false;
-			bindStartSlidingEvents(pane, true); // will enable if o.slidable = true
-
-			// if opposite-pane was autoClosed, see if it can be autoOpened now
-			var altPane = _c.oppositeEdge[pane];
-			if (state[ altPane ].noRoom) {
-				setSizeLimits( altPane );
-				makePaneFit( altPane );
-			}
-
-			if (!skipCallback && (state.initialized || o.triggerEventsOnLoad)) {
-				// onclose callback - UNLESS just 'showing' a hidden pane as 'closed'
-				if (!isShowing)	_runCallbacks("onclose_end", pane);
-				// onhide OR onshow callback
-				if (isShowing)	_runCallbacks("onshow_end", pane);
-				if (isHiding)	_runCallbacks("onhide_end", pane);
-			}
-		}
-	}
-
-	/**
-	 * @param {string}	pane	The pane just closed, ie: north, south, east, or west
-	 */
-,	setAsClosed = function (pane) {
-		if (!$Rs[pane]) return; // handles not initialized yet!
-		var
-			$P		= $Ps[pane]
-		,	$R		= $Rs[pane]
-		,	$T		= $Ts[pane]
-		,	o		= options[pane]
-		,	s		= state[pane]
-		,	side	= _c[pane].side
-		,	rClass	= o.resizerClass
-		,	tClass	= o.togglerClass
-		,	_pane	= "-"+ pane // used for classNames
-		,	_open	= "-open"
-		,	_sliding= "-sliding"
-		,	_closed	= "-closed"
-		;
-		$R
-			.css(side, sC.inset[side]) // move the resizer
-			.removeClass( rClass+_open +" "+ rClass+_pane+_open )
-			.removeClass( rClass+_sliding +" "+ rClass+_pane+_sliding )
-			.addClass( rClass+_closed +" "+ rClass+_pane+_closed )
-		;
-		// handle already-hidden panes in case called by swap() or a similar method 
-		if (s.isHidden) $R.hide(); // hide resizer-bar 
-
-		// DISABLE 'resizing' when closed - do this BEFORE bindStartSlidingEvents?
-		if (o.resizable && $.layout.plugins.draggable)
-			$R
-				.draggable("disable")
-				.removeClass("ui-state-disabled") // do NOT apply disabled styling - not suitable here
-				.css("cursor", "default")
-				.attr("title","")
-			;
-
-		// if pane has a toggler button, adjust that too
-		if ($T) {
-			$T
-				.removeClass( tClass+_open +" "+ tClass+_pane+_open )
-				.addClass( tClass+_closed +" "+ tClass+_pane+_closed )
-				.attr("title", o.tips.Open) // may be blank
-			;
-			// toggler-content - if exists
-			$T.children(".content-open").hide();
-			$T.children(".content-closed").css("display","block");
-		}
-
-		// sync any 'pin buttons'
-		syncPinBtns(pane, false);
-
-		if (state.initialized) {
-			// resize 'length' and position togglers for adjacent panes
-			sizeHandles();
-		}
-	}
-
-	/**
-	 * Open the specified pane (animation optional), and resize all other panes as needed
-	 *
-	 * @param {(string|Object)}	evt_or_pane			The pane being opened, ie: north, south, east, or west
-	 * @param {boolean=}			[slide=false]
-	 * @param {boolean=}			[noAnimation=false]
-	 * @param {boolean=}			[noAlert=false]
-	 */
-,	open = function (evt_or_pane, slide, noAnimation, noAlert) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$P	= $Ps[pane]
-		,	$R	= $Rs[pane]
-		,	$T	= $Ts[pane]
-		,	o	= options[pane]
-		,	s	= state[pane]
-		,	c	= _c[pane]
-		,	doFX, isShowing
-		;
-		if (pane === "center") return; // validate
-		// QUEUE in case another action/animation is in progress
-		$N.queue(function( queueNext ){
-
-			if ( !$P
-			||	(!o.resizable && !o.closable && !s.isShowing)	// invalid request
-			||	(s.isVisible && !s.isSliding)					// already open
-			) return queueNext();
-
-			// pane can ALSO be unhidden by just calling show(), so handle this scenario
-			if (s.isHidden && !s.isShowing) {
-				queueNext(); // call before show() because it needs the queue free
-				show(pane, true);
-				return;
-			}
-
-			if (s.autoResize && s.size != o.size) // resize pane to original size set in options
-				sizePane(pane, o.size, true, true, true); // true=skipCallback/noAnimation/forceResize
-			else
-				// make sure there is enough space available to open the pane
-				setSizeLimits(pane, slide);
-
-			// onopen_start callback - will CANCEL open if returns false
-			var cbReturn = _runCallbacks("onopen_start", pane);
-
-			if (cbReturn === "abort")
-				return queueNext();
-
-			// update pane-state again in case options were changed in onopen_start
-			if (cbReturn !== "NC") // NC = "No Callback"
-				setSizeLimits(pane, slide);
-
-			if (s.minSize > s.maxSize) { // INSUFFICIENT ROOM FOR PANE TO OPEN!
-				syncPinBtns(pane, false); // make sure pin-buttons are reset
-				if (!noAlert && o.tips.noRoomToOpen)
-					alert(o.tips.noRoomToOpen);
-				return queueNext(); // ABORT
-			}
-
-			if (slide) // START Sliding - will set isSliding=true
-				bindStopSlidingEvents(pane, true); // BIND trigger events to close sliding-pane
-			else if (s.isSliding) // PIN PANE (stop sliding) - open pane 'normally' instead
-				bindStopSlidingEvents(pane, false); // UNBIND trigger events - will set isSliding=false
-			else if (o.slidable)
-				bindStartSlidingEvents(pane, false); // UNBIND trigger events
-
-			s.noRoom = false; // will be reset by makePaneFit if 'noRoom'
-			makePaneFit(pane);
-
-			// transfer logic var to temp var
-			isShowing = s.isShowing;
-			// now clear the logic var
-			delete s.isShowing;
-
-			doFX		= !noAnimation && s.isClosed && (o.fxName_open != "none");
-			s.isMoving	= true;
-			s.isVisible	= true;
-			s.isClosed	= false;
-			// update isHidden BEFORE sizing panes - WHY??? Old?
-			if (isShowing) s.isHidden = false;
-
-			if (doFX) { // ANIMATE
-				// mask adjacent panes with objects
-				lockPaneForFX(pane, true);	// need to set left/top so animation will work
-					$P.show( o.fxName_open, o.fxSettings_open, o.fxSpeed_open, function() {
-					lockPaneForFX(pane, false); // undo
-					if (s.isVisible) open_2(); // continue
-					queueNext();
-				});
-			}
-			else { // no animation
-				_showPane(pane);// just show pane and...
-				open_2();		// continue
-				queueNext();
-			};
-		});
-
-		// SUBROUTINE
-		function open_2 () {
-			s.isMoving	= false;
-
-			// cure iframe display issues
-			_fixIframe(pane);
-
-			// NOTE: if isSliding, then other panes are NOT 'resized'
-			if (!s.isSliding) { // resize all panes adjacent to this one
-				sizeMidPanes(_c[pane].dir=="vert" ? "center" : "", false); // false = NOT skipCallback
-			}
-
-			// set classes, position handles and execute callbacks...
-			setAsOpen(pane);
-		};
-	
-	}
-
-	/**
-	 * @param {string}	pane		The pane just opened, ie: north, south, east, or west
-	 * @param {boolean=}	[skipCallback=false]
-	 */
-,	setAsOpen = function (pane, skipCallback) {
-		var 
-			$P		= $Ps[pane]
-		,	$R		= $Rs[pane]
-		,	$T		= $Ts[pane]
-		,	o		= options[pane]
-		,	s		= state[pane]
-		,	side	= _c[pane].side
-		,	rClass	= o.resizerClass
-		,	tClass	= o.togglerClass
-		,	_pane	= "-"+ pane // used for classNames
-		,	_open	= "-open"
-		,	_closed	= "-closed"
-		,	_sliding= "-sliding"
-		;
-		$R
-			.css(side, sC.inset[side] + getPaneSize(pane)) // move the resizer
-			.removeClass( rClass+_closed +" "+ rClass+_pane+_closed )
-			.addClass( rClass+_open +" "+ rClass+_pane+_open )
-		;
-		if (s.isSliding)
-			$R.addClass( rClass+_sliding +" "+ rClass+_pane+_sliding )
-		else // in case 'was sliding'
-			$R.removeClass( rClass+_sliding +" "+ rClass+_pane+_sliding )
-
-		removeHover( 0, $R ); // remove hover classes
-		if (o.resizable && $.layout.plugins.draggable)
-			$R	.draggable("enable")
-				.css("cursor", o.resizerCursor)
-				.attr("title", o.tips.Resize);
-		else if (!s.isSliding)
-			$R.css("cursor", "default"); // n-resize, s-resize, etc
-
-		// if pane also has a toggler button, adjust that too
-		if ($T) {
-			$T	.removeClass( tClass+_closed +" "+ tClass+_pane+_closed )
-				.addClass( tClass+_open +" "+ tClass+_pane+_open )
-				.attr("title", o.tips.Close); // may be blank
-			removeHover( 0, $T ); // remove hover classes
-			// toggler-content - if exists
-			$T.children(".content-closed").hide();
-			$T.children(".content-open").css("display","block");
-		}
-
-		// sync any 'pin buttons'
-		syncPinBtns(pane, !s.isSliding);
-
-		// update pane-state dimensions - BEFORE resizing content
-		$.extend(s, elDims($P));
-
-		if (state.initialized) {
-			// resize resizer & toggler sizes for all panes
-			sizeHandles();
-			// resize content every time pane opens - to be sure
-			sizeContent(pane, true); // true = remeasure headers/footers, even if 'pane.isMoving'
-		}
-
-		if (!skipCallback && (state.initialized || o.triggerEventsOnLoad) && $P.is(":visible")) {
-			// onopen callback
-			_runCallbacks("onopen_end", pane);
-			// onshow callback - TODO: should this be here?
-			if (s.isShowing) _runCallbacks("onshow_end", pane);
-
-			// ALSO call onresize because layout-size *may* have changed while pane was closed
-			if (state.initialized)
-				_runCallbacks("onresize_end", pane);
-		}
-
-		// TODO: Somehow sizePane("north") is being called after this point???
-	}
-
-
-	/**
-	 * slideOpen / slideClose / slideToggle
-	 *
-	 * Pass-though methods for sliding
-	 */
-,	slideOpen = function (evt_or_pane) {
-		if (!isInitialized()) return;
-		var	evt		= evtObj(evt_or_pane)
-		,	pane	= evtPane.call(this, evt_or_pane)
-		,	s		= state[pane]
-		,	delay	= options[pane].slideDelay_open
-		;
-		if (pane === "center") return; // validate
-		// prevent event from triggering on NEW resizer binding created below
-		if (evt) evt.stopImmediatePropagation();
-
-		if (s.isClosed && evt && evt.type === "mouseenter" && delay > 0)
-			// trigger = mouseenter - use a delay
-			timer.set(pane+"_openSlider", open_NOW, delay);
-		else
-			open_NOW(); // will unbind events if is already open
-
-		/**
-		 * SUBROUTINE for timed open
-		 */
-		function open_NOW () {
-			if (!s.isClosed) // skip if no longer closed!
-				bindStopSlidingEvents(pane, true); // BIND trigger events to close sliding-pane
-			else if (!s.isMoving)
-				open(pane, true); // true = slide - open() will handle binding
-		};
-	}
-
-,	slideClose = function (evt_or_pane) {
-		if (!isInitialized()) return;
-		var	evt		= evtObj(evt_or_pane)
-		,	pane	= evtPane.call(this, evt_or_pane)
-		,	o		= options[pane]
-		,	s		= state[pane]
-		,	delay	= s.isMoving ? 1000 : 300 // MINIMUM delay - option may override
-		;
-		if (pane === "center") return; // validate
-		if (s.isClosed || s.isResizing)
-			return; // skip if already closed OR in process of resizing
-		else if (o.slideTrigger_close === "click")
-			close_NOW(); // close immediately onClick
-		else if (o.preventQuickSlideClose && s.isMoving)
-			return; // handle Chrome quick-close on slide-open
-		else if (o.preventPrematureSlideClose && evt && $.layout.isMouseOverElem(evt, $Ps[pane]))
-			return; // handle incorrect mouseleave trigger, like when over a SELECT-list in IE
-		else if (evt) // trigger = mouseleave - use a delay
-			// 1 sec delay if 'opening', else .3 sec
-			timer.set(pane+"_closeSlider", close_NOW, max(o.slideDelay_close, delay));
-		else // called programically
-			close_NOW();
-
-		/**
-		 * SUBROUTINE for timed close
-		 */
-		function close_NOW () {
-			if (s.isClosed) // skip 'close' if already closed!
-				bindStopSlidingEvents(pane, false); // UNBIND trigger events - TODO: is this needed here?
-			else if (!s.isMoving)
-				close(pane); // close will handle unbinding
-		};
-	}
-
-	/**
-	 * @param {(string|Object)}	evt_or_pane		The pane being opened, ie: north, south, east, or west
-	 */
-,	slideToggle = function (evt_or_pane) {
-		var pane = evtPane.call(this, evt_or_pane);
-		toggle(pane, true);
-	}
-
-
-	/**
-	 * Must set left/top on East/South panes so animation will work properly
-	 *
-	 * @param {string}	pane	The pane to lock, 'east' or 'south' - any other is ignored!
-	 * @param {boolean}	doLock  true = set left/top, false = remove
-	 */
-,	lockPaneForFX = function (pane, doLock) {
-		var $P	= $Ps[pane]
-		,	s	= state[pane]
-		,	o	= options[pane]
-		,	z	= options.zIndexes
-		;
-		if (doLock) {
-			showMasks( pane, { animation: true, objectsOnly: true });
-			$P.css({ zIndex: z.pane_animate }); // overlay all elements during animation
-			if (pane=="south")
-				$P.css({ top: sC.inset.top + sC.innerHeight - $P.outerHeight() });
-			else if (pane=="east")
-				$P.css({ left: sC.inset.left + sC.innerWidth - $P.outerWidth() });
-		}
-		else { // animation DONE - RESET CSS
-			hideMasks();
-			$P.css({ zIndex: (s.isSliding ? z.pane_sliding : z.pane_normal) });
-			if (pane=="south")
-				$P.css({ top: "auto" });
-			// if pane is positioned 'off-screen', then DO NOT screw with it!
-			else if (pane=="east" && !$P.css("left").match(/\-99999/))
-				$P.css({ left: "auto" });
-			// fix anti-aliasing in IE - only needed for animations that change opacity
-			if (browser.msie && o.fxOpacityFix && o.fxName_open != "slide" && $P.css("filter") && $P.css("opacity") == 1)
-				$P[0].style.removeAttribute('filter');
-		}
-	}
-
-
-	/**
-	 * Toggle sliding functionality of a specific pane on/off by adding removing 'slide open' trigger
-	 *
-	 * @see  open(), close()
-	 * @param {string}	pane	The pane to enable/disable, 'north', 'south', etc.
-	 * @param {boolean}	enable	Enable or Disable sliding?
-	 */
-,	bindStartSlidingEvents = function (pane, enable) {
-		var o		= options[pane]
-		,	$P		= $Ps[pane]
-		,	$R		= $Rs[pane]
-		,	evtName	= o.slideTrigger_open.toLowerCase()
-		;
-		if (!$R || (enable && !o.slidable)) return;
-
-		// make sure we have a valid event
-		if (evtName.match(/mouseover/))
-			evtName = o.slideTrigger_open = "mouseenter";
-		else if (!evtName.match(/(click|dblclick|mouseenter)/)) 
-			evtName = o.slideTrigger_open = "click";
-
-		// must remove double-click-toggle when using dblclick-slide
-		if (o.resizerDblClickToggle && evtName.match(/click/)) {
-			$R[enable ? "unbind" : "bind"]('dblclick.'+ sID, toggle)
-		}
-
-		$R
-			// add or remove event
-			[enable ? "bind" : "unbind"](evtName +'.'+ sID, slideOpen)
-			// set the appropriate cursor & title/tip
-			.css("cursor", enable ? o.sliderCursor : "default")
-			.attr("title", enable ? o.tips.Slide : "")
-		;
-	}
-
-	/**
-	 * Add or remove 'mouseleave' events to 'slide close' when pane is 'sliding' open or closed
-	 * Also increases zIndex when pane is sliding open
-	 * See bindStartSlidingEvents for code to control 'slide open'
-	 *
-	 * @see  slideOpen(), slideClose()
-	 * @param {string}	pane	The pane to process, 'north', 'south', etc.
-	 * @param {boolean}	enable	Enable or Disable events?
-	 */
-,	bindStopSlidingEvents = function (pane, enable) {
-		var	o		= options[pane]
-		,	s		= state[pane]
-		,	c		= _c[pane]
-		,	z		= options.zIndexes
-		,	evtName	= o.slideTrigger_close.toLowerCase()
-		,	action	= (enable ? "bind" : "unbind")
-		,	$P		= $Ps[pane]
-		,	$R		= $Rs[pane]
-		;
-		timer.clear(pane+"_closeSlider"); // just in case
-
-		if (enable) {
-			s.isSliding = true;
-			state.panesSliding[pane] = true;
-			// remove 'slideOpen' event from resizer
-			// ALSO will raise the zIndex of the pane & resizer
-			bindStartSlidingEvents(pane, false);
-		}
-		else {
-			s.isSliding = false;
-			delete state.panesSliding[pane];
-		}
-
-		// RE/SET zIndex - increases when pane is sliding-open, resets to normal when not
-		$P.css("zIndex", enable ? z.pane_sliding : z.pane_normal);
-		$R.css("zIndex", enable ? z.pane_sliding+2 : z.resizer_normal); // NOTE: mask = pane_sliding+1
-
-		// make sure we have a valid event
-		if (!evtName.match(/(click|mouseleave)/))
-			evtName = o.slideTrigger_close = "mouseleave"; // also catches 'mouseout'
-
-		// add/remove slide triggers
-		$R[action](evtName, slideClose); // base event on resize
-		// need extra events for mouseleave
-		if (evtName === "mouseleave") {
-			// also close on pane.mouseleave
-			$P[action]("mouseleave."+ sID, slideClose);
-			// cancel timer when mouse moves between 'pane' and 'resizer'
-			$R[action]("mouseenter."+ sID, cancelMouseOut);
-			$P[action]("mouseenter."+ sID, cancelMouseOut);
-		}
-
-		if (!enable)
-			timer.clear(pane+"_closeSlider");
-		else if (evtName === "click" && !o.resizable) {
-			// IF pane is not resizable (which already has a cursor and tip) 
-			// then set the a cursor & title/tip on resizer when sliding
-			$R.css("cursor", enable ? o.sliderCursor : "default");
-			$R.attr("title", enable ? o.tips.Close : ""); // use Toggler-tip, eg: "Close Pane"
-		}
-
-		// SUBROUTINE for mouseleave timer clearing
-		function cancelMouseOut (evt) {
-			timer.clear(pane+"_closeSlider");
-			evt.stopPropagation();
-		}
-	}
-
-
-	/**
-	 * Hides/closes a pane if there is insufficient room - reverses this when there is room again
-	 * MUST have already called setSizeLimits() before calling this method
-	 *
-	 * @param {string}	pane					The pane being resized
-	 * @param {boolean=}	[isOpening=false]		Called from onOpen?
-	 * @param {boolean=}	[skipCallback=false]	Should the onresize callback be run?
-	 * @param {boolean=}	[force=false]
-	 */
-,	makePaneFit = function (pane, isOpening, skipCallback, force) {
-		var	o	= options[pane]
-		,	s	= state[pane]
-		,	c	= _c[pane]
-		,	$P	= $Ps[pane]
-		,	$R	= $Rs[pane]
-		,	isSidePane 	= c.dir==="vert"
-		,	hasRoom		= false
-		;
-		// special handling for center & east/west panes
-		if (pane === "center" || (isSidePane && s.noVerticalRoom)) {
-			// see if there is enough room to display the pane
-			// ERROR: hasRoom = s.minHeight <= s.maxHeight && (isSidePane || s.minWidth <= s.maxWidth);
-			hasRoom = (s.maxHeight >= 0);
-			if (hasRoom && s.noRoom) { // previously hidden due to noRoom, so show now
-				_showPane(pane);
-				if ($R) $R.show();
-				s.isVisible = true;
-				s.noRoom = false;
-				if (isSidePane) s.noVerticalRoom = false;
-				_fixIframe(pane);
-			}
-			else if (!hasRoom && !s.noRoom) { // not currently hidden, so hide now
-				_hidePane(pane);
-				if ($R) $R.hide();
-				s.isVisible = false;
-				s.noRoom = true;
-			}
-		}
-
-		// see if there is enough room to fit the border-pane
-		if (pane === "center") {
-			// ignore center in this block
-		}
-		else if (s.minSize <= s.maxSize) { // pane CAN fit
-			hasRoom = true;
-			if (s.size > s.maxSize) // pane is too big - shrink it
-				sizePane(pane, s.maxSize, skipCallback, true, force); // true = noAnimation
-			else if (s.size < s.minSize) // pane is too small - enlarge it
-				sizePane(pane, s.minSize, skipCallback, true, force); // true = noAnimation
-			// need s.isVisible because new pseudoClose method keeps pane visible, but off-screen
-			else if ($R && s.isVisible && $P.is(":visible")) {
-				// make sure resizer-bar is positioned correctly
-				// handles situation where nested layout was 'hidden' when initialized
-				var	pos = s.size + sC.inset[c.side];
-				if ($.layout.cssNum( $R, c.side ) != pos) $R.css( c.side, pos );
-			}
-
-			// if was previously hidden due to noRoom, then RESET because NOW there is room
-			if (s.noRoom) {
-				// s.noRoom state will be set by open or show
-				if (s.wasOpen && o.closable) {
-					if (o.autoReopen)
-						open(pane, false, true, true); // true = noAnimation, true = noAlert
-					else // leave the pane closed, so just update state
-						s.noRoom = false;
-				}
-				else
-					show(pane, s.wasOpen, true, true); // true = noAnimation, true = noAlert
-			}
-		}
-		else { // !hasRoom - pane CANNOT fit
-			if (!s.noRoom) { // pane not set as noRoom yet, so hide or close it now...
-				s.noRoom = true; // update state
-				s.wasOpen = !s.isClosed && !s.isSliding;
-				if (s.isClosed){} // SKIP
-				else if (o.closable) // 'close' if possible
-					close(pane, true, true); // true = force, true = noAnimation
-				else // 'hide' pane if cannot just be closed
-					hide(pane, true); // true = noAnimation
-			}
-		}
-	}
-
-
-	/**
-	 * manualSizePane is an exposed flow-through method allowing extra code when pane is 'manually resized'
-	 *
-	 * @param {(string|Object)}	evt_or_pane				The pane being resized
-	 * @param {number}			size					The *desired* new size for this pane - will be validated
-	 * @param {boolean=}			[skipCallback=false]	Should the onresize callback be run?
-	 * @param {boolean=}			[noAnimation=false]
-	 * @param {boolean=}			[force=false]			Force resizing even if does not seem necessary
-	 */
-,	manualSizePane = function (evt_or_pane, size, skipCallback, noAnimation, force) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	o	= options[pane]
-		,	s	= state[pane]
-		//	if resizing callbacks have been delayed and resizing is now DONE, force resizing to complete...
-		,	forceResize = force || (o.livePaneResizing && !s.isResizing)
-		;
-		if (pane === "center") return; // validate
-		// ANY call to manualSizePane disables autoResize - ie, percentage sizing
-		s.autoResize = false;
-		// flow-through...
-		sizePane(pane, size, skipCallback, noAnimation, forceResize); // will animate resize if option enabled
-	}
-
-	/**
-	 * sizePane is called only by internal methods whenever a pane needs to be resized
-	 *
-	 * @param {(string|Object)}	evt_or_pane				The pane being resized
-	 * @param {number}			size					The *desired* new size for this pane - will be validated
-	 * @param {boolean=}			[skipCallback=false]	Should the onresize callback be run?
-	 * @param {boolean=}			[noAnimation=false]
-	 * @param {boolean=}			[force=false]			Force resizing even if does not seem necessary
-	 */
-,	sizePane = function (evt_or_pane, size, skipCallback, noAnimation, force) {
-		if (!isInitialized()) return;
-		var	pane	= evtPane.call(this, evt_or_pane) // probably NEVER called from event?
-		,	o		= options[pane]
-		,	s		= state[pane]
-		,	$P		= $Ps[pane]
-		,	$R		= $Rs[pane]
-		,	side	= _c[pane].side
-		,	dimName	= _c[pane].sizeType.toLowerCase()
-		,	skipResizeWhileDragging = s.isResizing && !o.triggerEventsDuringLiveResize
-		,	doFX	= noAnimation !== true && o.animatePaneSizing
-		,	oldSize, newSize
-		;
-		if (pane === "center") return; // validate
-		// QUEUE in case another action/animation is in progress
-		$N.queue(function( queueNext ){
-			// calculate 'current' min/max sizes
-			setSizeLimits(pane); // update pane-state
-			oldSize = s.size;
-			size = _parseSize(pane, size); // handle percentages & auto
-			size = max(size, _parseSize(pane, o.minSize));
-			size = min(size, s.maxSize);
-			if (size < s.minSize) { // not enough room for pane!
-				queueNext(); // call before makePaneFit() because it needs the queue free
-				makePaneFit(pane, false, skipCallback);	// will hide or close pane
-				return;
-			}
-
-			// IF newSize is same as oldSize, then nothing to do - abort
-			if (!force && size === oldSize)
-				return queueNext();
-
-			s.newSize = size;
-
-			// onresize_start callback CANNOT cancel resizing because this would break the layout!
-			if (!skipCallback && state.initialized && s.isVisible)
-				_runCallbacks("onresize_start", pane);
-
-			// resize the pane, and make sure its visible
-			newSize = cssSize(pane, size);
-
-			if (doFX && $P.is(":visible")) { // ANIMATE
-				var fx		= $.layout.effects.size[pane] || $.layout.effects.size.all
-				,	easing	= o.fxSettings_size.easing || fx.easing
-				,	z		= options.zIndexes
-				,	props	= {};
-				props[ dimName ] = newSize +'px';
-				s.isMoving = true;
-				// overlay all elements during animation
-				$P.css({ zIndex: z.pane_animate })
-				  .show().animate( props, o.fxSpeed_size, easing, function(){
-					// reset zIndex after animation
-					$P.css({ zIndex: (s.isSliding ? z.pane_sliding : z.pane_normal) });
-					s.isMoving = false;
-					delete s.newSize;
-					sizePane_2(); // continue
-					queueNext();
-				});
-			}
-			else { // no animation
-				$P.css( dimName, newSize );	// resize pane
-				delete s.newSize;
-				// if pane is visible, then 
-				if ($P.is(":visible"))
-					sizePane_2(); // continue
-				else {
-					// pane is NOT VISIBLE, so just update state data...
-					// when pane is *next opened*, it will have the new size
-					s.size = size;				// update state.size
-					//$.extend(s, elDims($P));	// update state dimensions - CANNOT do this when not visible!				}
-				}
-				queueNext();
-			};
-
-		});
-
-		// SUBROUTINE
-		function sizePane_2 () {
-			/*	Panes are sometimes not sized precisely in some browsers!?
-			 *	This code will resize the pane up to 3 times to nudge the pane to the correct size
-			 */
-			var	actual	= dimName==='width' ? $P.outerWidth() : $P.outerHeight()
-			,	tries	= [{
-						   	pane:		pane
-						,	count:		1
-						,	target:		size
-						,	actual:		actual
-						,	correct:	(size === actual)
-						,	attempt:	size
-						,	cssSize:	newSize
-						}]
-			,	lastTry = tries[0]
-			,	thisTry	= {}
-			,	msg		= 'Inaccurate size after resizing the '+ pane +'-pane.'
-			;
-			while ( !lastTry.correct ) {
-				thisTry = { pane: pane, count: lastTry.count+1, target: size };
-
-				if (lastTry.actual > size)
-					thisTry.attempt = max(0, lastTry.attempt - (lastTry.actual - size));
-				else // lastTry.actual < size
-					thisTry.attempt = max(0, lastTry.attempt + (size - lastTry.actual));
-
-				thisTry.cssSize = cssSize(pane, thisTry.attempt);
-				$P.css( dimName, thisTry.cssSize );
-
-				thisTry.actual	= dimName=='width' ? $P.outerWidth() : $P.outerHeight();
-				thisTry.correct	= (size === thisTry.actual);
-
-				// log attempts and alert the user of this *non-fatal error* (if showDebugMessages)
-				if ( tries.length === 1) {
-					_log(msg, false, true);
-					_log(lastTry, false, true);
-				}
-				_log(thisTry, false, true);
-				// after 4 tries, is as close as its gonna get!
-				if (tries.length > 3) break;
-
-				tries.push( thisTry );
-				lastTry = tries[ tries.length - 1 ];
-			}
-			// END TESTING CODE
-
-			// update pane-state dimensions
-			s.size	= size;
-			$.extend(s, elDims($P));
-
-			if (s.isVisible && $P.is(":visible")) {
-				// reposition the resizer-bar
-				if ($R) $R.css( side, size + sC.inset[side] );
-				// resize the content-div
-				sizeContent(pane);
-			}
-
-			if (!skipCallback && !skipResizeWhileDragging && state.initialized && s.isVisible)
-				_runCallbacks("onresize_end", pane);
-
-			// resize all the adjacent panes, and adjust their toggler buttons
-			// when skipCallback passed, it means the controlling method will handle 'other panes'
-			if (!skipCallback) {
-				// also no callback if live-resize is in progress and NOT triggerEventsDuringLiveResize
-				if (!s.isSliding) sizeMidPanes(_c[pane].dir=="horz" ? "" : "center", skipResizeWhileDragging, force);
-				sizeHandles();
-			}
-
-			// if opposite-pane was autoClosed, see if it can be autoOpened now
-			var altPane = _c.oppositeEdge[pane];
-			if (size < oldSize && state[ altPane ].noRoom) {
-				setSizeLimits( altPane );
-				makePaneFit( altPane, false, skipCallback );
-			}
-
-			// DEBUG - ALERT user/developer so they know there was a sizing problem
-			if (tries.length > 1)
-				_log(msg +'\nSee the Error Console for details.', true, true);
-		}
-	}
-
-	/**
-	 * @see  initPanes(), sizePane(), 	resizeAll(), open(), close(), hide()
-	 * @param {(Array.|string)}	panes					The pane(s) being resized, comma-delmited string
-	 * @param {boolean=}					[skipCallback=false]	Should the onresize callback be run?
-	 * @param {boolean=}					[force=false]
-	 */
-,	sizeMidPanes = function (panes, skipCallback, force) {
-		panes = (panes ? panes : "east,west,center").split(",");
-
-		$.each(panes, function (i, pane) {
-			if (!$Ps[pane]) return; // NO PANE - skip
-			var 
-				o		= options[pane]
-			,	s		= state[pane]
-			,	$P		= $Ps[pane]
-			,	$R		= $Rs[pane]
-			,	isCenter= (pane=="center")
-			,	hasRoom	= true
-			,	CSS		= {}
-			//	if pane is not visible, show it invisibly NOW rather than for *each call* in this script
-			,	visCSS	= $.layout.showInvisibly($P)
-
-			,	newCenter	= calcNewCenterPaneDims()
-			;
-
-			// update pane-state dimensions
-			$.extend(s, elDims($P));
-
-			if (pane === "center") {
-				if (!force && s.isVisible && newCenter.width === s.outerWidth && newCenter.height === s.outerHeight) {
-					$P.css(visCSS);
-					return true; // SKIP - pane already the correct size
-				}
-				// set state for makePaneFit() logic
-				$.extend(s, cssMinDims(pane), {
-					maxWidth:	newCenter.width
-				,	maxHeight:	newCenter.height
-				});
-				CSS = newCenter;
-				s.newWidth	= CSS.width;
-				s.newHeight	= CSS.height;
-				// convert OUTER width/height to CSS width/height 
-				CSS.width	= cssW($P, CSS.width);
-				// NEW - allow pane to extend 'below' visible area rather than hide it
-				CSS.height	= cssH($P, CSS.height);
-				hasRoom		= CSS.width >= 0 && CSS.height >= 0; // height >= 0 = ALWAYS TRUE NOW
-
-				// during layout init, try to shrink east/west panes to make room for center
-				if (!state.initialized && o.minWidth > newCenter.width) {
-					var
-						reqPx	= o.minWidth - s.outerWidth
-					,	minE	= options.east.minSize || 0
-					,	minW	= options.west.minSize || 0
-					,	sizeE	= state.east.size
-					,	sizeW	= state.west.size
-					,	newE	= sizeE
-					,	newW	= sizeW
-					;
-					if (reqPx > 0 && state.east.isVisible && sizeE > minE) {
-						newE = max( sizeE-minE, sizeE-reqPx );
-						reqPx -= sizeE-newE;
-					}
-					if (reqPx > 0 && state.west.isVisible && sizeW > minW) {
-						newW = max( sizeW-minW, sizeW-reqPx );
-						reqPx -= sizeW-newW;
-					}
-					// IF we found enough extra space, then resize the border panes as calculated
-					if (reqPx === 0) {
-						if (sizeE && sizeE != minE)
-							sizePane('east', newE, true, true, force); // true = skipCallback/noAnimation - initPanes will handle when done
-						if (sizeW && sizeW != minW)
-							sizePane('west', newW, true, true, force); // true = skipCallback/noAnimation
-						// now start over!
-						sizeMidPanes('center', skipCallback, force);
-						$P.css(visCSS);
-						return; // abort this loop
-					}
-				}
-			}
-			else { // for east and west, set only the height, which is same as center height
-				// set state.min/maxWidth/Height for makePaneFit() logic
-				if (s.isVisible && !s.noVerticalRoom)
-					$.extend(s, elDims($P), cssMinDims(pane))
-				if (!force && !s.noVerticalRoom && newCenter.height === s.outerHeight) {
-					$P.css(visCSS);
-					return true; // SKIP - pane already the correct size
-				}
-				// east/west have same top, bottom & height as center
-				CSS.top		= newCenter.top;
-				CSS.bottom	= newCenter.bottom;
-				s.newSize	= newCenter.height
-				// NEW - allow pane to extend 'below' visible area rather than hide it
-				CSS.height	= cssH($P, newCenter.height);
-				s.maxHeight	= CSS.height;
-				hasRoom		= (s.maxHeight >= 0); // ALWAYS TRUE NOW
-				if (!hasRoom) s.noVerticalRoom = true; // makePaneFit() logic
-			}
-
-			if (hasRoom) {
-				// resizeAll passes skipCallback because it triggers callbacks after ALL panes are resized
-				if (!skipCallback && state.initialized)
-					_runCallbacks("onresize_start", pane);
-
-				$P.css(CSS); // apply the CSS to pane
-				if (pane !== "center")
-					sizeHandles(pane); // also update resizer length
-				if (s.noRoom && !s.isClosed && !s.isHidden)
-					makePaneFit(pane); // will re-open/show auto-closed/hidden pane
-				if (s.isVisible) {
-					$.extend(s, elDims($P)); // update pane dimensions
-					if (state.initialized) sizeContent(pane); // also resize the contents, if exists
-				}
-			}
-			else if (!s.noRoom && s.isVisible) // no room for pane
-				makePaneFit(pane); // will hide or close pane
-
-			// reset visibility, if necessary
-			$P.css(visCSS);
-
-			delete s.newSize;
-			delete s.newWidth;
-			delete s.newHeight;
-
-			if (!s.isVisible)
-				return true; // DONE - next pane
-
-			/*
-			 * Extra CSS for IE6 or IE7 in Quirks-mode - add 'width' to NORTH/SOUTH panes
-			 * Normally these panes have only 'left' & 'right' positions so pane auto-sizes
-			 * ALSO required when pane is an IFRAME because will NOT default to 'full width'
-			 *	TODO: Can I use width:100% for a north/south iframe?
-			 *	TODO: Sounds like a job for $P.outerWidth( sC.innerWidth ) SETTER METHOD
-			 */
-			if (pane === "center") { // finished processing midPanes
-				var fix = browser.isIE6 || !browser.boxModel;
-				if ($Ps.north && (fix || state.north.tagName=="IFRAME")) 
-					$Ps.north.css("width", cssW($Ps.north, sC.innerWidth));
-				if ($Ps.south && (fix || state.south.tagName=="IFRAME"))
-					$Ps.south.css("width", cssW($Ps.south, sC.innerWidth));
-			}
-
-			// resizeAll passes skipCallback because it triggers callbacks after ALL panes are resized
-			if (!skipCallback && state.initialized)
-				_runCallbacks("onresize_end", pane);
-		});
-	}
-
-
-	/**
-	 * @see  window.onresize(), callbacks or custom code
-	 * @param {(Object|boolean)=}	evt_or_refresh	If 'true', then also reset pane-positioning
-	 */
-,	resizeAll = function (evt_or_refresh) {
-		var	oldW	= sC.innerWidth
-		,	oldH	= sC.innerHeight
-		;
-		// stopPropagation if called by trigger("layoutdestroy") - use evtPane utility 
-		evtPane(evt_or_refresh);
-
-		// cannot size layout when 'container' is hidden or collapsed
-		if (!$N.is(":visible")) return;
-
-		if (!state.initialized) {
-			_initLayoutElements();
-			return; // no need to resize since we just initialized!
-		}
-
-		if (evt_or_refresh === true && $.isPlainObject(options.outset)) {
-			// update container CSS in case outset option has changed
-			$N.css( options.outset );
-		}
-		// UPDATE container dimensions
-		$.extend(sC, elDims( $N, options.inset ));
-		if (!sC.outerHeight) return;
-
-		// if 'true' passed, refresh pane & handle positioning too
-		if (evt_or_refresh === true) {
-			setPanePosition();
-		}
-
-		// onresizeall_start will CANCEL resizing if returns false
-		// state.container has already been set, so user can access this info for calcuations
-		if (false === _runCallbacks("onresizeall_start")) return false;
-
-		var	// see if container is now 'smaller' than before
-			shrunkH	= (sC.innerHeight < oldH)
-		,	shrunkW	= (sC.innerWidth < oldW)
-		,	$P, o, s
-		;
-		// NOTE special order for sizing: S-N-E-W
-		$.each(["south","north","east","west"], function (i, pane) {
-			if (!$Ps[pane]) return; // no pane - SKIP
-			o = options[pane];
-			s = state[pane];
-			if (s.autoResize && s.size != o.size) // resize pane to original size set in options
-				sizePane(pane, o.size, true, true, true); // true=skipCallback/noAnimation/forceResize
-			else {
-				setSizeLimits(pane);
-				makePaneFit(pane, false, true, true); // true=skipCallback/forceResize
-			}
-		});
-
-		sizeMidPanes("", true, true); // true=skipCallback/forceResize
-		sizeHandles(); // reposition the toggler elements
-
-		// trigger all individual pane callbacks AFTER layout has finished resizing
-		$.each(_c.allPanes, function (i, pane) {
-			$P = $Ps[pane];
-			if (!$P) return; // SKIP
-			if (state[pane].isVisible) // undefined for non-existent panes
-				_runCallbacks("onresize_end", pane); // callback - if exists
-		});
-
-		_runCallbacks("onresizeall_end");
-		//_triggerLayoutEvent(pane, 'resizeall');
-	}
-
-	/**
-	 * Whenever a pane resizes or opens that has a nested layout, trigger resizeAll
-	 *
-	 * @param {(string|Object)}	evt_or_pane		The pane just resized or opened
-	 */
-,	resizeChildren = function (evt_or_pane, skipRefresh) {
-		var	pane = evtPane.call(this, evt_or_pane);
-
-		if (!options[pane].resizeChildren) return;
-
-		// ensure the pane-children are up-to-date
-		if (!skipRefresh) refreshChildren( pane );
-		var pC = children[pane];
-		if ($.isPlainObject( pC )) {
-			// resize one or more children
-			$.each( pC, function (key, child) {
-				if (!child.destroyed) child.resizeAll();
-			});
-		}
-	}
-
-	/**
-	 * IF pane has a content-div, then resize all elements inside pane to fit pane-height
-	 *
-	 * @param {(string|Object)}	evt_or_panes		The pane(s) being resized
-	 * @param {boolean=}			[remeasure=false]	Should the content (header/footer) be remeasured?
-	 */
-,	sizeContent = function (evt_or_panes, remeasure) {
-		if (!isInitialized()) return;
-
-		var panes = evtPane.call(this, evt_or_panes);
-		panes = panes ? panes.split(",") : _c.allPanes;
-
-		$.each(panes, function (idx, pane) {
-			var
-				$P	= $Ps[pane]
-			,	$C	= $Cs[pane]
-			,	o	= options[pane]
-			,	s	= state[pane]
-			,	m	= s.content // m = measurements
-			;
-			if (!$P || !$C || !$P.is(":visible")) return true; // NOT VISIBLE - skip
-
-			// if content-element was REMOVED, update OR remove the pointer
-			if (!$C.length) {
-				initContent(pane, false);	// false = do NOT sizeContent() - already there!
-				if (!$C) return;			// no replacement element found - pointer have been removed
-			}
-
-			// onsizecontent_start will CANCEL resizing if returns false
-			if (false === _runCallbacks("onsizecontent_start", pane)) return;
-
-			// skip re-measuring offsets if live-resizing
-			if ((!s.isMoving && !s.isResizing) || o.liveContentResizing || remeasure || m.top == undefined) {
-				_measure();
-				// if any footers are below pane-bottom, they may not measure correctly,
-				// so allow pane overflow and re-measure
-				if (m.hiddenFooters > 0 && $P.css("overflow") === "hidden") {
-					$P.css("overflow", "visible");
-					_measure(); // remeasure while overflowing
-					$P.css("overflow", "hidden");
-				}
-			}
-			// NOTE: spaceAbove/Below *includes* the pane paddingTop/Bottom, but not pane.borders
-			var newH = s.innerHeight - (m.spaceAbove - s.css.paddingTop) - (m.spaceBelow - s.css.paddingBottom);
-
-			if (!$C.is(":visible") || m.height != newH) {
-				// size the Content element to fit new pane-size - will autoHide if not enough room
-				setOuterHeight($C, newH, true); // true=autoHide
-				m.height = newH; // save new height
-			};
-
-			if (state.initialized)
-				_runCallbacks("onsizecontent_end", pane);
-
-			function _below ($E) {
-				return max(s.css.paddingBottom, (parseInt($E.css("marginBottom"), 10) || 0));
-			};
-
-			function _measure () {
-				var
-					ignore	= options[pane].contentIgnoreSelector
-				,	$Fs		= $C.nextAll().not(".ui-layout-mask").not(ignore || ":lt(0)") // not :lt(0) = ALL
-				,	$Fs_vis	= $Fs.filter(':visible')
-				,	$F		= $Fs_vis.filter(':last')
-				;
-				m = {
-					top:			$C[0].offsetTop
-				,	height:			$C.outerHeight()
-				,	numFooters:		$Fs.length
-				,	hiddenFooters:	$Fs.length - $Fs_vis.length
-				,	spaceBelow:		0 // correct if no content footer ($E)
-				}
-					m.spaceAbove	= m.top; // just for state - not used in calc
-					m.bottom		= m.top + m.height;
-				if ($F.length)
-					//spaceBelow = (LastFooter.top + LastFooter.height) [footerBottom] - Content.bottom + max(LastFooter.marginBottom, pane.paddingBotom)
-					m.spaceBelow = ($F[0].offsetTop + $F.outerHeight()) - m.bottom + _below($F);
-				else // no footer - check marginBottom on Content element itself
-					m.spaceBelow = _below($C);
-			};
-		});
-	}
-
-
-	/**
-	 * Called every time a pane is opened, closed, or resized to slide the togglers to 'center' and adjust their length if necessary
-	 *
-	 * @see  initHandles(), open(), close(), resizeAll()
-	 * @param {(string|Object)=}		evt_or_panes	The pane(s) being resized
-	 */
-,	sizeHandles = function (evt_or_panes) {
-		var panes = evtPane.call(this, evt_or_panes)
-		panes = panes ? panes.split(",") : _c.borderPanes;
-
-		$.each(panes, function (i, pane) {
-			var 
-				o	= options[pane]
-			,	s	= state[pane]
-			,	$P	= $Ps[pane]
-			,	$R	= $Rs[pane]
-			,	$T	= $Ts[pane]
-			,	$TC
-			;
-			if (!$P || !$R) return;
-
-			var
-				dir			= _c[pane].dir
-			,	_state		= (s.isClosed ? "_closed" : "_open")
-			,	spacing		= o["spacing"+ _state]
-			,	togAlign	= o["togglerAlign"+ _state]
-			,	togLen		= o["togglerLength"+ _state]
-			,	paneLen
-			,	left
-			,	offset
-			,	CSS = {}
-			;
-
-			if (spacing === 0) {
-				$R.hide();
-				return;
-			}
-			else if (!s.noRoom && !s.isHidden) // skip if resizer was hidden for any reason
-				$R.show(); // in case was previously hidden
-
-			// Resizer Bar is ALWAYS same width/height of pane it is attached to
-			if (dir === "horz") { // north/south
-				//paneLen = $P.outerWidth(); // s.outerWidth || 
-				paneLen = sC.innerWidth; // handle offscreen-panes
-				s.resizerLength = paneLen;
-				left = $.layout.cssNum($P, "left")
-				$R.css({
-					width:	cssW($R, paneLen) // account for borders & padding
-				,	height:	cssH($R, spacing) // ditto
-				,	left:	left > -9999 ? left : sC.inset.left // handle offscreen-panes
-				});
-			}
-			else { // east/west
-				paneLen = $P.outerHeight(); // s.outerHeight || 
-				s.resizerLength = paneLen;
-				$R.css({
-					height:	cssH($R, paneLen) // account for borders & padding
-				,	width:	cssW($R, spacing) // ditto
-				,	top:	sC.inset.top + getPaneSize("north", true) // TODO: what if no North pane?
-				//,	top:	$.layout.cssNum($Ps["center"], "top")
-				});
-			}
-
-			// remove hover classes
-			removeHover( o, $R );
-
-			if ($T) {
-				if (togLen === 0 || (s.isSliding && o.hideTogglerOnSlide)) {
-					$T.hide(); // always HIDE the toggler when 'sliding'
-					return;
-				}
-				else
-					$T.show(); // in case was previously hidden
-
-				if (!(togLen > 0) || togLen === "100%" || togLen > paneLen) {
-					togLen = paneLen;
-					offset = 0;
-				}
-				else { // calculate 'offset' based on options.PANE.togglerAlign_open/closed
-					if (isStr(togAlign)) {
-						switch (togAlign) {
-							case "top":
-							case "left":	offset = 0;
-											break;
-							case "bottom":
-							case "right":	offset = paneLen - togLen;
-											break;
-							case "middle":
-							case "center":
-							default:		offset = round((paneLen - togLen) / 2); // 'default' catches typos
-						}
-					}
-					else { // togAlign = number
-						var x = parseInt(togAlign, 10); //
-						if (togAlign >= 0) offset = x;
-						else offset = paneLen - togLen + x; // NOTE: x is negative!
-					}
-				}
-
-				if (dir === "horz") { // north/south
-					var width = cssW($T, togLen);
-					$T.css({
-						width:	width  // account for borders & padding
-					,	height:	cssH($T, spacing) // ditto
-					,	left:	offset // TODO: VERIFY that toggler  positions correctly for ALL values
-					,	top:	0
-					});
-					// CENTER the toggler content SPAN
-					$T.children(".content").each(function(){
-						$TC = $(this);
-						$TC.css("marginLeft", round((width-$TC.outerWidth())/2)); // could be negative
-					});
-				}
-				else { // east/west
-					var height = cssH($T, togLen);
-					$T.css({
-						height:	height // account for borders & padding
-					,	width:	cssW($T, spacing) // ditto
-					,	top:	offset // POSITION the toggler
-					,	left:	0
-					});
-					// CENTER the toggler content SPAN
-					$T.children(".content").each(function(){
-						$TC = $(this);
-						$TC.css("marginTop", round((height-$TC.outerHeight())/2)); // could be negative
-					});
-				}
-
-				// remove ALL hover classes
-				removeHover( 0, $T );
-			}
-
-			// DONE measuring and sizing this resizer/toggler, so can be 'hidden' now
-			if (!state.initialized && (o.initHidden || s.isHidden)) {
-				$R.hide();
-				if ($T) $T.hide();
-			}
-		});
-	}
-
-
-	/**
-	 * @param {(string|Object)}	evt_or_pane
-	 */
-,	enableClosable = function (evt_or_pane) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$T	= $Ts[pane]
-		,	o	= options[pane]
-		;
-		if (!$T) return;
-		o.closable = true;
-		$T	.bind("click."+ sID, function(evt){ evt.stopPropagation(); toggle(pane); })
-			.css("visibility", "visible")
-			.css("cursor", "pointer")
-			.attr("title", state[pane].isClosed ? o.tips.Open : o.tips.Close) // may be blank
-			.show();
-	}
-	/**
-	 * @param {(string|Object)}	evt_or_pane
-	 * @param {boolean=}			[hide=false]
-	 */
-,	disableClosable = function (evt_or_pane, hide) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$T	= $Ts[pane]
-		;
-		if (!$T) return;
-		options[pane].closable = false;
-		// is closable is disable, then pane MUST be open!
-		if (state[pane].isClosed) open(pane, false, true);
-		$T	.unbind("."+ sID)
-			.css("visibility", hide ? "hidden" : "visible") // instead of hide(), which creates logic issues
-			.css("cursor", "default")
-			.attr("title", "");
-	}
-
-
-	/**
-	 * @param {(string|Object)}	evt_or_pane
-	 */
-,	enableSlidable = function (evt_or_pane) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$R	= $Rs[pane]
-		;
-		if (!$R || !$R.data('draggable')) return;
-		options[pane].slidable = true; 
-		if (state[pane].isClosed)
-			bindStartSlidingEvents(pane, true);
-	}
-	/**
-	 * @param {(string|Object)}	evt_or_pane
-	 */
-,	disableSlidable = function (evt_or_pane) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$R	= $Rs[pane]
-		;
-		if (!$R) return;
-		options[pane].slidable = false; 
-		if (state[pane].isSliding)
-			close(pane, false, true);
-		else {
-			bindStartSlidingEvents(pane, false);
-			$R	.css("cursor", "default")
-				.attr("title", "");
-			removeHover(null, $R[0]); // in case currently hovered
-		}
-	}
-
-
-	/**
-	 * @param {(string|Object)}	evt_or_pane
-	 */
-,	enableResizable = function (evt_or_pane) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$R	= $Rs[pane]
-		,	o	= options[pane]
-		;
-		if (!$R || !$R.data('draggable')) return;
-		o.resizable = true; 
-		$R.draggable("enable");
-		if (!state[pane].isClosed)
-			$R	.css("cursor", o.resizerCursor)
-			 	.attr("title", o.tips.Resize);
-	}
-	/**
-	 * @param {(string|Object)}	evt_or_pane
-	 */
-,	disableResizable = function (evt_or_pane) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$R	= $Rs[pane]
-		;
-		if (!$R || !$R.data('draggable')) return;
-		options[pane].resizable = false; 
-		$R	.draggable("disable")
-			.css("cursor", "default")
-			.attr("title", "");
-		removeHover(null, $R[0]); // in case currently hovered
-	}
-
-
-	/**
-	 * Move a pane from source-side (eg, west) to target-side (eg, east)
-	 * If pane exists on target-side, move that to source-side, ie, 'swap' the panes
-	 *
-	 * @param {(string|Object)}	evt_or_pane1	The pane/edge being swapped
-	 * @param {string}			pane2			ditto
-	 */
-,	swapPanes = function (evt_or_pane1, pane2) {
-		if (!isInitialized()) return;
-		var pane1 = evtPane.call(this, evt_or_pane1);
-		// change state.edge NOW so callbacks can know where pane is headed...
-		state[pane1].edge = pane2;
-		state[pane2].edge = pane1;
-		// run these even if NOT state.initialized
-		if (false === _runCallbacks("onswap_start", pane1)
-		 ||	false === _runCallbacks("onswap_start", pane2)
-		) {
-			state[pane1].edge = pane1; // reset
-			state[pane2].edge = pane2;
-			return;
-		}
-
-		var
-			oPane1	= copy( pane1 )
-		,	oPane2	= copy( pane2 )
-		,	sizes	= {}
-		;
-		sizes[pane1] = oPane1 ? oPane1.state.size : 0;
-		sizes[pane2] = oPane2 ? oPane2.state.size : 0;
-
-		// clear pointers & state
-		$Ps[pane1] = false; 
-		$Ps[pane2] = false;
-		state[pane1] = {};
-		state[pane2] = {};
-		
-		// ALWAYS remove the resizer & toggler elements
-		if ($Ts[pane1]) $Ts[pane1].remove();
-		if ($Ts[pane2]) $Ts[pane2].remove();
-		if ($Rs[pane1]) $Rs[pane1].remove();
-		if ($Rs[pane2]) $Rs[pane2].remove();
-		$Rs[pane1] = $Rs[pane2] = $Ts[pane1] = $Ts[pane2] = false;
-
-		// transfer element pointers and data to NEW Layout keys
-		move( oPane1, pane2 );
-		move( oPane2, pane1 );
-
-		// cleanup objects
-		oPane1 = oPane2 = sizes = null;
-
-		// make panes 'visible' again
-		if ($Ps[pane1]) $Ps[pane1].css(_c.visible);
-		if ($Ps[pane2]) $Ps[pane2].css(_c.visible);
-
-		// fix any size discrepancies caused by swap
-		resizeAll();
-
-		// run these even if NOT state.initialized
-		_runCallbacks("onswap_end", pane1);
-		_runCallbacks("onswap_end", pane2);
-
-		return;
-
-		function copy (n) { // n = pane
-			var
-				$P	= $Ps[n]
-			,	$C	= $Cs[n]
-			;
-			return !$P ? false : {
-				pane:		n
-			,	P:			$P ? $P[0] : false
-			,	C:			$C ? $C[0] : false
-			,	state:		$.extend(true, {}, state[n])
-			,	options:	$.extend(true, {}, options[n])
-			}
-		};
-
-		function move (oPane, pane) {
-			if (!oPane) return;
-			var
-				P		= oPane.P
-			,	C		= oPane.C
-			,	oldPane = oPane.pane
-			,	c		= _c[pane]
-			//	save pane-options that should be retained
-			,	s		= $.extend(true, {}, state[pane])
-			,	o		= options[pane]
-			//	RETAIN side-specific FX Settings - more below
-			,	fx		= { resizerCursor: o.resizerCursor }
-			,	re, size, pos
-			;
-			$.each("fxName,fxSpeed,fxSettings".split(","), function (i, k) {
-				fx[k +"_open"]  = o[k +"_open"];
-				fx[k +"_close"] = o[k +"_close"];
-				fx[k +"_size"]  = o[k +"_size"];
-			});
-
-			// update object pointers and attributes
-			$Ps[pane] = $(P)
-				.data({
-					layoutPane:		Instance[pane]	// NEW pointer to pane-alias-object
-				,	layoutEdge:		pane
-				})
-				.css(_c.hidden)
-				.css(c.cssReq)
-			;
-			$Cs[pane] = C ? $(C) : false;
-
-			// set options and state
-			options[pane]	= $.extend(true, {}, oPane.options, fx);
-			state[pane]		= $.extend(true, {}, oPane.state);
-
-			// change classNames on the pane, eg: ui-layout-pane-east ==> ui-layout-pane-west
-			re = new RegExp(o.paneClass +"-"+ oldPane, "g");
-			P.className = P.className.replace(re, o.paneClass +"-"+ pane);
-
-			// ALWAYS regenerate the resizer & toggler elements
-			initHandles(pane); // create the required resizer & toggler
-
-			// if moving to different orientation, then keep 'target' pane size
-			if (c.dir != _c[oldPane].dir) {
-				size = sizes[pane] || 0;
-				setSizeLimits(pane); // update pane-state
-				size = max(size, state[pane].minSize);
-				// use manualSizePane to disable autoResize - not useful after panes are swapped
-				manualSizePane(pane, size, true, true); // true/true = skipCallback/noAnimation
-			}
-			else // move the resizer here
-				$Rs[pane].css(c.side, sC.inset[c.side] + (state[pane].isVisible ? getPaneSize(pane) : 0));
-
-
-			// ADD CLASSNAMES & SLIDE-BINDINGS
-			if (oPane.state.isVisible && !s.isVisible)
-				setAsOpen(pane, true); // true = skipCallback
-			else {
-				setAsClosed(pane);
-				bindStartSlidingEvents(pane, true); // will enable events IF option is set
-			}
-
-			// DESTROY the object
-			oPane = null;
-		};
-	}
-
-
-	/**
-	 * INTERNAL method to sync pin-buttons when pane is opened or closed
-	 * Unpinned means the pane is 'sliding' - ie, over-top of the adjacent panes
-	 *
-	 * @see  open(), setAsOpen(), setAsClosed()
-	 * @param {string}	pane   These are the params returned to callbacks by layout()
-	 * @param {boolean}	doPin  True means set the pin 'down', False means 'up'
-	 */
-,	syncPinBtns = function (pane, doPin) {
-		if ($.layout.plugins.buttons)
-			$.each(state[pane].pins, function (i, selector) {
-				$.layout.buttons.setPinState(Instance, $(selector), pane, doPin);
-			});
-	}
-
-;	// END var DECLARATIONS
-
-	/**
-	 * Capture keys when enableCursorHotkey - toggle pane if hotkey pressed
-	 *
-	 * @see  document.keydown()
-	 */
-	function keyDown (evt) {
-		if (!evt) return true;
-		var code = evt.keyCode;
-		if (code < 33) return true; // ignore special keys: ENTER, TAB, etc
-
-		var
-			PANE = {
-				38: "north" // Up Cursor	- $.ui.keyCode.UP
-			,	40: "south" // Down Cursor	- $.ui.keyCode.DOWN
-			,	37: "west"  // Left Cursor	- $.ui.keyCode.LEFT
-			,	39: "east"  // Right Cursor	- $.ui.keyCode.RIGHT
-			}
-		,	ALT		= evt.altKey // no worky!
-		,	SHIFT	= evt.shiftKey
-		,	CTRL	= evt.ctrlKey
-		,	CURSOR	= (CTRL && code >= 37 && code <= 40)
-		,	o, k, m, pane
-		;
-
-		if (CURSOR && options[PANE[code]].enableCursorHotkey) // valid cursor-hotkey
-			pane = PANE[code];
-		else if (CTRL || SHIFT) // check to see if this matches a custom-hotkey
-			$.each(_c.borderPanes, function (i, p) { // loop each pane to check its hotkey
-				o = options[p];
-				k = o.customHotkey;
-				m = o.customHotkeyModifier; // if missing or invalid, treated as "CTRL+SHIFT"
-				if ((SHIFT && m=="SHIFT") || (CTRL && m=="CTRL") || (CTRL && SHIFT)) { // Modifier matches
-					if (k && code === (isNaN(k) || k <= 9 ? k.toUpperCase().charCodeAt(0) : k)) { // Key matches
-						pane = p;
-						return false; // BREAK
-					}
-				}
-			});
-
-		// validate pane
-		if (!pane || !$Ps[pane] || !options[pane].closable || state[pane].isHidden)
-			return true;
-
-		toggle(pane);
-
-		evt.stopPropagation();
-		evt.returnValue = false; // CANCEL key
-		return false;
-	};
-
-
-/*
- * ######################################
- *	UTILITY METHODS
- *	called externally or by initButtons
- * ######################################
- */
-
-	/**
-	 * Change/reset a pane overflow setting & zIndex to allow popups/drop-downs to work
-	 *
-	 * @param {Object=}   [el]	(optional) Can also be 'bound' to a click, mouseOver, or other event
-	 */
-	function allowOverflow (el) {
-		if (!isInitialized()) return;
-		if (this && this.tagName) el = this; // BOUND to element
-		var $P;
-		if (isStr(el))
-			$P = $Ps[el];
-		else if ($(el).data("layoutRole"))
-			$P = $(el);
-		else
-			$(el).parents().each(function(){
-				if ($(this).data("layoutRole")) {
-					$P = $(this);
-					return false; // BREAK
-				}
-			});
-		if (!$P || !$P.length) return; // INVALID
-
-		var
-			pane	= $P.data("layoutEdge")
-		,	s		= state[pane]
-		;
-
-		// if pane is already raised, then reset it before doing it again!
-		// this would happen if allowOverflow is attached to BOTH the pane and an element 
-		if (s.cssSaved)
-			resetOverflow(pane); // reset previous CSS before continuing
-
-		// if pane is raised by sliding or resizing, or its closed, then abort
-		if (s.isSliding || s.isResizing || s.isClosed) {
-			s.cssSaved = false;
-			return;
-		}
-
-		var
-			newCSS	= { zIndex: (options.zIndexes.resizer_normal + 1) }
-		,	curCSS	= {}
-		,	of		= $P.css("overflow")
-		,	ofX		= $P.css("overflowX")
-		,	ofY		= $P.css("overflowY")
-		;
-		// determine which, if any, overflow settings need to be changed
-		if (of != "visible") {
-			curCSS.overflow = of;
-			newCSS.overflow = "visible";
-		}
-		if (ofX && !ofX.match(/(visible|auto)/)) {
-			curCSS.overflowX = ofX;
-			newCSS.overflowX = "visible";
-		}
-		if (ofY && !ofY.match(/(visible|auto)/)) {
-			curCSS.overflowY = ofX;
-			newCSS.overflowY = "visible";
-		}
-
-		// save the current overflow settings - even if blank!
-		s.cssSaved = curCSS;
-
-		// apply new CSS to raise zIndex and, if necessary, make overflow 'visible'
-		$P.css( newCSS );
-
-		// make sure the zIndex of all other panes is normal
-		$.each(_c.allPanes, function(i, p) {
-			if (p != pane) resetOverflow(p);
-		});
-
-	};
-	/**
-	 * @param {Object=}   [el]	(optional) Can also be 'bound' to a click, mouseOver, or other event
-	 */
-	function resetOverflow (el) {
-		if (!isInitialized()) return;
-		if (this && this.tagName) el = this; // BOUND to element
-		var $P;
-		if (isStr(el))
-			$P = $Ps[el];
-		else if ($(el).data("layoutRole"))
-			$P = $(el);
-		else
-			$(el).parents().each(function(){
-				if ($(this).data("layoutRole")) {
-					$P = $(this);
-					return false; // BREAK
-				}
-			});
-		if (!$P || !$P.length) return; // INVALID
-
-		var
-			pane	= $P.data("layoutEdge")
-		,	s		= state[pane]
-		,	CSS		= s.cssSaved || {}
-		;
-		// reset the zIndex
-		if (!s.isSliding && !s.isResizing)
-			$P.css("zIndex", options.zIndexes.pane_normal);
-
-		// reset Overflow - if necessary
-		$P.css( CSS );
-
-		// clear var
-		s.cssSaved = false;
-	};
-
-/*
- * #####################
- * CREATE/RETURN LAYOUT
- * #####################
- */
-
-	// validate that container exists
-	var $N = $(this).eq(0); // FIRST matching Container element
-	if (!$N.length) {
-		return _log( options.errors.containerMissing );
-	};
-
-	// Users retrieve Instance of a layout with: $N.layout() OR $N.data("layout")
-	// return the Instance-pointer if layout has already been initialized
-	if ($N.data("layoutContainer") && $N.data("layout"))
-		return $N.data("layout"); // cached pointer
-
-	// init global vars
-	var 
-		$Ps	= {}	// Panes x5		- set in initPanes()
-	,	$Cs	= {}	// Content x5	- set in initPanes()
-	,	$Rs	= {}	// Resizers x4	- set in initHandles()
-	,	$Ts	= {}	// Togglers x4	- set in initHandles()
-	,	$Ms	= $([])	// Masks - up to 2 masks per pane (IFRAME + DIV)
-	//	aliases for code brevity
-	,	sC	= state.container // alias for easy access to 'container dimensions'
-	,	sID	= state.id // alias for unique layout ID/namespace - eg: "layout435"
-	;
-
-	// create Instance object to expose data & option Properties, and primary action Methods
-	var Instance = {
-	//	layout data
-		options:			options			// property - options hash
-	,	state:				state			// property - dimensions hash
-	//	object pointers
-	,	container:			$N				// property - object pointers for layout container
-	,	panes:				$Ps				// property - object pointers for ALL Panes: panes.north, panes.center
-	,	contents:			$Cs				// property - object pointers for ALL Content: contents.north, contents.center
-	,	resizers:			$Rs				// property - object pointers for ALL Resizers, eg: resizers.north
-	,	togglers:			$Ts				// property - object pointers for ALL Togglers, eg: togglers.north
-	//	border-pane open/close
-	,	hide:				hide			// method - ditto
-	,	show:				show			// method - ditto
-	,	toggle:				toggle			// method - pass a 'pane' ("north", "west", etc)
-	,	open:				open			// method - ditto
-	,	close:				close			// method - ditto
-	,	slideOpen:			slideOpen		// method - ditto
-	,	slideClose:			slideClose		// method - ditto
-	,	slideToggle:		slideToggle		// method - ditto
-	//	pane actions
-	,	setSizeLimits:		setSizeLimits	// method - pass a 'pane' - update state min/max data
-	,	_sizePane:			sizePane		// method -intended for user by plugins only!
-	,	sizePane:			manualSizePane	// method - pass a 'pane' AND an 'outer-size' in pixels or percent, or 'auto'
-	,	sizeContent:		sizeContent		// method - pass a 'pane'
-	,	swapPanes:			swapPanes		// method - pass TWO 'panes' - will swap them
-	,	showMasks:			showMasks		// method - pass a 'pane' OR list of panes - default = all panes with mask option set
-	,	hideMasks:			hideMasks		// method - ditto'
-	//	pane element methods
-	,	initContent:		initContent		// method - ditto
-	,	addPane:			addPane			// method - pass a 'pane'
-	,	removePane:			removePane		// method - pass a 'pane' to remove from layout, add 'true' to delete the pane-elem
-	,	createChildren:		createChildren	// method - pass a 'pane' and (optional) layout-options (OVERRIDES options[pane].children
-	,	refreshChildren:	refreshChildren	// method - pass a 'pane' and a layout-instance
-	//	special pane option setting
-	,	enableClosable:		enableClosable	// method - pass a 'pane'
-	,	disableClosable:	disableClosable	// method - ditto
-	,	enableSlidable:		enableSlidable	// method - ditto
-	,	disableSlidable:	disableSlidable	// method - ditto
-	,	enableResizable:	enableResizable	// method - ditto
-	,	disableResizable:	disableResizable// method - ditto
-	//	utility methods for panes
-	,	allowOverflow:		allowOverflow	// utility - pass calling element (this)
-	,	resetOverflow:		resetOverflow	// utility - ditto
-	//	layout control
-	,	destroy:			destroy			// method - no parameters
-	,	initPanes:			isInitialized	// method - no parameters
-	,	resizeAll:			resizeAll		// method - no parameters
-	//	callback triggering
-	,	runCallbacks:		_runCallbacks	// method - pass evtName & pane (if a pane-event), eg: trigger("onopen", "west")
-	//	alias collections of options, state and children - created in addPane and extended elsewhere
-	,	hasParentLayout:	false			// set by initContainer()
-	,	children:			children		// pointers to child-layouts, eg: Instance.children.west.layoutName
-	,	north:				false			// alias group: { name: pane, pane: $Ps[pane], options: options[pane], state: state[pane], children: children[pane] }
-	,	south:				false			// ditto
-	,	west:				false			// ditto
-	,	east:				false			// ditto
-	,	center:				false			// ditto
-	};
-
-	// create the border layout NOW
-	if (_create() === 'cancel') // onload_start callback returned false to CANCEL layout creation
-		return null;
-	else // true OR false -- if layout-elements did NOT init (hidden or do not exist), can auto-init later
-		return Instance; // return the Instance object
-
-}
-
-
-})( jQuery );
-
-
-
-
-/**
- * jquery.layout.state 1.2
- * $Date: 2015/03/13 22:37:04 $
- *
- * Copyright (c) 2014 
- *   Kevin Dalman (http://allpro.net)
- *
- * Dual licensed under the GPL (http://www.gnu.org/licenses/gpl.html)
- * and MIT (http://www.opensource.org/licenses/mit-license.php) licenses.
- *
- * @requires: UI Layout 1.4.0 or higher
- * @requires: $.ui.cookie (above)
- *
- * @see: http://groups.google.com/group/jquery-ui-layout
- */
-;(function ($) {
-
-if (!$.layout) return;
-
-
-/**
- *	UI COOKIE UTILITY
- *
- *	A $.cookie OR $.ui.cookie namespace *should be standard*, but until then...
- *	This creates $.ui.cookie so Layout does not need the cookie.jquery.js plugin
- *	NOTE: This utility is REQUIRED by the layout.state plugin
- *
- *	Cookie methods in Layout are created as part of State Management 
- */
-if (!$.ui) $.ui = {};
-$.ui.cookie = {
-
-	// cookieEnabled is not in DOM specs, but DOES works in all browsers,including IE6
-	acceptsCookies: !!navigator.cookieEnabled
-
-,	read: function (name) {
-		var
-			c	= document.cookie
-		,	cs	= c ? c.split(';') : []
-		,	pair, data, i
-		;
-		for (i=0; pair=cs[i]; i++) {
-			data = $.trim(pair).split('='); // name=value => [ name, value ]
-			if (data[0] == name) // found the layout cookie
-				return decodeURIComponent(data[1]);
-		}
-		return null;
-	}
-
-,	write: function (name, val, cookieOpts) {
-		var	params	= ""
-		,	date	= ""
-		,	clear	= false
-		,	o		= cookieOpts || {}
-		,	x		= o.expires  || null
-		,	t		= $.type(x)
-		;
-		if (t === "date")
-			date = x;
-		else if (t === "string" && x > 0) {
-			x = parseInt(x,10);
-			t = "number";
-		}
-		if (t === "number") {
-			date = new Date();
-			if (x > 0)
-				date.setDate(date.getDate() + x);
-			else {
-				date.setFullYear(1970);
-				clear = true;
-			}
-		}
-		if (date)		params += ";expires="+ date.toUTCString();
-		if (o.path)		params += ";path="+ o.path;
-		if (o.domain)	params += ";domain="+ o.domain;
-		if (o.secure)	params += ";secure";
-		document.cookie = name +"="+ (clear ? "" : encodeURIComponent( val )) + params; // write or clear cookie
-	}
-
-,	clear: function (name) {
-		$.ui.cookie.write(name, "", {expires: -1});
-	}
-
-};
-// if cookie.jquery.js is not loaded, create an alias to replicate it
-// this may be useful to other plugins or code dependent on that plugin
-if (!$.cookie) $.cookie = function (k, v, o) {
-	var C = $.ui.cookie;
-	if (v === null)
-		C.clear(k);
-	else if (v === undefined)
-		return C.read(k);
-	else
-		C.write(k, v, o);
-};
-
-
-
-/**
- *	State-management options stored in options.stateManagement, which includes a .cookie hash
- *	Default options saves ALL KEYS for ALL PANES, ie: pane.size, pane.isClosed, pane.isHidden
- *
- *	// STATE/COOKIE OPTIONS
- *	@example $(el).layout({
-				stateManagement: {
-					enabled:	true
-				,	stateKeys:	"east.size,west.size,east.isClosed,west.isClosed"
-				,	cookie:		{ name: "appLayout", path: "/" }
-				}
-			})
- *	@example $(el).layout({ stateManagement__enabled: true }) // enable auto-state-management using cookies
- *	@example $(el).layout({ stateManagement__cookie: { name: "appLayout", path: "/" } })
- *	@example $(el).layout({ stateManagement__cookie__name: "appLayout", stateManagement__cookie__path: "/" })
- *
- *	// STATE/COOKIE METHODS
- *	@example myLayout.saveCookie( "west.isClosed,north.size,south.isHidden", {expires: 7} );
- *	@example myLayout.loadCookie();
- *	@example myLayout.deleteCookie();
- *	@example var JSON = myLayout.readState();	// CURRENT Layout State
- *	@example var JSON = myLayout.readCookie();	// SAVED Layout State (from cookie)
- *	@example var JSON = myLayout.state.stateData;	// LAST LOADED Layout State (cookie saved in layout.state hash)
- *
- *	CUSTOM STATE-MANAGEMENT (eg, saved in a database)
- *	@example var JSON = myLayout.readState( "west.isClosed,north.size,south.isHidden" );
- *	@example myLayout.loadState( JSON );
- */
-
-// tell Layout that the state plugin is available
-$.layout.plugins.stateManagement = true;
-
-//	Add State-Management options to layout.defaults
-$.layout.defaults.stateManagement = {
-	enabled:		false	// true = enable state-management, even if not using cookies
-,	autoSave:		true	// Save a state-cookie when page exits?
-,	autoLoad:		true	// Load the state-cookie when Layout inits?
-,	animateLoad:	true	// animate panes when loading state into an active layout
-,	includeChildren: true	// recurse into child layouts to include their state as well
-	// List state-data to save - must be pane-specific
-,	stateKeys:	"north.size,south.size,east.size,west.size,"+
-				"north.isClosed,south.isClosed,east.isClosed,west.isClosed,"+
-				"north.isHidden,south.isHidden,east.isHidden,west.isHidden"
-,	cookie: {
-		name:	""	// If not specified, will use Layout.name, else just "Layout"
-	,	domain:	""	// blank = current domain
-	,	path:	""	// blank = current page, "/" = entire website
-	,	expires: ""	// 'days' to keep cookie - leave blank for 'session cookie'
-	,	secure:	false
-	}
-};
-
-// Set stateManagement as a 'layout-option', NOT a 'pane-option'
-$.layout.optionsMap.layout.push("stateManagement");
-// Update config so layout does not move options into the pane-default branch (panes)
-$.layout.config.optionRootKeys.push("stateManagement");
-
-/*
- *	State Management methods
- */
-$.layout.state = {
-
-	/**
-	 * Get the current layout state and save it to a cookie
-	 *
-	 * myLayout.saveCookie( keys, cookieOpts )
-	 *
-	 * @param {Object}			inst
-	 * @param {(string|Array)=}	keys
-	 * @param {Object=}			cookieOpts
-	 */
-	saveCookie: function (inst, keys, cookieOpts) {
-		var o	= inst.options
-		,	sm	= o.stateManagement
-		,	oC	= $.extend(true, {}, sm.cookie, cookieOpts || null)
-		,	data = inst.state.stateData = inst.readState( keys || sm.stateKeys ) // read current panes-state
-		;
-		$.ui.cookie.write( oC.name || o.name || "Layout", $.layout.state.encodeJSON(data), oC );
-		return $.extend(true, {}, data); // return COPY of state.stateData data
-	}
-
-	/**
-	 * Remove the state cookie
-	 *
-	 * @param {Object}	inst
-	 */
-,	deleteCookie: function (inst) {
-		var o = inst.options;
-		$.ui.cookie.clear( o.stateManagement.cookie.name || o.name || "Layout" );
-	}
-
-	/**
-	 * Read & return data from the cookie - as JSON
-	 *
-	 * @param {Object}	inst
-	 */
-,	readCookie: function (inst) {
-		var o = inst.options;
-		var c = $.ui.cookie.read( o.stateManagement.cookie.name || o.name || "Layout" );
-		// convert cookie string back to a hash and return it
-		return c ? $.layout.state.decodeJSON(c) : {};
-	}
-
-	/**
-	 * Get data from the cookie and USE IT to loadState
-	 *
-	 * @param {Object}	inst
-	 */
-,	loadCookie: function (inst) {
-		var c = $.layout.state.readCookie(inst); // READ the cookie
-		if (c && !$.isEmptyObject( c )) {
-			inst.state.stateData = $.extend(true, {}, c); // SET state.stateData
-			inst.loadState(c); // LOAD the retrieved state
-		}
-		return c;
-	}
-
-	/**
-	 * Update layout options from the cookie, if one exists
-	 *
-	 * @param {Object}		inst
-	 * @param {Object=}		stateData
-	 * @param {boolean=}	animate
-	 */
-,	loadState: function (inst, data, opts) {
-		if (!$.isPlainObject( data ) || $.isEmptyObject( data )) return;
-
-		// normalize data & cache in the state object
-		data = inst.state.stateData = $.layout.transformData( data ); // panes = default subkey
-
-		// add missing/default state-restore options
-		var smo = inst.options.stateManagement;
-		opts = $.extend({
-			animateLoad:		false //smo.animateLoad
-		,	includeChildren:	smo.includeChildren
-		}, opts );
-
-		if (!inst.state.initialized) {
-			/*
-			 *	layout NOT initialized, so just update its options
-			 */
-			// MUST remove pane.children keys before applying to options
-			// use a copy so we don't remove keys from original data
-			var o = $.extend(true, {}, data);
-			//delete o.center; // center has no state-data - only children
-			$.each($.layout.config.allPanes, function (idx, pane) {
-				if (o[pane]) delete o[pane].children;		   
-			 });
-			// update CURRENT layout-options with saved state data
-			$.extend(true, inst.options, o);
-		}
-		else {
-			/*
-			 *	layout already initialized, so modify layout's configuration
-			 */
-			var noAnimate = !opts.animateLoad
-			,	o, c, h, state, open
-			;
-			$.each($.layout.config.borderPanes, function (idx, pane) {
-				o = data[ pane ];
-				if (!$.isPlainObject( o )) return; // no key, skip pane
-
-				s	= o.size;
-				c	= o.initClosed;
-				h	= o.initHidden;
-				ar	= o.autoResize
-				state	= inst.state[pane];
-				open	= state.isVisible;
-
-				// reset autoResize
-				if (ar)
-					state.autoResize = ar;
-				// resize BEFORE opening
-				if (!open)
-					inst._sizePane(pane, s, false, false, false); // false=skipCallback/noAnimation/forceResize
-				// open/close as necessary - DO NOT CHANGE THIS ORDER!
-				if (h === true)			inst.hide(pane, noAnimate);
-				else if (c === true)	inst.close(pane, false, noAnimate);
-				else if (c === false)	inst.open (pane, false, noAnimate);
-				else if (h === false)	inst.show (pane, false, noAnimate);
-				// resize AFTER any other actions
-				if (open)
-					inst._sizePane(pane, s, false, false, noAnimate); // animate resize if option passed
-			});
-
-			/*
-			 *	RECURSE INTO CHILD-LAYOUTS
-			 */
-			if (opts.includeChildren) {
-				var paneStateChildren, childState;
-				$.each(inst.children, function (pane, paneChildren) {
-					paneStateChildren = data[pane] ? data[pane].children : 0;
-					if (paneStateChildren && paneChildren) {
-						$.each(paneChildren, function (stateKey, child) {
-							childState = paneStateChildren[stateKey];
-							if (child && childState)
-								child.loadState( childState );
-						});
-					}
-				});
-			}
-		}
-	}
-
-	/**
-	 * Get the *current layout state* and return it as a hash
-	 *
-	 * @param {Object=}		inst	// Layout instance to get state for
-	 * @param {object=}		[opts]	// State-Managements override options
-	 */
-,	readState: function (inst, opts) {
-		// backward compatility
-		if ($.type(opts) === 'string') opts = { keys: opts };
-		if (!opts) opts = {};
-		var	sm		= inst.options.stateManagement
-		,	ic		= opts.includeChildren
-		,	recurse	= ic !== undefined ? ic : sm.includeChildren
-		,	keys	= opts.stateKeys || sm.stateKeys
-		,	alt		= { isClosed: 'initClosed', isHidden: 'initHidden' }
-		,	state	= inst.state
-		,	panes	= $.layout.config.allPanes
-		,	data	= {}
-		,	pair, pane, key, val
-		,	ps, pC, child, array, count, branch
-		;
-		if ($.isArray(keys)) keys = keys.join(",");
-		// convert keys to an array and change delimiters from '__' to '.'
-		keys = keys.replace(/__/g, ".").split(',');
-		// loop keys and create a data hash
-		for (var i=0, n=keys.length; i < n; i++) {
-			pair = keys[i].split(".");
-			pane = pair[0];
-			key  = pair[1];
-			if ($.inArray(pane, panes) < 0) continue; // bad pane!
-			val = state[ pane ][ key ];
-			if (val == undefined) continue;
-			if (key=="isClosed" && state[pane]["isSliding"])
-				val = true; // if sliding, then *really* isClosed
-			( data[pane] || (data[pane]={}) )[ alt[key] ? alt[key] : key ] = val;
-		}
-
-		// recurse into the child-layouts for each pane
-		if (recurse) {
-			$.each(panes, function (idx, pane) {
-				pC = inst.children[pane];
-				ps = state.stateData[pane];
-				if ($.isPlainObject( pC ) && !$.isEmptyObject( pC )) {
-					// ensure a key exists for this 'pane', eg: branch = data.center
-					branch = data[pane] || (data[pane] = {});
-					if (!branch.children) branch.children = {};
-					$.each( pC, function (key, child) {
-						// ONLY read state from an initialize layout
-						if ( child.state.initialized )
-							branch.children[ key ] = $.layout.state.readState( child );
-						// if we have PREVIOUS (onLoad) state for this child-layout, KEEP IT!
-						else if ( ps && ps.children && ps.children[ key ] ) {
-							branch.children[ key ] = $.extend(true, {}, ps.children[ key ] );
-						}
-					});
-				}
-			});
-		}
-
-		return data;
-	}
-
-	/**
-	 *	Stringify a JSON hash so can save in a cookie or db-field
-	 */
-,	encodeJSON: function (json) {
-		var local = window.JSON || {};
-		return (local.stringify || stringify)(json);
-
-		function stringify (h) {
-			var D=[], i=0, k, v, t // k = key, v = value
-			,	a = $.isArray(h)
-			;
-			for (k in h) {
-				v = h[k];
-				t = typeof v;
-				if (t == 'string')		// STRING - add quotes
-					v = '"'+ v +'"';
-				else if (t == 'object')	// SUB-KEY - recurse into it
-					v = parse(v);
-				D[i++] = (!a ? '"'+ k +'":' : '') + v;
-			}
-			return (a ? '[' : '{') + D.join(',') + (a ? ']' : '}');
-		};
-	}
-
-	/**
-	 *	Convert stringified JSON back to a hash object
-	 *	@see		$.parseJSON(), adding in jQuery 1.4.1
-	 */
-,	decodeJSON: function (str) {
-		try { return $.parseJSON ? $.parseJSON(str) : window["eval"]("("+ str +")") || {}; }
-		catch (e) { return {}; }
-	}
-
-
-,	_create: function (inst) {
-		var s	= $.layout.state
-		,	o	= inst.options
-		,	sm	= o.stateManagement
-		;
-		//	ADD State-Management plugin methods to inst
-		 $.extend( inst, {
-		//	readCookie - update options from cookie - returns hash of cookie data
-			readCookie:		function () { return s.readCookie(inst); }
-		//	deleteCookie
-		,	deleteCookie:	function () { s.deleteCookie(inst); }
-		//	saveCookie - optionally pass keys-list and cookie-options (hash)
-		,	saveCookie:		function (keys, cookieOpts) { return s.saveCookie(inst, keys, cookieOpts); }
-		//	loadCookie - readCookie and use to loadState() - returns hash of cookie data
-		,	loadCookie:		function () { return s.loadCookie(inst); }
-		//	loadState - pass a hash of state to use to update options
-		,	loadState:		function (stateData, opts) { s.loadState(inst, stateData, opts); }
-		//	readState - returns hash of current layout-state
-		,	readState:		function (keys) { return s.readState(inst, keys); }
-		//	add JSON utility methods too...
-		,	encodeJSON:		s.encodeJSON
-		,	decodeJSON:		s.decodeJSON
-		});
-
-		// init state.stateData key, even if plugin is initially disabled
-		inst.state.stateData = {};
-
-		// autoLoad MUST BE one of: data-array, data-hash, callback-function, or TRUE
-		if ( !sm.autoLoad ) return;
-
-		//	When state-data exists in the autoLoad key USE IT,
-		//	even if stateManagement.enabled == false
-		if ($.isPlainObject( sm.autoLoad )) {
-			if (!$.isEmptyObject( sm.autoLoad )) {
-				inst.loadState( sm.autoLoad );
-			}
-		}
-		else if ( sm.enabled ) {
-			// update the options from cookie or callback
-			// if options is a function, call it to get stateData
-			if ($.isFunction( sm.autoLoad )) {
-				var d = {};
-				try {
-					d = sm.autoLoad( inst, inst.state, inst.options, inst.options.name || '' ); // try to get data from fn
-				} catch (e) {}
-				if (d && $.isPlainObject( d ) && !$.isEmptyObject( d ))
-					inst.loadState(d);
-			}
-			else // any other truthy value will trigger loadCookie
-				inst.loadCookie();
-		}
-	}
-
-,	_unload: function (inst) {
-		var sm = inst.options.stateManagement;
-		if (sm.enabled && sm.autoSave) {
-			// if options is a function, call it to save the stateData
-			if ($.isFunction( sm.autoSave )) {
-				try {
-					sm.autoSave( inst, inst.state, inst.options, inst.options.name || '' ); // try to get data from fn
-				} catch (e) {}
-			}
-			else // any truthy value will trigger saveCookie
-				inst.saveCookie();
-		}
-	}
-
-};
-
-// add state initialization method to Layout's onCreate array of functions
-$.layout.onCreate.push( $.layout.state._create );
-$.layout.onUnload.push( $.layout.state._unload );
-
-})( jQuery );
-
-
-
-/**
- * @preserve jquery.layout.buttons 1.0
- * $Date: 2015/03/13 22:37:04 $
- *
- * Copyright (c) 2011 
- *   Kevin Dalman (http://allpro.net)
- *
- * Dual licensed under the GPL (http://www.gnu.org/licenses/gpl.html)
- * and MIT (http://www.opensource.org/licenses/mit-license.php) licenses.
- *
- * @dependancies: UI Layout 1.3.0.rc30.1 or higher
- *
- * @support: http://groups.google.com/group/jquery-ui-layout
- *
- * Docs: [ to come ]
- * Tips: [ to come ]
- */
-;(function ($) {
-
-if (!$.layout) return;
-
-
-// tell Layout that the state plugin is available
-$.layout.plugins.buttons = true;
-
-//	Add State-Management options to layout.defaults
-$.layout.defaults.autoBindCustomButtons = false;
-// Set stateManagement as a layout-option, NOT a pane-option
-$.layout.optionsMap.layout.push("autoBindCustomButtons");
-
-var lang = $.layout.language;
-
-/*
- *	Button methods
- */
-$.layout.buttons = {
-	// set data used by multiple methods below
-	config: {
-		borderPanes:	"north,south,west,east"
-	}
-
-	/**
-	* Searches for .ui-layout-button-xxx elements and auto-binds them as layout-buttons
-	*
-	* @see  _create()
-	*/
-,	init: function (inst) {
-		var pre		= "ui-layout-button-"
-		,	layout	= inst.options.name || ""
-		,	name;
-		$.each("toggle,open,close,pin,toggle-slide,open-slide".split(","), function (i, action) {
-			$.each($.layout.buttons.config.borderPanes.split(","), function (ii, pane) {
-				$("."+pre+action+"-"+pane).each(function(){
-					// if button was previously 'bound', data.layoutName was set, but is blank if layout has no 'name'
-					name = $(this).data("layoutName") || $(this).attr("layoutName");
-					if (name == undefined || name === layout)
-						inst.bindButton(this, action, pane);
-				});
-			});
-		});
-	}
-
-	/**
-	* Helper function to validate params received by addButton utilities
-	*
-	* Two classes are added to the element, based on the buttonClass...
-	* The type of button is appended to create the 2nd className:
-	*  - ui-layout-button-pin
-	*  - ui-layout-pane-button-toggle
-	*  - ui-layout-pane-button-open
-	*  - ui-layout-pane-button-close
-	*
-	* @param  {(string|!Object)}	selector	jQuery selector (or element) for button, eg: ".ui-layout-north .toggle-button"
-	* @param  {string}   			pane 		Name of the pane the button is for: 'north', 'south', etc.
-	* @return {Array.}		If both params valid, the element matching 'selector' in a jQuery wrapper - otherwise returns null
-	*/
-,	get: function (inst, selector, pane, action) {
-		var $E	= $(selector)
-		,	o	= inst.options
-		,	err	= o.showErrorMessages
-		;
-		if (!$E.length) { // element not found
-			if (err) alert(lang.errButton + lang.selector +": "+ selector);
-		}
-		else if ($.layout.buttons.config.borderPanes.indexOf(pane) === -1) { // invalid 'pane' sepecified
-			if (err) alert(lang.errButton + lang.pane +": "+ pane);
-			$E = $("");  // NO BUTTON
-		}
-		else { // VALID
-			var btn = o[pane].buttonClass +"-"+ action;
-			$E	.addClass( btn +" "+ btn +"-"+ pane )
-				.data("layoutName", o.name); // add layout identifier - even if blank!
-		}
-		return $E;
-	}
-
-
-	/**
-	* NEW syntax for binding layout-buttons - will eventually replace addToggle, addOpen, etc.
-	*
-	* @param {(string|!Object)}	sel		jQuery selector (or element) for button, eg: ".ui-layout-north .toggle-button"
-	* @param {string}			action
-	* @param {string}			pane
-	*/
-,	bind: function (inst, sel, action, pane) {
-		var _ = $.layout.buttons;
-		switch (action.toLowerCase()) {
-			case "toggle":			_.addToggle	(inst, sel, pane); break;	
-			case "open":			_.addOpen	(inst, sel, pane); break;
-			case "close":			_.addClose	(inst, sel, pane); break;
-			case "pin":				_.addPin	(inst, sel, pane); break;
-			case "toggle-slide":	_.addToggle	(inst, sel, pane, true); break;	
-			case "open-slide":		_.addOpen	(inst, sel, pane, true); break;
-		}
-		return inst;
-	}
-
-	/**
-	* Add a custom Toggler button for a pane
-	*
-	* @param {(string|!Object)}	selector	jQuery selector (or element) for button, eg: ".ui-layout-north .toggle-button"
-	* @param {string}  			pane 		Name of the pane the button is for: 'north', 'south', etc.
-	* @param {boolean=}			slide 		true = slide-open, false = pin-open
-	*/
-,	addToggle: function (inst, selector, pane, slide) {
-		$.layout.buttons.get(inst, selector, pane, "toggle")
-			.click(function(evt){
-				inst.toggle(pane, !!slide);
-				evt.stopPropagation();
-			});
-		return inst;
-	}
-
-	/**
-	* Add a custom Open button for a pane
-	*
-	* @param {(string|!Object)}	selector	jQuery selector (or element) for button, eg: ".ui-layout-north .toggle-button"
-	* @param {string}			pane 		Name of the pane the button is for: 'north', 'south', etc.
-	* @param {boolean=}			slide 		true = slide-open, false = pin-open
-	*/
-,	addOpen: function (inst, selector, pane, slide) {
-		$.layout.buttons.get(inst, selector, pane, "open")
-			.attr("title", lang.Open)
-			.click(function (evt) {
-				inst.open(pane, !!slide);
-				evt.stopPropagation();
-			});
-		return inst;
-	}
-
-	/**
-	* Add a custom Close button for a pane
-	*
-	* @param {(string|!Object)}	selector	jQuery selector (or element) for button, eg: ".ui-layout-north .toggle-button"
-	* @param {string}   		pane 		Name of the pane the button is for: 'north', 'south', etc.
-	*/
-,	addClose: function (inst, selector, pane) {
-		$.layout.buttons.get(inst, selector, pane, "close")
-			.attr("title", lang.Close)
-			.click(function (evt) {
-				inst.close(pane);
-				evt.stopPropagation();
-			});
-		return inst;
-	}
-
-	/**
-	* Add a custom Pin button for a pane
-	*
-	* Four classes are added to the element, based on the paneClass for the associated pane...
-	* Assuming the default paneClass and the pin is 'up', these classes are added for a west-pane pin:
-	*  - ui-layout-pane-pin
-	*  - ui-layout-pane-west-pin
-	*  - ui-layout-pane-pin-up
-	*  - ui-layout-pane-west-pin-up
-	*
-	* @param {(string|!Object)}	selector	jQuery selector (or element) for button, eg: ".ui-layout-north .toggle-button"
-	* @param {string}   		pane 		Name of the pane the pin is for: 'north', 'south', etc.
-	*/
-,	addPin: function (inst, selector, pane) {
-		var $E = $.layout.buttons.get(inst, selector, pane, "pin");
-		if ($E.length) {
-			var s = inst.state[pane];
-			$E.click(function (evt) {
-				$.layout.buttons.setPinState(inst, $(this), pane, (s.isSliding || s.isClosed));
-				if (s.isSliding || s.isClosed) inst.open( pane ); // change from sliding to open
-				else inst.close( pane ); // slide-closed
-				evt.stopPropagation();
-			});
-			// add up/down pin attributes and classes
-			$.layout.buttons.setPinState(inst, $E, pane, (!s.isClosed && !s.isSliding));
-			// add this pin to the pane data so we can 'sync it' automatically
-			// PANE.pins key is an array so we can store multiple pins for each pane
-			s.pins.push( selector ); // just save the selector string
-		}
-		return inst;
-	}
-
-	/**
-	* Change the class of the pin button to make it look 'up' or 'down'
-	*
-	* @see  addPin(), syncPins()
-	* @param {Array.}	$Pin	The pin-span element in a jQuery wrapper
-	* @param {string}	pane	These are the params returned to callbacks by layout()
-	* @param {boolean}	doPin	true = set the pin 'down', false = set it 'up'
-	*/
-,	setPinState: function (inst, $Pin, pane, doPin) {
-		var updown = $Pin.attr("pin");
-		if (updown && doPin === (updown=="down")) return; // already in correct state
-		var
-			pin		= inst.options[pane].buttonClass +"-pin"
-		,	side	= pin +"-"+ pane
-		,	UP		= pin +"-up "+	side +"-up"
-		,	DN		= pin +"-down "+side +"-down"
-		;
-		$Pin
-			.attr("pin", doPin ? "down" : "up") // logic
-			.attr("title", doPin ? lang.Unpin : lang.Pin)
-			.removeClass( doPin ? UP : DN ) 
-			.addClass( doPin ? DN : UP ) 
-		;
-	}
-
-	/**
-	* INTERNAL function to sync 'pin buttons' when pane is opened or closed
-	* Unpinned means the pane is 'sliding' - ie, over-top of the adjacent panes
-	*
-	* @see  open(), close()
-	* @param {string}	pane   These are the params returned to callbacks by layout()
-	* @param {boolean}	doPin  True means set the pin 'down', False means 'up'
-	*/
-,	syncPinBtns: function (inst, pane, doPin) {
-		// REAL METHOD IS _INSIDE_ LAYOUT - THIS IS HERE JUST FOR REFERENCE
-		$.each(state[pane].pins, function (i, selector) {
-			$.layout.buttons.setPinState(inst, $(selector), pane, doPin);
-		});
-	}
-
-
-,	_load: function (inst) {
-		//	ADD Button methods to Layout Instance
-		$.extend( inst, {
-			bindButton:		function (selector, action, pane) { return $.layout.buttons.bind(inst, selector, action, pane); }
-		//	DEPRECATED METHODS...
-		,	addToggleBtn:	function (selector, pane, slide) { return $.layout.buttons.addToggle(inst, selector, pane, slide); }
-		,	addOpenBtn:		function (selector, pane, slide) { return $.layout.buttons.addOpen(inst, selector, pane, slide); }
-		,	addCloseBtn:	function (selector, pane) { return $.layout.buttons.addClose(inst, selector, pane); }
-		,	addPinBtn:		function (selector, pane) { return $.layout.buttons.addPin(inst, selector, pane); }
-		});
-
-		// init state array to hold pin-buttons
-		for (var i=0; i<4; i++) {
-			var pane = $.layout.buttons.config.borderPanes[i];
-			inst.state[pane].pins = [];
-		}
-
-		// auto-init buttons onLoad if option is enabled
-		if ( inst.options.autoBindCustomButtons )
-			$.layout.buttons.init(inst);
-	}
-
-,	_unload: function (inst) {
-		// TODO: unbind all buttons???
-	}
-
-};
-
-// add initialization method to Layout's onLoad array of functions
-$.layout.onLoad.push(  $.layout.buttons._load );
-//$.layout.onUnload.push( $.layout.buttons._unload );
-
-})( jQuery );
-
-
-
-
-/**
- * jquery.layout.browserZoom 1.0
- * $Date: 2015/03/13 22:37:04 $
- *
- * Copyright (c) 2012 
- *   Kevin Dalman (http://allpro.net)
- *
- * Dual licensed under the GPL (http://www.gnu.org/licenses/gpl.html)
- * and MIT (http://www.opensource.org/licenses/mit-license.php) licenses.
- *
- * @requires: UI Layout 1.3.0.rc30.1 or higher
- *
- * @see: http://groups.google.com/group/jquery-ui-layout
- *
- * TODO: Extend logic to handle other problematic zooming in browsers
- * TODO: Add hotkey/mousewheel bindings to _instantly_ respond to these zoom event
- */
-(function ($) {
-
-// tell Layout that the plugin is available
-$.layout.plugins.browserZoom = true;
-
-$.layout.defaults.browserZoomCheckInterval = 1000;
-$.layout.optionsMap.layout.push("browserZoomCheckInterval");
-
-/*
- *	browserZoom methods
- */
-$.layout.browserZoom = {
-
-	_init: function (inst) {
-		// abort if browser does not need this check
-		if ($.layout.browserZoom.ratio() !== false)
-			$.layout.browserZoom._setTimer(inst);
-	}
-
-,	_setTimer: function (inst) {
-		// abort if layout destroyed or browser does not need this check
-		if (inst.destroyed) return;
-		var o	= inst.options
-		,	s	= inst.state
-		//	don't need check if inst has parentLayout, but check occassionally in case parent destroyed!
-		//	MINIMUM 100ms interval, for performance
-		,	ms	= inst.hasParentLayout ?  5000 : Math.max( o.browserZoomCheckInterval, 100 )
-		;
-		// set the timer
-		setTimeout(function(){
-			if (inst.destroyed || !o.resizeWithWindow) return;
-			var d = $.layout.browserZoom.ratio();
-			if (d !== s.browserZoom) {
-				s.browserZoom = d;
-				inst.resizeAll();
-			}
-			// set a NEW timeout
-			$.layout.browserZoom._setTimer(inst);
-		}
-		,	ms );
-	}
-
-,	ratio: function () {
-		var w	= window
-		,	s	= screen
-		,	d	= document
-		,	dE	= d.documentElement || d.body
-		,	b	= $.layout.browser
-		,	v	= b.version
-		,	r, sW, cW
-		;
-		// we can ignore all browsers that fire window.resize event onZoom
-		if (!b.msie || v > 8)
-			return false; // don't need to track zoom
-		if (s.deviceXDPI && s.systemXDPI) // syntax compiler hack
-			return calc(s.deviceXDPI, s.systemXDPI);
-		// everything below is just for future reference!
-		if (b.webkit && (r = d.body.getBoundingClientRect))
-			return calc((r.left - r.right), d.body.offsetWidth);
-		if (b.webkit && (sW = w.outerWidth))
-			return calc(sW, w.innerWidth);
-		if ((sW = s.width) && (cW = dE.clientWidth))
-			return calc(sW, cW);
-		return false; // no match, so cannot - or don't need to - track zoom
-
-		function calc (x,y) { return (parseInt(x,10) / parseInt(y,10) * 100).toFixed(); }
-	}
-
-};
-// add initialization method to Layout's onLoad array of functions
-$.layout.onReady.push( $.layout.browserZoom._init );
-
-
-})( jQuery );
-
-
-
-
-/**
- *	UI Layout Plugin: Slide-Offscreen Animation
- *
- *	Prevent panes from being 'hidden' so that an iframes/objects 
- *	does not reload/refresh when pane 'opens' again.
- *	This plug-in adds a new animation called "slideOffscreen".
- *	It is identical to the normal "slide" effect, but avoids hiding the element
- *
- *	Requires Layout 1.3.0.RC30.1 or later for Close offscreen
- *	Requires Layout 1.3.0.RC30.5 or later for Hide, initClosed & initHidden offscreen
- *
- *	Version:	1.1 - 2012-11-18
- *	Author:		Kevin Dalman (kevin@jquery-dev.com)
- *	@preserve	jquery.layout.slideOffscreen-1.1.js
- */
-;(function ($) {
-
-// Add a new "slideOffscreen" effect
-if ($.effects) {
-
-	// add an option so initClosed and initHidden will work
-	$.layout.defaults.panes.useOffscreenClose = false; // user must enable when needed
-	/* set the new animation as the default for all panes
-	$.layout.defaults.panes.fxName = "slideOffscreen";
-	*/
-
-	if ($.layout.plugins)
-		$.layout.plugins.effects.slideOffscreen = true;
-
-	// dupe 'slide' effect defaults as new effect defaults
-	$.layout.effects.slideOffscreen = $.extend(true, {}, $.layout.effects.slide);
-
-	// add new effect to jQuery UI
-	$.effects.slideOffscreen = function(o) {
-		return this.queue(function(){
-
-			var fx		= $.effects
-			,	opt		= o.options
-			,	$el		= $(this)
-			,	pane	= $el.data('layoutEdge')
-			,	state	= $el.data('parentLayout').state
-			,	dist	= state[pane].size
-			,	s		= this.style
-			,	props	= ['top','bottom','left','right']
-				// Set options
-			,	mode	= fx.setMode($el, opt.mode || 'show') // Set Mode
-			,	show	= (mode == 'show')
-			,	dir		= opt.direction || 'left' // Default Direction
-			,	ref	 	= (dir == 'up' || dir == 'down') ? 'top' : 'left'
-			,	pos		= (dir == 'up' || dir == 'left')
-			,	offscrn	= $.layout.config.offscreenCSS || {}
-			,	keyLR	= $.layout.config.offscreenReset
-			,	keyTB	= 'offscreenResetTop' // only used internally
-			,	animation = {}
-			;
-			// Animation settings
-			animation[ref]	= (show ? (pos ? '+=' : '-=') : (pos ? '-=' : '+=')) + dist;
-
-			if (show) { // show() animation, so save top/bottom but retain left/right set when 'hidden'
-				$el.data(keyTB, { top: s.top, bottom: s.bottom });
-
-				// set the top or left offset in preparation for animation
-				// Note: ALL animations work by shifting the top or left edges
-				if (pos) { // top (north) or left (west)
-					$el.css(ref, isNaN(dist) ? "-" + dist : -dist); // Shift outside the left/top edge
-				}
-				else { // bottom (south) or right (east) - shift all the way across container
-					if (dir === 'right')
-						$el.css({ left: state.container.layoutWidth, right: 'auto' });
-					else // dir === bottom
-						$el.css({ top: state.container.layoutHeight, bottom: 'auto' });
-				}
-				// restore the left/right setting if is a top/bottom animation
-				if (ref === 'top')
-					$el.css( $el.data( keyLR ) || {} );
-			}
-			else { // hide() animation, so save ALL CSS
-				$el.data(keyTB, { top: s.top, bottom: s.bottom });
-				$el.data(keyLR, { left: s.left, right: s.right });
-			}
-
-			// Animate
-			$el.show().animate(animation, { queue: false, duration: o.duration, easing: opt.easing, complete: function(){
-				// Restore top/bottom
-				if ($el.data( keyTB ))
-					$el.css($el.data( keyTB )).removeData( keyTB );
-				if (show) // Restore left/right too
-					$el.css($el.data( keyLR ) || {}).removeData( keyLR );
-				else // Move the pane off-screen (left: -99999, right: 'auto')
-					$el.css( offscrn );
-
-				if (o.callback) o.callback.apply(this, arguments); // Callback
-				$el.dequeue();
-			}});
-
-		});
-	};
-
-}
-
-})( jQuery );
\ No newline at end of file
diff --git a/vid/src/main/webapp/static/fusion/js/moment.min.js b/vid/src/main/webapp/static/fusion/js/moment.min.js
deleted file mode 100644
index 62b1697b6..000000000
--- a/vid/src/main/webapp/static/fusion/js/moment.min.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// moment.js
-// version : 2.1.0
-// author : Tim Wood
-// license : MIT
-// momentjs.com
-!function(t){function e(t,e){return function(n){return u(t.call(this,n),e)}}function n(t,e){return function(n){return this.lang().ordinal(t.call(this,n),e)}}function s(){}function i(t){a(this,t)}function r(t){var e=t.years||t.year||t.y||0,n=t.months||t.month||t.M||0,s=t.weeks||t.week||t.w||0,i=t.days||t.day||t.d||0,r=t.hours||t.hour||t.h||0,a=t.minutes||t.minute||t.m||0,o=t.seconds||t.second||t.s||0,u=t.milliseconds||t.millisecond||t.ms||0;this._input=t,this._milliseconds=u+1e3*o+6e4*a+36e5*r,this._days=i+7*s,this._months=n+12*e,this._data={},this._bubble()}function a(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n]);return t}function o(t){return 0>t?Math.ceil(t):Math.floor(t)}function u(t,e){for(var n=t+"";n.lengthn;n++)~~t[n]!==~~e[n]&&r++;return r+i}function f(t){return t?ie[t]||t.toLowerCase().replace(/(.)s$/,"$1"):t}function l(t,e){return e.abbr=t,x[t]||(x[t]=new s),x[t].set(e),x[t]}function _(t){if(!t)return H.fn._lang;if(!x[t]&&A)try{require("./lang/"+t)}catch(e){return H.fn._lang}return x[t]}function m(t){return t.match(/\[.*\]/)?t.replace(/^\[|\]$/g,""):t.replace(/\\/g,"")}function y(t){var e,n,s=t.match(E);for(e=0,n=s.length;n>e;e++)s[e]=ue[s[e]]?ue[s[e]]:m(s[e]);return function(i){var r="";for(e=0;n>e;e++)r+=s[e]instanceof Function?s[e].call(i,t):s[e];return r}}function M(t,e){function n(e){return t.lang().longDateFormat(e)||e}for(var s=5;s--&&N.test(e);)e=e.replace(N,n);return re[e]||(re[e]=y(e)),re[e](t)}function g(t,e){switch(t){case"DDDD":return V;case"YYYY":return X;case"YYYYY":return $;case"S":case"SS":case"SSS":case"DDD":return I;case"MMM":case"MMMM":case"dd":case"ddd":case"dddd":return R;case"a":case"A":return _(e._l)._meridiemParse;case"X":return B;case"Z":case"ZZ":return j;case"T":return q;case"MM":case"DD":case"YY":case"HH":case"hh":case"mm":case"ss":case"M":case"D":case"d":case"H":case"h":case"m":case"s":return J;default:return new RegExp(t.replace("\\",""))}}function p(t){var e=(j.exec(t)||[])[0],n=(e+"").match(ee)||["-",0,0],s=+(60*n[1])+~~n[2];return"+"===n[0]?-s:s}function D(t,e,n){var s,i=n._a;switch(t){case"M":case"MM":i[1]=null==e?0:~~e-1;break;case"MMM":case"MMMM":s=_(n._l).monthsParse(e),null!=s?i[1]=s:n._isValid=!1;break;case"D":case"DD":case"DDD":case"DDDD":null!=e&&(i[2]=~~e);break;case"YY":i[0]=~~e+(~~e>68?1900:2e3);break;case"YYYY":case"YYYYY":i[0]=~~e;break;case"a":case"A":n._isPm=_(n._l).isPM(e);break;case"H":case"HH":case"h":case"hh":i[3]=~~e;break;case"m":case"mm":i[4]=~~e;break;case"s":case"ss":i[5]=~~e;break;case"S":case"SS":case"SSS":i[6]=~~(1e3*("0."+e));break;case"X":n._d=new Date(1e3*parseFloat(e));break;case"Z":case"ZZ":n._useUTC=!0,n._tzm=p(e)}null==e&&(n._isValid=!1)}function Y(t){var e,n,s=[];if(!t._d){for(e=0;7>e;e++)t._a[e]=s[e]=null==t._a[e]?2===e?1:0:t._a[e];s[3]+=~~((t._tzm||0)/60),s[4]+=~~((t._tzm||0)%60),n=new Date(0),t._useUTC?(n.setUTCFullYear(s[0],s[1],s[2]),n.setUTCHours(s[3],s[4],s[5],s[6])):(n.setFullYear(s[0],s[1],s[2]),n.setHours(s[3],s[4],s[5],s[6])),t._d=n}}function w(t){var e,n,s=t._f.match(E),i=t._i;for(t._a=[],e=0;eo&&(u=o,s=n);a(t,s)}function v(t){var e,n=t._i,s=K.exec(n);if(s){for(t._f="YYYY-MM-DD"+(s[2]||" "),e=0;4>e;e++)if(te[e][1].exec(n)){t._f+=te[e][0];break}j.exec(n)&&(t._f+=" Z"),w(t)}else t._d=new Date(n)}function T(e){var n=e._i,s=G.exec(n);n===t?e._d=new Date:s?e._d=new Date(+s[1]):"string"==typeof n?v(e):d(n)?(e._a=n.slice(0),Y(e)):e._d=n instanceof Date?new Date(+n):new Date(n)}function b(t,e,n,s,i){return i.relativeTime(e||1,!!n,t,s)}function S(t,e,n){var s=W(Math.abs(t)/1e3),i=W(s/60),r=W(i/60),a=W(r/24),o=W(a/365),u=45>s&&["s",s]||1===i&&["m"]||45>i&&["mm",i]||1===r&&["h"]||22>r&&["hh",r]||1===a&&["d"]||25>=a&&["dd",a]||45>=a&&["M"]||345>a&&["MM",W(a/30)]||1===o&&["y"]||["yy",o];return u[2]=e,u[3]=t>0,u[4]=n,b.apply({},u)}function F(t,e,n){var s,i=n-e,r=n-t.day();return r>i&&(r-=7),i-7>r&&(r+=7),s=H(t).add("d",r),{week:Math.ceil(s.dayOfYear()/7),year:s.year()}}function O(t){var e=t._i,n=t._f;return null===e||""===e?null:("string"==typeof e&&(t._i=e=_().preparse(e)),H.isMoment(e)?(t=a({},e),t._d=new Date(+e._d)):n?d(n)?k(t):w(t):T(t),new i(t))}function z(t,e){H.fn[t]=H.fn[t+"s"]=function(t){var n=this._isUTC?"UTC":"";return null!=t?(this._d["set"+n+e](t),H.updateOffset(this),this):this._d["get"+n+e]()}}function C(t){H.duration.fn[t]=function(){return this._data[t]}}function L(t,e){H.duration.fn["as"+t]=function(){return+this/e}}for(var H,P,U="2.1.0",W=Math.round,x={},A="undefined"!=typeof module&&module.exports,G=/^\/?Date\((\-?\d+)/i,Z=/(\-)?(\d*)?\.?(\d+)\:(\d+)\:(\d+)\.?(\d{3})?/,E=/(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|SS?S?|X|zz?|ZZ?|.)/g,N=/(\[[^\[]*\])|(\\)?(LT|LL?L?L?|l{1,4})/g,J=/\d\d?/,I=/\d{1,3}/,V=/\d{3}/,X=/\d{1,4}/,$=/[+\-]?\d{1,6}/,R=/[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i,j=/Z|[\+\-]\d\d:?\d\d/i,q=/T/i,B=/[\+\-]?\d+(\.\d{1,3})?/,K=/^\s*\d{4}-\d\d-\d\d((T| )(\d\d(:\d\d(:\d\d(\.\d\d?\d?)?)?)?)?([\+\-]\d\d:?\d\d)?)?/,Q="YYYY-MM-DDTHH:mm:ssZ",te=[["HH:mm:ss.S",/(T| )\d\d:\d\d:\d\d\.\d{1,3}/],["HH:mm:ss",/(T| )\d\d:\d\d:\d\d/],["HH:mm",/(T| )\d\d:\d\d/],["HH",/(T| )\d\d/]],ee=/([\+\-]|\d\d)/gi,ne="Date|Hours|Minutes|Seconds|Milliseconds".split("|"),se={Milliseconds:1,Seconds:1e3,Minutes:6e4,Hours:36e5,Days:864e5,Months:2592e6,Years:31536e6},ie={ms:"millisecond",s:"second",m:"minute",h:"hour",d:"day",w:"week",M:"month",y:"year"},re={},ae="DDD w W M D d".split(" "),oe="M D H h m s w W".split(" "),ue={M:function(){return this.month()+1},MMM:function(t){return this.lang().monthsShort(this,t)},MMMM:function(t){return this.lang().months(this,t)},D:function(){return this.date()},DDD:function(){return this.dayOfYear()},d:function(){return this.day()},dd:function(t){return this.lang().weekdaysMin(this,t)},ddd:function(t){return this.lang().weekdaysShort(this,t)},dddd:function(t){return this.lang().weekdays(this,t)},w:function(){return this.week()},W:function(){return this.isoWeek()},YY:function(){return u(this.year()%100,2)},YYYY:function(){return u(this.year(),4)},YYYYY:function(){return u(this.year(),5)},gg:function(){return u(this.weekYear()%100,2)},gggg:function(){return this.weekYear()},ggggg:function(){return u(this.weekYear(),5)},GG:function(){return u(this.isoWeekYear()%100,2)},GGGG:function(){return this.isoWeekYear()},GGGGG:function(){return u(this.isoWeekYear(),5)},e:function(){return this.weekday()},E:function(){return this.isoWeekday()},a:function(){return this.lang().meridiem(this.hours(),this.minutes(),!0)},A:function(){return this.lang().meridiem(this.hours(),this.minutes(),!1)},H:function(){return this.hours()},h:function(){return this.hours()%12||12},m:function(){return this.minutes()},s:function(){return this.seconds()},S:function(){return~~(this.milliseconds()/100)},SS:function(){return u(~~(this.milliseconds()/10),2)},SSS:function(){return u(this.milliseconds(),3)},Z:function(){var t=-this.zone(),e="+";return 0>t&&(t=-t,e="-"),e+u(~~(t/60),2)+":"+u(~~t%60,2)},ZZ:function(){var t=-this.zone(),e="+";return 0>t&&(t=-t,e="-"),e+u(~~(10*t/6),4)},z:function(){return this.zoneAbbr()},zz:function(){return this.zoneName()},X:function(){return this.unix()}};ae.length;)P=ae.pop(),ue[P+"o"]=n(ue[P],P);for(;oe.length;)P=oe.pop(),ue[P+P]=e(ue[P],2);for(ue.DDDD=e(ue.DDD,3),s.prototype={set:function(t){var e,n;for(n in t)e=t[n],"function"==typeof e?this[n]=e:this["_"+n]=e},_months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),months:function(t){return this._months[t.month()]},_monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),monthsShort:function(t){return this._monthsShort[t.month()]},monthsParse:function(t){var e,n,s;for(this._monthsParse||(this._monthsParse=[]),e=0;12>e;e++)if(this._monthsParse[e]||(n=H([2e3,e]),s="^"+this.months(n,"")+"|^"+this.monthsShort(n,""),this._monthsParse[e]=new RegExp(s.replace(".",""),"i")),this._monthsParse[e].test(t))return e},_weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdays:function(t){return this._weekdays[t.day()]},_weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysShort:function(t){return this._weekdaysShort[t.day()]},_weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),weekdaysMin:function(t){return this._weekdaysMin[t.day()]},weekdaysParse:function(t){var e,n,s;for(this._weekdaysParse||(this._weekdaysParse=[]),e=0;7>e;e++)if(this._weekdaysParse[e]||(n=H([2e3,1]).day(e),s="^"+this.weekdays(n,"")+"|^"+this.weekdaysShort(n,"")+"|^"+this.weekdaysMin(n,""),this._weekdaysParse[e]=new RegExp(s.replace(".",""),"i")),this._weekdaysParse[e].test(t))return e},_longDateFormat:{LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D YYYY",LLL:"MMMM D YYYY LT",LLLL:"dddd, MMMM D YYYY LT"},longDateFormat:function(t){var e=this._longDateFormat[t];return!e&&this._longDateFormat[t.toUpperCase()]&&(e=this._longDateFormat[t.toUpperCase()].replace(/MMMM|MM|DD|dddd/g,function(t){return t.slice(1)}),this._longDateFormat[t]=e),e},isPM:function(t){return"p"===(t+"").toLowerCase()[0]},_meridiemParse:/[ap]\.?m?\.?/i,meridiem:function(t,e,n){return t>11?n?"pm":"PM":n?"am":"AM"},_calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},calendar:function(t,e){var n=this._calendar[t];return"function"==typeof n?n.apply(e):n},_relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},relativeTime:function(t,e,n,s){var i=this._relativeTime[n];return"function"==typeof i?i(t,e,n,s):i.replace(/%d/i,t)},pastFuture:function(t,e){var n=this._relativeTime[t>0?"future":"past"];return"function"==typeof n?n(e):n.replace(/%s/i,e)},ordinal:function(t){return this._ordinal.replace("%d",t)},_ordinal:"%d",preparse:function(t){return t},postformat:function(t){return t},week:function(t){return F(t,this._week.dow,this._week.doy).week},_week:{dow:0,doy:6}},H=function(t,e,n){return O({_i:t,_f:e,_l:n,_isUTC:!1})},H.utc=function(t,e,n){return O({_useUTC:!0,_isUTC:!0,_l:n,_i:t,_f:e})},H.unix=function(t){return H(1e3*t)},H.duration=function(t,e){var n,s,i=H.isDuration(t),a="number"==typeof t,o=i?t._input:a?{}:t,u=Z.exec(t);return a?e?o[e]=t:o.milliseconds=t:u&&(n="-"===u[1]?-1:1,o={y:0,d:~~u[2]*n,h:~~u[3]*n,m:~~u[4]*n,s:~~u[5]*n,ms:~~u[6]*n}),s=new r(o),i&&t.hasOwnProperty("_lang")&&(s._lang=t._lang),s},H.version=U,H.defaultFormat=Q,H.updateOffset=function(){},H.lang=function(t,e){return t?(e?l(t,e):x[t]||_(t),H.duration.fn._lang=H.fn._lang=_(t),void 0):H.fn._lang._abbr},H.langData=function(t){return t&&t._lang&&t._lang._abbr&&(t=t._lang._abbr),_(t)},H.isMoment=function(t){return t instanceof i},H.isDuration=function(t){return t instanceof r},H.fn=i.prototype={clone:function(){return H(this)},valueOf:function(){return+this._d+6e4*(this._offset||0)},unix:function(){return Math.floor(+this/1e3)},toString:function(){return this.format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")},toDate:function(){return this._offset?new Date(+this):this._d},toISOString:function(){return M(H(this).utc(),"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]")},toArray:function(){var t=this;return[t.year(),t.month(),t.date(),t.hours(),t.minutes(),t.seconds(),t.milliseconds()]},isValid:function(){return null==this._isValid&&(this._isValid=this._a?!c(this._a,(this._isUTC?H.utc(this._a):H(this._a)).toArray()):!isNaN(this._d.getTime())),!!this._isValid},utc:function(){return this.zone(0)},local:function(){return this.zone(0),this._isUTC=!1,this},format:function(t){var e=M(this,t||H.defaultFormat);return this.lang().postformat(e)},add:function(t,e){var n;return n="string"==typeof t?H.duration(+e,t):H.duration(t,e),h(this,n,1),this},subtract:function(t,e){var n;return n="string"==typeof t?H.duration(+e,t):H.duration(t,e),h(this,n,-1),this},diff:function(t,e,n){var s,i,r=this._isUTC?H(t).zone(this._offset||0):H(t).local(),a=6e4*(this.zone()-r.zone());return e=f(e),"year"===e||"month"===e?(s=432e5*(this.daysInMonth()+r.daysInMonth()),i=12*(this.year()-r.year())+(this.month()-r.month()),i+=(this-H(this).startOf("month")-(r-H(r).startOf("month")))/s,i-=6e4*(this.zone()-H(this).startOf("month").zone()-(r.zone()-H(r).startOf("month").zone()))/s,"year"===e&&(i/=12)):(s=this-r,i="second"===e?s/1e3:"minute"===e?s/6e4:"hour"===e?s/36e5:"day"===e?(s-a)/864e5:"week"===e?(s-a)/6048e5:s),n?i:o(i)},from:function(t,e){return H.duration(this.diff(t)).lang(this.lang()._abbr).humanize(!e)},fromNow:function(t){return this.from(H(),t)},calendar:function(){var t=this.diff(H().startOf("day"),"days",!0),e=-6>t?"sameElse":-1>t?"lastWeek":0>t?"lastDay":1>t?"sameDay":2>t?"nextDay":7>t?"nextWeek":"sameElse";return this.format(this.lang().calendar(e,this))},isLeapYear:function(){var t=this.year();return 0===t%4&&0!==t%100||0===t%400},isDST:function(){return this.zone()+H(t).startOf(e)},isBefore:function(t,e){return e="undefined"!=typeof e?e:"millisecond",+this.clone().startOf(e)<+H(t).startOf(e)},isSame:function(t,e){return e="undefined"!=typeof e?e:"millisecond",+this.clone().startOf(e)===+H(t).startOf(e)},min:function(t){return t=H.apply(null,arguments),this>t?this:t},max:function(t){return t=H.apply(null,arguments),t>this?this:t},zone:function(t){var e=this._offset||0;return null==t?this._isUTC?e:this._d.getTimezoneOffset():("string"==typeof t&&(t=p(t)),Math.abs(t)<16&&(t=60*t),this._offset=t,this._isUTC=!0,e!==t&&h(this,H.duration(e-t,"m"),1,!0),this)},zoneAbbr:function(){return this._isUTC?"UTC":""},zoneName:function(){return this._isUTC?"Coordinated Universal Time":""},daysInMonth:function(){return H.utc([this.year(),this.month()+1,0]).date()},dayOfYear:function(t){var e=W((H(this).startOf("day")-H(this).startOf("year"))/864e5)+1;return null==t?e:this.add("d",t-e)},weekYear:function(t){var e=F(this,this.lang()._week.dow,this.lang()._week.doy).year;return null==t?e:this.add("y",t-e)},isoWeekYear:function(t){var e=F(this,1,4).year;return null==t?e:this.add("y",t-e)},week:function(t){var e=this.lang().week(this);return null==t?e:this.add("d",7*(t-e))},isoWeek:function(t){var e=F(this,1,4).week;return null==t?e:this.add("d",7*(t-e))},weekday:function(t){var e=(this._d.getDay()+7-this.lang()._week.dow)%7;return null==t?e:this.add("d",t-e)},isoWeekday:function(t){return null==t?this.day()||7:this.day(this.day()%7?t:t-7)},lang:function(e){return e===t?this._lang:(this._lang=_(e),this)}},P=0;P.z-cell {
-   background-color: white;
-   color: black;
-   font-weight: bold;
-}
-
-.GridReport tr.z-row td.z-row-inner,tr.z-row,div.z-grid-body div.z-cell,div.z-grid
-	{
-	background-color: white;
-	border-top: none;
-	border-left: none;
-	border-right: none;
-	border-bottom: none;
-	padding-top: 4px;
-	padding-bottom: 4px;
-	padding-left: 6px;
-	padding-right: 6px;
-	vertical-align:middle;
-	border-right-color: #ccc;
-	border-bottom-color: #ccc;
-	/*overflow:hidden;*/
-}
-.GridReportodd, .GridReportodd  > td 
-	{
-	color: black; background-color: rgb(255,255,204) !important;
-    }
-
-
-.z-toolbarbutton {
-	display: inline-block;
-	height: 24px;
-	border: 1px solid transparent;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-	margin: 0 2px;
-	padding: 1px 0;
-	line-height: 14px;
-	position: relative;
-	cursor: pointer;
-	float: right;
-}
-
-.z-paging-input {
-	font-family:Arial,Sans-serif;
-	font-size:12px;
-	font-weight:normal;
-	font-style:normal;
-	color:#000;
-	height:24px;
-	border:1px solid #8fb9d0;
-	margin-left:6px;
-	padding:3px 0;
-	line-height:20px;
-	vertical-align:baseline;
-}
-.z-paging-text {
-	font-family:Arial,Sans-serif;
-	font-size:12px;
-	font-weight:normal;
-	font-style:normal;
-	color:#000;
-	margin-right:12px
-}
-.z-paging-info {
-	font-family:Arial,Sans-serif;
-	font-size:12px;
-	font-weight:normal;
-	font-style:normal;
-	color:#000;
-	padding:4px 0;
-	position:absolute;
-	top:4px;
-	right:10px;
-}
-.z-menu-text,.z-menuitem-text {
-	font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;
-	font-size:12px;
-	font-weight:normal;
-	display:inline-block;
-	line-height:16px;
-	text-shadow:0 0px #fff
-}
-.z-menubar {
-	border-top: 0px
-	border-bottom: 0px; 
-}
-.z-column-content {
-	font-family: Arial,Sans-serif;
-	font-size: 12px;
-	color: #fff;
-	padding: 4px 5px;
-	line-height: 24px;
-	overflow: hidden;
-}
-.z-column-hover {	
-	background:	-webkit-linear-gradient(top, #336699 0%, #336699 100%); /* Chrome10+,Safari5.1+ */
-	background:	linear-gradient(to bottom, #336699 0%, #336699 100%); /* W3C */
-}
-/*
-.z-row:hover>.z-row-inner, .z-row:hover>.z-cell {
-background: #6ba6bf;
-background-clip: padding-box;
-position: relative;*/
-
-.z-messagebox .z-label  {
-	font-family: Arial,Sans-serif;
-	font-size: 12px;
-	color: #000;
-}
-
-.z-popup .z-popup-content{
-	font-family: Arial,Sans-serif;
-	font-size: 12px;
-	font-weight: normal;
-	font-style: normal;
-	color: #000;
-	height: 100%;
-	padding: 10px;
-	line-height: 14px;
-}		
-
-.z-notification-pointer ~ .z-notification-content {
-    display:table-cell;
-    width:150px;
-    height:50px;
-    min-height:60px;
-    ${t:borderRadius('5px') };
-    padding:5px 18px 5px 45px;
-    vertical-align:middle;
-}
-.z-loading {
-    background-color:#808080;
-    border:1px outset #A0A0A0;
-    font-weight: bold;
-    padding:2px;
-}
-.z-loading-indicator {
-    color: gray;
-    border:0 none;
-}		
-.z-toolbarbutton-content {
-	color: #fff;
-	text-shadow: 0 0px;
-}
-
-.z-groupbox>.z-groupbox-header {
-	color: #000;
-}
-
-.z-combobox-button, .z-bandbox-button, .z-datebox-button, .z-timebox-button, .z-spinner-button, .z-doublespinner-button {
-	color: #000;
-}
-
-
-/*.z-panel-header {
-font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
-font-size: 12px;
-font-weight: normal;
-font-style: normal;
-color: #fff;
-border: 0;
-padding: 3px 0 5px 0;
-line-height: 0px;
-background: #369;
-overflow: hidden;
-zoom: 1;
-display: none;
-}*/
-
-
-
-  .z-menupopup .z-menu-image, .z-menupopup .z-menuitem-image {
-min-width: 16px;
-min-height: 16px;
-margin-right: 9px;
-display: none;
-}
-
-
-  .z-menupopup-separator {
-width: 2px;
-height: 100%;
-border-width: 3px 1px 3px 0;
-border-style: solid;
-border-color: #d9f0fc;
-background: #a2c0ce;
-position: absolute;
-top: 0;
-left: 31px;
-z-index: 10;
-display: none;
-}
- 
-
-     .z-menupopup-content {
-left: 0px;
-}
-
-     .z-menu-icon.z-icon-caret-right {
-font-size: 15px;
-color: red;
-}
-
-
-           .z-menu-content:hover, .z-menuitem-content:hover {
-border-color: #8fb9d0;
-background: -webkit-linear-gradient(top, #e2f3fc 0%, #336699 100%);
-background: linear-gradient(to bottom, #e2f3fc 0%, #336699 100%);
-}
-
-/*.toolBarRaptor .z-toolbar {
-	background:white;
-}
-
-.toolBarRaptor .z-menuitem-content {
-    color:#000;
-}
-
-.toolBarRaptor .z-menuitem-content {
-    color:#000;
-}*/
-
-/*.z-caption .z-label {
-    float: right;
-}
-		
-.z-caption-content, .z-caption .z-label {
-	display: inline-block;
-	padding: 0;
-	line-height: 24px;
-	float: right;
-}  */		
-
-
-
-.ChartPanel .z-panel-head {
-  border:;
-}
-.ChartPanel .z-panel-header {
-line-height: 12px;
-color: #000;
-background:;
-}
-.ChartPanel .z-panel-icon {
-color: #000;
-display: block;
--webkit-border-radius: ;
-border-radius: ;
-text-align: left;
-overflow: hidden;
-cursor: pointer;
-float: left;
-}
-
-.ChartPanel .z-panel-icon:hover {
- color: ;
- border-color: ; 
-  background: 0;
-filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
- background:;
- float:left;
-}
-
-.ChartPanel .z-panel-expand {
-font-size: 9px;
-width: 12px; 
-line-height: 12px; 
-}
-
-/*[class^="z-icon-"], [class*=" z-icon-"] {*/
-.ChartPanel .z-icon	{
-display: inline-block;
-font-family: FontAwesome;
-font-size: 10px;
-font-weight: normal;
-font-style: normal;
--webkit-font-smoothing: antialiased;
--moz-osx-font-smoothing: grayscale;
-}
-
-.ChartPanel .z-icon-caret-up:before {
-  content: "\f068";
-}
-
-.ChartPanel .z-icon-caret-down:before {
-  content: "\f067";
-}
-
-.ie8 .z-column {
-background: #369;
-}
diff --git a/vid/src/main/webapp/static/fusion/raptor/css/calendar.css b/vid/src/main/webapp/static/fusion/raptor/css/calendar.css
deleted file mode 100644
index fdd2242f7..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/css/calendar.css
+++ /dev/null
@@ -1,97 +0,0 @@
-.TESTcpYearNavigation,
-.raptorcpMonthNavigation
-		{
-		background-color:#336699;
-		text-align:center;
-		vertical-align:center;
-		text-decoration:none;
-		color:#FFFFFF;
-		font-weight:bold;
-		}
-.raptorcpDayColumnHeader,
-.raptorcpYearNavigation,
-.raptorcpMonthNavigation,
-.raptorcpCurrentMonthDate,
-.raptorcpCurrentMonthDateDisabled,
-.raptorcpOtherMonthDate,
-.raptorcpOtherMonthDateDisabled,
-.raptorcpCurrentDate,
-.raptorcpCurrentDateDisabled,
-.raptorcpTodayText,
-.raptorcpTodayTextDisabled,
-.raptorcpText
-		{
-		font-family:arial;
-		font-size:8pt;
-		}
-TD.raptorcpDayColumnHeader
-		{
-		text-align:right;
-		border:solid thin #336699;
-		border-width:0 0 1 0;
-		}
-.raptorcpCurrentMonthDate,
-.raptorcpOtherMonthDate,
-.raptorcpCurrentDate
-		{
-		text-align:right;
-		text-decoration:none;
-		}
-.raptorcpCurrentMonthDateDisabled,
-.raptorcpOtherMonthDateDisabled,
-.raptorcpCurrentDateDisabled
-		{
-		color:#D0D0D0;
-		text-align:right;
-		text-decoration:line-through;
-		}
-.raptorcpCurrentMonthDate
-		{
-		color:#336699;
-		font-weight:bold;
-		}
-.raptorcpCurrentDate
-		{
-		color: #FFFFFF;
-		font-weight:bold;
-		}
-.raptorcpOtherMonthDate
-		{
-		color:#808080;
-		}
-TD.raptorcpCurrentDate
-		{
-		color:#FFFFFF;
-		background-color: red;
-		border-width:1;
-		border:solid thin #000000;
-		}
-TD.raptorcpCurrentDateDisabled
-		{
-		border-width:1;
-		border:solid thin #FFAAAA;
-		}
-TD.raptorcpTodayText,
-TD.raptorcpTodayTextDisabled
-		{
-		border:solid thin #336699;
-		border-width:1 0 0 0;
-		}
-A.raptorcpTodayText,
-SPAN.raptorcpTodayTextDisabled
-		{
-		height:20px;
-		}
-A.raptorcpTodayText
-		{
-		color:#336699;
-		font-weight:bold;
-		}
-SPAN.raptorcpTodayTextDisabled
-		{
-		color:#D0D0D0;
-		}
-.raptorcpBorder
-		{
-		border:solid thin #336699;
-		}
diff --git a/vid/src/main/webapp/static/fusion/raptor/css/dashboard.css b/vid/src/main/webapp/static/fusion/raptor/css/dashboard.css
deleted file mode 100644
index 2c79da202..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/css/dashboard.css
+++ /dev/null
@@ -1,36 +0,0 @@
-#news1{
-		font-family: Verdana, Arial, Helvetica, sans-serif;
-		font-size: 4pt;
-		margin: 0px;
-		background-color:#FFFFDF;
-		overflow: auto;
-	}	
-	
-#news2{
-		font-family: Verdana, Arial, Helvetica, sans-serif;
-		font-size: 4pt;
-		margin: 0px;
-		background-color:#E2E2E2;
-		overflow: auto;
-	}	
-#news3{
-		font-family: Verdana, Arial, Helvetica, sans-serif;
-		font-size: 4pt;
-		margin: 0px;
-		background-color:#E2E2E2;
-		overflow: auto;
-	}	
-	
-#news4{
-		font-family: Verdana, Arial, Helvetica, sans-serif;
-		font-size: 4pt;
-		margin: 0px;
-		background-color:#FFFFDF;
-		overflow: auto;
-	}	
-	
-#superTable {
-	width: 100%; 
-	height: 100%;
-    /*table-layout: fixed;*/ 
-}	
diff --git a/vid/src/main/webapp/static/fusion/raptor/css/drupal.css b/vid/src/main/webapp/static/fusion/raptor/css/drupal.css
deleted file mode 100644
index 158507902..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/css/drupal.css
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-#aggregator .feed-source .feed-title{margin-top:0;}#aggregator .feed-source .feed-image img{margin-bottom:0.75em;}#aggregator .feed-source .feed-icon{float:right;display:block;}#aggregator .feed-item{margin-bottom:1.5em;}#aggregator .feed-item-title{margin-bottom:0;font-size:1.3em;}#aggregator .feed-item-meta,#aggregator .feed-item-body{margin-bottom:0.5em;}#aggregator .feed-item-categories{font-size:0.9em;}#aggregator td{vertical-align:bottom;}#aggregator td.categorize-item{white-space:nowrap;}#aggregator .categorize-item .news-item .body{margin-top:0;}#aggregator .categorize-item h3{margin-bottom:1em;margin-top:0;}
-
-
-.book-navigation .menu{border-top:1px solid #888;padding:1em 0 0 3em;}.book-navigation .page-links{border-top:1px solid #888;border-bottom:1px solid #888;text-align:center;padding:0.5em;}.book-navigation .page-previous{text-align:left;width:42%;display:block;float:left;}.book-navigation .page-up{margin:0 5%;width:4%;display:block;float:left;}.book-navigation .page-next{text-align:right;width:42%;display:block;float:right;}#book-outline{min-width:56em;}.book-outline-form .form-item{margin-top:0;margin-bottom:0;}#edit-book-bid-wrapper .description{clear:both;}#book-admin-edit select{margin-right:24px;}#book-admin-edit select.progress-disabled{margin-right:0;}#book-admin-edit tr.ahah-new-content{background-color:#ffd;}#book-admin-edit .form-item{float:left;}
-
-
-.node-unpublished{background-color:#fff4f4;}.preview .node{background-color:#ffffea;}#node-admin-filter ul{list-style-type:none;padding:0;margin:0;width:100%;}#node-admin-buttons{float:left;margin-left:0.5em;clear:right;}td.revision-current{background:#ffc;}.node-form .form-text{display:block;width:95%;}.node-form .container-inline .form-text{display:inline;width:auto;}.node-form .standard{clear:both;}.node-form textarea{display:block;width:95%;}.node-form .attachments fieldset{float:none;display:block;}.terms-inline{display:inline;}
-
-
-
-fieldset{margin-bottom:1em;padding:.5em;}form{margin:0;padding:0;}hr{height:1px;border:1px solid gray;}img{border:0;}table{border-collapse:collapse;}th{text-align:left;padding-right:1em;border-bottom:3px solid #ccc;}.clear-block:after{content:".";display:block;height:0;clear:both;visibility:hidden;}.clear-block{display:inline-block;}/*_\*/
-* html .clear-block{height:1%;}.clear-block{display:block;}/* End hide from IE-mac */
-
-
-
-
-body.drag{cursor:move;}th.active img{display:inline;}tr.even,tr.odd{background-color:#eee;border-bottom:1px solid #ccc;padding:0.1em 0.6em;}tr.drag{background-color:#fffff0;}tr.drag-previous{background-color:#ffd;}td.active{background-color:#ddd;}td.checkbox,th.checkbox{text-align:center;}tbody{border-top:1px solid #ccc;}tbody th{border-bottom:1px solid #ccc;}thead th{text-align:left;padding-right:1em;border-bottom:3px solid #ccc;}.breadcrumb{padding-bottom:.5em}div.indentation{width:20px;height:1.7em;margin:-0.4em 0.2em -0.4em -0.4em;padding:0.42em 0 0.42em 0.6em;float:left;}div.tree-child{background:url(/misc/tree.png) no-repeat 11px center;}div.tree-child-last{background:url(/misc/tree-bottom.png) no-repeat 11px center;}div.tree-child-horizontal{background:url(/misc/tree.png) no-repeat -11px center;}.error{color:#e55;}div.error{border:1px solid #d77;}div.error,tr.error{background:#fcc;color:#200;padding:2px;}.warning{color:#e09010;}div.warning{border:1px solid #f0c020;}div.warning,tr.warning{background:#ffd;color:#220;padding:2px;}.ok{color:#008000;}div.ok{border:1px solid #00aa00;}div.ok,tr.ok{background:#dfd;color:#020;padding:2px;}.item-list .icon{color:#555;float:right;padding-left:0.25em;clear:right;}.item-list .title{font-weight:bold;}.item-list ul{margin:0 0 0.75em 0;padding:0;}.item-list ul li{margin:0 0 0.25em 1.5em;padding:0;list-style:disc;}ol.task-list li.active{font-weight:bold;}.form-item{margin-top:1em;margin-bottom:1em;}tr.odd .form-item,tr.even .form-item{margin-top:0;margin-bottom:0;white-space:nowrap;}tr.merge-down,tr.merge-down td,tr.merge-down th{border-bottom-width:0 !important;}tr.merge-up,tr.merge-up td,tr.merge-up th{border-top-width:0 !important;}.form-item input.error,.form-item textarea.error,.form-item select.error{border:2px solid red;}.form-item .description{font-size:0.85em;}.form-item label{display:block;font-weight:bold;}.form-item label.option{display:inline;font-weight:normal;}.form-checkboxes,.form-radios{margin:1em 0;}.form-checkboxes .form-item,.form-radios .form-item{margin-top:0.4em;margin-bottom:0.4em;}.marker,.form-required{color:#f00;}.more-link{text-align:right;}.more-help-link{font-size:0.85em;text-align:right;}.nowrap{white-space:nowrap;}.item-list .pager{clear:both;text-align:center;}.item-list .pager li{background-image:none;display:inline;list-style-type:none;padding:0.5em;}.pager-current{font-weight:bold;}.tips{margin-top:0;margin-bottom:0;padding-top:0;padding-bottom:0;font-size:0.9em;}dl.multiselect dd.b,dl.multiselect dd.b .form-item,dl.multiselect dd.b select{font-family:inherit;font-size:inherit;width:14em;}dl.multiselect dd.a,dl.multiselect dd.a .form-item{width:8em;}dl.multiselect dt,dl.multiselect dd{float:left;line-height:1.75em;padding:0;margin:0 1em 0 0;}dl.multiselect .form-item{height:1.75em;margin:0;}.container-inline div,.container-inline label{display:inline;}ul.primary{border-collapse:collapse;padding:0 0 0 1em;white-space:nowrap;list-style:none;margin:5px;height:auto;line-height:normal;border-bottom:1px solid #bbb;}ul.primary li{display:inline;}ul.primary li a{background-color:#ddd;border-color:#bbb;border-width:1px;border-style:solid solid none solid;height:auto;margin-right:0.5em;padding:0 1em;text-decoration:none;}ul.primary li.active a{background-color:#fff;border:1px solid #bbb;border-bottom:#fff 1px solid;}ul.primary li a:hover{background-color:#eee;border-color:#ccc;border-bottom-color:#eee;}ul.secondary{border-bottom:1px solid #bbb;padding:0.5em 1em;margin:5px;}ul.secondary li{display:inline;padding:0 1em;border-right:1px solid #ccc;}ul.secondary a{padding:0;text-decoration:none;}ul.secondary a.active{border-bottom:4px solid #999;}#autocomplete{position:absolute;border:1px solid;overflow:hidden;z-index:100;}#autocomplete ul{margin:0;padding:0;list-style:none;}#autocomplete li{background:#fff;color:#000;white-space:pre;cursor:default;}#autocomplete li.selected{background:#0072b9;color:#fff;}html.js input.form-autocomplete{background-image:url(/misc/throbber.gif);background-repeat:no-repeat;background-position:100% 2px;}html.js input.throbbing{background-position:100% -18px;}html.js fieldset.collapsed{border-bottom-width:0;border-left-width:0;border-right-width:0;margin-bottom:0;height:1em;}html.js fieldset.collapsed *{display:none;}html.js fieldset.collapsed legend{display:block;}html.js fieldset.collapsible legend a{padding-left:15px;background:url(/misc/menu-expanded.png) 5px 75% no-repeat;}html.js fieldset.collapsed legend a{background-image:url(/misc/menu-collapsed.png);background-position:5px 50%;}* html.js fieldset.collapsed legend,* html.js fieldset.collapsed legend *,* html.js fieldset.collapsed table *{display:inline;}html.js fieldset.collapsible{position:relative;}html.js fieldset.collapsible legend a{display:block;}html.js fieldset.collapsible .fieldset-wrapper{overflow:auto;}.resizable-textarea{width:95%;}.resizable-textarea .grippie{height:9px;overflow:hidden;background:#eee url(/misc/grippie.png) no-repeat center 2px;border:1px solid #ddd;border-top-width:0;cursor:s-resize;}html.js .resizable-textarea textarea{margin-bottom:0;width:100%;display:block;}.draggable a.tabledrag-handle{cursor:move;float:left;height:1.7em;margin:-0.4em 0 -0.4em -0.5em;padding:0.42em 1.5em 0.42em 0.5em;text-decoration:none;}a.tabledrag-handle:hover{text-decoration:none;}a.tabledrag-handle .handle{margin-top:4px;height:13px;width:13px;background:url(/misc/draggable.png) no-repeat 0 0;}a.tabledrag-handle-hover .handle{background-position:0 -20px;}.joined + .grippie{height:5px;background-position:center 1px;margin-bottom:-2px;}.teaser-checkbox{padding-top:1px;}div.teaser-button-wrapper{float:right;padding-right:5%;margin:0;}.teaser-checkbox div.form-item{float:right;margin:0 5% 0 0;padding:0;}textarea.teaser{display:none;}html.js .no-js{display:none;}.progress{font-weight:bold;}.progress .bar{background:#fff url(/misc/progress.gif);border:1px solid #00375a;height:1.5em;margin:0 0.2em;}.progress .filled{background:#0072b9;height:1em;border-bottom:0.5em solid #004a73;width:0%;}.progress .percentage{float:right;}.progress-disabled{float:left;}.ahah-progress{float:left;}.ahah-progress .throbber{width:15px;height:15px;margin:2px;background:transparent url(/misc/throbber.gif) no-repeat 0px -18px;float:left;}tr .ahah-progress .throbber{margin:0 2px;}.ahah-progress-bar{width:16em;}#first-time strong{display:block;padding:1.5em 0 .5em;}tr.selected td{background:#ffc;}table.sticky-header{margin-top:0;background:#fff;}#clean-url.install{display:none;}html.js .js-hide{display:none;}#system-modules div.incompatible{font-weight:bold;}#system-themes-form div.incompatible{font-weight:bold;}span.password-strength{visibility:hidden;}input.password-field{margin-right:10px;}div.password-description{padding:0 2px;margin:4px 0 0 0;font-size:0.85em;max-width:500px;}div.password-description ul{margin-bottom:0;}.password-parent{margin:0 0 0 0;}input.password-confirm{margin-right:10px;}.confirm-parent{margin:5px 0 0 0;}span.password-confirm{visibility:hidden;}span.password-confirm span{font-weight:normal;}
-
-
-ul.menu{list-style:none;border:none;text-align:left;}ul.menu li{margin:0 0 0 0.5em;}li.expanded{list-style-type:circle;list-style-image:url(/misc/menu-expanded.png);padding:0.2em 0.5em 0 0;margin:0;}li.collapsed{list-style-type:disc;list-style-image:url(/misc/menu-collapsed.png);padding:0.2em 0.5em 0 0;margin:0;}li.leaf{list-style-type:square;list-style-image:url(/misc/menu-leaf.png);padding:0.2em 0.5em 0 0;margin:0;}li a.active{color:#000;}td.menu-disabled{background:#ccc;}ul.links{margin:0;padding:0;}ul.links.inline{display:inline;}ul.links li{display:inline;list-style-type:none;padding:0 0.5em;}.block ul{margin:0;padding:0 0 0.25em 1em;}
-
-
-#permissions td.module{font-weight:bold;}#permissions td.permission{padding-left:1.5em;}#access-rules .access-type,#access-rules .rule-type{margin-right:1em;float:left;}#access-rules .access-type .form-item,#access-rules .rule-type .form-item{margin-top:0;}#access-rules .mask{clear:both;}#user-login-form{text-align:center;}#user-admin-filter ul{list-style-type:none;padding:0;margin:0;width:100%;}#user-admin-buttons{float:left;margin-left:0.5em;clear:right;}#user-admin-settings fieldset .description{font-size:0.85em;padding-bottom:.5em;}.profile{clear:both;margin:1em 0;}.profile .picture{float:right;margin:0 1em 1em 0;}.profile h3{border-bottom:1px solid #ccc;}.profile dl{margin:0 0 1.5em 0;}.profile dt{margin:0 0 0.2em 0;font-weight:bold;}.profile dd{margin:0 0 1em 0;}
-div.codeblock{padding:5px;border:1px solid #CCC;background-color:#EEE;}
-
-.ctools-locked{color:red;border:1px solid red;padding:1em;}.ctools-owns-lock{background:#FFFFDD none repeat scroll 0 0;border:1px solid #F0C020;padding:1em;}a.ctools-ajaxing,input.ctools-ajaxing,button.ctools-ajaxing,select.ctools-ajaxing{padding-right:18px !important;background:url(/sites/all/modules/ctools/images/status-active.gif) right center no-repeat;}div.ctools-ajaxing{float:left;width:18px;background:url(/sites/all/modules/ctools/images/status-active.gif) center center no-repeat;}
-.gam-banner{line-height:0;position:absolute;}.gam-holder{margin:0 auto;}.block-google_admanager{line-height:0;}
-#html5-user-geolocation-map{width:450px;height:250px;background:url(/sites/all/modules/html5_user_geolocation/world-map.png);position:relative;}#html5-user-geolocation-map-wrapper,#html5-user-geolocation-messages-wrapper .geolocating{display:none;}#html5-user-geolocation-map .dot{position:absolute;border:4px solid #064771;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;margin:-4px -4px -4px -4px;display:none;}
-
-
-#forum .description{font-size:0.9em;margin:0.5em;}#forum td.created,#forum td.posts,#forum td.topics,#forum td.last-reply,#forum td.replies,#forum td.pager{white-space:nowrap;}#forum td.posts,#forum td.topics,#forum td.replies,#forum td.pager{text-align:center;}#forum tr td.forum{padding-left:25px;background-position:2px 2px;background-image:url(/misc/forum-default.png);background-repeat:no-repeat;}#forum tr.new-topics td.forum{background-image:url(/misc/forum-new.png);}#forum div.indent{margin-left:20px;}.forum-topic-navigation{padding:1em 0 0 3em;border-top:1px solid #888;border-bottom:1px solid #888;text-align:center;padding:0.5em;}.forum-topic-navigation .topic-previous{text-align:right;float:left;width:46%;}.forum-topic-navigation .topic-next{text-align:left;float:right;width:46%;}
-
-
-.project table{width:auto;}.project tbody,.project tr{border:0;}.project td{vertical-align:top;padding:0.4em 0.1em;}.project .links{font-size:0.8em;}.project .author{color:#999;font-size:0.8em;}.project .downloads td{border-bottom:1px solid #ccc;padding-bottom:1em;}.project .downloads ul{margin:0px;}.project .downloads li{list-style-type:none;margin:0px;}.project-links-section div{float:left;padding-right:1.2em;width:30%;}#edit-project-goto{width:150px;}.node-form .project-taxonomy-element{float:left;padding-right:2em;}ul.project-terms{padding-left:1.5em;}.project-feed-icon{padding-left:1em;}
-
-
-.node-form .version-elements .form-item{float:left;padding-right:0.8em;margin:0.05em 0.1em;}table.releases{margin-top:.5em;}table.releases .release-title{width:15%;}table.releases .release-date{width:15%;}table.releases .release-size{width:10%;}table.releases .release-links{width:33%;}table.releases .release-status{width:25%;}table.releases .release-icon{width:2%;}.download-table h4{margin-bottom:0.67em;}.download-table-ok tr.odd,.download-table-ok tr.odd td.active,.download-table-ok tr.even,.download-table-ok tr.even td.active,table.releases tr.ok{background-color:#dfd;}.project-release tr.release-update-status-1,.download-table-warning tr.odd,.download-table-warning tr.odd td.active,.download-table-warning tr.even,.download-table-warning tr.even td.active,table.releases tr.warning{background-color:#ffd;}.project-release tr.release-update-status-2,.download-table-error tr.odd,.download-table-error tr.odd td.active,.download-table-error tr.even,.download-table-error tr.even td.active,table.releases tr.error{background-color:#fdd;}.view-project-release-download-table table{width:99%;}.view-project-release-download-table td.views-field-version{width:20%;}.view-project-release-download-table td.views-field-files{width:30%;}.view-project-release-download-table td.views-field-files span.filesize{font-size:80%;}.view-project-release-download-table td.views-field-file-timestamp{width:15%;}.view-project-release-download-table td.views-field-view-node{width:15%;}.view-project-release-download-table td.views-field-update-status{width:20%;}.project-release-files .views-field-filehash{color:#999;}
-
-
-
-#project-issue-summary-table{float:left;}#project-issue-summary-links{float:right;}#project-issue-summary-links li{background:none;list-style-type:none;margin-left:0;padding-left:0;}.project-issue .header{font-weight:bold;padding-top:0.5em;}.project-issue .summary table{border-collapse:collapse;width:auto;border:1px;border-style:solid;border-color:#eee;}.project-issue .summary table td{color:#333;background-color:transparent;font-size:90%;padding:0em 1em;border:0;}.project-issue tbody{border:0;}.project-issue .summary table tr{border:0;}.project-issue .node-form div.inline-options .form-item{float:left;padding-right:0.8em;margin:0.05em 0.1em;}.project-issue .node-form div.inline-options{overflow:hidden;}.project-issue .node-form div.inline-options:after{content:".";display:block;height:0;clear:both;visibility:hidden;}.project-issue .node-form fieldset{display:inline-block;width:97%;}.project-issue .node-form #edit-pid,.project-issue .node-form #edit-project-info-pid{width:225px;}table.projects{width:100%;margin-bottom:3em;}table.projects .project-name{width:24%;}table.projects .project-issue-updated{width:15%;}table.projects .project-issues{width:11%;text-align:center;}table.projects .project-issue-links{width:28%;padding-left:0.4em;padding-right:0.4em;text-align:center;}table.projects .project-project-links{width:22%;text-align:center;}table.projects .project-project-links a{white-space:nowrap;}.project-issue .quick-search #edit-projects,.project-issue .quick-search #edit-states{width:150px;}.view-project-issues-project .form-item #edit-filter1,.view-project-issues-project-search .form-item #edit-filter1,#edit-filter2{width:150px;}.view-project-issues-project-search #views-filters{width:100%;overflow:auto;}.project-issue .quick-search tr td .form-item,.project-issue .quick-search tr td input{margin:0;padding:0;}.project-issue .quick-search tr td{vertical-align:bottom;}.project-issue-status-info a,.project-issue-status-info .project-issue-assigned-user{background-color:#cdcdcd;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;padding:2px 4px;}.project-issue-status-info .project-issue-assigned-user{white-space:nowrap;}.project-issue tr.state-1,.project-issue-status-1 a{background-color:#fff;}.project-issue tr.state-1 td.active{background-color:#e1e7eb;}.project-issue tr.state-2,.project-issue-status-2 a{background-color:#c0ffc0;}.project-issue tr.state-2 td.active{background-color:#cec;}.project-issue tr.state-3,.project-issue-status-3 a,.project-issue tr.state-4,.project-issue-status-4 a,.project-issue tr.state-5,.project-issue-status-5 a,.project-issue tr.state-6,.project-issue-status-6 a{background-color:#ddf;}.project-issue tr.state-3 td.active,.project-issue tr.state-4 td.active,.project-issue tr.state-5 td.active,.project-issue tr.state-6 td.active{background-color:#cce;}.project-issue tr.state-7,.project-issue-status-7 a{background-color:#ffc9c9;}.project-issue tr.state-7 td.active{background-color:#eeb9b9;}.project-issue tr.state-8,.project-issue-status-8 a{background-color:#ffd;}.project-issue tr.state-8 td.active{background-color:#eed;}.project-issue tr.state-13,.project-issue-status-13 a{background-color:#ffe7dd;}.project-issue tr.state-13 td.active{background-color:#eed7cc;}.project-issue tr.state-14,.project-issue-status-14 a{background-color:#e7ffdd;}.project-issue tr.state-14 td.active{background-color:#d7eecc;}.project-issue-numeric{text-align:center;}.project-issue-numeric-light{text-align:center;color:#999;}.project-issue-statistics-overview-table{overflow:auto;}.project-issue-status-2,.project-issue-status-3,.project-issue-status-5,.project-issue-status-6,.project-issue-status-7{text-decoration:line-through;}.wrapper-throbber{background:url(/misc/throbber.gif) no-repeat right -18px;width:20px;height:18px;margin-top:20px;float:left;}
-
-
-tr.pift-pass{background-color:#99FF99 !important;}tr.pift-fail{background-color:#FF9999 !important;}tr.pift-retest{background-color:#FFFF77 !important;}
-
-.views-exposed-form .views-exposed-widget{float:left;padding:.5em 1em 0 0;}.views-exposed-form .views-exposed-widget .form-submit{margin-top:1.6em;}.views-exposed-form .form-item,.views-exposed-form .form-submit{margin-top:0;margin-bottom:0;}.views-exposed-form label{font-weight:bold;}.views-exposed-widgets{margin-bottom:.5em;}html.js a.views-throbbing,html.js span.views-throbbing{background:url(/sites/all/modules/views/images/status-active.gif) no-repeat right center;padding-right:18px;}div.view div.views-admin-links{font-size:xx-small;margin-right:1em;margin-top:1em;}.block div.view div.views-admin-links{margin-top:0;}div.view div.views-admin-links ul{padding-left:0;}div.view div.views-admin-links li a{color:#ccc;}div.view div.views-admin-links li{padding-bottom:2px;z-index:201;}div.view div.views-admin-links-hover a,div.view div.views-admin-links:hover a{color:#000;}div.view div.views-admin-links-hover,div.view div.views-admin-links:hover{background:transparent;;}div.view div.views-admin-links a:before{content:"[";}div.view div.views-admin-links a:after{content:"]";}div.view div.views-hide{display:none;}div.view div.views-hide-hover,div.view:hover div.views-hide{display:block;position:absolute;z-index:200;}div.view:hover div.views-hide{margin-top:-1.5em;}.views-view-grid tbody{border-top:none;}
-
-
-
-html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{border:0;background:transparent;font-size:100%;margin:0;padding:0;vertical-align:baseline;}img{border:0;background:transparent;font-size:100%;padding:0;vertical-align:baseline;}body{line-height:1;}ol,ul{list-style:none;}blockquote,q{quotes:none;}blockquote:before,blockquote:after,q:before,q:after{content:'';content:none;}ins{text-decoration:none;}del{text-decoration:line-through;}table{border-collapse:collapse;border-spacing:0;}ul.primary,ul.primary li,ul.primary li.active,ul.secondary,ul.secondary li,ul.secondary li.active{display:inline;}ul.primary,ul.primary li,ul.primary li a,ul.primary li.active a,ul.secondary,ul.secondary li,ul.secondary li a,ul.secondary li.active,ul.secondary li.active a{margin:0;padding:0;border:none;background:none;}.item-list ul li{margin:0;padding:0;list-style:none;list-style-image:none;list-style-position:inherit;list-style-type:none;}.block ul{margin:0;padding:0;}
-
-
-.container-12{margin-left:auto;margin-right:auto;width:960px;}#homebox.column-count-3 .homebox-column-wrapper,.grid-1,.grid-2,.grid-3,.grid-4,.grid-5,.grid-6,.grid-7,.grid-8,.grid-9,.grid-10,.grid-11,.grid-12,.grid-footer{display:inline;float:left;margin-left:10px;margin-right:10px;position:relative;}[dir=rtl] #homebox.column-count-3 .homebox-column-wrapper,[dir=rtl] .grid-1,[dir=rtl] .grid-2,[dir=rtl] .grid-3,[dir=rtl] .grid-4,[dir=rtl] .grid-5,[dir=rtl] .grid-6,[dir=rtl] .grid-7,[dir=rtl] .grid-8,[dir=rtl] .grid-9,[dir=rtl] .grid-10,[dir=rtl] .grid-11,[dir=rtl] .grid-12,[dir=rtl] .grid-footer{float:right;}#homebox.column-count-3 .homebox-column-wrapper-1,.alpha{margin-left:0;}[dir=rtl] #homebox.column-count-3 .homebox-column-wrapper-1,[dir=rtl] .alpha{margin-left:10px;margin-right:0;}#homebox.column-count-3 .homebox-column-wrapper-3,.omega{margin-right:0;}[dir=rtl] #homebox.column-count-3 .homebox-column-wrapper-3,[dir=rtl] .omega{margin-right:10px;margin-left:0;}.grid-1{width:60px;}.grid-2{width:140px;}.grid-3{width:220px;}#homebox.column-count-3 .homebox-column-wrapper,.grid-4{width:300px;}.grid-5{width:380px;}.grid-6{width:460px;}.grid-7{width:540px;}.grid-8{width:620px;}.grid-9{width:700px;}.grid-10{width:780px;}.grid-11{width:860px;}.grid-12{width:940px;}.grid-footer{width:172px;}.clear{clear:both;}.clearleft{clear:left;}.clearright{clear:right;}img.right{clear:right;float:right;margin:0 0 0.692em 20px;}img.left{clear:left;float:left;margin:0 20px 0.692em 0;}img.no-clear{clear:none;}.clear-block:after{clear:both;content:".";display:block;font-size:0;height:0;visibility:hidden;}.clear-block{display:inline-block;}/*_\*/
-* html .clear-block{height:1%;}.clear-block{display:block;}/* End hide from IE/Mac */
-
-
-
-
-
-
-body{color:#222;background-color:#fff;font-size:0.8125em;}body,caption,th,td,input,textarea,select,option,legend,fieldset{font-family:"Lucida Grande","DejaVu Sans","Bitstream Vera Sans",Verdana,Arial,sans-serif;line-height:1.384615em;}h1,h2,h3,h4,.h1,.h2,.h3,.h4{color:#555;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:normal;line-height:1.5em;}h1,.h1{color:#000;font-size:1.846em;line-height:1.25em;margin:1.125em 0 0.375em;}#aggregator .feed-item-title,h2,.h2{font-size:1.615em;line-height:1.286em;margin:0.619em 0 0.238em;}.block h2{margin-top:0;}#profile .name,h3,.h3{font-size:1.231em;line-height:1.125em;margin:1.125em 0 0.563em;}h4,.h4,h5,.h5,h6,.h6{color:#000;font-size:1em;line-height:1.385em;font-weight:bold;}#content h4,#content .h4{margin:0.5em 0 0.166667em;}#content h5,#content .h5{margin:1em 0 0;}#content h6,#content .h6{margin:0.5em 0 0;}p{margin-bottom:0.692em;}a,a:link,a:visited,a:active{color:#0678BE;text-decoration:none;}a:hover,a:focus{color:#0678BE;text-decoration:underline;}code,tt,pre{background-color:#F6F6F2;font-family:"Bitstream Vera Sans Mono",Monaco,"Lucida Console",monospace;font-size:0.9230em;padding:1px;white-space:pre-wrap;}
-
- 
-table{margin-bottom:0.5em;}thead th{border-bottom:0;padding:0.25em 0.5em;}th,td{padding:0.25em 0.5em;}th{background:#eaeae1;font-weight:bold;}th span.sort-header{float:left;}.table-sort-asc,.table-sort-desc{padding:0 14px 0 0;}.table-sort-asc{background:transparent url(/sites/all/themes/bluecheese/images/small-icons.png) no-repeat;background-position:right -636px;}.table-sort-desc{background:transparent url(/sites/all/themes/bluecheese/images/small-icons.png) no-repeat;background-position:right -600px;}th a,th a:link,th a:visited{color:#222;}th.active{background:#d7d7c7;}tr.even td.active{background:#e5e5d4;border-bottom:1px solid #D7D7C7;border-top:1px solid #D7D7C7;}tr.odd td.active{background:#eaeae1;}tr.even{background:#EEEEE0;border-bottom:1px solid #D8D8D2;border-top:1px solid #D8D8D2;position:relative;}tr.odd{background-color:#fff;border:0;border-bottom:1px solid #D8D8D2;position:relative;}#forum td > td{border:1px solid #f0f;}#forum ul{padding:0;}#forum .forum.first.last a{background:transparent url(/sites/all/themes/bluecheese/images/small-icons.png) no-repeat;background-position:0 -415px;padding-left:15px;}#forum tr td.container{padding-left:10px;}#forum tr td.container .name{background:transparent url(/sites/all/themes/bluecheese/images/small-icons.png) no-repeat;background-position:0 3px;padding:0px 0 5px 20px;min-width:20px;}#forum div.indent{margin-left:30px;}#forum tr td.forum{background:none;padding:0.25em 0.5em;}#forum tr td.forum .name{background:transparent url(/sites/all/themes/bluecheese/images/small-icons.png) no-repeat;background-position:0 -155px;min-width:20px;}#forum tr td.forum .name,#forum .description{margin:0;padding:0 0 0 20px;}td.icon{margin:5px 0 0 0;}.icon16{width:16px;height:16px;display:block;}.forum-default,.forum-hot{background:transparent url(/sites/all/themes/bluecheese/images/small-icons.png) no-repeat;background-position:0 -155px;}.forum-hot-new,.forum-new{background:transparent url(/sites/all/themes/bluecheese/images/small-icons.png) no-repeat;background-position:0 -410px;}.forum-closed{background:transparent url(/sites/all/themes/bluecheese/images/small-icons.png) no-repeat;background-position:0 -380px;}.forum-sticky{background:transparent url(/sites/all/themes/bluecheese/images/small-icons.png) no-repeat;background-position:0 5px;}table.releases tr.ok td{background-color:#F9FFEC;border-bottom:1px solid #EAEAE1;}table.releases tr.release-dev td{background-color:#F6E8E8;border-bottom:1px solid #EBCCCC;}table.releases td{vertical-align:middle;}#content table.releases td ul.links{margin:0;padding:0;}table.releases td.release-icon{padding:0 5px;vertical-align:middle;}table.releases td.release-icon img{display:block;}table.project-issue td{}table tr.notrecommended td{background:#F6E8E8;border-bottom:1px solid #EBCCCC;}
-
-
-#project-solr-browse-projects-form .results-count{border-bottom:1px solid #DDDDDD;margin:0 0 1em 0;padding-bottom:0.5em;}
-
-
-
-
-
-#skip-links a,#skip-links a:link,#skip-links a:visited,#skip-links a:hover{height:1px;left:0;overflow:hidden;position:absolute;top:-500px;width:1px;}#skip-links a:active,#skip-links a:focus{position:static;height:auto;width:auto;}blockquote{background:#fff url(/sites/all/themes/bluecheese/images/blockquote-66.png) no-repeat 0 0;margin:1.384em 40px 1.384em 20px;padding-left:30px;}acronym{border-bottom:1px dotted #666;}sub{font-size:0.923em;text-align:sub;}small{font-size:0.923em;}#column-left{z-index:1;}#content-top-region,#content,#content-bottom-region,#column-right-region{margin-bottom:13px;}#header,#footer,#page{min-width:960px;}#header{background-color:#56B3E6;height:10.846153em;}#header-content{position:relative;z-index:2;height:6.69230769em;}body.drupalorg-front #header{height:22.153846em;}body.drupalorg-front #header-content{height:18em;}#drupalorg-site-status{background-color:#D32101;color:#FFF;padding:0.5em;text-align:center;position:relative;-moz-box-shadow:0 2px 2px 1px rgba(68,68,68,0.5);-webkit-box-shadow:0 2px 2px 1px rgba(68,68,68,0.5);box-shadow:0 2px 2px 1px rgba(68,68,68,0.5);z-index:1;}#drupalorg-site-status a{color:#FFF;text-decoration:underline;}h1#site-name{margin:0;}#site-name a{display:block;height:63px;overflow:hidden;text-indent:-999em;width:181px;}#site-name a:focus,#site-name a:active{outline:#FFF dotted thin;}#header-left h2{color:#FFF;font-size:1.6153em;font-weight:lighter;margin:24px 0 12px 0;}#header-left-inner a{color:#fff;}.standfirst{font-size:1em;height:6.15384em;line-height:1.538461em;margin-top:0.5em;overflow:auto;}#header-right-inner{margin-top:46px;}#page{margin-bottom:30px;}#page-subtitle{margin-top:0;}.breadcrumb{padding-bottom:0;}#page-tools{margin:0.692em 0 0;float:right;text-align:right;}#page-tools li{display:block;padding:0;}#page-tools a{color:#96BC44;}#footer{background-color:#F6F6F2;font-size:0.92307em;line-height:1.5em;padding:30px 0 20px;}#footer-region li.first a{color:#222;}#footer-region .grid-footer:hover li.first a,#footer-region li.first a:hover{color:#0678BE;}#footer-message{border-top:1px solid #E2E2DF;margin-top:50px;padding-top:10px;}#footer-message-inner{color:#666;text-align:center;}#search-theme-form{float:right;vertical-align:middle;}#edit-search-theme-form-1-wrapper{display:inline;margin-bottom:0;}#edit-search-theme-form-1{background-color:#FFF;border:3px solid #1885C8;color:#999;float:left;font-size:0.92307em;min-height:18px;line-height:1.61538em;margin:0 5px 0 0;padding:8px 10px 8px 30px;width:229px;}#edit-search-theme-form-1-wrapper input.has-value,body.front #edit-search-theme-form-1-wrapper input{color:#222;font-size:1.0769em;}#edit-search-theme-form-1:focus{outline:#E4E4E4 solid 2px;}#edit-search-theme-form-1-wrapper label{display:none;}.drupalorg-front #edit-search-theme-form-1-wrapper label{color:#FFF;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:1.61538em;font-weight:lighter;margin:0 0 .5em 0;}#search-theme-form-advanced{clear:left;display:none;float:left;margin-top:-3px;width:275px;}#search-theme-form-advanced fieldset{border:0;line-height:1.538461em;margin:0;padding:0;}.drupalorg-front #search-theme-form-advanced{display:block;margin:9px 0 0 3px;}#search-theme-form-advanced{display:none;}html.js #search-theme-form-advanced{display:block;}#search-theme-form-advanced fieldset.collapsible{background:url(/sites/all/themes/bluecheese/images/search-bottom.png) 0 100% no-repeat;border:0;margin:0;padding:0;padding-bottom:12px;}#search-theme-form-advanced fieldset.collapsed{background:transparent;}#search-theme-form-advanced fieldset.collapsible .fieldset-wrapper{background-color:#0678BE;padding:2em 10px 0;}#search-theme-form-advanced fieldset.collapsed .fieldset-wrapper{background-color:transparent;}#search-theme-form-advanced fieldset.collapsible .form-radios{border:0;color:#FFF;}html.js #search-theme-form-advanced fieldset.collapsible .fieldset-wrapper{overflow:visible;float:left;}#search-theme-form-advanced legend{margin:0;height:1.538461em;line-height:1.538461em;}#search-theme-form-advanced fieldset.collapsible legend{height:auto;position:absolute;right:0;top:4px;}#search-theme-form-advanced fieldset.collapsible legend a{color:#000;padding:0 16px 0 0;text-decoration:none;}#search-theme-form-advanced fieldset.collapsible legend a:hover{text-decoration:underline;}#search-theme-form-advanced fieldset.collapsible legend a:focus{outline:none;}#search-theme-form-advanced .form-radios,#search-theme-form-advanced .form-radios .form-item{margin:0;float:left;}#search-theme-form-advanced .form-radios{padding-top:0;width:275px;position:relative;}#search-theme-form-advanced fieldset.collapsible .form-radios{width:255px;}#search-theme-form-advanced .form-radios .form-item{min-height:1.538461em;width:135px;}#search-theme-form-advanced fieldset.collapsible .form-radios .form-item{font-size:0.923076em;width:127px;}#search-theme-form-advanced .form-radios .form-divider{float:left;width:127px;}#search-theme-form-advanced .form-radios .form-item input{margin:0;}#search-theme-form-advanced .form-radios label{color:#FFF;}#search-theme-form-submit{display:inline;margin-top:3px;}.page-search h1{background-color:#F6F6F2;color:#555555;font-size:1.38461em;padding:10px;}.page-search h1 em{font-style:normal;font-weight:bold;}.page-search #project-solr-browse-projects-form{background:none;margin-bottom:1em;padding:0;}.page-search #project-solr-browse-projects-form label{font-weight:normal;}.page-search #drupalorg-search-sort-form{margin-bottom:1em;}.page-search #drupalorg-search-sort-form .form-item{margin-top:0;}.page-search #edit-solrsort-wrapper label,.page-search #edit-solrsort-wrapper select{display:inline;font-weight:normal;margin:0 10px 0 0;}.page-search #edit-solrsort-wrapper{margin-right:0;}.search-results dd{padding-left:0;}.search-results .search-info{color:#666;font-size:0.92307em;}.search-results dt{font-size:1em;}.page-search #column-right .block{background:none;}.page-search #column-right .item-list ul{list-style-image:none;list-style-position:outside;list-style-type:none;margin-left:-10px;}.page-search #column-right .item-list ul li{list-style-type:none;margin-bottom:3px;margin-left:0;}#block-drupalorg_news-news-terms ul.links li a,.page-search #column-right .item-list ul li a{color:#0678BE;padding:0.153846em 0.384615em 0.230769em 1em;}.page-search #column-right .item-list ul li a.selected,.page-search #column-right .item-list ul li a:hover,#block-drupalorg_news-news-terms ul.links li a.active,#block-drupalorg_news-news-terms ul.links li a:hover,#block-drupalorg_news-news-terms ul.links li a:focus{background-color:#666;color:#fff;text-decoration:none;}.page-search #drupalorg-search-block-form .form-text{height:1.5em;width:150px;}.page-search #content-top-region form.drupalorgSearch-processed input[type=submit]{display:none;}#autocomplete{background-color:#FFF;}#content #autocomplete ul{padding-left:5px;}#content #autocomplete ul li{list-style-type:none;}div#page-title{margin-top:1.048em;}#nav-header{font-size:0.923076em;}#nav-header ul{background:#064771;float:right;padding:0 0.75em 0 0.75em;}#nav-header ul li{float:left;margin:0.333333em 0.833333em;}#nav-header ul li a{color:#FFF;}#nav-header ul li a:hover,#nav-header ul li a:focus{color:#A5E2FF;text-decoration:none;}#nav-masthead{display:block;float:left;position:relative;z-index:1;}#nav-masthead ul li{list-style:none;float:left;font-size:0.923076em;margin:0;padding:0 0.615384em;}#nav-masthead ul li a{color:#FFF;display:block;float:left;margin:0;padding:0.416666em .75em 0.416666em 0;text-decoration:none;}#nav-masthead ul li.active a,#nav-masthead ul li:hover a,#nav-masthead ul li:focus a{color:#000;}#userinfo{float:left;margin:5px 0 0 .75em;}#userinfo a{color:#FFF;font-size:0.92307em;margin:0 1em 0 0;text-decoration:none;}#nav-content ul{border-bottom:1px solid #DDD;float:left;margin-bottom:1.154em;width:100%;}#nav-content ul li{float:left;margin-bottom:-1px;padding:4px 12px 5px 12px;position:relative;}#nav-content ul li a:hover,#nav-content ul li a:focus,#nav-content ul li.active-parent a{color:#000;text-decoration:none;}#nav-content ul li.active,#nav-content ul li.active-parent{background-color:transparent;border:none;}#nav-content ul li.active a:hover,#nav-content ul li.active a:focus{text-decoration:none;}#nav-content li.active,#nav-content li.active-parent{padding:0 0 0 0.384615em;}#nav-content li.active a.active,#nav-content li.active-parent a{display:block;padding:0.307692em 0.692307em 0.846153em 0.230769em;}.ui-tabs-nav{width:100%;float:left;border-bottom:1px solid #BFBFBA;}.ui-tabs-nav li{float:left;padding:0 0 0 10px;position:relative;margin-bottom:-1px;}.ui-tabs-nav a{color:#27537A;display:block;float:left;height:25px;padding:6px 11px 0 0;}.ui-tabs-nav li.ui-tabs-selected a{color:#000;}.ui-tabs-nav li a:hover,.ui-tabs-nav li a:focus{text-decoration:none;}.ui-tabs-hide{display:none;}.ui-tabs-nav a:active{outline:none;}.ui-tabs-nav .icon{display:inline-block;height:13px;margin-right:3px;width:11px;}#content .ui-tabs-panel h6{margin:0;}#tabs{margin-bottom:20px;}#tabs ul.tabs{display:block;}#tabs ul.tabs li{float:left;margin-right:5px;}#tabs ul.tabs li a{color:#96BC44;display:block;float:left;}#tabs ul.tabs li a:hover,#tabs ul.tabs li a:focus{background:#96BC44;color:#FFF;text-decoration:none;}#tabs ul.tabs li.active{}#tabs ul.tabs li.active a{background:#96BC44;color:#FFF;}#tabs ul.tabs li.active a:hover,#tabs ul.tabs li.active a:focus{}#tabs ul.primary{height:23px;}#tabs ul.primary li{}#tabs ul.primary li a{padding:0.230769em 0.615384em;}#tabs ul.primary li.parent-active{}#tabs ul.primary li.parent-active a{background:#E6FCB6;height:20px;}#tabs ul.primary li.parent-active a:hover{background:#96BC44;}#tabs ul.secondary{background:#E6FCB6;font-size:0.92307em;height:22px;}#tabs ul.secondary li{}#tabs ul.secondary li a{height:20px;padding:2px 10px 0 10px;}#content ul,ol{margin-bottom:0.692em;padding-left:2em;}#content [dir=rtl] ul,[dir=rtl] ol{padding-left:0;padding-right:2em;}ol{list-style:decimal outside;}.block ol{list-style:none;padding-left:0;}#content .profile ul,#homebox ul,#homebox ol{margin-bottom:0;padding-left:0;}#content ul{list-style-type:disc;}#node-type-page #content ul{list-style-type:none;}#content .item-list ul.flat,#content .item-list ul.links,#content .item-list ul.flat li,#content .item-list ul.links li,#content ul.flat,#content ul.links,#content ul.flat li,#content ul.links li{list-style-type:none;list-style-image:none;margin-left:0;padding-left:0;}#content .node,#aggregator .feed-item{margin-bottom:1.385em;}#content .sticky{background-color:#F6F6F2;padding:10px;}#content .sticky h2.node-title{margin-top:0;}#content .comment h3.comment-title{word-spacing:0.2em;color:#888;margin-bottom:0;}#content .comment h3.comment-title a{word-spacing:normal;}#content .submitted,#content .modified,#aggregator .feed-item-meta,#content .comment .links{color:#666;font-size:0.923em;line-height:1.5em;margin-bottom:0.75em;}#content .comment .links{float:right;}#aggregator .feed-item-date{font-style:italic;}body.page-node #content .tabs{float:right;}body.page-node #content .tabs ul.tabs li{float:left;display:block;font-size:0.92307em;margin:0 5px;padding:1px 4px;text-decoration:none;}body.page-node #content .tabs ul.tabs li.active{display:none;}.feed-source,#content .node-footer,#aggregator .feed-item-categories,.user-signature,#block-drupalorg_handbook-license{color:#666;font-size:0.92307em;}#content .item-list .pager{padding:1em 0 0;text-align:left;}.item-list ul.pager li{margin:0;padding:0 5px;}.pager li.first{padding:0;}ul.pager a{color:#2E6AB1;}.pager li.pager-current{background-color:#2E6AB1;color:#FFF;}.forum-topic-navigation{margin-bottom:10px;}.book-navigation{clear:both;}.book-navigation ul.menu{border-top:1px solid #E1E1DB;display:block;padding-bottom:.5em;}.book-navigation .page-links{border-top:1px solid #E1E1DB;border-bottom:1px solid #E1E1DB;margin-bottom:20px;}#column-right .block{background:#F6F6F2;}#column-right .block-inner{padding:1em;}.profile .item-list li,#column-right .block .item-list li,#homebox .block .item-list li{line-height:1.2em;margin-bottom:0.6em;}.front .block-content h4{clear:both;font-weight:bold;}.front .block-content .front-get-started{border:1px solid #DDD;border-width:1px 0;margin:1em 0;padding:20px 0;text-align:center;}.front #content .block-content ul{list-style:none;padding-left:0;}#front-middle-inner .block-content{margin-top:1.846em;height:5.538461em;padding:1.385em 0 0 64px;}#front-drupal-stats{border-top:1px solid #EEE;color:#9D9D93;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:1.846em;font-weight:lighter;line-height:1.5em;padding-top:5px;padding-left:16px;}#front-drupal-stats em{font-style:normal;color:#55554A;}#block-project-5 p.date{color:#666;font-size:0.92307em;}#cvs ul{margin:0 0 0.5em 0;padding:0;}#cvs ul,#cvs li{list-style:none;}#cvs li div.title{color:#555;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:1em;font-weight:bold;margin:0 0 0.5em 0;}#cvs li div.files{margin:0 0 0.5em 0;}#cvs li div.description{border-bottom:1px solid #E1E1DB;margin:0 0 2em 0;padding:0 0 1em 0;}#block-cvs-cvs_project_maintainers div.cvs-commit-times{color:#666;font-size:0.92307em;margin-bottom:0.5em;}#block-cvs-cvs_project_maintainers span.cvs-commits{white-space:nowrap;}.block ul.menu{padding:0 0 0.25em 1em;}#block-user-1 .h2{overflow:hidden;}.node-type-project-issue .comment-inner{margin-left:40px;}.node-type-project-issue #content h3.comment-title{float:left;font-size:1.1538em;margin-left:-40px;}.node-type-project-issue #content .comment .submitted{padding-top:1.4em;}.node-type-project-issue #content .comment .submitted a{font-size:1.2307em;}.comment .new{background-color:#E6FCB6;padding:1px 6px 2px;}.comment .picture{float:left;margin:0 1.5em 1.5em 0;}.comment-with-picture .content{margin-left:5.5em;}.node .picture{float:right;margin:0 1.5em 1.5em 0;}.indented{margin-left:30px;}.indented .indented .indented .indented{margin-left:0;}dl{margin-bottom:0.692em;}dt{font-weight:bold;margin:0.692em 0 0;}dl.documentation{margin-bottom:0;}dl.documentation dt{font-size:1.23076em;margin-top:0.563em;}a.all{font-weight:bold;}.narrow-box{margin-bottom:18px;padding:18px;}.narrow-box ul{padding-left:0!important;}.narrow-box ul li{list-style-type:none;}.narrow-box a.link-button{margin:20px 0 15px 0;}.narrow-box a.link-button span{font-size:0.92307em;white-space:nowrap;}.narrow-box-list{margin-bottom:1.5em;}#getting-started img{float:left;}a.action-button{display:inline-block;color:#fff;background:#9fc748;padding:0.643em 1.5em;font-size:1.077em;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;}a.action-button:hover{text-decoration:none;background:#8aaf3c;}#download h2,#content .drupal-modules-facets h2{margin-top:0;}#download .core ul li.download-core{margin-bottom:1.5em;}#content li.more a,#content li.more a:link,#content li.more a:visited,#content li.more a:active,#content li.all a,#content li.all a:link,#content li.all a:visited,#content li.all a:active{font-weight:bold;}#project-solr-version-form{margin-bottom:1em;}#edit-drupal-core-wrapper,#project-solr-version-form label,#project-solr-version-form select,#project-solr-version-form .form-submit{float:left;font-weight:normal;margin:0 10px 0 0;}#edit-drupal-core-wrapper{margin-right:0;}#project-solr-version-form .form-submit{padding:0 3px;}.feed-item-categories a,.feed-item-categories a:link,.feed-item-categories a:visited,.terms a,.terms a:link,.terms a:visited{background-color:#EEE;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;color:#666;display:inline-block;margin:3px 0;padding:3px 5px;text-decoration:none;}.feed-item-categories a:hover,.feed-item-categories a:active,.feed-item-categories a:focus,.terms a:hover,.terms a:active,.terms a:focus{background-color:#999;color:#FFF;}div.codeblock{background-color:#F6F6F2;margin-bottom:.5em;}.meta{background:#fffbd9;border-color:#ffebc5;border-style:solid none;border-width:1px;color:#666;font-size:0.92307em;margin:0.5em 0 1em;padding:0.5em 1em;}#content .meta h5{margin:0;}#page ul ul li{margin-left:1em;}#content .meta ul{list-style-type:none;margin:0;padding:0;}.profile{clear:none;margin-top:0;margin-bottom:0.692em;}.profile.alpha{clear:left;}.profile h3{border-bottom:none;clear:left;}.profile dl{margin:0;}.profile dt{clear:left;margin:0 10px 0 0;}.profile dd{margin-bottom:0.692em;}.profile .picture{float:right;margin-top:6px;}a.link-button{color:#FFF;display:inline-block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:1.38461em;height:36px;overflow:hidden;padding-left:1em;text-align:center;}a.link-button:focus,a.link-button:active{outline:#000 dotted thin;}a.link-button:hover{text-decoration:none;}.link-button span{cursor:pointer;display:inline-block;line-height:36px;padding:0 1em 0 0;}input.default{color:#888;}div.help,div.messages,div.warning{border:none;min-height:1em;padding:1em 1em 1em 3.5em;}div.help a,div.messages a,div.warning a{font-weight:bold;}#content div.help ul,#content div.messages ul{margin-bottom:1em;margin-left:0;padding:0;}#content div.help ul li,#content div.messages ul li{margin-bottom:.25em;}div.help{background:rgb(205,228,242) url(/sites/all/themes/bluecheese/images/icon-help.gif) 10px 14px no-repeat;margin-bottom:20px;}div.help ul li{list-style-image:url(/sites/all/themes/bluecheese/images/bullet-dot-blue.png);}div.more-help-link{margin-bottom:.5em;}div.messages,div.warning{margin-bottom:10px;}div.messages-multiple{padding-bottom:0;padding-left:4.5em;}div.messages-status{background:rgb(212,239,204) url(/sites/all/themes/bluecheese/images/icon-success.png) 10px 14px no-repeat;}div.messages-status ul li{list-style-image:url(/sites/all/themes/bluecheese/images/bullet-dot-green.png);}div.messages-warning,div.warning{background:#E6FCB6 url(/sites/all/themes/bluecheese/images/icon-warning.gif) 10px 14px no-repeat;}div.messages-warning ul li{list-style-image:url(/sites/all/themes/bluecheese/images/bullet-dot-yellow.png);}div.messages-error{background:#EBCCCC url(/sites/all/themes/bluecheese/images/icon-error.png) 10px 14px no-repeat;}div.messages-error ul li{list-style-image:url(/sites/all/themes/bluecheese/images/bullet-dot-red.png);}div.warning{margin-top:20px;}span.warning{color:rgb(227,144,27);margin-left:.5em;}div.warning span.warning{display:none;}tr.drag-previous{background:#E6FCB6;}.image-tags span{background-color:#49A9E4;display:inline-block;font-size:.6em;line-height:18px;padding-left:4px;}.image-tags span a{color:#FFF;display:inline-block;line-height:18px;padding-right:4px;}.source-tags .source-tag-688{background-color:#9FCA44;}.source-tags .source-tag-689{background-color:#EEE;}.source-tags .source-tag-689 a{color:#666;}.image-tags span:hover{background-color:#044771;}.image-tags span:hover a{text-decoration:none;}.source-tags span.source-tag-688:hover{background-color:#688A1F;}.source-tags span.source-tag-689:hover{background-color:#999;}.source-tags .source-tag-689 a:hover{color:#FFF;}.feature-tags span{background-color:#EBE3A4;color:#000;}.feature-tags span a{color:#000;}.feature-tags span:hover{background-color:#E9B538;}.feature-tags span:hover a{color:#FFF;}h2 .image-tags span{margin-left:1em;}.aggregator-promote-link{text-align:center;width:120px;padding:2px 0;}.aggregator-promote-link a{color:#96BC44;}.aggregator-promote-link:hover{background-color:#96BC44;}.aggregator-promote-link a:hover{color:#FFF;text-decoration:none;}#block-drupalorg_news-news-terms .block-inner{padding-left:3px;}#column-right #block-block-40,#column-right #block-drupalorg-drupalorg_activity,#block-drupalorg_news-news-terms.block{background-color:#FFF;}#block-drupalorg_news-news-terms h2{margin-bottom:.5em;}#block-drupalorg_news-news-terms ul.links{margin-left:-10px;}#block-drupalorg_news-news-terms ul.links li{display:list-item;margin-bottom:4px;}#about-features h3{font:bold 1em "Lucida Grande",Helvetica,Arial,sans-serif;text-transform:uppercase;}#about-features h3 a{display:block;padding:4px 0 0 70px;min-height:50px;}.node-section{border-bottom:1px solid #D8D8D2;padding-bottom:0.692em;}.comment{margin-top:0.692em;border-top:1px solid #D8D8D2;}.node-footer-section h3{margin:1em 0 .5em;}.aboutsmall{color:#555;font-size:0.92307em;}#content .aboutsmall ul{list-style:none;margin-bottom:1.5em;padding-left:0;}.aboutsmall dd{padding-left:0;}.aboutsmall h3{border-top:1px solid #DDD;margin-top:1em;padding-top:1em;}.aboutsmall .link-button{float:left;margin:1em 0;}.aboutsmall strong,.aboutsmall dt{color:#555;}.drupalorg-front #page{margin-top:1.385em;}.homepage-map{background:url(/sites/all/themes/bluecheese/images/world-map.png);height:250px;position:relative;width:450px;white-space:nowrap;}.homepage-map .homepage-pin{position:absolute;width:10px;height:10px;display:none;margin:0 0 -5px -5px;}.homepage-map .homepage-pin .latitude,.homepage-map .homepage-pin .longitude{display:none;}.homepage-map .homepage-pin .content{background:#fff;position:absolute;border:1px solid #bfbfba;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;padding:1px 4px;bottom:11px;}.homepage-map .homepage-pin-east .content{right:-40px;}.homepage-map .homepage-pin-west .content{left:-40px;}.homepage-map .homepage-pin .content:after{content:' ';display:block;position:absolute;width:12px;height:10px;bottom:-10px;background:url(/sites/all/themes/bluecheese/images/small-icons.png) no-repeat 0 -734px;}.homepage-map .homepage-pin-east .content:after{right:39px;}.homepage-map .homepage-pin-west .content:after{left:37px;}.homepage-map .drupalcon a{font-weight:bold;color:#d32101;}div.things-we-made-wrapper{width:300px;overflow:hidden;margin:0 0 1em 0;}#project-overview .project{border-bottom:1px solid #E1E1DB;margin-bottom:20px;padding-bottom:20px;}#project-overview .image-attach-teaser{float:right;margin:0 0 20px 20px;}#project-overview .image-attach-teaser img{border:1px solid #9D9D93;display:block;}#project-overview ul.project-meta li{color:#666;font-size:0.92307em;margin-bottom:0;}#project-overview .links{font-size:1em;}#content #project-overview .project ul,#content #project-overview .project ol{overflow:auto;}#project-solr-browse-projects-form{background-color:#F6F6F2;margin:0 0 20px 0;padding:10px;}#project-solr-browse-projects-form .form-item,#project-solr-browse-projects-form #edit-submit,#project-solr-browse-projects-form #edit-submit-2{float:none;}#project-solr-browse-projects-form #edit-submit,#project-solr-browse-projects-form #edit-submit-2{margin-bottom:0;}#project-solr-browse-projects-form .form-item>*{display:inline;}.project-links-section div{margin:1em 0;}#content .project-links-section ul{margin-left:0;padding-left:0;}body .project-issue tr.odd,body .project-issue tr.even{background:none;border:none;}table{border-collapse:separate;}.project-issue tr td,.project-issue tr td.active{background-color:#F9F9F9;border-bottom:1px solid #D8D8D2;border-top:2px solid #CCC;}.project-issue tr td.active{background-color:#FFF;border-top:2px solid #939393;}.project-issue tr.state-1 td{background-color:#F9F9F9;border-top:2px solid #ccc;}.project-issue tr.state-1 td.active{background-color:#FFF;border-top:2px solid #939393;}.project-issue tr.state-2 td{background-color:#D7FFD8;border-top:2px solid #A8FF98;}.project-issue tr.state-2 td.active{background-color:#EDFFEC;border-top:2px solid #96bc44;}.project-issue tr.state-3 td,.project-issue tr.state-4 td,.project-issue tr.state-5 td,.project-issue tr.state-6 td,.project-issue tr.state-16 td{background-color:#EFF1FE;border-top:2px solid #B5C4FE;}.project-issue tr.state-3 td.active,.project-issue tr.state-4 td.active,.project-issue tr.state-5 td.active,.project-issue tr.state-6 td.active,.project-issue tr.state-16 td.active{background-color:#F2F4FE;border-top:2px solid #4988FE;}.project-issue tr.state-7 td,.project-issue tr.state-18 td{background-color:#FDDDDD;border-top:2px solid #FC8596;}.project-issue tr.state-7 td.active,.project-issue tr.state-18 td.active{background-color:#FDEBED;border-top:2px solid #FC2843;}.project-issue tr.state-8 td{background-color:#FFFFDD;border-top:2px solid #FFCF73;}.project-issue tr.state-8 td.active{background-color:#FEFFEC;border-top:2px solid #FFB404;}.project-issue tr.state-13 td{background-color:#FFECE8;border-top:2px solid #FFDCCD;}.project-issue tr.state-13 td.active{background-color:#FFF6F6;border-top:2px solid #FFBCA4;}.project-issue tr.state-14 td,.project-issue tr.state-15 td{background-color:#F1FFE8;border-top:2px solid #BCFFB3;}.project-issue tr.state-14 td.active,.project-issue tr.state-15 td.active{background-color:#F8FFF1;border-top:2px solid #93FF88;}#block-project_issue-issue_cockpit .block-inner,#block-cvs-cvs_project_maintainers .block-inner{margin:0;}#block-project_issue-issue_cockpit .block-content,#homebox-block-project_issue_issue_cockpit .portlet-content{color:#888;}form#project-issue-issue-cockpit-searchbox,.issue-cockpit-categories,.issue-cockpit-subscribe,.issue-cockpit-statistics,.issue-cockpit-oldest{color:#222;}form#project-issue-issue-cockpit-searchbox{margin-bottom:0.5em;margin-top:0.5em;}form#project-issue-issue-cockpit-searchbox .form-item{float:left;margin:0 10px 0.5em 0;}form#project-issue-issue-cockpit-searchbox a{clear:left;display:block;}#block-project_issue-issue_cockpit .category-header,#homebox-block-project_issue_issue_cockpit .category-header{color:#555;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:1.2307em;font-weight:normal;margin-top:0.5em;}.issue-cockpit-bug,.issue-cockpit-statistics{margin-bottom:0.5em;}.issue-cockpit-oldest{color:#888;}.view-project-issue-user-issues div.project-title{font-weight:bold;}#homebox #homebox-block-views_a512ec6dea837b33a2b010c2af17ed85 .portlet-content{padding:0;}#homebox .homebox-portlet .view-project-issue-user-issues .more-link{padding:0px 10px 10px 0px;}#homebox #homebox-block-views_a512ec6dea837b33a2b010c2af17ed85 th{display:none;}#homebox #homebox-block-views_a512ec6dea837b33a2b010c2af17ed85 td{padding:0.25em 10px;}.project-info .count{font-weight:bold;}#homebox .homebox-column{background:none;margin:0;padding:0;}#homebox .homebox-portlet{border:0;margin:0 0 20px;}#homebox .homebox-placeholder{margin:0 0 14px;}#homebox .homebox-portlet .homebox-portlet-inner{background-color:#F6F6F2;border:0;}#homebox .portlet-config{padding:0 10px 10px;}#homebox .portlet-content{padding:10px;}#homebox .homebox-portlet .portlet-header{background:none;font-size:1.38461em;padding:10px 10px 8px;}#homebox .homebox-portlet .portlet-minus,#homebox .homebox-portlet .portlet-maximize{display:none;}#homebox .homebox-portlet .portlet-icon{margin-top:4px;margin-left:4px;}#homebox-buttons,#homebox-add{margin-bottom:10px;}#homebox-add a.restore{display:inline;height:auto;padding:0;width:auto;}#drupalorg-set-home a,html.js #drupalorg-set-home input{display:none;}html.js #drupalorg-set-home a{display:inline;}#drupalorg-set-home .ahah-progress{float:right;}#drupalorg-search-help-form{background-color:#F6F5F1;margin-bottom:20px;padding:20px 20px 15px 20px;}#drupalorg-search-help-form label{font-size:1.61538em;font-weight:normal;margin:0 0 1em 0;}#drupalorg-search-help-form .form-text{background:#FFFFFF url(/sites/all/themes/bluecheese/images/throbber-large.gif) 231px 8px no-repeat;border:2px solid #c8c9c4;color:#858585;font-size:1.61538em;height:35px;margin:0 0 5px 0;padding:0 30px 0 5px;width:221px;}#drupalorg-search-help-form .form-text.throbbing{background:#FFFFFF url(/sites/all/themes/bluecheese/images/throbber-large.gif) 231px -92px no-repeat;}#edit-search-term-results p.help-result-text{font-weight:bold;margin-left:10px;}#edit-search-term-results ul{list-style-type:none;margin:0 0 5px 0;padding:0;}#edit-search-term-results ul a{font-weight:bold;}#edit-search-term-results li .help-result-value{border-top:1px solid #E1E1DB;line-height:2em;list-style-type:none;margin:0;padding:0 0 0 10px;}#recent-activity ul{margin-left:0;padding-left:0;}#page .block-google_admanager{background-color:#f6f6f2;line-height:inherit;}.gam-holder{margin:0 0 1em;}.gam-prefix,.gam-suffix{padding:12px;}.gam-suffix{color:#666;font-size:0.92307em;}.gam-suffix a{color:#000;}.gam-holder .text{background-color:#f6f6f2;width:274px;line-height:1.5em;padding:13px;}.gam-holder .text a{font-weight:bold;}#column-right .block-google_admanager{margin:12px 0 12px 0;}#column-right .block-google_admanager .block-inner{padding:0;}.front-current-activity{float:left;margin-bottom:1.385em;}.front-current-activity:first-child{margin-right:1.5em;}.front-current-activity td{padding:0;white-space:nowrap;}.front-current-activity td:first-child{text-align:right;padding-right:0.4em;}.front-current-activity th{background:transparent;font-weight:normal;border-bottom:none;padding:0;}body.front .gam-holder{margin:1.385em 0 0 0;}#block-google_admanager-89caa04f148acdc52719b3d001e487c4 .gam-prefix h3{margin-top:0;}#block-google_admanager-89caa04f148acdc52719b3d001e487c4 .gam-prefix p{margin-bottom:0;}#google_ads_div_Security_books img,#google_ads_div_Redesign_books img{padding:0 12px;}.view-drupalorg-community-spotlight.view-display-id-block_1 .node-footer .links{display:block;}.view-drupalorg-community-spotlight.view-display-id-block_1 .node-footer .separator{display:none;}#block-drupalorg_search-drupalorg_search_users form,#block-drupalorg_search-drupalorg_search_users .form-item{margin:0;}#block-drupalorg_search-drupalorg_search_users .form-text{width:150px;}.drupalorg-front #header-screen{background:url(/sites/all/themes/bluecheese/images/fireworks.png) 5% 0 no-repeat;}.link-button span.celebrating{display:inline-block;margin-left:-1em;padding:0 0 0 1em;background:url(/sites/all/themes/bluecheese/images/fireworks-link-button.png) 0 0 no-repeat;}
-
-
-
-div.block-region{background:none;border:2px dashed #53B0EB;color:#53B0EB;font-size:1.0769em;margin:10px 0;padding:10px;}.views-tabs .ui-tabs-nav li,.views-tabs .ui-tabs-nav a{float:none;}#content .views-tabs ul.ui-tabs-nav{padding-left:0;}
-
-
-
-#content .node-footer a.comment_comments,#content .node-footer a.comment_add,html.js #search-theme-form-advanced fieldset.collapsible legend a,div.nav-content-dashboard ul li.active span.hover a.edit span,div.nav-content-dashboard ul li.active span.hover a.delete,#page-tools a.add,#dashboard a.remove-widget,.meta .alert,.project-info .alert,.rss-feed-link,.search-results .search-info .comments,.portlet-header .portlet-settings,.portlet-plus,.portlet-minus,.portlet-close,.portlet-maximize,.portlet-maximized .portlet-minimize{background-image:url(/sites/all/themes/bluecheese/images/small-icons.png);background-repeat:no-repeat;}#content .node-footer a.comment_comments,#content .node-footer a.comment_add{background-position:0 -415px;padding-left:15px;}html.js #search-theme-form-advanced fieldset.collapsible legend a{background-position:100% -473px;}div.nav-content-dashboard ul li.active span.hover a.edit span{background-position:8px -61px;padding-left:20px;}div.nav-content-dashboard ul li.active span.hover a.delete{background-position:8px -125px;height:12px;padding-left:20px;}#dashboard a.remove-widget{background-position:0 -128px;height:12px;padding-left:12px;}#page-tools a.add{background-position:right -188px;padding-right:18px;}.meta .alert{background-position:0 -225px;padding-left:14px;}.project-info .alert{background-position:0 -223px;padding-left:16px;}.rss-feed-link{background-position:0 -30px;padding-left:20px;}.search-results .search-info .comments{background-position:0 -415px;padding-left:14px;}.portlet-header .portlet-settings{background-position:2px -64px;}.portlet-plus{background-position:2px -192px;}.portlet-close{background-position:2px -128px;}.page-search #column-right .item-list ul li,#block-drupalorg_news-news-terms ul.links li{line-height:1.5em;}.page-search #column-right .item-list ul li a.selected,.page-search #column-right .item-list ul li a:hover,#block-drupalorg_news-news-terms ul.links li a.active,#block-drupalorg_news-news-terms ul.links li a:hover,#block-drupalorg_news-news-terms ul.links li a:focus{background-image:url(/sites/all/themes/bluecheese/images/pointer.png);background-repeat:no-repeat;background-position:0 center;}#edit-search-theme-form-1,#aboutwebbased a,#aboutcontentmanagement a,#aboutmodules a,#aboutthemes a,#aboutsearching a,#aboutsocial a,#aboutcommunity a,#aboutpersonalisation a{background:#fff url(/sites/all/themes/bluecheese/images/large-icons.png) no-repeat;}#edit-search-theme-form-1{background-position:8px -856px;}#aboutwebbased a{background-position:4px 0;}#aboutcontentmanagement a{background-position:4px -96px;}#aboutmodules a{background-position:4px -192px;}#aboutthemes a{background-position:4px -288px;}#aboutsearching a{background-position:4px -384px;}#aboutsocial a{background-position:4px -480px;}#aboutcommunity a{background-position:4px -576px;}#aboutpersonalisation a{background-position:4px -1056px;}#header{background-image:url(/sites/all/themes/bluecheese/images/sprites-horizontal.png);background-repeat:repeat-x;}#header{background-position:0 -1088px;}body.drupalorg-front #header{background-position:0 0;}#site-name a,#nav-content li.active,#nav-content li.active a.active,#nav-content li.active-parent,#nav-content li.active-parent a,#nav-masthead li,#nav-masthead li a,.ui-tabs-nav li.ui-tabs-selected,.ui-tabs-nav li.ui-tabs-selected a,.ui-tabs-nav .icon,a.link-button,a.link-button span,#front-middle-inner .block-content,.homepage-pin,.image-tags span,.image-tags span a{background-image:url(/sites/all/themes/bluecheese/images/sprites.png);background-repeat:no-repeat;}#site-name a{background-position:0 -467px;}.homepage-pin-doc{background-position:-22px -753px;}.ui-tabs-docs-updates .icon{background-position:-22px -750px;}.homepage-pin-forum{background-position:-11px -753px;}.ui-tabs-forum-posts .icon{background-position:-11px -750px;}.homepage-pin-commit{background-position:0 -753px;}.ui-tabs-commits .icon{background-position:0 -750px;}#nav-content li.active,#nav-content li.active-parent,.ui-tabs-nav li.ui-tabs-selected{background-position:0 -1300px;}#nav-content li.active a.active,#nav-content li.active-parent a,.ui-tabs-nav li.ui-tabs-selected a{background-position:100% -1200px;}#nav-masthead li a{background-position:100% -800px;}#nav-masthead li{background-position:0 -900px;}#nav-masthead li.active a,#nav-masthead li:hover a{background-position:100% -1000px;}#nav-masthead li.active,#nav-masthead li:hover{background-position:0 -1100px;}a.link-button{background-position:0 -48px;}a.link-button span{background-position:100% 0;}#front-middle-inner .block-content{background-position:0 -537px;}.image-tags span{background-position:0 -224px;}.image-tags a{background-position:100% -192px;}.feature-tags span{background-position:0 -288px;}.feature-tags a{background-position:100% -256px;}.sticky .image-tags span{background-position:0 -352px;}.sticky .image-tags a{background-position:100% -320px;}
diff --git a/vid/src/main/webapp/static/fusion/raptor/css/form-field-tooltip.css b/vid/src/main/webapp/static/fusion/raptor/css/form-field-tooltip.css
deleted file mode 100644
index 24b40da9d..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/css/form-field-tooltip.css
+++ /dev/null
@@ -1,12 +0,0 @@
-#DHTMLgoodies_formTooltipDiv{
-	color:#000000;
-	font-family:arial;
-	font-weight:bold;
-	font-size:0.8em;
-	line-height:120%;
-}
-.DHTMLgoodies_formTooltip_closeMessage{
-	color:#000000;
-	font-weight:normal;
-	font-size:0.7em;
-}
\ No newline at end of file
diff --git a/vid/src/main/webapp/static/fusion/raptor/css/mobile_raptor.css b/vid/src/main/webapp/static/fusion/raptor/css/mobile_raptor.css
deleted file mode 100644
index b47fc4311..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/css/mobile_raptor.css
+++ /dev/null
@@ -1,73 +0,0 @@
-#reportContainer {text-align:center;margin-bottom:5px;}
-
-#chartContainer {-webkit-border-radius:5px;margin-bottom:5px;}
-
-#reportTitleContainer {
-	background-color: rgb(57,91,162);
-	padding:8px 5px 0px 10px;
-	font-family:Helvetica;
-	color:#fff;
-	-webkit-border-top-left-radius: 5px;
-	-webkit-border-top-right-radius: 5px;
-}
-
-#reportTitle,#eventTitle{
-	font-size:15px;
-	font-weight:bold;
-	text-align:left;
-}
-
-#reportSubTitleContainer{
-	font-family:Helvetica;
-	font-weight:bold;
-	color:rgb(255,255,102);
-	padding:2px 10px 3px 10px;
-	background-color: rgb(57,91,162);
-}
-
-#reportFooter{
-	background-color: rgb(57,91,162);
-	-webkit-border-bottom-left-radius: 5px;
-	-webkit-border-bottom-right-radius: 5px;
-}
-
-.reportHeadRow {
-	background-color: rgb(57,91,162);
-	border-top:1px solid rgb(148,175,222);
-	border-bottom:1px solid rgb(148,175,222);
-}
-
-.reportHeadCell {
-	font-family:Helvetica;
-	font-weight:bold;
-	font-size:12px;
-	height:20px;
-}
-
-.rcolheader{
-	font-family:Helvetica;
-	font-size:13px;
-	color:#fff;
-}
-
-.reportRow {
-	border-top: 1px solid solid rgb(109,132,162);	
-	background-color: rgb(112,137,193);
-}
-
-.reportAltRow {
-	border-top: 1px solid solid rgb(109,132,162);
-	background-color: rgb(57,91,162);
-}
-
-.reportCell {
-	padding-left:3px;
-	padding-right:3px;
-	padding-top:10px;
-	padding-bottom:10px;
-	font-family:Helvetica;
-	font-size:13px;
-	color:#fff;
-}
-
-.reportCellLink {font-family:Helvetica;font-size:13px;color:#fff;word-break:break-all}
\ No newline at end of file
diff --git a/vid/src/main/webapp/static/fusion/raptor/css/novamap.css b/vid/src/main/webapp/static/fusion/raptor/css/novamap.css
deleted file mode 100644
index 7bbf4bf5d..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/css/novamap.css
+++ /dev/null
@@ -1,25 +0,0 @@
-@CHARSET "ISO-8859-1";
-
-.buttondefault {
-	background: lightgrey;
-	border-left: 2px lightgrey solid;
-	border-top: 2px lightgrey solid;
-	border-right: 2px gray solid;
-	border-bottom: 2px gray solid;
-}
-
-.buttonover {
-	cursor: hand;
-	background: #F0F8FF;	
-}
-
-.buttonout {
-	background: lightgrey;
-}
-
-.buttonclick {
-	border-left: 2px gray solid;
-	border-top: 2px gray solid;
-	border-right: 2px white solid;
-	border-bottom: 2px white solid;
-}
\ No newline at end of file
diff --git a/vid/src/main/webapp/static/fusion/raptor/css/picker.css b/vid/src/main/webapp/static/fusion/raptor/css/picker.css
deleted file mode 100644
index bbc439ec3..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/css/picker.css
+++ /dev/null
@@ -1,40 +0,0 @@
-.picker_layer {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	text-decoration: none;
-	background-color: #d4d0c8;
-	border-width: 1px;
-	border-style: solid;
-	border-color: #666666;
-	overflow: visible;
-	height: auto;
-	width: auto;
-}
-.picker_buttons {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	background-color:#d4d0c8;
-	border-style:solid;
-	border-color:#666666;
-	border-width:1px;
-	padding:1px;
-	cursor:pointer;
-	color:#000000;
-}
-.cell_color {
-	cursor:pointer;
-	width:9px;
-	height:9px;
-}
-.color_table {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	text-decoration: none;
-}
-.choosed_color_cell{
-	border-style:solid; border-color:#000000; border-width:1px;
-}
-.default_color_btn{
-	width:17px; height:17px; background-image:url(defaultcolor.jpg);
-	background-repeat:no-repeat; background-position:center;
-}
\ No newline at end of file
diff --git a/vid/src/main/webapp/static/fusion/raptor/css/ral.css b/vid/src/main/webapp/static/fusion/raptor/css/ral.css
deleted file mode 100644
index 4e45ddca8..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/css/ral.css
+++ /dev/null
@@ -1,1437 +0,0 @@
-/*
-Reusable Asset Library - CSS Positioning Version (v3.2)
-Release Date: 1/26/07
-Core Styles
-*/
-
-/*------------------------General-----------------------------------*/
-body{
-background:#FFF;
-font-family:Arial,Verdana,Geneva,Helvetica,sans-serif;
-font-size:.71em;
-padding:0;
-margin:0px;
-margin-right:1px;
-border:0;
-}
-.nested{
-border:0;
-padding:0;
-margin:0;
-}
-.btm{
-vertical-align:bottom !important;
-}
-.nowrap{
-white-space:nowrap;
-}
-.top, .top td{
-vertical-align:top !important;
-}
-table{ /*IE5.5 hack*/
-font-size:100%;
-}
-td,tr,th{ /*IE5.5 hack*/
-font-size:inherit;
-}
-.hide{
-display:none !important;
-}
-.mid {
-vertical-align:middle !important;
-}
-.value {
-text-align:right;
-}
-.show{
-display:block !important;
-}
-ul{
-padding:0;
-margin:0;
-border:0;
-}
-.indent{
-margin-left:10px !important;
-}
-.code{
-font-family: Courier,serif;
-}
-p{
-padding:5px 0;
-margin:0;
-border:0;
-}
-h1{
-font-size:150%;
-margin:2px 0px;
-display:block;
-position:relative;
-clear:both;
-}
-h2{
-font-size:130%;
-margin:2px 0px;
-clear:both;
-position:relative;
-display:block;
-}
-h2.blue{
-position:relative;
-top:0;
-left:0;
-font-size:100%;
-background:#369;
-color:#FFF;
-margin:0;
-margin-top:10px;
-padding:2px 5px 2px 8px;
-height:14px;
-width:auto;
-vertical-align:middle;
-}
-h3{
-font-size:120%;
-clear:both;
-margin:2px 0px;
-position:relative;
-display:block;
-}
-h4 {
-font-size:100%;
-clear:both;
-margin:2px 0px;
-position:relative;
-display:block;
-}
-
-/*----------------------Horizontal Rules----------------------------*/
-.hrule-blue {
-height:1px;
-border-top:1px #369 solid;
-margin-top:6px;
-margin-bottom:2px;
-line-height:0px;
-padding:0;
-clear:both;
-}
-hr{
-border:0;
-height:1px;
-margin:10px 0;
-background:#CCC;
-width:100%;
-clear:both;
-}
-
-/*--------------Primay Window Banner--------------------------------*/
-#tBAN{
-padding:0;
-border:0;
-margin:0;
-position:relative;
-background:no-repeat url(../images/swoosh.gif) 100% 0;
-min-width:800px;
-display:table;	/*For vertical centering in standards complaint browsers*/
-height:69px;
-overflow-x:hidden; /*Remove horizonal scroll in IE*/
-}
-#banner-spacer{
-display:block;
-width:650px;
-height:1px;
-position:relative;
-top:-1px;
-}
-#tBAN #logo{
-border:0;
-padding:0;
-margin:0;
-top:10px;
-position:absolute;
-}
-#tBAN #company {
-color:#FFF;
-font-weight:bold;
-font-size:10pt;
-padding-right:10px;
-_position:absolute;  	/*IE Hack for vertical centering*/
-_top:48%;				/*IE Hack for vertical centering*/
-display:table-cell; 	/*For standards complaint browsers*/
-vertical-align:middle;	/*For standards complaint browsers*/
-text-align:right;
-width:99%;
-}
-#tBAN #txt{
-_position:relative;  	/*IE Hack for vertical centering*/
-_top:-48%;				/*IE Hack for vertical centering*/
-width:205px; 
-float:right;
-overflow:hidden;
-}
-#appName{
-position:absolute;
-left:112px;
-top:45px;
-color:#09C;
-font-size:11pt;
-font-weight:bold;
-white-space:nowrap;
-}
-
-/*---------------------Secondary Window Banner----------------------*/
-#tSWB{
-background:#FFF;
-height:69px;
-border-bottom:2px #369 solid;
-}
-#tSWB #appName{
-top:35px;
-}
-
-
-/*--------------------Secondary Windows (General)-------------------*/
-.pHW{
-background:#FFC;
-}
-.pSW{
-background:#FFF;
-}
-.pSW .tPH,.pHW .tPH{
-margin:0;
-}
-/*--------------------mIC: Introductory Copy------------------------*/
-p.mIC{
-padding:0;
-margin:0;
-}
-
-/*-----------------------mQH: Quick Help----------------------------*/
-.qh-link{
-float:right;
-width:12px;
-height:14px;
-background:url(../images/quickhelp_lt.gif) no-repeat 0 50%;
-cursor:pointer;
-position:relative;
-vertical-align:middle;
-}
-.qh-link-field{
-width:12px;
-height:12px;
-background:url(../images/quickhelp_lt.gif) no-repeat 0px 0px;
-cursor:pointer;
-position:relative;
-top:0px;
-}
-.qh-element{
-margin-left:5px;
-vertical-align:middle;
-}
-.icon-quick-help{
-display:inline;
-}
-.mQH {
-clear:both !important;
-display:none;
-background:#9CF !important;
-margin:0 !important;
-border:0 !important;
-height:auto !important;
-padding:4px 8px !important;
-position:relative !important;
-z-index:0;
-}
-.mQH .label{
-font-weight:bold;
-padding-right:5px;
-}
-
-/*----------------------bPF: Footer---------------------------------*/
-#bPF{
-position:relative;
-bottom:0px;
-display:block;
-/*float:none;*/
-height:60px;
-clear:both;
-padding:25px 0 20px 10px;
-line-height:100%;
-color:#333;
-white-space:nowrap;
-}
-#bPF ul{
-position:relative;
-top:0px;
-left:0px;
-margin:0 !important;
-padding:0 !important;
-margin-left:0px !important;
-}
-#bPF li{
-display:inline;
-}
-#bPF .pipe{
-padding-right:5px;
-padding-left:5px;
-}
-
-/*---------------------------LAYOUT---------------------------------*/
-#grid{
-display:block;
-clear:both !important;
-height:50%;
-width:auto;
-position:relative;
-width:95%;
-min-width:800px;
-margin-left:10px;
-z-index:10;
-}
-.grid-secondary{
-margin-top:10px;
-margin-left:10px;
-width:95%;
-position:relative;
-}
-
-/* One column-------------------------------------------------------*/
-.one-col .col1 {
-width:95%;
-}
-.one-col .col2 {
-display:none;
-}
-.one-col .col3 {
-display:none;
-}
-
-/* Two column, wide left:------------------------------------------*/
-.two-col-wl .col1 {
-width:75%;
-float:left;
-}
-.two-col-wl .col2 {
-width:15%;
-float:left;
-margin-left:10px;
-}
-.two-col-wl .col3 {
-display:none;
-}
-
-/* Two column, wide right:------------------------------------------*/
-.two-col-wr .col1 {
-width:15%;
-float:left;
-}
-.two-col-wr .col2 {
-width:75%;
-float:left;
-margin-left:10px;
-}
-.two-col-wr .col3 {
-display:none;
-}
-
-/* Three column-----------------------------------------------------*/
-.three-col .col1 {
-width:15%;
-float:left;
-min-width:140px;
-}
-.three-col .col2 {
-width:60%;
-float:left;
-margin-left:10px;
-}
-.three-col .col3 {
-width:15%;
-float:left;
-margin-left:10px;
-min-width:140px;
-}
-
-
-/*---------------------------Forms----------------------------------*/
-.first-row td{
-padding-top:5px !important;
-}
-.last-row td{
-padding-bottom:5px !important;
-}
-.checkbox{
-height:13px;
-width:13px;
-vertical-align:middle;
-padding:0;
-margin:0;
-margin-right:10px;
-text-align:center !important;
-}
-.col-ast{
-width:10px !important;
-}
-.col-ast div,.col-ast img{
-width:9px;
-height:14px;
-}
-.form-grid td {
-padding:5px 0;
-vertical-align:middle;
-}
-.form-grid label.twoline,
-label.br {
-display:block;
-}
-
-
-.inline{						/*When multiple text input fields */
-margin-right:10px !important;	/*are adjacent, space them out!!*/
-}
-label{
-white-space:nowrap;
-margin-right:15px;
-vertical-align:middle;
-}
-.noborder{
-border:0 !important;
-}
-.rcb-spacer,.rcb-spacer img{
-width:20px;
-}
-p .ast{
-position:relative;
-left:0px;
-padding-right:3px;
-}
-.spacer-left {
-padding:0 !important;
-margin:0 !important;
-width:5px;
-}
-.spacer-left img{
-margin:0;
-padding:0;
-border:0;
-width:5px;
-height:1px;
-}
-label span.br{
-display:block;
-padding-left:5px;
-}
-label.text{
-vertical-align:top !important;
-}
-label.spacer{
-color:white;
-}
-form {
-margin:0;
-padding:0;
-border:0;
-}
-.form-buttons{
-margin:10px 0;
-white-space:nowrap;
-margin-left:0px;
-}
-.top-border{
-border-top:1px #666 solid;
-padding-top:10px;
-margin-top:15px;
-}
-.form-buttons td {
-vertical-align:middle;
-padding:5px 0;
-}
-fieldset{
-border:0;
-border-bottom:1px #000 solid;
-padding:5px;
-}
-fieldset td{
-padding:3px 0;
-}
-fieldset .btm-row td{
-border-top:1px #CCC solid !important;
-}
-fieldset legend{
-color:#000;
-font-weight:bold;
-padding-bottom:5px;
-margin-top:5px;
-margin-left:-6px;
-}
-input.button{
-padding:1px 4px;
-font-size:85%;
-margin:0;
-background:#ccc;
-}
-input.arrow-up{
-background:#CCC url(../images/button_arrow_up.gif) no-repeat 90% 50%;
-padding-right:20px;
-font-size:11px;
-}
-input.arrow-down{
-background:#CCC url(../images/button_arrow_down.gif) no-repeat 90% 50%;
-padding-right:20px;
-font-size:11px;
-}
-input.button-blue{
-padding:1px 4px;
-font-size:85%;
-margin:0;
-color:#FFF;
-background:#369;
-}
-input.button-sm{
-padding:1px;
-font-size:78%;
-margin:0;
-}
-textarea{
-font-size:100%;
-font-family:sans-serif;
-}
-td.spacer{
-height:1px;
-padding:0;
-}
-.disabled {
-color:#CCC !important;
-}
-.abled {
-color:#000 !important;
-}
-input.text, input.password{
-font-size:100%;
-vertical-align:middle;
-}
-input.text:focus,textarea:focus{
-background:#FFC;
-}
-.radio{
-padding:0;
-margin:0;
-border:0;
-height:12px;
-width:12px;
-vertical-align:middle;
-margin-right:8px !important;
-text-align:center !important;
-}
-.rcb {
-line-height:120%;
-}
-select {
-font-size:85%;
-}
-.tip{
-font-size:80%;
-padding-left:5px;
-display:inline;
-position:relative;
-}
-td.tier2 label{
-padding-left:22px !important;
-}
-td.tier2 .checkbox{
-margin-left:-1px;
-}
-.col-radio{
-text-align:center;
-}
-/*---------------------------Help-----------------------------------*/
-.app-help{
-margin-right:auto;
-margin-left:auto;
-}
-.nobullet li{
-list-style:none;
-}
-.plain{
-position:relative;
-top:0px;
-left:0px;
-margin:0 !important;
-padding:0 !important;
-margin-left:1px !important;
-}
-.plain .list-label{
-padding-right:10px;
-}
-.plain li{
-list-style:none;
-}
-.index{
-clear:both;
-padding:0;
-margin:0;
-border:0;
-}
-.index ul{
-padding:0px;
-margin:0px;
-border:0px;
-height:15px;
-}
-.index ul li{
-float:left;
-padding:4px;
-list-style:none;
-}
-.index a{
-text-decoration:none !important;
-}
-.index a:hover{
-text-decoration:underline !important;
-}
-
-/*--------------------------Glossary--------------------------------*/
-.glossary-index{
-height:12px;
-display:block;
-margin:0;
-padding:0;
-border:0;
-padding-top:5px;
-padding-bottom:5px;
-margin-right:auto;
-margin-left:auto;
-text-transform:uppercase;
-}
-.glossary-index li{
-list-style:none;
-display:inline;
-padding-right:2px;
-padding-left:2px;
-font-weight:bold;
-}
-.glossary-index a{
-padding-left:2px;
-padding-right:2px;
-}
-.glossary-index a:hover{
-background:#CCC;
-}
-dl{
-margin:0;
-}
-dt{
-font-weight:bold;
-}
-dd {
-margin-left:20px;
-}
-.marker {
-font-weight:bold;
-color:#369;
-width:100%;
-text-transform:uppercase;
-}
-.section{
-border-bottom:1px #999 solid;
-}
-p.link{
-width:100%;
-text-align:center;
-margin-top:0px;
-padding:0;
-padding-bottom:5px;
-}
-.blocks {
-padding:0;
-margin:0;
-border:0;
-}
-.blocks li{
-list-style:none;
-float:left;
-padding:10px;
-}
-.last{
-border-right:0 !important;
-}
-table {
-clear:both;
-}
-.noline td {
-border-bottom:0 !important;
-}
-.scroll{
-overflow:auto;
-}
-.ital{
-font-style:oblique;
-}
-.em{
-font-weight:bold !important;
-}
-.left{
-float:left;
-}
-.right{
-float:right;
-}
-
-/*--------------------mTIE: Table of Interactive Elements-----------*/
-th{
-font-weight:bold !important;
-}
-th a{
-font-weight:bold !important;
-}
-.mTIE {
-margin:10px 0;
-border:0;
-padding:0;
-border-left:1px #CCC solid;
-border-top:1px #CCC solid;
-width:100%;
-}
-.date, .date-ss, .time {
-text-align:right;
-white-space:nowrap;
-
-}
-.mTIE td{
-margin:0;
-border:0;
-border-bottom:1px #CCC solid;
-border-right:1px #CCC solid;
-padding:4px 6px;
-vertical-align:middle;
-}
-.mTIE .headerRow td {
-text-align:center;
-}
-.mTIE th {
-margin:0;
-border:0;
-border-bottom:1px #CCC solid;
-border-right:1px #CCC solid;
-padding:3px 6px;
-}
-.mTIE a {
-text-decoration:underline;
-}
-.headerRow{
-background:#369 !important;
-color:#FFF;
-font-weight:bold;
-}
-.button-mTIE{ 			/*Check All-Clear All button*/
-padding:1px 4px;
-background:#CCC;
-font-size:85%;
-margin:0;
-width:75px;
-}
-.decimal{
-text-align:right;
-}
-#totalRow {
-background:#FFF !important;
-}
-#totalRow .decTotal {
-text-align:right;
-}
-#totalRow .total{
-text-align:right;
-}
-
-/*------------------------mTAB--------------------------------------*/
-.mTAB {
-margin:0px 0;
-border:0;
-padding:0;
-border-left:1px #CCC solid;
-border-top:1px #CCC solid;
-/*width:100%;*/
-}
-.mTAB .date{
-text-align:right;
-white-space:nowrap;
-}
-.mTAB td{
-margin:0;
-border:0;
-border-bottom:1px #CCC solid;
-border-right:1px #CCC solid;
-padding:4px 6px;
-vertical-align:middle;
-}
-.mTAB .headerRow td {
-text-align:center;
-}
-.mTAB th {
-margin:0;
-border:0;
-border-bottom:1px #CCC solid;
-border-right:1px #CCC solid;
-padding:4px 6px;
-}
-/*.mTAB a {
-text-decoration:underline;
-}*/
-.headerRow{
-background:#369 !important;
-color:#FFF;
-font-weight:bold;
-}
-.button-mTAB{ 			/*Check All-Clear All button*/
-font-size:10px;
-padding:1px 4px;
-height:20px;
-line-height:12px;
-width:75px;
-}
-
-/* LISTS and mTS */
-/*----------------------mIM: Inline Messages------------------------*/
-.mIM{
-background:#9CF;
-margin:5px 0;
-padding:5px;
-background-position:9px 5px !important;
-clear:both;
-display:block;
-}
-.mIM p,.mIM ul,.mIM ol{
-position:relative;
-top:0;
-left:0;
-padding:0;
-margin:0;
-padding-left:48px;
-padding-bottom:5px;
-border:0;
-display:block;
-}
-.mIM ul{
-padding-left:65px;
-width:80%;
-}
-.mIM ol{
-padding-left:70px;
-width:80%;
-}
-* html .mIM { 			/*IE Hack*/
-height:35px;  			/*set the height in IE5.5*/
-voice-family:"\"}\"";
-voice-family:inherit;
-height:30px;			/*set the height in IE6.0*/
-}
-*+.mIM{ 				/*high end browser hack*/
-min-height:30px;
-}
-div.error {
-background:#9CF url(../images/icon_error.gif) no-repeat;
-}
-.error .txt{
-font-size:100%;
-color:#F00;
-font-weight:bold;
-text-align:right;
-padding-right:10px;
-padding-left:44px;
-width:35px;
-}
-.error table{
-position:relative;
-}
-.error table td{
-vertical-align:top;
-}
-.error .list-errors {
-padding:0;
-display:block;
-clear:both;
-left:-1px;
-position:relative;
-}
-.error .list-errors li {
-list-style:none;
-background:url(../images/dash.gif) no-repeat 0 50%;
-padding-left:12px;
-}
-.error p,
-.error ul{
-padding-left:0;
-}
-.error p{
-padding-top:0;
-margin-top:0;
-}
-.info {
-background:#9CF url(../images/icon_info.gif) no-repeat;
-}
-.confirmation {
-background:#9CF url(../images/icon_confirmation.gif) no-repeat;
-}
-.alert {
-background:#9CF url(../images/icon_alert.gif) no-repeat;
-}
-.help {
-background:#9CF url(../images/icon_help.gif) no-repeat;
-}
-
-/*---------------------mRT: Return to Top---------------------------*/
-.mRT {
-margin:10px 0;
-clear:both;
-display:block;
-}
-.mRT a {
-background:url(../images/return_to_top.gif) no-repeat 0 2px;
-padding-left:15px;
-}
-/*---------------------mPW:Please Wait------------------------------*/
-.mPW {
-border-top:1px #666 solid;
-border-bottom:1px #666 solid;
-background:#FFF;
-padding:10px;
-text-align:center;
-height:auto;
-width:auto;
-clear:both;
-display:block;
-margin:10px 0px;
-}
-.icon-wait {
-background:url(../images/please_wait.gif) no-repeat 50% 100%;
-width:100px;
-height:20px;
-margin-left:auto;
-margin-right:auto;
-clear:both;
-display:block;
-}
-
-/*---------------------mDL: Data List-------------------------------*/
-.mDL{
-width:100%;
-margin:10px 0;
-}
-.mDL td{
-padding:4px 0px 4px 10px;
-}
-.mDL th{
-background:#369;
-color:#FFF;
-text-align:left;
-padding:2px 5px;
-}
-.mDL .label{
-text-align:right;
-}
-.mDL .total{  /*are these being duplicated?*/
-text-align:right;
-font-weight:bold;
-padding-right:10px;
-}
-.mDL .decimal{
-text-align:right;
-padding-right:10px;
-}
-
-/*------------------mDDL: Double Data List--------------------------*/
-.mDDL .plain{
-margin-bottom:10px !important;
-}
-.mDDL{
-width:100%;
-margin:10px 0;
-}
-.mDDL td{
-padding:4px 0px 4px 10px;
-}
-.mDDL th{
-background:#369;
-color:#FFF;
-text-align:left;
-padding:2px 5px;
-}
-.mDDL .label{
-text-align:right;
-}
-.mDDL .total{
-text-align:right;
-font-weight:bold;
-padding-right:10px;
-}
-.mDDL .decimal{
-text-align:right;
-padding-right:10px;
-}
-
-/*------------------------mCA: Contact-------------------------*/
-.mCA{
-position:relative;
-width:50%;
-height:auto;
-margin:10px 0;
-}
-.mCA .number {
-position:relative;
-}
-.mCA .mail{
-font-weight:bold;
-position:relative;
-background:inherit;
-}
-.mCA address{
-margin-left:150px;
-font-weight:normal;
-font-style:normal;
-}
-
-
-/*----------mDSR:Data Summary/Review Verification-------------------*/
-.mDSR {
-border-bottom:1px #000 solid;
-width:100%;
-margin:10px 0;
-}
-.mDSR th {
-text-align:left;
-padding:4px 6px;
-}
-.mDSR td {
-text-align:left;
-padding:4px 4px;
-vertical-align:top;
-}
-th a{
-font-weight:normal;
-margin-left:5px;
-}
-
-/*---------------------mLL: Link Listing----------------------------*/
-.mLL {
-margin:10px 0;
-width:100%;
-display:block;
-height:auto;
-position:relative;
-clear:both;
-float:none;
-}
-.mLL ul{
-margin:0;
-padding:10px 0px;
-width:45%;
-position:relative;
-}
-.mLL ul li{
-list-style:none;
-border:0;
-margin:0;
-padding-bottom:2px;
-}
-
-
-/*-----------------mPN: Pagination/Navigation-----------------------*/
-.mPN{
-position:relative;
-display:block;
-clear:both;
-height:45px;
-margin:10px 0;
-white-space:nowrap;
-}
-.mPN p,
-.mPN label {
-line-height:160% !important;
-padding:0;
-margin:0;
-border:0;
-vertical-align:top;
-}
-.mPN .current{
-font-weight:bold;
-}
-.mPN a{
-font-weight:bold;
-}
-.mPN .left,.mPN .right{
-float:left;
-vertical-align:top;
-height:100%;
-color:#999;
-font-weight:bold;
-}
-.mPN .left{
-padding-right:40px;
-}
-.mPN .right{
-padding-left:45px;
-}
-.mPN .middle{
-float:left;
-text-align:left;
-height:100%;
-padding-top:0px;
-}
-.mPN input.text{
-vertical-align:top;
-}
-
-/*-----------------mSN: Simple Navigation---------------------------*/
-.mSN{
-padding:5px 0 !important;
-margin:0;
-border:0;
-width:90%;
-}
-.mSN *{  /*IE Hack to fix jumping*/
-position:relative;
-top:0;
-left:0;
-}
-.mSN ul{
-clear:both;
-width:80%;
-margin:0 !important;
-left:15px;
-}
-.mSN li {
-list-style:none;
-padding-bottom:3px;
-}
-
-/*----------------------mTC: Task Confirmation----------------------*/
-.mTC{
-border:1px #9CF solid;
-border-top:0;
-margin:10px 0;
-min-width:300px;
-}
-.mTC ul{
-margin-left:65px;
-}
-.mTC p{
-margin-left:60px;
-}
-.mTC table{
-padding:0;
-margin:0;
-border:0;
-margin-left:58px;
-}
-.mTC h2{
-position:relative;
-top:0;
-left:0;
-width:auto;
-background:#9CF url(../images/banner-confirmation.gif) repeat-x 0 0;
-padding:12px 10px 12px 60px;
-font-size:100%;
-font-weight:normal;
-margin-bottom:10px;
-}
-
-/*--------------------mHL: Helpful Links (new)----------------------*/
-.mHL{
-border-top:1px #333 solid;
-border-bottom:1px #333 solid;
-padding:10px 0;
-margin-bottom:10px;
-}
-.mHL h3{
-font-size:100%;
-}
-.mHL ul{
-margin-left:65px;
-}
-
-/*--------------------mTI: Task Instructions------------------------*/
-.mTI{
-display:block;
-clear:both;
-margin:10px 0;
-}
-.mTI ul{
-position:relative;
-display:block;
-left:.1em;
-padding:0;
-border:0;
-}
-/*---------------bSWN: Secondary Window Navigation------------------*/
-.bSWN{
-padding:10px 0;
-border-top:1px #369 solid;
-}
-
-/*----------------mSD: Status Dashboard-----------------------------*/
-.mSD{
-border:1px #369 solid;
-margin:10px 0;
-width:100%;
-}
-.mSD th{
-background:#369;
-color:#FFF;
-text-align:left;
-padding:2px 5px;
-}
-
-/*----------------mSDL: Summary Data Listing-----------------------*/
-.mSDL{
-border:1px #369 solid;
-margin:10px 0;
-min-width:250px;
-width:100%;
-}
-.mSDL td{
-border:0;
-margin:0;
-padding:2px 0 2px 8px;
-vertical-align:middle;
-}
-.mSDL th{
-background:#369;
-color:#FFF;
-text-align:left;
-padding:2px 5px;
-}
-.mSDL .value{
-text-align:right;
-}
-
-/*----------------------mDEE: Data Entry/Edit ----------------------*/
-.mDEE{
-margin:10px 0;
-width:100%;
-}
-table.mDEE{
-border:1px #369 solid;
-}
-.mDEE td{
-border:0;
-margin:0;
-padding:5px 0;
-vertical-align:middle;
-}
-.mDEE th{
-background:#369;
-color:#FFF;
-text-align:left;
-padding:2px 5px;
-}
-.nopad{
-padding:0 !important;
-border:0;
-margin:0;
-width:100%;
-}
-.desc {
-text-align:right; 
-}
-
-/*---------------------Supporting Text------------------------------*/
-.mST{
-margin:10px 0;
-display:block;
-clear:both;
-}
-
-/*------------------------tPH: Page header--------------------------*/
-.tPH {
-margin:10px 100px 1px 10px;
-display:block;
-clear:both;
-}
-
-/*----------------Topic index found in pHW2.html--------------------*/
-.topic-index{
-padding:0;
-margin:5px 0;
-width:100%;
-height:14px;
-display:block;
-clear:both;
-position:relative;
-top:0;
-left:0;
-}
-.topic-index li{
-list-style:none;
-float:left;
-margin-right:25px;
-padding:0;
-border:0;
-}
-.topic-index li a{
-padding-left:10px;
-background:url(../images/arrow_down_alt.gif) no-repeat 0 50%;
-}
-.alt li a{
-padding-left:10px;
-background:url(../images/arrow_down_alt2.gif) no-repeat 0 50%;
-}
-
-/*------------------Freezing header mods for NS7------------------- */
-div[class="class_float"] table {
-padding:0;
-margin:0;
-border:1px #CCC solid !important;
-background:#369;
-width:100%;
-}
-div[class="class_float"] th {
-margin:0;
-border-right:0;
-border-bottom:0;
-vertical-align:middle;
-}
-.headerRow nobr{
-border-left:2px #369 solid;
-}
-
-/*------------------mSD:Status Dashboard----------------------------*/
-.data-mSD{
-width:90%;
-margin:0 10px;
-}
-.data-mSD td{
-padding:2px 0 !important;
-margin:0 !important;
-border:0 !important;
-}
-.data-mSD .value{
-text-align:right !important;
-}
-.wrap {
-white-space:normal;
-}
-.input-error{
-color:#F00;
-font-weight:bold;
-}
-
-
-/*-------------------mCC: Convenence Choices------------------------*/
-.mCC{
-margin:10px 0;
-width:100%;
-}
-table.mCC{
-border:1px #369 solid;
-}
-.mCC td{
-border:0;
-margin:0;
-padding:5px 0;
-vertical-align:middle;
-}
-.mCC th{
-background:#369;
-color:#FFF;
-text-align:left;
-padding:2px 5px;
-}
-
-/*-----------------------Layout sample pages------------------------*/
-.layout-template .col1, 
-.layout-template .col2, 
-.layout-template .col3{
-background:#efefef;
-height:350px;
-border:1px #CCC dotted;
-text-align:center;
-}
-.layout-template #grid{
-padding-top:10px;
-}
-.center{
-text-align:center;
-}
-
-/*----------------------Row Exchange Module-------------------------*/
-div.mREX{
-border:1px #999 solid;
-padding:5px 10px;
-margin-bottom:20px;
-background:#efefef;
-}
-h1.mREX{
-background:#999;
-color:#FFF;
-padding:5px 10px;
-margin:0;
-font-size:100%;
-margin-top:20px;
-}
-
-/*---------------508 Complaint Skip Navigation Link-----------------*/
-#skip{
-display:inline;
-color:#FFF !important;
-text-decoration:none;
-font-size:1px;
-position:absolute;
-top:0;
-left:0;
-z-index:10;
-}
-.cal-label{
-font-size:90%;
-color:#999;
-position: relative;
-top:4px;
-}
-caption{
-font-weight:bold;
-color:#369;
-}
-#grid a:visited{
-text-decoration:none;
-border-bottom:1px dotted;
-}
-.clear{
-display:block !imporatn;
-clear:both;
-}
-
-/*---------------------mTS: Task Steps------------------------------*/
-.mTS {
-border:1px #9CF solid;
-width:140px;
-background:#FFF;
-margin:10px 0;
-}
-.mTS h2 {
-text-transform:uppercase;
-text-align:center;
-color:#369;
-padding:0px 4px;
-margin:0;
-border:0;
-font-size:100%;
-border-bottom:1px #9CF solid;
-}
-.mTS ul {
-margin:0;
-border:0;
-padding:5px 0;
-width:90%;
-}
-.mTS ul li {
-list-style:none;
-padding-bottom:8px;
-padding-left:20px;
-padding-right:5px;
-}
-.mTS li.current {
-font-weight:bold;
-background:url(../images/task_arrow_on.gif) no-repeat;
-}
-.mTS li.complete {
-background:url(../images/check.gif) no-repeat;
-}
\ No newline at end of file
diff --git a/vid/src/main/webapp/static/fusion/raptor/css/raptor.css b/vid/src/main/webapp/static/fusion/raptor/css/raptor.css
deleted file mode 100644
index ea37015a9..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/css/raptor.css
+++ /dev/null
@@ -1,62 +0,0 @@
-		.rowalt1          {background-color: rgb(255, 255, 255);}
-		.rowalt2          {background-color: rgb(255, 255, 204);}
-		.rowalt3          {background-color: rgb(255, 0, 0);}
-.rbg1             { background-color:#336699; } /* header background (gray) */
-		.rbg1d            { background:#747474; } /* tab dark background (gray) */
-		.rbg2             { background:#FFFFFF;/*background:#D6DCE4;*/ } /* darker background */
-		.rbg3             { background:#FFFFFF;/*background:#EDEDED;*/ } /* light background */
-		.rbg4             { background:#88CAFB; } /* second header - dark */
-		.rbg6             { background:#ffbbbb; } /* light error background */
-		.rbg7             { background:#ff9999; } /* dark error background - header */
-		.rcolheader       { font-family:Arial,Helvetica,sans-serif;font-size:11px;color:#FFFFFF;font-weight:700;text-decoration:none }
-		.rcolheader:hover { font-family:Arial,Helvetica,sans-serif;font-size:11px;color:#FFFFFF;font-weight:700;text-decoration:underline }
-		.rtableheader     { font-family:Arial,Helvetica,sans-serif;font-size:11px;color:#FFFFFF;font-weight:700; }
-		.rtabletext       { font-family:Arial,Helvetica,sans-serif;font-size:11px;color:#000000; }
-                .rtabletextwhite  { font-family:Arial;font-size:11px;color:#FFFFFF; }
-		.rtext            { font-family:Arial,Helvetica,sans-serif;font-size:13px;color:#000000; }
-                .rtext2           { font-family:Arial,Helvetica,sans-serif;font-size:13px;color:#ffffff; }
-		.rerrortext       { font-family:Arial,Helvetica,sans-serif;font-size:16px;color:#000000; }
-		.rerrortextsm     { font-family:Arial,Helvetica,sans-serif;font-size:11px;color:#000000; }
-		.rprismsbutton    { margin:3px 3px 3px 0px; padding:1px 5px 1px 5px; font-family: Arial; font-weight: 700; font-size: 11px; color: #ffffff; background-color: #336699 }
-		.rsmallbutton     { margin:3px 3px 3px 0px; padding:1px 5px 1px 5px; font-family: Arial; font-weight: 700; font-size: 11px; color: #336699; background-color: #EDEDED }
-		.rrequired        { background-image:url(raptor/images/required.gif); background-position:top right; background-repeat:no-repeat;}
-		.rtabselected     { font-family:Arial,Helvetica,sans-serif;font-size:11px;color:#FFFFFF;font-weight:700; }
-		.rtabtext         { font-family:Arial,Helvetica,sans-serif;font-size:11px;color:#CCCCCC;font-weight:700; }
-                .buttonLabelField { margin:3px 3px 3px 0px; }
-
-                 /* Added to better customize the UI with FUSION */
-		.rbg8             { border: 1px outset #8DA9D1; background: #EDEDED; color: #000000; } /* alternate table row background */
-                .tableBorder      { border:1px outset teal }
-		.unpaddedButton   { margin:3px 3px 3px 0px; font-family: Arial; font-weight: 700; font-size: 11px; color: #ffffff; background-color: #336699 }
-		.normalText       { font-family: Arial; font-size: 11px; color: #000000; }
-		.popText          { font-size:11px;font-family:Arial,Helvetica,sans-serif;color:#000000;padding:1px;font-weight:700;text-decoration:none; }		
-		.hyperref1        { font-family:Arial,Helvetica,sans-serif;font-size:11px;color:#000000;text-decoration: none}
-         A:link {text-decoration: none}
-         A:visited {text-decoration: none}
-         A:active {text-decoration: none}
-         A:hover {text-decoration: none; color: blue;}
-         .tdborder        {margin:0;border:0;border-bottom:1px #CCC solid;border-right:1px #CCC solid;padding:4px 6px;vertical-align:middle;}
-
-div.scrollableTable {
-	clear: both;
-	border: 1px solid #963;	
-        height:100%; 
-	overflow: auto;
-}
-div.scrollableTable table {float:left;width:100%}
-
-thead.scrollableTableHeader tr {
-	position: relative;
-	top: expression(this.offsetParent.scrollTop);
-	background:white;
-}
-
-thead.scrollableTableHeader tr th {position: relative;background: #336699;}
-/*thead.scrollableTableHeader tr td {position: relative;top: expression(this.offsetParent.scrollTop);background: #8a9bb3;}*/
-thead.scrollableTableHeader tr td {position: relative;top: expression(this.offsetParent.scrollTop);background: #336699;}
-tbody[class].scrollableTableContent {
-	display: block;
-	overflow: auto;
-}
-		.trhideunhidecolor {background: #ffffff;}
-
diff --git a/vid/src/main/webapp/static/fusion/raptor/css/tree/context-menu.css b/vid/src/main/webapp/static/fusion/raptor/css/tree/context-menu.css
deleted file mode 100644
index 160c2a11a..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/css/tree/context-menu.css
+++ /dev/null
@@ -1,57 +0,0 @@
-/************************************************************************************************************
-
-	DHTML Suite for Applications
-	(C) www.dhtmlgoodies.com, August 2006
-
-	CSS for the context menu class.
-	
-	Terms of use:
-	Look at the terms of use at http://www.dhtmlgoodies.com/index.html?page=termsOfUse
-	
-	Thank you!
-	
-	www.dhtmlgoodies.com
-	Alf Magne Kalleland
-
-************************************************************************************************************/
-
-.DHTMLSuite_contextMenu{	/* The bar that is parent of the menu strip */
-	position:absolute;
-	background-color:#FFF;
-	border:1px solid #000;
-	padding:1px;
-}
-
-.DHTMLSuite_contextMenu li{
-	list-style-type:none;
-	padding:1px;	/* Equal to border + padding of .DHTMLSuite_item_mouseover */
-	border:0px;
-	cursor: pointer;
-	background-repeat:no-repeat;
-	background-position:left center;
-}
-.DHTMLSuite_contextMenu .DHTMLSuite_item_mouseover{
-	border:1px solid #000;
-	background-color:#EEE;
-	padding:0px;	/* Padding + border of this element should be equal to padding of li element (see above ) */
-}
-.DHTMLSuite_contextMenu ul{
-	margin:0px;
-	padding:0px;
-}
-
-.DHTMLSuite_contextMenu a{
-	text-decoration:none;
-	color:#000;
-	padding-left:25px;
-}
-
-.DHTMLSuite_contextMenu div.DHTMLSuite_contextMenu_separator{	/* Css for the separator line */
-	height:1px;
-	line-height:1px;
-	padding:0px;
-	background-color: #AAA;
-	overflow:hidden;
-	margin-top:1px;
-	margin-bottom:1px;
-}
diff --git a/vid/src/main/webapp/static/fusion/raptor/css/tree/drag-drop-folder-tree.css b/vid/src/main/webapp/static/fusion/raptor/css/tree/drag-drop-folder-tree.css
deleted file mode 100644
index 67afc8944..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/css/tree/drag-drop-folder-tree.css
+++ /dev/null
@@ -1,64 +0,0 @@
-	ul,ol{
-		top:0;
-		left:0px;
-		margin:0px 0px;
-		position:static;
-		border:0;
-		padding:0;
-	}
-	
-	p{
-		font-family:arial;
-		
-	}
-	a{
-		color:#000;
-		font-family:arial;
-	}
-	
-	.dhtmlgoodies_tree,#floatingContainer{
-		margin:0px;
-		padding:0px;
-	}
-	.dhtmlgoodies_tree ul{	/* Sub menu groups */
-		margin-left:20px;	/* Left spacing */
-		padding-left:0px;
-		display:none;	/* Initially hide sub nodes */
-	}
-	
-	#floatingContainer ul{
-		margin-left:20px;	/* Left spacing */
-		padding-left:0px;	
-	}
-	.dhtmlgoodies_tree li,#floatingContainer li{	/* Nodes */
-		list-style-type:none;
-		vertical-align:middle;
-		
-	}
-	.dhtmlgoodies_tree li a,#floatingContainer li a{	/* Node links */
-		color:#000;
-		text-decoration:none;
-		font-family:arial;
-		font-size:0.8em;
-		padding-left:1px;
-		line-height:13px;
-		margin-left:2px;
-		
-	}
-	.dhtmlgoodies_tree li a.highlightedNodeItem{
-		color:#FFF;
-		background-color:#009;
-	}
-	
-		
-	body{
-		margin:0px;
-		padding:0px;
-	}
-	
-	.dhtmlgoodies_tree input.folderTreeTextBox{	/* Css for the text input - rename item */
-		font-size:10px;
-		margin:0px;
-		padding:0px;
-		height:12px;
-	}
\ No newline at end of file
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/dashed-canvas.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/dashed-canvas.js
deleted file mode 100644
index cec77298a..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/dashed-canvas.js
+++ /dev/null
@@ -1,176 +0,0 @@
-/**
- * @license
- * Copyright 2012 Dan Vanderkam (danvdk@gmail.com)
- * MIT-licensed (http://opensource.org/licenses/MIT)
- */
-
-/**
- * @fileoverview Adds support for dashed lines to the HTML5 canvas.
- *
- * Usage:
- *   var ctx = canvas.getContext("2d");
- *   ctx.installPattern([10, 5])  // draw 10 pixels, skip 5 pixels, repeat.
- *   ctx.beginPath();
- *   ctx.moveTo(100, 100);  // start the first line segment.
- *   ctx.lineTo(150, 200);
- *   ctx.lineTo(200, 100);
- *   ctx.moveTo(300, 150);  // start a second, unconnected line
- *   ctx.lineTo(400, 250);
- *   ...
- *   ctx.stroke();          // draw the dashed line.
- *   ctx.uninstallPattern();
- *
- * This is designed to leave the canvas untouched when it's not used.
- * If you never install a pattern, or call uninstallPattern(), then the canvas
- * will be exactly as it would have if you'd never used this library. The only
- * difference from the standard canvas will be the "installPattern" method of
- * the drawing context.
- */
-
-/**
- * Change the stroking style of the canvas drawing context from a solid line to
- * a pattern (e.g. dashes, dash-dot-dash, etc.)
- *
- * Once you've installed the pattern, you can draw with it by using the
- * beginPath(), moveTo(), lineTo() and stroke() method calls. Note that some
- * more advanced methods (e.g. quadraticCurveTo() and bezierCurveTo()) are not
- * supported. See file overview for a working example.
- *
- * Side effects of calling this method include adding an "isPatternInstalled"
- * property and "uninstallPattern" method to this particular canvas context.
- * You must call uninstallPattern() before calling installPattern() again.
- *
- * @param {Array.} pattern A description of the stroke pattern. Even
- * indices indicate a draw and odd indices indicate a gap (in pixels). The
- * array should have a even length as any odd lengthed array could be expressed
- * as a smaller even length array.
- */
-CanvasRenderingContext2D.prototype.installPattern = function(pattern) {
-  "use strict";
-
-  if (typeof(this.isPatternInstalled) !== 'undefined') {
-    throw "Must un-install old line pattern before installing a new one.";
-  }
-  this.isPatternInstalled = true;
-
-  var dashedLineToHistory = [0, 0];
-
-  // list of connected line segements:
-  // [ [x1, y1], ..., [xn, yn] ], [ [x1, y1], ..., [xn, yn] ]
-  var segments = [];
-
-  // Stash away copies of the unmodified line-drawing functions.
-  var realBeginPath = this.beginPath;
-  var realLineTo = this.lineTo;
-  var realMoveTo = this.moveTo;
-  var realStroke = this.stroke;
-
-  /** @type {function()|undefined} */
-  this.uninstallPattern = function() {
-    this.beginPath = realBeginPath;
-    this.lineTo = realLineTo;
-    this.moveTo = realMoveTo;
-    this.stroke = realStroke;
-    this.uninstallPattern = undefined;
-    this.isPatternInstalled = undefined;
-  };
-
-  // Keep our own copies of the line segments as they're drawn.
-  this.beginPath = function() {
-    segments = [];
-    realBeginPath.call(this);
-  };
-  this.moveTo = function(x, y) {
-    segments.push([[x, y]]);
-    realMoveTo.call(this, x, y);
-  };
-  this.lineTo = function(x, y) {
-    var last = segments[segments.length - 1];
-    last.push([x, y]);
-  };
-
-  this.stroke = function() {
-    if (segments.length === 0) {
-      // Maybe the user is drawing something other than a line.
-      // TODO(danvk): test this case.
-      realStroke.call(this);
-      return;
-    }
-
-    for (var i = 0; i < segments.length; i++) {
-      var seg = segments[i];
-      var x1 = seg[0][0], y1 = seg[0][1];
-      for (var j = 1; j < seg.length; j++) {
-        // Draw a dashed line from (x1, y1) - (x2, y2)
-        var x2 = seg[j][0], y2 = seg[j][1];
-        this.save();
-
-        // Calculate transformation parameters
-        var dx = (x2-x1);
-        var dy = (y2-y1);
-        var len = Math.sqrt(dx*dx + dy*dy);
-        var rot = Math.atan2(dy, dx);
-
-        // Set transformation
-        this.translate(x1, y1);
-        realMoveTo.call(this, 0, 0);
-        this.rotate(rot);
-
-        // Set last pattern index we used for this pattern.
-        var patternIndex = dashedLineToHistory[0];
-        var x = 0;
-        while (len > x) {
-          // Get the length of the pattern segment we are dealing with.
-          var segment = pattern[patternIndex];
-          // If our last draw didn't complete the pattern segment all the way
-          // we will try to finish it. Otherwise we will try to do the whole
-          // segment.
-          if (dashedLineToHistory[1]) {
-            x += dashedLineToHistory[1];
-          } else {
-            x += segment;
-          }
-
-          if (x > len) {
-            // We were unable to complete this pattern index all the way, keep
-            // where we are the history so our next draw continues where we
-            // left off in the pattern.
-            dashedLineToHistory = [patternIndex, x-len];
-            x = len;
-          } else {
-            // We completed this patternIndex, we put in the history that we
-            // are on the beginning of the next segment.
-            dashedLineToHistory = [(patternIndex+1)%pattern.length, 0];
-          }
-
-          // We do a line on a even pattern index and just move on a odd
-          // pattern index.  The move is the empty space in the dash.
-          if (patternIndex % 2 === 0) {
-            realLineTo.call(this, x, 0);
-          } else {
-            realMoveTo.call(this, x, 0);
-          }
-
-          // If we are not done, next loop process the next pattern segment, or
-          // the first segment again if we are at the end of the pattern.
-          patternIndex = (patternIndex+1) % pattern.length;
-        }
-
-        this.restore();
-        x1 = x2, y1 = y2;
-      }
-    }
-    realStroke.call(this);
-    segments = [];
-  };
-};
-
-/**
- * Removes the previously-installed pattern.
- * You must call installPattern() before calling this. You can install at most
- * one pattern at a time--there is no pattern stack.
- */
-CanvasRenderingContext2D.prototype.uninstallPattern = function() {
-  // This will be replaced by a non-error version when a pattern is installed.
-  throw "Must install a line pattern before uninstalling it.";
-}
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/data.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/data.js
deleted file mode 100644
index d92a63399..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/data.js
+++ /dev/null
@@ -1,63 +0,0 @@
-function StubbedData() {
-return "" +
-"Date,A,B\n" +
-"20061001,3.01953818828,0.7212041046,2.18487394958,0.599318549691\n" +
-"20061002,3.63321799308,0.778297234566,1.69491525424,0.531417655826\n" +
-"20061003,2.44328097731,0.644967734352,2.51256281407,0.640539070386\n" +
-"20061004,3.52733686067,0.774700921683,2.68456375839,0.66207105053\n" +
-"20061005,3.28719723183,0.741636245748,2.35294117647,0.621407707226\n" +
-"20061006,1.58450704225,0.523967868159,3.78657487091,0.791868460623\n" +
-"20061007,5.32859680284,0.946589405904,4.0404040404,0.807910739509\n" +
-"20061008,2.64084507042,0.672799548916,2.37288135593,0.626609885481\n" +
-"20061009,2.26480836237,0.620990945917,3.5413153457,0.75897176848\n" +
-"20061010,3.29289428076,0.74289969528,2.02702702703,0.579191340004\n" +
-"20061011,2.7633851468,0.681234043829,1.1744966443,0.4413034044\n" +
-"20061012,3.28719723183,0.741636245748,3.37268128162,0.741327769578\n" +
-"20061013,1.77304964539,0.55569466381,1.85810810811,0.555011329732\n" +
-"20061014,3.39892665474,0.7664008338,1.67224080268,0.524368852929\n" +
-"20061015,2.65017667845,0.675144574777,3.35570469799,0.737661045752\n" +
-"20061016,3.63951473137,0.779620631266,2.34899328859,0.620377617453\n" +
-"20061017,2.25694444444,0.618859623032,1.68067226891,0.526990133716\n" +
-"20061018,4.47504302926,0.857766274964,2.51677852349,0.641599927369\n" +
-"20061019,2.44755244755,0.646081155692,1.68067226891,0.526990133716\n" +
-"20061020,3.67775831874,0.787656442774,3.066439523,0.711598843969\n" +
-"20061021,3.94265232975,0.823839169829,3.85906040268,0.788990618726\n" +
-"20061022,2.59067357513,0.660187558973,3.71621621622,0.777438794254\n" +
-"20061023,4.33275563258,0.847570482324,3.85906040268,0.788990618726\n" +
-"20061024,3.10344827586,0.720049610821,2.84280936455,0.679611549697\n" +
-"20061025,1.40350877193,0.492720767725,2.7027027027,0.666482380968\n" +
-"20061026,1.95035460993,0.582291234145,2.36486486486,0.624518599275\n" +
-"20061027,2.30905861456,0.632980642182,2.03045685279,0.580161203819\n" +
-"20061028,4.09252669039,0.835706590809,2.87648054146,0.68754192469\n" +
-"20061029,2.66903914591,0.679883997626,2.02360876897,0.578224712918\n" +
-"20061030,4.74516695958,0.89127787497,4.36241610738,0.836670992529\n" +
-"20061031,2.78260869565,0.685905251933,3.20945945946,0.724388507178\n" +
-"20061101,1.5873015873,0.524884521441,1.51260504202,0.500373860545\n" +
-"20061102,2.78745644599,0.687083077461,2.0202020202,0.57726130639\n" +
-"20061103,5.11463844797,0.925157232782,2.68907563025,0.663168401088\n" +
-"20061104,4.9001814882,0.919644816432,3.07692307692,0.713993047527\n" +
-"20061105,5.13274336283,0.928343545136,3.55329949239,0.761492892041\n" +
-"20061106,1.92644483363,0.575222935029,2.35294117647,0.621407707226\n" +
-"20061107,2.46478873239,0.650573541306,1.52027027027,0.502889967904\n" +
-"20061108,2.13523131673,0.609772022763,2.6981450253,0.665374048085\n" +
-"20061109,3.88007054674,0.811026422222,2.72572402044,0.672079879106\n" +
-"20061110,2.63620386643,0.671633132526,3.71621621622,0.777438794254\n" +
-"20061111,3.69718309859,0.791736755355,3.0303030303,0.703344064467\n" +
-"20061112,3.83944153578,0.802703592906,4.05405405405,0.81058250986\n" +
-"20061113,2.47787610619,0.653984033555,2.20338983051,0.604340313133\n" +
-"20061114,1.77304964539,0.55569466381,2.22222222222,0.60944692682\n" +
-"20061115,2.30088495575,0.630766388737,0.843170320405,0.375484163785\n" +
-"20061116,1.57894736842,0.522144132232,2.19594594595,0.602321544724\n" +
-"20061118,2.45183887916,0.647198426991,1.69491525424,0.531417655826\n" +
-"20061119,3.52733686067,0.774700921683,1.85185185185,0.55316023504\n" +
-"20061120,2.97723292469,0.711254751484,2.6981450253,0.665374048085\n" +
-"20061121,2.29681978799,0.629665059963,2.01680672269,0.576301104352\n" +
-"20061122,3.01418439716,0.719945245328,2.5466893039,0.649125445325\n" +
-"20061123,3.78378378378,0.809917534069,2.6936026936,0.664269394219\n" +
-"20061124,3.18584070796,0.738851643987,2.01005025126,0.57439025002\n" +
-"20061125,2.83185840708,0.697868332879,3.066439523,0.711598843969\n" +
-"20061126,3.01953818828,0.7212041046,2.53378378378,0.645878720149\n" +
-"20061127,2.81195079086,0.693033387099,1.51006711409,0.499540743312\n" +
-"20061128,2.97723292469,0.711254751484,2.54237288136,0.648039583782\n" +
-"20061129,1.41093474427,0.495309102312,3.02013422819,0.701020603129";
-}
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-canvas.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-canvas.js
deleted file mode 100644
index cba4f4493..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-canvas.js
+++ /dev/null
@@ -1,816 +0,0 @@
-/**
- * @license
- * Copyright 2006 Dan Vanderkam (danvdk@gmail.com)
- * MIT-licensed (http://opensource.org/licenses/MIT)
- */
-
-/**
- * @fileoverview Based on PlotKit.CanvasRenderer, but modified to meet the
- * needs of dygraphs.
- *
- * In particular, support for:
- * - grid overlays
- * - error bars
- * - dygraphs attribute system
- */
-
-/**
- * The DygraphCanvasRenderer class does the actual rendering of the chart onto
- * a canvas. It's based on PlotKit.CanvasRenderer.
- * @param {Object} element The canvas to attach to
- * @param {Object} elementContext The 2d context of the canvas (injected so it
- * can be mocked for testing.)
- * @param {Layout} layout The DygraphLayout object for this graph.
- * @constructor
- */
-
-/*jshint globalstrict: true */
-/*global Dygraph:false,RGBColorParser:false */
-"use strict";
-
-
-/**
- * @constructor
- *
- * This gets called when there are "new points" to chart. This is generally the
- * case when the underlying data being charted has changed. It is _not_ called
- * in the common case that the user has zoomed or is panning the view.
- *
- * The chart canvas has already been created by the Dygraph object. The
- * renderer simply gets a drawing context.
- *
- * @param {Dygraph} dygraph The chart to which this renderer belongs.
- * @param {HTMLCanvasElement} element The <canvas> DOM element on which to draw.
- * @param {CanvasRenderingContext2D} elementContext The drawing context.
- * @param {DygraphLayout} layout The chart's DygraphLayout object.
- *
- * TODO(danvk): remove the elementContext property.
- */
-var DygraphCanvasRenderer = function(dygraph, element, elementContext, layout) {
-  this.dygraph_ = dygraph;
-
-  this.layout = layout;
-  this.element = element;
-  this.elementContext = elementContext;
-  this.container = this.element.parentNode;
-
-  this.height = this.element.height;
-  this.width = this.element.width;
-
-  // --- check whether everything is ok before we return
-  // NOTE(konigsberg): isIE is never defined in this object. Bug of some sort.
-  if (!this.isIE && !(DygraphCanvasRenderer.isSupported(this.element)))
-      throw "Canvas is not supported.";
-
-  // internal state
-  this.area = layout.getPlotArea();
-  this.container.style.position = "relative";
-  this.container.style.width = this.width + "px";
-
-  // Set up a clipping area for the canvas (and the interaction canvas).
-  // This ensures that we don't overdraw.
-  if (this.dygraph_.isUsingExcanvas_) {
-    this._createIEClipArea();
-  } else {
-    // on Android 3 and 4, setting a clipping area on a canvas prevents it from
-    // displaying anything.
-    if (!Dygraph.isAndroid()) {
-      var ctx = this.dygraph_.canvas_ctx_;
-      ctx.beginPath();
-      ctx.rect(this.area.x, this.area.y, this.area.w, this.area.h);
-      ctx.clip();
-
-      ctx = this.dygraph_.hidden_ctx_;
-      ctx.beginPath();
-      ctx.rect(this.area.x, this.area.y, this.area.w, this.area.h);
-      ctx.clip();
-    }
-  }
-};
-
-/**
- * This just forwards to dygraph.attr_.
- * TODO(danvk): remove this?
- * @private
- */
-DygraphCanvasRenderer.prototype.attr_ = function(name, opt_seriesName) {
-  return this.dygraph_.attr_(name, opt_seriesName);
-};
-
-/**
- * Clears out all chart content and DOM elements.
- * This is called immediately before render() on every frame, including
- * during zooms and pans.
- * @private
- */
-DygraphCanvasRenderer.prototype.clear = function() {
-  var context;
-  if (this.isIE) {
-    // VML takes a while to start up, so we just poll every this.IEDelay
-    try {
-      if (this.clearDelay) {
-        this.clearDelay.cancel();
-        this.clearDelay = null;
-      }
-      context = this.elementContext;
-    }
-    catch (e) {
-      // TODO(danvk): this is broken, since MochiKit.Async is gone.
-      // this.clearDelay = MochiKit.Async.wait(this.IEDelay);
-      // this.clearDelay.addCallback(bind(this.clear, this));
-      return;
-    }
-  }
-
-  context = this.elementContext;
-  context.clearRect(0, 0, this.width, this.height);
-};
-
-/**
- * Checks whether the browser supports the <canvas> tag.
- * @private
- */
-DygraphCanvasRenderer.isSupported = function(canvasName) {
-  var canvas = null;
-  try {
-    if (typeof(canvasName) == 'undefined' || canvasName === null) {
-      canvas = document.createElement("canvas");
-    } else {
-      canvas = canvasName;
-    }
-    canvas.getContext("2d");
-  }
-  catch (e) {
-    var ie = navigator.appVersion.match(/MSIE (\d\.\d)/);
-    var opera = (navigator.userAgent.toLowerCase().indexOf("opera") != -1);
-    if ((!ie) || (ie[1] < 6) || (opera))
-      return false;
-    return true;
-  }
-  return true;
-};
-
-/**
- * This method is responsible for drawing everything on the chart, including
- * lines, error bars, fills and axes.
- * It is called immediately after clear() on every frame, including during pans
- * and zooms.
- * @private
- */
-DygraphCanvasRenderer.prototype.render = function() {
-  // attaches point.canvas{x,y}
-  this._updatePoints();
-
-  // actually draws the chart.
-  this._renderLineChart();
-};
-
-DygraphCanvasRenderer.prototype._createIEClipArea = function() {
-  var className = 'dygraph-clip-div';
-  var graphDiv = this.dygraph_.graphDiv;
-
-  // Remove old clip divs.
-  for (var i = graphDiv.childNodes.length-1; i >= 0; i--) {
-    if (graphDiv.childNodes[i].className == className) {
-      graphDiv.removeChild(graphDiv.childNodes[i]);
-    }
-  }
-
-  // Determine background color to give clip divs.
-  var backgroundColor = document.bgColor;
-  var element = this.dygraph_.graphDiv;
-  while (element != document) {
-    var bgcolor = element.currentStyle.backgroundColor;
-    if (bgcolor && bgcolor != 'transparent') {
-      backgroundColor = bgcolor;
-      break;
-    }
-    element = element.parentNode;
-  }
-
-  function createClipDiv(area) {
-    if (area.w === 0 || area.h === 0) {
-      return;
-    }
-    var elem = document.createElement('div');
-    elem.className = className;
-    elem.style.backgroundColor = backgroundColor;
-    elem.style.position = 'absolute';
-    elem.style.left = area.x + 'px';
-    elem.style.top = area.y + 'px';
-    elem.style.width = area.w + 'px';
-    elem.style.height = area.h + 'px';
-    graphDiv.appendChild(elem);
-  }
-
-  var plotArea = this.area;
-  // Left side
-  createClipDiv({
-    x:0, y:0,
-    w:plotArea.x,
-    h:this.height
-  });
-
-  // Top
-  createClipDiv({
-    x: plotArea.x, y: 0,
-    w: this.width - plotArea.x,
-    h: plotArea.y
-  });
-
-  // Right side
-  createClipDiv({
-    x: plotArea.x + plotArea.w, y: 0,
-    w: this.width-plotArea.x - plotArea.w,
-    h: this.height
-  });
-
-  // Bottom
-  createClipDiv({
-    x: plotArea.x,
-    y: plotArea.y + plotArea.h,
-    w: this.width - plotArea.x,
-    h: this.height - plotArea.h - plotArea.y
-  });
-};
-
-
-/**
- * Returns a predicate to be used with an iterator, which will
- * iterate over points appropriately, depending on whether
- * connectSeparatedPoints is true. When it's false, the predicate will
- * skip over points with missing yVals.
- */
-DygraphCanvasRenderer._getIteratorPredicate = function(connectSeparatedPoints) {
-  return connectSeparatedPoints ?
-      DygraphCanvasRenderer._predicateThatSkipsEmptyPoints :
-      null;
-};
-
-DygraphCanvasRenderer._predicateThatSkipsEmptyPoints =
-    function(array, idx) {
-  return array[idx].yval !== null;
-};
-
-/**
- * Draws a line with the styles passed in and calls all the drawPointCallbacks.
- * @param {Object} e The dictionary passed to the plotter function.
- * @private
- */
-DygraphCanvasRenderer._drawStyledLine = function(e,
-    color, strokeWidth, strokePattern, drawPoints,
-    drawPointCallback, pointSize) {
-  var g = e.dygraph;
-  // TODO(konigsberg): Compute attributes outside this method call.
-  var stepPlot = g.getOption("stepPlot", e.setName);
-
-  if (!Dygraph.isArrayLike(strokePattern)) {
-    strokePattern = null;
-  }
-
-  var drawGapPoints = g.getOption('drawGapEdgePoints', e.setName);
-
-  var points = e.points;
-  var iter = Dygraph.createIterator(points, 0, points.length,
-      DygraphCanvasRenderer._getIteratorPredicate(
-          g.getOption("connectSeparatedPoints")));  // TODO(danvk): per-series?
-
-  var stroking = strokePattern && (strokePattern.length >= 2);
-
-  var ctx = e.drawingContext;
-  ctx.save();
-  if (stroking) {
-    ctx.installPattern(strokePattern);
-  }
-
-  var pointsOnLine = DygraphCanvasRenderer._drawSeries(
-      e, iter, strokeWidth, pointSize, drawPoints, drawGapPoints, stepPlot, color);
-  DygraphCanvasRenderer._drawPointsOnLine(
-      e, pointsOnLine, drawPointCallback, color, pointSize);
-
-  if (stroking) {
-    ctx.uninstallPattern();
-  }
-
-  ctx.restore();
-};
-
-/**
- * This does the actual drawing of lines on the canvas, for just one series.
- * Returns a list of [canvasx, canvasy] pairs for points for which a
- * drawPointCallback should be fired.  These include isolated points, or all
- * points if drawPoints=true.
- * @param {Object} e The dictionary passed to the plotter function.
- * @private
- */
-DygraphCanvasRenderer._drawSeries = function(e,
-    iter, strokeWidth, pointSize, drawPoints, drawGapPoints, stepPlot, color) {
-
-  var prevCanvasX = null;
-  var prevCanvasY = null;
-  var nextCanvasY = null;
-  var isIsolated; // true if this point is isolated (no line segments)
-  var point; // the point being processed in the while loop
-  var pointsOnLine = []; // Array of [canvasx, canvasy] pairs.
-  var first = true; // the first cycle through the while loop
-
-  var ctx = e.drawingContext;
-  ctx.beginPath();
-  ctx.strokeStyle = color;
-  ctx.lineWidth = strokeWidth;
-
-  // NOTE: we break the iterator's encapsulation here for about a 25% speedup.
-  var arr = iter.array_;
-  var limit = iter.end_;
-  var predicate = iter.predicate_;
-
-  for (var i = iter.start_; i < limit; i++) {
-    point = arr[i];
-    if (predicate) {
-      while (i < limit && !predicate(arr, i)) {
-        i++;
-      }
-      if (i == limit) break;
-      point = arr[i];
-    }
-
-    if (point.canvasy === null || point.canvasy != point.canvasy) {
-      if (stepPlot && prevCanvasX !== null) {
-        // Draw a horizontal line to the start of the missing data
-        ctx.moveTo(prevCanvasX, prevCanvasY);
-        ctx.lineTo(point.canvasx, prevCanvasY);
-      }
-      prevCanvasX = prevCanvasY = null;
-    } else {
-      isIsolated = false;
-      if (drawGapPoints || !prevCanvasX) {
-        iter.nextIdx_ = i;
-        iter.next();
-        nextCanvasY = iter.hasNext ? iter.peek.canvasy : null;
-
-        var isNextCanvasYNullOrNaN = nextCanvasY === null ||
-            nextCanvasY != nextCanvasY;
-        isIsolated = (!prevCanvasX && isNextCanvasYNullOrNaN);
-        if (drawGapPoints) {
-          // Also consider a point to be "isolated" if it's adjacent to a
-          // null point, excluding the graph edges.
-          if ((!first && !prevCanvasX) ||
-              (iter.hasNext && isNextCanvasYNullOrNaN)) {
-            isIsolated = true;
-          }
-        }
-      }
-
-      if (prevCanvasX !== null) {
-        if (strokeWidth) {
-          if (stepPlot) {
-            ctx.moveTo(prevCanvasX, prevCanvasY);
-            ctx.lineTo(point.canvasx, prevCanvasY);
-          }
-
-          ctx.lineTo(point.canvasx, point.canvasy);
-        }
-      } else {
-        ctx.moveTo(point.canvasx, point.canvasy);
-      }
-      if (drawPoints || isIsolated) {
-        pointsOnLine.push([point.canvasx, point.canvasy, point.idx]);
-      }
-      prevCanvasX = point.canvasx;
-      prevCanvasY = point.canvasy;
-    }
-    first = false;
-  }
-  ctx.stroke();
-  return pointsOnLine;
-};
-
-/**
- * This fires the drawPointCallback functions, which draw dots on the points by
- * default. This gets used when the "drawPoints" option is set, or when there
- * are isolated points.
- * @param {Object} e The dictionary passed to the plotter function.
- * @private
- */
-DygraphCanvasRenderer._drawPointsOnLine = function(
-    e, pointsOnLine, drawPointCallback, color, pointSize) {
-  var ctx = e.drawingContext;
-  for (var idx = 0; idx < pointsOnLine.length; idx++) {
-    var cb = pointsOnLine[idx];
-    ctx.save();
-    drawPointCallback(
-        e.dygraph, e.setName, ctx, cb[0], cb[1], color, pointSize, cb[2]);
-    ctx.restore();
-  }
-};
-
-/**
- * Attaches canvas coordinates to the points array.
- * @private
- */
-DygraphCanvasRenderer.prototype._updatePoints = function() {
-  // Update Points
-  // TODO(danvk): here
-  //
-  // TODO(bhs): this loop is a hot-spot for high-point-count charts. These
-  // transformations can be pushed into the canvas via linear transformation
-  // matrices.
-  // NOTE(danvk): this is trickier than it sounds at first. The transformation
-  // needs to be done before the .moveTo() and .lineTo() calls, but must be
-  // undone before the .stroke() call to ensure that the stroke width is
-  // unaffected.  An alternative is to reduce the stroke width in the
-  // transformed coordinate space, but you can't specify different values for
-  // each dimension (as you can with .scale()). The speedup here is ~12%.
-  var sets = this.layout.points;
-  for (var i = sets.length; i--;) {
-    var points = sets[i];
-    for (var j = points.length; j--;) {
-      var point = points[j];
-      point.canvasx = this.area.w * point.x + this.area.x;
-      point.canvasy = this.area.h * point.y + this.area.y;
-    }
-  }
-};
-
-/**
- * Add canvas Actually draw the lines chart, including error bars.
- *
- * This function can only be called if DygraphLayout's points array has been
- * updated with canvas{x,y} attributes, i.e. by
- * DygraphCanvasRenderer._updatePoints.
- *
- * @param {string=} opt_seriesName when specified, only that series will
- *     be drawn. (This is used for expedited redrawing with highlightSeriesOpts)
- * @param {CanvasRenderingContext2D} opt_ctx when specified, the drawing
- *     context.  However, lines are typically drawn on the object's
- *     elementContext.
- * @private
- */
-DygraphCanvasRenderer.prototype._renderLineChart = function(opt_seriesName, opt_ctx) {
-  var ctx = opt_ctx || this.elementContext;
-  var i;
-
-  var sets = this.layout.points;
-  var setNames = this.layout.setNames;
-  var setName;
-
-  this.colors = this.dygraph_.colorsMap_;
-
-  // Determine which series have specialized plotters.
-  var plotter_attr = this.attr_("plotter");
-  var plotters = plotter_attr;
-  if (!Dygraph.isArrayLike(plotters)) {
-    plotters = [plotters];
-  }
-
-  var setPlotters = {};  // series name -> plotter fn.
-  for (i = 0; i < setNames.length; i++) {
-    setName = setNames[i];
-    var setPlotter = this.attr_("plotter", setName);
-    if (setPlotter == plotter_attr) continue;  // not specialized.
-
-    setPlotters[setName] = setPlotter;
-  }
-
-  for (i = 0; i < plotters.length; i++) {
-    var plotter = plotters[i];
-    var is_last = (i == plotters.length - 1);
-
-    for (var j = 0; j < sets.length; j++) {
-      setName = setNames[j];
-      if (opt_seriesName && setName != opt_seriesName) continue;
-
-      var points = sets[j];
-
-      // Only throw in the specialized plotters on the last iteration.
-      var p = plotter;
-      if (setName in setPlotters) {
-        if (is_last) {
-          p = setPlotters[setName];
-        } else {
-          // Don't use the standard plotters in this case.
-          continue;
-        }
-      }
-
-      var color = this.colors[setName];
-      var strokeWidth = this.dygraph_.getOption("strokeWidth", setName);
-
-      ctx.save();
-      ctx.strokeStyle = color;
-      ctx.lineWidth = strokeWidth;
-      p({
-        points: points,
-        setName: setName,
-        drawingContext: ctx,
-        color: color,
-        strokeWidth: strokeWidth,
-        dygraph: this.dygraph_,
-        axis: this.dygraph_.axisPropertiesForSeries(setName),
-        plotArea: this.area,
-        seriesIndex: j,
-        seriesCount: sets.length,
-        singleSeriesName: opt_seriesName,
-        allSeriesPoints: sets
-      });
-      ctx.restore();
-    }
-  }
-};
-
-/**
- * Standard plotters. These may be used by clients via Dygraph.Plotters.
- * See comments there for more details.
- */
-DygraphCanvasRenderer._Plotters = {
-  linePlotter: function(e) {
-    DygraphCanvasRenderer._linePlotter(e);
-  },
-
-  fillPlotter: function(e) {
-    DygraphCanvasRenderer._fillPlotter(e);
-  },
-
-  errorPlotter: function(e) {
-    DygraphCanvasRenderer._errorPlotter(e);
-  }
-};
-
-/**
- * Plotter which draws the central lines for a series.
- * @private
- */
-DygraphCanvasRenderer._linePlotter = function(e) {
-  var g = e.dygraph;
-  var setName = e.setName;
-  var strokeWidth = e.strokeWidth;
-
-  // TODO(danvk): Check if there's any performance impact of just calling
-  // getOption() inside of _drawStyledLine. Passing in so many parameters makes
-  // this code a bit nasty.
-  var borderWidth = g.getOption("strokeBorderWidth", setName);
-  var drawPointCallback = g.getOption("drawPointCallback", setName) ||
-      Dygraph.Circles.DEFAULT;
-  var strokePattern = g.getOption("strokePattern", setName);
-  var drawPoints = g.getOption("drawPoints", setName);
-  var pointSize = g.getOption("pointSize", setName);
-
-  if (borderWidth && strokeWidth) {
-    DygraphCanvasRenderer._drawStyledLine(e,
-        g.getOption("strokeBorderColor", setName),
-        strokeWidth + 2 * borderWidth,
-        strokePattern,
-        drawPoints,
-        drawPointCallback,
-        pointSize
-        );
-  }
-
-  DygraphCanvasRenderer._drawStyledLine(e,
-      e.color,
-      strokeWidth,
-      strokePattern,
-      drawPoints,
-      drawPointCallback,
-      pointSize
-  );
-};
-
-/**
- * Draws the shaded error bars/confidence intervals for each series.
- * This happens before the center lines are drawn, since the center lines
- * need to be drawn on top of the error bars for all series.
- * @private
- */
-DygraphCanvasRenderer._errorPlotter = function(e) {
-  var g = e.dygraph;
-  var setName = e.setName;
-  var errorBars = g.getOption("errorBars") || g.getOption("customBars");
-  if (!errorBars) return;
-
-  var fillGraph = g.getOption("fillGraph", setName);
-  if (fillGraph) {
-    g.warn("Can't use fillGraph option with error bars");
-  }
-
-  var ctx = e.drawingContext;
-  var color = e.color;
-  var fillAlpha = g.getOption('fillAlpha', setName);
-  var stepPlot = g.getOption("stepPlot", setName);
-  var points = e.points;
-
-  var iter = Dygraph.createIterator(points, 0, points.length,
-      DygraphCanvasRenderer._getIteratorPredicate(
-          g.getOption("connectSeparatedPoints")));
-
-  var newYs;
-
-  // setup graphics context
-  var prevX = NaN;
-  var prevY = NaN;
-  var prevYs = [-1, -1];
-  // should be same color as the lines but only 15% opaque.
-  var rgb = new RGBColorParser(color);
-  var err_color =
-      'rgba(' + rgb.r + ',' + rgb.g + ',' + rgb.b + ',' + fillAlpha + ')';
-  ctx.fillStyle = err_color;
-  ctx.beginPath();
-
-  var isNullUndefinedOrNaN = function(x) {
-    return (x === null ||
-            x === undefined ||
-            isNaN(x));
-  };
-
-  while (iter.hasNext) {
-    var point = iter.next();
-    if ((!stepPlot && isNullUndefinedOrNaN(point.y)) ||
-        (stepPlot && !isNaN(prevY) && isNullUndefinedOrNaN(prevY))) {
-      prevX = NaN;
-      continue;
-    }
-
-    if (stepPlot) {
-      newYs = [ point.y_bottom, point.y_top ];
-      prevY = point.y;
-    } else {
-      newYs = [ point.y_bottom, point.y_top ];
-    }
-    newYs[0] = e.plotArea.h * newYs[0] + e.plotArea.y;
-    newYs[1] = e.plotArea.h * newYs[1] + e.plotArea.y;
-    if (!isNaN(prevX)) {
-      if (stepPlot) {
-        ctx.moveTo(prevX, prevYs[0]);
-        ctx.lineTo(point.canvasx, prevYs[0]);
-        ctx.lineTo(point.canvasx, prevYs[1]);
-      } else {
-        ctx.moveTo(prevX, prevYs[0]);
-        ctx.lineTo(point.canvasx, newYs[0]);
-        ctx.lineTo(point.canvasx, newYs[1]);
-      }
-      ctx.lineTo(prevX, prevYs[1]);
-      ctx.closePath();
-    }
-    prevYs = newYs;
-    prevX = point.canvasx;
-  }
-  ctx.fill();
-};
-
-/**
- * Draws the shaded regions when "fillGraph" is set. Not to be confused with
- * error bars.
- *
- * For stacked charts, it's more convenient to handle all the series
- * simultaneously. So this plotter plots all the points on the first series
- * it's asked to draw, then ignores all the other series.
- *
- * @private
- */
-DygraphCanvasRenderer._fillPlotter = function(e) {
-  // Skip if we're drawing a single series for interactive highlight overlay.
-  if (e.singleSeriesName) return;
-
-  // We'll handle all the series at once, not one-by-one.
-  if (e.seriesIndex !== 0) return;
-
-  var g = e.dygraph;
-  var setNames = g.getLabels().slice(1);  // remove x-axis
-
-  // getLabels() includes names for invisible series, which are not included in
-  // allSeriesPoints. We remove those to make the two match.
-  // TODO(danvk): provide a simpler way to get this information.
-  for (var i = setNames.length; i >= 0; i--) {
-    if (!g.visibility()[i]) setNames.splice(i, 1);
-  }
-
-  var anySeriesFilled = (function() {
-    for (var i = 0; i < setNames.length; i++) {
-      if (g.getOption("fillGraph", setNames[i])) return true;
-    }
-    return false;
-  })();
-
-  if (!anySeriesFilled) return;
-
-  var ctx = e.drawingContext;
-  var area = e.plotArea;
-  var sets = e.allSeriesPoints;
-  var setCount = sets.length;
-
-  var fillAlpha = g.getOption('fillAlpha');
-  var stackedGraph = g.getOption("stackedGraph");
-  var colors = g.getColors();
-
-  // For stacked graphs, track the baseline for filling.
-  //
-  // The filled areas below graph lines are trapezoids with two
-  // vertical edges. The top edge is the line segment being drawn, and
-  // the baseline is the bottom edge. Each baseline corresponds to the
-  // top line segment from the previous stacked line. In the case of
-  // step plots, the trapezoids are rectangles.
-  var baseline = {};
-  var currBaseline;
-  var prevStepPlot;  // for different line drawing modes (line/step) per series
-
-  // process sets in reverse order (needed for stacked graphs)
-  for (var setIdx = setCount - 1; setIdx >= 0; setIdx--) {
-    var setName = setNames[setIdx];
-    if (!g.getOption('fillGraph', setName)) continue;
-    
-    var stepPlot = g.getOption('stepPlot', setName);
-    var color = colors[setIdx];
-    var axis = g.axisPropertiesForSeries(setName);
-    var axisY = 1.0 + axis.minyval * axis.yscale;
-    if (axisY < 0.0) axisY = 0.0;
-    else if (axisY > 1.0) axisY = 1.0;
-    axisY = area.h * axisY + area.y;
-
-    var points = sets[setIdx];
-    var iter = Dygraph.createIterator(points, 0, points.length,
-        DygraphCanvasRenderer._getIteratorPredicate(
-            g.getOption("connectSeparatedPoints")));
-
-    // setup graphics context
-    var prevX = NaN;
-    var prevYs = [-1, -1];
-    var newYs;
-    // should be same color as the lines but only 15% opaque.
-    var rgb = new RGBColorParser(color);
-    var err_color =
-        'rgba(' + rgb.r + ',' + rgb.g + ',' + rgb.b + ',' + fillAlpha + ')';
-    ctx.fillStyle = err_color;
-    ctx.beginPath();
-    var last_x, is_first = true;
-    while (iter.hasNext) {
-      var point = iter.next();
-      if (!Dygraph.isOK(point.y)) {
-        prevX = NaN;
-        if (point.y_stacked !== null && !isNaN(point.y_stacked)) {
-          baseline[point.canvasx] = area.h * point.y_stacked + area.y;
-        }
-        continue;
-      }
-      if (stackedGraph) {
-        if (!is_first && last_x == point.xval) {
-          continue;
-        } else {
-          is_first = false;
-          last_x = point.xval;
-        }
-
-        currBaseline = baseline[point.canvasx];
-        var lastY;
-        if (currBaseline === undefined) {
-          lastY = axisY;
-        } else {
-          if(prevStepPlot) {
-            lastY = currBaseline[0];
-          } else {
-            lastY = currBaseline;
-          }
-        }
-        newYs = [ point.canvasy, lastY ];
-
-        if(stepPlot) {
-          // Step plots must keep track of the top and bottom of
-          // the baseline at each point.
-          if(prevYs[0] === -1) {
-            baseline[point.canvasx] = [ point.canvasy, axisY ];
-          } else {
-            baseline[point.canvasx] = [ point.canvasy, prevYs[0] ];
-          }
-        } else {
-          baseline[point.canvasx] = point.canvasy;
-        }
-
-      } else {
-        newYs = [ point.canvasy, axisY ];
-      }
-      if (!isNaN(prevX)) {
-        ctx.moveTo(prevX, prevYs[0]);
-        
-        // Move to top fill point
-        if (stepPlot) {
-          ctx.lineTo(point.canvasx, prevYs[0]);
-        } else {
-          ctx.lineTo(point.canvasx, newYs[0]);
-        }
-        // Move to bottom fill point
-        if (prevStepPlot && currBaseline) {
-          // Draw to the bottom of the baseline
-          ctx.lineTo(point.canvasx, currBaseline[1]);
-        } else {
-          ctx.lineTo(point.canvasx, newYs[1]);
-        }
-
-        ctx.lineTo(prevX, prevYs[1]);
-        ctx.closePath();
-      }
-      prevYs = newYs;
-      prevX = point.canvasx;
-    }
-    prevStepPlot = stepPlot;
-    ctx.fill();
-  }
-};
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-combined.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-combined.js
deleted file mode 100644
index 4f864538a..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-combined.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! @license Copyright 2011 Dan Vanderkam (danvdk@gmail.com) MIT-licensed (http://opensource.org/licenses/MIT) */
-Date.ext={};Date.ext.util={};Date.ext.util.xPad=function(a,c,b){if(typeof(b)=="undefined"){b=10}for(;parseInt(a,10)1;b/=10){a=c.toString()+a}return a.toString()};Date.prototype.locale="en-GB";if(document.getElementsByTagName("html")&&document.getElementsByTagName("html")[0].lang){Date.prototype.locale=document.getElementsByTagName("html")[0].lang}Date.ext.locales={};Date.ext.locales.en={a:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],A:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],b:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],B:["January","February","March","April","May","June","July","August","September","October","November","December"],c:"%a %d %b %Y %T %Z",p:["AM","PM"],P:["am","pm"],x:"%d/%m/%y",X:"%T"};Date.ext.locales["en-US"]=Date.ext.locales.en;Date.ext.locales["en-US"].c="%a %d %b %Y %r %Z";Date.ext.locales["en-US"].x="%D";Date.ext.locales["en-US"].X="%r";Date.ext.locales["en-GB"]=Date.ext.locales.en;Date.ext.locales["en-AU"]=Date.ext.locales["en-GB"];Date.ext.formats={a:function(a){return Date.ext.locales[a.locale].a[a.getDay()]},A:function(a){return Date.ext.locales[a.locale].A[a.getDay()]},b:function(a){return Date.ext.locales[a.locale].b[a.getMonth()]},B:function(a){return Date.ext.locales[a.locale].B[a.getMonth()]},c:"toLocaleString",C:function(a){return Date.ext.util.xPad(parseInt(a.getFullYear()/100,10),0)},d:["getDate","0"],e:["getDate"," "],g:function(a){return Date.ext.util.xPad(parseInt(Date.ext.util.G(a)/100,10),0)},G:function(c){var e=c.getFullYear();var b=parseInt(Date.ext.formats.V(c),10);var a=parseInt(Date.ext.formats.W(c),10);if(a>b){e++}else{if(a===0&&b>=52){e--}}return e},H:["getHours","0"],I:function(b){var a=b.getHours()%12;return Date.ext.util.xPad(a===0?12:a,0)},j:function(c){var a=c-new Date(""+c.getFullYear()+"/1/1 GMT");a+=c.getTimezoneOffset()*60000;var b=parseInt(a/60000/60/24,10)+1;return Date.ext.util.xPad(b,0,100)},m:function(a){return Date.ext.util.xPad(a.getMonth()+1,0)},M:["getMinutes","0"],p:function(a){return Date.ext.locales[a.locale].p[a.getHours()>=12?1:0]},P:function(a){return Date.ext.locales[a.locale].P[a.getHours()>=12?1:0]},S:["getSeconds","0"],u:function(a){var b=a.getDay();return b===0?7:b},U:function(e){var a=parseInt(Date.ext.formats.j(e),10);var c=6-e.getDay();var b=parseInt((a+c)/7,10);return Date.ext.util.xPad(b,0)},V:function(e){var c=parseInt(Date.ext.formats.W(e),10);var a=(new Date(""+e.getFullYear()+"/1/1")).getDay();var b=c+(a>4||a<=1?0:1);if(b==53&&(new Date(""+e.getFullYear()+"/12/31")).getDay()<4){b=1}else{if(b===0){b=Date.ext.formats.V(new Date(""+(e.getFullYear()-1)+"/12/31"))}}return Date.ext.util.xPad(b,0)},w:"getDay",W:function(e){var a=parseInt(Date.ext.formats.j(e),10);var c=7-Date.ext.formats.u(e);var b=parseInt((a+c)/7,10);return Date.ext.util.xPad(b,0,10)},y:function(a){return Date.ext.util.xPad(a.getFullYear()%100,0)},Y:"getFullYear",z:function(c){var b=c.getTimezoneOffset();var a=Date.ext.util.xPad(parseInt(Math.abs(b/60),10),0);var e=Date.ext.util.xPad(b%60,0);return(b>0?"-":"+")+a+e},Z:function(a){return a.toString().replace(/^.*\(([^)]+)\)$/,"$1")},"%":function(a){return"%"}};Date.ext.aggregates={c:"locale",D:"%m/%d/%y",h:"%b",n:"\n",r:"%I:%M:%S %p",R:"%H:%M",t:"\t",T:"%H:%M:%S",x:"locale",X:"locale"};Date.ext.aggregates.z=Date.ext.formats.z(new Date());Date.ext.aggregates.Z=Date.ext.formats.Z(new Date());Date.ext.unsupported={};Date.prototype.strftime=function(a){if(!(this.locale in Date.ext.locales)){if(this.locale.replace(/-[a-zA-Z]+$/,"") in Date.ext.locales){this.locale=this.locale.replace(/-[a-zA-Z]+$/,"")}else{this.locale="en-GB"}}var c=this;while(a.match(/%[cDhnrRtTxXzZ]/)){a=a.replace(/%([cDhnrRtTxXzZ])/g,function(e,d){var g=Date.ext.aggregates[d];return(g=="locale"?Date.ext.locales[c.locale][d]:g)})}var b=a.replace(/%([aAbBCdegGHIjmMpPSuUVwWyY%])/g,function(e,d){var g=Date.ext.formats[d];if(typeof(g)=="string"){return c[g]()}else{if(typeof(g)=="function"){return g.call(c,c)}else{if(typeof(g)=="object"&&typeof(g[0])=="string"){return Date.ext.util.xPad(c[g[0]](),g[1])}else{return d}}}});c=null;return b};"use strict";function RGBColorParser(f){this.ok=false;if(f.charAt(0)=="#"){f=f.substr(1,6)}f=f.replace(/ /g,"");f=f.toLowerCase();var b={aliceblue:"f0f8ff",antiquewhite:"faebd7",aqua:"00ffff",aquamarine:"7fffd4",azure:"f0ffff",beige:"f5f5dc",bisque:"ffe4c4",black:"000000",blanchedalmond:"ffebcd",blue:"0000ff",blueviolet:"8a2be2",brown:"a52a2a",burlywood:"deb887",cadetblue:"5f9ea0",chartreuse:"7fff00",chocolate:"d2691e",coral:"ff7f50",cornflowerblue:"6495ed",cornsilk:"fff8dc",crimson:"dc143c",cyan:"00ffff",darkblue:"00008b",darkcyan:"008b8b",darkgoldenrod:"b8860b",darkgray:"a9a9a9",darkgreen:"006400",darkkhaki:"bdb76b",darkmagenta:"8b008b",darkolivegreen:"556b2f",darkorange:"ff8c00",darkorchid:"9932cc",darkred:"8b0000",darksalmon:"e9967a",darkseagreen:"8fbc8f",darkslateblue:"483d8b",darkslategray:"2f4f4f",darkturquoise:"00ced1",darkviolet:"9400d3",deeppink:"ff1493",deepskyblue:"00bfff",dimgray:"696969",dodgerblue:"1e90ff",feldspar:"d19275",firebrick:"b22222",floralwhite:"fffaf0",forestgreen:"228b22",fuchsia:"ff00ff",gainsboro:"dcdcdc",ghostwhite:"f8f8ff",gold:"ffd700",goldenrod:"daa520",gray:"808080",green:"008000",greenyellow:"adff2f",honeydew:"f0fff0",hotpink:"ff69b4",indianred:"cd5c5c",indigo:"4b0082",ivory:"fffff0",khaki:"f0e68c",lavender:"e6e6fa",lavenderblush:"fff0f5",lawngreen:"7cfc00",lemonchiffon:"fffacd",lightblue:"add8e6",lightcoral:"f08080",lightcyan:"e0ffff",lightgoldenrodyellow:"fafad2",lightgrey:"d3d3d3",lightgreen:"90ee90",lightpink:"ffb6c1",lightsalmon:"ffa07a",lightseagreen:"20b2aa",lightskyblue:"87cefa",lightslateblue:"8470ff",lightslategray:"778899",lightsteelblue:"b0c4de",lightyellow:"ffffe0",lime:"00ff00",limegreen:"32cd32",linen:"faf0e6",magenta:"ff00ff",maroon:"800000",mediumaquamarine:"66cdaa",mediumblue:"0000cd",mediumorchid:"ba55d3",mediumpurple:"9370d8",mediumseagreen:"3cb371",mediumslateblue:"7b68ee",mediumspringgreen:"00fa9a",mediumturquoise:"48d1cc",mediumvioletred:"c71585",midnightblue:"191970",mintcream:"f5fffa",mistyrose:"ffe4e1",moccasin:"ffe4b5",navajowhite:"ffdead",navy:"000080",oldlace:"fdf5e6",olive:"808000",olivedrab:"6b8e23",orange:"ffa500",orangered:"ff4500",orchid:"da70d6",palegoldenrod:"eee8aa",palegreen:"98fb98",paleturquoise:"afeeee",palevioletred:"d87093",papayawhip:"ffefd5",peachpuff:"ffdab9",peru:"cd853f",pink:"ffc0cb",plum:"dda0dd",powderblue:"b0e0e6",purple:"800080",red:"ff0000",rosybrown:"bc8f8f",royalblue:"4169e1",saddlebrown:"8b4513",salmon:"fa8072",sandybrown:"f4a460",seagreen:"2e8b57",seashell:"fff5ee",sienna:"a0522d",silver:"c0c0c0",skyblue:"87ceeb",slateblue:"6a5acd",slategray:"708090",snow:"fffafa",springgreen:"00ff7f",steelblue:"4682b4",tan:"d2b48c",teal:"008080",thistle:"d8bfd8",tomato:"ff6347",turquoise:"40e0d0",violet:"ee82ee",violetred:"d02090",wheat:"f5deb3",white:"ffffff",whitesmoke:"f5f5f5",yellow:"ffff00",yellowgreen:"9acd32"};for(var g in b){if(f==g){f=b[g]}}var e=[{re:/^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/,example:["rgb(123, 234, 45)","rgb(255,234,245)"],process:function(i){return[parseInt(i[1]),parseInt(i[2]),parseInt(i[3])]}},{re:/^(\w{2})(\w{2})(\w{2})$/,example:["#00ff00","336699"],process:function(i){return[parseInt(i[1],16),parseInt(i[2],16),parseInt(i[3],16)]}},{re:/^(\w{1})(\w{1})(\w{1})$/,example:["#fb0","f0f"],process:function(i){return[parseInt(i[1]+i[1],16),parseInt(i[2]+i[2],16),parseInt(i[3]+i[3],16)]}}];for(var c=0;c255)?255:this.r);this.g=(this.g<0||isNaN(this.g))?0:((this.g>255)?255:this.g);this.b=(this.b<0||isNaN(this.b))?0:((this.b>255)?255:this.b);this.toRGB=function(){return"rgb("+this.r+", "+this.g+", "+this.b+")"};this.toHex=function(){var l=this.r.toString(16);var k=this.g.toString(16);var i=this.b.toString(16);if(l.length==1){l="0"+l}if(k.length==1){k="0"+k}if(i.length==1){i="0"+i}return"#"+l+k+i}}function printStackTrace(b){b=b||{guess:true};var c=b.e||null,e=!!b.guess;var d=new printStackTrace.implementation(),a=d.run(c);return(e)?d.guessAnonymousFunctions(a):a}printStackTrace.implementation=function(){};printStackTrace.implementation.prototype={run:function(a,b){a=a||this.createException();b=b||this.mode(a);if(b==="other"){return this.other(arguments.callee)}else{return this[b](a)}},createException:function(){try{this.undef()}catch(a){return a}},mode:function(a){if(a["arguments"]&&a.stack){return"chrome"}else{if(typeof a.message==="string"&&typeof window!=="undefined"&&window.opera){if(!a.stacktrace){return"opera9"}if(a.message.indexOf("\n")>-1&&a.message.split("\n").length>a.stacktrace.split("\n").length){return"opera9"}if(!a.stack){return"opera10a"}if(a.stacktrace.indexOf("called from line")<0){return"opera10b"}return"opera11"}else{if(a.stack){return"firefox"}}}return"other"},instrumentFunction:function(b,d,e){b=b||window;var a=b[d];b[d]=function c(){e.call(this,printStackTrace().slice(4));return b[d]._instrumented.apply(this,arguments)};b[d]._instrumented=a},deinstrumentFunction:function(a,b){if(a[b].constructor===Function&&a[b]._instrumented&&a[b]._instrumented.constructor===Function){a[b]=a[b]._instrumented}},chrome:function(b){var a=(b.stack+"\n").replace(/^\S[^\(]+?[\n$]/gm,"").replace(/^\s+at\s+/gm,"").replace(/^([^\(]+?)([\n$])/gm,"{anonymous}()@$1$2").replace(/^Object.\s*\(([^\)]+)\)/gm,"{anonymous}()@$1").split("\n");a.pop();return a},firefox:function(a){return a.stack.replace(/(?:\n@:0)?\s+$/m,"").replace(/^\(/gm,"{anonymous}(").split("\n")},opera11:function(g){var a="{anonymous}",h=/^.*line (\d+), column (\d+)(?: in (.+))? in (\S+):$/;var k=g.stacktrace.split("\n"),l=[];for(var c=0,f=k.length;c/,"$1").replace(//,a);l.push(b+"@"+j+" -- "+k[c+1].replace(/^\s+/,""))}}return l},opera10b:function(g){var a="{anonymous}",h=/^(.*)@(.+):(\d+)$/;var j=g.stacktrace.split("\n"),k=[];for(var c=0,f=j.length;c=0){l=l.substr(0,c)}if(l){b=l+b;d=k.exec(b);if(d&&d[1]){return d[1]}d=g.exec(b);if(d&&d[1]){return d[1]}d=h.exec(b);if(d&&d[1]){return d[1]}}}return"(?)"}};CanvasRenderingContext2D.prototype.installPattern=function(e){if(typeof(this.isPatternInstalled)!=="undefined"){throw"Must un-install old line pattern before installing a new one."}this.isPatternInstalled=true;var g=[0,0];var b=[];var f=this.beginPath;var d=this.lineTo;var c=this.moveTo;var a=this.stroke;this.uninstallPattern=function(){this.beginPath=f;this.lineTo=d;this.moveTo=c;this.stroke=a;this.uninstallPattern=undefined;this.isPatternInstalled=undefined};this.beginPath=function(){b=[];f.call(this)};this.moveTo=function(h,i){b.push([[h,i]]);c.call(this,h,i)};this.lineTo=function(h,j){var i=b[b.length-1];i.push([h,j])};this.stroke=function(){if(b.length===0){a.call(this);return}for(var p=0;pt){var q=e[m];if(g[1]){t+=g[1]}else{t+=q}if(t>r){g=[m,t-r];t=r}else{g=[(m+1)%e.length,0]}if(m%2===0){d.call(this,t,0)}else{c.call(this,t,0)}m=(m+1)%e.length}this.restore();l=h,u=s}}a.call(this);b=[]}};CanvasRenderingContext2D.prototype.uninstallPattern=function(){throw"Must install a line pattern before uninstalling it."};var DygraphOptions=(function(){var a=function(b){this.dygraph_=b;this.yAxes_=[];this.xAxis_={};this.series_={};this.global_=this.dygraph_.attrs_;this.user_=this.dygraph_.user_attrs_||{};this.labels_=[];this.highlightSeries_=this.get("highlightSeriesOpts")||{};this.reparseSeries()};a.AXIS_STRING_MAPPINGS_={y:0,Y:0,y1:0,Y1:0,y2:1,Y2:1};a.axisToIndex_=function(b){if(typeof(b)=="string"){if(a.AXIS_STRING_MAPPINGS_.hasOwnProperty(b)){return a.AXIS_STRING_MAPPINGS_[b]}throw"Unknown axis : "+b}if(typeof(b)=="number"){if(b===0||b===1){return b}throw"Dygraphs only supports two y-axes, indexed from 0-1."}if(b){throw"Unknown axis : "+b}return 0};a.prototype.reparseSeries=function(){var g=this.get("labels");if(!g){return}this.labels_=g.slice(1);this.yAxes_=[{series:[],options:{}}];this.xAxis_={options:{}};this.series_={};var h=!this.user_.series;if(h){var c=0;for(var j=0;j1){Dygraph.update(this.yAxes_[1].options,f.y2||{})}Dygraph.update(this.xAxis_.options,f.x||{})};a.prototype.get=function(c){var b=this.getGlobalUser_(c);if(b!==null){return b}return this.getGlobalDefault_(c)};a.prototype.getGlobalUser_=function(b){if(this.user_.hasOwnProperty(b)){return this.user_[b]}return null};a.prototype.getGlobalDefault_=function(b){if(this.global_.hasOwnProperty(b)){return this.global_[b]}if(Dygraph.DEFAULT_ATTRS.hasOwnProperty(b)){return Dygraph.DEFAULT_ATTRS[b]}return null};a.prototype.getForAxis=function(d,e){var f;var i;if(typeof(e)=="number"){f=e;i=f===0?"y":"y2"}else{if(e=="y1"){e="y"}if(e=="y"){f=0}else{if(e=="y2"){f=1}else{if(e=="x"){f=-1}else{throw"Unknown axis "+e}}}i=e}var g=(f==-1)?this.xAxis_:this.yAxes_[f];if(g){var h=g.options;if(h.hasOwnProperty(d)){return h[d]}}var c=this.getGlobalUser_(d);if(c!==null){return c}var b=Dygraph.DEFAULT_ATTRS.axes[i];if(b.hasOwnProperty(d)){return b[d]}return this.getGlobalDefault_(d)};a.prototype.getForSeries=function(c,e){if(e===this.dygraph_.getHighlightSeries()){if(this.highlightSeries_.hasOwnProperty(c)){return this.highlightSeries_[c]}}if(!this.series_.hasOwnProperty(e)){throw"Unknown series: "+e}var d=this.series_[e];var b=d.options;if(b.hasOwnProperty(c)){return b[c]}return this.getForAxis(c,d.yAxis)};a.prototype.numAxes=function(){return this.yAxes_.length};a.prototype.axisForSeries=function(b){return this.series_[b].yAxis};a.prototype.axisOptions=function(b){return this.yAxes_[b].options};a.prototype.seriesForAxis=function(b){return this.yAxes_[b].series};a.prototype.seriesNames=function(){return this.labels_};return a})();"use strict";var DygraphLayout=function(a){this.dygraph_=a;this.points=[];this.setNames=[];this.annotations=[];this.yAxes_=null;this.xTicks_=null;this.yTicks_=null};DygraphLayout.prototype.attr_=function(a){return this.dygraph_.attr_(a)};DygraphLayout.prototype.addDataset=function(a,b){this.points.push(b);this.setNames.push(a)};DygraphLayout.prototype.getPlotArea=function(){return this.area_};DygraphLayout.prototype.computePlotArea=function(){var a={x:0,y:0};a.w=this.dygraph_.width_-a.x-this.attr_("rightGap");a.h=this.dygraph_.height_;var b={chart_div:this.dygraph_.graphDiv,reserveSpaceLeft:function(c){var d={x:a.x,y:a.y,w:c,h:a.h};a.x+=c;a.w-=c;return d},reserveSpaceRight:function(c){var d={x:a.x+a.w-c,y:a.y,w:c,h:a.h};a.w-=c;return d},reserveSpaceTop:function(c){var d={x:a.x,y:a.y,w:a.w,h:c};a.y+=c;a.h-=c;return d},reserveSpaceBottom:function(c){var d={x:a.x,y:a.y+a.h-c,w:a.w,h:c};a.h-=c;return d},chartRect:function(){return{x:a.x,y:a.y,w:a.w,h:a.h}}};this.dygraph_.cascadeEvents_("layout",b);this.area_=a};DygraphLayout.prototype.setAnnotations=function(d){this.annotations=[];var e=this.attr_("xValueParser")||function(a){return a};for(var c=0;c=0)&&(f<=1)){this.xticks.push([f,b])}}this.yticks=[];for(d=0;d=0)&&(f<=1)){this.yticks.push([d,f,b])}}}};DygraphLayout.prototype._evaluateAnnotations=function(){var d;var g={};for(d=0;d=0;e--){if(f.childNodes[e].className==g){f.removeChild(f.childNodes[e])}}var c=document.bgColor;var d=this.dygraph_.graphDiv;while(d!=document){var a=d.currentStyle.backgroundColor;if(a&&a!="transparent"){c=a;break}d=d.parentNode}function b(j){if(j.w===0||j.h===0){return}var i=document.createElement("div");i.className=g;i.style.backgroundColor=c;i.style.position="absolute";i.style.left=j.x+"px";i.style.top=j.y+"px";i.style.width=j.w+"px";i.style.height=j.h+"px";f.appendChild(i)}var h=this.area;b({x:0,y:0,w:h.x,h:this.height});b({x:h.x,y:0,w:this.width-h.x,h:h.y});b({x:h.x+h.w,y:0,w:this.width-h.x-h.w,h:this.height});b({x:h.x,y:h.y+h.h,w:this.width-h.x,h:this.height-h.h-h.y})};DygraphCanvasRenderer._getIteratorPredicate=function(a){return a?DygraphCanvasRenderer._predicateThatSkipsEmptyPoints:null};DygraphCanvasRenderer._predicateThatSkipsEmptyPoints=function(b,a){return b[a].yval!==null};DygraphCanvasRenderer._drawStyledLine=function(i,a,m,q,f,n,d){var h=i.dygraph;var c=h.getOption("stepPlot",i.setName);if(!Dygraph.isArrayLike(q)){q=null}var l=h.getOption("drawGapEdgePoints",i.setName);var o=i.points;var k=Dygraph.createIterator(o,0,o.length,DygraphCanvasRenderer._getIteratorPredicate(h.getOption("connectSeparatedPoints")));var j=q&&(q.length>=2);var p=i.drawingContext;p.save();if(j){p.installPattern(q)}var b=DygraphCanvasRenderer._drawSeries(i,k,m,d,f,l,c,a);DygraphCanvasRenderer._drawPointsOnLine(i,b,n,a,d);if(j){p.uninstallPattern()}p.restore()};DygraphCanvasRenderer._drawSeries=function(v,t,m,h,p,s,g,q){var b=null;var w=null;var k=null;var j;var o;var l=[];var f=true;var n=v.drawingContext;n.beginPath();n.strokeStyle=q;n.lineWidth=m;var c=t.array_;var u=t.end_;var a=t.predicate_;for(var r=t.start_;r=0;C--){if(!D.visibility()[C]){I.splice(C,1)}}var h=(function(){for(var e=0;e=0;u--){var n=I[u];if(!D.getOption("fillGraph",n)){continue}var p=D.getOption("stepPlot",n);var x=q[u];var f=D.axisPropertiesForSeries(n);var d=1+f.minyval*f.yscale;if(d<0){d=0}else{if(d>1){d=1}}d=E.h*d+E.y;var B=c[u];var A=Dygraph.createIterator(B,0,B.length,DygraphCanvasRenderer._getIteratorPredicate(D.getOption("connectSeparatedPoints")));var m=NaN;var l=[-1,-1];var t;var b=new RGBColorParser(x);var H="rgba("+b.r+","+b.g+","+b.b+","+y+")";w.fillStyle=H;w.beginPath();var j,G=true;while(A.hasNext){var v=A.next();if(!Dygraph.isOK(v.y)){m=NaN;if(v.y_stacked!==null&&!isNaN(v.y_stacked)){s[v.canvasx]=E.h*v.y_stacked+E.y}continue}if(k){if(!G&&j==v.xval){continue}else{G=false;j=v.xval}a=s[v.canvasx];var o;if(a===undefined){o=d}else{if(r){o=a[0]}else{o=a}}t=[v.canvasy,o];if(p){if(l[0]===-1){s[v.canvasx]=[v.canvasy,d]}else{s[v.canvasx]=[v.canvasy,l[0]]}}else{s[v.canvasx]=v.canvasy}}else{t=[v.canvasy,d]}if(!isNaN(m)){w.moveTo(m,l[0]);if(p){w.lineTo(v.canvasx,l[0])}else{w.lineTo(v.canvasx,t[0])}if(r&&a){w.lineTo(v.canvasx,a[1])}else{w.lineTo(v.canvasx,t[1])}w.lineTo(m,l[1]);w.closePath()}l=t;m=v.canvasx}r=p;w.fill()}};"use strict";var Dygraph=function(d,c,b,a){this.is_initial_draw_=true;this.readyFns_=[];if(a!==undefined){this.warn("Using deprecated four-argument dygraph constructor");this.__old_init__(d,c,b,a)}else{this.__init__(d,c,b)}};Dygraph.NAME="Dygraph";Dygraph.VERSION="1.0.0";Dygraph.__repr__=function(){return"["+this.NAME+" "+this.VERSION+"]"};Dygraph.toString=function(){return this.__repr__()};Dygraph.DEFAULT_ROLL_PERIOD=1;Dygraph.DEFAULT_WIDTH=480;Dygraph.DEFAULT_HEIGHT=320;Dygraph.ANIMATION_STEPS=12;Dygraph.ANIMATION_DURATION=200;Dygraph.KMB_LABELS=["K","M","B","T","Q"];Dygraph.KMG2_BIG_LABELS=["k","M","G","T","P","E","Z","Y"];Dygraph.KMG2_SMALL_LABELS=["m","u","n","p","f","a","z","y"];Dygraph.numberValueFormatter=function(s,a,u,l){var e=a("sigFigs");if(e!==null){return Dygraph.floatFormat(s,e)}var c=a("digitsAfterDecimal");var o=a("maxNumberWidth");var b=a("labelsKMB");var r=a("labelsKMG2");var q;if(s!==0&&(Math.abs(s)>=Math.pow(10,o)||Math.abs(s)=0;h--,d/=f){if(p>=d){q=Dygraph.round_(s/d,c)+t[h];break}}if(r){var i=String(s.toExponential()).split("e-");if(i.length===2&&i[1]>=3&&i[1]<=24){if(i[1]%3>0){q=Dygraph.round_(i[0]/Dygraph.pow(10,(i[1]%3)),c)}else{q=Number(i[0]).toFixed(2)}q+=m[Math.floor(i[1]/3)-1]}}}return q};Dygraph.numberAxisLabelFormatter=function(a,d,c,b){return Dygraph.numberValueFormatter(a,c,b)};Dygraph.dateString_=function(e){var i=Dygraph.zeropad;var h=new Date(e);var f=""+h.getFullYear();var g=i(h.getMonth()+1);var a=i(h.getDate());var c="";var b=h.getHours()*3600+h.getMinutes()*60+h.getSeconds();if(b){c=" "+Dygraph.hmsString_(e)}return f+"/"+g+"/"+a+c};Dygraph.dateAxisFormatter=function(b,c){if(c>=Dygraph.DECADAL){return b.strftime("%Y")}else{if(c>=Dygraph.MONTHLY){return b.strftime("%b %y")}else{var a=b.getHours()*3600+b.getMinutes()*60+b.getSeconds()+b.getMilliseconds();if(a===0||c>=Dygraph.DAILY){return new Date(b.getTime()+3600*1000).strftime("%d%b")}else{return Dygraph.hmsString_(b.getTime())}}}};Dygraph.Plotters=DygraphCanvasRenderer._Plotters;Dygraph.DEFAULT_ATTRS={highlightCircleSize:3,highlightSeriesOpts:null,highlightSeriesBackgroundAlpha:0.5,labelsDivWidth:250,labelsDivStyles:{},labelsSeparateLines:false,labelsShowZeroValues:true,labelsKMB:false,labelsKMG2:false,showLabelsOnHighlight:true,digitsAfterDecimal:2,maxNumberWidth:6,sigFigs:null,strokeWidth:1,strokeBorderWidth:0,strokeBorderColor:"white",axisTickSize:3,axisLabelFontSize:14,xAxisLabelWidth:50,yAxisLabelWidth:50,rightGap:5,showRoller:false,xValueParser:Dygraph.dateParser,delimiter:",",sigma:2,errorBars:false,fractions:false,wilsonInterval:true,customBars:false,fillGraph:false,fillAlpha:0.15,connectSeparatedPoints:false,stackedGraph:false,stackedGraphNaNFill:"all",hideOverlayOnMouseOut:true,legend:"onmouseover",stepPlot:false,avoidMinZero:false,xRangePad:0,yRangePad:null,drawAxesAtZero:false,titleHeight:28,xLabelHeight:18,yLabelWidth:18,drawXAxis:true,drawYAxis:true,axisLineColor:"black",axisLineWidth:0.3,gridLineWidth:0.3,axisLabelColor:"black",axisLabelFont:"Arial",axisLabelWidth:50,drawYGrid:true,drawXGrid:true,gridLineColor:"rgb(128,128,128)",interactionModel:null,animatedZooms:false,showRangeSelector:false,rangeSelectorHeight:40,rangeSelectorPlotStrokeColor:"#808FAB",rangeSelectorPlotFillColor:"#A7B1C4",plotter:[Dygraph.Plotters.fillPlotter,Dygraph.Plotters.errorPlotter,Dygraph.Plotters.linePlotter],plugins:[],axes:{x:{pixelsPerLabel:60,axisLabelFormatter:Dygraph.dateAxisFormatter,valueFormatter:Dygraph.dateString_,drawGrid:true,independentTicks:true,ticker:null},y:{pixelsPerLabel:30,valueFormatter:Dygraph.numberValueFormatter,axisLabelFormatter:Dygraph.numberAxisLabelFormatter,drawGrid:true,independentTicks:true,ticker:null},y2:{pixelsPerLabel:30,valueFormatter:Dygraph.numberValueFormatter,axisLabelFormatter:Dygraph.numberAxisLabelFormatter,drawGrid:false,independentTicks:false,ticker:null}}};Dygraph.HORIZONTAL=1;Dygraph.VERTICAL=2;Dygraph.PLUGINS=[];Dygraph.addedAnnotationCSS=false;Dygraph.prototype.__old_init__=function(f,d,e,b){if(e!==null){var a=["Date"];for(var c=0;c=0;d--){var f=a[d][0];var h=a[d][1];h.call(f,g);if(g.propagationStopped){break}}}return g.defaultPrevented};Dygraph.prototype.isZoomed=function(a){if(a===null||a===undefined){return this.zoomed_x_||this.zoomed_y_}if(a==="x"){return this.zoomed_x_}if(a==="y"){return this.zoomed_y_}throw"axis parameter is ["+a+"] must be null, 'x' or 'y'."};Dygraph.prototype.toString=function(){var a=this.maindiv_;var b=(a&&a.id)?a.id:a;return"[Dygraph "+b+"]"};Dygraph.prototype.attr_=function(b,a){return a?this.attributes_.getForSeries(b,a):this.attributes_.get(b)};Dygraph.prototype.getOption=function(a,b){return this.attr_(a,b)};Dygraph.prototype.getOptionForAxis=function(a,b){return this.attributes_.getForAxis(a,b)};Dygraph.prototype.optionsViewForAxis_=function(b){var a=this;return function(c){var d=a.user_attrs_.axes;if(d&&d[b]&&d[b].hasOwnProperty(c)){return d[b][c]}if(typeof(a.user_attrs_[c])!="undefined"){return a.user_attrs_[c]}d=a.attrs_.axes;if(d&&d[b]&&d[b].hasOwnProperty(c)){return d[b][c]}if(b=="y"&&a.axes_[0].hasOwnProperty(c)){return a.axes_[0][c]}else{if(b=="y2"&&a.axes_[1].hasOwnProperty(c)){return a.axes_[1][c]}}return a.attr_(c)}};Dygraph.prototype.rollPeriod=function(){return this.rollPeriod_};Dygraph.prototype.xAxisRange=function(){return this.dateWindow_?this.dateWindow_:this.xAxisExtremes()};Dygraph.prototype.xAxisExtremes=function(){var d=this.attr_("xRangePad")/this.plotter_.area.w;if(this.numRows()===0){return[0-d,1+d]}var c=this.rawData_[0][0];var b=this.rawData_[this.rawData_.length-1][0];if(d){var a=b-c;c-=a*d;b+=a*d}return[c,b]};Dygraph.prototype.yAxisRange=function(a){if(typeof(a)=="undefined"){a=0}if(a<0||a>=this.axes_.length){return null}var b=this.axes_[a];return[b.computedValueRange[0],b.computedValueRange[1]]};Dygraph.prototype.yAxisRanges=function(){var a=[];for(var b=0;bthis.rawData_.length){return null}if(a<0||a>this.rawData_[b].length){return null}return this.rawData_[b][a]};Dygraph.prototype.createInterface_=function(){var a=this.maindiv_;this.graphDiv=document.createElement("div");this.graphDiv.style.textAlign="left";a.appendChild(this.graphDiv);this.canvas_=Dygraph.createCanvas();this.canvas_.style.position="absolute";this.hidden_=this.createPlotKitCanvas_(this.canvas_);this.resizeElements_();this.canvas_ctx_=Dygraph.getContext(this.canvas_);this.hidden_ctx_=Dygraph.getContext(this.hidden_);this.graphDiv.appendChild(this.hidden_);this.graphDiv.appendChild(this.canvas_);this.mouseEventElement_=this.createMouseEventElement_();this.layout_=new DygraphLayout(this);var b=this;this.mouseMoveHandler_=function(c){b.mouseMove_(c)};this.mouseOutHandler_=function(f){var d=f.target||f.fromElement;var c=f.relatedTarget||f.toElement;if(Dygraph.isNodeContainedBy(d,b.graphDiv)&&!Dygraph.isNodeContainedBy(c,b.graphDiv)){b.mouseOut_(f)}};this.addAndTrackEvent(window,"mouseout",this.mouseOutHandler_);this.addAndTrackEvent(this.mouseEventElement_,"mousemove",this.mouseMoveHandler_);if(!this.resizeHandler_){this.resizeHandler_=function(c){b.resize()};this.addAndTrackEvent(window,"resize",this.resizeHandler_)}};Dygraph.prototype.resizeElements_=function(){this.graphDiv.style.width=this.width_+"px";this.graphDiv.style.height=this.height_+"px";this.canvas_.width=this.width_;this.canvas_.height=this.height_;this.canvas_.style.width=this.width_+"px";this.canvas_.style.height=this.height_+"px";this.hidden_.width=this.width_;this.hidden_.height=this.height_;this.hidden_.style.width=this.width_+"px";this.hidden_.style.height=this.height_+"px"};Dygraph.prototype.destroy=function(){this.canvas_ctx_.restore();this.hidden_ctx_.restore();var a=function(c){while(c.hasChildNodes()){a(c.firstChild);c.removeChild(c.firstChild)}};this.removeTrackedEvents_();Dygraph.removeEvent(window,"mouseout",this.mouseOutHandler_);Dygraph.removeEvent(this.mouseEventElement_,"mousemove",this.mouseMoveHandler_);Dygraph.removeEvent(window,"resize",this.resizeHandler_);this.resizeHandler_=null;a(this.maindiv_);var b=function(c){for(var d in c){if(typeof(c[d])==="object"){c[d]=null}}};b(this.layout_);b(this.plotter_);b(this)};Dygraph.prototype.createPlotKitCanvas_=function(a){var b=Dygraph.createCanvas();b.style.position="absolute";b.style.top=a.style.top;b.style.left=a.style.left;b.width=this.width_;b.height=this.height_;b.style.width=this.width_+"px";b.style.height=this.height_+"px";return b};Dygraph.prototype.createMouseEventElement_=function(){if(this.isUsingExcanvas_){var a=document.createElement("div");a.style.position="absolute";a.style.backgroundColor="white";a.style.filter="alpha(opacity=0)";a.style.width=this.width_+"px";a.style.height=this.height_+"px";this.graphDiv.appendChild(a);return a}else{return this.canvas_}};Dygraph.prototype.setColors_=function(){var g=this.getLabels();var e=g.length-1;this.colors_=[];this.colorsMap_={};var a=this.attr_("colors");var d;if(!a){var c=this.attr_("colorSaturation")||1;var b=this.attr_("colorValue")||0.5;var k=Math.ceil(e/2);for(d=1;d<=e;d++){if(!this.visibility()[d-1]){continue}var h=d%2?Math.ceil(d/2):(k+d/2);var f=(1*h/(1+e));var j=Dygraph.hsvToRGB(f,c,b);this.colors_.push(j);this.colorsMap_[g[d]]=j}}else{for(d=0;d=0;--b){var m=this.layout_.points[b];for(var g=0;g=l.length){continue}var m=l[e];if(!Dygraph.isValidPoint(m)){continue}var j=m.canvasy;if(i>m.canvasx&&e+10){var a=(i-m.canvasx)/o;j+=a*(k.canvasy-m.canvasy)}}}else{if(i0){var n=l[e-1];if(Dygraph.isValidPoint(n)){var o=m.canvasx-n.canvasx;if(o>0){var a=(m.canvasx-i)/o;j+=a*(n.canvasy-m.canvasy)}}}}if(d===0||j=0){var j=0;var k=this.attr_("labels");for(h=1;hj){j=c}}var l=this.previousVerticalX_;n.clearRect(l-j-1,0,2*j+2,this.height_)}}if(this.isUsingExcanvas_&&this.currentZoomRectArgs_){Dygraph.prototype.drawZoomRect_.apply(this,this.currentZoomRectArgs_)}if(this.selPoints_.length>0){var b=this.selPoints_[0].canvasx;n.save();for(h=0;h=0){if(f!=this.lastRow_){e=true}this.lastRow_=f;for(var d=0;d=0){e=true}this.lastRow_=-1}if(this.selPoints_.length){this.lastx_=this.selPoints_[0].xval}else{this.lastx_=-1}if(h!==undefined){if(this.highlightSet_!==h){e=true}this.highlightSet_=h}if(g!==undefined){this.lockedSet_=g}if(e){this.updateSelection_(undefined)}return e};Dygraph.prototype.mouseOut_=function(a){if(this.attr_("unhighlightCallback")){this.attr_("unhighlightCallback")(a)}if(this.attr_("hideOverlayOnMouseOut")&&!this.lockedSet_){this.clearSelection()}};Dygraph.prototype.clearSelection=function(){this.cascadeEvents_("deselect",{});this.lockedSet_=false;if(this.fadeLevel){this.animateSelection_(-1);return}this.canvas_ctx_.clearRect(0,0,this.width_,this.height_);this.fadeLevel=0;this.selPoints_=[];this.lastx_=-1;this.lastRow_=-1;this.highlightSet_=null};Dygraph.prototype.getSelection=function(){if(!this.selPoints_||this.selPoints_.length<1){return -1}for(var c=0;cg){a=g}if(ef){f=e}if(h===null||af){f=g}if(h===null||g=i){return}for(var p=i;po[1]){o[1]=a}if(a=1;u--){if(!this.visibility()[u-1]){continue}if(f){l=w[u];var z=f[0];var j=f[1];var g=null,y=null;for(r=0;r=z&&g===null){g=r}if(l[r][0]<=j){y=r}}if(g===null){g=0}var e=g;var d=true;while(d&&e>0){e--;d=b(l[e])}if(y===null){y=l.length-1}var c=y;d=true;while(d&&c0){this.setIndexByName_[g[0]]=0}var e=0;for(var f=1;f0){var a=this.readyFns_.pop();a(this)}}};Dygraph.prototype.computeYAxes_=function(){var b,d,c,f,a;if(this.axes_!==undefined&&this.user_attrs_.hasOwnProperty("valueRange")===false){b=[];for(c=0;c0){D=0}if(A<0){A=0}}if(D==Infinity){D=0}if(A==-Infinity){A=1}x=A-D;if(x===0){if(A!==0){x=Math.abs(A)}else{A=1;x=1}}var h,H;if(C){if(b){h=A+B*x;H=D}else{var E=Math.exp(Math.log(x)*B);h=A*E;H=D/E}}else{h=A+B*x;H=D-B*x;if(b&&!this.attr_("avoidMinZero")){if(H<0&&D>=0){H=0}if(h>0&&A<=0){h=0}}}c.extremeRange=[H,h]}if(c.valueWindow){c.computedValueRange=[c.valueWindow[0],c.valueWindow[1]]}else{if(c.valueRange){var e=g(c.valueRange[0])?c.extremeRange[0]:c.valueRange[0];var d=g(c.valueRange[1])?c.extremeRange[1]:c.valueRange[1];if(!b){if(c.logscale){var E=Math.exp(Math.log(x)*B);e*=E;d/=E}else{x=d-e;e-=x*B;d+=x*B}}c.computedValueRange=[e,d]}else{c.computedValueRange=c.extremeRange}}if(l){c.independentTicks=l;var r=this.optionsViewForAxis_("y"+(y?"2":""));var F=r("ticker");c.ticks=F(c.computedValueRange[0],c.computedValueRange[1],this.height_,r,this);if(!p){p=c}}}if(p===undefined){throw ('Configuration Error: At least one axis has to have the "independentTicks" option activated.')}for(var y=0;y=0){k-=l[z-d][1][0];h-=l[z-d][1][1]}var C=l[z][0];var w=h?k/h:0;if(this.attr_("errorBars")){if(this.attr_("wilsonInterval")){if(h){var s=w<0?0:w,u=h;var B=t*Math.sqrt(s*(1-s)/u+t*t/(4*u*u));var a=1+t*t/h;G=(s+t*t/(2*h)-B)/a;o=(s+t*t/(2*h)+B)/a;b[z]=[C,[s*e,(s-G)*e,(o-s)*e]]}else{b[z]=[C,[0,0,0]]}}else{A=h?t*Math.sqrt(w*(1-w)/h):1;b[z]=[C,[e*w,e*A,e*A]]}}else{b[z]=[C,e*w]}}}else{if(this.attr_("customBars")){G=0;var D=0;o=0;var g=0;for(z=0;z=0){var r=l[z-d];if(r[1][1]!==null&&!isNaN(r[1][1])){G-=r[1][0];D-=r[1][1];o-=r[1][2];g-=1}}if(g){b[z]=[l[z][0],[1*D/g,1*(D-G)/g,1*(o-D)/g]]}else{b[z]=[l[z][0],[null,null,null]]}}}else{if(!this.attr_("errorBars")){if(d==1){return l}for(z=0;z0&&(b[c-1]!="e"&&b[c-1]!="E"))||b.indexOf("/")>=0||isNaN(parseFloat(b))){a=true}else{if(b.length==8&&b>"19700101"&&b<"20371231"){a=true}}this.setXAxisOptions_(a)};Dygraph.prototype.setXAxisOptions_=function(a){if(a){this.attrs_.xValueParser=Dygraph.dateParser;this.attrs_.axes.x.valueFormatter=Dygraph.dateString_;this.attrs_.axes.x.ticker=Dygraph.dateTicker;this.attrs_.axes.x.axisLabelFormatter=Dygraph.dateAxisFormatter}else{this.attrs_.xValueParser=function(b){return parseFloat(b)};this.attrs_.axes.x.valueFormatter=function(b){return b};this.attrs_.axes.x.ticker=Dygraph.numericLinearTicks;this.attrs_.axes.x.axisLabelFormatter=this.attrs_.axes.x.valueFormatter}};Dygraph.prototype.parseFloat_=function(a,c,b){var e=parseFloat(a);if(!isNaN(e)){return e}if(/^ *$/.test(a)){return null}if(/^ *nan *$/i.test(a)){return NaN}var d="Unable to parse '"+a+"' as a number";if(b!==null&&c!==null){d+=" on line "+(1+c)+" ('"+b+"') of CSV."}this.error(d);return null};Dygraph.prototype.parseCSV_=function(t){var r=[];var s=Dygraph.detectLineDelimiter(t);var a=t.split(s||"\n");var g,k;var p=this.attr_("delimiter");if(a[0].indexOf(p)==-1&&a[0].indexOf("\t")>=0){p="\t"}var b=0;if(!("labels" in this.user_attrs_)){b=1;this.attrs_.labels=a[0].split(p);this.attributes_.reparseSeries()}var o=0;var m;var q=false;var c=this.attr_("labels").length;var f=false;for(var l=b;l0&&h[0]0){j=String.fromCharCode(65+(i-1)%26)+j.toLowerCase();i=Math.floor((i-1)/26)}return j};var h=w.getNumberOfColumns();var g=w.getNumberOfRows();var f=w.getColumnType(0);if(f=="date"||f=="datetime"){this.attrs_.xValueParser=Dygraph.dateParser;this.attrs_.axes.x.valueFormatter=Dygraph.dateString_;this.attrs_.axes.x.ticker=Dygraph.dateTicker;this.attrs_.axes.x.axisLabelFormatter=Dygraph.dateAxisFormatter}else{if(f=="number"){this.attrs_.xValueParser=function(i){return parseFloat(i)};this.attrs_.axes.x.valueFormatter=function(i){return i};this.attrs_.axes.x.ticker=Dygraph.numericLinearTicks;this.attrs_.axes.x.axisLabelFormatter=this.attrs_.axes.x.valueFormatter}else{this.error("only 'date', 'datetime' and 'number' types are supported for column 1 of DataTable input (Got '"+f+"')");return null}}var m=[];var t={};var s=false;var q,o;for(q=1;q0&&e[0]0){this.setAnnotations(a,true)}this.attributes_.reparseSeries()};Dygraph.prototype.start_=function(){var d=this.file_;if(typeof d=="function"){d=d()}if(Dygraph.isArrayLike(d)){this.rawData_=this.parseArray_(d);this.predraw_()}else{if(typeof d=="object"&&typeof d.getColumnRange=="function"){this.parseDataTable_(d);this.predraw_()}else{if(typeof d=="string"){var c=Dygraph.detectLineDelimiter(d);if(c){this.loadedEvent_(d)}else{var b;if(window.XMLHttpRequest){b=new XMLHttpRequest()}else{b=new ActiveXObject("Microsoft.XMLHTTP")}var a=this;b.onreadystatechange=function(){if(b.readyState==4){if(b.status===200||b.status===0){a.loadedEvent_(b.responseText)}}};b.open("GET",d,true);b.send(null)}}else{this.error("Unknown data format: "+(typeof d))}}}};Dygraph.prototype.updateOptions=function(e,b){if(typeof(b)=="undefined"){b=false}var d=e.file;var c=Dygraph.mapLegacyOptions_(e);if("rollPeriod" in c){this.rollPeriod_=c.rollPeriod}if("dateWindow" in c){this.dateWindow_=c.dateWindow;if(!("isZoomedIgnoreProgrammaticZoom" in c)){this.zoomed_x_=(c.dateWindow!==null)}}if("valueRange" in c&&!("isZoomedIgnoreProgrammaticZoom" in c)){this.zoomed_y_=(c.valueRange!==null)}var a=Dygraph.isPixelChangingOptionList(this.attr_("labels"),c);Dygraph.updateDeep(this.user_attrs_,c);this.attributes_.reparseSeries();if(d){this.file_=d;if(!b){this.start_()}}else{if(!b){if(a){this.predraw_()}else{this.renderGraph_(false)}}}};Dygraph.mapLegacyOptions_=function(c){var a={};for(var b in c){if(b=="file"){continue}if(c.hasOwnProperty(b)){a[b]=c[b]}}var e=function(g,f,h){if(!a.axes){a.axes={}}if(!a.axes[g]){a.axes[g]={}}a.axes[g][f]=h};var d=function(f,g,h){if(typeof(c[f])!="undefined"){Dygraph.warn("Option "+f+" is deprecated. Use the "+h+" option for the "+g+" axis instead. (e.g. { axes : { "+g+" : { "+h+" : ... } } } (see http://dygraphs.com/per-axis.html for more information.");e(g,h,c[f]);delete a[f]}};d("xValueFormatter","x","valueFormatter");d("pixelsPerXLabel","x","pixelsPerLabel");d("xAxisLabelFormatter","x","axisLabelFormatter");d("xTicker","x","ticker");d("yValueFormatter","y","valueFormatter");d("pixelsPerYLabel","y","pixelsPerLabel");d("yAxisLabelFormatter","y","axisLabelFormatter");d("yTicker","y","ticker");return a};Dygraph.prototype.resize=function(d,b){if(this.resize_lock){return}this.resize_lock=true;if((d===null)!=(b===null)){this.warn("Dygraph.resize() should be called with zero parameters or two non-NULL parameters. Pretending it was zero.");d=b=null}var a=this.width_;var c=this.height_;if(d){this.maindiv_.style.width=d+"px";this.maindiv_.style.height=b+"px";this.width_=d;this.height_=b}else{this.width_=this.maindiv_.clientWidth;this.height_=this.maindiv_.clientHeight}if(a!=this.width_||c!=this.height_){this.resizeElements_();this.predraw_()}this.resize_lock=false};Dygraph.prototype.adjustRoll=function(a){this.rollPeriod_=a;this.predraw_()};Dygraph.prototype.visibility=function(){if(!this.attr_("visibility")){this.attrs_.visibility=[]}while(this.attr_("visibility").length=a.length){this.warn("invalid series number in setVisibility: "+b)}else{a[b]=c;this.predraw_()}};Dygraph.prototype.size=function(){return{width:this.width_,height:this.height_}};Dygraph.prototype.setAnnotations=function(b,a){Dygraph.addAnnotationRule();this.annotations_=b;if(!this.layout_){this.warn("Tried to setAnnotations before dygraph was ready. Try setting them in a ready() block. See dygraphs.com/tests/annotation.html");return}this.layout_.setAnnotations(this.annotations_);if(!a){this.predraw_()}};Dygraph.prototype.annotations=function(){return this.annotations_};Dygraph.prototype.getLabels=function(){var a=this.attr_("labels");return a?a.slice():null};Dygraph.prototype.indexFromSetName=function(a){return this.setIndexByName_[a]};Dygraph.prototype.ready=function(a){if(this.is_initial_draw_){this.readyFns_.push(a)}else{a(this)}};Dygraph.addAnnotationRule=function(){if(Dygraph.addedAnnotationCSS){return}var f="border: 1px solid black; background-color: white; text-align: center;";var e=document.createElement("style");e.type="text/css";document.getElementsByTagName("head")[0].appendChild(e);for(var b=0;bb){return -1}if(i===null||i===undefined){i=0}var h=function(j){return j>=0&&ja){if(i>0){f=g-1;if(h(f)&&d[f]a){return g}}return Dygraph.binarySearch(a,d,i,g+1,b)}}}return -1};Dygraph.dateParser=function(a){var b;var c;if(a.search("-")==-1||a.search("T")!=-1||a.search("Z")!=-1){c=Dygraph.dateStrToMillis(a);if(c&&!isNaN(c)){return c}}if(a.search("-")!=-1){b=a.replace("-","/","g");while(b.search("-")!=-1){b=b.replace("-","/")}c=Dygraph.dateStrToMillis(b)}else{if(a.length==8){b=a.substr(0,4)+"/"+a.substr(4,2)+"/"+a.substr(6,2);c=Dygraph.dateStrToMillis(b)}else{c=Dygraph.dateStrToMillis(a)}}if(!c||isNaN(c)){Dygraph.error("Couldn't parse "+a+" as a date")}return c};Dygraph.dateStrToMillis=function(a){return new Date(a).getTime()};Dygraph.update=function(b,c){if(typeof(c)!="undefined"&&c!==null){for(var a in c){if(c.hasOwnProperty(a)){b[a]=c[a]}}}return b};Dygraph.updateDeep=function(b,d){function c(e){return(typeof Node==="object"?e instanceof Node:typeof e==="object"&&typeof e.nodeType==="number"&&typeof e.nodeName==="string")}if(typeof(d)!="undefined"&&d!==null){for(var a in d){if(d.hasOwnProperty(a)){if(d[a]===null){b[a]=null}else{if(Dygraph.isArrayLike(d[a])){b[a]=d[a].slice()}else{if(c(d[a])){b[a]=d[a]}else{if(typeof(d[a])=="object"){if(typeof(b[a])!="object"||b[a]===null){b[a]={}}Dygraph.updateDeep(b[a],d[a])}else{b[a]=d[a]}}}}}}}return b};Dygraph.isArrayLike=function(b){var a=typeof(b);if((a!="object"&&!(a=="function"&&typeof(b.item)=="function"))||b===null||typeof(b.length)!="number"||b.nodeType===3){return false}return true};Dygraph.isDateLike=function(a){if(typeof(a)!="object"||a===null||typeof(a.getTime)!="function"){return false}return true};Dygraph.clone=function(c){var b=[];for(var a=0;a=g){return}Dygraph.requestAnimFrame.call(window,function(){var l=new Date().getTime();var j=l-b;d=i;i=Math.floor(j/f);var k=i-d;var m=(i+k)>e;if(m||(i>=e)){h(e);a()}else{if(k!==0){h(i)}c()}})})()};Dygraph.isPixelChangingOptionList=function(h,e){var d={annotationClickHandler:true,annotationDblClickHandler:true,annotationMouseOutHandler:true,annotationMouseOverHandler:true,axisLabelColor:true,axisLineColor:true,axisLineWidth:true,clickCallback:true,digitsAfterDecimal:true,drawCallback:true,drawHighlightPointCallback:true,drawPoints:true,drawPointCallback:true,drawXGrid:true,drawYGrid:true,fillAlpha:true,gridLineColor:true,gridLineWidth:true,hideOverlayOnMouseOut:true,highlightCallback:true,highlightCircleSize:true,interactionModel:true,isZoomedIgnoreProgrammaticZoom:true,labelsDiv:true,labelsDivStyles:true,labelsDivWidth:true,labelsKMB:true,labelsKMG2:true,labelsSeparateLines:true,labelsShowZeroValues:true,legend:true,maxNumberWidth:true,panEdgeFraction:true,pixelsPerYLabel:true,pointClickCallback:true,pointSize:true,rangeSelectorPlotFillColor:true,rangeSelectorPlotStrokeColor:true,showLabelsOnHighlight:true,showRoller:true,sigFigs:true,strokeWidth:true,underlayCallback:true,unhighlightCallback:true,xAxisLabelFormatter:true,xTicker:true,xValueFormatter:true,yAxisLabelFormatter:true,yValueFormatter:true,zoomCallback:true};var a=false;var b={};if(h){for(var f=1;fc.boundedDates[1]){h=h-(a-c.boundedDates[1]);a=h+c.dateRange}}k.dateWindow_=[h,a];if(c.is2DPan){var d=c.dragEndY-c.dragStartY;for(var j=0;j=10&&e.dragDirection==Dygraph.HORIZONTAL){var f=Math.min(e.dragStartX,e.dragEndX),k=Math.max(e.dragStartX,e.dragEndX);f=Math.max(f,b.x);k=Math.min(k,b.x+b.w);if(f=10&&e.dragDirection==Dygraph.VERTICAL){var j=Math.min(e.dragStartY,e.dragEndY),a=Math.max(e.dragStartY,e.dragEndY);j=Math.max(j,b.y);a=Math.min(a,b.y+b.h);if(j1){d.startTimeForDoubleTapMs=null}var h=[];for(var c=0;c=2){d.initialPinchCenter={pageX:0.5*(h[0].pageX+h[1].pageX),pageY:0.5*(h[0].pageY+h[1].pageY),dataX:0.5*(h[0].dataX+h[1].dataX),dataY:0.5*(h[0].dataY+h[1].dataY)};var a=180/Math.PI*Math.atan2(d.initialPinchCenter.pageY-h[0].pageY,h[0].pageX-d.initialPinchCenter.pageX);a=Math.abs(a);if(a>90){a=90-a}d.touchDirections={x:(a<(90-45/2)),y:(a>45/2)}}}d.initialRange={x:e.xAxisRange(),y:e.yAxisRange()}};Dygraph.Interaction.moveTouch=function(n,q,d){d.startTimeForDoubleTapMs=null;var p,l=[];for(p=0;p=2){var e=(a[1].pageX-j.pageX);w=(l[1].pageX-h.pageX)/e;var v=(a[1].pageY-j.pageY);c=(l[1].pageY-h.pageY)/v}}w=Math.min(8,Math.max(0.125,w));c=Math.min(8,Math.max(0.125,c));var u=false;if(d.touchDirections.x){q.dateWindow_=[j.dataX-m.dataX+(d.initialRange.x[0]-j.dataX)/w,j.dataX-m.dataX+(d.initialRange.x[1]-j.dataX)/w];u=true}if(d.touchDirections.y){for(p=0;p<1;p++){var b=q.axes_[p];var s=q.attributes_.getForAxis("logscale",p);if(s){}else{b.valueWindow=[j.dataY-m.dataY+(d.initialRange.y[0]-j.dataY)/c,j.dataY-m.dataY+(d.initialRange.y[1]-j.dataY)/c];u=true}}}q.drawGraph_(false);if(u&&l.length>1&&q.attr_("zoomCallback")){var r=q.xAxisRange();q.attr_("zoomCallback")(r[0],r[1],q.yAxisRanges())}};Dygraph.Interaction.endTouch=function(e,d,c){if(e.touches.length!==0){Dygraph.Interaction.startTouch(e,d,c)}else{if(e.changedTouches.length==1){var a=new Date().getTime();var b=e.changedTouches[0];if(c.startTimeForDoubleTapMs&&a-c.startTimeForDoubleTapMs<500&&c.doubleTapX&&Math.abs(c.doubleTapX-b.screenX)<50&&c.doubleTapY&&Math.abs(c.doubleTapY-b.screenY)<50){d.resetZoom()}else{c.startTimeForDoubleTapMs=a;c.doubleTapX=b.screenX;c.doubleTapY=b.screenY}}}};Dygraph.Interaction.defaultModel={mousedown:function(c,b,a){if(c.button&&c.button==2){return}a.initializeMouseDown(c,b,a);if(c.altKey||c.shiftKey){Dygraph.startPan(c,b,a)}else{Dygraph.startZoom(c,b,a)}},mousemove:function(c,b,a){if(a.isZooming){Dygraph.moveZoom(c,b,a)}else{if(a.isPanning){Dygraph.movePan(c,b,a)}}},mouseup:function(c,b,a){if(a.isZooming){Dygraph.endZoom(c,b,a)}else{if(a.isPanning){Dygraph.endPan(c,b,a)}}},touchstart:function(c,b,a){Dygraph.Interaction.startTouch(c,b,a)},touchmove:function(c,b,a){Dygraph.Interaction.moveTouch(c,b,a)},touchend:function(c,b,a){Dygraph.Interaction.endTouch(c,b,a)},mouseout:function(c,b,a){if(a.isZooming){a.dragEndX=null;a.dragEndY=null;b.clearZoomRect_()}},dblclick:function(c,b,a){if(a.cancelNextDblclick){a.cancelNextDblclick=false;return}if(c.altKey||c.shiftKey){return}b.resetZoom()}};Dygraph.DEFAULT_ATTRS.interactionModel=Dygraph.Interaction.defaultModel;Dygraph.defaultInteractionModel=Dygraph.Interaction.defaultModel;Dygraph.endZoom=Dygraph.Interaction.endZoom;Dygraph.moveZoom=Dygraph.Interaction.moveZoom;Dygraph.startZoom=Dygraph.Interaction.startZoom;Dygraph.endPan=Dygraph.Interaction.endPan;Dygraph.movePan=Dygraph.Interaction.movePan;Dygraph.startPan=Dygraph.Interaction.startPan;Dygraph.Interaction.nonInteractiveModel_={mousedown:function(c,b,a){a.initializeMouseDown(c,b,a)},mouseup:function(c,b,a){a.dragEndX=b.dragGetX_(c,a);a.dragEndY=b.dragGetY_(c,a);var e=Math.abs(a.dragEndX-a.dragStartX);var d=Math.abs(a.dragEndY-a.dragStartY);if(e<2&&d<2&&b.lastx_!==undefined&&b.lastx_!=-1){Dygraph.Interaction.treatMouseOpAsClick(b,c,a)}}};Dygraph.Interaction.dragIsPanInteractionModel={mousedown:function(c,b,a){a.initializeMouseDown(c,b,a);Dygraph.startPan(c,b,a)},mousemove:function(c,b,a){if(a.isPanning){Dygraph.movePan(c,b,a)}},mouseup:function(c,b,a){if(a.isPanning){Dygraph.endPan(c,b,a)}}};"use strict";Dygraph.TickList=undefined;Dygraph.Ticker=undefined;Dygraph.numericLinearTicks=function(d,c,i,g,f,h){var e=function(a){if(a==="logscale"){return false}return g(a)};return Dygraph.numericTicks(d,c,i,e,f,h)};Dygraph.numericTicks=function(F,E,u,p,d,q){var z=(p("pixelsPerLabel"));var G=[];var C,A,t,y;if(q){for(C=0;C=y/4){for(var r=H;r>=l;r--){var m=Dygraph.PREFERRED_LOG_TICK_VALUES[r];var k=Math.log(m/F)/Math.log(E/F)*u;var D={v:m};if(s===null){s={tickValue:m,pixel_coord:k}}else{if(Math.abs(k-s.pixel_coord)>=z){s={tickValue:m,pixel_coord:k}}else{D.label=""}}G.push(D)}G.reverse()}}if(G.length===0){var g=p("labelsKMG2");var n,h;if(g){n=[1,2,4,8,16,32,64,128,256];h=16}else{n=[1,2,5,10,20,50,100];h=10}var w=Math.ceil(u/z);var o=Math.abs(E-F)/w;var v=Math.floor(Math.log(o)/Math.log(h));var f=Math.pow(h,v);var I,x,c,e;for(A=0;Az){break}}if(x>c){I*=-1}for(C=0;C=0){return Dygraph.getDateAxis(e,c,d,g,f)}else{return[]}};Dygraph.SECONDLY=0;Dygraph.TWO_SECONDLY=1;Dygraph.FIVE_SECONDLY=2;Dygraph.TEN_SECONDLY=3;Dygraph.THIRTY_SECONDLY=4;Dygraph.MINUTELY=5;Dygraph.TWO_MINUTELY=6;Dygraph.FIVE_MINUTELY=7;Dygraph.TEN_MINUTELY=8;Dygraph.THIRTY_MINUTELY=9;Dygraph.HOURLY=10;Dygraph.TWO_HOURLY=11;Dygraph.SIX_HOURLY=12;Dygraph.DAILY=13;Dygraph.WEEKLY=14;Dygraph.MONTHLY=15;Dygraph.QUARTERLY=16;Dygraph.BIANNUAL=17;Dygraph.ANNUAL=18;Dygraph.DECADAL=19;Dygraph.CENTENNIAL=20;Dygraph.NUM_GRANULARITIES=21;Dygraph.SHORT_SPACINGS=[];Dygraph.SHORT_SPACINGS[Dygraph.SECONDLY]=1000*1;Dygraph.SHORT_SPACINGS[Dygraph.TWO_SECONDLY]=1000*2;Dygraph.SHORT_SPACINGS[Dygraph.FIVE_SECONDLY]=1000*5;Dygraph.SHORT_SPACINGS[Dygraph.TEN_SECONDLY]=1000*10;Dygraph.SHORT_SPACINGS[Dygraph.THIRTY_SECONDLY]=1000*30;Dygraph.SHORT_SPACINGS[Dygraph.MINUTELY]=1000*60;Dygraph.SHORT_SPACINGS[Dygraph.TWO_MINUTELY]=1000*60*2;Dygraph.SHORT_SPACINGS[Dygraph.FIVE_MINUTELY]=1000*60*5;Dygraph.SHORT_SPACINGS[Dygraph.TEN_MINUTELY]=1000*60*10;Dygraph.SHORT_SPACINGS[Dygraph.THIRTY_MINUTELY]=1000*60*30;Dygraph.SHORT_SPACINGS[Dygraph.HOURLY]=1000*3600;Dygraph.SHORT_SPACINGS[Dygraph.TWO_HOURLY]=1000*3600*2;Dygraph.SHORT_SPACINGS[Dygraph.SIX_HOURLY]=1000*3600*6;Dygraph.SHORT_SPACINGS[Dygraph.DAILY]=1000*86400;Dygraph.SHORT_SPACINGS[Dygraph.WEEKLY]=1000*604800;Dygraph.LONG_TICK_PLACEMENTS=[];Dygraph.LONG_TICK_PLACEMENTS[Dygraph.MONTHLY]={months:[0,1,2,3,4,5,6,7,8,9,10,11],year_mod:1};Dygraph.LONG_TICK_PLACEMENTS[Dygraph.QUARTERLY]={months:[0,3,6,9],year_mod:1};Dygraph.LONG_TICK_PLACEMENTS[Dygraph.BIANNUAL]={months:[0,6],year_mod:1};Dygraph.LONG_TICK_PLACEMENTS[Dygraph.ANNUAL]={months:[0],year_mod:1};Dygraph.LONG_TICK_PLACEMENTS[Dygraph.DECADAL]={months:[0],year_mod:10};Dygraph.LONG_TICK_PLACEMENTS[Dygraph.CENTENNIAL]={months:[0],year_mod:100};Dygraph.PREFERRED_LOG_TICK_VALUES=function(){var c=[];for(var b=-39;b<=39;b++){var a=Math.pow(10,b);for(var d=1;d<=9;d++){var e=a*d;c.push(e)}}return c}();Dygraph.pickDateTickGranularity=function(d,c,j,h){var g=(h("pixelsPerLabel"));for(var f=0;f=g){return f}}return -1};Dygraph.numDateTicks=function(e,b,f){if(f=Dygraph.SHORT_SPACINGS[Dygraph.TWO_HOURLY]);for(m=p;m<=l;m+=c){A=new Date(m);if(e&&A.getTimezoneOffset()!=B){var k=A.getTimezoneOffset()-B;m+=k*60*1000;A=new Date(m);B=A.getTimezoneOffset();if(new Date(m+c).getTimezoneOffset()!=B){m+=c;A=new Date(m);B=A.getTimezoneOffset()}}C.push({v:m,label:w(A,a,n,z)})}}else{var f;var r=1;if(al){continue}C.push({v:m,label:w(new Date(m),a,n,z)})}}}return C};if(Dygraph&&Dygraph.DEFAULT_ATTRS&&Dygraph.DEFAULT_ATTRS.axes&&Dygraph.DEFAULT_ATTRS.axes["x"]&&Dygraph.DEFAULT_ATTRS.axes["y"]&&Dygraph.DEFAULT_ATTRS.axes["y2"]){Dygraph.DEFAULT_ATTRS.axes["x"]["ticker"]=Dygraph.dateTicker;Dygraph.DEFAULT_ATTRS.axes["y"]["ticker"]=Dygraph.numericTicks;Dygraph.DEFAULT_ATTRS.axes["y2"]["ticker"]=Dygraph.numericTicks}Dygraph.Plugins={};Dygraph.Plugins.Annotations=(function(){var a=function(){this.annotations_=[]};a.prototype.toString=function(){return"Annotations Plugin"};a.prototype.activate=function(b){return{clearChart:this.clearChart,didDrawChart:this.didDrawChart}};a.prototype.detachLabels=function(){for(var c=0;cu.x+u.w||l.canvasyu.y+u.h){continue}var w=l.annotation;var n=6;if(w.hasOwnProperty("tickHeight")){n=w.tickHeight}var j=document.createElement("div");for(var A in x){if(x.hasOwnProperty(A)){j.style[A]=x[A]}}if(!w.hasOwnProperty("icon")){j.className="dygraphDefaultAnnotation"}if(w.hasOwnProperty("cssClass")){j.className+=" "+w.cssClass}var m=w.hasOwnProperty("width")?w.width:16;var k=w.hasOwnProperty("height")?w.height:16;if(w.hasOwnProperty("icon")){var z=document.createElement("img");z.src=w.icon;z.width=m;z.height=k;j.appendChild(z)}else{if(l.annotation.hasOwnProperty("shortText")){j.appendChild(document.createTextNode(l.annotation.shortText))}}var c=l.canvasx-m/2;j.style.left=c+"px";var f=0;if(w.attachAtBottom){var d=(u.y+u.h-k-n);if(q[c]){d-=q[c]}else{q[c]=0}q[c]+=(n+k);f=d}else{f=l.canvasy-k-n}j.style.top=f+"px";j.style.width=m+"px";j.style.height=k+"px";j.title=l.annotation.text;j.style.color=t.colorsMap_[l.name];j.style.borderColor=t.colorsMap_[l.name];w.div=j;t.addAndTrackEvent(j,"click",b("clickHandler","annotationClickHandler",l,this));t.addAndTrackEvent(j,"mouseover",b("mouseOverHandler","annotationMouseOverHandler",l,this));t.addAndTrackEvent(j,"mouseout",b("mouseOutHandler","annotationMouseOutHandler",l,this));t.addAndTrackEvent(j,"dblclick",b("dblClickHandler","annotationDblClickHandler",l,this));h.appendChild(j);this.annotations_.push(j);var o=v.drawingContext;o.save();o.strokeStyle=t.colorsMap_[l.name];o.beginPath();if(!w.attachAtBottom){o.moveTo(l.canvasx,l.canvasy);o.lineTo(l.canvasx,l.canvasy-2-n)}else{var d=f+k;o.moveTo(l.canvasx,d);o.lineTo(l.canvasx,d+n)}o.closePath();o.stroke();o.restore()}};a.prototype.destroy=function(){this.detachLabels()};return a})();Dygraph.Plugins.Axes=(function(){var a=function(){this.xlabels_=[];this.ylabels_=[]};a.prototype.toString=function(){return"Axes Plugin"};a.prototype.activate=function(b){return{layout:this.layout,clearChart:this.clearChart,willDrawChart:this.willDrawChart}};a.prototype.layout=function(f){var d=f.dygraph;if(d.getOption("drawYAxis")){var b=d.getOption("yAxisLabelWidth")+2*d.getOption("axisTickSize");f.reserveSpaceLeft(b)}if(d.getOption("drawXAxis")){var c;if(d.getOption("xAxisHeight")){c=d.getOption("xAxisHeight")}else{c=d.getOptionForAxis("axisLabelFontSize","x")+2*d.getOption("axisTickSize")}f.reserveSpaceBottom(c)}if(d.numAxes()==2){if(d.getOption("drawYAxis")){var b=d.getOption("yAxisLabelWidth")+2*d.getOption("axisTickSize");f.reserveSpaceRight(b)}}else{if(d.numAxes()>2){d.error("Only two y-axes are supported at this time. (Trying to use "+d.numAxes()+")")}}};a.prototype.detachLabels=function(){function b(d){for(var c=0;c0){var h=F.numAxes();for(D=0;Dd){s.style.bottom="0px"}else{s.style.top=z+"px"}if(E[0]===0){s.style.left=(G.x-F.getOption("yAxisLabelWidth")-F.getOption("axisTickSize"))+"px";s.style.textAlign="right"}else{if(E[0]==1){s.style.left=(G.x+G.w+F.getOption("axisTickSize"))+"px";s.style.textAlign="left"}}s.style.width=F.getOption("yAxisLabelWidth")+"px";v.appendChild(s);this.ylabels_.push(s)}var n=this.ylabels_[0];var k=F.getOptionForAxis("axisLabelFontSize","y");var q=parseInt(n.style.top,10)+k;if(q>d-k){n.style.top=(parseInt(n.style.top,10)-k/2)+"px"}}var c;if(F.getOption("drawAxesAtZero")){var w=F.toPercentXCoord(0);if(w>1||w<0||isNaN(w)){w=0}c=B(G.x+w*G.w)}else{c=B(G.x)}j.strokeStyle=F.getOptionForAxis("axisLineColor","y");j.lineWidth=F.getOptionForAxis("axisLineWidth","y");j.beginPath();j.moveTo(c,A(G.y));j.lineTo(c,A(G.y+G.h));j.closePath();j.stroke();if(F.numAxes()==2){j.strokeStyle=F.getOptionForAxis("axisLineColor","y2");j.lineWidth=F.getOptionForAxis("axisLineWidth","y2");j.beginPath();j.moveTo(A(G.x+G.w),A(G.y));j.lineTo(A(G.x+G.w),A(G.y+G.h));j.closePath();j.stroke()}}if(F.getOption("drawXAxis")){if(I.xticks){for(D=0;DJ){l=J-F.getOption("xAxisLabelWidth");s.style.textAlign="right"}if(l<0){l=0;s.style.textAlign="left"}s.style.left=l+"px";s.style.width=F.getOption("xAxisLabelWidth")+"px";v.appendChild(s);this.xlabels_.push(s)}}j.strokeStyle=F.getOptionForAxis("axisLineColor","x");j.lineWidth=F.getOptionForAxis("axisLineWidth","x");j.beginPath();var b;if(F.getOption("drawAxesAtZero")){var w=F.toPercentYCoord(0,0);if(w>1||w<0){w=1}b=A(G.y+w*G.h)}else{b=A(G.y+G.h)}j.moveTo(B(G.x),b);j.lineTo(B(G.x+G.w),b);j.closePath();j.stroke()}j.restore()};return a})();Dygraph.Plugins.ChartLabels=(function(){var c=function(){this.title_div_=null;this.xlabel_div_=null;this.ylabel_div_=null;this.y2label_div_=null};c.prototype.toString=function(){return"ChartLabels Plugin"};c.prototype.activate=function(d){return{layout:this.layout,didDrawChart:this.didDrawChart}};var b=function(d){var e=document.createElement("div");e.style.position="absolute";e.style.left=d.x+"px";e.style.top=d.y+"px";e.style.width=d.w+"px";e.style.height=d.h+"px";return e};c.prototype.detachLabels_=function(){var e=[this.title_div_,this.xlabel_div_,this.ylabel_div_,this.y2label_div_];for(var d=0;d=2)}}u=t.yticks;l.save();for(p=0;p=2);if(n){l.installPattern(d)}l.strokeStyle=q.getOptionForAxis("gridLineColor","x");l.lineWidth=q.getOptionForAxis("gridLineWidth","x");for(p=0;p":" ")}m=w.getOption("strokePattern",z[u]);s=d(m,q.color,f);r+=""+s+" "+z[u]+""}return r}var A=w.optionsViewForAxis_("x");var o=A("valueFormatter");r=o(p,A,z[0],w);if(r!==""){r+=":"}var v=[];var j=w.numAxes();for(u=0;u"}var q=w.getPropertiesForSeries(t.name);var n=v[q.axis-1];var y=n("valueFormatter");var e=y(t.yval,n,t.name,w);var h=(t.name==B)?" class='highlight'":"";r+=" "+t.name+": "+e+""}return r};d=function(s,h,r){var e=(/MSIE/.test(navigator.userAgent)&&!window.opera);if(e){return"—"}if(!s||s.length<=1){return'
          '}var l,k,f,o;var g=0,q=0;var p=[];var n;for(l=0;l<=s.length;l++){g+=s[l%s.length]}n=Math.floor(r/(g-s[0]));if(n>1){for(l=0;l'}}return m};return c})();Dygraph.Plugins.RangeSelector=(function(){var a=function(){this.isIE_=/MSIE/.test(navigator.userAgent)&&!window.opera;this.hasTouchInterface_=typeof(TouchEvent)!="undefined";this.isMobileDevice_=/mobile|android/gi.test(navigator.appVersion);this.interfaceCreated_=false};a.prototype.toString=function(){return"RangeSelector Plugin"};a.prototype.activate=function(b){this.dygraph_=b;this.isUsingExcanvas_=b.isUsingExcanvas_;if(this.getOption_("showRangeSelector")){this.createInterface_()}return{layout:this.reserveSpace_,predraw:this.renderStaticLayer_,didDrawChart:this.renderInteractiveLayer_}};a.prototype.destroy=function(){this.bgcanvas_=null;this.fgcanvas_=null;this.leftZoomHandle_=null;this.rightZoomHandle_=null;this.iePanOverlay_=null};a.prototype.getOption_=function(b){return this.dygraph_.getOption(b)};a.prototype.setDefaultOption_=function(b,c){return this.dygraph_.attrs_[b]=c};a.prototype.createInterface_=function(){this.createCanvases_();if(this.isUsingExcanvas_){this.createIEPanOverlay_()}this.createZoomHandles_();this.initInteraction_();if(this.getOption_("animatedZooms")){this.dygraph_.warn("Animated zooms and range selector are not compatible; disabling animatedZooms.");this.dygraph_.updateOptions({animatedZooms:false},true)}this.interfaceCreated_=true;this.addToGraph_()};a.prototype.addToGraph_=function(){var b=this.graphDiv_=this.dygraph_.graphDiv;b.appendChild(this.bgcanvas_);b.appendChild(this.fgcanvas_);b.appendChild(this.leftZoomHandle_);b.appendChild(this.rightZoomHandle_)};a.prototype.removeFromGraph_=function(){var b=this.graphDiv_;b.removeChild(this.bgcanvas_);b.removeChild(this.fgcanvas_);b.removeChild(this.leftZoomHandle_);b.removeChild(this.rightZoomHandle_);this.graphDiv_=null};a.prototype.reserveSpace_=function(b){if(this.getOption_("showRangeSelector")){b.reserveSpaceBottom(this.getOption_("rangeSelectorHeight")+4)}};a.prototype.renderStaticLayer_=function(){if(!this.updateVisibility_()){return}this.resize_();this.drawStaticLayer_()};a.prototype.renderInteractiveLayer_=function(){if(!this.updateVisibility_()||this.isChangingRange_){return}this.placeZoomHandles_();this.drawInteractiveLayer_()};a.prototype.updateVisibility_=function(){var b=this.getOption_("showRangeSelector");if(b){if(!this.interfaceCreated_){this.createInterface_()}else{if(!this.graphDiv_||!this.graphDiv_.parentNode){this.addToGraph_()}}}else{if(this.graphDiv_){this.removeFromGraph_();var c=this.dygraph_;setTimeout(function(){c.width_=0;c.resize()},1)}}return b};a.prototype.resize_=function(){function d(e,f){e.style.top=f.y+"px";e.style.left=f.x+"px";e.width=f.w;e.height=f.h;e.style.width=e.width+"px";e.style.height=e.height+"px"}var c=this.dygraph_.layout_.getPlotArea();var b=0;if(this.getOption_("drawXAxis")){b=this.getOption_("xAxisHeight")||(this.getOption_("axisLabelFontSize")+2*this.getOption_("axisTickSize"))}this.canvasRect_={x:c.x,y:c.y+c.h+b+4,w:c.w,h:this.getOption_("rangeSelectorHeight")};d(this.bgcanvas_,this.canvasRect_);d(this.fgcanvas_,this.canvasRect_)};a.prototype.createCanvases_=function(){this.bgcanvas_=Dygraph.createCanvas();this.bgcanvas_.className="dygraph-rangesel-bgcanvas";this.bgcanvas_.style.position="absolute";this.bgcanvas_.style.zIndex=9;this.bgcanvas_ctx_=Dygraph.getContext(this.bgcanvas_);this.fgcanvas_=Dygraph.createCanvas();this.fgcanvas_.className="dygraph-rangesel-fgcanvas";this.fgcanvas_.style.position="absolute";this.fgcanvas_.style.zIndex=9;this.fgcanvas_.style.cursor="default";this.fgcanvas_ctx_=Dygraph.getContext(this.fgcanvas_)};a.prototype.createIEPanOverlay_=function(){this.iePanOverlay_=document.createElement("div");this.iePanOverlay_.style.position="absolute";this.iePanOverlay_.style.backgroundColor="white";this.iePanOverlay_.style.filter="alpha(opacity=0)";this.iePanOverlay_.style.display="none";this.iePanOverlay_.style.cursor="move";this.fgcanvas_.appendChild(this.iePanOverlay_)};a.prototype.createZoomHandles_=function(){var b=new Image();b.className="dygraph-rangesel-zoomhandle";b.style.position="absolute";b.style.zIndex=10;b.style.visibility="hidden";b.style.cursor="col-resize";if(/MSIE 7/.test(navigator.userAgent)){b.width=7;b.height=14;b.style.backgroundColor="white";b.style.border="1px solid #333333"}else{b.width=9;b.height=16;b.src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAQCAYAAADESFVDAAAAAXNSR0IArs4c6QAAAAZiS0dEANAAzwDP4Z7KegAAAAlwSFlzAAAOxAAADsQBlSsOGwAAAAd0SU1FB9sHGw0cMqdt1UwAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAaElEQVQoz+3SsRFAQBCF4Z9WJM8KCDVwownl6YXsTmCUsyKGkZzcl7zkz3YLkypgAnreFmDEpHkIwVOMfpdi9CEEN2nGpFdwD03yEqDtOgCaun7sqSTDH32I1pQA2Pb9sZecAxc5r3IAb21d6878xsAAAAAASUVORK5CYII="}if(this.isMobileDevice_){b.width*=2;b.height*=2}this.leftZoomHandle_=b;this.rightZoomHandle_=b.cloneNode(false)};a.prototype.initInteraction_=function(){var o=this;var i=this.isIE_?document:window;var u=0;var v=null;var s=false;var d=false;var g=!this.isMobileDevice_&&!this.isUsingExcanvas_;var k=new Dygraph.IFrameTarp();var p,f,r,j,w,h,x,t,q,c,l;var e,n,m;p=function(C){var B=o.dygraph_.xAxisExtremes();var z=(B[1]-B[0])/o.canvasRect_.w;var A=B[0]+(C.leftHandlePos-o.canvasRect_.x)*z;var y=B[0]+(C.rightHandlePos-o.canvasRect_.x)*z;return[A,y]};f=function(y){Dygraph.cancelEvent(y);s=true;u=y.clientX;v=y.target?y.target:y.srcElement;if(y.type==="mousedown"||y.type==="dragstart"){Dygraph.addEvent(i,"mousemove",r);Dygraph.addEvent(i,"mouseup",j)}o.fgcanvas_.style.cursor="col-resize";k.cover();return true};r=function(C){if(!s){return false}Dygraph.cancelEvent(C);var z=C.clientX-u;if(Math.abs(z)<4){return true}u=C.clientX;var B=o.getZoomHandleStatus_();var y;if(v==o.leftZoomHandle_){y=B.leftHandlePos+z;y=Math.min(y,B.rightHandlePos-v.width-3);y=Math.max(y,o.canvasRect_.x)}else{y=B.rightHandlePos+z;y=Math.min(y,o.canvasRect_.x+o.canvasRect_.w);y=Math.max(y,B.leftHandlePos+v.width+3)}var A=v.width/2;v.style.left=(y-A)+"px";o.drawInteractiveLayer_();if(g){w()}return true};j=function(y){if(!s){return false}s=false;k.uncover();Dygraph.removeEvent(i,"mousemove",r);Dygraph.removeEvent(i,"mouseup",j);o.fgcanvas_.style.cursor="default";if(!g){w()}return true};w=function(){try{var z=o.getZoomHandleStatus_();o.isChangingRange_=true;if(!z.isZoomed){o.dygraph_.resetZoom()}else{var y=p(z);o.dygraph_.doZoomXDates_(y[0],y[1])}}finally{o.isChangingRange_=false}};h=function(A){if(o.isUsingExcanvas_){return A.srcElement==o.iePanOverlay_}else{var z=o.leftZoomHandle_.getBoundingClientRect();var y=z.left+z.width/2;z=o.rightZoomHandle_.getBoundingClientRect();var B=z.left+z.width/2;return(A.clientX>y&&A.clientX=o.canvasRect_.x+o.canvasRect_.w){y=o.canvasRect_.x+o.canvasRect_.w;E=y-D}else{E+=z;y+=z}}var A=o.leftZoomHandle_.width/2;o.leftZoomHandle_.style.left=(E-A)+"px";o.rightZoomHandle_.style.left=(y-A)+"px";o.drawInteractiveLayer_();if(g){c()}return true};q=function(y){if(!d){return false}d=false;Dygraph.removeEvent(i,"mousemove",t);Dygraph.removeEvent(i,"mouseup",q);if(!g){c()}return true};c=function(){try{o.isChangingRange_=true;o.dygraph_.dateWindow_=p(o.getZoomHandleStatus_());o.dygraph_.drawGraph_(false)}finally{o.isChangingRange_=false}};l=function(y){if(s||d){return}var z=h(y)?"move":"default";if(z!=o.fgcanvas_.style.cursor){o.fgcanvas_.style.cursor=z}};e=function(y){if(y.type=="touchstart"&&y.targetTouches.length==1){if(f(y.targetTouches[0])){Dygraph.cancelEvent(y)}}else{if(y.type=="touchmove"&&y.targetTouches.length==1){if(r(y.targetTouches[0])){Dygraph.cancelEvent(y)}}else{j(y)}}};n=function(y){if(y.type=="touchstart"&&y.targetTouches.length==1){if(x(y.targetTouches[0])){Dygraph.cancelEvent(y)}}else{if(y.type=="touchmove"&&y.targetTouches.length==1){if(t(y.targetTouches[0])){Dygraph.cancelEvent(y)}}else{q(y)}}};m=function(B,A){var z=["touchstart","touchend","touchmove","touchcancel"];for(var y=0;y1&&v[t][1]!==null){m=typeof v[t][1]!="number";if(m){d=[];h=[];for(r=0;r0)){b=Math.min(b,g);c=Math.max(c,g)}}var o=0.25;if(u){c=Dygraph.log10(c);c+=c*o;b=Dygraph.log10(b);for(t=0;tthis.canvasRect_.x||b+11;b/=10){a=c.toString()+a}return a.toString()};Date.prototype.locale="en-GB";if(document.getElementsByTagName("html")&&document.getElementsByTagName("html")[0].lang){Date.prototype.locale=document.getElementsByTagName("html")[0].lang}Date.ext.locales={};Date.ext.locales.en={a:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],A:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],b:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],B:["January","February","March","April","May","June","July","August","September","October","November","December"],c:"%a %d %b %Y %T %Z",p:["AM","PM"],P:["am","pm"],x:"%d/%m/%y",X:"%T"};Date.ext.locales["en-US"]=Date.ext.locales.en;Date.ext.locales["en-US"].c="%a %d %b %Y %r %Z";Date.ext.locales["en-US"].x="%D";Date.ext.locales["en-US"].X="%r";Date.ext.locales["en-GB"]=Date.ext.locales.en;Date.ext.locales["en-AU"]=Date.ext.locales["en-GB"];Date.ext.formats={a:function(a){return Date.ext.locales[a.locale].a[a.getDay()]},A:function(a){return Date.ext.locales[a.locale].A[a.getDay()]},b:function(a){return Date.ext.locales[a.locale].b[a.getMonth()]},B:function(a){return Date.ext.locales[a.locale].B[a.getMonth()]},c:"toLocaleString",C:function(a){return Date.ext.util.xPad(parseInt(a.getFullYear()/100,10),0)},d:["getDate","0"],e:["getDate"," "],g:function(a){return Date.ext.util.xPad(parseInt(Date.ext.util.G(a)/100,10),0)},G:function(c){var e=c.getFullYear();var b=parseInt(Date.ext.formats.V(c),10);var a=parseInt(Date.ext.formats.W(c),10);if(a>b){e++}else{if(a===0&&b>=52){e--}}return e},H:["getHours","0"],I:function(b){var a=b.getHours()%12;return Date.ext.util.xPad(a===0?12:a,0)},j:function(c){var a=c-new Date(""+c.getFullYear()+"/1/1 GMT");a+=c.getTimezoneOffset()*60000;var b=parseInt(a/60000/60/24,10)+1;return Date.ext.util.xPad(b,0,100)},m:function(a){return Date.ext.util.xPad(a.getMonth()+1,0)},M:["getMinutes","0"],p:function(a){return Date.ext.locales[a.locale].p[a.getHours()>=12?1:0]},P:function(a){return Date.ext.locales[a.locale].P[a.getHours()>=12?1:0]},S:["getSeconds","0"],u:function(a){var b=a.getDay();return b===0?7:b},U:function(e){var a=parseInt(Date.ext.formats.j(e),10);var c=6-e.getDay();var b=parseInt((a+c)/7,10);return Date.ext.util.xPad(b,0)},V:function(e){var c=parseInt(Date.ext.formats.W(e),10);var a=(new Date(""+e.getFullYear()+"/1/1")).getDay();var b=c+(a>4||a<=1?0:1);if(b==53&&(new Date(""+e.getFullYear()+"/12/31")).getDay()<4){b=1}else{if(b===0){b=Date.ext.formats.V(new Date(""+(e.getFullYear()-1)+"/12/31"))}}return Date.ext.util.xPad(b,0)},w:"getDay",W:function(e){var a=parseInt(Date.ext.formats.j(e),10);var c=7-Date.ext.formats.u(e);var b=parseInt((a+c)/7,10);return Date.ext.util.xPad(b,0,10)},y:function(a){return Date.ext.util.xPad(a.getFullYear()%100,0)},Y:"getFullYear",z:function(c){var b=c.getTimezoneOffset();var a=Date.ext.util.xPad(parseInt(Math.abs(b/60),10),0);var e=Date.ext.util.xPad(b%60,0);return(b>0?"-":"+")+a+e},Z:function(a){return a.toString().replace(/^.*\(([^)]+)\)$/,"$1")},"%":function(a){return"%"}};Date.ext.aggregates={c:"locale",D:"%m/%d/%y",h:"%b",n:"\n",r:"%I:%M:%S %p",R:"%H:%M",t:"\t",T:"%H:%M:%S",x:"locale",X:"locale"};Date.ext.aggregates.z=Date.ext.formats.z(new Date());Date.ext.aggregates.Z=Date.ext.formats.Z(new Date());Date.ext.unsupported={};Date.prototype.strftime=function(a){if(!(this.locale in Date.ext.locales)){if(this.locale.replace(/-[a-zA-Z]+$/,"") in Date.ext.locales){this.locale=this.locale.replace(/-[a-zA-Z]+$/,"")}else{this.locale="en-GB"}}var c=this;while(a.match(/%[cDhnrRtTxXzZ]/)){a=a.replace(/%([cDhnrRtTxXzZ])/g,function(e,d){var g=Date.ext.aggregates[d];return(g=="locale"?Date.ext.locales[c.locale][d]:g)})}var b=a.replace(/%([aAbBCdegGHIjmMpPSuUVwWyY%])/g,function(e,d){var g=Date.ext.formats[d];if(typeof(g)=="string"){return c[g]()}else{if(typeof(g)=="function"){return g.call(c,c)}else{if(typeof(g)=="object"&&typeof(g[0])=="string"){return Date.ext.util.xPad(c[g[0]](),g[1])}else{return d}}}});c=null;return b};"use strict";function RGBColorParser(f){this.ok=false;if(f.charAt(0)=="#"){f=f.substr(1,6)}f=f.replace(/ /g,"");f=f.toLowerCase();var b={dodgerBlue:"#1f77b4",vividOrange:"#ff7f0e",forestGreen:"#2ca02c",greenishRed:"#8c864b",desaturatedViolet:"#9467bd",darkModerateRed:"#8c564b",softPink:"#e377c2",darkGray:"#7f7f7f",strongYellow:"#bcbd22",strongCyan:"#17becf",vividRed:"#dc143c",darkMagenta:"#800080",blue:"#0000FF",darkLimeGreen:"#008000",reddishOrange:"#D2691E",red:"#FF0000",black:"#000000",pink:"#DB7093",pureMagenta:"#FF00FF",softBlue:"#7B68EE",strongBlue:"#1f77b6",verySoftCyan:"#9edae5",darkBlue:"#393b79",darkModerateBlue:"#5254a3",slightlyDesaturatedBlue:"#6b6ecf",verySoftBlue:"#9c9ede",darkGreen:"#637939",darkModerateGreen:"#8ca252",slightlyDesaturatedGreen:"#b5cf6b",desaturatedGreen:"#cedb9c",aliceblue:"f0f8ff",antiquewhite:"faebd7",aqua:"00ffff",aquamarine:"7fffd4",azure:"f0ffff",beige:"f5f5dc",bisque:"ffe4c4",black:"000000",blanchedalmond:"ffebcd",blue:"0000ff",blueviolet:"8a2be2",brown:"a52a2a",burlywood:"deb887",cadetblue:"5f9ea0",chartreuse:"7fff00",chocolate:"d2691e",coral:"ff7f50",cornflowerblue:"6495ed",cornsilk:"fff8dc",crimson:"dc143c",cyan:"00ffff",darkblue:"00008b",darkcyan:"008b8b",darkgoldenrod:"b8860b",darkgray:"a9a9a9",darkgreen:"006400",darkkhaki:"bdb76b",darkmagenta:"8b008b",darkolivegreen:"556b2f",darkorange:"ff8c00",darkorchid:"9932cc",darkred:"8b0000",darksalmon:"e9967a",darkseagreen:"8fbc8f",darkslateblue:"483d8b",darkslategray:"2f4f4f",darkturquoise:"00ced1",darkviolet:"9400d3",deeppink:"ff1493",deepskyblue:"00bfff",dimgray:"696969",dodgerblue:"1e90ff",feldspar:"d19275",firebrick:"b22222",floralwhite:"fffaf0",forestgreen:"228b22",fuchsia:"ff00ff",gainsboro:"dcdcdc",ghostwhite:"f8f8ff",gold:"ffd700",goldenrod:"daa520",gray:"808080",green:"008000",greenyellow:"adff2f",honeydew:"f0fff0",hotpink:"ff69b4",indianred:"cd5c5c",indigo:"4b0082",ivory:"fffff0",khaki:"f0e68c",lavender:"e6e6fa",lavenderblush:"fff0f5",lawngreen:"7cfc00",lemonchiffon:"fffacd",lightblue:"add8e6",lightcoral:"f08080",lightcyan:"e0ffff",lightgoldenrodyellow:"fafad2",lightgrey:"d3d3d3",lightgreen:"90ee90",lightpink:"ffb6c1",lightsalmon:"ffa07a",lightseagreen:"20b2aa",lightskyblue:"87cefa",lightslateblue:"8470ff",lightslategray:"778899",lightsteelblue:"b0c4de",lightyellow:"ffffe0",lime:"00ff00",limegreen:"32cd32",linen:"faf0e6",magenta:"ff00ff",maroon:"800000",mediumaquamarine:"66cdaa",mediumblue:"0000cd",mediumorchid:"ba55d3",mediumpurple:"9370d8",mediumseagreen:"3cb371",mediumslateblue:"7b68ee",mediumspringgreen:"00fa9a",mediumturquoise:"48d1cc",mediumvioletred:"c71585",midnightblue:"191970",mintcream:"f5fffa",mistyrose:"ffe4e1",moccasin:"ffe4b5",navajowhite:"ffdead",navy:"000080",oldlace:"fdf5e6",olive:"808000",olivedrab:"6b8e23",orange:"ffa500",orangered:"ff4500",orchid:"da70d6",palegoldenrod:"eee8aa",palegreen:"98fb98",paleturquoise:"afeeee",palevioletred:"d87093",papayawhip:"ffefd5",peachpuff:"ffdab9",peru:"cd853f",pink:"ffc0cb",plum:"dda0dd",powderblue:"b0e0e6",purple:"800080",red:"ff0000",rosybrown:"bc8f8f",royalblue:"4169e1",saddlebrown:"8b4513",salmon:"fa8072",sandybrown:"f4a460",seagreen:"2e8b57",seashell:"fff5ee",sienna:"a0522d",silver:"c0c0c0",skyblue:"87ceeb",slateblue:"6a5acd",slategray:"708090",snow:"fffafa",springgreen:"00ff7f",steelblue:"4682b4",tan:"d2b48c",teal:"008080",thistle:"d8bfd8",tomato:"ff6347",turquoise:"40e0d0",violet:"ee82ee",violetred:"d02090",wheat:"f5deb3",white:"ffffff",whitesmoke:"f5f5f5",yellow:"ffff00",yellowgreen:"9acd32"};for(var g in b){if(f==g){f=b[g]}}var e=[{re:/^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/,example:["rgb(123, 234, 45)","rgb(255,234,245)"],process:function(i){return[parseInt(i[1]),parseInt(i[2]),parseInt(i[3])]}},{re:/^(\w{2})(\w{2})(\w{2})$/,example:["#00ff00","336699"],process:function(i){return[parseInt(i[1],16),parseInt(i[2],16),parseInt(i[3],16)]}},{re:/^(\w{1})(\w{1})(\w{1})$/,example:["#fb0","f0f"],process:function(i){return[parseInt(i[1]+i[1],16),parseInt(i[2]+i[2],16),parseInt(i[3]+i[3],16)]}}];for(var c=0;c255)?255:this.r);this.g=(this.g<0||isNaN(this.g))?0:((this.g>255)?255:this.g);this.b=(this.b<0||isNaN(this.b))?0:((this.b>255)?255:this.b);this.toRGB=function(){return"rgb("+this.r+", "+this.g+", "+this.b+")"};this.toHex=function(){var l=this.r.toString(16);var k=this.g.toString(16);var i=this.b.toString(16);if(l.length==1){l="0"+l}if(k.length==1){k="0"+k}if(i.length==1){i="0"+i}return"#"+l+k+i}}function printStackTrace(b){b=b||{guess:true};var c=b.e||null,e=!!b.guess;var d=new printStackTrace.implementation(),a=d.run(c);return(e)?d.guessAnonymousFunctions(a):a}printStackTrace.implementation=function(){};printStackTrace.implementation.prototype={run:function(a,b){a=a||this.createException();b=b||this.mode(a);if(b==="other"){return this.other(arguments.callee)}else{return this[b](a)}},createException:function(){try{this.undef()}catch(a){return a}},mode:function(a){if(a["arguments"]&&a.stack){return"chrome"}else{if(typeof a.message==="string"&&typeof window!=="undefined"&&window.opera){if(!a.stacktrace){return"opera9"}if(a.message.indexOf("\n")>-1&&a.message.split("\n").length>a.stacktrace.split("\n").length){return"opera9"}if(!a.stack){return"opera10a"}if(a.stacktrace.indexOf("called from line")<0){return"opera10b"}return"opera11"}else{if(a.stack){return"firefox"}}}return"other"},instrumentFunction:function(b,d,e){b=b||window;var a=b[d];b[d]=function c(){e.call(this,printStackTrace().slice(4));return b[d]._instrumented.apply(this,arguments)};b[d]._instrumented=a},deinstrumentFunction:function(a,b){if(a[b].constructor===Function&&a[b]._instrumented&&a[b]._instrumented.constructor===Function){a[b]=a[b]._instrumented}},chrome:function(b){var a=(b.stack+"\n").replace(/^\S[^\(]+?[\n$]/gm,"").replace(/^\s+at\s+/gm,"").replace(/^([^\(]+?)([\n$])/gm,"{anonymous}()@$1$2").replace(/^Object.\s*\(([^\)]+)\)/gm,"{anonymous}()@$1").split("\n");a.pop();return a},firefox:function(a){return a.stack.replace(/(?:\n@:0)?\s+$/m,"").replace(/^\(/gm,"{anonymous}(").split("\n")},opera11:function(g){var a="{anonymous}",h=/^.*line (\d+), column (\d+)(?: in (.+))? in (\S+):$/;var k=g.stacktrace.split("\n"),l=[];for(var c=0,f=k.length;c/,"$1").replace(//,a);l.push(b+"@"+j+" -- "+k[c+1].replace(/^\s+/,""))}}return l},opera10b:function(g){var a="{anonymous}",h=/^(.*)@(.+):(\d+)$/;var j=g.stacktrace.split("\n"),k=[];for(var c=0,f=j.length;c=0){l=l.substr(0,c)}if(l){b=l+b;d=k.exec(b);if(d&&d[1]){return d[1]}d=g.exec(b);if(d&&d[1]){return d[1]}d=h.exec(b);if(d&&d[1]){return d[1]}}}return"(?)"}};CanvasRenderingContext2D.prototype.installPattern=function(e){if(typeof(this.isPatternInstalled)!=="undefined"){throw"Must un-install old line pattern before installing a new one."}this.isPatternInstalled=true;var g=[0,0];var b=[];var f=this.beginPath;var d=this.lineTo;var c=this.moveTo;var a=this.stroke;this.uninstallPattern=function(){this.beginPath=f;this.lineTo=d;this.moveTo=c;this.stroke=a;this.uninstallPattern=undefined;this.isPatternInstalled=undefined};this.beginPath=function(){b=[];f.call(this)};this.moveTo=function(h,i){b.push([[h,i]]);c.call(this,h,i)};this.lineTo=function(h,j){var i=b[b.length-1];i.push([h,j])};this.stroke=function(){if(b.length===0){a.call(this);return}for(var p=0;pt){var q=e[m];if(g[1]){t+=g[1]}else{t+=q}if(t>r){g=[m,t-r];t=r}else{g=[(m+1)%e.length,0]}if(m%2===0){d.call(this,t,0)}else{c.call(this,t,0)}m=(m+1)%e.length}this.restore();l=h,u=s}}a.call(this);b=[]}};CanvasRenderingContext2D.prototype.uninstallPattern=function(){throw"Must install a line pattern before uninstalling it."};var DygraphOptions=(function(){var a=function(b){this.dygraph_=b;this.yAxes_=[];this.xAxis_={};this.series_={};this.global_=this.dygraph_.attrs_;this.user_=this.dygraph_.user_attrs_||{};this.labels_=[];this.highlightSeries_=this.get("highlightSeriesOpts")||{};this.reparseSeries()};a.AXIS_STRING_MAPPINGS_={y:0,Y:0,y1:0,Y1:0,y2:1,Y2:1};a.axisToIndex_=function(b){if(typeof(b)=="string"){if(a.AXIS_STRING_MAPPINGS_.hasOwnProperty(b)){return a.AXIS_STRING_MAPPINGS_[b]}throw"Unknown axis : "+b}if(typeof(b)=="number"){if(b===0||b===1){return b}throw"Dygraphs only supports two y-axes, indexed from 0-1."}if(b){throw"Unknown axis : "+b}return 0};a.prototype.reparseSeries=function(){var g=this.get("labels");if(!g){return}this.labels_=g.slice(1);this.yAxes_=[{series:[],options:{}}];this.xAxis_={options:{}};this.series_={};var h=!this.user_.series;if(h){var c=0;for(var j=0;j1){Dygraph.update(this.yAxes_[1].options,f.y2||{})}Dygraph.update(this.xAxis_.options,f.x||{})};a.prototype.get=function(c){var b=this.getGlobalUser_(c);if(b!==null){return b}return this.getGlobalDefault_(c)};a.prototype.getGlobalUser_=function(b){if(this.user_.hasOwnProperty(b)){return this.user_[b]}return null};a.prototype.getGlobalDefault_=function(b){if(this.global_.hasOwnProperty(b)){return this.global_[b]}if(Dygraph.DEFAULT_ATTRS.hasOwnProperty(b)){return Dygraph.DEFAULT_ATTRS[b]}return null};a.prototype.getForAxis=function(d,e){var f;var i;if(typeof(e)=="number"){f=e;i=f===0?"y":"y2"}else{if(e=="y1"){e="y"}if(e=="y"){f=0}else{if(e=="y2"){f=1}else{if(e=="x"){f=-1}else{throw"Unknown axis "+e}}}i=e}var g=(f==-1)?this.xAxis_:this.yAxes_[f];if(g){var h=g.options;if(h.hasOwnProperty(d)){return h[d]}}var c=this.getGlobalUser_(d);if(c!==null){return c}var b=Dygraph.DEFAULT_ATTRS.axes[i];if(b.hasOwnProperty(d)){return b[d]}return this.getGlobalDefault_(d)};a.prototype.getForSeries=function(c,e){if(e===this.dygraph_.getHighlightSeries()){if(this.highlightSeries_.hasOwnProperty(c)){return this.highlightSeries_[c]}}if(!this.series_.hasOwnProperty(e)){throw"Unknown series: "+e}var d=this.series_[e];var b=d.options;if(b.hasOwnProperty(c)){return b[c]}return this.getForAxis(c,d.yAxis)};a.prototype.numAxes=function(){return this.yAxes_.length};a.prototype.axisForSeries=function(b){return this.series_[b].yAxis};a.prototype.axisOptions=function(b){return this.yAxes_[b].options};a.prototype.seriesForAxis=function(b){return this.yAxes_[b].series};a.prototype.seriesNames=function(){return this.labels_};return a})();"use strict";var DygraphLayout=function(a){this.dygraph_=a;this.points=[];this.setNames=[];this.annotations=[];this.yAxes_=null;this.xTicks_=null;this.yTicks_=null};DygraphLayout.prototype.attr_=function(a){return this.dygraph_.attr_(a)};DygraphLayout.prototype.addDataset=function(a,b){this.points.push(b);this.setNames.push(a)};DygraphLayout.prototype.getPlotArea=function(){return this.area_};DygraphLayout.prototype.computePlotArea=function(){var a={x:0,y:0};a.w=this.dygraph_.width_-a.x-this.attr_("rightGap");a.h=this.dygraph_.height_;var b={chart_div:this.dygraph_.graphDiv,reserveSpaceLeft:function(c){var d={x:a.x,y:a.y,w:c,h:a.h};a.x+=c;a.w-=c;return d},reserveSpaceRight:function(c){var d={x:a.x+a.w-c,y:a.y,w:c,h:a.h};a.w-=c;return d},reserveSpaceTop:function(c){var d={x:a.x,y:a.y,w:a.w,h:c};a.y+=c;a.h-=c;return d},reserveSpaceBottom:function(c){var d={x:a.x,y:a.y+a.h-c,w:a.w,h:c};a.h-=c;return d},chartRect:function(){return{x:a.x,y:a.y,w:a.w,h:a.h}}};this.dygraph_.cascadeEvents_("layout",b);this.area_=a};DygraphLayout.prototype.setAnnotations=function(d){this.annotations=[];var e=this.attr_("xValueParser")||function(a){return a};for(var c=0;c=0)&&(f<=1)){this.xticks.push([f,b])}}this.yticks=[];for(d=0;d=0)&&(f<=1)){this.yticks.push([d,f,b])}}}};DygraphLayout.prototype._evaluateAnnotations=function(){var d;var g={};for(d=0;d=0;e--){if(f.childNodes[e].className==g){f.removeChild(f.childNodes[e])}}var c=document.bgColor;var d=this.dygraph_.graphDiv;while(d!=document){var a=d.currentStyle.backgroundColor;if(a&&a!="transparent"){c=a;break}d=d.parentNode}function b(j){if(j.w===0||j.h===0){return}var i=document.createElement("div");i.className=g;i.style.backgroundColor=c;i.style.position="absolute";i.style.left=j.x+"px";i.style.top=j.y+"px";i.style.width=j.w+"px";i.style.height=j.h+"px";f.appendChild(i)}var h=this.area;b({x:0,y:0,w:h.x,h:this.height});b({x:h.x,y:0,w:this.width-h.x,h:h.y});b({x:h.x+h.w,y:0,w:this.width-h.x-h.w,h:this.height});b({x:h.x,y:h.y+h.h,w:this.width-h.x,h:this.height-h.h-h.y})};DygraphCanvasRenderer._getIteratorPredicate=function(a){return a?DygraphCanvasRenderer._predicateThatSkipsEmptyPoints:null};DygraphCanvasRenderer._predicateThatSkipsEmptyPoints=function(b,a){return b[a].yval!==null};DygraphCanvasRenderer._drawStyledLine=function(i,a,m,q,f,n,d){var h=i.dygraph;var c=h.getOption("stepPlot",i.setName);if(!Dygraph.isArrayLike(q)){q=null}var l=h.getOption("drawGapEdgePoints",i.setName);var o=i.points;var k=Dygraph.createIterator(o,0,o.length,DygraphCanvasRenderer._getIteratorPredicate(h.getOption("connectSeparatedPoints")));var j=q&&(q.length>=2);var p=i.drawingContext;p.save();if(j){p.installPattern(q)}var b=DygraphCanvasRenderer._drawSeries(i,k,m,d,f,l,c,a);DygraphCanvasRenderer._drawPointsOnLine(i,b,n,a,d);if(j){p.uninstallPattern()}p.restore()};DygraphCanvasRenderer._drawSeries=function(v,t,m,h,p,s,g,q){var b=null;var w=null;var k=null;var j;var o;var l=[];var f=true;var n=v.drawingContext;n.beginPath();n.strokeStyle=q;n.lineWidth=m;var c=t.array_;var u=t.end_;var a=t.predicate_;for(var r=t.start_;r=0;C--){if(!D.visibility()[C]){I.splice(C,1)}}var h=(function(){for(var e=0;e=0;u--){var n=I[u];if(!D.getOption("fillGraph",n)){continue}var p=D.getOption("stepPlot",n);var x=q[u];var f=D.axisPropertiesForSeries(n);var d=1+f.minyval*f.yscale;if(d<0){d=0}else{if(d>1){d=1}}d=E.h*d+E.y;var B=c[u];var A=Dygraph.createIterator(B,0,B.length,DygraphCanvasRenderer._getIteratorPredicate(D.getOption("connectSeparatedPoints")));var m=NaN;var l=[-1,-1];var t;var b=new RGBColorParser(x);var H="rgba("+b.r+","+b.g+","+b.b+","+y+")";w.fillStyle=H;w.beginPath();var j,G=true;while(A.hasNext){var v=A.next();if(!Dygraph.isOK(v.y)){m=NaN;if(v.y_stacked!==null&&!isNaN(v.y_stacked)){s[v.canvasx]=E.h*v.y_stacked+E.y}continue}if(k){if(!G&&j==v.xval){continue}else{G=false;j=v.xval}a=s[v.canvasx];var o;if(a===undefined){o=d}else{if(r){o=a[0]}else{o=a}}t=[v.canvasy,o];if(p){if(l[0]===-1){s[v.canvasx]=[v.canvasy,d]}else{s[v.canvasx]=[v.canvasy,l[0]]}}else{s[v.canvasx]=v.canvasy}}else{t=[v.canvasy,d]}if(!isNaN(m)){w.moveTo(m,l[0]);if(p){w.lineTo(v.canvasx,l[0])}else{w.lineTo(v.canvasx,t[0])}if(r&&a){w.lineTo(v.canvasx,a[1])}else{w.lineTo(v.canvasx,t[1])}w.lineTo(m,l[1]);w.closePath()}l=t;m=v.canvasx}r=p;w.fill()}};"use strict";var Dygraph=function(d,c,b,a){this.is_initial_draw_=true;this.readyFns_=[];if(a!==undefined){this.warn("Using deprecated four-argument dygraph constructor");this.__old_init__(d,c,b,a)}else{this.__init__(d,c,b)}};Dygraph.NAME="Dygraph";Dygraph.VERSION="1.0.0";Dygraph.__repr__=function(){return"["+this.NAME+" "+this.VERSION+"]"};Dygraph.toString=function(){return this.__repr__()};Dygraph.DEFAULT_ROLL_PERIOD=1;Dygraph.DEFAULT_WIDTH=480;Dygraph.DEFAULT_HEIGHT=320;Dygraph.ANIMATION_STEPS=12;Dygraph.ANIMATION_DURATION=200;Dygraph.KMB_LABELS=["K","M","B","T","Q"];Dygraph.KMG2_BIG_LABELS=["k","M","G","T","P","E","Z","Y"];Dygraph.KMG2_SMALL_LABELS=["m","u","n","p","f","a","z","y"];Dygraph.numberValueFormatter=function(s,a,u,l){var e=a("sigFigs");if(e!==null){return Dygraph.floatFormat(s,e)}var c=a("digitsAfterDecimal");var o=a("maxNumberWidth");var b=a("labelsKMB");var r=a("labelsKMG2");var q;if(s!==0&&(Math.abs(s)>=Math.pow(10,o)||Math.abs(s)=0;h--,d/=f){if(p>=d){q=Dygraph.round_(s/d,c)+t[h];break}}if(r){var i=String(s.toExponential()).split("e-");if(i.length===2&&i[1]>=3&&i[1]<=24){if(i[1]%3>0){q=Dygraph.round_(i[0]/Dygraph.pow(10,(i[1]%3)),c)}else{q=Number(i[0]).toFixed(2)}q+=m[Math.floor(i[1]/3)-1]}}}return q};Dygraph.numberAxisLabelFormatter=function(a,d,c,b){return Dygraph.numberValueFormatter(a,c,b)};Dygraph.dateString_=function(e){var i=Dygraph.zeropad;var h=new Date(e);var f=""+h.getFullYear();var g=i(h.getMonth()+1);var a=i(h.getDate());var c="";var b=h.getHours()*3600+h.getMinutes()*60+h.getSeconds();if(b){c=" "+Dygraph.hmsString_(e)}return f+"/"+g+"/"+a+c};Dygraph.dateAxisFormatter=function(b,c){if(c>=Dygraph.DECADAL){return b.strftime("%Y")}else{if(c>=Dygraph.MONTHLY){return b.strftime("%b %y")}else{var a=b.getHours()*3600+b.getMinutes()*60+b.getSeconds()+b.getMilliseconds();if(a===0||c>=Dygraph.DAILY){return new Date(b.getTime()+3600*1000).strftime("%d%b")}else{return Dygraph.hmsString_(b.getTime())}}}};Dygraph.Plotters=DygraphCanvasRenderer._Plotters;Dygraph.DEFAULT_ATTRS={highlightCircleSize:3,highlightSeriesOpts:null,highlightSeriesBackgroundAlpha:0.5,labelsDivWidth:250,labelsDivStyles:{},labelsSeparateLines:false,labelsShowZeroValues:true,labelsKMB:false,labelsKMG2:false,showLabelsOnHighlight:true,digitsAfterDecimal:2,maxNumberWidth:6,sigFigs:null,strokeWidth:1,strokeBorderWidth:0,strokeBorderColor:"white",axisTickSize:3,axisLabelFontSize:14,xAxisLabelWidth:50,yAxisLabelWidth:50,rightGap:5,showRoller:false,xValueParser:Dygraph.dateParser,delimiter:",",sigma:2,errorBars:false,fractions:false,wilsonInterval:true,customBars:false,fillGraph:false,fillAlpha:0.15,connectSeparatedPoints:false,stackedGraph:false,stackedGraphNaNFill:"all",hideOverlayOnMouseOut:true,legend:"onmouseover",stepPlot:false,avoidMinZero:false,xRangePad:0,yRangePad:null,drawAxesAtZero:false,titleHeight:28,xLabelHeight:18,yLabelWidth:18,drawXAxis:true,drawYAxis:true,axisLineColor:"black",axisLineWidth:0.3,gridLineWidth:0.3,axisLabelColor:"black",axisLabelFont:"Arial",axisLabelWidth:50,drawYGrid:true,drawXGrid:true,gridLineColor:"rgb(128,128,128)",interactionModel:null,animatedZooms:false,showRangeSelector:false,rangeSelectorHeight:40,rangeSelectorPlotStrokeColor:"#808FAB",rangeSelectorPlotFillColor:"#A7B1C4",plotter:[Dygraph.Plotters.fillPlotter,Dygraph.Plotters.errorPlotter,Dygraph.Plotters.linePlotter],plugins:[],axes:{x:{pixelsPerLabel:60,axisLabelFormatter:Dygraph.dateAxisFormatter,valueFormatter:Dygraph.dateString_,drawGrid:true,independentTicks:true,ticker:null},y:{pixelsPerLabel:30,valueFormatter:Dygraph.numberValueFormatter,axisLabelFormatter:Dygraph.numberAxisLabelFormatter,drawGrid:true,independentTicks:true,ticker:null},y2:{pixelsPerLabel:30,valueFormatter:Dygraph.numberValueFormatter,axisLabelFormatter:Dygraph.numberAxisLabelFormatter,drawGrid:false,independentTicks:false,ticker:null}}};Dygraph.HORIZONTAL=1;Dygraph.VERTICAL=2;Dygraph.PLUGINS=[];Dygraph.addedAnnotationCSS=false;Dygraph.prototype.__old_init__=function(f,d,e,b){if(e!==null){var a=["Date"];for(var c=0;c=0;d--){var f=a[d][0];var h=a[d][1];h.call(f,g);if(g.propagationStopped){break}}}return g.defaultPrevented};Dygraph.prototype.isZoomed=function(a){if(a===null||a===undefined){return this.zoomed_x_||this.zoomed_y_}if(a==="x"){return this.zoomed_x_}if(a==="y"){return this.zoomed_y_}throw"axis parameter is ["+a+"] must be null, 'x' or 'y'."};Dygraph.prototype.toString=function(){var a=this.maindiv_;var b=(a&&a.id)?a.id:a;return"[Dygraph "+b+"]"};Dygraph.prototype.attr_=function(b,a){return a?this.attributes_.getForSeries(b,a):this.attributes_.get(b)};Dygraph.prototype.getOption=function(a,b){return this.attr_(a,b)};Dygraph.prototype.getOptionForAxis=function(a,b){return this.attributes_.getForAxis(a,b)};Dygraph.prototype.optionsViewForAxis_=function(b){var a=this;return function(c){var d=a.user_attrs_.axes;if(d&&d[b]&&d[b].hasOwnProperty(c)){return d[b][c]}if(typeof(a.user_attrs_[c])!="undefined"){return a.user_attrs_[c]}d=a.attrs_.axes;if(d&&d[b]&&d[b].hasOwnProperty(c)){return d[b][c]}if(b=="y"&&a.axes_[0].hasOwnProperty(c)){return a.axes_[0][c]}else{if(b=="y2"&&a.axes_[1].hasOwnProperty(c)){return a.axes_[1][c]}}return a.attr_(c)}};Dygraph.prototype.rollPeriod=function(){return this.rollPeriod_};Dygraph.prototype.xAxisRange=function(){return this.dateWindow_?this.dateWindow_:this.xAxisExtremes()};Dygraph.prototype.xAxisExtremes=function(){var d=this.attr_("xRangePad")/this.plotter_.area.w;if(this.numRows()===0){return[0-d,1+d]}var c=this.rawData_[0][0];var b=this.rawData_[this.rawData_.length-1][0];if(d){var a=b-c;c-=a*d;b+=a*d}return[c,b]};Dygraph.prototype.yAxisRange=function(a){if(typeof(a)=="undefined"){a=0}if(a<0||a>=this.axes_.length){return null}var b=this.axes_[a];return[b.computedValueRange[0],b.computedValueRange[1]]};Dygraph.prototype.yAxisRanges=function(){var a=[];for(var b=0;bthis.rawData_.length){return null}if(a<0||a>this.rawData_[b].length){return null}return this.rawData_[b][a]};Dygraph.prototype.createInterface_=function(){var a=this.maindiv_;this.graphDiv=document.createElement("div");this.graphDiv.style.textAlign="left";a.appendChild(this.graphDiv);this.canvas_=Dygraph.createCanvas();this.canvas_.style.position="absolute";this.hidden_=this.createPlotKitCanvas_(this.canvas_);this.resizeElements_();this.canvas_ctx_=Dygraph.getContext(this.canvas_);this.hidden_ctx_=Dygraph.getContext(this.hidden_);this.graphDiv.appendChild(this.hidden_);this.graphDiv.appendChild(this.canvas_);this.mouseEventElement_=this.createMouseEventElement_();this.layout_=new DygraphLayout(this);var b=this;this.mouseMoveHandler_=function(c){b.mouseMove_(c)};this.mouseOutHandler_=function(f){var d=f.target||f.fromElement;var c=f.relatedTarget||f.toElement;if(Dygraph.isNodeContainedBy(d,b.graphDiv)&&!Dygraph.isNodeContainedBy(c,b.graphDiv)){b.mouseOut_(f)}};this.addAndTrackEvent(window,"mouseout",this.mouseOutHandler_);this.addAndTrackEvent(this.mouseEventElement_,"mousemove",this.mouseMoveHandler_);if(!this.resizeHandler_){this.resizeHandler_=function(c){b.resize()};this.addAndTrackEvent(window,"resize",this.resizeHandler_)}};Dygraph.prototype.resizeElements_=function(){this.graphDiv.style.width=this.width_+"px";this.graphDiv.style.height=this.height_+"px";this.canvas_.width=this.width_;this.canvas_.height=this.height_;this.canvas_.style.width=this.width_+"px";this.canvas_.style.height=this.height_+"px";this.hidden_.width=this.width_;this.hidden_.height=this.height_;this.hidden_.style.width=this.width_+"px";this.hidden_.style.height=this.height_+"px"};Dygraph.prototype.destroy=function(){this.canvas_ctx_.restore();this.hidden_ctx_.restore();var a=function(c){while(c.hasChildNodes()){a(c.firstChild);c.removeChild(c.firstChild)}};this.removeTrackedEvents_();Dygraph.removeEvent(window,"mouseout",this.mouseOutHandler_);Dygraph.removeEvent(this.mouseEventElement_,"mousemove",this.mouseMoveHandler_);Dygraph.removeEvent(window,"resize",this.resizeHandler_);this.resizeHandler_=null;a(this.maindiv_);var b=function(c){for(var d in c){if(typeof(c[d])==="object"){c[d]=null}}};b(this.layout_);b(this.plotter_);b(this)};Dygraph.prototype.createPlotKitCanvas_=function(a){var b=Dygraph.createCanvas();b.style.position="absolute";b.style.top=a.style.top;b.style.left=a.style.left;b.width=this.width_;b.height=this.height_;b.style.width=this.width_+"px";b.style.height=this.height_+"px";return b};Dygraph.prototype.createMouseEventElement_=function(){if(this.isUsingExcanvas_){var a=document.createElement("div");a.style.position="absolute";a.style.backgroundColor="white";a.style.filter="alpha(opacity=0)";a.style.width=this.width_+"px";a.style.height=this.height_+"px";this.graphDiv.appendChild(a);return a}else{return this.canvas_}};Dygraph.prototype.setColors_=function(){var g=this.getLabels();var e=g.length-1;this.colors_=[];this.colorsMap_={};var a=this.attr_("colors");var d;if(!a){var c=this.attr_("colorSaturation")||1;var b=this.attr_("colorValue")||0.5;var k=Math.ceil(e/2);for(d=1;d<=e;d++){if(!this.visibility()[d-1]){continue}var h=d%2?Math.ceil(d/2):(k+d/2);var f=(1*h/(1+e));var j=Dygraph.hsvToRGB(f,c,b);this.colors_.push(j);this.colorsMap_[g[d]]=j}}else{for(d=0;d=0;--b){var m=this.layout_.points[b];for(var g=0;g=l.length){continue}var m=l[e];if(!Dygraph.isValidPoint(m)){continue}var j=m.canvasy;if(i>m.canvasx&&e+10){var a=(i-m.canvasx)/o;j+=a*(k.canvasy-m.canvasy)}}}else{if(i0){var n=l[e-1];if(Dygraph.isValidPoint(n)){var o=m.canvasx-n.canvasx;if(o>0){var a=(m.canvasx-i)/o;j+=a*(n.canvasy-m.canvasy)}}}}if(d===0||j=0){var j=0;var k=this.attr_("labels");for(h=1;hj){j=c}}var l=this.previousVerticalX_;n.clearRect(l-j-1,0,2*j+2,this.height_)}}if(this.isUsingExcanvas_&&this.currentZoomRectArgs_){Dygraph.prototype.drawZoomRect_.apply(this,this.currentZoomRectArgs_)}if(this.selPoints_.length>0){var b=this.selPoints_[0].canvasx;n.save();for(h=0;h=0){if(f!=this.lastRow_){e=true}this.lastRow_=f;for(var d=0;d=0){e=true}this.lastRow_=-1}if(this.selPoints_.length){this.lastx_=this.selPoints_[0].xval}else{this.lastx_=-1}if(h!==undefined){if(this.highlightSet_!==h){e=true}this.highlightSet_=h}if(g!==undefined){this.lockedSet_=g}if(e){this.updateSelection_(undefined)}return e};Dygraph.prototype.mouseOut_=function(a){if(this.attr_("unhighlightCallback")){this.attr_("unhighlightCallback")(a)}if(this.attr_("hideOverlayOnMouseOut")&&!this.lockedSet_){this.clearSelection()}};Dygraph.prototype.clearSelection=function(){this.cascadeEvents_("deselect",{});this.lockedSet_=false;if(this.fadeLevel){this.animateSelection_(-1);return}this.canvas_ctx_.clearRect(0,0,this.width_,this.height_);this.fadeLevel=0;this.selPoints_=[];this.lastx_=-1;this.lastRow_=-1;this.highlightSet_=null};Dygraph.prototype.getSelection=function(){if(!this.selPoints_||this.selPoints_.length<1){return -1}for(var c=0;cg){a=g}if(ef){f=e}if(h===null||af){f=g}if(h===null||g=i){return}for(var p=i;po[1]){o[1]=a}if(a=1;u--){if(!this.visibility()[u-1]){continue}if(f){l=w[u];var z=f[0];var j=f[1];var g=null,y=null;for(r=0;r=z&&g===null){g=r}if(l[r][0]<=j){y=r}}if(g===null){g=0}var e=g;var d=true;while(d&&e>0){e--;d=b(l[e])}if(y===null){y=l.length-1}var c=y;d=true;while(d&&c0){this.setIndexByName_[g[0]]=0}var e=0;for(var f=1;f0){var a=this.readyFns_.pop();a(this)}}};Dygraph.prototype.computeYAxes_=function(){var b,d,c,f,a;if(this.axes_!==undefined&&this.user_attrs_.hasOwnProperty("valueRange")===false){b=[];for(c=0;c0){D=0}if(A<0){A=0}}if(D==Infinity){D=0}if(A==-Infinity){A=1}x=A-D;if(x===0){if(A!==0){x=Math.abs(A)}else{A=1;x=1}}var h,H;if(C){if(b){h=A+B*x;H=D}else{var E=Math.exp(Math.log(x)*B);h=A*E;H=D/E}}else{h=A+B*x;H=D-B*x;if(b&&!this.attr_("avoidMinZero")){if(H<0&&D>=0){H=0}if(h>0&&A<=0){h=0}}}c.extremeRange=[H,h]}if(c.valueWindow){c.computedValueRange=[c.valueWindow[0],c.valueWindow[1]]}else{if(c.valueRange){var e=g(c.valueRange[0])?c.extremeRange[0]:c.valueRange[0];var d=g(c.valueRange[1])?c.extremeRange[1]:c.valueRange[1];if(!b){if(c.logscale){var E=Math.exp(Math.log(x)*B);e*=E;d/=E}else{x=d-e;e-=x*B;d+=x*B}}c.computedValueRange=[e,d]}else{c.computedValueRange=c.extremeRange}}if(l){c.independentTicks=l;var r=this.optionsViewForAxis_("y"+(y?"2":""));var F=r("ticker");c.ticks=F(c.computedValueRange[0],c.computedValueRange[1],this.height_,r,this);if(!p){p=c}}}if(p===undefined){throw ('Configuration Error: At least one axis has to have the "independentTicks" option activated.')}for(var y=0;y=0){k-=l[z-d][1][0];h-=l[z-d][1][1]}var C=l[z][0];var w=h?k/h:0;if(this.attr_("errorBars")){if(this.attr_("wilsonInterval")){if(h){var s=w<0?0:w,u=h;var B=t*Math.sqrt(s*(1-s)/u+t*t/(4*u*u));var a=1+t*t/h;G=(s+t*t/(2*h)-B)/a;o=(s+t*t/(2*h)+B)/a;b[z]=[C,[s*e,(s-G)*e,(o-s)*e]]}else{b[z]=[C,[0,0,0]]}}else{A=h?t*Math.sqrt(w*(1-w)/h):1;b[z]=[C,[e*w,e*A,e*A]]}}else{b[z]=[C,e*w]}}}else{if(this.attr_("customBars")){G=0;var D=0;o=0;var g=0;for(z=0;z=0){var r=l[z-d];if(r[1][1]!==null&&!isNaN(r[1][1])){G-=r[1][0];D-=r[1][1];o-=r[1][2];g-=1}}if(g){b[z]=[l[z][0],[1*D/g,1*(D-G)/g,1*(o-D)/g]]}else{b[z]=[l[z][0],[null,null,null]]}}}else{if(!this.attr_("errorBars")){if(d==1){return l}for(z=0;z0&&(b[c-1]!="e"&&b[c-1]!="E"))||b.indexOf("/")>=0||isNaN(parseFloat(b))){a=true}else{if(b.length==8&&b>"19700101"&&b<"20371231"){a=true}}this.setXAxisOptions_(a)};Dygraph.prototype.setXAxisOptions_=function(a){if(a){this.attrs_.xValueParser=Dygraph.dateParser;this.attrs_.axes.x.valueFormatter=Dygraph.dateString_;this.attrs_.axes.x.ticker=Dygraph.dateTicker;this.attrs_.axes.x.axisLabelFormatter=Dygraph.dateAxisFormatter}else{this.attrs_.xValueParser=function(b){return parseFloat(b)};this.attrs_.axes.x.valueFormatter=function(b){return b};this.attrs_.axes.x.ticker=Dygraph.numericLinearTicks;this.attrs_.axes.x.axisLabelFormatter=this.attrs_.axes.x.valueFormatter}};Dygraph.prototype.parseFloat_=function(a,c,b){var e=parseFloat(a);if(!isNaN(e)){return e}if(/^ *$/.test(a)){return null}if(/^ *nan *$/i.test(a)){return NaN}var d="Unable to parse '"+a+"' as a number";if(b!==null&&c!==null){d+=" on line "+(1+c)+" ('"+b+"') of CSV."}this.error(d);return null};Dygraph.prototype.parseCSV_=function(t){var r=[];var s=Dygraph.detectLineDelimiter(t);var a=t.split(s||"\n");var g,k;var p=this.attr_("delimiter");if(a[0].indexOf(p)==-1&&a[0].indexOf("\t")>=0){p="\t"}var b=0;if(!("labels" in this.user_attrs_)){b=1;this.attrs_.labels=a[0].split(p);this.attributes_.reparseSeries()}var o=0;var m;var q=false;var c=this.attr_("labels").length;var f=false;for(var l=b;l0&&h[0]0){j=String.fromCharCode(65+(i-1)%26)+j.toLowerCase();i=Math.floor((i-1)/26)}return j};var h=w.getNumberOfColumns();var g=w.getNumberOfRows();var f=w.getColumnType(0);if(f=="date"||f=="datetime"){this.attrs_.xValueParser=Dygraph.dateParser;this.attrs_.axes.x.valueFormatter=Dygraph.dateString_;this.attrs_.axes.x.ticker=Dygraph.dateTicker;this.attrs_.axes.x.axisLabelFormatter=Dygraph.dateAxisFormatter}else{if(f=="number"){this.attrs_.xValueParser=function(i){return parseFloat(i)};this.attrs_.axes.x.valueFormatter=function(i){return i};this.attrs_.axes.x.ticker=Dygraph.numericLinearTicks;this.attrs_.axes.x.axisLabelFormatter=this.attrs_.axes.x.valueFormatter}else{this.error("only 'date', 'datetime' and 'number' types are supported for column 1 of DataTable input (Got '"+f+"')");return null}}var m=[];var t={};var s=false;var q,o;for(q=1;q0&&e[0]0){this.setAnnotations(a,true)}this.attributes_.reparseSeries()};Dygraph.prototype.start_=function(){var d=this.file_;if(typeof d=="function"){d=d()}if(Dygraph.isArrayLike(d)){this.rawData_=this.parseArray_(d);this.predraw_()}else{if(typeof d=="object"&&typeof d.getColumnRange=="function"){this.parseDataTable_(d);this.predraw_()}else{if(typeof d=="string"){var c=Dygraph.detectLineDelimiter(d);if(c){this.loadedEvent_(d)}else{var b;if(window.XMLHttpRequest){b=new XMLHttpRequest()}else{b=new ActiveXObject("Microsoft.XMLHTTP")}var a=this;b.onreadystatechange=function(){if(b.readyState==4){if(b.status===200||b.status===0){a.loadedEvent_(b.responseText)}}};b.open("GET",d,true);b.send(null)}}else{this.error("Unknown data format: "+(typeof d))}}}};Dygraph.prototype.updateOptions=function(e,b){if(typeof(b)=="undefined"){b=false}var d=e.file;var c=Dygraph.mapLegacyOptions_(e);if("rollPeriod" in c){this.rollPeriod_=c.rollPeriod}if("dateWindow" in c){this.dateWindow_=c.dateWindow;if(!("isZoomedIgnoreProgrammaticZoom" in c)){this.zoomed_x_=(c.dateWindow!==null)}}if("valueRange" in c&&!("isZoomedIgnoreProgrammaticZoom" in c)){this.zoomed_y_=(c.valueRange!==null)}var a=Dygraph.isPixelChangingOptionList(this.attr_("labels"),c);Dygraph.updateDeep(this.user_attrs_,c);this.attributes_.reparseSeries();if(d){this.file_=d;if(!b){this.start_()}}else{if(!b){if(a){this.predraw_()}else{this.renderGraph_(false)}}}};Dygraph.mapLegacyOptions_=function(c){var a={};for(var b in c){if(b=="file"){continue}if(c.hasOwnProperty(b)){a[b]=c[b]}}var e=function(g,f,h){if(!a.axes){a.axes={}}if(!a.axes[g]){a.axes[g]={}}a.axes[g][f]=h};var d=function(f,g,h){if(typeof(c[f])!="undefined"){Dygraph.warn("Option "+f+" is deprecated. Use the "+h+" option for the "+g+" axis instead. (e.g. { axes : { "+g+" : { "+h+" : ... } } } (see http://dygraphs.com/per-axis.html for more information.");e(g,h,c[f]);delete a[f]}};d("xValueFormatter","x","valueFormatter");d("pixelsPerXLabel","x","pixelsPerLabel");d("xAxisLabelFormatter","x","axisLabelFormatter");d("xTicker","x","ticker");d("yValueFormatter","y","valueFormatter");d("pixelsPerYLabel","y","pixelsPerLabel");d("yAxisLabelFormatter","y","axisLabelFormatter");d("yTicker","y","ticker");return a};Dygraph.prototype.resize=function(d,b){if(this.resize_lock){return}this.resize_lock=true;if((d===null)!=(b===null)){this.warn("Dygraph.resize() should be called with zero parameters or two non-NULL parameters. Pretending it was zero.");d=b=null}var a=this.width_;var c=this.height_;if(d){this.maindiv_.style.width=d+"px";this.maindiv_.style.height=b+"px";this.width_=d;this.height_=b}else{this.width_=this.maindiv_.clientWidth;this.height_=this.maindiv_.clientHeight}if(a!=this.width_||c!=this.height_){this.resizeElements_();this.predraw_()}this.resize_lock=false};Dygraph.prototype.adjustRoll=function(a){this.rollPeriod_=a;this.predraw_()};Dygraph.prototype.visibility=function(){if(!this.attr_("visibility")){this.attrs_.visibility=[]}while(this.attr_("visibility").length=a.length){this.warn("invalid series number in setVisibility: "+b)}else{a[b]=c;this.predraw_()}};Dygraph.prototype.size=function(){return{width:this.width_,height:this.height_}};Dygraph.prototype.setAnnotations=function(b,a){Dygraph.addAnnotationRule();this.annotations_=b;if(!this.layout_){this.warn("Tried to setAnnotations before dygraph was ready. Try setting them in a ready() block. See dygraphs.com/tests/annotation.html");return}this.layout_.setAnnotations(this.annotations_);if(!a){this.predraw_()}};Dygraph.prototype.annotations=function(){return this.annotations_};Dygraph.prototype.getLabels=function(){var a=this.attr_("labels");return a?a.slice():null};Dygraph.prototype.indexFromSetName=function(a){return this.setIndexByName_[a]};Dygraph.prototype.ready=function(a){if(this.is_initial_draw_){this.readyFns_.push(a)}else{a(this)}};Dygraph.addAnnotationRule=function(){if(Dygraph.addedAnnotationCSS){return}var f="border: 1px solid black; background-color: white; text-align: center;";var e=document.createElement("style");e.type="text/css";document.getElementsByTagName("head")[0].appendChild(e);for(var b=0;bb){return -1}if(i===null||i===undefined){i=0}var h=function(j){return j>=0&&ja){if(i>0){f=g-1;if(h(f)&&d[f]a){return g}}return Dygraph.binarySearch(a,d,i,g+1,b)}}}return -1};Dygraph.dateParser=function(a){var b;var c;if(a.search("-")==-1||a.search("T")!=-1||a.search("Z")!=-1){c=Dygraph.dateStrToMillis(a);if(c&&!isNaN(c)){return c}}if(a.search("-")!=-1){b=a.replace("-","/","g");while(b.search("-")!=-1){b=b.replace("-","/")}c=Dygraph.dateStrToMillis(b)}else{if(a.length==8){b=a.substr(0,4)+"/"+a.substr(4,2)+"/"+a.substr(6,2);c=Dygraph.dateStrToMillis(b)}else{c=Dygraph.dateStrToMillis(a)}}if(!c||isNaN(c)){Dygraph.error("Couldn't parse "+a+" as a date")}return c};Dygraph.dateStrToMillis=function(a){return new Date(a).getTime()};Dygraph.update=function(b,c){if(typeof(c)!="undefined"&&c!==null){for(var a in c){if(c.hasOwnProperty(a)){b[a]=c[a]}}}return b};Dygraph.updateDeep=function(b,d){function c(e){return(typeof Node==="object"?e instanceof Node:typeof e==="object"&&typeof e.nodeType==="number"&&typeof e.nodeName==="string")}if(typeof(d)!="undefined"&&d!==null){for(var a in d){if(d.hasOwnProperty(a)){if(d[a]===null){b[a]=null}else{if(Dygraph.isArrayLike(d[a])){b[a]=d[a].slice()}else{if(c(d[a])){b[a]=d[a]}else{if(typeof(d[a])=="object"){if(typeof(b[a])!="object"||b[a]===null){b[a]={}}Dygraph.updateDeep(b[a],d[a])}else{b[a]=d[a]}}}}}}}return b};Dygraph.isArrayLike=function(b){var a=typeof(b);if((a!="object"&&!(a=="function"&&typeof(b.item)=="function"))||b===null||typeof(b.length)!="number"||b.nodeType===3){return false}return true};Dygraph.isDateLike=function(a){if(typeof(a)!="object"||a===null||typeof(a.getTime)!="function"){return false}return true};Dygraph.clone=function(c){var b=[];for(var a=0;a=g){return}Dygraph.requestAnimFrame.call(window,function(){var l=new Date().getTime();var j=l-b;d=i;i=Math.floor(j/f);var k=i-d;var m=(i+k)>e;if(m||(i>=e)){h(e);a()}else{if(k!==0){h(i)}c()}})})()};Dygraph.isPixelChangingOptionList=function(h,e){var d={annotationClickHandler:true,annotationDblClickHandler:true,annotationMouseOutHandler:true,annotationMouseOverHandler:true,axisLabelColor:true,axisLineColor:true,axisLineWidth:true,clickCallback:true,digitsAfterDecimal:true,drawCallback:true,drawHighlightPointCallback:true,drawPoints:true,drawPointCallback:true,drawXGrid:true,drawYGrid:true,fillAlpha:true,gridLineColor:true,gridLineWidth:true,hideOverlayOnMouseOut:true,highlightCallback:true,highlightCircleSize:true,interactionModel:true,isZoomedIgnoreProgrammaticZoom:true,labelsDiv:true,labelsDivStyles:true,labelsDivWidth:true,labelsKMB:true,labelsKMG2:true,labelsSeparateLines:true,labelsShowZeroValues:true,legend:true,maxNumberWidth:true,panEdgeFraction:true,pixelsPerYLabel:true,pointClickCallback:true,pointSize:true,rangeSelectorPlotFillColor:true,rangeSelectorPlotStrokeColor:true,showLabelsOnHighlight:true,showRoller:true,sigFigs:true,strokeWidth:true,underlayCallback:true,unhighlightCallback:true,xAxisLabelFormatter:true,xTicker:true,xValueFormatter:true,yAxisLabelFormatter:true,yValueFormatter:true,zoomCallback:true};var a=false;var b={};if(h){for(var f=1;fc.boundedDates[1]){h=h-(a-c.boundedDates[1]);a=h+c.dateRange}}k.dateWindow_=[h,a];if(c.is2DPan){var d=c.dragEndY-c.dragStartY;for(var j=0;j=10&&e.dragDirection==Dygraph.HORIZONTAL){var f=Math.min(e.dragStartX,e.dragEndX),k=Math.max(e.dragStartX,e.dragEndX);f=Math.max(f,b.x);k=Math.min(k,b.x+b.w);if(f=10&&e.dragDirection==Dygraph.VERTICAL){var j=Math.min(e.dragStartY,e.dragEndY),a=Math.max(e.dragStartY,e.dragEndY);j=Math.max(j,b.y);a=Math.min(a,b.y+b.h);if(j1){d.startTimeForDoubleTapMs=null}var h=[];for(var c=0;c=2){d.initialPinchCenter={pageX:0.5*(h[0].pageX+h[1].pageX),pageY:0.5*(h[0].pageY+h[1].pageY),dataX:0.5*(h[0].dataX+h[1].dataX),dataY:0.5*(h[0].dataY+h[1].dataY)};var a=180/Math.PI*Math.atan2(d.initialPinchCenter.pageY-h[0].pageY,h[0].pageX-d.initialPinchCenter.pageX);a=Math.abs(a);if(a>90){a=90-a}d.touchDirections={x:(a<(90-45/2)),y:(a>45/2)}}}d.initialRange={x:e.xAxisRange(),y:e.yAxisRange()}};Dygraph.Interaction.moveTouch=function(n,q,d){d.startTimeForDoubleTapMs=null;var p,l=[];for(p=0;p=2){var e=(a[1].pageX-j.pageX);w=(l[1].pageX-h.pageX)/e;var v=(a[1].pageY-j.pageY);c=(l[1].pageY-h.pageY)/v}}w=Math.min(8,Math.max(0.125,w));c=Math.min(8,Math.max(0.125,c));var u=false;if(d.touchDirections.x){q.dateWindow_=[j.dataX-m.dataX+(d.initialRange.x[0]-j.dataX)/w,j.dataX-m.dataX+(d.initialRange.x[1]-j.dataX)/w];u=true}if(d.touchDirections.y){for(p=0;p<1;p++){var b=q.axes_[p];var s=q.attributes_.getForAxis("logscale",p);if(s){}else{b.valueWindow=[j.dataY-m.dataY+(d.initialRange.y[0]-j.dataY)/c,j.dataY-m.dataY+(d.initialRange.y[1]-j.dataY)/c];u=true}}}q.drawGraph_(false);if(u&&l.length>1&&q.attr_("zoomCallback")){var r=q.xAxisRange();q.attr_("zoomCallback")(r[0],r[1],q.yAxisRanges())}};Dygraph.Interaction.endTouch=function(e,d,c){if(e.touches.length!==0){Dygraph.Interaction.startTouch(e,d,c)}else{if(e.changedTouches.length==1){var a=new Date().getTime();var b=e.changedTouches[0];if(c.startTimeForDoubleTapMs&&a-c.startTimeForDoubleTapMs<500&&c.doubleTapX&&Math.abs(c.doubleTapX-b.screenX)<50&&c.doubleTapY&&Math.abs(c.doubleTapY-b.screenY)<50){d.resetZoom()}else{c.startTimeForDoubleTapMs=a;c.doubleTapX=b.screenX;c.doubleTapY=b.screenY}}}};Dygraph.Interaction.defaultModel={mousedown:function(c,b,a){if(c.button&&c.button==2){return}a.initializeMouseDown(c,b,a);if(c.altKey||c.shiftKey){Dygraph.startPan(c,b,a)}else{Dygraph.startZoom(c,b,a)}},mousemove:function(c,b,a){if(a.isZooming){Dygraph.moveZoom(c,b,a)}else{if(a.isPanning){Dygraph.movePan(c,b,a)}}},mouseup:function(c,b,a){if(a.isZooming){Dygraph.endZoom(c,b,a)}else{if(a.isPanning){Dygraph.endPan(c,b,a)}}},touchstart:function(c,b,a){Dygraph.Interaction.startTouch(c,b,a)},touchmove:function(c,b,a){Dygraph.Interaction.moveTouch(c,b,a)},touchend:function(c,b,a){Dygraph.Interaction.endTouch(c,b,a)},mouseout:function(c,b,a){if(a.isZooming){a.dragEndX=null;a.dragEndY=null;b.clearZoomRect_()}},dblclick:function(c,b,a){if(a.cancelNextDblclick){a.cancelNextDblclick=false;return}if(c.altKey||c.shiftKey){return}b.resetZoom()}};Dygraph.DEFAULT_ATTRS.interactionModel=Dygraph.Interaction.defaultModel;Dygraph.defaultInteractionModel=Dygraph.Interaction.defaultModel;Dygraph.endZoom=Dygraph.Interaction.endZoom;Dygraph.moveZoom=Dygraph.Interaction.moveZoom;Dygraph.startZoom=Dygraph.Interaction.startZoom;Dygraph.endPan=Dygraph.Interaction.endPan;Dygraph.movePan=Dygraph.Interaction.movePan;Dygraph.startPan=Dygraph.Interaction.startPan;Dygraph.Interaction.nonInteractiveModel_={mousedown:function(c,b,a){a.initializeMouseDown(c,b,a)},mouseup:function(c,b,a){a.dragEndX=b.dragGetX_(c,a);a.dragEndY=b.dragGetY_(c,a);var e=Math.abs(a.dragEndX-a.dragStartX);var d=Math.abs(a.dragEndY-a.dragStartY);if(e<2&&d<2&&b.lastx_!==undefined&&b.lastx_!=-1){Dygraph.Interaction.treatMouseOpAsClick(b,c,a)}}};Dygraph.Interaction.dragIsPanInteractionModel={mousedown:function(c,b,a){a.initializeMouseDown(c,b,a);Dygraph.startPan(c,b,a)},mousemove:function(c,b,a){if(a.isPanning){Dygraph.movePan(c,b,a)}},mouseup:function(c,b,a){if(a.isPanning){Dygraph.endPan(c,b,a)}}};"use strict";Dygraph.TickList=undefined;Dygraph.Ticker=undefined;Dygraph.numericLinearTicks=function(d,c,i,g,f,h){var e=function(a){if(a==="logscale"){return false}return g(a)};return Dygraph.numericTicks(d,c,i,e,f,h)};Dygraph.numericTicks=function(F,E,u,p,d,q){var z=(p("pixelsPerLabel"));var G=[];var C,A,t,y;if(q){for(C=0;C=y/4){for(var r=H;r>=l;r--){var m=Dygraph.PREFERRED_LOG_TICK_VALUES[r];var k=Math.log(m/F)/Math.log(E/F)*u;var D={v:m};if(s===null){s={tickValue:m,pixel_coord:k}}else{if(Math.abs(k-s.pixel_coord)>=z){s={tickValue:m,pixel_coord:k}}else{D.label=""}}G.push(D)}G.reverse()}}if(G.length===0){var g=p("labelsKMG2");var n,h;if(g){n=[1,2,4,8,16,32,64,128,256];h=16}else{n=[1,2,5,10,20,50,100];h=10}var w=Math.ceil(u/z);var o=Math.abs(E-F)/w;var v=Math.floor(Math.log(o)/Math.log(h));var f=Math.pow(h,v);var I,x,c,e;for(A=0;Az){break}}if(x>c){I*=-1}for(C=0;C=0){return Dygraph.getDateAxis(e,c,d,g,f)}else{return[]}};Dygraph.SECONDLY=0;Dygraph.TWO_SECONDLY=1;Dygraph.FIVE_SECONDLY=2;Dygraph.TEN_SECONDLY=3;Dygraph.THIRTY_SECONDLY=4;Dygraph.MINUTELY=5;Dygraph.TWO_MINUTELY=6;Dygraph.FIVE_MINUTELY=7;Dygraph.TEN_MINUTELY=8;Dygraph.THIRTY_MINUTELY=9;Dygraph.HOURLY=10;Dygraph.TWO_HOURLY=11;Dygraph.SIX_HOURLY=12;Dygraph.DAILY=13;Dygraph.WEEKLY=14;Dygraph.MONTHLY=15;Dygraph.QUARTERLY=16;Dygraph.BIANNUAL=17;Dygraph.ANNUAL=18;Dygraph.DECADAL=19;Dygraph.CENTENNIAL=20;Dygraph.NUM_GRANULARITIES=21;Dygraph.SHORT_SPACINGS=[];Dygraph.SHORT_SPACINGS[Dygraph.SECONDLY]=1000*1;Dygraph.SHORT_SPACINGS[Dygraph.TWO_SECONDLY]=1000*2;Dygraph.SHORT_SPACINGS[Dygraph.FIVE_SECONDLY]=1000*5;Dygraph.SHORT_SPACINGS[Dygraph.TEN_SECONDLY]=1000*10;Dygraph.SHORT_SPACINGS[Dygraph.THIRTY_SECONDLY]=1000*30;Dygraph.SHORT_SPACINGS[Dygraph.MINUTELY]=1000*60;Dygraph.SHORT_SPACINGS[Dygraph.TWO_MINUTELY]=1000*60*2;Dygraph.SHORT_SPACINGS[Dygraph.FIVE_MINUTELY]=1000*60*5;Dygraph.SHORT_SPACINGS[Dygraph.TEN_MINUTELY]=1000*60*10;Dygraph.SHORT_SPACINGS[Dygraph.THIRTY_MINUTELY]=1000*60*30;Dygraph.SHORT_SPACINGS[Dygraph.HOURLY]=1000*3600;Dygraph.SHORT_SPACINGS[Dygraph.TWO_HOURLY]=1000*3600*2;Dygraph.SHORT_SPACINGS[Dygraph.SIX_HOURLY]=1000*3600*6;Dygraph.SHORT_SPACINGS[Dygraph.DAILY]=1000*86400;Dygraph.SHORT_SPACINGS[Dygraph.WEEKLY]=1000*604800;Dygraph.LONG_TICK_PLACEMENTS=[];Dygraph.LONG_TICK_PLACEMENTS[Dygraph.MONTHLY]={months:[0,1,2,3,4,5,6,7,8,9,10,11],year_mod:1};Dygraph.LONG_TICK_PLACEMENTS[Dygraph.QUARTERLY]={months:[0,3,6,9],year_mod:1};Dygraph.LONG_TICK_PLACEMENTS[Dygraph.BIANNUAL]={months:[0,6],year_mod:1};Dygraph.LONG_TICK_PLACEMENTS[Dygraph.ANNUAL]={months:[0],year_mod:1};Dygraph.LONG_TICK_PLACEMENTS[Dygraph.DECADAL]={months:[0],year_mod:10};Dygraph.LONG_TICK_PLACEMENTS[Dygraph.CENTENNIAL]={months:[0],year_mod:100};Dygraph.PREFERRED_LOG_TICK_VALUES=function(){var c=[];for(var b=-39;b<=39;b++){var a=Math.pow(10,b);for(var d=1;d<=9;d++){var e=a*d;c.push(e)}}return c}();Dygraph.pickDateTickGranularity=function(d,c,j,h){var g=(h("pixelsPerLabel"));for(var f=0;f=g){return f}}return -1};Dygraph.numDateTicks=function(e,b,f){if(f=Dygraph.SHORT_SPACINGS[Dygraph.TWO_HOURLY]);for(m=p;m<=l;m+=c){A=new Date(m);if(e&&A.getTimezoneOffset()!=B){var k=A.getTimezoneOffset()-B;m+=k*60*1000;A=new Date(m);B=A.getTimezoneOffset();if(new Date(m+c).getTimezoneOffset()!=B){m+=c;A=new Date(m);B=A.getTimezoneOffset()}}C.push({v:m,label:w(A,a,n,z)})}}else{var f;var r=1;if(al){continue}C.push({v:m,label:w(new Date(m),a,n,z)})}}}return C};if(Dygraph&&Dygraph.DEFAULT_ATTRS&&Dygraph.DEFAULT_ATTRS.axes&&Dygraph.DEFAULT_ATTRS.axes["x"]&&Dygraph.DEFAULT_ATTRS.axes["y"]&&Dygraph.DEFAULT_ATTRS.axes["y2"]){Dygraph.DEFAULT_ATTRS.axes["x"]["ticker"]=Dygraph.dateTicker;Dygraph.DEFAULT_ATTRS.axes["y"]["ticker"]=Dygraph.numericTicks;Dygraph.DEFAULT_ATTRS.axes["y2"]["ticker"]=Dygraph.numericTicks}Dygraph.Plugins={};Dygraph.Plugins.Annotations=(function(){var a=function(){this.annotations_=[]};a.prototype.toString=function(){return"Annotations Plugin"};a.prototype.activate=function(b){return{clearChart:this.clearChart,didDrawChart:this.didDrawChart}};a.prototype.detachLabels=function(){for(var c=0;cu.x+u.w||l.canvasyu.y+u.h){continue}var w=l.annotation;var n=6;if(w.hasOwnProperty("tickHeight")){n=w.tickHeight}var j=document.createElement("div");for(var A in x){if(x.hasOwnProperty(A)){j.style[A]=x[A]}}if(!w.hasOwnProperty("icon")){j.className="dygraphDefaultAnnotation"}if(w.hasOwnProperty("cssClass")){j.className+=" "+w.cssClass}var m=w.hasOwnProperty("width")?w.width:16;var k=w.hasOwnProperty("height")?w.height:16;if(w.hasOwnProperty("icon")){var z=document.createElement("img");z.src=w.icon;z.width=m;z.height=k;j.appendChild(z)}else{if(l.annotation.hasOwnProperty("shortText")){j.appendChild(document.createTextNode(l.annotation.shortText))}}var c=l.canvasx-m/2;j.style.left=c+"px";var f=0;if(w.attachAtBottom){var d=(u.y+u.h-k-n);if(q[c]){d-=q[c]}else{q[c]=0}q[c]+=(n+k);f=d}else{f=l.canvasy-k-n}j.style.top=f+"px";j.style.width=m+"px";j.style.height=k+"px";j.title=l.annotation.text;j.style.color=t.colorsMap_[l.name];j.style.borderColor=t.colorsMap_[l.name];w.div=j;t.addAndTrackEvent(j,"click",b("clickHandler","annotationClickHandler",l,this));t.addAndTrackEvent(j,"mouseover",b("mouseOverHandler","annotationMouseOverHandler",l,this));t.addAndTrackEvent(j,"mouseout",b("mouseOutHandler","annotationMouseOutHandler",l,this));t.addAndTrackEvent(j,"dblclick",b("dblClickHandler","annotationDblClickHandler",l,this));h.appendChild(j);this.annotations_.push(j);var o=v.drawingContext;o.save();o.strokeStyle=t.colorsMap_[l.name];o.beginPath();if(!w.attachAtBottom){o.moveTo(l.canvasx,l.canvasy);o.lineTo(l.canvasx,l.canvasy-2-n)}else{var d=f+k;o.moveTo(l.canvasx,d);o.lineTo(l.canvasx,d+n)}o.closePath();o.stroke();o.restore()}};a.prototype.destroy=function(){this.detachLabels()};return a})();Dygraph.Plugins.Axes=(function(){var a=function(){this.xlabels_=[];this.ylabels_=[]};a.prototype.toString=function(){return"Axes Plugin"};a.prototype.activate=function(b){return{layout:this.layout,clearChart:this.clearChart,willDrawChart:this.willDrawChart}};a.prototype.layout=function(f){var d=f.dygraph;if(d.getOption("drawYAxis")){var b=d.getOption("yAxisLabelWidth")+2*d.getOption("axisTickSize");f.reserveSpaceLeft(b)}if(d.getOption("drawXAxis")){var c;if(d.getOption("xAxisHeight")){c=d.getOption("xAxisHeight")}else{c=d.getOptionForAxis("axisLabelFontSize","x")+2*d.getOption("axisTickSize")}f.reserveSpaceBottom(c)}if(d.numAxes()==2){if(d.getOption("drawYAxis")){var b=d.getOption("yAxisLabelWidth")+2*d.getOption("axisTickSize");f.reserveSpaceRight(b)}}else{if(d.numAxes()>2){d.error("Only two y-axes are supported at this time. (Trying to use "+d.numAxes()+")")}}};a.prototype.detachLabels=function(){function b(d){for(var c=0;c0){var h=F.numAxes();for(D=0;Dd){s.style.bottom="0px"}else{s.style.top=z+"px"}if(E[0]===0){s.style.left=(G.x-F.getOption("yAxisLabelWidth")-F.getOption("axisTickSize"))+"px";s.style.textAlign="right"}else{if(E[0]==1){s.style.left=(G.x+G.w+F.getOption("axisTickSize"))+"px";s.style.textAlign="left"}}s.style.width=F.getOption("yAxisLabelWidth")+"px";v.appendChild(s);this.ylabels_.push(s)}var n=this.ylabels_[0];var k=F.getOptionForAxis("axisLabelFontSize","y");var q=parseInt(n.style.top,10)+k;if(q>d-k){n.style.top=(parseInt(n.style.top,10)-k/2)+"px"}}var c;if(F.getOption("drawAxesAtZero")){var w=F.toPercentXCoord(0);if(w>1||w<0||isNaN(w)){w=0}c=B(G.x+w*G.w)}else{c=B(G.x)}j.strokeStyle=F.getOptionForAxis("axisLineColor","y");j.lineWidth=F.getOptionForAxis("axisLineWidth","y");j.beginPath();j.moveTo(c,A(G.y));j.lineTo(c,A(G.y+G.h));j.closePath();j.stroke();if(F.numAxes()==2){j.strokeStyle=F.getOptionForAxis("axisLineColor","y2");j.lineWidth=F.getOptionForAxis("axisLineWidth","y2");j.beginPath();j.moveTo(A(G.x+G.w),A(G.y));j.lineTo(A(G.x+G.w),A(G.y+G.h));j.closePath();j.stroke()}}if(F.getOption("drawXAxis")){if(I.xticks){for(D=0;DJ){l=J-F.getOption("xAxisLabelWidth");s.style.textAlign="right"}if(l<0){l=0;s.style.textAlign="left"}s.style.left=l+"px";s.style.width=F.getOption("xAxisLabelWidth")+"px";v.appendChild(s);this.xlabels_.push(s)}}j.strokeStyle=F.getOptionForAxis("axisLineColor","x");j.lineWidth=F.getOptionForAxis("axisLineWidth","x");j.beginPath();var b;if(F.getOption("drawAxesAtZero")){var w=F.toPercentYCoord(0,0);if(w>1||w<0){w=1}b=A(G.y+w*G.h)}else{b=A(G.y+G.h)}j.moveTo(B(G.x),b);j.lineTo(B(G.x+G.w),b);j.closePath();j.stroke()}j.restore()};return a})();Dygraph.Plugins.ChartLabels=(function(){var c=function(){this.title_div_=null;this.xlabel_div_=null;this.ylabel_div_=null;this.y2label_div_=null};c.prototype.toString=function(){return"ChartLabels Plugin"};c.prototype.activate=function(d){return{layout:this.layout,didDrawChart:this.didDrawChart}};var b=function(d){var e=document.createElement("div");e.style.position="absolute";e.style.left=d.x+"px";e.style.top=d.y+"px";e.style.width=d.w+"px";e.style.height=d.h+"px";return e};c.prototype.detachLabels_=function(){var e=[this.title_div_,this.xlabel_div_,this.ylabel_div_,this.y2label_div_];for(var d=0;d=2)}}u=t.yticks;l.save();for(p=0;p=2);if(n){l.installPattern(d)}l.strokeStyle=q.getOptionForAxis("gridLineColor","x");l.lineWidth=q.getOptionForAxis("gridLineWidth","x");for(p=0;p":" ")}m=w.getOption("strokePattern",z[u]);s=d(m,q.color,f);r+=""+s+" "+z[u]+""}return r}var A=w.optionsViewForAxis_("x");var o=A("valueFormatter");r=o(p,A,z[0],w);if(r!==""){r+=":"}var v=[];var j=w.numAxes();for(u=0;u"}var q=w.getPropertiesForSeries(t.name);var n=v[q.axis-1];var y=n("valueFormatter");var e=y(t.yval,n,t.name,w);var h=(t.name==B)?" class='highlight'":"";r+=" "+t.name+": "+e+""}return r};d=function(s,h,r){var e=(/MSIE/.test(navigator.userAgent)&&!window.opera);if(e){return"—"}if(!s||s.length<=1){return'
          '}var l,k,f,o;var g=0,q=0;var p=[];var n;for(l=0;l<=s.length;l++){g+=s[l%s.length]}n=Math.floor(r/(g-s[0]));if(n>1){for(l=0;l'}}return m};return c})();Dygraph.Plugins.RangeSelector=(function(){var a=function(){this.isIE_=/MSIE/.test(navigator.userAgent)&&!window.opera;this.hasTouchInterface_=typeof(TouchEvent)!="undefined";this.isMobileDevice_=/mobile|android/gi.test(navigator.appVersion);this.interfaceCreated_=false};a.prototype.toString=function(){return"RangeSelector Plugin"};a.prototype.activate=function(b){this.dygraph_=b;this.isUsingExcanvas_=b.isUsingExcanvas_;if(this.getOption_("showRangeSelector")){this.createInterface_()}return{layout:this.reserveSpace_,predraw:this.renderStaticLayer_,didDrawChart:this.renderInteractiveLayer_}};a.prototype.destroy=function(){this.bgcanvas_=null;this.fgcanvas_=null;this.leftZoomHandle_=null;this.rightZoomHandle_=null;this.iePanOverlay_=null};a.prototype.getOption_=function(b){return this.dygraph_.getOption(b)};a.prototype.setDefaultOption_=function(b,c){return this.dygraph_.attrs_[b]=c};a.prototype.createInterface_=function(){this.createCanvases_();if(this.isUsingExcanvas_){this.createIEPanOverlay_()}this.createZoomHandles_();this.initInteraction_();if(this.getOption_("animatedZooms")){this.dygraph_.warn("Animated zooms and range selector are not compatible; disabling animatedZooms.");this.dygraph_.updateOptions({animatedZooms:false},true)}this.interfaceCreated_=true;this.addToGraph_()};a.prototype.addToGraph_=function(){var b=this.graphDiv_=this.dygraph_.graphDiv;b.appendChild(this.bgcanvas_);b.appendChild(this.fgcanvas_);b.appendChild(this.leftZoomHandle_);b.appendChild(this.rightZoomHandle_)};a.prototype.removeFromGraph_=function(){var b=this.graphDiv_;b.removeChild(this.bgcanvas_);b.removeChild(this.fgcanvas_);b.removeChild(this.leftZoomHandle_);b.removeChild(this.rightZoomHandle_);this.graphDiv_=null};a.prototype.reserveSpace_=function(b){if(this.getOption_("showRangeSelector")){b.reserveSpaceBottom(this.getOption_("rangeSelectorHeight")+4)}};a.prototype.renderStaticLayer_=function(){if(!this.updateVisibility_()){return}this.resize_();this.drawStaticLayer_()};a.prototype.renderInteractiveLayer_=function(){if(!this.updateVisibility_()||this.isChangingRange_){return}this.placeZoomHandles_();this.drawInteractiveLayer_()};a.prototype.updateVisibility_=function(){var b=this.getOption_("showRangeSelector");if(b){if(!this.interfaceCreated_){this.createInterface_()}else{if(!this.graphDiv_||!this.graphDiv_.parentNode){this.addToGraph_()}}}else{if(this.graphDiv_){this.removeFromGraph_();var c=this.dygraph_;setTimeout(function(){c.width_=0;c.resize()},1)}}return b};a.prototype.resize_=function(){function d(e,f){e.style.top=f.y+"px";e.style.left=f.x+"px";e.width=f.w;e.height=f.h;e.style.width=e.width+"px";e.style.height=e.height+"px"}var c=this.dygraph_.layout_.getPlotArea();var b=0;if(this.getOption_("drawXAxis")){b=this.getOption_("xAxisHeight")||(this.getOption_("axisLabelFontSize")+2*this.getOption_("axisTickSize"))}this.canvasRect_={x:c.x,y:c.y+c.h+b+4,w:c.w,h:this.getOption_("rangeSelectorHeight")};d(this.bgcanvas_,this.canvasRect_);d(this.fgcanvas_,this.canvasRect_)};a.prototype.createCanvases_=function(){this.bgcanvas_=Dygraph.createCanvas();this.bgcanvas_.className="dygraph-rangesel-bgcanvas";this.bgcanvas_.style.position="absolute";this.bgcanvas_.style.zIndex=9;this.bgcanvas_ctx_=Dygraph.getContext(this.bgcanvas_);this.fgcanvas_=Dygraph.createCanvas();this.fgcanvas_.className="dygraph-rangesel-fgcanvas";this.fgcanvas_.style.position="absolute";this.fgcanvas_.style.zIndex=9;this.fgcanvas_.style.cursor="default";this.fgcanvas_ctx_=Dygraph.getContext(this.fgcanvas_)};a.prototype.createIEPanOverlay_=function(){this.iePanOverlay_=document.createElement("div");this.iePanOverlay_.style.position="absolute";this.iePanOverlay_.style.backgroundColor="white";this.iePanOverlay_.style.filter="alpha(opacity=0)";this.iePanOverlay_.style.display="none";this.iePanOverlay_.style.cursor="move";this.fgcanvas_.appendChild(this.iePanOverlay_)};a.prototype.createZoomHandles_=function(){var b=new Image();b.className="dygraph-rangesel-zoomhandle";b.style.position="absolute";b.style.zIndex=10;b.style.visibility="hidden";b.style.cursor="col-resize";if(/MSIE 7/.test(navigator.userAgent)){b.width=7;b.height=14;b.style.backgroundColor="white";b.style.border="1px solid #333333"}else{b.width=9;b.height=16;b.src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAQCAYAAADESFVDAAAAAXNSR0IArs4c6QAAAAZiS0dEANAAzwDP4Z7KegAAAAlwSFlzAAAOxAAADsQBlSsOGwAAAAd0SU1FB9sHGw0cMqdt1UwAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAaElEQVQoz+3SsRFAQBCF4Z9WJM8KCDVwownl6YXsTmCUsyKGkZzcl7zkz3YLkypgAnreFmDEpHkIwVOMfpdi9CEEN2nGpFdwD03yEqDtOgCaun7sqSTDH32I1pQA2Pb9sZecAxc5r3IAb21d6878xsAAAAAASUVORK5CYII="}if(this.isMobileDevice_){b.width*=2;b.height*=2}this.leftZoomHandle_=b;this.rightZoomHandle_=b.cloneNode(false)};a.prototype.initInteraction_=function(){var o=this;var i=this.isIE_?document:window;var u=0;var v=null;var s=false;var d=false;var g=!this.isMobileDevice_&&!this.isUsingExcanvas_;var k=new Dygraph.IFrameTarp();var p,f,r,j,w,h,x,t,q,c,l;var e,n,m;p=function(C){var B=o.dygraph_.xAxisExtremes();var z=(B[1]-B[0])/o.canvasRect_.w;var A=B[0]+(C.leftHandlePos-o.canvasRect_.x)*z;var y=B[0]+(C.rightHandlePos-o.canvasRect_.x)*z;return[A,y]};f=function(y){Dygraph.cancelEvent(y);s=true;u=y.clientX;v=y.target?y.target:y.srcElement;if(y.type==="mousedown"||y.type==="dragstart"){Dygraph.addEvent(i,"mousemove",r);Dygraph.addEvent(i,"mouseup",j)}o.fgcanvas_.style.cursor="col-resize";k.cover();return true};r=function(C){if(!s){return false}Dygraph.cancelEvent(C);var z=C.clientX-u;if(Math.abs(z)<4){return true}u=C.clientX;var B=o.getZoomHandleStatus_();var y;if(v==o.leftZoomHandle_){y=B.leftHandlePos+z;y=Math.min(y,B.rightHandlePos-v.width-3);y=Math.max(y,o.canvasRect_.x)}else{y=B.rightHandlePos+z;y=Math.min(y,o.canvasRect_.x+o.canvasRect_.w);y=Math.max(y,B.leftHandlePos+v.width+3)}var A=v.width/2;v.style.left=(y-A)+"px";o.drawInteractiveLayer_();if(g){w()}return true};j=function(y){if(!s){return false}s=false;k.uncover();Dygraph.removeEvent(i,"mousemove",r);Dygraph.removeEvent(i,"mouseup",j);o.fgcanvas_.style.cursor="default";if(!g){w()}return true};w=function(){try{var z=o.getZoomHandleStatus_();o.isChangingRange_=true;if(!z.isZoomed){o.dygraph_.resetZoom()}else{var y=p(z);o.dygraph_.doZoomXDates_(y[0],y[1])}}finally{o.isChangingRange_=false}};h=function(A){if(o.isUsingExcanvas_){return A.srcElement==o.iePanOverlay_}else{var z=o.leftZoomHandle_.getBoundingClientRect();var y=z.left+z.width/2;z=o.rightZoomHandle_.getBoundingClientRect();var B=z.left+z.width/2;return(A.clientX>y&&A.clientX=o.canvasRect_.x+o.canvasRect_.w){y=o.canvasRect_.x+o.canvasRect_.w;E=y-D}else{E+=z;y+=z}}var A=o.leftZoomHandle_.width/2;o.leftZoomHandle_.style.left=(E-A)+"px";o.rightZoomHandle_.style.left=(y-A)+"px";o.drawInteractiveLayer_();if(g){c()}return true};q=function(y){if(!d){return false}d=false;Dygraph.removeEvent(i,"mousemove",t);Dygraph.removeEvent(i,"mouseup",q);if(!g){c()}return true};c=function(){try{o.isChangingRange_=true;o.dygraph_.dateWindow_=p(o.getZoomHandleStatus_());o.dygraph_.drawGraph_(false)}finally{o.isChangingRange_=false}};l=function(y){if(s||d){return}var z=h(y)?"move":"default";if(z!=o.fgcanvas_.style.cursor){o.fgcanvas_.style.cursor=z}};e=function(y){if(y.type=="touchstart"&&y.targetTouches.length==1){if(f(y.targetTouches[0])){Dygraph.cancelEvent(y)}}else{if(y.type=="touchmove"&&y.targetTouches.length==1){if(r(y.targetTouches[0])){Dygraph.cancelEvent(y)}}else{j(y)}}};n=function(y){if(y.type=="touchstart"&&y.targetTouches.length==1){if(x(y.targetTouches[0])){Dygraph.cancelEvent(y)}}else{if(y.type=="touchmove"&&y.targetTouches.length==1){if(t(y.targetTouches[0])){Dygraph.cancelEvent(y)}}else{q(y)}}};m=function(B,A){var z=["touchstart","touchend","touchmove","touchcancel"];for(var y=0;y1&&v[t][1]!==null){m=typeof v[t][1]!="number";if(m){d=[];h=[];for(r=0;r0)){b=Math.min(b,g);c=Math.max(c,g)}}var o=0.25;if(u){c=Dygraph.log10(c);c+=c*o;b=Dygraph.log10(b);for(t=0;tthis.canvasRect_.x||b+1\n');
-  }
-})();
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-externs.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-externs.js
deleted file mode 100644
index ed5de4c1a..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-externs.js
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * @param {Object} dict
- * @return {!Array.}
- */
-function printStackTrace(dict) {}
-
-
-/**
- * @constructor
- */
-function G_vmlCanvasManager() {}
-
-/**
- * @param {!HTMLCanvasElement} canvas
- */
-G_vmlCanvasManager.initElement = function(canvas) {};
-
-// For IE
-/**
- * @param {string} type
- * @param {Object} fn
- */
-Element.prototype.detachEvent = function(type, fn) {};
-
-
-/**
- * @typedef {function(
- *   (number|Date),
- *   number,
- *   function(string):*,
- *   (Dygraph|undefined)
- * ):string}
- */
-var AxisLabelFormatter;
-
-
-/**
- * @typedef {function(number,function(string),Dygraph):string}
- */
-var ValueFormatter;
-
-
-/**
- * @typedef {Array.>>}
- */
-var DygraphDataArray;
-
-/**
- * @constructor
- */
-function GVizDataTable() {}
-
-// TODO(danvk): move the Dygraph definitions out of here once I closure-ify dygraphs.js
-/**
- * @param {!HTMLDivElement|string} div
- * @param {DygraphDataArray|
- *     GVizDataTable|
- *     string|
- *     function():(DygraphDataArray|GVizDataTable|string)} file
- * @param {Object} attrs
- * @constructor
- */
-function Dygraph(div, file, attrs) {}
-
-/**
- * @constructor
- */
-function DygraphLayout() {}
-
-/**
- * @type {Array}
- */
-DygraphLayout.prototype.datasets;
-
-// TODO: DygraphOptions should not reach inside Dygraph private data like this.
-/** @type {Object} */
-Dygraph.prototype.attrs_;
-/** @type {Object} */
-Dygraph.prototype.user_attrs_;
-
-/**
- * @type {DygraphLayout}
- */
-Dygraph.prototype.layout_;
-
-/** @type {function(): string} */
-Dygraph.prototype.getHighlightSeries;
-
-/** @type {Array.<{elem:Element,type:string,fn:function(!Event):(boolean|undefined|null)}>} */
-Dygraph.prototype.registeredEvents_;
-
-/** @type {{axes: Object}} */
-Dygraph.DEFAULT_ATTRS;
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-gviz.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-gviz.js
deleted file mode 100644
index 988e0ace1..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-gviz.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * @license
- * Copyright 2011 Dan Vanderkam (danvdk@gmail.com)
- * MIT-licensed (http://opensource.org/licenses/MIT)
- */
-
-/**
- * @fileoverview A wrapper around the Dygraph class which implements the
- * interface for a GViz (aka Google Visualization API) visualization.
- * It is designed to be a drop-in replacement for Google's AnnotatedTimeline,
- * so the documentation at
- * http://code.google.com/apis/chart/interactive/docs/gallery/annotatedtimeline.html
- * translates over directly.
- *
- * For a full demo, see:
- * - http://dygraphs.com/tests/gviz.html
- * - http://dygraphs.com/tests/annotation-gviz.html
- */
-
-/*jshint globalstrict: true */
-/*global Dygraph:false */
-"use strict";
-
-/**
- * A wrapper around Dygraph that implements the gviz API.
- * @param {!HTMLDivElement} container The DOM object the visualization should
- *     live in.
- * @constructor
- */
-Dygraph.GVizChart = function(container) {
-  this.container = container;
-};
-
-/**
- * @param {GVizDataTable} data
- * @param {Object.<*>} options
- */
-Dygraph.GVizChart.prototype.draw = function(data, options) {
-  // Clear out any existing dygraph.
-  // TODO(danvk): would it make more sense to simply redraw using the current
-  // date_graph object?
-  this.container.innerHTML = '';
-  if (typeof(this.date_graph) != 'undefined') {
-    this.date_graph.destroy();
-  }
-
-  this.date_graph = new Dygraph(this.container, data, options);
-};
-
-/**
- * Google charts compatible setSelection
- * Only row selection is supported, all points in the row will be highlighted
- * @param {Array.<{row:number}>} selection_array array of the selected cells
- * @public
- */
-Dygraph.GVizChart.prototype.setSelection = function(selection_array) {
-  var row = false;
-  if (selection_array.length) {
-    row = selection_array[0].row;
-  }
-  this.date_graph.setSelection(row);
-};
-
-/**
- * Google charts compatible getSelection implementation
- * @return {Array.<{row:number,column:number}>} array of the selected cells
- * @public
- */
-Dygraph.GVizChart.prototype.getSelection = function() {
-  var selection = [];
-
-  var row = this.date_graph.getSelection();
-
-  if (row < 0) return selection;
-
-  var points = this.date_graph.layout_.points;
-  for (var setIdx = 0; setIdx < points.length; ++setIdx) {
-    selection.push({row: row, column: setIdx + 1});
-  }
-
-  return selection;
-};
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-interaction-model.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-interaction-model.js
deleted file mode 100644
index 2af345c7d..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-interaction-model.js
+++ /dev/null
@@ -1,676 +0,0 @@
-/**
- * @license
- * Copyright 2011 Robert Konigsberg (konigsberg@google.com)
- * MIT-licensed (http://opensource.org/licenses/MIT)
- */
-
-/**
- * @fileoverview The default interaction model for Dygraphs. This is kept out
- * of dygraph.js for better navigability.
- * @author Robert Konigsberg (konigsberg@google.com)
- */
-
-/*jshint globalstrict: true */
-/*global Dygraph:false */
-"use strict";
-
-/**
- * A collection of functions to facilitate build custom interaction models.
- * @class
- */
-Dygraph.Interaction = {};
-
-/**
- * Called in response to an interaction model operation that
- * should start the default panning behavior.
- *
- * It's used in the default callback for "mousedown" operations.
- * Custom interaction model builders can use it to provide the default
- * panning behavior.
- *
- * @param {Event} event the event object which led to the startPan call.
- * @param {Dygraph} g The dygraph on which to act.
- * @param {Object} context The dragging context object (with
- *     dragStartX/dragStartY/etc. properties). This function modifies the
- *     context.
- */
-Dygraph.Interaction.startPan = function(event, g, context) {
-  var i, axis;
-  context.isPanning = true;
-  var xRange = g.xAxisRange();
-  context.dateRange = xRange[1] - xRange[0];
-  context.initialLeftmostDate = xRange[0];
-  context.xUnitsPerPixel = context.dateRange / (g.plotter_.area.w - 1);
-
-  if (g.attr_("panEdgeFraction")) {
-    var maxXPixelsToDraw = g.width_ * g.attr_("panEdgeFraction");
-    var xExtremes = g.xAxisExtremes(); // I REALLY WANT TO CALL THIS xTremes!
-
-    var boundedLeftX = g.toDomXCoord(xExtremes[0]) - maxXPixelsToDraw;
-    var boundedRightX = g.toDomXCoord(xExtremes[1]) + maxXPixelsToDraw;
-
-    var boundedLeftDate = g.toDataXCoord(boundedLeftX);
-    var boundedRightDate = g.toDataXCoord(boundedRightX);
-    context.boundedDates = [boundedLeftDate, boundedRightDate];
-
-    var boundedValues = [];
-    var maxYPixelsToDraw = g.height_ * g.attr_("panEdgeFraction");
-
-    for (i = 0; i < g.axes_.length; i++) {
-      axis = g.axes_[i];
-      var yExtremes = axis.extremeRange;
-
-      var boundedTopY = g.toDomYCoord(yExtremes[0], i) + maxYPixelsToDraw;
-      var boundedBottomY = g.toDomYCoord(yExtremes[1], i) - maxYPixelsToDraw;
-
-      var boundedTopValue = g.toDataYCoord(boundedTopY, i);
-      var boundedBottomValue = g.toDataYCoord(boundedBottomY, i);
-
-      boundedValues[i] = [boundedTopValue, boundedBottomValue];
-    }
-    context.boundedValues = boundedValues;
-  }
-
-  // Record the range of each y-axis at the start of the drag.
-  // If any axis has a valueRange or valueWindow, then we want a 2D pan.
-  // We can't store data directly in g.axes_, because it does not belong to us
-  // and could change out from under us during a pan (say if there's a data
-  // update).
-  context.is2DPan = false;
-  context.axes = [];
-  for (i = 0; i < g.axes_.length; i++) {
-    axis = g.axes_[i];
-    var axis_data = {};
-    var yRange = g.yAxisRange(i);
-    // TODO(konigsberg): These values should be in |context|.
-    // In log scale, initialTopValue, dragValueRange and unitsPerPixel are log scale.
-    var logscale = g.attributes_.getForAxis("logscale", i);
-    if (logscale) {
-      axis_data.initialTopValue = Dygraph.log10(yRange[1]);
-      axis_data.dragValueRange = Dygraph.log10(yRange[1]) - Dygraph.log10(yRange[0]);
-    } else {
-      axis_data.initialTopValue = yRange[1];
-      axis_data.dragValueRange = yRange[1] - yRange[0];
-    }
-    axis_data.unitsPerPixel = axis_data.dragValueRange / (g.plotter_.area.h - 1);
-    context.axes.push(axis_data);
-
-    // While calculating axes, set 2dpan.
-    if (axis.valueWindow || axis.valueRange) context.is2DPan = true;
-  }
-};
-
-/**
- * Called in response to an interaction model operation that
- * responds to an event that pans the view.
- *
- * It's used in the default callback for "mousemove" operations.
- * Custom interaction model builders can use it to provide the default
- * panning behavior.
- *
- * @param {Event} event the event object which led to the movePan call.
- * @param {Dygraph} g The dygraph on which to act.
- * @param {Object} context The dragging context object (with
- *     dragStartX/dragStartY/etc. properties). This function modifies the
- *     context.
- */
-Dygraph.Interaction.movePan = function(event, g, context) {
-  context.dragEndX = g.dragGetX_(event, context);
-  context.dragEndY = g.dragGetY_(event, context);
-
-  var minDate = context.initialLeftmostDate -
-    (context.dragEndX - context.dragStartX) * context.xUnitsPerPixel;
-  if (context.boundedDates) {
-    minDate = Math.max(minDate, context.boundedDates[0]);
-  }
-  var maxDate = minDate + context.dateRange;
-  if (context.boundedDates) {
-    if (maxDate > context.boundedDates[1]) {
-      // Adjust minDate, and recompute maxDate.
-      minDate = minDate - (maxDate - context.boundedDates[1]);
-      maxDate = minDate + context.dateRange;
-    }
-  }
-
-  g.dateWindow_ = [minDate, maxDate];
-
-  // y-axis scaling is automatic unless this is a full 2D pan.
-  if (context.is2DPan) {
-
-    var pixelsDragged = context.dragEndY - context.dragStartY;
-
-    // Adjust each axis appropriately.
-    for (var i = 0; i < g.axes_.length; i++) {
-      var axis = g.axes_[i];
-      var axis_data = context.axes[i];
-      var unitsDragged = pixelsDragged * axis_data.unitsPerPixel;
-
-      var boundedValue = context.boundedValues ? context.boundedValues[i] : null;
-
-      // In log scale, maxValue and minValue are the logs of those values.
-      var maxValue = axis_data.initialTopValue + unitsDragged;
-      if (boundedValue) {
-        maxValue = Math.min(maxValue, boundedValue[1]);
-      }
-      var minValue = maxValue - axis_data.dragValueRange;
-      if (boundedValue) {
-        if (minValue < boundedValue[0]) {
-          // Adjust maxValue, and recompute minValue.
-          maxValue = maxValue - (minValue - boundedValue[0]);
-          minValue = maxValue - axis_data.dragValueRange;
-        }
-      }
-      var logscale = g.attributes_.getForAxis("logscale", i);
-      if (logscale) {
-        axis.valueWindow = [ Math.pow(Dygraph.LOG_SCALE, minValue),
-                             Math.pow(Dygraph.LOG_SCALE, maxValue) ];
-      } else {
-        axis.valueWindow = [ minValue, maxValue ];
-      }
-    }
-  }
-
-  g.drawGraph_(false);
-};
-
-/**
- * Called in response to an interaction model operation that
- * responds to an event that ends panning.
- *
- * It's used in the default callback for "mouseup" operations.
- * Custom interaction model builders can use it to provide the default
- * panning behavior.
- *
- * @param {Event} event the event object which led to the endPan call.
- * @param {Dygraph} g The dygraph on which to act.
- * @param {Object} context The dragging context object (with
- *     dragStartX/dragStartY/etc. properties). This function modifies the
- *     context.
- */
-Dygraph.Interaction.endPan = function(event, g, context) {
-  context.dragEndX = g.dragGetX_(event, context);
-  context.dragEndY = g.dragGetY_(event, context);
-
-  var regionWidth = Math.abs(context.dragEndX - context.dragStartX);
-  var regionHeight = Math.abs(context.dragEndY - context.dragStartY);
-
-  if (regionWidth < 2 && regionHeight < 2 &&
-      g.lastx_ !== undefined && g.lastx_ != -1) {
-    Dygraph.Interaction.treatMouseOpAsClick(g, event, context);
-  }
-
-  // TODO(konigsberg): mouseup should just delete the
-  // context object, and mousedown should create a new one.
-  context.isPanning = false;
-  context.is2DPan = false;
-  context.initialLeftmostDate = null;
-  context.dateRange = null;
-  context.valueRange = null;
-  context.boundedDates = null;
-  context.boundedValues = null;
-  context.axes = null;
-};
-
-/**
- * Called in response to an interaction model operation that
- * responds to an event that starts zooming.
- *
- * It's used in the default callback for "mousedown" operations.
- * Custom interaction model builders can use it to provide the default
- * zooming behavior.
- *
- * @param {Event} event the event object which led to the startZoom call.
- * @param {Dygraph} g The dygraph on which to act.
- * @param {Object} context The dragging context object (with
- *     dragStartX/dragStartY/etc. properties). This function modifies the
- *     context.
- */
-Dygraph.Interaction.startZoom = function(event, g, context) {
-  context.isZooming = true;
-  context.zoomMoved = false;
-};
-
-/**
- * Called in response to an interaction model operation that
- * responds to an event that defines zoom boundaries.
- *
- * It's used in the default callback for "mousemove" operations.
- * Custom interaction model builders can use it to provide the default
- * zooming behavior.
- *
- * @param {Event} event the event object which led to the moveZoom call.
- * @param {Dygraph} g The dygraph on which to act.
- * @param {Object} context The dragging context object (with
- *     dragStartX/dragStartY/etc. properties). This function modifies the
- *     context.
- */
-Dygraph.Interaction.moveZoom = function(event, g, context) {
-  context.zoomMoved = true;
-  context.dragEndX = g.dragGetX_(event, context);
-  context.dragEndY = g.dragGetY_(event, context);
-
-  var xDelta = Math.abs(context.dragStartX - context.dragEndX);
-  var yDelta = Math.abs(context.dragStartY - context.dragEndY);
-
-  // drag direction threshold for y axis is twice as large as x axis
-  context.dragDirection = (xDelta < yDelta / 2) ? Dygraph.VERTICAL : Dygraph.HORIZONTAL;
-
-  g.drawZoomRect_(
-      context.dragDirection,
-      context.dragStartX,
-      context.dragEndX,
-      context.dragStartY,
-      context.dragEndY,
-      context.prevDragDirection,
-      context.prevEndX,
-      context.prevEndY);
-
-  context.prevEndX = context.dragEndX;
-  context.prevEndY = context.dragEndY;
-  context.prevDragDirection = context.dragDirection;
-};
-
-/**
- * @param {Dygraph} g
- * @param {Event} event
- * @param {Object} context
- */
-Dygraph.Interaction.treatMouseOpAsClick = function(g, event, context) {
-  var clickCallback = g.attr_('clickCallback');
-  var pointClickCallback = g.attr_('pointClickCallback');
-
-  var selectedPoint = null;
-
-  // Find out if the click occurs on a point. This only matters if there's a
-  // pointClickCallback.
-  if (pointClickCallback) {
-    var closestIdx = -1;
-    var closestDistance = Number.MAX_VALUE;
-
-    // check if the click was on a particular point.
-    for (var i = 0; i < g.selPoints_.length; i++) {
-      var p = g.selPoints_[i];
-      var distance = Math.pow(p.canvasx - context.dragEndX, 2) +
-                     Math.pow(p.canvasy - context.dragEndY, 2);
-      if (!isNaN(distance) &&
-          (closestIdx == -1 || distance < closestDistance)) {
-        closestDistance = distance;
-        closestIdx = i;
-      }
-    }
-
-    // Allow any click within two pixels of the dot.
-    var radius = g.attr_('highlightCircleSize') + 2;
-    if (closestDistance <= radius * radius) {
-      selectedPoint = g.selPoints_[closestIdx];
-    }
-  }
-
-  if (selectedPoint) {
-    pointClickCallback(event, selectedPoint);
-  }
-
-  // TODO(danvk): pass along more info about the points, e.g. 'x'
-  if (clickCallback) {
-    clickCallback(event, g.lastx_, g.selPoints_);
-  }
-};
-
-/**
- * Called in response to an interaction model operation that
- * responds to an event that performs a zoom based on previously defined
- * bounds..
- *
- * It's used in the default callback for "mouseup" operations.
- * Custom interaction model builders can use it to provide the default
- * zooming behavior.
- *
- * @param {Event} event the event object which led to the endZoom call.
- * @param {Dygraph} g The dygraph on which to end the zoom.
- * @param {Object} context The dragging context object (with
- *     dragStartX/dragStartY/etc. properties). This function modifies the
- *     context.
- */
-Dygraph.Interaction.endZoom = function(event, g, context) {
-  context.isZooming = false;
-  context.dragEndX = g.dragGetX_(event, context);
-  context.dragEndY = g.dragGetY_(event, context);
-  var regionWidth = Math.abs(context.dragEndX - context.dragStartX);
-  var regionHeight = Math.abs(context.dragEndY - context.dragStartY);
-
-  if (regionWidth < 2 && regionHeight < 2 &&
-      g.lastx_ !== undefined && g.lastx_ != -1) {
-    Dygraph.Interaction.treatMouseOpAsClick(g, event, context);
-  }
-
-  // The zoom rectangle is visibly clipped to the plot area, so its behavior
-  // should be as well.
-  // See http://code.google.com/p/dygraphs/issues/detail?id=280
-  var plotArea = g.getArea();
-  if (regionWidth >= 10 && context.dragDirection == Dygraph.HORIZONTAL) {
-    var left = Math.min(context.dragStartX, context.dragEndX),
-        right = Math.max(context.dragStartX, context.dragEndX);
-    left = Math.max(left, plotArea.x);
-    right = Math.min(right, plotArea.x + plotArea.w);
-    if (left < right) {
-      g.doZoomX_(left, right);
-    }
-    context.cancelNextDblclick = true;
-  } else if (regionHeight >= 10 && context.dragDirection == Dygraph.VERTICAL) {
-    var top = Math.min(context.dragStartY, context.dragEndY),
-        bottom = Math.max(context.dragStartY, context.dragEndY);
-    top = Math.max(top, plotArea.y);
-    bottom = Math.min(bottom, plotArea.y + plotArea.h);
-    if (top < bottom) {
-      g.doZoomY_(top, bottom);
-    }
-    context.cancelNextDblclick = true;
-  } else {
-    if (context.zoomMoved) g.clearZoomRect_();
-  }
-  context.dragStartX = null;
-  context.dragStartY = null;
-};
-
-/**
- * @private
- */
-Dygraph.Interaction.startTouch = function(event, g, context) {
-  event.preventDefault();  // touch browsers are all nice.
-  if (event.touches.length > 1) {
-    // If the user ever puts two fingers down, it's not a double tap.
-    context.startTimeForDoubleTapMs = null;
-  }
-
-  var touches = [];
-  for (var i = 0; i < event.touches.length; i++) {
-    var t = event.touches[i];
-    // we dispense with 'dragGetX_' because all touchBrowsers support pageX
-    touches.push({
-      pageX: t.pageX,
-      pageY: t.pageY,
-      dataX: g.toDataXCoord(t.pageX),
-      dataY: g.toDataYCoord(t.pageY)
-      // identifier: t.identifier
-    });
-  }
-  context.initialTouches = touches;
-
-  if (touches.length == 1) {
-    // This is just a swipe.
-    context.initialPinchCenter = touches[0];
-    context.touchDirections = { x: true, y: true };
-  } else if (touches.length >= 2) {
-    // It's become a pinch!
-    // In case there are 3+ touches, we ignore all but the "first" two.
-
-    // only screen coordinates can be averaged (data coords could be log scale).
-    context.initialPinchCenter = {
-      pageX: 0.5 * (touches[0].pageX + touches[1].pageX),
-      pageY: 0.5 * (touches[0].pageY + touches[1].pageY),
-
-      // TODO(danvk): remove
-      dataX: 0.5 * (touches[0].dataX + touches[1].dataX),
-      dataY: 0.5 * (touches[0].dataY + touches[1].dataY)
-    };
-
-    // Make pinches in a 45-degree swath around either axis 1-dimensional zooms.
-    var initialAngle = 180 / Math.PI * Math.atan2(
-        context.initialPinchCenter.pageY - touches[0].pageY,
-        touches[0].pageX - context.initialPinchCenter.pageX);
-
-    // use symmetry to get it into the first quadrant.
-    initialAngle = Math.abs(initialAngle);
-    if (initialAngle > 90) initialAngle = 90 - initialAngle;
-
-    context.touchDirections = {
-      x: (initialAngle < (90 - 45/2)),
-      y: (initialAngle > 45/2)
-    };
-  }
-
-  // save the full x & y ranges.
-  context.initialRange = {
-    x: g.xAxisRange(),
-    y: g.yAxisRange()
-  };
-};
-
-/**
- * @private
- */
-Dygraph.Interaction.moveTouch = function(event, g, context) {
-  // If the tap moves, then it's definitely not part of a double-tap.
-  context.startTimeForDoubleTapMs = null;
-
-  var i, touches = [];
-  for (i = 0; i < event.touches.length; i++) {
-    var t = event.touches[i];
-    touches.push({
-      pageX: t.pageX,
-      pageY: t.pageY
-    });
-  }
-  var initialTouches = context.initialTouches;
-
-  var c_now;
-
-  // old and new centers.
-  var c_init = context.initialPinchCenter;
-  if (touches.length == 1) {
-    c_now = touches[0];
-  } else {
-    c_now = {
-      pageX: 0.5 * (touches[0].pageX + touches[1].pageX),
-      pageY: 0.5 * (touches[0].pageY + touches[1].pageY)
-    };
-  }
-
-  // this is the "swipe" component
-  // we toss it out for now, but could use it in the future.
-  var swipe = {
-    pageX: c_now.pageX - c_init.pageX,
-    pageY: c_now.pageY - c_init.pageY
-  };
-  var dataWidth = context.initialRange.x[1] - context.initialRange.x[0];
-  var dataHeight = context.initialRange.y[0] - context.initialRange.y[1];
-  swipe.dataX = (swipe.pageX / g.plotter_.area.w) * dataWidth;
-  swipe.dataY = (swipe.pageY / g.plotter_.area.h) * dataHeight;
-  var xScale, yScale;
-
-  // The residual bits are usually split into scale & rotate bits, but we split
-  // them into x-scale and y-scale bits.
-  if (touches.length == 1) {
-    xScale = 1.0;
-    yScale = 1.0;
-  } else if (touches.length >= 2) {
-    var initHalfWidth = (initialTouches[1].pageX - c_init.pageX);
-    xScale = (touches[1].pageX - c_now.pageX) / initHalfWidth;
-
-    var initHalfHeight = (initialTouches[1].pageY - c_init.pageY);
-    yScale = (touches[1].pageY - c_now.pageY) / initHalfHeight;
-  }
-
-  // Clip scaling to [1/8, 8] to prevent too much blowup.
-  xScale = Math.min(8, Math.max(0.125, xScale));
-  yScale = Math.min(8, Math.max(0.125, yScale));
-
-  var didZoom = false;
-  if (context.touchDirections.x) {
-    g.dateWindow_ = [
-      c_init.dataX - swipe.dataX + (context.initialRange.x[0] - c_init.dataX) / xScale,
-      c_init.dataX - swipe.dataX + (context.initialRange.x[1] - c_init.dataX) / xScale
-    ];
-    didZoom = true;
-  }
-  
-  if (context.touchDirections.y) {
-    for (i = 0; i < 1  /*g.axes_.length*/; i++) {
-      var axis = g.axes_[i];
-      var logscale = g.attributes_.getForAxis("logscale", i);
-      if (logscale) {
-        // TODO(danvk): implement
-      } else {
-        axis.valueWindow = [
-          c_init.dataY - swipe.dataY + (context.initialRange.y[0] - c_init.dataY) / yScale,
-          c_init.dataY - swipe.dataY + (context.initialRange.y[1] - c_init.dataY) / yScale
-        ];
-        didZoom = true;
-      }
-    }
-  }
-
-  g.drawGraph_(false);
-
-  // We only call zoomCallback on zooms, not pans, to mirror desktop behavior.
-  if (didZoom && touches.length > 1 && g.attr_('zoomCallback')) {
-    var viewWindow = g.xAxisRange();
-    g.attr_("zoomCallback")(viewWindow[0], viewWindow[1], g.yAxisRanges());
-  }
-};
-
-/**
- * @private
- */
-Dygraph.Interaction.endTouch = function(event, g, context) {
-  if (event.touches.length !== 0) {
-    // this is effectively a "reset"
-    Dygraph.Interaction.startTouch(event, g, context);
-  } else if (event.changedTouches.length == 1) {
-    // Could be part of a "double tap"
-    // The heuristic here is that it's a double-tap if the two touchend events
-    // occur within 500ms and within a 50x50 pixel box.
-    var now = new Date().getTime();
-    var t = event.changedTouches[0];
-    if (context.startTimeForDoubleTapMs &&
-        now - context.startTimeForDoubleTapMs < 500 &&
-        context.doubleTapX && Math.abs(context.doubleTapX - t.screenX) < 50 &&
-        context.doubleTapY && Math.abs(context.doubleTapY - t.screenY) < 50) {
-      g.resetZoom();
-    } else {
-      context.startTimeForDoubleTapMs = now;
-      context.doubleTapX = t.screenX;
-      context.doubleTapY = t.screenY;
-    }
-  }
-};
-
-/**
- * Default interation model for dygraphs. You can refer to specific elements of
- * this when constructing your own interaction model, e.g.:
- * g.updateOptions( {
- *   interactionModel: {
- *     mousedown: Dygraph.defaultInteractionModel.mousedown
- *   }
- * } );
- */
-Dygraph.Interaction.defaultModel = {
-  // Track the beginning of drag events
-  mousedown: function(event, g, context) {
-    // Right-click should not initiate a zoom.
-    if (event.button && event.button == 2) return;
-
-    context.initializeMouseDown(event, g, context);
-
-    if (event.altKey || event.shiftKey) {
-      Dygraph.startPan(event, g, context);
-    } else {
-      Dygraph.startZoom(event, g, context);
-    }
-  },
-
-  // Draw zoom rectangles when the mouse is down and the user moves around
-  mousemove: function(event, g, context) {
-    if (context.isZooming) {
-      Dygraph.moveZoom(event, g, context);
-    } else if (context.isPanning) {
-      Dygraph.movePan(event, g, context);
-    }
-  },
-
-  mouseup: function(event, g, context) {
-    if (context.isZooming) {
-      Dygraph.endZoom(event, g, context);
-    } else if (context.isPanning) {
-      Dygraph.endPan(event, g, context);
-    }
-  },
-
-  touchstart: function(event, g, context) {
-    Dygraph.Interaction.startTouch(event, g, context);
-  },
-  touchmove: function(event, g, context) {
-    Dygraph.Interaction.moveTouch(event, g, context);
-  },
-  touchend: function(event, g, context) {
-    Dygraph.Interaction.endTouch(event, g, context);
-  },
-
-  // Temporarily cancel the dragging event when the mouse leaves the graph
-  mouseout: function(event, g, context) {
-    if (context.isZooming) {
-      context.dragEndX = null;
-      context.dragEndY = null;
-      g.clearZoomRect_();
-    }
-  },
-
-  // Disable zooming out if panning.
-  dblclick: function(event, g, context) {
-    if (context.cancelNextDblclick) {
-      context.cancelNextDblclick = false;
-      return;
-    }
-    if (event.altKey || event.shiftKey) {
-      return;
-    }
-    g.resetZoom();
-  }
-};
-
-Dygraph.DEFAULT_ATTRS.interactionModel = Dygraph.Interaction.defaultModel;
-
-// old ways of accessing these methods/properties
-Dygraph.defaultInteractionModel = Dygraph.Interaction.defaultModel;
-Dygraph.endZoom = Dygraph.Interaction.endZoom;
-Dygraph.moveZoom = Dygraph.Interaction.moveZoom;
-Dygraph.startZoom = Dygraph.Interaction.startZoom;
-Dygraph.endPan = Dygraph.Interaction.endPan;
-Dygraph.movePan = Dygraph.Interaction.movePan;
-Dygraph.startPan = Dygraph.Interaction.startPan;
-
-Dygraph.Interaction.nonInteractiveModel_ = {
-  mousedown: function(event, g, context) {
-    context.initializeMouseDown(event, g, context);
-  },
-  mouseup: function(event, g, context) {
-    // TODO(danvk): this logic is repeated in Dygraph.Interaction.endZoom
-    context.dragEndX = g.dragGetX_(event, context);
-    context.dragEndY = g.dragGetY_(event, context);
-    var regionWidth = Math.abs(context.dragEndX - context.dragStartX);
-    var regionHeight = Math.abs(context.dragEndY - context.dragStartY);
-
-    if (regionWidth < 2 && regionHeight < 2 &&
-        g.lastx_ !== undefined && g.lastx_ != -1) {
-      Dygraph.Interaction.treatMouseOpAsClick(g, event, context);
-    }
-  }
-};
-
-// Default interaction model when using the range selector.
-Dygraph.Interaction.dragIsPanInteractionModel = {
-  mousedown: function(event, g, context) {
-    context.initializeMouseDown(event, g, context);
-    Dygraph.startPan(event, g, context);
-  },
-  mousemove: function(event, g, context) {
-    if (context.isPanning) {
-      Dygraph.movePan(event, g, context);
-    }
-  },
-  mouseup: function(event, g, context) {
-    if (context.isPanning) {
-      Dygraph.endPan(event, g, context);
-    }
-  }
-};
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-layout.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-layout.js
deleted file mode 100644
index e766e8f54..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-layout.js
+++ /dev/null
@@ -1,349 +0,0 @@
-/**
- * @license
- * Copyright 2011 Dan Vanderkam (danvdk@gmail.com)
- * MIT-licensed (http://opensource.org/licenses/MIT)
- */
-
-/**
- * @fileoverview Based on PlotKitLayout, but modified to meet the needs of
- * dygraphs.
- */
-
-/*jshint globalstrict: true */
-/*global Dygraph:false */
-"use strict";
-
-/**
- * Creates a new DygraphLayout object.
- *
- * This class contains all the data to be charted.
- * It uses data coordinates, but also records the chart range (in data
- * coordinates) and hence is able to calculate percentage positions ('In this
- * view, Point A lies 25% down the x-axis.')
- *
- * Two things that it does not do are:
- * 1. Record pixel coordinates for anything.
- * 2. (oddly) determine anything about the layout of chart elements.
- *
- * The naming is a vestige of Dygraph's original PlotKit roots.
- *
- * @constructor
- */
-var DygraphLayout = function(dygraph) {
-  this.dygraph_ = dygraph;
-  /**
-   * Array of points for each series.
-   *
-   * [series index][row index in series] = |Point| structure,
-   * where series index refers to visible series only, and the
-   * point index is for the reduced set of points for the current
-   * zoom region (including one point just outside the window).
-   * All points in the same row index share the same X value.
-   *
-   * @type {Array.>}
-   */
-  this.points = [];
-  this.setNames = [];
-  this.annotations = [];
-  this.yAxes_ = null;
-
-  // TODO(danvk): it's odd that xTicks_ and yTicks_ are inputs, but xticks and
-  // yticks are outputs. Clean this up.
-  this.xTicks_ = null;
-  this.yTicks_ = null;
-};
-
-DygraphLayout.prototype.attr_ = function(name) {
-  return this.dygraph_.attr_(name);
-};
-
-/**
- * Add points for a single series.
- *
- * @param {string} setname Name of the series.
- * @param {Array.} set_xy Points for the series.
- */
-DygraphLayout.prototype.addDataset = function(setname, set_xy) {
-  this.points.push(set_xy);
-  this.setNames.push(setname);
-};
-
-/**
- * Returns the box which the chart should be drawn in. This is the canvas's
- * box, less space needed for the axis and chart labels.
- *
- * @return {{x: number, y: number, w: number, h: number}}
- */
-DygraphLayout.prototype.getPlotArea = function() {
-  return this.area_;
-};
-
-// Compute the box which the chart should be drawn in. This is the canvas's
-// box, less space needed for axis, chart labels, and other plug-ins.
-// NOTE: This should only be called by Dygraph.predraw_().
-DygraphLayout.prototype.computePlotArea = function() {
-  var area = {
-    // TODO(danvk): per-axis setting.
-    x: 0,
-    y: 0
-  };
-
-  area.w = this.dygraph_.width_ - area.x - this.attr_('rightGap');
-  area.h = this.dygraph_.height_;
-
-  // Let plugins reserve space.
-  var e = {
-    chart_div: this.dygraph_.graphDiv,
-    reserveSpaceLeft: function(px) {
-      var r = {
-        x: area.x,
-        y: area.y,
-        w: px,
-        h: area.h
-      };
-      area.x += px;
-      area.w -= px;
-      return r;
-    },
-    reserveSpaceRight: function(px) {
-      var r = {
-        x: area.x + area.w - px,
-        y: area.y,
-        w: px,
-        h: area.h
-      };
-      area.w -= px;
-      return r;
-    },
-    reserveSpaceTop: function(px) {
-      var r = {
-        x: area.x,
-        y: area.y,
-        w: area.w,
-        h: px
-      };
-      area.y += px;
-      area.h -= px;
-      return r;
-    },
-    reserveSpaceBottom: function(px) {
-      var r = {
-        x: area.x,
-        y: area.y + area.h - px,
-        w: area.w,
-        h: px
-      };
-      area.h -= px;
-      return r;
-    },
-    chartRect: function() {
-      return {x:area.x, y:area.y, w:area.w, h:area.h};
-    }
-  };
-  this.dygraph_.cascadeEvents_('layout', e);
-
-  this.area_ = area;
-};
-
-DygraphLayout.prototype.setAnnotations = function(ann) {
-  // The Dygraph object's annotations aren't parsed. We parse them here and
-  // save a copy. If there is no parser, then the user must be using raw format.
-  this.annotations = [];
-  var parse = this.attr_('xValueParser') || function(x) { return x; };
-  for (var i = 0; i < ann.length; i++) {
-    var a = {};
-    if (!ann[i].xval && ann[i].x === undefined) {
-      this.dygraph_.error("Annotations must have an 'x' property");
-      return;
-    }
-    if (ann[i].icon &&
-        !(ann[i].hasOwnProperty('width') &&
-          ann[i].hasOwnProperty('height'))) {
-      this.dygraph_.error("Must set width and height when setting " +
-                          "annotation.icon property");
-      return;
-    }
-    Dygraph.update(a, ann[i]);
-    if (!a.xval) a.xval = parse(a.x);
-    this.annotations.push(a);
-  }
-};
-
-DygraphLayout.prototype.setXTicks = function(xTicks) {
-  this.xTicks_ = xTicks;
-};
-
-// TODO(danvk): add this to the Dygraph object's API or move it into Layout.
-DygraphLayout.prototype.setYAxes = function (yAxes) {
-  this.yAxes_ = yAxes;
-};
-
-DygraphLayout.prototype.evaluate = function() {
-  this._evaluateLimits();
-  this._evaluateLineCharts();
-  this._evaluateLineTicks();
-  this._evaluateAnnotations();
-};
-
-DygraphLayout.prototype._evaluateLimits = function() {
-  var xlimits = this.dygraph_.xAxisRange();
-  this.minxval = xlimits[0];
-  this.maxxval = xlimits[1];
-  var xrange = xlimits[1] - xlimits[0];
-  this.xscale = (xrange !== 0 ? 1 / xrange : 1.0);
-
-  for (var i = 0; i < this.yAxes_.length; i++) {
-    var axis = this.yAxes_[i];
-    axis.minyval = axis.computedValueRange[0];
-    axis.maxyval = axis.computedValueRange[1];
-    axis.yrange = axis.maxyval - axis.minyval;
-    axis.yscale = (axis.yrange !== 0 ? 1.0 / axis.yrange : 1.0);
-
-    if (axis.g.attr_("logscale")) {
-      axis.ylogrange = Dygraph.log10(axis.maxyval) - Dygraph.log10(axis.minyval);
-      axis.ylogscale = (axis.ylogrange !== 0 ? 1.0 / axis.ylogrange : 1.0);
-      if (!isFinite(axis.ylogrange) || isNaN(axis.ylogrange)) {
-        axis.g.error('axis ' + i + ' of graph at ' + axis.g +
-            ' can\'t be displayed in log scale for range [' +
-            axis.minyval + ' - ' + axis.maxyval + ']');
-      }
-    }
-  }
-};
-
-DygraphLayout._calcYNormal = function(axis, value, logscale) {
-  if (logscale) {
-    return 1.0 - ((Dygraph.log10(value) - Dygraph.log10(axis.minyval)) * axis.ylogscale);
-  } else {
-    return 1.0 - ((value - axis.minyval) * axis.yscale);
-  }
-};
-
-DygraphLayout.prototype._evaluateLineCharts = function() {
-  var connectSeparated = this.attr_('connectSeparatedPoints');
-  var isStacked = this.attr_("stackedGraph");
-  var hasBars = this.attr_('errorBars') || this.attr_('customBars');
-
-  for (var setIdx = 0; setIdx < this.points.length; setIdx++) {
-    var points = this.points[setIdx];
-    var setName = this.setNames[setIdx];
-    var axis = this.dygraph_.axisPropertiesForSeries(setName);
-    // TODO (konigsberg): use optionsForAxis instead.
-    var logscale = this.dygraph_.attributes_.getForSeries("logscale", setName);
-
-    for (var j = 0; j < points.length; j++) {
-      var point = points[j];
-
-      // Range from 0-1 where 0 represents left and 1 represents right.
-      point.x = (point.xval - this.minxval) * this.xscale;
-      // Range from 0-1 where 0 represents top and 1 represents bottom
-      var yval = point.yval;
-      if (isStacked) {
-        point.y_stacked = DygraphLayout._calcYNormal(
-            axis, point.yval_stacked, logscale);
-        if (yval !== null && !isNaN(yval)) {
-          yval = point.yval_stacked;
-        }
-      }
-      if (yval === null) {
-        yval = NaN;
-        if (!connectSeparated) {
-          point.yval = NaN;
-        }
-      }
-      point.y = DygraphLayout._calcYNormal(axis, yval, logscale);
-
-      if (hasBars) {
-        point.y_top = DygraphLayout._calcYNormal(
-            axis, yval - point.yval_minus, logscale);
-        point.y_bottom = DygraphLayout._calcYNormal(
-            axis, yval + point.yval_plus, logscale);
-      }
-    }
-  }
-};
-
-/**
- * Optimized replacement for parseFloat, which was way too slow when almost
- * all values were type number, with few edge cases, none of which were strings.
- */
-DygraphLayout.parseFloat_ = function(val) {
-  // parseFloat(null) is NaN
-  if (val === null) {
-    return NaN;
-  }
-
-  // Assume it's a number or NaN. If it's something else, I'll be shocked.
-  return val;
-};
-
-DygraphLayout.prototype._evaluateLineTicks = function() {
-  var i, tick, label, pos;
-  this.xticks = [];
-  for (i = 0; i < this.xTicks_.length; i++) {
-    tick = this.xTicks_[i];
-    label = tick.label;
-    pos = this.xscale * (tick.v - this.minxval);
-    if ((pos >= 0.0) && (pos <= 1.0)) {
-      this.xticks.push([pos, label]);
-    }
-  }
-
-  this.yticks = [];
-  for (i = 0; i < this.yAxes_.length; i++ ) {
-    var axis = this.yAxes_[i];
-    for (var j = 0; j < axis.ticks.length; j++) {
-      tick = axis.ticks[j];
-      label = tick.label;
-      pos = this.dygraph_.toPercentYCoord(tick.v, i);
-      if ((pos >= 0.0) && (pos <= 1.0)) {
-        this.yticks.push([i, pos, label]);
-      }
-    }
-  }
-};
-
-DygraphLayout.prototype._evaluateAnnotations = function() {
-  // Add the annotations to the point to which they belong.
-  // Make a map from (setName, xval) to annotation for quick lookups.
-  var i;
-  var annotations = {};
-  for (i = 0; i < this.annotations.length; i++) {
-    var a = this.annotations[i];
-    annotations[a.xval + "," + a.series] = a;
-  }
-
-  this.annotated_points = [];
-
-  // Exit the function early if there are no annotations.
-  if (!this.annotations || !this.annotations.length) {
-    return;
-  }
-
-  // TODO(antrob): loop through annotations not points.
-  for (var setIdx = 0; setIdx < this.points.length; setIdx++) {
-    var points = this.points[setIdx];
-    for (i = 0; i < points.length; i++) {
-      var p = points[i];
-      var k = p.xval + "," + p.name;
-      if (k in annotations) {
-        p.annotation = annotations[k];
-        this.annotated_points.push(p);
-      }
-    }
-  }
-};
-
-/**
- * Convenience function to remove all the data sets from a graph
- */
-DygraphLayout.prototype.removeAllDatasets = function() {
-  delete this.points;
-  delete this.setNames;
-  delete this.setPointsLengths;
-  delete this.setPointsOffsets;
-  this.points = [];
-  this.setNames = [];
-  this.setPointsLengths = [];
-  this.setPointsOffsets = [];
-};
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-options-reference.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-options-reference.js
deleted file mode 100644
index 64e738d4f..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-options-reference.js
+++ /dev/null
@@ -1,867 +0,0 @@
-/**
- * @license
- * Copyright 2011 Dan Vanderkam (danvdk@gmail.com)
- * MIT-licensed (http://opensource.org/licenses/MIT)
- */
-
-/*jshint globalstrict: true */
-/*global Dygraph:false */
-
-// NOTE: in addition to parsing as JS, this snippet is expected to be valid
-// JSON. This assumption cannot be checked in JS, but it will be checked when
-// documentation is generated by the generate-documentation.py script. For the
-// most part, this just means that you should always use double quotes.
-Dygraph.OPTIONS_REFERENCE =  // 
-{
-  "xValueParser": {
-    "default": "parseFloat() or Date.parse()*",
-    "labels": ["CSV parsing"],
-    "type": "function(str) -> number",
-    "description": "A function which parses x-values (i.e. the dependent series). Must return a number, even when the values are dates. In this case, millis since epoch are used. This is used primarily for parsing CSV data. *=Dygraphs is slightly more accepting in the dates which it will parse. See code for details."
-  },
-  "stackedGraph": {
-    "default": "false",
-    "labels": ["Data Line display"],
-    "type": "boolean",
-    "description": "If set, stack series on top of one another rather than drawing them independently. The first series specified in the input data will wind up on top of the chart and the last will be on bottom. NaN values are drawn as white areas without a line on top, see stackedGraphNaNFill for details."
-  },
-  "stackedGraphNaNFill": {
-    "default": "all",
-    "labels": ["Data Line display"],
-    "type": "string",
-    "description": "Controls handling of NaN values inside a stacked graph. NaN values are interpolated/extended for stacking purposes, but the actual point value remains NaN in the legend display. Valid option values are \"all\" (interpolate internally, repeat leftmost and rightmost value as needed), \"inside\" (interpolate internally only, use zero outside leftmost and rightmost value), and \"none\" (treat NaN as zero everywhere)."
-  },
-  "pointSize": {
-    "default": "1",
-    "labels": ["Data Line display"],
-    "type": "integer",
-    "description": "The size of the dot to draw on each point in pixels (see drawPoints). A dot is always drawn when a point is \"isolated\", i.e. there is a missing point on either side of it. This also controls the size of those dots."
-  },
-  "labelsDivStyles": {
-    "default": "null",
-    "labels": ["Legend"],
-    "type": "{}",
-    "description": "Additional styles to apply to the currently-highlighted points div. For example, { 'fontWeight': 'bold' } will make the labels bold. In general, it is better to use CSS to style the .dygraph-legend class than to use this property."
-  },
-  "drawPoints": {
-    "default": "false",
-    "labels": ["Data Line display"],
-    "type": "boolean",
-    "description": "Draw a small dot at each point, in addition to a line going through the point. This makes the individual data points easier to see, but can increase visual clutter in the chart. The small dot can be replaced with a custom rendering by supplying a drawPointCallback."
-  },
-  "drawGapEdgePoints": {
-    "default": "false",
-    "labels": ["Data Line display"],
-    "type": "boolean",
-    "description": "Draw points at the edges of gaps in the data. This improves visibility of small data segments or other data irregularities."
-  },
-  "drawPointCallback": {
-    "default": "null",
-    "labels": ["Data Line display"],
-    "type": "function(g, seriesName, canvasContext, cx, cy, color, pointSize)",
-    "parameters": [
-      [ "g" , "the reference graph" ],
-      [ "seriesName" , "the name of the series" ],
-      [ "canvasContext" , "the canvas to draw on" ],
-      [ "cx" , "center x coordinate" ],
-      [ "cy" , "center y coordinate" ],
-      [ "color" , "series color" ],
-      [ "pointSize" , "the radius of the image." ],
-      [ "idx" , "the row-index of the point in the data."]
-    ],
-    "description": "Draw a custom item when drawPoints is enabled. Default is a small dot matching the series color. This method should constrain drawing to within pointSize pixels from (cx, cy).  Also see drawHighlightPointCallback"
-  },
-  "height": {
-    "default": "320",
-    "labels": ["Overall display"],
-    "type": "integer",
-    "description": "Height, in pixels, of the chart. If the container div has been explicitly sized, this will be ignored."
-  },
-  "zoomCallback": {
-    "default": "null",
-    "labels": ["Callbacks"],
-    "type": "function(minDate, maxDate, yRanges)",
-    "parameters": [
-      [ "minDate" , "milliseconds since epoch" ],
-      [ "maxDate" , "milliseconds since epoch." ],
-      [ "yRanges" , "is an array of [bottom, top] pairs, one for each y-axis." ]
-    ],
-    "description": "A function to call when the zoom window is changed (either by zooming in or out)."
-  },
-  "pointClickCallback": {
-    "snippet": "function(e, point){
            alert(point);
          }",
-    "default": "null",
-    "labels": ["Callbacks", "Interactive Elements"],
-    "type": "function(e, point)",
-    "parameters": [
-      [ "e" , "the event object for the click" ],
-      [ "point" , "the point that was clicked See Point properties for details" ]
-    ],
-    "description": "A function to call when a data point is clicked. and the point that was clicked."
-  },
-  "colors": {
-    "default": "(see description)",
-    "labels": ["Data Series Colors"],
-    "type": "array",
-    "example": "['red', '#00FF00']",
-    "description": "List of colors for the data series. These can be of the form \"#AABBCC\" or \"rgb(255,100,200)\" or \"yellow\", etc. If not specified, equally-spaced points around a color wheel are used."
-  },
-  "connectSeparatedPoints": {
-    "default": "false",
-    "labels": ["Data Line display"],
-    "type": "boolean",
-    "description": "Usually, when Dygraphs encounters a missing value in a data series, it interprets this as a gap and draws it as such. If, instead, the missing values represents an x-value for which only a different series has data, then you'll want to connect the dots by setting this to true. To explicitly include a gap with this option set, use a value of NaN."
-  },
-  "highlightCallback": {
-    "default": "null",
-    "labels": ["Callbacks"],
-    "type": "function(event, x, points, row, seriesName)",
-    "description": "When set, this callback gets called every time a new point is highlighted.",
-    "parameters": [
-      ["event", "the JavaScript mousemove event"],
-      ["x", "the x-coordinate of the highlighted points"],
-      ["points", "an array of highlighted points: [ {name: 'series', yval: y-value}, … ]"],
-      ["row", "integer index of the highlighted row in the data table, starting from 0"],
-      ["seriesName", "name of the highlighted series, only present if highlightSeriesOpts is set."]
-    ]
-  },
-  "drawHighlightPointCallback": {
-    "default": "null",
-    "labels": ["Data Line display"],
-    "type": "function(g, seriesName, canvasContext, cx, cy, color, pointSize)",
-    "parameters": [
-      [ "g" , "the reference graph" ],
-      [ "seriesName" , "the name of the series" ],
-      [ "canvasContext" , "the canvas to draw on" ],
-      [ "cx" , "center x coordinate" ],
-      [ "cy" , "center y coordinate" ],
-      [ "color" , "series color" ],
-      [ "pointSize" , "the radius of the image." ],
-      [ "idx" , "the row-index of the point in the data."]
-    ],
-    "description": "Draw a custom item when a point is highlighted.  Default is a small dot matching the series color. This method should constrain drawing to within pointSize pixels from (cx, cy) Also see drawPointCallback"
-  },
-  "highlightSeriesOpts": {
-    "default": "null",
-    "labels": ["Interactive Elements"],
-    "type": "Object",
-    "description": "When set, the options from this object are applied to the timeseries closest to the mouse pointer for interactive highlighting. See also 'highlightCallback'. Example: highlightSeriesOpts: { strokeWidth: 3 }."
-  },
-  "highlightSeriesBackgroundAlpha": {
-    "default": "0.5",
-    "labels": ["Interactive Elements"],
-    "type": "float",
-    "description": "Fade the background while highlighting series. 1=fully visible background (disable fading), 0=hiddden background (show highlighted series only)."
-  },
-  "includeZero": {
-    "default": "false",
-    "labels": ["Axis display"],
-    "type": "boolean",
-    "description": "Usually, dygraphs will use the range of the data plus some padding to set the range of the y-axis. If this option is set, the y-axis will always include zero, typically as the lowest value. This can be used to avoid exaggerating the variance in the data"
-  },
-  "rollPeriod": {
-    "default": "1",
-    "labels": ["Error Bars", "Rolling Averages"],
-    "type": "integer >= 1",
-    "description": "Number of days over which to average data. Discussed extensively above."
-  },
-  "unhighlightCallback": {
-    "default": "null",
-    "labels": ["Callbacks"],
-    "type": "function(event)",
-    "parameters": [
-      [ "event" , "the mouse event" ]
-    ],
-    "description": "When set, this callback gets called every time the user stops highlighting any point by mousing out of the graph."
-  },
-  "axisTickSize": {
-    "default": "3.0",
-    "labels": ["Axis display"],
-    "type": "number",
-    "description": "The size of the line to display next to each tick mark on x- or y-axes."
-  },
-  "labelsSeparateLines": {
-    "default": "false",
-    "labels": ["Legend"],
-    "type": "boolean",
-    "description": "Put <br/> between lines in the label string. Often used in conjunction with labelsDiv."
-  },
-  "xValueFormatter": {
-    "default": "",
-    "labels": ["Deprecated"],
-    "type": "",
-    "description": "Prefer axes: { x: { valueFormatter } }"
-  },
-  "valueFormatter": {
-    "default": "Depends on the type of your data.",
-    "labels": ["Legend", "Value display/formatting"],
-    "type": "function(num or millis, opts, dygraph)",
-    "description": "Function to provide a custom display format for the values displayed on mouseover. This does not affect the values that appear on tick marks next to the axes. To format those, see axisLabelFormatter. This is usually set on a per-axis basis. For date axes, you can call new Date(millis) to get a Date object. opts is a function you can call to access various options (e.g. opts('labelsKMB'))."
-  },
-  "pixelsPerYLabel": {
-    "default": "",
-    "labels": ["Deprecated"],
-    "type": "integer",
-    "description": "Prefer axes: { y: { pixelsPerLabel } }"
-  },
-  "annotationMouseOverHandler": {
-    "default": "null",
-    "labels": ["Annotations"],
-    "type": "function(annotation, point, dygraph, event)",
-    "description": "If provided, this function is called whenever the user mouses over an annotation."
-  },
-  "annotationMouseOutHandler": {
-    "default": "null",
-    "labels": ["Annotations"],
-    "type": "function(annotation, point, dygraph, event)",
-    "parameters": [
-      [ "annotation" , "the annotation left" ],
-      [ "point" , "the point associated with the annotation" ],
-      [ "dygraph" , "the reference graph" ],
-      [ "event" , "the mouse event" ]
-    ],
-    "description": "If provided, this function is called whenever the user mouses out of an annotation."
-  },
-  "annotationClickHandler": {
-    "default": "null",
-    "labels": ["Annotations"],
-    "type": "function(annotation, point, dygraph, event)",
-    "parameters": [
-      [ "annotation" , "the annotation left" ],
-      [ "point" , "the point associated with the annotation" ],
-      [ "dygraph" , "the reference graph" ],
-      [ "event" , "the mouse event" ]
-    ],
-    "description": "If provided, this function is called whenever the user clicks on an annotation."
-  },
-  "annotationDblClickHandler": {
-    "default": "null",
-    "labels": ["Annotations"],
-    "type": "function(annotation, point, dygraph, event)",
-    "parameters": [
-      [ "annotation" , "the annotation left" ],
-      [ "point" , "the point associated with the annotation" ],
-      [ "dygraph" , "the reference graph" ],
-      [ "event" , "the mouse event" ]
-    ],
-    "description": "If provided, this function is called whenever the user double-clicks on an annotation."
-  },
-  "drawCallback": {
-    "default": "null",
-    "labels": ["Callbacks"],
-    "type": "function(dygraph, is_initial)",
-    "parameters": [
-      [ "dygraph" , "The graph being drawn" ],
-      [ "is_initial" , "True if this is the initial draw, false for subsequent draws." ]
-    ],
-    "description": "When set, this callback gets called every time the dygraph is drawn. This includes the initial draw, after zooming and repeatedly while panning."
-  },
-  "labelsKMG2": {
-    "default": "false",
-    "labels": ["Value display/formatting"],
-    "type": "boolean",
-    "description": "Show k/M/G for kilo/Mega/Giga on y-axis. This is different than labelsKMB in that it uses base 2, not 10."
-  },
-  "delimiter": {
-    "default": ",",
-    "labels": ["CSV parsing"],
-    "type": "string",
-    "description": "The delimiter to look for when separating fields of a CSV file. Setting this to a tab is not usually necessary, since tab-delimited data is auto-detected."
-  },
-  "axisLabelFontSize": {
-    "default": "14",
-    "labels": ["Axis display"],
-    "type": "integer",
-    "description": "Size of the font (in pixels) to use in the axis labels, both x- and y-axis."
-  },
-  "underlayCallback": {
-    "default": "null",
-    "labels": ["Callbacks"],
-    "type": "function(context, area, dygraph)",
-    "parameters": [
-      [ "context" , "the canvas drawing context on which to draw" ],
-      [ "area" , "An object with {x,y,w,h} properties describing the drawing area." ],
-      [ "dygraph" , "the reference graph" ]
-    ],
-    "description": "When set, this callback gets called before the chart is drawn. It details on how to use this."
-  },
-  "width": {
-    "default": "480",
-    "labels": ["Overall display"],
-    "type": "integer",
-    "description": "Width, in pixels, of the chart. If the container div has been explicitly sized, this will be ignored."
-  },
-  "interactionModel": {
-    "default": "...",
-    "labels": ["Interactive Elements"],
-    "type": "Object",
-    "description": "TODO(konigsberg): document this"
-  },
-  "ticker": {
-    "default": "Dygraph.dateTicker or Dygraph.numericTicks",
-    "labels": ["Axis display"],
-    "type": "function(min, max, pixels, opts, dygraph, vals) -> [{v: ..., label: ...}, ...]",
-    "parameters": [
-      [ "min" , "" ],
-      [ "max" , "" ],
-      [ "pixels" , "" ],
-      [ "opts" , "" ],
-      [ "dygraph" , "the reference graph" ],
-      [ "vals" , "" ]
-    ],
-    "description": "This lets you specify an arbitrary function to generate tick marks on an axis. The tick marks are an array of (value, label) pairs. The built-in functions go to great lengths to choose good tick marks so, if you set this option, you'll most likely want to call one of them and modify the result. See dygraph-tickers.js for an extensive discussion. This is set on a per-axis basis."
-  },
-  "xAxisLabelWidth": {
-    "default": "50",
-    "labels": ["Axis display"],
-    "type": "integer",
-    "description": "Width, in pixels, of the x-axis labels."
-  },
-  "xAxisHeight": {
-    "default": "(null)",
-    "labels": ["Axis display"],
-    "type": "integer",
-    "description": "Height, in pixels, of the x-axis. If not set explicitly, this is computed based on axisLabelFontSize and axisTickSize."
-  },
-  "showLabelsOnHighlight": {
-    "default": "true",
-    "labels": ["Interactive Elements", "Legend"],
-    "type": "boolean",
-    "description": "Whether to show the legend upon mouseover."
-  },
-  "axis": {
-    "default": "(none)",
-    "labels": ["Axis display"],
-    "type": "string or object",
-    "description": "Set to either an object ({}) filled with options for this axis or to the name of an existing data series with its own axis to re-use that axis. See tests for usage."
-  },
-  "pixelsPerXLabel": {
-    "default": "",
-    "labels": ["Deprecated"],
-    "type": "integer",
-    "description": "Prefer axes { x: { pixelsPerLabel } }"
-  },
-  "pixelsPerLabel": {
-    "default": "60 (x-axis) or 30 (y-axes)",
-    "labels": ["Axis display", "Grid"],
-    "type": "integer",
-    "description": "Number of pixels to require between each x- and y-label. Larger values will yield a sparser axis with fewer ticks. This is set on a per-axis basis."
-  },
-  "labelsDiv": {
-    "default": "null",
-    "labels": ["Legend"],
-    "type": "DOM element or string",
-    "example": "document.getElementById('foo')or'foo'",
-    "description": "Show data labels in an external div, rather than on the graph.  This value can either be a div element or a div id."
-  },
-  "fractions": {
-    "default": "false",
-    "labels": ["CSV parsing", "Error Bars"],
-    "type": "boolean",
-    "description": "When set, attempt to parse each cell in the CSV file as \"a/b\", where a and b are integers. The ratio will be plotted. This allows computation of Wilson confidence intervals (see below)."
-  },
-  "logscale": {
-    "default": "false",
-    "labels": ["Axis display"],
-    "type": "boolean",
-    "description": "When set for a y-axis, the graph shows that axis in log scale. Any values less than or equal to zero are not displayed.\n\nNot compatible with showZero, and ignores connectSeparatedPoints. Also, showing log scale with valueRanges that are less than zero will result in an unviewable graph."
-  },
-  "strokeWidth": {
-    "default": "1.0",
-    "labels": ["Data Line display"],
-    "type": "float",
-    "example": "0.5, 2.0",
-    "description": "The width of the lines connecting data points. This can be used to increase the contrast or some graphs."
-  },
-  "strokePattern": {
-    "default": "null",
-    "labels": ["Data Line display"],
-    "type": "array",
-    "example": "[10, 2, 5, 2]",
-    "description": "A custom pattern array where the even index is a draw and odd is a space in pixels. If null then it draws a solid line. The array should have a even length as any odd lengthed array could be expressed as a smaller even length array. This is used to create dashed lines."
-  },
-  "strokeBorderWidth": {
-    "default": "null",
-    "labels": ["Data Line display"],
-    "type": "float",
-    "example": "1.0",
-    "description": "Draw a border around graph lines to make crossing lines more easily distinguishable. Useful for graphs with many lines."
-  },
-  "strokeBorderColor": {
-    "default": "white",
-    "labels": ["Data Line display"],
-    "type": "string",
-    "example": "red, #ccffdd",
-    "description": "Color for the line border used if strokeBorderWidth is set."
-  },
-  "wilsonInterval": {
-    "default": "true",
-    "labels": ["Error Bars"],
-    "type": "boolean",
-    "description": "Use in conjunction with the \"fractions\" option. Instead of plotting +/- N standard deviations, dygraphs will compute a Wilson confidence interval and plot that. This has more reasonable behavior for ratios close to 0 or 1."
-  },
-  "fillGraph": {
-    "default": "false",
-    "labels": ["Data Line display"],
-    "type": "boolean",
-    "description": "Should the area underneath the graph be filled? This option is not compatible with error bars. This may be set on a per-series basis."
-  },
-  "highlightCircleSize": {
-    "default": "3",
-    "labels": ["Interactive Elements"],
-    "type": "integer",
-    "description": "The size in pixels of the dot drawn over highlighted points."
-  },
-  "gridLineColor": {
-    "default": "rgb(128,128,128)",
-    "labels": ["Grid"],
-    "type": "red, blue",
-    "description": "The color of the gridlines. This may be set on a per-axis basis to define each axis' grid separately."
-  },
-  "visibility": {
-    "default": "[true, true, ...]",
-    "labels": ["Data Line display"],
-    "type": "Array of booleans",
-    "description": "Which series should initially be visible? Once the Dygraph has been constructed, you can access and modify the visibility of each series using the visibility and setVisibility methods."
-  },
-  "valueRange": {
-    "default": "Full range of the input is shown",
-    "labels": ["Axis display"],
-    "type": "Array of two numbers",
-    "example": "[10, 110]",
-    "description": "Explicitly set the vertical range of the graph to [low, high]. This may be set on a per-axis basis to define each y-axis separately. If either limit is unspecified, it will be calculated automatically (e.g. [null, 30] to automatically calculate just the lower bound)"
-  },
-  "labelsDivWidth": {
-    "default": "250",
-    "labels": ["Legend"],
-    "type": "integer",
-    "description": "Width (in pixels) of the div which shows information on the currently-highlighted points."
-  },
-  "colorSaturation": {
-    "default": "1.0",
-    "labels": ["Data Series Colors"],
-    "type": "float (0.0 - 1.0)",
-    "description": "If colors is not specified, saturation of the automatically-generated data series colors."
-  },
-  "yAxisLabelWidth": {
-    "default": "50",
-    "labels": ["Axis display"],
-    "type": "integer",
-    "description": "Width, in pixels, of the y-axis labels. This also affects the amount of space available for a y-axis chart label."
-  },
-  "hideOverlayOnMouseOut": {
-    "default": "true",
-    "labels": ["Interactive Elements", "Legend"],
-    "type": "boolean",
-    "description": "Whether to hide the legend when the mouse leaves the chart area."
-  },
-  "yValueFormatter": {
-    "default": "",
-    "labels": ["Deprecated"],
-    "type": "",
-    "description": "Prefer axes: { y: { valueFormatter } }"
-  },
-  "legend": {
-    "default": "onmouseover",
-    "labels": ["Legend"],
-    "type": "string",
-    "description": "When to display the legend. By default, it only appears when a user mouses over the chart. Set it to \"always\" to always display a legend of some sort."
-  },
-  "labelsShowZeroValues": {
-    "default": "true",
-    "labels": ["Legend"],
-    "type": "boolean",
-    "description": "Show zero value labels in the labelsDiv."
-  },
-  "stepPlot": {
-    "default": "false",
-    "labels": ["Data Line display"],
-    "type": "boolean",
-    "description": "When set, display the graph as a step plot instead of a line plot. This option may either be set for the whole graph or for single series."
-  },
-  "labelsKMB": {
-    "default": "false",
-    "labels": ["Value display/formatting"],
-    "type": "boolean",
-    "description": "Show K/M/B for thousands/millions/billions on y-axis."
-  },
-  "rightGap": {
-    "default": "5",
-    "labels": ["Overall display"],
-    "type": "integer",
-    "description": "Number of pixels to leave blank at the right edge of the Dygraph. This makes it easier to highlight the right-most data point."
-  },
-  "avoidMinZero": {
-    "default": "false",
-    "labels": ["Deprecated"],
-    "type": "boolean",
-    "description": "Deprecated, please use yRangePad instead. When set, the heuristic that fixes the Y axis at zero for a data set with the minimum Y value of zero is disabled. \nThis is particularly useful for data sets that contain many zero values, especially for step plots which may otherwise have lines not visible running along the bottom axis."
-  },
-  "drawAxesAtZero": {
-    "default": "false",
-    "labels": ["Axis display"],
-    "type": "boolean",
-    "description": "When set, draw the X axis at the Y=0 position and the Y axis at the X=0 position if those positions are inside the graph's visible area. Otherwise, draw the axes at the bottom or left graph edge as usual."
-  },
-  "xRangePad": {
-    "default": "0",
-    "labels": ["Axis display"],
-    "type": "float",
-    "description": "Add the specified amount of extra space (in pixels) around the X-axis value range to ensure points at the edges remain visible."
-  },
-  "yRangePad": {
-    "default": "null",
-    "labels": ["Axis display"],
-    "type": "float",
-    "description": "If set, add the specified amount of extra space (in pixels) around the Y-axis value range to ensure points at the edges remain visible. If unset, use the traditional Y padding algorithm."
-  },
-  "xAxisLabelFormatter": {
-    "default": "",
-    "labels": ["Deprecated"],
-    "type": "",
-    "description": "Prefer axes { x: { axisLabelFormatter } }"
-  },
-  "axisLabelFormatter": {
-    "default": "Depends on the data type",
-    "labels": ["Axis display"],
-    "type": "function(number or Date, granularity, opts, dygraph)",
-    "parameters": [
-      [ "number or date" , "Either a number (for a numeric axis) or a Date object (for a date axis)" ],
-      [ "granularity" , "specifies how fine-grained the axis is. For date axes, this is a reference to the time granularity enumeration, defined in dygraph-tickers.js, e.g. Dygraph.WEEKLY." ],
-      [ "opts" , "a function which provides access to various options on the dygraph, e.g. opts('labelsKMB')." ],
-      [ "dygraph" , "the referenced graph" ]
-    ],
-    "description": "Function to call to format the tick values that appear along an axis. This is usually set on a per-axis basis."
-  },
-  "clickCallback": {
-    "snippet": "function(e, date_millis){
            alert(new Date(date_millis));
          }",
-    "default": "null",
-    "labels": ["Callbacks"],
-    "type": "function(e, x, points)",
-    "parameters": [
-      [ "e" , "The event object for the click" ],
-      [ "x" , "The x value that was clicked (for dates, this is milliseconds since epoch)" ],
-      [ "points" , "The closest points along that date. See Point properties for details." ]
-    ],
-    "description": "A function to call when the canvas is clicked."
-  },
-  "yAxisLabelFormatter": {
-    "default": "",
-    "labels": ["Deprecated"],
-    "type": "",
-    "description": "Prefer axes: { y: { axisLabelFormatter } }"
-  },
-  "labels": {
-    "default": "[\"X\", \"Y1\", \"Y2\", ...]*",
-    "labels": ["Legend"],
-    "type": "array",
-    "description": "A name for each data series, including the independent (X) series. For CSV files and DataTable objections, this is determined by context. For raw data, this must be specified. If it is not, default values are supplied and a warning is logged."
-  },
-  "dateWindow": {
-    "default": "Full range of the input is shown",
-    "labels": ["Axis display"],
-    "type": "Array of two Dates or numbers",
-    "example": "[
            Date.parse('2006-01-01'),
            (new Date()).valueOf()
          ]",
-    "description": "Initially zoom in on a section of the graph. Is of the form [earliest, latest], where earliest/latest are milliseconds since epoch. If the data for the x-axis is numeric, the values in dateWindow must also be numbers."
-  },
-  "showRoller": {
-    "default": "false",
-    "labels": ["Interactive Elements", "Rolling Averages"],
-    "type": "boolean",
-    "description": "If the rolling average period text box should be shown."
-  },
-  "sigma": {
-    "default": "2.0",
-    "labels": ["Error Bars"],
-    "type": "float",
-    "description": "When errorBars is set, shade this many standard deviations above/below each point."
-  },
-  "customBars": {
-    "default": "false",
-    "labels": ["CSV parsing", "Error Bars"],
-    "type": "boolean",
-    "description": "When set, parse each CSV cell as \"low;middle;high\". Error bars will be drawn for each point between low and high, with the series itself going through middle."
-  },
-  "colorValue": {
-    "default": "1.0",
-    "labels": ["Data Series Colors"],
-    "type": "float (0.0 - 1.0)",
-    "description": "If colors is not specified, value of the data series colors, as in hue/saturation/value. (0.0-1.0, default 0.5)"
-  },
-  "errorBars": {
-    "default": "false",
-    "labels": ["CSV parsing", "Error Bars"],
-    "type": "boolean",
-    "description": "Does the data contain standard deviations? Setting this to true alters the input format (see above)."
-  },
-  "displayAnnotations": {
-    "default": "false",
-    "labels": ["Annotations"],
-    "type": "boolean",
-    "description": "Only applies when Dygraphs is used as a GViz chart. Causes string columns following a data series to be interpreted as annotations on points in that series. This is the same format used by Google's AnnotatedTimeLine chart."
-  },
-  "panEdgeFraction": {
-    "default": "null",
-    "labels": ["Axis display", "Interactive Elements"],
-    "type": "float",
-    "description": "A value representing the farthest a graph may be panned, in percent of the display. For example, a value of 0.1 means that the graph can only be panned 10% pased the edges of the displayed values. null means no bounds."
-  },
-  "title": {
-    "labels": ["Chart labels"],
-    "type": "string",
-    "default": "null",
-    "description": "Text to display above the chart. You can supply any HTML for this value, not just text. If you wish to style it using CSS, use the 'dygraph-label' or 'dygraph-title' classes."
-  },
-  "titleHeight": {
-    "default": "18",
-    "labels": ["Chart labels"],
-    "type": "integer",
-    "description": "Height of the chart title, in pixels. This also controls the default font size of the title. If you style the title on your own, this controls how much space is set aside above the chart for the title's div."
-  },
-  "xlabel": {
-    "labels": ["Chart labels"],
-    "type": "string",
-    "default": "null",
-    "description": "Text to display below the chart's x-axis. You can supply any HTML for this value, not just text. If you wish to style it using CSS, use the 'dygraph-label' or 'dygraph-xlabel' classes."
-  },
-  "xLabelHeight": {
-    "labels": ["Chart labels"],
-    "type": "integer",
-    "default": "18",
-    "description": "Height of the x-axis label, in pixels. This also controls the default font size of the x-axis label. If you style the label on your own, this controls how much space is set aside below the chart for the x-axis label's div."
-  },
-  "ylabel": {
-    "labels": ["Chart labels"],
-    "type": "string",
-    "default": "null",
-    "description": "Text to display to the left of the chart's y-axis. You can supply any HTML for this value, not just text. If you wish to style it using CSS, use the 'dygraph-label' or 'dygraph-ylabel' classes. The text will be rotated 90 degrees by default, so CSS rules may behave in unintuitive ways. No additional space is set aside for a y-axis label. If you need more space, increase the width of the y-axis tick labels using the yAxisLabelWidth option. If you need a wider div for the y-axis label, either style it that way with CSS (but remember that it's rotated, so width is controlled by the 'height' property) or set the yLabelWidth option."
-  },
-  "y2label": {
-    "labels": ["Chart labels"],
-    "type": "string",
-    "default": "null",
-    "description": "Text to display to the right of the chart's secondary y-axis. This label is only displayed if a secondary y-axis is present. See this test for an example of how to do this. The comments for the 'ylabel' option generally apply here as well. This label gets a 'dygraph-y2label' instead of a 'dygraph-ylabel' class."
-  },
-  "yLabelWidth": {
-    "labels": ["Chart labels"],
-    "type": "integer",
-    "default": "18",
-    "description": "Width of the div which contains the y-axis label. Since the y-axis label appears rotated 90 degrees, this actually affects the height of its div."
-  },
-  "isZoomedIgnoreProgrammaticZoom" : {
-    "default": "false",
-    "labels": ["Zooming"],
-    "type": "boolean",
-    "description" : "When this option is passed to updateOptions() along with either the dateWindow or valueRange options, the zoom flags are not changed to reflect a zoomed state. This is primarily useful for when the display area of a chart is changed programmatically and also where manual zooming is allowed and use is made of the isZoomed method to determine this."
-  },
-  "drawXGrid": {
-    "default": "true",
-    "labels": ["Grid","Deprecated"],
-    "type": "boolean",
-    "description" : "Use the per-axis option drawGrid instead. Whether to display vertical gridlines under the chart."
-  },
-  "drawYGrid": {
-    "default": "true",
-    "labels": ["Grid","Deprecated"],
-    "type": "boolean",
-    "description" : "Use the per-axis option drawGrid instead. Whether to display horizontal gridlines under the chart."
-  },
-  "drawGrid": {
-    "default": "true for x and y, false for y2",
-    "labels": ["Grid"],
-    "type": "boolean",
-    "description" : "Whether to display gridlines in the chart. This may be set on a per-axis basis to define the visibility of each axis' grid separately."
-  },
-  "independentTicks": {
-    "default": "true for y, false for y2",
-    "labels": ["Axis display", "Grid"],
-    "type": "boolean",
-    "description" : "Only valid for y and y2, has no effect on x: This option defines whether the y axes should align their ticks or if they should be independent. Possible combinations: 1.) y=true, y2=false (default): y is the primary axis and the y2 ticks are aligned to the the ones of y. (only 1 grid) 2.) y=false, y2=true: y2 is the primary axis and the y ticks are aligned to the the ones of y2. (only 1 grid) 3.) y=true, y2=true: Both axis are independent and have their own ticks. (2 grids) 4.) y=false, y2=false: Invalid configuration causes an error."
-  },
-  "drawXAxis": {
-    "default": "true",
-    "labels": ["Axis display"],
-    "type": "boolean",
-    "description" : "Whether to draw the x-axis. Setting this to false also prevents x-axis ticks from being drawn and reclaims the space for the chart grid/lines."
-  },
-  "drawYAxis": {
-    "default": "true",
-    "labels": ["Axis display"],
-    "type": "boolean",
-    "description" : "Whether to draw the y-axis. Setting this to false also prevents y-axis ticks from being drawn and reclaims the space for the chart grid/lines."
-  },
-  "gridLineWidth": {
-    "default": "0.3",
-    "labels": ["Grid"],
-    "type": "float",
-    "description" : "Thickness (in pixels) of the gridlines drawn under the chart. The vertical/horizontal gridlines can be turned off entirely by using the drawXGrid and drawYGrid options. This may be set on a per-axis basis to define each axis' grid separately."
-  },
-  "axisLineWidth": {
-    "default": "0.3",
-    "labels": ["Axis display"],
-    "type": "float",
-    "description" : "Thickness (in pixels) of the x- and y-axis lines."
-  },
-  "axisLineColor": {
-    "default": "black",
-    "labels": ["Axis display"],
-    "type": "string",
-    "description" : "Color of the x- and y-axis lines. Accepts any value which the HTML canvas strokeStyle attribute understands, e.g. 'black' or 'rgb(0, 100, 255)'."
-  },
-  "fillAlpha": {
-    "default": "0.15",
-    "labels": ["Error Bars", "Data Series Colors"],
-    "type": "float (0.0 - 1.0)",
-    "description" : "Error bars (or custom bars) for each series are drawn in the same color as the series, but with partial transparency. This sets the transparency. A value of 0.0 means that the error bars will not be drawn, whereas a value of 1.0 means that the error bars will be as dark as the line for the series itself. This can be used to produce chart lines whose thickness varies at each point."
-  },
-  "axisLabelColor": {
-    "default": "black",
-    "labels": ["Axis display"],
-    "type": "string",
-    "description" : "Color for x- and y-axis labels. This is a CSS color string."
-  },
-  "axisLabelWidth": {
-    "default": "50",
-    "labels": ["Axis display", "Chart labels"],
-    "type": "integer",
-    "description" : "Width (in pixels) of the containing divs for x- and y-axis labels. For the y-axis, this also controls "
-  },
-  "sigFigs" : {
-    "default": "null",
-    "labels": ["Value display/formatting"],
-    "type": "integer",
-    "description": "By default, dygraphs displays numbers with a fixed number of digits after the decimal point. If you'd prefer to have a fixed number of significant figures, set this option to that number of sig figs. A value of 2, for instance, would cause 1 to be display as 1.0 and 1234 to be displayed as 1.23e+3."
-  },
-  "digitsAfterDecimal" : {
-    "default": "2",
-    "labels": ["Value display/formatting"],
-    "type": "integer",
-    "description": "Unless it's run in scientific mode (see the sigFigs option), dygraphs displays numbers with digitsAfterDecimal digits after the decimal point. Trailing zeros are not displayed, so with a value of 2 you'll get '0', '0.1', '0.12', '123.45' but not '123.456' (it will be rounded to '123.46'). Numbers with absolute value less than 0.1^digitsAfterDecimal (i.e. those which would show up as '0.00') will be displayed in scientific notation."
-  },
-  "maxNumberWidth" : {
-    "default": "6",
-    "labels": ["Value display/formatting"],
-    "type": "integer",
-    "description": "When displaying numbers in normal (not scientific) mode, large numbers will be displayed with many trailing zeros (e.g. 100000000 instead of 1e9). This can lead to unwieldy y-axis labels. If there are more than maxNumberWidth digits to the left of the decimal in a number, dygraphs will switch to scientific notation, even when not operating in scientific mode. If you'd like to see all those digits, set this to something large, like 20 or 30."
-  },
-  "file": {
-    "default": "(set when constructed)",
-    "labels": ["Data"],
-    "type": "string (URL of CSV or CSV), GViz DataTable or 2D Array",
-    "description": "Sets the data being displayed in the chart. This can only be set when calling updateOptions; it cannot be set from the constructor. For a full description of valid data formats, see the Data Formats page."
-  },
-  "timingName": {
-    "default": "null",
-    "labels": [ "Debugging" ],
-    "type": "string",
-    "description": "Set this option to log timing information. The value of the option will be logged along with the timimg, so that you can distinguish multiple dygraphs on the same page."
-  },
-  "showRangeSelector": {
-    "default": "false",
-    "labels": ["Interactive Elements"],
-    "type": "boolean",
-    "description": "Show or hide the range selector widget."
-  },
-  "rangeSelectorHeight": {
-    "default": "40",
-    "labels": ["Interactive Elements"],
-    "type": "integer",
-    "description": "Height, in pixels, of the range selector widget. This option can only be specified at Dygraph creation time."
-  },
-  "rangeSelectorPlotStrokeColor": {
-    "default": "#808FAB",
-    "labels": ["Interactive Elements"],
-    "type": "string",
-    "description": "The range selector mini plot stroke color. This can be of the form \"#AABBCC\" or \"rgb(255,100,200)\" or \"yellow\". You can also specify null or \"\" to turn off stroke."
-  },
-  "rangeSelectorPlotFillColor": {
-    "default": "#A7B1C4",
-    "labels": ["Interactive Elements"],
-    "type": "string",
-    "description": "The range selector mini plot fill color. This can be of the form \"#AABBCC\" or \"rgb(255,100,200)\" or \"yellow\". You can also specify null or \"\" to turn off fill."
-  },
-  "animatedZooms": {
-    "default": "false",
-    "labels": ["Interactive Elements"],
-    "type": "boolean",
-    "description": "Set this option to animate the transition between zoom windows. Applies to programmatic and interactive zooms. Note that if you also set a drawCallback, it will be called several times on each zoom. If you set a zoomCallback, it will only be called after the animation is complete."
-  },
-  "plotter": {
-    "default": "[DygraphCanvasRenderer.Plotters.fillPlotter, DygraphCanvasRenderer.Plotters.errorPlotter, DygraphCanvasRenderer.Plotters.linePlotter]",
-    "labels": ["Data Line display"],
-    "type": "array or function",
-    "description": "A function (or array of functions) which plot each data series on the chart. TODO(danvk): more details! May be set per-series."
-  },
-  "series": {
-    "default": "null",
-    "labels": ["Series"],
-    "type": "Object",
-    "description": "Defines per-series options. Its keys match the y-axis label names, and the values are dictionaries themselves that contain options specific to that series. When this option is missing, it falls back on the old-style of per-series options comingled with global options."
-  },
-  "plugins": {
-    "default": "[]",
-    "labels": ["Configuration"],
-    "type": "Array",
-    "description": "Defines per-graph plug-ins. Useful for per-graph customization"
-  }
-}
-;  //           
-// NOTE: in addition to parsing as JS, this snippet is expected to be valid
-// JSON. This assumption cannot be checked in JS, but it will be checked when
-// documentation is generated by the generate-documentation.py script. For the
-// most part, this just means that you should always use double quotes.
-
-// Do a quick sanity check on the options reference.
-(function() {
-  "use strict";
-  var warn = function(msg) { if (window.console) window.console.warn(msg); };
-  var flds = ['type', 'default', 'description'];
-  var valid_cats = [
-   'Annotations',
-   'Axis display',
-   'Chart labels',
-   'CSV parsing',
-   'Callbacks',
-   'Data',
-   'Data Line display',
-   'Data Series Colors',
-   'Error Bars',
-   'Grid',
-   'Interactive Elements',
-   'Legend',
-   'Overall display',
-   'Rolling Averages',
-   'Series',
-   'Value display/formatting',
-   'Zooming',
-   'Debugging',
-   'Configuration',
-   'Deprecated'
-  ];
-  var i;
-  var cats = {};
-  for (i = 0; i < valid_cats.length; i++) cats[valid_cats[i]] = true;
-
-  for (var k in Dygraph.OPTIONS_REFERENCE) {
-    if (!Dygraph.OPTIONS_REFERENCE.hasOwnProperty(k)) continue;
-    var op = Dygraph.OPTIONS_REFERENCE[k];
-    for (i = 0; i < flds.length; i++) {
-      if (!op.hasOwnProperty(flds[i])) {
-        warn('Option ' + k + ' missing "' + flds[i] + '" property');
-      } else if (typeof(op[flds[i]]) != 'string') {
-        warn(k + '.' + flds[i] + ' must be of type string');
-      }
-    }
-    var labels = op.labels;
-    if (typeof(labels) !== 'object') {
-      warn('Option "' + k + '" is missing a "labels": [...] option');
-    } else {
-      for (i = 0; i < labels.length; i++) {
-        if (!cats.hasOwnProperty(labels[i])) {
-          warn('Option "' + k + '" has label "' + labels[i] +
-               '", which is invalid.');
-        }
-      }
-    }
-  }
-})();
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-options.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-options.js
deleted file mode 100644
index 0f90086cb..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-options.js
+++ /dev/null
@@ -1,384 +0,0 @@
-/**
- * @license
- * Copyright 2011 Dan Vanderkam (danvdk@gmail.com)
- * MIT-licensed (http://opensource.org/licenses/MIT)
- */
-
-/**
- * @fileoverview DygraphOptions is responsible for parsing and returning information about options.
- *
- * Still tightly coupled to Dygraphs, we could remove some of that, you know.
- */
-
-var DygraphOptions = (function() {
-
-/*jshint sub:true */
-/*global Dygraph:false */
-"use strict";
-
-/*
- * Interesting member variables: (REMOVING THIS LIST AS I CLOSURIZE)
- * global_ - global attributes (common among all graphs, AIUI)
- * user - attributes set by the user
- * series_ - { seriesName -> { idx, yAxis, options }}
- */
-
-/**
- * This parses attributes into an object that can be easily queried.
- *
- * It doesn't necessarily mean that all options are available, specifically
- * if labels are not yet available, since those drive details of the per-series
- * and per-axis options.
- *
- * @param {Dygraph} dygraph The chart to which these options belong.
- * @constructor
- */
-var DygraphOptions = function(dygraph) {
-  /**
-   * The dygraph.
-   * @type {!Dygraph}
-   */
-  this.dygraph_ = dygraph;
-
-  /**
-   * Array of axis index to { series : [ series names ] , options : { axis-specific options. }
-   * @type {Array.<{series : Array., options : Object}>} @private
-   */
-  this.yAxes_ = [];
-
-  /**
-   * Contains x-axis specific options, which are stored in the options key.
-   * This matches the yAxes_ object structure (by being a dictionary with an
-   * options element) allowing for shared code.
-   * @type {options: Object} @private
-   */
-  this.xAxis_ = {};
-  this.series_ = {};
-
-  // Once these two objects are initialized, you can call get();
-  this.global_ = this.dygraph_.attrs_;
-  this.user_ = this.dygraph_.user_attrs_ || {};
-
-  /**
-   * A list of series in columnar order.
-   * @type {Array.}
-   */
-  this.labels_ = [];
-
-  this.highlightSeries_ = this.get("highlightSeriesOpts") || {};
-  this.reparseSeries();
-};
-
-/**
- * Not optimal, but does the trick when you're only using two axes.
- * If we move to more axes, this can just become a function.
- *
- * @type {Object.}
- * @private
- */
-DygraphOptions.AXIS_STRING_MAPPINGS_ = {
-  'y' : 0,
-  'Y' : 0,
-  'y1' : 0,
-  'Y1' : 0,
-  'y2' : 1,
-  'Y2' : 1
-};
-
-/**
- * @param {string|number} axis
- * @private
- */
-DygraphOptions.axisToIndex_ = function(axis) {
-  if (typeof(axis) == "string") {
-    if (DygraphOptions.AXIS_STRING_MAPPINGS_.hasOwnProperty(axis)) {
-      return DygraphOptions.AXIS_STRING_MAPPINGS_[axis];
-    }
-    throw "Unknown axis : " + axis;
-  }
-  if (typeof(axis) == "number") {
-    if (axis === 0 || axis === 1) {
-      return axis;
-    }
-    throw "Dygraphs only supports two y-axes, indexed from 0-1.";
-  }
-  if (axis) {
-    throw "Unknown axis : " + axis;
-  }
-  // No axis specification means axis 0.
-  return 0;
-};
-
-/**
- * Reparses options that are all related to series. This typically occurs when
- * options are either updated, or source data has been made available.
- *
- * TODO(konigsberg): The method name is kind of weak; fix.
- */
-DygraphOptions.prototype.reparseSeries = function() {
-  var labels = this.get("labels");
-  if (!labels) {
-    return; // -- can't do more for now, will parse after getting the labels.
-  }
-
-  this.labels_ = labels.slice(1);
-
-  this.yAxes_ = [ { series : [], options : {}} ]; // Always one axis at least.
-  this.xAxis_ = { options : {} };
-  this.series_ = {};
-
-  // Traditionally, per-series options were specified right up there with the options. For instance
-  // {
-  //   labels: [ "X", "foo", "bar" ],
-  //   pointSize: 3,
-  //   foo : {}, // options for foo
-  //   bar : {} // options for bar
-  // }
-  //
-  // Moving forward, series really should be specified in the series element, separating them.
-  // like so:
-  //
-  // {
-  //   labels: [ "X", "foo", "bar" ],
-  //   pointSize: 3,
-  //   series : {
-  //     foo : {}, // options for foo
-  //     bar : {} // options for bar
-  //   }
-  // }
-  //
-  // So, if series is found, it's expected to contain per-series data, otherwise we fall
-  // back.
-  var oldStyleSeries = !this.user_["series"];
-
-  if (oldStyleSeries) {
-    var axisId = 0; // 0-offset; there's always one.
-    // Go through once, add all the series, and for those with {} axis options, add a new axis.
-    for (var idx = 0; idx < this.labels_.length; idx++) {
-      var seriesName = this.labels_[idx];
-
-      var optionsForSeries = this.user_[seriesName] || {};
-
-      var yAxis = 0;
-      var axis = optionsForSeries["axis"];
-      if (typeof(axis) == 'object') {
-        yAxis = ++axisId;
-        this.yAxes_[yAxis] = { series : [ seriesName ], options : axis };
-      }
-
-      // Associate series without axis options with axis 0.
-      if (!axis) { // undefined
-        this.yAxes_[0].series.push(seriesName);
-      }
-
-      this.series_[seriesName] = { idx: idx, yAxis: yAxis, options : optionsForSeries };
-    }
-
-    // Go through one more time and assign series to an axis defined by another
-    // series, e.g. { 'Y1: { axis: {} }, 'Y2': { axis: 'Y1' } }
-    for (var idx = 0; idx < this.labels_.length; idx++) {
-      var seriesName = this.labels_[idx];
-      var optionsForSeries = this.series_[seriesName]["options"];
-      var axis = optionsForSeries["axis"];
-
-      if (typeof(axis) == 'string') {
-        if (!this.series_.hasOwnProperty(axis)) {
-          Dygraph.error("Series " + seriesName + " wants to share a y-axis with " +
-                     "series " + axis + ", which does not define its own axis.");
-          return;
-        }
-        var yAxis = this.series_[axis].yAxis;
-        this.series_[seriesName].yAxis = yAxis;
-        this.yAxes_[yAxis].series.push(seriesName);
-      }
-    }
-  } else {
-    for (var idx = 0; idx < this.labels_.length; idx++) {
-      var seriesName = this.labels_[idx];
-      var optionsForSeries = this.user_.series[seriesName] || {};
-      var yAxis = DygraphOptions.axisToIndex_(optionsForSeries["axis"]);
-
-      this.series_[seriesName] = {
-        idx: idx,
-        yAxis: yAxis,
-        options : optionsForSeries };
-
-      if (!this.yAxes_[yAxis]) {
-        this.yAxes_[yAxis] =  { series : [ seriesName ], options : {} };
-      } else {
-        this.yAxes_[yAxis].series.push(seriesName);
-      }
-    }
-  }
-
-  var axis_opts = this.user_["axes"] || {};
-  Dygraph.update(this.yAxes_[0].options, axis_opts["y"] || {});
-  if (this.yAxes_.length > 1) {
-    Dygraph.update(this.yAxes_[1].options, axis_opts["y2"] || {});
-  }
-  Dygraph.update(this.xAxis_.options, axis_opts["x"] || {});
-};
-
-/**
- * Get a global value.
- *
- * @param {string} name the name of the option.
- */
-DygraphOptions.prototype.get = function(name) {
-  var result = this.getGlobalUser_(name);
-  if (result !== null) {
-    return result;
-  }
-  return this.getGlobalDefault_(name);
-};
-
-DygraphOptions.prototype.getGlobalUser_ = function(name) {
-  if (this.user_.hasOwnProperty(name)) {
-    return this.user_[name];
-  }
-  return null;
-};
-
-DygraphOptions.prototype.getGlobalDefault_ = function(name) {
-  if (this.global_.hasOwnProperty(name)) {
-    return this.global_[name];
-  }
-  if (Dygraph.DEFAULT_ATTRS.hasOwnProperty(name)) {
-    return Dygraph.DEFAULT_ATTRS[name];
-  }
-  return null;
-};
-
-/**
- * Get a value for a specific axis. If there is no specific value for the axis,
- * the global value is returned.
- *
- * @param {string} name the name of the option.
- * @param {string|number} axis the axis to search. Can be the string representation
- * ("y", "y2") or the axis number (0, 1).
- */
-DygraphOptions.prototype.getForAxis = function(name, axis) {
-  var axisIdx;
-  var axisString;
-
-  // Since axis can be a number or a string, straighten everything out here.
-  if (typeof(axis) == 'number') {
-    axisIdx = axis;
-    axisString = axisIdx === 0 ? "y" : "y2";
-  } else {
-    if (axis == "y1") { axis = "y"; } // Standardize on 'y'. Is this bad? I think so.
-    if (axis == "y") {
-      axisIdx = 0;
-    } else if (axis == "y2") {
-      axisIdx = 1;
-    } else if (axis == "x") {
-      axisIdx = -1; // simply a placeholder for below.
-    } else {
-      throw "Unknown axis " + axis;
-    }
-    axisString = axis;
-  }
-
-  var userAxis = (axisIdx == -1) ? this.xAxis_ : this.yAxes_[axisIdx];
-
-  // Search the user-specified axis option first.
-  if (userAxis) { // This condition could be removed if we always set up this.yAxes_ for y2.
-    var axisOptions = userAxis.options;
-    if (axisOptions.hasOwnProperty(name)) {
-      return axisOptions[name];
-    }
-  }
-
-  // User-specified global options second.
-  var result = this.getGlobalUser_(name);
-  if (result !== null) {
-    return result;
-  }
-
-  // Default axis options third.
-  var defaultAxisOptions = Dygraph.DEFAULT_ATTRS.axes[axisString];
-  if (defaultAxisOptions.hasOwnProperty(name)) {
-    return defaultAxisOptions[name];
-  }
-
-  // Default global options last.
-  return this.getGlobalDefault_(name);
-};
-
-/**
- * Get a value for a specific series. If there is no specific value for the series,
- * the value for the axis is returned (and afterwards, the global value.)
- *
- * @param {string} name the name of the option.
- * @param {string} series the series to search.
- */
-DygraphOptions.prototype.getForSeries = function(name, series) {
-  // Honors indexes as series.
-  if (series === this.dygraph_.getHighlightSeries()) {
-    if (this.highlightSeries_.hasOwnProperty(name)) {
-      return this.highlightSeries_[name];
-    }
-  }
-
-  if (!this.series_.hasOwnProperty(series)) {
-    throw "Unknown series: " + series;
-  }
-
-  var seriesObj = this.series_[series];
-  var seriesOptions = seriesObj["options"];
-  if (seriesOptions.hasOwnProperty(name)) {
-    return seriesOptions[name];
-  }
-
-  return this.getForAxis(name, seriesObj["yAxis"]);
-};
-
-/**
- * Returns the number of y-axes on the chart.
- * @return {number} the number of axes.
- */
-DygraphOptions.prototype.numAxes = function() {
-  return this.yAxes_.length;
-};
-
-/**
- * Return the y-axis for a given series, specified by name.
- */
-DygraphOptions.prototype.axisForSeries = function(series) {
-  return this.series_[series].yAxis;
-};
-
-/**
- * Returns the options for the specified axis.
- */
-// TODO(konigsberg): this is y-axis specific. Support the x axis.
-DygraphOptions.prototype.axisOptions = function(yAxis) {
-  return this.yAxes_[yAxis].options;
-};
-
-/**
- * Return the series associated with an axis.
- */
-DygraphOptions.prototype.seriesForAxis = function(yAxis) {
-  return this.yAxes_[yAxis].series;
-};
-
-/**
- * Return the list of all series, in their columnar order.
- */
-DygraphOptions.prototype.seriesNames = function() {
-  return this.labels_;
-};
-
-/* Are we using this? */
-/**
- * Return the index of the specified series.
- * @param {string} series the series name.
- */
-DygraphOptions.prototype.indexOfSeries = function(series) {
-  return this.series_[series].idx;
-};
-
-return DygraphOptions;
-
-})();
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-plugin-base.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-plugin-base.js
deleted file mode 100644
index 7f758a9a9..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-plugin-base.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*global Dygraph:false */
-
-// Namespace for plugins. Load this before plugins/*.js files.
-Dygraph.Plugins = {};
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-plugin-install.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-plugin-install.js
deleted file mode 100644
index 806a92740..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-plugin-install.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/*global Dygraph:false */
-
-// This file defines the ordering of the plugins.
-//
-// The ordering is from most-general to most-specific.
-// This means that, in an event cascade, plugins which have registered for that
-// event will be called in reverse order.
-//
-// This is most relevant for plugins which register a layout event, e.g.
-// Axes, Legend and ChartLabels.
-
-Dygraph.PLUGINS.push(
-  Dygraph.Plugins.Legend,
-  Dygraph.Plugins.Axes,
-  Dygraph.Plugins.RangeSelector, // Has to be before ChartLabels so that its callbacks are called after ChartLabels' callbacks.
-  Dygraph.Plugins.ChartLabels,
-  Dygraph.Plugins.Annotations,
-  Dygraph.Plugins.Grid
-);
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-tickers.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-tickers.js
deleted file mode 100644
index f4778b12b..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-tickers.js
+++ /dev/null
@@ -1,487 +0,0 @@
-/**
- * @license
- * Copyright 2011 Dan Vanderkam (danvdk@gmail.com)
- * MIT-licensed (http://opensource.org/licenses/MIT)
- */
-
-/**
- * @fileoverview Description of this file.
- * @author danvk@google.com (Dan Vanderkam)
- *
- * A ticker is a function with the following interface:
- *
- * function(a, b, pixels, options_view, dygraph, forced_values);
- * -> [ { v: tick1_v, label: tick1_label[, label_v: label_v1] },
- *      { v: tick2_v, label: tick2_label[, label_v: label_v2] },
- *      ...
- *    ]
- *
- * The returned value is called a "tick list".
- *
- * Arguments
- * ---------
- *
- * [a, b] is the range of the axis for which ticks are being generated. For a
- * numeric axis, these will simply be numbers. For a date axis, these will be
- * millis since epoch (convertable to Date objects using "new Date(a)" and "new
- * Date(b)").
- *
- * opts provides access to chart- and axis-specific options. It can be used to
- * access number/date formatting code/options, check for a log scale, etc.
- *
- * pixels is the length of the axis in pixels. opts('pixelsPerLabel') is the
- * minimum amount of space to be allotted to each label. For instance, if
- * pixels=400 and opts('pixelsPerLabel')=40 then the ticker should return
- * between zero and ten (400/40) ticks.
- *
- * dygraph is the Dygraph object for which an axis is being constructed.
- *
- * forced_values is used for secondary y-axes. The tick positions are typically
- * set by the primary y-axis, so the secondary y-axis has no choice in where to
- * put these. It simply has to generate labels for these data values.
- *
- * Tick lists
- * ----------
- * Typically a tick will have both a grid/tick line and a label at one end of
- * that line (at the bottom for an x-axis, at left or right for the y-axis).
- *
- * A tick may be missing one of these two components:
- * - If "label_v" is specified instead of "v", then there will be no tick or
- *   gridline, just a label.
- * - Similarly, if "label" is not specified, then there will be a gridline
- *   without a label.
- *
- * This flexibility is useful in a few situations:
- * - For log scales, some of the tick lines may be too close to all have labels.
- * - For date scales where years are being displayed, it is desirable to display
- *   tick marks at the beginnings of years but labels (e.g. "2006") in the
- *   middle of the years.
- */
-
-/*jshint globalstrict:true, sub:true */
-/*global Dygraph:false */
-"use strict";
-
-/** @typedef {Array.<{v:number, label:string, label_v:(string|undefined)}>} */
-Dygraph.TickList = undefined;  // the ' = undefined' keeps jshint happy.
-
-/** @typedef {function(
- *    number,
- *    number,
- *    number,
- *    function(string):*,
- *    Dygraph=,
- *    Array.=
- *  ): Dygraph.TickList}
- */
-Dygraph.Ticker = undefined;  // the ' = undefined' keeps jshint happy.
-
-/** @type {Dygraph.Ticker} */
-Dygraph.numericLinearTicks = function(a, b, pixels, opts, dygraph, vals) {
-  var nonLogscaleOpts = function(opt) {
-    if (opt === 'logscale') return false;
-    return opts(opt);
-  };
-  return Dygraph.numericTicks(a, b, pixels, nonLogscaleOpts, dygraph, vals);
-};
-
-/** @type {Dygraph.Ticker} */
-Dygraph.numericTicks = function(a, b, pixels, opts, dygraph, vals) {
-  var pixels_per_tick = /** @type{number} */(opts('pixelsPerLabel'));
-  var ticks = [];
-  var i, j, tickV, nTicks;
-  if (vals) {
-    for (i = 0; i < vals.length; i++) {
-      ticks.push({v: vals[i]});
-    }
-  } else {
-    // TODO(danvk): factor this log-scale block out into a separate function.
-    if (opts("logscale")) {
-      nTicks  = Math.floor(pixels / pixels_per_tick);
-      var minIdx = Dygraph.binarySearch(a, Dygraph.PREFERRED_LOG_TICK_VALUES, 1);
-      var maxIdx = Dygraph.binarySearch(b, Dygraph.PREFERRED_LOG_TICK_VALUES, -1);
-      if (minIdx == -1) {
-        minIdx = 0;
-      }
-      if (maxIdx == -1) {
-        maxIdx = Dygraph.PREFERRED_LOG_TICK_VALUES.length - 1;
-      }
-      // Count the number of tick values would appear, if we can get at least
-      // nTicks / 4 accept them.
-      var lastDisplayed = null;
-      if (maxIdx - minIdx >= nTicks / 4) {
-        for (var idx = maxIdx; idx >= minIdx; idx--) {
-          var tickValue = Dygraph.PREFERRED_LOG_TICK_VALUES[idx];
-          var pixel_coord = Math.log(tickValue / a) / Math.log(b / a) * pixels;
-          var tick = { v: tickValue };
-          if (lastDisplayed === null) {
-            lastDisplayed = {
-              tickValue : tickValue,
-              pixel_coord : pixel_coord
-            };
-          } else {
-            if (Math.abs(pixel_coord - lastDisplayed.pixel_coord) >= pixels_per_tick) {
-              lastDisplayed = {
-                tickValue : tickValue,
-                pixel_coord : pixel_coord
-              };
-            } else {
-              tick.label = "";
-            }
-          }
-          ticks.push(tick);
-        }
-        // Since we went in backwards order.
-        ticks.reverse();
-      }
-    }
-
-    // ticks.length won't be 0 if the log scale function finds values to insert.
-    if (ticks.length === 0) {
-      // Basic idea:
-      // Try labels every 1, 2, 5, 10, 20, 50, 100, etc.
-      // Calculate the resulting tick spacing (i.e. this.height_ / nTicks).
-      // The first spacing greater than pixelsPerYLabel is what we use.
-      // TODO(danvk): version that works on a log scale.
-      var kmg2 = opts("labelsKMG2");
-      var mults, base;
-      if (kmg2) {
-        mults = [1, 2, 4, 8, 16, 32, 64, 128, 256];
-        base = 16;
-      } else {
-        mults = [1, 2, 5, 10, 20, 50, 100];
-        base = 10;
-      }
-
-      // Get the maximum number of permitted ticks based on the
-      // graph's pixel size and pixels_per_tick setting.
-      var max_ticks = Math.ceil(pixels / pixels_per_tick);
-
-      // Now calculate the data unit equivalent of this tick spacing.
-      // Use abs() since graphs may have a reversed Y axis.
-      var units_per_tick = Math.abs(b - a) / max_ticks;
-
-      // Based on this, get a starting scale which is the largest
-      // integer power of the chosen base (10 or 16) that still remains
-      // below the requested pixels_per_tick spacing.
-      var base_power = Math.floor(Math.log(units_per_tick) / Math.log(base));
-      var base_scale = Math.pow(base, base_power);
-
-      // Now try multiples of the starting scale until we find one
-      // that results in tick marks spaced sufficiently far apart.
-      // The "mults" array should cover the range 1 .. base^2 to
-      // adjust for rounding and edge effects.
-      var scale, low_val, high_val, spacing;
-      for (j = 0; j < mults.length; j++) {
-        scale = base_scale * mults[j];
-        low_val = Math.floor(a / scale) * scale;
-        high_val = Math.ceil(b / scale) * scale;
-        nTicks = Math.abs(high_val - low_val) / scale;
-        spacing = pixels / nTicks;
-        if (spacing > pixels_per_tick) break;
-      }
-
-      // Construct the set of ticks.
-      // Allow reverse y-axis if it's explicitly requested.
-      if (low_val > high_val) scale *= -1;
-      for (i = 0; i < nTicks; i++) {
-        tickV = low_val + i * scale;
-        ticks.push( {v: tickV} );
-      }
-    }
-  }
-
-  var formatter = /**@type{AxisLabelFormatter}*/(opts('axisLabelFormatter'));
-
-  // Add labels to the ticks.
-  for (i = 0; i < ticks.length; i++) {
-    if (ticks[i].label !== undefined) continue;  // Use current label.
-    // TODO(danvk): set granularity to something appropriate here.
-    ticks[i].label = formatter(ticks[i].v, 0, opts, dygraph);
-  }
-
-  return ticks;
-};
-
-
-/** @type {Dygraph.Ticker} */
-Dygraph.dateTicker = function(a, b, pixels, opts, dygraph, vals) {
-  var chosen = Dygraph.pickDateTickGranularity(a, b, pixels, opts);
-
-  if (chosen >= 0) {
-    return Dygraph.getDateAxis(a, b, chosen, opts, dygraph);
-  } else {
-    // this can happen if self.width_ is zero.
-    return [];
-  }
-};
-
-// Time granularity enumeration
-// TODO(danvk): make this an @enum
-Dygraph.SECONDLY = 0;
-Dygraph.TWO_SECONDLY = 1;
-Dygraph.FIVE_SECONDLY = 2;
-Dygraph.TEN_SECONDLY = 3;
-Dygraph.THIRTY_SECONDLY  = 4;
-Dygraph.MINUTELY = 5;
-Dygraph.TWO_MINUTELY = 6;
-Dygraph.FIVE_MINUTELY = 7;
-Dygraph.TEN_MINUTELY = 8;
-Dygraph.THIRTY_MINUTELY = 9;
-Dygraph.HOURLY = 10;
-Dygraph.TWO_HOURLY = 11;
-Dygraph.SIX_HOURLY = 12;
-Dygraph.DAILY = 13;
-Dygraph.WEEKLY = 14;
-Dygraph.MONTHLY = 15;
-Dygraph.QUARTERLY = 16;
-Dygraph.BIANNUAL = 17;
-Dygraph.ANNUAL = 18;
-Dygraph.DECADAL = 19;
-Dygraph.CENTENNIAL = 20;
-Dygraph.NUM_GRANULARITIES = 21;
-
-/** @type {Array.} */
-Dygraph.SHORT_SPACINGS = [];
-Dygraph.SHORT_SPACINGS[Dygraph.SECONDLY]        = 1000 * 1;
-Dygraph.SHORT_SPACINGS[Dygraph.TWO_SECONDLY]    = 1000 * 2;
-Dygraph.SHORT_SPACINGS[Dygraph.FIVE_SECONDLY]   = 1000 * 5;
-Dygraph.SHORT_SPACINGS[Dygraph.TEN_SECONDLY]    = 1000 * 10;
-Dygraph.SHORT_SPACINGS[Dygraph.THIRTY_SECONDLY] = 1000 * 30;
-Dygraph.SHORT_SPACINGS[Dygraph.MINUTELY]        = 1000 * 60;
-Dygraph.SHORT_SPACINGS[Dygraph.TWO_MINUTELY]    = 1000 * 60 * 2;
-Dygraph.SHORT_SPACINGS[Dygraph.FIVE_MINUTELY]   = 1000 * 60 * 5;
-Dygraph.SHORT_SPACINGS[Dygraph.TEN_MINUTELY]    = 1000 * 60 * 10;
-Dygraph.SHORT_SPACINGS[Dygraph.THIRTY_MINUTELY] = 1000 * 60 * 30;
-Dygraph.SHORT_SPACINGS[Dygraph.HOURLY]          = 1000 * 3600;
-Dygraph.SHORT_SPACINGS[Dygraph.TWO_HOURLY]      = 1000 * 3600 * 2;
-Dygraph.SHORT_SPACINGS[Dygraph.SIX_HOURLY]      = 1000 * 3600 * 6;
-Dygraph.SHORT_SPACINGS[Dygraph.DAILY]           = 1000 * 86400;
-Dygraph.SHORT_SPACINGS[Dygraph.WEEKLY]          = 1000 * 604800;
-
-/** 
- * A collection of objects specifying where it is acceptable to place tick
- * marks for granularities larger than WEEKLY.  
- * 'months' is an array of month indexes on which to place tick marks.
- * 'year_mod' ticks are placed when year % year_mod = 0.
- * @type {Array.} 
- */
-Dygraph.LONG_TICK_PLACEMENTS = [];
-Dygraph.LONG_TICK_PLACEMENTS[Dygraph.MONTHLY] = {
-  months : [0,1,2,3,4,5,6,7,8,9,10,11], 
-  year_mod : 1
-};
-Dygraph.LONG_TICK_PLACEMENTS[Dygraph.QUARTERLY] = {
-  months: [0,3,6,9], 
-  year_mod: 1
-};
-Dygraph.LONG_TICK_PLACEMENTS[Dygraph.BIANNUAL] = {
-  months: [0,6], 
-  year_mod: 1
-};
-Dygraph.LONG_TICK_PLACEMENTS[Dygraph.ANNUAL] = {
-  months: [0], 
-  year_mod: 1
-};
-Dygraph.LONG_TICK_PLACEMENTS[Dygraph.DECADAL] = {
-  months: [0], 
-  year_mod: 10
-};
-Dygraph.LONG_TICK_PLACEMENTS[Dygraph.CENTENNIAL] = {
-  months: [0], 
-  year_mod: 100
-};
-
-/**
- * This is a list of human-friendly values at which to show tick marks on a log
- * scale. It is k * 10^n, where k=1..9 and n=-39..+39, so:
- * ..., 1, 2, 3, 4, 5, ..., 9, 10, 20, 30, ..., 90, 100, 200, 300, ...
- * NOTE: this assumes that Dygraph.LOG_SCALE = 10.
- * @type {Array.}
- */
-Dygraph.PREFERRED_LOG_TICK_VALUES = function() {
-  var vals = [];
-  for (var power = -39; power <= 39; power++) {
-    var range = Math.pow(10, power);
-    for (var mult = 1; mult <= 9; mult++) {
-      var val = range * mult;
-      vals.push(val);
-    }
-  }
-  return vals;
-}();
-
-/**
- * Determine the correct granularity of ticks on a date axis.
- *
- * @param {number} a Left edge of the chart (ms)
- * @param {number} b Right edge of the chart (ms)
- * @param {number} pixels Size of the chart in the relevant dimension (width).
- * @param {function(string):*} opts Function mapping from option name ->
- *     value.
- * @return {number} The appropriate axis granularity for this chart. See the
- *     enumeration of possible values in dygraph-tickers.js.
- */
-Dygraph.pickDateTickGranularity = function(a, b, pixels, opts) {
-  var pixels_per_tick = /** @type{number} */(opts('pixelsPerLabel'));
-  for (var i = 0; i < Dygraph.NUM_GRANULARITIES; i++) {
-    var num_ticks = Dygraph.numDateTicks(a, b, i);
-    if (pixels / num_ticks >= pixels_per_tick) {
-      return i;
-    }
-  }
-  return -1;
-};
-
-/**
- * @param {number} start_time
- * @param {number} end_time
- * @param {number} granularity (one of the granularities enumerated above)
- * @return {number} Number of ticks that would result.
- */
-Dygraph.numDateTicks = function(start_time, end_time, granularity) {
-  if (granularity < Dygraph.MONTHLY) {
-    // Generate one tick mark for every fixed interval of time.
-    var spacing = Dygraph.SHORT_SPACINGS[granularity];
-    return Math.floor(0.5 + 1.0 * (end_time - start_time) / spacing);
-  } else {
-    var tickPlacement = Dygraph.LONG_TICK_PLACEMENTS[granularity];
-
-    var msInYear = 365.2524 * 24 * 3600 * 1000;
-    var num_years = 1.0 * (end_time - start_time) / msInYear;
-    return Math.floor(0.5 + 1.0 * num_years * tickPlacement.months.length / tickPlacement.year_mod);
-  }
-};
-
-/**
- * @param {number} start_time
- * @param {number} end_time
- * @param {number} granularity (one of the granularities enumerated above)
- * @param {function(string):*} opts Function mapping from option name -> value.
- * @param {Dygraph=} dg
- * @return {!Dygraph.TickList}
- */
-Dygraph.getDateAxis = function(start_time, end_time, granularity, opts, dg) {
-  var formatter = /** @type{AxisLabelFormatter} */(
-      opts("axisLabelFormatter"));
-  var ticks = [];
-  var t;
-
-  if (granularity < Dygraph.MONTHLY) {
-    // Generate one tick mark for every fixed interval of time.
-    var spacing = Dygraph.SHORT_SPACINGS[granularity];
-
-    // Find a time less than start_time which occurs on a "nice" time boundary
-    // for this granularity.
-    var g = spacing / 1000;
-    var d = new Date(start_time);
-    Dygraph.setDateSameTZ(d, {ms: 0});
-
-    var x;
-    if (g <= 60) {  // seconds
-      x = d.getSeconds();
-      Dygraph.setDateSameTZ(d, {s: x - x % g});
-    } else {
-      Dygraph.setDateSameTZ(d, {s: 0});
-      g /= 60;
-      if (g <= 60) {  // minutes
-        x = d.getMinutes();
-        Dygraph.setDateSameTZ(d, {m: x - x % g});
-      } else {
-        Dygraph.setDateSameTZ(d, {m: 0});
-        g /= 60;
-
-        if (g <= 24) {  // days
-          x = d.getHours();
-          d.setHours(x - x % g);
-        } else {
-          d.setHours(0);
-          g /= 24;
-
-          if (g == 7) {  // one week
-            d.setDate(d.getDate() - d.getDay());
-          }
-        }
-      }
-    }
-    start_time = d.getTime();
-
-    // For spacings coarser than two-hourly, we want to ignore daylight
-    // savings transitions to get consistent ticks. For finer-grained ticks,
-    // it's essential to show the DST transition in all its messiness.
-    var start_offset_min = new Date(start_time).getTimezoneOffset();
-    var check_dst = (spacing >= Dygraph.SHORT_SPACINGS[Dygraph.TWO_HOURLY]);
-
-    for (t = start_time; t <= end_time; t += spacing) {
-      d = new Date(t);
-
-      // This ensures that we stay on the same hourly "rhythm" across
-      // daylight savings transitions. Without this, the ticks could get off
-      // by an hour. See tests/daylight-savings.html or issue 147.
-      if (check_dst && d.getTimezoneOffset() != start_offset_min) {
-        var delta_min = d.getTimezoneOffset() - start_offset_min;
-        t += delta_min * 60 * 1000;
-        d = new Date(t);
-        start_offset_min = d.getTimezoneOffset();
-
-        // Check whether we've backed into the previous timezone again.
-        // This can happen during a "spring forward" transition. In this case,
-        // it's best to skip this tick altogether (we may be shooting for a
-        // non-existent time like the 2AM that's skipped) and go to the next
-        // one.
-        if (new Date(t + spacing).getTimezoneOffset() != start_offset_min) {
-          t += spacing;
-          d = new Date(t);
-          start_offset_min = d.getTimezoneOffset();
-        }
-      }
-
-      ticks.push({ v:t,
-                   label: formatter(d, granularity, opts, dg)
-                 });
-    }
-  } else {
-    // Display a tick mark on the first of a set of months of each year.
-    // Years get a tick mark iff y % year_mod == 0. This is useful for
-    // displaying a tick mark once every 10 years, say, on long time scales.
-    var months;
-    var year_mod = 1;  // e.g. to only print one point every 10 years.
-
-    if (granularity < Dygraph.NUM_GRANULARITIES) {
-      months = Dygraph.LONG_TICK_PLACEMENTS[granularity].months;
-      year_mod = Dygraph.LONG_TICK_PLACEMENTS[granularity].year_mod;
-    } else {
-      Dygraph.warn("Span of dates is too long");
-    }
-
-    var start_year = new Date(start_time).getFullYear();
-    var end_year   = new Date(end_time).getFullYear();
-    var zeropad = Dygraph.zeropad;
-    for (var i = start_year; i <= end_year; i++) {
-      if (i % year_mod !== 0) continue;
-      for (var j = 0; j < months.length; j++) {
-        var date_str = i + "/" + zeropad(1 + months[j]) + "/01";
-        t = Dygraph.dateStrToMillis(date_str);
-        if (t < start_time || t > end_time) continue;
-        ticks.push({ v:t,
-                     label: formatter(new Date(t), granularity, opts, dg)
-                   });
-      }
-    }
-  }
-
-  return ticks;
-};
-
-// These are set here so that this file can be included after dygraph.js
-// or independently.
-if (Dygraph &&
-    Dygraph.DEFAULT_ATTRS &&
-    Dygraph.DEFAULT_ATTRS['axes'] &&
-    Dygraph.DEFAULT_ATTRS['axes']['x'] &&
-    Dygraph.DEFAULT_ATTRS['axes']['y'] &&
-    Dygraph.DEFAULT_ATTRS['axes']['y2']) {
-  Dygraph.DEFAULT_ATTRS['axes']['x']['ticker'] = Dygraph.dateTicker;
-  Dygraph.DEFAULT_ATTRS['axes']['y']['ticker'] = Dygraph.numericTicks;
-  Dygraph.DEFAULT_ATTRS['axes']['y2']['ticker'] = Dygraph.numericTicks;
-}
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-utils.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-utils.js
deleted file mode 100644
index 1ec1795dd..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph-utils.js
+++ /dev/null
@@ -1,1305 +0,0 @@
-/**
- * @license
- * Copyright 2011 Dan Vanderkam (danvdk@gmail.com)
- * MIT-licensed (http://opensource.org/licenses/MIT)
- */
-
-/**
- * @fileoverview This file contains utility functions used by dygraphs. These
- * are typically static (i.e. not related to any particular dygraph). Examples
- * include date/time formatting functions, basic algorithms (e.g. binary
- * search) and generic DOM-manipulation functions.
- */
-
-/*jshint globalstrict: true */
-/*global Dygraph:false, G_vmlCanvasManager:false, Node:false, printStackTrace: false */
-"use strict";
-
-Dygraph.LOG_SCALE = 10;
-Dygraph.LN_TEN = Math.log(Dygraph.LOG_SCALE);
-
-/**
- * @private
- * @param {number} x
- * @return {number}
- */
-Dygraph.log10 = function(x) {
-  return Math.log(x) / Dygraph.LN_TEN;
-};
-
-// Various logging levels.
-Dygraph.DEBUG = 1;
-Dygraph.INFO = 2;
-Dygraph.WARNING = 3;
-Dygraph.ERROR = 3;
-
-// Set this to log stack traces on warnings, etc.
-// This requires stacktrace.js, which is up to you to provide.
-// A copy can be found in the dygraphs repo, or at
-// https://github.com/eriwen/javascript-stacktrace
-Dygraph.LOG_STACK_TRACES = false;
-
-/** A dotted line stroke pattern. */
-Dygraph.DOTTED_LINE = [2, 2];
-/** A dashed line stroke pattern. */
-Dygraph.DASHED_LINE = [7, 3];
-/** A dot dash stroke pattern. */
-Dygraph.DOT_DASH_LINE = [7, 2, 2, 2];
-
-/**
- * Log an error on the JS console at the given severity.
- * @param {number} severity One of Dygraph.{DEBUG,INFO,WARNING,ERROR}
- * @param {string} message The message to log.
- * @private
- */
-Dygraph.log = function(severity, message) {
-  var st;
-  if (typeof(printStackTrace) != 'undefined') {
-    try {
-      // Remove uninteresting bits: logging functions and paths.
-      st = printStackTrace({guess:false});
-      while (st[0].indexOf("stacktrace") != -1) {
-        st.splice(0, 1);
-      }
-
-      st.splice(0, 2);
-      for (var i = 0; i < st.length; i++) {
-        st[i] = st[i].replace(/\([^)]*\/(.*)\)/, '@$1')
-            .replace(/\@.*\/([^\/]*)/, '@$1')
-            .replace('[object Object].', '');
-      }
-      var top_msg = st.splice(0, 1)[0];
-      message += ' (' + top_msg.replace(/^.*@ ?/, '') + ')';
-    } catch(e) {
-      // Oh well, it was worth a shot!
-    }
-  }
-
-  if (typeof(window.console) != 'undefined') {
-    // In older versions of Firefox, only console.log is defined.
-    var console = window.console;
-    var log = function(console, method, msg) {
-      if (method && typeof(method) == 'function') {
-        method.call(console, msg);
-      } else {
-        console.log(msg);
-      }
-    };
-
-    switch (severity) {
-      case Dygraph.DEBUG:
-        log(console, console.debug, 'dygraphs: ' + message);
-        break;
-      case Dygraph.INFO:
-        log(console, console.info, 'dygraphs: ' + message);
-        break;
-      case Dygraph.WARNING:
-        log(console, console.warn, 'dygraphs: ' + message);
-        break;
-      case Dygraph.ERROR:
-        log(console, console.error, 'dygraphs: ' + message);
-        break;
-    }
-  }
-
-  if (Dygraph.LOG_STACK_TRACES) {
-    window.console.log(st.join('\n'));
-  }
-};
-
-/**
- * @param {string} message
- * @private
- */
-Dygraph.info = function(message) {
-  Dygraph.log(Dygraph.INFO, message);
-};
-/**
- * @param {string} message
- * @private
- */
-Dygraph.prototype.info = Dygraph.info;
-
-/**
- * @param {string} message
- * @private
- */
-Dygraph.warn = function(message) {
-  Dygraph.log(Dygraph.WARNING, message);
-};
-/**
- * @param {string} message
- * @private
- */
-Dygraph.prototype.warn = Dygraph.warn;
-
-/**
- * @param {string} message
- */
-Dygraph.error = function(message) {
-  Dygraph.log(Dygraph.ERROR, message);
-};
-/**
- * @param {string} message
- * @private
- */
-Dygraph.prototype.error = Dygraph.error;
-
-/**
- * Return the 2d context for a dygraph canvas.
- *
- * This method is only exposed for the sake of replacing the function in
- * automated tests, e.g.
- *
- * var oldFunc = Dygraph.getContext();
- * Dygraph.getContext = function(canvas) {
- *   var realContext = oldFunc(canvas);
- *   return new Proxy(realContext);
- * };
- * @param {!HTMLCanvasElement} canvas
- * @return {!CanvasRenderingContext2D}
- * @private
- */
-Dygraph.getContext = function(canvas) {
-  return /** @type{!CanvasRenderingContext2D}*/(canvas.getContext("2d"));
-};
-
-/**
- * Add an event handler. This smooths a difference between IE and the rest of
- * the world.
- * @param { !Element } elem The element to add the event to.
- * @param { string } type The type of the event, e.g. 'click' or 'mousemove'.
- * @param { function(Event):(boolean|undefined) } fn The function to call
- *     on the event. The function takes one parameter: the event object.
- * @private
- */
-Dygraph.addEvent = function addEvent(elem, type, fn) {
-  if (elem.addEventListener) {
-    elem.addEventListener(type, fn, false);
-  } else {
-    elem[type+fn] = function(){fn(window.event);};
-    elem.attachEvent('on'+type, elem[type+fn]);
-  }
-};
-
-/**
- * Add an event handler. This event handler is kept until the graph is
- * destroyed with a call to graph.destroy().
- *
- * @param { !Element } elem The element to add the event to.
- * @param { string } type The type of the event, e.g. 'click' or 'mousemove'.
- * @param { function(Event):(boolean|undefined) } fn The function to call
- *     on the event. The function takes one parameter: the event object.
- * @private
- */
-Dygraph.prototype.addAndTrackEvent = function(elem, type, fn) {
-  Dygraph.addEvent(elem, type, fn);
-  this.registeredEvents_.push({ elem : elem, type : type, fn : fn });
-};
-
-/**
- * Remove an event handler. This smooths a difference between IE and the rest
- * of the world.
- * @param {!Element} elem The element to add the event to.
- * @param {string} type The type of the event, e.g. 'click' or 'mousemove'.
- * @param {function(Event):(boolean|undefined)} fn The function to call
- *     on the event. The function takes one parameter: the event object.
- * @private
- */
-Dygraph.removeEvent = function(elem, type, fn) {
-  if (elem.removeEventListener) {
-    elem.removeEventListener(type, fn, false);
-  } else {
-    try {
-      elem.detachEvent('on'+type, elem[type+fn]);
-    } catch(e) {
-      // We only detach event listeners on a "best effort" basis in IE. See:
-      // http://stackoverflow.com/questions/2553632/detachevent-not-working-with-named-inline-functions
-    }
-    elem[type+fn] = null;
-  }
-};
-
-Dygraph.prototype.removeTrackedEvents_ = function() {
-  if (this.registeredEvents_) {
-    for (var idx = 0; idx < this.registeredEvents_.length; idx++) {
-      var reg = this.registeredEvents_[idx];
-      Dygraph.removeEvent(reg.elem, reg.type, reg.fn);
-    }
-  }
-
-  this.registeredEvents_ = [];
-};
-
-/**
- * Cancels further processing of an event. This is useful to prevent default
- * browser actions, e.g. highlighting text on a double-click.
- * Based on the article at
- * http://www.switchonthecode.com/tutorials/javascript-tutorial-the-scroll-wheel
- * @param { !Event } e The event whose normal behavior should be canceled.
- * @private
- */
-Dygraph.cancelEvent = function(e) {
-  e = e ? e : window.event;
-  if (e.stopPropagation) {
-    e.stopPropagation();
-  }
-  if (e.preventDefault) {
-    e.preventDefault();
-  }
-  e.cancelBubble = true;
-  e.cancel = true;
-  e.returnValue = false;
-  return false;
-};
-
-/**
- * Convert hsv values to an rgb(r,g,b) string. Taken from MochiKit.Color. This
- * is used to generate default series colors which are evenly spaced on the
- * color wheel.
- * @param { number } hue Range is 0.0-1.0.
- * @param { number } saturation Range is 0.0-1.0.
- * @param { number } value Range is 0.0-1.0.
- * @return { string } "rgb(r,g,b)" where r, g and b range from 0-255.
- * @private
- */
-Dygraph.hsvToRGB = function (hue, saturation, value) {
-  var red;
-  var green;
-  var blue;
-  if (saturation === 0) {
-    red = value;
-    green = value;
-    blue = value;
-  } else {
-    var i = Math.floor(hue * 6);
-    var f = (hue * 6) - i;
-    var p = value * (1 - saturation);
-    var q = value * (1 - (saturation * f));
-    var t = value * (1 - (saturation * (1 - f)));
-    switch (i) {
-      case 1: red = q; green = value; blue = p; break;
-      case 2: red = p; green = value; blue = t; break;
-      case 3: red = p; green = q; blue = value; break;
-      case 4: red = t; green = p; blue = value; break;
-      case 5: red = value; green = p; blue = q; break;
-      case 6: // fall through
-      case 0: red = value; green = t; blue = p; break;
-    }
-  }
-  red = Math.floor(255 * red + 0.5);
-  green = Math.floor(255 * green + 0.5);
-  blue = Math.floor(255 * blue + 0.5);
-  return 'rgb(' + red + ',' + green + ',' + blue + ')';
-};
-
-// The following functions are from quirksmode.org with a modification for Safari from
-// http://blog.firetree.net/2005/07/04/javascript-find-position/
-// http://www.quirksmode.org/js/findpos.html
-// ... and modifications to support scrolling divs.
-
-/**
- * Find the x-coordinate of the supplied object relative to the left side
- * of the page.
- * TODO(danvk): change obj type from Node -> !Node
- * @param {Node} obj
- * @return {number}
- * @private
- */
-Dygraph.findPosX = function(obj) {
-  var curleft = 0;
-  if(obj.offsetParent) {
-    var copyObj = obj;
-    while(1) {
-      // NOTE: the if statement here is for IE8.
-      var borderLeft = "0";
-      if (window.getComputedStyle) {
-        borderLeft = window.getComputedStyle(copyObj, null).borderLeft || "0";
-      }
-      curleft += parseInt(borderLeft, 10) ;
-      curleft += copyObj.offsetLeft;
-      if(!copyObj.offsetParent) {
-        break;
-      }
-      copyObj = copyObj.offsetParent;
-    }
-  } else if(obj.x) {
-    curleft += obj.x;
-  }
-  // This handles the case where the object is inside a scrolled div.
-  while(obj && obj != document.body) {
-    curleft -= obj.scrollLeft;
-    obj = obj.parentNode;
-  }
-  return curleft;
-};
-
-/**
- * Find the y-coordinate of the supplied object relative to the top of the
- * page.
- * TODO(danvk): change obj type from Node -> !Node
- * TODO(danvk): consolidate with findPosX and return an {x, y} object.
- * @param {Node} obj
- * @return {number}
- * @private
- */
-Dygraph.findPosY = function(obj) {
-  var curtop = 0;
-  if(obj.offsetParent) {
-    var copyObj = obj;
-    while(1) {
-      // NOTE: the if statement here is for IE8.
-      var borderTop = "0";
-      if (window.getComputedStyle) {
-        borderTop = window.getComputedStyle(copyObj, null).borderTop || "0";
-      }
-      curtop += parseInt(borderTop, 10) ;
-      curtop += copyObj.offsetTop;
-      if(!copyObj.offsetParent) {
-        break;
-      }
-      copyObj = copyObj.offsetParent;
-    }
-  } else if(obj.y) {
-    curtop += obj.y;
-  }
-  // This handles the case where the object is inside a scrolled div.
-  while(obj && obj != document.body) {
-    curtop -= obj.scrollTop;
-    obj = obj.parentNode;
-  }
-  return curtop;
-};
-
-/**
- * Returns the x-coordinate of the event in a coordinate system where the
- * top-left corner of the page (not the window) is (0,0).
- * Taken from MochiKit.Signal
- * @param {!Event} e
- * @return {number}
- * @private
- */
-Dygraph.pageX = function(e) {
-  if (e.pageX) {
-    return (!e.pageX || e.pageX < 0) ? 0 : e.pageX;
-  } else {
-    var de = document.documentElement;
-    var b = document.body;
-    return e.clientX +
-        (de.scrollLeft || b.scrollLeft) -
-        (de.clientLeft || 0);
-  }
-};
-
-/**
- * Returns the y-coordinate of the event in a coordinate system where the
- * top-left corner of the page (not the window) is (0,0).
- * Taken from MochiKit.Signal
- * @param {!Event} e
- * @return {number}
- * @private
- */
-Dygraph.pageY = function(e) {
-  if (e.pageY) {
-    return (!e.pageY || e.pageY < 0) ? 0 : e.pageY;
-  } else {
-    var de = document.documentElement;
-    var b = document.body;
-    return e.clientY +
-        (de.scrollTop || b.scrollTop) -
-        (de.clientTop || 0);
-  }
-};
-
-/**
- * This returns true unless the parameter is 0, null, undefined or NaN.
- * TODO(danvk): rename this function to something like 'isNonZeroNan'.
- *
- * @param {number} x The number to consider.
- * @return {boolean} Whether the number is zero or NaN.
- * @private
- */
-Dygraph.isOK = function(x) {
-  return !!x && !isNaN(x);
-};
-
-/**
- * @param { {x:?number,y:?number,yval:?number} } p The point to consider, valid
- *     points are {x, y} objects
- * @param { boolean } allowNaNY Treat point with y=NaN as valid
- * @return { boolean } Whether the point has numeric x and y.
- * @private
- */
-Dygraph.isValidPoint = function(p, allowNaNY) {
-  if (!p) return false;  // null or undefined object
-  if (p.yval === null) return false;  // missing point
-  if (p.x === null || p.x === undefined) return false;
-  if (p.y === null || p.y === undefined) return false;
-  if (isNaN(p.x) || (!allowNaNY && isNaN(p.y))) return false;
-  return true;
-};
-
-/**
- * Number formatting function which mimicks the behavior of %g in printf, i.e.
- * either exponential or fixed format (without trailing 0s) is used depending on
- * the length of the generated string.  The advantage of this format is that
- * there is a predictable upper bound on the resulting string length,
- * significant figures are not dropped, and normal numbers are not displayed in
- * exponential notation.
- *
- * NOTE: JavaScript's native toPrecision() is NOT a drop-in replacement for %g.
- * It creates strings which are too long for absolute values between 10^-4 and
- * 10^-6, e.g. '0.00001' instead of '1e-5'. See tests/number-format.html for
- * output examples.
- *
- * @param {number} x The number to format
- * @param {number=} opt_precision The precision to use, default 2.
- * @return {string} A string formatted like %g in printf.  The max generated
- *                  string length should be precision + 6 (e.g 1.123e+300).
- */
-Dygraph.floatFormat = function(x, opt_precision) {
-  // Avoid invalid precision values; [1, 21] is the valid range.
-  var p = Math.min(Math.max(1, opt_precision || 2), 21);
-
-  // This is deceptively simple.  The actual algorithm comes from:
-  //
-  // Max allowed length = p + 4
-  // where 4 comes from 'e+n' and '.'.
-  //
-  // Length of fixed format = 2 + y + p
-  // where 2 comes from '0.' and y = # of leading zeroes.
-  //
-  // Equating the two and solving for y yields y = 2, or 0.00xxxx which is
-  // 1.0e-3.
-  //
-  // Since the behavior of toPrecision() is identical for larger numbers, we
-  // don't have to worry about the other bound.
-  //
-  // Finally, the argument for toExponential() is the number of trailing digits,
-  // so we take off 1 for the value before the '.'.
-  return (Math.abs(x) < 1.0e-3 && x !== 0.0) ?
-      x.toExponential(p - 1) : x.toPrecision(p);
-};
-
-/**
- * Converts '9' to '09' (useful for dates)
- * @param {number} x
- * @return {string}
- * @private
- */
-Dygraph.zeropad = function(x) {
-  if (x < 10) return "0" + x; else return "" + x;
-};
-
-/**
- * Return a string version of the hours, minutes and seconds portion of a date.
- *
- * @param {number} date The JavaScript date (ms since epoch)
- * @return {string} A time of the form "HH:MM:SS"
- * @private
- */
-Dygraph.hmsString_ = function(date) {
-  var zeropad = Dygraph.zeropad;
-  var d = new Date(date);
-  if (d.getSeconds()) {
-    return zeropad(d.getHours()) + ":" +
-           zeropad(d.getMinutes()) + ":" +
-           zeropad(d.getSeconds());
-  } else {
-    return zeropad(d.getHours()) + ":" + zeropad(d.getMinutes());
-  }
-};
-
-/**
- * Round a number to the specified number of digits past the decimal point.
- * @param {number} num The number to round
- * @param {number} places The number of decimals to which to round
- * @return {number} The rounded number
- * @private
- */
-Dygraph.round_ = function(num, places) {
-  var shift = Math.pow(10, places);
-  return Math.round(num * shift)/shift;
-};
-
-/**
- * Implementation of binary search over an array.
- * Currently does not work when val is outside the range of arry's values.
- * @param {number} val the value to search for
- * @param {Array.} arry is the value over which to search
- * @param {number} abs If abs > 0, find the lowest entry greater than val
- *     If abs < 0, find the highest entry less than val.
- *     If abs == 0, find the entry that equals val.
- * @param {number=} low The first index in arry to consider (optional)
- * @param {number=} high The last index in arry to consider (optional)
- * @return {number} Index of the element, or -1 if it isn't found.
- * @private
- */
-Dygraph.binarySearch = function(val, arry, abs, low, high) {
-  if (low === null || low === undefined ||
-      high === null || high === undefined) {
-    low = 0;
-    high = arry.length - 1;
-  }
-  if (low > high) {
-    return -1;
-  }
-  if (abs === null || abs === undefined) {
-    abs = 0;
-  }
-  var validIndex = function(idx) {
-    return idx >= 0 && idx < arry.length;
-  };
-  var mid = parseInt((low + high) / 2, 10);
-  var element = arry[mid];
-  var idx;
-  if (element == val) {
-    return mid;
-  } else if (element > val) {
-    if (abs > 0) {
-      // Accept if element > val, but also if prior element < val.
-      idx = mid - 1;
-      if (validIndex(idx) && arry[idx] < val) {
-        return mid;
-      }
-    }
-    return Dygraph.binarySearch(val, arry, abs, low, mid - 1);
-  } else if (element < val) {
-    if (abs < 0) {
-      // Accept if element < val, but also if prior element > val.
-      idx = mid + 1;
-      if (validIndex(idx) && arry[idx] > val) {
-        return mid;
-      }
-    }
-    return Dygraph.binarySearch(val, arry, abs, mid + 1, high);
-  }
-  return -1;  // can't actually happen, but makes closure compiler happy
-};
-
-/**
- * Parses a date, returning the number of milliseconds since epoch. This can be
- * passed in as an xValueParser in the Dygraph constructor.
- * TODO(danvk): enumerate formats that this understands.
- *
- * @param {string} dateStr A date in a variety of possible string formats.
- * @return {number} Milliseconds since epoch.
- * @private
- */
-Dygraph.dateParser = function(dateStr) {
-  var dateStrSlashed;
-  var d;
-
-  // Let the system try the format first, with one caveat:
-  // YYYY-MM-DD[ HH:MM:SS] is interpreted as UTC by a variety of browsers.
-  // dygraphs displays dates in local time, so this will result in surprising
-  // inconsistencies. But if you specify "T" or "Z" (i.e. YYYY-MM-DDTHH:MM:SS),
-  // then you probably know what you're doing, so we'll let you go ahead.
-  // Issue: http://code.google.com/p/dygraphs/issues/detail?id=255
-  if (dateStr.search("-") == -1 ||
-      dateStr.search("T") != -1 || dateStr.search("Z") != -1) {
-    d = Dygraph.dateStrToMillis(dateStr);
-    if (d && !isNaN(d)) return d;
-  }
-
-  if (dateStr.search("-") != -1) {  // e.g. '2009-7-12' or '2009-07-12'
-    dateStrSlashed = dateStr.replace("-", "/", "g");
-    while (dateStrSlashed.search("-") != -1) {
-      dateStrSlashed = dateStrSlashed.replace("-", "/");
-    }
-    d = Dygraph.dateStrToMillis(dateStrSlashed);
-  } else if (dateStr.length == 8) {  // e.g. '20090712'
-    // TODO(danvk): remove support for this format. It's confusing.
-    dateStrSlashed = dateStr.substr(0,4) + "/" + dateStr.substr(4,2) + "/" +
-        dateStr.substr(6,2);
-    d = Dygraph.dateStrToMillis(dateStrSlashed);
-  } else {
-    // Any format that Date.parse will accept, e.g. "2009/07/12" or
-    // "2009/07/12 12:34:56"
-    d = Dygraph.dateStrToMillis(dateStr);
-  }
-
-  if (!d || isNaN(d)) {
-    Dygraph.error("Couldn't parse " + dateStr + " as a date");
-  }
-  return d;
-};
-
-/**
- * This is identical to JavaScript's built-in Date.parse() method, except that
- * it doesn't get replaced with an incompatible method by aggressive JS
- * libraries like MooTools or Joomla.
- * @param {string} str The date string, e.g. "2011/05/06"
- * @return {number} millis since epoch
- * @private
- */
-Dygraph.dateStrToMillis = function(str) {
-  return new Date(str).getTime();
-};
-
-// These functions are all based on MochiKit.
-/**
- * Copies all the properties from o to self.
- *
- * @param {!Object} self
- * @param {!Object} o
- * @return {!Object}
- */
-Dygraph.update = function(self, o) {
-  if (typeof(o) != 'undefined' && o !== null) {
-    for (var k in o) {
-      if (o.hasOwnProperty(k)) {
-        self[k] = o[k];
-      }
-    }
-  }
-  return self;
-};
-
-/**
- * Copies all the properties from o to self.
- *
- * @param {!Object} self
- * @param {!Object} o
- * @return {!Object}
- * @private
- */
-Dygraph.updateDeep = function (self, o) {
-  // Taken from http://stackoverflow.com/questions/384286/javascript-isdom-how-do-you-check-if-a-javascript-object-is-a-dom-object
-  function isNode(o) {
-    return (
-      typeof Node === "object" ? o instanceof Node :
-      typeof o === "object" && typeof o.nodeType === "number" && typeof o.nodeName==="string"
-    );
-  }
-
-  if (typeof(o) != 'undefined' && o !== null) {
-    for (var k in o) {
-      if (o.hasOwnProperty(k)) {
-        if (o[k] === null) {
-          self[k] = null;
-        } else if (Dygraph.isArrayLike(o[k])) {
-          self[k] = o[k].slice();
-        } else if (isNode(o[k])) {
-          // DOM objects are shallowly-copied.
-          self[k] = o[k];
-        } else if (typeof(o[k]) == 'object') {
-          if (typeof(self[k]) != 'object' || self[k] === null) {
-            self[k] = {};
-          }
-          Dygraph.updateDeep(self[k], o[k]);
-        } else {
-          self[k] = o[k];
-        }
-      }
-    }
-  }
-  return self;
-};
-
-/**
- * @param {Object} o
- * @return {boolean}
- * @private
- */
-Dygraph.isArrayLike = function(o) {
-  var typ = typeof(o);
-  if (
-      (typ != 'object' && !(typ == 'function' &&
-        typeof(o.item) == 'function')) ||
-      o === null ||
-      typeof(o.length) != 'number' ||
-      o.nodeType === 3
-     ) {
-    return false;
-  }
-  return true;
-};
-
-/**
- * @param {Object} o
- * @return {boolean}
- * @private
- */
-Dygraph.isDateLike = function (o) {
-  if (typeof(o) != "object" || o === null ||
-      typeof(o.getTime) != 'function') {
-    return false;
-  }
-  return true;
-};
-
-/**
- * Note: this only seems to work for arrays.
- * @param {!Array} o
- * @return {!Array}
- * @private
- */
-Dygraph.clone = function(o) {
-  // TODO(danvk): figure out how MochiKit's version works
-  var r = [];
-  for (var i = 0; i < o.length; i++) {
-    if (Dygraph.isArrayLike(o[i])) {
-      r.push(Dygraph.clone(o[i]));
-    } else {
-      r.push(o[i]);
-    }
-  }
-  return r;
-};
-
-/**
- * Create a new canvas element. This is more complex than a simple
- * document.createElement("canvas") because of IE and excanvas.
- *
- * @return {!HTMLCanvasElement}
- * @private
- */
-Dygraph.createCanvas = function() {
-  var canvas = document.createElement("canvas");
-
-  var isIE = (/MSIE/.test(navigator.userAgent) && !window.opera);
-  if (isIE && (typeof(G_vmlCanvasManager) != 'undefined')) {
-    canvas = G_vmlCanvasManager.initElement(
-        /**@type{!HTMLCanvasElement}*/(canvas));
-  }
-
-  return canvas;
-};
-
-/**
- * Checks whether the user is on an Android browser.
- * Android does not fully support the  tag, e.g. w/r/t/ clipping.
- * @return {boolean}
- * @private
- */
-Dygraph.isAndroid = function() {
-  return (/Android/).test(navigator.userAgent);
-};
-
-
-/**
- * TODO(danvk): use @template here when it's better supported for classes.
- * @param {!Array} array
- * @param {number} start
- * @param {number} length
- * @param {function(!Array,?):boolean=} predicate
- * @constructor
- */
-Dygraph.Iterator = function(array, start, length, predicate) {
-  start = start || 0;
-  length = length || array.length;
-  this.hasNext = true; // Use to identify if there's another element.
-  this.peek = null; // Use for look-ahead
-  this.start_ = start;
-  this.array_ = array;
-  this.predicate_ = predicate;
-  this.end_ = Math.min(array.length, start + length);
-  this.nextIdx_ = start - 1; // use -1 so initial advance works.
-  this.next(); // ignoring result.
-};
-
-/**
- * @return {Object}
- */
-Dygraph.Iterator.prototype.next = function() {
-  if (!this.hasNext) {
-    return null;
-  }
-  var obj = this.peek;
-
-  var nextIdx = this.nextIdx_ + 1;
-  var found = false;
-  while (nextIdx < this.end_) {
-    if (!this.predicate_ || this.predicate_(this.array_, nextIdx)) {
-      this.peek = this.array_[nextIdx];
-      found = true;
-      break;
-    }
-    nextIdx++;
-  }
-  this.nextIdx_ = nextIdx;
-  if (!found) {
-    this.hasNext = false;
-    this.peek = null;
-  }
-  return obj;
-};
-
-/**
- * Returns a new iterator over array, between indexes start and
- * start + length, and only returns entries that pass the accept function
- *
- * @param {!Array} array the array to iterate over.
- * @param {number} start the first index to iterate over, 0 if absent.
- * @param {number} length the number of elements in the array to iterate over.
- *     This, along with start, defines a slice of the array, and so length
- *     doesn't imply the number of elements in the iterator when accept doesn't
- *     always accept all values. array.length when absent.
- * @param {function(?):boolean=} opt_predicate a function that takes
- *     parameters array and idx, which returns true when the element should be
- *     returned.  If omitted, all elements are accepted.
- * @private
- */
-Dygraph.createIterator = function(array, start, length, opt_predicate) {
-  return new Dygraph.Iterator(array, start, length, opt_predicate);
-};
-
-// Shim layer with setTimeout fallback.
-// From: http://paulirish.com/2011/requestanimationframe-for-smart-animating/
-// Should be called with the window context:
-//   Dygraph.requestAnimFrame.call(window, function() {})
-Dygraph.requestAnimFrame = (function() {
-  return window.requestAnimationFrame       ||
-          window.webkitRequestAnimationFrame ||
-          window.mozRequestAnimationFrame    ||
-          window.oRequestAnimationFrame      ||
-          window.msRequestAnimationFrame     ||
-          function (callback) {
-            window.setTimeout(callback, 1000 / 60);
-          };
-})();
-
-/**
- * Call a function at most maxFrames times at an attempted interval of
- * framePeriodInMillis, then call a cleanup function once. repeatFn is called
- * once immediately, then at most (maxFrames - 1) times asynchronously. If
- * maxFrames==1, then cleanup_fn() is also called synchronously.  This function
- * is used to sequence animation.
- * @param {function(number)} repeatFn Called repeatedly -- takes the frame
- *     number (from 0 to maxFrames-1) as an argument.
- * @param {number} maxFrames The max number of times to call repeatFn
- * @param {number} framePeriodInMillis Max requested time between frames.
- * @param {function()} cleanupFn A function to call after all repeatFn calls.
- * @private
- */
-Dygraph.repeatAndCleanup = function(repeatFn, maxFrames, framePeriodInMillis,
-    cleanupFn) {
-  var frameNumber = 0;
-  var previousFrameNumber;
-  var startTime = new Date().getTime();
-  repeatFn(frameNumber);
-  if (maxFrames == 1) {
-    cleanupFn();
-    return;
-  }
-  var maxFrameArg = maxFrames - 1;
-
-  (function loop() {
-    if (frameNumber >= maxFrames) return;
-    Dygraph.requestAnimFrame.call(window, function() {
-      // Determine which frame to draw based on the delay so far.  Will skip
-      // frames if necessary.
-      var currentTime = new Date().getTime();
-      var delayInMillis = currentTime - startTime;
-      previousFrameNumber = frameNumber;
-      frameNumber = Math.floor(delayInMillis / framePeriodInMillis);
-      var frameDelta = frameNumber - previousFrameNumber;
-      // If we predict that the subsequent repeatFn call will overshoot our
-      // total frame target, so our last call will cause a stutter, then jump to
-      // the last call immediately.  If we're going to cause a stutter, better
-      // to do it faster than slower.
-      var predictOvershootStutter = (frameNumber + frameDelta) > maxFrameArg;
-      if (predictOvershootStutter || (frameNumber >= maxFrameArg)) {
-        repeatFn(maxFrameArg);  // Ensure final call with maxFrameArg.
-        cleanupFn();
-      } else {
-        if (frameDelta !== 0) {  // Don't call repeatFn with duplicate frames.
-          repeatFn(frameNumber);
-        }
-        loop();
-      }
-    });
-  })();
-};
-
-/**
- * This function will scan the option list and determine if they
- * require us to recalculate the pixel positions of each point.
- * @param {!Array.} labels a list of options to check.
- * @param {!Object} attrs
- * @return {boolean} true if the graph needs new points else false.
- * @private
- */
-Dygraph.isPixelChangingOptionList = function(labels, attrs) {
-  // A whitelist of options that do not change pixel positions.
-  var pixelSafeOptions = {
-    'annotationClickHandler': true,
-    'annotationDblClickHandler': true,
-    'annotationMouseOutHandler': true,
-    'annotationMouseOverHandler': true,
-    'axisLabelColor': true,
-    'axisLineColor': true,
-    'axisLineWidth': true,
-    'clickCallback': true,
-    'digitsAfterDecimal': true,
-    'drawCallback': true,
-    'drawHighlightPointCallback': true,
-    'drawPoints': true,
-    'drawPointCallback': true,
-    'drawXGrid': true,
-    'drawYGrid': true,
-    'fillAlpha': true,
-    'gridLineColor': true,
-    'gridLineWidth': true,
-    'hideOverlayOnMouseOut': true,
-    'highlightCallback': true,
-    'highlightCircleSize': true,
-    'interactionModel': true,
-    'isZoomedIgnoreProgrammaticZoom': true,
-    'labelsDiv': true,
-    'labelsDivStyles': true,
-    'labelsDivWidth': true,
-    'labelsKMB': true,
-    'labelsKMG2': true,
-    'labelsSeparateLines': true,
-    'labelsShowZeroValues': true,
-    'legend': true,
-    'maxNumberWidth': true,
-    'panEdgeFraction': true,
-    'pixelsPerYLabel': true,
-    'pointClickCallback': true,
-    'pointSize': true,
-    'rangeSelectorPlotFillColor': true,
-    'rangeSelectorPlotStrokeColor': true,
-    'showLabelsOnHighlight': true,
-    'showRoller': true,
-    'sigFigs': true,
-    'strokeWidth': true,
-    'underlayCallback': true,
-    'unhighlightCallback': true,
-    'xAxisLabelFormatter': true,
-    'xTicker': true,
-    'xValueFormatter': true,
-    'yAxisLabelFormatter': true,
-    'yValueFormatter': true,
-    'zoomCallback': true
-  };
-
-  // Assume that we do not require new points.
-  // This will change to true if we actually do need new points.
-  var requiresNewPoints = false;
-
-  // Create a dictionary of series names for faster lookup.
-  // If there are no labels, then the dictionary stays empty.
-  var seriesNamesDictionary = { };
-  if (labels) {
-    for (var i = 1; i < labels.length; i++) {
-      seriesNamesDictionary[labels[i]] = true;
-    }
-  }
-
-  // Iterate through the list of updated options.
-  for (var property in attrs) {
-    // Break early if we already know we need new points from a previous option.
-    if (requiresNewPoints) {
-      break;
-    }
-    if (attrs.hasOwnProperty(property)) {
-      // Find out of this field is actually a series specific options list.
-      if (seriesNamesDictionary[property]) {
-        // This property value is a list of options for this series.
-        // If any of these sub properties are not pixel safe, set the flag.
-        for (var subProperty in attrs[property]) {
-          // Break early if we already know we need new points from a previous option.
-          if (requiresNewPoints) {
-            break;
-          }
-          if (attrs[property].hasOwnProperty(subProperty) && !pixelSafeOptions[subProperty]) {
-            requiresNewPoints = true;
-          }
-        }
-      // If this was not a series specific option list, check if its a pixel changing property.
-      } else if (!pixelSafeOptions[property]) {
-        requiresNewPoints = true;
-      }
-    }
-  }
-
-  return requiresNewPoints;
-};
-
-/**
- * Compares two arrays to see if they are equal. If either parameter is not an
- * array it will return false. Does a shallow compare
- * Dygraph.compareArrays([[1,2], [3, 4]], [[1,2], [3,4]]) === false.
- * @param {!Array.} array1 first array
- * @param {!Array.} array2 second array
- * @return {boolean} True if both parameters are arrays, and contents are equal.
- * @template T
- */
-Dygraph.compareArrays = function(array1, array2) {
-  if (!Dygraph.isArrayLike(array1) || !Dygraph.isArrayLike(array2)) {
-    return false;
-  }
-  if (array1.length !== array2.length) {
-    return false;
-  }
-  for (var i = 0; i < array1.length; i++) {
-    if (array1[i] !== array2[i]) {
-      return false;
-    }
-  }
-  return true;
-};
-
-/**
- * @param {!CanvasRenderingContext2D} ctx the canvas context
- * @param {number} sides the number of sides in the shape.
- * @param {number} radius the radius of the image.
- * @param {number} cx center x coordate
- * @param {number} cy center y coordinate
- * @param {number=} rotationRadians the shift of the initial angle, in radians.
- * @param {number=} delta the angle shift for each line. If missing, creates a
- *     regular polygon.
- * @private
- */
-Dygraph.regularShape_ = function(
-    ctx, sides, radius, cx, cy, rotationRadians, delta) {
-  rotationRadians = rotationRadians || 0;
-  delta = delta || Math.PI * 2 / sides;
-
-  ctx.beginPath();
-  var initialAngle = rotationRadians;
-  var angle = initialAngle;
-
-  var computeCoordinates = function() {
-    var x = cx + (Math.sin(angle) * radius);
-    var y = cy + (-Math.cos(angle) * radius);
-    return [x, y];
-  };
-
-  var initialCoordinates = computeCoordinates();
-  var x = initialCoordinates[0];
-  var y = initialCoordinates[1];
-  ctx.moveTo(x, y);
-
-  for (var idx = 0; idx < sides; idx++) {
-    angle = (idx == sides - 1) ? initialAngle : (angle + delta);
-    var coords = computeCoordinates();
-    ctx.lineTo(coords[0], coords[1]);
-  }
-  ctx.fill();
-  ctx.stroke();
-};
-
-/**
- * TODO(danvk): be more specific on the return type.
- * @param {number} sides
- * @param {number=} rotationRadians
- * @param {number=} delta
- * @return {Function}
- * @private
- */
-Dygraph.shapeFunction_ = function(sides, rotationRadians, delta) {
-  return function(g, name, ctx, cx, cy, color, radius) {
-    ctx.strokeStyle = color;
-    ctx.fillStyle = "white";
-    Dygraph.regularShape_(ctx, sides, radius, cx, cy, rotationRadians, delta);
-  };
-};
-
-Dygraph.Circles = {
-  DEFAULT : function(g, name, ctx, canvasx, canvasy, color, radius) {
-    ctx.beginPath();
-    ctx.fillStyle = color;
-    ctx.arc(canvasx, canvasy, radius, 0, 2 * Math.PI, false);
-    ctx.fill();
-  },
-  TRIANGLE : Dygraph.shapeFunction_(3),
-  SQUARE : Dygraph.shapeFunction_(4, Math.PI / 4),
-  DIAMOND : Dygraph.shapeFunction_(4),
-  PENTAGON : Dygraph.shapeFunction_(5),
-  HEXAGON : Dygraph.shapeFunction_(6),
-  CIRCLE : function(g, name, ctx, cx, cy, color, radius) {
-    ctx.beginPath();
-    ctx.strokeStyle = color;
-    ctx.fillStyle = "white";
-    ctx.arc(cx, cy, radius, 0, 2 * Math.PI, false);
-    ctx.fill();
-    ctx.stroke();
-  },
-  STAR : Dygraph.shapeFunction_(5, 0, 4 * Math.PI / 5),
-  PLUS : function(g, name, ctx, cx, cy, color, radius) {
-    ctx.strokeStyle = color;
-
-    ctx.beginPath();
-    ctx.moveTo(cx + radius, cy);
-    ctx.lineTo(cx - radius, cy);
-    ctx.closePath();
-    ctx.stroke();
-
-    ctx.beginPath();
-    ctx.moveTo(cx, cy + radius);
-    ctx.lineTo(cx, cy - radius);
-    ctx.closePath();
-    ctx.stroke();
-  },
-  EX : function(g, name, ctx, cx, cy, color, radius) {
-    ctx.strokeStyle = color;
-
-    ctx.beginPath();
-    ctx.moveTo(cx + radius, cy + radius);
-    ctx.lineTo(cx - radius, cy - radius);
-    ctx.closePath();
-    ctx.stroke();
-
-    ctx.beginPath();
-    ctx.moveTo(cx + radius, cy - radius);
-    ctx.lineTo(cx - radius, cy + radius);
-    ctx.closePath();
-    ctx.stroke();
-  }
-};
-
-/**
- * To create a "drag" interaction, you typically register a mousedown event
- * handler on the element where the drag begins. In that handler, you register a
- * mouseup handler on the window to determine when the mouse is released,
- * wherever that release happens. This works well, except when the user releases
- * the mouse over an off-domain iframe. In that case, the mouseup event is
- * handled by the iframe and never bubbles up to the window handler.
- *
- * To deal with this issue, we cover iframes with high z-index divs to make sure
- * they don't capture mouseup.
- *
- * Usage:
- * element.addEventListener('mousedown', function() {
- *   var tarper = new Dygraph.IFrameTarp();
- *   tarper.cover();
- *   var mouseUpHandler = function() {
- *     ...
- *     window.removeEventListener(mouseUpHandler);
- *     tarper.uncover();
- *   };
- *   window.addEventListener('mouseup', mouseUpHandler);
- * };
- *
- * @constructor
- */
-Dygraph.IFrameTarp = function() {
-  /** @type {Array.} */
-  this.tarps = [];
-};
-
-/**
- * Find all the iframes in the document and cover them with high z-index
- * transparent divs.
- */
-Dygraph.IFrameTarp.prototype.cover = function() {
-  var iframes = document.getElementsByTagName("iframe");
-  for (var i = 0; i < iframes.length; i++) {
-    var iframe = iframes[i];
-    var x = Dygraph.findPosX(iframe),
-        y = Dygraph.findPosY(iframe),
-        width = iframe.offsetWidth,
-        height = iframe.offsetHeight;
-
-    var div = document.createElement("div");
-    div.style.position = "absolute";
-    div.style.left = x + 'px';
-    div.style.top = y + 'px';
-    div.style.width = width + 'px';
-    div.style.height = height + 'px';
-    div.style.zIndex = 999;
-    document.body.appendChild(div);
-    this.tarps.push(div);
-  }
-};
-
-/**
- * Remove all the iframe covers. You should call this in a mouseup handler.
- */
-Dygraph.IFrameTarp.prototype.uncover = function() {
-  for (var i = 0; i < this.tarps.length; i++) {
-    this.tarps[i].parentNode.removeChild(this.tarps[i]);
-  }
-  this.tarps = [];
-};
-
-/**
- * Determine whether |data| is delimited by CR, CRLF, LF, LFCR.
- * @param {string} data
- * @return {?string} the delimiter that was detected (or null on failure).
- */
-Dygraph.detectLineDelimiter = function(data) {
-  for (var i = 0; i < data.length; i++) {
-    var code = data.charAt(i);
-    if (code === '\r') {
-      // Might actually be "\r\n".
-      if (((i + 1) < data.length) && (data.charAt(i + 1) === '\n')) {
-        return '\r\n';
-      }
-      return code;
-    }
-    if (code === '\n') {
-      // Might actually be "\n\r".
-      if (((i + 1) < data.length) && (data.charAt(i + 1) === '\r')) {
-        return '\n\r';
-      }
-      return code;
-    }
-  }
-
-  return null;
-};
-
-/**
- * Is one node contained by another?
- * @param {Node} containee The contained node.
- * @param {Node} container The container node.
- * @return {boolean} Whether containee is inside (or equal to) container.
- * @private
- */
-Dygraph.isNodeContainedBy = function(containee, container) {
-  if (container === null || containee === null) {
-    return false;
-  }
-  var containeeNode = /** @type {Node} */ (containee);
-  while (containeeNode && containeeNode !== container) {
-    containeeNode = containeeNode.parentNode;
-  }
-  return (containeeNode === container);
-};
-
-
-// This masks some numeric issues in older versions of Firefox,
-// where 1.0/Math.pow(10,2) != Math.pow(10,-2).
-/** @type {function(number,number):number} */
-Dygraph.pow = function(base, exp) {
-  if (exp < 0) {
-    return 1.0 / Math.pow(base, -exp);
-  }
-  return Math.pow(base, exp);
-};
-
-// For Dygraph.setDateSameTZ, below.
-Dygraph.dateSetters = {
-  ms: Date.prototype.setMilliseconds,
-  s: Date.prototype.setSeconds,
-  m: Date.prototype.setMinutes,
-  h: Date.prototype.setHours
-};
-
-/**
- * This is like calling d.setSeconds(), d.setMinutes(), etc, except that it
- * adjusts for time zone changes to keep the date/time parts consistent.
- *
- * For example, d.getSeconds(), d.getMinutes() and d.getHours() will all be
- * the same before/after you call setDateSameTZ(d, {ms: 0}). The same is not
- * true if you call d.setMilliseconds(0).
- *
- * @type {function(!Date, Object.)}
- */
-Dygraph.setDateSameTZ = function(d, parts) {
-  var tz = d.getTimezoneOffset();
-  for (var k in parts) {
-    if (!parts.hasOwnProperty(k)) continue;
-    var setter = Dygraph.dateSetters[k];
-    if (!setter) throw "Invalid setter: " + k;
-    setter.call(d, parts[k]);
-    if (d.getTimezoneOffset() != tz) {
-      d.setTime(d.getTime() + (tz - d.getTimezoneOffset()) * 60 * 1000);
-    }
-  }
-};
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph.js
deleted file mode 100644
index 1ee711ca2..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/dygraph.js
+++ /dev/null
@@ -1,3857 +0,0 @@
-/**
- * @license
- * Copyright 2006 Dan Vanderkam (danvdk@gmail.com)
- * MIT-licensed (http://opensource.org/licenses/MIT)
- */
-
-/**
- * @fileoverview Creates an interactive, zoomable graph based on a CSV file or
- * string. Dygraph can handle multiple series with or without error bars. The
- * date/value ranges will be automatically set. Dygraph uses the
- * <canvas> tag, so it only works in FF1.5+.
- * @author danvdk@gmail.com (Dan Vanderkam)
-
-  Usage:
-   
          
-   
-
- The CSV file is of the form
-
-   Date,SeriesA,SeriesB,SeriesC
-   YYYYMMDD,A1,B1,C1
-   YYYYMMDD,A2,B2,C2
-
- If the 'errorBars' option is set in the constructor, the input should be of
- the form
-   Date,SeriesA,SeriesB,...
-   YYYYMMDD,A1,sigmaA1,B1,sigmaB1,...
-   YYYYMMDD,A2,sigmaA2,B2,sigmaB2,...
-
- If the 'fractions' option is set, the input should be of the form:
-
-   Date,SeriesA,SeriesB,...
-   YYYYMMDD,A1/B1,A2/B2,...
-   YYYYMMDD,A1/B1,A2/B2,...
-
- And error bars will be calculated automatically using a binomial distribution.
-
- For further documentation and examples, see http://dygraphs.com/
-
- */
-
-/*jshint globalstrict: true */
-/*global DygraphLayout:false, DygraphCanvasRenderer:false, DygraphOptions:false, G_vmlCanvasManager:false */
-"use strict";
-
-/**
- * Creates an interactive, zoomable chart.
- *
- * @constructor
- * @param {div | String} div A div or the id of a div into which to construct
- * the chart.
- * @param {String | Function} file A file containing CSV data or a function
- * that returns this data. The most basic expected format for each line is
- * "YYYY/MM/DD,val1,val2,...". For more information, see
- * http://dygraphs.com/data.html.
- * @param {Object} attrs Various other attributes, e.g. errorBars determines
- * whether the input data contains error ranges. For a complete list of
- * options, see http://dygraphs.com/options.html.
- */
-var Dygraph = function(div, data, opts, opt_fourth_param) {
-  if (opt_fourth_param !== undefined) {
-    // Old versions of dygraphs took in the series labels as a constructor
-    // parameter. This doesn't make sense anymore, but it's easy to continue
-    // to support this usage.
-    this.warn("Using deprecated four-argument dygraph constructor");
-    this.__old_init__(div, data, opts, opt_fourth_param);
-  } else {
-    this.__init__(div, data, opts);
-  }
-};
-
-Dygraph.NAME = "Dygraph";
-Dygraph.VERSION = "1.2";
-Dygraph.__repr__ = function() {
-  return "[" + this.NAME + " " + this.VERSION + "]";
-};
-
-/**
- * Returns information about the Dygraph class.
- */
-Dygraph.toString = function() {
-  return this.__repr__();
-};
-
-// Various default values
-Dygraph.DEFAULT_ROLL_PERIOD = 1;
-Dygraph.DEFAULT_WIDTH = 480;
-Dygraph.DEFAULT_HEIGHT = 320;
-
-// For max 60 Hz. animation:
-Dygraph.ANIMATION_STEPS = 12;
-Dygraph.ANIMATION_DURATION = 200;
-
-// Label constants for the labelsKMB and labelsKMG2 options.
-// (i.e. '100000' -> '100K')
-Dygraph.KMB_LABELS = [ 'K', 'M', 'B', 'T', 'Q' ];
-Dygraph.KMG2_BIG_LABELS = [ 'k', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y' ];
-Dygraph.KMG2_SMALL_LABELS = [ 'm', 'u', 'n', 'p', 'f', 'a', 'z', 'y' ];
-
-// These are defined before DEFAULT_ATTRS so that it can refer to them.
-/**
- * @private
- * Return a string version of a number. This respects the digitsAfterDecimal
- * and maxNumberWidth options.
- * @param {Number} x The number to be formatted
- * @param {Dygraph} opts An options view
- * @param {String} name The name of the point's data series
- * @param {Dygraph} g The dygraph object
- */
-Dygraph.numberValueFormatter = function(x, opts, pt, g) {
-  var sigFigs = opts('sigFigs');
-
-  if (sigFigs !== null) {
-    // User has opted for a fixed number of significant figures.
-    return Dygraph.floatFormat(x, sigFigs);
-  }
-
-  var digits = opts('digitsAfterDecimal');
-  var maxNumberWidth = opts('maxNumberWidth');
-
-  var kmb = opts('labelsKMB');
-  var kmg2 = opts('labelsKMG2');
-
-  var label;
-
-  // switch to scientific notation if we underflow or overflow fixed display.
-  if (x !== 0.0 &&
-      (Math.abs(x) >= Math.pow(10, maxNumberWidth) ||
-       Math.abs(x) < Math.pow(10, -digits))) {
-    label = x.toExponential(digits);
-  } else {
-    label = '' + Dygraph.round_(x, digits);
-  }
-
-  if (kmb || kmg2) {
-    var k;
-    var k_labels = [];
-    var m_labels = [];
-    if (kmb) {
-      k = 1000;
-      k_labels = Dygraph.KMB_LABELS;
-    }
-    if (kmg2) {
-      if (kmb) Dygraph.warn("Setting both labelsKMB and labelsKMG2. Pick one!");
-      k = 1024;
-      k_labels = Dygraph.KMG2_BIG_LABELS;
-      m_labels = Dygraph.KMG2_SMALL_LABELS;
-    }
-
-    var absx = Math.abs(x);
-    var n = Dygraph.pow(k, k_labels.length);
-    for (var j = k_labels.length - 1; j >= 0; j--, n /= k) {
-      if (absx >= n) {
-        label = Dygraph.round_(x / n, digits) + k_labels[j];
-        break;
-      }
-    }
-    if (kmg2) {
-      // TODO(danvk): clean up this logic. Why so different than kmb?
-      var x_parts = String(x.toExponential()).split('e-');
-      if (x_parts.length === 2 && x_parts[1] >= 3 && x_parts[1] <= 24) {
-        if (x_parts[1] % 3 > 0) {
-          label = Dygraph.round_(x_parts[0] /
-              Dygraph.pow(10, (x_parts[1] % 3)),
-              digits);
-        } else {
-          label = Number(x_parts[0]).toFixed(2);
-        }
-        label += m_labels[Math.floor(x_parts[1] / 3) - 1];
-      }
-    }
-  }
-
-  return label;
-};
-
-/**
- * variant for use as an axisLabelFormatter.
- * @private
- */
-Dygraph.numberAxisLabelFormatter = function(x, granularity, opts, g) {
-  return Dygraph.numberValueFormatter(x, opts, g);
-};
-
-/**
- * Convert a JS date (millis since epoch) to YYYY/MM/DD
- * @param {Number} date The JavaScript date (ms since epoch)
- * @return {String} A date of the form "YYYY/MM/DD"
- * @private
- */
-Dygraph.dateString_ = function(date) {
-  var zeropad = Dygraph.zeropad;
-  var d = new Date(date);
-
-  // Get the year:
-  var year = "" + d.getFullYear();
-  // Get a 0 padded month string
-  var month = zeropad(d.getMonth() + 1);  //months are 0-offset, sigh
-  // Get a 0 padded day string
-  var day = zeropad(d.getDate());
-
-  var ret = "";
-  var frac = d.getHours() * 3600 + d.getMinutes() * 60 + d.getSeconds();
-  if (frac) ret = " " + Dygraph.hmsString_(date);
-
-  return year + "/" + month + "/" + day + ret;
-};
-
-/**
- * Convert a JS date to a string appropriate to display on an axis that
- * is displaying values at the stated granularity.
- * @param {Date} date The date to format
- * @param {Number} granularity One of the Dygraph granularity constants
- * @return {String} The formatted date
- * @private
- */
-Dygraph.dateAxisFormatter = function(date, granularity) {
-  if (granularity >= Dygraph.DECADAL) {
-    return date.strftime('%Y');
-  } else if (granularity >= Dygraph.MONTHLY) {
-    return date.strftime('%b %y');
-  } else {
-    var frac = date.getHours() * 3600 + date.getMinutes() * 60 + date.getSeconds() + date.getMilliseconds();
-    if (frac === 0 || granularity >= Dygraph.DAILY) {
-      return new Date(date.getTime() + 3600*1000).strftime('%d%b');
-    } else {
-      return Dygraph.hmsString_(date.getTime());
-    }
-  }
-};
-
-/**
- * Standard plotters. These may be used by clients.
- * Available plotters are:
- * - Dygraph.Plotters.linePlotter: draws central lines (most common)
- * - Dygraph.Plotters.errorPlotter: draws error bars
- * - Dygraph.Plotters.fillPlotter: draws fills under lines (used with fillGraph)
- *
- * By default, the plotter is [fillPlotter, errorPlotter, linePlotter].
- * This causes all the lines to be drawn over all the fills/error bars.
- */
-Dygraph.Plotters = DygraphCanvasRenderer._Plotters;
-
-
-// Default attribute values.
-Dygraph.DEFAULT_ATTRS = {
-  highlightCircleSize: 3,
-  highlightSeriesOpts: null,
-  highlightSeriesBackgroundAlpha: 0.5,
-
-  labelsDivWidth: 250,
-  labelsDivStyles: {
-    // TODO(danvk): move defaults from createStatusMessage_ here.
-  },
-  labelsSeparateLines: false,
-  labelsShowZeroValues: true,
-  labelsKMB: false,
-  labelsKMG2: false,
-  showLabelsOnHighlight: true,
-
-  digitsAfterDecimal: 2,
-  maxNumberWidth: 6,
-  sigFigs: null,
-
-  strokeWidth: 1.0,
-  strokeBorderWidth: 0,
-  strokeBorderColor: "white",
-
-  axisTickSize: 3,
-  axisLabelFontSize: 14,
-  xAxisLabelWidth: 50,
-  yAxisLabelWidth: 50,
-  rightGap: 5,
-
-  showRoller: false,
-  xValueParser: Dygraph.dateParser,
-
-  delimiter: ',',
-
-  sigma: 2.0,
-  errorBars: false,
-  fractions: false,
-  wilsonInterval: true,  // only relevant if fractions is true
-  customBars: false,
-  fillGraph: false,
-  fillAlpha: 0.15,
-  connectSeparatedPoints: false,
-
-  stackedGraph: false,
-  stackedGraphNaNFill: 'all',
-  hideOverlayOnMouseOut: true,
-
-  // TODO(danvk): support 'onmouseover' and 'never', and remove synonyms.
-  legend: 'onmouseover',  // the only relevant value at the moment is 'always'.
-
-  stepPlot: false,
-  avoidMinZero: false,
-  xRangePad: 0,
-  yRangePad: null,
-  drawAxesAtZero: false,
-
-  // Sizes of the various chart labels.
-  titleHeight: 28,
-  xLabelHeight: 18,
-  yLabelWidth: 18,
-
-  drawXAxis: true,
-  drawYAxis: true,
-  axisLineColor: "black",
-  axisLineWidth: 0.3,
-  gridLineWidth: 0.3,
-  axisLabelColor: "black",
-  axisLabelFont: "Arial",  // TODO(danvk): is this implemented?
-  axisLabelWidth: 50,
-  drawYGrid: true,
-  drawXGrid: true,
-  gridLineColor: "rgb(128,128,128)",
-
-  interactionModel: null,  // will be set to Dygraph.Interaction.defaultModel
-  animatedZooms: false,  // (for now)
-
-  // Range selector options
-  showRangeSelector: false,
-  rangeSelectorHeight: 40,
-  rangeSelectorPlotStrokeColor: "#808FAB",
-  rangeSelectorPlotFillColor: "#A7B1C4",
-
-  // The ordering here ensures that central lines always appear above any
-  // fill bars/error bars.
-  plotter: [
-    Dygraph.Plotters.fillPlotter,
-    Dygraph.Plotters.errorPlotter,
-    Dygraph.Plotters.linePlotter
-  ],
-
-  plugins: [ ],
-
-  // per-axis options
-  axes: {
-    x: {
-      pixelsPerLabel: 60,
-      axisLabelFormatter: Dygraph.dateAxisFormatter,
-      valueFormatter: Dygraph.dateString_,
-      drawGrid: true,
-      independentTicks: true,
-      ticker: null  // will be set in dygraph-tickers.js
-    },
-    y: {
-      pixelsPerLabel: 30,
-      valueFormatter: Dygraph.numberValueFormatter,
-      axisLabelFormatter: Dygraph.numberAxisLabelFormatter,
-      drawGrid: true,
-      independentTicks: true,
-      ticker: null  // will be set in dygraph-tickers.js
-    },
-    y2: {
-      pixelsPerLabel: 30,
-      valueFormatter: Dygraph.numberValueFormatter,
-      axisLabelFormatter: Dygraph.numberAxisLabelFormatter,
-      drawGrid: false,
-      independentTicks: false,
-      ticker: null  // will be set in dygraph-tickers.js
-    }
-  }
-};
-
-// Directions for panning and zooming. Use bit operations when combined
-// values are possible.
-Dygraph.HORIZONTAL = 1;
-Dygraph.VERTICAL = 2;
-
-// Installed plugins, in order of precedence (most-general to most-specific).
-// Plugins are installed after they are defined, in plugins/install.js.
-Dygraph.PLUGINS = [
-];
-
-// Used for initializing annotation CSS rules only once.
-Dygraph.addedAnnotationCSS = false;
-
-Dygraph.prototype.__old_init__ = function(div, file, labels, attrs) {
-  // Labels is no longer a constructor parameter, since it's typically set
-  // directly from the data source. It also conains a name for the x-axis,
-  // which the previous constructor form did not.
-  if (labels !== null) {
-    var new_labels = ["Date"];
-    for (var i = 0; i < labels.length; i++) new_labels.push(labels[i]);
-    Dygraph.update(attrs, { 'labels': new_labels });
-  }
-  this.__init__(div, file, attrs);
-};
-
-/**
- * Initializes the Dygraph. This creates a new DIV and constructs the PlotKit
- * and context <canvas> inside of it. See the constructor for details.
- * on the parameters.
- * @param {Element} div the Element to render the graph into.
- * @param {String | Function} file Source data
- * @param {Object} attrs Miscellaneous other options
- * @private
- */
-Dygraph.prototype.__init__ = function(div, file, attrs) {
-  // Hack for IE: if we're using excanvas and the document hasn't finished
-  // loading yet (and hence may not have initialized whatever it needs to
-  // initialize), then keep calling this routine periodically until it has.
-  if (/MSIE/.test(navigator.userAgent) && !window.opera &&
-      typeof(G_vmlCanvasManager) != 'undefined' &&
-      document.readyState != 'complete') {
-    var self = this;
-    setTimeout(function() { self.__init__(div, file, attrs); }, 100);
-    return;
-  }
-
-  // Support two-argument constructor
-  if (attrs === null || attrs === undefined) { attrs = {}; }
-
-  attrs = Dygraph.mapLegacyOptions_(attrs);
-
-  if (typeof(div) == 'string') {
-    div = document.getElementById(div);
-  }
-
-  if (!div) {
-    Dygraph.error("Constructing dygraph with a non-existent div!");
-    return;
-  }
-
-  this.isUsingExcanvas_ = typeof(G_vmlCanvasManager) != 'undefined';
-
-  // Copy the important bits into the object
-  // TODO(danvk): most of these should just stay in the attrs_ dictionary.
-  this.maindiv_ = div;
-  this.file_ = file;
-  this.rollPeriod_ = attrs.rollPeriod || Dygraph.DEFAULT_ROLL_PERIOD;
-  this.previousVerticalX_ = -1;
-  this.fractions_ = attrs.fractions || false;
-  this.dateWindow_ = attrs.dateWindow || null;
-
-  this.is_initial_draw_ = true;
-  this.annotations_ = [];
-
-  // Zoomed indicators - These indicate when the graph has been zoomed and on what axis.
-  this.zoomed_x_ = false;
-  this.zoomed_y_ = false;
-
-  // Clear the div. This ensure that, if multiple dygraphs are passed the same
-  // div, then only one will be drawn.
-  div.innerHTML = "";
-
-  // For historical reasons, the 'width' and 'height' options trump all CSS
-  // rules _except_ for an explicit 'width' or 'height' on the div.
-  // As an added convenience, if the div has zero height (like 
           does
-  // without any styles), then we use a default height/width.
-  if (div.style.width === '' && attrs.width) {
-    div.style.width = attrs.width + "px";
-  }
-  if (div.style.height === '' && attrs.height) {
-    div.style.height = attrs.height + "px";
-  }
-  if (div.style.height === '' && div.clientHeight === 0) {
-    div.style.height = Dygraph.DEFAULT_HEIGHT + "px";
-    if (div.style.width === '') {
-      div.style.width = Dygraph.DEFAULT_WIDTH + "px";
-    }
-  }
-  // These will be zero if the dygraph's div is hidden. In that case,
-  // use the user-specified attributes if present. If not, use zero
-  // and assume the user will call resize to fix things later.
-  this.width_ = div.clientWidth || attrs.width || 0;
-  this.height_ = div.clientHeight || attrs.height || 0;
-
-  // TODO(danvk): set fillGraph to be part of attrs_ here, not user_attrs_.
-  if (attrs.stackedGraph) {
-    attrs.fillGraph = true;
-    // TODO(nikhilk): Add any other stackedGraph checks here.
-  }
-
-  // DEPRECATION WARNING: All option processing should be moved from
-  // attrs_ and user_attrs_ to options_, which holds all this information.
-  //
-  // Dygraphs has many options, some of which interact with one another.
-  // To keep track of everything, we maintain two sets of options:
-  //
-  //  this.user_attrs_   only options explicitly set by the user.
-  //  this.attrs_        defaults, options derived from user_attrs_, data.
-  //
-  // Options are then accessed this.attr_('attr'), which first looks at
-  // user_attrs_ and then computed attrs_. This way Dygraphs can set intelligent
-  // defaults without overriding behavior that the user specifically asks for.
-  this.user_attrs_ = {};
-  Dygraph.update(this.user_attrs_, attrs);
-
-  // This sequence ensures that Dygraph.DEFAULT_ATTRS is never modified.
-  this.attrs_ = {};
-  Dygraph.updateDeep(this.attrs_, Dygraph.DEFAULT_ATTRS);
-
-  this.boundaryIds_ = [];
-  this.setIndexByName_ = {};
-  this.datasetIndex_ = [];
-
-  this.registeredEvents_ = [];
-  this.eventListeners_ = {};
-
-  this.attributes_ = new DygraphOptions(this);
-
-  // Create the containing DIV and other interactive elements
-  this.createInterface_();
-
-  // Activate plugins.
-  this.plugins_ = [];
-  var plugins = Dygraph.PLUGINS.concat(this.getOption('plugins'));
-  for (var i = 0; i < plugins.length; i++) {
-    var Plugin = plugins[i];
-    var pluginInstance = new Plugin();
-    var pluginDict = {
-      plugin: pluginInstance,
-      events: {},
-      options: {},
-      pluginOptions: {}
-    };
-
-    var handlers = pluginInstance.activate(this);
-    for (var eventName in handlers) {
-      // TODO(danvk): validate eventName.
-      pluginDict.events[eventName] = handlers[eventName];
-    }
-
-    this.plugins_.push(pluginDict);
-  }
-
-  // At this point, plugins can no longer register event handlers.
-  // Construct a map from event -> ordered list of [callback, plugin].
-  for (var i = 0; i < this.plugins_.length; i++) {
-    var plugin_dict = this.plugins_[i];
-    for (var eventName in plugin_dict.events) {
-      if (!plugin_dict.events.hasOwnProperty(eventName)) continue;
-      var callback = plugin_dict.events[eventName];
-
-      var pair = [plugin_dict.plugin, callback];
-      if (!(eventName in this.eventListeners_)) {
-        this.eventListeners_[eventName] = [pair];
-      } else {
-        this.eventListeners_[eventName].push(pair);
-      }
-    }
-  }
-
-  this.createDragInterface_();
-
-  this.start_();
-};
-
-/**
- * Triggers a cascade of events to the various plugins which are interested in them.
- * Returns true if the "default behavior" should be performed, i.e. if none of
- * the event listeners called event.preventDefault().
- * @private
- */
-Dygraph.prototype.cascadeEvents_ = function(name, extra_props) {
-  if (!(name in this.eventListeners_)) return true;
-
-  // QUESTION: can we use objects & prototypes to speed this up?
-  var e = {
-    dygraph: this,
-    cancelable: false,
-    defaultPrevented: false,
-    preventDefault: function() {
-      if (!e.cancelable) throw "Cannot call preventDefault on non-cancelable event.";
-      e.defaultPrevented = true;
-    },
-    propagationStopped: false,
-    stopPropagation: function() {
-      e.propagationStopped = true;
-    }
-  };
-  Dygraph.update(e, extra_props);
-
-  var callback_plugin_pairs = this.eventListeners_[name];
-  if (callback_plugin_pairs) {
-    for (var i = callback_plugin_pairs.length - 1; i >= 0; i--) {
-      var plugin = callback_plugin_pairs[i][0];
-      var callback = callback_plugin_pairs[i][1];
-      callback.call(plugin, e);
-      if (e.propagationStopped) break;
-    }
-  }
-  return e.defaultPrevented;
-};
-
-/**
- * Returns the zoomed status of the chart for one or both axes.
- *
- * Axis is an optional parameter. Can be set to 'x' or 'y'.
- *
- * The zoomed status for an axis is set whenever a user zooms using the mouse
- * or when the dateWindow or valueRange are updated (unless the
- * isZoomedIgnoreProgrammaticZoom option is also specified).
- */
-Dygraph.prototype.isZoomed = function(axis) {
-  if (axis === null || axis === undefined) {
-    return this.zoomed_x_ || this.zoomed_y_;
-  }
-  if (axis === 'x') return this.zoomed_x_;
-  if (axis === 'y') return this.zoomed_y_;
-  throw "axis parameter is [" + axis + "] must be null, 'x' or 'y'.";
-};
-
-/**
- * Returns information about the Dygraph object, including its containing ID.
- */
-Dygraph.prototype.toString = function() {
-  var maindiv = this.maindiv_;
-  var id = (maindiv && maindiv.id) ? maindiv.id : maindiv;
-  return "[Dygraph " + id + "]";
-};
-
-/**
- * @private
- * Returns the value of an option. This may be set by the user (either in the
- * constructor or by calling updateOptions) or by dygraphs, and may be set to a
- * per-series value.
- * @param { String } name The name of the option, e.g. 'rollPeriod'.
- * @param { String } [seriesName] The name of the series to which the option
- * will be applied. If no per-series value of this option is available, then
- * the global value is returned. This is optional.
- * @return { ... } The value of the option.
- */
-Dygraph.prototype.attr_ = function(name, seriesName) {
-// 
-  if (typeof(Dygraph.OPTIONS_REFERENCE) === 'undefined') {
-    this.error('Must include options reference JS for testing');
-  } else if (!Dygraph.OPTIONS_REFERENCE.hasOwnProperty(name)) {
-    this.error('Dygraphs is using property ' + name + ', which has no entry ' +
-               'in the Dygraphs.OPTIONS_REFERENCE listing.');
-    // Only log this error once.
-    Dygraph.OPTIONS_REFERENCE[name] = true;
-  }
-// 
-  return seriesName ? this.attributes_.getForSeries(name, seriesName) : this.attributes_.get(name);
-};
-
-/**
- * Returns the current value for an option, as set in the constructor or via
- * updateOptions. You may pass in an (optional) series name to get per-series
- * values for the option.
- *
- * All values returned by this method should be considered immutable. If you
- * modify them, there is no guarantee that the changes will be honored or that
- * dygraphs will remain in a consistent state. If you want to modify an option,
- * use updateOptions() instead.
- *
- * @param { String } name The name of the option (e.g. 'strokeWidth')
- * @param { String } [opt_seriesName] Series name to get per-series values.
- * @return { ... } The value of the option.
- */
-Dygraph.prototype.getOption = function(name, opt_seriesName) {
-  return this.attr_(name, opt_seriesName);
-};
-
-Dygraph.prototype.getOptionForAxis = function(name, axis) {
-  return this.attributes_.getForAxis(name, axis);
-};
-
-/**
- * @private
- * @param  String} axis The name of the axis (i.e. 'x', 'y' or 'y2')
- * @return { ... } A function mapping string -> option value
- */
-Dygraph.prototype.optionsViewForAxis_ = function(axis) {
-  var self = this;
-  return function(opt) {
-    var axis_opts = self.user_attrs_.axes;
-    if (axis_opts && axis_opts[axis] && axis_opts[axis].hasOwnProperty(opt)) {
-      return axis_opts[axis][opt];
-    }
-    // user-specified attributes always trump defaults, even if they're less
-    // specific.
-    if (typeof(self.user_attrs_[opt]) != 'undefined') {
-      return self.user_attrs_[opt];
-    }
-
-    axis_opts = self.attrs_.axes;
-    if (axis_opts && axis_opts[axis] && axis_opts[axis].hasOwnProperty(opt)) {
-      return axis_opts[axis][opt];
-    }
-    // check old-style axis options
-    // TODO(danvk): add a deprecation warning if either of these match.
-    if (axis == 'y' && self.axes_[0].hasOwnProperty(opt)) {
-      return self.axes_[0][opt];
-    } else if (axis == 'y2' && self.axes_[1].hasOwnProperty(opt)) {
-      return self.axes_[1][opt];
-    }
-    return self.attr_(opt);
-  };
-};
-
-/**
- * Returns the current rolling period, as set by the user or an option.
- * @return {Number} The number of points in the rolling window
- */
-Dygraph.prototype.rollPeriod = function() {
-  return this.rollPeriod_;
-};
-
-/**
- * Returns the currently-visible x-range. This can be affected by zooming,
- * panning or a call to updateOptions.
- * Returns a two-element array: [left, right].
- * If the Dygraph has dates on the x-axis, these will be millis since epoch.
- */
-Dygraph.prototype.xAxisRange = function() {
-  return this.dateWindow_ ? this.dateWindow_ : this.xAxisExtremes();
-};
-
-/**
- * Returns the lower- and upper-bound x-axis values of the
- * data set.
- */
-Dygraph.prototype.xAxisExtremes = function() {
-  var pad = this.attr_('xRangePad') / this.plotter_.area.w;
-  if (this.numRows() === 0) {
-    return [0 - pad, 1 + pad];
-  }
-  var left = this.rawData_[0][0];
-  var right = this.rawData_[this.rawData_.length - 1][0];
-  if (pad) {
-    // Must keep this in sync with dygraph-layout _evaluateLimits()
-    var range = right - left;
-    left -= range * pad;
-    right += range * pad;
-  }
-  return [left, right];
-};
-
-/**
- * Returns the currently-visible y-range for an axis. This can be affected by
- * zooming, panning or a call to updateOptions. Axis indices are zero-based. If
- * called with no arguments, returns the range of the first axis.
- * Returns a two-element array: [bottom, top].
- */
-Dygraph.prototype.yAxisRange = function(idx) {
-  if (typeof(idx) == "undefined") idx = 0;
-  if (idx < 0 || idx >= this.axes_.length) {
-    return null;
-  }
-  var axis = this.axes_[idx];
-  return [ axis.computedValueRange[0], axis.computedValueRange[1] ];
-};
-
-/**
- * Returns the currently-visible y-ranges for each axis. This can be affected by
- * zooming, panning, calls to updateOptions, etc.
- * Returns an array of [bottom, top] pairs, one for each y-axis.
- */
-Dygraph.prototype.yAxisRanges = function() {
-  var ret = [];
-  for (var i = 0; i < this.axes_.length; i++) {
-    ret.push(this.yAxisRange(i));
-  }
-  return ret;
-};
-
-// TODO(danvk): use these functions throughout dygraphs.
-/**
- * Convert from data coordinates to canvas/div X/Y coordinates.
- * If specified, do this conversion for the coordinate system of a particular
- * axis. Uses the first axis by default.
- * Returns a two-element array: [X, Y]
- *
- * Note: use toDomXCoord instead of toDomCoords(x, null) and use toDomYCoord
- * instead of toDomCoords(null, y, axis).
- */
-Dygraph.prototype.toDomCoords = function(x, y, axis) {
-  return [ this.toDomXCoord(x), this.toDomYCoord(y, axis) ];
-};
-
-/**
- * Convert from data x coordinates to canvas/div X coordinate.
- * If specified, do this conversion for the coordinate system of a particular
- * axis.
- * Returns a single value or null if x is null.
- */
-Dygraph.prototype.toDomXCoord = function(x) {
-  if (x === null) {
-    return null;
-  }
-
-  var area = this.plotter_.area;
-  var xRange = this.xAxisRange();
-  return area.x + (x - xRange[0]) / (xRange[1] - xRange[0]) * area.w;
-};
-
-/**
- * Convert from data x coordinates to canvas/div Y coordinate and optional
- * axis. Uses the first axis by default.
- *
- * returns a single value or null if y is null.
- */
-Dygraph.prototype.toDomYCoord = function(y, axis) {
-  var pct = this.toPercentYCoord(y, axis);
-
-  if (pct === null) {
-    return null;
-  }
-  var area = this.plotter_.area;
-  return area.y + pct * area.h;
-};
-
-/**
- * Convert from canvas/div coords to data coordinates.
- * If specified, do this conversion for the coordinate system of a particular
- * axis. Uses the first axis by default.
- * Returns a two-element array: [X, Y].
- *
- * Note: use toDataXCoord instead of toDataCoords(x, null) and use toDataYCoord
- * instead of toDataCoords(null, y, axis).
- */
-Dygraph.prototype.toDataCoords = function(x, y, axis) {
-  return [ this.toDataXCoord(x), this.toDataYCoord(y, axis) ];
-};
-
-/**
- * Convert from canvas/div x coordinate to data coordinate.
- *
- * If x is null, this returns null.
- */
-Dygraph.prototype.toDataXCoord = function(x) {
-  if (x === null) {
-    return null;
-  }
-
-  var area = this.plotter_.area;
-  var xRange = this.xAxisRange();
-  return xRange[0] + (x - area.x) / area.w * (xRange[1] - xRange[0]);
-};
-
-/**
- * Convert from canvas/div y coord to value.
- *
- * If y is null, this returns null.
- * if axis is null, this uses the first axis.
- */
-Dygraph.prototype.toDataYCoord = function(y, axis) {
-  if (y === null) {
-    return null;
-  }
-
-  var area = this.plotter_.area;
-  var yRange = this.yAxisRange(axis);
-
-  if (typeof(axis) == "undefined") axis = 0;
-  if (!this.axes_[axis].logscale) {
-    return yRange[0] + (area.y + area.h - y) / area.h * (yRange[1] - yRange[0]);
-  } else {
-    // Computing the inverse of toDomCoord.
-    var pct = (y - area.y) / area.h;
-
-    // Computing the inverse of toPercentYCoord. The function was arrived at with
-    // the following steps:
-    //
-    // Original calcuation:
-    // pct = (logr1 - Dygraph.log10(y)) / (logr1 - Dygraph.log10(yRange[0]));
-    //
-    // Move denominator to both sides:
-    // pct * (logr1 - Dygraph.log10(yRange[0])) = logr1 - Dygraph.log10(y);
-    //
-    // subtract logr1, and take the negative value.
-    // logr1 - (pct * (logr1 - Dygraph.log10(yRange[0]))) = Dygraph.log10(y);
-    //
-    // Swap both sides of the equation, and we can compute the log of the
-    // return value. Which means we just need to use that as the exponent in
-    // e^exponent.
-    // Dygraph.log10(y) = logr1 - (pct * (logr1 - Dygraph.log10(yRange[0])));
-
-    var logr1 = Dygraph.log10(yRange[1]);
-    var exponent = logr1 - (pct * (logr1 - Dygraph.log10(yRange[0])));
-    var value = Math.pow(Dygraph.LOG_SCALE, exponent);
-    return value;
-  }
-};
-
-/**
- * Converts a y for an axis to a percentage from the top to the
- * bottom of the drawing area.
- *
- * If the coordinate represents a value visible on the canvas, then
- * the value will be between 0 and 1, where 0 is the top of the canvas.
- * However, this method will return values outside the range, as
- * values can fall outside the canvas.
- *
- * If y is null, this returns null.
- * if axis is null, this uses the first axis.
- *
- * @param { Number } y The data y-coordinate.
- * @param { Number } [axis] The axis number on which the data coordinate lives.
- * @return { Number } A fraction in [0, 1] where 0 = the top edge.
- */
-Dygraph.prototype.toPercentYCoord = function(y, axis) {
-  if (y === null) {
-    return null;
-  }
-  if (typeof(axis) == "undefined") axis = 0;
-
-  var yRange = this.yAxisRange(axis);
-
-  var pct;
-  var logscale = this.attributes_.getForAxis("logscale", axis);
-  if (!logscale) {
-    // yRange[1] - y is unit distance from the bottom.
-    // yRange[1] - yRange[0] is the scale of the range.
-    // (yRange[1] - y) / (yRange[1] - yRange[0]) is the % from the bottom.
-    pct = (yRange[1] - y) / (yRange[1] - yRange[0]);
-  } else {
-    var logr1 = Dygraph.log10(yRange[1]);
-    pct = (logr1 - Dygraph.log10(y)) / (logr1 - Dygraph.log10(yRange[0]));
-  }
-  return pct;
-};
-
-/**
- * Converts an x value to a percentage from the left to the right of
- * the drawing area.
- *
- * If the coordinate represents a value visible on the canvas, then
- * the value will be between 0 and 1, where 0 is the left of the canvas.
- * However, this method will return values outside the range, as
- * values can fall outside the canvas.
- *
- * If x is null, this returns null.
- * @param { Number } x The data x-coordinate.
- * @return { Number } A fraction in [0, 1] where 0 = the left edge.
- */
-Dygraph.prototype.toPercentXCoord = function(x) {
-  if (x === null) {
-    return null;
-  }
-
-  var xRange = this.xAxisRange();
-  return (x - xRange[0]) / (xRange[1] - xRange[0]);
-};
-
-/**
- * Returns the number of columns (including the independent variable).
- * @return { Integer } The number of columns.
- */
-Dygraph.prototype.numColumns = function() {
-  if (!this.rawData_) return 0;
-  return this.rawData_[0] ? this.rawData_[0].length : this.attr_("labels").length;
-};
-
-/**
- * Returns the number of rows (excluding any header/label row).
- * @return { Integer } The number of rows, less any header.
- */
-Dygraph.prototype.numRows = function() {
-  if (!this.rawData_) return 0;
-  return this.rawData_.length;
-};
-
-/**
- * Returns the value in the given row and column. If the row and column exceed
- * the bounds on the data, returns null. Also returns null if the value is
- * missing.
- * @param { Number} row The row number of the data (0-based). Row 0 is the
- * first row of data, not a header row.
- * @param { Number} col The column number of the data (0-based)
- * @return { Number } The value in the specified cell or null if the row/col
- * were out of range.
- */
-Dygraph.prototype.getValue = function(row, col) {
-  if (row < 0 || row > this.rawData_.length) return null;
-  if (col < 0 || col > this.rawData_[row].length) return null;
-
-  return this.rawData_[row][col];
-};
-
-/**
- * Generates interface elements for the Dygraph: a containing div, a div to
- * display the current point, and a textbox to adjust the rolling average
- * period. Also creates the Renderer/Layout elements.
- * @private
- */
-Dygraph.prototype.createInterface_ = function() {
-  // Create the all-enclosing graph div
-  var enclosing = this.maindiv_;
-
-  this.graphDiv = document.createElement("div");
-
-  // TODO(danvk): any other styles that are useful to set here?
-  this.graphDiv.style.textAlign = 'left';  // This is a CSS "reset"
-  enclosing.appendChild(this.graphDiv);
-
-  // Create the canvas for interactive parts of the chart.
-  this.canvas_ = Dygraph.createCanvas();
-  this.canvas_.style.position = "absolute";
-
-  // ... and for static parts of the chart.
-  this.hidden_ = this.createPlotKitCanvas_(this.canvas_);
-
-  this.resizeElements_();
-
-  this.canvas_ctx_ = Dygraph.getContext(this.canvas_);
-  this.hidden_ctx_ = Dygraph.getContext(this.hidden_);
-
-  // The interactive parts of the graph are drawn on top of the chart.
-  this.graphDiv.appendChild(this.hidden_);
-  this.graphDiv.appendChild(this.canvas_);
-  this.mouseEventElement_ = this.createMouseEventElement_();
-
-  // Create the grapher
-  this.layout_ = new DygraphLayout(this);
-
-  var dygraph = this;
-
-  this.mouseMoveHandler_ = function(e) {
-    dygraph.mouseMove_(e);
-  };
-
-  this.mouseOutHandler_ = function(e) {
-    // The mouse has left the chart if:
-    // 1. e.target is inside the chart
-    // 2. e.relatedTarget is outside the chart
-    var target = e.target || e.fromElement;
-    var relatedTarget = e.relatedTarget || e.toElement;
-    if (Dygraph.isNodeContainedBy(target, dygraph.graphDiv) &&
-        !Dygraph.isNodeContainedBy(relatedTarget, dygraph.graphDiv)) {
-      dygraph.mouseOut_(e);
-    }
-  };
-
-  this.addAndTrackEvent(window, 'mouseout', this.mouseOutHandler_);
-  this.addAndTrackEvent(this.mouseEventElement_, 'mousemove', this.mouseMoveHandler_);
-
-  // Don't recreate and register the resize handler on subsequent calls.
-  // This happens when the graph is resized.
-  if (!this.resizeHandler_) {
-    this.resizeHandler_ = function(e) {
-      dygraph.resize();
-    };
-
-    // Update when the window is resized.
-    // TODO(danvk): drop frames depending on complexity of the chart.
-    this.addAndTrackEvent(window, 'resize', this.resizeHandler_);
-  }
-};
-
-Dygraph.prototype.resizeElements_ = function() {
-  this.graphDiv.style.width = this.width_ + "px";
-  this.graphDiv.style.height = this.height_ + "px";
-  this.canvas_.width = this.width_;
-  this.canvas_.height = this.height_;
-  this.canvas_.style.width = this.width_ + "px";    // for IE
-  this.canvas_.style.height = this.height_ + "px";  // for IE
-  this.hidden_.width = this.width_;
-  this.hidden_.height = this.height_;
-  this.hidden_.style.width = this.width_ + "px";    // for IE
-  this.hidden_.style.height = this.height_ + "px";  // for IE
-};
-
-/**
- * Detach DOM elements in the dygraph and null out all data references.
- * Calling this when you're done with a dygraph can dramatically reduce memory
- * usage. See, e.g., the tests/perf.html example.
- */
-Dygraph.prototype.destroy = function() {
-  this.canvas_ctx_.restore();
-  this.hidden_ctx_.restore();
-
-  var removeRecursive = function(node) {
-    while (node.hasChildNodes()) {
-      removeRecursive(node.firstChild);
-      node.removeChild(node.firstChild);
-    }
-  };
-
-  this.removeTrackedEvents_();
-
-  // remove mouse event handlers (This may not be necessary anymore)
-  Dygraph.removeEvent(window, 'mouseout', this.mouseOutHandler_);
-  Dygraph.removeEvent(this.mouseEventElement_, 'mousemove', this.mouseMoveHandler_);
-
-  // remove window handlers
-  Dygraph.removeEvent(window,'resize',this.resizeHandler_);
-  this.resizeHandler_ = null;
-
-  removeRecursive(this.maindiv_);
-
-  var nullOut = function(obj) {
-    for (var n in obj) {
-      if (typeof(obj[n]) === 'object') {
-        obj[n] = null;
-      }
-    }
-  };
-  // These may not all be necessary, but it can't hurt...
-  nullOut(this.layout_);
-  nullOut(this.plotter_);
-  nullOut(this);
-};
-
-/**
- * Creates the canvas on which the chart will be drawn. Only the Renderer ever
- * draws on this particular canvas. All Dygraph work (i.e. drawing hover dots
- * or the zoom rectangles) is done on this.canvas_.
- * @param {Object} canvas The Dygraph canvas over which to overlay the plot
- * @return {Object} The newly-created canvas
- * @private
- */
-Dygraph.prototype.createPlotKitCanvas_ = function(canvas) {
-  var h = Dygraph.createCanvas();
-  h.style.position = "absolute";
-  // TODO(danvk): h should be offset from canvas. canvas needs to include
-  // some extra area to make it easier to zoom in on the far left and far
-  // right. h needs to be precisely the plot area, so that clipping occurs.
-  h.style.top = canvas.style.top;
-  h.style.left = canvas.style.left;
-  h.width = this.width_;
-  h.height = this.height_;
-  h.style.width = this.width_ + "px";    // for IE
-  h.style.height = this.height_ + "px";  // for IE
-  return h;
-};
-
-/**
- * Creates an overlay element used to handle mouse events.
- * @return {Object} The mouse event element.
- * @private
- */
-Dygraph.prototype.createMouseEventElement_ = function() {
-  if (this.isUsingExcanvas_) {
-    var elem = document.createElement("div");
-    elem.style.position = 'absolute';
-    elem.style.backgroundColor = 'white';
-    elem.style.filter = 'alpha(opacity=0)';
-    elem.style.width = this.width_ + "px";
-    elem.style.height = this.height_ + "px";
-    this.graphDiv.appendChild(elem);
-    return elem;
-  } else {
-    return this.canvas_;
-  }
-};
-
-/**
- * Generate a set of distinct colors for the data series. This is done with a
- * color wheel. Saturation/Value are customizable, and the hue is
- * equally-spaced around the color wheel. If a custom set of colors is
- * specified, that is used instead.
- * @private
- */
-Dygraph.prototype.setColors_ = function() {
-  var labels = this.getLabels();
-  var num = labels.length - 1;
-  this.colors_ = [];
-  this.colorsMap_ = {};
-  var colors = this.attr_('colors');
-  var i;
-  if (!colors) {
-    var sat = this.attr_('colorSaturation') || 1.0;
-    var val = this.attr_('colorValue') || 0.5;
-    var half = Math.ceil(num / 2);
-    for (i = 1; i <= num; i++) {
-      if (!this.visibility()[i-1]) continue;
-      // alternate colors for high contrast.
-      var idx = i % 2 ? Math.ceil(i / 2) : (half + i / 2);
-      var hue = (1.0 * idx/ (1 + num));
-      var colorStr = Dygraph.hsvToRGB(hue, sat, val);
-      this.colors_.push(colorStr);
-      this.colorsMap_[labels[i]] = colorStr;
-    }
-  } else {
-    for (i = 0; i < num; i++) {
-      if (!this.visibility()[i]) continue;
-      var colorStr = colors[i % colors.length];
-      this.colors_.push(colorStr);
-      this.colorsMap_[labels[1 + i]] = colorStr;
-    }
-  }
-};
-
-/**
- * Return the list of colors. This is either the list of colors passed in the
- * attributes or the autogenerated list of rgb(r,g,b) strings.
- * This does not return colors for invisible series.
- * @return {Array} The list of colors.
- */
-Dygraph.prototype.getColors = function() {
-  return this.colors_;
-};
-
-/**
- * Returns a few attributes of a series, i.e. its color, its visibility, which
- * axis it's assigned to, and its column in the original data.
- * Returns null if the series does not exist.
- * Otherwise, returns an object with column, visibility, color and axis properties.
- * The "axis" property will be set to 1 for y1 and 2 for y2.
- * The "column" property can be fed back into getValue(row, column) to get
- * values for this series.
- */
-Dygraph.prototype.getPropertiesForSeries = function(series_name) {
-  var idx = -1;
-  var labels = this.getLabels();
-  for (var i = 1; i < labels.length; i++) {
-    if (labels[i] == series_name) {
-      idx = i;
-      break;
-    }
-  }
-  if (idx == -1) return null;
-
-  return {
-    name: series_name,
-    column: idx,
-    visible: this.visibility()[idx - 1],
-    color: this.colorsMap_[series_name],
-    axis: 1 + this.attributes_.axisForSeries(series_name)
-  };
-};
-
-/**
- * Create the text box to adjust the averaging period
- * @private
- */
-Dygraph.prototype.createRollInterface_ = function() {
-  // Create a roller if one doesn't exist already.
-  if (!this.roller_) {
-    this.roller_ = document.createElement("input");
-    this.roller_.type = "text";
-    this.roller_.style.display = "none";
-    this.graphDiv.appendChild(this.roller_);
-  }
-
-  var display = this.attr_('showRoller') ? 'block' : 'none';
-
-  var area = this.plotter_.area;
-  var textAttr = { "position": "absolute",
-                   "zIndex": 10,
-                   "top": (area.y + area.h - 25) + "px",
-                   "left": (area.x + 1) + "px",
-                   "display": display
-                  };
-  this.roller_.size = "2";
-  this.roller_.value = this.rollPeriod_;
-  for (var name in textAttr) {
-    if (textAttr.hasOwnProperty(name)) {
-      this.roller_.style[name] = textAttr[name];
-    }
-  }
-
-  var dygraph = this;
-  this.roller_.onchange = function() { dygraph.adjustRoll(dygraph.roller_.value); };
-};
-
-/**
- * @private
- * Converts page the x-coordinate of the event to pixel x-coordinates on the
- * canvas (i.e. DOM Coords).
- */
-Dygraph.prototype.dragGetX_ = function(e, context) {
-  return Dygraph.pageX(e) - context.px;
-};
-
-/**
- * @private
- * Converts page the y-coordinate of the event to pixel y-coordinates on the
- * canvas (i.e. DOM Coords).
- */
-Dygraph.prototype.dragGetY_ = function(e, context) {
-  return Dygraph.pageY(e) - context.py;
-};
-
-/**
- * Set up all the mouse handlers needed to capture dragging behavior for zoom
- * events.
- * @private
- */
-Dygraph.prototype.createDragInterface_ = function() {
-  var context = {
-    // Tracks whether the mouse is down right now
-    isZooming: false,
-    isPanning: false,  // is this drag part of a pan?
-    is2DPan: false,    // if so, is that pan 1- or 2-dimensional?
-    dragStartX: null, // pixel coordinates
-    dragStartY: null, // pixel coordinates
-    dragEndX: null, // pixel coordinates
-    dragEndY: null, // pixel coordinates
-    dragDirection: null,
-    prevEndX: null, // pixel coordinates
-    prevEndY: null, // pixel coordinates
-    prevDragDirection: null,
-    cancelNextDblclick: false,  // see comment in dygraph-interaction-model.js
-
-    // The value on the left side of the graph when a pan operation starts.
-    initialLeftmostDate: null,
-
-    // The number of units each pixel spans. (This won't be valid for log
-    // scales)
-    xUnitsPerPixel: null,
-
-    // TODO(danvk): update this comment
-    // The range in second/value units that the viewport encompasses during a
-    // panning operation.
-    dateRange: null,
-
-    // Top-left corner of the canvas, in DOM coords
-    // TODO(konigsberg): Rename topLeftCanvasX, topLeftCanvasY.
-    px: 0,
-    py: 0,
-
-    // Values for use with panEdgeFraction, which limit how far outside the
-    // graph's data boundaries it can be panned.
-    boundedDates: null, // [minDate, maxDate]
-    boundedValues: null, // [[minValue, maxValue] ...]
-
-    // We cover iframes during mouse interactions. See comments in
-    // dygraph-utils.js for more info on why this is a good idea.
-    tarp: new Dygraph.IFrameTarp(),
-
-    // contextB is the same thing as this context object but renamed.
-    initializeMouseDown: function(event, g, contextB) {
-      // prevents mouse drags from selecting page text.
-      if (event.preventDefault) {
-        event.preventDefault();  // Firefox, Chrome, etc.
-      } else {
-        event.returnValue = false;  // IE
-        event.cancelBubble = true;
-      }
-
-      contextB.px = Dygraph.findPosX(g.canvas_);
-      contextB.py = Dygraph.findPosY(g.canvas_);
-      contextB.dragStartX = g.dragGetX_(event, contextB);
-      contextB.dragStartY = g.dragGetY_(event, contextB);
-      contextB.cancelNextDblclick = false;
-      contextB.tarp.cover();
-    }
-  };
-
-  var interactionModel = this.attr_("interactionModel");
-
-  // Self is the graph.
-  var self = this;
-
-  // Function that binds the graph and context to the handler.
-  var bindHandler = function(handler) {
-    return function(event) {
-      handler(event, self, context);
-    };
-  };
-
-  for (var eventName in interactionModel) {
-    if (!interactionModel.hasOwnProperty(eventName)) continue;
-    this.addAndTrackEvent(this.mouseEventElement_, eventName,
-        bindHandler(interactionModel[eventName]));
-  }
-
-  // If the user releases the mouse button during a drag, but not over the
-  // canvas, then it doesn't count as a zooming action.
-  var mouseUpHandler = function(event) {
-    if (context.isZooming || context.isPanning) {
-      context.isZooming = false;
-      context.dragStartX = null;
-      context.dragStartY = null;
-    }
-
-    if (context.isPanning) {
-      context.isPanning = false;
-      context.draggingDate = null;
-      context.dateRange = null;
-      for (var i = 0; i < self.axes_.length; i++) {
-        delete self.axes_[i].draggingValue;
-        delete self.axes_[i].dragValueRange;
-      }
-    }
-
-    context.tarp.uncover();
-  };
-
-  this.addAndTrackEvent(document, 'mouseup', mouseUpHandler);
-};
-
-/**
- * Draw a gray zoom rectangle over the desired area of the canvas. Also clears
- * up any previous zoom rectangles that were drawn. This could be optimized to
- * avoid extra redrawing, but it's tricky to avoid interactions with the status
- * dots.
- *
- * @param {Number} direction the direction of the zoom rectangle. Acceptable
- * values are Dygraph.HORIZONTAL and Dygraph.VERTICAL.
- * @param {Number} startX The X position where the drag started, in canvas
- * coordinates.
- * @param {Number} endX The current X position of the drag, in canvas coords.
- * @param {Number} startY The Y position where the drag started, in canvas
- * coordinates.
- * @param {Number} endY The current Y position of the drag, in canvas coords.
- * @param {Number} prevDirection the value of direction on the previous call to
- * this function. Used to avoid excess redrawing
- * @param {Number} prevEndX The value of endX on the previous call to this
- * function. Used to avoid excess redrawing
- * @param {Number} prevEndY The value of endY on the previous call to this
- * function. Used to avoid excess redrawing
- * @private
- */
-Dygraph.prototype.drawZoomRect_ = function(direction, startX, endX, startY,
-                                           endY, prevDirection, prevEndX,
-                                           prevEndY) {
-  var ctx = this.canvas_ctx_;
-
-  // Clean up from the previous rect if necessary
-  if (prevDirection == Dygraph.HORIZONTAL) {
-    ctx.clearRect(Math.min(startX, prevEndX), this.layout_.getPlotArea().y,
-                  Math.abs(startX - prevEndX), this.layout_.getPlotArea().h);
-  } else if (prevDirection == Dygraph.VERTICAL) {
-    ctx.clearRect(this.layout_.getPlotArea().x, Math.min(startY, prevEndY),
-                  this.layout_.getPlotArea().w, Math.abs(startY - prevEndY));
-  }
-
-  // Draw a light-grey rectangle to show the new viewing area
-  if (direction == Dygraph.HORIZONTAL) {
-    if (endX && startX) {
-      ctx.fillStyle = "rgba(128,128,128,0.33)";
-      ctx.fillRect(Math.min(startX, endX), this.layout_.getPlotArea().y,
-                   Math.abs(endX - startX), this.layout_.getPlotArea().h);
-    }
-  } else if (direction == Dygraph.VERTICAL) {
-    if (endY && startY) {
-      ctx.fillStyle = "rgba(128,128,128,0.33)";
-      ctx.fillRect(this.layout_.getPlotArea().x, Math.min(startY, endY),
-                   this.layout_.getPlotArea().w, Math.abs(endY - startY));
-    }
-  }
-
-  if (this.isUsingExcanvas_) {
-    this.currentZoomRectArgs_ = [direction, startX, endX, startY, endY, 0, 0, 0];
-  }
-};
-
-/**
- * Clear the zoom rectangle (and perform no zoom).
- * @private
- */
-Dygraph.prototype.clearZoomRect_ = function() {
-  this.currentZoomRectArgs_ = null;
-  this.canvas_ctx_.clearRect(0, 0, this.canvas_.width, this.canvas_.height);
-};
-
-/**
- * Zoom to something containing [lowX, highX]. These are pixel coordinates in
- * the canvas. The exact zoom window may be slightly larger if there are no data
- * points near lowX or highX. Don't confuse this function with doZoomXDates,
- * which accepts dates that match the raw data. This function redraws the graph.
- *
- * @param {Number} lowX The leftmost pixel value that should be visible.
- * @param {Number} highX The rightmost pixel value that should be visible.
- * @private
- */
-Dygraph.prototype.doZoomX_ = function(lowX, highX) {
-  this.currentZoomRectArgs_ = null;
-  // Find the earliest and latest dates contained in this canvasx range.
-  // Convert the call to date ranges of the raw data.
-  var minDate = this.toDataXCoord(lowX);
-  var maxDate = this.toDataXCoord(highX);
-  this.doZoomXDates_(minDate, maxDate);
-};
-
-/**
- * Transition function to use in animations. Returns values between 0.0
- * (totally old values) and 1.0 (totally new values) for each frame.
- * @private
- */
-Dygraph.zoomAnimationFunction = function(frame, numFrames) {
-  var k = 1.5;
-  return (1.0 - Math.pow(k, -frame)) / (1.0 - Math.pow(k, -numFrames));
-};
-
-/**
- * Zoom to something containing [minDate, maxDate] values. Don't confuse this
- * method with doZoomX which accepts pixel coordinates. This function redraws
- * the graph.
- *
- * @param {Number} minDate The minimum date that should be visible.
- * @param {Number} maxDate The maximum date that should be visible.
- * @private
- */
-Dygraph.prototype.doZoomXDates_ = function(minDate, maxDate) {
-  // TODO(danvk): when yAxisRange is null (i.e. "fit to data", the animation
-  // can produce strange effects. Rather than the y-axis transitioning slowly
-  // between values, it can jerk around.)
-  var old_window = this.xAxisRange();
-  var new_window = [minDate, maxDate];
-  this.zoomed_x_ = true;
-  var that = this;
-  this.doAnimatedZoom(old_window, new_window, null, null, function() {
-    if (that.attr_("zoomCallback")) {
-      that.attr_("zoomCallback")(minDate, maxDate, that.yAxisRanges());
-    }
-  });
-};
-
-/**
- * Zoom to something containing [lowY, highY]. These are pixel coordinates in
- * the canvas. This function redraws the graph.
- *
- * @param {Number} lowY The topmost pixel value that should be visible.
- * @param {Number} highY The lowest pixel value that should be visible.
- * @private
- */
-Dygraph.prototype.doZoomY_ = function(lowY, highY) {
-  this.currentZoomRectArgs_ = null;
-  // Find the highest and lowest values in pixel range for each axis.
-  // Note that lowY (in pixels) corresponds to the max Value (in data coords).
-  // This is because pixels increase as you go down on the screen, whereas data
-  // coordinates increase as you go up the screen.
-  var oldValueRanges = this.yAxisRanges();
-  var newValueRanges = [];
-  for (var i = 0; i < this.axes_.length; i++) {
-    var hi = this.toDataYCoord(lowY, i);
-    var low = this.toDataYCoord(highY, i);
-    newValueRanges.push([low, hi]);
-  }
-
-  this.zoomed_y_ = true;
-  var that = this;
-  this.doAnimatedZoom(null, null, oldValueRanges, newValueRanges, function() {
-    if (that.attr_("zoomCallback")) {
-      var xRange = that.xAxisRange();
-      that.attr_("zoomCallback")(xRange[0], xRange[1], that.yAxisRanges());
-    }
-  });
-};
-
-/**
- * Reset the zoom to the original view coordinates. This is the same as
- * double-clicking on the graph.
- */
-Dygraph.prototype.resetZoom = function() {
-  var dirty = false, dirtyX = false, dirtyY = false;
-  if (this.dateWindow_ !== null) {
-    dirty = true;
-    dirtyX = true;
-  }
-
-  for (var i = 0; i < this.axes_.length; i++) {
-    if (typeof(this.axes_[i].valueWindow) !== 'undefined' && this.axes_[i].valueWindow !== null) {
-      dirty = true;
-      dirtyY = true;
-    }
-  }
-
-  // Clear any selection, since it's likely to be drawn in the wrong place.
-  this.clearSelection();
-
-  if (dirty) {
-    this.zoomed_x_ = false;
-    this.zoomed_y_ = false;
-
-    var minDate = this.rawData_[0][0];
-    var maxDate = this.rawData_[this.rawData_.length - 1][0];
-
-    // With only one frame, don't bother calculating extreme ranges.
-    // TODO(danvk): merge this block w/ the code below.
-    if (!this.attr_("animatedZooms")) {
-      this.dateWindow_ = null;
-      for (i = 0; i < this.axes_.length; i++) {
-        if (this.axes_[i].valueWindow !== null) {
-          delete this.axes_[i].valueWindow;
-        }
-      }
-      this.drawGraph_();
-      if (this.attr_("zoomCallback")) {
-        this.attr_("zoomCallback")(minDate, maxDate, this.yAxisRanges());
-      }
-      return;
-    }
-
-    var oldWindow=null, newWindow=null, oldValueRanges=null, newValueRanges=null;
-    if (dirtyX) {
-      oldWindow = this.xAxisRange();
-      newWindow = [minDate, maxDate];
-    }
-
-    if (dirtyY) {
-      oldValueRanges = this.yAxisRanges();
-      // TODO(danvk): this is pretty inefficient
-      var packed = this.gatherDatasets_(this.rolledSeries_, null);
-      var extremes = packed.extremes;
-
-      // this has the side-effect of modifying this.axes_.
-      // this doesn't make much sense in this context, but it's convenient (we
-      // need this.axes_[*].extremeValues) and not harmful since we'll be
-      // calling drawGraph_ shortly, which clobbers these values.
-      this.computeYAxisRanges_(extremes);
-
-      newValueRanges = [];
-      for (i = 0; i < this.axes_.length; i++) {
-        var axis = this.axes_[i];
-        newValueRanges.push((axis.valueRange !== null &&
-                             axis.valueRange !== undefined) ?
-                            axis.valueRange : axis.extremeRange);
-      }
-    }
-
-    var that = this;
-    this.doAnimatedZoom(oldWindow, newWindow, oldValueRanges, newValueRanges,
-        function() {
-          that.dateWindow_ = null;
-          for (var i = 0; i < that.axes_.length; i++) {
-            if (that.axes_[i].valueWindow !== null) {
-              delete that.axes_[i].valueWindow;
-            }
-          }
-          if (that.attr_("zoomCallback")) {
-            that.attr_("zoomCallback")(minDate, maxDate, that.yAxisRanges());
-          }
-        });
-  }
-};
-
-/**
- * Combined animation logic for all zoom functions.
- * either the x parameters or y parameters may be null.
- * @private
- */
-Dygraph.prototype.doAnimatedZoom = function(oldXRange, newXRange, oldYRanges, newYRanges, callback) {
-  var steps = this.attr_("animatedZooms") ? Dygraph.ANIMATION_STEPS : 1;
-
-  var windows = [];
-  var valueRanges = [];
-  var step, frac;
-
-  if (oldXRange !== null && newXRange !== null) {
-    for (step = 1; step <= steps; step++) {
-      frac = Dygraph.zoomAnimationFunction(step, steps);
-      windows[step-1] = [oldXRange[0]*(1-frac) + frac*newXRange[0],
-                         oldXRange[1]*(1-frac) + frac*newXRange[1]];
-    }
-  }
-
-  if (oldYRanges !== null && newYRanges !== null) {
-    for (step = 1; step <= steps; step++) {
-      frac = Dygraph.zoomAnimationFunction(step, steps);
-      var thisRange = [];
-      for (var j = 0; j < this.axes_.length; j++) {
-        thisRange.push([oldYRanges[j][0]*(1-frac) + frac*newYRanges[j][0],
-                        oldYRanges[j][1]*(1-frac) + frac*newYRanges[j][1]]);
-      }
-      valueRanges[step-1] = thisRange;
-    }
-  }
-
-  var that = this;
-  Dygraph.repeatAndCleanup(function(step) {
-    if (valueRanges.length) {
-      for (var i = 0; i < that.axes_.length; i++) {
-        var w = valueRanges[step][i];
-        that.axes_[i].valueWindow = [w[0], w[1]];
-      }
-    }
-    if (windows.length) {
-      that.dateWindow_ = windows[step];
-    }
-    that.drawGraph_();
-  }, steps, Dygraph.ANIMATION_DURATION / steps, callback);
-};
-
-/**
- * Get the current graph's area object.
- *
- * Returns: {x, y, w, h}
- */
-Dygraph.prototype.getArea = function() {
-  return this.plotter_.area;
-};
-
-/**
- * Convert a mouse event to DOM coordinates relative to the graph origin.
- *
- * Returns a two-element array: [X, Y].
- */
-Dygraph.prototype.eventToDomCoords = function(event) {
-  if (event.offsetX && event.offsetY) {
-    return [ event.offsetX, event.offsetY ];
-  } else {
-    var canvasx = Dygraph.pageX(event) - Dygraph.findPosX(this.mouseEventElement_);
-    var canvasy = Dygraph.pageY(event) - Dygraph.findPosY(this.mouseEventElement_);
-    return [canvasx, canvasy];
-  }
-};
-
-/**
- * Given a canvas X coordinate, find the closest row.
- * @param {Number} domX graph-relative DOM X coordinate
- * Returns: row number, integer
- * @private
- */
-Dygraph.prototype.findClosestRow = function(domX) {
-  var minDistX = Infinity;
-  var closestRow = -1;
-  var sets = this.layout_.points;
-  for (var i = 0; i < sets.length; i++) {
-    var points = sets[i];
-    var len = points.length;
-    for (var j = 0; j < len; j++) {
-      var point = points[j];
-      if (!Dygraph.isValidPoint(point, true)) continue;
-      var dist = Math.abs(point.canvasx - domX);
-      if (dist < minDistX) {
-        minDistX = dist;
-        closestRow = point.idx;
-      }
-    }
-  }
-
-  return closestRow;
-};
-
-/**
- * Given canvas X,Y coordinates, find the closest point.
- *
- * This finds the individual data point across all visible series
- * that's closest to the supplied DOM coordinates using the standard
- * Euclidean X,Y distance.
- *
- * @param {Number} domX graph-relative DOM X coordinate
- * @param {Number} domY graph-relative DOM Y coordinate
- * Returns: {row, seriesName, point}
- * @private
- */
-Dygraph.prototype.findClosestPoint = function(domX, domY) {
-  var minDist = Infinity;
-  var dist, dx, dy, point, closestPoint, closestSeries, closestRow;
-  for ( var setIdx = this.layout_.points.length - 1 ; setIdx >= 0 ; --setIdx ) {
-    var points = this.layout_.points[setIdx];
-    for (var i = 0; i < points.length; ++i) {
-      point = points[i];
-      if (!Dygraph.isValidPoint(point)) continue;
-      dx = point.canvasx - domX;
-      dy = point.canvasy - domY;
-      dist = dx * dx + dy * dy;
-      if (dist < minDist) {
-        minDist = dist;
-        closestPoint = point;
-        closestSeries = setIdx;
-        closestRow = point.idx;
-      }
-    }
-  }
-  var name = this.layout_.setNames[closestSeries];
-  return {
-    row: closestRow,
-    seriesName: name,
-    point: closestPoint
-  };
-};
-
-/**
- * Given canvas X,Y coordinates, find the touched area in a stacked graph.
- *
- * This first finds the X data point closest to the supplied DOM X coordinate,
- * then finds the series which puts the Y coordinate on top of its filled area,
- * using linear interpolation between adjacent point pairs.
- *
- * @param {Number} domX graph-relative DOM X coordinate
- * @param {Number} domY graph-relative DOM Y coordinate
- * Returns: {row, seriesName, point}
- * @private
- */
-Dygraph.prototype.findStackedPoint = function(domX, domY) {
-  var row = this.findClosestRow(domX);
-  var closestPoint, closestSeries;
-  for (var setIdx = 0; setIdx < this.layout_.points.length; ++setIdx) {
-    var boundary = this.getLeftBoundary_(setIdx);
-    var rowIdx = row - boundary;
-    var points = this.layout_.points[setIdx];
-    if (rowIdx >= points.length) continue;
-    var p1 = points[rowIdx];
-    if (!Dygraph.isValidPoint(p1)) continue;
-    var py = p1.canvasy;
-    if (domX > p1.canvasx && rowIdx + 1 < points.length) {
-      // interpolate series Y value using next point
-      var p2 = points[rowIdx + 1];
-      if (Dygraph.isValidPoint(p2)) {
-        var dx = p2.canvasx - p1.canvasx;
-        if (dx > 0) {
-          var r = (domX - p1.canvasx) / dx;
-          py += r * (p2.canvasy - p1.canvasy);
-        }
-      }
-    } else if (domX < p1.canvasx && rowIdx > 0) {
-      // interpolate series Y value using previous point
-      var p0 = points[rowIdx - 1];
-      if (Dygraph.isValidPoint(p0)) {
-        var dx = p1.canvasx - p0.canvasx;
-        if (dx > 0) {
-          var r = (p1.canvasx - domX) / dx;
-          py += r * (p0.canvasy - p1.canvasy);
-        }
-      }
-    }
-    // Stop if the point (domX, py) is above this series' upper edge
-    if (setIdx === 0 || py < domY) {
-      closestPoint = p1;
-      closestSeries = setIdx;
-    }
-  }
-  var name = this.layout_.setNames[closestSeries];
-  return {
-    row: row,
-    seriesName: name,
-    point: closestPoint
-  };
-};
-
-/**
- * When the mouse moves in the canvas, display information about a nearby data
- * point and draw dots over those points in the data series. This function
- * takes care of cleanup of previously-drawn dots.
- * @param {Object} event The mousemove event from the browser.
- * @private
- */
-Dygraph.prototype.mouseMove_ = function(event) {
-  // This prevents JS errors when mousing over the canvas before data loads.
-  var points = this.layout_.points;
-  if (points === undefined || points === null) return;
-
-  var canvasCoords = this.eventToDomCoords(event);
-  var canvasx = canvasCoords[0];
-  var canvasy = canvasCoords[1];
-
-  var highlightSeriesOpts = this.attr_("highlightSeriesOpts");
-  var selectionChanged = false;
-  if (highlightSeriesOpts && !this.isSeriesLocked()) {
-    var closest;
-    if (this.attr_("stackedGraph")) {
-      closest = this.findStackedPoint(canvasx, canvasy);
-    } else {
-      closest = this.findClosestPoint(canvasx, canvasy);
-    }
-    selectionChanged = this.setSelection(closest.row, closest.seriesName);
-  } else {
-    var idx = this.findClosestRow(canvasx);
-    selectionChanged = this.setSelection(idx);
-  }
-
-  var callback = this.attr_("highlightCallback");
-  if (callback && selectionChanged) {
-    callback(event,
-        this.lastx_,
-        this.selPoints_,
-        this.lastRow_,
-        this.highlightSet_);
-  }
-};
-
-/**
- * Fetch left offset from the specified set index or if not passed, the 
- * first defined boundaryIds record (see bug #236).
- * @private
- */
-Dygraph.prototype.getLeftBoundary_ = function(setIdx) {
-  if (this.boundaryIds_[setIdx]) {
-      return this.boundaryIds_[setIdx][0];
-  } else {
-    for (var i = 0; i < this.boundaryIds_.length; i++) {
-      if (this.boundaryIds_[i] !== undefined) {
-        return this.boundaryIds_[i][0];
-      }
-    }
-    return 0;
-  }
-};
-
-Dygraph.prototype.animateSelection_ = function(direction) {
-  var totalSteps = 10;
-  var millis = 30;
-  if (this.fadeLevel === undefined) this.fadeLevel = 0;
-  if (this.animateId === undefined) this.animateId = 0;
-  var start = this.fadeLevel;
-  var steps = direction < 0 ? start : totalSteps - start;
-  if (steps <= 0) {
-    if (this.fadeLevel) {
-      this.updateSelection_(1.0);
-    }
-    return;
-  }
-
-  var thisId = ++this.animateId;
-  var that = this;
-  Dygraph.repeatAndCleanup(
-    function(n) {
-      // ignore simultaneous animations
-      if (that.animateId != thisId) return;
-
-      that.fadeLevel += direction;
-      if (that.fadeLevel === 0) {
-        that.clearSelection();
-      } else {
-        that.updateSelection_(that.fadeLevel / totalSteps);
-      }
-    },
-    steps, millis, function() {});
-};
-
-/**
- * Draw dots over the selectied points in the data series. This function
- * takes care of cleanup of previously-drawn dots.
- * @private
- */
-Dygraph.prototype.updateSelection_ = function(opt_animFraction) {
-  /*var defaultPrevented = */
-  this.cascadeEvents_('select', {
-    selectedX: this.lastx_,
-    selectedPoints: this.selPoints_
-  });
-  // TODO(danvk): use defaultPrevented here?
-
-  // Clear the previously drawn vertical, if there is one
-  var i;
-  var ctx = this.canvas_ctx_;
-  if (this.attr_('highlightSeriesOpts')) {
-    ctx.clearRect(0, 0, this.width_, this.height_);
-    var alpha = 1.0 - this.attr_('highlightSeriesBackgroundAlpha');
-    if (alpha) {
-      // Activating background fade includes an animation effect for a gradual
-      // fade. TODO(klausw): make this independently configurable if it causes
-      // issues? Use a shared preference to control animations?
-      var animateBackgroundFade = true;
-      if (animateBackgroundFade) {
-        if (opt_animFraction === undefined) {
-          // start a new animation
-          this.animateSelection_(1);
-          return;
-        }
-        alpha *= opt_animFraction;
-      }
-      ctx.fillStyle = 'rgba(255,255,255,' + alpha + ')';
-      ctx.fillRect(0, 0, this.width_, this.height_);
-    }
-
-    // Redraw only the highlighted series in the interactive canvas (not the
-    // static plot canvas, which is where series are usually drawn).
-    this.plotter_._renderLineChart(this.highlightSet_, ctx);
-  } else if (this.previousVerticalX_ >= 0) {
-    // Determine the maximum highlight circle size.
-    var maxCircleSize = 0;
-    var labels = this.attr_('labels');
-    for (i = 1; i < labels.length; i++) {
-      var r = this.attr_('highlightCircleSize', labels[i]);
-      if (r > maxCircleSize) maxCircleSize = r;
-    }
-    var px = this.previousVerticalX_;
-    ctx.clearRect(px - maxCircleSize - 1, 0,
-                  2 * maxCircleSize + 2, this.height_);
-  }
-
-  if (this.isUsingExcanvas_ && this.currentZoomRectArgs_) {
-    Dygraph.prototype.drawZoomRect_.apply(this, this.currentZoomRectArgs_);
-  }
-
-  if (this.selPoints_.length > 0) {
-    // Draw colored circles over the center of each selected point
-    var canvasx = this.selPoints_[0].canvasx;
-    ctx.save();
-    for (i = 0; i < this.selPoints_.length; i++) {
-      var pt = this.selPoints_[i];
-      if (!Dygraph.isOK(pt.canvasy)) continue;
-
-      var circleSize = this.attr_('highlightCircleSize', pt.name);
-      var callback = this.attr_("drawHighlightPointCallback", pt.name);
-      var color = this.plotter_.colors[pt.name];
-      if (!callback) {
-        callback = Dygraph.Circles.DEFAULT;
-      }
-      ctx.lineWidth = this.attr_('strokeWidth', pt.name);
-      ctx.strokeStyle = color;
-      ctx.fillStyle = color;
-      callback(this.g, pt.name, ctx, canvasx, pt.canvasy,
-          color, circleSize, pt.idx);
-    }
-    ctx.restore();
-
-    this.previousVerticalX_ = canvasx;
-  }
-};
-
-/**
- * Manually set the selected points and display information about them in the
- * legend. The selection can be cleared using clearSelection() and queried
- * using getSelection().
- * @param { Integer } row number that should be highlighted (i.e. appear with
- * hover dots on the chart). Set to false to clear any selection.
- * @param { seriesName } optional series name to highlight that series with the
- * the highlightSeriesOpts setting.
- * @param { locked } optional If true, keep seriesName selected when mousing
- * over the graph, disabling closest-series highlighting. Call clearSelection()
- * to unlock it.
- */
-Dygraph.prototype.setSelection = function(row, opt_seriesName, opt_locked) {
-  // Extract the points we've selected
-  this.selPoints_ = [];
-
-  var changed = false;
-  if (row !== false && row >= 0) {
-    if (row != this.lastRow_) changed = true;
-    this.lastRow_ = row;
-    for (var setIdx = 0; setIdx < this.layout_.points.length; ++setIdx) {
-      var points = this.layout_.points[setIdx];
-      var setRow = row - this.getLeftBoundary_(setIdx);
-      if (setRow < points.length) {
-        var point = points[setRow];
-        if (point.yval !== null) this.selPoints_.push(point);
-      }
-    }
-  } else {
-    if (this.lastRow_ >= 0) changed = true;
-    this.lastRow_ = -1;
-  }
-
-  if (this.selPoints_.length) {
-    this.lastx_ = this.selPoints_[0].xval;
-  } else {
-    this.lastx_ = -1;
-  }
-
-  if (opt_seriesName !== undefined) {
-    if (this.highlightSet_ !== opt_seriesName) changed = true;
-    this.highlightSet_ = opt_seriesName;
-  }
-
-  if (opt_locked !== undefined) {
-    this.lockedSet_ = opt_locked;
-  }
-
-  if (changed) {
-    this.updateSelection_(undefined);
-  }
-  return changed;
-};
-
-/**
- * The mouse has left the canvas. Clear out whatever artifacts remain
- * @param {Object} event the mouseout event from the browser.
- * @private
- */
-Dygraph.prototype.mouseOut_ = function(event) {
-  if (this.attr_("unhighlightCallback")) {
-    this.attr_("unhighlightCallback")(event);
-  }
-
-  if (this.attr_("hideOverlayOnMouseOut") && !this.lockedSet_) {
-    this.clearSelection();
-  }
-};
-
-/**
- * Clears the current selection (i.e. points that were highlighted by moving
- * the mouse over the chart).
- */
-Dygraph.prototype.clearSelection = function() {
-  this.cascadeEvents_('deselect', {});
-
-  this.lockedSet_ = false;
-  // Get rid of the overlay data
-  if (this.fadeLevel) {
-    this.animateSelection_(-1);
-    return;
-  }
-  this.canvas_ctx_.clearRect(0, 0, this.width_, this.height_);
-  this.fadeLevel = 0;
-  this.selPoints_ = [];
-  this.lastx_ = -1;
-  this.lastRow_ = -1;
-  this.highlightSet_ = null;
-};
-
-/**
- * Returns the number of the currently selected row. To get data for this row,
- * you can use the getValue method.
- * @return { Integer } row number, or -1 if nothing is selected
- */
-Dygraph.prototype.getSelection = function() {
-  if (!this.selPoints_ || this.selPoints_.length < 1) {
-    return -1;
-  }
-
-  for (var setIdx = 0; setIdx < this.layout_.points.length; setIdx++) {
-    var points = this.layout_.points[setIdx];
-    for (var row = 0; row < points.length; row++) {
-      if (points[row].x == this.selPoints_[0].x) {
-        return points[row].idx;
-      }
-    }
-  }
-  return -1;
-};
-
-/**
- * Returns the name of the currently-highlighted series.
- * Only available when the highlightSeriesOpts option is in use.
- */
-Dygraph.prototype.getHighlightSeries = function() {
-  return this.highlightSet_;
-};
-
-/**
- * Returns true if the currently-highlighted series was locked
- * via setSelection(..., seriesName, true).
- */
-Dygraph.prototype.isSeriesLocked = function() {
-  return this.lockedSet_;
-};
-
-/**
- * Fires when there's data available to be graphed.
- * @param {String} data Raw CSV data to be plotted
- * @private
- */
-Dygraph.prototype.loadedEvent_ = function(data) {
-  this.rawData_ = this.parseCSV_(data);
-  this.predraw_();
-};
-
-/**
- * Add ticks on the x-axis representing years, months, quarters, weeks, or days
- * @private
- */
-Dygraph.prototype.addXTicks_ = function() {
-  // Determine the correct ticks scale on the x-axis: quarterly, monthly, ...
-  var range;
-  if (this.dateWindow_) {
-    range = [this.dateWindow_[0], this.dateWindow_[1]];
-  } else {
-    range = this.xAxisExtremes();
-  }
-
-  var xAxisOptionsView = this.optionsViewForAxis_('x');
-  var xTicks = xAxisOptionsView('ticker')(
-      range[0],
-      range[1],
-      this.width_,  // TODO(danvk): should be area.width
-      xAxisOptionsView,
-      this);
-  // var msg = 'ticker(' + range[0] + ', ' + range[1] + ', ' + this.width_ + ', ' + this.attr_('pixelsPerXLabel') + ') -> ' + JSON.stringify(xTicks);
-  // console.log(msg);
-  this.layout_.setXTicks(xTicks);
-};
-
-/**
- * @private
- * Computes the range of the data series (including confidence intervals).
- * @param { [Array] } series either [ [x1, y1], [x2, y2], ... ] or
- * [ [x1, [y1, dev_low, dev_high]], [x2, [y2, dev_low, dev_high]], ...
- * @return [low, high]
- */
-Dygraph.prototype.extremeValues_ = function(series) {
-  var minY = null, maxY = null, j, y;
-
-  var bars = this.attr_("errorBars") || this.attr_("customBars");
-  if (bars) {
-    // With custom bars, maxY is the max of the high values.
-    for (j = 0; j < series.length; j++) {
-      y = series[j][1][0];
-      if (y === null || isNaN(y)) continue;
-      var low = y - series[j][1][1];
-      var high = y + series[j][1][2];
-      if (low > y) low = y;    // this can happen with custom bars,
-      if (high < y) high = y;  // e.g. in tests/custom-bars.html
-      if (maxY === null || high > maxY) {
-        maxY = high;
-      }
-      if (minY === null || low < minY) {
-        minY = low;
-      }
-    }
-  } else {
-    for (j = 0; j < series.length; j++) {
-      y = series[j][1];
-      if (y === null || isNaN(y)) continue;
-      if (maxY === null || y > maxY) {
-        maxY = y;
-      }
-      if (minY === null || y < minY) {
-        minY = y;
-      }
-    }
-  }
-
-  return [minY, maxY];
-};
-
-/**
- * @private
- * This function is called once when the chart's data is changed or the options
- * dictionary is updated. It is _not_ called when the user pans or zooms. The
- * idea is that values derived from the chart's data can be computed here,
- * rather than every time the chart is drawn. This includes things like the
- * number of axes, rolling averages, etc.
- */
-Dygraph.prototype.predraw_ = function() {
-  var start = new Date();
-
-  this.layout_.computePlotArea();
-
-  // TODO(danvk): move more computations out of drawGraph_ and into here.
-  this.computeYAxes_();
-
-  // Create a new plotter.
-  if (this.plotter_) {
-    this.cascadeEvents_('clearChart');
-    this.plotter_.clear();
-  }
-
-  if (!this.is_initial_draw_) {
-    this.canvas_ctx_.restore();
-    this.hidden_ctx_.restore();
-  }
-
-  this.canvas_ctx_.save();
-  this.hidden_ctx_.save();
-
-  this.plotter_ = new DygraphCanvasRenderer(this,
-                                            this.hidden_,
-                                            this.hidden_ctx_,
-                                            this.layout_);
-
-  // The roller sits in the bottom left corner of the chart. We don't know where
-  // this will be until the options are available, so it's positioned here.
-  this.createRollInterface_();
-
-  this.cascadeEvents_('predraw');
-
-  // Convert the raw data (a 2D array) into the internal format and compute
-  // rolling averages.
-  this.rolledSeries_ = [null];  // x-axis is the first series and it's special
-  for (var i = 1; i < this.numColumns(); i++) {
-    // var logScale = this.attr_('logscale', i); // TODO(klausw): this looks wrong // konigsberg thinks so too.
-    var logScale = this.attr_('logscale');
-    var series = this.extractSeries_(this.rawData_, i, logScale);
-    series = this.rollingAverage(series, this.rollPeriod_);
-    this.rolledSeries_.push(series);
-  }
-
-  // If the data or options have changed, then we'd better redraw.
-  this.drawGraph_();
-
-  // This is used to determine whether to do various animations.
-  var end = new Date();
-  this.drawingTimeMs_ = (end - start);
-};
-
-/**
- * Point structure.
- *
- * xval_* and yval_* are the original unscaled data values,
- * while x_* and y_* are scaled to the range (0.0-1.0) for plotting.
- * yval_stacked is the cumulative Y value used for stacking graphs,
- * and bottom/top/minus/plus are used for error bar graphs.
- *
- * @typedef {{
- *     idx: number,
- *     name: string,
- *     x: ?number,
- *     xval: ?number,
- *     y_bottom: ?number,
- *     y: ?number,
- *     y_stacked: ?number,
- *     y_top: ?number,
- *     yval_minus: ?number,
- *     yval: ?number,
- *     yval_plus: ?number,
- *     yval_stacked
- * }}
- */
-Dygraph.PointType = undefined;
-
-// TODO(bhs): these loops are a hot-spot for high-point-count charts. In fact,
-// on chrome+linux, they are 6 times more expensive than iterating through the
-// points and drawing the lines. The brunt of the cost comes from allocating
-// the |point| structures.
-/**
- * Converts a series to a Point array.
- *
- * @param {Array.)>} series Array where
- *     series[row] = [x,y] or [x, [y, err]] or [x, [y, yplus, yminus]].
- * @param {boolean} bars True if error bars or custom bars are being drawn.
- * @param {string} setName Name of the series.
- * @param {number} boundaryIdStart Index offset of the first point, equal to
- *     the number of skipped points left of the date window minimum (if any).
- * @return {Array.} List of points for this series.
- */
-Dygraph.seriesToPoints_ = function(series, bars, setName, boundaryIdStart) {
-  var points = [];
-  for (var i = 0; i < series.length; ++i) {
-    var item = series[i];
-    var yraw = bars ? item[1][0] : item[1];
-    var yval = yraw === null ? null : DygraphLayout.parseFloat_(yraw);
-    var point = {
-      x: NaN,
-      y: NaN,
-      xval: DygraphLayout.parseFloat_(item[0]),
-      yval: yval,
-      name: setName,  // TODO(danvk): is this really necessary?
-      idx: i + boundaryIdStart
-    };
-
-    if (bars) {
-      point.y_top = NaN;
-      point.y_bottom = NaN;
-      point.yval_minus = DygraphLayout.parseFloat_(item[1][1]);
-      point.yval_plus = DygraphLayout.parseFloat_(item[1][2]);
-    }
-    points.push(point);
-  }
-  return points;
-};
-
-
-/**
- * Calculates point stacking for stackedGraph=true.
- *
- * For stacking purposes, interpolate or extend neighboring data across
- * NaN values based on stackedGraphNaNFill settings. This is for display
- * only, the underlying data value as shown in the legend remains NaN.
- *
- * @param {Array.} points Point array for a single series.
- *     Updates each Point's yval_stacked property.
- * @param {Array.} cumulativeYval Accumulated top-of-graph stacked Y
- *     values for the series seen so far. Index is the row number. Updated
- *     based on the current series's values.
- * @param {Array.} seriesExtremes Min and max values, updated
- *     to reflect the stacked values.
- * @param {string} fillMethod Interpolation method, one of 'all', 'inside', or
- *     'none'.
- */
-Dygraph.stackPoints_ = function(
-    points, cumulativeYval, seriesExtremes, fillMethod) {
-  var lastXval = null;
-  var prevPoint = null;
-  var nextPoint = null;
-  var nextPointIdx = -1;
-
-  // Find the next stackable point starting from the given index.
-  var updateNextPoint = function(idx) {
-    // If we've previously found a non-NaN point and haven't gone past it yet,
-    // just use that.
-    if (nextPointIdx >= idx) return;
-
-    // We haven't found a non-NaN point yet or have moved past it,
-    // look towards the right to find a non-NaN point.
-    for (var j = idx; j < points.length; ++j) {
-      // Clear out a previously-found point (if any) since it's no longer
-      // valid, we shouldn't use it for interpolation anymore.
-      nextPoint = null;
-      if (!isNaN(points[j].yval) && points[j].yval !== null) {
-        nextPointIdx = j;
-        nextPoint = points[j];
-        break;
-      }
-    }
-  };
-
-  for (var i = 0; i < points.length; ++i) {
-    var point = points[i];
-    var xval = point.xval;
-    if (cumulativeYval[xval] === undefined) {
-      cumulativeYval[xval] = 0;
-    }
-
-    var actualYval = point.yval;
-    if (isNaN(actualYval) || actualYval === null) {
-      // Interpolate/extend for stacking purposes if possible.
-      updateNextPoint(i);
-      if (prevPoint && nextPoint && fillMethod != 'none') {
-        // Use linear interpolation between prevPoint and nextPoint.
-        actualYval = prevPoint.yval + (nextPoint.yval - prevPoint.yval) *
-            ((xval - prevPoint.xval) / (nextPoint.xval - prevPoint.xval));
-      } else if (prevPoint && fillMethod == 'all') {
-        actualYval = prevPoint.yval;
-      } else if (nextPoint && fillMethod == 'all') {
-        actualYval = nextPoint.yval;
-      } else {
-        actualYval = 0;
-      }
-    } else {
-      prevPoint = point;
-    }
-
-    var stackedYval = cumulativeYval[xval];
-    if (lastXval != xval) {
-      // If an x-value is repeated, we ignore the duplicates.
-      stackedYval += actualYval;
-      cumulativeYval[xval] = stackedYval;
-    }
-    lastXval = xval;
-
-    point.yval_stacked = stackedYval;
-
-    if (stackedYval > seriesExtremes[1]) {
-      seriesExtremes[1] = stackedYval;
-    }
-    if (stackedYval < seriesExtremes[0]) {
-      seriesExtremes[0] = stackedYval;
-    }
-  }
-};
-
-
-/**
- * Loop over all fields and create datasets, calculating extreme y-values for
- * each series and extreme x-indices as we go.
- *
- * dateWindow is passed in as an explicit parameter so that we can compute
- * extreme values "speculatively", i.e. without actually setting state on the
- * dygraph.
- *
- * @param {Array.)>>} rolledSeries, where
- *     rolledSeries[seriesIndex][row] = raw point, where
- *     seriesIndex is the column number starting with 1, and
- *     rawPoint is [x,y] or [x, [y, err]] or [x, [y, yminus, yplus]].
- * @param {?Array.} dateWindow [xmin, xmax] pair, or null.
- * @return {{
- *     points: Array.>,
- *     seriesExtremes: Array.>,
- *     boundaryIds: Array.}}
- * @private
- */
-Dygraph.prototype.gatherDatasets_ = function(rolledSeries, dateWindow) {
-  var boundaryIds = [];
-  var points = [];
-  var cumulativeYval = [];  // For stacked series.
-  var extremes = {};  // series name -> [low, high]
-  var i, k;
-  var errorBars = this.attr_("errorBars");
-  var customBars = this.attr_("customBars");
-  var bars = errorBars || customBars;
-  var isValueNull = function(sample) {
-    if (!bars) {
-      return sample[1] === null;
-    } else {
-      return customBars ? sample[1][1] === null : 
-        errorBars ? sample[1][0] === null : false;
-    }
-  };
-
-  // Loop over the fields (series).  Go from the last to the first,
-  // because if they're stacked that's how we accumulate the values.
-  var num_series = rolledSeries.length - 1;
-  var series;
-  for (i = num_series; i >= 1; i--) {
-    if (!this.visibility()[i - 1]) continue;
-
-    // Prune down to the desired range, if necessary (for zooming)
-    // Because there can be lines going to points outside of the visible area,
-    // we actually prune to visible points, plus one on either side.
-    if (dateWindow) {
-      series = rolledSeries[i];
-      var low = dateWindow[0];
-      var high = dateWindow[1];
-
-      // TODO(danvk): do binary search instead of linear search.
-      // TODO(danvk): pass firstIdx and lastIdx directly to the renderer.
-      var firstIdx = null, lastIdx = null;
-      for (k = 0; k < series.length; k++) {
-        if (series[k][0] >= low && firstIdx === null) {
-          firstIdx = k;
-        }
-        if (series[k][0] <= high) {
-          lastIdx = k;
-        }
-      }
-
-      if (firstIdx === null) firstIdx = 0;
-      var correctedFirstIdx = firstIdx;
-      var isInvalidValue = true;
-      while (isInvalidValue && correctedFirstIdx > 0) {
-        correctedFirstIdx--;
-        isInvalidValue = isValueNull(series[correctedFirstIdx]);
-      }
-
-      if (lastIdx === null) lastIdx = series.length - 1;
-      var correctedLastIdx = lastIdx;
-      isInvalidValue = true;
-      while (isInvalidValue && correctedLastIdx < series.length - 1) {
-        correctedLastIdx++;
-        isInvalidValue = isValueNull(series[correctedLastIdx]);
-      }
-
-
-      if (correctedFirstIdx!==firstIdx) {
-        firstIdx = correctedFirstIdx;
-      }
-      if (correctedLastIdx !== lastIdx) {
-        lastIdx = correctedLastIdx;
-      }
-      
-      boundaryIds[i-1] = [firstIdx, lastIdx];
-      
-      // .slice's end is exclusive, we want to include lastIdx.
-      series = series.slice(firstIdx, lastIdx + 1);
-    } else {
-      series = rolledSeries[i];
-      boundaryIds[i-1] = [0, series.length-1];
-    }
-
-    var seriesName = this.attr_("labels")[i];
-    var seriesExtremes = this.extremeValues_(series);
-
-    var seriesPoints = Dygraph.seriesToPoints_(
-        series, bars, seriesName, boundaryIds[i-1][0]);
-
-    if (this.attr_("stackedGraph")) {
-      Dygraph.stackPoints_(seriesPoints, cumulativeYval, seriesExtremes,
-                           this.attr_("stackedGraphNaNFill"));
-    }
-
-    extremes[seriesName] = seriesExtremes;
-    points[i] = seriesPoints;
-  }
-
-  return { points: points, extremes: extremes, boundaryIds: boundaryIds };
-};
-
-/**
- * Update the graph with new data. This method is called when the viewing area
- * has changed. If the underlying data or options have changed, predraw_ will
- * be called before drawGraph_ is called.
- *
- * @private
- */
-Dygraph.prototype.drawGraph_ = function() {
-  var start = new Date();
-
-  // This is used to set the second parameter to drawCallback, below.
-  var is_initial_draw = this.is_initial_draw_;
-  this.is_initial_draw_ = false;
-
-  this.layout_.removeAllDatasets();
-  this.setColors_();
-  this.attrs_.pointSize = 0.5 * this.attr_('highlightCircleSize');
-
-  var packed = this.gatherDatasets_(this.rolledSeries_, this.dateWindow_);
-  var points = packed.points;
-  var extremes = packed.extremes;
-  this.boundaryIds_ = packed.boundaryIds;
-
-  this.setIndexByName_ = {};
-  var labels = this.attr_("labels");
-  if (labels.length > 0) {
-    this.setIndexByName_[labels[0]] = 0;
-  }
-  var dataIdx = 0;
-  for (var i = 1; i < points.length; i++) {
-    this.setIndexByName_[labels[i]] = i;
-    if (!this.visibility()[i - 1]) continue;
-    this.layout_.addDataset(labels[i], points[i]);
-    this.datasetIndex_[i] = dataIdx++;
-  }
-
-  this.computeYAxisRanges_(extremes);
-  this.layout_.setYAxes(this.axes_);
-
-  this.addXTicks_();
-
-  // Save the X axis zoomed status as the updateOptions call will tend to set it erroneously
-  var tmp_zoomed_x = this.zoomed_x_;
-  // Tell PlotKit to use this new data and render itself
-  this.zoomed_x_ = tmp_zoomed_x;
-  this.layout_.evaluate();
-  this.renderGraph_(is_initial_draw);
-
-  if (this.attr_("timingName")) {
-    var end = new Date();
-    Dygraph.info(this.attr_("timingName") + " - drawGraph: " + (end - start) + "ms");
-  }
-};
-
-/**
- * This does the work of drawing the chart. It assumes that the layout and axis
- * scales have already been set (e.g. by predraw_).
- *
- * @private
- */
-Dygraph.prototype.renderGraph_ = function(is_initial_draw) {
-  this.cascadeEvents_('clearChart');
-  this.plotter_.clear();
-
-  if (this.attr_('underlayCallback')) {
-    // NOTE: we pass the dygraph object to this callback twice to avoid breaking
-    // users who expect a deprecated form of this callback.
-    this.attr_('underlayCallback')(
-        this.hidden_ctx_, this.layout_.getPlotArea(), this, this);
-  }
-
-  var e = {
-    canvas: this.hidden_,
-    drawingContext: this.hidden_ctx_
-  };
-  this.cascadeEvents_('willDrawChart', e);
-  this.plotter_.render();
-  this.cascadeEvents_('didDrawChart', e);
-  this.lastRow_ = -1;  // because plugins/legend.js clears the legend
-
-  // TODO(danvk): is this a performance bottleneck when panning?
-  // The interaction canvas should already be empty in that situation.
-  this.canvas_.getContext('2d').clearRect(0, 0, this.canvas_.width,
-                                          this.canvas_.height);
-
-  if (this.attr_("drawCallback") !== null) {
-    this.attr_("drawCallback")(this, is_initial_draw);
-  }
-};
-
-/**
- * @private
- * Determine properties of the y-axes which are independent of the data
- * currently being displayed. This includes things like the number of axes and
- * the style of the axes. It does not include the range of each axis and its
- * tick marks.
- * This fills in this.axes_.
- * axes_ = [ { options } ]
- *   indices are into the axes_ array.
- */
-Dygraph.prototype.computeYAxes_ = function() {
-  // Preserve valueWindow settings if they exist, and if the user hasn't
-  // specified a new valueRange.
-  var valueWindows, axis, index, opts, v;
-  if (this.axes_ !== undefined && this.user_attrs_.hasOwnProperty("valueRange") === false) {
-    valueWindows = [];
-    for (index = 0; index < this.axes_.length; index++) {
-      valueWindows.push(this.axes_[index].valueWindow);
-    }
-  }
-
-  // this.axes_ doesn't match this.attributes_.axes_.options. It's used for
-  // data computation as well as options storage.
-  // Go through once and add all the axes.
-  this.axes_ = [];
-
-  for (axis = 0; axis < this.attributes_.numAxes(); axis++) {
-    // Add a new axis, making a copy of its per-axis options.
-    opts = { g : this };
-    Dygraph.update(opts, this.attributes_.axisOptions(axis));
-    this.axes_[axis] = opts;
-  }
-
-
-  // Copy global valueRange option over to the first axis.
-  // NOTE(konigsberg): Are these two statements necessary?
-  // I tried removing it. The automated tests pass, and manually
-  // messing with tests/zoom.html showed no trouble.
-  v = this.attr_('valueRange');
-  if (v) this.axes_[0].valueRange = v;
-
-  if (valueWindows !== undefined) {
-    // Restore valueWindow settings.
-
-    // When going from two axes back to one, we only restore
-    // one axis.
-    var idxCount = Math.min(valueWindows.length, this.axes_.length);
-
-    for (index = 0; index < idxCount; index++) {
-      this.axes_[index].valueWindow = valueWindows[index];
-    }
-  }
-
-  for (axis = 0; axis < this.axes_.length; axis++) {
-    if (axis === 0) {
-      opts = this.optionsViewForAxis_('y' + (axis ? '2' : ''));
-      v = opts("valueRange");
-      if (v) this.axes_[axis].valueRange = v;
-    } else {  // To keep old behavior
-      var axes = this.user_attrs_.axes;
-      if (axes && axes.y2) {
-        v = axes.y2.valueRange;
-        if (v) this.axes_[axis].valueRange = v;
-      }
-    }
-  }
-};
-
-/**
- * Returns the number of y-axes on the chart.
- * @return {Number} the number of axes.
- */
-Dygraph.prototype.numAxes = function() {
-  return this.attributes_.numAxes();
-};
-
-/**
- * @private
- * Returns axis properties for the given series.
- * @param { String } setName The name of the series for which to get axis
- * properties, e.g. 'Y1'.
- * @return { Object } The axis properties.
- */
-Dygraph.prototype.axisPropertiesForSeries = function(series) {
-  // TODO(danvk): handle errors.
-  return this.axes_[this.attributes_.axisForSeries(series)];
-};
-
-/**
- * @private
- * Determine the value range and tick marks for each axis.
- * @param {Object} extremes A mapping from seriesName -> [low, high]
- * This fills in the valueRange and ticks fields in each entry of this.axes_.
- */
-Dygraph.prototype.computeYAxisRanges_ = function(extremes) {
-  var isNullUndefinedOrNaN = function(num) {
-    return isNaN(parseFloat(num));
-  };
-  var numAxes = this.attributes_.numAxes();
-  var ypadCompat, span, series, ypad;
-  
-  var p_axis;
-
-  // Compute extreme values, a span and tick marks for each axis.
-  for (var i = 0; i < numAxes; i++) {
-    var axis = this.axes_[i];
-    var logscale = this.attributes_.getForAxis("logscale", i);
-    var includeZero = this.attributes_.getForAxis("includeZero", i);
-    var independentTicks = this.attributes_.getForAxis("independentTicks", i);
-    series = this.attributes_.seriesForAxis(i);
-
-    // Add some padding. This supports two Y padding operation modes:
-    //
-    // - backwards compatible (yRangePad not set):
-    //   10% padding for automatic Y ranges, but not for user-supplied
-    //   ranges, and move a close-to-zero edge to zero except if
-    //   avoidMinZero is set, since drawing at the edge results in
-    //   invisible lines. Unfortunately lines drawn at the edge of a
-    //   user-supplied range will still be invisible. If logscale is
-    //   set, add a variable amount of padding at the top but
-    //   none at the bottom.
-    //
-    // - new-style (yRangePad set by the user):
-    //   always add the specified Y padding.
-    //
-    ypadCompat = true;
-    ypad = 0.1; // add 10%
-    if (this.attr_('yRangePad') !== null) {
-      ypadCompat = false;
-      // Convert pixel padding to ratio
-      ypad = this.attr_('yRangePad') / this.plotter_.area.h;
-    }
-
-    if (series.length === 0) {
-      // If no series are defined or visible then use a reasonable default
-      axis.extremeRange = [0, 1];
-    } else {
-      // Calculate the extremes of extremes.
-      var minY = Infinity;  // extremes[series[0]][0];
-      var maxY = -Infinity;  // extremes[series[0]][1];
-      var extremeMinY, extremeMaxY;
-
-      for (var j = 0; j < series.length; j++) {
-        // this skips invisible series
-        if (!extremes.hasOwnProperty(series[j])) continue;
-
-        // Only use valid extremes to stop null data series' from corrupting the scale.
-        extremeMinY = extremes[series[j]][0];
-        if (extremeMinY !== null) {
-          minY = Math.min(extremeMinY, minY);
-        }
-        extremeMaxY = extremes[series[j]][1];
-        if (extremeMaxY !== null) {
-          maxY = Math.max(extremeMaxY, maxY);
-        }
-      }
-
-      // Include zero if requested by the user.
-      if (includeZero && !logscale) {
-        if (minY > 0) minY = 0;
-        if (maxY < 0) maxY = 0;
-      }
-
-      // Ensure we have a valid scale, otherwise default to [0, 1] for safety.
-      if (minY == Infinity) minY = 0;
-      if (maxY == -Infinity) maxY = 1;
-
-      span = maxY - minY;
-      // special case: if we have no sense of scale, center on the sole value.
-      if (span === 0) {
-        if (maxY !== 0) {
-          span = Math.abs(maxY);
-        } else {
-          // ... and if the sole value is zero, use range 0-1.
-          maxY = 1;
-          span = 1;
-        }
-      }
-
-      var maxAxisY, minAxisY;
-      if (logscale) {
-        if (ypadCompat) {
-          maxAxisY = maxY + ypad * span;
-          minAxisY = minY;
-        } else {
-          var logpad = Math.exp(Math.log(span) * ypad);
-          maxAxisY = maxY * logpad;
-          minAxisY = minY / logpad;
-        }
-      } else {
-        maxAxisY = maxY + ypad * span;
-        minAxisY = minY - ypad * span;
-
-        // Backwards-compatible behavior: Move the span to start or end at zero if it's
-        // close to zero, but not if avoidMinZero is set.
-        if (ypadCompat && !this.attr_("avoidMinZero")) {
-          if (minAxisY < 0 && minY >= 0) minAxisY = 0;
-          if (maxAxisY > 0 && maxY <= 0) maxAxisY = 0;
-        }
-      }
-      axis.extremeRange = [minAxisY, maxAxisY];
-    }
-    if (axis.valueWindow) {
-      // This is only set if the user has zoomed on the y-axis. It is never set
-      // by a user. It takes precedence over axis.valueRange because, if you set
-      // valueRange, you'd still expect to be able to pan.
-      axis.computedValueRange = [axis.valueWindow[0], axis.valueWindow[1]];
-    } else if (axis.valueRange) {
-      // This is a user-set value range for this axis.
-      var y0 = isNullUndefinedOrNaN(axis.valueRange[0]) ? axis.extremeRange[0] : axis.valueRange[0];
-      var y1 = isNullUndefinedOrNaN(axis.valueRange[1]) ? axis.extremeRange[1] : axis.valueRange[1];
-      if (!ypadCompat) {
-        if (axis.logscale) {
-          var logpad = Math.exp(Math.log(span) * ypad);
-          y0 *= logpad;
-          y1 /= logpad;
-        } else {
-          span = y1 - y0;
-          y0 -= span * ypad;
-          y1 += span * ypad;
-        }
-      }
-      axis.computedValueRange = [y0, y1];
-    } else {
-      axis.computedValueRange = axis.extremeRange;
-    }
-    
-    
-    if (independentTicks) {
-      axis.independentTicks = independentTicks;
-      var opts = this.optionsViewForAxis_('y' + (i ? '2' : ''));
-      var ticker = opts('ticker');
-      axis.ticks = ticker(axis.computedValueRange[0],
-              axis.computedValueRange[1],
-              this.height_,  // TODO(danvk): should be area.height
-              opts,
-              this);
-      // Define the first independent axis as primary axis.
-      if (!p_axis) p_axis = axis;
-    }
-  }
-  if (p_axis === undefined) {
-    throw ("Configuration Error: At least one axis has to have the \"independentTicks\" option activated.");
-  }
-  // Add ticks. By default, all axes inherit the tick positions of the
-  // primary axis. However, if an axis is specifically marked as having
-  // independent ticks, then that is permissible as well.
-  for (var i = 0; i < numAxes; i++) {
-    var axis = this.axes_[i];
-    
-    if (!axis.independentTicks) {
-      var opts = this.optionsViewForAxis_('y' + (i ? '2' : ''));
-      var ticker = opts('ticker');
-      var p_ticks = p_axis.ticks;
-      var p_scale = p_axis.computedValueRange[1] - p_axis.computedValueRange[0];
-      var scale = axis.computedValueRange[1] - axis.computedValueRange[0];
-      var tick_values = [];
-      for (var k = 0; k < p_ticks.length; k++) {
-        var y_frac = (p_ticks[k].v - p_axis.computedValueRange[0]) / p_scale;
-        var y_val = axis.computedValueRange[0] + y_frac * scale;
-        tick_values.push(y_val);
-      }
-
-      axis.ticks = ticker(axis.computedValueRange[0],
-                          axis.computedValueRange[1],
-                          this.height_,  // TODO(danvk): should be area.height
-                          opts,
-                          this,
-                          tick_values);
-    }
-  }
-};
-
-/**
- * Extracts one series from the raw data (a 2D array) into an array of (date,
- * value) tuples.
- *
- * This is where undesirable points (i.e. negative values on log scales and
- * missing values through which we wish to connect lines) are dropped.
- * TODO(danvk): the "missing values" bit above doesn't seem right.
- *
- * @private
- * @param {Array.)>>} rawData Input data. Rectangular
- *     grid of points, where rawData[row][0] is the X value for the row,
- *     and rawData[row][i] is the Y data for series #i.
- * @param {number} i Series index, starting from 1.
- * @param {boolean} logScale True if using logarithmic Y scale.
- * @return {Array.)>} Series array, where
- *     series[row] = [x,y] or [x, [y, err]] or [x, [y, yplus, yminus]].
- */
-Dygraph.prototype.extractSeries_ = function(rawData, i, logScale) {
-  // TODO(danvk): pre-allocate series here.
-  var series = [];
-  var errorBars = this.attr_("errorBars");
-  var customBars =  this.attr_("customBars");
-  for (var j = 0; j < rawData.length; j++) {
-    var x = rawData[j][0];
-    var point = rawData[j][i];
-    if (logScale) {
-      // On the log scale, points less than zero do not exist.
-      // This will create a gap in the chart.
-      if (errorBars || customBars) {
-        // point.length is either 2 (errorBars) or 3 (customBars)
-        for (var k = 0; k < point.length; k++) {
-          if (point[k] <= 0) {
-            point = null;
-            break;
-          }
-        }
-      } else if (point <= 0) {
-        point = null;
-      }
-    }
-    // Fix null points to fit the display type standard.
-    if (point !== null) {
-      series.push([x, point]);
-    } else {
-      series.push([x, errorBars ? [null, null] : customBars ? [null, null, null] : point]);
-    }
-  }
-  return series;
-};
-
-/**
- * @private
- * Calculates the rolling average of a data set.
- * If originalData is [label, val], rolls the average of those.
- * If originalData is [label, [, it's interpreted as [value, stddev]
- *   and the roll is returned in the same form, with appropriately reduced
- *   stddev for each value.
- * Note that this is where fractional input (i.e. '5/10') is converted into
- *   decimal values.
- * @param {Array} originalData The data in the appropriate format (see above)
- * @param {Number} rollPeriod The number of points over which to average the
- *                            data
- */
-Dygraph.prototype.rollingAverage = function(originalData, rollPeriod) {
-  rollPeriod = Math.min(rollPeriod, originalData.length);
-  var rollingData = [];
-  var sigma = this.attr_("sigma");
-
-  var low, high, i, j, y, sum, num_ok, stddev;
-  if (this.fractions_) {
-    var num = 0;
-    var den = 0;  // numerator/denominator
-    var mult = 100.0;
-    for (i = 0; i < originalData.length; i++) {
-      num += originalData[i][1][0];
-      den += originalData[i][1][1];
-      if (i - rollPeriod >= 0) {
-        num -= originalData[i - rollPeriod][1][0];
-        den -= originalData[i - rollPeriod][1][1];
-      }
-
-      var date = originalData[i][0];
-      var value = den ? num / den : 0.0;
-      if (this.attr_("errorBars")) {
-        if (this.attr_("wilsonInterval")) {
-          // For more details on this confidence interval, see:
-          // http://en.wikipedia.org/wiki/Binomial_confidence_interval
-          if (den) {
-            var p = value < 0 ? 0 : value, n = den;
-            var pm = sigma * Math.sqrt(p*(1-p)/n + sigma*sigma/(4*n*n));
-            var denom = 1 + sigma * sigma / den;
-            low  = (p + sigma * sigma / (2 * den) - pm) / denom;
-            high = (p + sigma * sigma / (2 * den) + pm) / denom;
-            rollingData[i] = [date,
-                              [p * mult, (p - low) * mult, (high - p) * mult]];
-          } else {
-            rollingData[i] = [date, [0, 0, 0]];
-          }
-        } else {
-          stddev = den ? sigma * Math.sqrt(value * (1 - value) / den) : 1.0;
-          rollingData[i] = [date, [mult * value, mult * stddev, mult * stddev]];
-        }
-      } else {
-        rollingData[i] = [date, mult * value];
-      }
-    }
-  } else if (this.attr_("customBars")) {
-    low = 0;
-    var mid = 0;
-    high = 0;
-    var count = 0;
-    for (i = 0; i < originalData.length; i++) {
-      var data = originalData[i][1];
-      y = data[1];
-      rollingData[i] = [originalData[i][0], [y, y - data[0], data[2] - y]];
-
-      if (y !== null && !isNaN(y)) {
-        low += data[0];
-        mid += y;
-        high += data[2];
-        count += 1;
-      }
-      if (i - rollPeriod >= 0) {
-        var prev = originalData[i - rollPeriod];
-        if (prev[1][1] !== null && !isNaN(prev[1][1])) {
-          low -= prev[1][0];
-          mid -= prev[1][1];
-          high -= prev[1][2];
-          count -= 1;
-        }
-      }
-      if (count) {
-        rollingData[i] = [originalData[i][0], [ 1.0 * mid / count,
-                                                1.0 * (mid - low) / count,
-                                                1.0 * (high - mid) / count ]];
-      } else {
-        rollingData[i] = [originalData[i][0], [null, null, null]];
-      }
-    }
-  } else {
-    // Calculate the rolling average for the first rollPeriod - 1 points where
-    // there is not enough data to roll over the full number of points
-    if (!this.attr_("errorBars")) {
-      if (rollPeriod == 1) {
-        return originalData;
-      }
-
-      for (i = 0; i < originalData.length; i++) {
-        sum = 0;
-        num_ok = 0;
-        for (j = Math.max(0, i - rollPeriod + 1); j < i + 1; j++) {
-          y = originalData[j][1];
-          if (y === null || isNaN(y)) continue;
-          num_ok++;
-          sum += originalData[j][1];
-        }
-        if (num_ok) {
-          rollingData[i] = [originalData[i][0], sum / num_ok];
-        } else {
-          rollingData[i] = [originalData[i][0], null];
-        }
-      }
-
-    } else {
-      for (i = 0; i < originalData.length; i++) {
-        sum = 0;
-        var variance = 0;
-        num_ok = 0;
-        for (j = Math.max(0, i - rollPeriod + 1); j < i + 1; j++) {
-          y = originalData[j][1][0];
-          if (y === null || isNaN(y)) continue;
-          num_ok++;
-          sum += originalData[j][1][0];
-          variance += Math.pow(originalData[j][1][1], 2);
-        }
-        if (num_ok) {
-          stddev = Math.sqrt(variance) / num_ok;
-          rollingData[i] = [originalData[i][0],
-                            [sum / num_ok, sigma * stddev, sigma * stddev]];
-        } else {
-          // This explicitly preserves NaNs to aid with "independent series".
-          // See testRollingAveragePreservesNaNs.
-          var v = (rollPeriod == 1) ? originalData[i][1][0] : null;
-          rollingData[i] = [originalData[i][0], [v, v, v]];
-        }
-      }
-    }
-  }
-
-  return rollingData;
-};
-
-/**
- * Detects the type of the str (date or numeric) and sets the various
- * formatting attributes in this.attrs_ based on this type.
- * @param {String} str An x value.
- * @private
- */
-Dygraph.prototype.detectTypeFromString_ = function(str) {
-  var isDate = false;
-  var dashPos = str.indexOf('-');  // could be 2006-01-01 _or_ 1.0e-2
-  if ((dashPos > 0 && (str[dashPos-1] != 'e' && str[dashPos-1] != 'E')) ||
-      str.indexOf('/') >= 0 ||
-      isNaN(parseFloat(str))) {
-    isDate = true;
-  } else if (str.length == 8 && str > '19700101' && str < '20371231') {
-    // TODO(danvk): remove support for this format.
-    isDate = true;
-  }
-
-  this.setXAxisOptions_(isDate);
-};
-
-Dygraph.prototype.setXAxisOptions_ = function(isDate) {
-  if (isDate) {
-    this.attrs_.xValueParser = Dygraph.dateParser;
-    this.attrs_.axes.x.valueFormatter = Dygraph.dateString_;
-    this.attrs_.axes.x.ticker = Dygraph.dateTicker;
-    this.attrs_.axes.x.axisLabelFormatter = Dygraph.dateAxisFormatter;
-  } else {
-    /** @private (shut up, jsdoc!) */
-    this.attrs_.xValueParser = function(x) { return parseFloat(x); };
-    // TODO(danvk): use Dygraph.numberValueFormatter here?
-    /** @private (shut up, jsdoc!) */
-    this.attrs_.axes.x.valueFormatter = function(x) { return x; };
-    this.attrs_.axes.x.ticker = Dygraph.numericLinearTicks;
-    this.attrs_.axes.x.axisLabelFormatter = this.attrs_.axes.x.valueFormatter;
-  }
-};
-
-/**
- * Parses the value as a floating point number. This is like the parseFloat()
- * built-in, but with a few differences:
- * - the empty string is parsed as null, rather than NaN.
- * - if the string cannot be parsed at all, an error is logged.
- * If the string can't be parsed, this method returns null.
- * @param {String} x The string to be parsed
- * @param {Number} opt_line_no The line number from which the string comes.
- * @param {String} opt_line The text of the line from which the string comes.
- * @private
- */
-
-// Parse the x as a float or return null if it's not a number.
-Dygraph.prototype.parseFloat_ = function(x, opt_line_no, opt_line) {
-  var val = parseFloat(x);
-  if (!isNaN(val)) return val;
-
-  // Try to figure out what happeend.
-  // If the value is the empty string, parse it as null.
-  if (/^ *$/.test(x)) return null;
-
-  // If it was actually "NaN", return it as NaN.
-  if (/^ *nan *$/i.test(x)) return NaN;
-
-  // Looks like a parsing error.
-  var msg = "Unable to parse '" + x + "' as a number";
-  if (opt_line !== null && opt_line_no !== null) {
-    msg += " on line " + (1+opt_line_no) + " ('" + opt_line + "') of CSV.";
-  }
-  this.error(msg);
-
-  return null;
-};
-
-/**
- * @private
- * Parses a string in a special csv format.  We expect a csv file where each
- * line is a date point, and the first field in each line is the date string.
- * We also expect that all remaining fields represent series.
- * if the errorBars attribute is set, then interpret the fields as:
- * date, series1, stddev1, series2, stddev2, ...
- * @param {[Object]} data See above.
- *
- * @return [Object] An array with one entry for each row. These entries
- * are an array of cells in that row. The first entry is the parsed x-value for
- * the row. The second, third, etc. are the y-values. These can take on one of
- * three forms, depending on the CSV and constructor parameters:
- * 1. numeric value
- * 2. [ value, stddev ]
- * 3. [ low value, center value, high value ]
- */
-Dygraph.prototype.parseCSV_ = function(data) {
-  var ret = [];
-  var line_delimiter = Dygraph.detectLineDelimiter(data);
-  var lines = data.split(line_delimiter || "\n");
-  var vals, j;
-
-  // Use the default delimiter or fall back to a tab if that makes sense.
-  var delim = this.attr_('delimiter');
-  if (lines[0].indexOf(delim) == -1 && lines[0].indexOf('\t') >= 0) {
-    delim = '\t';
-  }
-
-  var start = 0;
-  if (!('labels' in this.user_attrs_)) {
-    // User hasn't explicitly set labels, so they're (presumably) in the CSV.
-    start = 1;
-    this.attrs_.labels = lines[0].split(delim);  // NOTE: _not_ user_attrs_.
-    this.attributes_.reparseSeries();
-  }
-  var line_no = 0;
-
-  var xParser;
-  var defaultParserSet = false;  // attempt to auto-detect x value type
-  var expectedCols = this.attr_("labels").length;
-  var outOfOrder = false;
-  for (var i = start; i < lines.length; i++) {
-    var line = lines[i];
-    line_no = i;
-    if (line.length === 0) continue;  // skip blank lines
-    if (line[0] == '#') continue;    // skip comment lines
-    var inFields = line.split(delim);
-    if (inFields.length < 2) continue;
-
-    var fields = [];
-    if (!defaultParserSet) {
-      this.detectTypeFromString_(inFields[0]);
-      xParser = this.attr_("xValueParser");
-      defaultParserSet = true;
-    }
-    fields[0] = xParser(inFields[0], this);
-
-    // If fractions are expected, parse the numbers as "A/B"
-    if (this.fractions_) {
-      for (j = 1; j < inFields.length; j++) {
-        // TODO(danvk): figure out an appropriate way to flag parse errors.
-        vals = inFields[j].split("/");
-        if (vals.length != 2) {
-          this.error('Expected fractional "num/den" values in CSV data ' +
-                     "but found a value '" + inFields[j] + "' on line " +
-                     (1 + i) + " ('" + line + "') which is not of this form.");
-          fields[j] = [0, 0];
-        } else {
-          fields[j] = [this.parseFloat_(vals[0], i, line),
-                       this.parseFloat_(vals[1], i, line)];
-        }
-      }
-    } else if (this.attr_("errorBars")) {
-      // If there are error bars, values are (value, stddev) pairs
-      if (inFields.length % 2 != 1) {
-        this.error('Expected alternating (value, stdev.) pairs in CSV data ' +
-                   'but line ' + (1 + i) + ' has an odd number of values (' +
-                   (inFields.length - 1) + "): '" + line + "'");
-      }
-      for (j = 1; j < inFields.length; j += 2) {
-        fields[(j + 1) / 2] = [this.parseFloat_(inFields[j], i, line),
-                               this.parseFloat_(inFields[j + 1], i, line)];
-      }
-    } else if (this.attr_("customBars")) {
-      // Bars are a low;center;high tuple
-      for (j = 1; j < inFields.length; j++) {
-        var val = inFields[j];
-        if (/^ *$/.test(val)) {
-          fields[j] = [null, null, null];
-        } else {
-          vals = val.split(";");
-          if (vals.length == 3) {
-            fields[j] = [ this.parseFloat_(vals[0], i, line),
-                          this.parseFloat_(vals[1], i, line),
-                          this.parseFloat_(vals[2], i, line) ];
-          } else {
-            this.warn('When using customBars, values must be either blank ' +
-                      'or "low;center;high" tuples (got "' + val +
-                      '" on line ' + (1+i));
-          }
-        }
-      }
-    } else {
-      // Values are just numbers
-      for (j = 1; j < inFields.length; j++) {
-        fields[j] = this.parseFloat_(inFields[j], i, line);
-      }
-    }
-    if (ret.length > 0 && fields[0] < ret[ret.length - 1][0]) {
-      outOfOrder = true;
-    }
-
-    if (fields.length != expectedCols) {
-      this.error("Number of columns in line " + i + " (" + fields.length +
-                 ") does not agree with number of labels (" + expectedCols +
-                 ") " + line);
-    }
-
-    // If the user specified the 'labels' option and none of the cells of the
-    // first row parsed correctly, then they probably double-specified the
-    // labels. We go with the values set in the option, discard this row and
-    // log a warning to the JS console.
-    if (i === 0 && this.attr_('labels')) {
-      var all_null = true;
-      for (j = 0; all_null && j < fields.length; j++) {
-        if (fields[j]) all_null = false;
-      }
-      if (all_null) {
-        this.warn("The dygraphs 'labels' option is set, but the first row of " +
-                  "CSV data ('" + line + "') appears to also contain labels. " +
-                  "Will drop the CSV labels and use the option labels.");
-        continue;
-      }
-    }
-    ret.push(fields);
-  }
-
-  if (outOfOrder) {
-    this.warn("CSV is out of order; order it correctly to speed loading.");
-    ret.sort(function(a,b) { return a[0] - b[0]; });
-  }
-
-  return ret;
-};
-
-/**
- * @private
- * The user has provided their data as a pre-packaged JS array. If the x values
- * are numeric, this is the same as dygraphs' internal format. If the x values
- * are dates, we need to convert them from Date objects to ms since epoch.
- * @param {[Object]} data
- * @return {[Object]} data with numeric x values.
- */
-Dygraph.prototype.parseArray_ = function(data) {
-  // Peek at the first x value to see if it's numeric.
-  if (data.length === 0) {
-    this.error("Can't plot empty data set");
-    return null;
-  }
-  if (data[0].length === 0) {
-    this.error("Data set cannot contain an empty row");
-    return null;
-  }
-
-  var i;
-  if (this.attr_("labels") === null) {
-    this.warn("Using default labels. Set labels explicitly via 'labels' " +
-              "in the options parameter");
-    this.attrs_.labels = [ "X" ];
-    for (i = 1; i < data[0].length; i++) {
-      this.attrs_.labels.push("Y" + i); // Not user_attrs_.
-    }
-    this.attributes_.reparseSeries();
-  } else {
-    var num_labels = this.attr_("labels");
-    if (num_labels.length != data[0].length) {
-      this.error("Mismatch between number of labels (" + num_labels +
-          ") and number of columns in array (" + data[0].length + ")");
-      return null;
-    }
-  }
-
-  if (Dygraph.isDateLike(data[0][0])) {
-    // Some intelligent defaults for a date x-axis.
-    this.attrs_.axes.x.valueFormatter = Dygraph.dateString_;
-    this.attrs_.axes.x.ticker = Dygraph.dateTicker;
-    this.attrs_.axes.x.axisLabelFormatter = Dygraph.dateAxisFormatter;
-
-    // Assume they're all dates.
-    var parsedData = Dygraph.clone(data);
-    for (i = 0; i < data.length; i++) {
-      if (parsedData[i].length === 0) {
-        this.error("Row " + (1 + i) + " of data is empty");
-        return null;
-      }
-      if (parsedData[i][0] === null ||
-          typeof(parsedData[i][0].getTime) != 'function' ||
-          isNaN(parsedData[i][0].getTime())) {
-        this.error("x value in row " + (1 + i) + " is not a Date");
-        return null;
-      }
-      parsedData[i][0] = parsedData[i][0].getTime();
-    }
-    return parsedData;
-  } else {
-    // Some intelligent defaults for a numeric x-axis.
-    /** @private (shut up, jsdoc!) */
-    this.attrs_.axes.x.valueFormatter = function(x) { return x; };
-    this.attrs_.axes.x.ticker = Dygraph.numericLinearTicks;
-    this.attrs_.axes.x.axisLabelFormatter = Dygraph.numberAxisLabelFormatter;
-    return data;
-  }
-};
-
-/**
- * Parses a DataTable object from gviz.
- * The data is expected to have a first column that is either a date or a
- * number. All subsequent columns must be numbers. If there is a clear mismatch
- * between this.xValueParser_ and the type of the first column, it will be
- * fixed. Fills out rawData_.
- * @param {[Object]} data See above.
- * @private
- */
-Dygraph.prototype.parseDataTable_ = function(data) {
-  var shortTextForAnnotationNum = function(num) {
-    // converts [0-9]+ [A-Z][a-z]*
-    // example: 0=A, 1=B, 25=Z, 26=Aa, 27=Ab
-    // and continues like.. Ba Bb .. Za .. Zz..Aaa...Zzz Aaaa Zzzz
-    var shortText = String.fromCharCode(65 /* A */ + num % 26);
-    num = Math.floor(num / 26);
-    while ( num > 0 ) {
-      shortText = String.fromCharCode(65 /* A */ + (num - 1) % 26 ) + shortText.toLowerCase();
-      num = Math.floor((num - 1) / 26);
-    }
-    return shortText;
-  };
-
-  var cols = data.getNumberOfColumns();
-  var rows = data.getNumberOfRows();
-
-  var indepType = data.getColumnType(0);
-  if (indepType == 'date' || indepType == 'datetime') {
-    this.attrs_.xValueParser = Dygraph.dateParser;
-    this.attrs_.axes.x.valueFormatter = Dygraph.dateString_;
-    this.attrs_.axes.x.ticker = Dygraph.dateTicker;
-    this.attrs_.axes.x.axisLabelFormatter = Dygraph.dateAxisFormatter;
-  } else if (indepType == 'number') {
-    this.attrs_.xValueParser = function(x) { return parseFloat(x); };
-    this.attrs_.axes.x.valueFormatter = function(x) { return x; };
-    this.attrs_.axes.x.ticker = Dygraph.numericLinearTicks;
-    this.attrs_.axes.x.axisLabelFormatter = this.attrs_.axes.x.valueFormatter;
-  } else {
-    this.error("only 'date', 'datetime' and 'number' types are supported for " +
-               "column 1 of DataTable input (Got '" + indepType + "')");
-    return null;
-  }
-
-  // Array of the column indices which contain data (and not annotations).
-  var colIdx = [];
-  var annotationCols = {};  // data index -> [annotation cols]
-  var hasAnnotations = false;
-  var i, j;
-  for (i = 1; i < cols; i++) {
-    var type = data.getColumnType(i);
-    if (type == 'number') {
-      colIdx.push(i);
-    } else if (type == 'string' && this.attr_('displayAnnotations')) {
-      // This is OK -- it's an annotation column.
-      var dataIdx = colIdx[colIdx.length - 1];
-      if (!annotationCols.hasOwnProperty(dataIdx)) {
-        annotationCols[dataIdx] = [i];
-      } else {
-        annotationCols[dataIdx].push(i);
-      }
-      hasAnnotations = true;
-    } else {
-      this.error("Only 'number' is supported as a dependent type with Gviz." +
-                 " 'string' is only supported if displayAnnotations is true");
-    }
-  }
-
-  // Read column labels
-  // TODO(danvk): add support back for errorBars
-  var labels = [data.getColumnLabel(0)];
-  for (i = 0; i < colIdx.length; i++) {
-    labels.push(data.getColumnLabel(colIdx[i]));
-    if (this.attr_("errorBars")) i += 1;
-  }
-  this.attrs_.labels = labels;
-  cols = labels.length;
-
-  var ret = [];
-  var outOfOrder = false;
-  var annotations = [];
-  for (i = 0; i < rows; i++) {
-    var row = [];
-    if (typeof(data.getValue(i, 0)) === 'undefined' ||
-        data.getValue(i, 0) === null) {
-      this.warn("Ignoring row " + i +
-                " of DataTable because of undefined or null first column.");
-      continue;
-    }
-
-    if (indepType == 'date' || indepType == 'datetime') {
-      row.push(data.getValue(i, 0).getTime());
-    } else {
-      row.push(data.getValue(i, 0));
-    }
-    if (!this.attr_("errorBars")) {
-      for (j = 0; j < colIdx.length; j++) {
-        var col = colIdx[j];
-        row.push(data.getValue(i, col));
-        if (hasAnnotations &&
-            annotationCols.hasOwnProperty(col) &&
-            data.getValue(i, annotationCols[col][0]) !== null) {
-          var ann = {};
-          ann.series = data.getColumnLabel(col);
-          ann.xval = row[0];
-          ann.shortText = shortTextForAnnotationNum(annotations.length);
-          ann.text = '';
-          for (var k = 0; k < annotationCols[col].length; k++) {
-            if (k) ann.text += "\n";
-            ann.text += data.getValue(i, annotationCols[col][k]);
-          }
-          annotations.push(ann);
-        }
-      }
-
-      // Strip out infinities, which give dygraphs problems later on.
-      for (j = 0; j < row.length; j++) {
-        if (!isFinite(row[j])) row[j] = null;
-      }
-    } else {
-      for (j = 0; j < cols - 1; j++) {
-        row.push([ data.getValue(i, 1 + 2 * j), data.getValue(i, 2 + 2 * j) ]);
-      }
-    }
-    if (ret.length > 0 && row[0] < ret[ret.length - 1][0]) {
-      outOfOrder = true;
-    }
-    ret.push(row);
-  }
-
-  if (outOfOrder) {
-    this.warn("DataTable is out of order; order it correctly to speed loading.");
-    ret.sort(function(a,b) { return a[0] - b[0]; });
-  }
-  this.rawData_ = ret;
-
-  if (annotations.length > 0) {
-    this.setAnnotations(annotations, true);
-  }
-  this.attributes_.reparseSeries();
-};
-
-/**
- * Get the CSV data. If it's in a function, call that function. If it's in a
- * file, do an XMLHttpRequest to get it.
- * @private
- */
-Dygraph.prototype.start_ = function() {
-  var data = this.file_;
-
-  // Functions can return references of all other types.
-  if (typeof data == 'function') {
-    data = data();
-  }
-
-  if (Dygraph.isArrayLike(data)) {
-    this.rawData_ = this.parseArray_(data);
-    this.predraw_();
-  } else if (typeof data == 'object' &&
-             typeof data.getColumnRange == 'function') {
-    // must be a DataTable from gviz.
-    this.parseDataTable_(data);
-    this.predraw_();
-  } else if (typeof data == 'string') {
-    // Heuristic: a newline means it's CSV data. Otherwise it's an URL.
-    var line_delimiter = Dygraph.detectLineDelimiter(data);
-    if (line_delimiter) {
-      this.loadedEvent_(data);
-    } else {
-      var req = new XMLHttpRequest();
-      var caller = this;
-      req.onreadystatechange = function () {
-        if (req.readyState == 4) {
-          if (req.status === 200 ||  // Normal http
-              req.status === 0) {    // Chrome w/ --allow-file-access-from-files
-            caller.loadedEvent_(req.responseText);
-          }
-        }
-      };
-
-      req.open("GET", data, true);
-      req.send(null);
-    }
-  } else {
-    this.error("Unknown data format: " + (typeof data));
-  }
-};
-
-/**
- * Changes various properties of the graph. These can include:
- * 
            
- * 
          • file: changes the source data for the graph
            • 
- * 
          • errorBars: changes whether the data contains stddev
            • 
- * 
          
- *
- * There's a huge variety of options that can be passed to this method. For a
- * full list, see http://dygraphs.com/options.html.
- *
- * @param {Object} attrs The new properties and values
- * @param {Boolean} [block_redraw] Usually the chart is redrawn after every
- * call to updateOptions(). If you know better, you can pass true to explicitly
- * block the redraw. This can be useful for chaining updateOptions() calls,
- * avoiding the occasional infinite loop and preventing redraws when it's not
- * necessary (e.g. when updating a callback).
- */
-Dygraph.prototype.updateOptions = function(input_attrs, block_redraw) {
-  if (typeof(block_redraw) == 'undefined') block_redraw = false;
-
-  // mapLegacyOptions_ drops the "file" parameter as a convenience to us.
-  var file = input_attrs.file;
-  var attrs = Dygraph.mapLegacyOptions_(input_attrs);
-
-  // TODO(danvk): this is a mess. Move these options into attr_.
-  if ('rollPeriod' in attrs) {
-    this.rollPeriod_ = attrs.rollPeriod;
-  }
-  if ('dateWindow' in attrs) {
-    this.dateWindow_ = attrs.dateWindow;
-    if (!('isZoomedIgnoreProgrammaticZoom' in attrs)) {
-      this.zoomed_x_ = (attrs.dateWindow !== null);
-    }
-  }
-  if ('valueRange' in attrs && !('isZoomedIgnoreProgrammaticZoom' in attrs)) {
-    this.zoomed_y_ = (attrs.valueRange !== null);
-  }
-
-  // TODO(danvk): validate per-series options.
-  // Supported:
-  // strokeWidth
-  // pointSize
-  // drawPoints
-  // highlightCircleSize
-
-  // Check if this set options will require new points.
-  var requiresNewPoints = Dygraph.isPixelChangingOptionList(this.attr_("labels"), attrs);
-
-  Dygraph.updateDeep(this.user_attrs_, attrs);
-
-  this.attributes_.reparseSeries();
-
-  if (file) {
-    this.file_ = file;
-    if (!block_redraw) this.start_();
-  } else {
-    if (!block_redraw) {
-      if (requiresNewPoints) {
-        this.predraw_();
-      } else {
-        this.renderGraph_(false);
-      }
-    }
-  }
-};
-
-/**
- * Returns a copy of the options with deprecated names converted into current
- * names. Also drops the (potentially-large) 'file' attribute. If the caller is
- * interested in that, they should save a copy before calling this.
- * @private
- */
-Dygraph.mapLegacyOptions_ = function(attrs) {
-  var my_attrs = {};
-  for (var k in attrs) {
-    if (k == 'file') continue;
-    if (attrs.hasOwnProperty(k)) my_attrs[k] = attrs[k];
-  }
-
-  var set = function(axis, opt, value) {
-    if (!my_attrs.axes) my_attrs.axes = {};
-    if (!my_attrs.axes[axis]) my_attrs.axes[axis] = {};
-    my_attrs.axes[axis][opt] = value;
-  };
-  var map = function(opt, axis, new_opt) {
-    if (typeof(attrs[opt]) != 'undefined') {
-      Dygraph.warn("Option " + opt + " is deprecated. Use the " +
-          new_opt + " option for the " + axis + " axis instead. " +
-          "(e.g. { axes : { " + axis + " : { " + new_opt + " : ... } } } " +
-          "(see http://dygraphs.com/per-axis.html for more information.");
-      set(axis, new_opt, attrs[opt]);
-      delete my_attrs[opt];
-    }
-  };
-
-  // This maps, e.g., xValueFormater -> axes: { x: { valueFormatter: ... } }
-  map('xValueFormatter', 'x', 'valueFormatter');
-  map('pixelsPerXLabel', 'x', 'pixelsPerLabel');
-  map('xAxisLabelFormatter', 'x', 'axisLabelFormatter');
-  map('xTicker', 'x', 'ticker');
-  map('yValueFormatter', 'y', 'valueFormatter');
-  map('pixelsPerYLabel', 'y', 'pixelsPerLabel');
-  map('yAxisLabelFormatter', 'y', 'axisLabelFormatter');
-  map('yTicker', 'y', 'ticker');
-  return my_attrs;
-};
-
-/**
- * Resizes the dygraph. If no parameters are specified, resizes to fill the
- * containing div (which has presumably changed size since the dygraph was
- * instantiated. If the width/height are specified, the div will be resized.
- *
- * This is far more efficient than destroying and re-instantiating a
- * Dygraph, since it doesn't have to reparse the underlying data.
- *
- * @param {Number} [width] Width (in pixels)
- * @param {Number} [height] Height (in pixels)
- */
-Dygraph.prototype.resize = function(width, height) {
-  if (this.resize_lock) {
-    return;
-  }
-  this.resize_lock = true;
-
-  if ((width === null) != (height === null)) {
-    this.warn("Dygraph.resize() should be called with zero parameters or " +
-              "two non-NULL parameters. Pretending it was zero.");
-    width = height = null;
-  }
-
-  var old_width = this.width_;
-  var old_height = this.height_;
-
-  if (width) {
-    this.maindiv_.style.width = width + "px";
-    this.maindiv_.style.height = height + "px";
-    this.width_ = width;
-    this.height_ = height;
-  } else {
-    this.width_ = this.maindiv_.clientWidth;
-    this.height_ = this.maindiv_.clientHeight;
-  }
-
-  if (old_width != this.width_ || old_height != this.height_) {
-    // Resizing a canvas erases it, even when the size doesn't change, so
-    // any resize needs to be followed by a redraw.
-    this.resizeElements_();
-    this.predraw_();
-  }
-
-  this.resize_lock = false;
-};
-
-/**
- * Adjusts the number of points in the rolling average. Updates the graph to
- * reflect the new averaging period.
- * @param {Number} length Number of points over which to average the data.
- */
-Dygraph.prototype.adjustRoll = function(length) {
-  this.rollPeriod_ = length;
-  this.predraw_();
-};
-
-/**
- * Returns a boolean array of visibility statuses.
- */
-Dygraph.prototype.visibility = function() {
-  // Do lazy-initialization, so that this happens after we know the number of
-  // data series.
-  if (!this.attr_("visibility")) {
-    this.attrs_.visibility = [];
-  }
-  // TODO(danvk): it looks like this could go into an infinite loop w/ user_attrs.
-  while (this.attr_("visibility").length < this.numColumns() - 1) {
-    this.attrs_.visibility.push(true);
-  }
-  return this.attr_("visibility");
-};
-
-/**
- * Changes the visiblity of a series.
- */
-Dygraph.prototype.setVisibility = function(num, value) {
-  var x = this.visibility();
-  if (num < 0 || num >= x.length) {
-    this.warn("invalid series number in setVisibility: " + num);
-  } else {
-    x[num] = value;
-    this.predraw_();
-  }
-};
-
-/**
- * How large of an area will the dygraph render itself in?
- * This is used for testing.
- * @return A {width: w, height: h} object.
- * @private
- */
-Dygraph.prototype.size = function() {
-  return { width: this.width_, height: this.height_ };
-};
-
-/**
- * Update the list of annotations and redraw the chart.
- * See dygraphs.com/annotations.html for more info on how to use annotations.
- * @param ann {Array} An array of annotation objects.
- * @param suppressDraw {Boolean} Set to "true" to block chart redraw (optional).
- */
-Dygraph.prototype.setAnnotations = function(ann, suppressDraw) {
-  // Only add the annotation CSS rule once we know it will be used.
-  Dygraph.addAnnotationRule();
-  this.annotations_ = ann;
-  if (!this.layout_) {
-    this.warn("Tried to setAnnotations before dygraph was ready. " +
-              "Try setting them in a drawCallback. See " +
-              "dygraphs.com/tests/annotation.html");
-    return;
-  }
-
-  this.layout_.setAnnotations(this.annotations_);
-  if (!suppressDraw) {
-    this.predraw_();
-  }
-};
-
-/**
- * Return the list of annotations.
- */
-Dygraph.prototype.annotations = function() {
-  return this.annotations_;
-};
-
-/**
- * Get the list of label names for this graph. The first column is the
- * x-axis, so the data series names start at index 1.
- *
- * Returns null when labels have not yet been defined.
- */
-Dygraph.prototype.getLabels = function() {
-  var labels = this.attr_("labels");
-  return labels ? labels.slice() : null;
-};
-
-/**
- * Get the index of a series (column) given its name. The first column is the
- * x-axis, so the data series start with index 1.
- */
-Dygraph.prototype.indexFromSetName = function(name) {
-  return this.setIndexByName_[name];
-};
-
-/**
- * Get the internal dataset index given its name. These are numbered starting from 0,
- * and only count visible sets.
- * @private
- */
-Dygraph.prototype.datasetIndexFromSetName_ = function(name) {
-  return this.datasetIndex_[this.indexFromSetName(name)];
-};
-
-/**
- * @private
- * Adds a default style for the annotation CSS classes to the document. This is
- * only executed when annotations are actually used. It is designed to only be
- * called once -- all calls after the first will return immediately.
- */
-Dygraph.addAnnotationRule = function() {
-  // TODO(danvk): move this function into plugins/annotations.js?
-  if (Dygraph.addedAnnotationCSS) return;
-
-  var rule = "border: 1px solid black; " +
-             "background-color: white; " +
-             "text-align: center;";
-
-  var styleSheetElement = document.createElement("style");
-  styleSheetElement.type = "text/css";
-  document.getElementsByTagName("head")[0].appendChild(styleSheetElement);
-
-  // Find the first style sheet that we can access.
-  // We may not add a rule to a style sheet from another domain for security
-  // reasons. This sometimes comes up when using gviz, since the Google gviz JS
-  // adds its own style sheets from google.com.
-  for (var i = 0; i < document.styleSheets.length; i++) {
-    if (document.styleSheets[i].disabled) continue;
-    var mysheet = document.styleSheets[i];
-    try {
-      if (mysheet.insertRule) {  // Firefox
-        var idx = mysheet.cssRules ? mysheet.cssRules.length : 0;
-        mysheet.insertRule(".dygraphDefaultAnnotation { " + rule + " }", idx);
-      } else if (mysheet.addRule) {  // IE
-        mysheet.addRule(".dygraphDefaultAnnotation", rule);
-      }
-      Dygraph.addedAnnotationCSS = true;
-      return;
-    } catch(err) {
-      // Was likely a security exception.
-    }
-  }
-
-  this.warn("Unable to add default annotation CSS rule; display may be off.");
-};
-
-// Older pages may still use this name.
-var DateGraph = Dygraph;
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/excanvas.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/excanvas.js
deleted file mode 100644
index 367764b4d..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/excanvas.js
+++ /dev/null
@@ -1,924 +0,0 @@
-// Copyright 2006 Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-
-// Known Issues:
-//
-// * Patterns are not implemented.
-// * Radial gradient are not implemented. The VML version of these look very
-//   different from the canvas one.
-// * Clipping paths are not implemented.
-// * Coordsize. The width and height attribute have higher priority than the
-//   width and height style values which isn't correct.
-// * Painting mode isn't implemented.
-// * Canvas width/height should is using content-box by default. IE in
-//   Quirks mode will draw the canvas using border-box. Either change your
-//   doctype to HTML5
-//   (http://www.whatwg.org/specs/web-apps/current-work/#the-doctype)
-//   or use Box Sizing Behavior from WebFX
-//   (http://webfx.eae.net/dhtml/boxsizing/boxsizing.html)
-// * Non uniform scaling does not correctly scale strokes.
-// * Optimize. There is always room for speed improvements.
-
-// Only add this code if we do not already have a canvas implementation
-if (!document.createElement('canvas').getContext) {
-
-(function() {
-
-  // alias some functions to make (compiled) code shorter
-  var m = Math;
-  var mr = m.round;
-  var ms = m.sin;
-  var mc = m.cos;
-  var abs = m.abs;
-  var sqrt = m.sqrt;
-
-  // this is used for sub pixel precision
-  var Z = 10;
-  var Z2 = Z / 2;
-
-  /**
-   * This funtion is assigned to the  elements as element.getContext().
-   * @this {HTMLElement}
-   * @return {CanvasRenderingContext2D_}
-   */
-  function getContext() {
-    return this.context_ ||
-        (this.context_ = new CanvasRenderingContext2D_(this));
-  }
-
-  var slice = Array.prototype.slice;
-
-  /**
-   * Binds a function to an object. The returned function will always use the
-   * passed in {@code obj} as {@code this}.
-   *
-   * Example:
-   *
-   *   g = bind(f, obj, a, b)
-   *   g(c, d) // will do f.call(obj, a, b, c, d)
-   *
-   * @param {Function} f The function to bind the object to
-   * @param {Object} obj The object that should act as this when the function
-   *     is called
-   * @param {*} var_args Rest arguments that will be used as the initial
-   *     arguments when the function is called
-   * @return {Function} A new function that has bound this
-   */
-  function bind(f, obj, var_args) {
-    var a = slice.call(arguments, 2);
-    return function() {
-      return f.apply(obj, a.concat(slice.call(arguments)));
-    };
-  }
-
-  var G_vmlCanvasManager_ = {
-    init: function(opt_doc) {
-      if (/MSIE/.test(navigator.userAgent) && !window.opera) {
-        var doc = opt_doc || document;
-        // Create a dummy element so that IE will allow canvas elements to be
-        // recognized.
-        doc.createElement('canvas');
-        doc.attachEvent('onreadystatechange', bind(this.init_, this, doc));
-      }
-    },
-
-    init_: function(doc) {
-      // create xmlns
-      if (!doc.namespaces['g_vml_']) {
-        doc.namespaces.add('g_vml_', 'urn:schemas-microsoft-com:vml',
-                           '#default#VML');
-
-      }
-      if (!doc.namespaces['g_o_']) {
-        doc.namespaces.add('g_o_', 'urn:schemas-microsoft-com:office:office',
-                           '#default#VML');
-      }
-
-      // Setup default CSS.  Only add one style sheet per document
-      if (!doc.styleSheets['ex_canvas_']) {
-        var ss = doc.createStyleSheet();
-        ss.owningElement.id = 'ex_canvas_';
-        ss.cssText = 'canvas{display:inline-block;overflow:hidden;' +
-            // default size is 300x150 in Gecko and Opera
-            'text-align:left;width:300px;height:150px}' +
-            'g_vml_\\:*{behavior:url(#default#VML)}' +
-            'g_o_\\:*{behavior:url(#default#VML)}';
-
-      }
-
-      // find all canvas elements
-      var els = doc.getElementsByTagName('canvas');
-      for (var i = 0; i < els.length; i++) {
-        this.initElement(els[i]);
-      }
-    },
-
-    /**
-     * Public initializes a canvas element so that it can be used as canvas
-     * element from now on. This is called automatically before the page is
-     * loaded but if you are creating elements using createElement you need to
-     * make sure this is called on the element.
-     * @param {HTMLElement} el The canvas element to initialize.
-     * @return {HTMLElement} the element that was created.
-     */
-    initElement: function(el) {
-      if (!el.getContext) {
-
-        el.getContext = getContext;
-
-        // Remove fallback content. There is no way to hide text nodes so we
-        // just remove all childNodes. We could hide all elements and remove
-        // text nodes but who really cares about the fallback content.
-        el.innerHTML = '';
-
-        // do not use inline function because that will leak memory
-        el.attachEvent('onpropertychange', onPropertyChange);
-        el.attachEvent('onresize', onResize);
-
-        var attrs = el.attributes;
-        if (attrs.width && attrs.width.specified) {
-          // TODO: use runtimeStyle and coordsize
-          // el.getContext().setWidth_(attrs.width.nodeValue);
-          el.style.width = attrs.width.nodeValue + 'px';
-        } else {
-          el.width = el.clientWidth;
-        }
-        if (attrs.height && attrs.height.specified) {
-          // TODO: use runtimeStyle and coordsize
-          // el.getContext().setHeight_(attrs.height.nodeValue);
-          el.style.height = attrs.height.nodeValue + 'px';
-        } else {
-          el.height = el.clientHeight;
-        }
-        //el.getContext().setCoordsize_()
-      }
-      return el;
-    }
-  };
-
-  function onPropertyChange(e) {
-    var el = e.srcElement;
-
-    switch (e.propertyName) {
-      case 'width':
-        el.style.width = el.attributes.width.nodeValue + 'px';
-        el.getContext().clearRect();
-        break;
-      case 'height':
-        el.style.height = el.attributes.height.nodeValue + 'px';
-        el.getContext().clearRect();
-        break;
-    }
-  }
-
-  function onResize(e) {
-    var el = e.srcElement;
-    if (el.firstChild) {
-      el.firstChild.style.width =  el.clientWidth + 'px';
-      el.firstChild.style.height = el.clientHeight + 'px';
-    }
-  }
-
-  G_vmlCanvasManager_.init();
-
-  // precompute "00" to "FF"
-  var dec2hex = [];
-  for (var i = 0; i < 16; i++) {
-    for (var j = 0; j < 16; j++) {
-      dec2hex[i * 16 + j] = i.toString(16) + j.toString(16);
-    }
-  }
-
-  function createMatrixIdentity() {
-    return [
-      [1, 0, 0],
-      [0, 1, 0],
-      [0, 0, 1]
-    ];
-  }
-
-  function matrixMultiply(m1, m2) {
-    var result = createMatrixIdentity();
-
-    for (var x = 0; x < 3; x++) {
-      for (var y = 0; y < 3; y++) {
-        var sum = 0;
-
-        for (var z = 0; z < 3; z++) {
-          sum += m1[x][z] * m2[z][y];
-        }
-
-        result[x][y] = sum;
-      }
-    }
-    return result;
-  }
-
-  function copyState(o1, o2) {
-    o2.fillStyle     = o1.fillStyle;
-    o2.lineCap       = o1.lineCap;
-    o2.lineJoin      = o1.lineJoin;
-    o2.lineWidth     = o1.lineWidth;
-    o2.miterLimit    = o1.miterLimit;
-    o2.shadowBlur    = o1.shadowBlur;
-    o2.shadowColor   = o1.shadowColor;
-    o2.shadowOffsetX = o1.shadowOffsetX;
-    o2.shadowOffsetY = o1.shadowOffsetY;
-    o2.strokeStyle   = o1.strokeStyle;
-    o2.globalAlpha   = o1.globalAlpha;
-    o2.arcScaleX_    = o1.arcScaleX_;
-    o2.arcScaleY_    = o1.arcScaleY_;
-    o2.lineScale_    = o1.lineScale_;
-  }
-
-  function processStyle(styleString) {
-    var str, alpha = 1;
-
-    styleString = String(styleString);
-    if (styleString.substring(0, 3) == 'rgb') {
-      var start = styleString.indexOf('(', 3);
-      var end = styleString.indexOf(')', start + 1);
-      var guts = styleString.substring(start + 1, end).split(',');
-
-      str = '#';
-      for (var i = 0; i < 3; i++) {
-        str += dec2hex[Number(guts[i])];
-      }
-
-      if (guts.length == 4 && styleString.substr(3, 1) == 'a') {
-        alpha = guts[3];
-      }
-    } else {
-      str = styleString;
-    }
-
-    return {color: str, alpha: alpha};
-  }
-
-  function processLineCap(lineCap) {
-    switch (lineCap) {
-      case 'butt':
-        return 'flat';
-      case 'round':
-        return 'round';
-      case 'square':
-      default:
-        return 'square';
-    }
-  }
-
-  /**
-   * This class implements CanvasRenderingContext2D interface as described by
-   * the WHATWG.
-   * @param {HTMLElement} surfaceElement The element that the 2D context should
-   * be associated with
-   */
-  function CanvasRenderingContext2D_(surfaceElement) {
-    this.m_ = createMatrixIdentity();
-
-    this.mStack_ = [];
-    this.aStack_ = [];
-    this.currentPath_ = [];
-
-    // Canvas context properties
-    this.strokeStyle = '#000';
-    this.fillStyle = '#000';
-
-    this.lineWidth = 1;
-    this.lineJoin = 'miter';
-    this.lineCap = 'butt';
-    this.miterLimit = Z * 1;
-    this.globalAlpha = 1;
-    this.canvas = surfaceElement;
-
-    var el = surfaceElement.ownerDocument.createElement('div');
-    el.style.width =  surfaceElement.clientWidth + 'px';
-    el.style.height = surfaceElement.clientHeight + 'px';
-    el.style.overflow = 'hidden';
-    el.style.position = 'absolute';
-    surfaceElement.appendChild(el);
-
-    this.element_ = el;
-    this.arcScaleX_ = 1;
-    this.arcScaleY_ = 1;
-    this.lineScale_ = 1;
-  }
-
-  var contextPrototype = CanvasRenderingContext2D_.prototype;
-  contextPrototype.clearRect = function() {
-    this.element_.innerHTML = '';
-  };
-
-  contextPrototype.beginPath = function() {
-    // TODO: Branch current matrix so that save/restore has no effect
-    //       as per safari docs.
-    this.currentPath_ = [];
-  };
-
-  contextPrototype.moveTo = function(aX, aY) {
-    var p = this.getCoords_(aX, aY);
-    this.currentPath_.push({type: 'moveTo', x: p.x, y: p.y});
-    this.currentX_ = p.x;
-    this.currentY_ = p.y;
-  };
-
-  contextPrototype.lineTo = function(aX, aY) {
-    var p = this.getCoords_(aX, aY);
-    this.currentPath_.push({type: 'lineTo', x: p.x, y: p.y});
-
-    this.currentX_ = p.x;
-    this.currentY_ = p.y;
-  };
-
-  contextPrototype.bezierCurveTo = function(aCP1x, aCP1y,
-                                            aCP2x, aCP2y,
-                                            aX, aY) {
-    var p = this.getCoords_(aX, aY);
-    var cp1 = this.getCoords_(aCP1x, aCP1y);
-    var cp2 = this.getCoords_(aCP2x, aCP2y);
-    bezierCurveTo(this, cp1, cp2, p);
-  };
-
-  // Helper function that takes the already fixed cordinates.
-  function bezierCurveTo(self, cp1, cp2, p) {
-    self.currentPath_.push({
-      type: 'bezierCurveTo',
-      cp1x: cp1.x,
-      cp1y: cp1.y,
-      cp2x: cp2.x,
-      cp2y: cp2.y,
-      x: p.x,
-      y: p.y
-    });
-    self.currentX_ = p.x;
-    self.currentY_ = p.y;
-  }
-
-  contextPrototype.quadraticCurveTo = function(aCPx, aCPy, aX, aY) {
-    // the following is lifted almost directly from
-    // http://developer.mozilla.org/en/docs/Canvas_tutorial:Drawing_shapes
-
-    var cp = this.getCoords_(aCPx, aCPy);
-    var p = this.getCoords_(aX, aY);
-
-    var cp1 = {
-      x: this.currentX_ + 2.0 / 3.0 * (cp.x - this.currentX_),
-      y: this.currentY_ + 2.0 / 3.0 * (cp.y - this.currentY_)
-    };
-    var cp2 = {
-      x: cp1.x + (p.x - this.currentX_) / 3.0,
-      y: cp1.y + (p.y - this.currentY_) / 3.0
-    };
-
-    bezierCurveTo(this, cp1, cp2, p);
-  };
-
-  contextPrototype.arc = function(aX, aY, aRadius,
-                                  aStartAngle, aEndAngle, aClockwise) {
-    aRadius *= Z;
-    var arcType = aClockwise ? 'at' : 'wa';
-
-    var xStart = aX + mc(aStartAngle) * aRadius - Z2;
-    var yStart = aY + ms(aStartAngle) * aRadius - Z2;
-
-    var xEnd = aX + mc(aEndAngle) * aRadius - Z2;
-    var yEnd = aY + ms(aEndAngle) * aRadius - Z2;
-
-    // IE won't render arches drawn counter clockwise if xStart == xEnd.
-    if (xStart == xEnd && !aClockwise) {
-      xStart += 0.125; // Offset xStart by 1/80 of a pixel. Use something
-                       // that can be represented in binary
-    }
-
-    var p = this.getCoords_(aX, aY);
-    var pStart = this.getCoords_(xStart, yStart);
-    var pEnd = this.getCoords_(xEnd, yEnd);
-
-    this.currentPath_.push({type: arcType,
-                           x: p.x,
-                           y: p.y,
-                           radius: aRadius,
-                           xStart: pStart.x,
-                           yStart: pStart.y,
-                           xEnd: pEnd.x,
-                           yEnd: pEnd.y});
-
-  };
-
-  contextPrototype.rect = function(aX, aY, aWidth, aHeight) {
-    this.moveTo(aX, aY);
-    this.lineTo(aX + aWidth, aY);
-    this.lineTo(aX + aWidth, aY + aHeight);
-    this.lineTo(aX, aY + aHeight);
-    this.closePath();
-  };
-
-  contextPrototype.strokeRect = function(aX, aY, aWidth, aHeight) {
-    var oldPath = this.currentPath_;
-    this.beginPath();
-
-    this.moveTo(aX, aY);
-    this.lineTo(aX + aWidth, aY);
-    this.lineTo(aX + aWidth, aY + aHeight);
-    this.lineTo(aX, aY + aHeight);
-    this.closePath();
-    this.stroke();
-
-    this.currentPath_ = oldPath;
-  };
-
-  contextPrototype.fillRect = function(aX, aY, aWidth, aHeight) {
-    var oldPath = this.currentPath_;
-    this.beginPath();
-
-    this.moveTo(aX, aY);
-    this.lineTo(aX + aWidth, aY);
-    this.lineTo(aX + aWidth, aY + aHeight);
-    this.lineTo(aX, aY + aHeight);
-    this.closePath();
-    this.fill();
-
-    this.currentPath_ = oldPath;
-  };
-
-  contextPrototype.createLinearGradient = function(aX0, aY0, aX1, aY1) {
-    var gradient = new CanvasGradient_('gradient');
-    gradient.x0_ = aX0;
-    gradient.y0_ = aY0;
-    gradient.x1_ = aX1;
-    gradient.y1_ = aY1;
-    return gradient;
-  };
-
-  contextPrototype.createRadialGradient = function(aX0, aY0, aR0,
-                                                   aX1, aY1, aR1) {
-    var gradient = new CanvasGradient_('gradientradial');
-    gradient.x0_ = aX0;
-    gradient.y0_ = aY0;
-    gradient.r0_ = aR0;
-    gradient.x1_ = aX1;
-    gradient.y1_ = aY1;
-    gradient.r1_ = aR1;
-    return gradient;
-  };
-
-  contextPrototype.drawImage = function(image, var_args) {
-    var dx, dy, dw, dh, sx, sy, sw, sh;
-
-    // to find the original width we overide the width and height
-    var oldRuntimeWidth = image.runtimeStyle.width;
-    var oldRuntimeHeight = image.runtimeStyle.height;
-    image.runtimeStyle.width = 'auto';
-    image.runtimeStyle.height = 'auto';
-
-    // get the original size
-    var w = image.width;
-    var h = image.height;
-
-    // and remove overides
-    image.runtimeStyle.width = oldRuntimeWidth;
-    image.runtimeStyle.height = oldRuntimeHeight;
-
-    if (arguments.length == 3) {
-      dx = arguments[1];
-      dy = arguments[2];
-      sx = sy = 0;
-      sw = dw = w;
-      sh = dh = h;
-    } else if (arguments.length == 5) {
-      dx = arguments[1];
-      dy = arguments[2];
-      dw = arguments[3];
-      dh = arguments[4];
-      sx = sy = 0;
-      sw = w;
-      sh = h;
-    } else if (arguments.length == 9) {
-      sx = arguments[1];
-      sy = arguments[2];
-      sw = arguments[3];
-      sh = arguments[4];
-      dx = arguments[5];
-      dy = arguments[6];
-      dw = arguments[7];
-      dh = arguments[8];
-    } else {
-      throw Error('Invalid number of arguments');
-    }
-
-    var d = this.getCoords_(dx, dy);
-
-    var w2 = sw / 2;
-    var h2 = sh / 2;
-
-    var vmlStr = [];
-
-    var W = 10;
-    var H = 10;
-
-    // For some reason that I've now forgotten, using divs didn't work
-    vmlStr.push(' ' ,
-                '',
-                '');
-
-    this.element_.insertAdjacentHTML('BeforeEnd',
-                                    vmlStr.join(''));
-  };
-
-  contextPrototype.stroke = function(aFill) {
-    var lineStr = [];
-    var lineOpen = false;
-    var a = processStyle(aFill ? this.fillStyle : this.strokeStyle);
-    var color = a.color;
-    var opacity = a.alpha * this.globalAlpha;
-
-    var W = 10;
-    var H = 10;
-
-    lineStr.push('');
-
-    if (!aFill) {
-      var lineWidth = this.lineScale_ * this.lineWidth;
-
-      // VML cannot correctly render a line if the width is less than 1px.
-      // In that case, we dilute the color to make the line look thinner.
-      if (lineWidth < 1) {
-        opacity *= lineWidth;
-      }
-
-      lineStr.push(
-        ''
-      );
-    } else if (typeof this.fillStyle == 'object') {
-      var fillStyle = this.fillStyle;
-      var angle = 0;
-      var focus = {x: 0, y: 0};
-
-      // additional offset
-      var shift = 0;
-      // scale factor for offset
-      var expansion = 1;
-
-      if (fillStyle.type_ == 'gradient') {
-        var x0 = fillStyle.x0_ / this.arcScaleX_;
-        var y0 = fillStyle.y0_ / this.arcScaleY_;
-        var x1 = fillStyle.x1_ / this.arcScaleX_;
-        var y1 = fillStyle.y1_ / this.arcScaleY_;
-        var p0 = this.getCoords_(x0, y0);
-        var p1 = this.getCoords_(x1, y1);
-        var dx = p1.x - p0.x;
-        var dy = p1.y - p0.y;
-        angle = Math.atan2(dx, dy) * 180 / Math.PI;
-
-        // The angle should be a non-negative number.
-        if (angle < 0) {
-          angle += 360;
-        }
-
-        // Very small angles produce an unexpected result because they are
-        // converted to a scientific notation string.
-        if (angle < 1e-6) {
-          angle = 0;
-        }
-      } else {
-        var p0 = this.getCoords_(fillStyle.x0_, fillStyle.y0_);
-        var width  = max.x - min.x;
-        var height = max.y - min.y;
-        focus = {
-          x: (p0.x - min.x) / width,
-          y: (p0.y - min.y) / height
-        };
-
-        width  /= this.arcScaleX_ * Z;
-        height /= this.arcScaleY_ * Z;
-        var dimension = m.max(width, height);
-        shift = 2 * fillStyle.r0_ / dimension;
-        expansion = 2 * fillStyle.r1_ / dimension - shift;
-      }
-
-      // We need to sort the color stops in ascending order by offset,
-      // otherwise IE won't interpret it correctly.
-      var stops = fillStyle.colors_;
-      stops.sort(function(cs1, cs2) {
-        return cs1.offset - cs2.offset;
-      });
-
-      var length = stops.length;
-      var color1 = stops[0].color;
-      var color2 = stops[length - 1].color;
-      var opacity1 = stops[0].alpha * this.globalAlpha;
-      var opacity2 = stops[length - 1].alpha * this.globalAlpha;
-
-      var colors = [];
-      for (var i = 0; i < length; i++) {
-        var stop = stops[i];
-        colors.push(stop.offset * expansion + shift + ' ' + stop.color);
-      }
-
-      // When colors attribute is used, the meanings of opacity and o:opacity2
-      // are reversed.
-      lineStr.push('');
-    } else {
-      lineStr.push('');
-    }
-
-    lineStr.push('');
-
-    this.element_.insertAdjacentHTML('beforeEnd', lineStr.join(''));
-  };
-
-  contextPrototype.fill = function() {
-    this.stroke(true);
-  }
-
-  contextPrototype.closePath = function() {
-    this.currentPath_.push({type: 'close'});
-  };
-
-  /**
-   * @private
-   */
-  contextPrototype.getCoords_ = function(aX, aY) {
-    var m = this.m_;
-    return {
-      x: Z * (aX * m[0][0] + aY * m[1][0] + m[2][0]) - Z2,
-      y: Z * (aX * m[0][1] + aY * m[1][1] + m[2][1]) - Z2
-    }
-  };
-
-  contextPrototype.save = function() {
-    var o = {};
-    copyState(this, o);
-    this.aStack_.push(o);
-    this.mStack_.push(this.m_);
-    this.m_ = matrixMultiply(createMatrixIdentity(), this.m_);
-  };
-
-  contextPrototype.restore = function() {
-    copyState(this.aStack_.pop(), this);
-    this.m_ = this.mStack_.pop();
-  };
-
-  function matrixIsFinite(m) {
-    for (var j = 0; j < 3; j++) {
-      for (var k = 0; k < 2; k++) {
-        if (!isFinite(m[j][k]) || isNaN(m[j][k])) {
-          return false;
-        }
-      }
-    }
-    return true;
-  }
-
-  function setM(ctx, m, updateLineScale) {
-    if (!matrixIsFinite(m)) {
-      return;
-    }
-    ctx.m_ = m;
-
-    if (updateLineScale) {
-      // Get the line scale.
-      // Determinant of this.m_ means how much the area is enlarged by the
-      // transformation. So its square root can be used as a scale factor
-      // for width.
-      var det = m[0][0] * m[1][1] - m[0][1] * m[1][0];
-      ctx.lineScale_ = sqrt(abs(det));
-    }
-  }
-
-  contextPrototype.translate = function(aX, aY) {
-    var m1 = [
-      [1,  0,  0],
-      [0,  1,  0],
-      [aX, aY, 1]
-    ];
-
-    setM(this, matrixMultiply(m1, this.m_), false);
-  };
-
-  contextPrototype.rotate = function(aRot) {
-    var c = mc(aRot);
-    var s = ms(aRot);
-
-    var m1 = [
-      [c,  s, 0],
-      [-s, c, 0],
-      [0,  0, 1]
-    ];
-
-    setM(this, matrixMultiply(m1, this.m_), false);
-  };
-
-  contextPrototype.scale = function(aX, aY) {
-    this.arcScaleX_ *= aX;
-    this.arcScaleY_ *= aY;
-    var m1 = [
-      [aX, 0,  0],
-      [0,  aY, 0],
-      [0,  0,  1]
-    ];
-
-    setM(this, matrixMultiply(m1, this.m_), true);
-  };
-
-  contextPrototype.transform = function(m11, m12, m21, m22, dx, dy) {
-    var m1 = [
-      [m11, m12, 0],
-      [m21, m22, 0],
-      [dx,  dy,  1]
-    ];
-
-    setM(this, matrixMultiply(m1, this.m_), true);
-  };
-
-  contextPrototype.setTransform = function(m11, m12, m21, m22, dx, dy) {
-    var m = [
-      [m11, m12, 0],
-      [m21, m22, 0],
-      [dx,  dy,  1]
-    ];
-
-    setM(this, m, true);
-  };
-
-  /******** STUBS ********/
-  contextPrototype.clip = function() {
-    // TODO: Implement
-  };
-
-  contextPrototype.arcTo = function() {
-    // TODO: Implement
-  };
-
-  contextPrototype.createPattern = function() {
-    return new CanvasPattern_;
-  };
-
-  // Gradient / Pattern Stubs
-  function CanvasGradient_(aType) {
-    this.type_ = aType;
-    this.x0_ = 0;
-    this.y0_ = 0;
-    this.r0_ = 0;
-    this.x1_ = 0;
-    this.y1_ = 0;
-    this.r1_ = 0;
-    this.colors_ = [];
-  }
-
-  CanvasGradient_.prototype.addColorStop = function(aOffset, aColor) {
-    aColor = processStyle(aColor);
-    this.colors_.push({offset: aOffset,
-                       color: aColor.color,
-                       alpha: aColor.alpha});
-  };
-
-  function CanvasPattern_() {}
-
-  // set up externs
-  G_vmlCanvasManager = G_vmlCanvasManager_;
-  CanvasRenderingContext2D = CanvasRenderingContext2D_;
-  CanvasGradient = CanvasGradient_;
-  CanvasPattern = CanvasPattern_;
-
-})();
-
-} // if
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/interaction.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/interaction.js
deleted file mode 100644
index 23847845f..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/interaction.js
+++ /dev/null
@@ -1,333 +0,0 @@
-	function moveV3(event, g, context) {
-		if (context.isPanning) {
-			Dygraph.movePan(event, g, context);
-		} else if (context.isZooming) {
-			Dygraph.moveZoom(event, g, context);
-		}
-	}
-	
-	function upV3(event, g, context) {
-		if (context.isPanning) {
-			Dygraph.endPan(event, g, context);
-		} else if (context.isZooming) {
-			Dygraph.endZoom(event, g, context);
-		}
-	}	
-
-// Take the offset of a mouse event on the dygraph canvas and
-// convert it to a pair of percentages from the bottom left. 
-// (Not top left, bottom is where the lower value is.)
-function offsetToPercentage(g, offsetX, offsetY) {
-  // This is calculating the pixel offset of the leftmost date.
-  var xOffset = g.toDomCoords(g.xAxisRange()[0], null)[0];
-  var yar0 = g.yAxisRange(0);
-
-  // This is calculating the pixel of the higest value. (Top pixel)
-  var yOffset = g.toDomCoords(null, yar0[1])[1];
-
-  // x y w and h are relative to the corner of the drawing area,
-  // so that the upper corner of the drawing area is (0, 0).
-  var x = offsetX - xOffset;
-  var y = offsetY - yOffset;
-
-  // This is computing the rightmost pixel, effectively defining the
-  // width.
-  var w = g.toDomCoords(g.xAxisRange()[1], null)[0] - xOffset;
-
-  // This is computing the lowest pixel, effectively defining the height.
-  var h = g.toDomCoords(null, yar0[0])[1] - yOffset;
-
-  // Percentage from the left.
-  var xPct = w == 0 ? 0 : (x / w);
-  // Percentage from the top.
-  var yPct = h == 0 ? 0 : (y / h);
-
-  // The (1-) part below changes it from "% distance down from the top"
-  // to "% distance up from the bottom".
-  return [xPct, (1-yPct)];
-}
-
-function dblClickV3(event, g, context) {
-  // Reducing by 20% makes it 80% the original size, which means
-  // to restore to original size it must grow by 25%
-  /*
-  if (!(event.offsetX && event.offsetY)){
-    event.offsetX = event.layerX - event.target.offsetLeft;
-    event.offsetY = event.layerY - event.target.offsetTop;
-  }
-
-  var percentages = offsetToPercentage(g, event.offsetX, event.offsetY);
-  var xPct = percentages[0];
-  var yPct = percentages[1];
-
-  if (event.ctrlKey) {
-    zoom(g, -.25, xPct, yPct);
-  } else {
-    zoom(g, +.2, xPct, yPct);
-  }
-  */
-  restorePositioning(g);
-}
-
-var lastClickedGraph = null;
-
-function clickV3(event, g, context) {
-  lastClickedGraph = g;
-  Dygraph.cancelEvent(event);
-}
-
-function scrollV3(event, g, context) {
-  if (lastClickedGraph != g) {
-    return;
-  }
-  var normal = event.detail ? event.detail * -1 : event.wheelDelta / 40;
-  // For me the normalized value shows 0.075 for one click. If I took
-  // that verbatim, it would be a 7.5%.
-  var percentage = normal / 50;
-
-  if (!(event.offsetX && event.offsetY)){
-    event.offsetX = event.layerX - event.target.offsetLeft;
-    event.offsetY = event.layerY - event.target.offsetTop;
-  }
-
-  var percentages = offsetToPercentage(g, event.offsetX, event.offsetY);
-  var xPct = percentages[0];
-  var yPct = percentages[1];
-
-  zoom(g, percentage, xPct, yPct);
-  Dygraph.cancelEvent(event);
-}
-
-// Adjusts [x, y] toward each other by zoomInPercentage%
-// Split it so the left/bottom axis gets xBias/yBias of that change and
-// tight/top gets (1-xBias)/(1-yBias) of that change.
-//
-// If a bias is missing it splits it down the middle.
-function zoom(g, zoomInPercentage, xBias, yBias) {
-  xBias = xBias || 0.5;
-  yBias = yBias || 0.5;
-  function adjustAxis(axis, zoomInPercentage, bias) {
-    var delta = axis[1] - axis[0];
-    var increment = delta * zoomInPercentage;
-    var foo = [increment * bias, increment * (1-bias)];
-    return [ axis[0] + foo[0], axis[1] - foo[1] ];
-  }
-  var yAxes = g.yAxisRanges();
-  var newYAxes = [];
-  for (var i = 0; i < yAxes.length; i++) {
-    newYAxes[i] = adjustAxis(yAxes[i], zoomInPercentage, yBias);
-  }
-
-  g.updateOptions({
-    dateWindow: adjustAxis(g.xAxisRange(), zoomInPercentage, xBias),
-    valueRange: newYAxes[0]
-    });
-}
-
-function restorePositioning(g) {
-  g.updateOptions({
-    dateWindow: null,
-    valueRange: null
-  });
-}	
-
-function zoom_custom(res) {
-  var w = g.xAxisRange();
-  desired_range = [w[0] - res * 1000, w[0] ];
-  animate();
-}
-
-function reset() {
- desired_range = orig_range;
- animate();
-}
-
-var click = 0;
-var desired_range = null;
-function approach_range() {
-	if (!desired_range) return;
-	// go halfway there
-	var range = g.xAxisRange();
-	if (Math.abs(desired_range[0] - range[0]) < 60 &&
-		Math.abs(desired_range[1] - range[1]) < 60) {
-		if(desired_range[0]>=orig_range[0])
-			g.updateOptions({dateWindow: desired_range});
-		else {
-			g.updateOptions({dateWindow: orig_range});
-			click = 8;
-		}
-		// (do not set another timeout.)
-	} else {
-		var new_range;
-        new_range = [0.5 * (desired_range[0] + range[0]),
-                       0.5 * (desired_range[1] + range[1])];
-        g.updateOptions({dateWindow: new_range});
-        animate();
-    }
-}	  
-
-function animate() {
-  setTimeout(approach_range, 50);
-}
-
-
-var v4Active = false;
-var v4Canvas = null;
-
-function downV4(event, g, context) {
-  context.initializeMouseDown(event, g, context);
-    
-    Dygraph.Interaction.startTouch(event, g, context);
-  
-    Dygraph.Interaction.moveTouch(event, g, context);
-  
-    Dygraph.Interaction.endTouch(event, g, context);
-  
-  v4Active = true;
-  moveV4(event, g, context); // in case the mouse went down on a data point.
-}
-
-var processed = [];
-
-function moveV4(event, g, context) {
-  var RANGE = 7;
-
-  if (v4Active) {
-    var graphPos = Dygraph.findPos(g.graphDiv);
-    var canvasx = Dygraph.pageX(event) - graphPos.x;
-    var canvasy = Dygraph.pageY(event) - graphPos.y;
-
-    var rows = g.numRows();
-    // Row layout:
-    // [date, [val1, stdev1], [val2, stdev2]]
-    for (var row = 0; row < rows; row++) {
-      var date = g.getValue(row, 0);
-      var x = g.toDomCoords(date, null)[0];
-      var diff = Math.abs(canvasx - x);
-      if (diff < RANGE) {
-        for (var col = 1; col < 3; col++) {
-          // TODO(konigsberg): these will throw exceptions as data is removed.
-          var vals =  g.getValue(row, col);
-          if (vals == null) { continue; }
-          var val = vals[0];
-          var y = g.toDomCoords(null, val)[1];
-          var diff2 = Math.abs(canvasy - y);
-          if (diff2 < RANGE) {
-            var found = false;
-            for (var i in processed) {
-              var stored = processed[i];
-              if(stored[0] == row && stored[1] == col) {
-                found = true;
-                break;
-              }
-            }
-            if (!found) {
-              //processed.push([row, col]);
-              //drawV4(x, y);
-            }
-            return;
-          }
-        }
-      }
-    }
-  }
-}
-
-function upV4(event, g, context) {
-  if (v4Active) {
-    v4Active = false;
-  }
-}
-
-function dblClickV4(event, g, context) {
-  restorePositioning(g);
-}
-
-function drawV4(x, y) {
-  var ctx = v4Canvas;
-
-  ctx.strokeStyle = "#000000";
-  //ctx.fillStyle = "#FFFF00";
-  ctx.fillStyle = "#FF0000";
-  ctx.beginPath();
-  ctx.arc(x,y,5,0,Math.PI*2,true);
-  ctx.closePath();
-  ctx.stroke();
-  ctx.fill();
-}
-
-function captureCanvas(canvas, area, g) {
-  v4Canvas = canvas;
-}
-
-function newDygraphTouchstart(event, g, context) { 
-// This right here is what prevents IOS from doing its own zoom/touch behavior 
-// It stops the node from being selected too 
-event.preventDefault(); // touch browsers are all nice. 
-
-if (event.touches.length > 1) { 
-// If the user ever puts two fingers down, it's not a double tap. 
-context.startTimeForDoubleTapMs = null; 
-} 
-
-var touches = []; 
-for (var i = 0; i < event.touches.length; i++) { 
-var t = event.touches[i]; 
-// we dispense with 'dragGetX_' because all touchBrowsers support pageX 
-touches.push({ 
-pageX: t.pageX, 
-pageY: t.pageY, 
-dataX: g.toDataXCoord(t.pageX), 
-dataY: g.toDataYCoord(t.pageY) 
-// identifier: t.identifier 
-}); 
-} 
-context.initialTouches = touches; 
-
-if (touches.length == 1) { 
-// This is just a swipe. 
-context.initialPinchCenter = touches[0]; 
-context.touchDirections = { x: true, y: true }; 
-
-// ADDITION - this needs to select the points 
-//var closestTouchP = g.findClosestPoint(touches[0].pageX,touches[0].pageY); 
-//if(closestTouchP) { 
-//var selectionChanged = g.setSelection(closestTouchP.row, closestTouchP.seriesName); 
-//} 
-g.mouseMove_(event); 
-
-} else if (touches.length >= 2) { 
-// It's become a pinch! 
-// In case there are 3+ touches, we ignore all but the "first" two. 
-
-// only screen coordinates can be averaged (data coords could be log scale). 
-context.initialPinchCenter = { 
-pageX: 0.5 * (touches[0].pageX + touches[1].pageX), 
-pageY: 0.5 * (touches[0].pageY + touches[1].pageY), 
-
-// TODO(danvk): remove 
-dataX: 0.5 * (touches[0].dataX + touches[1].dataX), 
-dataY: 0.5 * (touches[0].dataY + touches[1].dataY) 
-}; 
-
-// Make pinches in a 45-degree swath around either axis 1-dimensional zooms. 
-var initialAngle = 180 / Math.PI * Math.atan2( 
-context.initialPinchCenter.pageY - touches[0].pageY, 
-touches[0].pageX - context.initialPinchCenter.pageX); 
-
-// use symmetry to get it into the first quadrant. 
-initialAngle = Math.abs(initialAngle); 
-if (initialAngle > 90) initialAngle = 90 - initialAngle; 
-
-context.touchDirections = { 
-x: (initialAngle < (90 - 45/2)), 
-y: (initialAngle > 45/2) 
-}; 
-} 
-
-// save the full x & y ranges. 
-context.initialRange = { 
-x: g.xAxisRange(), 
-y: g.yAxisRange() 
-}; 
-};
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/interaction.min.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/interaction.min.js
deleted file mode 100644
index e3f736a81..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/interaction.min.js
+++ /dev/null
@@ -1 +0,0 @@
-function moveV3(e,t,n){if(n.isPanning){Dygraph.movePan(e,t,n)}else if(n.isZooming){Dygraph.moveZoom(e,t,n)}}function upV3(e,t,n){if(n.isPanning){Dygraph.endPan(e,t,n)}else if(n.isZooming){Dygraph.endZoom(e,t,n)}}function offsetToPercentage(e,t,n){var r=e.toDomCoords(e.xAxisRange()[0],null)[0];var i=e.yAxisRange(0);var s=e.toDomCoords(null,i[1])[1];var o=t-r;var u=n-s;var a=e.toDomCoords(e.xAxisRange()[1],null)[0]-r;var f=e.toDomCoords(null,i[0])[1]-s;var l=a==0?0:o/a;var c=f==0?0:u/f;return[l,1-c]}function dblClickV3(e,t,n){restorePositioning(t)}function clickV3(e,t,n){lastClickedGraph=t;Dygraph.cancelEvent(e)}function scrollV3(e,t,n){if(lastClickedGraph!=t){return}var r=e.detail?e.detail*-1:e.wheelDelta/40;var i=r/50;if(!(e.offsetX&&e.offsetY)){e.offsetX=e.layerX-e.target.offsetLeft;e.offsetY=e.layerY-e.target.offsetTop}var s=offsetToPercentage(t,e.offsetX,e.offsetY);var o=s[0];var u=s[1];zoom(t,i,o,u);Dygraph.cancelEvent(e)}function zoom(e,t,n,r){function i(e,t,n){var r=e[1]-e[0];var i=r*t;var s=[i*n,i*(1-n)];return[e[0]+s[0],e[1]-s[1]]}n=n||.5;r=r||.5;var s=e.yAxisRanges();var o=[];for(var u=0;u=orig_range[0])g.updateOptions({dateWindow:desired_range});else{g.updateOptions({dateWindow:orig_range});click=8}}else{var t;t=[.5*(desired_range[0]+e[0]),.5*(desired_range[1]+e[1])];g.updateOptions({dateWindow:t});animate()}}function animate(){setTimeout(approach_range,50)}function downV4(e,t,n){n.initializeMouseDown(e,t,n);Dygraph.Interaction.startTouch(e,t,n);Dygraph.Interaction.moveTouch(e,t,n);Dygraph.Interaction.endTouch(e,t,n);v4Active=true;moveV4(e,t,n)}function moveV4(e,t,n){var r=7;if(v4Active){var i=Dygraph.findPos(t.graphDiv);var s=Dygraph.pageX(e)-i.x;var o=Dygraph.pageY(e)-i.y;var u=t.numRows();for(var a=0;a1){n.startTimeForDoubleTapMs=null}var r=[];for(var i=0;i=2){n.initialPinchCenter={pageX:.5*(r[0].pageX+r[1].pageX),pageY:.5*(r[0].pageY+r[1].pageY),dataX:.5*(r[0].dataX+r[1].dataX),dataY:.5*(r[0].dataY+r[1].dataY)};var o=180/Math.PI*Math.atan2(n.initialPinchCenter.pageY-r[0].pageY,r[0].pageX-n.initialPinchCenter.pageX);o=Math.abs(o);if(o>90)o=90-o;n.touchDirections={x:o<90-45/2,y:o>45/2}}n.initialRange={x:t.xAxisRange(),y:t.yAxisRange()}}var lastClickedGraph=null;var click=0;var desired_range=null;var v4Active=false;var v4Canvas=null;var processed=[];
\ No newline at end of file
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/interaction_sun.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/interaction_sun.js
deleted file mode 100644
index 92a0dbd75..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/interaction_sun.js
+++ /dev/null
@@ -1,303 +0,0 @@
-// Code for a variety of interaction models. Used in interaction.html, but split out from
-// that file so they can be tested in isolation.
-//
-function downV3(event, g, context) {
-  context.initializeMouseDown(event, g, context);
-  if (event.altKey || event.shiftKey) {
-    Dygraph.startZoom(event, g, context);
-  } else {
-    Dygraph.startPan(event, g, context);
-  }
-}
-
-function moveV3(event, g, context) {
-  if (context.isPanning) {
-    Dygraph.movePan(event, g, context);
-  } else if (context.isZooming) {
-    Dygraph.moveZoom(event, g, context);
-  }
-}
-
-function upV3(event, g, context) {
-  if (context.isPanning) {
-    Dygraph.endPan(event, g, context);
-  } else if (context.isZooming) {
-    Dygraph.endZoom(event, g, context);
-  }
-}
-
-// Take the offset of a mouse event on the dygraph canvas and
-// convert it to a pair of percentages from the bottom left. 
-// (Not top left, bottom is where the lower value is.)
-function offsetToPercentage(g, offsetX, offsetY) {
-  // This is calculating the pixel offset of the leftmost date.
-  var xOffset = g.toDomCoords(g.xAxisRange()[0], null)[0];
-  var yar0 = g.yAxisRange(0);
-
-  // This is calculating the pixel of the higest value. (Top pixel)
-  var yOffset = g.toDomCoords(null, yar0[1])[1];
-
-  // x y w and h are relative to the corner of the drawing area,
-  // so that the upper corner of the drawing area is (0, 0).
-  var x = offsetX - xOffset;
-  var y = offsetY - yOffset;
-
-  // This is computing the rightmost pixel, effectively defining the
-  // width.
-  var w = g.toDomCoords(g.xAxisRange()[1], null)[0] - xOffset;
-
-  // This is computing the lowest pixel, effectively defining the height.
-  var h = g.toDomCoords(null, yar0[0])[1] - yOffset;
-
-  // Percentage from the left.
-  var xPct = w == 0 ? 0 : (x / w);
-  // Percentage from the top.
-  var yPct = h == 0 ? 0 : (y / h);
-
-  // The (1-) part below changes it from "% distance down from the top"
-  // to "% distance up from the bottom".
-  return [xPct, (1-yPct)];
-}
-
-function dblClickV3(event, g, context) {
-  // Reducing by 20% makes it 80% the original size, which means
-  // to restore to original size it must grow by 25%
-
-  if (!(event.offsetX && event.offsetY)){
-    event.offsetX = event.layerX - event.target.offsetLeft;
-    event.offsetY = event.layerY - event.target.offsetTop;
-  }
-
-  var percentages = offsetToPercentage(g, event.offsetX, event.offsetY);
-  var xPct = percentages[0];
-  var yPct = percentages[1];
-
-  if (event.ctrlKey) {
-    zoom(g, -.25, xPct, yPct);
-  } else {
-    zoom(g, +.2, xPct, yPct);
-  }
-}
-
-var lastClickedGraph = null;
-
-function clickV3(event, g, context) {
-  lastClickedGraph = g;
-  Dygraph.cancelEvent(event);
-}
-
-function scrollV3(event, g, context) {
-  if (lastClickedGraph != g) {
-    return;
-  }
-  var normal = event.detail ? event.detail * -1 : event.wheelDelta / 40;
-  // For me the normalized value shows 0.075 for one click. If I took
-  // that verbatim, it would be a 7.5%.
-  var percentage = normal / 50;
-
-  if (!(event.offsetX && event.offsetY)){
-    event.offsetX = event.layerX - event.target.offsetLeft;
-    event.offsetY = event.layerY - event.target.offsetTop;
-  }
-
-  var percentages = offsetToPercentage(g, event.offsetX, event.offsetY);
-  var xPct = percentages[0];
-  var yPct = percentages[1];
-
-  zoom(g, percentage, xPct, yPct);
-  Dygraph.cancelEvent(event);
-}
-
-// Adjusts [x, y] toward each other by zoomInPercentage%
-// Split it so the left/bottom axis gets xBias/yBias of that change and
-// tight/top gets (1-xBias)/(1-yBias) of that change.
-//
-// If a bias is missing it splits it down the middle.
-function zoom(g, zoomInPercentage, xBias, yBias) {
-  xBias = xBias || 0.5;
-  yBias = yBias || 0.5;
-  function adjustAxis(axis, zoomInPercentage, bias) {
-    var delta = axis[1] - axis[0];
-    var increment = delta * zoomInPercentage;
-    var foo = [increment * bias, increment * (1-bias)];
-    return [ axis[0] + foo[0], axis[1] - foo[1] ];
-  }
-  var yAxes = g.yAxisRanges();
-  var newYAxes = [];
-  for (var i = 0; i < yAxes.length; i++) {
-    newYAxes[i] = adjustAxis(yAxes[i], zoomInPercentage, yBias);
-  }
-
-  g.updateOptions({
-    dateWindow: adjustAxis(g.xAxisRange(), zoomInPercentage, xBias),
-    valueRange: newYAxes[0]
-    });
-}
-
-var v4Active = false;
-var v4Canvas = null;
-
-function downV4(event, g, context) {
-  context.initializeMouseDown(event, g, context);
-    
-    Dygraph.Interaction.startTouch(event, g, context);
-  
-    Dygraph.Interaction.moveTouch(event, g, context);
-  
-    Dygraph.Interaction.endTouch(event, g, context);
-  
-  v4Active = true;
-  moveV4(event, g, context); // in case the mouse went down on a data point.
-}
-
-var processed = [];
-
-function moveV4(event, g, context) {
-  var RANGE = 7;
-
-  if (v4Active) {
-    var graphPos = Dygraph.findPos(g.graphDiv);
-    var canvasx = Dygraph.pageX(event) - graphPos.x;
-    var canvasy = Dygraph.pageY(event) - graphPos.y;
-
-    var rows = g.numRows();
-    // Row layout:
-    // [date, [val1, stdev1], [val2, stdev2]]
-    for (var row = 0; row < rows; row++) {
-      var date = g.getValue(row, 0);
-      var x = g.toDomCoords(date, null)[0];
-      var diff = Math.abs(canvasx - x);
-      if (diff < RANGE) {
-        for (var col = 1; col < 3; col++) {
-          // TODO(konigsberg): these will throw exceptions as data is removed.
-          var vals =  g.getValue(row, col);
-          if (vals == null) { continue; }
-          var val = vals[0];
-          var y = g.toDomCoords(null, val)[1];
-          var diff2 = Math.abs(canvasy - y);
-          if (diff2 < RANGE) {
-            var found = false;
-            for (var i in processed) {
-              var stored = processed[i];
-              if(stored[0] == row && stored[1] == col) {
-                found = true;
-                break;
-              }
-            }
-            if (!found) {
-              //processed.push([row, col]);
-              //drawV4(x, y);
-            }
-            return;
-          }
-        }
-      }
-    }
-  }
-}
-
-function upV4(event, g, context) {
-  if (v4Active) {
-    v4Active = false;
-  }
-}
-
-function dblClickV4(event, g, context) {
-  restorePositioning(g);
-}
-
-function drawV4(x, y) {
-  var ctx = v4Canvas;
-
-  ctx.strokeStyle = "#000000";
-  //ctx.fillStyle = "#FFFF00";
-  ctx.fillStyle = "#FF0000";
-  ctx.beginPath();
-  ctx.arc(x,y,5,0,Math.PI*2,true);
-  ctx.closePath();
-  ctx.stroke();
-  ctx.fill();
-}
-
-function captureCanvas(canvas, area, g) {
-  v4Canvas = canvas;
-}
-
-function restorePositioning(g) {
-  g.updateOptions({
-    dateWindow: null,
-    valueRange: null
-  });
-}
-
-function newDygraphTouchstart(event, g, context) { 
-// This right here is what prevents IOS from doing its own zoom/touch behavior 
-// It stops the node from being selected too 
-event.preventDefault(); // touch browsers are all nice. 
-
-if (event.touches.length > 1) { 
-// If the user ever puts two fingers down, it's not a double tap. 
-context.startTimeForDoubleTapMs = null; 
-} 
-
-var touches = []; 
-for (var i = 0; i < event.touches.length; i++) { 
-var t = event.touches[i]; 
-// we dispense with 'dragGetX_' because all touchBrowsers support pageX 
-touches.push({ 
-pageX: t.pageX, 
-pageY: t.pageY, 
-dataX: g.toDataXCoord(t.pageX), 
-dataY: g.toDataYCoord(t.pageY) 
-// identifier: t.identifier 
-}); 
-} 
-context.initialTouches = touches; 
-
-if (touches.length == 1) { 
-// This is just a swipe. 
-context.initialPinchCenter = touches[0]; 
-context.touchDirections = { x: true, y: true }; 
-
-// ADDITION - this needs to select the points 
-//var closestTouchP = g.findClosestPoint(touches[0].pageX,touches[0].pageY); 
-//if(closestTouchP) { 
-//var selectionChanged = g.setSelection(closestTouchP.row, closestTouchP.seriesName); 
-//} 
-g.mouseMove_(event); 
-
-} else if (touches.length >= 2) { 
-// It's become a pinch! 
-// In case there are 3+ touches, we ignore all but the "first" two. 
-
-// only screen coordinates can be averaged (data coords could be log scale). 
-context.initialPinchCenter = { 
-pageX: 0.5 * (touches[0].pageX + touches[1].pageX), 
-pageY: 0.5 * (touches[0].pageY + touches[1].pageY), 
-
-// TODO(danvk): remove 
-dataX: 0.5 * (touches[0].dataX + touches[1].dataX), 
-dataY: 0.5 * (touches[0].dataY + touches[1].dataY) 
-}; 
-
-// Make pinches in a 45-degree swath around either axis 1-dimensional zooms. 
-var initialAngle = 180 / Math.PI * Math.atan2( 
-context.initialPinchCenter.pageY - touches[0].pageY, 
-touches[0].pageX - context.initialPinchCenter.pageX); 
-
-// use symmetry to get it into the first quadrant. 
-initialAngle = Math.abs(initialAngle); 
-if (initialAngle > 90) initialAngle = 90 - initialAngle; 
-
-context.touchDirections = { 
-x: (initialAngle < (90 - 45/2)), 
-y: (initialAngle > 45/2) 
-}; 
-} 
-
-// save the full x & y ranges. 
-context.initialRange = { 
-x: g.xAxisRange(), 
-y: g.yAxisRange() 
-}; 
-};
\ No newline at end of file
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/moment.min.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/moment.min.js
deleted file mode 100644
index 62b1697b6..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/moment.min.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// moment.js
-// version : 2.1.0
-// author : Tim Wood
-// license : MIT
-// momentjs.com
-!function(t){function e(t,e){return function(n){return u(t.call(this,n),e)}}function n(t,e){return function(n){return this.lang().ordinal(t.call(this,n),e)}}function s(){}function i(t){a(this,t)}function r(t){var e=t.years||t.year||t.y||0,n=t.months||t.month||t.M||0,s=t.weeks||t.week||t.w||0,i=t.days||t.day||t.d||0,r=t.hours||t.hour||t.h||0,a=t.minutes||t.minute||t.m||0,o=t.seconds||t.second||t.s||0,u=t.milliseconds||t.millisecond||t.ms||0;this._input=t,this._milliseconds=u+1e3*o+6e4*a+36e5*r,this._days=i+7*s,this._months=n+12*e,this._data={},this._bubble()}function a(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n]);return t}function o(t){return 0>t?Math.ceil(t):Math.floor(t)}function u(t,e){for(var n=t+"";n.lengthn;n++)~~t[n]!==~~e[n]&&r++;return r+i}function f(t){return t?ie[t]||t.toLowerCase().replace(/(.)s$/,"$1"):t}function l(t,e){return e.abbr=t,x[t]||(x[t]=new s),x[t].set(e),x[t]}function _(t){if(!t)return H.fn._lang;if(!x[t]&&A)try{require("./lang/"+t)}catch(e){return H.fn._lang}return x[t]}function m(t){return t.match(/\[.*\]/)?t.replace(/^\[|\]$/g,""):t.replace(/\\/g,"")}function y(t){var e,n,s=t.match(E);for(e=0,n=s.length;n>e;e++)s[e]=ue[s[e]]?ue[s[e]]:m(s[e]);return function(i){var r="";for(e=0;n>e;e++)r+=s[e]instanceof Function?s[e].call(i,t):s[e];return r}}function M(t,e){function n(e){return t.lang().longDateFormat(e)||e}for(var s=5;s--&&N.test(e);)e=e.replace(N,n);return re[e]||(re[e]=y(e)),re[e](t)}function g(t,e){switch(t){case"DDDD":return V;case"YYYY":return X;case"YYYYY":return $;case"S":case"SS":case"SSS":case"DDD":return I;case"MMM":case"MMMM":case"dd":case"ddd":case"dddd":return R;case"a":case"A":return _(e._l)._meridiemParse;case"X":return B;case"Z":case"ZZ":return j;case"T":return q;case"MM":case"DD":case"YY":case"HH":case"hh":case"mm":case"ss":case"M":case"D":case"d":case"H":case"h":case"m":case"s":return J;default:return new RegExp(t.replace("\\",""))}}function p(t){var e=(j.exec(t)||[])[0],n=(e+"").match(ee)||["-",0,0],s=+(60*n[1])+~~n[2];return"+"===n[0]?-s:s}function D(t,e,n){var s,i=n._a;switch(t){case"M":case"MM":i[1]=null==e?0:~~e-1;break;case"MMM":case"MMMM":s=_(n._l).monthsParse(e),null!=s?i[1]=s:n._isValid=!1;break;case"D":case"DD":case"DDD":case"DDDD":null!=e&&(i[2]=~~e);break;case"YY":i[0]=~~e+(~~e>68?1900:2e3);break;case"YYYY":case"YYYYY":i[0]=~~e;break;case"a":case"A":n._isPm=_(n._l).isPM(e);break;case"H":case"HH":case"h":case"hh":i[3]=~~e;break;case"m":case"mm":i[4]=~~e;break;case"s":case"ss":i[5]=~~e;break;case"S":case"SS":case"SSS":i[6]=~~(1e3*("0."+e));break;case"X":n._d=new Date(1e3*parseFloat(e));break;case"Z":case"ZZ":n._useUTC=!0,n._tzm=p(e)}null==e&&(n._isValid=!1)}function Y(t){var e,n,s=[];if(!t._d){for(e=0;7>e;e++)t._a[e]=s[e]=null==t._a[e]?2===e?1:0:t._a[e];s[3]+=~~((t._tzm||0)/60),s[4]+=~~((t._tzm||0)%60),n=new Date(0),t._useUTC?(n.setUTCFullYear(s[0],s[1],s[2]),n.setUTCHours(s[3],s[4],s[5],s[6])):(n.setFullYear(s[0],s[1],s[2]),n.setHours(s[3],s[4],s[5],s[6])),t._d=n}}function w(t){var e,n,s=t._f.match(E),i=t._i;for(t._a=[],e=0;eo&&(u=o,s=n);a(t,s)}function v(t){var e,n=t._i,s=K.exec(n);if(s){for(t._f="YYYY-MM-DD"+(s[2]||" "),e=0;4>e;e++)if(te[e][1].exec(n)){t._f+=te[e][0];break}j.exec(n)&&(t._f+=" Z"),w(t)}else t._d=new Date(n)}function T(e){var n=e._i,s=G.exec(n);n===t?e._d=new Date:s?e._d=new Date(+s[1]):"string"==typeof n?v(e):d(n)?(e._a=n.slice(0),Y(e)):e._d=n instanceof Date?new Date(+n):new Date(n)}function b(t,e,n,s,i){return i.relativeTime(e||1,!!n,t,s)}function S(t,e,n){var s=W(Math.abs(t)/1e3),i=W(s/60),r=W(i/60),a=W(r/24),o=W(a/365),u=45>s&&["s",s]||1===i&&["m"]||45>i&&["mm",i]||1===r&&["h"]||22>r&&["hh",r]||1===a&&["d"]||25>=a&&["dd",a]||45>=a&&["M"]||345>a&&["MM",W(a/30)]||1===o&&["y"]||["yy",o];return u[2]=e,u[3]=t>0,u[4]=n,b.apply({},u)}function F(t,e,n){var s,i=n-e,r=n-t.day();return r>i&&(r-=7),i-7>r&&(r+=7),s=H(t).add("d",r),{week:Math.ceil(s.dayOfYear()/7),year:s.year()}}function O(t){var e=t._i,n=t._f;return null===e||""===e?null:("string"==typeof e&&(t._i=e=_().preparse(e)),H.isMoment(e)?(t=a({},e),t._d=new Date(+e._d)):n?d(n)?k(t):w(t):T(t),new i(t))}function z(t,e){H.fn[t]=H.fn[t+"s"]=function(t){var n=this._isUTC?"UTC":"";return null!=t?(this._d["set"+n+e](t),H.updateOffset(this),this):this._d["get"+n+e]()}}function C(t){H.duration.fn[t]=function(){return this._data[t]}}function L(t,e){H.duration.fn["as"+t]=function(){return+this/e}}for(var H,P,U="2.1.0",W=Math.round,x={},A="undefined"!=typeof module&&module.exports,G=/^\/?Date\((\-?\d+)/i,Z=/(\-)?(\d*)?\.?(\d+)\:(\d+)\:(\d+)\.?(\d{3})?/,E=/(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|SS?S?|X|zz?|ZZ?|.)/g,N=/(\[[^\[]*\])|(\\)?(LT|LL?L?L?|l{1,4})/g,J=/\d\d?/,I=/\d{1,3}/,V=/\d{3}/,X=/\d{1,4}/,$=/[+\-]?\d{1,6}/,R=/[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i,j=/Z|[\+\-]\d\d:?\d\d/i,q=/T/i,B=/[\+\-]?\d+(\.\d{1,3})?/,K=/^\s*\d{4}-\d\d-\d\d((T| )(\d\d(:\d\d(:\d\d(\.\d\d?\d?)?)?)?)?([\+\-]\d\d:?\d\d)?)?/,Q="YYYY-MM-DDTHH:mm:ssZ",te=[["HH:mm:ss.S",/(T| )\d\d:\d\d:\d\d\.\d{1,3}/],["HH:mm:ss",/(T| )\d\d:\d\d:\d\d/],["HH:mm",/(T| )\d\d:\d\d/],["HH",/(T| )\d\d/]],ee=/([\+\-]|\d\d)/gi,ne="Date|Hours|Minutes|Seconds|Milliseconds".split("|"),se={Milliseconds:1,Seconds:1e3,Minutes:6e4,Hours:36e5,Days:864e5,Months:2592e6,Years:31536e6},ie={ms:"millisecond",s:"second",m:"minute",h:"hour",d:"day",w:"week",M:"month",y:"year"},re={},ae="DDD w W M D d".split(" "),oe="M D H h m s w W".split(" "),ue={M:function(){return this.month()+1},MMM:function(t){return this.lang().monthsShort(this,t)},MMMM:function(t){return this.lang().months(this,t)},D:function(){return this.date()},DDD:function(){return this.dayOfYear()},d:function(){return this.day()},dd:function(t){return this.lang().weekdaysMin(this,t)},ddd:function(t){return this.lang().weekdaysShort(this,t)},dddd:function(t){return this.lang().weekdays(this,t)},w:function(){return this.week()},W:function(){return this.isoWeek()},YY:function(){return u(this.year()%100,2)},YYYY:function(){return u(this.year(),4)},YYYYY:function(){return u(this.year(),5)},gg:function(){return u(this.weekYear()%100,2)},gggg:function(){return this.weekYear()},ggggg:function(){return u(this.weekYear(),5)},GG:function(){return u(this.isoWeekYear()%100,2)},GGGG:function(){return this.isoWeekYear()},GGGGG:function(){return u(this.isoWeekYear(),5)},e:function(){return this.weekday()},E:function(){return this.isoWeekday()},a:function(){return this.lang().meridiem(this.hours(),this.minutes(),!0)},A:function(){return this.lang().meridiem(this.hours(),this.minutes(),!1)},H:function(){return this.hours()},h:function(){return this.hours()%12||12},m:function(){return this.minutes()},s:function(){return this.seconds()},S:function(){return~~(this.milliseconds()/100)},SS:function(){return u(~~(this.milliseconds()/10),2)},SSS:function(){return u(this.milliseconds(),3)},Z:function(){var t=-this.zone(),e="+";return 0>t&&(t=-t,e="-"),e+u(~~(t/60),2)+":"+u(~~t%60,2)},ZZ:function(){var t=-this.zone(),e="+";return 0>t&&(t=-t,e="-"),e+u(~~(10*t/6),4)},z:function(){return this.zoneAbbr()},zz:function(){return this.zoneName()},X:function(){return this.unix()}};ae.length;)P=ae.pop(),ue[P+"o"]=n(ue[P],P);for(;oe.length;)P=oe.pop(),ue[P+P]=e(ue[P],2);for(ue.DDDD=e(ue.DDD,3),s.prototype={set:function(t){var e,n;for(n in t)e=t[n],"function"==typeof e?this[n]=e:this["_"+n]=e},_months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),months:function(t){return this._months[t.month()]},_monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),monthsShort:function(t){return this._monthsShort[t.month()]},monthsParse:function(t){var e,n,s;for(this._monthsParse||(this._monthsParse=[]),e=0;12>e;e++)if(this._monthsParse[e]||(n=H([2e3,e]),s="^"+this.months(n,"")+"|^"+this.monthsShort(n,""),this._monthsParse[e]=new RegExp(s.replace(".",""),"i")),this._monthsParse[e].test(t))return e},_weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdays:function(t){return this._weekdays[t.day()]},_weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysShort:function(t){return this._weekdaysShort[t.day()]},_weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),weekdaysMin:function(t){return this._weekdaysMin[t.day()]},weekdaysParse:function(t){var e,n,s;for(this._weekdaysParse||(this._weekdaysParse=[]),e=0;7>e;e++)if(this._weekdaysParse[e]||(n=H([2e3,1]).day(e),s="^"+this.weekdays(n,"")+"|^"+this.weekdaysShort(n,"")+"|^"+this.weekdaysMin(n,""),this._weekdaysParse[e]=new RegExp(s.replace(".",""),"i")),this._weekdaysParse[e].test(t))return e},_longDateFormat:{LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D YYYY",LLL:"MMMM D YYYY LT",LLLL:"dddd, MMMM D YYYY LT"},longDateFormat:function(t){var e=this._longDateFormat[t];return!e&&this._longDateFormat[t.toUpperCase()]&&(e=this._longDateFormat[t.toUpperCase()].replace(/MMMM|MM|DD|dddd/g,function(t){return t.slice(1)}),this._longDateFormat[t]=e),e},isPM:function(t){return"p"===(t+"").toLowerCase()[0]},_meridiemParse:/[ap]\.?m?\.?/i,meridiem:function(t,e,n){return t>11?n?"pm":"PM":n?"am":"AM"},_calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},calendar:function(t,e){var n=this._calendar[t];return"function"==typeof n?n.apply(e):n},_relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},relativeTime:function(t,e,n,s){var i=this._relativeTime[n];return"function"==typeof i?i(t,e,n,s):i.replace(/%d/i,t)},pastFuture:function(t,e){var n=this._relativeTime[t>0?"future":"past"];return"function"==typeof n?n(e):n.replace(/%s/i,e)},ordinal:function(t){return this._ordinal.replace("%d",t)},_ordinal:"%d",preparse:function(t){return t},postformat:function(t){return t},week:function(t){return F(t,this._week.dow,this._week.doy).week},_week:{dow:0,doy:6}},H=function(t,e,n){return O({_i:t,_f:e,_l:n,_isUTC:!1})},H.utc=function(t,e,n){return O({_useUTC:!0,_isUTC:!0,_l:n,_i:t,_f:e})},H.unix=function(t){return H(1e3*t)},H.duration=function(t,e){var n,s,i=H.isDuration(t),a="number"==typeof t,o=i?t._input:a?{}:t,u=Z.exec(t);return a?e?o[e]=t:o.milliseconds=t:u&&(n="-"===u[1]?-1:1,o={y:0,d:~~u[2]*n,h:~~u[3]*n,m:~~u[4]*n,s:~~u[5]*n,ms:~~u[6]*n}),s=new r(o),i&&t.hasOwnProperty("_lang")&&(s._lang=t._lang),s},H.version=U,H.defaultFormat=Q,H.updateOffset=function(){},H.lang=function(t,e){return t?(e?l(t,e):x[t]||_(t),H.duration.fn._lang=H.fn._lang=_(t),void 0):H.fn._lang._abbr},H.langData=function(t){return t&&t._lang&&t._lang._abbr&&(t=t._lang._abbr),_(t)},H.isMoment=function(t){return t instanceof i},H.isDuration=function(t){return t instanceof r},H.fn=i.prototype={clone:function(){return H(this)},valueOf:function(){return+this._d+6e4*(this._offset||0)},unix:function(){return Math.floor(+this/1e3)},toString:function(){return this.format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")},toDate:function(){return this._offset?new Date(+this):this._d},toISOString:function(){return M(H(this).utc(),"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]")},toArray:function(){var t=this;return[t.year(),t.month(),t.date(),t.hours(),t.minutes(),t.seconds(),t.milliseconds()]},isValid:function(){return null==this._isValid&&(this._isValid=this._a?!c(this._a,(this._isUTC?H.utc(this._a):H(this._a)).toArray()):!isNaN(this._d.getTime())),!!this._isValid},utc:function(){return this.zone(0)},local:function(){return this.zone(0),this._isUTC=!1,this},format:function(t){var e=M(this,t||H.defaultFormat);return this.lang().postformat(e)},add:function(t,e){var n;return n="string"==typeof t?H.duration(+e,t):H.duration(t,e),h(this,n,1),this},subtract:function(t,e){var n;return n="string"==typeof t?H.duration(+e,t):H.duration(t,e),h(this,n,-1),this},diff:function(t,e,n){var s,i,r=this._isUTC?H(t).zone(this._offset||0):H(t).local(),a=6e4*(this.zone()-r.zone());return e=f(e),"year"===e||"month"===e?(s=432e5*(this.daysInMonth()+r.daysInMonth()),i=12*(this.year()-r.year())+(this.month()-r.month()),i+=(this-H(this).startOf("month")-(r-H(r).startOf("month")))/s,i-=6e4*(this.zone()-H(this).startOf("month").zone()-(r.zone()-H(r).startOf("month").zone()))/s,"year"===e&&(i/=12)):(s=this-r,i="second"===e?s/1e3:"minute"===e?s/6e4:"hour"===e?s/36e5:"day"===e?(s-a)/864e5:"week"===e?(s-a)/6048e5:s),n?i:o(i)},from:function(t,e){return H.duration(this.diff(t)).lang(this.lang()._abbr).humanize(!e)},fromNow:function(t){return this.from(H(),t)},calendar:function(){var t=this.diff(H().startOf("day"),"days",!0),e=-6>t?"sameElse":-1>t?"lastWeek":0>t?"lastDay":1>t?"sameDay":2>t?"nextDay":7>t?"nextWeek":"sameElse";return this.format(this.lang().calendar(e,this))},isLeapYear:function(){var t=this.year();return 0===t%4&&0!==t%100||0===t%400},isDST:function(){return this.zone()+H(t).startOf(e)},isBefore:function(t,e){return e="undefined"!=typeof e?e:"millisecond",+this.clone().startOf(e)<+H(t).startOf(e)},isSame:function(t,e){return e="undefined"!=typeof e?e:"millisecond",+this.clone().startOf(e)===+H(t).startOf(e)},min:function(t){return t=H.apply(null,arguments),this>t?this:t},max:function(t){return t=H.apply(null,arguments),t>this?this:t},zone:function(t){var e=this._offset||0;return null==t?this._isUTC?e:this._d.getTimezoneOffset():("string"==typeof t&&(t=p(t)),Math.abs(t)<16&&(t=60*t),this._offset=t,this._isUTC=!0,e!==t&&h(this,H.duration(e-t,"m"),1,!0),this)},zoneAbbr:function(){return this._isUTC?"UTC":""},zoneName:function(){return this._isUTC?"Coordinated Universal Time":""},daysInMonth:function(){return H.utc([this.year(),this.month()+1,0]).date()},dayOfYear:function(t){var e=W((H(this).startOf("day")-H(this).startOf("year"))/864e5)+1;return null==t?e:this.add("d",t-e)},weekYear:function(t){var e=F(this,this.lang()._week.dow,this.lang()._week.doy).year;return null==t?e:this.add("y",t-e)},isoWeekYear:function(t){var e=F(this,1,4).year;return null==t?e:this.add("y",t-e)},week:function(t){var e=this.lang().week(this);return null==t?e:this.add("d",7*(t-e))},isoWeek:function(t){var e=F(this,1,4).week;return null==t?e:this.add("d",7*(t-e))},weekday:function(t){var e=(this._d.getDay()+7-this.lang()._week.dow)%7;return null==t?e:this.add("d",t-e)},isoWeekday:function(t){return null==t?this.day()||7:this.day(this.day()%7?t:t-7)},lang:function(e){return e===t?this._lang:(this._lang=_(e),this)}},P=0;P 0 && phantom.args[0] === "--verbose") {
-    verbose = true;
-    optIdx = 1;
-  }
-  if (phantom.args.length == optIdx + 1) {
-    var parts = phantom.args[optIdx].split('.');
-    if (2 != parts.length) {
-      console.warn('Usage: phantomjs phantom-driver.js [--verbose] [testCase.test]');
-      phantom.exit();
-    }
-    testCase = parts[0];
-    test = parts[1];
-  }
-
-  var loggingOn = false;
-
-  page.onConsoleMessage = function (msg) {
-    if (msg == 'Running ' + test) {
-      loggingOn = true;
-    } else if (msg.substr(0, 'Running'.length) == 'Running') {
-      loggingOn = false;
-    }
-    if (verbose || loggingOn) console.log(msg);
-  };
-
-  page.onError = function (msg, trace) {
-    console.log(msg);
-    trace.forEach(function(item) {
-        console.log('  ', item.file, ':', item.line);
-    })
-  };
-
-  var results;
-  
-  // Run all tests.
-  var start = new Date().getTime();
-  results = page.evaluate(function() {
-    var num_passing = 0, num_failing = 0;
-    var failures = [];
-    // Phantom doesn't like stacktrace.js using the "arguments" object
-    // in stacktrace.js, which it interprets in strict mode.
-    printStackTrace = undefined;
-
-    jstestdriver.attachListener({
-      finish : function(tc, name, result, e) {
-        console.log("Result:", tc.name, name, result, e);
-        if (result) {
-          // console.log(testCase + '.' + test + ' passed');
-          num_passing++;
-        } else {
-          num_failing++;
-          failures.push(tc.name + '.' + name);
-        }
-      }
-    });
-    var testCases = getAllTestCases();
-    for (var idx in testCases) {
-      var entry = testCases[idx];
-
-      var prototype = entry.testCase;
-      var tc = new entry.testCase();
-      var result = tc.runAllTests();
-    }
-    return {
-      num_passing : num_passing,
-      num_failing : num_failing,
-      failures : failures
-    };
-  });
-  var end = new Date().getTime();
-  var elapsed = (end - start) / 1000;
-
-  console.log('Ran ' + (results.num_passing + results.num_failing) + ' tests in ' + elapsed + 's.');
-  console.log(results.num_passing + ' test(s) passed');
-  console.log(results.num_failing + ' test(s) failed:');
-  for (var i = 0; i < results.failures.length; i++) {
-    // TODO(danvk): print an auto_test/misc/local URL that runs this test.
-    console.log('  ' + results.failures[i] + ' failed.');
-  }
-
-  done_callback(results.num_failing, results.num_passing);
-});
-
-};
-
-// Load all "tests/" pages.
-var LoadAllManualTests = function(totally_done_callback) {
-
-var fs = require('fs');
-var tests = fs.list('tests');
-var pages = [];
-
-function make_barrier_closure(n, fn) {
-  var calls = 0;
-  return function() {
-    calls++;
-    if (calls == n) {
-      fn();
-    } else {
-      // console.log('' + calls + ' done, ' + (n - calls) + ' remain');
-    }
-  };
-}
-
-var tasks = [];
-for (var i = 0; i < tests.length; i++) {
-  if (tests[i].substr(-5) != '.html') continue;
-  tasks.push(tests[i]);
-}
-tasks = [ 'independent-series.html' ];
-
-var loaded_page = make_barrier_closure(tasks.length, function() {
-  // Wait 2 secs to allow JS errors to happen after page load.
-  setTimeout(function() {
-    var success = 0, failures = 0;
-    for (var i = 0; i < pages.length; i++) {
-      if (pages[i].success && !pages[i].hasErrors) {
-        success++;
-      } else {
-        failures++;
-      }
-    }
-    console.log('Successfully loaded ' + success + ' / ' +
-                (success + failures) + ' test pages.');
-    totally_done_callback(failures, success);
-  }, 2000);
-});
-
-
-for (var i = 0; i < tasks.length; i++) {
-  var url = 'file://' + fs.absolute('tests/' + tasks[i]);
-  pages.push(function(path, url) {
-    var page = require('webpage').create();
-    page.success = false;
-    page.hasErrors = false;
-    page.onError = function (msg, trace) {
-      console.log(path + ': ' + msg);
-      page.hasErrors = true;
-      trace.forEach(function(item) {
-        console.log('  ', item.file, ':', item.line);
-      });
-    };
-    page.onLoadFinished = function(status) {
-      if (status == 'success') {
-        page.success = true;
-      }
-      if (!page.done) loaded_page();
-      page.done = true;
-    };
-    page.open(url);
-    return page;
-  }(tasks[i], url));
-}
-
-};
-
-
-// First run all auto_tests.
-// If they all pass, load the manual tests.
-RunAllAutoTests(function(num_failing, num_passing) {
-  if (num_failing !== 0) {
-    console.log('FAIL');
-    phantom.exit();
-  } else {
-    console.log('PASS');
-  }
-  phantom.exit();
-
-  // This is not yet reliable enough to be useful:
-  /*
-  LoadAllManualTests(function(failing, passing) {
-    if (failing !== 0) {
-      console.log('FAIL');
-    } else {
-      console.log('PASS');
-    }
-    phantom.exit();
-  });
-  */
-});
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/phantom-perf.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/phantom-perf.js
deleted file mode 100644
index b98c3f03a..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/phantom-perf.js
+++ /dev/null
@@ -1,94 +0,0 @@
-// dygraphs command-line performance benchmark.
-//
-// Invoke as:
-//
-//   phantomjs phantom-perf.js 1000 100 5
-//
-// If the test succeeds, it will print out something like:
-//
-//   1000/100/5: 1309.4+/-43.4 ms (1284, 1245, 1336, 1346, 1336)
-//
-// This is mean +/- standard deviation, followed by a list of the individual
-// times for each repetition, in milliseconds.
-
-var system = require('system'),
-    fs = require('fs');
-
-var tmpfile = "tmp-dygraph-test-params.js";
-var url = 'tests/dygraph-many-points-benchmark.html';
-
-function fail(msg){
-  console.warn(msg);
-  phantom.exit(1);
-}
-
-function assert(condition, msg){
-  if (condition) return;
-  fail(msg);
-}
-
-var config_file_template =
-    "document.getElementById('points').value = (points);\n" +
-    "document.getElementById('series').value = (series);\n" +
-    "document.getElementById('repetitions').value = (repetitions);\n";
-
-var RunBenchmark = function(points, series, repetitions, done_callback) {
-  var page = require('webpage').create();
-
-  // page.evalute() is seriously locked down.
-  // This was the only way I could find to pass the parameters to the page.
-  fs.write(tmpfile,
-      config_file_template
-        .replace("(points)", points)
-        .replace("(series)", series)
-        .replace("(repetitions)", repetitions),
-      "w");
-
-  page.open(url, function(status) {
-    if (status !== 'success') {
-      console.warn('Page status: ' + status);
-      console.log(page);
-      phantom.exit();
-    }
-
-    assert(page.injectJs(tmpfile), "Unable to inject JS.");
-    fs.remove(tmpfile);
-
-    var start = new Date().getTime();
-    var rep_times = page.evaluate(function() {
-      var rep_times = updatePlot();
-      return rep_times;
-    });
-    var end = new Date().getTime();
-    var elapsed = (end - start) / 1000;
-    done_callback(rep_times);
-  });
-};
-
-
-var points, series, repetitions;
-if (4 != system.args.length) {
-  console.warn('Usage: phantomjs phantom-driver.js (points) (series) (repititions)');
-  phantom.exit();
-}
-
-points = parseInt(system.args[1]);
-series = parseInt(system.args[2]);
-repetitions = parseInt(system.args[3]);
-assert(points != null, "Couldn't parse " + system.args[1]);
-assert(series != null, "Couldn't parse " + system.args[2]);
-assert(repetitions != null, "Couldn't parse " + system.args[3]);
-
-
-RunBenchmark(points, series, repetitions, function(rep_times) {
-  var mean = 0.0, std = 0.0;
-  rep_times.forEach(function(x) { mean += x; } );
-  mean /= rep_times.length;
-  rep_times.forEach(function(x) { std += Math.pow(x - mean, 2); });
-  std = Math.sqrt(std / (rep_times.length - 1));
-
-  console.log(points + '/' + series + '/' + repetitions + ': ' +
-      mean.toFixed(1) + '+/-' + std.toFixed(1) + ' ms (' +
-      rep_times.join(', ') + ')');
-  phantom.exit();
-});
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/plugins/README b/vid/src/main/webapp/static/fusion/raptor/dy3/js/plugins/README
deleted file mode 100644
index f216545b8..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/plugins/README
+++ /dev/null
@@ -1,113 +0,0 @@
-dygraphs plugins
-----------------
-
-A single dygraph is actually a collection of dygraphs plugins, each responsible
-for some portion of the chart: the plot area, the axes, the legend, the labels,
-etc.
-
-This forces the dygraphs code to be more modular and encourages better APIs.
-
-The "legend" plugin (plugins/legend.js) can be used as a template for new
-plugins.
-
-Here is a simplified version of it, with comments to explain the plugin
-lifecycle and APIs:
-
-----------------
-
-// (standard JavaScript library wrapper; prevents polluting global namespace)
-Dygraph.Plugins.Legend = (function() {
-
-// Plugin constructor. This is invoked once for every chart which uses the
-// plugin. You can't actually access the Dygraph object at this point, so the
-// initialization you do here shouldn't be chart-specific. (For that, use
-// the activate() method).
-var legend = function() {
-  this.div_ = null;
-};
-
-// Plugins are expected to implement this method for debugging purposes.
-legend.toString = function() {
-  return "Legend";
-};
-
-// This is called once the dygraph is ready. The chart data may not be
-// available yet, but the options specified in the constructor are.
-// 
-// Proper tasks to do here include:
-// - Reading your own options
-// - DOM manipulation
-// - Registering event listeners
-//
-// "dygraph" is the Dygraph object for which this instance is being activated.
-// "registerer" allows you to register event listeners.
-legend.prototype.activate = function(dygraph, registerer) {
-  // Create the legend div and attach it to the chart DOM.
-  this.div_ = document.createElement("div");
-  dygraph.graphDiv.appendChild(this.div_);
-
-  // Add event listeners. These will be called whenever points are selected
-  // (i.e. you hover over them) or deselected (i.e. you mouse away from the
-  // chart). This is your only chance to register event listeners! Once this
-  // method returns, the gig is up.
-  registerer.addEventListener('select', legend.select);
-  registerer.addEventListener('deselect', legend.deselect);
-};
-
-// The functions called by event listeners all take a single parameter, an
-// event object. This contains properties relevant to the particular event, but
-// you can always assume that it has:
-//
-// 1. A "dygraph" parameter which is a reference to the chart on which the
-//    event took place.
-// 2. A "stopPropagation" method, which you can call to prevent the event from
-//    being seen by any other plugins after you. This effectively cancels the
-//    event.
-// 3. A "preventDefault" method, which prevents dygraphs from performing the
-//    default action associated with this event.
-//
-legend.select = function(e) {
-  // These are two of the properties specific to the "select" event object:
-  var xValue = e.selectedX;
-  var points = e.selectedPoints;
-
-  var html = xValue + ':';
-  for (var i = 0; i < points.length; i++) {
-    var point = points[i];
-    html += ' ' + point.name + ':' + point.yval;
-  }
-
-  // In an event listener, "this" refers to your plugin object.
-  this.div_.innerHTML = html;
-};
-
-// This clears out the legend when the user mouses away from the chart.
-legend.deselect = function(e) {
-  this.div_.innerHTML = '';
-};
-
-return legend;
-})();
-
-----------------
-
-Plugin Events Reference:
-
-- predraw
-- clearChart
-- drawChart
-- select
-- deselect
-
-TODO(danvk): document all event properties for each event.
-
-
-Special methods:
-- (constructor)
-- activate
-- destroy
-
-
-----------------
-
-Notes on plugin registration and event cascade ordering/behavior.
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/plugins/annotations.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/plugins/annotations.js
deleted file mode 100644
index 857610403..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/plugins/annotations.js
+++ /dev/null
@@ -1,182 +0,0 @@
-/**
- * @license
- * Copyright 2012 Dan Vanderkam (danvdk@gmail.com)
- * MIT-licensed (http://opensource.org/licenses/MIT)
- */
-
-/*global Dygraph:false */
-
-Dygraph.Plugins.Annotations = (function() {
-
-"use strict";
-
-/**
-Current bits of jankiness:
-- Uses dygraph.layout_ to get the parsed annotations.
-- Uses dygraph.plotter_.area
-
-It would be nice if the plugin didn't require so much special support inside
-the core dygraphs classes, but annotations involve quite a bit of parsing and
-layout.
-
-TODO(danvk): cache DOM elements.
-
-*/
-
-var annotations = function() {
-  this.annotations_ = [];
-};
-
-annotations.prototype.toString = function() {
-  return "Annotations Plugin";
-};
-
-annotations.prototype.activate = function(g) {
-  return {
-    clearChart: this.clearChart,
-    didDrawChart: this.didDrawChart
-  };
-};
-
-annotations.prototype.detachLabels = function() {
-  for (var i = 0; i < this.annotations_.length; i++) {
-    var a = this.annotations_[i];
-    if (a.parentNode) a.parentNode.removeChild(a);
-    this.annotations_[i] = null;
-  }
-  this.annotations_ = [];
-};
-
-annotations.prototype.clearChart = function(e) {
-  this.detachLabels();
-};
-
-annotations.prototype.didDrawChart = function(e) {
-  var g = e.dygraph;
-
-  // Early out in the (common) case of zero annotations.
-  var points = g.layout_.annotated_points;
-  if (!points || points.length === 0) return;
-
-  var containerDiv = e.canvas.parentNode;
-  var annotationStyle = {
-    "position": "absolute",
-    "fontSize": g.getOption('axisLabelFontSize') + "px",
-    "zIndex": 10,
-    "overflow": "hidden"
-  };
-
-  var bindEvt = function(eventName, classEventName, pt) {
-    return function(annotation_event) {
-      var a = pt.annotation;
-      if (a.hasOwnProperty(eventName)) {
-        a[eventName](a, pt, g, annotation_event);
-      } else if (g.getOption(classEventName)) {
-        g.getOption(classEventName)(a, pt, g, annotation_event );
-      }
-    };
-  };
-
-  // Add the annotations one-by-one.
-  var area = e.dygraph.plotter_.area;
-
-  // x-coord to sum of previous annotation's heights (used for stacking).
-  var xToUsedHeight = {};
-
-  for (var i = 0; i < points.length; i++) {
-    var p = points[i];
-    if (p.canvasx < area.x || p.canvasx > area.x + area.w ||
-        p.canvasy < area.y || p.canvasy > area.y + area.h) {
-      continue;
-    }
-
-    var a = p.annotation;
-    var tick_height = 6;
-    if (a.hasOwnProperty("tickHeight")) {
-      tick_height = a.tickHeight;
-    }
-
-    var div = document.createElement("div");
-    for (var name in annotationStyle) {
-      if (annotationStyle.hasOwnProperty(name)) {
-        div.style[name] = annotationStyle[name];
-      }
-    }
-    if (!a.hasOwnProperty('icon')) {
-      div.className = "dygraphDefaultAnnotation";
-    }
-    if (a.hasOwnProperty('cssClass')) {
-      div.className += " " + a.cssClass;
-    }
-
-    var width = a.hasOwnProperty('width') ? a.width : 16;
-    var height = a.hasOwnProperty('height') ? a.height : 16;
-    if (a.hasOwnProperty('icon')) {
-      var img = document.createElement("img");
-      img.src = a.icon;
-      img.width = width;
-      img.height = height;
-      div.appendChild(img);
-    } else if (p.annotation.hasOwnProperty('shortText')) {
-      div.appendChild(document.createTextNode(p.annotation.shortText));
-    }
-    var left = p.canvasx - width / 2;
-    div.style.left = left + "px";
-    var divTop = 0;
-    if (a.attachAtBottom) {
-      var y = (area.y + area.h - height - tick_height);
-      if (xToUsedHeight[left]) {
-        y -= xToUsedHeight[left];
-      } else {
-        xToUsedHeight[left] = 0;
-      }
-      xToUsedHeight[left] += (tick_height + height);
-      divTop = y;
-    } else {
-      divTop = p.canvasy - height - tick_height;
-    }
-    div.style.top = divTop + "px";
-    div.style.width = width + "px";
-    div.style.height = height + "px";
-    div.title = p.annotation.text;
-    div.style.color = g.colorsMap_[p.name];
-    div.style.borderColor = g.colorsMap_[p.name];
-    a.div = div;
-
-    g.addAndTrackEvent(div, 'click',
-        bindEvt('clickHandler', 'annotationClickHandler', p, this));
-    g.addAndTrackEvent(div, 'mouseover',
-        bindEvt('mouseOverHandler', 'annotationMouseOverHandler', p, this));
-    g.addAndTrackEvent(div, 'mouseout',
-        bindEvt('mouseOutHandler', 'annotationMouseOutHandler', p, this));
-    g.addAndTrackEvent(div, 'dblclick',
-        bindEvt('dblClickHandler', 'annotationDblClickHandler', p, this));
-
-    containerDiv.appendChild(div);
-    this.annotations_.push(div);
-
-    var ctx = e.drawingContext;
-    ctx.save();
-    ctx.strokeStyle = g.colorsMap_[p.name];
-    ctx.beginPath();
-    if (!a.attachAtBottom) {
-      ctx.moveTo(p.canvasx, p.canvasy);
-      ctx.lineTo(p.canvasx, p.canvasy - 2 - tick_height);
-    } else {
-      var y = divTop + height;
-      ctx.moveTo(p.canvasx, y);
-      ctx.lineTo(p.canvasx, y + tick_height);
-    }
-    ctx.closePath();
-    ctx.stroke();
-    ctx.restore();
-  }
-};
-
-annotations.prototype.destroy = function() {
-  this.detachLabels();
-};
-
-return annotations;
-
-})();
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/plugins/axes.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/plugins/axes.js
deleted file mode 100644
index cacda86e8..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/plugins/axes.js
+++ /dev/null
@@ -1,315 +0,0 @@
-/**
- * @license
- * Copyright 2012 Dan Vanderkam (danvdk@gmail.com)
- * MIT-licensed (http://opensource.org/licenses/MIT)
- */
-
-/*global Dygraph:false */
-
-Dygraph.Plugins.Axes = (function() {
-
-"use strict";
-
-/*
-Bits of jankiness:
-- Direct layout access
-- Direct area access
-- Should include calculation of ticks, not just the drawing.
-
-Options left to make axis-friendly.
-  ('axisTickSize')
-  ('drawAxesAtZero')
-  ('xAxisHeight')
-
-These too. What is the difference between axisLablelWidth and {x,y}AxisLabelWidth?
-  ('axisLabelWidth')
-  ('xAxisLabelWidth')
-  ('yAxisLabelWidth')
-*/
-
-/**
- * Draws the axes. This includes the labels on the x- and y-axes, as well
- * as the tick marks on the axes.
- * It does _not_ draw the grid lines which span the entire chart.
- */
-var axes = function() {
-  this.xlabels_ = [];
-  this.ylabels_ = [];
-};
-
-axes.prototype.toString = function() {
-  return "Axes Plugin";
-};
-
-axes.prototype.activate = function(g) {
-  return {
-    layout: this.layout,
-    clearChart: this.clearChart,
-    willDrawChart: this.willDrawChart
-  };
-};
-
-axes.prototype.layout = function(e) {
-  var g = e.dygraph;
-
-  if (g.getOption('drawYAxis')) {
-    var w = g.getOption('yAxisLabelWidth') + 2 * g.getOption('axisTickSize');
-    e.reserveSpaceLeft(w);
-  }
-
-  if (g.getOption('drawXAxis')) {
-    var h;
-    // NOTE: I think this is probably broken now, since g.getOption() now
-    // hits the dictionary. (That is, g.getOption('xAxisHeight') now always
-    // has a value.)
-    if (g.getOption('xAxisHeight')) {
-      h = g.getOption('xAxisHeight');
-    } else {
-      h = g.getOptionForAxis('axisLabelFontSize', 'x') + 2 * g.getOption('axisTickSize');
-    }
-    e.reserveSpaceBottom(h);
-  }
-
-  if (g.numAxes() == 2) {
-    // TODO(danvk): introduce a 'drawAxis' per-axis property.
-    if (g.getOption('drawYAxis')) {
-      // TODO(danvk): per-axis setting.
-      var w = g.getOption('yAxisLabelWidth') + 2 * g.getOption('axisTickSize');
-      e.reserveSpaceRight(w);
-    }
-  } else if (g.numAxes() > 2) {
-    g.error("Only two y-axes are supported at this time. (Trying " +
-            "to use " + g.numAxes() + ")");
-  }
-};
-
-axes.prototype.detachLabels = function() {
-  function removeArray(ary) {
-    for (var i = 0; i < ary.length; i++) {
-      var el = ary[i];
-      if (el.parentNode) el.parentNode.removeChild(el);
-    }
-  }
-
-  removeArray(this.xlabels_);
-  removeArray(this.ylabels_);
-  this.xlabels_ = [];
-  this.ylabels_ = [];
-};
-
-axes.prototype.clearChart = function(e) {
-  this.detachLabels();
-};
-
-axes.prototype.willDrawChart = function(e) {
-  var g = e.dygraph;
-  if (!g.getOption('drawXAxis') && !g.getOption('drawYAxis')) return;
-  
-  // Round pixels to half-integer boundaries for crisper drawing.
-  function halfUp(x)  { return Math.round(x) + 0.5; }
-  function halfDown(y){ return Math.round(y) - 0.5; }
-
-  var context = e.drawingContext;
-  var containerDiv = e.canvas.parentNode;
-  var canvasWidth = e.canvas.width;
-  var canvasHeight = e.canvas.height;
-
-  var label, x, y, tick, i;
-
-  var makeLabelStyle = function(axis) {
-    return {
-      position: "absolute",
-      fontSize: g.getOptionForAxis('axisLabelFontSize', axis) + "px",
-      zIndex: 10,
-      color: g.getOptionForAxis('axisLabelColor', axis),
-      width: g.getOption('axisLabelWidth') + "px",
-      // height: g.getOptionForAxis('axisLabelFontSize', 'x') + 2 + "px",
-      lineHeight: "normal",  // Something other than "normal" line-height screws up label positioning.
-      overflow: "hidden"
-    };
-  };
-
-  var labelStyles = {
-    x : makeLabelStyle('x'),
-    y : makeLabelStyle('y'),
-    y2 : makeLabelStyle('y2')
-  };
-
-  var makeDiv = function(txt, axis, prec_axis) {
-    /*
-     * This seems to be called with the following three sets of axis/prec_axis:
-     * x: undefined
-     * y: y1
-     * y: y2
-     */
-    var div = document.createElement("div");
-    var labelStyle = labelStyles[prec_axis == 'y2' ? 'y2' : axis];
-    for (var name in labelStyle) {
-      if (labelStyle.hasOwnProperty(name)) {
-        div.style[name] = labelStyle[name];
-      }
-    }
-    var inner_div = document.createElement("div");
-    inner_div.className = 'dygraph-axis-label' +
-                          ' dygraph-axis-label-' + axis +
-                          (prec_axis ? ' dygraph-axis-label-' + prec_axis : '');
-    inner_div.innerHTML = txt;
-    div.appendChild(inner_div);
-    return div;
-  };
-
-  // axis lines
-  context.save();
-
-  var layout = g.layout_;
-  var area = e.dygraph.plotter_.area;
-
-  if (g.getOption('drawYAxis')) {
-    if (layout.yticks && layout.yticks.length > 0) {
-      var num_axes = g.numAxes();
-      for (i = 0; i < layout.yticks.length; i++) {
-        tick = layout.yticks[i];
-        if (typeof(tick) == "function") return;
-        x = area.x;
-        var sgn = 1;
-        var prec_axis = 'y1';
-        if (tick[0] == 1) {  // right-side y-axis
-          x = area.x + area.w;
-          sgn = -1;
-          prec_axis = 'y2';
-        }
-        var fontSize = g.getOptionForAxis('axisLabelFontSize', prec_axis);
-        y = area.y + tick[1] * area.h;
-
-        /* Tick marks are currently clipped, so don't bother drawing them.
-        context.beginPath();
-        context.moveTo(halfUp(x), halfDown(y));
-        context.lineTo(halfUp(x - sgn * this.attr_('axisTickSize')), halfDown(y));
-        context.closePath();
-        context.stroke();
-        */
-
-        label = makeDiv(tick[2], 'y', num_axes == 2 ? prec_axis : null);
-        var top = (y - fontSize / 2);
-        if (top < 0) top = 0;
-
-        if (top + fontSize + 3 > canvasHeight) {
-          label.style.bottom = "0px";
-        } else {
-          label.style.top = top + "px";
-        }
-        if (tick[0] === 0) {
-          label.style.left = (area.x - g.getOption('yAxisLabelWidth') - g.getOption('axisTickSize')) + "px";
-          label.style.textAlign = "right";
-        } else if (tick[0] == 1) {
-          label.style.left = (area.x + area.w +
-                              g.getOption('axisTickSize')) + "px";
-          label.style.textAlign = "left";
-        }
-        label.style.width = g.getOption('yAxisLabelWidth') + "px";
-        containerDiv.appendChild(label);
-        this.ylabels_.push(label);
-      }
-
-      // The lowest tick on the y-axis often overlaps with the leftmost
-      // tick on the x-axis. Shift the bottom tick up a little bit to
-      // compensate if necessary.
-      var bottomTick = this.ylabels_[0];
-      // Interested in the y2 axis also?
-      var fontSize = g.getOptionForAxis('axisLabelFontSize', "y");
-      var bottom = parseInt(bottomTick.style.top, 10) + fontSize;
-      if (bottom > canvasHeight - fontSize) {
-        bottomTick.style.top = (parseInt(bottomTick.style.top, 10) -
-            fontSize / 2) + "px";
-      }
-    }
-
-    // draw a vertical line on the left to separate the chart from the labels.
-    var axisX;
-    if (g.getOption('drawAxesAtZero')) {
-      var r = g.toPercentXCoord(0);
-      if (r > 1 || r < 0 || isNaN(r)) r = 0;
-      axisX = halfUp(area.x + r * area.w);
-    } else {
-      axisX = halfUp(area.x);
-    }
-
-    context.strokeStyle = g.getOptionForAxis('axisLineColor', 'y');
-    context.lineWidth = g.getOptionForAxis('axisLineWidth', 'y');
-
-    context.beginPath();
-    context.moveTo(axisX, halfDown(area.y));
-    context.lineTo(axisX, halfDown(area.y + area.h));
-    context.closePath();
-    context.stroke();
-
-    // if there's a secondary y-axis, draw a vertical line for that, too.
-    if (g.numAxes() == 2) {
-      context.strokeStyle = g.getOptionForAxis('axisLineColor', 'y2');
-      context.lineWidth = g.getOptionForAxis('axisLineWidth', 'y2');
-      context.beginPath();
-      context.moveTo(halfDown(area.x + area.w), halfDown(area.y));
-      context.lineTo(halfDown(area.x + area.w), halfDown(area.y + area.h));
-      context.closePath();
-      context.stroke();
-    }
-  }
-
-  if (g.getOption('drawXAxis')) {
-    if (layout.xticks) {
-      for (i = 0; i < layout.xticks.length; i++) {
-        tick = layout.xticks[i];
-        x = area.x + tick[0] * area.w;
-        y = area.y + area.h;
-
-        /* Tick marks are currently clipped, so don't bother drawing them.
-        context.beginPath();
-        context.moveTo(halfUp(x), halfDown(y));
-        context.lineTo(halfUp(x), halfDown(y + this.attr_('axisTickSize')));
-        context.closePath();
-        context.stroke();
-        */
-
-        label = makeDiv(tick[1], 'x');
-        label.style.textAlign = "center";
-        label.style.top = (y + g.getOption('axisTickSize')) + 'px';
-
-        var left = (x - g.getOption('axisLabelWidth')/2);
-        if (left + g.getOption('axisLabelWidth') > canvasWidth) {
-          left = canvasWidth - g.getOption('xAxisLabelWidth');
-          label.style.textAlign = "right";
-        }
-        if (left < 0) {
-          left = 0;
-          label.style.textAlign = "left";
-        }
-
-        label.style.left = left + "px";
-        label.style.width = g.getOption('xAxisLabelWidth') + "px";
-        containerDiv.appendChild(label);
-        this.xlabels_.push(label);
-      }
-    }
-
-    context.strokeStyle = g.getOptionForAxis('axisLineColor', 'x');
-    context.lineWidth = g.getOptionForAxis('axisLineWidth', 'x');
-    context.beginPath();
-    var axisY;
-    if (g.getOption('drawAxesAtZero')) {
-      var r = g.toPercentYCoord(0, 0);
-      if (r > 1 || r < 0) r = 1;
-      axisY = halfDown(area.y + r * area.h);
-    } else {
-      axisY = halfDown(area.y + area.h);
-    }
-    context.moveTo(halfUp(area.x), axisY);
-    context.lineTo(halfUp(area.x + area.w), axisY);
-    context.closePath();
-    context.stroke();
-  }
-
-  context.restore();
-};
-
-return axes;
-})();
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/plugins/chart-labels.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/plugins/chart-labels.js
deleted file mode 100644
index da231d806..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/plugins/chart-labels.js
+++ /dev/null
@@ -1,202 +0,0 @@
-/**
- * @license
- * Copyright 2012 Dan Vanderkam (danvdk@gmail.com)
- * MIT-licensed (http://opensource.org/licenses/MIT)
- */
-/*global Dygraph:false */
-
-Dygraph.Plugins.ChartLabels = (function() {
-
-"use strict";
-
-// TODO(danvk): move chart label options out of dygraphs and into the plugin.
-// TODO(danvk): only tear down & rebuild the DIVs when it's necessary.
-
-var chart_labels = function() {
-  this.title_div_ = null;
-  this.xlabel_div_ = null;
-  this.ylabel_div_ = null;
-  this.y2label_div_ = null;
-};
-
-chart_labels.prototype.toString = function() {
-  return "ChartLabels Plugin";
-};
-
-chart_labels.prototype.activate = function(g) {
-  return {
-    layout: this.layout,
-    // clearChart: this.clearChart,
-    didDrawChart: this.didDrawChart
-  };
-};
-
-// QUESTION: should there be a plugin-utils.js?
-var createDivInRect = function(r) {
-  var div = document.createElement('div');
-  div.style.position = 'absolute';
-  div.style.left = r.x + 'px';
-  div.style.top = r.y + 'px';
-  div.style.width = r.w + 'px';
-  div.style.height = r.h + 'px';
-  return div;
-};
-
-// Detach and null out any existing nodes.
-chart_labels.prototype.detachLabels_ = function() {
-  var els = [ this.title_div_,
-              this.xlabel_div_,
-              this.ylabel_div_,
-              this.y2label_div_ ];
-  for (var i = 0; i < els.length; i++) {
-    var el = els[i];
-    if (!el) continue;
-    if (el.parentNode) el.parentNode.removeChild(el);
-  }
-
-  this.title_div_ = null;
-  this.xlabel_div_ = null;
-  this.ylabel_div_ = null;
-  this.y2label_div_ = null;
-};
-
-var createRotatedDiv = function(g, box, axis, classes, html) {
-  // TODO(danvk): is this outer div actually necessary?
-  var div = document.createElement("div");
-  div.style.position = 'absolute';
-  if (axis == 1) {
-    // NOTE: this is cheating. Should be positioned relative to the box.
-    div.style.left = '0px';
-  } else {
-    div.style.left = box.x + 'px';
-  }
-  div.style.top = box.y + 'px';
-  div.style.width = box.w + 'px';
-  div.style.height = box.h + 'px';
-  div.style.fontSize = (g.getOption('yLabelWidth') - 2) + 'px';
-
-  var inner_div = document.createElement("div");
-  inner_div.style.position = 'absolute';
-  inner_div.style.width = box.h + 'px';
-  inner_div.style.height = box.w + 'px';
-  inner_div.style.top = (box.h / 2 - box.w / 2) + 'px';
-  inner_div.style.left = (box.w / 2 - box.h / 2) + 'px';
-  inner_div.style.textAlign = 'center';
-
-  // CSS rotation is an HTML5 feature which is not standardized. Hence every
-  // browser has its own name for the CSS style.
-  var val = 'rotate(' + (axis == 1 ? '-' : '') + '90deg)';
-  inner_div.style.transform = val;        // HTML5
-  inner_div.style.WebkitTransform = val;  // Safari/Chrome
-  inner_div.style.MozTransform = val;     // Firefox
-  inner_div.style.OTransform = val;       // Opera
-  inner_div.style.msTransform = val;      // IE9
-
-  if (typeof(document.documentMode) !== 'undefined' &&
-      document.documentMode < 9) {
-    // We're dealing w/ an old version of IE, so we have to rotate the text
-    // using a BasicImage transform. This uses a different origin of rotation
-    // than HTML5 rotation (top left of div vs. its center).
-    inner_div.style.filter =
-        'progid:DXImageTransform.Microsoft.BasicImage(rotation=' +
-        (axis == 1 ? '3' : '1') + ')';
-    inner_div.style.left = '0px';
-    inner_div.style.top = '0px';
-  }
-
-  var class_div = document.createElement("div");
-  class_div.className = classes;
-  class_div.innerHTML = html;
-
-  inner_div.appendChild(class_div);
-  div.appendChild(inner_div);
-  return div;
-};
-
-chart_labels.prototype.layout = function(e) {
-  this.detachLabels_();
-
-  var g = e.dygraph;
-  var div = e.chart_div;
-  if (g.getOption('title')) {
-    // QUESTION: should this return an absolutely-positioned div instead?
-    var title_rect = e.reserveSpaceTop(g.getOption('titleHeight'));
-    this.title_div_ = createDivInRect(title_rect);
-    this.title_div_.style.textAlign = 'center';
-    this.title_div_.style.fontSize = (g.getOption('titleHeight') - 8) + 'px';
-    this.title_div_.style.fontWeight = 'bold';
-    this.title_div_.style.zIndex = 10;
-
-    var class_div = document.createElement("div");
-    class_div.className = 'dygraph-label dygraph-title';
-    class_div.innerHTML = g.getOption('title');
-    this.title_div_.appendChild(class_div);
-    div.appendChild(this.title_div_);
-  }
-
-  if (g.getOption('xlabel')) {
-    var x_rect = e.reserveSpaceBottom(g.getOption('xLabelHeight'));
-    this.xlabel_div_ = createDivInRect(x_rect);
-    this.xlabel_div_.style.textAlign = 'center';
-    this.xlabel_div_.style.fontSize = (g.getOption('xLabelHeight') - 2) + 'px';
-
-    var class_div = document.createElement("div");
-    class_div.className = 'dygraph-label dygraph-xlabel';
-    class_div.innerHTML = g.getOption('xlabel');
-    this.xlabel_div_.appendChild(class_div);
-    div.appendChild(this.xlabel_div_);
-  }
-
-  if (g.getOption('ylabel')) {
-    // It would make sense to shift the chart here to make room for the y-axis
-    // label, but the default yAxisLabelWidth is large enough that this results
-    // in overly-padded charts. The y-axis label should fit fine. If it
-    // doesn't, the yAxisLabelWidth option can be increased.
-    var y_rect = e.reserveSpaceLeft(0);
-
-    this.ylabel_div_ = createRotatedDiv(
-        g, y_rect,
-        1,  // primary (left) y-axis
-        'dygraph-label dygraph-ylabel',
-        g.getOption('ylabel'));
-    div.appendChild(this.ylabel_div_);
-  }
-
-  if (g.getOption('y2label') && g.numAxes() == 2) {
-    // same logic applies here as for ylabel.
-    var y2_rect = e.reserveSpaceRight(0);
-    this.y2label_div_ = createRotatedDiv(
-        g, y2_rect,
-        2,  // secondary (right) y-axis
-        'dygraph-label dygraph-y2label',
-        g.getOption('y2label'));
-    div.appendChild(this.y2label_div_);
-  }
-};
-
-chart_labels.prototype.didDrawChart = function(e) {
-  var g = e.dygraph;
-  if (this.title_div_) {
-    this.title_div_.children[0].innerHTML = g.getOption('title');
-  }
-  if (this.xlabel_div_) {
-    this.xlabel_div_.children[0].innerHTML = g.getOption('xlabel');
-  }
-  if (this.ylabel_div_) {
-    this.ylabel_div_.children[0].children[0].innerHTML = g.getOption('ylabel');
-  }
-  if (this.y2label_div_) {
-    this.y2label_div_.children[0].children[0].innerHTML = g.getOption('y2label');
-  }
-};
-
-chart_labels.prototype.clearChart = function() {
-};
-
-chart_labels.prototype.destroy = function() {
-  this.detachLabels_();
-};
-
-
-return chart_labels;
-})();
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/plugins/grid.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/plugins/grid.js
deleted file mode 100644
index 425d93f67..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/plugins/grid.js
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
- * @license
- * Copyright 2012 Dan Vanderkam (danvdk@gmail.com)
- * MIT-licensed (http://opensource.org/licenses/MIT)
- */
-/*global Dygraph:false */
-
-Dygraph.Plugins.Grid = (function() {
-
-/*
-
-Current bits of jankiness:
-- Direct layout access
-- Direct area access
-
-*/
-
-"use strict";
-
-
-/**
- * Draws the gridlines, i.e. the gray horizontal & vertical lines running the
- * length of the chart.
- *
- * @constructor
- */
-var grid = function() {
-};
-
-grid.prototype.toString = function() {
-  return "Gridline Plugin";
-};
-
-grid.prototype.activate = function(g) {
-  return {
-    willDrawChart: this.willDrawChart
-  };
-};
-
-grid.prototype.willDrawChart = function(e) {
-  // Draw the new X/Y grid. Lines appear crisper when pixels are rounded to
-  // half-integers. This prevents them from drawing in two rows/cols.
-  var g = e.dygraph;
-  var ctx = e.drawingContext;
-  var layout = g.layout_;
-  var area = e.dygraph.plotter_.area;
-
-  function halfUp(x)  { return Math.round(x) + 0.5; }
-  function halfDown(y){ return Math.round(y) - 0.5; }
-
-  var x, y, i, ticks;
-  if (g.getOption('drawYGrid')) {
-    var axes = ["y", "y2"];
-    var strokeStyles = [], lineWidths = [], drawGrid = [], stroking = [], strokePattern = [];
-    for (var i = 0; i < axes.length; i++) {
-      drawGrid[i] = g.getOptionForAxis("drawGrid", axes[i]);
-      if (drawGrid[i]) {
-        strokeStyles[i] = g.getOptionForAxis('gridLineColor', axes[i]);
-        lineWidths[i] = g.getOptionForAxis('gridLineWidth', axes[i]);
-        strokePattern[i] = g.getOptionForAxis('gridLinePattern', axes[i]);
-        stroking[i] = strokePattern[i] && (strokePattern[i].length >= 2);
-      }
-    }
-    ticks = layout.yticks;
-    ctx.save();
-    // draw grids for the different y axes
-    for (i = 0; i < ticks.length; i++) {
-      var axis = ticks[i][0];
-      if(drawGrid[axis]) {
-        if (stroking[axis]) {
-          ctx.installPattern(strokePattern[axis]);
-        }
-        ctx.strokeStyle = strokeStyles[axis];
-        ctx.lineWidth = lineWidths[axis];
-
-        x = halfUp(area.x);
-        y = halfDown(area.y + ticks[i][1] * area.h);
-        ctx.beginPath();
-        ctx.moveTo(x, y);
-        ctx.lineTo(x + area.w, y);
-        ctx.closePath();
-        ctx.stroke();
-
-        if (stroking[axis]) {
-          ctx.uninstallPattern();
-        }
-      }
-    }
-    ctx.restore();
-  }
-
-  // draw grid for x axis
-  if (g.getOption('drawXGrid') && g.getOptionForAxis("drawGrid", 'x')) {
-    ticks = layout.xticks;
-    ctx.save();
-    var strokePattern = g.getOptionForAxis('gridLinePattern', 'x');
-    var stroking = strokePattern && (strokePattern.length >= 2);
-    if (stroking) {
-      ctx.installPattern(strokePattern);
-    }
-    ctx.strokeStyle = g.getOptionForAxis('gridLineColor', 'x');
-    ctx.lineWidth = g.getOptionForAxis('gridLineWidth', 'x');
-    for (i = 0; i < ticks.length; i++) {
-      x = halfUp(area.x + ticks[i][0] * area.w);
-      y = halfDown(area.y + area.h);
-      ctx.beginPath();
-      ctx.moveTo(x, y);
-      ctx.lineTo(x, area.y);
-      ctx.closePath();
-      ctx.stroke();
-    }
-    if (stroking) {
-      ctx.uninstallPattern();
-    }
-    ctx.restore();
-  }
-};
-
-grid.prototype.destroy = function() {
-};
-
-return grid;
-
-})();
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/plugins/legend.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/plugins/legend.js
deleted file mode 100644
index 7406f82a9..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/plugins/legend.js
+++ /dev/null
@@ -1,332 +0,0 @@
-/**
- * @license
- * Copyright 2012 Dan Vanderkam (danvdk@gmail.com)
- * MIT-licensed (http://opensource.org/licenses/MIT)
- */
-/*global Dygraph:false */
-
-Dygraph.Plugins.Legend = (function() {
-/*
-
-Current bits of jankiness:
-- Uses two private APIs:
-    1. Dygraph.optionsViewForAxis_
-    2. dygraph.plotter_.area
-- Registers for a "predraw" event, which should be renamed.
-- I call calculateEmWidthInDiv more often than needed.
-
-*/
-
-/*jshint globalstrict: true */
-/*global Dygraph:false */
-"use strict";
-
-
-/**
- * Creates the legend, which appears when the user hovers over the chart.
- * The legend can be either a user-specified or generated div.
- *
- * @constructor
- */
-var legend = function() {
-  this.legend_div_ = null;
-  this.is_generated_div_ = false;  // do we own this div, or was it user-specified?
-};
-
-legend.prototype.toString = function() {
-  return "Legend Plugin";
-};
-
-// (defined below)
-var generateLegendHTML, generateLegendDashHTML;
-
-/**
- * This is called during the dygraph constructor, after options have been set
- * but before the data is available.
- *
- * Proper tasks to do here include:
- * - Reading your own options
- * - DOM manipulation
- * - Registering event listeners
- *
- * @param {Dygraph} g Graph instance.
- * @return {object.} Mapping of event names to callbacks.
- */
-legend.prototype.activate = function(g) {
-  var div;
-  var divWidth = g.getOption('labelsDivWidth');
-
-  var userLabelsDiv = g.getOption('labelsDiv');
-  if (userLabelsDiv && null !== userLabelsDiv) {
-    if (typeof(userLabelsDiv) == "string" || userLabelsDiv instanceof String) {
-      div = document.getElementById(userLabelsDiv);
-    } else {
-      div = userLabelsDiv;
-    }
-  } else {
-    // Default legend styles. These can be overridden in CSS by adding
-    // "!important" after your rule, e.g. "left: 30px !important;"
-    var messagestyle = {
-      "position": "absolute",
-      "fontSize": "14px",
-      "zIndex": 10,
-      "width": divWidth + "px",
-      "top": "0px",
-      "left": (g.size().width - divWidth - 2) + "px",
-      "background": "white",
-      "lineHeight": "normal",
-      "textAlign": "left",
-      "overflow": "hidden"};
-
-    // TODO(danvk): get rid of labelsDivStyles? CSS is better.
-    Dygraph.update(messagestyle, g.getOption('labelsDivStyles'));
-    div = document.createElement("div");
-    div.className = "dygraph-legend";
-    for (var name in messagestyle) {
-      if (!messagestyle.hasOwnProperty(name)) continue;
-
-      try {
-        div.style[name] = messagestyle[name];
-      } catch (e) {
-        this.warn("You are using unsupported css properties for your " +
-            "browser in labelsDivStyles");
-      }
-    }
-
-    // TODO(danvk): come up with a cleaner way to expose this.
-    g.graphDiv.appendChild(div);
-    this.is_generated_div_ = true;
-  }
-
-  this.legend_div_ = div;
-  this.one_em_width_ = 10;  // just a guess, will be updated.
-
-  return {
-    select: this.select,
-    deselect: this.deselect,
-    // TODO(danvk): rethink the name "predraw" before we commit to it in any API.
-    predraw: this.predraw,
-    didDrawChart: this.didDrawChart
-  };
-};
-
-// Needed for dashed lines.
-var calculateEmWidthInDiv = function(div) {
-  var sizeSpan = document.createElement('span');
-  sizeSpan.setAttribute('style', 'margin: 0; padding: 0 0 0 1em; border: 0;');
-  div.appendChild(sizeSpan);
-  var oneEmWidth=sizeSpan.offsetWidth;
-  div.removeChild(sizeSpan);
-  return oneEmWidth;
-};
-
-legend.prototype.select = function(e) {
-  var xValue = e.selectedX;
-  var points = e.selectedPoints;
-
-  var html = generateLegendHTML(e.dygraph, xValue, points, this.one_em_width_);
-  this.legend_div_.innerHTML = html;
-};
-
-legend.prototype.deselect = function(e) {
-  // Have to do this every time, since styles might have changed.
-  var oneEmWidth = calculateEmWidthInDiv(this.legend_div_);
-  this.one_em_width_ = oneEmWidth;
-
-  var html = generateLegendHTML(e.dygraph, undefined, undefined, oneEmWidth);
-  this.legend_div_.innerHTML = html;
-};
-
-legend.prototype.didDrawChart = function(e) {
-  this.deselect(e);
-};
-
-// Right edge should be flush with the right edge of the charting area (which
-// may not be the same as the right edge of the div, if we have two y-axes.
-// TODO(danvk): is any of this really necessary? Could just set "right" in "activate".
-/**
- * Position the labels div so that:
- * - its right edge is flush with the right edge of the charting area
- * - its top edge is flush with the top edge of the charting area
- * @private
- */
-legend.prototype.predraw = function(e) {
-  // Don't touch a user-specified labelsDiv.
-  if (!this.is_generated_div_) return;
-
-  // TODO(danvk): only use real APIs for this.
-  e.dygraph.graphDiv.appendChild(this.legend_div_);
-  var area = e.dygraph.plotter_.area;
-  var labelsDivWidth = e.dygraph.getOption("labelsDivWidth");
-  this.legend_div_.style.left = area.x + area.w - labelsDivWidth - 1 + "px";
-  this.legend_div_.style.top = area.y + "px";
-  this.legend_div_.style.width = labelsDivWidth + "px";
-};
-
-/**
- * Called when dygraph.destroy() is called.
- * You should null out any references and detach any DOM elements.
- */
-legend.prototype.destroy = function() {
-  this.legend_div_ = null;
-};
-
-/**
- * @private
- * Generates HTML for the legend which is displayed when hovering over the
- * chart. If no selected points are specified, a default legend is returned
- * (this may just be the empty string).
- * @param { Number } [x] The x-value of the selected points.
- * @param { [Object] } [sel_points] List of selected points for the given
- * x-value. Should have properties like 'name', 'yval' and 'canvasy'.
- * @param { Number } [oneEmWidth] The pixel width for 1em in the legend. Only
- * relevant when displaying a legend with no selection (i.e. {legend:
- * 'always'}) and with dashed lines.
- */
-generateLegendHTML = function(g, x, sel_points, oneEmWidth) {
-  // TODO(danvk): deprecate this option in place of {legend: 'never'}
-  if (g.getOption('showLabelsOnHighlight') !== true) return '';
-
-  // If no points are selected, we display a default legend. Traditionally,
-  // this has been blank. But a better default would be a conventional legend,
-  // which provides essential information for a non-interactive chart.
-  var html, sepLines, i, dash, strokePattern;
-  var labels = g.getLabels();
-
-  if (typeof(x) === 'undefined') {
-    if (g.getOption('legend') != 'always') {
-      return '';
-    }
-
-    sepLines = g.getOption('labelsSeparateLines');
-    html = '';
-    for (i = 1; i < labels.length; i++) {
-      var series = g.getPropertiesForSeries(labels[i]);
-      if (!series.visible) continue;
-
-      if (html !== '') html += (sepLines ? '
          ' : ' ');
-      strokePattern = g.getOption("strokePattern", labels[i]);
-      dash = generateLegendDashHTML(strokePattern, series.color, oneEmWidth);
-      html += "" +
-          dash + " " + labels[i] + "";
-    }
-    return html;
-  }
-
-  // TODO(danvk): remove this use of a private API
-  var xOptView = g.optionsViewForAxis_('x');
-  var xvf = xOptView('valueFormatter');
-  html = xvf(x, xOptView, labels[0], g);
-  if (html !== '') {
-    html += ':';
-  }
-
-  var yOptViews = [];
-  var num_axes = g.numAxes();
-  for (i = 0; i < num_axes; i++) {
-    // TODO(danvk): remove this use of a private API
-    yOptViews[i] = g.optionsViewForAxis_('y' + (i ? 1 + i : ''));
-  }
-  var showZeros = g.getOption("labelsShowZeroValues");
-  sepLines = g.getOption("labelsSeparateLines");
-  var highlightSeries = g.getHighlightSeries();
-  for (i = 0; i < sel_points.length; i++) {
-    var pt = sel_points[i];
-    if (pt.yval === 0 && !showZeros) continue;
-    if (!Dygraph.isOK(pt.canvasy)) continue;
-    if (sepLines) html += "
          ";
-
-    var series = g.getPropertiesForSeries(pt.name);
-    var yOptView = yOptViews[series.axis - 1];
-    var fmtFunc = yOptView('valueFormatter');
-    var yval = fmtFunc(pt.yval, yOptView, pt.name, g);
-
-    var cls = (pt.name == highlightSeries) ? " class='highlight'" : "";
-
-    // TODO(danvk): use a template string here and make it an attribute.
-    html += "" + " " +
-        pt.name + ": " + yval + "";
-  }
-  return html;
-};
-
-
-/**
- * Generates html for the "dash" displayed on the legend when using "legend: always".
- * In particular, this works for dashed lines with any stroke pattern. It will
- * try to scale the pattern to fit in 1em width. Or if small enough repeat the
- * pattern for 1em width.
- *
- * @param strokePattern The pattern
- * @param color The color of the series.
- * @param oneEmWidth The width in pixels of 1em in the legend.
- * @private
- */
-generateLegendDashHTML = function(strokePattern, color, oneEmWidth) {
-  // IE 7,8 fail at these divs, so they get boring legend, have not tested 9.
-  var isIE = (/MSIE/.test(navigator.userAgent) && !window.opera);
-  if (isIE) return "—";
-
-  // Easy, common case: a solid line
-  if (!strokePattern || strokePattern.length <= 1) {
-    return "
          ";
-  }
-
-  var i, j, paddingLeft, marginRight;
-  var strokePixelLength = 0, segmentLoop = 0;
-  var normalizedPattern = [];
-  var loop;
-
-  // Compute the length of the pixels including the first segment twice, 
-  // since we repeat it.
-  for (i = 0; i <= strokePattern.length; i++) {
-    strokePixelLength += strokePattern[i%strokePattern.length];
-  }
-
-  // See if we can loop the pattern by itself at least twice.
-  loop = Math.floor(oneEmWidth/(strokePixelLength-strokePattern[0]));
-  if (loop > 1) {
-    // This pattern fits at least two times, no scaling just convert to em;
-    for (i = 0; i < strokePattern.length; i++) {
-      normalizedPattern[i] = strokePattern[i]/oneEmWidth;
-    }
-    // Since we are repeating the pattern, we don't worry about repeating the
-    // first segment in one draw.
-    segmentLoop = normalizedPattern.length;
-  } else {
-    // If the pattern doesn't fit in the legend we scale it to fit.
-    loop = 1;
-    for (i = 0; i < strokePattern.length; i++) {
-      normalizedPattern[i] = strokePattern[i]/strokePixelLength;
-    }
-    // For the scaled patterns we do redraw the first segment.
-    segmentLoop = normalizedPattern.length+1;
-  }
-
-  // Now make the pattern.
-  var dash = "";
-  for (j = 0; j < loop; j++) {
-    for (i = 0; i < segmentLoop; i+=2) {
-      // The padding is the drawn segment.
-      paddingLeft = normalizedPattern[i%normalizedPattern.length];
-      if (i < strokePattern.length) {
-        // The margin is the space segment.
-        marginRight = normalizedPattern[(i+1)%normalizedPattern.length];
-      } else {
-        // The repeated first segment has no right margin.
-        marginRight = 0;
-      }
-      dash += "
          ";
-    }
-  }
-  return dash;
-};
-
-
-return legend;
-})();
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/plugins/range-selector.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/plugins/range-selector.js
deleted file mode 100644
index 089e64aab..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/plugins/range-selector.js
+++ /dev/null
@@ -1,852 +0,0 @@
-/**
- * @license
- * Copyright 2011 Paul Felix (paul.eric.felix@gmail.com)
- * MIT-licensed (http://opensource.org/licenses/MIT)
- */
-/*global Dygraph:false,TouchEvent:false */
-
-/**
- * @fileoverview This file contains the RangeSelector plugin used to provide
- * a timeline range selector widget for dygraphs.
- */
-
-Dygraph.Plugins.RangeSelector = (function() {
-
-/*jshint globalstrict: true */
-/*global Dygraph:false */
-"use strict";
-
-var rangeSelector = function() {
-  this.isIE_ = /MSIE/.test(navigator.userAgent) && !window.opera;
-  this.hasTouchInterface_ = typeof(TouchEvent) != 'undefined';
-  this.isMobileDevice_ = /mobile|android/gi.test(navigator.appVersion);
-  this.interfaceCreated_ = false;
-};
-
-rangeSelector.prototype.toString = function() {
-  return "RangeSelector Plugin";
-};
-
-rangeSelector.prototype.activate = function(dygraph) {
-  this.dygraph_ = dygraph;
-  this.isUsingExcanvas_ = dygraph.isUsingExcanvas_;
-  if (this.getOption_('showRangeSelector')) {
-    this.createInterface_();
-  }
-  return {
-    layout: this.reserveSpace_,
-    predraw: this.renderStaticLayer_,
-    didDrawChart: this.renderInteractiveLayer_
-  };
-};
-
-rangeSelector.prototype.destroy = function() {
-  this.bgcanvas_ = null;
-  this.fgcanvas_ = null;
-  this.leftZoomHandle_ = null;
-  this.rightZoomHandle_ = null;
-  this.iePanOverlay_ = null;
-};
-
-//------------------------------------------------------------------
-// Private methods
-//------------------------------------------------------------------
-
-rangeSelector.prototype.getOption_ = function(name) {
-  return this.dygraph_.getOption(name);
-};
-
-rangeSelector.prototype.setDefaultOption_ = function(name, value) {
-  return this.dygraph_.attrs_[name] = value;
-};
-
-/**
- * @private
- * Creates the range selector elements and adds them to the graph.
- */
-rangeSelector.prototype.createInterface_ = function() {
-  this.createCanvases_();
-  if (this.isUsingExcanvas_) {
-    this.createIEPanOverlay_();
-  }
-  this.createZoomHandles_();
-  this.initInteraction_();
-
-  // Range selector and animatedZooms have a bad interaction. See issue 359.
-  if (this.getOption_('animatedZooms')) {
-    this.dygraph_.warn('Animated zooms and range selector are not compatible; disabling animatedZooms.');
-    this.dygraph_.updateOptions({animatedZooms: false}, true);
-  }
-
-  this.interfaceCreated_ = true;
-  this.addToGraph_();
-};
-
-/**
- * @private
- * Adds the range selector to the graph.
- */
-rangeSelector.prototype.addToGraph_ = function() {
-  var graphDiv = this.graphDiv_ = this.dygraph_.graphDiv;
-  graphDiv.appendChild(this.bgcanvas_);
-  graphDiv.appendChild(this.fgcanvas_);
-  graphDiv.appendChild(this.leftZoomHandle_);
-  graphDiv.appendChild(this.rightZoomHandle_);
-};
-
-/**
- * @private
- * Removes the range selector from the graph.
- */
-rangeSelector.prototype.removeFromGraph_ = function() {
-  var graphDiv = this.graphDiv_;
-  graphDiv.removeChild(this.bgcanvas_);
-  graphDiv.removeChild(this.fgcanvas_);
-  graphDiv.removeChild(this.leftZoomHandle_);
-  graphDiv.removeChild(this.rightZoomHandle_);
-  this.graphDiv_ = null;
-};
-
-/**
- * @private
- * Called by Layout to allow range selector to reserve its space.
- */
-rangeSelector.prototype.reserveSpace_ = function(e) {
-  if (this.getOption_('showRangeSelector')) {
-    e.reserveSpaceBottom(this.getOption_('rangeSelectorHeight') + 4);
-  }
-};
-
-/**
- * @private
- * Renders the static portion of the range selector at the predraw stage.
- */
-rangeSelector.prototype.renderStaticLayer_ = function() {
-  if (!this.updateVisibility_()) {
-    return;
-  }
-  this.resize_();
-  this.drawStaticLayer_();
-};
-
-/**
- * @private
- * Renders the interactive portion of the range selector after the chart has been drawn.
- */
-rangeSelector.prototype.renderInteractiveLayer_ = function() {
-  if (!this.updateVisibility_() || this.isChangingRange_) {
-    return;
-  }
-  this.placeZoomHandles_();
-  this.drawInteractiveLayer_();
-};
-
-/**
- * @private
- * Check to see if the range selector is enabled/disabled and update visibility accordingly.
- */
-rangeSelector.prototype.updateVisibility_ = function() {
-  var enabled = this.getOption_('showRangeSelector');
-  if (enabled) {
-    if (!this.interfaceCreated_) {
-      this.createInterface_();
-    } else if (!this.graphDiv_ || !this.graphDiv_.parentNode) {
-      this.addToGraph_();
-    }
-  } else if (this.graphDiv_) {
-    this.removeFromGraph_();
-    var dygraph = this.dygraph_;
-    setTimeout(function() { dygraph.width_ = 0; dygraph.resize(); }, 1);
-  }
-  return enabled;
-};
-
-/**
- * @private
- * Resizes the range selector.
- */
-rangeSelector.prototype.resize_ = function() {
-  function setElementRect(canvas, rect) {
-    canvas.style.top = rect.y + 'px';
-    canvas.style.left = rect.x + 'px';
-    canvas.width = rect.w;
-    canvas.height = rect.h;
-    canvas.style.width = canvas.width + 'px';    // for IE
-    canvas.style.height = canvas.height + 'px';  // for IE
-  }
-
-  var plotArea = this.dygraph_.layout_.getPlotArea();
-  
-  var xAxisLabelHeight = 0;
-  if(this.getOption_('drawXAxis')){
-    xAxisLabelHeight = this.getOption_('xAxisHeight') || (this.getOption_('axisLabelFontSize') + 2 * this.getOption_('axisTickSize'));
-  }
-  this.canvasRect_ = {
-    x: plotArea.x,
-    y: plotArea.y + plotArea.h + xAxisLabelHeight + 4,
-    w: plotArea.w,
-    h: this.getOption_('rangeSelectorHeight')
-  };
-
-  setElementRect(this.bgcanvas_, this.canvasRect_);
-  setElementRect(this.fgcanvas_, this.canvasRect_);
-};
-
-/**
- * @private
- * Creates the background and foreground canvases.
- */
-rangeSelector.prototype.createCanvases_ = function() {
-  this.bgcanvas_ = Dygraph.createCanvas();
-  this.bgcanvas_.className = 'dygraph-rangesel-bgcanvas';
-  this.bgcanvas_.style.position = 'absolute';
-  this.bgcanvas_.style.zIndex = 9;
-  this.bgcanvas_ctx_ = Dygraph.getContext(this.bgcanvas_);
-
-  this.fgcanvas_ = Dygraph.createCanvas();
-  this.fgcanvas_.className = 'dygraph-rangesel-fgcanvas';
-  this.fgcanvas_.style.position = 'absolute';
-  this.fgcanvas_.style.zIndex = 9;
-  this.fgcanvas_.style.cursor = 'default';
-  this.fgcanvas_ctx_ = Dygraph.getContext(this.fgcanvas_);
-};
-
-/**
- * @private
- * Creates overlay divs for IE/Excanvas so that mouse events are handled properly.
- */
-rangeSelector.prototype.createIEPanOverlay_ = function() {
-  this.iePanOverlay_ = document.createElement("div");
-  this.iePanOverlay_.style.position = 'absolute';
-  this.iePanOverlay_.style.backgroundColor = 'white';
-  this.iePanOverlay_.style.filter = 'alpha(opacity=0)';
-  this.iePanOverlay_.style.display = 'none';
-  this.iePanOverlay_.style.cursor = 'move';
-  this.fgcanvas_.appendChild(this.iePanOverlay_);
-};
-
-/**
- * @private
- * Creates the zoom handle elements.
- */
-rangeSelector.prototype.createZoomHandles_ = function() {
-  var img = new Image();
-  img.className = 'dygraph-rangesel-zoomhandle';
-  img.style.position = 'absolute';
-  img.style.zIndex = 10;
-  img.style.visibility = 'hidden'; // Initially hidden so they don't show up in the wrong place.
-  img.style.cursor = 'col-resize';
-
-  if (/MSIE 7/.test(navigator.userAgent)) { // IE7 doesn't support embedded src data.
-    img.width = 7;
-    img.height = 14;
-    img.style.backgroundColor = 'white';
-    img.style.border = '1px solid #333333'; // Just show box in IE7.
-  } else {
-    img.width = 9;
-    img.height = 16;
-    img.src = 'data:image/png;base64,' +
-'iVBORw0KGgoAAAANSUhEUgAAAAkAAAAQCAYAAADESFVDAAAAAXNSR0IArs4c6QAAAAZiS0dEANAA' +
-'zwDP4Z7KegAAAAlwSFlzAAAOxAAADsQBlSsOGwAAAAd0SU1FB9sHGw0cMqdt1UwAAAAZdEVYdENv' +
-'bW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAaElEQVQoz+3SsRFAQBCF4Z9WJM8KCDVwownl' +
-'6YXsTmCUsyKGkZzcl7zkz3YLkypgAnreFmDEpHkIwVOMfpdi9CEEN2nGpFdwD03yEqDtOgCaun7s' +
-'qSTDH32I1pQA2Pb9sZecAxc5r3IAb21d6878xsAAAAAASUVORK5CYII=';
-  }
-
-  if (this.isMobileDevice_) {
-    img.width *= 2;
-    img.height *= 2;
-  }
-
-  this.leftZoomHandle_ = img;
-  this.rightZoomHandle_ = img.cloneNode(false);
-};
-
-/**
- * @private
- * Sets up the interaction for the range selector.
- */
-rangeSelector.prototype.initInteraction_ = function() {
-  var self = this;
-  var topElem = this.isIE_ ? document : window;
-  var clientXLast = 0;
-  var handle = null;
-  var isZooming = false;
-  var isPanning = false;
-  var dynamic = !this.isMobileDevice_ && !this.isUsingExcanvas_;
-
-  // We cover iframes during mouse interactions. See comments in
-  // dygraph-utils.js for more info on why this is a good idea.
-  var tarp = new Dygraph.IFrameTarp();
-
-  // functions, defined below.  Defining them this way (rather than with
-  // "function foo() {...}" makes JSHint happy.
-  var toXDataWindow, onZoomStart, onZoom, onZoomEnd, doZoom, isMouseInPanZone,
-      onPanStart, onPan, onPanEnd, doPan, onCanvasHover;
-
-  // Touch event functions
-  var onZoomHandleTouchEvent, onCanvasTouchEvent, addTouchEvents;
-
-  toXDataWindow = function(zoomHandleStatus) {
-    var xDataLimits = self.dygraph_.xAxisExtremes();
-    var fact = (xDataLimits[1] - xDataLimits[0])/self.canvasRect_.w;
-    var xDataMin = xDataLimits[0] + (zoomHandleStatus.leftHandlePos - self.canvasRect_.x)*fact;
-    var xDataMax = xDataLimits[0] + (zoomHandleStatus.rightHandlePos - self.canvasRect_.x)*fact;
-    return [xDataMin, xDataMax];
-  };
-
-  onZoomStart = function(e) {
-    Dygraph.cancelEvent(e);
-    isZooming = true;
-    clientXLast = e.clientX;
-    handle = e.target ? e.target : e.srcElement;
-    if (e.type === 'mousedown' || e.type === 'dragstart') {
-      // These events are removed manually.
-      Dygraph.addEvent(topElem, 'mousemove', onZoom);
-      Dygraph.addEvent(topElem, 'mouseup', onZoomEnd);
-    }
-    self.fgcanvas_.style.cursor = 'col-resize';
-    tarp.cover();
-    return true;
-  };
-
-  onZoom = function(e) {
-    if (!isZooming) {
-      return false;
-    }
-    Dygraph.cancelEvent(e);
-
-    var delX = e.clientX - clientXLast;
-    if (Math.abs(delX) < 4) {
-      return true;
-    }
-    clientXLast = e.clientX;
-
-    // Move handle.
-    var zoomHandleStatus = self.getZoomHandleStatus_();
-    var newPos;
-    if (handle == self.leftZoomHandle_) {
-      newPos = zoomHandleStatus.leftHandlePos + delX;
-      newPos = Math.min(newPos, zoomHandleStatus.rightHandlePos - handle.width - 3);
-      newPos = Math.max(newPos, self.canvasRect_.x);
-    } else {
-      newPos = zoomHandleStatus.rightHandlePos + delX;
-      newPos = Math.min(newPos, self.canvasRect_.x + self.canvasRect_.w);
-      newPos = Math.max(newPos, zoomHandleStatus.leftHandlePos + handle.width + 3);
-    }
-    var halfHandleWidth = handle.width/2;
-    handle.style.left = (newPos - halfHandleWidth) + 'px';
-    self.drawInteractiveLayer_();
-
-    // Zoom on the fly (if not using excanvas).
-    if (dynamic) {
-      doZoom();
-    }
-    return true;
-  };
-
-  onZoomEnd = function(e) {
-    if (!isZooming) {
-      return false;
-    }
-    isZooming = false;
-    tarp.uncover();
-    Dygraph.removeEvent(topElem, 'mousemove', onZoom);
-    Dygraph.removeEvent(topElem, 'mouseup', onZoomEnd);
-    self.fgcanvas_.style.cursor = 'default';
-
-    // If using excanvas, Zoom now.
-    if (!dynamic) {
-      doZoom();
-    }
-    return true;
-  };
-
-  doZoom = function() {
-    try {
-      var zoomHandleStatus = self.getZoomHandleStatus_();
-      self.isChangingRange_ = true;
-      if (!zoomHandleStatus.isZoomed) {
-        self.dygraph_.resetZoom();
-      } else {
-        var xDataWindow = toXDataWindow(zoomHandleStatus);
-        self.dygraph_.doZoomXDates_(xDataWindow[0], xDataWindow[1]);
-      }
-    } finally {
-      self.isChangingRange_ = false;
-    }
-  };
-
-  isMouseInPanZone = function(e) {
-    if (self.isUsingExcanvas_) {
-        return e.srcElement == self.iePanOverlay_;
-    } else {
-      var rect = self.leftZoomHandle_.getBoundingClientRect();
-      var leftHandleClientX = rect.left + rect.width/2;
-      rect = self.rightZoomHandle_.getBoundingClientRect();
-      var rightHandleClientX = rect.left + rect.width/2;
-      return (e.clientX > leftHandleClientX && e.clientX < rightHandleClientX);
-    }
-  };
-
-  onPanStart = function(e) {
-    if (!isPanning && isMouseInPanZone(e) && self.getZoomHandleStatus_().isZoomed) {
-      Dygraph.cancelEvent(e);
-      isPanning = true;
-      clientXLast = e.clientX;
-      if (e.type === 'mousedown') {
-        // These events are removed manually.
-        Dygraph.addEvent(topElem, 'mousemove', onPan);
-        Dygraph.addEvent(topElem, 'mouseup', onPanEnd);
-      }
-      return true;
-    }
-    return false;
-  };
-
-  onPan = function(e) {
-    if (!isPanning) {
-      return false;
-    }
-    Dygraph.cancelEvent(e);
-
-    var delX = e.clientX - clientXLast;
-    if (Math.abs(delX) < 4) {
-      return true;
-    }
-    clientXLast = e.clientX;
-
-    // Move range view
-    var zoomHandleStatus = self.getZoomHandleStatus_();
-    var leftHandlePos = zoomHandleStatus.leftHandlePos;
-    var rightHandlePos = zoomHandleStatus.rightHandlePos;
-    var rangeSize = rightHandlePos - leftHandlePos;
-    if (leftHandlePos + delX <= self.canvasRect_.x) {
-      leftHandlePos = self.canvasRect_.x;
-      rightHandlePos = leftHandlePos + rangeSize;
-    } else if (rightHandlePos + delX >= self.canvasRect_.x + self.canvasRect_.w) {
-      rightHandlePos = self.canvasRect_.x + self.canvasRect_.w;
-      leftHandlePos = rightHandlePos - rangeSize;
-    } else {
-      leftHandlePos += delX;
-      rightHandlePos += delX;
-    }
-    var halfHandleWidth = self.leftZoomHandle_.width/2;
-    self.leftZoomHandle_.style.left = (leftHandlePos - halfHandleWidth) + 'px';
-    self.rightZoomHandle_.style.left = (rightHandlePos - halfHandleWidth) + 'px';
-    self.drawInteractiveLayer_();
-
-    // Do pan on the fly (if not using excanvas).
-    if (dynamic) {
-      doPan();
-    }
-    return true;
-  };
-
-  onPanEnd = function(e) {
-    if (!isPanning) {
-      return false;
-    }
-    isPanning = false;
-    Dygraph.removeEvent(topElem, 'mousemove', onPan);
-    Dygraph.removeEvent(topElem, 'mouseup', onPanEnd);
-    // If using excanvas, do pan now.
-    if (!dynamic) {
-      doPan();
-    }
-    return true;
-  };
-
-  doPan = function() {
-    try {
-      self.isChangingRange_ = true;
-      self.dygraph_.dateWindow_ = toXDataWindow(self.getZoomHandleStatus_());
-      self.dygraph_.drawGraph_(false);
-    } finally {
-      self.isChangingRange_ = false;
-    }
-  };
-
-  onCanvasHover = function(e) {
-    if (isZooming || isPanning) {
-      return;
-    }
-    var cursor = isMouseInPanZone(e) ? 'move' : 'default';
-    if (cursor != self.fgcanvas_.style.cursor) {
-      self.fgcanvas_.style.cursor = cursor;
-    }
-  };
-
-  onZoomHandleTouchEvent = function(e) {
-    if (e.type == 'touchstart' && e.targetTouches.length == 1) {
-      if (onZoomStart(e.targetTouches[0])) {
-        Dygraph.cancelEvent(e);
-      }
-    } else if (e.type == 'touchmove' && e.targetTouches.length == 1) {
-      if (onZoom(e.targetTouches[0])) {
-        Dygraph.cancelEvent(e);
-      }
-    } else {
-      onZoomEnd(e);
-    }
-  };
-
-  onCanvasTouchEvent = function(e) {
-    if (e.type == 'touchstart' && e.targetTouches.length == 1) {
-      if (onPanStart(e.targetTouches[0])) {
-        Dygraph.cancelEvent(e);
-      }
-    } else if (e.type == 'touchmove' && e.targetTouches.length == 1) {
-      if (onPan(e.targetTouches[0])) {
-        Dygraph.cancelEvent(e);
-      }
-    } else {
-      onPanEnd(e);
-    }
-  };
-
-  addTouchEvents = function(elem, fn) {
-    var types = ['touchstart', 'touchend', 'touchmove', 'touchcancel'];
-    for (var i = 0; i < types.length; i++) {
-      self.dygraph_.addAndTrackEvent(elem, types[i], fn);
-    }
-  };
-
-  this.setDefaultOption_('interactionModel', Dygraph.Interaction.dragIsPanInteractionModel);
-  this.setDefaultOption_('panEdgeFraction', 0.0001);
-
-  var dragStartEvent = window.opera ? 'mousedown' : 'dragstart';
-  this.dygraph_.addAndTrackEvent(this.leftZoomHandle_, dragStartEvent, onZoomStart);
-  this.dygraph_.addAndTrackEvent(this.rightZoomHandle_, dragStartEvent, onZoomStart);
-
-  if (this.isUsingExcanvas_) {
-    this.dygraph_.addAndTrackEvent(this.iePanOverlay_, 'mousedown', onPanStart);
-  } else {
-    this.dygraph_.addAndTrackEvent(this.fgcanvas_, 'mousedown', onPanStart);
-    this.dygraph_.addAndTrackEvent(this.fgcanvas_, 'mousemove', onCanvasHover);
-  }
-
-  // Touch events
-  if (this.hasTouchInterface_) {
-    addTouchEvents(this.leftZoomHandle_, onZoomHandleTouchEvent);
-    addTouchEvents(this.rightZoomHandle_, onZoomHandleTouchEvent);
-    addTouchEvents(this.fgcanvas_, onCanvasTouchEvent);
-  }
-};
-
-/**
- * @private
- * Draws the static layer in the background canvas.
- */
-rangeSelector.prototype.drawStaticLayer_ = function() {
-  var ctx = this.bgcanvas_ctx_;
-  ctx.clearRect(0, 0, this.canvasRect_.w, this.canvasRect_.h);
-  try {
-    this.drawMiniPlot_();
-  } catch(ex) {
-    Dygraph.warn(ex);
-  }
-
-  var margin = 0.5;
-  this.bgcanvas_ctx_.lineWidth = 1;
-  ctx.strokeStyle = 'gray';
-  ctx.beginPath();
-  ctx.moveTo(margin, margin);
-  ctx.lineTo(margin, this.canvasRect_.h-margin);
-  ctx.lineTo(this.canvasRect_.w-margin, this.canvasRect_.h-margin);
-  ctx.lineTo(this.canvasRect_.w-margin, margin);
-  ctx.stroke();
-};
-
-
-/**
- * @private
- * Draws the mini plot in the background canvas.
- */
-rangeSelector.prototype.drawMiniPlot_ = function() {
-  var fillStyle = this.getOption_('rangeSelectorPlotFillColor');
-  var strokeStyle = this.getOption_('rangeSelectorPlotStrokeColor');
-  if (!fillStyle && !strokeStyle) {
-    return;
-  }
-
-  var stepPlot = this.getOption_('stepPlot');
-
-  var combinedSeriesData = this.computeCombinedSeriesAndLimits_();
-  var yRange = combinedSeriesData.yMax - combinedSeriesData.yMin;
-
-  // Draw the mini plot.
-  var ctx = this.bgcanvas_ctx_;
-  var margin = 0.5;
-
-  var xExtremes = this.dygraph_.xAxisExtremes();
-  var xRange = Math.max(xExtremes[1] - xExtremes[0], 1.e-30);
-  var xFact = (this.canvasRect_.w - margin)/xRange;
-  var yFact = (this.canvasRect_.h - margin)/yRange;
-  var canvasWidth = this.canvasRect_.w - margin;
-  var canvasHeight = this.canvasRect_.h - margin;
-
-  var prevX = null, prevY = null;
-
-  ctx.beginPath();
-  ctx.moveTo(margin, canvasHeight);
-  for (var i = 0; i < combinedSeriesData.data.length; i++) {
-    var dataPoint = combinedSeriesData.data[i];
-    var x = ((dataPoint[0] !== null) ? ((dataPoint[0] - xExtremes[0])*xFact) : NaN);
-    var y = ((dataPoint[1] !== null) ? (canvasHeight - (dataPoint[1] - combinedSeriesData.yMin)*yFact) : NaN);
-    if (isFinite(x) && isFinite(y)) {
-      if(prevX === null) {
-        ctx.lineTo(x, canvasHeight);
-      }
-      else if (stepPlot) {
-        ctx.lineTo(x, prevY);
-      }
-      ctx.lineTo(x, y);
-      prevX = x;
-      prevY = y;
-    }
-    else {
-      if(prevX !== null) {
-        if (stepPlot) {
-          ctx.lineTo(x, prevY);
-          ctx.lineTo(x, canvasHeight);
-        }
-        else {
-          ctx.lineTo(prevX, canvasHeight);
-        }
-      }
-      prevX = prevY = null;
-    }
-  }
-  ctx.lineTo(canvasWidth, canvasHeight);
-  ctx.closePath();
-
-  if (fillStyle) {
-    var lingrad = this.bgcanvas_ctx_.createLinearGradient(0, 0, 0, canvasHeight);
-    lingrad.addColorStop(0, 'white');
-    lingrad.addColorStop(1, fillStyle);
-    this.bgcanvas_ctx_.fillStyle = lingrad;
-    ctx.fill();
-  }
-
-  if (strokeStyle) {
-    this.bgcanvas_ctx_.strokeStyle = strokeStyle;
-    this.bgcanvas_ctx_.lineWidth = 1.5;
-    ctx.stroke();
-  }
-};
-
-/**
- * @private
- * Computes and returns the combinded series data along with min/max for the mini plot.
- * @return {Object} An object containing combinded series array, ymin, ymax.
- */
-rangeSelector.prototype.computeCombinedSeriesAndLimits_ = function() {
-  var data = this.dygraph_.rawData_;
-  var logscale = this.getOption_('logscale');
-
-  // Create a combined series (average of all series values).
-  var combinedSeries = [];
-  var sum;
-  var count;
-  var mutipleValues;
-  var i, j, k;
-  var xVal, yVal;
-
-  // Find out if data has multiple values per datapoint.
-  // Go to first data point that actually has values (see http://code.google.com/p/dygraphs/issues/detail?id=246)
-  for (i = 0; i < data.length; i++) {
-    if (data[i].length > 1 && data[i][1] !== null) {
-      mutipleValues = typeof data[i][1] != 'number';
-      if (mutipleValues) {
-        sum = [];
-        count = [];
-        for (k = 0; k < data[i][1].length; k++) {
-          sum.push(0);
-          count.push(0);
-        }
-      }
-      break;
-    }
-  }
-
-  for (i = 0; i < data.length; i++) {
-    var dataPoint = data[i];
-    xVal = dataPoint[0];
-
-    if (mutipleValues) {
-      for (k = 0; k < sum.length; k++) {
-        sum[k] = count[k] = 0;
-      }
-    } else {
-      sum = count = 0;
-    }
-
-    for (j = 1; j < dataPoint.length; j++) {
-      if (this.dygraph_.visibility()[j-1]) {
-        var y;
-        if (mutipleValues) {
-          for (k = 0; k < sum.length; k++) {
-            y = dataPoint[j][k];
-            if (y === null || isNaN(y)) continue;
-            sum[k] += y;
-            count[k]++;
-          }
-        } else {
-          y = dataPoint[j];
-          if (y === null || isNaN(y)) continue;
-          sum += y;
-          count++;
-        }
-      }
-    }
-
-    if (mutipleValues) {
-      for (k = 0; k < sum.length; k++) {
-        sum[k] /= count[k];
-      }
-      yVal = sum.slice(0);
-    } else {
-      yVal = sum/count;
-    }
-
-    combinedSeries.push([xVal, yVal]);
-  }
-
-  // Account for roll period, fractions.
-  combinedSeries = this.dygraph_.rollingAverage(combinedSeries, this.dygraph_.rollPeriod_);
-
-  if (typeof combinedSeries[0][1] != 'number') {
-    for (i = 0; i < combinedSeries.length; i++) {
-      yVal = combinedSeries[i][1];
-      combinedSeries[i][1] = yVal[0];
-    }
-  }
-
-  // Compute the y range.
-  var yMin = Number.MAX_VALUE;
-  var yMax = -Number.MAX_VALUE;
-  for (i = 0; i < combinedSeries.length; i++) {
-    yVal = combinedSeries[i][1];
-    if (yVal !== null && isFinite(yVal) && (!logscale || yVal > 0)) {
-      yMin = Math.min(yMin, yVal);
-      yMax = Math.max(yMax, yVal);
-    }
-  }
-
-  // Convert Y data to log scale if needed.
-  // Also, expand the Y range to compress the mini plot a little.
-  var extraPercent = 0.25;
-  if (logscale) {
-    yMax = Dygraph.log10(yMax);
-    yMax += yMax*extraPercent;
-    yMin = Dygraph.log10(yMin);
-    for (i = 0; i < combinedSeries.length; i++) {
-      combinedSeries[i][1] = Dygraph.log10(combinedSeries[i][1]);
-    }
-  } else {
-    var yExtra;
-    var yRange = yMax - yMin;
-    if (yRange <= Number.MIN_VALUE) {
-      yExtra = yMax*extraPercent;
-    } else {
-      yExtra = yRange*extraPercent;
-    }
-    yMax += yExtra;
-    yMin -= yExtra;
-  }
-
-  return {data: combinedSeries, yMin: yMin, yMax: yMax};
-};
-
-/**
- * @private
- * Places the zoom handles in the proper position based on the current X data window.
- */
-rangeSelector.prototype.placeZoomHandles_ = function() {
-  var xExtremes = this.dygraph_.xAxisExtremes();
-  var xWindowLimits = this.dygraph_.xAxisRange();
-  var xRange = xExtremes[1] - xExtremes[0];
-  var leftPercent = Math.max(0, (xWindowLimits[0] - xExtremes[0])/xRange);
-  var rightPercent = Math.max(0, (xExtremes[1] - xWindowLimits[1])/xRange);
-  var leftCoord = this.canvasRect_.x + this.canvasRect_.w*leftPercent;
-  var rightCoord = this.canvasRect_.x + this.canvasRect_.w*(1 - rightPercent);
-  var handleTop = Math.max(this.canvasRect_.y, this.canvasRect_.y + (this.canvasRect_.h - this.leftZoomHandle_.height)/2);
-  var halfHandleWidth = this.leftZoomHandle_.width/2;
-  this.leftZoomHandle_.style.left = (leftCoord - halfHandleWidth) + 'px';
-  this.leftZoomHandle_.style.top = handleTop + 'px';
-  this.rightZoomHandle_.style.left = (rightCoord - halfHandleWidth) + 'px';
-  this.rightZoomHandle_.style.top = this.leftZoomHandle_.style.top;
-
-  this.leftZoomHandle_.style.visibility = 'visible';
-  this.rightZoomHandle_.style.visibility = 'visible';
-};
-
-/**
- * @private
- * Draws the interactive layer in the foreground canvas.
- */
-rangeSelector.prototype.drawInteractiveLayer_ = function() {
-  var ctx = this.fgcanvas_ctx_;
-  ctx.clearRect(0, 0, this.canvasRect_.w, this.canvasRect_.h);
-  var margin = 1;
-  var width = this.canvasRect_.w - margin;
-  var height = this.canvasRect_.h - margin;
-  var zoomHandleStatus = this.getZoomHandleStatus_();
-
-  ctx.strokeStyle = 'black';
-  if (!zoomHandleStatus.isZoomed) {
-    ctx.beginPath();
-    ctx.moveTo(margin, margin);
-    ctx.lineTo(margin, height);
-    ctx.lineTo(width, height);
-    ctx.lineTo(width, margin);
-    ctx.stroke();
-    if (this.iePanOverlay_) {
-      this.iePanOverlay_.style.display = 'none';
-    }
-  } else {
-    var leftHandleCanvasPos = Math.max(margin, zoomHandleStatus.leftHandlePos - this.canvasRect_.x);
-    var rightHandleCanvasPos = Math.min(width, zoomHandleStatus.rightHandlePos - this.canvasRect_.x);
-
-    ctx.fillStyle = 'rgba(240, 240, 240, 0.6)';
-    ctx.fillRect(0, 0, leftHandleCanvasPos, this.canvasRect_.h);
-    ctx.fillRect(rightHandleCanvasPos, 0, this.canvasRect_.w - rightHandleCanvasPos, this.canvasRect_.h);
-
-    ctx.beginPath();
-    ctx.moveTo(margin, margin);
-    ctx.lineTo(leftHandleCanvasPos, margin);
-    ctx.lineTo(leftHandleCanvasPos, height);
-    ctx.lineTo(rightHandleCanvasPos, height);
-    ctx.lineTo(rightHandleCanvasPos, margin);
-    ctx.lineTo(width, margin);
-    ctx.stroke();
-
-    if (this.isUsingExcanvas_) {
-      this.iePanOverlay_.style.width = (rightHandleCanvasPos - leftHandleCanvasPos) + 'px';
-      this.iePanOverlay_.style.left = leftHandleCanvasPos + 'px';
-      this.iePanOverlay_.style.height = height + 'px';
-      this.iePanOverlay_.style.display = 'inline';
-    }
-  }
-};
-
-/**
- * @private
- * Returns the current zoom handle position information.
- * @return {Object} The zoom handle status.
- */
-rangeSelector.prototype.getZoomHandleStatus_ = function() {
-  var halfHandleWidth = this.leftZoomHandle_.width/2;
-  var leftHandlePos = parseFloat(this.leftZoomHandle_.style.left) + halfHandleWidth;
-  var rightHandlePos = parseFloat(this.rightZoomHandle_.style.left) + halfHandleWidth;
-  return {
-      leftHandlePos: leftHandlePos,
-      rightHandlePos: rightHandlePos,
-      isZoomed: (leftHandlePos - 1 > this.canvasRect_.x || rightHandlePos + 1 < this.canvasRect_.x+this.canvasRect_.w)
-  };
-};
-
-return rangeSelector;
-
-})();
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/rgbcolor/rgbcolor.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/rgbcolor/rgbcolor.js
deleted file mode 100644
index 5a882446e..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/rgbcolor/rgbcolor.js
+++ /dev/null
@@ -1,257 +0,0 @@
-/**
- * A class to parse color values
- *
- * NOTE: modified by danvk. I removed the "getHelpXML" function to reduce the
- * file size, added "use strict" and a few "var" declarations where needed.
- *
- * Modifications by adilh:
- * Original "RGBColor" function name collides with:
- *   http://www.w3.org/TR/DOM-Level-2-Style/css.html#CSS-RGBColor
- * so renamed to "RGBColorParser"
- *
- * @author Stoyan Stefanov 
- * @link   http://www.phpied.com/rgb-color-parser-in-javascript/
- * @license Use it if you like it
- */
-"use strict";
-
-function RGBColorParser(color_string)
-{
-    this.ok = false;
-
-    // strip any leading #
-    if (color_string.charAt(0) == '#') { // remove # if any
-        color_string = color_string.substr(1,6);
-    }
-
-    color_string = color_string.replace(/ /g,'');
-    color_string = color_string.toLowerCase();
-
-    // before getting into regexps, try simple matches
-    // and overwrite the input
-    var simple_colors = {
-        aliceblue: 'f0f8ff',
-        antiquewhite: 'faebd7',
-        aqua: '00ffff',
-        aquamarine: '7fffd4',
-        azure: 'f0ffff',
-        beige: 'f5f5dc',
-        bisque: 'ffe4c4',
-        black: '000000',
-        blanchedalmond: 'ffebcd',
-        blue: '0000ff',
-        blueviolet: '8a2be2',
-        brown: 'a52a2a',
-        burlywood: 'deb887',
-        cadetblue: '5f9ea0',
-        chartreuse: '7fff00',
-        chocolate: 'd2691e',
-        coral: 'ff7f50',
-        cornflowerblue: '6495ed',
-        cornsilk: 'fff8dc',
-        crimson: 'dc143c',
-        cyan: '00ffff',
-        darkblue: '00008b',
-        darkcyan: '008b8b',
-        darkgoldenrod: 'b8860b',
-        darkgray: 'a9a9a9',
-        darkgreen: '006400',
-        darkkhaki: 'bdb76b',
-        darkmagenta: '8b008b',
-        darkolivegreen: '556b2f',
-        darkorange: 'ff8c00',
-        darkorchid: '9932cc',
-        darkred: '8b0000',
-        darksalmon: 'e9967a',
-        darkseagreen: '8fbc8f',
-        darkslateblue: '483d8b',
-        darkslategray: '2f4f4f',
-        darkturquoise: '00ced1',
-        darkviolet: '9400d3',
-        deeppink: 'ff1493',
-        deepskyblue: '00bfff',
-        dimgray: '696969',
-        dodgerblue: '1e90ff',
-        feldspar: 'd19275',
-        firebrick: 'b22222',
-        floralwhite: 'fffaf0',
-        forestgreen: '228b22',
-        fuchsia: 'ff00ff',
-        gainsboro: 'dcdcdc',
-        ghostwhite: 'f8f8ff',
-        gold: 'ffd700',
-        goldenrod: 'daa520',
-        gray: '808080',
-        green: '008000',
-        greenyellow: 'adff2f',
-        honeydew: 'f0fff0',
-        hotpink: 'ff69b4',
-        indianred : 'cd5c5c',
-        indigo : '4b0082',
-        ivory: 'fffff0',
-        khaki: 'f0e68c',
-        lavender: 'e6e6fa',
-        lavenderblush: 'fff0f5',
-        lawngreen: '7cfc00',
-        lemonchiffon: 'fffacd',
-        lightblue: 'add8e6',
-        lightcoral: 'f08080',
-        lightcyan: 'e0ffff',
-        lightgoldenrodyellow: 'fafad2',
-        lightgrey: 'd3d3d3',
-        lightgreen: '90ee90',
-        lightpink: 'ffb6c1',
-        lightsalmon: 'ffa07a',
-        lightseagreen: '20b2aa',
-        lightskyblue: '87cefa',
-        lightslateblue: '8470ff',
-        lightslategray: '778899',
-        lightsteelblue: 'b0c4de',
-        lightyellow: 'ffffe0',
-        lime: '00ff00',
-        limegreen: '32cd32',
-        linen: 'faf0e6',
-        magenta: 'ff00ff',
-        maroon: '800000',
-        mediumaquamarine: '66cdaa',
-        mediumblue: '0000cd',
-        mediumorchid: 'ba55d3',
-        mediumpurple: '9370d8',
-        mediumseagreen: '3cb371',
-        mediumslateblue: '7b68ee',
-        mediumspringgreen: '00fa9a',
-        mediumturquoise: '48d1cc',
-        mediumvioletred: 'c71585',
-        midnightblue: '191970',
-        mintcream: 'f5fffa',
-        mistyrose: 'ffe4e1',
-        moccasin: 'ffe4b5',
-        navajowhite: 'ffdead',
-        navy: '000080',
-        oldlace: 'fdf5e6',
-        olive: '808000',
-        olivedrab: '6b8e23',
-        orange: 'ffa500',
-        orangered: 'ff4500',
-        orchid: 'da70d6',
-        palegoldenrod: 'eee8aa',
-        palegreen: '98fb98',
-        paleturquoise: 'afeeee',
-        palevioletred: 'd87093',
-        papayawhip: 'ffefd5',
-        peachpuff: 'ffdab9',
-        peru: 'cd853f',
-        pink: 'ffc0cb',
-        plum: 'dda0dd',
-        powderblue: 'b0e0e6',
-        purple: '800080',
-        red: 'ff0000',
-        rosybrown: 'bc8f8f',
-        royalblue: '4169e1',
-        saddlebrown: '8b4513',
-        salmon: 'fa8072',
-        sandybrown: 'f4a460',
-        seagreen: '2e8b57',
-        seashell: 'fff5ee',
-        sienna: 'a0522d',
-        silver: 'c0c0c0',
-        skyblue: '87ceeb',
-        slateblue: '6a5acd',
-        slategray: '708090',
-        snow: 'fffafa',
-        springgreen: '00ff7f',
-        steelblue: '4682b4',
-        tan: 'd2b48c',
-        teal: '008080',
-        thistle: 'd8bfd8',
-        tomato: 'ff6347',
-        turquoise: '40e0d0',
-        violet: 'ee82ee',
-        violetred: 'd02090',
-        wheat: 'f5deb3',
-        white: 'ffffff',
-        whitesmoke: 'f5f5f5',
-        yellow: 'ffff00',
-        yellowgreen: '9acd32'
-    };
-    for (var key in simple_colors) {
-        if (color_string == key) {
-            color_string = simple_colors[key];
-        }
-    }
-    // emd of simple type-in colors
-
-    // array of color definition objects
-    var color_defs = [
-        {
-            re: /^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/,
-            example: ['rgb(123, 234, 45)', 'rgb(255,234,245)'],
-            process: function (bits){
-                return [
-                    parseInt(bits[1]),
-                    parseInt(bits[2]),
-                    parseInt(bits[3])
-                ];
-            }
-        },
-        {
-            re: /^(\w{2})(\w{2})(\w{2})$/,
-            example: ['#00ff00', '336699'],
-            process: function (bits){
-                return [
-                    parseInt(bits[1], 16),
-                    parseInt(bits[2], 16),
-                    parseInt(bits[3], 16)
-                ];
-            }
-        },
-        {
-            re: /^(\w{1})(\w{1})(\w{1})$/,
-            example: ['#fb0', 'f0f'],
-            process: function (bits){
-                return [
-                    parseInt(bits[1] + bits[1], 16),
-                    parseInt(bits[2] + bits[2], 16),
-                    parseInt(bits[3] + bits[3], 16)
-                ];
-            }
-        }
-    ];
-
-    // search through the definitions to find a match
-    for (var i = 0; i < color_defs.length; i++) {
-        var re = color_defs[i].re;
-        var processor = color_defs[i].process;
-        var bits = re.exec(color_string);
-        if (bits) {
-            var channels = processor(bits);
-            this.r = channels[0];
-            this.g = channels[1];
-            this.b = channels[2];
-            this.ok = true;
-        }
-
-    }
-
-    // validate/cleanup values
-    this.r = (this.r < 0 || isNaN(this.r)) ? 0 : ((this.r > 255) ? 255 : this.r);
-    this.g = (this.g < 0 || isNaN(this.g)) ? 0 : ((this.g > 255) ? 255 : this.g);
-    this.b = (this.b < 0 || isNaN(this.b)) ? 0 : ((this.b > 255) ? 255 : this.b);
-
-    // some getters
-    this.toRGB = function () {
-        return 'rgb(' + this.r + ', ' + this.g + ', ' + this.b + ')';
-    }
-    this.toHex = function () {
-        var r = this.r.toString(16);
-        var g = this.g.toString(16);
-        var b = this.b.toString(16);
-        if (r.length == 1) r = '0' + r;
-        if (g.length == 1) g = '0' + g;
-        if (b.length == 1) b = '0' + b;
-        return '#' + r + g + b;
-    }
-
-
-}
-
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/stacktrace.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/stacktrace.js
deleted file mode 100644
index 4d0384d18..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/stacktrace.js
+++ /dev/null
@@ -1,411 +0,0 @@
-// Domain Public by Eric Wendelin http://eriwen.com/ (2008)
-//                  Luke Smith http://lucassmith.name/ (2008)
-//                  Loic Dachary  (2008)
-//                  Johan Euphrosine  (2008)
-//                  Oyvind Sean Kinsey http://kinsey.no/blog (2010)
-//                  Victor Homyakov  (2010)
-
-/**
- * Main function giving a function stack trace with a forced or passed in Error
- *
- * @cfg {Error} e The error to create a stacktrace from (optional)
- * @cfg {Boolean} guess If we should try to resolve the names of anonymous functions
- * @return {Array} of Strings with functions, lines, files, and arguments where possible
- */
-function printStackTrace(options) {
-    options = options || {guess: true};
-    var ex = options.e || null, guess = !!options.guess;
-    var p = new printStackTrace.implementation(), result = p.run(ex);
-    return (guess) ? p.guessAnonymousFunctions(result) : result;
-}
-
-printStackTrace.implementation = function() {
-};
-
-printStackTrace.implementation.prototype = {
-    /**
-     * @param {Error} ex The error to create a stacktrace from (optional)
-     * @param {String} mode Forced mode (optional, mostly for unit tests)
-     */
-    run: function(ex, mode) {
-        ex = ex || this.createException();
-        // examine exception properties w/o debugger
-        //for (var prop in ex) {alert("Ex['" + prop + "']=" + ex[prop]);}
-        mode = mode || this.mode(ex);
-        if (mode === 'other') {
-            return this.other(arguments.callee);
-        } else {
-            return this[mode](ex);
-        }
-    },
-
-    createException: function() {
-        try {
-            this.undef();
-        } catch (e) {
-            return e;
-        }
-    },
-
-    /**
-     * Mode could differ for different exception, e.g.
-     * exceptions in Chrome may or may not have arguments or stack.
-     *
-     * @return {String} mode of operation for the exception
-     */
-    mode: function(e) {
-        if (e['arguments'] && e.stack) {
-            return 'chrome';
-        } else if (typeof e.message === 'string' && typeof window !== 'undefined' && window.opera) {
-            // e.message.indexOf("Backtrace:") > -1 -> opera
-            // !e.stacktrace -> opera
-            if (!e.stacktrace) {
-                return 'opera9'; // use e.message
-            }
-            // 'opera#sourceloc' in e -> opera9, opera10a
-            if (e.message.indexOf('\n') > -1 && e.message.split('\n').length > e.stacktrace.split('\n').length) {
-                return 'opera9'; // use e.message
-            }
-            // e.stacktrace && !e.stack -> opera10a
-            if (!e.stack) {
-                return 'opera10a'; // use e.stacktrace
-            }
-            // e.stacktrace && e.stack -> opera10b
-            if (e.stacktrace.indexOf("called from line") < 0) {
-                return 'opera10b'; // use e.stacktrace, format differs from 'opera10a'
-            }
-            // e.stacktrace && e.stack -> opera11
-            return 'opera11'; // use e.stacktrace, format differs from 'opera10a', 'opera10b'
-        } else if (e.stack) {
-            return 'firefox';
-        }
-        return 'other';
-    },
-
-    /**
-     * Given a context, function name, and callback function, overwrite it so that it calls
-     * printStackTrace() first with a callback and then runs the rest of the body.
-     *
-     * @param {Object} context of execution (e.g. window)
-     * @param {String} functionName to instrument
-     * @param {Function} function to call with a stack trace on invocation
-     */
-    instrumentFunction: function(context, functionName, callback) {
-        context = context || window;
-        var original = context[functionName];
-        context[functionName] = function instrumented() {
-            callback.call(this, printStackTrace().slice(4));
-            return context[functionName]._instrumented.apply(this, arguments);
-        };
-        context[functionName]._instrumented = original;
-    },
-
-    /**
-     * Given a context and function name of a function that has been
-     * instrumented, revert the function to it's original (non-instrumented)
-     * state.
-     *
-     * @param {Object} context of execution (e.g. window)
-     * @param {String} functionName to de-instrument
-     */
-    deinstrumentFunction: function(context, functionName) {
-        if (context[functionName].constructor === Function &&
-                context[functionName]._instrumented &&
-                context[functionName]._instrumented.constructor === Function) {
-            context[functionName] = context[functionName]._instrumented;
-        }
-    },
-
-    /**
-     * Given an Error object, return a formatted Array based on Chrome's stack string.
-     *
-     * @param e - Error object to inspect
-     * @return Array of function calls, files and line numbers
-     */
-    chrome: function(e) {
-        var stack = (e.stack + '\n').replace(/^\S[^\(]+?[\n$]/gm, '').
-          replace(/^\s+at\s+/gm, '').
-          replace(/^([^\(]+?)([\n$])/gm, '{anonymous}()@$1$2').
-          replace(/^Object.\s*\(([^\)]+)\)/gm, '{anonymous}()@$1').split('\n');
-        stack.pop();
-        return stack;
-    },
-
-    /**
-     * Given an Error object, return a formatted Array based on Firefox's stack string.
-     *
-     * @param e - Error object to inspect
-     * @return Array of function calls, files and line numbers
-     */
-    firefox: function(e) {
-        return e.stack.replace(/(?:\n@:0)?\s+$/m, '').replace(/^\(/gm, '{anonymous}(').split('\n');
-    },
-
-    opera11: function(e) {
-        // "Error thrown at line 42, column 12 in () in file://localhost/G:/js/stacktrace.js:\n"
-        // "Error thrown at line 42, column 12 in () in file://localhost/G:/js/stacktrace.js:\n"
-        // "called from line 7, column 4 in bar(n) in file://localhost/G:/js/test/functional/testcase1.html:\n"
-        // "called from line 15, column 3 in file://localhost/G:/js/test/functional/testcase1.html:\n"
-        var ANON = '{anonymous}', lineRE = /^.*line (\d+), column (\d+)(?: in (.+))? in (\S+):$/;
-        var lines = e.stacktrace.split('\n'), result = [];
-
-        for (var i = 0, len = lines.length; i < len; i += 2) {
-            var match = lineRE.exec(lines[i]);
-            if (match) {
-                var location = match[4] + ':' + match[1] + ':' + match[2];
-                var fnName = match[3] || "global code";
-                fnName = fnName.replace(//, "$1").replace(//, ANON);
-                result.push(fnName + '@' + location + ' -- ' + lines[i + 1].replace(/^\s+/, ''));
-            }
-        }
-
-        return result;
-    },
-
-    opera10b: function(e) {
-        // "([arguments not available])@file://localhost/G:/js/stacktrace.js:27\n" +
-        // "printStackTrace([arguments not available])@file://localhost/G:/js/stacktrace.js:18\n" +
-        // "@file://localhost/G:/js/test/functional/testcase1.html:15"
-        var ANON = '{anonymous}', lineRE = /^(.*)@(.+):(\d+)$/;
-        var lines = e.stacktrace.split('\n'), result = [];
-
-        for (var i = 0, len = lines.length; i < len; i++) {
-            var match = lineRE.exec(lines[i]);
-            if (match) {
-                var fnName = match[1]? (match[1] + '()') : "global code";
-                result.push(fnName + '@' + match[2] + ':' + match[3]);
-            }
-        }
-
-        return result;
-    },
-
-    /**
-     * Given an Error object, return a formatted Array based on Opera 10's stacktrace string.
-     *
-     * @param e - Error object to inspect
-     * @return Array of function calls, files and line numbers
-     */
-    opera10a: function(e) {
-        // "  Line 27 of linked script file://localhost/G:/js/stacktrace.js\n"
-        // "  Line 11 of inline#1 script in file://localhost/G:/js/test/functional/testcase1.html: In function foo\n"
-        var ANON = '{anonymous}', lineRE = /Line (\d+).*script (?:in )?(\S+)(?:: In function (\S+))?$/i;
-        var lines = e.stacktrace.split('\n'), result = [];
-
-        for (var i = 0, len = lines.length; i < len; i += 2) {
-            var match = lineRE.exec(lines[i]);
-            if (match) {
-                var fnName = match[3] || ANON;
-                result.push(fnName + '()@' + match[2] + ':' + match[1] + ' -- ' + lines[i + 1].replace(/^\s+/, ''));
-            }
-        }
-
-        return result;
-    },
-
-    // Opera 7.x-9.2x only!
-    opera9: function(e) {
-        // "  Line 43 of linked script file://localhost/G:/js/stacktrace.js\n"
-        // "  Line 7 of inline#1 script in file://localhost/G:/js/test/functional/testcase1.html\n"
-        var ANON = '{anonymous}', lineRE = /Line (\d+).*script (?:in )?(\S+)/i;
-        var lines = e.message.split('\n'), result = [];
-
-        for (var i = 2, len = lines.length; i < len; i += 2) {
-            var match = lineRE.exec(lines[i]);
-            if (match) {
-                result.push(ANON + '()@' + match[2] + ':' + match[1] + ' -- ' + lines[i + 1].replace(/^\s+/, ''));
-            }
-        }
-
-        return result;
-    },
-
-    // Safari, IE, and others
-    other: function(curr) {
-        var ANON = '{anonymous}', fnRE = /function\s*([\w\-$]+)?\s*\(/i, stack = [], fn, args, maxStackSize = 10;
-        while (curr && stack.length < maxStackSize) {
-            fn = fnRE.test(curr.toString()) ? RegExp.$1 || ANON : ANON;
-            args = Array.prototype.slice.call(curr['arguments'] || []);
-            stack[stack.length] = fn + '(' + this.stringifyArguments(args) + ')';
-            curr = curr.caller;
-        }
-        return stack;
-    },
-
-    /**
-     * Given arguments array as a String, subsituting type names for non-string types.
-     *
-     * @param {Arguments} object
-     * @return {Array} of Strings with stringified arguments
-     */
-    stringifyArguments: function(args) {
-        var result = [];
-        var slice = Array.prototype.slice;
-        for (var i = 0; i < args.length; ++i) {
-            var arg = args[i];
-            if (arg === undefined) {
-                result[i] = 'undefined';
-            } else if (arg === null) {
-                result[i] = 'null';
-            } else if (arg.constructor) {
-                if (arg.constructor === Array) {
-                    if (arg.length < 3) {
-                        result[i] = '[' + this.stringifyArguments(arg) + ']';
-                    } else {
-                        result[i] = '[' + this.stringifyArguments(slice.call(arg, 0, 1)) + '...' + this.stringifyArguments(slice.call(arg, -1)) + ']';
-                    }
-                } else if (arg.constructor === Object) {
-                    result[i] = '#object';
-                } else if (arg.constructor === Function) {
-                    result[i] = '#function';
-                } else if (arg.constructor === String) {
-                    result[i] = '"' + arg + '"';
-                } else if (arg.constructor === Number) {
-                    result[i] = arg;
-                }
-            }
-        }
-        return result.join(',');
-    },
-
-    sourceCache: {},
-
-    /**
-     * @return the text from a given URL
-     */
-    ajax: function(url) {
-        var req = this.createXMLHTTPObject();
-        if (req) {
-            try {
-                req.open('GET', url, false);
-                req.send(null);
-                return req.responseText;
-            } catch (e) {
-            }
-        }
-        return '';
-    },
-
-    /**
-     * Try XHR methods in order and store XHR factory.
-     *
-     * @return  XHR function or equivalent
-     */
-    createXMLHTTPObject: function() {
-        var xmlhttp, XMLHttpFactories = [
-            function() {
-                return new XMLHttpRequest();
-            }, function() {
-                return new ActiveXObject('Msxml2.XMLHTTP');
-            }, function() {
-                return new ActiveXObject('Msxml3.XMLHTTP');
-            }, function() {
-                return new ActiveXObject('Microsoft.XMLHTTP');
-            }
-        ];
-        for (var i = 0; i < XMLHttpFactories.length; i++) {
-            try {
-                xmlhttp = XMLHttpFactories[i]();
-                // Use memoization to cache the factory
-                this.createXMLHTTPObject = XMLHttpFactories[i];
-                return xmlhttp;
-            } catch (e) {
-            }
-        }
-    },
-
-    /**
-     * Given a URL, check if it is in the same domain (so we can get the source
-     * via Ajax).
-     *
-     * @param url  source url
-     * @return False if we need a cross-domain request
-     */
-    isSameDomain: function(url) {
-        return url.indexOf(location.hostname) !== -1;
-    },
-
-    /**
-     * Get source code from given URL if in the same domain.
-     *
-     * @param url  JS source URL
-     * @return  Array of source code lines
-     */
-    getSource: function(url) {
-        // TODO reuse source from script tags?
-        if (!(url in this.sourceCache)) {
-            this.sourceCache[url] = this.ajax(url).split('\n');
-        }
-        return this.sourceCache[url];
-    },
-
-    guessAnonymousFunctions: function(stack) {
-        for (var i = 0; i < stack.length; ++i) {
-            var reStack = /\{anonymous\}\(.*\)@(.*)/,
-                reRef = /^(.*?)(?::(\d+))(?::(\d+))?(?: -- .+)?$/,
-                frame = stack[i], ref = reStack.exec(frame);
-
-            if (ref) {
-                var m = reRef.exec(ref[1]), file = m[1],
-                    lineno = m[2], charno = m[3] || 0;
-                if (file && this.isSameDomain(file) && lineno) {
-                    var functionName = this.guessAnonymousFunction(file, lineno, charno);
-                    stack[i] = frame.replace('{anonymous}', functionName);
-                }
-            }
-        }
-        return stack;
-    },
-
-    guessAnonymousFunction: function(url, lineNo, charNo) {
-        var ret;
-        try {
-            ret = this.findFunctionName(this.getSource(url), lineNo);
-        } catch (e) {
-            ret = 'getSource failed with url: ' + url + ', exception: ' + e.toString();
-        }
-        return ret;
-    },
-
-    findFunctionName: function(source, lineNo) {
-        // FIXME findFunctionName fails for compressed source
-        // (more than one function on the same line)
-        // TODO use captured args
-        // function {name}({args}) m[1]=name m[2]=args
-        var reFunctionDeclaration = /function\s+([^(]*?)\s*\(([^)]*)\)/;
-        // {name} = function ({args}) TODO args capture
-        // /['"]?([0-9A-Za-z_]+)['"]?\s*[:=]\s*function(?:[^(]*)/
-        var reFunctionExpression = /['"]?([0-9A-Za-z_]+)['"]?\s*[:=]\s*function\b/;
-        // {name} = eval()
-        var reFunctionEvaluation = /['"]?([0-9A-Za-z_]+)['"]?\s*[:=]\s*(?:eval|new Function)\b/;
-        // Walk backwards in the source lines until we find
-        // the line which matches one of the patterns above
-        var code = "", line, maxLines = Math.min(lineNo, 20), m, commentPos;
-        for (var i = 0; i < maxLines; ++i) {
-            // lineNo is 1-based, source[] is 0-based
-            line = source[lineNo - i - 1];
-            commentPos = line.indexOf('//');
-            if (commentPos >= 0) {
-                line = line.substr(0, commentPos);
-            }
-            // TODO check other types of comments? Commented code may lead to false positive
-            if (line) {
-                code = line + code;
-                m = reFunctionExpression.exec(code);
-                if (m && m[1]) {
-                    return m[1];
-                }
-                m = reFunctionDeclaration.exec(code);
-                if (m && m[1]) {
-                    //return m[1] + "(" + (m[2] || "") + ")";
-                    return m[1];
-                }
-                m = reFunctionEvaluation.exec(code);
-                if (m && m[1]) {
-                    return m[1];
-                }
-            }
-        }
-        return '(?)';
-    }
-};
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/strftime/Doxyfile b/vid/src/main/webapp/static/fusion/raptor/dy3/js/strftime/Doxyfile
deleted file mode 100644
index 26ac5a538..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/strftime/Doxyfile
+++ /dev/null
@@ -1,243 +0,0 @@
-# Doxyfile 1.5.3
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-DOXYFILE_ENCODING      = UTF-8
-PROJECT_NAME           = strftime
-PROJECT_NUMBER         = 1.3
-OUTPUT_DIRECTORY       = /home/philip/public_html/hacks/strftime/docs/
-CREATE_SUBDIRS         = NO
-OUTPUT_LANGUAGE        = English
-BRIEF_MEMBER_DESC      = YES
-REPEAT_BRIEF           = YES
-ABBREVIATE_BRIEF       = "The $name class  " \
-                         "The $name widget  " \
-                         "The $name file  " \
-                         is \
-                         provides \
-                         specifies \
-                         contains \
-                         represents \
-                         a \
-                         an \
-                         the
-ALWAYS_DETAILED_SEC    = NO
-INLINE_INHERITED_MEMB  = NO
-FULL_PATH_NAMES        = YES
-STRIP_FROM_PATH        = /home/philip/public_html/hacks/strftime/
-STRIP_FROM_INC_PATH    = 
-SHORT_NAMES            = NO
-JAVADOC_AUTOBRIEF      = NO
-QT_AUTOBRIEF           = NO
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP         = NO
-INHERIT_DOCS           = YES
-SEPARATE_MEMBER_PAGES  = NO
-TAB_SIZE               = 8
-ALIASES                = 
-OPTIMIZE_OUTPUT_FOR_C  = NO
-OPTIMIZE_OUTPUT_JAVA   = NO
-BUILTIN_STL_SUPPORT    = NO
-CPP_CLI_SUPPORT        = NO
-DISTRIBUTE_GROUP_DOC   = NO
-SUBGROUPING            = YES
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL            = NO
-EXTRACT_PRIVATE        = NO
-EXTRACT_STATIC         = NO
-EXTRACT_LOCAL_CLASSES  = YES
-EXTRACT_LOCAL_METHODS  = NO
-EXTRACT_ANON_NSPACES   = NO
-HIDE_UNDOC_MEMBERS     = YES
-HIDE_UNDOC_CLASSES     = YES
-HIDE_FRIEND_COMPOUNDS  = NO
-HIDE_IN_BODY_DOCS      = NO
-INTERNAL_DOCS          = NO
-CASE_SENSE_NAMES       = YES
-HIDE_SCOPE_NAMES       = NO
-SHOW_INCLUDE_FILES     = YES
-INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = YES
-SORT_BRIEF_DOCS        = NO
-SORT_BY_SCOPE_NAME     = NO
-GENERATE_TODOLIST      = YES
-GENERATE_TESTLIST      = YES
-GENERATE_BUGLIST       = YES
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS       = 
-MAX_INITIALIZER_LINES  = 30
-SHOW_USED_FILES        = NO
-SHOW_DIRECTORIES       = NO
-FILE_VERSION_FILTER    = 
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET                  = NO
-WARNINGS               = YES
-WARN_IF_UNDOCUMENTED   = YES
-WARN_IF_DOC_ERROR      = YES
-WARN_NO_PARAMDOC       = NO
-WARN_FORMAT            = "$file:$line: $text  "
-WARN_LOGFILE           = 
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT                  = /home/philip/public_html/hacks/strftime
-INPUT_ENCODING         = UTF-8
-FILE_PATTERNS          = *.js
-RECURSIVE              = NO
-EXCLUDE                = 
-EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = 
-EXCLUDE_SYMBOLS        = 
-EXAMPLE_PATH           = .
-EXAMPLE_PATTERNS       = *
-EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = 
-INPUT_FILTER           = 
-FILTER_PATTERNS        = 
-FILTER_SOURCE_FILES    = NO
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER         = YES
-INLINE_SOURCES         = YES
-STRIP_CODE_COMMENTS    = YES
-REFERENCED_BY_RELATION = YES
-REFERENCES_RELATION    = YES
-REFERENCES_LINK_SOURCE = YES
-USE_HTAGS              = NO
-VERBATIM_HEADERS       = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX     = YES
-COLS_IN_ALPHA_INDEX    = 5
-IGNORE_PREFIX          = Date \
-                         Date.ext \
-                         Date.prototype
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML          = YES
-HTML_OUTPUT            = html
-HTML_FILE_EXTENSION    = .html
-HTML_HEADER            = 
-HTML_FOOTER            = 
-HTML_STYLESHEET        = 
-HTML_ALIGN_MEMBERS     = YES
-GENERATE_HTMLHELP      = NO
-HTML_DYNAMIC_SECTIONS  = NO
-CHM_FILE               = 
-HHC_LOCATION           = 
-GENERATE_CHI           = NO
-BINARY_TOC             = NO
-TOC_EXPAND             = NO
-DISABLE_INDEX          = NO
-ENUM_VALUES_PER_LINE   = 4
-GENERATE_TREEVIEW      = NO
-TREEVIEW_WIDTH         = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX         = YES
-LATEX_OUTPUT           = latex
-LATEX_CMD_NAME         = latex
-MAKEINDEX_CMD_NAME     = makeindex
-COMPACT_LATEX          = NO
-PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         = 
-LATEX_HEADER           = 
-PDF_HYPERLINKS         = YES
-USE_PDFLATEX           = YES
-LATEX_BATCHMODE        = NO
-LATEX_HIDE_INDICES     = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF           = NO
-RTF_OUTPUT             = rtf
-COMPACT_RTF            = NO
-RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    = 
-RTF_EXTENSIONS_FILE    = 
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN           = NO
-MAN_OUTPUT             = man
-MAN_EXTENSION          = .3
-MAN_LINKS              = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML           = NO
-XML_OUTPUT             = xml
-XML_SCHEMA             = 
-XML_DTD                = 
-XML_PROGRAMLISTING     = YES
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF   = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD       = NO
-PERLMOD_LATEX          = NO
-PERLMOD_PRETTY         = YES
-PERLMOD_MAKEVAR_PREFIX = 
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING   = YES
-MACRO_EXPANSION        = NO
-EXPAND_ONLY_PREDEF     = NO
-SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = 
-INCLUDE_FILE_PATTERNS  = 
-PREDEFINED             = 
-EXPAND_AS_DEFINED      = 
-SKIP_FUNCTION_MACROS   = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references   
-#---------------------------------------------------------------------------
-TAGFILES               = 
-GENERATE_TAGFILE       = 
-ALLEXTERNALS           = NO
-EXTERNAL_GROUPS        = YES
-PERL_PATH              = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS         = NO
-MSCGEN_PATH            = 
-HIDE_UNDOC_RELATIONS   = YES
-HAVE_DOT               = YES
-CLASS_GRAPH            = YES
-COLLABORATION_GRAPH    = YES
-GROUP_GRAPHS           = YES
-UML_LOOK               = NO
-TEMPLATE_RELATIONS     = NO
-INCLUDE_GRAPH          = YES
-INCLUDED_BY_GRAPH      = YES
-CALL_GRAPH             = YES
-CALLER_GRAPH           = NO
-GRAPHICAL_HIERARCHY    = YES
-DIRECTORY_GRAPH        = YES
-DOT_IMAGE_FORMAT       = png
-DOT_PATH               = 
-DOTFILE_DIRS           = 
-DOT_GRAPH_MAX_NODES    = 50
-MAX_DOT_GRAPH_DEPTH    = 1000
-DOT_TRANSPARENT        = NO
-DOT_MULTI_TARGETS      = NO
-GENERATE_LEGEND        = YES
-DOT_CLEANUP            = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine   
-#---------------------------------------------------------------------------
-SEARCHENGINE           = YES
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/strftime/strftime-min.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/strftime/strftime-min.js
deleted file mode 100644
index 8207714ee..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/strftime/strftime-min.js
+++ /dev/null
@@ -1 +0,0 @@
-Date.ext={};Date.ext.util={};Date.ext.util.xPad=function(x,pad,r){if(typeof (r)=="undefined"){r=10}for(;parseInt(x,10)1;r/=10){x=pad.toString()+x}return x.toString()};Date.prototype.locale="en-GB";if(document.getElementsByTagName("html")&&document.getElementsByTagName("html")[0].lang){Date.prototype.locale=document.getElementsByTagName("html")[0].lang}Date.ext.locales={};Date.ext.locales.en={a:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],A:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],b:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],B:["January","February","March","April","May","June","July","August","September","October","November","December"],c:"%a %d %b %Y %T %Z",p:["AM","PM"],P:["am","pm"],x:"%d/%m/%y",X:"%T"};Date.ext.locales["en-US"]=Date.ext.locales.en;Date.ext.locales["en-US"].c="%a %d %b %Y %r %Z";Date.ext.locales["en-US"].x="%D";Date.ext.locales["en-US"].X="%r";Date.ext.locales["en-GB"]=Date.ext.locales.en;Date.ext.locales["en-AU"]=Date.ext.locales["en-GB"];Date.ext.formats={a:function(d){return Date.ext.locales[d.locale].a[d.getDay()]},A:function(d){return Date.ext.locales[d.locale].A[d.getDay()]},b:function(d){return Date.ext.locales[d.locale].b[d.getMonth()]},B:function(d){return Date.ext.locales[d.locale].B[d.getMonth()]},c:"toLocaleString",C:function(d){return Date.ext.util.xPad(parseInt(d.getFullYear()/100,10),0)},d:["getDate","0"],e:["getDate"," "],g:function(d){return Date.ext.util.xPad(parseInt(Date.ext.util.G(d)/100,10),0)},G:function(d){var y=d.getFullYear();var V=parseInt(Date.ext.formats.V(d),10);var W=parseInt(Date.ext.formats.W(d),10);if(W>V){y++}else{if(W===0&&V>=52){y--}}return y},H:["getHours","0"],I:function(d){var I=d.getHours()%12;return Date.ext.util.xPad(I===0?12:I,0)},j:function(d){var ms=d-new Date(""+d.getFullYear()+"/1/1 GMT");ms+=d.getTimezoneOffset()*60000;var doy=parseInt(ms/60000/60/24,10)+1;return Date.ext.util.xPad(doy,0,100)},m:function(d){return Date.ext.util.xPad(d.getMonth()+1,0)},M:["getMinutes","0"],p:function(d){return Date.ext.locales[d.locale].p[d.getHours()>=12?1:0]},P:function(d){return Date.ext.locales[d.locale].P[d.getHours()>=12?1:0]},S:["getSeconds","0"],u:function(d){var dow=d.getDay();return dow===0?7:dow},U:function(d){var doy=parseInt(Date.ext.formats.j(d),10);var rdow=6-d.getDay();var woy=parseInt((doy+rdow)/7,10);return Date.ext.util.xPad(woy,0)},V:function(d){var woy=parseInt(Date.ext.formats.W(d),10);var dow1_1=(new Date(""+d.getFullYear()+"/1/1")).getDay();var idow=woy+(dow1_1>4||dow1_1<=1?0:1);if(idow==53&&(new Date(""+d.getFullYear()+"/12/31")).getDay()<4){idow=1}else{if(idow===0){idow=Date.ext.formats.V(new Date(""+(d.getFullYear()-1)+"/12/31"))}}return Date.ext.util.xPad(idow,0)},w:"getDay",W:function(d){var doy=parseInt(Date.ext.formats.j(d),10);var rdow=7-Date.ext.formats.u(d);var woy=parseInt((doy+rdow)/7,10);return Date.ext.util.xPad(woy,0,10)},y:function(d){return Date.ext.util.xPad(d.getFullYear()%100,0)},Y:"getFullYear",z:function(d){var o=d.getTimezoneOffset();var H=Date.ext.util.xPad(parseInt(Math.abs(o/60),10),0);var M=Date.ext.util.xPad(o%60,0);return(o>0?"-":"+")+H+M},Z:function(d){return d.toString().replace(/^.*\(([^)]+)\)$/,"$1")},"%":function(d){return"%"}};Date.ext.aggregates={c:"locale",D:"%m/%d/%y",h:"%b",n:"\n",r:"%I:%M:%S %p",R:"%H:%M",t:"\t",T:"%H:%M:%S",x:"locale",X:"locale"};Date.ext.aggregates.z=Date.ext.formats.z(new Date());Date.ext.aggregates.Z=Date.ext.formats.Z(new Date());Date.ext.unsupported={};Date.prototype.strftime=function(fmt){if(!(this.locale in Date.ext.locales)){if(this.locale.replace(/-[a-zA-Z]+$/,"") in Date.ext.locales){this.locale=this.locale.replace(/-[a-zA-Z]+$/,"")}else{this.locale="en-GB"}}var d=this;while(fmt.match(/%[cDhnrRtTxXzZ]/)){fmt=fmt.replace(/%([cDhnrRtTxXzZ])/g,function(m0,m1){var f=Date.ext.aggregates[m1];return(f=="locale"?Date.ext.locales[d.locale][m1]:f)})}var str=fmt.replace(/%([aAbBCdegGHIjmMpPSuUVwWyY%])/g,function(m0,m1){var f=Date.ext.formats[m1];if(typeof (f)=="string"){return d[f]()}else{if(typeof (f)=="function"){return f.call(d,d)}else{if(typeof (f)=="object"&&typeof (f[0])=="string"){return Date.ext.util.xPad(d[f[0]](),f[1])}else{return m1}}}});d=null;return str};
diff --git a/vid/src/main/webapp/static/fusion/raptor/dy3/js/strftime/strftime.js b/vid/src/main/webapp/static/fusion/raptor/dy3/js/strftime/strftime.js
deleted file mode 100644
index d622df9e2..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/dy3/js/strftime/strftime.js
+++ /dev/null
@@ -1,731 +0,0 @@
-/*
- strftime for Javascript
- Copyright (c) 2008, Philip S Tellis 
- All rights reserved.
- 
- This code is distributed under the terms of the BSD licence
- 
- Redistribution and use of this software in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
-   * Redistributions of source code must retain the above copyright notice, this list of conditions
-     and the following disclaimer.
-   * Redistributions in binary form must reproduce the above copyright notice, this list of
-     conditions and the following disclaimer in the documentation and/or other materials provided
-     with the distribution.
-   * The names of the contributors to this file may not be used to endorse or promote products
-     derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/**
- * \file strftime.js
- * \author Philip S Tellis \
- * \version 1.3
- * \date 2008/06
- * \brief Javascript implementation of strftime
- * 
- * Implements strftime for the Date object in javascript based on the PHP implementation described at
- * http://www.php.net/strftime  This is in turn based on the Open Group specification defined
- * at http://www.opengroup.org/onlinepubs/007908799/xsh/strftime.html This implementation does not
- * include modified conversion specifiers (i.e., Ex and Ox)
- *
- * The following format specifiers are supported:
- *
- * \copydoc formats
- *
- * \%a, \%A, \%b and \%B should be localised for non-English locales.
- *
- * \par Usage:
- * This library may be used as follows:
- * \code
- *     var d = new Date();
- *
- *     var ymd = d.strftime('%Y/%m/%d');
- *     var iso = d.strftime('%Y-%m-%dT%H:%M:%S%z');
- *
- * \endcode
- *
- * \sa \link Date.prototype.strftime Date.strftime \endlink for a description of each of the supported format specifiers
- * \sa Date.ext.locales for localisation information
- * \sa http://www.php.net/strftime for the PHP implementation which is the basis for this
- * \sa http://tech.bluesmoon.info/2008/04/strftime-in-javascript.html for feedback
- */
-
-//! Date extension object - all supporting objects go in here.
-Date.ext = {};
-
-//! Utility methods
-Date.ext.util = {};
-
-/**
-\brief Left pad a number with something
-\details Takes a number and pads it to the left with the passed in pad character
-\param x	The number to pad
-\param pad	The string to pad with
-\param r	[optional] Upper limit for pad.  A value of 10 pads to 2 digits, a value of 100 pads to 3 digits.
-		Default is 10.
-
-\return The number left padded with the pad character.  This function returns a string and not a number.
-*/
-Date.ext.util.xPad=function(x, pad, r)
-{
-	if(typeof(r) == 'undefined')
-	{
-		r=10;
-	}
-	for( ; parseInt(x, 10)1; r/=10)
-		x = pad.toString() + x;
-	return x.toString();
-};
-
-/**
-\brief Currently selected locale.
-\details
-The locale for a specific date object may be changed using \code Date.locale = "new-locale"; \endcode
-The default will be based on the lang attribute of the HTML tag of your document
-*/
-Date.prototype.locale = 'en-GB';
-//! \cond FALSE
-if(document.getElementsByTagName('html') && document.getElementsByTagName('html')[0].lang)
-{
-	Date.prototype.locale = document.getElementsByTagName('html')[0].lang;
-}
-//! \endcond
-
-/**
-\brief Localised strings for days of the week and months of the year.
-\details
-To create your own local strings, add a locale object to the locales object.
-The key of your object should be the same as your locale name.  For example:
-   en-US,
-   fr,
-   fr-CH,
-   de-DE
-Names are case sensitive and are described at http://www.w3.org/TR/REC-html40/struct/dirlang.html#langcodes
-Your locale object must contain the following keys:
-\param a	Short names of days of week starting with Sunday
-\param A	Long names days of week starting with Sunday
-\param b	Short names of months of the year starting with January
-\param B	Long names of months of the year starting with February
-\param c	The preferred date and time representation in your locale
-\param p	AM or PM in your locale
-\param P	am or pm in your locale
-\param x	The  preferred date representation for the current locale without the time.
-\param X	The preferred time representation for the current locale without the date.
-
-\sa Date.ext.locales.en for a sample implementation
-\sa \ref localisation for detailed documentation on localising strftime for your own locale
-*/
-Date.ext.locales = { };
-
-/**
- * \brief Localised strings for English (British).
- * \details
- * This will be used for any of the English dialects unless overridden by a country specific one.
- * This is the default locale if none specified
- */
-Date.ext.locales.en = {
-	a: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
-	A: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
-	b: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
-	B: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
-	c: '%a %d %b %Y %T %Z',
-	p: ['AM', 'PM'],
-	P: ['am', 'pm'],
-	x: '%d/%m/%y',
-	X: '%T'
-};
-
-//! \cond FALSE
-// Localised strings for US English
-Date.ext.locales['en-US'] = Date.ext.locales.en;
-Date.ext.locales['en-US'].c = '%a %d %b %Y %r %Z';
-Date.ext.locales['en-US'].x = '%D';
-Date.ext.locales['en-US'].X = '%r';
-
-// Localised strings for British English
-Date.ext.locales['en-GB'] = Date.ext.locales.en;
-
-// Localised strings for Australian English
-Date.ext.locales['en-AU'] = Date.ext.locales['en-GB'];
-//! \endcond
-
-//! \brief List of supported format specifiers.
-/**
- * \details
- * \arg \%a - abbreviated weekday name according to the current locale
- * \arg \%A - full weekday name according to the current locale
- * \arg \%b - abbreviated month name according to the current locale
- * \arg \%B - full month name according to the current locale
- * \arg \%c - preferred date and time representation for the current locale
- * \arg \%C - century number (the year divided by 100 and truncated to an integer, range 00 to 99)
- * \arg \%d - day of the month as a decimal number (range 01 to 31)
- * \arg \%D - same as %m/%d/%y
- * \arg \%e - day of the month as a decimal number, a single digit is preceded by a space (range ' 1' to '31')
- * \arg \%g - like %G, but without the century
- * \arg \%G - The 4-digit year corresponding to the ISO week number
- * \arg \%h - same as %b
- * \arg \%H - hour as a decimal number using a 24-hour clock (range 00 to 23)
- * \arg \%I - hour as a decimal number using a 12-hour clock (range 01 to 12)
- * \arg \%j - day of the year as a decimal number (range 001 to 366)
- * \arg \%m - month as a decimal number (range 01 to 12)
- * \arg \%M - minute as a decimal number
- * \arg \%n - newline character
- * \arg \%p - either `AM' or `PM' according to the given time value, or the corresponding strings for the current locale
- * \arg \%P - like %p, but lower case
- * \arg \%r - time in a.m. and p.m. notation equal to %I:%M:%S %p
- * \arg \%R - time in 24 hour notation equal to %H:%M
- * \arg \%S - second as a decimal number
- * \arg \%t - tab character
- * \arg \%T - current time, equal to %H:%M:%S
- * \arg \%u - weekday as a decimal number [1,7], with 1 representing Monday
- * \arg \%U - week number of the current year as a decimal number, starting with
- *            the first Sunday as the first day of the first week
- * \arg \%V - The ISO 8601:1988 week number of the current year as a decimal number,
- *            range 01 to 53, where week 1 is the first week that has at least 4 days
- *            in the current year, and with Monday as the first day of the week.
- * \arg \%w - day of the week as a decimal, Sunday being 0
- * \arg \%W - week number of the current year as a decimal number, starting with the
- *            first Monday as the first day of the first week
- * \arg \%x - preferred date representation for the current locale without the time
- * \arg \%X - preferred time representation for the current locale without the date
- * \arg \%y - year as a decimal number without a century (range 00 to 99)
- * \arg \%Y - year as a decimal number including the century
- * \arg \%z - numerical time zone representation
- * \arg \%Z - time zone name or abbreviation
- * \arg \%% - a literal `\%' character
- */
-Date.ext.formats = {
-	a: function(d) { return Date.ext.locales[d.locale].a[d.getDay()]; },
-	A: function(d) { return Date.ext.locales[d.locale].A[d.getDay()]; },
-	b: function(d) { return Date.ext.locales[d.locale].b[d.getMonth()]; },
-	B: function(d) { return Date.ext.locales[d.locale].B[d.getMonth()]; },
-	c: 'toLocaleString',
-	C: function(d) { return Date.ext.util.xPad(parseInt(d.getFullYear()/100, 10), 0); },
-	d: ['getDate', '0'],
-	e: ['getDate', ' '],
-	g: function(d) { return Date.ext.util.xPad(parseInt(Date.ext.util.G(d)/100, 10), 0); },
-	G: function(d) {
-			var y = d.getFullYear();
-			var V = parseInt(Date.ext.formats.V(d), 10);
-			var W = parseInt(Date.ext.formats.W(d), 10);
-
-			if(W > V) {
-				y++;
-			} else if(W===0 && V>=52) {
-				y--;
-			}
-
-			return y;
-		},
-	H: ['getHours', '0'],
-	I: function(d) { var I=d.getHours()%12; return Date.ext.util.xPad(I===0?12:I, 0); },
-	j: function(d) {
-			var ms = d - new Date('' + d.getFullYear() + '/1/1 GMT');
-			ms += d.getTimezoneOffset()*60000;
-			var doy = parseInt(ms/60000/60/24, 10)+1;
-			return Date.ext.util.xPad(doy, 0, 100);
-		},
-	m: function(d) { return Date.ext.util.xPad(d.getMonth()+1, 0); },
-	M: ['getMinutes', '0'],
-	p: function(d) { return Date.ext.locales[d.locale].p[d.getHours() >= 12 ? 1 : 0 ]; },
-	P: function(d) { return Date.ext.locales[d.locale].P[d.getHours() >= 12 ? 1 : 0 ]; },
-	S: ['getSeconds', '0'],
-	u: function(d) { var dow = d.getDay(); return dow===0?7:dow; },
-	U: function(d) {
-			var doy = parseInt(Date.ext.formats.j(d), 10);
-			var rdow = 6-d.getDay();
-			var woy = parseInt((doy+rdow)/7, 10);
-			return Date.ext.util.xPad(woy, 0);
-		},
-	V: function(d) {
-			var woy = parseInt(Date.ext.formats.W(d), 10);
-			var dow1_1 = (new Date('' + d.getFullYear() + '/1/1')).getDay();
-			// First week is 01 and not 00 as in the case of %U and %W,
-			// so we add 1 to the final result except if day 1 of the year
-			// is a Monday (then %W returns 01).
-			// We also need to subtract 1 if the day 1 of the year is 
-			// Friday-Sunday, so the resulting equation becomes:
-			var idow = woy + (dow1_1 > 4 || dow1_1 <= 1 ? 0 : 1);
-			if(idow == 53 && (new Date('' + d.getFullYear() + '/12/31')).getDay() < 4)
-			{
-				idow = 1;
-			}
-			else if(idow === 0)
-			{
-				idow = Date.ext.formats.V(new Date('' + (d.getFullYear()-1) + '/12/31'));
-			}
-
-			return Date.ext.util.xPad(idow, 0);
-		},
-	w: 'getDay',
-	W: function(d) {
-			var doy = parseInt(Date.ext.formats.j(d), 10);
-			var rdow = 7-Date.ext.formats.u(d);
-			var woy = parseInt((doy+rdow)/7, 10);
-			return Date.ext.util.xPad(woy, 0, 10);
-		},
-	y: function(d) { return Date.ext.util.xPad(d.getFullYear()%100, 0); },
-	Y: 'getFullYear',
-	z: function(d) {
-			var o = d.getTimezoneOffset();
-			var H = Date.ext.util.xPad(parseInt(Math.abs(o/60), 10), 0);
-			var M = Date.ext.util.xPad(o%60, 0);
-			return (o>0?'-':'+') + H + M;
-		},
-	Z: function(d) { return d.toString().replace(/^.*\(([^)]+)\)$/, '$1'); },
-	'%': function(d) { return '%'; }
-};
-
-/**
-\brief List of aggregate format specifiers.
-\details
-Aggregate format specifiers map to a combination of basic format specifiers.
-These are implemented in terms of Date.ext.formats.
-
-A format specifier that maps to 'locale' is read from Date.ext.locales[current-locale].
-
-\sa Date.ext.formats
-*/
-Date.ext.aggregates = {
-	c: 'locale',
-	D: '%m/%d/%y',
-	h: '%b',
-	n: '\n',
-	r: '%I:%M:%S %p',
-	R: '%H:%M',
-	t: '\t',
-	T: '%H:%M:%S',
-	x: 'locale',
-	X: 'locale'
-};
-
-//! \cond FALSE
-// Cache timezone values because they will never change for a given JS instance
-Date.ext.aggregates.z = Date.ext.formats.z(new Date());
-Date.ext.aggregates.Z = Date.ext.formats.Z(new Date());
-//! \endcond
-
-//! List of unsupported format specifiers.
-/**
- * \details
- * All format specifiers supported by the PHP implementation are supported by
- * this javascript implementation.
- */
-Date.ext.unsupported = { };
-
-
-/**
- * \brief Formats the date according to the specified format.
- * \param fmt	The format to format the date in.  This may be a combination of the following:
- * \copydoc formats
- *
- * \return	A string representation of the date formatted based on the passed in parameter
- * \sa http://www.php.net/strftime for documentation on format specifiers
-*/
-Date.prototype.strftime=function(fmt)
-{
-	// Fix locale if declared locale hasn't been defined
-	// After the first call this condition should never be entered unless someone changes the locale
-	if(!(this.locale in Date.ext.locales))
-	{
-		if(this.locale.replace(/-[a-zA-Z]+$/, '') in Date.ext.locales)
-		{
-			this.locale = this.locale.replace(/-[a-zA-Z]+$/, '');
-		}
-		else
-		{
-			this.locale = 'en-GB';
-		}
-	}
-
-	var d = this;
-	// First replace aggregates
-	while(fmt.match(/%[cDhnrRtTxXzZ]/))
-	{
-		fmt = fmt.replace(/%([cDhnrRtTxXzZ])/g, function(m0, m1)
-				{
-					var f = Date.ext.aggregates[m1];
-					return (f == 'locale' ? Date.ext.locales[d.locale][m1] : f);
-				});
-	}
-
-
-	// Now replace formats - we need a closure so that the date object gets passed through
-	var str = fmt.replace(/%([aAbBCdegGHIjmMpPSuUVwWyY%])/g, function(m0, m1) 
-			{
-				var f = Date.ext.formats[m1];
-				if(typeof(f) == 'string') {
-					return d[f]();
-				} else if(typeof(f) == 'function') {
-					return f.call(d, d);
-				} else if(typeof(f) == 'object' && typeof(f[0]) == 'string') {
-					return Date.ext.util.xPad(d[f[0]](), f[1]);
-				} else {
-					return m1;
-				}
-			});
-	d=null;
-	return str;
-};
-
-/**
- * \mainpage strftime for Javascript
- *
- * \section toc Table of Contents
- * - \ref intro_sec
- * - Download full source / minified
- * - \subpage usage
- * - \subpage format_specifiers
- * - \subpage localisation
- * - \link strftime.js API Documentation \endlink
- * - \subpage demo
- * - \subpage changelog
- * - \subpage faq
- * - Feedback
- * - \subpage copyright_licence
- *
- * \section intro_sec Introduction
- *
- * C and PHP developers have had access to a built in strftime function for a long time.
- * This function is an easy way to format dates and times for various display needs.
- *
- * This library brings the flexibility of strftime to the javascript Date object
- *
- * Use this library if you frequently need to format dates in javascript in a variety of ways.  For example,
- * if you have PHP code that writes out formatted dates, and want to mimic the functionality using
- * progressively enhanced javascript, then this library can do exactly what you want.
- *
- *
- *
- *
- * \page usage Example usage
- *
- * \section usage_sec Usage
- * This library may be used as follows:
- * \code
- *     var d = new Date();
- *
- *     var ymd = d.strftime('%Y/%m/%d');
- *     var iso = d.strftime('%Y-%m-%dT%H:%M:%S%z');
- *
- * \endcode
- *
- * \subsection examples Examples
- * 
- * To get the current time in hours and minutes:
- * \code
- * 	var d = new Date();
- * 	d.strftime("%H:%M");
- * \endcode
- *
- * To get the current time with seconds in AM/PM notation:
- * \code
- * 	var d = new Date();
- * 	d.strftime("%r");
- * \endcode
- *
- * To get the year and day of the year for August 23, 2009:
- * \code
- * 	var d = new Date('2009/8/23');
- * 	d.strftime("%Y-%j");
- * \endcode
- *
- * \section demo_sec Demo
- *
- * Try your own examples on the \subpage demo page.  You can use any of the supported
- * \subpage format_specifiers.
- *
- *
- *
- *
- * \page localisation Localisation
- * You can localise strftime by implementing the short and long forms for days of the
- * week and months of the year, and the localised aggregates for the preferred date
- * and time representation for your locale.  You need to add your locale to the
- * Date.ext.locales object.
- *
- * \section localising_fr Localising for french
- *
- * For example, this is how we'd add French language strings to the locales object:
- * \dontinclude index.html
- * \skip Generic french
- * \until };
- * The % format specifiers are all defined in \ref formats.  You can use any of those.
- *
- * This locale definition may be included in your own source file, or in the HTML file
- * including \c strftime.js, however it must be defined \em after including \c strftime.js
- *
- * The above definition includes generic french strings and formats that are used in France.
- * Other french speaking countries may have other representations for dates and times, so we
- * need to override this for them.  For example, Canadian french uses a Y-m-d date format,
- * while French french uses d.m.Y.  We fix this by defining Canadian french to be the same
- * as generic french, and then override the format specifiers for \c x for the \c fr-CA locale:
- * \until End french
- *
- * You can now use any of the French locales at any time by setting \link Date.prototype.locale Date.locale \endlink
- * to \c "fr", \c "fr-FR", \c "fr-CA", or any other french dialect:
- * \code
- *     var d = new Date("2008/04/22");
- *     d.locale = "fr";
- *
- *     d.strftime("%A, %d %B == %x");
- * \endcode
- * will return:
- * \code
- *     mardi, 22 avril == 22.04.2008
- * \endcode
- * While changing the locale to "fr-CA":
- * \code
- *     d.locale = "fr-CA";
- *
- *     d.strftime("%A, %d %B == %x");
- * \endcode
- * will return:
- * \code
- *     mardi, 22 avril == 2008-04-22
- * \endcode
- *
- * You can use any of the format specifiers defined at \ref formats
- *
- * The locale for all dates defaults to the value of the \c lang attribute of your HTML document if
- * it is set, or to \c "en" otherwise.
- * \note
- * Your locale definitions \b MUST be added to the locale object before calling
- * \link Date.prototype.strftime Date.strftime \endlink.
- *
- * \sa \ref formats for a list of format specifiers that can be used in your definitions
- * for c, x and X.
- *
- * \section locale_names Locale names
- *
- * Locale names are defined in RFC 1766. Typically, a locale would be a two letter ISO639
- * defined language code and an optional ISO3166 defined country code separated by a -
- * 
- * eg: fr-FR, de-DE, hi-IN
- *
- * \sa http://www.ietf.org/rfc/rfc1766.txt
- * \sa http://www.loc.gov/standards/iso639-2/php/code_list.php
- * \sa http://www.iso.org/iso/country_codes/iso_3166_code_lists/english_country_names_and_code_elements.htm
- * 
- * \section locale_fallback Locale fallbacks
- *
- * If a locale object corresponding to the fully specified locale isn't found, an attempt will be made
- * to fall back to the two letter language code.  If a locale object corresponding to that isn't found
- * either, then the locale will fall back to \c "en".  No warning will be issued.
- *
- * For example, if we define a locale for de:
- * \until };
- * Then set the locale to \c "de-DE":
- * \code
- *     d.locale = "de-DE";
- *
- *     d.strftime("%a, %d %b");
- * \endcode
- * In this case, the \c "de" locale will be used since \c "de-DE" has not been defined:
- * \code
- *     Di, 22 Apr
- * \endcode
- *
- * Swiss german will return the same since it will also fall back to \c "de":
- * \code
- *     d.locale = "de-CH";
- *
- *     d.strftime("%a, %d %b");
- * \endcode
- * \code
- *     Di, 22 Apr
- * \endcode
- *
- * We need to override the \c a specifier for Swiss german, since it's different from German german:
- * \until End german
- * We now get the correct results:
- * \code
- *     d.locale = "de-CH";
- *
- *     d.strftime("%a, %d %b");
- * \endcode
- * \code
- *     Die, 22 Apr
- * \endcode
- *
- * \section builtin_locales Built in locales
- *
- * This library comes with pre-defined locales for en, en-GB, en-US and en-AU.
- *
- * 
- *
- *
- * \page format_specifiers Format specifiers
- * 
- * \section specifiers Format specifiers
- * strftime has several format specifiers defined by the Open group at 
- * http://www.opengroup.org/onlinepubs/007908799/xsh/strftime.html
- *
- * PHP added a few of its own, defined at http://www.php.net/strftime
- *
- * This javascript implementation supports all the PHP specifiers
- *
- * \subsection supp Supported format specifiers:
- * \copydoc formats
- * 
- * \subsection unsupportedformats Unsupported format specifiers:
- * \copydoc unsupported
- *
- *
- *
- *
- * \page demo strftime demo
- * 
          
- * \copydoc formats
- * 
          
- * \htmlinclude index.html
- *
- *
- *
- *
- * \page faq FAQ
- * 
- * \section how_tos Usage
- *
- * \subsection howtouse Is there a manual on how to use this library?
- *
- * Yes, see \ref usage
- *
- * \subsection wheretoget Where can I get a minified version of this library?
- *
- * The minified version is available here.
- *
- * \subsection which_specifiers Which format specifiers are supported?
- *
- * See \ref format_specifiers
- *
- * \section whys Why?
- *
- * \subsection why_lib Why this library?
- *
- * I've used the strftime function in C, PHP and the Unix shell, and found it very useful
- * to do date formatting.  When I needed to do date formatting in javascript, I decided
- * that it made the most sense to just reuse what I'm already familiar with.
- *
- * \subsection why_another Why another strftime implementation for Javascript?
- *
- * Yes, there are other strftime implementations for Javascript, but I saw problems with
- * all of them that meant I couldn't use them directly.  Some implementations had bad
- * designs.  For example, iterating through all possible specifiers and scanning the string
- * for them.  Others were tied to specific libraries like prototype.
- *
- * Trying to extend any of the existing implementations would have required only slightly
- * less effort than writing this from scratch.  In the end it took me just about 3 hours
- * to write the code and about 6 hours battling with doxygen to write these docs.
- *
- * I also had an idea of how I wanted to implement this, so decided to try it.
- *
- * \subsection why_extend_date Why extend the Date class rather than subclass it?
- *
- * I tried subclassing Date and failed.  I didn't want to waste time on figuring
- * out if there was a problem in my code or if it just wasn't possible.  Adding to the
- * Date.prototype worked well, so I stuck with it.
- *
- * I did have some worries because of the way for..in loops got messed up after json.js added
- * to the Object.prototype, but that isn't an issue here since {} is not a subclass of Date.
- *
- * My last doubt was about the Date.ext namespace that I created.  I still don't like this,
- * but I felt that \c ext at least makes clear that this is external or an extension.
- *
- * It's quite possible that some future version of javascript will add an \c ext or a \c locale
- * or a \c strftime property/method to the Date class, but this library should probably
- * check for capabilities before doing what it does.
- *
- * \section curiosity Curiosity
- *
- * \subsection how_big How big is the code?
- *
- * \arg 26K bytes with documentation
- * \arg 4242 bytes minified using YUI Compressor
- * \arg 1477 bytes minified and gzipped
- *
- * \subsection how_long How long did it take to write this?
- *
- * 15 minutes for the idea while I was composing this blog post:
- * http://tech.bluesmoon.info/2008/04/javascript-date-functions.html
- *
- * 3 hours in one evening to write v1.0 of the code and 6 hours the same
- * night to write the docs and this manual.  As you can tell, I'm fairly
- * sleepy.
- *
- * Versions 1.1 and 1.2 were done in a couple of hours each, and version 1.3
- * in under one hour.
- *
- * \section contributing Contributing
- *
- * \subsection how_to_rfe How can I request features or make suggestions?
- *
- * You can leave a comment on my blog post about this library here:
- * http://tech.bluesmoon.info/2008/04/strftime-in-javascript.html
- *
- * \subsection how_to_contribute Can I/How can I contribute code to this library?
- *
- * Yes, that would be very nice, thank you.  You can do various things.  You can make changes
- * to the library, and make a diff against the current file and mail me that diff at
- * philip@bluesmoon.info, or you could just host the new file on your own servers and add
- * your name to the copyright list at the top stating which parts you've added.
- *
- * If you do mail me a diff, let me know how you'd like to be listed in the copyright section.
- *
- * \subsection copyright_signover Who owns the copyright on contributed code?
- *
- * The contributor retains copyright on contributed code.
- *
- * In some cases I may use contributed code as a template and write the code myself.  In this
- * case I'll give the contributor credit for the idea, but will not add their name to the
- * copyright holders list.
- *
- *
- *
- *
- * \page copyright_licence Copyright & Licence
- *
- * \section copyright Copyright
- * \dontinclude strftime.js
- * \skip Copyright
- * \until rights
- *
- * \section licence Licence
- * \skip This code
- * \until SUCH DAMAGE.
- *
- *
- *
- * \page changelog ChangeLog
- *
- * \par 1.3 - 2008/06/17:
- * - Fixed padding issue with negative timezone offsets in %r
- *   reported and fixed by Mikko 
- * - Added support for %P
- * - Internationalised %r, %p and %P
- *
- * \par 1.2 - 2008/04/27:
- * - Fixed support for c (previously it just returned toLocaleString())
- * - Add support for c, x and X
- * - Add locales for en-GB, en-US and en-AU
- * - Make en-GB the default locale (previous was en)
- * - Added more localisation docs
- *
- * \par 1.1 - 2008/04/27:
- * - Fix bug in xPad which wasn't padding more than a single digit
- * - Fix bug in j which had an off by one error for days after March 10th because of daylight savings
- * - Add support for g, G, U, V and W
- *
- * \par 1.0 - 2008/04/22:
- * - Initial release with support for a, A, b, B, c, C, d, D, e, H, I, j, m, M, p, r, R, S, t, T, u, w, y, Y, z, Z, and %
- */
diff --git a/vid/src/main/webapp/static/fusion/raptor/ebz/date_time_picker.css b/vid/src/main/webapp/static/fusion/raptor/ebz/date_time_picker.css
deleted file mode 100644
index a44c35603..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/ebz/date_time_picker.css
+++ /dev/null
@@ -1,557 +0,0 @@
-/**
- * @license angular-circular-timepicker  version: 0.1.0
- * Copyright 2016 sidaudhi.com, Inc. http://www.sidaudhi.com
- * License: MIT
- *
- * @author        Siddharth Audhinarayanan
- * @since        2016-Jan-31
- */
-
-.datetimepicker {
-  font-family: Arial;
-}
-
-.datetimepicker div,
-.datetimepicker span,
-.datetimepicker object,
-.datetimepicker iframe,
-.datetimepicker h1,
-.datetimepicker h2,
-.datetimepicker h3,
-.datetimepicker h4,
-.datetimepicker h5,
-.datetimepicker h6,
-.datetimepicker p,
-.datetimepicker pre,
-.datetimepicker a,
-.datetimepicker abbr,
-.datetimepicker acronym,
-.datetimepicker address,
-.datetimepicker code,
-.datetimepicker del,
-.datetimepicker dfn,
-.datetimepicker em,
-.datetimepicker img,
-.datetimepicker dl,
-.datetimepicker dt,
-.datetimepicker dd,
-.datetimepicker ol,
-.datetimepicker ul,
-.datetimepicker li,
-.datetimepicker fieldset,
-.datetimepicker form,
-.datetimepicker label,
-.datetimepicker legend,
-.datetimepicker caption,
-.datetimepicker tbody,
-.datetimepicker tfoot,
-.datetimepicker thead,
-.datetimepicker tr {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  outline: 0;
-  font-weight: inherit;
-  font-style: inherit;
-  font-family: inherit;
-  font-size: 100%;
-  vertical-align: baseline;
-}
-
-.datetimepicker table {
-  border-collapse: separate;
-  border-spacing: 0;
-  vertical-align: middle;
-}
-
-.datetimepicker caption,
-.datetimepicker th,
-.datetimepicker td {
-  text-align: left;
-  font-weight: normal;
-  vertical-align: middle;
-}
-
-.datetimepicker a img {
-  border: none;
-}
-
-.datetimepicker .left {
-  float: left;
-}
-
-.datetimepicker .right {
-  float: right;
-}
-
-.datetimepicker .datetimepicker-display {
-  padding: 6px 12px;
-  border: 1px solid rgba(0,0,0,0.15);
-  font-size: 15px;
-  min-height: 34px;
-}
-
-.datetimepicker .datetimepicker-toggle {
-  float: right;
-  padding: 7px;
-  border: 0px;
-  cursor: pointer;
-}
-
-.datetimepicker .datetimepicker-modal {
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  background-color: rgba(0,0,0,0.5);
-  position: fixed;
-  z-index: 990;
-}
-
-.datetimepicker .datetimepicker-close {
-  position: fixed;
-  right: 10px;
-  top: 5px;
-  color: #fff;
-  font-size: 24px;
-  cursor: pointer;
-  z-index: 999;
-}
-
-.datetimepicker .datetimepicker-preview {
-  padding: 5px;
-  text-align: center;
-  cursor: pointer;
-  font-size: 18px;
-  background-color: #0574AC;
-  color: #fff;
-}
-
-.datetimepicker .datetimepicker-content {
-  min-height: 300px;
-  background-color: #fff;
-  border: 1px solid rgba(0,0,0,0.15);
-  border-top: 0px;
-  position: relative;
-  width: 290px;
-  z-index: 998;
-}
-
-.datetimepicker .datetimepicker-content.datetimepicker-absolute {
-  position: fixed;
-  top: calc(30% - 100px);
-  left: calc(50% - 145px);
-  border: 0px;
-  -webkit-box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.5);
-  box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.5);
-}
-
-.datetimepicker .datetimepicker-content .datetimepicker-tabs {
-  background-color: #0574AC;
-}
-
-.datetimepicker .datetimepicker-content .datetimepicker-tabs .datetimepicker-tab {
-  width: 50%;
-  display: inline-block;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  padding: 5px;
-  text-align: center;
-  font-size: 13px;
-  text-transform: uppercase;
-  color: #fff;
-  cursor: pointer;
-  background-color: #f3f3f4;
-  color: #0574AC;
-}
-
-.datetimepicker .datetimepicker-content .datetimepicker-tabs .datetimepicker-tab.active {
-  background-color: #0574AC;
-  color: #f3f3f4;
-  font-weight: bold;
-}
-
-.datetimepicker .datetimepicker-content .datetimepicker-month {
-  border-bottom: 1px solid rgba(0,0,0,0.2);
-  background-color: #fff;
-}
-
-.datetimepicker .datetimepicker-content .datetimepicker-month .datetimepicker-current-month {
-  text-align: center;
-  padding: 10px 10px;
-}
-
-.datetimepicker .datetimepicker-calendar {
-  text-align: center;
-  padding: 10px 0px;
-}
-
-.datetimepicker .datetimepicker-calendar .datetimepicker-day {
-  width: 38px;
-  display: inline-block;
-  text-align: center;
-  padding: 10px;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  font-weight: bold;
-  color: #0574AC;
-  font-size: 15px;
-}
-
-.datetimepicker .datetimepicker-calendar .datetimepicker-day.datetimepicker-leading-day,
-.datetimepicker .datetimepicker-calendar .datetimepicker-day.datetimepicker-trailing-day {
-  font-weight: normal;
-  color: rgba(0,0,0,0.25);
-}
-
-.datetimepicker .datetimepicker-calendar .datetimepicker-day.datetimepicker-active-day {
-  font-weight: normal;
-  color: rgba(0,0,0,0.75);
-  font-size: 14px;
-}
-
-.datetimepicker .datetimepicker-calendar .datetimepicker-day.datetimepicker-active-day.selected,
-.datetimepicker .datetimepicker-calendar .datetimepicker-day.datetimepicker-active-day:hover {
-  color: #fff;
-  background-color: #0574AC;
-  cursor: pointer;
-}
-
-.datetimepicker .time-circle-outer {
-  width: 240px;
-  height: 240px;
-  border: 3px dashed rgba(0,0,0,0.1);
-  -webkit-border-radius: 50%;
-  border-radius: 50%;
-  margin: 30px auto;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  position: relative;
-}
-
-.datetimepicker .time-circle-outer .time-circle-center {
-  position: absolute;
-  top: calc(50% - 10px);
-  left: calc(50% - 10px);
-  width: 20px;
-  height: 20px;
-  background-color: #0574AC;
-  -webkit-border-radius: 50%;
-  border-radius: 50%;
-}
-
-.datetimepicker .time-circle-outer .time-meridian {
-  position: absolute;
-  top: -70px;
-  width: 30px;
-  height: 30px;
-  padding: 7px 5px;
-  -webkit-border-radius: 50%;
-  border-radius: 50%;
-  font-size: 13px;
-  font-weight: bold;
-  cursor: pointer;
-  color: #0574AC;
-  text-align: center;
-}
-
-.datetimepicker .time-circle-outer .time-meridian.time-left {
-  left: -15px;
-}
-
-.datetimepicker .time-circle-outer .time-meridian.time-right {
-  right: -15px;
-}
-
-.datetimepicker .time-circle-outer .time-meridian.selected {
-  background-color: #0574AC;
-  color: #fff;
-}
-
-.datetimepicker .time-circle-outer .time-circle-hand {
-  width: 6px;
-  height: 82px;
-  position: absolute;
-  left: calc(50% - 3px);
-  top: calc(50% - 82px);
-  -webkit-transform-origin: 50% 100%;
-  -moz-transform-origin: 50% 100%;
-  -o-transform-origin: 50% 100%;
-  -ms-transform-origin: 50% 100%;
-  transform-origin: 50% 100%;
-  background-color: #0574AC;
-}
-
-.datetimepicker .time-circle-outer .time-circle-hand.deg-1 {
-  -webkit-transform: rotate(30deg);
-  -moz-transform: rotate(30deg);
-  -o-transform: rotate(30deg);
-  -ms-transform: rotate(30deg);
-  transform: rotate(30deg);
-}
-
-.datetimepicker .time-circle-outer .time-circle-hand.deg-2 {
-  -webkit-transform: rotate(60deg);
-  -moz-transform: rotate(60deg);
-  -o-transform: rotate(60deg);
-  -ms-transform: rotate(60deg);
-  transform: rotate(60deg);
-}
-
-.datetimepicker .time-circle-outer .time-circle-hand.deg-3 {
-  -webkit-transform: rotate(90deg);
-  -moz-transform: rotate(90deg);
-  -o-transform: rotate(90deg);
-  -ms-transform: rotate(90deg);
-  transform: rotate(90deg);
-}
-
-.datetimepicker .time-circle-outer .time-circle-hand.deg-4 {
-  -webkit-transform: rotate(120deg);
-  -moz-transform: rotate(120deg);
-  -o-transform: rotate(120deg);
-  -ms-transform: rotate(120deg);
-  transform: rotate(120deg);
-}
-
-.datetimepicker .time-circle-outer .time-circle-hand.deg-5 {
-  -webkit-transform: rotate(150deg);
-  -moz-transform: rotate(150deg);
-  -o-transform: rotate(150deg);
-  -ms-transform: rotate(150deg);
-  transform: rotate(150deg);
-}
-
-.datetimepicker .time-circle-outer .time-circle-hand.deg-6 {
-  -webkit-transform: rotate(180deg);
-  -moz-transform: rotate(180deg);
-  -o-transform: rotate(180deg);
-  -ms-transform: rotate(180deg);
-  transform: rotate(180deg);
-}
-
-.datetimepicker .time-circle-outer .time-circle-hand.deg-7 {
-  -webkit-transform: rotate(210deg);
-  -moz-transform: rotate(210deg);
-  -o-transform: rotate(210deg);
-  -ms-transform: rotate(210deg);
-  transform: rotate(210deg);
-}
-
-.datetimepicker .time-circle-outer .time-circle-hand.deg-8 {
-  -webkit-transform: rotate(240deg);
-  -moz-transform: rotate(240deg);
-  -o-transform: rotate(240deg);
-  -ms-transform: rotate(240deg);
-  transform: rotate(240deg);
-}
-
-.datetimepicker .time-circle-outer .time-circle-hand.deg-9 {
-  -webkit-transform: rotate(270deg);
-  -moz-transform: rotate(270deg);
-  -o-transform: rotate(270deg);
-  -ms-transform: rotate(270deg);
-  transform: rotate(270deg);
-}
-
-.datetimepicker .time-circle-outer .time-circle-hand.deg-10 {
-  -webkit-transform: rotate(300deg);
-  -moz-transform: rotate(300deg);
-  -o-transform: rotate(300deg);
-  -ms-transform: rotate(300deg);
-  transform: rotate(300deg);
-}
-
-.datetimepicker .time-circle-outer .time-circle-hand.deg-11 {
-  -webkit-transform: rotate(330deg);
-  -moz-transform: rotate(330deg);
-  -o-transform: rotate(330deg);
-  -ms-transform: rotate(330deg);
-  transform: rotate(330deg);
-}
-
-.datetimepicker .time-circle-outer .time-circle-hand.deg-12 {
-  -webkit-transform: rotate(360deg);
-  -moz-transform: rotate(360deg);
-  -o-transform: rotate(360deg);
-  -ms-transform: rotate(360deg);
-  transform: rotate(360deg);
-}
-
-.datetimepicker .time-circle-outer .time-circle-hand-large {
-  height: 120px;
-  top: calc(50% - 120px);
-}
-
-.datetimepicker .time-circle-outer .time {
-  position: absolute;
-  margin-top: -15px;
-  margin-left: -15px;
-  background-color: #b4b4b4;
-  -webkit-border-radius: 50%;
-  border-radius: 50%;
-  padding: 5px;
-  height: 28px;
-  width: 28px;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  text-align: center;
-  font-size: 13px;
-  cursor: pointer;
-  color: rgba(0,0,0,0.75);
-}
-
-.datetimepicker .time-circle-outer .time:hover,
-.datetimepicker .time-circle-outer .time.selected {
-  background-color: #0574AC;
-  color: #fff;
-}
-
-.datetimepicker .time-circle-outer .time-1 {
-  left: calc(50% + 60px);
-  top: 16.076951545867374px;
-}
-
-.datetimepicker .time-circle-outer .time-2 {
-  left: calc(50% + 103.92304845413263px);
-  top: 60px;
-}
-
-.datetimepicker .time-circle-outer .time-3 {
-  left: calc(50% + 120px);
-  top: 120px;
-}
-
-.datetimepicker .time-circle-outer .time-4 {
-  left: calc(50% + 103.92304845413263px);
-  top: 180px;
-}
-
-.datetimepicker .time-circle-outer .time-5 {
-  left: calc(50% + 60px);
-  top: 223.92304845413264px;
-}
-
-.datetimepicker .time-circle-outer .time-6 {
-  left: 50%;
-  top: 240px;
-}
-
-.datetimepicker .time-circle-outer .time-11 {
-  left: calc(50% - 60px);
-  top: 16.076951545867374px;
-}
-
-.datetimepicker .time-circle-outer .time-10 {
-  left: calc(50% - 103.92304845413263px);
-  top: 60px;
-}
-
-.datetimepicker .time-circle-outer .time-9 {
-  left: calc(50% - 120px);
-  top: 120px;
-}
-
-.datetimepicker .time-circle-outer .time-8 {
-  left: calc(50% - 103.92304845413263px);
-  top: 180px;
-}
-
-.datetimepicker .time-circle-outer .time-7 {
-  left: calc(50% - 60px);
-  top: 223.92304845413264px;
-}
-
-.datetimepicker .time-circle-outer .time-12 {
-  left: 50%;
-  top: 0px;
-}
-
-.datetimepicker .time-circle-outer .time-circle-inner {
-  width: 164px;
-  height: 164px;
-  border: 3px dashed rgba(0,0,0,0.1);
-  -webkit-border-radius: 50%;
-  border-radius: 50%;
-  margin: 35px auto;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  position: relative;
-}
-
-.datetimepicker .time-circle-outer .time-circle-inner .time-1 {
-  left: calc(50% + 41px);
-  top: 10.985916889676034px;
-}
-
-.datetimepicker .time-circle-outer .time-circle-inner .time-2 {
-  left: calc(50% + 71.01408311032397px);
-  top: 41px;
-}
-
-.datetimepicker .time-circle-outer .time-circle-inner .time-3 {
-  left: calc(50% + 82px);
-  top: 82px;
-}
-
-.datetimepicker .time-circle-outer .time-circle-inner .time-4 {
-  left: calc(50% + 71.01408311032397px);
-  top: 123px;
-}
-
-.datetimepicker .time-circle-outer .time-circle-inner .time-5 {
-  left: calc(50% + 41px);
-  top: 153.01408311032395px;
-}
-
-.datetimepicker .time-circle-outer .time-circle-inner .time-6 {
-  left: 50%;
-  top: 164px;
-}
-
-.datetimepicker .time-circle-outer .time-circle-inner .time-11 {
-  left: calc(50% - 41px);
-  top: 10.985916889676034px;
-}
-
-.datetimepicker .time-circle-outer .time-circle-inner .time-10 {
-  left: calc(50% - 71.01408311032397px);
-  top: 41px;
-}
-
-.datetimepicker .time-circle-outer .time-circle-inner .time-9 {
-  left: calc(50% - 82px);
-  top: 82px;
-}
-
-.datetimepicker .time-circle-outer .time-circle-inner .time-8 {
-  left: calc(50% - 71.01408311032397px);
-  top: 123px;
-}
-
-.datetimepicker .time-circle-outer .time-circle-inner .time-7 {
-  left: calc(50% - 41px);
-  top: 153.01408311032395px;
-}
-
-.datetimepicker .time-circle-outer .time-circle-inner .time-12 {
-  left: 50%;
-  top: 0px;
-}
-
-.datetimepicker .datetimepicker-action {
-  cursor: pointer;
-  font-weight: bold;
-  line-height: 18px;
-  padding: 10px 10px;
-}
-
-.datetimepicker .datetimepicker-action:hover {
-  background-color: rgba(5, 116, 172, 1);
-  cursor: pointer;
-}
\ No newline at end of file
diff --git a/vid/src/main/webapp/static/fusion/raptor/ebz/date_time_picker.js b/vid/src/main/webapp/static/fusion/raptor/ebz/date_time_picker.js
deleted file mode 100644
index ae69a913d..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/ebz/date_time_picker.js
+++ /dev/null
@@ -1,277 +0,0 @@
- String.prototype.paddingLeft = function (paddingValue) {
-    return String(paddingValue + this).slice(-paddingValue.length);
- };
-
-angular.module("app/scripts/ng_js_att_tpls/datepicker/dateTimePickerPopup.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("app/scripts/ng_js_att_tpls/datepicker/dateTimePickerPopup.html",
-    "
          \n" +
-    "    
          \n" +
-    "        \n" +
-    
-    "        \n" +
-    "    
          \n" +
-
-    	'
          '
-        +   '
          '
-        
-        +   '
            '
-        +   '
          • '
-        +   'Date'
-        +   '
            • '
-        +   '
          • '
-        +   'Time'
-        +   '
            • '
-        +   '
          '
-
-        +     '
          '
-        +       '
          '
-        +'
          '
-        +'
          '
-        +         '
          {{displayMonth}} {{year}}
          '
-        +       '
          '
-        +       '
          '
-        +         '
          {{day | limitTo: 1}}
          '
-        +         '
          {{d}}
          '
-        +         '
          {{d}}
          '
-        +         '
          {{d}}
          '
-        +       '
          '
-        +     '
          '
-        
-        +     '
          '
-        +       '
          '
-        +         '
          {{hour}}:{{minute}}
          '
-        +       '
          '        
-        +       '
          '
-        +         '
          AM
          '
-        +         '
          PM
          '
-        +         '
          '
-        +         '
          '
-        +         '
          {{time}}
          '
-        +         '
          '
-        +           '
          '
-        +           '
          {{time}}
          '
-        +         '
          '
-        +       '
          '
-        +     '
          '
-        
-        +   '
          '
-        + '
          ' +
-
-    "
          \n" +
-    "");
-}]);
-
-angular.module('quantum').requires.push("app/scripts/ng_js_att_tpls/datepicker/dateTimePickerPopup.html");
-
-angular.module('quantum')
-.directive('dateTimePickerPopup', ['$document', 'datepickerService', '$isElement', '$documentBind', function($document, datepickerService, $isElement, $documentBind) {
-    var link = function (scope, elem, attr) {
-        datepickerService.bindScope(attr, scope);
-
-        scope.isOpen = false;
-
-        var toggle = scope.toggle = function (show) {
-            if(show === true || show === false) {
-                scope.isOpen = show;
-            } else {
-                scope.isOpen = !scope.isOpen;
-            }
-        };
-
-//        scope.$watch('current', function () {
-//            toggle(false);
-//        });
-
-        var outsideClick = function (e) {
-            var isElement = $isElement(angular.element(e.target), elem, $document);
-            if(!isElement) {
-                toggle(false);
-                scope.$apply();
-            }
-        };
-
-        $documentBind.click('isOpen', outsideClick, scope);
-        
-    	scope.tabs = [{
-            title: 'DATE',
-            url: '#option1'
-        }, {
-            title: 'TIME',
-            url: '#option2',
-            selected: true
-        }
-    ];
-        
-        //--------------------------------------
-
-        scope.state = false;
-        scope.tab = 'time';
-        scope.setTab = function(tab){
-          scope.tab = tab;
-        };
-        scope.config = {
-          modal: true,
-          color:'rgba(5, 116, 172, 1)',
-          backgroundColor: 'rgba(0,0,0,0.75)'
-        };
-        scope.months = ["January","February","March","April","May","June","July","Augusta","September","October","November","December"];
-        scope.dayNames = ["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"];
-        scope.$watch('current',function(value){
-          var m;
-          if(value)
-            m = moment(value);
-          else
-            m = moment();
-          m = m.minute(5*Math.ceil(m.minute()/5));
-          scope.display = m.format('YYYY-MM-DD hh:mm A');
-          scope.days = scope.getDaysInMonth(m.year(),m.month());
-          scope.minute = m.minute();
-          scope.meridian = m.format('A');
-          scope.hour  = scope.meridian == 'PM' ? m.hour() - 12: m.hour();
-          if(scope.hour==0) scope.hour = 12;
-          scope.datePreview = m.format('YYYY-MM-DD');
-          scope.timePreview = m.format('hh:mm A');
-          scope.displayMonth = scope.months[m.month()];
-          scope.day = m.date();
-          scope.year = m.year();
-
-        });
-
-        scope.setDay = function(date){
-          scope.current = moment(scope.current).date(date).toDate();
-        };
-
-        scope.setState = function(state){
-          scope.state = false;
-        };
-
-        scope.setHour = function(hour){
-          if(scope.meridian == 'PM' && hour < 12)
-            hour = hour + 12;
-          if(scope.meridian == 'AM' && hour == 12)
-            hour = hour - 12;
-          scope.current = moment(scope.current).hour(hour).toDate();
-        };
-
-        scope.setMeridian = function(meridian){
-          var m = moment(scope.current);
-
-          if(meridian == 'AM'){
-            if(m.hours()>=12){
-              m = m.add(-12,'hours');
-              scope.current = m.toDate();
-            }
-          }else{
-            if(m.hours()<12){
-              m = m.add(12,'hours');
-              scope.current = m.toDate();
-            }
-          }
-        };
-
-        scope.setMinutes = function(minutes){
-          scope.current = moment(scope.current).minute(minutes).toDate();
-        };
-
-        var days = [];
-        for(var i=1;i<=31;i++){
-          days.push(i);
-        }
-        scope.getDaysInMonth = function(year,month){
-          var firstDayOfWeek = 0;
-          var firstDayOfMonth = new Date(year, month, 1),
-              lastDayOfMonth = new Date(year, month + 1, 0),
-              lastDayOfPreviousMonth = new Date(year, month, 0),
-              daysInMonth = lastDayOfMonth.getDate(),
-              daysInLastMonth = lastDayOfPreviousMonth.getDate(),
-              dayOfWeek = firstDayOfMonth.getDay(),
-              leadingDays = (dayOfWeek - firstDayOfWeek + 7) % 7 || 7,
-              trailingDays = days.slice(0, 6 * 7 - (leadingDays + daysInMonth));
-          if (trailingDays.length > 7) {
-            trailingDays = trailingDays.slice(0, trailingDays.length-7);
-          }
-
-          return {
-            year: year,
-            month: month,
-            days: days.slice(0, daysInMonth),
-            leadingDays: days.slice(- leadingDays - (31 - daysInLastMonth), daysInLastMonth),
-            trailingDays: trailingDays
-          };
-        };
-
-        scope.addMonth = function(increment){
-          scope.current = moment(scope.current).add(increment,'months').toDate();
-        };
-      
-    };
-
-    return {
-        restrict: 'EA',
-        replace: true,
-        transclude: true,
-        templateUrl: 'app/scripts/ng_js_att_tpls/datepicker/dateTimePickerPopup.html',
-        scope: {
-            current: "=current"
-        },
-        compile: function (elem, attr) {
-            var wrapperElement = elem.find('span').eq(1);
-            wrapperElement.attr('current', 'current');
-            datepickerService.setAttributes(attr, wrapperElement);
-
-            return link;
-        }
-    };
-}])
-.directive('attDateTimePicker', ['$log', function($log) {
-    return {
-        restrict: 'A',
-        require: 'ngModel',
-        scope: {},
-        controller: ['$scope', '$element', '$attrs', '$compile', 'datepickerConfig', 'datepickerService', function($scope, $element, $attrs, $compile, datepickerConfig, datepickerService) {
-            var dateFormatString = angular.isDefined($attrs.dateFormat) ? $scope.$parent.$eval($attrs.dateFormat) : datepickerConfig.dateFormat;
-            var selectedDateMessage = '
          the date you selected is {{$parent.current | date : \'' + dateFormatString + '\'}}
          ';
-
-            $element.removeAttr('att-date-time-picker');
-            $element.removeAttr('ng-model');
-            $element.attr('ng-model', '$parent.current');
-            $element.attr('aria-describedby', 'datepicker');
-            $element.attr('format-date', dateFormatString);
-            $element.attr('att-input-deny', '[^0-9ampAMP \/:-]');
-            $element.attr('maxlength', 20);
-
-            var wrapperElement = angular.element('
          ');
-            wrapperElement.attr('date-time-picker-popup', '');
-            wrapperElement.attr('current', 'current');
-
-            datepickerService.setAttributes($attrs, wrapperElement);
-            datepickerService.bindScope($attrs, $scope);
-
-            wrapperElement.html('');
-            wrapperElement.append($element.prop('outerHTML'));
-            if (navigator.userAgent.match(/MSIE 8/) === null) {
-                wrapperElement.append(selectedDateMessage);
-            }
-            var elm = wrapperElement.prop('outerHTML');
-
-            elm = $compile(elm)($scope);
-            $element.replaceWith(elm);
-        }],
-        link: function(scope, elem, attr, ctrl) {
-            if (!ctrl) {
-                // do nothing if no ng-model
-                $log.error("ng-model is required.");
-                return;
-            }
-            
-            scope.$watch('current', function(value) {
-                ctrl.$setViewValue(value);
-            });
-            ctrl.$render = function() {
-                scope.current = ctrl.$viewValue;
-            };
-        }
-    };
-}]);
-
-
diff --git a/vid/src/main/webapp/static/fusion/raptor/ebz/dynamicform.js b/vid/src/main/webapp/static/fusion/raptor/ebz/dynamicform.js
deleted file mode 100644
index e711f414e..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/ebz/dynamicform.js
+++ /dev/null
@@ -1,112 +0,0 @@
-angular.module('quantum')
-  .directive('formBuilder', ['$q', '$parse', '$http', '$templateCache', '$compile', '$document', '$timeout', function ($q, $parse, $http, $templateCache, $compile, $document, $timeout) {
-    return {
-      restrict: 'E', // supports using directive as element only
-      scope:{ 
-		ngModel: '=',
-		ngFormFields: '=',
-		ngNumFormCols: '=',
-		ngTriggerMethod: '=',
-		ngShowFieldId: '='
-		},
-      link: function ($scope, element, attrs) {
-    	  $scope.element=element;
-    	  $scope.datetimeformat = "MM/dd/yyyy hh:mm a";
-
-    	  $scope.buildField = function (field, parentElement) {
-            var x = '';
-            if(field.visible) {
-            	if (field.fieldType === 'LIST_MULTI_SELECT') {
-            		x = angular.element('
          '+
-  			          	'
          '+
-  			      			''+
-  			      		'
          ');
-                } else if (field.fieldType === 'LIST_BOX') {
-                    	x = angular.element('
           
          ');
-                } else if((field.fieldType === 'text' || field.fieldType === 'TEXT') && field.validationType === 'DATE'){
-                	x = angular.element('
           ');
-                } else if((field.fieldType === 'text' || field.fieldType === 'TEXT') && field.validationType === 'TIMESTAMP_MIN'){
-                	x = angular.element('
           ');
-                } else if(field.fieldType === 'text' || field.fieldType === 'TEXT'){
-                		x = angular.element('
           ');
-                } else if(field.fieldType === 'CHECK_BOX'){
-                	x = angular.element('
           ');
-                }
-            }
-          	parentElement.append(x);
-            $compile(x)($scope);
-          };
-          $scope.buildForm = function() {
-  	        // create elements 
         and a 
-  	        var tbl     = angular.element("
        ");
-  	        var tblBody = angular.element("");
-  	        var row = angular.element("");
-  	        
-  	        var ngFormFieldsLength = $scope.ngFormFields.length;
-
-  	        for (var j = 0; j < ngFormFieldsLength; j++) {
-  	            var cell = angular.element("");
-  	            $scope.buildField($scope.ngFormFields[j],cell); 
-  	            row.append(cell);
-
-  	            if((j!=0 && (j+1)%$scope.ngNumFormCols==0) || j==(ngFormFieldsLength-1)){
-	    	            tblBody.append(row);
-  	            	row = angular.element("");
-  	            }
-  	        }
-  	        tbl.append(tblBody);
-    		angular.element($scope.element).html('');
-    		$scope.element.append(tbl);
-        };
-
-    	  
-  		$scope.formFieldLuValues = {};
-		$scope.getEBZFormat = function() {
-			if($scope.ngFormFields && $scope.ngFormFields.length>0){
-    	    	$scope.ngFormFields.forEach(function(formField) {
-    		   		if(formField.fieldType === 'LIST_MULTI_SELECT') {
-    		   			$scope.ngModel[formField.fieldId]= [];
-    		   			if(formField.formFieldValues && formField.formFieldValues.length>0){
-	    		   		 	formField.formFieldValues.forEach(function(entry,i) {
-	    		   		 		$scope.ngModel[formField.fieldId].push({ index: i, value: entry.id, title: entry.name, defaultValue: entry.defaultValue});
-	    			   		});
-    		   			}
-    		   		} else if(formField.fieldType==='LIST_BOX') {
-    		   			$scope.formFieldLuValues[formField.fieldId]= [];
-    		   			if(formField.formFieldValues && formField.formFieldValues.length>0){
-	    		   		 	formField.formFieldValues.forEach(function(entry,i) {
-	    		   		 		$scope.formFieldLuValues[formField.fieldId].push({ index: i, value: entry.id, title: entry.name});
-	    		   		 		if(entry.defaultValue){
-	    		   		 			$scope.ngModel[formField.fieldId]={ index: i, value: entry.id, title: entry.name};
-	    		   		 		}
-	    			   		});
-    		   			}
-    		   		} else if(formField.fieldType === 'text' || formField.fieldType === 'TEXT' || 
-    		   				formField.validationType === 'DATE' || formField.validationType === 'TIMESTAMP_MIN') {
-		   		 		if(formField.formFieldValues && formField.formFieldValues.length>0){
-		   		 			$scope.ngModel[formField.fieldId]=formField.formFieldValues[0].id;
-		   		 		}
-                    }
-    		   	});
-    		}
-		};
-		
-  		$scope.$watch("ngFormFields",function(newValue,oldValue) {
-  		  if($scope.ngFormFields){
-  	  		$scope.getEBZFormat();
-  	  	    $scope.buildForm();
-  		  }
-  		});
-  		
-  		$scope.triggerFormFields = function(triggerFlag) {
-  			if(triggerFlag){
-  	 	  		$scope.element.html('Loading...');
-  	 	  		$scope.ngTriggerMethod();
-  			}
-    	};
-
-      }
-    };
-  }]);
diff --git a/vid/src/main/webapp/static/fusion/raptor/ebz/moment.js b/vid/src/main/webapp/static/fusion/raptor/ebz/moment.js
deleted file mode 100644
index b5f0b3644..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/ebz/moment.js
+++ /dev/null
@@ -1,3688 +0,0 @@
-//! moment.js
-//! version : 2.12.0
-//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
-//! license : MIT
-//! momentjs.com
-
-;(function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
-    typeof define === 'function' && define.amd ? define(factory) :
-    global.moment = factory()
-}(this, function () { 'use strict';
-
-    var hookCallback;
-
-    function utils_hooks__hooks () {
-        return hookCallback.apply(null, arguments);
-    }
-
-    // This is done to register the method called with moment()
-    // without creating circular dependencies.
-    function setHookCallback (callback) {
-        hookCallback = callback;
-    }
-
-    function isArray(input) {
-        return input instanceof Array || Object.prototype.toString.call(input) === '[object Array]';
-    }
-
-    function isDate(input) {
-        return input instanceof Date || Object.prototype.toString.call(input) === '[object Date]';
-    }
-
-    function map(arr, fn) {
-        var res = [], i;
-        for (i = 0; i < arr.length; ++i) {
-            res.push(fn(arr[i], i));
-        }
-        return res;
-    }
-
-    function hasOwnProp(a, b) {
-        return Object.prototype.hasOwnProperty.call(a, b);
-    }
-
-    function extend(a, b) {
-        for (var i in b) {
-            if (hasOwnProp(b, i)) {
-                a[i] = b[i];
-            }
-        }
-
-        if (hasOwnProp(b, 'toString')) {
-            a.toString = b.toString;
-        }
-
-        if (hasOwnProp(b, 'valueOf')) {
-            a.valueOf = b.valueOf;
-        }
-
-        return a;
-    }
-
-    function create_utc__createUTC (input, format, locale, strict) {
-        return createLocalOrUTC(input, format, locale, strict, true).utc();
-    }
-
-    function defaultParsingFlags() {
-        // We need to deep clone this object.
-        return {
-            empty           : false,
-            unusedTokens    : [],
-            unusedInput     : [],
-            overflow        : -2,
-            charsLeftOver   : 0,
-            nullInput       : false,
-            invalidMonth    : null,
-            invalidFormat   : false,
-            userInvalidated : false,
-            iso             : false
-        };
-    }
-
-    function getParsingFlags(m) {
-        if (m._pf == null) {
-            m._pf = defaultParsingFlags();
-        }
-        return m._pf;
-    }
-
-    function valid__isValid(m) {
-        if (m._isValid == null) {
-            var flags = getParsingFlags(m);
-            m._isValid = !isNaN(m._d.getTime()) &&
-                flags.overflow < 0 &&
-                !flags.empty &&
-                !flags.invalidMonth &&
-                !flags.invalidWeekday &&
-                !flags.nullInput &&
-                !flags.invalidFormat &&
-                !flags.userInvalidated;
-
-            if (m._strict) {
-                m._isValid = m._isValid &&
-                    flags.charsLeftOver === 0 &&
-                    flags.unusedTokens.length === 0 &&
-                    flags.bigHour === undefined;
-            }
-        }
-        return m._isValid;
-    }
-
-    function valid__createInvalid (flags) {
-        var m = create_utc__createUTC(NaN);
-        if (flags != null) {
-            extend(getParsingFlags(m), flags);
-        }
-        else {
-            getParsingFlags(m).userInvalidated = true;
-        }
-
-        return m;
-    }
-
-    function isUndefined(input) {
-        return input === void 0;
-    }
-
-    // Plugins that add properties should also add the key here (null value),
-    // so we can properly clone ourselves.
-    var momentProperties = utils_hooks__hooks.momentProperties = [];
-
-    function copyConfig(to, from) {
-        var i, prop, val;
-
-        if (!isUndefined(from._isAMomentObject)) {
-            to._isAMomentObject = from._isAMomentObject;
-        }
-        if (!isUndefined(from._i)) {
-            to._i = from._i;
-        }
-        if (!isUndefined(from._f)) {
-            to._f = from._f;
-        }
-        if (!isUndefined(from._l)) {
-            to._l = from._l;
-        }
-        if (!isUndefined(from._strict)) {
-            to._strict = from._strict;
-        }
-        if (!isUndefined(from._tzm)) {
-            to._tzm = from._tzm;
-        }
-        if (!isUndefined(from._isUTC)) {
-            to._isUTC = from._isUTC;
-        }
-        if (!isUndefined(from._offset)) {
-            to._offset = from._offset;
-        }
-        if (!isUndefined(from._pf)) {
-            to._pf = getParsingFlags(from);
-        }
-        if (!isUndefined(from._locale)) {
-            to._locale = from._locale;
-        }
-
-        if (momentProperties.length > 0) {
-            for (i in momentProperties) {
-                prop = momentProperties[i];
-                val = from[prop];
-                if (!isUndefined(val)) {
-                    to[prop] = val;
-                }
-            }
-        }
-
-        return to;
-    }
-
-    var updateInProgress = false;
-
-    // Moment prototype object
-    function Moment(config) {
-        copyConfig(this, config);
-        this._d = new Date(config._d != null ? config._d.getTime() : NaN);
-        // Prevent infinite loop in case updateOffset creates new moment
-        // objects.
-        if (updateInProgress === false) {
-            updateInProgress = true;
-            utils_hooks__hooks.updateOffset(this);
-            updateInProgress = false;
-        }
-    }
-
-    function isMoment (obj) {
-        return obj instanceof Moment || (obj != null && obj._isAMomentObject != null);
-    }
-
-    function absFloor (number) {
-        if (number < 0) {
-            return Math.ceil(number);
-        } else {
-            return Math.floor(number);
-        }
-    }
-
-    function toInt(argumentForCoercion) {
-        var coercedNumber = +argumentForCoercion,
-            value = 0;
-
-        if (coercedNumber !== 0 && isFinite(coercedNumber)) {
-            value = absFloor(coercedNumber);
-        }
-
-        return value;
-    }
-
-    // compare two arrays, return the number of differences
-    function compareArrays(array1, array2, dontConvert) {
-        var len = Math.min(array1.length, array2.length),
-            lengthDiff = Math.abs(array1.length - array2.length),
-            diffs = 0,
-            i;
-        for (i = 0; i < len; i++) {
-            if ((dontConvert && array1[i] !== array2[i]) ||
-                (!dontConvert && toInt(array1[i]) !== toInt(array2[i]))) {
-                diffs++;
-            }
-        }
-        return diffs + lengthDiff;
-    }
-
-    function warn(msg) {
-        if (utils_hooks__hooks.suppressDeprecationWarnings === false &&
-                (typeof console !==  'undefined') && console.warn) {
-            console.warn('Deprecation warning: ' + msg);
-        }
-    }
-
-    function deprecate(msg, fn) {
-        var firstTime = true;
-
-        return extend(function () {
-            if (firstTime) {
-                warn(msg + '\nArguments: ' + Array.prototype.slice.call(arguments).join(', ') + '\n' + (new Error()).stack);
-                firstTime = false;
-            }
-            return fn.apply(this, arguments);
-        }, fn);
-    }
-
-    var deprecations = {};
-
-    function deprecateSimple(name, msg) {
-        if (!deprecations[name]) {
-            warn(msg);
-            deprecations[name] = true;
-        }
-    }
-
-    utils_hooks__hooks.suppressDeprecationWarnings = false;
-
-    function isFunction(input) {
-        return input instanceof Function || Object.prototype.toString.call(input) === '[object Function]';
-    }
-
-    function isObject(input) {
-        return Object.prototype.toString.call(input) === '[object Object]';
-    }
-
-    function locale_set__set (config) {
-        var prop, i;
-        for (i in config) {
-            prop = config[i];
-            if (isFunction(prop)) {
-                this[i] = prop;
-            } else {
-                this['_' + i] = prop;
-            }
-        }
-        this._config = config;
-        // Lenient ordinal parsing accepts just a number in addition to
-        // number + (possibly) stuff coming from _ordinalParseLenient.
-        this._ordinalParseLenient = new RegExp(this._ordinalParse.source + '|' + (/\d{1,2}/).source);
-    }
-
-    function mergeConfigs(parentConfig, childConfig) {
-        var res = extend({}, parentConfig), prop;
-        for (prop in childConfig) {
-            if (hasOwnProp(childConfig, prop)) {
-                if (isObject(parentConfig[prop]) && isObject(childConfig[prop])) {
-                    res[prop] = {};
-                    extend(res[prop], parentConfig[prop]);
-                    extend(res[prop], childConfig[prop]);
-                } else if (childConfig[prop] != null) {
-                    res[prop] = childConfig[prop];
-                } else {
-                    delete res[prop];
-                }
-            }
-        }
-        return res;
-    }
-
-    function Locale(config) {
-        if (config != null) {
-            this.set(config);
-        }
-    }
-
-    // internal storage for locale config files
-    var locales = {};
-    var globalLocale;
-
-    function normalizeLocale(key) {
-        return key ? key.toLowerCase().replace('_', '-') : key;
-    }
-
-    // pick the locale from the array
-    // try ['en-au', 'en-gb'] as 'en-au', 'en-gb', 'en', as in move through the list trying each
-    // substring from most specific to least, but move to the next array item if it's a more specific variant than the current root
-    function chooseLocale(names) {
-        var i = 0, j, next, locale, split;
-
-        while (i < names.length) {
-            split = normalizeLocale(names[i]).split('-');
-            j = split.length;
-            next = normalizeLocale(names[i + 1]);
-            next = next ? next.split('-') : null;
-            while (j > 0) {
-                locale = loadLocale(split.slice(0, j).join('-'));
-                if (locale) {
-                    return locale;
-                }
-                if (next && next.length >= j && compareArrays(split, next, true) >= j - 1) {
-                    //the next array item is better than a shallower substring of this one
-                    break;
-                }
-                j--;
-            }
-            i++;
-        }
-        return null;
-    }
-
-    function loadLocale(name) {
-        var oldLocale = null;
-        // TODO: Find a better way to register and load all the locales in Node
-        if (!locales[name] && (typeof module !== 'undefined') &&
-                module && module.exports) {
-            try {
-                oldLocale = globalLocale._abbr;
-                require('./locale/' + name);
-                // because defineLocale currently also sets the global locale, we
-                // want to undo that for lazy loaded locales
-                locale_locales__getSetGlobalLocale(oldLocale);
-            } catch (e) { }
-        }
-        return locales[name];
-    }
-
-    // This function will load locale and then set the global locale.  If
-    // no arguments are passed in, it will simply return the current global
-    // locale key.
-    function locale_locales__getSetGlobalLocale (key, values) {
-        var data;
-        if (key) {
-            if (isUndefined(values)) {
-                data = locale_locales__getLocale(key);
-            }
-            else {
-                data = defineLocale(key, values);
-            }
-
-            if (data) {
-                // moment.duration._locale = moment._locale = data;
-                globalLocale = data;
-            }
-        }
-
-        return globalLocale._abbr;
-    }
-
-    function defineLocale (name, config) {
-        if (config !== null) {
-            config.abbr = name;
-            if (locales[name] != null) {
-                deprecateSimple('defineLocaleOverride',
-                        'use moment.updateLocale(localeName, config) to change ' +
-                        'an existing locale. moment.defineLocale(localeName, ' +
-                        'config) should only be used for creating a new locale');
-                config = mergeConfigs(locales[name]._config, config);
-            } else if (config.parentLocale != null) {
-                if (locales[config.parentLocale] != null) {
-                    config = mergeConfigs(locales[config.parentLocale]._config, config);
-                } else {
-                    // treat as if there is no base config
-                    deprecateSimple('parentLocaleUndefined',
-                            'specified parentLocale is not defined yet');
-                }
-            }
-            locales[name] = new Locale(config);
-
-            // backwards compat for now: also set the locale
-            locale_locales__getSetGlobalLocale(name);
-
-            return locales[name];
-        } else {
-            // useful for testing
-            delete locales[name];
-            return null;
-        }
-    }
-
-    function updateLocale(name, config) {
-        if (config != null) {
-            var locale;
-            if (locales[name] != null) {
-                config = mergeConfigs(locales[name]._config, config);
-            }
-            locale = new Locale(config);
-            locale.parentLocale = locales[name];
-            locales[name] = locale;
-
-            // backwards compat for now: also set the locale
-            locale_locales__getSetGlobalLocale(name);
-        } else {
-            // pass null for config to unupdate, useful for tests
-            if (locales[name] != null) {
-                if (locales[name].parentLocale != null) {
-                    locales[name] = locales[name].parentLocale;
-                } else if (locales[name] != null) {
-                    delete locales[name];
-                }
-            }
-        }
-        return locales[name];
-    }
-
-    // returns locale data
-    function locale_locales__getLocale (key) {
-        var locale;
-
-        if (key && key._locale && key._locale._abbr) {
-            key = key._locale._abbr;
-        }
-
-        if (!key) {
-            return globalLocale;
-        }
-
-        if (!isArray(key)) {
-            //short-circuit everything else
-            locale = loadLocale(key);
-            if (locale) {
-                return locale;
-            }
-            key = [key];
-        }
-
-        return chooseLocale(key);
-    }
-
-    function locale_locales__listLocales() {
-        return Object.keys(locales);
-    }
-
-    var aliases = {};
-
-    function addUnitAlias (unit, shorthand) {
-        var lowerCase = unit.toLowerCase();
-        aliases[lowerCase] = aliases[lowerCase + 's'] = aliases[shorthand] = unit;
-    }
-
-    function normalizeUnits(units) {
-        return typeof units === 'string' ? aliases[units] || aliases[units.toLowerCase()] : undefined;
-    }
-
-    function normalizeObjectUnits(inputObject) {
-        var normalizedInput = {},
-            normalizedProp,
-            prop;
-
-        for (prop in inputObject) {
-            if (hasOwnProp(inputObject, prop)) {
-                normalizedProp = normalizeUnits(prop);
-                if (normalizedProp) {
-                    normalizedInput[normalizedProp] = inputObject[prop];
-                }
-            }
-        }
-
-        return normalizedInput;
-    }
-
-    function makeGetSet (unit, keepTime) {
-        return function (value) {
-            if (value != null) {
-                get_set__set(this, unit, value);
-                utils_hooks__hooks.updateOffset(this, keepTime);
-                return this;
-            } else {
-                return get_set__get(this, unit);
-            }
-        };
-    }
-
-    function get_set__get (mom, unit) {
-        return mom.isValid() ?
-            mom._d['get' + (mom._isUTC ? 'UTC' : '') + unit]() : NaN;
-    }
-
-    function get_set__set (mom, unit, value) {
-        if (mom.isValid()) {
-            mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value);
-        }
-    }
-
-    // MOMENTS
-
-    function getSet (units, value) {
-        var unit;
-        if (typeof units === 'object') {
-            for (unit in units) {
-                this.set(unit, units[unit]);
-            }
-        } else {
-            units = normalizeUnits(units);
-            if (isFunction(this[units])) {
-                return this[units](value);
-            }
-        }
-        return this;
-    }
-
-    function zeroFill(number, targetLength, forceSign) {
-        var absNumber = '' + Math.abs(number),
-            zerosToFill = targetLength - absNumber.length,
-            sign = number >= 0;
-        return (sign ? (forceSign ? '+' : '') : '-') +
-            Math.pow(10, Math.max(0, zerosToFill)).toString().substr(1) + absNumber;
-    }
-
-    var formattingTokens = /(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g;
-
-    var localFormattingTokens = /(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g;
-
-    var formatFunctions = {};
-
-    var formatTokenFunctions = {};
-
-    // token:    'M'
-    // padded:   ['MM', 2]
-    // ordinal:  'Mo'
-    // callback: function () { this.month() + 1 }
-    function addFormatToken (token, padded, ordinal, callback) {
-        var func = callback;
-        if (typeof callback === 'string') {
-            func = function () {
-                return this[callback]();
-            };
-        }
-        if (token) {
-            formatTokenFunctions[token] = func;
-        }
-        if (padded) {
-            formatTokenFunctions[padded[0]] = function () {
-                return zeroFill(func.apply(this, arguments), padded[1], padded[2]);
-            };
-        }
-        if (ordinal) {
-            formatTokenFunctions[ordinal] = function () {
-                return this.localeData().ordinal(func.apply(this, arguments), token);
-            };
-        }
-    }
-
-    function removeFormattingTokens(input) {
-        if (input.match(/\[[\s\S]/)) {
-            return input.replace(/^\[|\]$/g, '');
-        }
-        return input.replace(/\\/g, '');
-    }
-
-    function makeFormatFunction(format) {
-        var array = format.match(formattingTokens), i, length;
-
-        for (i = 0, length = array.length; i < length; i++) {
-            if (formatTokenFunctions[array[i]]) {
-                array[i] = formatTokenFunctions[array[i]];
-            } else {
-                array[i] = removeFormattingTokens(array[i]);
-            }
-        }
-
-        return function (mom) {
-            var output = '';
-            for (i = 0; i < length; i++) {
-                output += array[i] instanceof Function ? array[i].call(mom, format) : array[i];
-            }
-            return output;
-        };
-    }
-
-    // format date using native date object
-    function formatMoment(m, format) {
-        if (!m.isValid()) {
-            return m.localeData().invalidDate();
-        }
-
-        format = expandFormat(format, m.localeData());
-        formatFunctions[format] = formatFunctions[format] || makeFormatFunction(format);
-
-        return formatFunctions[format](m);
-    }
-
-    function expandFormat(format, locale) {
-        var i = 5;
-
-        function replaceLongDateFormatTokens(input) {
-            return locale.longDateFormat(input) || input;
-        }
-
-        localFormattingTokens.lastIndex = 0;
-        while (i >= 0 && localFormattingTokens.test(format)) {
-            format = format.replace(localFormattingTokens, replaceLongDateFormatTokens);
-            localFormattingTokens.lastIndex = 0;
-            i -= 1;
-        }
-
-        return format;
-    }
-
-    var match1         = /\d/;            //       0 - 9
-    var match2         = /\d\d/;          //      00 - 99
-    var match3         = /\d{3}/;         //     000 - 999
-    var match4         = /\d{4}/;         //    0000 - 9999
-    var match6         = /[+-]?\d{6}/;    // -999999 - 999999
-    var match1to2      = /\d\d?/;         //       0 - 99
-    var match3to4      = /\d\d\d\d?/;     //     999 - 9999
-    var match5to6      = /\d\d\d\d\d\d?/; //   99999 - 999999
-    var match1to3      = /\d{1,3}/;       //       0 - 999
-    var match1to4      = /\d{1,4}/;       //       0 - 9999
-    var match1to6      = /[+-]?\d{1,6}/;  // -999999 - 999999
-
-    var matchUnsigned  = /\d+/;           //       0 - inf
-    var matchSigned    = /[+-]?\d+/;      //    -inf - inf
-
-    var matchOffset    = /Z|[+-]\d\d:?\d\d/gi; // +00:00 -00:00 +0000 -0000 or Z
-    var matchShortOffset = /Z|[+-]\d\d(?::?\d\d)?/gi; // +00 -00 +00:00 -00:00 +0000 -0000 or Z
-
-    var matchTimestamp = /[+-]?\d+(\.\d{1,3})?/; // 123456789 123456789.123
-
-    // any word (or two) characters or numbers including two/three word month in arabic.
-    // includes scottish gaelic two word and hyphenated months
-    var matchWord = /[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i;
-
-
-    var regexes = {};
-
-    function addRegexToken (token, regex, strictRegex) {
-        regexes[token] = isFunction(regex) ? regex : function (isStrict, localeData) {
-            return (isStrict && strictRegex) ? strictRegex : regex;
-        };
-    }
-
-    function getParseRegexForToken (token, config) {
-        if (!hasOwnProp(regexes, token)) {
-            return new RegExp(unescapeFormat(token));
-        }
-
-        return regexes[token](config._strict, config._locale);
-    }
-
-    // Code from http://stackoverflow.com/questions/3561493/is-there-a-regexp-escape-function-in-javascript
-    function unescapeFormat(s) {
-        return regexEscape(s.replace('\\', '').replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g, function (matched, p1, p2, p3, p4) {
-            return p1 || p2 || p3 || p4;
-        }));
-    }
-
-    function regexEscape(s) {
-        return s.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
-    }
-
-    var tokens = {};
-
-    function addParseToken (token, callback) {
-        var i, func = callback;
-        if (typeof token === 'string') {
-            token = [token];
-        }
-        if (typeof callback === 'number') {
-            func = function (input, array) {
-                array[callback] = toInt(input);
-            };
-        }
-        for (i = 0; i < token.length; i++) {
-            tokens[token[i]] = func;
-        }
-    }
-
-    function addWeekParseToken (token, callback) {
-        addParseToken(token, function (input, array, config, token) {
-            config._w = config._w || {};
-            callback(input, config._w, config, token);
-        });
-    }
-
-    function addTimeToArrayFromToken(token, input, config) {
-        if (input != null && hasOwnProp(tokens, token)) {
-            tokens[token](input, config._a, config, token);
-        }
-    }
-
-    var YEAR = 0;
-    var MONTH = 1;
-    var DATE = 2;
-    var HOUR = 3;
-    var MINUTE = 4;
-    var SECOND = 5;
-    var MILLISECOND = 6;
-    var WEEK = 7;
-    var WEEKDAY = 8;
-
-    function daysInMonth(year, month) {
-        return new Date(Date.UTC(year, month + 1, 0)).getUTCDate();
-    }
-
-    // FORMATTING
-
-    addFormatToken('M', ['MM', 2], 'Mo', function () {
-        return this.month() + 1;
-    });
-
-    addFormatToken('MMM', 0, 0, function (format) {
-        return this.localeData().monthsShort(this, format);
-    });
-
-    addFormatToken('MMMM', 0, 0, function (format) {
-        return this.localeData().months(this, format);
-    });
-
-    // ALIASES
-
-    addUnitAlias('month', 'M');
-
-    // PARSING
-
-    addRegexToken('M',    match1to2);
-    addRegexToken('MM',   match1to2, match2);
-    addRegexToken('MMM',  function (isStrict, locale) {
-        return locale.monthsShortRegex(isStrict);
-    });
-    addRegexToken('MMMM', function (isStrict, locale) {
-        return locale.monthsRegex(isStrict);
-    });
-
-    addParseToken(['M', 'MM'], function (input, array) {
-        array[MONTH] = toInt(input) - 1;
-    });
-
-    addParseToken(['MMM', 'MMMM'], function (input, array, config, token) {
-        var month = config._locale.monthsParse(input, token, config._strict);
-        // if we didn't find a month name, mark the date as invalid.
-        if (month != null) {
-            array[MONTH] = month;
-        } else {
-            getParsingFlags(config).invalidMonth = input;
-        }
-    });
-
-    // LOCALES
-
-    var MONTHS_IN_FORMAT = /D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/;
-    var defaultLocaleMonths = 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_');
-    function localeMonths (m, format) {
-        return isArray(this._months) ? this._months[m.month()] :
-            this._months[MONTHS_IN_FORMAT.test(format) ? 'format' : 'standalone'][m.month()];
-    }
-
-    var defaultLocaleMonthsShort = 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_');
-    function localeMonthsShort (m, format) {
-        return isArray(this._monthsShort) ? this._monthsShort[m.month()] :
-            this._monthsShort[MONTHS_IN_FORMAT.test(format) ? 'format' : 'standalone'][m.month()];
-    }
-
-    function localeMonthsParse (monthName, format, strict) {
-        var i, mom, regex;
-
-        if (!this._monthsParse) {
-            this._monthsParse = [];
-            this._longMonthsParse = [];
-            this._shortMonthsParse = [];
-        }
-
-        for (i = 0; i < 12; i++) {
-            // make the regex if we don't have it already
-            mom = create_utc__createUTC([2000, i]);
-            if (strict && !this._longMonthsParse[i]) {
-                this._longMonthsParse[i] = new RegExp('^' + this.months(mom, '').replace('.', '') + '$', 'i');
-                this._shortMonthsParse[i] = new RegExp('^' + this.monthsShort(mom, '').replace('.', '') + '$', 'i');
-            }
-            if (!strict && !this._monthsParse[i]) {
-                regex = '^' + this.months(mom, '') + '|^' + this.monthsShort(mom, '');
-                this._monthsParse[i] = new RegExp(regex.replace('.', ''), 'i');
-            }
-            // test the regex
-            if (strict && format === 'MMMM' && this._longMonthsParse[i].test(monthName)) {
-                return i;
-            } else if (strict && format === 'MMM' && this._shortMonthsParse[i].test(monthName)) {
-                return i;
-            } else if (!strict && this._monthsParse[i].test(monthName)) {
-                return i;
-            }
-        }
-    }
-
-    // MOMENTS
-
-    function setMonth (mom, value) {
-        var dayOfMonth;
-
-        if (!mom.isValid()) {
-            // No op
-            return mom;
-        }
-
-        if (typeof value === 'string') {
-            if (/^\d+$/.test(value)) {
-                value = toInt(value);
-            } else {
-                value = mom.localeData().monthsParse(value);
-                // TODO: Another silent failure?
-                if (typeof value !== 'number') {
-                    return mom;
-                }
-            }
-        }
-
-        dayOfMonth = Math.min(mom.date(), daysInMonth(mom.year(), value));
-        mom._d['set' + (mom._isUTC ? 'UTC' : '') + 'Month'](value, dayOfMonth);
-        return mom;
-    }
-
-    function getSetMonth (value) {
-        if (value != null) {
-            setMonth(this, value);
-            utils_hooks__hooks.updateOffset(this, true);
-            return this;
-        } else {
-            return get_set__get(this, 'Month');
-        }
-    }
-
-    function getDaysInMonth () {
-        return daysInMonth(this.year(), this.month());
-    }
-
-    var defaultMonthsShortRegex = matchWord;
-    function monthsShortRegex (isStrict) {
-        if (this._monthsParseExact) {
-            if (!hasOwnProp(this, '_monthsRegex')) {
-                computeMonthsParse.call(this);
-            }
-            if (isStrict) {
-                return this._monthsShortStrictRegex;
-            } else {
-                return this._monthsShortRegex;
-            }
-        } else {
-            return this._monthsShortStrictRegex && isStrict ?
-                this._monthsShortStrictRegex : this._monthsShortRegex;
-        }
-    }
-
-    var defaultMonthsRegex = matchWord;
-    function monthsRegex (isStrict) {
-        if (this._monthsParseExact) {
-            if (!hasOwnProp(this, '_monthsRegex')) {
-                computeMonthsParse.call(this);
-            }
-            if (isStrict) {
-                return this._monthsStrictRegex;
-            } else {
-                return this._monthsRegex;
-            }
-        } else {
-            return this._monthsStrictRegex && isStrict ?
-                this._monthsStrictRegex : this._monthsRegex;
-        }
-    }
-
-    function computeMonthsParse () {
-        function cmpLenRev(a, b) {
-            return b.length - a.length;
-        }
-
-        var shortPieces = [], longPieces = [], mixedPieces = [],
-            i, mom;
-        for (i = 0; i < 12; i++) {
-            // make the regex if we don't have it already
-            mom = create_utc__createUTC([2000, i]);
-            shortPieces.push(this.monthsShort(mom, ''));
-            longPieces.push(this.months(mom, ''));
-            mixedPieces.push(this.months(mom, ''));
-            mixedPieces.push(this.monthsShort(mom, ''));
-        }
-        // Sorting makes sure if one month (or abbr) is a prefix of another it
-        // will match the longer piece.
-        shortPieces.sort(cmpLenRev);
-        longPieces.sort(cmpLenRev);
-        mixedPieces.sort(cmpLenRev);
-        for (i = 0; i < 12; i++) {
-            shortPieces[i] = regexEscape(shortPieces[i]);
-            longPieces[i] = regexEscape(longPieces[i]);
-            mixedPieces[i] = regexEscape(mixedPieces[i]);
-        }
-
-        this._monthsRegex = new RegExp('^(' + mixedPieces.join('|') + ')', 'i');
-        this._monthsShortRegex = this._monthsRegex;
-        this._monthsStrictRegex = new RegExp('^(' + longPieces.join('|') + ')$', 'i');
-        this._monthsShortStrictRegex = new RegExp('^(' + shortPieces.join('|') + ')$', 'i');
-    }
-
-    function checkOverflow (m) {
-        var overflow;
-        var a = m._a;
-
-        if (a && getParsingFlags(m).overflow === -2) {
-            overflow =
-                a[MONTH]       < 0 || a[MONTH]       > 11  ? MONTH :
-                a[DATE]        < 1 || a[DATE]        > daysInMonth(a[YEAR], a[MONTH]) ? DATE :
-                a[HOUR]        < 0 || a[HOUR]        > 24 || (a[HOUR] === 24 && (a[MINUTE] !== 0 || a[SECOND] !== 0 || a[MILLISECOND] !== 0)) ? HOUR :
-                a[MINUTE]      < 0 || a[MINUTE]      > 59  ? MINUTE :
-                a[SECOND]      < 0 || a[SECOND]      > 59  ? SECOND :
-                a[MILLISECOND] < 0 || a[MILLISECOND] > 999 ? MILLISECOND :
-                -1;
-
-            if (getParsingFlags(m)._overflowDayOfYear && (overflow < YEAR || overflow > DATE)) {
-                overflow = DATE;
-            }
-            if (getParsingFlags(m)._overflowWeeks && overflow === -1) {
-                overflow = WEEK;
-            }
-            if (getParsingFlags(m)._overflowWeekday && overflow === -1) {
-                overflow = WEEKDAY;
-            }
-
-            getParsingFlags(m).overflow = overflow;
-        }
-
-        return m;
-    }
-
-    // iso 8601 regex
-    // 0000-00-00 0000-W00 or 0000-W00-0 + T + 00 or 00:00 or 00:00:00 or 00:00:00.000 + +00:00 or +0000 or +00)
-    var extendedIsoRegex = /^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?/;
-    var basicIsoRegex = /^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?/;
-
-    var tzRegex = /Z|[+-]\d\d(?::?\d\d)?/;
-
-    var isoDates = [
-        ['YYYYYY-MM-DD', /[+-]\d{6}-\d\d-\d\d/],
-        ['YYYY-MM-DD', /\d{4}-\d\d-\d\d/],
-        ['GGGG-[W]WW-E', /\d{4}-W\d\d-\d/],
-        ['GGGG-[W]WW', /\d{4}-W\d\d/, false],
-        ['YYYY-DDD', /\d{4}-\d{3}/],
-        ['YYYY-MM', /\d{4}-\d\d/, false],
-        ['YYYYYYMMDD', /[+-]\d{10}/],
-        ['YYYYMMDD', /\d{8}/],
-        // YYYYMM is NOT allowed by the standard
-        ['GGGG[W]WWE', /\d{4}W\d{3}/],
-        ['GGGG[W]WW', /\d{4}W\d{2}/, false],
-        ['YYYYDDD', /\d{7}/]
-    ];
-
-    // iso time formats and regexes
-    var isoTimes = [
-        ['HH:mm:ss.SSSS', /\d\d:\d\d:\d\d\.\d+/],
-        ['HH:mm:ss,SSSS', /\d\d:\d\d:\d\d,\d+/],
-        ['HH:mm:ss', /\d\d:\d\d:\d\d/],
-        ['HH:mm', /\d\d:\d\d/],
-        ['HHmmss.SSSS', /\d\d\d\d\d\d\.\d+/],
-        ['HHmmss,SSSS', /\d\d\d\d\d\d,\d+/],
-        ['HHmmss', /\d\d\d\d\d\d/],
-        ['HHmm', /\d\d\d\d/],
-        ['HH', /\d\d/]
-    ];
-
-    var aspNetJsonRegex = /^\/?Date\((\-?\d+)/i;
-
-    // date from iso format
-    function configFromISO(config) {
-        var i, l,
-            string = config._i,
-            match = extendedIsoRegex.exec(string) || basicIsoRegex.exec(string),
-            allowTime, dateFormat, timeFormat, tzFormat;
-
-        if (match) {
-            getParsingFlags(config).iso = true;
-
-            for (i = 0, l = isoDates.length; i < l; i++) {
-                if (isoDates[i][1].exec(match[1])) {
-                    dateFormat = isoDates[i][0];
-                    allowTime = isoDates[i][2] !== false;
-                    break;
-                }
-            }
-            if (dateFormat == null) {
-                config._isValid = false;
-                return;
-            }
-            if (match[3]) {
-                for (i = 0, l = isoTimes.length; i < l; i++) {
-                    if (isoTimes[i][1].exec(match[3])) {
-                        // match[2] should be 'T' or space
-                        timeFormat = (match[2] || ' ') + isoTimes[i][0];
-                        break;
-                    }
-                }
-                if (timeFormat == null) {
-                    config._isValid = false;
-                    return;
-                }
-            }
-            if (!allowTime && timeFormat != null) {
-                config._isValid = false;
-                return;
-            }
-            if (match[4]) {
-                if (tzRegex.exec(match[4])) {
-                    tzFormat = 'Z';
-                } else {
-                    config._isValid = false;
-                    return;
-                }
-            }
-            config._f = dateFormat + (timeFormat || '') + (tzFormat || '');
-            configFromStringAndFormat(config);
-        } else {
-            config._isValid = false;
-        }
-    }
-
-    // date from iso format or fallback
-    function configFromString(config) {
-        var matched = aspNetJsonRegex.exec(config._i);
-
-        if (matched !== null) {
-            config._d = new Date(+matched[1]);
-            return;
-        }
-
-        configFromISO(config);
-        if (config._isValid === false) {
-            delete config._isValid;
-            utils_hooks__hooks.createFromInputFallback(config);
-        }
-    }
-
-    utils_hooks__hooks.createFromInputFallback = deprecate(
-        'moment construction falls back to js Date. This is ' +
-        'discouraged and will be removed in upcoming major ' +
-        'release. Please refer to ' +
-        'https://github.com/moment/moment/issues/1407 for more info.',
-        function (config) {
-            config._d = new Date(config._i + (config._useUTC ? ' UTC' : ''));
-        }
-    );
-
-    function createDate (y, m, d, h, M, s, ms) {
-        //can't just apply() to create a date:
-        //http://stackoverflow.com/questions/181348/instantiating-a-javascript-object-by-calling-prototype-constructor-apply
-        var date = new Date(y, m, d, h, M, s, ms);
-
-        //the date constructor remaps years 0-99 to 1900-1999
-        if (y < 100 && y >= 0 && isFinite(date.getFullYear())) {
-            date.setFullYear(y);
-        }
-        return date;
-    }
-
-    function createUTCDate (y) {
-        var date = new Date(Date.UTC.apply(null, arguments));
-
-        //the Date.UTC function remaps years 0-99 to 1900-1999
-        if (y < 100 && y >= 0 && isFinite(date.getUTCFullYear())) {
-            date.setUTCFullYear(y);
-        }
-        return date;
-    }
-
-    // FORMATTING
-
-    addFormatToken('Y', 0, 0, function () {
-        var y = this.year();
-        return y <= 9999 ? '' + y : '+' + y;
-    });
-
-    addFormatToken(0, ['YY', 2], 0, function () {
-        return this.year() % 100;
-    });
-
-    addFormatToken(0, ['YYYY',   4],       0, 'year');
-    addFormatToken(0, ['YYYYY',  5],       0, 'year');
-    addFormatToken(0, ['YYYYYY', 6, true], 0, 'year');
-
-    // ALIASES
-
-    addUnitAlias('year', 'y');
-
-    // PARSING
-
-    addRegexToken('Y',      matchSigned);
-    addRegexToken('YY',     match1to2, match2);
-    addRegexToken('YYYY',   match1to4, match4);
-    addRegexToken('YYYYY',  match1to6, match6);
-    addRegexToken('YYYYYY', match1to6, match6);
-
-    addParseToken(['YYYYY', 'YYYYYY'], YEAR);
-    addParseToken('YYYY', function (input, array) {
-        array[YEAR] = input.length === 2 ? utils_hooks__hooks.parseTwoDigitYear(input) : toInt(input);
-    });
-    addParseToken('YY', function (input, array) {
-        array[YEAR] = utils_hooks__hooks.parseTwoDigitYear(input);
-    });
-    addParseToken('Y', function (input, array) {
-        array[YEAR] = parseInt(input, 10);
-    });
-
-    // HELPERS
-
-    function daysInYear(year) {
-        return isLeapYear(year) ? 366 : 365;
-    }
-
-    function isLeapYear(year) {
-        return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
-    }
-
-    // HOOKS
-
-    utils_hooks__hooks.parseTwoDigitYear = function (input) {
-        return toInt(input) + (toInt(input) > 68 ? 1900 : 2000);
-    };
-
-    // MOMENTS
-
-    var getSetYear = makeGetSet('FullYear', false);
-
-    function getIsLeapYear () {
-        return isLeapYear(this.year());
-    }
-
-    // start-of-first-week - start-of-year
-    function firstWeekOffset(year, dow, doy) {
-        var // first-week day -- which january is always in the first week (4 for iso, 1 for other)
-            fwd = 7 + dow - doy,
-            // first-week day local weekday -- which local weekday is fwd
-            fwdlw = (7 + createUTCDate(year, 0, fwd).getUTCDay() - dow) % 7;
-
-        return -fwdlw + fwd - 1;
-    }
-
-    //http://en.wikipedia.org/wiki/ISO_week_date#Calculating_a_date_given_the_year.2C_week_number_and_weekday
-    function dayOfYearFromWeeks(year, week, weekday, dow, doy) {
-        var localWeekday = (7 + weekday - dow) % 7,
-            weekOffset = firstWeekOffset(year, dow, doy),
-            dayOfYear = 1 + 7 * (week - 1) + localWeekday + weekOffset,
-            resYear, resDayOfYear;
-
-        if (dayOfYear <= 0) {
-            resYear = year - 1;
-            resDayOfYear = daysInYear(resYear) + dayOfYear;
-        } else if (dayOfYear > daysInYear(year)) {
-            resYear = year + 1;
-            resDayOfYear = dayOfYear - daysInYear(year);
-        } else {
-            resYear = year;
-            resDayOfYear = dayOfYear;
-        }
-
-        return {
-            year: resYear,
-            dayOfYear: resDayOfYear
-        };
-    }
-
-    function weekOfYear(mom, dow, doy) {
-        var weekOffset = firstWeekOffset(mom.year(), dow, doy),
-            week = Math.floor((mom.dayOfYear() - weekOffset - 1) / 7) + 1,
-            resWeek, resYear;
-
-        if (week < 1) {
-            resYear = mom.year() - 1;
-            resWeek = week + weeksInYear(resYear, dow, doy);
-        } else if (week > weeksInYear(mom.year(), dow, doy)) {
-            resWeek = week - weeksInYear(mom.year(), dow, doy);
-            resYear = mom.year() + 1;
-        } else {
-            resYear = mom.year();
-            resWeek = week;
-        }
-
-        return {
-            week: resWeek,
-            year: resYear
-        };
-    }
-
-    function weeksInYear(year, dow, doy) {
-        var weekOffset = firstWeekOffset(year, dow, doy),
-            weekOffsetNext = firstWeekOffset(year + 1, dow, doy);
-        return (daysInYear(year) - weekOffset + weekOffsetNext) / 7;
-    }
-
-    // Pick the first defined of two or three arguments.
-    function defaults(a, b, c) {
-        if (a != null) {
-            return a;
-        }
-        if (b != null) {
-            return b;
-        }
-        return c;
-    }
-
-    function currentDateArray(config) {
-        // hooks is actually the exported moment object
-        var nowValue = new Date(utils_hooks__hooks.now());
-        if (config._useUTC) {
-            return [nowValue.getUTCFullYear(), nowValue.getUTCMonth(), nowValue.getUTCDate()];
-        }
-        return [nowValue.getFullYear(), nowValue.getMonth(), nowValue.getDate()];
-    }
-
-    // convert an array to a date.
-    // the array should mirror the parameters below
-    // note: all values past the year are optional and will default to the lowest possible value.
-    // [year, month, day , hour, minute, second, millisecond]
-    function configFromArray (config) {
-        var i, date, input = [], currentDate, yearToUse;
-
-        if (config._d) {
-            return;
-        }
-
-        currentDate = currentDateArray(config);
-
-        //compute day of the year from weeks and weekdays
-        if (config._w && config._a[DATE] == null && config._a[MONTH] == null) {
-            dayOfYearFromWeekInfo(config);
-        }
-
-        //if the day of the year is set, figure out what it is
-        if (config._dayOfYear) {
-            yearToUse = defaults(config._a[YEAR], currentDate[YEAR]);
-
-            if (config._dayOfYear > daysInYear(yearToUse)) {
-                getParsingFlags(config)._overflowDayOfYear = true;
-            }
-
-            date = createUTCDate(yearToUse, 0, config._dayOfYear);
-            config._a[MONTH] = date.getUTCMonth();
-            config._a[DATE] = date.getUTCDate();
-        }
-
-        // Default to current date.
-        // * if no year, month, day of month are given, default to today
-        // * if day of month is given, default month and year
-        // * if month is given, default only year
-        // * if year is given, don't default anything
-        for (i = 0; i < 3 && config._a[i] == null; ++i) {
-            config._a[i] = input[i] = currentDate[i];
-        }
-
-        // Zero out whatever was not defaulted, including time
-        for (; i < 7; i++) {
-            config._a[i] = input[i] = (config._a[i] == null) ? (i === 2 ? 1 : 0) : config._a[i];
-        }
-
-        // Check for 24:00:00.000
-        if (config._a[HOUR] === 24 &&
-                config._a[MINUTE] === 0 &&
-                config._a[SECOND] === 0 &&
-                config._a[MILLISECOND] === 0) {
-            config._nextDay = true;
-            config._a[HOUR] = 0;
-        }
-
-        config._d = (config._useUTC ? createUTCDate : createDate).apply(null, input);
-        // Apply timezone offset from input. The actual utcOffset can be changed
-        // with parseZone.
-        if (config._tzm != null) {
-            config._d.setUTCMinutes(config._d.getUTCMinutes() - config._tzm);
-        }
-
-        if (config._nextDay) {
-            config._a[HOUR] = 24;
-        }
-    }
-
-    function dayOfYearFromWeekInfo(config) {
-        var w, weekYear, week, weekday, dow, doy, temp, weekdayOverflow;
-
-        w = config._w;
-        if (w.GG != null || w.W != null || w.E != null) {
-            dow = 1;
-            doy = 4;
-
-            // TODO: We need to take the current isoWeekYear, but that depends on
-            // how we interpret now (local, utc, fixed offset). So create
-            // a now version of current config (take local/utc/offset flags, and
-            // create now).
-            weekYear = defaults(w.GG, config._a[YEAR], weekOfYear(local__createLocal(), 1, 4).year);
-            week = defaults(w.W, 1);
-            weekday = defaults(w.E, 1);
-            if (weekday < 1 || weekday > 7) {
-                weekdayOverflow = true;
-            }
-        } else {
-            dow = config._locale._week.dow;
-            doy = config._locale._week.doy;
-
-            weekYear = defaults(w.gg, config._a[YEAR], weekOfYear(local__createLocal(), dow, doy).year);
-            week = defaults(w.w, 1);
-
-            if (w.d != null) {
-                // weekday -- low day numbers are considered next week
-                weekday = w.d;
-                if (weekday < 0 || weekday > 6) {
-                    weekdayOverflow = true;
-                }
-            } else if (w.e != null) {
-                // local weekday -- counting starts from begining of week
-                weekday = w.e + dow;
-                if (w.e < 0 || w.e > 6) {
-                    weekdayOverflow = true;
-                }
-            } else {
-                // default to begining of week
-                weekday = dow;
-            }
-        }
-        if (week < 1 || week > weeksInYear(weekYear, dow, doy)) {
-            getParsingFlags(config)._overflowWeeks = true;
-        } else if (weekdayOverflow != null) {
-            getParsingFlags(config)._overflowWeekday = true;
-        } else {
-            temp = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy);
-            config._a[YEAR] = temp.year;
-            config._dayOfYear = temp.dayOfYear;
-        }
-    }
-
-    // constant that refers to the ISO standard
-    utils_hooks__hooks.ISO_8601 = function () {};
-
-    // date from string and format string
-    function configFromStringAndFormat(config) {
-        // TODO: Move this to another part of the creation flow to prevent circular deps
-        if (config._f === utils_hooks__hooks.ISO_8601) {
-            configFromISO(config);
-            return;
-        }
-
-        config._a = [];
-        getParsingFlags(config).empty = true;
-
-        // This array is used to make a Date, either with `new Date` or `Date.UTC`
-        var string = '' + config._i,
-            i, parsedInput, tokens, token, skipped,
-            stringLength = string.length,
-            totalParsedInputLength = 0;
-
-        tokens = expandFormat(config._f, config._locale).match(formattingTokens) || [];
-
-        for (i = 0; i < tokens.length; i++) {
-            token = tokens[i];
-            parsedInput = (string.match(getParseRegexForToken(token, config)) || [])[0];
-            // console.log('token', token, 'parsedInput', parsedInput,
-            //         'regex', getParseRegexForToken(token, config));
-            if (parsedInput) {
-                skipped = string.substr(0, string.indexOf(parsedInput));
-                if (skipped.length > 0) {
-                    getParsingFlags(config).unusedInput.push(skipped);
-                }
-                string = string.slice(string.indexOf(parsedInput) + parsedInput.length);
-                totalParsedInputLength += parsedInput.length;
-            }
-            // don't parse if it's not a known token
-            if (formatTokenFunctions[token]) {
-                if (parsedInput) {
-                    getParsingFlags(config).empty = false;
-                }
-                else {
-                    getParsingFlags(config).unusedTokens.push(token);
-                }
-                addTimeToArrayFromToken(token, parsedInput, config);
-            }
-            else if (config._strict && !parsedInput) {
-                getParsingFlags(config).unusedTokens.push(token);
-            }
-        }
-
-        // add remaining unparsed input length to the string
-        getParsingFlags(config).charsLeftOver = stringLength - totalParsedInputLength;
-        if (string.length > 0) {
-            getParsingFlags(config).unusedInput.push(string);
-        }
-
-        // clear _12h flag if hour is <= 12
-        if (getParsingFlags(config).bigHour === true &&
-                config._a[HOUR] <= 12 &&
-                config._a[HOUR] > 0) {
-            getParsingFlags(config).bigHour = undefined;
-        }
-        // handle meridiem
-        config._a[HOUR] = meridiemFixWrap(config._locale, config._a[HOUR], config._meridiem);
-
-        configFromArray(config);
-        checkOverflow(config);
-    }
-
-
-    function meridiemFixWrap (locale, hour, meridiem) {
-        var isPm;
-
-        if (meridiem == null) {
-            // nothing to do
-            return hour;
-        }
-        if (locale.meridiemHour != null) {
-            return locale.meridiemHour(hour, meridiem);
-        } else if (locale.isPM != null) {
-            // Fallback
-            isPm = locale.isPM(meridiem);
-            if (isPm && hour < 12) {
-                hour += 12;
-            }
-            if (!isPm && hour === 12) {
-                hour = 0;
-            }
-            return hour;
-        } else {
-            // this is not supposed to happen
-            return hour;
-        }
-    }
-
-    // date from string and array of format strings
-    function configFromStringAndArray(config) {
-        var tempConfig,
-            bestMoment,
-
-            scoreToBeat,
-            i,
-            currentScore;
-
-        if (config._f.length === 0) {
-            getParsingFlags(config).invalidFormat = true;
-            config._d = new Date(NaN);
-            return;
-        }
-
-        for (i = 0; i < config._f.length; i++) {
-            currentScore = 0;
-            tempConfig = copyConfig({}, config);
-            if (config._useUTC != null) {
-                tempConfig._useUTC = config._useUTC;
-            }
-            tempConfig._f = config._f[i];
-            configFromStringAndFormat(tempConfig);
-
-            if (!valid__isValid(tempConfig)) {
-                continue;
-            }
-
-            // if there is any input that was not parsed add a penalty for that format
-            currentScore += getParsingFlags(tempConfig).charsLeftOver;
-
-            //or tokens
-            currentScore += getParsingFlags(tempConfig).unusedTokens.length * 10;
-
-            getParsingFlags(tempConfig).score = currentScore;
-
-            if (scoreToBeat == null || currentScore < scoreToBeat) {
-                scoreToBeat = currentScore;
-                bestMoment = tempConfig;
-            }
-        }
-
-        extend(config, bestMoment || tempConfig);
-    }
-
-    function configFromObject(config) {
-        if (config._d) {
-            return;
-        }
-
-        var i = normalizeObjectUnits(config._i);
-        config._a = map([i.year, i.month, i.day || i.date, i.hour, i.minute, i.second, i.millisecond], function (obj) {
-            return obj && parseInt(obj, 10);
-        });
-
-        configFromArray(config);
-    }
-
-    function createFromConfig (config) {
-        var res = new Moment(checkOverflow(prepareConfig(config)));
-        if (res._nextDay) {
-            // Adding is smart enough around DST
-            res.add(1, 'd');
-            res._nextDay = undefined;
-        }
-
-        return res;
-    }
-
-    function prepareConfig (config) {
-        var input = config._i,
-            format = config._f;
-
-        config._locale = config._locale || locale_locales__getLocale(config._l);
-
-        if (input === null || (format === undefined && input === '')) {
-            return valid__createInvalid({nullInput: true});
-        }
-
-        if (typeof input === 'string') {
-            config._i = input = config._locale.preparse(input);
-        }
-
-        if (isMoment(input)) {
-            return new Moment(checkOverflow(input));
-        } else if (isArray(format)) {
-            configFromStringAndArray(config);
-        } else if (format) {
-            configFromStringAndFormat(config);
-        } else if (isDate(input)) {
-            config._d = input;
-        } else {
-            configFromInput(config);
-        }
-
-        if (!valid__isValid(config)) {
-            config._d = null;
-        }
-
-        return config;
-    }
-
-    function configFromInput(config) {
-        var input = config._i;
-        if (input === undefined) {
-            config._d = new Date(utils_hooks__hooks.now());
-        } else if (isDate(input)) {
-            config._d = new Date(+input);
-        } else if (typeof input === 'string') {
-            configFromString(config);
-        } else if (isArray(input)) {
-            config._a = map(input.slice(0), function (obj) {
-                return parseInt(obj, 10);
-            });
-            configFromArray(config);
-        } else if (typeof(input) === 'object') {
-            configFromObject(config);
-        } else if (typeof(input) === 'number') {
-            // from milliseconds
-            config._d = new Date(input);
-        } else {
-            utils_hooks__hooks.createFromInputFallback(config);
-        }
-    }
-
-    function createLocalOrUTC (input, format, locale, strict, isUTC) {
-        var c = {};
-
-        if (typeof(locale) === 'boolean') {
-            strict = locale;
-            locale = undefined;
-        }
-        // object construction must be done this way.
-        // https://github.com/moment/moment/issues/1423
-        c._isAMomentObject = true;
-        c._useUTC = c._isUTC = isUTC;
-        c._l = locale;
-        c._i = input;
-        c._f = format;
-        c._strict = strict;
-
-        return createFromConfig(c);
-    }
-
-    function local__createLocal (input, format, locale, strict) {
-        return createLocalOrUTC(input, format, locale, strict, false);
-    }
-
-    var prototypeMin = deprecate(
-         'moment().min is deprecated, use moment.max instead. https://github.com/moment/moment/issues/1548',
-         function () {
-             var other = local__createLocal.apply(null, arguments);
-             if (this.isValid() && other.isValid()) {
-                 return other < this ? this : other;
-             } else {
-                 return valid__createInvalid();
-             }
-         }
-     );
-
-    var prototypeMax = deprecate(
-        'moment().max is deprecated, use moment.min instead. https://github.com/moment/moment/issues/1548',
-        function () {
-            var other = local__createLocal.apply(null, arguments);
-            if (this.isValid() && other.isValid()) {
-                return other > this ? this : other;
-            } else {
-                return valid__createInvalid();
-            }
-        }
-    );
-
-    // Pick a moment m from moments so that m[fn](other) is true for all
-    // other. This relies on the function fn to be transitive.
-    //
-    // moments should either be an array of moment objects or an array, whose
-    // first element is an array of moment objects.
-    function pickBy(fn, moments) {
-        var res, i;
-        if (moments.length === 1 && isArray(moments[0])) {
-            moments = moments[0];
-        }
-        if (!moments.length) {
-            return local__createLocal();
-        }
-        res = moments[0];
-        for (i = 1; i < moments.length; ++i) {
-            if (!moments[i].isValid() || moments[i][fn](res)) {
-                res = moments[i];
-            }
-        }
-        return res;
-    }
-
-    // TODO: Use [].sort instead?
-    function min () {
-        var args = [].slice.call(arguments, 0);
-
-        return pickBy('isBefore', args);
-    }
-
-    function max () {
-        var args = [].slice.call(arguments, 0);
-
-        return pickBy('isAfter', args);
-    }
-
-    var now = function () {
-        return Date.now ? Date.now() : +(new Date());
-    };
-
-    function Duration (duration) {
-        var normalizedInput = normalizeObjectUnits(duration),
-            years = normalizedInput.year || 0,
-            quarters = normalizedInput.quarter || 0,
-            months = normalizedInput.month || 0,
-            weeks = normalizedInput.week || 0,
-            days = normalizedInput.day || 0,
-            hours = normalizedInput.hour || 0,
-            minutes = normalizedInput.minute || 0,
-            seconds = normalizedInput.second || 0,
-            milliseconds = normalizedInput.millisecond || 0;
-
-        // representation for dateAddRemove
-        this._milliseconds = +milliseconds +
-            seconds * 1e3 + // 1000
-            minutes * 6e4 + // 1000 * 60
-            hours * 36e5; // 1000 * 60 * 60
-        // Because of dateAddRemove treats 24 hours as different from a
-        // day when working around DST, we need to store them separately
-        this._days = +days +
-            weeks * 7;
-        // It is impossible translate months into days without knowing
-        // which months you are are talking about, so we have to store
-        // it separately.
-        this._months = +months +
-            quarters * 3 +
-            years * 12;
-
-        this._data = {};
-
-        this._locale = locale_locales__getLocale();
-
-        this._bubble();
-    }
-
-    function isDuration (obj) {
-        return obj instanceof Duration;
-    }
-
-    // FORMATTING
-
-    function offset (token, separator) {
-        addFormatToken(token, 0, 0, function () {
-            var offset = this.utcOffset();
-            var sign = '+';
-            if (offset < 0) {
-                offset = -offset;
-                sign = '-';
-            }
-            return sign + zeroFill(~~(offset / 60), 2) + separator + zeroFill(~~(offset) % 60, 2);
-        });
-    }
-
-    offset('Z', ':');
-    offset('ZZ', '');
-
-    // PARSING
-
-    addRegexToken('Z',  matchShortOffset);
-    addRegexToken('ZZ', matchShortOffset);
-    addParseToken(['Z', 'ZZ'], function (input, array, config) {
-        config._useUTC = true;
-        config._tzm = offsetFromString(matchShortOffset, input);
-    });
-
-    // HELPERS
-
-    // timezone chunker
-    // '+10:00' > ['10',  '00']
-    // '-1530'  > ['-15', '30']
-    var chunkOffset = /([\+\-]|\d\d)/gi;
-
-    function offsetFromString(matcher, string) {
-        var matches = ((string || '').match(matcher) || []);
-        var chunk   = matches[matches.length - 1] || [];
-        var parts   = (chunk + '').match(chunkOffset) || ['-', 0, 0];
-        var minutes = +(parts[1] * 60) + toInt(parts[2]);
-
-        return parts[0] === '+' ? minutes : -minutes;
-    }
-
-    // Return a moment from input, that is local/utc/zone equivalent to model.
-    function cloneWithOffset(input, model) {
-        var res, diff;
-        if (model._isUTC) {
-            res = model.clone();
-            diff = (isMoment(input) || isDate(input) ? +input : +local__createLocal(input)) - (+res);
-            // Use low-level api, because this fn is low-level api.
-            res._d.setTime(+res._d + diff);
-            utils_hooks__hooks.updateOffset(res, false);
-            return res;
-        } else {
-            return local__createLocal(input).local();
-        }
-    }
-
-    function getDateOffset (m) {
-        // On Firefox.24 Date#getTimezoneOffset returns a floating point.
-        // https://github.com/moment/moment/pull/1871
-        return -Math.round(m._d.getTimezoneOffset() / 15) * 15;
-    }
-
-    // HOOKS
-
-    // This function will be called whenever a moment is mutated.
-    // It is intended to keep the offset in sync with the timezone.
-    utils_hooks__hooks.updateOffset = function () {};
-
-    // MOMENTS
-
-    // keepLocalTime = true means only change the timezone, without
-    // affecting the local hour. So 5:31:26 +0300 --[utcOffset(2, true)]-->
-    // 5:31:26 +0200 It is possible that 5:31:26 doesn't exist with offset
-    // +0200, so we adjust the time as needed, to be valid.
-    //
-    // Keeping the time actually adds/subtracts (one hour)
-    // from the actual represented time. That is why we call updateOffset
-    // a second time. In case it wants us to change the offset again
-    // _changeInProgress == true case, then we have to adjust, because
-    // there is no such time in the given timezone.
-    function getSetOffset (input, keepLocalTime) {
-        var offset = this._offset || 0,
-            localAdjust;
-        if (!this.isValid()) {
-            return input != null ? this : NaN;
-        }
-        if (input != null) {
-            if (typeof input === 'string') {
-                input = offsetFromString(matchShortOffset, input);
-            } else if (Math.abs(input) < 16) {
-                input = input * 60;
-            }
-            if (!this._isUTC && keepLocalTime) {
-                localAdjust = getDateOffset(this);
-            }
-            this._offset = input;
-            this._isUTC = true;
-            if (localAdjust != null) {
-                this.add(localAdjust, 'm');
-            }
-            if (offset !== input) {
-                if (!keepLocalTime || this._changeInProgress) {
-                    add_subtract__addSubtract(this, create__createDuration(input - offset, 'm'), 1, false);
-                } else if (!this._changeInProgress) {
-                    this._changeInProgress = true;
-                    utils_hooks__hooks.updateOffset(this, true);
-                    this._changeInProgress = null;
-                }
-            }
-            return this;
-        } else {
-            return this._isUTC ? offset : getDateOffset(this);
-        }
-    }
-
-    function getSetZone (input, keepLocalTime) {
-        if (input != null) {
-            if (typeof input !== 'string') {
-                input = -input;
-            }
-
-            this.utcOffset(input, keepLocalTime);
-
-            return this;
-        } else {
-            return -this.utcOffset();
-        }
-    }
-
-    function setOffsetToUTC (keepLocalTime) {
-        return this.utcOffset(0, keepLocalTime);
-    }
-
-    function setOffsetToLocal (keepLocalTime) {
-        if (this._isUTC) {
-            this.utcOffset(0, keepLocalTime);
-            this._isUTC = false;
-
-            if (keepLocalTime) {
-                this.subtract(getDateOffset(this), 'm');
-            }
-        }
-        return this;
-    }
-
-    function setOffsetToParsedOffset () {
-        if (this._tzm) {
-            this.utcOffset(this._tzm);
-        } else if (typeof this._i === 'string') {
-            this.utcOffset(offsetFromString(matchOffset, this._i));
-        }
-        return this;
-    }
-
-    function hasAlignedHourOffset (input) {
-        if (!this.isValid()) {
-            return false;
-        }
-        input = input ? local__createLocal(input).utcOffset() : 0;
-
-        return (this.utcOffset() - input) % 60 === 0;
-    }
-
-    function isDaylightSavingTime () {
-        return (
-            this.utcOffset() > this.clone().month(0).utcOffset() ||
-            this.utcOffset() > this.clone().month(5).utcOffset()
-        );
-    }
-
-    function isDaylightSavingTimeShifted () {
-        if (!isUndefined(this._isDSTShifted)) {
-            return this._isDSTShifted;
-        }
-
-        var c = {};
-
-        copyConfig(c, this);
-        c = prepareConfig(c);
-
-        if (c._a) {
-            var other = c._isUTC ? create_utc__createUTC(c._a) : local__createLocal(c._a);
-            this._isDSTShifted = this.isValid() &&
-                compareArrays(c._a, other.toArray()) > 0;
-        } else {
-            this._isDSTShifted = false;
-        }
-
-        return this._isDSTShifted;
-    }
-
-    function isLocal () {
-        return this.isValid() ? !this._isUTC : false;
-    }
-
-    function isUtcOffset () {
-        return this.isValid() ? this._isUTC : false;
-    }
-
-    function isUtc () {
-        return this.isValid() ? this._isUTC && this._offset === 0 : false;
-    }
-
-    // ASP.NET json date format regex
-    var aspNetRegex = /^(\-)?(?:(\d*)[. ])?(\d+)\:(\d+)(?:\:(\d+)\.?(\d{3})?\d*)?$/;
-
-    // from http://docs.closure-library.googlecode.com/git/closure_goog_date_date.js.source.html
-    // somewhat more in line with 4.4.3.2 2004 spec, but allows decimal anywhere
-    // and further modified to allow for strings containing both week and day
-    var isoRegex = /^(-)?P(?:([0-9,.]*)Y)?(?:([0-9,.]*)M)?(?:([0-9,.]*)W)?(?:([0-9,.]*)D)?(?:T(?:([0-9,.]*)H)?(?:([0-9,.]*)M)?(?:([0-9,.]*)S)?)?$/;
-
-    function create__createDuration (input, key) {
-        var duration = input,
-            // matching against regexp is expensive, do it on demand
-            match = null,
-            sign,
-            ret,
-            diffRes;
-
-        if (isDuration(input)) {
-            duration = {
-                ms : input._milliseconds,
-                d  : input._days,
-                M  : input._months
-            };
-        } else if (typeof input === 'number') {
-            duration = {};
-            if (key) {
-                duration[key] = input;
-            } else {
-                duration.milliseconds = input;
-            }
-        } else if (!!(match = aspNetRegex.exec(input))) {
-            sign = (match[1] === '-') ? -1 : 1;
-            duration = {
-                y  : 0,
-                d  : toInt(match[DATE])        * sign,
-                h  : toInt(match[HOUR])        * sign,
-                m  : toInt(match[MINUTE])      * sign,
-                s  : toInt(match[SECOND])      * sign,
-                ms : toInt(match[MILLISECOND]) * sign
-            };
-        } else if (!!(match = isoRegex.exec(input))) {
-            sign = (match[1] === '-') ? -1 : 1;
-            duration = {
-                y : parseIso(match[2], sign),
-                M : parseIso(match[3], sign),
-                w : parseIso(match[4], sign),
-                d : parseIso(match[5], sign),
-                h : parseIso(match[6], sign),
-                m : parseIso(match[7], sign),
-                s : parseIso(match[8], sign)
-            };
-        } else if (duration == null) {// checks for null or undefined
-            duration = {};
-        } else if (typeof duration === 'object' && ('from' in duration || 'to' in duration)) {
-            diffRes = momentsDifference(local__createLocal(duration.from), local__createLocal(duration.to));
-
-            duration = {};
-            duration.ms = diffRes.milliseconds;
-            duration.M = diffRes.months;
-        }
-
-        ret = new Duration(duration);
-
-        if (isDuration(input) && hasOwnProp(input, '_locale')) {
-            ret._locale = input._locale;
-        }
-
-        return ret;
-    }
-
-    create__createDuration.fn = Duration.prototype;
-
-    function parseIso (inp, sign) {
-        // We'd normally use ~~inp for this, but unfortunately it also
-        // converts floats to ints.
-        // inp may be undefined, so careful calling replace on it.
-        var res = inp && parseFloat(inp.replace(',', '.'));
-        // apply sign while we're at it
-        return (isNaN(res) ? 0 : res) * sign;
-    }
-
-    function positiveMomentsDifference(base, other) {
-        var res = {milliseconds: 0, months: 0};
-
-        res.months = other.month() - base.month() +
-            (other.year() - base.year()) * 12;
-        if (base.clone().add(res.months, 'M').isAfter(other)) {
-            --res.months;
-        }
-
-        res.milliseconds = +other - +(base.clone().add(res.months, 'M'));
-
-        return res;
-    }
-
-    function momentsDifference(base, other) {
-        var res;
-        if (!(base.isValid() && other.isValid())) {
-            return {milliseconds: 0, months: 0};
-        }
-
-        other = cloneWithOffset(other, base);
-        if (base.isBefore(other)) {
-            res = positiveMomentsDifference(base, other);
-        } else {
-            res = positiveMomentsDifference(other, base);
-            res.milliseconds = -res.milliseconds;
-            res.months = -res.months;
-        }
-
-        return res;
-    }
-
-    function absRound (number) {
-        if (number < 0) {
-            return Math.round(-1 * number) * -1;
-        } else {
-            return Math.round(number);
-        }
-    }
-
-    // TODO: remove 'name' arg after deprecation is removed
-    function createAdder(direction, name) {
-        return function (val, period) {
-            var dur, tmp;
-            //invert the arguments, but complain about it
-            if (period !== null && !isNaN(+period)) {
-                deprecateSimple(name, 'moment().' + name  + '(period, number) is deprecated. Please use moment().' + name + '(number, period).');
-                tmp = val; val = period; period = tmp;
-            }
-
-            val = typeof val === 'string' ? +val : val;
-            dur = create__createDuration(val, period);
-            add_subtract__addSubtract(this, dur, direction);
-            return this;
-        };
-    }
-
-    function add_subtract__addSubtract (mom, duration, isAdding, updateOffset) {
-        var milliseconds = duration._milliseconds,
-            days = absRound(duration._days),
-            months = absRound(duration._months);
-
-        if (!mom.isValid()) {
-            // No op
-            return;
-        }
-
-        updateOffset = updateOffset == null ? true : updateOffset;
-
-        if (milliseconds) {
-            mom._d.setTime(+mom._d + milliseconds * isAdding);
-        }
-        if (days) {
-            get_set__set(mom, 'Date', get_set__get(mom, 'Date') + days * isAdding);
-        }
-        if (months) {
-            setMonth(mom, get_set__get(mom, 'Month') + months * isAdding);
-        }
-        if (updateOffset) {
-            utils_hooks__hooks.updateOffset(mom, days || months);
-        }
-    }
-
-    var add_subtract__add      = createAdder(1, 'add');
-    var add_subtract__subtract = createAdder(-1, 'subtract');
-
-    function moment_calendar__calendar (time, formats) {
-        // We want to compare the start of today, vs this.
-        // Getting start-of-today depends on whether we're local/utc/offset or not.
-        var now = time || local__createLocal(),
-            sod = cloneWithOffset(now, this).startOf('day'),
-            diff = this.diff(sod, 'days', true),
-            format = diff < -6 ? 'sameElse' :
-                diff < -1 ? 'lastWeek' :
-                diff < 0 ? 'lastDay' :
-                diff < 1 ? 'sameDay' :
-                diff < 2 ? 'nextDay' :
-                diff < 7 ? 'nextWeek' : 'sameElse';
-
-        var output = formats && (isFunction(formats[format]) ? formats[format]() : formats[format]);
-
-        return this.format(output || this.localeData().calendar(format, this, local__createLocal(now)));
-    }
-
-    function clone () {
-        return new Moment(this);
-    }
-
-    function isAfter (input, units) {
-        var localInput = isMoment(input) ? input : local__createLocal(input);
-        if (!(this.isValid() && localInput.isValid())) {
-            return false;
-        }
-        units = normalizeUnits(!isUndefined(units) ? units : 'millisecond');
-        if (units === 'millisecond') {
-            return +this > +localInput;
-        } else {
-            return +localInput < +this.clone().startOf(units);
-        }
-    }
-
-    function isBefore (input, units) {
-        var localInput = isMoment(input) ? input : local__createLocal(input);
-        if (!(this.isValid() && localInput.isValid())) {
-            return false;
-        }
-        units = normalizeUnits(!isUndefined(units) ? units : 'millisecond');
-        if (units === 'millisecond') {
-            return +this < +localInput;
-        } else {
-            return +this.clone().endOf(units) < +localInput;
-        }
-    }
-
-    function isBetween (from, to, units) {
-        return this.isAfter(from, units) && this.isBefore(to, units);
-    }
-
-    function isSame (input, units) {
-        var localInput = isMoment(input) ? input : local__createLocal(input),
-            inputMs;
-        if (!(this.isValid() && localInput.isValid())) {
-            return false;
-        }
-        units = normalizeUnits(units || 'millisecond');
-        if (units === 'millisecond') {
-            return +this === +localInput;
-        } else {
-            inputMs = +localInput;
-            return +(this.clone().startOf(units)) <= inputMs && inputMs <= +(this.clone().endOf(units));
-        }
-    }
-
-    function isSameOrAfter (input, units) {
-        return this.isSame(input, units) || this.isAfter(input,units);
-    }
-
-    function isSameOrBefore (input, units) {
-        return this.isSame(input, units) || this.isBefore(input,units);
-    }
-
-    function diff (input, units, asFloat) {
-        var that,
-            zoneDelta,
-            delta, output;
-
-        if (!this.isValid()) {
-            return NaN;
-        }
-
-        that = cloneWithOffset(input, this);
-
-        if (!that.isValid()) {
-            return NaN;
-        }
-
-        zoneDelta = (that.utcOffset() - this.utcOffset()) * 6e4;
-
-        units = normalizeUnits(units);
-
-        if (units === 'year' || units === 'month' || units === 'quarter') {
-            output = monthDiff(this, that);
-            if (units === 'quarter') {
-                output = output / 3;
-            } else if (units === 'year') {
-                output = output / 12;
-            }
-        } else {
-            delta = this - that;
-            output = units === 'second' ? delta / 1e3 : // 1000
-                units === 'minute' ? delta / 6e4 : // 1000 * 60
-                units === 'hour' ? delta / 36e5 : // 1000 * 60 * 60
-                units === 'day' ? (delta - zoneDelta) / 864e5 : // 1000 * 60 * 60 * 24, negate dst
-                units === 'week' ? (delta - zoneDelta) / 6048e5 : // 1000 * 60 * 60 * 24 * 7, negate dst
-                delta;
-        }
-        return asFloat ? output : absFloor(output);
-    }
-
-    function monthDiff (a, b) {
-        // difference in months
-        var wholeMonthDiff = ((b.year() - a.year()) * 12) + (b.month() - a.month()),
-            // b is in (anchor - 1 month, anchor + 1 month)
-            anchor = a.clone().add(wholeMonthDiff, 'months'),
-            anchor2, adjust;
-
-        if (b - anchor < 0) {
-            anchor2 = a.clone().add(wholeMonthDiff - 1, 'months');
-            // linear across the month
-            adjust = (b - anchor) / (anchor - anchor2);
-        } else {
-            anchor2 = a.clone().add(wholeMonthDiff + 1, 'months');
-            // linear across the month
-            adjust = (b - anchor) / (anchor2 - anchor);
-        }
-
-        return -(wholeMonthDiff + adjust);
-    }
-
-    utils_hooks__hooks.defaultFormat = 'YYYY-MM-DDTHH:mm:ssZ';
-
-    function toString () {
-        return this.clone().locale('en').format('ddd MMM DD YYYY HH:mm:ss [GMT]ZZ');
-    }
-
-    function moment_format__toISOString () {
-        var m = this.clone().utc();
-        if (0 < m.year() && m.year() <= 9999) {
-            if (isFunction(Date.prototype.toISOString)) {
-                // native implementation is ~50x faster, use it when we can
-                return this.toDate().toISOString();
-            } else {
-                return formatMoment(m, 'YYYY-MM-DD[T]HH:mm:ss.SSS[Z]');
-            }
-        } else {
-            return formatMoment(m, 'YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]');
-        }
-    }
-
-    function format (inputString) {
-        var output = formatMoment(this, inputString || utils_hooks__hooks.defaultFormat);
-        return this.localeData().postformat(output);
-    }
-
-    function from (time, withoutSuffix) {
-        if (this.isValid() &&
-                ((isMoment(time) && time.isValid()) ||
-                 local__createLocal(time).isValid())) {
-            return create__createDuration({to: this, from: time}).locale(this.locale()).humanize(!withoutSuffix);
-        } else {
-            return this.localeData().invalidDate();
-        }
-    }
-
-    function fromNow (withoutSuffix) {
-        return this.from(local__createLocal(), withoutSuffix);
-    }
-
-    function to (time, withoutSuffix) {
-        if (this.isValid() &&
-                ((isMoment(time) && time.isValid()) ||
-                 local__createLocal(time).isValid())) {
-            return create__createDuration({from: this, to: time}).locale(this.locale()).humanize(!withoutSuffix);
-        } else {
-            return this.localeData().invalidDate();
-        }
-    }
-
-    function toNow (withoutSuffix) {
-        return this.to(local__createLocal(), withoutSuffix);
-    }
-
-    // If passed a locale key, it will set the locale for this
-    // instance.  Otherwise, it will return the locale configuration
-    // variables for this instance.
-    function locale (key) {
-        var newLocaleData;
-
-        if (key === undefined) {
-            return this._locale._abbr;
-        } else {
-            newLocaleData = locale_locales__getLocale(key);
-            if (newLocaleData != null) {
-                this._locale = newLocaleData;
-            }
-            return this;
-        }
-    }
-
-    var lang = deprecate(
-        'moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.',
-        function (key) {
-            if (key === undefined) {
-                return this.localeData();
-            } else {
-                return this.locale(key);
-            }
-        }
-    );
-
-    function localeData () {
-        return this._locale;
-    }
-
-    function startOf (units) {
-        units = normalizeUnits(units);
-        // the following switch intentionally omits break keywords
-        // to utilize falling through the cases.
-        switch (units) {
-        case 'year':
-            this.month(0);
-            /* falls through */
-        case 'quarter':
-        case 'month':
-            this.date(1);
-            /* falls through */
-        case 'week':
-        case 'isoWeek':
-        case 'day':
-            this.hours(0);
-            /* falls through */
-        case 'hour':
-            this.minutes(0);
-            /* falls through */
-        case 'minute':
-            this.seconds(0);
-            /* falls through */
-        case 'second':
-            this.milliseconds(0);
-        }
-
-        // weeks are a special case
-        if (units === 'week') {
-            this.weekday(0);
-        }
-        if (units === 'isoWeek') {
-            this.isoWeekday(1);
-        }
-
-        // quarters are also special
-        if (units === 'quarter') {
-            this.month(Math.floor(this.month() / 3) * 3);
-        }
-
-        return this;
-    }
-
-    function endOf (units) {
-        units = normalizeUnits(units);
-        if (units === undefined || units === 'millisecond') {
-            return this;
-        }
-        return this.startOf(units).add(1, (units === 'isoWeek' ? 'week' : units)).subtract(1, 'ms');
-    }
-
-    function to_type__valueOf () {
-        return +this._d - ((this._offset || 0) * 60000);
-    }
-
-    function unix () {
-        return Math.floor(+this / 1000);
-    }
-
-    function toDate () {
-        return this._offset ? new Date(+this) : this._d;
-    }
-
-    function toArray () {
-        var m = this;
-        return [m.year(), m.month(), m.date(), m.hour(), m.minute(), m.second(), m.millisecond()];
-    }
-
-    function toObject () {
-        var m = this;
-        return {
-            years: m.year(),
-            months: m.month(),
-            date: m.date(),
-            hours: m.hours(),
-            minutes: m.minutes(),
-            seconds: m.seconds(),
-            milliseconds: m.milliseconds()
-        };
-    }
-
-    function toJSON () {
-        // new Date(NaN).toJSON() === null
-        return this.isValid() ? this.toISOString() : null;
-    }
-
-    function moment_valid__isValid () {
-        return valid__isValid(this);
-    }
-
-    function parsingFlags () {
-        return extend({}, getParsingFlags(this));
-    }
-
-    function invalidAt () {
-        return getParsingFlags(this).overflow;
-    }
-
-    function creationData() {
-        return {
-            input: this._i,
-            format: this._f,
-            locale: this._locale,
-            isUTC: this._isUTC,
-            strict: this._strict
-        };
-    }
-
-    // FORMATTING
-
-    addFormatToken(0, ['gg', 2], 0, function () {
-        return this.weekYear() % 100;
-    });
-
-    addFormatToken(0, ['GG', 2], 0, function () {
-        return this.isoWeekYear() % 100;
-    });
-
-    function addWeekYearFormatToken (token, getter) {
-        addFormatToken(0, [token, token.length], 0, getter);
-    }
-
-    addWeekYearFormatToken('gggg',     'weekYear');
-    addWeekYearFormatToken('ggggg',    'weekYear');
-    addWeekYearFormatToken('GGGG',  'isoWeekYear');
-    addWeekYearFormatToken('GGGGG', 'isoWeekYear');
-
-    // ALIASES
-
-    addUnitAlias('weekYear', 'gg');
-    addUnitAlias('isoWeekYear', 'GG');
-
-    // PARSING
-
-    addRegexToken('G',      matchSigned);
-    addRegexToken('g',      matchSigned);
-    addRegexToken('GG',     match1to2, match2);
-    addRegexToken('gg',     match1to2, match2);
-    addRegexToken('GGGG',   match1to4, match4);
-    addRegexToken('gggg',   match1to4, match4);
-    addRegexToken('GGGGG',  match1to6, match6);
-    addRegexToken('ggggg',  match1to6, match6);
-
-    addWeekParseToken(['gggg', 'ggggg', 'GGGG', 'GGGGG'], function (input, week, config, token) {
-        week[token.substr(0, 2)] = toInt(input);
-    });
-
-    addWeekParseToken(['gg', 'GG'], function (input, week, config, token) {
-        week[token] = utils_hooks__hooks.parseTwoDigitYear(input);
-    });
-
-    // MOMENTS
-
-    function getSetWeekYear (input) {
-        return getSetWeekYearHelper.call(this,
-                input,
-                this.week(),
-                this.weekday(),
-                this.localeData()._week.dow,
-                this.localeData()._week.doy);
-    }
-
-    function getSetISOWeekYear (input) {
-        return getSetWeekYearHelper.call(this,
-                input, this.isoWeek(), this.isoWeekday(), 1, 4);
-    }
-
-    function getISOWeeksInYear () {
-        return weeksInYear(this.year(), 1, 4);
-    }
-
-    function getWeeksInYear () {
-        var weekInfo = this.localeData()._week;
-        return weeksInYear(this.year(), weekInfo.dow, weekInfo.doy);
-    }
-
-    function getSetWeekYearHelper(input, week, weekday, dow, doy) {
-        var weeksTarget;
-        if (input == null) {
-            return weekOfYear(this, dow, doy).year;
-        } else {
-            weeksTarget = weeksInYear(input, dow, doy);
-            if (week > weeksTarget) {
-                week = weeksTarget;
-            }
-            return setWeekAll.call(this, input, week, weekday, dow, doy);
-        }
-    }
-
-    function setWeekAll(weekYear, week, weekday, dow, doy) {
-        var dayOfYearData = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy),
-            date = createUTCDate(dayOfYearData.year, 0, dayOfYearData.dayOfYear);
-
-        this.year(date.getUTCFullYear());
-        this.month(date.getUTCMonth());
-        this.date(date.getUTCDate());
-        return this;
-    }
-
-    // FORMATTING
-
-    addFormatToken('Q', 0, 'Qo', 'quarter');
-
-    // ALIASES
-
-    addUnitAlias('quarter', 'Q');
-
-    // PARSING
-
-    addRegexToken('Q', match1);
-    addParseToken('Q', function (input, array) {
-        array[MONTH] = (toInt(input) - 1) * 3;
-    });
-
-    // MOMENTS
-
-    function getSetQuarter (input) {
-        return input == null ? Math.ceil((this.month() + 1) / 3) : this.month((input - 1) * 3 + this.month() % 3);
-    }
-
-    // FORMATTING
-
-    addFormatToken('w', ['ww', 2], 'wo', 'week');
-    addFormatToken('W', ['WW', 2], 'Wo', 'isoWeek');
-
-    // ALIASES
-
-    addUnitAlias('week', 'w');
-    addUnitAlias('isoWeek', 'W');
-
-    // PARSING
-
-    addRegexToken('w',  match1to2);
-    addRegexToken('ww', match1to2, match2);
-    addRegexToken('W',  match1to2);
-    addRegexToken('WW', match1to2, match2);
-
-    addWeekParseToken(['w', 'ww', 'W', 'WW'], function (input, week, config, token) {
-        week[token.substr(0, 1)] = toInt(input);
-    });
-
-    // HELPERS
-
-    // LOCALES
-
-    function localeWeek (mom) {
-        return weekOfYear(mom, this._week.dow, this._week.doy).week;
-    }
-
-    var defaultLocaleWeek = {
-        dow : 0, // Sunday is the first day of the week.
-        doy : 6  // The week that contains Jan 1st is the first week of the year.
-    };
-
-    function localeFirstDayOfWeek () {
-        return this._week.dow;
-    }
-
-    function localeFirstDayOfYear () {
-        return this._week.doy;
-    }
-
-    // MOMENTS
-
-    function getSetWeek (input) {
-        var week = this.localeData().week(this);
-        return input == null ? week : this.add((input - week) * 7, 'd');
-    }
-
-    function getSetISOWeek (input) {
-        var week = weekOfYear(this, 1, 4).week;
-        return input == null ? week : this.add((input - week) * 7, 'd');
-    }
-
-    // FORMATTING
-
-    addFormatToken('D', ['DD', 2], 'Do', 'date');
-
-    // ALIASES
-
-    addUnitAlias('date', 'D');
-
-    // PARSING
-
-    addRegexToken('D',  match1to2);
-    addRegexToken('DD', match1to2, match2);
-    addRegexToken('Do', function (isStrict, locale) {
-        return isStrict ? locale._ordinalParse : locale._ordinalParseLenient;
-    });
-
-    addParseToken(['D', 'DD'], DATE);
-    addParseToken('Do', function (input, array) {
-        array[DATE] = toInt(input.match(match1to2)[0], 10);
-    });
-
-    // MOMENTS
-
-    var getSetDayOfMonth = makeGetSet('Date', true);
-
-    // FORMATTING
-
-    addFormatToken('d', 0, 'do', 'day');
-
-    addFormatToken('dd', 0, 0, function (format) {
-        return this.localeData().weekdaysMin(this, format);
-    });
-
-    addFormatToken('ddd', 0, 0, function (format) {
-        return this.localeData().weekdaysShort(this, format);
-    });
-
-    addFormatToken('dddd', 0, 0, function (format) {
-        return this.localeData().weekdays(this, format);
-    });
-
-    addFormatToken('e', 0, 0, 'weekday');
-    addFormatToken('E', 0, 0, 'isoWeekday');
-
-    // ALIASES
-
-    addUnitAlias('day', 'd');
-    addUnitAlias('weekday', 'e');
-    addUnitAlias('isoWeekday', 'E');
-
-    // PARSING
-
-    addRegexToken('d',    match1to2);
-    addRegexToken('e',    match1to2);
-    addRegexToken('E',    match1to2);
-    addRegexToken('dd',   matchWord);
-    addRegexToken('ddd',  matchWord);
-    addRegexToken('dddd', matchWord);
-
-    addWeekParseToken(['dd', 'ddd', 'dddd'], function (input, week, config, token) {
-        var weekday = config._locale.weekdaysParse(input, token, config._strict);
-        // if we didn't get a weekday name, mark the date as invalid
-        if (weekday != null) {
-            week.d = weekday;
-        } else {
-            getParsingFlags(config).invalidWeekday = input;
-        }
-    });
-
-    addWeekParseToken(['d', 'e', 'E'], function (input, week, config, token) {
-        week[token] = toInt(input);
-    });
-
-    // HELPERS
-
-    function parseWeekday(input, locale) {
-        if (typeof input !== 'string') {
-            return input;
-        }
-
-        if (!isNaN(input)) {
-            return parseInt(input, 10);
-        }
-
-        input = locale.weekdaysParse(input);
-        if (typeof input === 'number') {
-            return input;
-        }
-
-        return null;
-    }
-
-    // LOCALES
-
-    var defaultLocaleWeekdays = 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_');
-    function localeWeekdays (m, format) {
-        return isArray(this._weekdays) ? this._weekdays[m.day()] :
-            this._weekdays[this._weekdays.isFormat.test(format) ? 'format' : 'standalone'][m.day()];
-    }
-
-    var defaultLocaleWeekdaysShort = 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_');
-    function localeWeekdaysShort (m) {
-        return this._weekdaysShort[m.day()];
-    }
-
-    var defaultLocaleWeekdaysMin = 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_');
-    function localeWeekdaysMin (m) {
-        return this._weekdaysMin[m.day()];
-    }
-
-    function localeWeekdaysParse (weekdayName, format, strict) {
-        var i, mom, regex;
-
-        if (!this._weekdaysParse) {
-            this._weekdaysParse = [];
-            this._minWeekdaysParse = [];
-            this._shortWeekdaysParse = [];
-            this._fullWeekdaysParse = [];
-        }
-
-        for (i = 0; i < 7; i++) {
-            // make the regex if we don't have it already
-
-            mom = local__createLocal([2000, 1]).day(i);
-            if (strict && !this._fullWeekdaysParse[i]) {
-                this._fullWeekdaysParse[i] = new RegExp('^' + this.weekdays(mom, '').replace('.', '\.?') + '$', 'i');
-                this._shortWeekdaysParse[i] = new RegExp('^' + this.weekdaysShort(mom, '').replace('.', '\.?') + '$', 'i');
-                this._minWeekdaysParse[i] = new RegExp('^' + this.weekdaysMin(mom, '').replace('.', '\.?') + '$', 'i');
-            }
-            if (!this._weekdaysParse[i]) {
-                regex = '^' + this.weekdays(mom, '') + '|^' + this.weekdaysShort(mom, '') + '|^' + this.weekdaysMin(mom, '');
-                this._weekdaysParse[i] = new RegExp(regex.replace('.', ''), 'i');
-            }
-            // test the regex
-            if (strict && format === 'dddd' && this._fullWeekdaysParse[i].test(weekdayName)) {
-                return i;
-            } else if (strict && format === 'ddd' && this._shortWeekdaysParse[i].test(weekdayName)) {
-                return i;
-            } else if (strict && format === 'dd' && this._minWeekdaysParse[i].test(weekdayName)) {
-                return i;
-            } else if (!strict && this._weekdaysParse[i].test(weekdayName)) {
-                return i;
-            }
-        }
-    }
-
-    // MOMENTS
-
-    function getSetDayOfWeek (input) {
-        if (!this.isValid()) {
-            return input != null ? this : NaN;
-        }
-        var day = this._isUTC ? this._d.getUTCDay() : this._d.getDay();
-        if (input != null) {
-            input = parseWeekday(input, this.localeData());
-            return this.add(input - day, 'd');
-        } else {
-            return day;
-        }
-    }
-
-    function getSetLocaleDayOfWeek (input) {
-        if (!this.isValid()) {
-            return input != null ? this : NaN;
-        }
-        var weekday = (this.day() + 7 - this.localeData()._week.dow) % 7;
-        return input == null ? weekday : this.add(input - weekday, 'd');
-    }
-
-    function getSetISODayOfWeek (input) {
-        if (!this.isValid()) {
-            return input != null ? this : NaN;
-        }
-        // behaves the same as moment#day except
-        // as a getter, returns 7 instead of 0 (1-7 range instead of 0-6)
-        // as a setter, sunday should belong to the previous week.
-        return input == null ? this.day() || 7 : this.day(this.day() % 7 ? input : input - 7);
-    }
-
-    // FORMATTING
-
-    addFormatToken('DDD', ['DDDD', 3], 'DDDo', 'dayOfYear');
-
-    // ALIASES
-
-    addUnitAlias('dayOfYear', 'DDD');
-
-    // PARSING
-
-    addRegexToken('DDD',  match1to3);
-    addRegexToken('DDDD', match3);
-    addParseToken(['DDD', 'DDDD'], function (input, array, config) {
-        config._dayOfYear = toInt(input);
-    });
-
-    // HELPERS
-
-    // MOMENTS
-
-    function getSetDayOfYear (input) {
-        var dayOfYear = Math.round((this.clone().startOf('day') - this.clone().startOf('year')) / 864e5) + 1;
-        return input == null ? dayOfYear : this.add((input - dayOfYear), 'd');
-    }
-
-    // FORMATTING
-
-    function hFormat() {
-        return this.hours() % 12 || 12;
-    }
-
-    addFormatToken('H', ['HH', 2], 0, 'hour');
-    addFormatToken('h', ['hh', 2], 0, hFormat);
-
-    addFormatToken('hmm', 0, 0, function () {
-        return '' + hFormat.apply(this) + zeroFill(this.minutes(), 2);
-    });
-
-    addFormatToken('hmmss', 0, 0, function () {
-        return '' + hFormat.apply(this) + zeroFill(this.minutes(), 2) +
-            zeroFill(this.seconds(), 2);
-    });
-
-    addFormatToken('Hmm', 0, 0, function () {
-        return '' + this.hours() + zeroFill(this.minutes(), 2);
-    });
-
-    addFormatToken('Hmmss', 0, 0, function () {
-        return '' + this.hours() + zeroFill(this.minutes(), 2) +
-            zeroFill(this.seconds(), 2);
-    });
-
-    function meridiem (token, lowercase) {
-        addFormatToken(token, 0, 0, function () {
-            return this.localeData().meridiem(this.hours(), this.minutes(), lowercase);
-        });
-    }
-
-    meridiem('a', true);
-    meridiem('A', false);
-
-    // ALIASES
-
-    addUnitAlias('hour', 'h');
-
-    // PARSING
-
-    function matchMeridiem (isStrict, locale) {
-        return locale._meridiemParse;
-    }
-
-    addRegexToken('a',  matchMeridiem);
-    addRegexToken('A',  matchMeridiem);
-    addRegexToken('H',  match1to2);
-    addRegexToken('h',  match1to2);
-    addRegexToken('HH', match1to2, match2);
-    addRegexToken('hh', match1to2, match2);
-
-    addRegexToken('hmm', match3to4);
-    addRegexToken('hmmss', match5to6);
-    addRegexToken('Hmm', match3to4);
-    addRegexToken('Hmmss', match5to6);
-
-    addParseToken(['H', 'HH'], HOUR);
-    addParseToken(['a', 'A'], function (input, array, config) {
-        config._isPm = config._locale.isPM(input);
-        config._meridiem = input;
-    });
-    addParseToken(['h', 'hh'], function (input, array, config) {
-        array[HOUR] = toInt(input);
-        getParsingFlags(config).bigHour = true;
-    });
-    addParseToken('hmm', function (input, array, config) {
-        var pos = input.length - 2;
-        array[HOUR] = toInt(input.substr(0, pos));
-        array[MINUTE] = toInt(input.substr(pos));
-        getParsingFlags(config).bigHour = true;
-    });
-    addParseToken('hmmss', function (input, array, config) {
-        var pos1 = input.length - 4;
-        var pos2 = input.length - 2;
-        array[HOUR] = toInt(input.substr(0, pos1));
-        array[MINUTE] = toInt(input.substr(pos1, 2));
-        array[SECOND] = toInt(input.substr(pos2));
-        getParsingFlags(config).bigHour = true;
-    });
-    addParseToken('Hmm', function (input, array, config) {
-        var pos = input.length - 2;
-        array[HOUR] = toInt(input.substr(0, pos));
-        array[MINUTE] = toInt(input.substr(pos));
-    });
-    addParseToken('Hmmss', function (input, array, config) {
-        var pos1 = input.length - 4;
-        var pos2 = input.length - 2;
-        array[HOUR] = toInt(input.substr(0, pos1));
-        array[MINUTE] = toInt(input.substr(pos1, 2));
-        array[SECOND] = toInt(input.substr(pos2));
-    });
-
-    // LOCALES
-
-    function localeIsPM (input) {
-        // IE8 Quirks Mode & IE7 Standards Mode do not allow accessing strings like arrays
-        // Using charAt should be more compatible.
-        return ((input + '').toLowerCase().charAt(0) === 'p');
-    }
-
-    var defaultLocaleMeridiemParse = /[ap]\.?m?\.?/i;
-    function localeMeridiem (hours, minutes, isLower) {
-        if (hours > 11) {
-            return isLower ? 'pm' : 'PM';
-        } else {
-            return isLower ? 'am' : 'AM';
-        }
-    }
-
-
-    // MOMENTS
-
-    // Setting the hour should keep the time, because the user explicitly
-    // specified which hour he wants. So trying to maintain the same hour (in
-    // a new timezone) makes sense. Adding/subtracting hours does not follow
-    // this rule.
-    var getSetHour = makeGetSet('Hours', true);
-
-    // FORMATTING
-
-    addFormatToken('m', ['mm', 2], 0, 'minute');
-
-    // ALIASES
-
-    addUnitAlias('minute', 'm');
-
-    // PARSING
-
-    addRegexToken('m',  match1to2);
-    addRegexToken('mm', match1to2, match2);
-    addParseToken(['m', 'mm'], MINUTE);
-
-    // MOMENTS
-
-    var getSetMinute = makeGetSet('Minutes', false);
-
-    // FORMATTING
-
-    addFormatToken('s', ['ss', 2], 0, 'second');
-
-    // ALIASES
-
-    addUnitAlias('second', 's');
-
-    // PARSING
-
-    addRegexToken('s',  match1to2);
-    addRegexToken('ss', match1to2, match2);
-    addParseToken(['s', 'ss'], SECOND);
-
-    // MOMENTS
-
-    var getSetSecond = makeGetSet('Seconds', false);
-
-    // FORMATTING
-
-    addFormatToken('S', 0, 0, function () {
-        return ~~(this.millisecond() / 100);
-    });
-
-    addFormatToken(0, ['SS', 2], 0, function () {
-        return ~~(this.millisecond() / 10);
-    });
-
-    addFormatToken(0, ['SSS', 3], 0, 'millisecond');
-    addFormatToken(0, ['SSSS', 4], 0, function () {
-        return this.millisecond() * 10;
-    });
-    addFormatToken(0, ['SSSSS', 5], 0, function () {
-        return this.millisecond() * 100;
-    });
-    addFormatToken(0, ['SSSSSS', 6], 0, function () {
-        return this.millisecond() * 1000;
-    });
-    addFormatToken(0, ['SSSSSSS', 7], 0, function () {
-        return this.millisecond() * 10000;
-    });
-    addFormatToken(0, ['SSSSSSSS', 8], 0, function () {
-        return this.millisecond() * 100000;
-    });
-    addFormatToken(0, ['SSSSSSSSS', 9], 0, function () {
-        return this.millisecond() * 1000000;
-    });
-
-
-    // ALIASES
-
-    addUnitAlias('millisecond', 'ms');
-
-    // PARSING
-
-    addRegexToken('S',    match1to3, match1);
-    addRegexToken('SS',   match1to3, match2);
-    addRegexToken('SSS',  match1to3, match3);
-
-    var token;
-    for (token = 'SSSS'; token.length <= 9; token += 'S') {
-        addRegexToken(token, matchUnsigned);
-    }
-
-    function parseMs(input, array) {
-        array[MILLISECOND] = toInt(('0.' + input) * 1000);
-    }
-
-    for (token = 'S'; token.length <= 9; token += 'S') {
-        addParseToken(token, parseMs);
-    }
-    // MOMENTS
-
-    var getSetMillisecond = makeGetSet('Milliseconds', false);
-
-    // FORMATTING
-
-    addFormatToken('z',  0, 0, 'zoneAbbr');
-    addFormatToken('zz', 0, 0, 'zoneName');
-
-    // MOMENTS
-
-    function getZoneAbbr () {
-        return this._isUTC ? 'UTC' : '';
-    }
-
-    function getZoneName () {
-        return this._isUTC ? 'Coordinated Universal Time' : '';
-    }
-
-    var momentPrototype__proto = Moment.prototype;
-
-    momentPrototype__proto.add               = add_subtract__add;
-    momentPrototype__proto.calendar          = moment_calendar__calendar;
-    momentPrototype__proto.clone             = clone;
-    momentPrototype__proto.diff              = diff;
-    momentPrototype__proto.endOf             = endOf;
-    momentPrototype__proto.format            = format;
-    momentPrototype__proto.from              = from;
-    momentPrototype__proto.fromNow           = fromNow;
-    momentPrototype__proto.to                = to;
-    momentPrototype__proto.toNow             = toNow;
-    momentPrototype__proto.get               = getSet;
-    momentPrototype__proto.invalidAt         = invalidAt;
-    momentPrototype__proto.isAfter           = isAfter;
-    momentPrototype__proto.isBefore          = isBefore;
-    momentPrototype__proto.isBetween         = isBetween;
-    momentPrototype__proto.isSame            = isSame;
-    momentPrototype__proto.isSameOrAfter     = isSameOrAfter;
-    momentPrototype__proto.isSameOrBefore    = isSameOrBefore;
-    momentPrototype__proto.isValid           = moment_valid__isValid;
-    momentPrototype__proto.lang              = lang;
-    momentPrototype__proto.locale            = locale;
-    momentPrototype__proto.localeData        = localeData;
-    momentPrototype__proto.max               = prototypeMax;
-    momentPrototype__proto.min               = prototypeMin;
-    momentPrototype__proto.parsingFlags      = parsingFlags;
-    momentPrototype__proto.set               = getSet;
-    momentPrototype__proto.startOf           = startOf;
-    momentPrototype__proto.subtract          = add_subtract__subtract;
-    momentPrototype__proto.toArray           = toArray;
-    momentPrototype__proto.toObject          = toObject;
-    momentPrototype__proto.toDate            = toDate;
-    momentPrototype__proto.toISOString       = moment_format__toISOString;
-    momentPrototype__proto.toJSON            = toJSON;
-    momentPrototype__proto.toString          = toString;
-    momentPrototype__proto.unix              = unix;
-    momentPrototype__proto.valueOf           = to_type__valueOf;
-    momentPrototype__proto.creationData      = creationData;
-
-    // Year
-    momentPrototype__proto.year       = getSetYear;
-    momentPrototype__proto.isLeapYear = getIsLeapYear;
-
-    // Week Year
-    momentPrototype__proto.weekYear    = getSetWeekYear;
-    momentPrototype__proto.isoWeekYear = getSetISOWeekYear;
-
-    // Quarter
-    momentPrototype__proto.quarter = momentPrototype__proto.quarters = getSetQuarter;
-
-    // Month
-    momentPrototype__proto.month       = getSetMonth;
-    momentPrototype__proto.daysInMonth = getDaysInMonth;
-
-    // Week
-    momentPrototype__proto.week           = momentPrototype__proto.weeks        = getSetWeek;
-    momentPrototype__proto.isoWeek        = momentPrototype__proto.isoWeeks     = getSetISOWeek;
-    momentPrototype__proto.weeksInYear    = getWeeksInYear;
-    momentPrototype__proto.isoWeeksInYear = getISOWeeksInYear;
-
-    // Day
-    momentPrototype__proto.date       = getSetDayOfMonth;
-    momentPrototype__proto.day        = momentPrototype__proto.days             = getSetDayOfWeek;
-    momentPrototype__proto.weekday    = getSetLocaleDayOfWeek;
-    momentPrototype__proto.isoWeekday = getSetISODayOfWeek;
-    momentPrototype__proto.dayOfYear  = getSetDayOfYear;
-
-    // Hour
-    momentPrototype__proto.hour = momentPrototype__proto.hours = getSetHour;
-
-    // Minute
-    momentPrototype__proto.minute = momentPrototype__proto.minutes = getSetMinute;
-
-    // Second
-    momentPrototype__proto.second = momentPrototype__proto.seconds = getSetSecond;
-
-    // Millisecond
-    momentPrototype__proto.millisecond = momentPrototype__proto.milliseconds = getSetMillisecond;
-
-    // Offset
-    momentPrototype__proto.utcOffset            = getSetOffset;
-    momentPrototype__proto.utc                  = setOffsetToUTC;
-    momentPrototype__proto.local                = setOffsetToLocal;
-    momentPrototype__proto.parseZone            = setOffsetToParsedOffset;
-    momentPrototype__proto.hasAlignedHourOffset = hasAlignedHourOffset;
-    momentPrototype__proto.isDST                = isDaylightSavingTime;
-    momentPrototype__proto.isDSTShifted         = isDaylightSavingTimeShifted;
-    momentPrototype__proto.isLocal              = isLocal;
-    momentPrototype__proto.isUtcOffset          = isUtcOffset;
-    momentPrototype__proto.isUtc                = isUtc;
-    momentPrototype__proto.isUTC                = isUtc;
-
-    // Timezone
-    momentPrototype__proto.zoneAbbr = getZoneAbbr;
-    momentPrototype__proto.zoneName = getZoneName;
-
-    // Deprecations
-    momentPrototype__proto.dates  = deprecate('dates accessor is deprecated. Use date instead.', getSetDayOfMonth);
-    momentPrototype__proto.months = deprecate('months accessor is deprecated. Use month instead', getSetMonth);
-    momentPrototype__proto.years  = deprecate('years accessor is deprecated. Use year instead', getSetYear);
-    momentPrototype__proto.zone   = deprecate('moment().zone is deprecated, use moment().utcOffset instead. https://github.com/moment/moment/issues/1779', getSetZone);
-
-    var momentPrototype = momentPrototype__proto;
-
-    function moment__createUnix (input) {
-        return local__createLocal(input * 1000);
-    }
-
-    function moment__createInZone () {
-        return local__createLocal.apply(null, arguments).parseZone();
-    }
-
-    var defaultCalendar = {
-        sameDay : '[Today at] LT',
-        nextDay : '[Tomorrow at] LT',
-        nextWeek : 'dddd [at] LT',
-        lastDay : '[Yesterday at] LT',
-        lastWeek : '[Last] dddd [at] LT',
-        sameElse : 'L'
-    };
-
-    function locale_calendar__calendar (key, mom, now) {
-        var output = this._calendar[key];
-        return isFunction(output) ? output.call(mom, now) : output;
-    }
-
-    var defaultLongDateFormat = {
-        LTS  : 'h:mm:ss A',
-        LT   : 'h:mm A',
-        L    : 'MM/DD/YYYY',
-        LL   : 'MMMM D, YYYY',
-        LLL  : 'MMMM D, YYYY h:mm A',
-        LLLL : 'dddd, MMMM D, YYYY h:mm A'
-    };
-
-    function longDateFormat (key) {
-        var format = this._longDateFormat[key],
-            formatUpper = this._longDateFormat[key.toUpperCase()];
-
-        if (format || !formatUpper) {
-            return format;
-        }
-
-        this._longDateFormat[key] = formatUpper.replace(/MMMM|MM|DD|dddd/g, function (val) {
-            return val.slice(1);
-        });
-
-        return this._longDateFormat[key];
-    }
-
-    var defaultInvalidDate = 'Invalid date';
-
-    function invalidDate () {
-        return this._invalidDate;
-    }
-
-    var defaultOrdinal = '%d';
-    var defaultOrdinalParse = /\d{1,2}/;
-
-    function ordinal (number) {
-        return this._ordinal.replace('%d', number);
-    }
-
-    function preParsePostFormat (string) {
-        return string;
-    }
-
-    var defaultRelativeTime = {
-        future : 'in %s',
-        past   : '%s ago',
-        s  : 'a few seconds',
-        m  : 'a minute',
-        mm : '%d minutes',
-        h  : 'an hour',
-        hh : '%d hours',
-        d  : 'a day',
-        dd : '%d days',
-        M  : 'a month',
-        MM : '%d months',
-        y  : 'a year',
-        yy : '%d years'
-    };
-
-    function relative__relativeTime (number, withoutSuffix, string, isFuture) {
-        var output = this._relativeTime[string];
-        return (isFunction(output)) ?
-            output(number, withoutSuffix, string, isFuture) :
-            output.replace(/%d/i, number);
-    }
-
-    function pastFuture (diff, output) {
-        var format = this._relativeTime[diff > 0 ? 'future' : 'past'];
-        return isFunction(format) ? format(output) : format.replace(/%s/i, output);
-    }
-
-    var prototype__proto = Locale.prototype;
-
-    prototype__proto._calendar       = defaultCalendar;
-    prototype__proto.calendar        = locale_calendar__calendar;
-    prototype__proto._longDateFormat = defaultLongDateFormat;
-    prototype__proto.longDateFormat  = longDateFormat;
-    prototype__proto._invalidDate    = defaultInvalidDate;
-    prototype__proto.invalidDate     = invalidDate;
-    prototype__proto._ordinal        = defaultOrdinal;
-    prototype__proto.ordinal         = ordinal;
-    prototype__proto._ordinalParse   = defaultOrdinalParse;
-    prototype__proto.preparse        = preParsePostFormat;
-    prototype__proto.postformat      = preParsePostFormat;
-    prototype__proto._relativeTime   = defaultRelativeTime;
-    prototype__proto.relativeTime    = relative__relativeTime;
-    prototype__proto.pastFuture      = pastFuture;
-    prototype__proto.set             = locale_set__set;
-
-    // Month
-    prototype__proto.months            =        localeMonths;
-    prototype__proto._months           = defaultLocaleMonths;
-    prototype__proto.monthsShort       =        localeMonthsShort;
-    prototype__proto._monthsShort      = defaultLocaleMonthsShort;
-    prototype__proto.monthsParse       =        localeMonthsParse;
-    prototype__proto._monthsRegex      = defaultMonthsRegex;
-    prototype__proto.monthsRegex       = monthsRegex;
-    prototype__proto._monthsShortRegex = defaultMonthsShortRegex;
-    prototype__proto.monthsShortRegex  = monthsShortRegex;
-
-    // Week
-    prototype__proto.week = localeWeek;
-    prototype__proto._week = defaultLocaleWeek;
-    prototype__proto.firstDayOfYear = localeFirstDayOfYear;
-    prototype__proto.firstDayOfWeek = localeFirstDayOfWeek;
-
-    // Day of Week
-    prototype__proto.weekdays       =        localeWeekdays;
-    prototype__proto._weekdays      = defaultLocaleWeekdays;
-    prototype__proto.weekdaysMin    =        localeWeekdaysMin;
-    prototype__proto._weekdaysMin   = defaultLocaleWeekdaysMin;
-    prototype__proto.weekdaysShort  =        localeWeekdaysShort;
-    prototype__proto._weekdaysShort = defaultLocaleWeekdaysShort;
-    prototype__proto.weekdaysParse  =        localeWeekdaysParse;
-
-    // Hours
-    prototype__proto.isPM = localeIsPM;
-    prototype__proto._meridiemParse = defaultLocaleMeridiemParse;
-    prototype__proto.meridiem = localeMeridiem;
-
-    function lists__get (format, index, field, setter) {
-        var locale = locale_locales__getLocale();
-        var utc = create_utc__createUTC().set(setter, index);
-        return locale[field](utc, format);
-    }
-
-    function list (format, index, field, count, setter) {
-        if (typeof format === 'number') {
-            index = format;
-            format = undefined;
-        }
-
-        format = format || '';
-
-        if (index != null) {
-            return lists__get(format, index, field, setter);
-        }
-
-        var i;
-        var out = [];
-        for (i = 0; i < count; i++) {
-            out[i] = lists__get(format, i, field, setter);
-        }
-        return out;
-    }
-
-    function lists__listMonths (format, index) {
-        return list(format, index, 'months', 12, 'month');
-    }
-
-    function lists__listMonthsShort (format, index) {
-        return list(format, index, 'monthsShort', 12, 'month');
-    }
-
-    function lists__listWeekdays (format, index) {
-        return list(format, index, 'weekdays', 7, 'day');
-    }
-
-    function lists__listWeekdaysShort (format, index) {
-        return list(format, index, 'weekdaysShort', 7, 'day');
-    }
-
-    function lists__listWeekdaysMin (format, index) {
-        return list(format, index, 'weekdaysMin', 7, 'day');
-    }
-
-    locale_locales__getSetGlobalLocale('en', {
-        ordinalParse: /\d{1,2}(th|st|nd|rd)/,
-        ordinal : function (number) {
-            var b = number % 10,
-                output = (toInt(number % 100 / 10) === 1) ? 'th' :
-                (b === 1) ? 'st' :
-                (b === 2) ? 'nd' :
-                (b === 3) ? 'rd' : 'th';
-            return number + output;
-        }
-    });
-
-    // Side effect imports
-    utils_hooks__hooks.lang = deprecate('moment.lang is deprecated. Use moment.locale instead.', locale_locales__getSetGlobalLocale);
-    utils_hooks__hooks.langData = deprecate('moment.langData is deprecated. Use moment.localeData instead.', locale_locales__getLocale);
-
-    var mathAbs = Math.abs;
-
-    function duration_abs__abs () {
-        var data           = this._data;
-
-        this._milliseconds = mathAbs(this._milliseconds);
-        this._days         = mathAbs(this._days);
-        this._months       = mathAbs(this._months);
-
-        data.milliseconds  = mathAbs(data.milliseconds);
-        data.seconds       = mathAbs(data.seconds);
-        data.minutes       = mathAbs(data.minutes);
-        data.hours         = mathAbs(data.hours);
-        data.months        = mathAbs(data.months);
-        data.years         = mathAbs(data.years);
-
-        return this;
-    }
-
-    function duration_add_subtract__addSubtract (duration, input, value, direction) {
-        var other = create__createDuration(input, value);
-
-        duration._milliseconds += direction * other._milliseconds;
-        duration._days         += direction * other._days;
-        duration._months       += direction * other._months;
-
-        return duration._bubble();
-    }
-
-    // supports only 2.0-style add(1, 's') or add(duration)
-    function duration_add_subtract__add (input, value) {
-        return duration_add_subtract__addSubtract(this, input, value, 1);
-    }
-
-    // supports only 2.0-style subtract(1, 's') or subtract(duration)
-    function duration_add_subtract__subtract (input, value) {
-        return duration_add_subtract__addSubtract(this, input, value, -1);
-    }
-
-    function absCeil (number) {
-        if (number < 0) {
-            return Math.floor(number);
-        } else {
-            return Math.ceil(number);
-        }
-    }
-
-    function bubble () {
-        var milliseconds = this._milliseconds;
-        var days         = this._days;
-        var months       = this._months;
-        var data         = this._data;
-        var seconds, minutes, hours, years, monthsFromDays;
-
-        // if we have a mix of positive and negative values, bubble down first
-        // check: https://github.com/moment/moment/issues/2166
-        if (!((milliseconds >= 0 && days >= 0 && months >= 0) ||
-                (milliseconds <= 0 && days <= 0 && months <= 0))) {
-            milliseconds += absCeil(monthsToDays(months) + days) * 864e5;
-            days = 0;
-            months = 0;
-        }
-
-        // The following code bubbles up values, see the tests for
-        // examples of what that means.
-        data.milliseconds = milliseconds % 1000;
-
-        seconds           = absFloor(milliseconds / 1000);
-        data.seconds      = seconds % 60;
-
-        minutes           = absFloor(seconds / 60);
-        data.minutes      = minutes % 60;
-
-        hours             = absFloor(minutes / 60);
-        data.hours        = hours % 24;
-
-        days += absFloor(hours / 24);
-
-        // convert days to months
-        monthsFromDays = absFloor(daysToMonths(days));
-        months += monthsFromDays;
-        days -= absCeil(monthsToDays(monthsFromDays));
-
-        // 12 months -> 1 year
-        years = absFloor(months / 12);
-        months %= 12;
-
-        data.days   = days;
-        data.months = months;
-        data.years  = years;
-
-        return this;
-    }
-
-    function daysToMonths (days) {
-        // 400 years have 146097 days (taking into account leap year rules)
-        // 400 years have 12 months === 4800
-        return days * 4800 / 146097;
-    }
-
-    function monthsToDays (months) {
-        // the reverse of daysToMonths
-        return months * 146097 / 4800;
-    }
-
-    function as (units) {
-        var days;
-        var months;
-        var milliseconds = this._milliseconds;
-
-        units = normalizeUnits(units);
-
-        if (units === 'month' || units === 'year') {
-            days   = this._days   + milliseconds / 864e5;
-            months = this._months + daysToMonths(days);
-            return units === 'month' ? months : months / 12;
-        } else {
-            // handle milliseconds separately because of floating point math errors (issue #1867)
-            days = this._days + Math.round(monthsToDays(this._months));
-            switch (units) {
-                case 'week'   : return days / 7     + milliseconds / 6048e5;
-                case 'day'    : return days         + milliseconds / 864e5;
-                case 'hour'   : return days * 24    + milliseconds / 36e5;
-                case 'minute' : return days * 1440  + milliseconds / 6e4;
-                case 'second' : return days * 86400 + milliseconds / 1000;
-                // Math.floor prevents floating point math errors here
-                case 'millisecond': return Math.floor(days * 864e5) + milliseconds;
-                default: throw new Error('Unknown unit ' + units);
-            }
-        }
-    }
-
-    // TODO: Use this.as('ms')?
-    function duration_as__valueOf () {
-        return (
-            this._milliseconds +
-            this._days * 864e5 +
-            (this._months % 12) * 2592e6 +
-            toInt(this._months / 12) * 31536e6
-        );
-    }
-
-    function makeAs (alias) {
-        return function () {
-            return this.as(alias);
-        };
-    }
-
-    var asMilliseconds = makeAs('ms');
-    var asSeconds      = makeAs('s');
-    var asMinutes      = makeAs('m');
-    var asHours        = makeAs('h');
-    var asDays         = makeAs('d');
-    var asWeeks        = makeAs('w');
-    var asMonths       = makeAs('M');
-    var asYears        = makeAs('y');
-
-    function duration_get__get (units) {
-        units = normalizeUnits(units);
-        return this[units + 's']();
-    }
-
-    function makeGetter(name) {
-        return function () {
-            return this._data[name];
-        };
-    }
-
-    var milliseconds = makeGetter('milliseconds');
-    var seconds      = makeGetter('seconds');
-    var minutes      = makeGetter('minutes');
-    var hours        = makeGetter('hours');
-    var days         = makeGetter('days');
-    var months       = makeGetter('months');
-    var years        = makeGetter('years');
-
-    function weeks () {
-        return absFloor(this.days() / 7);
-    }
-
-    var round = Math.round;
-    var thresholds = {
-        s: 45,  // seconds to minute
-        m: 45,  // minutes to hour
-        h: 22,  // hours to day
-        d: 26,  // days to month
-        M: 11   // months to year
-    };
-
-    // helper function for moment.fn.from, moment.fn.fromNow, and moment.duration.fn.humanize
-    function substituteTimeAgo(string, number, withoutSuffix, isFuture, locale) {
-        return locale.relativeTime(number || 1, !!withoutSuffix, string, isFuture);
-    }
-
-    function duration_humanize__relativeTime (posNegDuration, withoutSuffix, locale) {
-        var duration = create__createDuration(posNegDuration).abs();
-        var seconds  = round(duration.as('s'));
-        var minutes  = round(duration.as('m'));
-        var hours    = round(duration.as('h'));
-        var days     = round(duration.as('d'));
-        var months   = round(duration.as('M'));
-        var years    = round(duration.as('y'));
-
-        var a = seconds < thresholds.s && ['s', seconds]  ||
-                minutes <= 1           && ['m']           ||
-                minutes < thresholds.m && ['mm', minutes] ||
-                hours   <= 1           && ['h']           ||
-                hours   < thresholds.h && ['hh', hours]   ||
-                days    <= 1           && ['d']           ||
-                days    < thresholds.d && ['dd', days]    ||
-                months  <= 1           && ['M']           ||
-                months  < thresholds.M && ['MM', months]  ||
-                years   <= 1           && ['y']           || ['yy', years];
-
-        a[2] = withoutSuffix;
-        a[3] = +posNegDuration > 0;
-        a[4] = locale;
-        return substituteTimeAgo.apply(null, a);
-    }
-
-    // This function allows you to set a threshold for relative time strings
-    function duration_humanize__getSetRelativeTimeThreshold (threshold, limit) {
-        if (thresholds[threshold] === undefined) {
-            return false;
-        }
-        if (limit === undefined) {
-            return thresholds[threshold];
-        }
-        thresholds[threshold] = limit;
-        return true;
-    }
-
-    function humanize (withSuffix) {
-        var locale = this.localeData();
-        var output = duration_humanize__relativeTime(this, !withSuffix, locale);
-
-        if (withSuffix) {
-            output = locale.pastFuture(+this, output);
-        }
-
-        return locale.postformat(output);
-    }
-
-    var iso_string__abs = Math.abs;
-
-    function iso_string__toISOString() {
-        // for ISO strings we do not use the normal bubbling rules:
-        //  * milliseconds bubble up until they become hours
-        //  * days do not bubble at all
-        //  * months bubble up until they become years
-        // This is because there is no context-free conversion between hours and days
-        // (think of clock changes)
-        // and also not between days and months (28-31 days per month)
-        var seconds = iso_string__abs(this._milliseconds) / 1000;
-        var days         = iso_string__abs(this._days);
-        var months       = iso_string__abs(this._months);
-        var minutes, hours, years;
-
-        // 3600 seconds -> 60 minutes -> 1 hour
-        minutes           = absFloor(seconds / 60);
-        hours             = absFloor(minutes / 60);
-        seconds %= 60;
-        minutes %= 60;
-
-        // 12 months -> 1 year
-        years  = absFloor(months / 12);
-        months %= 12;
-
-
-        // inspired by https://github.com/dordille/moment-isoduration/blob/master/moment.isoduration.js
-        var Y = years;
-        var M = months;
-        var D = days;
-        var h = hours;
-        var m = minutes;
-        var s = seconds;
-        var total = this.asSeconds();
-
-        if (!total) {
-            // this is the same as C#'s (Noda) and python (isodate)...
-            // but not other JS (goog.date)
-            return 'P0D';
-        }
-
-        return (total < 0 ? '-' : '') +
-            'P' +
-            (Y ? Y + 'Y' : '') +
-            (M ? M + 'M' : '') +
-            (D ? D + 'D' : '') +
-            ((h || m || s) ? 'T' : '') +
-            (h ? h + 'H' : '') +
-            (m ? m + 'M' : '') +
-            (s ? s + 'S' : '');
-    }
-
-    var duration_prototype__proto = Duration.prototype;
-
-    duration_prototype__proto.abs            = duration_abs__abs;
-    duration_prototype__proto.add            = duration_add_subtract__add;
-    duration_prototype__proto.subtract       = duration_add_subtract__subtract;
-    duration_prototype__proto.as             = as;
-    duration_prototype__proto.asMilliseconds = asMilliseconds;
-    duration_prototype__proto.asSeconds      = asSeconds;
-    duration_prototype__proto.asMinutes      = asMinutes;
-    duration_prototype__proto.asHours        = asHours;
-    duration_prototype__proto.asDays         = asDays;
-    duration_prototype__proto.asWeeks        = asWeeks;
-    duration_prototype__proto.asMonths       = asMonths;
-    duration_prototype__proto.asYears        = asYears;
-    duration_prototype__proto.valueOf        = duration_as__valueOf;
-    duration_prototype__proto._bubble        = bubble;
-    duration_prototype__proto.get            = duration_get__get;
-    duration_prototype__proto.milliseconds   = milliseconds;
-    duration_prototype__proto.seconds        = seconds;
-    duration_prototype__proto.minutes        = minutes;
-    duration_prototype__proto.hours          = hours;
-    duration_prototype__proto.days           = days;
-    duration_prototype__proto.weeks          = weeks;
-    duration_prototype__proto.months         = months;
-    duration_prototype__proto.years          = years;
-    duration_prototype__proto.humanize       = humanize;
-    duration_prototype__proto.toISOString    = iso_string__toISOString;
-    duration_prototype__proto.toString       = iso_string__toISOString;
-    duration_prototype__proto.toJSON         = iso_string__toISOString;
-    duration_prototype__proto.locale         = locale;
-    duration_prototype__proto.localeData     = localeData;
-
-    // Deprecations
-    duration_prototype__proto.toIsoString = deprecate('toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)', iso_string__toISOString);
-    duration_prototype__proto.lang = lang;
-
-    // Side effect imports
-
-    // FORMATTING
-
-    addFormatToken('X', 0, 0, 'unix');
-    addFormatToken('x', 0, 0, 'valueOf');
-
-    // PARSING
-
-    addRegexToken('x', matchSigned);
-    addRegexToken('X', matchTimestamp);
-    addParseToken('X', function (input, array, config) {
-        config._d = new Date(parseFloat(input, 10) * 1000);
-    });
-    addParseToken('x', function (input, array, config) {
-        config._d = new Date(toInt(input));
-    });
-
-    // Side effect imports
-
-
-    utils_hooks__hooks.version = '2.12.0';
-
-    setHookCallback(local__createLocal);
-
-    utils_hooks__hooks.fn                    = momentPrototype;
-    utils_hooks__hooks.min                   = min;
-    utils_hooks__hooks.max                   = max;
-    utils_hooks__hooks.now                   = now;
-    utils_hooks__hooks.utc                   = create_utc__createUTC;
-    utils_hooks__hooks.unix                  = moment__createUnix;
-    utils_hooks__hooks.months                = lists__listMonths;
-    utils_hooks__hooks.isDate                = isDate;
-    utils_hooks__hooks.locale                = locale_locales__getSetGlobalLocale;
-    utils_hooks__hooks.invalid               = valid__createInvalid;
-    utils_hooks__hooks.duration              = create__createDuration;
-    utils_hooks__hooks.isMoment              = isMoment;
-    utils_hooks__hooks.weekdays              = lists__listWeekdays;
-    utils_hooks__hooks.parseZone             = moment__createInZone;
-    utils_hooks__hooks.localeData            = locale_locales__getLocale;
-    utils_hooks__hooks.isDuration            = isDuration;
-    utils_hooks__hooks.monthsShort           = lists__listMonthsShort;
-    utils_hooks__hooks.weekdaysMin           = lists__listWeekdaysMin;
-    utils_hooks__hooks.defineLocale          = defineLocale;
-    utils_hooks__hooks.updateLocale          = updateLocale;
-    utils_hooks__hooks.locales               = locale_locales__listLocales;
-    utils_hooks__hooks.weekdaysShort         = lists__listWeekdaysShort;
-    utils_hooks__hooks.normalizeUnits        = normalizeUnits;
-    utils_hooks__hooks.relativeTimeThreshold = duration_humanize__getSetRelativeTimeThreshold;
-    utils_hooks__hooks.prototype             = momentPrototype;
-
-    var _moment = utils_hooks__hooks;
-
-    return _moment;
-
-}));
\ No newline at end of file
diff --git a/vid/src/main/webapp/static/fusion/raptor/ebz/multiselect.js b/vid/src/main/webapp/static/fusion/raptor/ebz/multiselect.js
deleted file mode 100644
index eda8da089..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/ebz/multiselect.js
+++ /dev/null
@@ -1,62 +0,0 @@
-'use strict';
-
-angular.module('quantum').directive('dropdownMultiselect', ['$document', function($document){
-   return {
-       restrict: 'E',
-       scope:{           
-            model: '=ngModel',
-            options: '='
-       },
-       template: "
        "+
-        "Multi-Select"+
-                ""+
-                "" +
-            "
        " ,
-       link: function($scope,element,attr){
-
-     	  $scope.$watch("options",function(newValue,oldValue) {
-             	$scope.model = [];
-    	  });
-           
-            $scope.selectAll = function () {
-                $scope.model = _.pluck($scope.options, 'value');
-            };            
-            $scope.deselectAll = function() {
-                $scope.model=[];
-            };
-            $scope.setSelectedItem = function(){
-                var value = this.option.value;
-                if (_.contains($scope.model, value)) {
-                    $scope.model = _.without($scope.model, value);
-                } else {
-                    $scope.model.push(value);
-                }
-                return false;
-            };
-            $scope.isChecked = function (value) {                 
-                if (_.contains($scope.model, value)) {
-                    return 'icon-included-checkmark pull-right';
-                }
-                return false;
-            };
-            
-            $document.bind('click', function(event){
-                var isClickedElementChildOfPopup = element
-                  .find(event.target)
-                  .length > 0;
-                  
-                if (isClickedElementChildOfPopup)
-                  return;
-                  
-                $scope.open = false;
-                $scope.$apply();
-              });
-
-       }
-   }; 
-}]);
\ No newline at end of file
diff --git a/vid/src/main/webapp/static/fusion/raptor/ebz/quick_links.js b/vid/src/main/webapp/static/fusion/raptor/ebz/quick_links.js
deleted file mode 100644
index 81e8276ed..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/ebz/quick_links.js
+++ /dev/null
@@ -1,33 +0,0 @@
-'use strict';
-angular.module('quantum').directive('quickLinks', ['$http','$window', function($http,$window){
-	return {
-	restrict: 'E',
-	scope:{ 
-		ngModel: '='
-		},
-	template: "
        " +
- 				"{{quickLink.reportName}} - {{quickLink.reportDescr}}" +
- 				"{{quickLink.reportName}} - {{quickLink.reportDescr}}" +
-	 		"
        ",
-	link: function($scope,element,attr){
-		   		$scope.ngDisplayType=attr.ngDisplayType;
-		   		$scope.popUpWindowSize = "top=" + ((screen.height*.2)/2) + ",left=" + ((screen.width*.05)/2) + ",width="+(screen.width-(screen.width*.06))+",height="+(screen.height-(screen.height*.25));
-
-		   		$scope.openLink = function(url){
-		   			if($scope.ngDisplayType){
-		   				if($scope.ngDisplayType=='1'){
-				   			$window.open(url,'_self');
-			   			}else if($scope.ngDisplayType=='2'){
-				   			$window.open(url, '_blank');
-			   			}else if($scope.ngDisplayType=='3'){
-				   	        $window.open(url, '', $scope.popUpWindowSize);
-			   			}
-			   		}
-		   		};
-
-		   		$http.get('raptor.htm?action=quicklinks.json&quick_links_menu_id='+attr.ngMenuId).then(function(result){
-		   			$scope.quickLinks=result.data;
-		   		});
-	   	}
-	}; 
-}]);
\ No newline at end of file
diff --git a/vid/src/main/webapp/static/fusion/raptor/ebz/report_chart_wizard.html b/vid/src/main/webapp/static/fusion/raptor/ebz/report_chart_wizard.html
deleted file mode 100644
index 35fad2b4d..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/ebz/report_chart_wizard.html
+++ /dev/null
@@ -1,313 +0,0 @@
-
        Your configurations have been successfully submitted
        
-
-
        
-	
        
-		
        
-		
        
-	
        
-	
-	
-	
        
-		
        
-			
        
-	
        
-	
        
-	
-	
        
-		
        
-		
-	
         
-	
-	
        
-		
        
-		
-	
        
-	
        
-	
-	
        
-		
        
-		Show
-		Hide
-	
        
-	
        
-	
-
-	
        
-		
        
-		
        
-	
          
-	
-	
        
-		
        
-		
        
-	
        
-	
        
-
-
        	
-
        	
-	
        
-	
        
-		
        
-		
        
-	
        
-	
-	
-	
        
-		
        
-		
-	
        
-	
-	
        
-		
        
-		
-	
        
-	
-	
        
-		
        
-		
        
-	
        
-	
-	
        
-		
        
-		
        
-	
        
-	
-	
        
-		
        
-		
-	
        
-	
-	
        
-	Add
-	
-			Remove
-	  
        
-	  
        
-	 
        
-	
        
-	
        
-	
-
-	
-	
        
-		
        
-		
-	
        
-	
        
-		
        
-		
-	
        
-	
        
-	
        
-		
        
-		
-	
        
-	
        
-		
        
-		
-	

        
-	        
-        
-	
-	
-	
-
-
        
-  
-  	
-	
-  				
-	
-	
        
-		
        
-			
        
-			Vertical
-			Horizontal
-		
        
-	
-	
        
-		
        
-		Yes
-		No
-	
        
-	
-	
        
-		
        
-		Yes
-		No
-	
        
-	
-	
        
-		
        
-		Yes
-		No
-	
        
-	
-	
        
-		
        
-		Yes
-		No
-	

        
-	
-	
        
-		
        
-		Yes
-		No
-	
        
-	
-	
        
-		
        
-		
-		
-	
        
- 
        
-
-          
-        
-
        
-	
-	
        
-	
-	 
-		
-		
-		
        
-			
        
-			
        
-				
        
-				Line
-				Area
-			
        
-	
-		
        
-			
        
-			
-		

        
-		
-		
        
-			
        
-			
-		
        
-		
-		
        
-			
        
-			Yes
-			No
-		
        
-		
-		
        
-			
        
-			Yes
-			No
-		
        
-		 
        
-		
        
-	
-	         
-	        
-	
-	
        
-	
-	
        
-		
-		
-		
-		
-		
-		
-		
        
-			
        
-		
        
-			
        
-			
-		
        
-		
-		
        
-			
        
-			Weekly
-			Daily
-			Hourly
-			30 Min
-		
        
-	  
        
-	 
        
-		        
-	        
-	
-	
        	
-	
-	
-	
-	
-	
-	
-	 
-	
-	
-	
-	
-	
-	
        
-	
        
-	
        
-		
        
-		up 45°
-		up 90°
- 	    down 45°
- 	    down 90°
- 	    Standard
-	
        
-	
-	
        
-		
        
-		Top
-		Bottom
-	

        
-	
-	
        
-		
        
-		Yes
-		No
-	
        
-	
-	
        
-		
        
-		Yes
-		No
-	

        
-	
-	
        
-		
        
-		
-	
        
-	
        
-		
        
-		
-	
        
-	
        
-		
        
-		
-	
        
-	
        
-		
        
-		
-	  

        
-	 
        
-	
        
-         
-        
-	

        
-	Save
-	Run
-	
-	
-	
-		
-
-
        
-
-
-
diff --git a/vid/src/main/webapp/static/fusion/raptor/ebz/report_chart_wizard.js b/vid/src/main/webapp/static/fusion/raptor/ebz/report_chart_wizard.js
deleted file mode 100644
index 7fc167c14..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/ebz/report_chart_wizard.js
+++ /dev/null
@@ -1,671 +0,0 @@
-app.controller('ChartController', function ($scope, $rootScope, $timeout, $window, $http, $routeParams,modalService) {
-	//$scope.test="1223";
-	//alert($scope.chartType.value);
-	
-	$scope.populateChrtWzdFields = function() {
-	 	
-		$scope.reportRunJson = {};
-	//	console.log($routeParams.reportId); 
-		$http.get("raptor.htm?action=chart.json&c_master="+$routeParams.reportId).then(function (response) {
-			//$scope.myData = JSON.stringify(response.data);  
-		//	response.data.rangeAxisList[0].rangeColorJSON = {};  
-			$scope.reportRunJson = response.data;
-			//  $scope.chrtheight =  $scope.reportRunJson.height;
-		//	console.log(JSON.stringify($scope.reportRunJson));
-		/*	  if ($scope.reportRunJson.showTitle==false)
-				  $scope.reportRunJson.showTitle="false";
-			  else 
-				  $scope.reportRunJson.showTitle="true"; */
-			  
-			  console.log($scope.reportRunJson);
-			  
-			  
-			  
-			  
-			  
-			  //Set chart type
-			  if ($scope.reportRunJson.chartTypeJSON) {
-				  var chrtTypeValue = $scope.reportRunJson.chartTypeJSON.value;
-					 for(var i = 0; i < $scope.chartTypes.length; i++) {
-						    var obj = $scope.chartTypes[i];
-						    //console.log(obj.id);
-						    if ($scope.chartTypes[i].value==chrtTypeValue) {
-						    	$scope.reportRunJson.chartTypeJSON.index=$scope.chartTypes[i].index;
-						    	$scope.reportRunJson.chartTypeJSON.title=$scope.chartTypes[i].title;
-						    }
-	
-					}
-			  }	 
-				 
-				//Set Domain Axis
-				 if ($scope.reportRunJson.domainAxisJSON) {
-					  var domaninAxisValue = $scope.reportRunJson.domainAxisJSON.value;
-						 for(var i = 0; i < $scope.reportRunJson.chartColumnJSONList.length; i++) {
-							   if ($scope.reportRunJson.chartColumnJSONList[i].value==domaninAxisValue) {
-							    	$scope.reportRunJson.domainAxisJSON.index=$scope.reportRunJson.chartColumnJSONList[i].index;
-							    	$scope.reportRunJson.domainAxisJSON.title=$scope.reportRunJson.chartColumnJSONList[i].title;
-							    }
-		
-						}
-				  }
-				 
-				//Set Category
-				 if ($scope.reportRunJson.categoryAxisJSON) {
-					  var categoryAxisValue = $scope.reportRunJson.categoryAxisJSON.value;
-						 for(var i = 0; i < $scope.reportRunJson.chartColumnJSONList.length; i++) {
-							   if ($scope.reportRunJson.chartColumnJSONList[i].value==categoryAxisValue) {
-							    	$scope.reportRunJson.categoryAxisJSON.index=$scope.reportRunJson.chartColumnJSONList[i].index;
-							    	$scope.reportRunJson.categoryAxisJSON.title=$scope.reportRunJson.chartColumnJSONList[i].title;
-							    }
-		
-						}
-				  }
-				 
-				//Set range axis label
-		if ($scope.reportRunJson.rangeAxisList) {
-			for(var j = 0; j < $scope.reportRunJson.rangeAxisList.length; j++) { 
-				 
-				 if ($scope.reportRunJson.rangeAxisList[j].rangeAxisLabelJSON) {
-					  var rangeAxisLabelValue = $scope.reportRunJson.rangeAxisList[j].rangeAxisLabelJSON.value;
-						 for(var i = 0; i < $scope.reportRunJson.chartColumnJSONList.length; i++) {
-							   if ($scope.reportRunJson.chartColumnJSONList[i].value==rangeAxisLabelValue) {
-							    	$scope.reportRunJson.rangeAxisList[j].rangeAxisLabelJSON.index=$scope.reportRunJson.chartColumnJSONList[i].index;
-							    	$scope.reportRunJson.rangeAxisList[j].rangeAxisLabelJSON.title=$scope.reportRunJson.chartColumnJSONList[i].title;
-							    }
-		
-						}
-				  }
-			}
-		}
-				
-				
-				//set range linetype
-				if ($scope.reportRunJson.rangeAxisList) {
-					for(var j = 0; j < $scope.reportRunJson.rangeAxisList.length; j++) { 
-						 if ($scope.reportRunJson.rangeAxisList[j].rangeLineTypeJSON != null && $scope.reportRunJson.rangeAxisList[j].rangeLineTypeJSON.value != ""
-							 && $scope.reportRunJson.rangeAxisList[j].rangeLineTypeJSON.value != null) {
-							 var lineTypeValue = $scope.reportRunJson.rangeAxisList[j].rangeLineTypeJSON.value;
-							 for(var i = 0; i < $scope.lineTypes.length; i++) {
-								    if ($scope.lineTypes[i].value==lineTypeValue) {
-								    	$scope.reportRunJson.rangeAxisList[j].rangeLineTypeJSON.index=$scope.lineTypes[i].index;
-								    	$scope.reportRunJson.rangeAxisList[j].rangeLineTypeJSON.title=$scope.lineTypes[i].title;
-								    }
-						
-							}
-						} else {
-							$scope.reportRunJson.rangeAxisList[j].rangeLineTypeJSON = null;
-						}  
-					}
-				
-				}
-				//set range color
-				if ($scope.reportRunJson.rangeAxisList) {
-					for(var j = 0; j < $scope.reportRunJson.rangeAxisList.length; j++) { 
-						 if ($scope.reportRunJson.rangeAxisList[j].rangeColorJSON != null && $scope.reportRunJson.rangeAxisList[j].rangeColorJSON.value != ""
-							 && $scope.reportRunJson.rangeAxisList[j].rangeColorJSON.value != null) {
-							 var colorValue = $scope.reportRunJson.rangeAxisList[j].rangeColorJSON.value; 
-				
-							 for(var i = 0; i < $scope.rangeColors.length; i++) {
-								 
-								 if ($scope.rangeColors[i].value==colorValue) {
-									 $scope.reportRunJson.rangeAxisList[j].rangeColorJSON.index=$scope.rangeColors[i].index;
-									 $scope.reportRunJson.rangeAxisList[j].rangeColorJSON.title=$scope.rangeColors[i].title;
-								 }
-							 }
-						 }else {
-							 $scope.reportRunJson.rangeAxisList[j].rangeColorJSON = null; 
-						 }
-					}
-				}
-				 
-				 
-			  
-			  
-			  /*	  var data = $.param({
-				  json: JSON.stringify($scope.reportRunJson)
-		        });
-			  console.log(data);
-			  $http.post("/ecomp-sdk-app/testraptorchart", JSON.stringify($scope.reportRunJson)).success(function(data, status) {
-		            console.log(data);
-		            console.log(status);
-		            
-		        })*/
-			  
-	 	  });
-		
-		
-	/*	$scope.chrtwidth =  $scope.reportRunJson.width;
-	 	
-		$scope.chrtheight =  $scope.reportRunJson.height;
-	 	$scope.title="false";
-	 	$scope.domainAxes = $scope.reportRunJson.chartColumnJSONList;
-	 	$scope.categories = $scope.reportRunJson.chartColumnJSONList;
-	 	$scope.rangeAxes = $scope.reportRunJson.chartColumnJSONList; */
-	 	
-	 //	$scope.Color = $scope.rangeColors;
-	 //	$scope.lineType = $scope.lineTypes;
-	 //	$scope.praxis = $scope.reportRunJson.primaryAxisLabel;
-	 //	$scope.secaxis = $scope.reportRunJson.secondaryAxisLabel;
-	 //	$scope.raxisminrange = $scope.reportRunJson.minRange;
-	 //	$scope.raxismaxrange = $scope.reportRunJson.maxRange;
-	 //	$scope.reportRunJson.legendangle = "up_45";
-	 	$scope.legend = "true";
-	// 	$scope.animate = "true";
-	// 	$scope.topmargin = $scope.reportRunJson.topMargin;
-	// 	$scope.bottommargin = $scope.reportRunJson.bottomMargin;
-	// 	$scope.leftmargin = $scope.reportRunJson.leftMargin;
-	// 	$scope.rightmargin = $scope.reportRunJson.rightMargin;
-	// 	$scope.tt1=false;
-	
-	
-	
-	}
-	
-	$scope.saveChartData = function() {
-		//console.log(JSON.stringify($scope.reportRunJson));
-	
-		//Converting string variables to numbers
-		$scope.reportRunJson.commonChartOptions.rightMargin = Number($scope.reportRunJson.commonChartOptions.rightMargin);
-		$scope.reportRunJson.commonChartOptions.topMargin = Number($scope.reportRunJson.commonChartOptions.topMargin);
-		$scope.reportRunJson.commonChartOptions.bottomMargin = Number($scope.reportRunJson.commonChartOptions.bottomMargin);
-		$scope.reportRunJson.commonChartOptions.leftMargin = Number($scope.reportRunJson.commonChartOptions.leftMargin);
-	
-		//Concatenate range Y axis with range label with pipe delimiter
-		/* if ($scope.reportRunJson.rangeAxisList) {
-				
-				for(var j = 0; j < $scope.reportRunJson.rangeAxisList.length; j++) { 
-					
-					if ($scope.reportRunJson.rangeAxisList[j].rangeYAxis) {
-						if ($scope.reportRunJson.rangeAxisList[j].rangeAxisLabelJSON != "" && $scope.reportRunJson.rangeAxisList[j].rangeAxisLabelJSON != null) {
-							$scope.reportRunJson.rangeAxisList[j].rangeYAxis = 
-								$scope.reportRunJson.rangeAxisList[j].rangeYAxis + "|"+ $scope.reportRunJson.rangeAxisList[j].rangeAxisLabelJSON.value;
-							
-							//document.getElementById('yaxs').value = $scope.reportRunJson.rangeAxisList[j].rangeYAxis.substring(0,$scope.reportRunJson.rangeAxisList[j].rangeYAxis.indexOf('|'));
-						}
-					} else {
-						if ($scope.reportRunJson.rangeAxisList[j].rangeAxisLabelJSON != "" && $scope.reportRunJson.rangeAxisList[j].rangeAxisLabelJSON != null)
-							$scope.reportRunJson.rangeAxisList[j].rangeYAxis = "|"+ $scope.reportRunJson.rangeAxisList[j].rangeAxisLabelJSON.value;
-					
-					}
-				}
-				
-				
-		}*/	
- 
-		if ($scope.reportRunJson.categoryAxisJSON == "") { 
-			console.log('Inside categoryAxisJSON value'); 
-			$scope.reportRunJson.categoryAxisJSON = {}; 
-			$scope.reportRunJson.categoryAxisJSON.value = -1; 
-			console.log('$scope.reportRunJson.categoryAxisJSON',$scope.reportRunJson.categoryAxisJSON);  
-		}
-		
-			
-		$http.post("save_chart", JSON.stringify($scope.reportRunJson)).success(function(data, status) {
-	          //  console.log(data);
-	          //  console.log(status);
-			 $scope.successSubmit=true;
-			//  modalService.showSuccess("Success","Chart Wizard details have been successfully submitted.");
-	          //      saveProfile();
-	        
-			})
-			
-			
-	/*	$http.post("/ecomp-sdk-app/testraptorchart", $scope.reportRunJson).then(function(response) {
-			console.log(response.data);
-			console.log(response.status);
-	
-			});*/
-	}
-	
-	//$scope.samplearray = ["abc","test"];
-	
-	
-	$scope.addRangeAxisRow = function (rangeaxisitem) {
-		
-		
-		
-		
-		$scope.reportRunJson.rangeAxisList.push({  
-	         
-	  /*       "rangeColor":{  
-	            "index":0,
-	            "value":rangeaxisitem.rangeColor.value,
-	            "title":rangeaxisitem.rangeColor.title
-	            
-	         },
-	         "rangeLineType":{  
-	            "index":0,
-	            "value":rangeaxisitem.rangeLineType.value,
-	            "title":rangeaxisitem.rangeLineType.title
-	            
-	         },
-	         "rangeaxisLabel":{  
-	            "index":0,
-	            "value":rangeaxisitem.rangeaxisLabel.value,
-	            "title":rangeaxisitem.rangeaxisLabel.value
-	            
-	         },
-	         "YAxis":"",
-	         "chartTitle":""*/
-	      });
-	//	alert($scope.reportRunJson.rangeAxisList.length);
-		console.log($scope.reportRunJson.rangeAxisList);
-	
-	};
-
-	$scope.removeRangeAxisRow = function (index) {
-		$scope.reportRunJson.rangeAxisList.splice(index, 1);
-		//console.log($scope.hardCodeReport.rangeAxisList)
-	};
-	
-	
-	
-	/*$scope.saveProfile = function() {
-		  var uuu = "profile/saveProfile?profile_id=" + $scope.profileId;;
-		  var postData={profile: $scope.profile,
-				        selectedCountry:$scope.selectedCountry!=null?$scope.selectedCountry.value:"",
-				        selectedState:$scope.stateList.selected!=null?$scope.stateList.selected.value:"",
-				        selectedTimeZone:$scope.selectedTimeZone!=null?$scope.selectedTimeZone.value:""
-		               };
-	  	  $.ajax({
-	  		 type : 'POST',
-	  		 url : uuu,
-	  		 dataType: 'json',
-	  		 contentType: 'application/json',
-	  		 data: JSON.stringify(postData),
-	  		 success : function(data){
-	  			modalService.showSuccess("Success","Update Successful.");
-			 },
-			 error : function(data){
-				 modalService.showFailure("Fail","Error while saving.");
-			 }
-	  	  });
-	};*/
-	
-	
- /*	$scope.actionClicked = function(){
-        
-		if ($scope.chartType=="Bar Chart") {
-        	$scope.tt1=true;
-        } else if ($scope.chartType=="Time Series/Area Chart") {
-        	$scope.tt2=true;
-        }else 
-        //	$scope.tt3=true;
-    };*/
-	
-	$scope.init = function () {
-		//	console.time("In init");
-		if ($scope) { 
-			$scope.populateChrtWzdFields();
-		//	$scope.saveChartData();
-		}
-			
-	};
-	
-	
-	/*$scope.accgroups =  [
-		                 {
-		                     title: "Accordion Item #1",
-		                     content:"Unit test me bro! Proin eu quam malesuada, accumsan velit eu, tristique orci. Donec neque nisl, dignissim ut hendrerit sit amet, tempor id erat. Donec fermentum commodo semper. Sed lectus odio, egestas non volutpat eu, venenatis eu turpis. Donec eget fringilla lorem. Fusce sit amet semper velit. ",
-		                     open: false
-		                 },
-		                 {
-		                     title: "Accordion Item #2",
-		                     content: "Lint me too! Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi eleifend aliquam eros quis fringilla. Integer eu justo turpis. Nam mauris augue, posuere interdum dignissim sed, tempor sit amet neque. In nec tortor id nibh sollicitudin aliquam sit amet ac augue",
-		                     open: false
-		                 },
-		                 {
-		                     title: "Accordion Item #3",
-		                     content: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi eleifend aliquam eros quis fringilla. Integer eu justo turpis. Nam mauris augue, posuere interdum dignissim sed, tempor sit amet neque. In nec tortor id nibh sollicitudin aliquam sit amet ac augue",
-		                     open: false
-		                 }
-		             ];*/
-	
-	$scope.domainItems = [{title:"Domain Axis1", content:"Test1", open: false},{title:"Domain Axis2", content:"Test2", open: false}];
-	
-	$scope.chartTypes = [        
-	                     {index: 0, value: 'BarChart3D', title: 'Bar Chart'},
-	                     {index: 1, value: 'TimeSeriesChart', title: 'Time Series/Area Chart'},
-	                     {index: 2, value: 'PieChart', title: 'Pie Chart'},
-	                     {index: 3, value: 'AnnotationChart', title: 'Annotation Chart'},
-	                     {index: 4, value: 'FlexTimeChart', title: 'Flexible Time Chart'}
-	 ];
-	 
-	 /* $scope.domainAxes = [        
-		                     {index: 0, value: 'scenario_name', title: 'scenario_name'},
-		                     {index: 1, value: 'total_traffic_in_PB', title: 'Total Traffic in PB'},
-		                     {index: 2, value: 'Avg Utilization Day', title: 'Avg Utilization Day'}
-		                     
-		 ];*/
-	 
-	 $scope.categories = [        
-		                     {index: 0, value: 'scenario_name', title: 'scenario_name'},
-		                     {index: 1, value: 'total_traffic_in_PB', title: 'Total Traffic in PB'},
-		                     {index: 2, value: 'Avg Utilization Day', title: 'Avg Utilization Day'}
-		                     
-		 ];
-	 
-	 $scope.rangeColors = [        
-		                     
-		                     {index: 0, value: "#1f77b4",title: "Dodger Blue"},  						
-							 {index: 1, value: "#ff7f0e",title: "Vivid orange"},							
-							 {index: 2, value: "#2ca02c",title: "Forest Green"},							
-							 {index: 3, value: "#8c864b",title: "Greenish Red"},							
-							 {index: 4, value: "#9467bd",title: "Desaturated violet"},					
-							 {index: 5, value: "#8c564b",title: "Dark moderate red"},					
-							 {index: 6, value: "#e377c2",title: "Soft pink"},							
-							 {index: 7, value: "#7f7f7f",title: "Dark gray"},							
-							 {index: 8, value: "#bcbd22",title: "Strong yellow"},						
-							 {index: 9, value: "#17becf",title: "Strong cyan"},							
-							 {index: 10, value: "#dc143c",title: "Vivid red"},							
-							 {index: 11, value: "#800080",title: "Dark magenta"},							
-							 {index: 12, value: "#0000FF",title: "Blue"},									
-							 {index: 13, value: "#008000",title: "Dark lime green"},						
-							 {index: 14, value: "#D2691E",title: "Reddish Orange"},					
-							 {index: 15, value: "#FF0000",title: "Red"},								
-							 {index: 16, value: "#000000",title: "Black"},								
-							 {index: 17, value: "#DB7093",title: "Pink"},								
-							 {index: 18, value: "#FF00FF",title: "Pure Magenta"},						
-							 {index: 19, value: "#7B68EE",title: "Soft blue"},							
-							 {index: 20, value: "#1f77b6",title: "Strong blue"},						
-							 {index: 21, value: "#9edae5",title: "Very soft cyan"},						
-							 {index: 22, value: "#393b79",title: "Dark Blue"},							
-							 {index: 23, value: "#5254a3",title: "Dark moderate Blue"},					
-							 {index: 24, value: "#6b6ecf",title: "Slightly desaturated blue"},			
-							 {index: 25, value: "#9c9ede",title: "Very soft blue"},			
-							 {index: 26, value: "#637939",title: "Dark Green"},							
-							 {index: 27, value: "#8ca252",title: "Dark moderate green"},				
-							 {index: 28, value: "#b5cf6b",title: "Slightly desaturated green"},			
-							 {index: 29, value: "#cedb9c",title: "Desaturated Green"},	
-     
-							 /* Old Colors  */
-							 {index: 30, value: "#00FFFF",title: "Aqua"},
-							 {index: 31, value: "#000000",title: "Black"},
-							 {index: 32, value: "#0000FF",title: "Blue"},
-							 {index: 33, value: "#FF00FF",title: "Fuchsia"},
-							 {index: 34, value: "#808080",title: "Gray"},
-							 {index: 35, value: "#008000",title: "Green"},
-							 {index: 36, value: "#00FF00",title: "Lime"},
-							 {index: 37, value: "#800000",title: "Maroon"},
-							 {index: 38, value: "#000080",title: "Navy"},
-							 {index: 39, value: "#808000",title: "Olive"},
-							 {index: 40, value: "#FF9900",title: "Orange"},
-							 {index: 41, value: "#800080",title: "Purple"},
-							 {index: 42, value: "#FF0000",title: "Red"},
-							 {index: 43, value: "#C0C0C0",title: "Silver"},
-							 {index: 44, value: "#008080",title: "Teal"},
-							 {index: 45, value: "#FFFFFF",title: "White"},
-							 {index: 46, value: "#FFFF00",title: "Yellow"}
-						];	
-    
-    
-	 $scope.lineTypes = [        
-	                     {index: 0, value: 'default', title: 'Default'},
-	                     {index: 1, value: 'dotted_lines', title: 'Dotted Lines'},
-	                     {index: 2, value: 'dashed_lines', title: 'Dashed Lines'}
-	                     
-	 ]; 
-	 
-	 
-	 $scope.hardCodeReport= {
-		   "reportID":"3356",
-		   "reportName":"Test: Line Chart",
-		   "reportDescr":"",
-		   "reportTitle":"",
-		   "reportSubTitle":"",
-		   "formFieldList":[
-
-		   ],
-		   "chartColumnJSONList":[
-		      {
-		         "index":0,
-		         "value":"tr0",
-		         "title":"traffic_date",
-		         "$$hashKey":"056"
-		      },
-		      {
-		         "index":1,
-		         "value":"ut1",
-		         "title":"util_perc",
-		         "$$hashKey":"057"
-		      }
-		   ],
-		   "formfield_comments":null,
-		   "totalRows":0,
-		   "chartSqlWhole":"SELECT traffic_date tr0, traffic_date tr0_1,util_perc ut1, 1 FROM portal.demo_util_chart   ORDER BY 1",
-		   "chartAvailable":true,
-		   "chartType":{"index": "", "value": "Bar Chart", "title": ""},
-		   "width":"700",
-		   "height":"420",
-		   "animation":false,
-		   "rotateLabels":"90",
-		   "staggerLabels":false,
-		   "showTitle":"false",
-		   "domainAxis":{
-			      "index":0,
-			      "value":"tr0",
-			      "title":"traffic_date",
-			      "$$hashKey":"11H"
-			   },
-
-			   "categoryAxis":{
-				      "index":1,
-				      "value":"ut1",
-				      "title":"util_perc",
-				      "$$hashKey":"11I"
-				   },
-
-		   "hasCategoryAxis":false,
-		   "rangeAxisList":[
-		      {
-		         
-		         "rangeColor":{
-		        	"index":"",
-		            "value":"#bcbd22",
-		            "title":""
-		            
-		         },
-		         
-		         "rangeLineType":{
-		            "index":"",
-		            "value":"dotted_lines",
-		            "title":""
-		            
-		            
-		         },
-		         
-		         "rangeAxisLabel":{
-		            "index":0,
-		            "value":"tr0",
-		            "title":"traffic_date",
-		            "$$hashKey":"056"
-		         },
-		         "YAxis":"10",
-		         "chartTitle":"test"
-		      },
-		      {
-			         
-			         "rangeColor":{
-			        	"index":"",
-			            "value":"#2ca02c",
-			            "title":""
-			            
-			         },
-			         
-			         "rangeLineType":{
-			            "index":"",
-			            "value":"dashed_lines",
-			            "title":""
-			            
-			            
-			         },
-			         
-			         "rangeAxisLabel":{
-			            "index":0,
-			            "value":"tr0",
-			            "title":"traffic_date",
-			            "$$hashKey":"056"
-			         },
-			         "YAxis":"10",
-			         "chartTitle":"test"
-			      }
-		      
-		     
-		   ],
-		  
-		   "primaryAxisLabel":"testlabel",
-		   "secondaryAxisLabel":"testseclabel",
-		   "minRange":"10",
-		   "maxRange":"20",
-		   "topMargin":"6",
-		   "bottomMargin":"5",
-		   "leftMargin":"4",
-		   "rightMargin":"3"
-		};
-	 
-	 var colorValue = $scope.hardCodeReport.rangeAxisList[0].rangeColor.value;
-	 
-	 //console.log($scope.hardCodeReport.chartType);
-	 
-	 // prefill range color
-	/* for(var i = 0; i < $scope.rangeColors.length; i++) {
-		    var obj = $scope.rangeColors[i];
-		    //console.log(obj.id);
-		    if ($scope.rangeColors[i].value==colorValue) {
-		    	$scope.hardCodeReport.rangeAxisList[0].rangeColor.index=$scope.rangeColors[i].index;
-		   	 	$scope.hardCodeReport.rangeAxisList[0].rangeColor.title=$scope.rangeColors[i].title;
-		    }
-
-		}*/
-	 
-	 //prefill chart type
-	 
-//	 console.log($scope.hardCodeReport.chartType);
-	 
-//	 console.log($scope.hardCodeReport.chartType);
-	 
-	// console.log($scope.hardCodeReport.rangeAxisList);
-	 //prefill rangle line type
-	/* for(var j = 0; j < $scope.hardCodeReport.rangeAxisList.length; j++) { 
-	 
-		 var lineTypeValue = $scope.hardCodeReport.rangeAxisList[j].rangeLineType.value;
-		 for(var i = 0; i < $scope.lineTypes.length; i++) {
-			    var obj = $scope.lineTypes[i];
-			    //console.log(obj.id);
-			    if ($scope.lineTypes[i].value==lineTypeValue) {
-			    	$scope.hardCodeReport.rangeAxisList[j].rangeLineType.index=$scope.lineTypes[i].index;
-			    	$scope.hardCodeReport.rangeAxisList[j].rangeLineType.title=$scope.lineTypes[i].title;
-			    }
-	
-			}
-	 }*/
-//	 console.log($scope.hardCodeReport.rangeAxisList);
-	 
-	
-	 
-	 
-	 // console.log($scope.hardCodeReport.rangeAxisList[0].rangeColor);
-	/* $scope.hardCodeReport.rangeAxisList[0].rangeColor.index=4;
-	 $scope.hardCodeReport.rangeAxisList[0].rangeColor.title="Desaturated violet";*/
-	 
-	 
-	 //console.log($scope.hardCodeReport);
-	 
-
-	 
-	 
-	 
-	 /*$scope.reportRunJson = 
-	 	{
-			   "reportID":"3356",
-			   "reportName":"Test: Line Chart",
-			   "reportDescr":"",
-			   "reportTitle":"",
-			   "reportSubTitle":"",
-			   "formFieldList":[
-
-			   ],
-			   "chartColumnJSONList":[
-			      {
-			         "index":0,
-			         "value":"tr0",
-			         "title":"traffic_date"
-			      },
-			      {
-			         "index":1,
-			         "value":"ut1",
-			         "title":"util_perc"
-			      }
-			   ],
-			   "formfield_comments":null,
-			   "totalRows":0,
-			   "chartSqlWhole":"SELECT traffic_date tr0, traffic_date tr0_1,util_perc ut1, 1 FROM portal.demo_util_chart   ORDER BY 1",
-			   "chartAvailable":true,
-			   "chartType":"TimeSeriesChart",
-			   "width":"700",
-			   "height":"420",
-			   "animation":false,
-			   "rotateLabels":"90",
-			   "staggerLabels":false,
-			   "showTitle":false,
-			   "domainAxis":"tr0",
-			   "categoryAxis":null,
-			   "hasCategoryAxis":false,
-			   "rangeAxisList":[
-			      {
-			         "YAxis":"",
-			         "chartTitle":""
-			      }
-			   ],
-			   "primaryAxisLabel":"",
-			   "secondaryAxisLabel":"",
-			   "minRange":"",
-			   "maxRange":"",
-			   "topMargin":"",
-			   "bottomMargin":"",
-			   "leftMargin":"",
-			   "rightMargin":"3"
-			}; */
-	 	$timeout(function() {
-			$rootScope.isViewRendering = false;
-			});
-
-
-});
-
-app.directive('onlyDigits', function () {
-
-    return {
-        restrict: 'A',
-        require: '?ngModel',
-        link: function (scope, element, attrs, ngModel) {
-            if (!ngModel) return;
-            ngModel.$parsers.unshift(function (inputValue) {
-                var digits = inputValue.split('').filter(function (s) { return (!isNaN(s) && s != ' '); }).join('');
-                ngModel.$viewValue = digits;
-                ngModel.$render();
-                return digits;
-            });
-        }
-    };
-});
-
-app.directive('onlyCharacters', function () {
-
-    return {
-        restrict: 'A',
-        require: '?ngModel',
-        link: function (scope, element, attrs, ngModel) {
-            if (!ngModel) return;
-            ngModel.$parsers.unshift(function (inputValue) {
-                var digits = inputValue.split('').filter(function (s) { return (isNaN(s) && s != ' '); }).join('');
-                ngModel.$viewValue = digits;
-                ngModel.$render();
-                return digits;
-            });
-        }
-    };
-});
-
-
-
diff --git a/vid/src/main/webapp/static/fusion/raptor/ebz/report_run.html b/vid/src/main/webapp/static/fusion/raptor/ebz/report_run.html
deleted file mode 100644
index 69ef38f0c..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/ebz/report_run.html
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
        
-	
        {{reportData.reportName}}  
-	
-	   
-	   
-	
-	
-	
        
-	  
        Loading...
        
-	  
-	  
        
-	    
-	    

        
-	    
-	  
        
-	  Back
-	  
-	  
        
-	  
        
-	  	
        
-	  	
        
-      		
        
-        		{{reportData.message}}
-      		
        
-	    
        
-	 
        
-	  
        
-
        	
diff --git a/vid/src/main/webapp/static/fusion/raptor/ebz/report_run.js b/vid/src/main/webapp/static/fusion/raptor/ebz/report_run.js
deleted file mode 100644
index 0df56796c..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/ebz/report_run.js
+++ /dev/null
@@ -1,293 +0,0 @@
-app.controller("reportRunController", ['$scope','$rootScope','$routeParams','$http','dateFilter', '$window', '$timeout', 'rowSorter',
-                                       function ($scope,$rootScope,$routeParams,$http,dateFilter,$window,$timeout,rowSorter) { 
-	$scope.dateformat = "MM/dd/yyyy";
-	$scope.datetimeformat = "MM/dd/yyyy hh:mm a";
-	$scope.showFormFields =  false;
-	$scope.showGrid =  false;
-	$scope.showChart =  false;
-	$scope.showBackButton = false;
-	$scope.reportData = {};
-	$scope.reportData.allowEdit = false;
-	$scope.formFieldSelectedValues = {};
-	$scope.showFormFieldIds = false;
-	
-	$scope.isInProgress = true;
-	
-	if($routeParams.reportUrlParams.indexOf("parent___params===")>-1) {
-		$scope.showBackButton = true;
-		$scope.parentReportUrlParams = $routeParams.reportUrlParams.substring($routeParams.reportUrlParams.indexOf("parent___params===")+18);
-		$scope.currentReportUrlParams = $routeParams.reportUrlParams.substring(0,$routeParams.reportUrlParams.indexOf("parent___params==="));
-	} else {
-		$scope.currentReportUrlParams = $routeParams.reportUrlParams;
-	}
-	console.log($routeParams.reportUrlParams);
-	var parseQueryString = function( queryString ) {
-	    var params = {}, queries, temp, i, l;
-	    // Split into key/value pairs
-	    queries = queryString.split("&");
-	    // Convert the array of strings into an object
-	    for ( i = 0, l = queries.length; i < l; i++ ) {
-	        temp = queries[i].split('=');
-	        //console.log(temp[0]);
-	        //console.log(temp[0] != "refresh");
-	        if(temp[0] && temp[0] != "refresh")
-	        	params[temp[0]] = temp[1];
-	    }
-	    return params;
-	};
-	
-	var convertQueryString = function(queryString) {
-		var keys = ""; var str = "";
-		keys = Object.keys(queryString);
-		//console.log(keys);
-		for ( i = 0, l = keys.length; i < l; i++ ) {
-			str += keys[i]+"="+queryString[keys[i]] + "&";
-			
-		}
-		return str;
-		//queryString = 
-	}
-	
-	
-	
-	
-	$scope.urlParams = parseQueryString($scope.currentReportUrlParams);
-	
-	$scope.reportChartURL = 'report#/report_chart_wizard/'+$scope.urlParams.c_master;
-	
-	$scope.reportEditURL = 'report_wizard.htm?action=report.edit&c_master='+$scope.urlParams.c_master;
-
-	
-	$http.get('raptor.htm?action=report.run.container&'+$scope.currentReportUrlParams).then(
-		function(response){
-			console.log(response);
-			$scope.isInProgress = false;
-			$scope.reportData = response.data;
-	      	if(!$scope.urlParams.hideChart && $scope.reportData.chartAvailable && $scope.reportData.totalRows>1){
-	      		console.log('raptor.htm?action=chart.run&'+convertQueryString($scope.urlParams));
-		    	$http.get('raptor.htm?action=chart.run&'+convertQueryString($scope.urlParams)).then(
-		      		 	function(response){
-		      		 	  $scope.showChart =  true;
-		      			  document.getElementById('chartiframe').contentWindow.document.write(response.data);
-		      		 	  document.getElementById('chartiframe').contentWindow.document.close();
-		      			});
-	    	}
-	
-	        if($scope.reportData.displayForm && $scope.reportData.formFieldList && $scope.reportData.formFieldList.length>0 && !$scope.urlParams.hideFormFields){
-			  $scope.showFormFields = true;
-		    }
-		});
-    $scope.getFormFieldSelectedValuesAsURL = function(){
-    	var formFieldsUrl = '';
-    	$scope.reportData.formFieldList.forEach(function(formField) {
-	   		if(formField.fieldType==='LIST_BOX') {
-	   			if($scope.formFieldSelectedValues && $scope.formFieldSelectedValues[formField.fieldId] && $scope.formFieldSelectedValues[formField.fieldId].value != '') {
-	   				formFieldsUrl = formFieldsUrl+formField.fieldId+'='+$scope.formFieldSelectedValues[formField.fieldId].value+'&';
-	   			}
-	   		} else if(formField.fieldType==='LIST_MULTI_SELECT') {
-	   			if($scope.formFieldSelectedValues[formField.fieldId].length >0) {
-	   				for (var i = 0; i < $scope.formFieldSelectedValues[formField.fieldId].length; i++) {
-	   					if($scope.formFieldSelectedValues[formField.fieldId][i].defaultValue){
-		   				  formFieldsUrl = formFieldsUrl+formField.fieldId+'='+$scope.formFieldSelectedValues[formField.fieldId][i].value+'&';
-	   					}
-	   			    }
-	   			}
-	   		} else if((formField.fieldType === 'text' || formField.fieldType === 'TEXT') && formField.validationType === 'DATE'){
-	   			formFieldsUrl = formFieldsUrl+formField.fieldId+'='+dateFilter($scope.formFieldSelectedValues[formField.fieldId],$scope.dateformat)+'&';
-	   		} else if((formField.fieldType === 'text' || formField.fieldType === 'TEXT') && formField.validationType === 'TIMESTAMP_MIN'){
-	   			formFieldsUrl = formFieldsUrl+formField.fieldId+'='+dateFilter($scope.formFieldSelectedValues[formField.fieldId],$scope.datetimeformat)+'&';
-	   		} else if((formField.fieldType === 'text' || formField.fieldType === 'TEXT') && $scope.formFieldSelectedValues[formField.fieldId] && $scope.formFieldSelectedValues[formField.fieldId] != ''){
-	   			formFieldsUrl = formFieldsUrl+formField.fieldId+'='+$scope.formFieldSelectedValues[formField.fieldId]+'&';
-	   		}
-    	});
-    	return formFieldsUrl;
-
-    }
-
-    $scope.runReport = function(pagination){
-    	
-    	var formFieldsUrl = $scope.getFormFieldSelectedValuesAsURL();
-		console.log("pagination");
-    	if(!pagination) {
-    		console.log("refreshed ...");
-    		$scope.gridOptions.pageNumber = 1;
-  		  $scope.gridOptions.paginationPageSizes= [$scope.reportData.pageSize];
-		  $scope.gridOptions.paginationPageSize= $scope.reportData.pageSize;
-		  if($scope.reportData.totalRows<14){
-			  $scope.gridHeight = ($scope.reportData.totalRows+7)*30+'px';
-		  } else{
-			  $scope.gridHeight = '400px';
-		  }
-		  $scope.gridOptions.totalItems = $scope.reportData.totalRows;
-		  $scope.gridOptions.data= $scope.reportData.reportDataRows;
-		  $scope.gridOptions.exporterPdfHeader.text= $scope.reportData.reportName;
-
-    	}
-        $scope.currentReportUrlParams = 'c_master='+$scope.urlParams.c_master+'&'+formFieldsUrl+'&display_content=Y&r_page='+(paginationOptions.pageNumber-1);
-    	console.log('raptor.htm?action=report.run.container&c_master='+$scope.urlParams.c_master+'&'+formFieldsUrl+'refresh=Y&display_content=Y&r_page='+(paginationOptions.pageNumber-1));
-    	  $http.get('raptor.htm?action=report.run.container&c_master='+$scope.urlParams.c_master+'&'+formFieldsUrl+'refresh=Y&display_content=Y&r_page='+(paginationOptions.pageNumber-1)).then(
-    		function(response){
-		    	$scope.reportData = response.data;
-		    	if($scope.reportData.errormessage) {
-		    		document.getElementById('errorDiv').innerHTML = $scope.reportData.errormessage;
-		    		console.log(document.getElementById('errorDiv').innerHtml);
-		    		console.log($scope.reportData.errormessage);
-		    	}		   
-		    if(!pagination) {	
-		      if(!$scope.urlParams.hideChart && $scope.reportData.chartAvailable && $scope.reportData.totalRows>1){
-		      		console.log('raptor.htm?action=chart.run&c_master='+$scope.urlParams.c_master+'&'+formFieldsUrl+'display_content=Y&r_page='+(paginationOptions.pageNumber-1));
-			    	$http.get('raptor.htm?action=chart.run&c_master='+$scope.urlParams.c_master+'&'+formFieldsUrl+'display_content=Y&r_page='+(paginationOptions.pageNumber-1)).then(
-			      		 	function(response) {
-			      		 		console.log(response.data);
-			      		 		$scope.showChart =  true;
-			      		 		document.getElementById('chartiframe').contentWindow.document.write(response.data);
-			      		 		document.getElementById('chartiframe').contentWindow.document.close();
-			      			});
-		      	} else {
-			      		 		$scope.showChart =  false;
-		      	}
-		    }
-		        if($scope.reportData.displayForm && $scope.reportData.formFieldList && $scope.reportData.formFieldList.length>0 && !$scope.urlParams.hideFormFields){
-		        	$scope.showFormFields = true;
-				} else {
-					$scope.showFormFields = false;
-				}
-    		});
-    };
-
-	  var paginationOptions = {
-			    pageNumber: 1,
-			    pageSize: 5,
-			    sort: null
-	  };
-	  
-	  $scope.gridOptions = {
-			  	pageNumber: 1,
-			  	sort : null,
-			    paginationPageSizes: [5],
-			    paginationPageSize: 5,
-			    useExternalPagination: true,
-				columnDefs: [],
-				data: [],
-			    enableGridMenu: true,
-			    enableSelectAll: true,
-				gridMenuCustomItems : [
-   					{	title : 'All Reports',
-						action : function($event) {
-							$window.open('report.htm','_self');
-							},	order : 210	},
-   					{	title : 'Edit Report',
-						action : function($event) {
-							$window.open($scope.reportEditURL,'_self');
-							},	order : 211	},
-					{	title : 'Export All data as Excel 2007',
-						action : function($event) {
-							$window.open('raptor.htm?c_master='+$scope.reportData.reportID+'&r_action=report.download.excel2007.session','_self');
-							},	order : 212	},
-					{	title : 'Export All data as Excel',
-						action : function($event) {
-							$window.open('raptor.htm?c_master='+$scope.reportData.reportID+'&r_action=report.download.excel.session','_self');
-							},	order : 213 },
-					{	title : 'Export All data as CSV',
-						action : function($event) {
-							$window.open('raptor.htm?c_master='+$scope.reportData.reportID+'&r_action=report.download.csv.session','_self');
-							},	order : 214	},
-					{	title : 'Export All data as PDF',
-						action : function($event) {
-							$window.open('raptor.htm?c_master='+$scope.reportData.reportID+'&r_action=report.download.pdf.session','_self');
-							},	order : 215	} ],
-			    exporterMenuPdf: false,
-	    		exporterMenuCsv: false,
-			    exporterCsvFilename: 'myFile.csv',
-			    exporterPdfDefaultStyle: {fontSize: 9},
-			    exporterPdfTableStyle: {margin: [30, 30, 30, 30]},
-			    exporterPdfTableHeaderStyle: {fontSize: 10, bold: true, italics: true, color: 'red'},
-			    exporterPdfHeader: { text: "My Header", style: 'headerStyle' },
-			    exporterPdfFooter: function ( currentPage, pageCount ) {
-			      return { text: currentPage.toString() + ' of ' + pageCount.toString(), style: 'footerStyle' };
-			    },
-			    exporterPdfCustomFormatter: function ( docDefinition ) {
-			      docDefinition.styles.headerStyle = { fontSize: 22, bold: true };
-			      docDefinition.styles.footerStyle = { fontSize: 10, bold: true };
-			      return docDefinition;
-			    },
-			    exporterPdfOrientation: 'portrait',
-			    exporterPdfPageSize: 'LETTER',
-			    exporterPdfMaxGridWidth: 500,
-			    exporterCsvLinkElement: angular.element(document.querySelectorAll(".custom-csv-link-location")),
-			    onRegisterApi: function(gridApi) {
-			        $scope.gridApi = gridApi;
-			        gridApi.pagination.on.paginationChanged($scope, function (newPage, pageSize) {
-			          paginationOptions.pageNumber = newPage;
-			          paginationOptions.pageSize = pageSize;
-			          $scope.runReport(true);
-			        });
-			      }
-			  };
- 
-	  $scope.uiGridRefresh = function(){
-		  var columnDefsArray = [];
-		  var columnFreezeEndColumn = $scope.reportData.colIdxTobeFreezed;
-		  var doColumnNeedToFreeze = false;
-		  if(columnFreezeEndColumn && columnFreezeEndColumn.length>0) {
-			  doColumnNeedToFreeze = true;
-		  }
-		  $scope.reportData.reportDataColumns.forEach(function(entry) {
-			  var tempColumnDef = { displayName: entry.columnTitle, field: entry.colId, enableSorting: entry.sortable,
-					  sortingAlgorithm: function(a, b) {
-				         return rowSorter.sortAlpha(a.displayValue, b.displayValue);
-					  },
-					  cellTemplate: '
           '+
-					  	 '  
        {{COL_FIELD.displayValue}}
        ' +
-		                 '  {{COL_FIELD.displayValue}}' +
-						  '
        '};
-			  if(entry.columnWidth && entry.columnWidth!='null' && entry.columnWidth!='pxpx' && entry.columnWidth!='nullpx' && entry.columnWidth!='nullpxpx'){
-				  tempColumnDef['minWidth'] = entry.columnWidth.substring(0, entry.columnWidth.length - 2);
-			  } else {
-				  tempColumnDef['minWidth'] = '100';
-			  }
-			  if(doColumnNeedToFreeze) {
-				  tempColumnDef['pinnedLeft']= true;
-				  if(columnFreezeEndColumn === entry.colId){
-					  doColumnNeedToFreeze = false;
-				  }
-			  }
-			  columnDefsArray.push(tempColumnDef);
-		  }); 
-	  
-		  $scope.gridOptions.paginationPageSizes= [$scope.reportData.pageSize];
-		  $scope.gridOptions.paginationPageSize= $scope.reportData.pageSize;
-		  if($scope.reportData.totalRows<14){
-			  $scope.gridHeight = ($scope.reportData.totalRows+5)*30+'px';
-		  }else{
-			  $scope.gridHeight = '400px';
-		  }
-		  $scope.gridOptions.totalItems = $scope.reportData.totalRows;
-		  $scope.gridOptions.columnDefs= columnDefsArray;
-		  $scope.gridOptions.data= $scope.reportData.reportDataRows;
-		  $scope.gridOptions.exporterPdfHeader.text= $scope.reportData.reportName;
-	  };
-
-		$scope.$watch("reportData",function(newValue,oldValue) {
-	  	 if(!$scope.urlParams.hideGrid){
-		  if($scope.reportData){
-	    	if($scope.reportData.displayData && $scope.reportData.reportDataColumns){
-	  			$scope.showGrid =  true;
-		        $scope.uiGridRefresh();
-	  		}
-	      }
-		 }
-		});
-
-		$scope.triggerOtherFormFields = function(){
-  			console.log("report_run");
-	    	var formFieldsUrl = $scope.getFormFieldSelectedValuesAsURL();
-	    	$http.get('raptor.htm?action=report.formfields.run.container&c_master='+$scope.reportData.reportID+'&'+formFieldsUrl).then(
-	      		 	function(response){
-	    		    	$scope.reportData = response.data;
-	      			});
-		};
-		$timeout(function() {
-			$rootScope.isViewRendering = false;
-			});
-}]);
diff --git a/vid/src/main/webapp/static/fusion/raptor/ebz/report_search.html b/vid/src/main/webapp/static/fusion/raptor/ebz/report_search.html
deleted file mode 100644
index 37b388ffa..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/ebz/report_search.html
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
        Report search
        
-
        
-
        
-
-
               
-     
         
-
         
-
        
-                           
-
        
-
-
-
               
-     
         
-
         
-
        
-                           
-
        
-
-
-
         
-
        
-
        
diff --git a/vid/src/main/webapp/static/fusion/raptor/ebz/report_search.js b/vid/src/main/webapp/static/fusion/raptor/ebz/report_search.js
deleted file mode 100644
index afea176cc..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/ebz/report_search.js
+++ /dev/null
@@ -1,136 +0,0 @@
-app.controller("reportSearchController", ['$scope','$rootScope','$http','$timeout',function ($scope,$rootScope,$http,$timeout) { 
-    
-	$http.get('raptor.htm?action=report.search.execute&r_page=0').then(
-		function(result){$scope.searchdData = result.data;		  
-	});
-	  
-	$scope.runReport = function(){
-			var searchParams = '';
-			if($scope.reportId && $scope.reportId!=''){
-				searchParams = '&rep_id='+$scope.reportId+'&rep_id_options='+$scope.operatorRepId.index;
-			}
-			if($scope.reportName && $scope.reportName!=''){
-				searchParams = searchParams+'&rep_name='+$scope.reportName+'&rep_name_options='+$scope.operatorRepName.index;
-			}
-
-			console.log('raptor.htm?action=report.search.execute&r_page='+(paginationOptions.pageNumber-1)+searchParams);
-			$http.get('raptor.htm?action=report.search.execute&r_page='+(paginationOptions.pageNumber-1)+searchParams).then(
-					function(result){$scope.searchdData = result.data;		  
-				});
-			//quantum/raptor.htm?action=report.search.execute&rep_id=1000&rep_id_options=2&rep_name=cross&rep_name_options=2
-	};
-
-
-	var paginationOptions = {
-		    pageNumber: 1,
-		    pageSize: 5,
-		    sort: null
-	};
-	  
-	$scope.gridOptions = {
-	  paginationPageSizes: [5],
-	  paginationPageSize: 5,
-	  useExternalPagination: true,
-	  columnDefs: [],
-	  data: [],
-	  enableGridMenu: true,
-	  enableSelectAll: true,
-	  exporterMenuPdf: false,
-	  exporterMenuCsv: false,
-	  exporterCsvFilename: 'myFile.csv',
-	  exporterPdfDefaultStyle: {fontSize: 9},
-	  exporterPdfTableStyle: {margin: [30, 30, 30, 30]},
-	  exporterPdfTableHeaderStyle: {fontSize: 10, bold: true, italics: true, color: 'red'},
-	  exporterPdfHeader: { text: "My Header", style: 'headerStyle' },
-	  exporterPdfFooter: function ( currentPage, pageCount ) {
-	    return { text: currentPage.toString() + ' of ' + pageCount.toString(), style: 'footerStyle' };
-	  },
-	  exporterPdfCustomFormatter: function ( docDefinition ) {
-	    docDefinition.styles.headerStyle = { fontSize: 22, bold: true };
-	    docDefinition.styles.footerStyle = { fontSize: 10, bold: true };
-	    return docDefinition;
-	  },
-	  exporterPdfOrientation: 'portrait',
-	  exporterPdfPageSize: 'LETTER',
-	  exporterPdfMaxGridWidth: 500,
-	  exporterCsvLinkElement: angular.element(document.querySelectorAll(".custom-csv-link-location")),
-	  onRegisterApi: function(gridApi) {
-		    $scope.gridApi = gridApi;
-		    gridApi.pagination.on.paginationChanged($scope, function (newPage, pageSize) {
-			      paginationOptions.pageNumber = newPage;
-			      paginationOptions.pageSize = pageSize;
-			      $scope.runReport();
-			    });
-			  }
-			};
-
-
-	var getPage = function() {
-		$scope.gridOptions.columnDefs = [];
-		$scope.searchdData.columns[0].forEach(function(entry) {
-			if(entry.columnTitle=='Run'){
-				$scope.gridOptions.columnDefs.push({ displayName: entry.columnTitle, field: entry.columnId+'==drillDownLink', enableSorting: false,
-				cellTemplate: '
        '
-				});
-			} else if(entry.columnTitle=='Edit'){
-				$scope.gridOptions.columnDefs.push({ displayName: entry.columnTitle, field: entry.columnId+'==drillDownLink', enableSorting: false,
-					cellTemplate: '
        '
-				});
-			} else if(entry.columnTitle=='Delete'){
-				$scope.gridOptions.columnDefs.push({ displayName: entry.columnTitle, field: entry.columnId+'==drillDownLink', enableSorting: false,
-					cellTemplate: '
        '
-				});
-			}  else if(entry.columnTitle=='Copy'){
-				$scope.gridOptions.columnDefs.push({ displayName: entry.columnTitle, field: entry.columnId+'==drillDownLink', enableSorting: false,
-					cellTemplate: '
        '
-				});
-			} else if(entry.columnTitle=='Schedule'){
-				//$scope.gridOptions.columnDefs.push({ displayName: entry.columnTitle, field: entry.columnId+'==drillDownLink',
-					//  cellTemplate: '
        '
-				//});
-			} else if(entry.columnTitle=='No'){
-			} else {
-					$scope.gridOptions.columnDefs.push({ displayName: entry.columnTitle, field: entry.columnId+'==displayValue'});
-			}
-		});
-		$scope.gridOptions.data = $scope.searchdData.rows[0];
-		$scope.gridOptions.paginationPageSizes= [$scope.searchdData.metaReport.pageSize];
-		$scope.gridOptions.paginationPageSize= $scope.searchdData.metaReport.pageSize;
-		$scope.gridOptions.totalItems = $scope.searchdData.metaReport.totalSize;
-	};
-
-	$scope.$watch("searchdData",function(newValue,oldValue) {
-		if($scope.searchdData){
-			getPage();
-		}
-	});
-
-	$scope.operatorsRepId = [{index: 0, value: 'Equal To', title: 'Equal To', alias:'Equal To'},
-	                 {index: 1, value: 'Less Than', title: 'Less Than', alias:'Less Than'},
-	                 {index: 2, value: 'Greater Than', title: 'Greater Than', alias:'Greater Than'}];
-	$scope.operatorsRepName = [{index: 0, value: 'Starts With', title: 'Starts With', alias:'Starts With'},
-                        {index:1, value: 'Ends With', title: 'Ends With', alias:'Ends With'},
-                        {index: 2, value: 'Contains', title: 'Contains', alias:'Contains'}];
-	
-	$scope.deleteReport = function(reportDeleteUrl,row) {
-		if (confirm("Please confirm: Are you sure you want to delete report #" + reportDeleteUrl.substr(41) + "?")) {
-			$http.get(reportDeleteUrl).then(
-					function(result){
-						if(result.data=='deleted:true'){
-							var index = $scope.gridOptions.data.indexOf(row.entity);
-							$scope.gridOptions.data.splice(index, 1);
-							alert("Report deleted.");
-						} else {
-							alert("Report not deleted.");
-						}
-					}
-				);
-		}
-	};
-
-	$timeout(function() {
-		$rootScope.isViewRendering = false;
-		});
-
-
-}]);
diff --git a/vid/src/main/webapp/static/fusion/raptor/images/ATT_Business_logo.gif b/vid/src/main/webapp/static/fusion/raptor/images/ATT_Business_logo.gif
deleted file mode 100644
index 56c4f8db300c852358caa3d1fc473bcaeca666f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8203
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

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/addbtn.png b/vid/src/main/webapp/static/fusion/raptor/images/addbtn.png
deleted file mode 100644
index 8f746db6344f2d90f7f3b00b4fdb2bbaa6db7b95..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 662
zcmV;H0%`q;P)1CwVuy+|2CE&iCvZ
zwrxYN*Rxlv6`W2dK>U9!!!RHi3_?Diheo4e80~i3-tYHNuh$`)&4Ou~f>AaA1(Ak-
zS}G&ueZrs5Cu}ww=yto1OeVohBoaT(W)pI`oWm@Cuh&Zn`~70E7^Kr_7!HSE9gj!I
zWHQ1comWKX9uiH3lRU=>MqQ}WI-k#iK%Thei0_w5C5JwpPL&FE@|Vj6to!{AkH^Dz
zu|y&f2gYc5F_zZtb^{BAexsN#zw#Je3x&9#F2`;u@T>TGy@G|>G2E&)krm2DP$*@2
zF9ur}Z?u>fhAdF4)joPT91c5hwOaky9}EV{GZ7X!<~h@w~fvEfiy@
zRH4=NqSu0xJ>}tu;j_(CB$+;
z&1N&ta~fA55ct}QdQ9sf*QnxY>*kpE+b{_Q;sJloS71)&(@kO!}mqf@1v(v;*8Y=G9S3kY~Cw#
zY=t&c
z;3~JK4HxB^lY(MD+sYeQ=t%XSSW;x^1M?dTvN=W^yNcAcy`HCte31C;)5xP%b~qs>
zDP&4(%TBqBNGHwnryK;BdMI$fEg
xd0mc!C@j^ZpLxYv4HmnPfI0THYuv<%+6iSmMn&w3dPGDfL1|=LY008wP(boU~

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/arrow_add.gif b/vid/src/main/webapp/static/fusion/raptor/images/arrow_add.gif
deleted file mode 100644
index f3cfc64e2301698ee8c32fec5d0537c06bbf15ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 469
zcmZ?wbhEHbbZ3xZIKsfd;MH*L&XerPn`SKEW1Kc~=aEYlb9P9@^aM04J$d=wN;<5+q#1n)l(DHSKUf$N0$3TCf@-ow
z(^QQGi&<)#f*bk*TCyX{R7_Zlco^8{1PU{WP4MGkV&j~g#oBIX>{~dYN6eq2W=1lF$gdUtjs!ixR8s1pK%2PCu76qD?4f)-Y>eb
zu5jzN8sSGfJ~gepmUJLbc}DhqmjC=aSPd8$A{(Nb%6{H_l6_XI_P3ZukaGaj6hA%*
zzZ=b~#TdDJq*kpgNq3VoWE2f@SZUV#n6c#^6WcEKV**DyxY^DuJd`j^guCv^l}cmh
z=jRsZG%0FT39Y=Wo-$>cPsoF-mn}uOLUvU?>$tu?W_yFI^pbXiO&LpP#h%`__V#vL
ICk6&<06hA`hyVZp

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/arrow_add_edge.gif b/vid/src/main/webapp/static/fusion/raptor/images/arrow_add_edge.gif
deleted file mode 100644
index ada0334cc1f1aaa745d87957ba9a8a9a268042d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 564
zcmV-40?YkJNk%w1VMhQQ0K@ldi=YT#QhF
zrT_o`$imXC+pO~k-g{8jC)ZW9)*r2z|
z@Avn%z|XqG(*OVeA^8La6aXIpEC2ui07n2E000I5;3tk`X`X1RuB^Dca4gSsZP)Gi
z64@j;z@TtQEEIc+tfFfPrxu7eQiq1Y8#Zf{l)V0fi0%Oe70X4vUYQoNSRm9e5uL1VMhA7ytke
za037XZmN$OL6xH!Ko6Y-s<3aazHG9Obq*PL3ll&FoDcvB&uth38^CH10|yMljs`#z
z$Xscgz`Pr43aZbq6b%uo&;XmblgL4x&=9E#Y7GDp5FosRWdT413Kh6H3StikCjkF5wcTdks>FCF2rq0r%n}yi|kOb!s4b-5Iq6NlsRDLh+=`85+YJK0DvEb
zbghie0(_8+a9URP30GQb0}#%87tY!h=;40G*ig
zRZBp$fY=&^NmC~`5YD;Tz-rSc2caw_0%G^B;Xi*ViE^=ru-L7vL|Jdn5Vq1!O>8FrFfjU4O52J+~lCQ
z%elnTGiI5Jo3lc9pOdb|yUN#vrM_K?tQuU5ovXjY%-GD--nzun|Ns900000000000
z000000000000000A^8La6aW|iEC2ui0B8Ul000I5ASRAvX`X1Ru59bRa4gSs+T3`q
z?|kq7z+i4BEE}9@lMG#(mR%KbB{vjW
zn~sdGSeaIniH`}b0Hd4^oCORLx}{xXgCsZ$Sr7md%ZHzhwh#gb0kTz-0|2540NJ?#
z3I$aK3IVs31=$A$;NtB82h>%hRS*XP;#do)A~+UV(CAe$K#AF-0tgZ@%XKBx00apN
z0FV$V)I3h4a51omEnzov^d5MGWyJzN3^=s^FoS@|z&HR1AV5g?h!-%53}}f|L?PNC54UD_PbOgsSEMLDrz#=t<_3bely|v;y0z
zVsg)jV^`EN7@aMvPnQV@K1#Sq8Ck_bA5P@9R%n83L@`npI%z@`L=K)xjLS~nNt6v%
zS@9X%N>tYo5V<0_v6UpDI3LiCsMM$K+yWjX1z_Mow!!q&0YzZW3Nb=A4Bh^Dg(5KN
z6I6HdhUvN}pa7VY31ALPW(k0m@YaoKH>lB5z(NQNX2mI<88e3(5D3%IB6k#!&lVYS
zSe7UXh?vD)?O7oR9~T1RVj66*u_6j)$oJxnS@`0W8gCp2pDM`UD5M<=5L00pPb8^i
e6H6@VzC09q21lnM-lZgC|y6m<&*l#*JIrdO0%
zj0O?{kOrHaT4RSKI0bbRjQ|H%3k?Dfs8tUF4GXJR2#pI?4FCiI3kVFs$yN`-vup*P
zA~+UxkPrq2&(sQ(=aB&nq`j3_j15?%56uekjsfPF0@_#rhXF^O2aN(SnouPgfdvps
z1&9DZLV!#2tQ5O~su_T5q$D}`xM1WUHUtgywz*_6qJk>rs;rYl>6x;OFx_#C)NEP+
zR15$p2vo04${XX@jKoA~(8glR0z|D+^a{S7IRi1J6mZSJJtK0liD-a;*^w40G7Kpts9VfTayn
zhX4Qn$~{-n5Vp5imb!T*qy7t
z@Avn%z|XqG(*OVeA^8La6aXIpEC2ui07n2E000I5;3tk`X`X1RuB^Dca4gSsZP)Gi
z5|<@3z@TtQEEdD2ih9j%yWjBm#j_EL
zv86>Ih|$FVfPrxu7(rrr1Y8&af{l)V0fh|$Oe70X4U2FSkDY>%Kpl7=3j{%aZxaA;
z0|2hB5}chB00@5?L6xKzKpUH`tN;=e6a}ufkF>~fbqyDI3l=~IsjtBUYZ(C86$}#t
z2N7%D1F{v$6%GjEZU#UW&|GP4s@89<+zbx@5Z%VF;vy(`RX~k01i~1+;WY_b5I6Pg
zxoP#v)dMvU6kyx85x{|S065V)pg@6xI6)lh0)bd@)jeUvXoXzk;D9k~1Jy)eM{A(D
zHz{4nV=1u>KAHd&q>}(^TLoZkWD1i5L;y5t4X6=yInk+3U>qwPWhxHA1CbuJeSG7t
z0X!EBeO2RX6eh8O2`cPM0D&pCRu2#uLyLexNri5jJ#%3S2r8DrDk?~z5W&E001E1R
zl^3L~0{}9(!39JYDNLGDdFr;#O@!8sKs69$DG`v=t8)jEO=*;iJ+~k09^QtKA>TTH
z_cAb#c8eEK^x64p~
zrODIY|NsB4!O;y~{-U5c!otG}41yu-}c
zw!qKt_xHNQ(*OVeA^8La6aXIpEC2ui07n2E000I5;3tk`X`X1RuB^zsa4gSsZP)Gi
z5|<@Bz@TtQEEv%kdhpD9}EORer^o~
z0Id!XppOFp18y5Zm8BOz8E*>?00jfA0G_dev$bw@4;Oe07C;7X3IG^u7}jbF6$1wo
zYMc`j0~Kry0|Ve|5akPM$!`Wg7SCL1ZU_MD6btYD5n8nZH;Whm1!}Shghjz10)n*O
z?3(l}2%J`MAULQcA>u3q3ld;#005*&1QaU&0FXf8z(ES}-UO)#fdw;9kupbjkoXIn6Za%&ANyUHJh0h
z886v?Fk+?JOs6@!<{K~U?Y}l{DyA
zV&kp9{9Tdc#ywp!?!#0Afqc#h91Oh{FCGR63$_MG9ZU#)>?SCy9nf*aLWzaJ8UT(S
Bm@@zX

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/arrow_left2.gif b/vid/src/main/webapp/static/fusion/raptor/images/arrow_left2.gif
deleted file mode 100644
index 726d4227b460fcff2533ef1615d2ac33b24c0232..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 399
zcmZ?wbhEHblwpuzIKsfd;MH*L&Xb7?ceF0u_vqQ1okuSH`1yO$`a@@~-249HSJ&*#
zTlb$kdiLgmbqD|d|Nrvs$7P$3?md15$OdX91}OeyVHIHzV$cC82HDBL`hS5+-{RzX
z8Y|aL`e`s>fd#-xm?)6!#j)M5nZFJ81bB40qwh-<>cX=~O-8Z)Wc7cJPngVBDE@xI9iiVyQ`
z+OmLgd(jM&<;E-1&z+yNW4+oOr&SAYL@d?ozrJH?#w9Kb-Ilh9j`Xe#O_j#gAJXfM
z8=LaE9=%u{{ML_K)Be<#z{^ih^R?KonsM<^YMXeoDi1>plS-4bGGA4}8y6PkDQ*TS
UJXd!Fx*X>cG4Sopts9Wfu;>p
zhX4Qn$zo3p#h*IkONLU*6m+~lXU#+awPCuNe%)ZW9)*qy7t
z@Avn%z|XqG(*OVeA^8La6aXIpEC2ui07n2E000I5;3tk`X`X1RuB^Dca4gSsZP)Gi
z5}D;hz@TtQEEdD4ih9j%yWjA5#Ic+tfFfPrxu7eQiq1Y8#Zf{l)V0fi9`Oe70X5sQzTf(dYuKpl7=3j{%aaRLAj
zYpMd95)^R&o^KjKm82O!8-S_+uNAJF3IMaTaCH$GcncOl2EG8(62ic03TRHoJP-MM>RI#h-`zoDUEWmhc)5XxZ4miG+Re)UIyUhcAde1G9ZUg
v=;89ExpN?4dXpi5>ACeOR-~WU(S!N*>q(Z3$#J8+`SUb#s9(>%eFy+ME$$V3

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/arrow_plus.gif b/vid/src/main/webapp/static/fusion/raptor/images/arrow_plus.gif
deleted file mode 100644
index 7a402426d3a3f3e37f851897b18e67c25f0c71de..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 67
zcmZ?wbhEHbG

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/arrow_reorder_all.gif b/vid/src/main/webapp/static/fusion/raptor/images/arrow_reorder_all.gif
deleted file mode 100644
index d67e1a63f64dd99a2bd9fe403429cf839a62f851..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 686
zcmV;f0#W@(Nk%w1VQ2sx0K@RfzEt45Zna>xk{e*+{v&vQ9vyOH~fS(qbVT1{{v$
zA)<%PfdU5GuowVf;3BC>_V7gjAR&N+M-?ysZaW7cf`KgB9z=SX@RheK4k4mypbY_o
zDhD_ki^m{=fTIscF)|6@04!jL7&QwJ)WA>xMKfZ70DwS%W=j>`w371%xh#+1aa1SK
zQa?+(3NEbY?9tmq#!6|~D3M+OvCghE+%v*fxumaxmMnJ7*s+*ZHqzVmF#xtyip`nR
zi=~;U2JyW9wHeq7IKqV&d_wCir~}Ig+O0E%WgP(st{Lsx*dW0w*s}GWqkSc4ge%&9
z0@gB%&<#UZyv1uZL7#)4Sx(x+zDq5uOw|!x2T0sXyn$6tmRzpMp}0A0q#@iQ4Lg?v
z)}k3ZwM7sg`1}PZpnoWs0iA#d+VO@fd(L@sOM(!lQNS#ymGQ)d7&fs)h8%Y20}&pE
Uh+z#RmT2OMD5j`li6H<0I|8C72mk;8

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/arrow_reorder_all.png b/vid/src/main/webapp/static/fusion/raptor/images/arrow_reorder_all.png
deleted file mode 100644
index bca729f2f423b6bdaa7d8f185b660a47494885cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 29837
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
A8UO$Q

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/arrow_right2.gif b/vid/src/main/webapp/static/fusion/raptor/images/arrow_right2.gif
deleted file mode 100644
index 302cb2915c8507736147f6cd77fe9e1a10571d7c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 399
zcmZ?wbhEHblwpuzIKsfd;MH*L&Xb7?cXZ9({OH-6z{X`ek6ilk^Y^0lht6EN_x;DO
zt^3a%J$rM(x`Y4!|9|=RwiKDT;FEZuMMR%7Ge@TiQ=`j~@7Xf*mOL(L
z+mUqs2Fs$?JnHG(TmI}xXo_x`pLmX6qRvH$FNPz7wKhH5$)AtkJ}rWwJ%fQEozvce
zkH=V`XzJvN)6!#j)M5nZFG!!7kuRWT#5`fqYR0wGjhWQ!i>K~y-;r*=$9UiVN!u46
zHr{Bw<{*+#C
z+}M=Q{OHB%;n)au@1YUl6nyMzW@LL

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/arrow_save.gif b/vid/src/main/webapp/static/fusion/raptor/images/arrow_save.gif
deleted file mode 100644
index 2702547afbe40f69f5437ae13823cba5d657d663..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 606
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

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/calendar_icon.gif b/vid/src/main/webapp/static/fusion/raptor/images/calendar_icon.gif
deleted file mode 100644
index caf77f9a9ceaf964ddc66b81e7beda42bc9c363a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 552
zcmV+@0@wXVNk%w1VITk@0K@pr4yNy~G*(GfvWjYJ4C>4>&ii_0Y=
zQn4O`S2BVbEM6{#12<7PgTvx#q3L?P1E)fdb3yBDc%Sr%&thy`+
zsOzaH0D+30mae+Gx~`V7v7Vl>v9&d_8P@*~FbHxmNHRz=GYT>=2{JMZGX6gT+
zS%5OiK%1C>rm!%>&1Ym{7EBaT3=|Spax?^Lzs11A3^Z4eS&+e=;k)Ur784!**$WT&
z#}>^#F?rjKE8F4|YR)=-3wx<+`Ri9r&w{I(ufKDwFH32@>vrlXd(Yl*x2qc^Cakb}
zSedxHoZDXhw0i%;=S-ez*S^OdnkRH9xpkA+g9dBO*xak@+gJJ5{N;@eJ$=Y}VRGb3
zA1P*cmI#UO<)_xnF6{fHlQd=N9H~rp{z&gfQWyI@UwAUyiC%H)#-4jV**-5!EEDw%
zuN1IHT|9R8EJH%-cg?x;*FV^I-$>fs;Z>!)&ZL=3s-4RPSex@4HrEGjU#!|JCgsBD
M?Xb1Mh4KGQ0E+dO1ONa4

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/calendar_icon_nav1.gif b/vid/src/main/webapp/static/fusion/raptor/images/calendar_icon_nav1.gif
deleted file mode 100644
index 093ef50a69d4767c1b1b7fabf6631680984a1bf2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1065
zcmdth?N1v89Ki9LRz{3Ej0=lK7f_L~_=1@jVLBZhZqCI4GZ^E;(#B+{!ypEt5wo;o
zKwD@T^pOhe`f$DLBc;6_EqA@^T_5QaePDy|kbz}ocABVfChkRT{WJXhe#!Us@5S%z
zxid}8+$!K{-~j*>i^ct7@wbP??ce{-0{!A{FN-bvhmdlbQ@l=dV?=58SQ>k1ck%-6R_;Q|D
zzKbVwu~^KL%tfP7Z#+-Mx0aTcu=s8y5+S0y;cz4r3I&5fS7aj)47fr&3!yDEycq}t
z{6WU=_s<76OJNv>E@ON?+DFrNdY$&+6h$#4}Id5}1tY$lEx6dK=
z#d(|AX0utXR*ThAVzrt}G-j*W1e;9;1VLh;?51%JhG7IoOt5Bq`ih|h(m@8u2!Rj;
zA<#{|UJvO(old9!Zw$IwF+ypzT1|O1B^z=s2!gcg#?0)@>cnN`tX@8&Q>)ce>Z$1|
zxl*ajj&hX>xuT>Txk^6%{m-aWDiz7}g9=C{9q&;FCMU!LGP8b6$eBuht?)=BlKx3^
z_oVYjiD5tj_l?hWkGluNTA@(*!RC
zt_eAO+ofv`4&U$r4|ROi0sQaO?z32jfg!Y^(K+*8!!t{Nk#n$*@-G(Lh~ei;q~aRe*VEj+Sghmb*+`JTpVrL
zba&M7543%D^xXW;V;^Zr*2C`gR$;a6ovzG^dZ_D|;N?%gdug93C@kl%vUc7={6oD*
tPTP0~boK2uXM6g-Y&rcxLiNUwqiy{uQR48}_VHxJvu#%|NO{1U{{r#?_MZR%

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/calender_icon.gif b/vid/src/main/webapp/static/fusion/raptor/images/calender_icon.gif
deleted file mode 100644
index caf77f9a9ceaf964ddc66b81e7beda42bc9c363a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 552
zcmV+@0@wXVNk%w1VITk@0K@pr4yNy~G*(GfvWjYJ4C>4>&ii_0Y=
zQn4O`S2BVbEM6{#12<7PgTvx#q3L?P1E)f8z>~|<%z#rPa;rNXU
z_g>`B+-{sUbHSbq4_GV#)IS76afZn055z*q5uE@

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/columnblankup.gif b/vid/src/main/webapp/static/fusion/raptor/images/columnblankup.gif
deleted file mode 100644
index f76975bd21b807ff54bee462429f3825c452b046..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 193
zcmZ?wbhEHblw@FMIKsfd;MK7I(*1zu6#}6h|NsA=zx%v#+RXP~zSl3=uaG$5{N3jT
zGj}+YFIa!<`u!L0<9pXPEIpu@JO!u{sFfI?_>+ZIgh7Zw2c#HeCj+b90+qfcAv{hi
z*CkEh;ht=wv)X{UM1bAIpzGF&k0;)8c+7iWm>?^_8C%r#Mpa;y(-)7o-*`+qxgGRo
LpU+6(V6X-N?w&#z

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/columndown.gif b/vid/src/main/webapp/static/fusion/raptor/images/columndown.gif
deleted file mode 100644
index 6c8d80e6f9dc705b88ad0f4beec12e89e5075ac9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 124
zcmZ?wbhEHblw@FM*v!Dd;MLHu^ngS8f&-Tx2!wWQIDR9bdBuV~7ZegFT)6k*!OIT`
zeH;G&{|{6M0g69aSVb6k7<52fkQodtngt3DtM^8z9OFBox!5RRTxh)I;

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/columnup.gif b/vid/src/main/webapp/static/fusion/raptor/images/columnup.gif
deleted file mode 100644
index 1c9b24f85c5c3535ff61ca55d517706025fdfcd0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 126
zcmZ?wbhEHblw@FM*v!Dd;MEY{yMF(r`wEE@=I=i5P`*GQw4;8>{_}UA2Q;r(f9(4G
z7w`Z7{|{6M0g69aSVb6k7<52fkQodt+7nKCN*b5(ej@)Wnk16ovB4k_?5Aj8p}8Pv3y|DXMuug^Hdojv*W~
zlT#7`b{{=(z(a3q*F%2p!=}dq1infgTYScc!Ty(I*mn!_Q$WQGp00i_>zopr0P9RV
Ac>n+a

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/csv_icon.gif b/vid/src/main/webapp/static/fusion/raptor/images/csv_icon.gif
deleted file mode 100644
index d73e93a6d078dee376a517a1f9462beca8f1176b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 447
zcmex=OP>
z$SlZU&rqycaA6@!r;0!BN1YS34fTpD^R%o27eCqCZ?c?MVg3J`
E0D=f~PXGV_

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/deleteicon.gif b/vid/src/main/webapp/static/fusion/raptor/images/deleteicon.gif
deleted file mode 100644
index d544b59bb9ca365bf5f935dd1d6b40266d730678..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 80
zcmZ?wbhEHb>h;
dQ<$_`$xvhKx5|`)?rR-$zPn^(YOyj{0{|cG7Z3md

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/excel2007.jpg b/vid/src/main/webapp/static/fusion/raptor/images/excel2007.jpg
deleted file mode 100644
index 77d7cc208b428f3deb5a834f8234a167bda328f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 761
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

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/green-arrow-right.gif b/vid/src/main/webapp/static/fusion/raptor/images/green-arrow-right.gif
deleted file mode 100644
index d3e37e84d7a9f8de0831cb7fc4c86dcea0512f0e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 201
zcmZ?wbhEHb6krfxIKsg2_wT=7fByXV_516OpP#?~`0(}HyU$-=e)#nK-G@i7-`;-q
z^4gWdi~D6OV@XvyRzl<#hGXRuRnfn)sZs`_8yzJ=g9y6{~2%t#h)y!A`D^-
zIv^z=I~iEr7O3{6WV#9_tz(c1Jnki=XC=95>XmgNYk1<`8frMU>=D|O7PZKS>G`V-
kQ*W~n^5|}w}MWl|)
zt9fi&6!P~vTnOIH%GbL)_>g)wt8#<%#{v<-!oJ0iI<*
K{H-EP4Aubq;7)J=

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/grnarrowdn.gif b/vid/src/main/webapp/static/fusion/raptor/images/grnarrowdn.gif
deleted file mode 100644
index 4c312a350aa41f5ec28e735d36166bb1eac2f916..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 74
zcmZ?wbhEHb?&!2bXL{{xwdKUr8s7?>DzfNTbkJOh*Tl>W?vU5tyO
a1$`J(lh&ApwBAzeOQ;B)o~X*oU=0A;;1q8F

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/grnarrowup.gif b/vid/src/main/webapp/static/fusion/raptor/images/grnarrowup.gif
deleted file mode 100644
index 23442aafcb52f9cc141ff2f846fd60031f904583..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 106
zcmZ?wbhEHbxs+7jWJ`
zGdnjbU7stlXkEob1-H~MimVKZ|K$A(N-}dZt5Q=Gk}4HKb5avi6oPXTi%NnM%TkLJ
H85pbqX=5Oc

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/h.png b/vid/src/main/webapp/static/fusion/raptor/images/h.png
deleted file mode 100644
index 389eb08a630d9d5de4bc274707789cc5a7ed5ca6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 380
zcmeAS@N?(olHy`uVBq!ia0vp^%0PUAg9%8!wK(q&q}Y|gW!U_%O?XxI14-?
ziy0WWg+Z8+Vb&Z8pdfpRr>`sfHD+-pLsP-+;j~}^OXbZpRuF9;E{&zc{m+V~a(cH7-mvv4Gul;h(6EACn6xHXvDQ{VP`Rs+vCDj%;
z-+ww~^YKeX|BrjVD}H^M=xh@rzV%gwy~pZ>m!16NC!|TPyvVVuU04N(KfCx@{G1fG
Y^I?wqnHzUj1H*~I)78&qol`;+0RLO0)c^nh

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/inactive.gif b/vid/src/main/webapp/static/fusion/raptor/images/inactive.gif
deleted file mode 100644
index bb0a71121a3ec33f59716eedbff6386dede3bbf6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 352
zcmV-m0iXUyNk%w1VGsZi0M$DH|4~ueEG++!kn~1I{s;)$+uNU?pWWTv$jHc^o}TFF
z=>NyZt*x!v+S)S4-dkIhTJJB@IpetO-;~EO~h4I@PUD^udm5kTKGyz>eJK5L`11=ZK|rO|KsE0
zFE7{E*Zc+s^bQW}?Cj^~=hoKNzfe&5`T6+x_`Oa}(_df4#>W2u0RR900000000000
z00000A^8LW0027xEC2ui01yBW000Jkz@2bNEDjd}qfoFIvIshjQJ^D0gcqDncOn9|
zp-4?w5N!v-uP()q5ofKl`m@>?5tHo}lV~V+2pwB6eSbS@TOfvN0Rd-97Fz)Z3=dlp
yMN~SI1v?IwIwV6CP&WphLJlK3FDODb9yBEiMF%D-IT=DR9JEFUE)<4;K>#~QjiP-3

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/loader.gif b/vid/src/main/webapp/static/fusion/raptor/images/loader.gif
deleted file mode 100644
index 32af9875a41d87a018252b23b87c2c985db35c9e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 958
zcmZ?wbhEHbv}539n8?6z=FFLyGiUz)|DS<@LGeGgpKD04vtxj(k)8oFBS`2c3o91`
z6N3(r%>dHEz!cx3-+n;%twQxAC+Vd|nU6IY=S%dZ?O>f-6!!G>v4CBAMP&znp1rW8
zkGrWtrT4je&f95D4dH?`m2N-Jf@^-B`u<
k`efaf1uZNJVwLXmH>Kt%%wMyKcFfdpH0M|h^@&Et;

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/loading.gif b/vid/src/main/webapp/static/fusion/raptor/images/loading.gif
deleted file mode 100644
index 7ca73e934650c377f31bf2c86832459eba68de0e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4176
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

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/lookup_arrow.gif b/vid/src/main/webapp/static/fusion/raptor/images/lookup_arrow.gif
deleted file mode 100644
index 84e1aaad407ad48a96cc14ca7314713befe1dcee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 645
zcmZ?wbhEHb6l4%&c*el+9|XSt{`=|MxBnl%{{Qgt>znugpFR8k?8&bO_r6@Y_W#1=
zPnR$LzkKP@`HOc?U3z-v%>OfI-kmvf=EUiHr%rr0dHl_hW8Y4nxOw#0t)qwkA3F46
z|K2})_deXU^Y_l3x3_KnziZpg&09Zh*z#}V)^i)z{a>^0|N7NGR;>B9bk(0#tDme~
z{(I$$Z!4C6U%K@F%H`*mFTXu+>EF2vf6ZTbXWqPL)93wIIPdE0xu0gv{6A;L_n9-#
z^iTRbx$i}P?}z@L|9umW_4Hrs={eEU{<^i}V|)9{j`k$4(TTykftmmmJS4Ih0*=rlfdl
zcH!=<{KJ_ATXJ#_>at}928M<_os!y0O6scG^GwXm
zwWlz!Pf*g(Fcg#5(lEDm5o;3AQdOU4EXB<&W^ChZ)+DVuPuD_IgilD$+tJH|nPIN3
zfw>{Skg|l2udiq1OX<~y=JLF*Np2Z4H?^FaSi)6s_XeZWq3QYo+gv(@+}f6kSylX*
zQE>3&RK3s*9X$po4hbl_AL-awwDi<8?c^*G50OWmB6_ihVs<`a?Ga>|s>6_(bo7+7
Yy56Nwrho;9xaBP^R3f}eGZh%D0n}z9S^xk5

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/maps/blue.png b/vid/src/main/webapp/static/fusion/raptor/images/maps/blue.png
deleted file mode 100644
index 69590b92ab25dbd8fc82d7d6b0eb5b7f6a1ec1ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1309
zcmV+&1>*XNP)Z
z5tfPI80dhNjXizOZ4M^WIE{~~m@T?2q8U@v=+tB;lFVdoCfj^0CPoPxa6GrfGHmPM
zPMduB)As-G{r+>$J@;M$0K^@Zu3t!T_jO|IxJ0ryoF-|-FAsEUt5^S!`sb3c&QIwZ&OqhB(xN~U
z(9rS)a5&uAB*VT8CIMZ;S&V}E6$C1Gx~YDiz-ZB73yLw|+bc$NxGpdWn6ZNC8$XHU
zc?qsdwf039BYGc}Z!E|B-?eog#+o~?v91Nbk}|C2s^S-Qn8}mL1yA30M$rG2mLoLt
zZ>AUz7MAwiaJ0iL;E=#Zl%~OAY!uenPI#OZbeQywV>s>{8iAV9zPW{neKFd6#Ysu;
zB#B9D?Gp&aVClMw%kM%7E7rQQzCXb)FcQLLRr{&5x$9?Q-tvDc<`$Q6l|Ixsir{<9g4h`
zbIt|I+7B3&YrtRT0|}bGTH0YQ-hV4h0-D-U7xYb^;u4*BGBja+jiA@WoSh)>37pW?
zpB3mE#~oX^TVbvP|0K8hOOl-bl%B^IK+)#QbGcxj2H(JNh)QW{r;*atkGa4kkXbR}
zO69wFeaCB=!0$q;=`h&#VdgiDYF}ud3)vvtSx)pEm>73$;t@Lv$WD}
zcoOJ_1AGI*#xymfxE+7bEldJR^9ycK-FJ+vR&C1j_FaKFa1%EjDp(b3>Q-00P0~w_
zxrIppGu|yq^AVDi|AfR#ApApH_YwH`t%SI&?u_)3mkB+TxPwU`LA%WZb|TgF6K|pT
zyV%T5xJxMdO;PZSD2+zQG~^aG0Zp$*WcnS%Ulj3yI5-u@KjeIB(eot5cnCS@7AAqH
zltzzWStkDC=+~ABgt+O9J}uR4C-K=m9{FDc@XT<4Rz<(S@Z-4kB6uwG2$MjH@qkBY
zVg<(*^-uvxlzu-R$2`s&3X_1RDMeA2zeS=`AFxpYJOQ<4R2(NNoCTivH-WzZfyOD!
T^E$RX00000NkvXXu0mjfg)VJP

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/maps/green.png b/vid/src/main/webapp/static/fusion/raptor/images/maps/green.png
deleted file mode 100644
index 0f79315e427e3401061bd85d197b033ca24e5212..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1190
zcmV;X1X=ruP)JW3b9v#cu@&%
zgPs-gCf_VvQJ}>7Vh}Ht1H4zC=+AbXd{}-iNx+^c;KERq%DHSnxzrh1;U#&ipYYy1
z!rS~LW0Od^QvT-eL-=4YF8V61e*cev!!rRFOuLImJ0h>kCNWq|@J$oJ$rgg2TM{il
zi=i6An|-7J&*1#L`_J{Ckbtim0K3ASY?OFv6V85UCOFYiqLOV>UwgKe4rxXF{Ciwh2Con+Xv6szH`rJ|M53
zVvX!S9be3;R>F=PQen>lu{WlS1mI)&O-f1<`)dfkZyuk3@0v**tRs~o2_FhxZ6rXI
zdmoo&UN+V=_SD<)V>8K`3{nN@Pnrn;+$K4yt-u?va}D>y+XFf)dJP4@cAOjF^`C%%
z`=*k%V<Ouq$au!f48cz<;KVpa&&wufXOfC~`^BqK!%D~%
z4EkeXl`2o-k`Nb{ON<3wgjR-0Df~_Bt}HdKgm8%Wf};%}HWpvWW%V?!E*!fe@^|Dt
zga7{v*A(5T`)fPq0{#`z9cgEyBz9IfX9X{lcs)jZJ|M9&+-W%I-?R7O*?gW-Z0ws0~UVPKIZaaw{$39`SZvQeQIx
zyDO7iZ|3aLlGynxhX*B6|+siHq>9pOe}CSXspA+fIt@QK2!RH`EQFrJ77
z&U+bj6W$qEWQ~~f{$k7oyik_RcB@TM>8>wvZG_jG-4T1%6$7pc`<2J_hvK1jJf<%mge9IrB(9@bzrJtl}F{p8F6!TLkzFv&J4X0doV+bmjsdR(A0+
zkSs_a#HIPb!RUyYfI9-t+|2??y_@xoNlx?hVS5hX9G@d*Y4~)JGaHJ5BfpCeoFrSa
zdc^Y_fSe&tmLg;7DQyaFjNVG5Pun-^DvUW%qZo}b;3OSJq5(xi6qP>+Y{n-nqlFFI{3w+uK>(-n}fmrbZH&n;Yli=T~QEXV=CU
zYp2%5*SEnhBV$SA=FQUB-Md-xkt4!58c*|xtwCa+1-N~iWnaF`mYqDw!p!CfTdQ7!*)a;{~>bAmIN*U9s0kAM$_r3(LmADr%*UDGVR^dv3VyY(e8V6ot=C}WI!iO>FNrS
zI5>=}tE;DNM$`}O8_+}k&>cUnGVnTK4puVqaxB9sm`HD<8ydcNBj|go8QA}CO=Dwr
z{=Iv`Jlp`J0-Pjf=gvHw6q4H7py=5%QR7*5>J*(jL}CH^Scv$G(Y0$6%D;P;EnKzg
zM@NMMa&F!f%J1aGh5Q&A0(_`IfWgp0(AbX|Zrl*W1(0>|;)LjNfe#Z2UdusT0E(@m
zK%oy?w+u8gVf21Aj&iP
z`-Mt6SzG{1j~)9&DW^|Uk?NgXBWU*#n>K;tym=$K6DJ(;<_J%?$>R0_Yo(q!!=mcz
zQ}Jp-_SLIk932&2N6x;!5M(md&~EA8TZ;=I;qc*4)!Is}%wf))(U@JkpybUPz^H&k
zB6*Ad_ooP1@18pXOAa2isYHu~dBw*!`y?mB>hW<{Y&L_lQh9}r2(PJ4aRJc#-j?F`
z?`I23OP4#jxe2!G9vuzJl$1K{p+mxVw!{U1A+{-kh^njemdWLRe%H|fat{wsRaPd@
zLa}@H*c2Cldi{EFRadjG6pG={iVDE?ceH6Y0uzJg0>EEFq6*)*k)iAT;vNwJ&OScB
z#q8L@G~2g}iVGmvWD*tHGMgI^(B&YP1GfEY1j1w#6&FB|(I~2~OG+5Nn13QybWtk1
z0}Td-<|Hb<7ZHX|OtDQ(OqrVc0|9tzwJrE_O!U@}xB$ei6iM6C!h(y6Rucd|Jk9hu
fe&0S(eGcGXd0TozQ6I=600000NkvXXu0mjfKWb4+

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/maps/map_iphone.jpg b/vid/src/main/webapp/static/fusion/raptor/images/maps/map_iphone.jpg
deleted file mode 100644
index d6b996c5d08b06e1a55b213e88a977c4f6666548..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 712
zcmex=db3yBDc%Sr%&thy`+
zsOzaH0D+30mae+Gx~`V7v7Vl>v9&d_8P@*~FbHxmNHT~pGYT>=2{JMZGX6ipAP#aW
zBLfm(VP#?lN@xl&FflQ*Ffucvut9SPkRKRQ|Bb1IEit&V2j$=FM$nd9b*?=^{g`?zBhoJGcLuaJ9cMWTKAWzGdO;OC&>|PO~`q
z?dP$k4HH)@F6n>eRd87@{ySez`?j2~+jfho+)Hks>+v{a)uyLvUqwDnbk~uz)C@bJ
zP*;+AY-L79x9dKy9Za)5i#zw+f1qvcQxtrAwaO}Ik7W+~xz60Fmwg@3Y$NfdiG!(F
z_-)yiP4|~5h+Ar|=|vfA(Qz)TA?;((WXw%PPnR{duh0_xb(O
v#oNF2Ey>#H7{C0-e}=Q!)?Fv=F3hR?&tQ7EHKnpX{Ojt=w^j!i{l5tS6IuQB

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/maps/orange.png b/vid/src/main/webapp/static/fusion/raptor/images/maps/orange.png
deleted file mode 100644
index 8bee9da397e37a094f7c7f4d1169d1282b0e41e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3413
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

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/maps/purple.png b/vid/src/main/webapp/static/fusion/raptor/images/maps/purple.png
deleted file mode 100644
index b57873893261255efa18f98e7c47dcc0473d9bb7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1324
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
P00000NkvXXu0mjfV_aiO

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/maps/yellow.png b/vid/src/main/webapp/static/fusion/raptor/images/maps/yellow.png
deleted file mode 100644
index a9d65acca6b10c03c259ec547ba1f6bc85437e33..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1309
zcmV+&1>*XNP)Pe%s
z1_r!wnTrsT6YXJZx+A1)b^v#oIpFaLJm0u2;~DSf`XEmHkq8Xlj3V!5IBmu!9f=HI
z30E$Kf@WBamn2M~`70KF=vWWxXd4`njK7)Y`0DL{?q8I^$dHO0%#|hMpio-qJsEI3
z4m9`FFn(7x#l$@oz*rofPlS`@et@qB_T)&@MuuY81%CZGf}E~i?Sa8Zj~Dykp(HNQ
z%)tMJ6T$1MD&%w~G^Z-%ih;feHi3@T5aJ>coQ;ZD$vxS8!Dm9R$7F?7VzZWSThaKK&XJxFt&K1gk*VmSoYQ1h&5ZG##jnRiH33!g^5x
z32}CGpduy#h5xb)vDgeIu;?r}2k3GfjRUDf0B$njb|!)R58U0bpo}y(1OrUOFYM_t
z0l#k#r3FcIaKB8>ByizeFp>LPRx120IRVXm^}|0sPJgJ<3VVdGmi7fEfq`q0q_s)u
zz~}P@cV|l`i_t?Cp+mVc;PLeDHhmT7bgM6tP2lz~*bDBcNO`eOFecJ)-XZsS6Ox|)
z7<&d@KX&x6=Y~H;o{y+^6hGM|M-W1~1w)s^0_x?z7>-r>20@u1XOhGpn
z{k`ElN3mHO2ADGo^mop7XAnHGXJVqKdj$R7ztQCj|Ic+cr
z6c>1Dg-X2to|_eB{r&S_2f^}Xk3r_!PVx#2REB>_w812>D@&pk>wTcsWI+6D-R_
zEHeAd*vJq>4yN_^Cxl=!>V!$)rDO-4q@{|9)LBqKtD>!q$rrfwBC2Q`oiGU$c@X(X6FCDzbp`E1gZz>#SavJvM@3*h%o4Yl!5GYV0BYa?R!!f
zz_ehM%L10pPz?^hl7Iy=sSkN4HSQ}u!=Bv
zG3bDt35pX2_Vxy^rskH`CUJFhJp+A13+Xl)M>RP`1qEwo*;XlQK86JhN^Zsytj&@(
z0t*?8JQN%?d7Gr{gxAQsxVw59Z?O|v!zLgiYGSqj;F^UhCMQoX;LtHUe}P@=ir3at
zr?20XvK73*z^;9BCI4e)4bv_5VvL-hIC)r@RBy^SSt#r3>HZ7oVVI;Wz+epkGV`9T

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/pdficon_large.gif b/vid/src/main/webapp/static/fusion/raptor/images/pdficon_large.gif
deleted file mode 100644
index 39673df7b48ee551318e9f366010e13f112df78e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 434
zcmZ?wbhEHbRA5kGI3mn&_wHQ=1_mH5FE2MXHvSI;Kr$`u%$YO0ckfP1OA{0n{6BN1
zi;K&DU-;TGc}&Bp7n8EH%*TDB64URjFg#116vJ
z?>9r$*ETfP1i0qU%y}1Jv-CmzvfRn_l%6!%$t-;;B;w1&d84>FS#p
zv9ZrLn4>dqF#{jZilvq-3>L0op1gc98{4KW>v>i!n!i?W{SJnWvp3IO!M^Xv!c+SW
zC~Y-nh(nzR2N@8ZFG;}_9X@(zQZeo9vxq1%)x$T{lqux3R#Zuaeg=C_+9(u
zAcKj*1cvL(^$frMGD+wvGO`K?XeboqGc+>(l4A1a0xTh*K!3hCCB>yKGRohoQqx;#L)m4U$;05EW;
AqW}N^

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/pdficon_small.gif b/vid/src/main/webapp/static/fusion/raptor/images/pdficon_small.gif
deleted file mode 100644
index bb5edcac38153b483a4acf5861baed1c0b37ff73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 361
zcmZ?wbhEHb6l4%&xT?(Xq^9xig-Z|Ctbgg?_GrqC`#W}j3XQI=shQi{^5MgWdq<8v
zEhyb6D*e#K`?j5nxw(0;n|mw2$ZHLKYj)1_67tU@;+FUJm+=WjaPbz|IpilLKkn#x
zmXi6xCur%?WqEn|Z)H>t95`_2?!Ev2|1;14DE?$&WMEKc&;gkZ@)HAF+kuN3f?87j
ziVKZOK3L2@=ggwW61hGi;P~MM3PLwOh!xLlIdrox<1eQq53hUry@@G6N
zVqj{h_EfHGkZEqHX|J#9YU%Bmz%r?AiV|ZnW6zBKMiy3CuByrXjH0XzGRz9hGRtSl
iG*xj)%Sz2>sc2a?L#%w?{#pS^`4cBk@hdtqSOWm%P;emt

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/pen_paper.gif b/vid/src/main/webapp/static/fusion/raptor/images/pen_paper.gif
deleted file mode 100644
index ba562347cf8784be0d8aec404700a2edacd6ad30..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 618
zcmV-w0+szoNk%w1VG#fi0OkMy|NsB~|NsC0{{R2_{{H{{|NsB}`1$|;{QUg?{QCd<
z`u_ay{`>U%`}_X;^X&is`T6gwt0?CI&~=H}+(QPO;Nalf+uPaM+47M)jEnprD}cnE*k#weFYzo}QlVmjIoeo$-_a{Ez_JnGo!g1Dl(hz?NN_
znwspA0GOJYnVFgFj{xhC0GODV_lf}PjsmxmQ{#>S=!*d8hyaa^jf{+pi;IgBtEPp8
zg#e?lB%Xe%ct9eUb^w}>0Gg1TXCazU0E#Q~82}G3Tvtmq4yY|yBpNDBs4rewW;zCsAX-{SLUOh)Q&nX<
z36BUA(5%H)TNjk7dQ-lqe0toxr(hx-ifE8=>
z1{~11vt$(8Lw095Ws@Fo!AwloFUSRg8e)%)3Qj!sy(o(@h`%
EJ7w!p(f|Me

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/plus.gif b/vid/src/main/webapp/static/fusion/raptor/images/plus.gif
deleted file mode 100644
index 4a51f04d090e427c8e2bec6448217e99811a1b44..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 78
zcmZ?wbhEHb2;Y;%0w#?z@b4jXL3FA8&5*Ro>yqwo69RTzQ4-{z4J<
z;zol<7T=<|cQpnaT5h`Fm+;DK4}v)l$$nXLl|!>i#9qkti{jP(C%uXiJ8GXTZT{YXe{Lz2&=FP8Ph95t!
ze)a0r%a<=-ym;~a`SZ7Lr#*iB5C|ST`1RnygFAQb+`fJL#*G`7E?v5C;ljCd=T4tK
zeeBq=!-o&=-o1P0&Yj!0Z{NCg>*mdyH*MOqZr!?7t5z*rwruIrrAwA9S-5cF{Q2{z
zPoF+*+O&xiCr+3!p}&7dPft&GcXxaH{Em*6j*iy0w)WQ6{+5=O#>QC<4Gnd5b=B3?
z6%`fb<>jTNrNza?MMXu0g#~$edAYf{IXOAm+1XiHS(%xc85tSr>FKGdsVONbNl8hG
ziHQjb32|{5F){HmF)`86(NR$;QBes|QBjeRkr5ye6BZT<1|cCK(IFv0U=ZN%@9*d5
z=j-e1=;p@xl=H}+?>}+FWV`*t-WhG&5Zf;>AZ)|LAXy|NUV4$z>sH>~1
zt!=KUX`-pAsiC2vs;a7@qN1p%AR{9qA|faxBqS&($j8UW!^6YP&CS8V!N$hMz`*eT
z|9>Dk3g{dHia%LcMHreHbU^lk@&p6N4F+~jksS>Oo0_?$L?kRW9GR}>GtK1Zr=`4X
zZIUNkJ_slsY3Gt$6p?TuiIqVuU{z0|fC|%L?hK9<4uy|e7`V#fawKLXwKS{vOc4=e
zXgw!ypvm^|!{p@S-OKf>L>xaUd&?CmxU
zGk$0Uv78Vy&s%olgfo*Hx19u&&kTi!2OF8Wc$VA@P8U$H%71iZ=Hg{Ol4eC8BqA>}
v9FdjQ$+)nhP`QoU*1fGpU`6A}>3SRX7912h?!(^3ET!Obg5ltS1_o;Y&;c21

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/progress.gif b/vid/src/main/webapp/static/fusion/raptor/images/progress.gif
deleted file mode 100644
index b713e27dfba708a01c380e7c731a13b52a34edfc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 734
zcmZ?wbhEHb6krfw*v!jdZ*RYU|9&kkt+4ULFya6I
z{|pQa5E95x{Lk&@8WQa67~pE8XTZz|68g!)$-uzNpaWzB4HaNuV6okB(sT7*i`QqX
zc^L!>4t!=<(wVp51?zD`Kkg=-D~S>;skcR%7#$omMC>21xN*pcHs0c0tRNsF(;}SM
ziPc1Fu!&|20tT$-nJa`fCQUjv@kC+C3!quI1U@ISvoqf2Xk|(i=IUl?N@{e_G3Yq3
z;U-H^uFrB+CTuRW+i+5nfx|fagWLs?!jQY{X6=arU0riqs^&x$2`7X};t
z37RYmQ;O#*G6uOVn*=nAm7~Q)&(!ybaj}oz`WtJ?PQSHN#^y?3ICf5PGS1Ha8pE+k
zgJmJh5y6y1=@^y-ft=a0ZG|ZdPArq?H(+2`(;|7`F{6Xpbl>GI8B?M_My|#ljzAN4
z3Pb@-+?qdUsm6)xA>j@^Y0K7lSt}-Mopvo#qQ-sCkLXFkyF
zSLvgkf4d8-w;?feL$4)lp3HYoMI*E5@=0AueT*09aVgICcu;r3k!5-F!GZ%U3=K0F
z9S$(a^)KPCsC4r`z65*B*uc`x?)kvPGDl;Yns{Fj0|R3#FisfHGY4!D^0$zED2R>s)qBO7<=E|DCFS
zxzznhP=52{@9z0pLYbH6&gT5ka-LOh%d)1mMV1}vOV1TfydP?9*K$^9_SYS;We#3<
h3YJ|z#=4t(zIw=6Lkq*ZVXLPoy7a`n`xF2FCIH?$X}JIZ

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/quickhelp_dk.gif b/vid/src/main/webapp/static/fusion/raptor/images/quickhelp_dk.gif
deleted file mode 100644
index 05fe83ec716bd4cd6d12daa0a640e8ef128589be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 155
zcmV;M0A&A1Nk%w1VGIBa0J9GO|NsBV*5os0nM8A;PI{+Yg{^6iv~7{La+SG~t;xI0
z-JrP7rM%Lu!q)Ni`2YX^A^8LW000jFEC2ui01N;O06+vt@JV*YI7~h!I!Q^_QKA?C
zg>XEGPyjHn2*@*(fMbY*)Rr_2t79+_f}2iZVL&)g0>({LPyia8ODQlDt$qeTKvdIE
JEEr7$06S0DKNJ7}

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/quickhelp_lt.gif b/vid/src/main/webapp/static/fusion/raptor/images/quickhelp_lt.gif
deleted file mode 100644
index b629545ef4006cf17bd56585a7f35924f2af787e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 897
zcmbu8zf0F~5XKKHYLJ8+BgoPvBZvd($E45?9a?OP79lT!2AhPoh%eb-k<@UTP$3CM
zM55$ULXvQiLpVfIh)W4VEsfXfKL0}R?YMiMd!FY$p9_QMPn{lVmv;FplJz3fGc8jy
zrK*Sw&#(;5kZO9Qd%C4-y40*inx|Qsrb$6HQa#mDHC13ri4;$<6iuOk8)~=!GcC2J
zo<~@OMo6utau2s~4VO|u(>%<=G)zhqv+AK1s-c2LpdlV&AsWI~R6~YnR3eKWi{XYE
zF2GWTs^*!yx=Z`=HC$53RhycpW>P`okF`{)rb4dRMFmY0H6cfmCIECXPSCg|O7cJ^XyQNq@SrBWY9<=Wi4n#~C-=H@Cj+XP*yH`x`miKC9t
zI4q_{bls%UQN#^3p95DSJUp>#=g;5O^{w?E+x=tHL*vgc-JZGHnj4vTb>rciabIdZ
zU7mcgGBvll6dTivpXZj>->rTB@MUvr`#0GCdB+P}|AOo@8GN+acj8dr&7Ui`Ixqe@
zct+&)=9OmMvSR5xm?zXRBrWnxjXLPG5e!YRd7v_Fea%eu{~S
zaY2zx2?sei~VmW>0w6fk=7LgNI
zu3o!-2!gGZr-L0r$mV`cM!6YMNS
z0xcR7AGveLSX~NsXgG4V(wSq$4Tppidt_Ao#Z*^3W(^#$I*cQhF2PQhS=3duR_~Fpv
z(95w+d5Xe^hpdf)#&J_-I5sgf-%?2^FBau#{yfLH<*U^}9!D+}mWTshjty=+%%=q;
zCQP(tt7I~2nQ8IhRmj%DRgX?jKmW?1k>$td*Z0rw-w#YyY#s9%v~Q>%Y~)Z|@t}#v
z?8Sp-0lAFBT-qWE2U;c4Ry=HzDSPp-T_H~65Q|*Eg#(=$%T_$<(%JUnQMbW7i$`1x
XS27;=T0C3vxX3+28>1_o;Y=reXr

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/raptor.jpg b/vid/src/main/webapp/static/fusion/raptor/images/raptor.jpg
deleted file mode 100644
index 401efb4b10411116bb4ccff32271d6224f7d2ebb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 889
zcmex=i3*BJ!6k`h{6D}T
z$ibk%puo&1$iO7X$SlbC{|JL510w?yGXoM}XJ%n#;{Zx&3otM-GJ^msBSfB&2`DGX
zCZxz9?8vTUC?XoDZ0rRH}TDedy3V;oi^JSC=(D
zio3Mv)V*u79A-~{-c(@Z{(Qy1VE=$X5%(wS=IvCvdi1N=wJc6q=kwfhZ#@1poP3mc
z?!JYs$fr+i>zTG{=WB&tz1SAys<2w~hnD*Z<#jE>C)i(?-r7{_FH<;oWAp?qCXcWQ
zZzoJV$M~JE@O;eb=c!ZOnxjsnbS>)JG^cI#!v2&XE1d;-aktYfnKkb$Kk>M4GXI@g
zk9YQqw3%K>)$ZNZb9@3zDTCF5;KvWI{AZYJxRm9%rrch&Ydll4m#ivJ(~w$r>-{4W
zg_9iTPe^}Pe~?n~s$b~Ni`cIZjK6v%7hWk(=-m+*k~>Y4q15oaRPpv-?J*_YTMh@6
zByO=ibu{;W?k;EVFOxifiEEu`bqOdhTkRfXUvj{VX-#`crJdESJ?5JW7Z)#{?-g`!
z-pTSy`o7U7d71m}M{7i?cZp3^_Sq)A_jpF1bibvnZj$<@-!Be*_M932e51QhRr1mm
z`X;y9+M;HybWvRUK2&ppo0{`<1{O)fll?#ceGLtD`cjlr=WZ3hZguHZaqm_pk1JDs
zb}vpnERY;Jq44m#*mM<#1GUcHCRpfA`>H*}wyr?l(4j
q#^f1CCQN(mFl|;_rrB+QCWZDLcU!D$7q&!~Gaj%F*x+;g|4jf}Ydt>z

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/raptor_logo.gif b/vid/src/main/webapp/static/fusion/raptor/images/raptor_logo.gif
deleted file mode 100644
index 5ea2629998beeaf9239ef57157ecfb266b6e61b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3150
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
        a%pfTWH*+0=e|)E#?j7M~kfIGJ}e
z_8BK+3AWbSMW%$AL}ttw=;@LC*x80t&CH#_5|&Yx+xXFq4uPl5yu+MD#`TlmQ=|st
z+Ra6
zm9?kmH9KT;0=Bgi{PC{4u*nGXp}N>&Of#rR68s9CkGTR&lLiF#Dp!B;XL>D(*csZCw|XtKS4PR1b62fP$ZsRia>CAgaXgRn{K{E*D&0at6tGTKa7b^zq|q2&gu4Bxgnrs3
zv9x`~?WdG*+xb2cPoq!}0voV-Q^B}%$5}2!uP&?Y6jr?r(C;U+xA$X)f0MsOE@H$(
z3~4H*L&%pQ?S|1giV@YAAYm%NdIGg5lD
zhmF(6YJ~Cms6PjMQT}Du9Xif9zgjp$tREnzF(14=is7k6*DHn(S^C~
zr~D#!L37IN$CcKxDN0$YhBkr3Dzh|s4a?2KEX}G9^LDpzOSftsv^^}sGOU^w)1DS-
znO4n`WiN}eEUPAs2v|cCUJ&6jr@#h`ZN};IfeQC@uU5!m-VvVR)q>$cJJK_~T0gXy
zj`A$8wgb1Y2R|?X#YjXGB47s_c2-my
zO)TVq@i>jOc!_zqg+2Iz0VqZyq``tUG~opiE&~lVU~Dr^pAS@ZW>|?r4)d;#ko*ap
zgo%_435}G9g&Z&*r?D0+PY;|B(y7>SSu3)awt7eu%WG}wT#%{YBNQ2g%xr51ii
zN2Cue53djZ6C2|Ly}Zus-JRT@jZZIL9DQDGUXLxV94|dTZe4xMAG|$%KfK?}4lXD6
QkG{5Vrw-5OW~Q|M2j<|RVE_OC

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/shareicon.gif b/vid/src/main/webapp/static/fusion/raptor/images/shareicon.gif
deleted file mode 100644
index 31153568cb0aa84eaceaa86b0e5728df823c8e11..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 542
zcmc&wyGz|*96i3Hy|wY#*!F63eMYSs?Zfo?xPDcyrVqWJli4I=+`jP^)c8>xB1LfM
z;Mh=UDYyi?1e`Kv42Y1`r65kyDUFkVf(H(qbC%!loZ|B0q_&Yk1_ueYwvxZ!kR%C!
z;go5bL7_5x_*IfGJ|FQ~Y+Ube{%p*h|LN_!`F?!*<;OaZHzjgtfGJ?AU}-Q^&7?4i
zAB8eAbce%8t>O8;AIIGDpsIvB8h1cVPz$=LTHFgl=oVxRq#R#fg;D%FxP;0aH#AHJ
z)zx$cnL+Ut5<_H=TtWj#0R$bQ4>5!o$w~;}$oGRVjDsL@-Sp&*X>v-Lu9pSD11!J=
zQV{?Va0Mhp;|Arob?+PUzv_zHAMUoVD{sTLE6KZEyJeNYCSjdO=)3m%LbAf6_5gntN%_>npD&KMsxW;fXrX+Fnz;H(J-6?ae-F&i#7+
p;#sC6J3O|kN$7s_wo?!uyk7mVY!{rirs@8vwX-6nOJsKk`Tu7nfHeRB

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/sv.png b/vid/src/main/webapp/static/fusion/raptor/images/sv.png
deleted file mode 100644
index f57fecb174d364e4e2db31466a76073243ad43fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11373
zcmV-zERxfSP)eSaefwW^{L9a%BK_cXuvnZfkR6VQ^(GZ*pgw?mQX*04xDXL_t(|+Uqn_2SMlWl&FKf2{|9y;2W&{BDa~z0BR*&@3HrAvfnHLrueme-N
zV8_Sfzde1wfA#aP`0x14*MEcmlHaoY3CN#-{0YdPfcy!FUf~Lm^3$JLZoZ-{04e4j
zivFIwbRYD|=T)JfmFM^N_49juey<<(^XvZh_`dBwKHm0k`}h5Se*D}1pZov&g8;dB
zefcSdlzW>1W&Inhe=h@9iEtC_^j!ftU=Tn)Avk`rJ+D52`264d1Bz|`_2Yg2@%Z0A
zK7M}y@_)Ys$i;pyUy!Wy8sKWTUc-JaQGB$>XOsybCA~wTPbtEQ(!aN>2Ep;aPiE8;
zkj9K{|MmdnZU61#`vZ<&_W%6&`~DyM|9JrrEOhThPL;Uix0iRZ-?3PFBWp!L3xE`X
ztH^5Xp{`Ut*ZUa&-O?}0Q5&%e#I@LdAvba2zA%J%P
zCphD|Wq>yK2jt8&u1mMmeF_x{cTF9d8d9J^}g5$&mke0P_2TBOVak4vQC@
zC^iNZld{Sju6%`Jtv&&QXvr)?^cBt@+R_sQ>=qr6<{BhbH~^_+;|Cxc1M=~XZzn^3
zc>wa4{ofuODOVx3OjA~w%MvafAmsblBMN4}K{4-8yg%#`R&!IpU*~azdj(zfM6mY0#?~4nvbRHAWNUVQ<=(S
zF`r$+CMb)_#=b!5s9k|MF@7q{pd>Z?qCPiI6DbY2r&!_ej>A1NAm5)1`S*{1+5fWt
zZ4F47WGVV(eW(kV5MasR9#W2SAv)McD@zhDbGdwqWM<3Ctl@
zZ%=+~Plmib0Qvm-{*bJ1Cm^2;`5zBJJ~>j7cT7db7q~J{QeJT2O}&uQl*k_^M<2?#
z!hq~cmsWv&!^Q!{RX(xxKUv!R2FG64E86QtdaF??vh=*WzXaHW
zRHZJ>nW_H_ar{^Mqrt?fcduOoy=zpl@tV#2Y3D8O9u4Hd5HLeNi{a<2_XmFe_+W4ps<{{&e2P_!wae4^eIv~e5
zv3p1}bv&E;gB!n{fc$j^NSOs)Xv#{N34VWf$-{iSZJPs9k5CAR8KZa8qD#OXVwGpL
z!z&7%?Hw(A4ADm`*YQXnk~A}KaTmmp&#&l`b$G}*Ts#2z_5kFVX_Zv^1d!szstv8f
z=|(X=Gr%HW2nDks&0ft_*$psM^GcUc8G|6qY9;1YN?GHYII+*0$M)n8O|ANg$5{w*
zE)VAFUWZzy9{DhuaThF7&M9Z0OBH_DU&h!zo$4hY&*qkZ&g-KO!JDC26igF}>SN
zS7WZ)eR3*1<4UIy7`cd+b#NnJ6$c2)d}h1L>~`l9zq<3y3B3e9&Ag3C#%W+b`2f#%
zTgr+(qyh5l3CJ-*nE^5tAj_I-ZeZFXK>5c&-F5XQox`cJvWm6X#S#
zfHs^krx=+b9Bk1eZM-?5$aPi8LIkA8-JOr5BxRwUhy3_>KLL3+fFSm53kb#Dk+LQ}
z@u6bWUSWeRixehvS>+3LjRFKtz=#t!5Ah6m$)aP~J|3y$8pA{C@DPmtaipva$S8&n
zKpyZM40$$o+yMk`6dtS@!J>1+<~oNgN_w6VI02idcru05yE7n&xvEO<$a#uj36ix@
z>}^2w!`glHk592WQr1JVpnz-w$l2KOnYJc?7*1g350)F4*tY?IW3L>idU1*aksw*g
zE#L-*U96saUu_(n6TOG*W1{;hS(Q#eS`|FLzsXRsorFA19RrZ
zqc!zS0ePDHCln74!FB@je%|VE01_CIvJzbHCc}mu|AD)CAqY!`q933_Qc@ZY4%WaK
zclU>VG8So!L6oXCHjGtJDj7sJ47KZ?pgv~JFl)f#%c8SZT#qmzC#
zg_9vCAkQOQw1cV!$gh`x>@p5CQj?6|?Ec^xVR+8$ViuV3InrV4p2s5+aFOOzyScHg
z|4b&iNRst5?yB89d5D<0OId><=efw|jn)H@cMnLGu4wTx)PQLj<^War5{#PP*V}lC
zv`9DVAO&1$9BEp$a}i93PyMF@h-T-Nq^n|hNHX;?%i2$doW<~YD=7}i`UK<{p?uz@
z^?m|^MP}OL>0LP6j^}kq^$zBITY1AG1#^Z+8GGp$ZmcSV~G#i7$xH
zDdF|v6Du1Bi(E01RR>=%28hW+#=xWvOAvxCpO<6&sZH~c^8^G7Q$KJ2IeN$uf4@H+
zMFBaFt6l-5AaxAOg$qu2&+uKN%NrSXXcY`ol&oF>cfNO|=PF56=wX)m(zp;#Kz1Ft
zAF?(~{qsHE_t-;f?;(eiFd)Y*4-W^yT(XdkOlPK!)FLJoFs7|y`7y~;0SHKx9Uf9h
z*0h6nV7O^CYwuze#)#BIShDH~kHp^7%nOF8Z^wxt&e(gVt#9X_BOHyrG30q%l>k9X
zNi#r@vQy_xeuWG^pvj4f9S~ZDGj$n+U?N$4=^+zbFa%+6r~#LH2*SV};f%0($ha{M
z{Jq8A_Lm_Bko^;qUp_O}mjO{T=dKYLR&u}%rXG8DpW32K;3+9xN$G2YLli%)+KVyu
z_J7IrDo7PeRt-I*-H8>>Loia71Elr!cEbL~fRy;1$BCGP*vZ!ra1oA|5V}QYh_i7A
zghW~^S&coEtArCH;9fAKOVv5cYLa!16U%Ai1?nMhO~MWjIVJ5|55LFB;Re3tAuwbG
z$O#0(9Uz896Ca82jGGdGG$NEyp@20PDQ1FpjdXR66E)@;iLtkT<&@P-
z{pjuAsExFlR%6JIH6Z3{1_*&xZos2E+*^8lPPXrC>O-nPhTYEs&tTh!C6FQ*O&xmj
zQFpmJanByoOugSix@!;Vu@|k4G(f(0K<1KV{bB6gl*f#R1dB&e!;g;!35%Q{a4;!<
zZb%}|(a!|ifZYn0O4a~G2JXQ_dJloz(~EHDA{3A|(>egzo{|*-nVYwWi)q;Ninq&M
zA@hhk;fcG7iytAFNEYHem;Wa4{HZXcs;ReIeom=6W3PG$c>Mke!SS5{IfwAQu|EO%
z1m=*eHxJ0{>%t@EP`E2?-zB0pM#sT;}C<`J$c
z4;LXvQODE@5s(^2CvO*~UeAy_3gXe!8!+dA?$-c07d9<#AB4!1X(m$1wl((h?uQHx
zG0Rn@
zG=|Zz0ol>%%0XakTQbvv6JqMxHGm*eMgQ(e7}R)E!{{V1WGY#WA!qCb0n&zxr~#PP
zLoy((9)1qvw;3QJQYg|xddh;diz^5~C*pxcCg^g?LSjhY(^!hs$rJ7xAM`b*EKoP^
zz>t|E0iv-N2@nFN^^kX}hmIlJ35bF~oM?UIV(Eo9QL=2;2ups86N4GRM63p&!zD0|
zWlhi>JtQ+En)y_+Ks`h~1TAINGi9~#OXr6)+4>Z%F94Fb6aksW+r*R)2S%16^HaH>L(tSUdP<18I?H!r-06g2NJfb@dcB&*GS-^ko&
zfWT#@nK;P=Y65{2Ld40fG9(IECBJb4LxZ%t%scV!gnue3~A;*0c6awWY>GJ2&MwtH9{erF=XZ;X-Gm4B-coJDh)@n
zha^+qMjOEx!%I`|oM?a?O`ZN6VWh0imwuNP+SK=~iKmxjKtLxL5s;Z%U?xlaGjWFw
zVF7UnVJs5FNd%13)v)uA>Z<%LeB{)OSmA8f-R)1{x?(T=ONG&!>yS*&3vE#pXI`2iy3kkkT`?NCZ4+nW|HL@
zA=jbc4Ywevf|*_+*||POiOQrbVo2qt4&qDu6P@lM!`jJ1K<6SSQ`*&gJFdb=TiV+r
zAUQ`(0EwpV;i01_v2oe=i8qp~kQl-ug>2u$HLAp31tP{=x|SYN_so>$FHN$BsUJthHHg!2ML@S1y0MXo|-|~GXK
zTmlw|Ny;J{kCIjUq{~WH^N?|-PF~WAA)Oy$oQ@nd@jNBD2MEXBxv48WS_M5b*wix=
zb=1TJM3X1Ska$J0cjPDntr~!wWIazpka`FKQpU~J$MYp+jo5n*ZzIEWAz3#VlEq0Txd>S+1l*F-749))<0IS-p_8mp6YDuhxe>8R1yAu}{3>lBp;Zxv*F1?ei*%eQFl_7kk0Hs3Mve#(pIy%uF0vR$wj;o$P
zjG9Q3tu-Ls&eJlR#?ekbQVTZ%Het*pS4nU8458+sgLa+kq6DjtroIV4($uk*tacvK
zV4=|o+Q_lT-jTU5Oub$Ll9*xux#JqSVaRJWRWVEiiw+LcbDUV6H%_1M*6?Uzh?T5k
zr?*y8$=s=_cR<=0o=yF{an3Si^pR^oCM77;_<6
zdj4?&hwoy=cPr=-zfLWf(k~L#U
z(S_IMjY$!*B&xs2*&r$kQ{s4EUQ^O-o~*Nrz{e%tqIr*fN-~%=PAPp22CW3
z)0Q!HWA!6NqZs1dobZvl`2)A8q@bpZ&%ZEoxy
z(bSzBT}qb5-ocPCEQw;(1T2`l1thqIt%4?H)yNP@SD_g8?^~C%+Tl?z=_!kQJ9zec
z-m|5El=%G^op3R-@o4mL|IfOi=O$Sl2t#Pi91stF}UubnO`!5#_zGQVYdj9OZ9wWyrS?5{F3Xo9qIB~hs2MVd3ec6vDXP%O$?#CPJ}TwWhD>kLwGgyZtdMs2#~FX;4WQjK*Bgg4xn6;n&&Co
zL&VfE86cwH)B~~cTMQwvoQDj)&`)ds=}1>63wk@r9L{pby*fZCAY$Xv8lBx+$
ztf_kt#-LCnt44_e<*F!4Cx6Cs34+l%JRm;y#?c9yT}QF1V&*Dg($q&yq#-;tc7Z@9
zTVwWn8vfxWUkAhoU1;Mz_cuuvGv)?EhKI1JkAZveiLv`ZyWewy<%~y&L!>sjVh?Fk
ztUiA4v)}WoHTL#L3TPr#0wC`_f!ziq=c~GaXXYqLvY2PWf)Q!6hv;)|GsNU7^^69^
zwrf*A_Iqvf-F6SWOnVom-e9ewGnHKsY7lK(#e)-B`s~O0MR6sQjTe2WhfFy<=5)W0UNqVo{Qi6Knv6;p5C
zL4TwGxj6`LmLV%ZcrpbuwUWK9{s6sSWF=V)8Z#srxHEP2nVzd=fFuZ*F9HpP;7S5k
zL-w+grIRfJMnkaa?Kc1kEO2r(gWy84a;h>65f71KNU_)DDj<$UphL#Z@`ZUYBx_Rv
zBaxyjJ`X`Mb-wih%#iXjAUZl3;uKOA*?17J$R!%7!<)Jo_uNC!uO+lzFvRtcE>S7=
zj=8TELzXNVq|gcb+1p3_-CFFW3Gm>{D}b0VOOGX(3LDUo7#2SqB{C(3V6KTWR=Ea5d_qU-2qiE*nqw~k@d87vckFy?
z0%&;=m)^x*15cRtA`KOTNV(bX_&S*K=0}Yf(nXH40wnpw41xtGG7zcyiK&n4x@UMs
zOom`O%e!C^LdYSr)|R
zp&lYItr&9YA;J)(rj9Vn8giC;i184NX>SRDL=V{pAUQKdKxXWz;ZetzJCZeH$jn37
zz)MI=mw;FSqtVHwWDU3~{VW3#8R8_XI8&dQ`Aonfm)N3_7yFA0k(4$0S(!+d1HyYq
z7%t9CeJWWpj5i+AI8lfb8y)Drfb_}MPXPj48}}U#;WG{~^*+m@-H#+kZO7Lg7p|dT6*-(Gc7qYWUspka9d?cT+tEGJo2SX3QPhKJ9e-sBRU6Dnxx9U=A}R-ZkDfhYk2zN+TxbwJcDC=$oXRG3pu
z%$%Rip28MSO`Vn%!UCAZj;_;|zk1_G3dO6GC8LutNWu6{DT_Ga_+kNxqrwnvp@YC1
z97rdPL#z
zu2HB_tGGqaP)?xl?HW7;2;)SOC2QZfezXRY-{`r{)VoMo51~;bo4SD~)x;GbsdsB9
z57zD=NaEBbFAEtDLiEwmDoA)j*C^4(`3@|tiQ&;ri{Y4M={OOAG2TOlsiPQkm&w*R
zO{9Tic@>b5r;x2Wdq_z}&Kv;w!c?+2SJCn!)I7lN{xW|wq^cBqX@JtJAV=Q9HWD_P-LCI8o#EfS5dmGBx$E?|TX&$qLD-q{TK2k;O*X@5P9eiM
zIOwv643UbaPBUNvuc7NaS|+Y7bwDBz+(Y%jSD~7SF+%AU?*IwRaE&AJq+dG^VaXEcDvb^Mb(l
        sH%BDIs<8Lz2ZaFcUyR(2cPd*=HzMS$K?Ob%~ln
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

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/tab_left_sel.gif b/vid/src/main/webapp/static/fusion/raptor/images/tab_left_sel.gif
deleted file mode 100644
index 9a534806a3d2cdf1f561b23f3df5ea84a44064f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 106
zcmZ?wbhEHbCDMGlDm$-EFzMgk49fe>n?-
FH2@0WB%J^N

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/tab_right.gif b/vid/src/main/webapp/static/fusion/raptor/images/tab_right.gif
deleted file mode 100644
index 62f251623b5af71a642686a334e8fb861b7db683..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 138
zcmZ?wbhEHb6{|wPX#A``c2r$balzsFrjDf{7oyQBO4=BTa>EJq_-^7{d;T^Z*RqwV*7*n9x`eS4Aua=
CaUzTW

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/test_run.gif b/vid/src/main/webapp/static/fusion/raptor/images/test_run.gif
deleted file mode 100644
index 92c1c3dc27d319bf6abef7fbc7c1c3c002b708f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 330
zcmV-Q0k!@|Nk%w1VGsZi0M$MKX#W6b{{Z><`D_0GYX1QG|M$|;(qxQFWBCAUtU>4h
z)@1ttY~3D~n3Z&XZT$ZGzWsYh1vu6GPZT|pi{{U$J1Z)2X`1ttaigX=Cp(*SI0y3U!itKrN
zA4*M=JAS=^10fZgV9vF;T5*2%A0~{;|85SplJs|@O7%(0s0(E#Z
cDGoOmBu5|{2`CLJl}IlWD+Z-htUf^iJI_;^x&QzG

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/text.gif b/vid/src/main/webapp/static/fusion/raptor/images/text.gif
deleted file mode 100644
index 6db2fe1edfc7cf9a3e9607913310266f52cb9be4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 141
zcmZ?wbhEHbg?oy^+88&+tVz;(vzb{gr5#(gle>w9!5RQ6uP{dd

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/tree/context-menu-gradient.gif b/vid/src/main/webapp/static/fusion/raptor/images/tree/context-menu-gradient.gif
deleted file mode 100644
index 6e289cecc51b59a01c1278ce95653badf4e643de..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 807
xcmZ?wbhEHbWMp7u_|7m2Mnhmkhk)Ww7Dfh!{|q{yPypo#1`Za6|Ew$w)&O`M20Z`(

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_folder.gif b/vid/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_folder.gif
deleted file mode 100644
index cd89accb5ff8fa9fcdb028e0e4e302524ace4c69..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1120
zcmchW`!|~h06@R09@eQ77RRf#)F@LnI-|0!_3oHQ(@ooH8||o9RaM7odbVWoR$D}B
zh*u=ih(}N)5pR`lf_a3NE=Ud$rt%?@IEnAu`cLeh`}_UrUI+?2>vanWAOST1ppXdL
z_f4Ho9rv&^^>TCcb3tDC*fiJ`5$uW#b4P}qLk6JTBLXesF;*EjPDF>>rCf8(xP!*{
z`d~vt5+lRYV=w=djLnI${x!jxlzf7G*QWY=TWXp)E5nTb=mST%%ME
zx&$>@ff7}o7FRjHq@EVhy|~f^87(=7}ysM_Fe*eFUxwO-w3ea
z00tbq1P(=lBayo!*FZre_yP;QhysOJa5QRrENX8&N;(|B`8;WREOu|=_V#$f&P1Ye
z^qy)uPC1pJo=H^A+*6D0E2lE|XH&EpX`E+RE2k7-fNc=OEl0&8B)lrBI
z)nqo6%%+jq3^JQZX0s~zEF71a!*3$+TeA4|Tk
z)clQy#W;8o4=)nnr7YFb6X`34Y=Hqwv*G1@SW*Z}ij>kac$o;T65*9%SVn?mCGZLv
zUZp^56nL%XV51D$pg`+2Dk)XHMpvyd)$&HoMm@Ayd!V4{HlIRUPxm)i8U^cMt7%Ws
zrjm2ja-Mdpbzjk`RdneT&mcvYM$Us2JT2G^fovG;SeO(3vo2BZ%J-BzI-ORh(;XZf
zKoA7OFz~-{a$o-t0KkCr+uGYF07DqyzjOS{*4n{4Wrz>Ixq8gnlc4W;Ke#@4)*-YM
z{jE^YM(et(cQT?b9`jzEe>uwd5j~G23?f;$pktVmD07#qhyuIGVu$!ivb}b-(A)__
zl{UFOIFfIOFRBZm$&AWfZ*)ekQfC;2X7-NGhDhb+d`I*^>d1Fb;*71_BFa`!7@wQ9
zvEy`;Vf#k226WO;65jTCj=@pALvGQr&SfrF>NmNT!?z1cP-i?s5SqC8_FJ5r<=wlo
z$L3Dqd73<`&oAERM+)9lq-_{ix<|G9d+iVmjEvsZSFO($&N+RaD#A_K*8f4Y`2>3%
zg(Cjdc!jn|9Gs5HH$k0E7JY$p8^Qzl%#ZL+B{8|iRt_O#V4He4*XWp@q3D@!Kmo$U
g8w3s?wZj2=1{N0w0D!r&Oh5!WO0x8i=mVeq3*8(!MF0Q*

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_minus.gif b/vid/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_minus.gif
deleted file mode 100644
index 45ff7280097b4f8f447a66bb619b846fdb8b3cbc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 197
zcmZ?wbhEHb6k_0IIKsg2|HuCcD-JB!aNzXC>mNS+-*Di;feRlFTzGKd#)k(FK79D`
z|Gl+R{`0(TZfeQ}~T=?+e!~X*}K0J8w
z;rZ+L7l4cpA09mTu;Ijm2@8OV{x4W@V8Mwf+E_2IZBL%z;F%$
z#h)yU3=IDnbU>a2egTwKuI+n{sPHtS_GlL^5ug0=yf!}-^d8VzBQx+YV@7}#g
art7kX_tJpbdbM0vmt1WP+04emU=0AYMm#?N

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_sheet_crosstab.gif b/vid/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_sheet_crosstab.gif
deleted file mode 100644
index f8ccce34a2e9a64d1990956b7f632147f6957b30..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1144
zcmdVZ*;5+@00!_4u?(e>1{?4gKxk>El@_q$Xev5Vdnni{6}d{#5Yk#1#^P|a16a9D
zC=u-oB^r;rl4z0_Aiz
z2_ONR0FZy;m%Yghd;R96Y02O&L3npaS4$^G|I!2(|19F@MhMmB0
z1Tb8LTzf#SCm_%J5)BTdS%b2nmvi92Yj)yQ=W7fkG#4cmdZP>U5qVZ}u7#Y3MCU^%
ziyd({p}1S{`R~maZyP^gZj{z_e^y~gs?erX8!ob(Ni~*~T1y%WqBfec8j#FJEU5|l
zf{SKy;4hmkR1TcQh0}TV489|S@4O;#ToE`kg|4rm>YqKvz)8?BatHe(^rLhIV5iMGpc->j)BZMaj(uCH!vsBL0bw=~ys
zntl}W*&Ra8PaWJI5wEX@C+-#Y_X+yN!m-i8KmT}G-?dQPt*Pk+?>$nr4`S^@Ufz&L
zIP4J*PT!ZzKNwy7`H5OI=6*Z{O2>z!km(t0RzhYKY*E7&4FaiQ2t*()0_&{svK3jjA!^L3Ly;BKx{6x$
zb`-Rs28RuF*t8C8m(GbTJFyj)W7X|6*ia*8GhsHf9kaNd#x>V2lgDNDxGf$x*37XRQ$
z__$y~9qYxjl&`6#{IuILr
zM7$9CZjp}`$Cw$opDdP?WIgtO4m05#IRHGG${>N#J^k0BlA(xM9^k}u`sBSQX3f72s8lv>(lv#
zdH{4dp=DKipyhzhK&<7I9H-K)K@3LR#I0ow79Ai;aLTD*+^pI~DLj-SsA4uU+I6Zt
zH>vTe^8I?fjVp9<77tgj$*?wHG6z`)r7vSStI@KNF%)k$uCKNMl}&}&q1HF&34Dm64$N@U!oLr!;iYh8DfF;xG`uH9W79RqEh{cT;t?R)ok
zw)b{+436%9)f1fx?3fC)Oh%fy{PceYW_^Az1?^E;YRS-LRai
zIyCmqz2BBs9wr3&&qwLZN;;cPW*%o&QrUD`NUr2^E25O9mjBv(~FyNVp2k+V4=mlLxBpOv$`Ao8*x
z@EMWk1zwVKvMgpKF)N8VQOc|?$TBaBg8UyPQIaHClEMFmEsG%l$iV%i>B%PmDT7aj
zYPZjI0;+~~+8qN0!QOKpw9drthsO)|J(xcdnKPER{Y;`)_D)2PZ>Ucm%{vpCxfmbn
zIZV}Jv9r&=blM&poc-luJOr*=mzE#=X!jXGY0nqa=bqhhw8nd&YqCiJGfk8~OeD_%}M~_J{*Jd#!igGcn_7
zz3g}MT~}U5kL6*nHC)ofZu&1P%4S=ZZq}XrjDF_fd?xz#&dYt%A1?R){lZ;-tjxKf
z$Hu-i1^eH>bD+7U{kgZcl`f3B#{V)0dv4!4eFPd0E=`Pn+6qGO_vuMCc+W9%qvG4^
y!$;O|?iJd(Wo{1{{OQfwn}KVCU)?CbVD%}3jZsg?v8>5w%N9?)!B!&(*z^xu@scS3

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_sheet_graph.gif b/vid/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_sheet_graph.gif
deleted file mode 100644
index c8efeed8fccb5904c35e1ff8afcfac35af181d7f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 983
zcmZ?wbhEHb6k!ly_|5dX?GuzPZUeHn!L79B0Xm
z`3F1mPZpLREUZ7+SpP6G{b6MN%p~-YMfd@;@)i6%-y=7@jkCI29goFC+ee
zyVGMYhc~X?kHbQr#6&);$a^xY{l%oV*VFo5&FFhSd(yKdGv6+o{&COdH^>h!SjV!~uq*5w?A7d9^Fm+|2cvs|$FiGzx|
z(H#$^3ny8`t!2I`NVGDwOBhH9Ok{e}+RVV0%_Aw{(#pi6Wuo)Lu*r>KNeBbago2hX
zAr|eBkO>5pwJ{JBkr)IqA`iBTP*Wx+*gM~EIk6OOadDi71!Tet)!zO
fkZ@ze;XS-k=5;zdH$^ebFwVZ$W0`!Yfx#L8E+w|N

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/tree/dragDrop_ind1.gif b/vid/src/main/webapp/static/fusion/raptor/images/tree/dragDrop_ind1.gif
deleted file mode 100644
index 2f9bf5a658dd413e71394bd7a7e7a5ee7484dfec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 53
zcmZ?wbhEHb0r5dH3`{&d{VTH{@GqXzce9#{!5RQO
C!3{0|

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/tree/dragDrop_ind2.gif b/vid/src/main/webapp/static/fusion/raptor/images/tree/dragDrop_ind2.gif
deleted file mode 100644
index a1da63108a5b87bc573b98c16193624f66ab62e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 56
zcmZ?wbhEHbjEB<5wG8q|kKzxu40~3EwKif(6-;3sKIW|r1+%g6R
FYXE2^4z&OP

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/tree/folder_close.gif b/vid/src/main/webapp/static/fusion/raptor/images/tree/folder_close.gif
deleted file mode 100644
index bba11d3901104873a4afec51a7ecee851dd8f244..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 283
zcmZ?wbhEHb6krfxxXQrL)YR12*vP=Z@c;jRAUWiK;!hSv1_l-e9gxdGeqvy=aA+#<
z(2?ptv7|^c!)osF0|{QTEQ>;4UDY@nwQ+yJ5ATL)d!Hnk@786yko%~3-!S=8s#5af{2qyg(Jo`C4r_bSm=iY3&czuDALGq_W
z&@xPgYed*Q1dff!NQ!8%YdmUI6Hy+tRsd8AZX{?WeJb<{poy^=y9DB5gqDBV{&=we
z{p;uVN`TW5W3f#@CrYjeYzrZ{Rn*pKs=+Eiryg%nuhXdfl{4FqYv4Tlbskiu7Qhxvps~A$oSF0Q4=KGB9$f1sUHo6m2J?X~9?XR35Kmt9cX
zkAs&tE>RM}vj-#B9_^%0DsrPID1QorUvZF|Ucc}PWVH@-zTC$%wi@KmG;N(t~0C3f3B~@R#=VwN4rbtr-^YzWG)#U~2jN^GoZ_
NzyJNefyI%*8UO@ZCwTw>

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/tree/folder_sub.gif b/vid/src/main/webapp/static/fusion/raptor/images/tree/folder_sub.gif
deleted file mode 100644
index e3c8e44ec174a7cb896d542b72d4ce3372cb407a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 265
zcmZ?wbhEHb6krfxxXQ@T*x1N0l!4+;7DfgJMg|>_CqRB;U{gELP{1J})qg@|(~2Cc
h&hslKX|Cm38J1Zn{UB}neJ!&)GLt8#6$vm{0|4(R7U}>1

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/tree/grnarrowleft.gif b/vid/src/main/webapp/static/fusion/raptor/images/tree/grnarrowleft.gif
deleted file mode 100644
index 22b9bdbef94f5236b6c45f1b0ee244adeb1b697d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 854
zcmZ?wbhEHbo401@aEo&W#<

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/txt_icon.gif b/vid/src/main/webapp/static/fusion/raptor/images/txt_icon.gif
deleted file mode 100644
index 0a73eb528f5bc9d19fdc9d832a276e5f5e45bfd2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 154
zcmZ?wbhEHbo_6!xF4BNL?B?KS2u#MsW|L>pg{l9(T
z|Nndc|G)qL|G(l-7DfgJeg++oPLLT6EbbppvagbzY&31x;{F9aDUA&eE7o*1GB8Fe
z$r~`9-DK#UPa$=z|ml
z=ckpFCl;kLWag#i>!oGpq^9K;V@WICg-Q52IQp&rxumvq?Tkb)*Aq|
zI)Svhq!uR^WfqiV=I1eFl#~=$>Fbx5mm`}2GE*N+ltK*BPXoFSD3X#|p_fsTd$;3Z
z4A3-dkZI2O1(ija=@}(3vyzKa6H7A7Qj_y@bMy0x_413-^>Z?lQ}c>bi}jN#b@P&S
zixc&Y^bGWKIwpbqv(eMVF{I+w+ZzXY85B4e48N6C$R762aDO1jk_MD!Xqew8xFsnj
zIpe5+ikS0+2p-2ILzYhRI4%N#EE})53LZ)9xPEey#*sw=-A+1O8}TtfPCy20zA?z~
V@Y(b3UVa-S?CI*~vd$@?2>>8&q+kF5

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/uF034.png b/vid/src/main/webapp/static/fusion/raptor/images/uF034.png
deleted file mode 100644
index 4f6073452948d052d09b1781c631c4ace4c96f1a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 536
zcmeAS@N?(olHy`uVBq!ia0vp^DImTV;?(En=FLC_`XB|t
z`DrEPiAAXlnR#jXdTE(CscHE|xrrruDTyVCdZBrl$@wX%0eR`csYPWusU;bV^#(w#
zP9Uu=sl~}fnFS@8`FRW(B_#z``ugSN<;Z4$%+v=Hr4WPk(}3;+iln4g=w+1Te%bux
zKF~C4kZI2O1(ija=@}(3vyzKa6H7A7Qj_y@bMy0x_413-^>Z?lQ}c>bi}jN#b@P&S
zixc&Y^bGWKIwpbqbI{YpF{I+w+v^8885DR}4t~k~7}fkBdE!i=P5sKoKm`m3yiapR
zZPVDRu!yC(Lx@Mo%b-K!AbA`Pr49+VSOG(uwvLaH0)|eGM>tpol|@{70*K=X7=j#x
b40e<-JX^qLpCCOG6v7Oiu6{1-oD!M?Q;W)SQcE%z>kWWf
zoj_V$Qj3#|G7CyF^Ya)oN=gc>^!3Zj%aP3hnW+yZN+Aa6rvcpu6iG>~(90;vHMP~2
z2byLLGR--^pt2}4J);C>R&r5lVo7FMYI1&VZhl^|UVc%!eokg`YF=?_v3^peZeFr(
zaiYGFo`HT&$0U${CV09yhE&{odvzo40RsVM!}oI^PCn)kX7St8K{#gNR-g(9c<}v=
zVCTnookCrTUIuL%2PGDl6|I3PO_+inT$-o`^H%N
VmCwG{({B$**wfX|Wt~$(696vGo2UQ)

diff --git a/vid/src/main/webapp/static/fusion/raptor/images/uF036.png b/vid/src/main/webapp/static/fusion/raptor/images/uF036.png
deleted file mode 100644
index da9db296078ebb137b0f390319ee36d04306dd3c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 482
zcmeAS@N?(olHy`uVBq!ia0vp^DIm?Q;W)SQcE%z>kWWf
zoj_V$Qj3#|G7CyF^Ya)oN=gc>^!3Zj%aP3hnW+yZN+Aa6rvcpu6iG>~(90;vU31@8
z4rrP+$Ta8tg36-I^o$aiS;ez#rjE=x_QaE
z#fkbxdItJA9g{%*>GpJS45_&F_97#1gMq+-13%|gv~j)oRPHHSq6?IUfx6B2=bgT_
zY)0a#Cz9qqlIDwTQs4AEn)1=uEBFkDuc5NZ(Vhz;#!f_YVCEv|hJKk$Lq7Yf46EG%?U-IXlbLZy#%lDoCToEAz
z-QC?pBobk4Yz)k=npiCU-@o(o^TELaT)1$7ya|54pLBI~k+!xr=K1Ukn
zu^0k@0A7do_I4B&7UJN+gSdP5E?Qe#as2pkybdarihJqWhw<=uJm~N5$Kc=~%w{t>
zJ3En_oD7S_g5u(0R8>_WB_##xAU?pQOP837<6wS%9(IQl3n39?DLIho3y__Y0GGoG
zS(*$T*Kgs+n>Vp3I~xTB1&~UmFF9C+7%xy#Qo@ZP7z|=|b{5mm1!QgBjLSn@z38Au$YYSxgAhQV$doTP)b49PNX=WBcc5}B+_7I
zB?ZVWDu;3E85|DB`T_3WzmLVR1l2osU`_~Q^vN(K)Q$tSJ5ZYY4$?NL!H_N!VfSD!
zWcB;8Y%oBnkRmlX31wxaAQA=c-MhC&MH~|o6Hp{-A(zQ8Gd+bwl@gxi1x$=j;=M8^
z0BV;nqw>K6taNn1R8s@V*7uR5QG-APy)G50>3WQgj;>#U-EK#cHWdqA4?HdbHme2V
zSeUhrb7Z@93t%IFN^?-7f#T>s=cl6beB`TN4Qd
z5L^jhW@Zj1N|;gtDCJ^Aqft~;RPZGHd-vkh$&+~e_%W@FKrE3!u23Kv1A>7i_AaYB
zE&v}1Nl8g?xSjkYX6ST$W1q_juVBOZ^XK{Vrluxl{M4qWr^Dy-Ax)>_fgFMxPAUo=
zT}L93cn%~qi_+3kEc=}BxZOO9a3~DHZpG=-r?8D?-_mjpM~)o9$jAuqv%z5C?Fp^~
z5spN7))un~TefUr`^5#|*;Q9pBkXr$YRZVEr6mLc%lPZzpE&zX3+;bBD7IiI?7
zb8{FN7~oX|LqRP0{V+a#3V~Lzi}FPGiwnRni;Rp6=+e?KGd_f=>1i&#y3f8uenAm(
za&w_nsTo%+JN7OQ=J9wD4o5I!GGTC_A4NrlOi66NxBzULaw{({M{v=NzTdj=)c6dc
zNEA}J0x<$wfgDz=6*B4x;bl`|V|*~)xqTZxD(}k5%GJH%NM4=kytJJ=ccQnq7r*>;
z9nS65Fwj|}OVvUwA`mD)fCw%s3NJMyZD(I^ALT2EhK7b!F4xF(&FysT*fD;K-MH}s
z9_llZlb46A%uHw!6A)NlrX*Woo;7j*>45{BdIinsOI
b!j0iS`~}CFLktAO00000NkvXXu0mjf++1`$

diff --git a/vid/src/main/webapp/static/fusion/raptor/img/Calendar-16x16.png b/vid/src/main/webapp/static/fusion/raptor/img/Calendar-16x16.png
deleted file mode 100644
index ac970bda5aef01cd511c0e7057a2908c35684fb2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 552
zcmV+@0@wYCP)(aA0vjm$GKT!NKV0=%S*cl$4Z&goLZB
zt9p8RZf3oV`F2-$H!JyRzN^NI5;@=
z_V$N|hu7EFeSLlX{rxH`DlacDfq{YL<>iKkhEPyYb#--KUS8DH)X>n-@9*#R_4WGt
z`dC<4K0ZF(-QB#qyUWYV(a_MVs;bu3*4WqA>+9>EpP!SHlW1sY=jZ3@>gwlM!Rn-&G^DQzX&f*6E1TOv(fEX!Mq{&gE`z~ZIh?xL?lP&AiXnaEPS-cLclYeW;}ZhoIq~xP
qmP{%ieEJgs&wlAN?EB}J`2+vOKN)2h$QSPb0000&DPQaDX_8vaoya2(=drgx5|^
z{{sX6cz8VT?7R>Xazt48yqMSp4UK0fPCR?|?D_NO4}sv~#hYPaZ@j&~1O~p#&;Om3
zwM9(qq=3M~efyp~dGhe&$y?FUuV24@eD>^NLBWq7KfX9~=IQR;_xJCA@ZiDybLVcj
zxxMuA+AAkFfsgNopC8cg(?vz^sjA-c^Sifu_e~$4x3RG|A|meX*>k(0;Z01;W;eHg
zRaKi98TV*wzqGJ;U}^awJp6xA(Z{^JM`>xVva^pzMowj8dlL|FF*deaK;XKk=huXU
zfBE@ei;J&kWefP4lt>3dz6Bt`+B|(0`
z2z;_y*QWZ{Pv*&NlWmqRee(0?lP61;+RU8E*7E013!A~}=g(IgEZSMM0jT4Yr;B4q
zMcmx;m&;fJMOZG}dACtCI{Egt+#}m^U(cRw{Fi;@@~Gb{S3Qq+UEa|zF;xX`RAZ!z2169QfXuD??0b@ef#(E>)*{DY!6N>-Bjg#XH7^pcMOBi
z!jP4wQJwb^Og=LF2%CNPVTtD*x%K`G3OsFxCT8f&^H_FCso`GCz5t!6(QnV)36f{1
zOfAi=O)k!^PA^|C&%i4qCp&-6yt(l)d_srY+T7p0lb4(CcKjHpLq<~3tKzCOv3-A-
Yq#ZRBZhPE*3iK6&r>mdKI;Vst048HtuK)l5

diff --git a/vid/src/main/webapp/static/fusion/raptor/img/addbtn.png b/vid/src/main/webapp/static/fusion/raptor/img/addbtn.png
deleted file mode 100644
index 8f746db6344f2d90f7f3b00b4fdb2bbaa6db7b95..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 662
zcmV;H0%`q;P)1CwVuy+|2CE&iCvZ
zwrxYN*Rxlv6`W2dK>U9!!!RHi3_?Diheo4e80~i3-tYHNuh$`)&4Ou~f>AaA1(Ak-
zS}G&ueZrs5Cu}ww=yto1OeVohBoaT(W)pI`oWm@Cuh&Zn`~70E7^Kr_7!HSE9gj!I
zWHQ1comWKX9uiH3lRU=>MqQ}WI-k#iK%Thei0_w5C5JwpPL&FE@|Vj6to!{AkH^Dz
zu|y&f2gYc5F_zZtb^{BAexsN#zw#Je3x&9#F2`;u@T>TGy@G|>G2E&)krm2DP$*@2
zF9ur}Z?u>fhAdF4)joPT91c5hwOaky9}EV{GZ7X!<~h@w~fvEfiy@
zRH4=NqSu0xJ>}tu;j_(CB$+;
z&1N&ta~fA55ctd2Pl=SIMktT4RFlVy&#g0>rr%?JcP4Y{
z)33R|bLV@`J@=mb^GtOc3B$d8zz)op
z1kx#Eam0IghIEAeunc38v6-n2_XH0RRoOxrG)XC1-3qIvR7*8t@jeD8um`8`EI}B_
z8k4cw(20zNnV=$FgJBDocbJ5I5i>nz$>Zm<5$fPE3vUpH85_|Hn1^He9fD1}M4U42
zg$5BVxA3`wQMgPQTa*pBq0>MD(kPTwf!D<62nN$cl{LeXZpOuOB&;kdrMNM9r-H24
zZJB-%w`-e?4rg6U*y}L426mx6*O!D#a}JN&o-=07*qoM6N<$f^*mIf&c&j

diff --git a/vid/src/main/webapp/static/fusion/raptor/img/copyicon-highlighted.png b/vid/src/main/webapp/static/fusion/raptor/img/copyicon-highlighted.png
deleted file mode 100644
index 312c43984ec7a2068594cb31e93565fca17f3f26..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 264
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~q!3HGX7W?Z1DaPU;cPEB*=VV?2Ic!PZ?k)`f
z7)~-sehCWj0g7-IctjR6FmMZlFeAgPITAoY_7YEDSN1!MTw*dTOfEl{0fjm|T^vI+
z&L@k!x2T-e=<;EM!+nusX^9C52_NqJPYUo+(a0){^luF_e%GqizjV(@hJb6Mw<&;$Ux
CZB>r|

diff --git a/vid/src/main/webapp/static/fusion/raptor/img/copyicon.png b/vid/src/main/webapp/static/fusion/raptor/img/copyicon.png
deleted file mode 100644
index 6c1c3c155f6d2dbaf649a4f5094ff679b95960c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 235
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~q!3HGX7W?Z1DaPU;cPEB*=VV?2Ic!PZ?k)`C
z3>^$7)npGG1d4DLctjR6FmMZlFeAgPITAoY_7YEDSN1!MTw=l^GqS((0)?_YT^vI+
z&flH1oA-bLhf9A)V!q0;B$;wQVb_0}$I8UDRQM|9Oqe3%=fv2M(q}efW(o7WLtAD(
zneo8;f}Td^S)US>S#tt(Z!1<5mmfDf*vWo%g1kV?>h-sSvRLY0IsUw_Qv77fLiW`r
b3gO^r07ZZb9?HtTFf{z&?foM;`Cmziw@m*Bpy6UAL4F{Y
zFfbS!djLUUVRiKx2x!nuJq#3g^K@|xk+__k;KOP>
z$SlZU&rqycaA6@!r;0!BN1YS34fTpD^R%o27eCqCZ?c?MVg3J`
E0D=f~PXGV_

diff --git a/vid/src/main/webapp/static/fusion/raptor/img/csv_icon.jpg b/vid/src/main/webapp/static/fusion/raptor/img/csv_icon.jpg
deleted file mode 100644
index b4d795bdb12afcfaeb861fa857a3df0b19acd187..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 632
zcmex=7?=bZ
znFSgDA7Ky!JCy+maIkR##pMJTn3$MB`e0IQ?98l8EF6rSLLxwUQ6w3N3RZTYu%aLX
z6C)ElLKg!g6Elk-11lT5kfNceJj{$h>zM@^>={a|XKqppdC)SI^TXb)wY#3r
z*?#J_AD=4!EW_X3AAU)^?+{Txa=K73TvMkmKDED5HAq5ocC}grgLLv7wutOdLGDkv
z@k(3d{~UW1u(rB>%K7TZw~Ksw*FW!&pU(8?uF!*z^$-8*UD(;Vm21D^iUTYkB_}H?
za$Z_8X^~ogY*Fe9pYDBYvi>~!dE?$1w{5fLMlc5(nTFP_iE8`u{epMZt*p7)#|_R|
zhMutbJSC~4p4WlPO2W*)1jc!t{Tlh8v
zZEUTQm~|&3a*G4oy~2phIU7&*x^}(2{Z{3qi{(4f)>cV(b%z;q4JF*=mRw4xSiDU-
zaZSpV`&p};^&ED&26nM(oD^9rvVeVKMGCi;Wy+2K-kll}b6lr|UI^dR&g1x^Z>k5E
SvofFV`|09hZ~i6!zX<>U9I`3^

diff --git a/vid/src/main/webapp/static/fusion/raptor/img/csv_icon.png b/vid/src/main/webapp/static/fusion/raptor/img/csv_icon.png
deleted file mode 100644
index bfae8fc31a546895dbec642834d1f1b4509b21b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 938
zcmV;b16BNqP)5r00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyS$
z6afNV8CzKZ00SyXL_t(2&n3Z6Y*Pgs!13?vd;Pz*>nM!G0grGzYWQxXwc;f28WQp-I@i6B+5MdM%Sw`j#1`!QvXqk0DxBgw%e{1{t+PSB;;?&Nld)M9w~@OswQ%A_7_?DH6?qWIV`#enqIH+
z{lX>g-ie~BPClJDPb7JVg~d6NsTD>J9OBTkBLKJ@uu;e}@!=$bg@XrQ7ERMsj=nTX
zFu0rW)t@-=-Z7ro-Gyq~WIeY=V5^UOF@sJOD=to+I?T?&5H6>}xsT4Gfr&|zYOT!v
z1A7Q;bF=XC6>3I`3m49_r*j|P4mT>G^1p%5Adeo#aJs!%G^+&*P%ajjpT9|0_ZC7s
zgQyzJg)ftl1et6S3kt=mAV6?H#T3}cm(ddORi?w!T)F%s?f$JyO-(WO)+jb-mGIST
zJpI&u`uqDaFt9nC0K{Sd8VbZ+-ktD3aAwlh6@iOJ7q>G1Xu
zyD-znzy&QzTvx$&1Kxt|*aoS^oI9E{nGtGI!mO$7>=_4xN^-zWz&w_r4*T
zf&~RDD$uN1S&2Y&If808$rZBnbnjp}lEGrO6X*zX>t=o$d%PmbdkN^Mx
M07*qoM6N<$f@vGH@c;k-

diff --git a/vid/src/main/webapp/static/fusion/raptor/img/deleteicon-highlighted.gif b/vid/src/main/webapp/static/fusion/raptor/img/deleteicon-highlighted.gif
deleted file mode 100644
index b62241b4eb603c63642e7e9f258b7cd6b583885b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 592
zcmZ?wbhEHb6krfwIL63OSk?Of|NnJ64o{l5^5f?(vzBZ)a{9`(JCAl8x%lMu$DK#c
z>zF%z`1D?`s3%jufI0#KBi$}ACsD|ZRYsk#YasOhpTs=O`N;x
z;Mtoyj-20r>Pkdn_PnKQb{x5|>*$4vbC=Irw6d_et$pI`MXR@InL5;WOuts
z!{ReH9XR*l^OrfxHWk*i$ED>L)phmETzdTC&4XvIH}*`w^W=3_aZP4XT~1k3YF>q!
zk==&f$751*tJ@~Nc>neI`Rjet=g(NQZpwnyvsY~S@%R7YRH%<=E7`yz-`<
zM=rSeMLd4>Au+4i(L40~m0LRwpSy7D$@%LKrp{TqVehH3#_rw6uUx(T=;r-rx)#nU
zc@@9_p&L;A$->CMP|u*l00f{oabREDP~X%P!O+GK(cBzi!N|tK$;!^b%p~L0*~(`o
z8Eh=eWuxgLWzl$P)5386+4J)Oj~EQK+~k!*992y<)a;f=SRP+HHBe>y
zwh!KF4hMUqMcH;mJ$iDji@_txM6ijqg@aMCD&z2{6n0h~bse1xn;JUTI51cP06PL*
Ag8%>k

diff --git a/vid/src/main/webapp/static/fusion/raptor/img/deleteicon-highlighted.png b/vid/src/main/webapp/static/fusion/raptor/img/deleteicon-highlighted.png
deleted file mode 100644
index aee193def999904183810416966b2742e5d0bacf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}P)Px#24YJ`L;(H($p9JjQcz3)000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyS)
z792Lplc**D00Fj1L_t(I%cYY|Yg0iKhM!3zArz_wG09
zGosLFwX1_>Y5Ht;snY3fub2PSn(3k>uMV1}M-Lz1L;yIE&GNYZjNPS5C($G@^S6%2
zMe3-~XtirQb^Vuk|LKd?cIsMawA$H(*dGc%`hDWqVXb9sW5%(=TE}QKCK`fPH!V%XZaLhH(S3rU04O0pQ#W2jbkESG6sXe7%;}9OI2AZoZ;iuTKctr0W;$qUp8VzQ~&?~07*qoM6N<$
Eg6N|5DF6Tf

diff --git a/vid/src/main/webapp/static/fusion/raptor/img/deleteicon.gif b/vid/src/main/webapp/static/fusion/raptor/img/deleteicon.gif
deleted file mode 100644
index 4b07af82662b62f35cec00a27928410b3a500703..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 579
zcmZ?wbhEHb6krfwcoxG@Sk?Of|NnJ64o{l5^5f?(vzBZ)a{9`(JCAl8x%lMu$DK#c
z>zF%z`1D?`s3%jufI0#KBi$}ACsD|ZRYsk#YasOhpTs=O`N;x
z;Mtoyj-20r>Pkdn_PnKQb{x5|>*$4vbC=Irw6d_et$pI`MXR@InL5;WOuts
z!{ReH9XR*l^OrfxHWk*i$ED>L)phmETzdTC&4XvIH}*`w^W=3_aZP4XT~1k3YF>q!
zk==&f$751*tJ@~Nc>neI`Rjet=g(NQZpwnyvsY~S@%R7YRH%<=E7`yz-`<
zM=rSeMLd4>Au+4i(L40~m0LRwpSy7D$@%LKrp{TqVehH3#_rw6uUx(T=;r-rx)#nU
zc@@9_VW1aK{K>+|z!1Zr1F{elCk*Th8e*E78Cn^dJ31J6czJo+J7d}=PibMCK4T_h
zzyt<9Gs$3MSuPt*7b&B;hFWg&${~)brW$H?6Jqok9R%(5BEy}9xxzXu8QEAkS=l+5
znF3WhEKZy{bB;;It0VgA>9gm#%scq+U4LlRA^PkAleb@o+?yNj1|8ar9=g6x5eiC7
mPG1~Y9tH_=iZ97Y2yAtmDOAtqh!89ZDp4AuZRknPU^

diff --git a/vid/src/main/webapp/static/fusion/raptor/img/downloadicon.gif b/vid/src/main/webapp/static/fusion/raptor/img/downloadicon.gif
deleted file mode 100644
index 1dddfb68b9dde6b2132ca794d6cc3ef3ebd0f596..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 74
zcmZ?wbhEHb>h;
dQ<$_`$xvhKx5|`)?rR-$zPn^(YOyj{0{|cG7Z3md

diff --git a/vid/src/main/webapp/static/fusion/raptor/img/editicon.gif b/vid/src/main/webapp/static/fusion/raptor/img/editicon.gif
deleted file mode 100644
index 48538c18c3c6a711ecd71d14d7b80e9608cec27f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 360
zcmZ?wbhEHb6k_0ISgOVV1dmQkPfqs!^y$OQnKQqBdf6i({#+3=9uW%+h9HxN>Iu$4_5A-dvlQ6!iJa
zv+v*E|9}4c?Ty`2q<9q=7;c?j_x}6$|8HMEKRV;V=>`9(3KahdIv1rTmZYXAlxLP?
zD7bt21~4f8WMLFxuxHQ#c@N}K2DX9&^9ww5nj9uAD#|F-;A>c6l4VjOqi`T$w<-gN
zGZ%B>hCf?om(2RLIK^W^bHHlB8>Y+-w}mwV+cJckSfle873&+AOPMN|MQZ9?qnd=J
o1=~8jN~EM%MfgQ0&5mK7&n@0LTVjm_!^%~&g9ACeogEph0o|0zssI20

diff --git a/vid/src/main/webapp/static/fusion/raptor/img/excel2007.jpg b/vid/src/main/webapp/static/fusion/raptor/img/excel2007.jpg
deleted file mode 100644
index 77d7cc208b428f3deb5a834f8234a167bda328f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 761
zcmex=~;k+`^QRlZ%U&n^%&LPtsIH
zPQ?@_&_t6lF*VUKG0`;re}F-dgF%5oftgW>fk}{&S&;Gn5e5mMGl75s0a#es*qMPc
zx&jQ0%uKAz%uMW1Nk%4S7FIz9HX%hrVG&2Az(V#$BPZ912QOX%Di>#DU`93usE3&a
zWP_9-NCw#oMxgaVip>9SG4KGjFbOgXGT1Y`V7>CJUAivXtIB#-k4MzCX;*GUXqFzC
zFni4luO^Q#HFu`2nsuw*rT1G`^PdFERL4`hPPddizI=o253jGne};;ap~WV9R?bi{
z<*QzIS+y!?yGZDz`=2HsUFZ6z_ak>zW483BTH|H8(`DQKGl)tye&)1)&b=rkbD~y|
z=G-F|o1R!qk8BZZu~_mYz|*^CV!_%2A8I!!UAgfy_4>>;<;Jp?mtIyVxuC~8$#c70
zph|dQ^4cMbTID8n%}>k{f9kL>K}dJQ<2w&Sf819HJTqBn
zma(L4hp*(sMM|DtTum{N3h~8TkFS27UD$awEu#C&YC|dS^XFss%}H6vBd}@dS`ALl
zoqNCb83wNpshag*ZLQUm(>kxpT_i8wv&nM`+A^u^0aNV;_SaXgWo|hkm?^p{YT301
iFI}Cu*D@{mouwSfYQBl@`iFv3myWh71nTJgzXb|M%zL??1nP{{8vo|Ce8Xe*O6KgAi458gev`swPEmrtHPe|qcHt(&iJ-gtH6`pfILp5HqE>in&T
zw=O@teD2A)^AFFTet3Gt(-ljeE?M?u*^);~=G>h#`}*uTr{-+iv2DY)4J$XTT)uI6
z`M&a5OJ^l-Po6$^de@w;&e@$YD`Vo9#+T15FPmAGv@oe?R#D;1!ng%-CDThvW|Sn(
zPmGx#lQ=gqYJOC~l!BC*DN!?{!e)l~%<&1E5f(lzJak5A%A}N-DKWv*gERXw6DKBy
zOb^22BQ*wU!3;23n0;`t|xAB_5iMnoea-rd6iSrOx`b`WBTI
zCe`g+BB+Qr)HrRoL+2D*j1MtMexC5i@l20HmVdbxTE#R}4;
z()zjjip7djB~l7S3UWnqibaZwg^Joa+B!Kpnz@?th4NCxQgVfIvPH78g|eDCnsNnl
z+L_u6Ll7wbWML6u_|KpNayuwbFmU`~xG$5Gk{!G@h{O2rBazd7i=3*TsT@pta(bq5
za!bfZp%Z;eOvEiJ3>p=jSlHDKY))L_zA=HT&*b1OMur3Y@fA8gAD?KR;;`_Idbq36
zd4^nqYTK1nPgPj?rQC}mH(hx?ou4z&sxj!YLUW&_R|)5)Da;3&%oe$<3=B}!b)qDdy}i44Ywv_D6M8rIc5dnH-O$^$sjG2IWAB>Y_OzkX_H}$RVt6W>T
zaNfe2RW$`G3Z_n-I%U$7$&)6hEJ;aToSe2WEo)v@;=;tl1&LiWA`P_yHI*zCs
z$-*MS@Si~kWHu;IFmT*wIKAd!bNYEXo60{g77DX995#*hYI(r$n2noPcSerm1_p-(
zJUm$sI0PCT_?g9*IQ(Q{INvUl%a$7WVA%x$j;ID1!!5^Kng!jy9I#AQcjVBv@6%vP
zVRmTYb$W6oli>jC)Fqu?&PY5^J=da8e&WK037xpybXSP6iouujQF5(a^meB`M)(bbQmmjInd0Wenmrp!5RRJOg3-;

diff --git a/vid/src/main/webapp/static/fusion/raptor/img/executeicon.png b/vid/src/main/webapp/static/fusion/raptor/img/executeicon.png
deleted file mode 100644
index 295c429baeb10748cd179674cc29e8f1cc90b4a4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1076
zcmV-41k3x0P)KLZ*U+
zMZqD61UKR0ATHv^)-h>I5gck1NwPJ`rHVGW++068`4T>agNvh}Z%}a%oO}c~K^z<$
zB4lt7!84uz8UFmBvEp_7ZetEcxivx0mthpknMbB+0>B_Gwb$=&1LQ@n_`&-#0^n)Y
z>-b&%#%!vM1wMhzOqD5!bs#&l+Jd+Q+~i1G5LbX}_JTHuJHQ!MJ^`Gh@)y7{VHAUS
z1>9j6#n1q7lgeGdwd&jgvH7ey+o)$(IW?)qYRQsyk
zp4P`o20fquC5&QO+1m~R5DSyK)ubop^jn2^`2DVbjPJnEQ_@xV|$`ith~00004XF*Lt007wQ^&Awc0000WV@Og>004R=004l4008tQ004y1
z003=Y008K0002CT000|UgXaf$0007SNkl2*CQn^$#CpHZ`mLpxv
zIUPUjP+4QB%yqT3Cfd3vTFJCFqsGh_qAhEr+HpxKxpXjnw{#?~*ov{oIYH;98)Clijn>yk6YZNnAD?cO~I5dRXQY9YKDLMkEf)*!ko{iw1AQJw8(
zSJ@Dm@5ada03olzep}LB5fO1aQf7#5gdHy-_!$ILfp5tmzPATSsE5oJ$Z8&AU*#~`
z^e&uF_u^a(Qv(wdMW#3@w8h<~%|=*T51Z;Cr3JD-!^L(;dJDP-pe%;jc`)nTD2@pY
z=4k;Lbry~beZ*Sr@29PT;AS|{4tZbU@JCqn92QrBvJ#XJVP4({P6w(#P4!ymFX;Q>`T%Tb1+OM>ZvrBxemfL=PiLM7U
zUqIano^L>@H+Ih0ajeK%rHd937ZI`it3Yna*#@l%R3)uFirBO}lNNc$ideaeh}F0h
u4h&7&W9{l4EtYl~5wV%@hyM4@KL!BqOVCyRu$`;`0000?DLMT!(i5hWEJ4g^J_Oo2oy5RuY3^e7QE(D;{Ui;MVLtD)Iy{k0svt1_UpR(sv`)1UN_aUIjh3(G^S>UhuVXkI;z~A)*Zcd(rPD|y5(v7(kR@1_
z%0Q&X$8njWaa#O9Q$%{ay^R}lbC}NMsJG&RfF>IfDj`l0Xv1qGeeSKSz~vDppRMpF
zgnqmhvPifDgU2=S{b7(KNhY6ZVG(8$$55oRrW&ef;AnojJb9XLr6|t{00000NkvXXu0mjfDPbaJ

diff --git a/vid/src/main/webapp/static/fusion/raptor/img/pdficon_small.gif b/vid/src/main/webapp/static/fusion/raptor/img/pdficon_small.gif
deleted file mode 100644
index bb5edcac38153b483a4acf5861baed1c0b37ff73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 361
zcmZ?wbhEHb6l4%&xT?(Xq^9xig-Z|Ctbgg?_GrqC`#W}j3XQI=shQi{^5MgWdq<8v
zEhyb6D*e#K`?j5nxw(0;n|mw2$ZHLKYj)1_67tU@;+FUJm+=WjaPbz|IpilLKkn#x
zmXi6xCur%?WqEn|Z)H>t95`_2?!Ev2|1;14DE?$&WMEKc&;gkZ@)HAF+kuN3f?87j
ziVKZOK3L2@=ggwW61hGi;P~MM3PLwOh!xLlIdrox<1eQq53hUry@@G6N
zVqj{h_EfHGkZEqHX|J#9YU%Bmz%r?AiV|ZnW6zBKMiy3CuByrXjH0XzGRz9hGRtSl
iG*xj)%Sz2>sc2a?L#%w?{#pS^`4cBk@hdtqSOWm%P;emt

diff --git a/vid/src/main/webapp/static/fusion/raptor/img/pen_paper.gif b/vid/src/main/webapp/static/fusion/raptor/img/pen_paper.gif
deleted file mode 100644
index ba562347cf8784be0d8aec404700a2edacd6ad30..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 618
zcmV-w0+szoNk%w1VG#fi0OkMy|NsB~|NsC0{{R2_{{H{{|NsB}`1$|;{QUg?{QCd<
z`u_ay{`>U%`}_X;^X&is`T6gwt0?CI&~=H}+(QPO;Nalf+uPaM+47M)jEnprD}cnE*k#weFYzo}QlVmjIoeo$-_a{Ez_JnGo!g1Dl(hz?NN_
znwspA0GOJYnVFgFj{xhC0GODV_lf}PjsmxmQ{#>S=!*d8hyaa^jf{+pi;IgBtEPp8
zg#e?lB%Xe%ct9eUb^w}>0Gg1TXCazU0E#Q~82}G3Tvtmq4yY|yBpNDBs4rewW;zCsAX-{SLUOh)Q&nX<
z36BUA(5%H)TNjk7dQ-lqe0toxr(hx-ifE8=>
z1{~11vt$(8Lw095Ws@Fo!AwloFUSRg8e)%)3Qj!sy(o(@h`%
EJ7w!p(f|Me

diff --git a/vid/src/main/webapp/static/fusion/raptor/img/pencil-small.png b/vid/src/main/webapp/static/fusion/raptor/img/pencil-small.png
deleted file mode 100644
index e6f2ca02bb9aa67e8cc5c214fc3803667060e97d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 309
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
VVyVaBkNyAv002ovPDHLkV1hyJJU9RV

diff --git a/vid/src/main/webapp/static/fusion/raptor/img/report-public.png b/vid/src/main/webapp/static/fusion/raptor/img/report-public.png
deleted file mode 100644
index 9ee052ec784998656d880d434a5c0ae7378cd831..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 776
zcmV+j1NZ!iP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyVz
z6&W9O1Sn|$00M|fL_t(I%bk-;NK|1I$A9GKQO-rv)6+!3uU1MGeY#+W}TB8Uh^1ex3an)h`?5v?s-
zYi)}$0CYB50PJe`TX!@-N4>#P1$I_WvMurjiaEp>wAQwxm9n%kfW^HLLxYotl#3Bz
zS5Po1!FWa1ytzek@EMtz@3gnA#ocxit(4^`rREXHSdJ6z6#(=Nzhiyfa^fQi&h}nq
zL(59kVu#-T+k8qML@70w0Pc+#I!d8`bQG;M`s)zaA78|sjsz?QspWoB}^akUJK4MilB9SOs>)8|jB^Zpy
z@zN<)RD{^N{SdYotZb6u$LB~zqxjnoQwY`|T04&Nygw(*Y5;9DHBgK&JW`IDenrN0
zsIJgNqMcabCKk1Ik(&6zhUVt>c_RKM7)m54cp37c7`+cJ;CNrD-qcOYo->4fv;Q)k
z$+2MgeNJbNyI!B8H|@I&2aCNN33b|0lnx=0qLxc=xEcV1j!#uY-r0Fkn?YNwFT
z`{oktu+zL8xJ=p7*HqP(5N=!trV%8Ln|{NG&v7E*7|pfo$hxj^zD-S)`u%<`wq^jB
zNf#M%T}n%Qj7^Lq+(Ja*w*!O%VMI^xeBdtQpNc$u^5m@*tgr93L!sK=2J!i|udXRy
zAFY&1F!sL&@;p1A91VTU{s?3wn@w0i5GVtj|1_fl(mw%y>}~cP2yZ!#Ds#3S1?7A!OK=-T@DNoTAPrw_nt11v6?g@&Bl8B~JR;Y_sApsw|Gn3f4
ztV)hF@;|o!nQxAdwXH(oGk^t5x7vp5x{G_o;oV_LIE~%Et(g50s=)Z4+((Pl@-Y^YBj7U5`7vf^dXZGeOM}i
zJwhM_CJ0J*cS2y9CeEr==^A00o0~C$eu1Z_U<98a9gRv}YBcaB9v6L1`|&QF?$b~q
zDL~$_P4o#W&885Tv$MFOF}Q1(Xif+F;eST<>QqHn6XzhYw1gB<^d29PwQa1%V(9jI
zSfelUHkBHVKwhKQ?aoXRR9h_};8mtE{H_-?#wY=Mjo4002ovPDHLkV1j#5
B_jCXN

diff --git a/vid/src/main/webapp/static/fusion/raptor/img/reports.png b/vid/src/main/webapp/static/fusion/raptor/img/reports.png
deleted file mode 100644
index 40dca71ee4cfff19cf72f49248602c6a25c91f8d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 769
zcmV+c1OEJpP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyVz
z6)Y}>>+0nI00MzYL_t(I%axNcZyZ$=g}?je&CJ@K^;%jbII-n`WfMg-QG^pjML`1+
zGzbORzk!Aykf7wB(4in|QbZyR6_FwZgcb>`*fE?xhGxLu0<;+~P<_
z=N3mky?y&GB5z=3oCT5AIrr7qw{ATI@T$7;&7C`+4Ffm<3=9xJ?Zq`-h<6|-czX3(mQRKE~+G
zV7{5~-6z*MLlb}Ro%cSMlkxBC+dDt_7=lX%g;RzRK6(t5GdkYLMA<)1tW?Tqrp#rD
z+$nYK`2KBeoT~U3f>VP@t(ZYKgY#ZlFHb2Yu{>w2bOMJ-=wy*x5>qLtqlm^RK7`<+
z8eJbr22}}f7B$=F3i_RlC%d~`+t^^Rzt6ee65aWE9u0nBmX;;P_-_N?q*2u1`3(Ln
zg^?XFu|U7f`DySoWu9~J$AlOomG?wdQrn6PAviU|G!oUg*o6y~@%n4aymjdkO$cmV
zzRX-%vbnm-)|D$HRYHuCUcF#OPC|ik4PzBX$75!a@L9&M&z{kQz`@ZG0yq(Zs-zIa
zHFce<8ROH4nvprk1bmiJc#oP<76l?go@I230t2F|(6-`^Mx&xH4LiMKq8U{IRbec2
zI`pavGo#<@;j@gzg$4RcOPCokC1_jcC&S@`m8yDt@#@vB_dmY*?!gR}3*ou_#l!+J
zB?eEQl2kdKPBAk?gqV_0*W#PKy}JOhEWhkabN$=(qgD}uRWHZ$pFKI}_-%JLa(L)p
zx#im02hHBzB4?#6b#Zm|M*-%5F5vlpL}2<4Pn=Z=XqdT300000NkvXXu0mjftVddJ

diff --git a/vid/src/main/webapp/static/fusion/raptor/img/search.gif b/vid/src/main/webapp/static/fusion/raptor/img/search.gif
deleted file mode 100644
index 164b9123e92a01696474c378c50fc2bcd0e42969..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 223
zcmZ?wbhEHb6krfwI3mSx;K12?_r4!JdhhMqFaPHxPn)*Br)TMsrTfmFeKup}rndG4
zmoB|ox9<4%?HAXtKY8rfgFAO$&Y!CMAjO~q5&_xCz#6katuG}qEhBAGI9mwAl-SkJ_^u|{tf~y>ZC2R$Vxp1g
zf`CmHDF*5X927MI_!^(DbkbGW!1p%uQ7?;xf5ysIk2%KEW@#+ldL(;>%@wB|r`>Dn
Q>ZKZ+8!FqB0u&jn0dUY{fdBvi

diff --git a/vid/src/main/webapp/static/fusion/raptor/img/search.png b/vid/src/main/webapp/static/fusion/raptor/img/search.png
deleted file mode 100644
index 7ff964f83e9bac4d371dc369ab1d075ababc8256..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3501
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

diff --git a/vid/src/main/webapp/static/fusion/raptor/js/CalendarPopup.js b/vid/src/main/webapp/static/fusion/raptor/js/CalendarPopup.js
deleted file mode 100644
index 07cd7ee8b..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/js/CalendarPopup.js
+++ /dev/null
@@ -1,1486 +0,0 @@
-// ===================================================================
-// Author: Matt Kruse 
-// WWW: http://www.mattkruse.com/
-//
-// NOTICE: You may use this code for any purpose, commercial or
-// private, without any further permission from the author. You may
-// remove this notice from your final code if you wish, however it is
-// appreciated by the author if at least my web site address is kept.
-//
-// You may *NOT* re-distribute this code in any way except through its
-// use. That means, you can include it in your product, or your web
-// site, or any other form where the code is actually being used. You
-// may not put the plain javascript up on your site for download or
-// include it in your javascript libraries for download. 
-// If you wish to share this code with others, please just point them
-// to the URL instead.
-// Please DO NOT link directly to my .js files from your site. Copy
-// the files to your server and use them there. Thank you.
-// ===================================================================
-
-   
-/* SOURCE FILE: date.js */
-
-// HISTORY
-// ------------------------------------------------------------------
-// May 17, 2003: Fixed bug in parseDate() for dates <1970
-// March 11, 2003: Added parseDate() function
-// March 11, 2003: Added "NNN" formatting option. Doesn't match up
-//                 perfectly with SimpleDateFormat formats, but 
-//                 backwards-compatability was required.
-
-// ------------------------------------------------------------------
-// These functions use the same 'format' strings as the 
-// java.text.SimpleDateFormat class, with minor exceptions.
-// The format string consists of the following abbreviations:
-// 
-// Field        | Full Form          | Short Form
-// -------------+--------------------+-----------------------
-// Year         | yyyy (4 digits)    | yy (2 digits), y (2 or 4 digits)
-// Month        | MMM (name or abbr.)| MM (2 digits), M (1 or 2 digits)
-//              | NNN (abbr.)        |
-// Day of Month | dd (2 digits)      | d (1 or 2 digits)
-// Day of Week  | EE (name)          | E (abbr)
-// Hour (1-12)  | hh (2 digits)      | h (1 or 2 digits)
-// Hour (0-23)  | HH (2 digits)      | H (1 or 2 digits)
-// Hour (0-11)  | KK (2 digits)      | K (1 or 2 digits)
-// Hour (1-24)  | kk (2 digits)      | k (1 or 2 digits)
-// Minute       | mm (2 digits)      | m (1 or 2 digits)
-// Second       | ss (2 digits)      | s (1 or 2 digits)
-// AM/PM        | a                  |
-//
-// NOTE THE DIFFERENCE BETWEEN MM and mm! Month=MM, not mm!
-// Examples:
-//  "MMM d, y" matches: January 01, 2000
-//                      Dec 1, 1900
-//                      Nov 20, 00
-//  "M/d/yy"   matches: 01/20/00
-//                      9/2/00
-//  "MMM dd, yyyy hh:mm:ssa" matches: "January 01, 2000 12:30:45AM"
-// ------------------------------------------------------------------
-
-var MONTH_NAMES=new Array('January','February','March','April','May','June','July','August','September','October','November','December','Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec');
-var DAY_NAMES=new Array('Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sun','Mon','Tue','Wed','Thu','Fri','Sat');
-function LZ(x) {return(x<0||x>9?"":"0")+x}
-
-// ------------------------------------------------------------------
-// isDate ( date_string, format_string )
-// Returns true if date string matches format of format string and
-// is a valid date. Else returns false.
-// It is recommended that you trim whitespace around the value before
-// passing it to this function, as whitespace is NOT ignored!
-// ------------------------------------------------------------------
-function isDate(val,format) {
-	var date=getDateFromFormat(val,format);
-	if (date==0) { return false; }
-	return true;
-	}
-
-// -------------------------------------------------------------------
-// compareDates(date1,date1format,date2,date2format)
-//   Compare two date strings to see which is greater.
-//   Returns:
-//   1 if date1 is greater than date2
-//   0 if date2 is greater than date1 of if they are the same
-//  -1 if either of the dates is in an invalid format
-// -------------------------------------------------------------------
-function compareDates(date1,dateformat1,date2,dateformat2) {
-	var d1=getDateFromFormat(date1,dateformat1);
-	var d2=getDateFromFormat(date2,dateformat2);
-	if (d1==0 || d2==0) {
-		return -1;
-		}
-	else if (d1 > d2) {
-		return 1;
-		}
-	return 0;
-	}
-
-// ------------------------------------------------------------------
-// formatDate (date_object, format)
-// Returns a date in the output format specified.
-// The format string uses the same abbreviations as in getDateFromFormat()
-// ------------------------------------------------------------------
-function formatDate(date,format) {
-	format=format+"";
-	var result="";
-	var i_format=0;
-	var c="";
-	var token="";
-	var y=date.getYear()+"";
-	var M=date.getMonth()+1;
-	var d=date.getDate();
-	var E=date.getDay();
-	var H=date.getHours();
-	var m=date.getMinutes();
-	var s=date.getSeconds();
-	var yyyy,yy,MMM,MM,dd,hh,h,mm,ss,ampm,HH,H,KK,K,kk,k;
-	// Convert real date parts into formatted versions
-	var value=new Object();
-	if (y.length < 4) {y=""+(y-0+1900);}
-	value["y"]=""+y;
-	value["yyyy"]=y;
-	value["yy"]=y.substring(2,4);
-	value["M"]=M;
-	value["MM"]=LZ(M);
-	value["MMM"]=MONTH_NAMES[M-1];
-	value["NNN"]=MONTH_NAMES[M+11];
-	value["d"]=d;
-	value["dd"]=LZ(d);
-	value["E"]=DAY_NAMES[E+7];
-	value["EE"]=DAY_NAMES[E];
-	value["H"]=H;
-	value["HH"]=LZ(H);
-	if (H==0){value["h"]=12;}
-	else if (H>12){value["h"]=H-12;}
-	else {value["h"]=H;}
-	value["hh"]=LZ(value["h"]);
-	if (H>11){value["K"]=H-12;} else {value["K"]=H;}
-	value["k"]=H+1;
-	value["KK"]=LZ(value["K"]);
-	value["kk"]=LZ(value["k"]);
-	if (H > 11) { value["a"]="PM"; }
-	else { value["a"]="AM"; }
-	value["m"]=m;
-	value["mm"]=LZ(m);
-	value["s"]=s;
-	value["ss"]=LZ(s);
-	while (i_format < format.length) {
-		c=format.charAt(i_format);
-		token="";
-		while ((format.charAt(i_format)==c) && (i_format < format.length)) {
-			token += format.charAt(i_format++);
-			}
-		if (value[token] != null) { result=result + value[token]; }
-		else { result=result + token; }
-		}
-	return result;
-	}
-	
-// ------------------------------------------------------------------
-// Utility functions for parsing in getDateFromFormat()
-// ------------------------------------------------------------------
-function _isInteger(val) {
-	var digits="1234567890";
-	for (var i=0; i < val.length; i++) {
-		if (digits.indexOf(val.charAt(i))==-1) { return false; }
-		}
-	return true;
-	}
-function _getInt(str,i,minlength,maxlength) {
-	for (var x=maxlength; x>=minlength; x--) {
-		var token=str.substring(i,i+x);
-		if (token.length < minlength) { return null; }
-		if (_isInteger(token)) { return token; }
-		}
-	return null;
-	}
-	
-// ------------------------------------------------------------------
-// getDateFromFormat( date_string , format_string )
-//
-// This function takes a date string and a format string. It matches
-// If the date string matches the format string, it returns the 
-// getTime() of the date. If it does not match, it returns 0.
-// ------------------------------------------------------------------
-function getDateFromFormat(val,format) {
-	val=val+"";
-	format=format+"";
-	var i_val=0;
-	var i_format=0;
-	var c="";
-	var token="";
-	var token2="";
-	var x,y;
-	var now=new Date();
-	
-	var year=now.getYear();
-	var month=now.getMonth()+1;
-	var date=1;
-	var hh=now.getHours();
-	var mm=now.getMinutes();
-	var ss=now.getSeconds();
-	var ampm="";
-	
-	while (i_format < format.length) {
-		// Get next token from format string
-		c=format.charAt(i_format);
-		token="";
-		while ((format.charAt(i_format)==c) && (i_format < format.length)) {
-			token += format.charAt(i_format++);
-			}
-		// Extract contents of value based on format token
-		if (token=="yyyy" || token=="yy" || token=="y") {
-			if (token=="yyyy") { x=4;y=4; }
-			if (token=="yy")   { x=2;y=2; }
-			if (token=="y")    { x=2;y=4; }
-			year=_getInt(val,i_val,x,y);
-			if (year==null) { return 0; }
-			i_val += year.length;
-			if (year.length==2) {
-				if (year > 70) { year=1900+(year-0); }
-				else { year=2000+(year-0); }
-				}
-			}
-		else if (token=="MMM"||token=="NNN"){
-			month=0;
-			for (var i=0; i11)) {
-						month=i+1;
-						if (month>12) { month -= 12; }
-						i_val += month_name.length;
-						break;
-						}
-					}
-				}
-			if ((month < 1)||(month>12)){return 0;}
-			}
-		else if (token=="EE"||token=="E"){
-			for (var i=0; i12)){return 0;}
-			i_val+=month.length;}
-		else if (token=="dd"||token=="d") {
-			date=_getInt(val,i_val,token.length,2);
-			if(date==null||(date<1)||(date>31)){return 0;}
-			i_val+=date.length;}
-		else if (token=="hh"||token=="h") {
-			hh=_getInt(val,i_val,token.length,2);
-			if(hh==null||(hh<1)||(hh>12)){return 0;}
-			i_val+=hh.length;}
-		else if (token=="HH"||token=="H") {
-			hh=_getInt(val,i_val,token.length,2);
-			if(hh==null||(hh<0)||(hh>23)){return 0;}
-			i_val+=hh.length;}
-		else if (token=="KK"||token=="K") {
-			hh=_getInt(val,i_val,token.length,2);
-			if(hh==null||(hh<0)||(hh>11)){return 0;}
-			i_val+=hh.length;}
-		else if (token=="kk"||token=="k") {
-			hh=_getInt(val,i_val,token.length,2);
-			if(hh==null||(hh<1)||(hh>24)){return 0;}
-			i_val+=hh.length;hh--;}
-		else if (token=="mm"||token=="m") {
-			mm=_getInt(val,i_val,token.length,2);
-			if(mm==null||(mm<0)||(mm>59)){return 0;}
-			i_val+=mm.length;}
-		else if (token=="ss"||token=="s") {
-			ss=_getInt(val,i_val,token.length,2);
-			if(ss==null||(ss<0)||(ss>59)){return 0;}
-			i_val+=ss.length;}
-		else if (token=="a") {
-			if (val.substring(i_val,i_val+2).toLowerCase()=="am") {ampm="AM";}
-			else if (val.substring(i_val,i_val+2).toLowerCase()=="pm") {ampm="PM";}
-			else {return 0;}
-			i_val+=2;}
-		else {
-			if (val.substring(i_val,i_val+token.length)!=token) {return 0;}
-			else {i_val+=token.length;}
-			}
-		}
-	// If there are any trailing characters left in the value, it doesn't match
-	if (i_val != val.length) { return 0; }
-	// Is date valid for month?
-	if (month==2) {
-		// Check for leap year
-		if ( ( (year%4==0)&&(year%100 != 0) ) || (year%400==0) ) { // leap year
-			if (date > 29){ return 0; }
-			}
-		else { if (date > 28) { return 0; } }
-		}
-	if ((month==4)||(month==6)||(month==9)||(month==11)) {
-		if (date > 30) { return 0; }
-		}
-	// Correct hours value
-	if (hh<12 && ampm=="PM") { hh=hh-0+12; }
-	else if (hh>11 && ampm=="AM") { hh-=12; }
-	var newdate=new Date(year,month-1,date,hh,mm,ss);
-	return newdate.getTime();
-	}
-
-// ------------------------------------------------------------------
-// parseDate( date_string [, prefer_euro_format] )
-//
-// This function takes a date string and tries to match it to a
-// number of possible date formats to get the value. It will try to
-// match against the following international formats, in this order:
-// y-M-d   MMM d, y   MMM d,y   y-MMM-d   d-MMM-y  MMM d
-// M/d/y   M-d-y      M.d.y     MMM-d     M/d      M-d
-// d/M/y   d-M-y      d.M.y     d-MMM     d/M      d-M
-// A second argument may be passed to instruct the method to search
-// for formats like d/M/y (european format) before M/d/y (American).
-// Returns a Date object or null if no patterns match.
-// ------------------------------------------------------------------
-function parseDate(val) {
-	var preferEuro=(arguments.length==2)?arguments[1]:false;
-	generalFormats=new Array('y-M-d','MMM d, y','MMM d,y','y-MMM-d','d-MMM-y','MMM d');
-	monthFirst=new Array('M/d/y','M-d-y','M.d.y','MMM-d','M/d','M-d');
-	dateFirst =new Array('d/M/y','d-M-y','d.M.y','d-MMM','d/M','d-M');
-	var checkList=new Array('generalFormats',preferEuro?'dateFirst':'monthFirst',preferEuro?'monthFirst':'dateFirst');
-	var d=null;
-	for (var i=0; i tags may cause errors.
-
-USAGE:
-// Create an object for a WINDOW popup
-var win = new PopupWindow(); 
-
-// Create an object for a DIV window using the DIV named 'mydiv'
-var win = new PopupWindow('mydiv'); 
-
-// Set the window to automatically hide itself when the user clicks 
-// anywhere else on the page except the popup
-win.autoHide(); 
-
-// Show the window relative to the anchor name passed in
-win.showPopup(anchorname);
-
-// Hide the popup
-win.hidePopup();
-
-// Set the size of the popup window (only applies to WINDOW popups
-win.setSize(width,height);
-
-// Populate the contents of the popup window that will be shown. If you 
-// change the contents while it is displayed, you will need to refresh()
-win.populate(string);
-
-// set the URL of the window, rather than populating its contents
-// manually
-win.setUrl("http://www.site.com/");
-
-// Refresh the contents of the popup
-win.refresh();
-
-// Specify how many pixels to the right of the anchor the popup will appear
-win.offsetX = 50;
-
-// Specify how many pixels below the anchor the popup will appear
-win.offsetY = 100;
-
-NOTES:
-1) Requires the functions in AnchorPosition.js
-
-2) Your anchor tag MUST contain both NAME and ID attributes which are the 
-   same. For example:
-    
-
-3) There must be at least a space between   for IE5.5 to see the 
-   anchor tag correctly. Do not do  with no space.
-
-4) When a PopupWindow object is created, a handler for 'onmouseup' is
-   attached to any event handler you may have already defined. Do NOT define
-   an event handler for 'onmouseup' after you define a PopupWindow object or
-   the autoHide() will not work correctly.
-*/ 
-function getPos(e)
-{
-    var posx = 0;
-    var posy = 0;
-    var coordinates = new Object();
-    if (!e) var e = window.event;
-    if (e.pageX || e.pageY)
-    {                
-        posx = e.pageX;
-        posy = e.pageY;              
-    }
-    else if (e.clientX || e.clientY)
-    {
-    
-        posx = e.clientX + document.body.scrollLeft
-         + document.documentElement.scrollLeft;
-     posy = e.clientY + document.body.scrollTop
-        + document.documentElement.scrollTop;	  			         
-	 }
-	
-	//alert("posx: " + posx + " posy: " + posy);
-	coordinates.x = posx;
-	coordinates.y = posy;
-	return coordinates;
-}
-// Set the position of the popup window based on the anchor
-function PopupWindow_getXYPosition(anchorname) {
-	var coordintes
-	if (this.type == "WINDOW") {
-		coordinates = getAnchorWindowPosition(anchorname);
-		coordinates =  getPos(anchorname); // Replaced using getPost(event)	
-		}
-	else {
-		//alert("envent: " + anchorname);
-		//coordinates = getAnchorPosition(anchorname);
-		coordinates =  getPos(anchorname); // Replaced using getPost(event)	
-		}
-		
-	this.x = coordinates.x;
-	this.y = coordinates.y;
-	//alert("PopupWindow_getXYPosition x: " + this.x + " y: " + this.y);
-	}
-// Set width/height of DIV/popup window
-function PopupWindow_setSize(width,height) {
-	this.width = width;
-	this.height = height;
-	}
-// Fill the window with contents
-function PopupWindow_populate(contents) {
-	this.contents = contents;
-	this.populated = false;
-	}
-// Set the URL to go to
-function PopupWindow_setUrl(url) {
-	this.url = url;
-	}
-// Set the window popup properties
-function PopupWindow_setWindowProperties(props) {
-	this.windowProperties = props;
-	}
-// Refresh the displayed contents of the popup
-function PopupWindow_refresh() {
-	if (this.divName != null) {
-		// refresh the DIV object
-		if (this.use_gebi) {
-			document.getElementById(this.divName).innerHTML = this.contents;
-			}
-		else if (this.use_css) { 
-			document.all[this.divName].innerHTML = this.contents;
-			}
-		else if (this.use_layers) { 
-			var d = document.layers[this.divName]; 
-			d.document.open();
-			d.document.writeln(this.contents);
-			d.document.close();
-			}
-		}
-	else {
-		if (this.popupWindow != null && !this.popupWindow.closed) {
-			if (this.url!="") {
-				this.popupWindow.location.href=this.url;
-				}
-			else {
-				this.popupWindow.document.open();
-				this.popupWindow.document.writeln(this.contents);
-				this.popupWindow.document.close();
-			}
-			this.popupWindow.focus();
-			}
-		}
-	}
-
-var offsetLeft = 0;
-var offsetTop = 0;	
-function parenName(ref)
-	{
-	ok=0; // it's just to start the loop, we don't use it to get out.
-	while (!ok)
-		{
-		ref = ref.parentNode;
-		if (ref.nodeType==1) //check that the node is a tag, not text (type=3)
-			{
-			if (String(ref.nodeName)=="DIV")
-				{
-					offsetLeft = ref.offsetLeft;
-					offsetTop = ref.offsetTop;
-					
-					return ;
-				}
-			if (String(ref.nodeName)=="BODY")
-				{
-				return ;
-				}
-			}
-		}
-	}
-	
-// Position and show the popup, relative to an anchor object
-function PopupWindow_showPopup(anchorname) {
-	this.getXYPosition(anchorname);
-	this.x += this.offsetX - 125;
-	this.y += this.offsetY;
-	if (!this.populated && (this.contents != "")) {
-		this.populated = true;
-		this.refresh();
-		}
-	if (this.divName != null) {
-		// Show the DIV object
-		var oDiv = document.getElementById(this.divName);
-		parenName(oDiv);
-		if (this.use_gebi) {
-			document.getElementById(this.divName).style.left = this.x - offsetLeft + "px";
-			document.getElementById(this.divName).style.top = this.y - offsetTop + "px";
-			document.getElementById(this.divName).style.visibility = "visible";
-			}
-		else if (this.use_css) {
-			document.all[this.divName].style.left = this.x;
-			document.all[this.divName].style.top = this.y;
-			document.all[this.divName].style.visibility = "visible";
-			}
-		else if (this.use_layers) {
-			document.layers[this.divName].left = this.x;
-			document.layers[this.divName].top = this.y;
-			document.layers[this.divName].visibility = "visible";
-			}
-		}
-	else {
-		if (this.popupWindow == null || this.popupWindow.closed) {
-			// If the popup window will go off-screen, move it so it doesn't
-			if (this.x<0) { this.x=0; }
-			if (this.y<0) { this.y=0; }
-			if (screen && screen.availHeight) {
-				if ((this.y + this.height) > screen.availHeight) {
-					this.y = screen.availHeight - this.height;
-					}
-				}
-			if (screen && screen.availWidth) {
-				if ((this.x + this.width) > screen.availWidth) {
-					this.x = screen.availWidth - this.width;
-					}
-				}
-			var avoidAboutBlank = window.opera || ( document.layers && !navigator.mimeTypes['*'] ) || navigator.vendor == 'KDE' || ( document.childNodes && !document.all && !navigator.taintEnabled );
-			this.popupWindow = window.open(avoidAboutBlank?"":"about:blank","window_"+anchorname,this.windowProperties+",width="+this.width+",height="+this.height+",screenX="+this.x+",left="+this.x+",screenY="+this.y+",top="+this.y+"");
-			}
-		this.refresh();
-		}
-		
-		//added for IE6 issue
-		///////////////////////		
-		showFrame(this.divName, this.frameName);
-		/*var oIfr = document.getElementById(this.frameName);
-		var oCal = document.getElementById(this.divName);
-		oIfr.style.display='block';
-		oIfr.style.top=oCal.style.top;
-		oIfr.style.left=oCal.style.left;*/
-		
-		
-	}
-// Hide the popup
-function PopupWindow_hidePopup() {
-	if (this.divName != null) {
-		if (this.use_gebi) {
-			
-			document.getElementById(this.divName).style.visibility = "hidden";
-			}
-		else if (this.use_css) {
-			document.all[this.divName].style.visibility = "hidden";
-			}
-		else if (this.use_layers) {
-			document.layers[this.divName].visibility = "hidden";
-			}
-		}
-	else {
-		if (this.popupWindow && !this.popupWindow.closed) {
-			this.popupWindow.close();
-			this.popupWindow = null;
-			}
-		}
-		
-		
-	//added for IE6 issue
-	//////////////
-	hideFrame(this.divName, this.frameName);
-	/*var oIfr = document.getElementById(this.frameName);
-	oIfr.style.display='none';	*/
-	}
-// Pass an event and return whether or not it was the popup DIV that was clicked
-function PopupWindow_isClicked(e) {
-	if (this.divName != null) {
-		if (this.use_layers) {
-			var clickX = e.pageX;
-			var clickY = e.pageY;
-			var t = document.layers[this.divName];
-			if ((clickX > t.left) && (clickX < t.left+t.clip.width) && (clickY > t.top) && (clickY < t.top+t.clip.height)) {
-				window.calendarAction='Y';
-				return true;
-				}
-			else { return false; }
-			}
-		else if (document.all) { // Need to hard-code this to trap IE for error-handling
-			var t = window.event.srcElement;
-			while (t.parentElement != null) {
-				if (t.id==this.divName) {
-					window.calendarAction='Y';
-					return true;
-					}
-				t = t.parentElement;
-				}
-			return false;
-			}
-		else if (this.use_gebi && e) {
-			var t = e.originalTarget;
-			//console.log(t);
-			while (t && t.parentNode != null) {
-				if (t.id==this.divName) {
-					window.calendarAction='Y';
-					return true;
-					}
-				t = t.parentNode;
-				}
-			return false;
-			}
-		return false;
-		}
-	return false;
-	}
-
-// Check an onMouseDown event to see if we should hide
-function PopupWindow_hideIfNotClicked(e) {
-	if (this.autoHideEnabled && !this.isClicked(e)) {
-		
-		this.hidePopup();
-		}
-	}
-// Call this to make the DIV disable automatically when mouse is clicked outside it
-function PopupWindow_autoHide() {
-	this.autoHideEnabled = true;
-	}
-// This global function checks all PopupWindow objects onmouseup to see if they should be hidden
-function PopupWindow_hidePopupWindows(e) {
-	for (var i=0; i0) {
-		this.type="DIV";
-		this.divName = arguments[0];
-		//added for IE6 issue
-		
-		if (arguments.length>1)
-			this.frameName = arguments[1];			
-		}
-	else {
-		this.type="WINDOW";
-		}
-	this.use_gebi = false;
-	this.use_css = false;
-	this.use_layers = false;
-	if (document.getElementById) { this.use_gebi = true; }
-	else if (document.all) { this.use_css = true; }
-	else if (document.layers) { this.use_layers = true; }
-	else { this.type = "WINDOW"; }
-	this.offsetX = 0;
-	this.offsetY = 0;
-	// Method mappings
-	this.getXYPosition = PopupWindow_getXYPosition;
-	this.populate = PopupWindow_populate;
-	this.setUrl = PopupWindow_setUrl;
-	this.setWindowProperties = PopupWindow_setWindowProperties;
-	this.refresh = PopupWindow_refresh;
-	this.showPopup = PopupWindow_showPopup;
-	this.hidePopup = PopupWindow_hidePopup;
-	this.setSize = PopupWindow_setSize;
-	this.isClicked = PopupWindow_isClicked;
-	this.autoHide = PopupWindow_autoHide;
-	this.hideIfNotClicked = PopupWindow_hideIfNotClicked;
-	
-	// Added to reset the Calendar DIV when it related with another DIV
-	this.resetPosition = PopupWindow_resetPosition;
-	}
-
-/* SOURCE FILE: CalendarPopup.js */
-
-// HISTORY
-// ------------------------------------------------------------------
-// Feb 7, 2005: Fixed a CSS styles to use px unit
-// March 29, 2004: Added check in select() method for the form field
-//      being disabled. If it is, just return and don't do anything.
-// March 24, 2004: Fixed bug - when month name and abbreviations were
-//      changed, date format still used original values.
-// January 26, 2004: Added support for drop-down month and year
-//      navigation (Thanks to Chris Reid for the idea)
-// September 22, 2003: Fixed a minor problem in YEAR calendar with
-//      CSS prefix.
-// August 19, 2003: Renamed the function to get styles, and made it
-//      work correctly without an object reference
-// August 18, 2003: Changed showYearNavigation and 
-//      showYearNavigationInput to optionally take an argument of
-//      true or false
-// July 31, 2003: Added text input option for year navigation.
-//      Added a per-calendar CSS prefix option to optionally use 
-//      different styles for different calendars.
-// July 29, 2003: Fixed bug causing the Today link to be clickable 
-//      even though today falls in a disabled date range.
-//      Changed formatting to use pure CSS, allowing greater control
-//      over look-and-feel options.
-// June 11, 2003: Fixed bug causing the Today link to be unselectable
-//      under certain cases when some days of week are disabled
-// March 14, 2003: Added ability to disable individual dates or date
-//      ranges, display as light gray and strike-through
-// March 14, 2003: Removed dependency on graypixel.gif and instead 
-///     use table border coloring
-// March 12, 2003: Modified showCalendar() function to allow optional
-//      start-date parameter
-// March 11, 2003: Modified select() function to allow optional
-//      start-date parameter
-/* 
-DESCRIPTION: This object implements a popup calendar to allow the user to
-select a date, month, quarter, or year.
-
-COMPATABILITY: Works with Netscape 4.x, 6.x, IE 5.x on Windows. Some small
-positioning errors - usually with Window positioning - occur on the 
-Macintosh platform.
-The calendar can be modified to work for any location in the world by 
-changing which weekday is displayed as the first column, changing the month
-names, and changing the column headers for each day.
-
-USAGE:
-// Create a new CalendarPopup object of type WINDOW
-var cal = new CalendarPopup(); 
-
-// Create a new CalendarPopup object of type DIV using the DIV named 'mydiv'
-var cal = new CalendarPopup('mydiv'); 
-
-// Easy method to link the popup calendar with an input box. 
-cal.select(inputObject, anchorname, dateFormat);
-// Same method, but passing a default date other than the field's current value
-cal.select(inputObject, anchorname, dateFormat, '01/02/2000');
-// This is an example call to the popup calendar from a link to populate an 
-// input box. Note that to use this, date.js must also be included!!
-Select
-
-// Set the type of date select to be used. By default it is 'date'.
-cal.setDisplayType(type);
-
-// When a date, month, quarter, or year is clicked, a function is called and
-// passed the details. You must write this function, and tell the calendar
-// popup what the function name is.
-// Function to be called for 'date' select receives y, m, d
-cal.setReturnFunction(functionname);
-// Function to be called for 'month' select receives y, m
-cal.setReturnMonthFunction(functionname);
-// Function to be called for 'quarter' select receives y, q
-cal.setReturnQuarterFunction(functionname);
-// Function to be called for 'year' select receives y
-cal.setReturnYearFunction(functionname);
-
-// Show the calendar relative to a given anchor
-cal.showCalendar(anchorname);
-
-// Hide the calendar. The calendar is set to autoHide automatically
-cal.hideCalendar();
-
-// Set the month names to be used. Default are English month names
-cal.setMonthNames("January","February","March",...);
-
-// Set the month abbreviations to be used. Default are English month abbreviations
-cal.setMonthAbbreviations("Jan","Feb","Mar",...);
-
-// Show navigation for changing by the year, not just one month at a time
-cal.showYearNavigation();
-
-// Show month and year dropdowns, for quicker selection of month of dates
-cal.showNavigationDropdowns();
-
-// Set the text to be used above each day column. The days start with 
-// sunday regardless of the value of WeekStartDay
-cal.setDayHeaders("S","M","T",...);
-
-// Set the day for the first column in the calendar grid. By default this
-// is Sunday (0) but it may be changed to fit the conventions of other
-// countries.
-cal.setWeekStartDay(1); // week is Monday - Sunday
-
-// Set the weekdays which should be disabled in the 'date' select popup. You can
-// then allow someone to only select week end dates, or Tuedays, for example
-cal.setDisabledWeekDays(0,1); // To disable selecting the 1st or 2nd days of the week
-
-// Selectively disable individual days or date ranges. Disabled days will not
-// be clickable, and show as strike-through text on current browsers.
-// Date format is any format recognized by parseDate() in date.js
-// Pass a single date to disable:
-cal.addDisabledDates("2003-01-01");
-// Pass null as the first parameter to mean "anything up to and including" the
-// passed date:
-cal.addDisabledDates(null, "01/02/03");
-// Pass null as the second parameter to mean "including the passed date and
-// anything after it:
-cal.addDisabledDates("Jan 01, 2003", null);
-// Pass two dates to disable all dates inbetween and including the two
-cal.addDisabledDates("January 01, 2003", "Dec 31, 2003");
-
-// When the 'year' select is displayed, set the number of years back from the 
-// current year to start listing years. Default is 2.
-// This is also used for year drop-down, to decide how many years +/- to display
-cal.setYearSelectStartOffset(2);
-
-// Text for the word "Today" appearing on the calendar
-cal.setTodayText("Today");
-
-// The calendar uses CSS classes for formatting. If you want your calendar to
-// have unique styles, you can set the prefix that will be added to all the
-// classes in the output.
-// For example, normal output may have this:
-//     Today
-// But if you set the prefix like this:
-cal.setCssPrefix("Test");
-// The output will then look like:
-//     Today
-// And you can define that style somewhere in your page.
-
-// When using Year navigation, you can make the year be an input box, so
-// the user can manually change it and jump to any year
-cal.showYearNavigationInput();
-
-// Set the calendar offset to be different than the default. By default it
-// will appear just below and to the right of the anchorname. So if you have
-// a text box where the date will go and and anchor immediately after the
-// text box, the calendar will display immediately under the text box.
-cal.offsetX = 20;
-cal.offsetY = 20;
-
-NOTES:
-1) Requires the functions in AnchorPosition.js and PopupWindow.js
-
-2) Your anchor tag MUST contain both NAME and ID attributes which are the 
-   same. For example:
-    
-
-3) There must be at least a space between   for IE5.5 to see the 
-   anchor tag correctly. Do not do  with no space.
-
-4) When a CalendarPopup object is created, a handler for 'onmouseup' is
-   attached to any event handler you may have already defined. Do NOT define
-   an event handler for 'onmouseup' after you define a CalendarPopup object 
-   or the autoHide() will not work correctly.
-   
-5) The calendar popup display uses style sheets to make it look nice.
-
-*/ 
-
-// CONSTRUCTOR for the CalendarPopup Object
-function CalendarPopup() {
-	var c;
-	//added for IE6 issue
-	if (arguments.length>1) {
-		c = new PopupWindow(arguments[0], arguments[1]);
-		}
-	else if (arguments.length>0) {
-		c = new PopupWindow(arguments[0]);
-		}
-	else {
-		c = new PopupWindow();
-		c.setSize(150,175);
-		}
-	c.offsetX = 20;
-	c.offsetY = 0;
-	c.autoHide();
-	// Calendar-specific properties
-	c.monthNames = new Array("January","February","March","April","May","June","July","August","September","October","November","December");
-	c.monthAbbreviations = new Array("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec");
-	c.dayHeaders = new Array("S","M","T","W","T","F","S");
-	c.returnFunction = "CP_tmpReturnFunction";
-	c.returnMonthFunction = "CP_tmpReturnMonthFunction";
-	c.returnQuarterFunction = "CP_tmpReturnQuarterFunction";
-	c.returnYearFunction = "CP_tmpReturnYearFunction";
-	c.weekStartDay = 0;
-	c.isShowYearNavigation = false;
-	c.displayType = "date";
-	c.disabledWeekDays = new Object();
-	c.disabledDatesExpression = "";
-	c.yearSelectStartOffset = 2;
-	c.currentDate = null;
-	c.todayText="Today";
-	c.cssPrefix="";
-	c.isShowNavigationDropdowns=false;
-	c.isShowYearNavigationInput=false;
-	window.CP_calendarObject = null;
-	window.CP_targetInput = null;
-	window.CP_dateFormat = "MM/dd/yyyy";
-	// Method mappings
-	c.copyMonthNamesToWindow = CP_copyMonthNamesToWindow;
-	c.setReturnFunction = CP_setReturnFunction;
-	c.setReturnMonthFunction = CP_setReturnMonthFunction;
-	c.setReturnQuarterFunction = CP_setReturnQuarterFunction;
-	c.setReturnYearFunction = CP_setReturnYearFunction;
-	c.setMonthNames = CP_setMonthNames;
-	c.setMonthAbbreviations = CP_setMonthAbbreviations;
-	c.setDayHeaders = CP_setDayHeaders;
-	c.setWeekStartDay = CP_setWeekStartDay;
-	c.setDisplayType = CP_setDisplayType;
-	c.setDisabledWeekDays = CP_setDisabledWeekDays;
-	c.addDisabledDates = CP_addDisabledDates;
-	c.setYearSelectStartOffset = CP_setYearSelectStartOffset;
-	c.setTodayText = CP_setTodayText;
-	c.showYearNavigation = CP_showYearNavigation;
-	c.showCalendar = CP_showCalendar;
-	c.hideCalendar = CP_hideCalendar;
-	c.getStyles = getCalendarStyles;
-	c.refreshCalendar = CP_refreshCalendar;
-	c.getCalendar = CP_getCalendar;
-	c.select = CP_select;
-	c.setCssPrefix = CP_setCssPrefix;
-	c.showNavigationDropdowns = CP_showNavigationDropdowns;
-	c.showYearNavigationInput = CP_showYearNavigationInput;
-	c.copyMonthNamesToWindow();
-	// Return the object
-	return c;
-	}
-function CP_copyMonthNamesToWindow() {
-	// Copy these values over to the date.js 
-	if (typeof(window.MONTH_NAMES)!="undefined" && window.MONTH_NAMES!=null) {
-		window.MONTH_NAMES = new Array();
-		for (var i=0; i\n";
-		result += '
        \n';
-		}
-	else {
-		result += '
        \n';
-		result += '
        \n';
-		result += '
        \n';
-		}
-	// Code for DATE display (default)
-	// -------------------------------
-	if (this.displayType=="date" || this.displayType=="week-end") {
-		if (this.currentDate==null) { this.currentDate = now; }
-		if (arguments.length > 0) { var month = arguments[0]; }
-			else { var month = this.currentDate.getMonth()+1; }
-		if (arguments.length > 1 && arguments[1]>0 && arguments[1]-0==arguments[1]) { var year = arguments[1]; }
-			else { var year = this.currentDate.getFullYear(); }
-		var daysinmonth= new Array(0,31,28,31,30,31,30,31,31,30,31,30,31);
-		if ( ( (year%4 == 0)&&(year%100 != 0) ) || (year%400 == 0) ) {
-			daysinmonth[2] = 29;
-			}
-		var current_month = new Date(year,month-1,1);
-		var display_year = year;
-		var display_month = month;
-		var display_date = 1;
-		var weekday= current_month.getDay();
-		var offset = 0;
-		
-		offset = (weekday >= this.weekStartDay) ? weekday-this.weekStartDay : 7-this.weekStartDay+weekday ;
-		if (offset > 0) {
-			display_month--;
-			if (display_month < 1) { display_month = 12; display_year--; }
-			display_date = daysinmonth[display_month]-offset+1;
-			}
-		var next_month = month+1;
-		var next_month_year = year;
-		if (next_month > 12) { next_month=1; next_month_year++; }
-		var last_month = month-1;
-		var last_month_year = year;
-		if (last_month < 1) { last_month=12; last_month_year--; }
-		var date_class;
-		if (this.type!="WINDOW") {
-			result += "";
-			}
-		result += '\n';
-		var refresh = windowref+'CP_refreshCalendar';
-		var refreshLink = 'javascript:' + refresh;
-		if (this.isShowNavigationDropdowns) {
-			result += '';
-			result += '';
-
-			result += '';
-			}
-		else {
-			if (this.isShowYearNavigation) {
-				result += '';
-				result += '';
-				result += '';
-				result += '';
-
-				result += '';
-				if (this.isShowYearNavigationInput) {
-					result += '';
-					}
-				else {
-					result += '';
-					}
-				result += '';
-				}
-			else {
-				result += '\n';
-				result += '\n';
-				result += '\n';
-				}
-			}
-		result += '
         <'+this.monthNames[month-1]+'> <'+year+'><<'+this.monthNames[month-1]+' '+year+'>>
        \n';
-		result += '\n';
-		result += '\n';
-		for (var j=0; j<7; j++) {
-
-			result += '\n';
-			}
-		result += '\n';
-		for (var row=1; row<=6; row++) {
-			result += '\n';
-			for (var col=1; col<=7; col++) {
-				var disabled=false;
-				if (this.disabledDatesExpression!="") {
-					var ds=""+display_year+LZ(display_month)+LZ(display_date);
-					eval("disabled=("+this.disabledDatesExpression+")");
-					}
-				var dateClass = "";
-				if ((display_month == this.currentDate.getMonth()+1) && (display_date==this.currentDate.getDate()) && (display_year==this.currentDate.getFullYear())) {
-					dateClass = "cpCurrentDate";
-					}
-				else if (display_month == month) {
-					dateClass = "cpCurrentMonthDate";
-					}
-				else {
-					dateClass = "cpOtherMonthDate";
-					}
-				if (disabled || this.disabledWeekDays[col-1]) {
-					result += '	\n';
-					}
-				else {
-					var selected_date = display_date;
-					var selected_month = display_month;
-					var selected_year = display_year;
-					if (this.displayType=="week-end") {
-						var d = new Date(selected_year,selected_month-1,selected_date,0,0,0,0);
-						d.setDate(d.getDate() + (7-col));
-						selected_year = d.getYear();
-						if (selected_year < 1000) { selected_year += 1900; }
-						selected_month = d.getMonth()+1;
-						selected_date = d.getDate();
-						}
-					result += '	\n';
-					}
-				display_date++;
-				if (display_date > daysinmonth[display_month]) {
-					display_date=1;
-					display_month++;
-					}
-				if (display_month > 12) {
-					display_month=1;
-					display_year++;
-					}
-				}
-			result += '';
-			}
-		var current_weekday = now.getDay() - this.weekStartDay;
-		if (current_weekday < 0) {
-			current_weekday += 7;
-			}
-		result += '\n';
-		result += '	
        '+this.dayHeaders[(this.weekStartDay+j)%7]+'
        '+display_date+''+display_date+'
        \n';
-		if (this.disabledDatesExpression!="") {
-			var ds=""+now.getFullYear()+LZ(now.getMonth()+1)+LZ(now.getDate());
-			eval("disabled=("+this.disabledDatesExpression+")");
-			}
-		if (disabled || this.disabledWeekDays[current_weekday+1]) {
-			result += '		'+this.todayText+'\n';
-			}
-		else {
-			result += '		'+this.todayText+'\n';
-			}
-		result += '		
        \n';
-		result += '	
        \n';
-	}
-
-	// Code common for MONTH, QUARTER, YEAR
-	// ------------------------------------
-	if (this.displayType=="month" || this.displayType=="quarter" || this.displayType=="year") {
-		if (arguments.length > 0) { var year = arguments[0]; }
-		else { 
-			if (this.displayType=="year") {	var year = now.getFullYear()-this.yearSelectStartOffset; }
-			else { var year = now.getFullYear(); }
-			}
-		if (this.displayType!="year" && this.isShowYearNavigation) {
-			result += "";
-			result += '\n';
-			result += '	\n';
-			result += '	\n';
-			result += '	\n';
-			result += '
        <<'+year+'>>
        \n';
-			}
-		}
-		
-	// Code for MONTH display 
-	// ----------------------
-	if (this.displayType=="month") {
-		// If POPUP, write entire HTML document
-		result += '\n';
-		for (var i=0; i<4; i++) {
-			result += '';
-			for (var j=0; j<3; j++) {
-				var monthindex = ((i*3)+j);
-				result += '';
-				}
-			result += '';
-			}
-		result += '
        '+this.monthAbbreviations[monthindex]+'
        \n';
-		}
-	
-	// Code for QUARTER display
-	// ------------------------
-	if (this.displayType=="quarter") {
-		result += '
        \n';
-		for (var i=0; i<2; i++) {
-			result += '';
-			for (var j=0; j<2; j++) {
-				var quarter = ((i*2)+j+1);
-				result += '';
-				}
-			result += '';
-			}
-		result += '

        Q'+quarter+'

        \n';
-		}
-
-	// Code for YEAR display
-	// ---------------------
-	if (this.displayType=="year") {
-		var yearColumnSize = 4;
-		result += "";
-		result += '\n';
-		result += '	\n';
-		result += '	\n';
-		result += '
        <<>>
        \n';
-		result += '\n';
-		for (var i=0; i'+currentyear+'';
-				}
-			result += '';
-			}
-		result += '
        \n';
-		}
-	// Common
-	if (this.type == "WINDOW") {
-		result += "\n";
-		}
-	return result;
-	}
-	
-//added for IE6 issue	
-	
-function showFrame(divName, frameName){
-	
-	// added to show Iframe behind calender
-	var oIfr = document.getElementById(frameName);
-	var oCal = document.getElementById(divName);
-	if (oIfr != null){
-		oIfr.style.display='block';
-		oIfr.style.top=oCal.style.top;
-		oIfr.style.left=oCal.style.left;
-	}
-
-}
-function hideFrame(divName, frameName){
-	var oIfr = document.getElementById(frameName);
-	if (oIfr != null){
-		oIfr.style.display='none';
-	}
-}
diff --git a/vid/src/main/webapp/static/fusion/raptor/js/ajax.js b/vid/src/main/webapp/static/fusion/raptor/js/ajax.js
deleted file mode 100644
index c24c26886..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/js/ajax.js
+++ /dev/null
@@ -1,214 +0,0 @@
-/* Simple AJAX Code-Kit (SACK) v1.6.1 */
-/* ©2005 Gregory Wild-Smith */
-/* www.twilightuniverse.com */
-/* Software licenced under a modified X11 licence,
-   see documentation or authors website for more details */
-
-function sack(file) {
-	this.xmlhttp = null;
-
-	this.resetData = function() {
-		this.method = "POST";
-  		this.queryStringSeparator = "?";
-		this.argumentSeparator = "&";
-		this.URLString = "";
-		this.encodeURIString = true;
-  		this.execute = false;
-  		this.element = null;
-		this.elementObj = null;
-		this.requestFile = file;
-		this.vars = new Object();
-		this.responseStatus = new Array(2);
-  	};
-
-	this.resetFunctions = function() {
-  		this.onLoading = function() { };
-  		this.onLoaded = function() { };
-  		this.onInteractive = function() { };
-  		this.onCompletion = function() { };
-  		this.onError = function() { };
-		this.onFail = function() { };
-	};
-
-	this.reset = function() {
-		this.resetFunctions();
-		this.resetData();
-	};
-
-	this.createAJAX = function() {
-		try {
-			this.xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
-		} catch (e1) {
-			try {
-				this.xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
-			} catch (e2) {
-				this.xmlhttp = null;
-			}
-		}
-
-		if (! this.xmlhttp) {
-			if (typeof XMLHttpRequest != "undefined") {
-				this.xmlhttp = new XMLHttpRequest();
-			} else {
-				this.failed = true;
-			}
-		}
-	};
-
-	/*Modified by Sundar: to accept POST request*/
-	this.setVar = function(name, value, index){
-		if(index)
-			this.vars[name+'~'+index] = Array(value, false);
-		else
-			this.vars[name+'~'+0] = Array(value, false);
-	};
-
-	this.encVar = function(name, value, returnvars) {
-		if (true == returnvars) {
-			return Array(encodeURIComponent(name), encodeURIComponent(value));
-		} else {
-			this.vars[encodeURIComponent(name)] = Array(encodeURIComponent(value), true);
-		}
-	}
-
-	this.processURLString = function(string, encode) {
-		encoded = encodeURIComponent(this.argumentSeparator);
-		regexp = new RegExp(this.argumentSeparator + "|" + encoded);
-		varArray = string.split(regexp);
-		for (i = 0; i < varArray.length; i++){
-			urlVars = varArray[i].split("=");
-			if (true == encode){
-				this.encVar(urlVars[0], urlVars[1]);
-			} else {
-				this.setVar(urlVars[0], urlVars[1]);
-			}
-		}
-	}
-
-	this.createURLString = function(urlstring) {
-		if (this.encodeURIString && this.URLString.length) {
-			this.processURLString(this.URLString, true);
-		}
-
-		if (urlstring) {
-			if (this.URLString.length) {
-				this.URLString += this.argumentSeparator + urlstring;
-			} else {
-				this.URLString = urlstring;
-			}
-		}
-
-		// prevents caching of URLString
-		this.setVar("rndval", new Date().getTime());
-
-		urlstringtemp = new Array();
-		/*Modified by Sundar: to accept POST request*/
-		var key1 = "";
-		for (key in this.vars) {
-			if (false == this.vars[key][1] && true == this.encodeURIString) {
-				encoded = this.encVar(key, this.vars[key][0], true);
-				delete this.vars[key];
-				this.vars[encoded[0]] = Array(encoded[1], true);
-				key = encoded[0];
-			}
-			key1 = key.substr(0,key.indexOf('~'));
-			//alert("Key " + key1);
-			urlstringtemp[urlstringtemp.length] = key1 + "=" + this.vars[key][0];
-		}
-		if (urlstring){
-			this.URLString += this.argumentSeparator + urlstringtemp.join(this.argumentSeparator);
-		} else {
-			this.URLString += urlstringtemp.join(this.argumentSeparator);
-		}
-		//alert("URLString " + this.URLString);
-		
-	}
-
-	this.runResponse = function() {
-		eval(this.response);
-	}
-
-
-	this.runAJAX = function(urlstring,noWaitForResponse,timeOut) {
-		
-		if(noWaitForResponse == null){
-			noWaitForResponse = true;
-		}
-		
-		if (this.failed) {
-			this.onFail();
-		} else {
-			this.createURLString(urlstring);
-			if (this.element) {
-				this.elementObj = document.getElementById(this.element);
-			}
-			if (this.xmlhttp) {
-				var self = this;
-				//SUNDAR: Added timeout for synchronous AJAX  
-				if(!noWaitForResponse && timeOut != null && !isNaN(timeOut)){
-					window.setTimeout("dummyFunction()",timeOut);
-				}
-				if (this.method == "GET") {
-					totalurlstring = this.requestFile + this.queryStringSeparator + this.URLString;
-					this.xmlhttp.open(this.method, totalurlstring, noWaitForResponse);
-				} else {
-					
-					this.xmlhttp.open(this.method, this.requestFile, noWaitForResponse);
-					try {
-						this.xmlhttp.setRequestHeader("Content-Type", "application/x-www-form-urlencoded")
-					} catch (e) { }
-				}
-
-				this.xmlhttp.onreadystatechange = function() {
-					//alert("AJAX READY " + self.xmlhttp.readyState);
-					switch (self.xmlhttp.readyState) {
-						case 1:
-							self.onLoading();
-							break;
-						case 2:
-							self.onLoaded();
-							break;
-						case 3:
-							self.onInteractive();
-							break;
-						case 4:
-							self.response = self.xmlhttp.responseText;
-							self.responseXML = self.xmlhttp.responseXML;
-							self.responseStatus[0] = self.xmlhttp.status;
-							self.responseStatus[1] = self.xmlhttp.statusText;
-
-							if (self.execute) {
-								self.runResponse();
-							}
-
-							if (self.elementObj) {
-								elemNodeName = self.elementObj.nodeName;
-								elemNodeName.toLowerCase();
-								if (elemNodeName == "input"
-								|| elemNodeName == "select"
-								|| elemNodeName == "option"
-								|| elemNodeName == "textarea") {
-									self.elementObj.value = self.response;
-								} else {
-									self.elementObj.innerHTML = self.response;
-								}
-							}
-							if (self.responseStatus[0] == "200") {
-								self.onCompletion();
-							} else {
-								self.onError();
-							}
-
-							self.URLString = "";
-							break;
-					}
-				};
-
-				this.xmlhttp.send(this.URLString);
-			}
-		}
-	};
-
-	this.reset();
-	this.createAJAX();
-}
diff --git a/vid/src/main/webapp/static/fusion/raptor/js/ajax_dynamic_content.js b/vid/src/main/webapp/static/fusion/raptor/js/ajax_dynamic_content.js
deleted file mode 100644
index 077932e1a..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/js/ajax_dynamic_content.js
+++ /dev/null
@@ -1,97 +0,0 @@
-
-/***********************************************
-* Dynamic Ajax Content- © Dynamic Drive DHTML code library (www.dynamicdrive.com)
-* This notice MUST stay intact for legal use
-* Visit Dynamic Drive at http://www.dynamicdrive.com/ for full source code
-***********************************************/
-
-var loadedobjects=""
-var rootdomain="http://"+window.location.hostname
-
-function ajaxpage(url, containerid){
-
-var page_request = false;
-   try {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-   } catch (e) {
-    //alert("Permission UniversalBrowserRead denied.");
-   }
-if (window.XMLHttpRequest) // if Mozilla, Safari etc
-page_request = new XMLHttpRequest()
-else if (window.ActiveXObject){ // if IE
-try {
-page_request = new ActiveXObject("Msxml2.XMLHTTP")
-} 
-catch (e1){
-try{
-page_request = new ActiveXObject("Microsoft.XMLHTTP")
-}
-catch (e1){ page_request = null; alert('permission denied');
-}
-}
-}
-else
-return false
-page_request.onreadystatechange=function(){
-loadpage(page_request, containerid)
-}
-// This is a fix made since IE doesn't refresh the page 
-var ajaxRightNow = new Date();
-var noCacheAjaxurl = url + ((/\?/.test(url)) ? "&" : "?") + "ajaxRandomTimestamp=" + ajaxRightNow.getTime(); 
-page_request.open('GET', noCacheAjaxurl, true)
-page_request.send(null)
-}
-
-function loadpage(page_request, containerid){
-var div = document.getElementById(containerid);
-if (page_request.readyState == 4 && (page_request.status==200 || window.location.href.indexOf("http")==-1))
-    div.innerHTML=page_request.responseText;
-    var x = div.getElementsByTagName("script");   
-    for(var i=0;i=0) 
-        eval(x[i].text);  
-    }
-}
-
-function resizeDivScrollbar(){  
-	var frame = document.getElementById("scrollableTableResult");  
-	var parentBody = window.parent.document.body;
-	var parentMenu = window.parent.document.getElementById("application");
-	if(frame!=null) {
-		//alert(frame.clientHeight + " " + window.parent.document.body.clientHeight);
-		if (frame.clientHeight > window.parent.document.body.clientHeight) {
-				frame.style.height = window.parent.document.body.clientHeight-350;
-		} else
-				frame.style.height = window.parent.document.body.clientHeight;
-		parentMenu.style.width = frame.clientWidth+200;
-	}			
-} 
-
-
-function loadobjs(){
-if (!document.getElementById)
-return
-for (i=0; i35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('(H(){J w=1b.4M,3m$=1b.$;J D=1b.4M=1b.$=H(a,b){I 2B D.17.5j(a,b)};J u=/^[^<]*(<(.|\\s)+>)[^>]*$|^#(\\w+)$/,62=/^.[^:#\\[\\.]*$/,12;D.17=D.44={5j:H(d,b){d=d||S;G(d.16){7[0]=d;7.K=1;I 7}G(1j d=="23"){J c=u.2D(d);G(c&&(c[1]||!b)){G(c[1])d=D.4h([c[1]],b);N{J a=S.61(c[3]);G(a){G(a.2v!=c[3])I D().2q(d);I D(a)}d=[]}}N I D(b).2q(d)}N G(D.1D(d))I D(S)[D.17.27?"27":"43"](d);I 7.6Y(D.2d(d))},5w:"1.2.6",8G:H(){I 7.K},K:0,3p:H(a){I a==12?D.2d(7):7[a]},2I:H(b){J a=D(b);a.5n=7;I a},6Y:H(a){7.K=0;2p.44.1p.1w(7,a);I 7},P:H(a,b){I D.P(7,a,b)},5i:H(b){J a=-1;I D.2L(b&&b.5w?b[0]:b,7)},1K:H(c,a,b){J d=c;G(c.1q==56)G(a===12)I 7[0]&&D[b||"1K"](7[0],c);N{d={};d[c]=a}I 7.P(H(i){R(c 1n d)D.1K(b?7.V:7,c,D.1i(7,d[c],b,i,c))})},1g:H(b,a){G((b==\'2h\'||b==\'1Z\')&&3d(a)<0)a=12;I 7.1K(b,a,"2a")},1r:H(b){G(1j b!="49"&&b!=U)I 7.4E().3v((7[0]&&7[0].2z||S).5F(b));J a="";D.P(b||7,H(){D.P(7.3t,H(){G(7.16!=8)a+=7.16!=1?7.76:D.17.1r([7])})});I a},5z:H(b){G(7[0])D(b,7[0].2z).5y().39(7[0]).2l(H(){J a=7;1B(a.1x)a=a.1x;I a}).3v(7);I 7},8Y:H(a){I 7.P(H(){D(7).6Q().5z(a)})},8R:H(a){I 7.P(H(){D(7).5z(a)})},3v:H(){I 7.3W(19,M,Q,H(a){G(7.16==1)7.3U(a)})},6F:H(){I 7.3W(19,M,M,H(a){G(7.16==1)7.39(a,7.1x)})},6E:H(){I 7.3W(19,Q,Q,H(a){7.1d.39(a,7)})},5q:H(){I 7.3W(19,Q,M,H(a){7.1d.39(a,7.2H)})},3l:H(){I 7.5n||D([])},2q:H(b){J c=D.2l(7,H(a){I D.2q(b,a)});I 7.2I(/[^+>] [^+>]/.11(b)||b.1h("..")>-1?D.4r(c):c)},5y:H(e){J f=7.2l(H(){G(D.14.1f&&!D.4n(7)){J a=7.6o(M),5h=S.3h("1v");5h.3U(a);I D.4h([5h.4H])[0]}N I 7.6o(M)});J d=f.2q("*").5c().P(H(){G(7[E]!=12)7[E]=U});G(e===M)7.2q("*").5c().P(H(i){G(7.16==3)I;J c=D.L(7,"3w");R(J a 1n c)R(J b 1n c[a])D.W.1e(d[i],a,c[a][b],c[a][b].L)});I f},1E:H(b){I 7.2I(D.1D(b)&&D.3C(7,H(a,i){I b.1k(a,i)})||D.3g(b,7))},4Y:H(b){G(b.1q==56)G(62.11(b))I 7.2I(D.3g(b,7,M));N b=D.3g(b,7);J a=b.K&&b[b.K-1]!==12&&!b.16;I 7.1E(H(){I a?D.2L(7,b)<0:7!=b})},1e:H(a){I 7.2I(D.4r(D.2R(7.3p(),1j a==\'23\'?D(a):D.2d(a))))},3F:H(a){I!!a&&D.3g(a,7).K>0},7T:H(a){I 7.3F("."+a)},6e:H(b){G(b==12){G(7.K){J c=7[0];G(D.Y(c,"2A")){J e=c.64,63=[],15=c.15,2V=c.O=="2A-2V";G(e<0)I U;R(J i=2V?e:0,2f=2V?e+1:15.K;i<2f;i++){J d=15[i];G(d.2W){b=D.14.1f&&!d.at.2x.an?d.1r:d.2x;G(2V)I b;63.1p(b)}}I 63}N I(7[0].2x||"").1o(/\\r/g,"")}I 12}G(b.1q==4L)b+=\'\';I 7.P(H(){G(7.16!=1)I;G(b.1q==2p&&/5O|5L/.11(7.O))7.4J=(D.2L(7.2x,b)>=0||D.2L(7.34,b)>=0);N G(D.Y(7,"2A")){J a=D.2d(b);D("9R",7).P(H(){7.2W=(D.2L(7.2x,a)>=0||D.2L(7.1r,a)>=0)});G(!a.K)7.64=-1}N 7.2x=b})},2K:H(a){I a==12?(7[0]?7[0].4H:U):7.4E().3v(a)},7b:H(a){I 7.5q(a).21()},79:H(i){I 7.3s(i,i+1)},3s:H(){I 7.2I(2p.44.3s.1w(7,19))},2l:H(b){I 7.2I(D.2l(7,H(a,i){I b.1k(a,i,a)}))},5c:H(){I 7.1e(7.5n)},L:H(d,b){J a=d.1R(".");a[1]=a[1]?"."+a[1]:"";G(b===12){J c=7.5C("9z"+a[1]+"!",[a[0]]);G(c===12&&7.K)c=D.L(7[0],d);I c===12&&a[1]?7.L(a[0]):c}N I 7.1P("9u"+a[1]+"!",[a[0],b]).P(H(){D.L(7,d,b)})},3b:H(a){I 7.P(H(){D.3b(7,a)})},3W:H(g,f,h,d){J e=7.K>1,3x;I 7.P(H(){G(!3x){3x=D.4h(g,7.2z);G(h)3x.9o()}J b=7;G(f&&D.Y(7,"1T")&&D.Y(3x[0],"4F"))b=7.3H("22")[0]||7.3U(7.2z.3h("22"));J c=D([]);D.P(3x,H(){J a=e?D(7).5y(M)[0]:7;G(D.Y(a,"1m"))c=c.1e(a);N{G(a.16==1)c=c.1e(D("1m",a).21());d.1k(b,a)}});c.P(6T)})}};D.17.5j.44=D.17;H 6T(i,a){G(a.4d)D.3Y({1a:a.4d,31:Q,1O:"1m"});N D.5u(a.1r||a.6O||a.4H||"");G(a.1d)a.1d.37(a)}H 1z(){I+2B 8J}D.1l=D.17.1l=H(){J b=19[0]||{},i=1,K=19.K,4x=Q,15;G(b.1q==8I){4x=b;b=19[1]||{};i=2}G(1j b!="49"&&1j b!="H")b={};G(K==i){b=7;--i}R(;i-1}},6q:H(b,c,a){J e={};R(J d 1n c){e[d]=b.V[d];b.V[d]=c[d]}a.1k(b);R(J d 1n c)b.V[d]=e[d]},1g:H(d,e,c){G(e=="2h"||e=="1Z"){J b,3X={30:"5x",5g:"1G",18:"3I"},35=e=="2h"?["5e","6k"]:["5G","6i"];H 5b(){b=e=="2h"?d.8f:d.8c;J a=0,2C=0;D.P(35,H(){a+=3d(D.2a(d,"57"+7,M))||0;2C+=3d(D.2a(d,"2C"+7+"4b",M))||0});b-=29.83(a+2C)}G(D(d).3F(":4j"))5b();N D.6q(d,3X,5b);I 29.2f(0,b)}I D.2a(d,e,c)},2a:H(f,l,k){J e,V=f.V;H 3E(b){G(!D.14.2k)I Q;J a=3P.54(b,U);I!a||a.52("3E")==""}G(l=="1y"&&D.14.1f){e=D.1K(V,"1y");I e==""?"1":e}G(D.14.2G&&l=="18"){J d=V.50;V.50="0 7Y 7W";V.50=d}G(l.1I(/4i/i))l=y;G(!k&&V&&V[l])e=V[l];N G(3P.54){G(l.1I(/4i/i))l="4i";l=l.1o(/([A-Z])/g,"-$1").3y();J c=3P.54(f,U);G(c&&!3E(f))e=c.52(l);N{J g=[],2E=[],a=f,i=0;R(;a&&3E(a);a=a.1d)2E.6h(a);R(;i<2E.K;i++)G(3E(2E[i])){g[i]=2E[i].V.18;2E[i].V.18="3I"}e=l=="18"&&g[2E.K-1]!=U?"2F":(c&&c.52(l))||"";R(i=0;i]*?)\\/>/g,H(b,a,c){I c.1I(/^(aK|4f|7E|aG|4T|7A|aB|3n|az|ay|av)$/i)?b:a+">"});J f=D.3k(d).3y(),1v=h.3h("1v");J e=!f.1h("",""]||!f.1h("",""]||f.1I(/^<(aq|22|am|ak|ai)/)&&[1,"<1T>",""]||!f.1h("<4F")&&[2,"<1T><22>",""]||(!f.1h("<22><4F>",""]||!f.1h("<7E")&&[2,"<1T><22><7q>",""]||D.14.1f&&[1,"1v<1v>",""]||[0,"",""];1v.4H=e[1]+d+e[2];1B(e[0]--)1v=1v.5T;G(D.14.1f){J g=!f.1h("<1T")&&f.1h("<22")<0?1v.1x&&1v.1x.3t:e[1]=="<1T>"&&f.1h("<22")<0?1v.3t:[];R(J j=g.K-1;j>=0;--j)G(D.Y(g[j],"22")&&!g[j].3t.K)g[j].1d.37(g[j]);G(/^\\s/.11(d))1v.39(h.5F(d.1I(/^\\s*/)[0]),1v.1x)}d=D.2d(1v.3t)}G(d.K===0&&(!D.Y(d,"3V")&&!D.Y(d,"2A")))I;G(d[0]==12||D.Y(d,"3V")||d.15)k.1p(d);N k=D.2R(k,d)});I k},1K:H(d,f,c){G(!d||d.16==3||d.16==8)I 12;J e=!D.4n(d),40=c!==12,1f=D.14.1f;f=e&&D.3X[f]||f;G(d.2j){J g=/5Q|4d|V/.11(f);G(f=="2W"&&D.14.2k)d.1d.64;G(f 1n d&&e&&!g){G(40){G(f=="O"&&D.Y(d,"4T")&&d.1d)7p"O a3 a1\'t 9V 9U";d[f]=c}G(D.Y(d,"3V")&&d.7i(f))I d.7i(f).76;I d[f]}G(1f&&e&&f=="V")I D.1K(d.V,"9T",c);G(40)d.9Q(f,""+c);J h=1f&&e&&g?d.4G(f,2):d.4G(f);I h===U?12:h}G(1f&&f=="1y"){G(40){d.6B=1;d.1E=(d.1E||"").1o(/7f\\([^)]*\\)/,"")+(3r(c)+\'\'=="9L"?"":"7f(1y="+c*7a+")")}I d.1E&&d.1E.1h("1y=")>=0?(3d(d.1E.1I(/1y=([^)]*)/)[1])/7a)+\'\':""}f=f.1o(/-([a-z])/9H,H(a,b){I b.2r()});G(40)d[f]=c;I d[f]},3k:H(a){I(a||"").1o(/^\\s+|\\s+$/g,"")},2d:H(b){J a=[];G(b!=U){J i=b.K;G(i==U||b.1R||b.4I||b.1k)a[0]=b;N 1B(i)a[--i]=b[i]}I a},2L:H(b,a){R(J i=0,K=a.K;i*",7).21();1B(7.1x)7.37(7.1x)}},H(a,b){D.17[a]=H(){I 7.P(b,19)}});D.P(["6N","4b"],H(i,c){J b=c.3y();D.17[b]=H(a){I 7[0]==1b?D.14.2G&&S.1c["5t"+c]||D.14.2k&&1b["5s"+c]||S.70=="6Z"&&S.1C["5t"+c]||S.1c["5t"+c]:7[0]==S?29.2f(29.2f(S.1c["4y"+c],S.1C["4y"+c]),29.2f(S.1c["2i"+c],S.1C["2i"+c])):a==12?(7.K?D.1g(7[0],b):U):7.1g(b,a.1q==56?a:a+"2X")}});H 25(a,b){I a[0]&&3r(D.2a(a[0],b,M),10)||0}J C=D.14.2k&&3r(D.14.5B)<8H?"(?:[\\\\w*3m-]|\\\\\\\\.)":"(?:[\\\\w\\8F-\\8E*3m-]|\\\\\\\\.)",6L=2B 4v("^>\\\\s*("+C+"+)"),6J=2B 4v("^("+C+"+)(#)("+C+"+)"),6I=2B 4v("^([#.]?)("+C+"*)");D.1l({6H:{"":H(a,i,m){I m[2]=="*"||D.Y(a,m[2])},"#":H(a,i,m){I a.4G("2v")==m[2]},":":{8D:H(a,i,m){I im[3]-0},3a:H(a,i,m){I m[3]-0==i},79:H(a,i,m){I m[3]-0==i},3o:H(a,i){I i==0},3S:H(a,i,m,r){I i==r.K-1},6D:H(a,i){I i%2==0},6C:H(a,i){I i%2},"3o-4u":H(a){I a.1d.3H("*")[0]==a},"3S-4u":H(a){I D.3a(a.1d.5T,1,"4l")==a},"8z-4u":H(a){I!D.3a(a.1d.5T,2,"4l")},6W:H(a){I a.1x},4E:H(a){I!a.1x},8y:H(a,i,m){I(a.6O||a.8x||D(a).1r()||"").1h(m[3])>=0},4j:H(a){I"1G"!=a.O&&D.1g(a,"18")!="2F"&&D.1g(a,"5g")!="1G"},1G:H(a){I"1G"==a.O||D.1g(a,"18")=="2F"||D.1g(a,"5g")=="1G"},8w:H(a){I!a.3R},3R:H(a){I a.3R},4J:H(a){I a.4J},2W:H(a){I a.2W||D.1K(a,"2W")},1r:H(a){I"1r"==a.O},5O:H(a){I"5O"==a.O},5L:H(a){I"5L"==a.O},5p:H(a){I"5p"==a.O},3Q:H(a){I"3Q"==a.O},5o:H(a){I"5o"==a.O},6A:H(a){I"6A"==a.O},6z:H(a){I"6z"==a.O},2s:H(a){I"2s"==a.O||D.Y(a,"2s")},4T:H(a){I/4T|2A|6y|2s/i.11(a.Y)},3T:H(a,i,m){I D.2q(m[3],a).K},8t:H(a){I/h\\d/i.11(a.Y)},8s:H(a){I D.3C(D.3O,H(b){I a==b.T}).K}}},6x:[/^(\\[) *@?([\\w-]+) *([!*$^~=]*) *(\'?"?)(.*?)\\4 *\\]/,/^(:)([\\w-]+)\\("?\'?(.*?(\\(.*?\\))?[^(]*?)"?\'?\\)/,2B 4v("^([:.#]*)("+C+"+)")],3g:H(a,c,b){J d,1t=[];1B(a&&a!=d){d=a;J f=D.1E(a,c,b);a=f.t.1o(/^\\s*,\\s*/,"");1t=b?c=f.r:D.2R(1t,f.r)}I 1t},2q:H(t,o){G(1j t!="23")I[t];G(o&&o.16!=1&&o.16!=9)I[];o=o||S;J d=[o],2o=[],3S,Y;1B(t&&3S!=t){J r=[];3S=t;t=D.3k(t);J l=Q,3j=6L,m=3j.2D(t);G(m){Y=m[1].2r();R(J i=0;d[i];i++)R(J c=d[i].1x;c;c=c.2H)G(c.16==1&&(Y=="*"||c.Y.2r()==Y))r.1p(c);d=r;t=t.1o(3j,"");G(t.1h(" ")==0)6M;l=M}N{3j=/^([>+~])\\s*(\\w*)/i;G((m=3j.2D(t))!=U){r=[];J k={};Y=m[2].2r();m=m[1];R(J j=0,3i=d.K;j<3i;j++){J n=m=="~"||m=="+"?d[j].2H:d[j].1x;R(;n;n=n.2H)G(n.16==1){J g=D.L(n);G(m=="~"&&k[g])1X;G(!Y||n.Y.2r()==Y){G(m=="~")k[g]=M;r.1p(n)}G(m=="+")1X}}d=r;t=D.3k(t.1o(3j,""));l=M}}G(t&&!l){G(!t.1h(",")){G(o==d[0])d.4s();2o=D.2R(2o,d);r=d=[o];t=" "+t.6v(1,t.K)}N{J h=6J;J m=h.2D(t);G(m){m=[0,m[2],m[3],m[1]]}N{h=6I;m=h.2D(t)}m[2]=m[2].1o(/\\\\/g,"");J f=d[d.K-1];G(m[1]=="#"&&f&&f.61&&!D.4n(f)){J p=f.61(m[2]);G((D.14.1f||D.14.2G)&&p&&1j p.2v=="23"&&p.2v!=m[2])p=D(\'[@2v="\'+m[2]+\'"]\',f)[0];d=r=p&&(!m[3]||D.Y(p,m[3]))?[p]:[]}N{R(J i=0;d[i];i++){J a=m[1]=="#"&&m[3]?m[3]:m[1]!=""||m[0]==""?"*":m[2];G(a=="*"&&d[i].Y.3y()=="49")a="3n";r=D.2R(r,d[i].3H(a))}G(m[1]==".")r=D.5m(r,m[2]);G(m[1]=="#"){J e=[];R(J i=0;r[i];i++)G(r[i].4G("2v")==m[2]){e=[r[i]];1X}r=e}d=r}t=t.1o(h,"")}}G(t){J b=D.1E(t,r);d=r=b.r;t=D.3k(b.t)}}G(t)d=[];G(d&&o==d[0])d.4s();2o=D.2R(2o,d);I 2o},5m:H(r,m,a){m=" "+m+" ";J c=[];R(J i=0;r[i];i++){J b=(" "+r[i].1F+" ").1h(m)>=0;G(!a&&b||a&&!b)c.1p(r[i])}I c},1E:H(t,r,h){J d;1B(t&&t!=d){d=t;J p=D.6x,m;R(J i=0;p[i];i++){m=p[i].2D(t);G(m){t=t.8r(m[0].K);m[2]=m[2].1o(/\\\\/g,"");1X}}G(!m)1X;G(m[1]==":"&&m[2]=="4Y")r=62.11(m[3])?D.1E(m[3],r,M).r:D(r).4Y(m[3]);N G(m[1]==".")r=D.5m(r,m[2],h);N G(m[1]=="["){J g=[],O=m[3];R(J i=0,3i=r.K;i<3i;i++){J a=r[i],z=a[D.3X[m[2]]||m[2]];G(z==U||/5Q|4d|2W/.11(m[2]))z=D.1K(a,m[2])||\'\';G((O==""&&!!z||O=="="&&z==m[5]||O=="!="&&z!=m[5]||O=="^="&&z&&!z.1h(m[5])||O=="$="&&z.6v(z.K-m[5].K)==m[5]||(O=="*="||O=="~=")&&z.1h(m[5])>=0)^h)g.1p(a)}r=g}N G(m[1]==":"&&m[2]=="3a-4u"){J e={},g=[],11=/(-?)(\\d*)n((?:\\+|-)?\\d*)/.2D(m[3]=="6D"&&"2n"||m[3]=="6C"&&"2n+1"||!/\\D/.11(m[3])&&"8q+"+m[3]||m[3]),3o=(11[1]+(11[2]||1))-0,d=11[3]-0;R(J i=0,3i=r.K;i<3i;i++){J j=r[i],1d=j.1d,2v=D.L(1d);G(!e[2v]){J c=1;R(J n=1d.1x;n;n=n.2H)G(n.16==1)n.4q=c++;e[2v]=M}J b=Q;G(3o==0){G(j.4q==d)b=M}N G((j.4q-d)%3o==0&&(j.4q-d)/3o>=0)b=M;G(b^h)g.1p(j)}r=g}N{J f=D.6H[m[1]];G(1j f=="49")f=f[m[2]];G(1j f=="23")f=6u("Q||H(a,i){I "+f+";}");r=D.3C(r,H(a,i){I f(a,i,m,r)},h)}}I{r:r,t:t}},4S:H(b,c){J a=[],1t=b[c];1B(1t&&1t!=S){G(1t.16==1)a.1p(1t);1t=1t[c]}I a},3a:H(a,e,c,b){e=e||1;J d=0;R(;a;a=a[c])G(a.16==1&&++d==e)1X;I a},5v:H(n,a){J r=[];R(;n;n=n.2H){G(n.16==1&&n!=a)r.1p(n)}I r}});D.W={1e:H(f,i,g,e){G(f.16==3||f.16==8)I;G(D.14.1f&&f.4I)f=1b;G(!g.24)g.24=7.24++;G(e!=12){J h=g;g=7.3M(h,H(){I h.1w(7,19)});g.L=e}J j=D.L(f,"3w")||D.L(f,"3w",{}),1H=D.L(f,"1H")||D.L(f,"1H",H(){G(1j D!="12"&&!D.W.5k)I D.W.1H.1w(19.3L.T,19)});1H.T=f;D.P(i.1R(/\\s+/),H(c,b){J a=b.1R(".");b=a[0];g.O=a[1];J d=j[b];G(!d){d=j[b]={};G(!D.W.2t[b]||D.W.2t[b].4p.1k(f)===Q){G(f.3K)f.3K(b,1H,Q);N G(f.6t)f.6t("4o"+b,1H)}}d[g.24]=g;D.W.26[b]=M});f=U},24:1,26:{},21:H(e,h,f){G(e.16==3||e.16==8)I;J i=D.L(e,"3w"),1L,5i;G(i){G(h==12||(1j h=="23"&&h.8p(0)=="."))R(J g 1n i)7.21(e,g+(h||""));N{G(h.O){f=h.2y;h=h.O}D.P(h.1R(/\\s+/),H(b,a){J c=a.1R(".");a=c[0];G(i[a]){G(f)2U i[a][f.24];N R(f 1n i[a])G(!c[1]||i[a][f].O==c[1])2U i[a][f];R(1L 1n i[a])1X;G(!1L){G(!D.W.2t[a]||D.W.2t[a].4A.1k(e)===Q){G(e.6p)e.6p(a,D.L(e,"1H"),Q);N G(e.6n)e.6n("4o"+a,D.L(e,"1H"))}1L=U;2U i[a]}}})}R(1L 1n i)1X;G(!1L){J d=D.L(e,"1H");G(d)d.T=U;D.3b(e,"3w");D.3b(e,"1H")}}},1P:H(h,c,f,g,i){c=D.2d(c);G(h.1h("!")>=0){h=h.3s(0,-1);J a=M}G(!f){G(7.26[h])D("*").1e([1b,S]).1P(h,c)}N{G(f.16==3||f.16==8)I 12;J b,1L,17=D.1D(f[h]||U),W=!c[0]||!c[0].32;G(W){c.6h({O:h,2J:f,32:H(){},3J:H(){},4C:1z()});c[0][E]=M}c[0].O=h;G(a)c[0].6m=M;J d=D.L(f,"1H");G(d)b=d.1w(f,c);G((!17||(D.Y(f,\'a\')&&h=="4V"))&&f["4o"+h]&&f["4o"+h].1w(f,c)===Q)b=Q;G(W)c.4s();G(i&&D.1D(i)){1L=i.1w(f,b==U?c:c.7d(b));G(1L!==12)b=1L}G(17&&g!==Q&&b!==Q&&!(D.Y(f,\'a\')&&h=="4V")){7.5k=M;1U{f[h]()}1V(e){}}7.5k=Q}I b},1H:H(b){J a,1L,38,5f,4m;b=19[0]=D.W.6l(b||1b.W);38=b.O.1R(".");b.O=38[0];38=38[1];5f=!38&&!b.6m;4m=(D.L(7,"3w")||{})[b.O];R(J j 1n 4m){J c=4m[j];G(5f||c.O==38){b.2y=c;b.L=c.L;1L=c.1w(7,19);G(a!==Q)a=1L;G(1L===Q){b.32();b.3J()}}}I a},6l:H(b){G(b[E]==M)I b;J d=b;b={8o:d};J c="8n 8m 8l 8k 2s 8j 47 5d 6j 5E 8i L 8h 8g 4K 2y 5a 59 8e 8b 58 6f 8a 88 4k 87 86 84 6d 2J 4C 6c O 82 81 35".1R(" ");R(J i=c.K;i;i--)b[c[i]]=d[c[i]];b[E]=M;b.32=H(){G(d.32)d.32();d.80=Q};b.3J=H(){G(d.3J)d.3J();d.7Z=M};b.4C=b.4C||1z();G(!b.2J)b.2J=b.6d||S;G(b.2J.16==3)b.2J=b.2J.1d;G(!b.4k&&b.4K)b.4k=b.4K==b.2J?b.6c:b.4K;G(b.58==U&&b.5d!=U){J a=S.1C,1c=S.1c;b.58=b.5d+(a&&a.2e||1c&&1c.2e||0)-(a.6b||0);b.6f=b.6j+(a&&a.2c||1c&&1c.2c||0)-(a.6a||0)}G(!b.35&&((b.47||b.47===0)?b.47:b.5a))b.35=b.47||b.5a;G(!b.59&&b.5E)b.59=b.5E;G(!b.35&&b.2s)b.35=(b.2s&1?1:(b.2s&2?3:(b.2s&4?2:0)));I b},3M:H(a,b){b.24=a.24=a.24||b.24||7.24++;I b},2t:{27:{4p:H(){55();I},4A:H(){I}},3D:{4p:H(){G(D.14.1f)I Q;D(7).2O("53",D.W.2t.3D.2y);I M},4A:H(){G(D.14.1f)I Q;D(7).4e("53",D.W.2t.3D.2y);I M},2y:H(a){G(F(a,7))I M;a.O="3D";I D.W.1H.1w(7,19)}},3N:{4p:H(){G(D.14.1f)I Q;D(7).2O("51",D.W.2t.3N.2y);I M},4A:H(){G(D.14.1f)I Q;D(7).4e("51",D.W.2t.3N.2y);I M},2y:H(a){G(F(a,7))I M;a.O="3N";I D.W.1H.1w(7,19)}}}};D.17.1l({2O:H(c,a,b){I c=="4X"?7.2V(c,a,b):7.P(H(){D.W.1e(7,c,b||a,b&&a)})},2V:H(d,b,c){J e=D.W.3M(c||b,H(a){D(7).4e(a,e);I(c||b).1w(7,19)});I 7.P(H(){D.W.1e(7,d,e,c&&b)})},4e:H(a,b){I 7.P(H(){D.W.21(7,a,b)})},1P:H(c,a,b){I 7.P(H(){D.W.1P(c,a,7,M,b)})},5C:H(c,a,b){I 7[0]&&D.W.1P(c,a,7[0],Q,b)},2m:H(b){J c=19,i=1;1B(i=0){J i=g.3s(e,g.K);g=g.3s(0,e)}c=c||H(){};J f="2P";G(d)G(D.1D(d)){c=d;d=U}N{d=D.3n(d);f="6g"}J h=7;D.3Y({1a:g,O:f,1O:"2K",L:d,1J:H(a,b){G(b=="1W"||b=="7J")h.2K(i?D("<1v/>").3v(a.4U.1o(/<1m(.|\\s)*?\\/1m>/g,"")).2q(i):a.4U);h.P(c,[a.4U,b,a])}});I 7},aL:H(){I D.3n(7.7I())},7I:H(){I 7.2l(H(){I D.Y(7,"3V")?D.2d(7.aH):7}).1E(H(){I 7.34&&!7.3R&&(7.4J||/2A|6y/i.11(7.Y)||/1r|1G|3Q/i.11(7.O))}).2l(H(i,c){J b=D(7).6e();I b==U?U:b.1q==2p?D.2l(b,H(a,i){I{34:c.34,2x:a}}):{34:c.34,2x:b}}).3p()}});D.P("7H,7G,7F,7D,7C,7B".1R(","),H(i,o){D.17[o]=H(f){I 7.2O(o,f)}});J B=1z();D.1l({3p:H(d,b,a,c){G(D.1D(b)){a=b;b=U}I D.3Y({O:"2P",1a:d,L:b,1W:a,1O:c})},aE:H(b,a){I D.3p(b,U,a,"1m")},aD:H(c,b,a){I D.3p(c,b,a,"3z")},aC:H(d,b,a,c){G(D.1D(b)){a=b;b={}}I D.3Y({O:"6g",1a:d,L:b,1W:a,1O:c})},aA:H(a){D.1l(D.60,a)},60:{1a:5Z.5Q,26:M,O:"2P",2T:0,7z:"4R/x-ax-3V-aw",7x:M,31:M,L:U,5Y:U,3Q:U,4Q:{2N:"4R/2N, 1r/2N",2K:"1r/2K",1m:"1r/4t, 4R/4t",3z:"4R/3z, 1r/4t",1r:"1r/as",4w:"*/*"}},4z:{},3Y:H(s){s=D.1l(M,s,D.1l(M,{},D.60,s));J g,2Z=/=\\?(&|$)/g,1u,L,O=s.O.2r();G(s.L&&s.7x&&1j s.L!="23")s.L=D.3n(s.L);G(s.1O=="4P"){G(O=="2P"){G(!s.1a.1I(2Z))s.1a+=(s.1a.1I(/\\?/)?"&":"?")+(s.4P||"7u")+"=?"}N G(!s.L||!s.L.1I(2Z))s.L=(s.L?s.L+"&":"")+(s.4P||"7u")+"=?";s.1O="3z"}G(s.1O=="3z"&&(s.L&&s.L.1I(2Z)||s.1a.1I(2Z))){g="4P"+B++;G(s.L)s.L=(s.L+"").1o(2Z,"="+g+"$1");s.1a=s.1a.1o(2Z,"="+g+"$1");s.1O="1m";1b[g]=H(a){L=a;1W();1J();1b[g]=12;1U{2U 1b[g]}1V(e){}G(i)i.37(h)}}G(s.1O=="1m"&&s.1Y==U)s.1Y=Q;G(s.1Y===Q&&O=="2P"){J j=1z();J k=s.1a.1o(/(\\?|&)3m=.*?(&|$)/,"$ap="+j+"$2");s.1a=k+((k==s.1a)?(s.1a.1I(/\\?/)?"&":"?")+"3m="+j:"")}G(s.L&&O=="2P"){s.1a+=(s.1a.1I(/\\?/)?"&":"?")+s.L;s.L=U}G(s.26&&!D.4O++)D.W.1P("7H");J n=/^(?:\\w+:)?\\/\\/([^\\/?#]+)/;G(s.1O=="1m"&&O=="2P"&&n.11(s.1a)&&n.2D(s.1a)[1]!=5Z.al){J i=S.3H("6w")[0];J h=S.3h("1m");h.4d=s.1a;G(s.7t)h.aj=s.7t;G(!g){J l=Q;h.ah=h.ag=H(){G(!l&&(!7.3f||7.3f=="68"||7.3f=="1J")){l=M;1W();1J();i.37(h)}}}i.3U(h);I 12}J m=Q;J c=1b.7s?2B 7s("ae.ac"):2B 7r();G(s.5Y)c.6R(O,s.1a,s.31,s.5Y,s.3Q);N c.6R(O,s.1a,s.31);1U{G(s.L)c.4B("ab-aa",s.7z);G(s.5S)c.4B("a9-5R-a8",D.4z[s.1a]||"a7, a6 a5 a4 5N:5N:5N a2");c.4B("X-9Z-9Y","7r");c.4B("9W",s.1O&&s.4Q[s.1O]?s.4Q[s.1O]+", */*":s.4Q.4w)}1V(e){}G(s.7m&&s.7m(c,s)===Q){s.26&&D.4O--;c.7l();I Q}G(s.26)D.W.1P("7B",[c,s]);J d=H(a){G(!m&&c&&(c.3f==4||a=="2T")){m=M;G(f){7k(f);f=U}1u=a=="2T"&&"2T"||!D.7j(c)&&"3e"||s.5S&&D.7h(c,s.1a)&&"7J"||"1W";G(1u=="1W"){1U{L=D.6X(c,s.1O,s.9S)}1V(e){1u="5J"}}G(1u=="1W"){J b;1U{b=c.5I("7g-5R")}1V(e){}G(s.5S&&b)D.4z[s.1a]=b;G(!g)1W()}N D.5H(s,c,1u);1J();G(s.31)c=U}};G(s.31){J f=4I(d,13);G(s.2T>0)3B(H(){G(c){c.7l();G(!m)d("2T")}},s.2T)}1U{c.9P(s.L)}1V(e){D.5H(s,c,U,e)}G(!s.31)d();H 1W(){G(s.1W)s.1W(L,1u);G(s.26)D.W.1P("7C",[c,s])}H 1J(){G(s.1J)s.1J(c,1u);G(s.26)D.W.1P("7F",[c,s]);G(s.26&&!--D.4O)D.W.1P("7G")}I c},5H:H(s,a,b,e){G(s.3e)s.3e(a,b,e);G(s.26)D.W.1P("7D",[a,s,e])},4O:0,7j:H(a){1U{I!a.1u&&5Z.9O=="5p:"||(a.1u>=7e&&a.1u<9N)||a.1u==7c||a.1u==9K||D.14.2k&&a.1u==12}1V(e){}I Q},7h:H(a,c){1U{J b=a.5I("7g-5R");I a.1u==7c||b==D.4z[c]||D.14.2k&&a.1u==12}1V(e){}I Q},6X:H(a,c,b){J d=a.5I("9J-O"),2N=c=="2N"||!c&&d&&d.1h("2N")>=0,L=2N?a.9I:a.4U;G(2N&&L.1C.2j=="5J")7p"5J";G(b)L=b(L,c);G(c=="1m")D.5u(L);G(c=="3z")L=6u("("+L+")");I L},3n:H(a){J s=[];G(a.1q==2p||a.5w)D.P(a,H(){s.1p(3u(7.34)+"="+3u(7.2x))});N R(J j 1n a)G(a[j]&&a[j].1q==2p)D.P(a[j],H(){s.1p(3u(j)+"="+3u(7))});N s.1p(3u(j)+"="+3u(D.1D(a[j])?a[j]():a[j]));I s.6s("&").1o(/%20/g,"+")}});D.17.1l({1N:H(c,b){I c?7.2g({1Z:"1N",2h:"1N",1y:"1N"},c,b):7.1E(":1G").P(H(){7.V.18=7.5D||"";G(D.1g(7,"18")=="2F"){J a=D("<"+7.2j+" />").6P("1c");7.V.18=a.1g("18");G(7.V.18=="2F")7.V.18="3I";a.21()}}).3l()},1M:H(b,a){I b?7.2g({1Z:"1M",2h:"1M",1y:"1M"},b,a):7.1E(":4j").P(H(){7.5D=7.5D||D.1g(7,"18");7.V.18="2F"}).3l()},78:D.17.2m,2m:H(a,b){I D.1D(a)&&D.1D(b)?7.78.1w(7,19):a?7.2g({1Z:"2m",2h:"2m",1y:"2m"},a,b):7.P(H(){D(7)[D(7).3F(":1G")?"1N":"1M"]()})},9G:H(b,a){I 7.2g({1Z:"1N"},b,a)},9F:H(b,a){I 7.2g({1Z:"1M"},b,a)},9E:H(b,a){I 7.2g({1Z:"2m"},b,a)},9D:H(b,a){I 7.2g({1y:"1N"},b,a)},9M:H(b,a){I 7.2g({1y:"1M"},b,a)},9C:H(c,a,b){I 7.2g({1y:a},c,b)},2g:H(k,j,i,g){J h=D.77(j,i,g);I 7[h.36===Q?"P":"36"](H(){G(7.16!=1)I Q;J f=D.1l({},h),p,1G=D(7).3F(":1G"),46=7;R(p 1n k){G(k[p]=="1M"&&1G||k[p]=="1N"&&!1G)I f.1J.1k(7);G(p=="1Z"||p=="2h"){f.18=D.1g(7,"18");f.33=7.V.33}}G(f.33!=U)7.V.33="1G";f.45=D.1l({},k);D.P(k,H(c,a){J e=2B D.28(46,f,c);G(/2m|1N|1M/.11(a))e[a=="2m"?1G?"1N":"1M":a](k);N{J b=a.6r().1I(/^([+-]=)?([\\d+-.]+)(.*)$/),2b=e.1t(M)||0;G(b){J d=3d(b[2]),2M=b[3]||"2X";G(2M!="2X"){46.V[c]=(d||1)+2M;2b=((d||1)/e.1t(M))*2b;46.V[c]=2b+2M}G(b[1])d=((b[1]=="-="?-1:1)*d)+2b;e.3G(2b,d,2M)}N e.3G(2b,a,"")}});I M})},36:H(a,b){G(D.1D(a)||(a&&a.1q==2p)){b=a;a="28"}G(!a||(1j a=="23"&&!b))I A(7[0],a);I 7.P(H(){G(b.1q==2p)A(7,a,b);N{A(7,a).1p(b);G(A(7,a).K==1)b.1k(7)}})},9X:H(b,c){J a=D.3O;G(b)7.36([]);7.P(H(){R(J i=a.K-1;i>=0;i--)G(a[i].T==7){G(c)a[i](M);a.7n(i,1)}});G(!c)7.5A();I 7}});J A=H(b,c,a){G(b){c=c||"28";J q=D.L(b,c+"36");G(!q||a)q=D.L(b,c+"36",D.2d(a))}I q};D.17.5A=H(a){a=a||"28";I 7.P(H(){J q=A(7,a);q.4s();G(q.K)q[0].1k(7)})};D.1l({77:H(b,a,c){J d=b&&b.1q==a0?b:{1J:c||!c&&a||D.1D(b)&&b,2u:b,41:c&&a||a&&a.1q!=9t&&a};d.2u=(d.2u&&d.2u.1q==4L?d.2u:D.28.5K[d.2u])||D.28.5K.74;d.5M=d.1J;d.1J=H(){G(d.36!==Q)D(7).5A();G(D.1D(d.5M))d.5M.1k(7)};I d},41:{73:H(p,n,b,a){I b+a*p},5P:H(p,n,b,a){I((-29.9r(p*29.9q)/2)+0.5)*a+b}},3O:[],48:U,28:H(b,c,a){7.15=c;7.T=b;7.1i=a;G(!c.3Z)c.3Z={}}});D.28.44={4D:H(){G(7.15.2Y)7.15.2Y.1k(7.T,7.1z,7);(D.28.2Y[7.1i]||D.28.2Y.4w)(7);G(7.1i=="1Z"||7.1i=="2h")7.T.V.18="3I"},1t:H(a){G(7.T[7.1i]!=U&&7.T.V[7.1i]==U)I 7.T[7.1i];J r=3d(D.1g(7.T,7.1i,a));I r&&r>-9p?r:3d(D.2a(7.T,7.1i))||0},3G:H(c,b,d){7.5V=1z();7.2b=c;7.3l=b;7.2M=d||7.2M||"2X";7.1z=7.2b;7.2S=7.4N=0;7.4D();J e=7;H t(a){I e.2Y(a)}t.T=7.T;D.3O.1p(t);G(D.48==U){D.48=4I(H(){J a=D.3O;R(J i=0;i7.15.2u+7.5V){7.1z=7.3l;7.2S=7.4N=1;7.4D();7.15.45[7.1i]=M;J b=M;R(J i 1n 7.15.45)G(7.15.45[i]!==M)b=Q;G(b){G(7.15.18!=U){7.T.V.33=7.15.33;7.T.V.18=7.15.18;G(D.1g(7.T,"18")=="2F")7.T.V.18="3I"}G(7.15.1M)7.T.V.18="2F";G(7.15.1M||7.15.1N)R(J p 1n 7.15.45)D.1K(7.T.V,p,7.15.3Z[p])}G(b)7.15.1J.1k(7.T);I Q}N{J n=t-7.5V;7.4N=n/7.15.2u;7.2S=D.41[7.15.41||(D.41.5P?"5P":"73")](7.4N,n,0,1,7.15.2u);7.1z=7.2b+((7.3l-7.2b)*7.2S);7.4D()}I M}};D.1l(D.28,{5K:{9l:9j,9i:7e,74:9g},2Y:{2e:H(a){a.T.2e=a.1z},2c:H(a){a.T.2c=a.1z},1y:H(a){D.1K(a.T.V,"1y",a.1z)},4w:H(a){a.T.V[a.1i]=a.1z+a.2M}}});D.17.2i=H(){J b=0,1S=0,T=7[0],3q;G(T)ao(D.14){J d=T.1d,4a=T,1s=T.1s,1Q=T.2z,5U=2k&&3r(5B)<9c&&!/9a/i.11(v),1g=D.2a,3c=1g(T,"30")=="3c";G(T.7y){J c=T.7y();1e(c.1A+29.2f(1Q.1C.2e,1Q.1c.2e),c.1S+29.2f(1Q.1C.2c,1Q.1c.2c));1e(-1Q.1C.6b,-1Q.1C.6a)}N{1e(T.5X,T.5W);1B(1s){1e(1s.5X,1s.5W);G(42&&!/^t(98|d|h)$/i.11(1s.2j)||2k&&!5U)2C(1s);G(!3c&&1g(1s,"30")=="3c")3c=M;4a=/^1c$/i.11(1s.2j)?4a:1s;1s=1s.1s}1B(d&&d.2j&&!/^1c|2K$/i.11(d.2j)){G(!/^96|1T.*$/i.11(1g(d,"18")))1e(-d.2e,-d.2c);G(42&&1g(d,"33")!="4j")2C(d);d=d.1d}G((5U&&(3c||1g(4a,"30")=="5x"))||(42&&1g(4a,"30")!="5x"))1e(-1Q.1c.5X,-1Q.1c.5W);G(3c)1e(29.2f(1Q.1C.2e,1Q.1c.2e),29.2f(1Q.1C.2c,1Q.1c.2c))}3q={1S:1S,1A:b}}H 2C(a){1e(D.2a(a,"6V",M),D.2a(a,"6U",M))}H 1e(l,t){b+=3r(l,10)||0;1S+=3r(t,10)||0}I 3q};D.17.1l({30:H(){J a=0,1S=0,3q;G(7[0]){J b=7.1s(),2i=7.2i(),4c=/^1c|2K$/i.11(b[0].2j)?{1S:0,1A:0}:b.2i();2i.1S-=25(7,\'94\');2i.1A-=25(7,\'aF\');4c.1S+=25(b,\'6U\');4c.1A+=25(b,\'6V\');3q={1S:2i.1S-4c.1S,1A:2i.1A-4c.1A}}I 3q},1s:H(){J a=7[0].1s;1B(a&&(!/^1c|2K$/i.11(a.2j)&&D.1g(a,\'30\')==\'93\'))a=a.1s;I D(a)}});D.P([\'5e\',\'5G\'],H(i,b){J c=\'4y\'+b;D.17[c]=H(a){G(!7[0])I;I a!=12?7.P(H(){7==1b||7==S?1b.92(!i?a:D(1b).2e(),i?a:D(1b).2c()):7[c]=a}):7[0]==1b||7[0]==S?46[i?\'aI\':\'aJ\']||D.71&&S.1C[c]||S.1c[c]:7[0][c]}});D.P(["6N","4b"],H(i,b){J c=i?"5e":"5G",4f=i?"6k":"6i";D.17["5s"+b]=H(){I 7[b.3y()]()+25(7,"57"+c)+25(7,"57"+4f)};D.17["90"+b]=H(a){I 7["5s"+b]()+25(7,"2C"+c+"4b")+25(7,"2C"+4f+"4b")+(a?25(7,"6S"+c)+25(7,"6S"+4f):0)}})})();',62,669,'|||||||this|||||||||||||||||||||||||||||||||||if|function|return|var|length|data|true|else|type|each|false|for|document|elem|null|style|event||nodeName|||test|undefined||browser|options|nodeType|fn|display|arguments|url|window|body|parentNode|add|msie|css|indexOf|prop|typeof|call|extend|script|in|replace|push|constructor|text|offsetParent|cur|status|div|apply|firstChild|opacity|now|left|while|documentElement|isFunction|filter|className|hidden|handle|match|complete|attr|ret|hide|show|dataType|trigger|doc|split|top|table|try|catch|success|break|cache|height||remove|tbody|string|guid|num|global|ready|fx|Math|curCSS|start|scrollTop|makeArray|scrollLeft|max|animate|width|offset|tagName|safari|map|toggle||done|Array|find|toUpperCase|button|special|duration|id|copy|value|handler|ownerDocument|select|new|border|exec|stack|none|opera|nextSibling|pushStack|target|html|inArray|unit|xml|bind|GET|isReady|merge|pos|timeout|delete|one|selected|px|step|jsre|position|async|preventDefault|overflow|name|which|queue|removeChild|namespace|insertBefore|nth|removeData|fixed|parseFloat|error|readyState|multiFilter|createElement|rl|re|trim|end|_|param|first|get|results|parseInt|slice|childNodes|encodeURIComponent|append|events|elems|toLowerCase|json|readyList|setTimeout|grep|mouseenter|color|is|custom|getElementsByTagName|block|stopPropagation|addEventListener|callee|proxy|mouseleave|timers|defaultView|password|disabled|last|has|appendChild|form|domManip|props|ajax|orig|set|easing|mozilla|load|prototype|curAnim|self|charCode|timerId|object|offsetChild|Width|parentOffset|src|unbind|br|currentStyle|clean|float|visible|relatedTarget|previousSibling|handlers|isXMLDoc|on|setup|nodeIndex|unique|shift|javascript|child|RegExp|_default|deep|scroll|lastModified|teardown|setRequestHeader|timeStamp|update|empty|tr|getAttribute|innerHTML|setInterval|checked|fromElement|Number|jQuery|state|active|jsonp|accepts|application|dir|input|responseText|click|styleSheets|unload|not|lastToggle|outline|mouseout|getPropertyValue|mouseover|getComputedStyle|bindReady|String|padding|pageX|metaKey|keyCode|getWH|andSelf|clientX|Left|all|visibility|container|index|init|triggered|removeAttribute|classFilter|prevObject|submit|file|after|windowData|inner|client|globalEval|sibling|jquery|absolute|clone|wrapAll|dequeue|version|triggerHandler|oldblock|ctrlKey|createTextNode|Top|handleError|getResponseHeader|parsererror|speeds|checkbox|old|00|radio|swing|href|Modified|ifModified|lastChild|safari2|startTime|offsetTop|offsetLeft|username|location|ajaxSettings|getElementById|isSimple|values|selectedIndex|runtimeStyle|rsLeft|_load|loaded|DOMContentLoaded|clientTop|clientLeft|toElement|srcElement|val|pageY|POST|unshift|Bottom|clientY|Right|fix|exclusive|detachEvent|cloneNode|removeEventListener|swap|toString|join|attachEvent|eval|substr|head|parse|textarea|reset|image|zoom|odd|even|before|prepend|exclude|expr|quickClass|quickID|uuid|quickChild|continue|Height|textContent|appendTo|contents|open|margin|evalScript|borderTopWidth|borderLeftWidth|parent|httpData|setArray|CSS1Compat|compatMode|boxModel|cssFloat|linear|def|webkit|nodeValue|speed|_toggle|eq|100|replaceWith|304|concat|200|alpha|Last|httpNotModified|getAttributeNode|httpSuccess|clearInterval|abort|beforeSend|splice|styleFloat|throw|colgroup|XMLHttpRequest|ActiveXObject|scriptCharset|callback|fieldset|multiple|processData|getBoundingClientRect|contentType|link|ajaxSend|ajaxSuccess|ajaxError|col|ajaxComplete|ajaxStop|ajaxStart|serializeArray|notmodified|keypress|keydown|change|mouseup|mousedown|dblclick|focus|blur|stylesheet|hasClass|rel|doScroll|black|hover|solid|cancelBubble|returnValue|wheelDelta|view|round|shiftKey|resize|screenY|screenX|relatedNode|mousemove|prevValue|originalTarget|offsetHeight|keyup|newValue|offsetWidth|eventPhase|detail|currentTarget|cancelable|bubbles|attrName|attrChange|altKey|originalEvent|charAt|0n|substring|animated|header|noConflict|line|enabled|innerText|contains|only|weight|font|gt|lt|uFFFF|u0128|size|417|Boolean|Date|toggleClass|removeClass|addClass|removeAttr|replaceAll|insertAfter|prependTo|wrap|contentWindow|contentDocument|iframe|children|siblings|prevAll|wrapInner|nextAll|outer|prev|scrollTo|static|marginTop|next|inline|parents|able|cellSpacing|adobeair|cellspacing|522|maxLength|maxlength|readOnly|400|readonly|fast|600|class|slow|1px|htmlFor|reverse|10000|PI|cos|compatible|Function|setData|ie|ra|it|rv|getData|userAgent|navigator|fadeTo|fadeIn|slideToggle|slideUp|slideDown|ig|responseXML|content|1223|NaN|fadeOut|300|protocol|send|setAttribute|option|dataFilter|cssText|changed|be|Accept|stop|With|Requested|Object|can|GMT|property|1970|Jan|01|Thu|Since|If|Type|Content|XMLHTTP|th|Microsoft|td|onreadystatechange|onload|cap|charset|colg|host|tfoot|specified|with|1_|thead|leg|plain|attributes|opt|embed|urlencoded|www|area|hr|ajaxSetup|meta|post|getJSON|getScript|marginLeft|img|elements|pageYOffset|pageXOffset|abbr|serialize|pixelLeft'.split('|'),0,{}));
-// $Id: drupal.js,v 1.41.2.4 2009/07/21 08:59:10 goba Exp $
-
-var Drupal = Drupal || { 'settings': {}, 'behaviors': {}, 'themes': {}, 'locale': {} };
-
-/**
- * Set the variable that indicates if JavaScript behaviors should be applied
- */
-Drupal.jsEnabled = document.getElementsByTagName && document.createElement && document.createTextNode && document.documentElement && document.getElementById;
-
-/**
- * Attach all registered behaviors to a page element.
- *
- * Behaviors are event-triggered actions that attach to page elements, enhancing
- * default non-Javascript UIs. Behaviors are registered in the Drupal.behaviors
- * object as follows:
- * @code
- *    Drupal.behaviors.behaviorName = function () {
- *      ...
- *    };
- * @endcode
- *
- * Drupal.attachBehaviors is added below to the jQuery ready event and so
- * runs on initial page load. Developers implementing AHAH/AJAX in their
- * solutions should also call this function after new page content has been
- * loaded, feeding in an element to be processed, in order to attach all
- * behaviors to the new content.
- *
- * Behaviors should use a class in the form behaviorName-processed to ensure
- * the behavior is attached only once to a given element. (Doing so enables
- * the reprocessing of given elements, which may be needed on occasion despite
- * the ability to limit behavior attachment to a particular element.)
- *
- * @param context
- *   An element to attach behaviors to. If none is given, the document element
- *   is used.
- */
-Drupal.attachBehaviors = function(context) {
-  context = context || document;
-  if (Drupal.jsEnabled) {
-    // Execute all of them.
-    jQuery.each(Drupal.behaviors, function() {
-      this(context);
-    });
-  }
-};
-
-/**
- * Encode special characters in a plain-text string for display as HTML.
- */
-Drupal.checkPlain = function(str) {
-  str = String(str);
-  var replace = { '&': '&', '"': '"', '<': '<', '>': '>' };
-  for (var character in replace) {
-    var regex = new RegExp(character, 'g');
-    str = str.replace(regex, replace[character]);
-  }
-  return str;
-};
-
-/**
- * Translate strings to the page language or a given language.
- *
- * See the documentation of the server-side t() function for further details.
- *
- * @param str
- *   A string containing the English string to translate.
- * @param args
- *   An object of replacements pairs to make after translation. Incidences
- *   of any key in this array are replaced with the corresponding value.
- *   Based on the first character of the key, the value is escaped and/or themed:
- *    - !variable: inserted as is
- *    - @variable: escape plain text to HTML (Drupal.checkPlain)
- *    - %variable: escape text and theme as a placeholder for user-submitted
- *      content (checkPlain + Drupal.theme('placeholder'))
- * @return
- *   The translated string.
- */
-Drupal.t = function(str, args) {
-  // Fetch the localized version of the string.
-  if (Drupal.locale.strings && Drupal.locale.strings[str]) {
-    str = Drupal.locale.strings[str];
-  }
-
-  if (args) {
-    // Transform arguments before inserting them
-    for (var key in args) {
-      switch (key.charAt(0)) {
-        // Escaped only
-        case '@':
-          args[key] = Drupal.checkPlain(args[key]);
-        break;
-        // Pass-through
-        case '!':
-          break;
-        // Escaped and placeholder
-        case '%':
-        default:
-          args[key] = Drupal.theme('placeholder', args[key]);
-          break;
-      }
-      str = str.replace(key, args[key]);
-    }
-  }
-  return str;
-};
-
-/**
- * Format a string containing a count of items.
- *
- * This function ensures that the string is pluralized correctly. Since Drupal.t() is
- * called by this function, make sure not to pass already-localized strings to it.
- *
- * See the documentation of the server-side format_plural() function for further details.
- *
- * @param count
- *   The item count to display.
- * @param singular
- *   The string for the singular case. Please make sure it is clear this is
- *   singular, to ease translation (e.g. use "1 new comment" instead of "1 new").
- *   Do not use @count in the singular string.
- * @param plural
- *   The string for the plural case. Please make sure it is clear this is plural,
- *   to ease translation. Use @count in place of the item count, as in "@count
- *   new comments".
- * @param args
- *   An object of replacements pairs to make after translation. Incidences
- *   of any key in this array are replaced with the corresponding value.
- *   Based on the first character of the key, the value is escaped and/or themed:
- *    - !variable: inserted as is
- *    - @variable: escape plain text to HTML (Drupal.checkPlain)
- *    - %variable: escape text and theme as a placeholder for user-submitted
- *      content (checkPlain + Drupal.theme('placeholder'))
- *   Note that you do not need to include @count in this array.
- *   This replacement is done automatically for the plural case.
- * @return
- *   A translated string.
- */
-Drupal.formatPlural = function(count, singular, plural, args) {
-  var args = args || {};
-  args['@count'] = count;
-  // Determine the index of the plural form.
-  var index = Drupal.locale.pluralFormula ? Drupal.locale.pluralFormula(args['@count']) : ((args['@count'] == 1) ? 0 : 1);
-
-  if (index == 0) {
-    return Drupal.t(singular, args);
-  }
-  else if (index == 1) {
-    return Drupal.t(plural, args);
-  }
-  else {
-    args['@count['+ index +']'] = args['@count'];
-    delete args['@count'];
-    return Drupal.t(plural.replace('@count', '@count['+ index +']'));
-  }
-};
-
-/**
- * Generate the themed representation of a Drupal object.
- *
- * All requests for themed output must go through this function. It examines
- * the request and routes it to the appropriate theme function. If the current
- * theme does not provide an override function, the generic theme function is
- * called.
- *
- * For example, to retrieve the HTML that is output by theme_placeholder(text),
- * call Drupal.theme('placeholder', text).
- *
- * @param func
- *   The name of the theme function to call.
- * @param ...
- *   Additional arguments to pass along to the theme function.
- * @return
- *   Any data the theme function returns. This could be a plain HTML string,
- *   but also a complex object.
- */
-Drupal.theme = function(func) {
-  for (var i = 1, args = []; i < arguments.length; i++) {
-    args.push(arguments[i]);
-  }
-
-  return (Drupal.theme[func] || Drupal.theme.prototype[func]).apply(this, args);
-};
-
-/**
- * Parse a JSON response.
- *
- * The result is either the JSON object, or an object with 'status' 0 and 'data' an error message.
- */
-Drupal.parseJson = function (data) {
-  if ((data.substring(0, 1) != '{') && (data.substring(0, 1) != '[')) {
-    return { status: 0, data: data.length ? data : Drupal.t('Unspecified error') };
-  }
-  return eval('(' + data + ');');
-};
-
-/**
- * Freeze the current body height (as minimum height). Used to prevent
- * unnecessary upwards scrolling when doing DOM manipulations.
- */
-Drupal.freezeHeight = function () {
-  Drupal.unfreezeHeight();
-  var div = document.createElement('div');
-  $(div).css({
-    position: 'absolute',
-    top: '0px',
-    left: '0px',
-    width: '1px',
-    height: $('body').css('height')
-  }).attr('id', 'freeze-height');
-  $('body').append(div);
-};
-
-/**
- * Unfreeze the body height
- */
-Drupal.unfreezeHeight = function () {
-  $('#freeze-height').remove();
-};
-
-/**
- * Wrapper around encodeURIComponent() which avoids Apache quirks (equivalent of
- * drupal_urlencode() in PHP). This function should only be used on paths, not
- * on query string arguments.
- */
-Drupal.encodeURIComponent = function (item, uri) {
-  uri = uri || location.href;
-  item = encodeURIComponent(item).replace(/%2F/g, '/');
-  return (uri.indexOf('?q=') != -1) ? item : item.replace(/%26/g, '%2526').replace(/%23/g, '%2523').replace(/\/\//g, '/%252F');
-};
-
-/**
- * Get the text selection in a textarea.
- */
-Drupal.getSelection = function (element) {
-  if (typeof(element.selectionStart) != 'number' && document.selection) {
-    // The current selection
-    var range1 = document.selection.createRange();
-    var range2 = range1.duplicate();
-    // Select all text.
-    range2.moveToElementText(element);
-    // Now move 'dummy' end point to end point of original range.
-    range2.setEndPoint('EndToEnd', range1);
-    // Now we can calculate start and end points.
-    var start = range2.text.length - range1.text.length;
-    var end = start + range1.text.length;
-    return { 'start': start, 'end': end };
-  }
-  return { 'start': element.selectionStart, 'end': element.selectionEnd };
-};
-
-/**
- * Build an error message from ahah response.
- */
-Drupal.ahahError = function(xmlhttp, uri) {
-  if (xmlhttp.status == 200) {
-    if (jQuery.trim($(xmlhttp.responseText).text())) {
-      var message = Drupal.t("An error occurred. \n@uri\n@text", {'@uri': uri, '@text': xmlhttp.responseText });
-    }
-    else {
-      var message = Drupal.t("An error occurred. \n@uri\n(no information available).", {'@uri': uri, '@text': xmlhttp.responseText });
-    }
-  }
-  else {
-    var message = Drupal.t("An HTTP error @status occurred. \n@uri", {'@uri': uri, '@status': xmlhttp.status });
-  }
-  return message;
-}
-
-// Global Killswitch on the  element
-if (Drupal.jsEnabled) {
-  // Global Killswitch on the  element
-  $(document.documentElement).addClass('js');
-  // 'js enabled' cookie
-  document.cookie = 'has_js=1; path=/';
-  // Attach all behaviors.
-  $(document).ready(function() {
-    Drupal.attachBehaviors(this);
-  });
-}
-
-/**
- * The default themes.
- */
-Drupal.theme.prototype = {
-
-  /**
-   * Formats text for emphasized display in a placeholder inside a sentence.
-   *
-   * @param str
-   *   The text to format (plain-text).
-   * @return
-   *   The formatted text (html).
-   */
-  placeholder: function(str) {
-    return '' + Drupal.checkPlain(str) + '';
-  }
-};
-;
-// $Id: googleanalytics.js,v 1.9.2.4 2010/09/19 11:39:20 hass Exp $
-
-$(document).ready(function() {
-
-  // Attach onclick event to document only and catch clicks on all elements.
-  $(document.body).click(function(event) {
-    // Catch only the first parent link of a clicked element.
-    $(event.target).parents("a:first,area:first").andSelf().filter("a,area").each(function() {
-
-      var ga = Drupal.settings.googleanalytics;
-      // Expression to check for absolute internal links.
-      var isInternal = new RegExp("^(https?):\/\/" + window.location.host, "i");
-      // Expression to check for special links like gotwo.module /go/* links.
-      var isInternalSpecial = new RegExp("(\/go\/.*)$", "i");
-      // Expression to check for download links.
-      var isDownload = new RegExp("\\.(" + ga.trackDownloadExtensions + ")$", "i");
-
-      // Is the clicked URL internal?
-      if (isInternal.test(this.href)) {
-        // Is download tracking activated and the file extension configured for download tracking?
-        if (ga.trackDownload && isDownload.test(this.href)) {
-          // Download link clicked.
-          var extension = isDownload.exec(this.href);
-          _gaq.push(["_trackEvent", "Downloads", extension[1].toUpperCase(), this.href.replace(isInternal, '')]);
-        }
-        else if (isInternalSpecial.test(this.href)) {
-          // Keep the internal URL for Google Analytics website overlay intact.
-          _gaq.push(["_trackPageview", this.href.replace(isInternal, '')]);
-        }
-      }
-      else {
-        if (ga.trackMailto && $(this).is("a[href^=mailto:],area[href^=mailto:]")) {
-          // Mailto link clicked.
-          _gaq.push(["_trackEvent", "Mails", "Click", this.href.substring(7)]);
-        }
-        else if (ga.trackOutgoing && this.href) {
-          // External link clicked.
-          _gaq.push(["_trackEvent", "Outgoing links", "Click", this.href]);
-        }
-      }
-
-    });
-  });
-});
-;
-(function () {
-  function latitudeToMercator(latitude) {
-    return Math.log(Math.tan(latitude * Math.PI / 180) + 1 / Math.cos(latitude * Math.PI / 180));
-  }
-
-  Drupal.html5UserGeolocationLongitudeToPx = function (longitude, leftLongitude, width) {
-    return (longitude - leftLongitude + 360) / 360 % 1 * width;
-  }
-
-  Drupal.html5UserGeolocationLatitudeToPx = function (latitude, topLatitude, bottomLatitude, height) {
-    return (latitudeToMercator(latitude) - latitudeToMercator(bottomLatitude))
-           / (latitudeToMercator(topLatitude) - latitudeToMercator(bottomLatitude))
-           * height;
-  }
-
-  function plot() {
-    var $map = $('#html5-user-geolocation-map'),
-      latitude = $('#edit-html5-user-geolocation-latitude').attr('value'),
-      longitude = $('#edit-html5-user-geolocation-longitude').attr('value');
-
-    if (latitude == 0 && longitude == 0) {
-      return;
-    }
-
-    // Plot coords
-    $('#html5-user-geolocation-map .dot').css({
-      left: '' + Drupal.html5UserGeolocationLongitudeToPx(longitude, -168, $map.width()) + 'px',
-      bottom: '' + Drupal.html5UserGeolocationLatitudeToPx(latitude, 78, -58, $map.height()) + 'px'
-    }).show();
-
-    // Show precision
-    $map.siblings('.description').find('span').html(
-      (Math.acos(
-        Math.sin(latitude * Math.PI / 180)
-          * Math.sin((latitude) * Math.PI / 180)
-        + Math.cos(latitude * Math.PI / 180)
-          * Math.cos((latitude) * Math.PI / 180)
-          * Math.cos(Math.pow(10, -1 * Drupal.settings.html5UserGeolocationPrecision) * Math.PI / 180)
-      ) * 6371).toPrecision(3)
-    );
-  }
-
-  function getLocation() {
-    if ($('#edit-html5-user-geolocation-save').attr('checked')) {
-      var $busy = $('#html5-user-geolocation-messages-wrapper .geolocating');
-      $('#html5-user-geolocation-map-wrapper').slideDown('fast');
-
-      // Get position
-      $busy.show();
-      navigator.geolocation.getCurrentPosition(function (position) {
-        // Save coords
-        $('#edit-html5-user-geolocation-latitude').attr('value', position.coords.latitude);
-        $('#edit-html5-user-geolocation-longitude').attr('value', position.coords.longitude);
-
-        plot();
-        $busy.hide();
-      }, function () { // getCurrentPosition error callback
-        $('#edit-html5-user-geolocation-save').attr('checked', false).change();
-      },
-      {
-        maximumAge: Infinity
-      });
-    }
-    else { // Location not checked
-      $('#html5-user-geolocation-map-wrapper').slideUp('fast');
-    }
-  }
-
-  Drupal.behaviors.html5UserGeolocation = function (context) {
-    if (navigator.geolocation) {
-      $('#user-profile-form #edit-html5-user-geolocation-save:not(.html5-user-geolocation-processed)', context)
-      .addClass('html5-user-geolocation-processed')
-      .change(function () {
-        getLocation();
-      })
-      .each(function () {
-        $('#html5-user-geolocation-messages-wrapper .not-supported').hide();
-        if ($('#edit-html5-user-geolocation-save').attr('checked')) {
-          $('#html5-user-geolocation-map-wrapper').slideDown('fast');
-          plot();
-        }
-        getLocation();
-      });
-    }
-    else { // HTML5 Geolocation not supported
-      $('#edit-html5-user-geolocation-save').attr('disabled', true);
-    }
-  };
-}());
-;
-Drupal.behaviors.drupalorgSetHome = function () {
-  $('#drupalorg-set-home:not(.drupalorg-set-home-processed)')
-  .addClass('drupalorg-set-home-processed')
-  .each(function () {
-    var $this = $(this);
-    // Click triggers form submit
-    $('a', $this).click(function () {
-      $('input[type=submit]', $this).click();
-      return false;
-    });
-  });
-};
-
-Drupal.behaviors.drupalorgSearch = function () {
-  $('body.page-search #content-top-region form:not(.drupalorgSearch-processed)').addClass('drupalorgSearch-processed').each(function () {
-    var $this = $(this);
-    $this.find('select').change(function () {
-      $this.submit();
-    });
-  });
-};
-;
-// $Id: base.js,v 1.11.2.1 2010/03/10 20:08:58 merlinofchaos Exp $
-/**
- * @file base.js
- *
- * Some basic behaviors and utility functions for Views.
- */
-
-Drupal.Views = {};
-
-/**
- * jQuery UI tabs, Views integration component
- */
-Drupal.behaviors.viewsTabs = function (context) {
-  $('#views-tabset:not(.views-processed)').addClass('views-processed').each(function() {
-    new Drupal.Views.Tabs($(this), {selectedClass: 'active'});
-  });
-
-  $('a.views-remove-link')
-    .addClass('views-processed')
-    .click(function() {
-      var id = $(this).attr('id').replace('views-remove-link-', '');
-      $('#views-row-' + id).hide();
-      $('#views-removed-' + id).attr('checked', true);
-      return false;
-    });
-}
-
-/**
- * For IE, attach some javascript so that our hovers do what they're supposed
- * to do.
- */
-Drupal.behaviors.viewsHoverlinks = function() {
-  if ($.browser.msie) {
-    // If IE, attach a hover event so we can see our admin links.
-    $("div.view:not(.views-hover-processed)").addClass('views-hover-processed').hover(
-      function() {
-        $('div.views-hide', this).addClass("views-hide-hover"); return true;
-      },
-      function(){
-        $('div.views-hide', this).removeClass("views-hide-hover"); return true;
-      }
-    );
-    $("div.views-admin-links:not(.views-hover-processed)")
-      .addClass('views-hover-processed')
-      .hover(
-        function() {
-          $(this).addClass("views-admin-links-hover"); return true;
-        },
-        function(){
-          $(this).removeClass("views-admin-links-hover"); return true;
-        }
-      );
-  }
-}
-
-/**
- * Helper function to parse a querystring.
- */
-Drupal.Views.parseQueryString = function (query) {
-  var args = {};
-  var pos = query.indexOf('?');
-  if (pos != -1) {
-    query = query.substring(pos + 1);
-  }
-  var pairs = query.split('&');
-  for(var i in pairs) {
-    var pair = pairs[i].split('=');
-    // Ignore the 'q' path argument, if present.
-    if (pair[0] != 'q' && pair[1]) {
-      args[pair[0]] = decodeURIComponent(pair[1].replace(/\+/g, ' '));
-    }
-  }
-  return args;
-};
-
-/**
- * Helper function to return a view's arguments based on a path.
- */
-Drupal.Views.parseViewArgs = function (href, viewPath) {
-  var returnObj = {};
-  var path = Drupal.Views.getPath(href);
-  // Ensure we have a correct path.
-  if (viewPath && path.substring(0, viewPath.length + 1) == viewPath + '/') {
-    var args = decodeURIComponent(path.substring(viewPath.length + 1, path.length));
-    returnObj.view_args = args;
-    returnObj.view_path = path;
-  }
-  return returnObj;
-};
-
-/**
- * Strip off the protocol plus domain from an href.
- */
-Drupal.Views.pathPortion = function (href) {
-  // Remove e.g. http://example.com if present.
-  var protocol = window.location.protocol;
-  if (href.substring(0, protocol.length) == protocol) {
-    // 2 is the length of the '//' that normally follows the protocol
-    href = href.substring(href.indexOf('/', protocol.length + 2));
-  }
-  return href;
-};
-
-/**
- * Return the Drupal path portion of an href.
- */
-Drupal.Views.getPath = function (href) {
-  href = Drupal.Views.pathPortion(href);
-  href = href.substring(Drupal.settings.basePath.length, href.length);
-  // 3 is the length of the '?q=' added to the url without clean urls.
-  if (href.substring(0, 3) == '?q=') {
-    href = href.substring(3, href.length);
-  }
-  var chars = ['#', '?', '&'];
-  for (i in chars) {
-    if (href.indexOf(chars[i]) > -1) {
-      href = href.substr(0, href.indexOf(chars[i]));
-    }
-  }
-  return href;
-};
-;
-// $Id: dependent.js,v 1.9.2.1 2009/11/18 02:43:47 merlinofchaos Exp $
-/**
- * @file dependent.js
- *
- * Written by dmitrig01 (Dmitri Gaskin) for Views; this provides dependent
- * visibility for form items in Views' ajax forms.
- *
- * To your $form item definition add:
- * - '#process' => array('views_process_dependency'),
- * - Add '#dependency' => array('id-of-form-item' => array(list, of, values, that,
-     make, this, item, show),
- *
- * Special considerations:
- * - radios are harder. Because Drupal doesn't give radio groups individual ids,
- *   use 'radio:name-of-radio'
- *
- * - Checkboxes don't have their own id, so you need to add one in a div
- *   around the checkboxes via #prefix and #suffix. You actually need to add TWO
- *   divs because it's the parent that gets hidden. Also be sure to retain the
- *   'expand_checkboxes' in the #process array, because the views process will
- *   override it.
- */
-
-Drupal.Views = Drupal.Views || {};
-
-Drupal.Views.dependent = { bindings: {}, activeBindings: {}, activeTriggers: [] };
-
-Drupal.Views.dependent.inArray = function(array, search_term) {
-  var i = array.length;
-  if (i > 0) {
-   do {
-    if (array[i] == search_term) {
-       return true;
-    }
-   } while (i--);
-  }
-  return false;
-}
-
-
-Drupal.Views.dependent.autoAttach = function() {
-  // Clear active bindings and triggers.
-  for (i in Drupal.Views.dependent.activeTriggers) {
-    jQuery(Drupal.Views.dependent.activeTriggers[i]).unbind('change');
-  }
-  Drupal.Views.dependent.activeTriggers = [];
-  Drupal.Views.dependent.activeBindings = {};
-  Drupal.Views.dependent.bindings = {};
-
-  if (!Drupal.settings.viewsAjax) {
-    return;
-  }
-
-  // Iterate through all relationships
-  for (id in Drupal.settings.viewsAjax.formRelationships) {
-
-    // Drupal.Views.dependent.activeBindings[id] is a boolean,
-    // whether the binding is active or not.  Defaults to no.
-    Drupal.Views.dependent.activeBindings[id] = 0;
-    // Iterate through all possible values
-    for(bind_id in Drupal.settings.viewsAjax.formRelationships[id].values) {
-      // This creates a backward relationship.  The bind_id is the ID
-      // of the element which needs to change in order for the id to hide or become shown.
-      // The id is the ID of the item which will be conditionally hidden or shown.
-      // Here we're setting the bindings for the bind
-      // id to be an empty array if it doesn't already have bindings to it
-      if (!Drupal.Views.dependent.bindings[bind_id]) {
-        Drupal.Views.dependent.bindings[bind_id] = [];
-      }
-      // Add this ID
-      Drupal.Views.dependent.bindings[bind_id].push(id);
-      // Big long if statement.
-      // Drupal.settings.viewsAjax.formRelationships[id].values[bind_id] holds the possible values
-
-      if (bind_id.substring(0, 6) == 'radio:') {
-        var trigger_id = "input[name='" + bind_id.substring(6) + "']";
-      }
-      else {
-        var trigger_id = '#' + bind_id;
-      }
-
-      Drupal.Views.dependent.activeTriggers.push(trigger_id);
-
-      if (jQuery(trigger_id).attr('type') == 'checkbox') {
-        $(trigger_id).parent().addClass('hidden-options');
-      }
-
-      var getValue = function(item, trigger) {
-        if (item.substring(0, 6) == 'radio:') {
-          var val = jQuery(trigger + ':checked').val();
-        }
-        else {
-          switch (jQuery(trigger).attr('type')) {
-            case 'checkbox':
-              var val = jQuery(trigger).attr('checked') || 0;
-
-              if (val) {
-                $(trigger).parent().removeClass('hidden-options').addClass('expanded-options');
-              }
-              else {
-                $(trigger).parent().removeClass('expanded-options').addClass('hidden-options');
-              }
-
-              break;
-            default:
-              var val = jQuery(trigger).val();
-          }
-        }
-        return val;
-      }
-
-      var setChangeTrigger = function(trigger_id, bind_id) {
-        // Triggered when change() is clicked.
-        var changeTrigger = function() {
-          var val = getValue(bind_id, trigger_id);
-
-          for (i in Drupal.Views.dependent.bindings[bind_id]) {
-            var id = Drupal.Views.dependent.bindings[bind_id][i];
-
-            // Fix numerous errors
-            if (typeof id != 'string') {
-              continue;
-            }
-
-            // This bit had to be rewritten a bit because two properties on the
-            // same set caused the counter to go up and up and up.
-            if (!Drupal.Views.dependent.activeBindings[id]) {
-              Drupal.Views.dependent.activeBindings[id] = {};
-            }
-
-            if (Drupal.Views.dependent.inArray(Drupal.settings.viewsAjax.formRelationships[id].values[bind_id], val)) {
-              Drupal.Views.dependent.activeBindings[id][bind_id] = 'bind';
-            }
-            else {
-              delete Drupal.Views.dependent.activeBindings[id][bind_id];
-            }
-
-            var len = 0;
-            for (i in Drupal.Views.dependent.activeBindings[id]) {
-              len++;
-            }
-
-            var object = jQuery('#' + id + '-wrapper');
-            if (!object.size()) {
-              object = jQuery('#' + id).parent();
-            }
-
-            var rel_num = Drupal.settings.viewsAjax.formRelationships[id].num;
-            if (typeof rel_num === 'object') {
-              rel_num = Drupal.settings.viewsAjax.formRelationships[id].num[0];
-            }
-
-            if (rel_num <= len) {
-              // Show if the element if criteria is matched
-              object.show(0);
-              object.addClass('dependent-options');
-            }
-            else {
-              // Otherwise hide
-              object.hide(0);
-            }
-          }
-        }
-
-        jQuery(trigger_id).change(function() {
-          // Trigger the internal change function
-          // the attr('id') is used because closures are more confusing
-          changeTrigger(trigger_id, bind_id);
-        });
-        // Trigger initial reaction
-        changeTrigger(trigger_id, bind_id);
-      }
-      setChangeTrigger(trigger_id, bind_id);
-    }
-  }
-}
-
-Drupal.behaviors.viewsDependent = function (context) {
-  Drupal.Views.dependent.autoAttach();
-
-  // Really large sets of fields are too slow with the above method, so this
-  // is a sort of hacked one that's faster but much less flexible.
-  $("select.views-master-dependent:not(.views-processed)")
-    .addClass('views-processed')
-    .change(function() {
-      var val = $(this).val();
-      if (val == 'all') {
-        $('.views-dependent-all').show(0);
-      }
-      else {
-        $('.views-dependent-all').hide(0);
-        $('.views-dependent-' + val).show(0);
-      }
-    })
-    .trigger('change');
-}
-;
-// $Id: tableheader.js,v 1.16.2.2 2009/03/30 12:48:09 goba Exp $
-
-Drupal.tableHeaderDoScroll = function() {
-  if (typeof(Drupal.tableHeaderOnScroll)=='function') {
-    Drupal.tableHeaderOnScroll();
-  }
-};
-
-Drupal.behaviors.tableHeader = function (context) {
-  // This breaks in anything less than IE 7. Prevent it from running.
-  if (jQuery.browser.msie && parseInt(jQuery.browser.version, 10) < 7) {
-    return;
-  }
-
-  // Keep track of all cloned table headers.
-  var headers = [];
-
-  $('table.sticky-enabled thead:not(.tableHeader-processed)', context).each(function () {
-    // Clone thead so it inherits original jQuery properties.
-    var headerClone = $(this).clone(true).insertBefore(this.parentNode).wrap('
        ').parent().css({
-      position: 'fixed',
-      top: '0px'
-    });
-
-    headerClone = $(headerClone)[0];
-    headers.push(headerClone);
-
-    // Store parent table.
-    var table = $(this).parent('table')[0];
-    headerClone.table = table;
-    // Finish initialzing header positioning.
-    tracker(headerClone);
-
-    $(table).addClass('sticky-table');
-    $(this).addClass('tableHeader-processed');
-  });
-
-  // Define the anchor holding var.
-  var prevAnchor = '';
-
-  // Track positioning and visibility.
-  function tracker(e) {
-    // Save positioning data.
-    var viewHeight = document.documentElement.scrollHeight || document.body.scrollHeight;
-    if (e.viewHeight != viewHeight) {
-      e.viewHeight = viewHeight;
-      e.vPosition = $(e.table).offset().top - 4;
-      e.hPosition = $(e.table).offset().left;
-      e.vLength = e.table.clientHeight - 100;
-      // Resize header and its cell widths.
-      var parentCell = $('th', e.table);
-      $('th', e).each(function(index) {
-        var cellWidth = parentCell.eq(index).css('width');
-        // Exception for IE7.
-        if (cellWidth == 'auto') {
-          cellWidth = parentCell.get(index).clientWidth +'px';
-        }
-        $(this).css('width', cellWidth);
-      });
-      $(e).css('width', $(e.table).css('width'));
-    }
-
-    // Track horizontal positioning relative to the viewport and set visibility.
-    var hScroll = document.documentElement.scrollLeft || document.body.scrollLeft;
-    var vOffset = (document.documentElement.scrollTop || document.body.scrollTop) - e.vPosition;
-    var visState = (vOffset > 0 && vOffset < e.vLength) ? 'visible' : 'hidden';
-    $(e).css({left: -hScroll + e.hPosition +'px', visibility: visState});
-
-    // Check the previous anchor to see if we need to scroll to make room for the header.
-    // Get the height of the header table and scroll up that amount.
-    if (prevAnchor != location.hash) {
-      if (location.hash != '') {
-        var offset = $('td' + location.hash).offset();
-        if (offset) {
-          var top = offset.top;
-          var scrollLocation = top - $(e).height();
-          $('body, html').scrollTop(scrollLocation);
-        }
-      }
-      prevAnchor = location.hash;
-    }
-  }
-
-  // Only attach to scrollbars once, even if Drupal.attachBehaviors is called
-  //  multiple times.
-  if (!$('body').hasClass('tableHeader-processed')) {
-    $('body').addClass('tableHeader-processed');
-    $(window).scroll(Drupal.tableHeaderDoScroll);
-    $(document.documentElement).scroll(Drupal.tableHeaderDoScroll);
-  }
-
-  // Track scrolling.
-  Drupal.tableHeaderOnScroll = function() {
-    $(headers).each(function () {
-      tracker(this);
-    });
-  };
-
-  // Track resizing.
-  var time = null;
-  var resize = function () {
-    // Ensure minimum time between adjustments.
-    if (time) {
-      return;
-    }
-    time = setTimeout(function () {
-      $('table.sticky-header').each(function () {
-        // Force cell width calculation.
-        this.viewHeight = 0;
-        tracker(this);
-      });
-      // Reset timer
-      time = null;
-    }, 250);
-  };
-  $(window).resize(resize);
-};
-;
-// $Id: collapse.js,v 1.17 2008/01/29 10:58:25 goba Exp $
-
-/**
- * Toggle the visibility of a fieldset using smooth animations
- */
-Drupal.toggleFieldset = function(fieldset) {
-  if ($(fieldset).is('.collapsed')) {
-    // Action div containers are processed separately because of a IE bug
-    // that alters the default submit button behavior.
-    var content = $('> div:not(.action)', fieldset);
-    $(fieldset).removeClass('collapsed');
-    content.hide();
-    content.slideDown( {
-      duration: 'fast',
-      easing: 'linear',
-      complete: function() {
-        Drupal.collapseScrollIntoView(this.parentNode);
-        this.parentNode.animating = false;
-        $('div.action', fieldset).show();
-      },
-      step: function() {
-        // Scroll the fieldset into view
-        Drupal.collapseScrollIntoView(this.parentNode);
-      }
-    });
-  }
-  else {
-    $('div.action', fieldset).hide();
-    var content = $('> div:not(.action)', fieldset).slideUp('fast', function() {
-      $(this.parentNode).addClass('collapsed');
-      this.parentNode.animating = false;
-    });
-  }
-};
-
-/**
- * Scroll a given fieldset into view as much as possible.
- */
-Drupal.collapseScrollIntoView = function (node) {
-  var h = self.innerHeight || document.documentElement.clientHeight || $('body')[0].clientHeight || 0;
-  var offset = self.pageYOffset || document.documentElement.scrollTop || $('body')[0].scrollTop || 0;
-  var posY = $(node).offset().top;
-  var fudge = 55;
-  if (posY + node.offsetHeight + fudge > h + offset) {
-    if (node.offsetHeight > h) {
-      window.scrollTo(0, posY);
-    } else {
-      window.scrollTo(0, posY + node.offsetHeight - h + fudge);
-    }
-  }
-};
-
-Drupal.behaviors.collapse = function (context) {
-  $('fieldset.collapsible > legend:not(.collapse-processed)', context).each(function() {
-    var fieldset = $(this.parentNode);
-    // Expand if there are errors inside
-    if ($('input.error, textarea.error, select.error', fieldset).size() > 0) {
-      fieldset.removeClass('collapsed');
-    }
-
-    // Turn the legend into a clickable link and wrap the contents of the fieldset
-    // in a div for easier animation
-    var text = this.innerHTML;
-      $(this).empty().append($(''+ text +'').click(function() {
-        var fieldset = $(this).parents('fieldset:first')[0];
-        // Don't animate multiple times
-        if (!fieldset.animating) {
-          fieldset.animating = true;
-          Drupal.toggleFieldset(fieldset);
-        }
-        return false;
-      }))
-      .after($('
        ')
-      .append(fieldset.children(':not(legend):not(.action)')))
-      .addClass('collapse-processed');
-  });
-};
-;
-Drupal.behaviors.Drupalorg = function () {
-  var $element = $('body:not(.drupalorg-front) #edit-search-theme-form-1'),
-    value = Drupal.t('Search Drupal.org');
-
-  // Add focus/blur label behavior to search box.
-  $element.bind('focus', function () {
-    if ($element.val() === value) {
-      $element.val('').addClass('has-value');
-    }
-  });
-  $element.bind('blur', function () {
-    if ($element.val() === '' || $element.val() === value) {
-      $element.val(value).removeClass('has-value');
-    }
-    else {
-      $element.addClass('has-value');
-    }
-  });
-  $element.trigger('blur');
-
-  // Move right column out of the way of wide tables used on API.drupal.org and
-  // forums.
-  if ($('#column-left.grid-8').length === 1) {
-    var delta = 0;
-    $('#column-left table').each(function() {
-      delta = Math.max(delta, $(this).width());
-    });
-    delta -= $('#column-left').width();
-    if (delta > 0) {
-      $('#page-inner').width($('#page-inner').width() + delta);
-      $('#column-left').width($('#column-left').width() + delta);
-    }
-  }
-};
-;
diff --git a/vid/src/main/webapp/static/fusion/raptor/js/editabledropdown.js b/vid/src/main/webapp/static/fusion/raptor/js/editabledropdown.js
deleted file mode 100644
index 6511d8a0d..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/js/editabledropdown.js
+++ /dev/null
@@ -1,363 +0,0 @@
-//Common functions for all dropdowns
-  /*----------------------------------------------
-  The Common function used for all dropdowns are:
-  -----------------------------------------------
-  -- function fnKeyDownHandler(getdropdown, e)
-  -- function fnLeftToRight(getdropdown)
-  -- function fnRightToLeft(getdropdown)
-  -- function fnDelete(getdropdown)
-  -- function FindKeyCode(e)
-  -- function FindKeyChar(e)
-  -- function fnSanityCheck(getdropdown)
-
-  --------------------------- */
-
-  function fnKeyDownHandler(getdropdown, e) {
-  
-    fnSanityCheck(getdropdown);
-
-    // Press [ <- ] and [ -> ] arrow keys on the keyboard to change alignment/flow.
-    // ...go to Start : Press  [ <- ] Arrow Key
-    // ...go to End : Press [ -> ] Arrow Key
-    // (this is useful when the edited-text content exceeds the ListBox-fixed-width)
-    // This works best on Internet Explorer, and not on Netscape
-
-    var vEventKeyCode = FindKeyCode(e);
-    // Press left/right arrow keys
-    if(vEventKeyCode == 37) {
-		fnLeftToRight(getdropdown);
-    }
-    if(vEventKeyCode == 39) {
-		fnRightToLeft(getdropdown);
-    }
-
-    // Delete key pressed
-    if(vEventKeyCode == 46) {
-		fnDelete(getdropdown);
-    }
-
-    // backspace key pressed
-    if(vEventKeyCode == 8 || vEventKeyCode==127) {
-		if(e.which) { //Netscape 
-			//e.which = ''; //this property has only a getter.
-		} else { //Internet Explorer
-			//To prevent backspace from activating the -Back- button of the browser
-			e.keyCode = '';
-			if(window.event.keyCode) {
-				window.event.keyCode = '';
-			}
-		}
-		return true;
-    }
-    // Tab key pressed, use code below to reorient to Left-To-Right flow, if needed
-    //if(vEventKeyCode == 9)
-    //{
-    //  fnLeftToRight(getdropdown);
-    //}
-  } // function fnKeyDownHandler
-
-  function fnLeftToRight(getdropdown) {
-    getdropdown.style.direction = "ltr";
-  } //function fnLeftToRight
-
-  function fnRightToLeft(getdropdown) {
-    getdropdown.style.direction = "rtl";
-  } //function fnRightToLeft
-
-  function fnDelete(getdropdown) {
-    if(getdropdown.options.length != 0) {  // if dropdown is not empty
-		if (getdropdown.options.selectedIndex == vEditableOptionIndex_A) {  // if option the Editable field
-			getdropdown.options[getdropdown.options.selectedIndex].text = '';
-			//getdropdown.options[getdropdown.options.selectedIndex].value = ''; //Use this line only if want to change the 	internal value too; else this line is not required.
-		}
-    }
-  } // function fnDelete
-
-
-  /*
-  Since Internet Explorer and Netscape have different
-  ways of returning the key code, displaying keys
-  browser-independently is a bit harder.
-  However, you can create a script that displays keys
-  for either browser.
-  The following function will display each key
-  in the status line:
-
-  The "FindKey.." function receives the "event" object
-  from the event handler and stores it in the variable "e".
-  It checks whether the "e.which" property exists (for Netscape),
-  and stores it in the "keycode" variable if present.
-  Otherwise, it assumes the browser is Internet Explorer
-  and assigns to keycode the "e.keyCode" property.
-  */
-
-  function FindKeyCode(e) {
-    if(e.which) {
-		keycode=e.which;  //Netscape
-    } else {
-		keycode=e.keyCode; //Internet Explorer
-    }
-    //alert("FindKeyCode"+ keycode);
-    return keycode;
-  } // function FindKeyCode
-
-  function FindKeyChar(e) {
-    keycode = FindKeyCode(e);
-    if((keycode==8)||(keycode==127)) {
-		character="backspace"
-    }
-    else if((keycode==46)) {
-		character="delete"
-    }
-    else {
-		character=String.fromCharCode(keycode);
-    }
-    //alert("FindKey"+ character);
-    return character;
-  } // function FindKeyChar
-
-  function fnSanityCheck(getdropdown) {
-    if(vEditableOptionIndex_A>(getdropdown.options.length-1)) {
-		alert("PROGRAMMING ERROR: The value of variable vEditableOptionIndex_... cannot be greater than (length of dropdown - 1)");
-		return false;
-    }
-  }
-
-  //Dropdown specific functions, which manipulate dropdown specific global variables
-
-  /*----------------------------------------------
-  Dropdown specific global variables are:
-  -----------------------------------------------
-  1) vEditableOptionIndex_A   --> this needs to be set by Programmer!! See explanation.
-  2) vEditableOptionText_A    --> this needs to be set by Programmer!! See explanation.
-  3) vPreviousSelectIndex_A
-  4) vSelectIndex_A
-  5) vSelectChange_A
-
-  ---------------------------  */
-
-  /*----------------------------------------------
-  The dropdown specific functions
-  (which manipulate dropdown specific global variables)
-  used by all dropdowns are:
-  -----------------------------------------------
-  1) function fnChangeHandler_A(getdropdown)
-  2) function fnKeyPressHandler_A(getdropdown, e)
-  3) function fnKeyUpHandler_A(getdropdown, e)
-
-  ---------------------------  */
-
-  /*------------------------------------------------
-  IMPORTANT: Global Variable required to be SET by programmer
-  --------------------------   */
-
-  var vEditableOptionIndex_A = 0;
-
-  // Give Index of Editable option in the dropdown.
-  // For eg.
-  // if first option is editable then vEditableOptionIndex_A = 0;
-  // if second option is editable then vEditableOptionIndex_A = 1;
-  // if third option is editable then vEditableOptionIndex_A = 2;
-  // if last option is editable then vEditableOptionIndex_A = (length of dropdown - 1).
-  // Note: the value of vEditableOptionIndex_A cannot be greater than (length of dropdown - 1)
-
-  var vEditableOptionText_A = "Custom";
-
-  // Give the default text of the Editable option in the dropdown.
-  // For eg.
-  // if the editable option is ,
-  // then set vEditableOptionText_A = "--?--";
-
-  /*------------------------------------------------
-  Global Variables required for
-  fnChangeHandler_A(), fnKeyPressHandler_A() and fnKeyUpHandler_A()
-  for Editable Dropdowns
-  --------------------------   */
-
-  var vPreviousSelectIndex_A = 0;
-  // Contains the Previously Selected Index, set to 0 by default
-
-  var vSelectIndex_A = 0;
-  // Contains the Currently Selected Index, set to 0 by default
-
-  var vSelectChange_A = 'MANUAL_CLICK';
-  // Indicates whether Change in dropdown selected option
-  // was due to a Manual Click
-  // or due to System properties of dropdown.
-
-  // vSelectChange_A = 'MANUAL_CLICK' indicates that
-  // the jump to a non-editable option in the dropdown was due
-  // to a Manual click (i.e.,changed on purpose by user).
-
-  // vSelectChange_A = 'AUTO_SYSTEM' indicates that
-  // the jump to a non-editable option was due to System properties of dropdown
-  // (i.e.,user did not change the option in the dropdown;
-  // instead an automatic jump happened due to inbuilt
-  // dropdown properties of browser on typing of a character )
-
-  /*------------------------------------------------
-  Functions required for  Editable Dropdowns
-  --------------------------   */
-
-  function fnChangeHandler_A(getdropdown, e) {
-    fnSanityCheck(getdropdown);
-
-    vPreviousSelectIndex_A = vSelectIndex_A;
-    // Contains the Previously Selected Index
-
-    vSelectIndex_A = getdropdown.options.selectedIndex;
-    // Contains the Currently Selected Index
-
-    if ((vPreviousSelectIndex_A == (vEditableOptionIndex_A)) && (vSelectIndex_A != (vEditableOptionIndex_A))&&(vSelectChange_A != 'MANUAL_CLICK')) { // To Set value of Index variables - 
-      getdropdown[(vEditableOptionIndex_A)].selected=true;
-      vPreviousSelectIndex_A = vSelectIndex_A;
-      vSelectIndex_A = getdropdown.options.selectedIndex;
-      vSelectChange_A = 'MANUAL_CLICK';
-      // Indicates that the Change in dropdown selected
-      // option was due to a Manual Click
-    }
-  } // function fnChangeHandler_A
-
-  function fnKeyPressHandler_A(getdropdown, e) {
-    fnSanityCheck(getdropdown);
-
-    keycode = FindKeyCode(e);
-    keychar = FindKeyChar(e);
-
-    // Check for allowable Characters
-    // The various characters allowable for entry into Editable option..
-    // may be customized by minor modifications in the code (if condition below)
-    // (you need to know the keycode/ASCII value of the  character to be allowed/disallowed.
-    // - 
-
-    if ((keycode>47 && keycode<59)||(keycode>62 && keycode<127) ||(keycode==32)) {
-      var vAllowableCharacter = "yes";
-    }
-    else {
-      var vAllowableCharacter = "no";
-    }
-
-    //alert(window); alert(window.event);
-
-    if(getdropdown.options.length != 0) {
-    // if dropdown is not empty
-      if (getdropdown.options.selectedIndex == (vEditableOptionIndex_A)) {
-      // if selected option the Editable option of the dropdown
-
-        var vEditString = getdropdown[vEditableOptionIndex_A].text;
-
-        // make Editable option Null if it is being edited for the first time
-        if((vAllowableCharacter == "yes")||(keychar=="backspace")) {
-          if (vEditString == vEditableOptionText_A)
-            vEditString = "";
-        }
-        if (keychar=="backspace") {
-        // To handle backspace - 
-          vEditString = vEditString.substring(0,vEditString.length-1);
-          // Decrease length of string by one from right
-
-          vSelectChange_A = 'MANUAL_CLICK';
-          // Indicates that the Change in dropdown selected
-          // option was due to a Manual Click
-
-        }
-        //alert("EditString2:"+vEditString);
-
-        if (vAllowableCharacter == "yes") {
-        // To handle addition of a character - 
-          vEditString+=String.fromCharCode(keycode);
-          // Concatenate Enter character to Editable string
-
-          // The following portion handles the "automatic Jump" bug
-          // The "automatic Jump" bug (Description):
-          //   If a alphabet is entered (while editing)
-          //   ...which is contained as a first character in one of the read-only options
-          //   ..the focus automatically "jumps" to the read-only option
-          //   (-- this is a common property of normal dropdowns
-          //    ..but..is undesirable while editing).
-
-          var i=0;
-          var vEnteredChar = String.fromCharCode(keycode);
-          var vUpperCaseEnteredChar = vEnteredChar;
-          var vLowerCaseEnteredChar = vEnteredChar;
-
-
-          if(((keycode)>=97)&&((keycode)<=122))
-          // if vEnteredChar lowercase
-            vUpperCaseEnteredChar = String.fromCharCode(keycode - 32);
-            // This is UpperCase
-
-
-          if(((keycode)>=65)&&((keycode)<=90))
-          // if vEnteredChar is UpperCase
-            vLowerCaseEnteredChar = String.fromCharCode(keycode + 32);
-            // This is lowercase
-
-          if(e.which) { //For Netscape
-            // Compare the typed character (into the editable option)
-            // with the first character of all the other
-            // options (non-editable).
-
-            // To note if the jump to the non-editable option was due
-            // to a Manual click (i.e.,changed on purpose by user)
-            // or due to System properties of dropdown
-            // (i.e.,user did not change the option in the dropdown;
-            // instead an automatic jump happened due to inbuilt
-            // dropdown properties of browser on typing of a character )
-
-            for (i=0;i<=(getdropdown.options.length-1);i++)
-            {
-              if(i!=vEditableOptionIndex_A)
-              {
-                var vReadOnlyString = getdropdown[i].text;
-                var vFirstChar = vReadOnlyString.substring(0,1);
-                if((vFirstChar == vUpperCaseEnteredChar)||(vFirstChar == vLowerCaseEnteredChar))
-                {
-                  vSelectChange_A = 'AUTO_SYSTEM';
-                  // Indicates that the Change in dropdown selected
-                  // option was due to System properties of dropdown
-                  break;
-                }
-                else
-                {
-                  vSelectChange_A = 'MANUAL_CLICK';
-                  // Indicates that the Change in dropdown selected
-                  // option was due to a Manual Click
-                }
-              }
-            }
-          }
-        }
-
-        // Set the new edited string into the Editable option
-        getdropdown.options[vEditableOptionIndex_A].text = vEditString;
-        //getdropdown.options[vEditableOptionIndex_A].value = vEditString; //Use this line only if want to change the internal value too; else this line is not required.
-
-        return false;
-      }
-	}
-    return true;
-  }
-
-  function fnKeyUpHandler_A(getdropdown, e) {
-    fnSanityCheck(getdropdown);
-
-    if(e.which) { // Netscape
-      if(vSelectChange_A == 'AUTO_SYSTEM') {
-        // if editable dropdown option jumped while editing
-        // (due to typing of a character which is the first character of some other option)
-        // then go back to the editable option.
-        getdropdown[(vEditableOptionIndex_A)].selected=true;
-      }
-
-      var vEventKeyCode = FindKeyCode(e);
-      // if [ <- ] or [ -> ] arrow keys are pressed, select the editable option
-      if((vEventKeyCode == 37)||(vEventKeyCode == 39)) {
-        getdropdown[vEditableOptionIndex_A].selected=true;
-      }
-    }
-  }
-
-/*--------------------------------------------------------------------------------------------  */
-
-
\ No newline at end of file
diff --git a/vid/src/main/webapp/static/fusion/raptor/js/form-field-tooltip.js b/vid/src/main/webapp/static/fusion/raptor/js/form-field-tooltip.js
deleted file mode 100644
index b499ca084..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/js/form-field-tooltip.js
+++ /dev/null
@@ -1,715 +0,0 @@
-/************************************************************************************************************
-
-	Form field tooltip
-	(C) www.dhtmlgoodies.com, September 2006
-
-	This is a script from www.dhtmlgoodies.com. You will find this and a lot of other scripts at our website.	
-	
-	Terms of use:
-	Look at the terms of use at http://www.dhtmlgoodies.com/index.html?page=termsOfUse
-	
-	Thank you!
-	
-	www.dhtmlgoodies.com
-	Alf Magne Kalleland
-
-************************************************************************************************************/
-
-var DHTMLgoodies_globalTooltipObj;
-
-
-/** 
-Constructor 
-**/
-function DHTMLgoodies_formTooltip()
-{
-	var tooltipDiv;
-	var tooltipText;
-	var tooltipContentDiv;				// Reference to inner div with tooltip content
-	var imagePath;						// Relative path to images
-	var arrowImageFile;					// Name of arrow image
-	var arrowImageFileRight;			// Name of arrow image
-	var arrowRightWidth;
-	var arrowTopHeight;
-	var tooltipWidth;					// Width of tooltip
-	var roundedCornerObj;				// Reference to object of class DHTMLgoodies_roundedCorners
-	var tooltipBgColor;
-	var closeMessage;					// Close message
-	var activeInput;					// Reference to currently active input
-	var tooltipPosition;				// Tooltip position, possible values: "below" or "right"
-	var tooltipCornerSize;				// Size of rounded corners
-	var displayArrow;					// Display arrow above or at the left of the tooltip?
-	var cookieName;						// Name of cookie
-	var disableTooltipPossibility;		// Possibility of disabling tooltip
-	var disableTooltipByCookie;			// If tooltip has been disabled, save the settings in cookie, i.e. for other pages with the same cookie name.
-	var disableTooltipMessage;
-	var tooltipDisabled;
-	var isMSIE;
-	var tooltipIframeObj;
-	var pageBgColor;					// Color of background - used in ie when applying iframe which covers select boxes
-	var currentTooltipObj;				// Reference to form field which tooltip is currently showing for
-	
-	this.currentTooltipObj = false,
-	this.tooltipDiv = false,
-	this.tooltipText = false;
-	this.imagePath = 'static/fusion/raptor/images/';
-	this.arrowImageFile = 'green-arrow.gif';
-	this.arrowImageFileRight = 'green-arrow-right.gif';
-	this.tooltipWidth = 200;
-	this.tooltipBgColor = '#317082';
-	this.closeMessage = 'Close';
-	this.disableTooltipMessage = 'Don\'t show this message again';
-	this.activeInput = false;
-	this.tooltipPosition = 'right';
-	this.arrowRightWidth = 16;			// Default width of arrow when the tooltip is on the right side of the inputs.
-	this.arrowTopHeight = 13;			// Default height of arrow at the top of tooltip
-	this.tooltipCornerSize = 10;
-	this.displayArrow = true;
-	this.cookieName = 'DHTMLgoodies_tooltipVisibility';
-	this.disableTooltipByCookie = false;
-	this.tooltipDisabled = false;
-	this.disableTooltipPossibility = true;
-	this.tooltipIframeObj = false;
-	this.pageBgColor = '#FFFFFF';
-	
-	DHTMLgoodies_globalTooltipObj = this;
-	
-	if(navigator.userAgent.indexOf('MSIE')>=0)this.isMSIE = true; else this.isMSIE = false;
-}
-
-
-DHTMLgoodies_formTooltip.prototype = {
-	// {{{ initFormFieldTooltip()
-    /**
-     *
-	 *
-     *  Initializes the tooltip script. Most set methods needs to be executed before you call this method.
-     * 
-     * @public
-     */		
-	initFormFieldTooltip : function()
-	{
-		var formElements = new Array();
-		var inputs = document.getElementsByTagName('IMG');
-		for(var no=0;no');
-			this.tooltipIframeObj.style.position = 'absolute';
-			this.tooltipIframeObj.style.top = '0px';
-			this.tooltipIframeObj.style.left = '0px';
-			this.tooltipIframeObj.style.width = (this.tooltipWidth) + 'px';
-			this.tooltipIframeObj.style.zIndex = 100;
-			this.tooltipIframeObj.background = this.pageBgColor;
-			this.tooltipIframeObj.style.backgroundColor= this.pageBgColor;
-			this.tooltipDiv.appendChild(this.tooltipIframeObj);	
-			if(this.tooltipPosition!='below' && this.displayArrow){
-				this.tooltipIframeObj.style.left = (this.arrowRightWidth) +  'px';	
-			}else{
-				this.tooltipIframeObj.style.top = this.arrowTopHeight + 'px';	
-			}
-
-			setTimeout("self.frames['tooltipIframeObj'].document.documentElement.style.backgroundColor='" + this.pageBgColor + "'",500);
-
-		}
-		
-		this.tooltipContentDiv = document.createElement('DIV');	
-		this.tooltipContentDiv.style.position = 'relative';	
-		this.tooltipContentDiv.id = 'DHTMLgoodies_formTooltipContent';
-		outerDiv.appendChild(this.tooltipContentDiv);			
-		
-		var closeDiv = document.createElement('DIV');
-		closeDiv.style.textAlign = 'center';
-	
-		closeDiv.innerHTML = '' + this.closeMessage + '';
-		
-		if(this.disableTooltipPossibility){
-			var tmpHTML = closeDiv.innerHTML;
-			tmpHTML = tmpHTML + ' | ' + this.disableTooltipMessage + '';
-			closeDiv.innerHTML = tmpHTML;
-		} 
-		
-		outerDiv.appendChild(closeDiv);
-		
-		document.body.appendChild(this.tooltipDiv);
-		
-		
-				
-		if(this.tooltipCornerSize>0){
-			this.roundedCornerObj = new DHTMLgoodies_roundedCorners();
-			// (divId,xRadius,yRadius,color,backgroundColor,padding,heightOfContent,whichCorners)
-			this.roundedCornerObj.addTarget('DHTMLgoodies_formTooltipDiv',this.tooltipCornerSize,this.tooltipCornerSize,this.tooltipBgColor,this.pageBgColor,5);
-			this.roundedCornerObj.init();
-		}
-		
-
-		this.tooltipContentDiv = document.getElementById('DHTMLgoodies_formTooltipContent');
-	}
-	// }}}
-	,
-	addEvent : function(whichObject,eventType,functionName)
-	{ 
-	  if(whichObject.attachEvent){ 
-	    whichObject['e'+eventType+functionName] = functionName; 
-	    whichObject[eventType+functionName] = function(){whichObject['e'+eventType+functionName]( window.event );} 
-	    whichObject.attachEvent( 'on'+eventType, whichObject[eventType+functionName] ); 
-	  } else 
-	    whichObject.addEventListener(eventType,functionName,false); 	    
-	} 	
-	// }}}
-	,
-	__positionCurrentToolTipObj : function()
-	{
-		if(DHTMLgoodies_globalTooltipObj.activeInput)this.__positionTooltip(DHTMLgoodies_globalTooltipObj.activeInput);
-		
-	}
-	// }}}
-	,		
-	// {{{ __positionTooltip()
-    /**
-     *
-	 *
-     *  This function positions the tooltip
-     *
-     * @param Obj inputObj = Reference to text input
-     * 
-     * @private
-     */	
-	__positionTooltip : function(inputObj)
-	{	
-		var offset = 0;
-		if(!this.displayArrow)offset = 3;	
-		if(this.tooltipPosition=='below'){
-			this.tooltipDiv.style.left = this.getLeftPos(inputObj)+  'px';
-			this.tooltipDiv.style.top = (this.getTopPos(inputObj) + inputObj.offsetHeight + offset) + 'px';
-		}else{
-		
-			this.tooltipDiv.style.left = (this.getLeftPos(inputObj) + inputObj.offsetWidth + offset)+  'px';
-			this.tooltipDiv.style.top = this.getTopPos(inputObj) + 'px';			
-		}
-		this.tooltipDiv.style.width=this.tooltipWidth + 'px';
-		
-	}
-	,
-	// {{{ getTopPos()
-    /**
-     * This method will return the top coordinate(pixel) of an object
-     *
-     * @param Object inputObj = Reference to HTML element
-     * @public
-     */	
-	getTopPos : function(inputObj)
-	{		
-	  var returnValue = inputObj.offsetTop;
-	  while((inputObj = inputObj.offsetParent) != null){
-	  	if(inputObj.tagName!='HTML'){
-	  		returnValue += inputObj.offsetTop;
-	  		if(document.all)returnValue+=inputObj.clientTop;
-	  	}
-	  } 
-	  return returnValue;
-	}
-	// }}}
-	
-	,
-	// {{{ getLeftPos()
-    /**
-     * This method will return the left coordinate(pixel) of an object
-     *
-     * @param Object inputObj = Reference to HTML element
-     * @public
-     */	
-	getLeftPos : function(inputObj)
-	{	  
-	  var returnValue = inputObj.offsetLeft;
-	  while((inputObj = inputObj.offsetParent) != null){
-	  	if(inputObj.tagName!='HTML'){
-	  		returnValue += inputObj.offsetLeft;
-	  		if(document.all)returnValue+=inputObj.clientLeft;
-	  	}
-	  }
-	  return returnValue;
-	}
-	
-	,
-	
-	// {{{ getCookie()
-    /**
-     *
-     * 	These cookie functions are downloaded from 
-	 * 	http://www.mach5.com/support/analyzer/manual/html/General/CookiesJavaScript.htm
-	 *
-     *  This function returns the value of a cookie
-     *
-     * @param String name = Name of cookie
-     * @param Object inputObj = Reference to HTML element
-     * @public
-     */	
-	getCookie : function(name) { 
-	   var start = document.cookie.indexOf(name+"="); 
-	   var len = start+name.length+1; 
-	   if ((!start) && (name != document.cookie.substring(0,name.length))) return null; 
-	   if (start == -1) return null; 
-	   var end = document.cookie.indexOf(";",len); 
-	   if (end == -1) end = document.cookie.length; 
-	   return unescape(document.cookie.substring(len,end)); 
-	} 	
-	// }}}
-	,	
-	
-	// {{{ setCookie()
-    /**
-     *
-     * 	These cookie functions are downloaded from 
-	 * 	http://www.mach5.com/support/analyzer/manual/html/General/CookiesJavaScript.htm
-	 *
-     *  This function creates a cookie. (This method has been slighhtly modified)
-     *
-     * @param String name = Name of cookie
-     * @param String value = Value of cookie
-     * @param Int expires = Timestamp - days
-     * @param String path = Path for cookie (Usually left empty)
-     * @param String domain = Cookie domain
-     * @param Boolean secure = Secure cookie(SSL)
-     * 
-     * @public
-     */	
-	setCookie : function(name,value,expires,path,domain,secure) { 
-		expires = expires * 60*60*24*1000;
-		var today = new Date();
-		var expires_date = new Date( today.getTime() + (expires) );
-	    var cookieString = name + "=" +escape(value) + 
-	       ( (expires) ? ";expires=" + expires_date.toGMTString() : "") + 
-	       ( (path) ? ";path=" + path : "") + 
-	       ( (domain) ? ";domain=" + domain : "") + 
-	       ( (secure) ? ";secure" : ""); 
-	    document.cookie = cookieString; 
-	}
-	// }}}
-		
-		
-}
\ No newline at end of file
diff --git a/vid/src/main/webapp/static/fusion/raptor/js/gmap.js b/vid/src/main/webapp/static/fusion/raptor/js/gmap.js
deleted file mode 100644
index ba214f61e..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/js/gmap.js
+++ /dev/null
@@ -1,634 +0,0 @@
-var map;
-var popupTable;
-var networkOverlay;
-var selectedNetworkOverlay;
-var flashTimeout;
-//var infoDiv;
-var mainInfoDiv;
-var locationInfoDiv;
-var loadingAnimationDiv;
-var geocoder;
-var addressMarker;
-var popupDiv;
-//var novaButton;
-
-function novaMapInit() {
-	if (GBrowserIsCompatible()) {
-		var dmap = document.getElementById("map");
-		map = new GMap2(dmap);
-		var defaultCenterLongitude = document.getElementById("defaultCenterLongitude").value;
-		var defaultCenterLatitude = document.getElementById("defaultCenterLatitude").value;
-		var defaultZoomLevel = document.getElementById("defaultZoomLevel").value * 1;
-		
-		map.setCenter(new GLatLng(defaultCenterLatitude, defaultCenterLongitude), defaultZoomLevel); 
-		
-	    map.enableScrollWheelZoom();
-	    map.enableContinuousZoom();
-	    map.addControl(new GLargeMapControl());
-	    map.addControl(new GMapTypeControl());
-	    
-	    geocoder = new GClientGeocoder();
-	
-	    GEvent.addListener(map, "dragend", mapDragEnd);
-	    GEvent.addListener(map, "zoomend", mapZoomChanged);
-	    GEvent.addListener(map, "click", mapClicked);
-	    GEvent.addListener(map, "moveend", mapMoveEnd)
-	    GEvent.addListener(map, "singlerightclick", mapRightClicked);
-	    GEvent.addListener(map, "mousemove", function(latlng) {
-	    	locationInfoDiv.innerHTML = latlng.lng().toFixed(3) + ", " + latlng.lat().toFixed(3);
-	    });
-	
-	    var n = document.getElementById("popupmenudiv2");
-	    popupDiv = n.cloneNode(true);
-	    map.getContainer().appendChild(popupDiv);
-	    
-	    popupTable = document.getElementById("popupmenudivtb");
-	    
-	    // detail info div
-	  	/*infoDiv = document.createElement("div");
-	  	infoDiv.style.display = "none";
-	  	infoDiv.style.position = "absolute";
-	  	infoDiv.style.overflow = "auto";
-	  	infoDiv.style.top = "0px"; 
-	  	infoDiv.style.left = "0px";
-	  	infoDiv.style.zIndex = "1001";
-	  	infoDiv.style.border = "1px outset #000";
-	  	infoDiv.style.background = "#C6DEFF";
-	  	infoDiv.style.height = "150px";
-	  	infoDiv.style.width = "300px";
-	  	infoDiv.align = "center";*/
-	  	
-	  	mainInfoDiv = document.createElement("div");
-	  	mainInfoDiv.style.display = "none";
-	  	mainInfoDiv.style.position = "absolute";
-	  	mainInfoDiv.style.overflow = "auto";
-	  	mainInfoDiv.style.top = "0px"; 
-	  	mainInfoDiv.style.left = "0px";
-	  	mainInfoDiv.style.zIndex = "1001";
-	  	mainInfoDiv.style.border = "1px outset #000";
-	  	mainInfoDiv.style.background = "#C6DEFF";
-	  	mainInfoDiv.style.height = "150px";
-	  	mainInfoDiv.style.width = "300px";
-	  	mainInfoDiv.align = "center";
-
-	  	//mainInfoDiv = infoDiv.appendChild(document.createElement("div"));
-	  	mainInfoDiv.style.overflow = "auto";
-	  	mainInfoDiv.style.height = "150px";
-	  	mainInfoDiv.style.width = "300px";
-	  	//mainInfoDiv.align = "center";
-	  	
-	  	/*var closeInfoDiv = infoDiv.appendChild(document.createElement("div"));
-	  	closeInfoDiv.appendChild(document.createTextNode("Close"));
-	  	
-	  	closeInfoDiv.style.background = "#FFFFF0";
-	  	closeInfoDiv.style.color = "black";
-		closeInfoDiv.style.fontFamily = "Verdana";
-		closeInfoDiv.style.fontSize = "12px";
-		closeInfoDiv.style.fontWeight= "bold";
-		closeInfoDiv.style.border = "2px solid black";
-		closeInfoDiv.style.padding = "0px";
-		closeInfoDiv.style.marginBottom = "0px";
-		closeInfoDiv.style.textAlign = "center";
-		closeInfoDiv.style.width = "80px";
-		closeInfoDiv.style.height = "15px";
-		closeInfoDiv.style.cursor = "pointer";
-	  	
-	  	GEvent.addDomListener(closeInfoDiv, "click", function() {
-	  	  infoDiv.style.display = "none";
-	  	});	*/
-	  	
-	  	// longitude latitude div
-	  	var locationInfoWidth = 200;
-	  	var locationInfoHeight = 15;
-	  	locationInfoDiv = document.createElement("div");
-	  	locationInfoDiv.style.display = "inline";
-	  	locationInfoDiv.style.position = "absolute";
-	  	locationInfoDiv.style.zIndex = "1";
-	  	locationInfoDiv.style.height = locationInfoHeight + "px";
-	  	locationInfoDiv.style.width = locationInfoWidth + "px";
-	  	locationInfoDiv.align = "center";
-	  	locationInfoDiv.style.color = "#4CC417";
-	  	locationInfoDiv.style.fontWeight = "bold";
-	  	locationInfoDiv.appendChild(document.createTextNode("Longitude Latitude"));
-	
-	  	var mapWidth = map.getSize().width;
-	  	var mapHeight = map.getSize().height;
-	  	
-	  	locationInfoDiv.style.top = (mapHeight - locationInfoHeight - 5) + "px";
-	  	locationInfoDiv.style.left = (mapWidth / 2 - locationInfoWidth / 2) + "px";
-	  	
-	  	// loading image animation
-	  	loadingAnimationDiv = document.createElement("div");
-	  	loadingAnimationDiv.style.position = "absolute";
-	  	loadingAnimationDiv.style.zIndex = "100000";
-	  	loadingAnimationDiv.style.display = "none";
-	  	loadingAnimationDiv.style.width = "50px";
-	  	loadingAnimationDiv.style.height = "50px";
-	  	loadingAnimationDiv.style.top = (mapHeight / 2 - 50 / 2) + "px";
-	  	loadingAnimationDiv.style.left = (mapWidth / 2 - 50 / 2) + "px";
-	  	var imgDiv = loadingAnimationDiv.appendChild(document.createElement("img"));
-	  	imgDiv.src = document.getElementById("imgFolder").value + "loading.gif";
-	  	
-	  
-	  	//map.getContainer().appendChild(infoDiv);
-		map.getContainer().appendChild(mainInfoDiv);
-	  	map.getContainer().appendChild(locationInfoDiv);
-	  	map.getContainer().appendChild(loadingAnimationDiv);
-	  	updateImage(0);
-	}
-}
-
-function mapRightClicked(point, src) {
-	var latlng = map.fromContainerPixelToLatLng(new GPoint(point.x , point.y));
-	alert(latlng.lng() + ", " + latlng.lat());
-}
-/*
-function searchObject(searchInput, searchType, exactMatch, clickX, clickY) {
-  loadingAnimationDiv.style.display = "inline";
-  var baseURL = document.getElementById("baseURL").value;
-  //var url = baseURL + "/gmap_controller.htm?action=searchObject";
-  //var url = baseURL + "report.gmap.search_object";
-  var url = baseURL + "/gmapservlet?action=searchObject&nextpage=report.gmap.search_object";
-  url += "&search_input=" + searchInput;
-  url += "&search_type=" + searchType;
-  url += "&exact_match=" + exactMatch;
-  url += "&object_type=CELLSITE";
-  
-  if (clickX == null || clickY == null) {
-    var mapWidth = map.getSize().width;
-  	var mapHeight = map.getSize().height;
-  	clickX = mapWidth / 2;
-  	clickY = mapHeight / 2;
-  }
-  
-  url += "&client_x=" + clickX;
-  url += "&client_y=" + clickY;
-  
-  new Ajax.Request(url, {
-  	method: 'get',
-  	onSuccess: function(transport) {
-  	  loadingAnimationDiv.style.display = "none";
-  	  var jsonData = transport.responseText.evalJSON();
-  	  var list = jsonData.list;
-  	  
-  	  if (list == null) {
-  	    alert("Not found");
-  	  }
-  	  else {
-  	    if (list.length == 1) {
-  	      var longitude = list[0].longitude;
-  	      var latitude = list[0].latitude;
-  	      map.setCenter(new GLatLng(latitude, longitude));
-  	      updateImage(0);
-  	    }
-  	    else {
-  	      for (var i = popupTable.childNodes.length - 1; i >= 0; i--) {
-            popupTable.removeChild(popupTable.lastChild);
-          }
-            
-  	      for (var i = 0; i < list.length; i++) {
-					  var tr = popupTable.appendChild(document.createElement("tr"));			
-          	var td = tr.appendChild(document.createElement("td"));
-          	td.appendChild(document.createTextNode(list[i].type + "(" + list[i].numberOfT1 + 
-        	  	"): " + list[i].id));
-          	td.style.border = "solid";
-          	td.style.borderWidth = "thin";
-          	td.style.borderRight = "none";
-          	td.style.borderLeft = "none";
-        	
-          	if (i == 0) {
-            	td.style.borderTop = "none";
-          	}
-        	
-          	if (i == list.length - 1) {
-          		td.style.borderBottom = "none";
-          	}
-        	
-          	td.style.color = "#0000FF";
-          	td.style.background = "#FFFFF0";
-           	td.style.fontSize = "12px";
-          	td.font = "Arial,Helvetica,sans-serif";
-          	td.id = list[i].latitude + ">>" + list[i].longitude;
-        	
-          	td.onmouseover = function(e) {
-              this.style.background = "#0000FF";
-              this.style.color = "#FFFFF0";
-            }
-        	
-          	td.onmouseout = function(e) {
-              this.style.background = "#FFFFF0";
-              this.style.color = "#0000FF";
-            }
-          
-            td.onclick = function(e) {
-              //var popupDiv = document.getElementById("popupmenudiv");
-              popupDiv.style.display = "none";
-              var latitudeLongitude = this.id.split(">>");
-              var latlng = new GLatLng(latitudeLongitude[0], latitudeLongitude[1]);
-            	map.setCenter(latlng);
-            	updateImage(0); 
-            }
-				  }
-				  
-				  //var popupDiv = document.getElementById("popupmenudiv");
-				  popupDiv.style.display = "";
- 	
-      	  var textWidth = popupDiv.offsetWidth;
-     		  var textHeight = popupDiv.offsetHeight;
-         
-      	  if (textHeight >= 200) {
-      	  	popupDiv.style.overflow = "auto";
-      	  	popupDiv.style.height = "200px";
-      	  	textHeight = 200;
-      	  }
-      	
-      	  if (textWidth >= 250) {
-      	  	popupDiv.style.width = "250px";
-      	  	//textWidth = 250;
-      	  }
-      	
-        	var clientX = jsonData.clientX;
-        	var clientY = jsonData.clientY;
-      	
-        	if ((clientX * 1 + textWidth + 20) >= screen.availWidth) {
-     	    	clientX = clientX - textWidth - 20;
-     	  	}
-     	
-     	  	if ((clientY * 1 + textHeight) >= document.getElementById("map").offsetHeight) {
-     	  		clientY = document.getElementById("map").offsetHeight - textHeight;
-     		  
-     	  	}
-     	  	
-        	popupDiv.style.top = clientY + "px";
-        	popupDiv.style.left = clientX + "px";
-  	    }
-  	  }
-  	}
-  });	
-}
-*/
-function getInfo(info, x, y) {
-  var baseURL = document.getElementById("baseURL").value;
-  //var url = baseURL + "/gmap_controller.htm?action=getInfo";
-  //var url = baseURL + "report.gmap.get_info";
-  var url = baseURL + "/gmapservlet?action=getInfo&nextpage=report.gmap.get_info";
-  url += "&info=" + info;
-  url += "&client_x=" + x;
-  url += "&client_y=" + y;
-  
-  new Ajax.Request(url, {
-  	method: 'get',
-  	onSuccess: function(transport) {
-  		var jsonData = transport.responseText.evalJSON();
-  		var clientX = jsonData.clientX;
-  		var clientY = jsonData.clientY;
-  		var attributes = jsonData.attributes;
-  		
-  		for (var i = mainInfoDiv.childNodes.length - 1; i >= 0; i--) {
-      	mainInfoDiv.removeChild(mainInfoDiv.lastChild);
-      }
-      
-     	mainInfoDiv.align="left";
-     	var menuUL = mainInfoDiv.appendChild(document.createElement("ul"));
-     	var menuItem = document.createElement("li");
-     	menuItem.appendChild(document.createTextNode("Row : " + jsonData.id));
-     	menuUL.appendChild(menuItem);
-     	
-     	menuItem = document.createElement("li");
-     	menuItem.appendChild(document.createTextNode("Longitude: " + jsonData.longitude));
-     	menuUL.appendChild(menuItem);
-     	
-     	menuItem = document.createElement("li");
-     	menuItem.appendChild(document.createTextNode("Latitude: " + jsonData.latitude));
-     	menuUL.appendChild(menuItem);
-     	
-     	var table = mainInfoDiv.appendChild(document.createElement("table"));
-     	table.width="100%";
-     	table.align="left";
-     	var tbody = table.appendChild(document.createElement("tbody"));
-     	//tbody.style.borderCollapse = "collapse";
-     	//var tr = tbody.appendChild(document.createElement("tr"));
-     	var td;
-     	for (var i = 0; i < attributes.length ; i++) {
-     		tr = tbody.appendChild(document.createElement("tr"));
-     		td = tr.appendChild(document.createElement("td"));
-     		td.align="left";
-     		td.width="25%"
-     		td.style.padding = "2px";
-     		td.appendChild(document.createTextNode(attributes[i].key));
-     		td = tr.appendChild(document.createElement("td"));
-     		td.style.padding = "2px";
-     		td.appendChild(document.createTextNode(attributes[i].value));
-     	}
-     	
-     	var textWidth = 300;
-     	var textHeight = 150 + 15;
-     	
-		if ((clientX * 1 + textWidth + 20) >= screen.availWidth) {
-     	  clientX = clientX - textWidth - 20;
-     	}
-     	
-     	if ((clientY * 1 + textHeight) >= document.getElementById("map").offsetHeight) {
-     		clientY = document.getElementById("map").offsetHeight - textHeight;		  
-     	}
-      
-	mainInfoDiv.style.top = clientY + "px";
-      	mainInfoDiv.style.left = clientX + "px";
-	mainInfoDiv.style.display = "inline";
-  	}
-  });
-}
-
-function mapClicked(overlay, latlng, overlaylatlng) {
-	var baseURL = document.getElementById("baseURL").value;
-  //var url = baseURL + "/gmap_controller.htm?action=singleLeftClick";
-  //var url = baseURL + "report.gmap.single_left_click";
-  var url = baseURL + "/gmapservlet?action=singleLeftClick&nextpage=report.gmap.single_left_click";
-  var mapSize = map.getSize();
-  var mapBounds = map.getBounds();
-  var pointSW = mapBounds.getSouthWest();
-  var pointNE = mapBounds.getNorthEast();
-  url += "&click_longitude=" + latlng.lng();
-  url += "&click_latitude=" + latlng.lat();
-  url += "&zoom_level=" + map.getZoom();
-  url += "&map_size=" + mapSize.width + "," + mapSize.height;
-  url += "&map_bounds=" + pointSW.lng() + "," + pointSW.lat() + "," + pointNE.lng() + "," + pointNE.lat();
-  var point = map.fromLatLngToContainerPixel(latlng);
-  var clickX = point.x;
-  var clickY = point.y;
-  url += "&client_x=" + clickX;
-  url += "&client_y=" + clickY;
-  
-  //document.getElementById("popupmenudiv").style.display = "none";
-  popupDiv.style.display="none";
-  mainInfoDiv.style.display="none";
-  new Ajax.Request(url, {
-  	method: 'get',
-  	onSuccess: function(transport) {
-  		var jsonData = transport.responseText.evalJSON();
-			var list = jsonData.list;
-			var selectedImageURL = jsonData.selectedImageURL;
-			var legendImageURL = jsonData.legendImageURL;
-			//alert(legendImageURL);
-			if (legendImageURL != null) {
-				repaintLegend(legendImageURL);
-			}
-			
-			if (list != null) {
-				for (var i = popupTable.childNodes.length - 1; i >= 0; i--) {
-          			popupTable.removeChild(popupTable.lastChild);
-        		}
-    	
-				for (var i = 0; i < list.length; i++) {
-					var tr = popupTable.appendChild(document.createElement("tr"));			
-		        	var td = tr.appendChild(document.createElement("td"));
-		        	td.appendChild(document.createTextNode("Row : " + list[i].id));
-		        	td.style.border = "solid";
-		        	td.style.borderWidth = "thin";
-		        	td.style.borderRight = "none";
-		        	td.style.borderLeft = "none";
-		        	
-		        	if (i == 0) {
-		        		td.style.borderTop = "none";
-		        	}
-		        	
-		        	if (i == list.length - 1) {
-		        		td.style.borderBottom = "none";
-		        	}
-		        	
-		        	td.style.color = "#0000FF";
-		        	td.style.background = "#FFFFF0";
-		        	td.style.fontSize = "12px";
-		        	td.font = "Arial,Helvetica,sans-serif";
-		        	td.id = jsonData.type + ">>" + list[i].id + ">>" + list[i].type;
-		        	
-		        	td.onmouseover = function(e) {
-		            this.style.background = "#0000FF";
-		            this.style.color = "#FFFFF0";
-				}
-        	
-	        	td.onmouseout = function(e) {
-	            this.style.background = "#FFFFF0";
-	            this.style.color = "#0000FF";
-          }
-          
-          td.onclick = function(e) {
-	          //var popupDiv = document.getElementById("popupmenudiv");
-	          getInfo(this.id, clickX, clickY);
-	            
-	          popupDiv.style.display = "none";
-		  }
-    }
-							
-	//var popupDiv = document.getElementById("popupmenudiv");
-	popupDiv.style.display = "";
- 	
-    var textWidth = popupDiv.offsetWidth;
-    var textHeight = popupDiv.offsetHeight;
-         
-    if (textHeight >= 200) {
-    	popupDiv.style.overflow = "auto";
-      	popupDiv.style.height = "200px";
-      		textHeight = 200;
-	}
-      	
-    if (textWidth >= 250) {
-    	popupDiv.style.width = "250px";
-      	//textWidth = 250;
-	}
-      	
-    var clientX = jsonData.clientX;
-    var clientY = jsonData.clientY;
-      	
-    if ((clientX * 1 + textWidth + 20) >= screen.availWidth) {
-    	clientX = clientX - textWidth - 20;
-     }
-     	
-     if ((clientY * 1 + textHeight) >= document.getElementById("map").offsetHeight) {
-     	clientY = document.getElementById("map").offsetHeight - textHeight;
-     		  
-     }
-      
-     popupDiv.style.top = clientY + "px";
-     popupDiv.style.left = clientX + "px";
-	}
-	else if (selectedImageURL != null) {
-		repaintSelected(selectedImageURL);
-	}
-  	}
-  });
-}
-
-//new changes
-
-function mapMoveEnd() {
-  if (networkOverlay != null) {
-		map.removeOverlay(networkOverlay);
-  	networkOverlay = null;
-  }
-
-  
-	updateImage(0);
-}
-
-function mapDragEnd() {
-}
-
-function mapZoomChanged(oldZoomLevel, newZoomLevel) {
-}
-/*
-function updateSelectedImage() {
-	var baseURL = document.getElementById("baseURL").value;
-	var url = baseURL + "/gmap_controller.htm?action=nova.gmap.fetch.selected.image";
-	var mapSize = map.getSize();
-	var mapBounds = map.getBounds();
-	var pointSW = mapBounds.getSouthWest();
-	var pointNE = mapBounds.getNorthEast();
-	url += "&zoomLevel=" + map.getZoom();
-	url += "&mapSize=" + mapSize.width + "," + mapSize.height;
-	url += "&mapBounds=" + pointSW.lng() + "," + pointSW.lat() + "," + pointNE.lng() + "," + pointNE.lat();
-	
-	new Ajax.Request(url, {     
-		method: 'get',
-		asynchronous: false,
-		onSuccess: function(transport) {      
-			var url = transport.responseXML.getElementsByTagName("image-url")[0].childNodes[0].nodeValue;
-			
-			if (url != null) {
-				repaintSelected(url);
-			}
-		}
-	}); 
-}
-*/
-
-function updateImage(incDecValue) {
-	//alert();
-	loadingAnimationDiv.style.display = "inline";
-	var baseURL = document.getElementById("baseURL").value;
-	//var url = baseURL + "/gmap_controller.htm?action=getImage";
-	//var url = baseURL + "report.gmap.get_image";
-	var url = baseURL + "/gmapservlet?action=getImage&nextpage=report.gmap.get_image";
-	var mapSize = map.getSize();
-	var mapBounds = map.getBounds();
-	var pointSW = mapBounds.getSouthWest();
-	var pointNE = mapBounds.getNorthEast();
-	url += "&zoom_level=" + map.getZoom();
-	url += "&map_size=" + mapSize.width + "," + mapSize.height;
-	url += "&map_bounds=" + pointSW.lng() + "," + pointSW.lat() + "," + pointNE.lng() + "," + pointNE.lat();
- 	url += "&increment_decrement_value=" + incDecValue;
- 	url += "&selected_layer_list=" + document.getElementById("selectedLayerList").value; 
- 	url += "&color_list=" + document.getElementById("colorList").value;
- 	var randomNumber = Math.floor(Math.random() * 5000000)
- 	url += "&dummy=" + randomNumber;
- 
-  //disableUserInput();
-  new Ajax.Request(url, {     
-  	method: 'get',  	
-  	onSuccess: function(transport) {  
-  		
-  	  loadingAnimationDiv.style.display = "none";
-  		var jsonData = transport.responseText.evalJSON();
-			var imageURL = jsonData.imageURL;
-			var legendImageURL = jsonData.legendImageURL;
-			var selectedImageURL = jsonData.selectedImageURL;
-			var currentMonth = jsonData.currentMonth;
-			var colorList = jsonData.colorList;
-			var selectedLayerList = jsonData.selectedLayerList;
-			
-			if (legendImageURL != null) {
-				repaintLegend(legendImageURL);
-			}
-			if (imageURL != null) {
-				repaint(imageURL);
-			}
-			
-			if (selectedImageURL != null) {
-				repaintSelected(selectedImageURL);
-			}
-		
-			if (currentMonth != null) {
-			  document.getElementById("currentMonthDiv").innerHTML = currentMonth;
-			}
-			
-			if (colorList != null) {
-			  document.getElementById("colorList").value = colorList;
-			  document.getElementById("selectedLayerList").value = selectedLayerList;
-			  NovaButton.prototype.initializeLayerDiv(NovaButton.globals.layerOptionContainer);
-			}
-  		
-  		
-  	}
-  }); 
-}
-
-	function repaintLegend(url) {
-		var mapLegend = document.getElementById("mapLegend");
-		var legendImg = document.getElementById("legendImg");
-		
-		mapLegend.removeChild(legendImg);
-	    var newpic=document.createElement('img');
-	    newpic.src=url;
-	    newpic.id="legendImg";
-	    //alert(url);
-	    mapLegend.appendChild(newpic);
-	      
-	}
-
-
-function repaint(url) {
-  if (networkOverlay != null) {
-  	map.removeOverlay(networkOverlay);
-  }
-  
-  networkOverlay = new ProjectedOverlay(url, map.getBounds()) ;
-  map.addOverlay(networkOverlay);
-}
-
-function repaintSelected(url) {
-  var mapBounds = map.getBounds();
-  var pointSW = mapBounds.getSouthWest();
-  var pointNE = mapBounds.getNorthEast();
-  
-  if (selectedNetworkOverlay != null) {
-  	map.removeOverlay(selectedNetworkOverlay);	
-  }
-  
-  selectedNetworkOverlay = new GGroundOverlay(url, new GLatLngBounds(pointSW, pointNE)) ;
-  map.addOverlay(selectedNetworkOverlay);
-  
-  if (flashTimeout != null) {
-  	clearTimeout(flashTimeout);
-  }
-  
-  flashImage();
-}
-
-function flashImage() {
-	if (selectedNetworkOverlay.isHidden()) {
-	  selectedNetworkOverlay.show();
-	}
-	else {
-		selectedNetworkOverlay.hide();
-	}
-	
-	flashTimeout = setTimeout(flashImage, 500);
-}
-
-function disableUserInput() {
-	map.disableDragging();
-	map.disableDoubleClickZoom();
-	map.disableScrollWheelZoom();
-	map.disableContinuousZoom();
-}
-
-function enableUserInput() {
-	map.enableDragging();
-	map.enableDoubleClickZoom();
-	map.enableScrollWheelZoom();
-	map.enableContinuousZoom();
-}
-
-String.prototype.trim = function() {
-  return this.replace(/^\s+|\s+$/g, "");
-}
\ No newline at end of file
diff --git a/vid/src/main/webapp/static/fusion/raptor/js/jquery.js b/vid/src/main/webapp/static/fusion/raptor/js/jquery.js
deleted file mode 100644
index 462cde56c..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/js/jquery.js
+++ /dev/null
@@ -1,4376 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.3.2
- * http://jquery.com/
- *
- * Copyright (c) 2009 John Resig
- * Dual licensed under the MIT and GPL licenses.
- * http://docs.jquery.com/License
- *
- * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009)
- * Revision: 6246
- */
-(function(){
-
-var 
-	// Will speed up references to window, and allows munging its name.
-	window = this,
-	// Will speed up references to undefined, and allows munging its name.
-	undefined,
-	// Map over jQuery in case of overwrite
-	_jQuery = window.jQuery,
-	// Map over the $ in case of overwrite
-	_$ = window.$,
-
-	jQuery = window.jQuery = window.$ = function( selector, context ) {
-		// The jQuery object is actually just the init constructor 'enhanced'
-		return new jQuery.fn.init( selector, context );
-	},
-
-	// A simple way to check for HTML strings or ID strings
-	// (both of which we optimize for)
-	quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,
-	// Is it a simple selector
-	isSimple = /^.[^:#\[\.,]*$/;
-
-jQuery.fn = jQuery.prototype = {
-	init: function( selector, context ) {
-		// Make sure that a selection was provided
-		selector = selector || document;
-
-		// Handle $(DOMElement)
-		if ( selector.nodeType ) {
-			this[0] = selector;
-			this.length = 1;
-			this.context = selector;
-			return this;
-		}
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			// Are we dealing with HTML string or an ID?
-			var match = quickExpr.exec( selector );
-
-			// Verify a match, and that no context was specified for #id
-			if ( match && (match[1] || !context) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] )
-					selector = jQuery.clean( [ match[1] ], context );
-
-				// HANDLE: $("#id")
-				else {
-					var elem = document.getElementById( match[3] );
-
-					// Handle the case where IE and Opera return items
-					// by name instead of ID
-					if ( elem && elem.id != match[3] )
-						return jQuery().find( selector );
-
-					// Otherwise, we inject the element directly into the jQuery object
-					var ret = jQuery( elem || [] );
-					ret.context = document;
-					ret.selector = selector;
-					return ret;
-				}
-
-			// HANDLE: $(expr, [context])
-			// (which is just equivalent to: $(content).find(expr)
-			} else
-				return jQuery( context ).find( selector );
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) )
-			return jQuery( document ).ready( selector );
-
-		// Make sure that old selector state is passed along
-		if ( selector.selector && selector.context ) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
-		return this.setArray(jQuery.isArray( selector ) ?
-			selector :
-			jQuery.makeArray(selector));
-	},
-
-	// Start with an empty selector
-	selector: "",
-
-	// The current version of jQuery being used
-	jquery: "1.3.2",
-
-	// The number of elements contained in the matched element set
-	size: function() {
-		return this.length;
-	},
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num === undefined ?
-
-			// Return a 'clean' array
-			Array.prototype.slice.call( this ) :
-
-			// Return just the object
-			this[ num ];
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems, name, selector ) {
-		// Build a new jQuery matched element set
-		var ret = jQuery( elems );
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-
-		ret.context = this.context;
-
-		if ( name === "find" )
-			ret.selector = this.selector + (this.selector ? " " : "") + selector;
-		else if ( name )
-			ret.selector = this.selector + "." + name + "(" + selector + ")";
-
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Force the current matched set of elements to become
-	// the specified array of elements (destroying the stack in the process)
-	// You should use pushStack() in order to do this, but maintain the stack
-	setArray: function( elems ) {
-		// Resetting the length to 0, then using the native Array push
-		// is a super-fast way to populate an object with array-like properties
-		this.length = 0;
-		Array.prototype.push.apply( this, elems );
-
-		return this;
-	},
-
-	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
-	},
-
-	// Determine the position of an element within
-	// the matched set of elements
-	index: function( elem ) {
-		// Locate the position of the desired element
-		return jQuery.inArray(
-			// If it receives a jQuery object, the first element is used
-			elem && elem.jquery ? elem[0] : elem
-		, this );
-	},
-
-	attr: function( name, value, type ) {
-		var options = name;
-
-		// Look for the case where we're accessing a style value
-		if ( typeof name === "string" )
-			if ( value === undefined )
-				return this[0] && jQuery[ type || "attr" ]( this[0], name );
-
-			else {
-				options = {};
-				options[ name ] = value;
-			}
-
-		// Check to see if we're setting style values
-		return this.each(function(i){
-			// Set all the styles
-			for ( name in options )
-				jQuery.attr(
-					type ?
-						this.style :
-						this,
-					name, jQuery.prop( this, options[ name ], type, i, name )
-				);
-		});
-	},
-
-	css: function( key, value ) {
-		// ignore negative width and height values
-		if ( (key == 'width' || key == 'height') && parseFloat(value) < 0 )
-			value = undefined;
-		return this.attr( key, value, "curCSS" );
-	},
-
-	text: function( text ) {
-		if ( typeof text !== "object" && text != null )
-			return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
-
-		var ret = "";
-
-		jQuery.each( text || this, function(){
-			jQuery.each( this.childNodes, function(){
-				if ( this.nodeType != 8 )
-					ret += this.nodeType != 1 ?
-						this.nodeValue :
-						jQuery.fn.text( [ this ] );
-			});
-		});
-
-		return ret;
-	},
-
-	wrapAll: function( html ) {
-		if ( this[0] ) {
-			// The elements to wrap the target around
-			var wrap = jQuery( html, this[0].ownerDocument ).clone();
-
-			if ( this[0].parentNode )
-				wrap.insertBefore( this[0] );
-
-			wrap.map(function(){
-				var elem = this;
-
-				while ( elem.firstChild )
-					elem = elem.firstChild;
-
-				return elem;
-			}).append(this);
-		}
-
-		return this;
-	},
-
-	wrapInner: function( html ) {
-		return this.each(function(){
-			jQuery( this ).contents().wrapAll( html );
-		});
-	},
-
-	wrap: function( html ) {
-		return this.each(function(){
-			jQuery( this ).wrapAll( html );
-		});
-	},
-
-	append: function() {
-		return this.domManip(arguments, true, function(elem){
-			if (this.nodeType == 1)
-				this.appendChild( elem );
-		});
-	},
-
-	prepend: function() {
-		return this.domManip(arguments, true, function(elem){
-			if (this.nodeType == 1)
-				this.insertBefore( elem, this.firstChild );
-		});
-	},
-
-	before: function() {
-		return this.domManip(arguments, false, function(elem){
-			this.parentNode.insertBefore( elem, this );
-		});
-	},
-
-	after: function() {
-		return this.domManip(arguments, false, function(elem){
-			this.parentNode.insertBefore( elem, this.nextSibling );
-		});
-	},
-
-	end: function() {
-		return this.prevObject || jQuery( [] );
-	},
-
-	// For internal use only.
-	// Behaves like an Array's method, not like a jQuery method.
-	push: [].push,
-	sort: [].sort,
-	splice: [].splice,
-
-	find: function( selector ) {
-		if ( this.length === 1 ) {
-			var ret = this.pushStack( [], "find", selector );
-			ret.length = 0;
-			jQuery.find( selector, this[0], ret );
-			return ret;
-		} else {
-			return this.pushStack( jQuery.unique(jQuery.map(this, function(elem){
-				return jQuery.find( selector, elem );
-			})), "find", selector );
-		}
-	},
-
-	clone: function( events ) {
-		// Do the clone
-		var ret = this.map(function(){
-			if ( !jQuery.support.noCloneEvent && !jQuery.isXMLDoc(this) ) {
-				// IE copies events bound via attachEvent when
-				// using cloneNode. Calling detachEvent on the
-				// clone will also remove the events from the orignal
-				// In order to get around this, we use innerHTML.
-				// Unfortunately, this means some modifications to
-				// attributes in IE that are actually only stored
-				// as properties will not be copied (such as the
-				// the name attribute on an input).
-				var html = this.outerHTML;
-				if ( !html ) {
-					var div = this.ownerDocument.createElement("div");
-					div.appendChild( this.cloneNode(true) );
-					html = div.innerHTML;
-				}
-
-				return jQuery.clean([html.replace(/ jQuery\d+="(?:\d+|null)"/g, "").replace(/^\s*/, "")])[0];
-			} else
-				return this.cloneNode(true);
-		});
-
-		// Copy the events from the original to the clone
-		if ( events === true ) {
-			var orig = this.find("*").andSelf(), i = 0;
-
-			ret.find("*").andSelf().each(function(){
-				if ( this.nodeName !== orig[i].nodeName )
-					return;
-
-				var events = jQuery.data( orig[i], "events" );
-
-				for ( var type in events ) {
-					for ( var handler in events[ type ] ) {
-						jQuery.event.add( this, type, events[ type ][ handler ], events[ type ][ handler ].data );
-					}
-				}
-
-				i++;
-			});
-		}
-
-		// Return the cloned set
-		return ret;
-	},
-
-	filter: function( selector ) {
-		return this.pushStack(
-			jQuery.isFunction( selector ) &&
-			jQuery.grep(this, function(elem, i){
-				return selector.call( elem, i );
-			}) ||
-
-			jQuery.multiFilter( selector, jQuery.grep(this, function(elem){
-				return elem.nodeType === 1;
-			}) ), "filter", selector );
-	},
-
-	closest: function( selector ) {
-		var pos = jQuery.expr.match.POS.test( selector ) ? jQuery(selector) : null,
-			closer = 0;
-
-		return this.map(function(){
-			var cur = this;
-			while ( cur && cur.ownerDocument ) {
-				if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selector) ) {
-					jQuery.data(cur, "closest", closer);
-					return cur;
-				}
-				cur = cur.parentNode;
-				closer++;
-			}
-		});
-	},
-
-	not: function( selector ) {
-		if ( typeof selector === "string" )
-			// test special case where just one selector is passed in
-			if ( isSimple.test( selector ) )
-				return this.pushStack( jQuery.multiFilter( selector, this, true ), "not", selector );
-			else
-				selector = jQuery.multiFilter( selector, this );
-
-		var isArrayLike = selector.length && selector[selector.length - 1] !== undefined && !selector.nodeType;
-		return this.filter(function() {
-			return isArrayLike ? jQuery.inArray( this, selector ) < 0 : this != selector;
-		});
-	},
-
-	add: function( selector ) {
-		return this.pushStack( jQuery.unique( jQuery.merge(
-			this.get(),
-			typeof selector === "string" ?
-				jQuery( selector ) :
-				jQuery.makeArray( selector )
-		)));
-	},
-
-	is: function( selector ) {
-		return !!selector && jQuery.multiFilter( selector, this ).length > 0;
-	},
-
-	hasClass: function( selector ) {
-		return !!selector && this.is( "." + selector );
-	},
-
-	val: function( value ) {
-		if ( value === undefined ) {			
-			var elem = this[0];
-
-			if ( elem ) {
-				if( jQuery.nodeName( elem, 'option' ) )
-					return (elem.attributes.value || {}).specified ? elem.value : elem.text;
-				
-				// We need to handle select boxes special
-				if ( jQuery.nodeName( elem, "select" ) ) {
-					var index = elem.selectedIndex,
-						values = [],
-						options = elem.options,
-						one = elem.type == "select-one";
-
-					// Nothing was selected
-					if ( index < 0 )
-						return null;
-
-					// Loop through all the selected options
-					for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
-						var option = options[ i ];
-
-						if ( option.selected ) {
-							// Get the specifc value for the option
-							value = jQuery(option).val();
-
-							// We don't need an array for one selects
-							if ( one )
-								return value;
-
-							// Multi-Selects return an array
-							values.push( value );
-						}
-					}
-
-					return values;				
-				}
-
-				// Everything else, we just grab the value
-				return (elem.value || "").replace(/\r/g, "");
-
-			}
-
-			return undefined;
-		}
-
-		if ( typeof value === "number" )
-			value += '';
-
-		return this.each(function(){
-			if ( this.nodeType != 1 )
-				return;
-
-			if ( jQuery.isArray(value) && /radio|checkbox/.test( this.type ) )
-				this.checked = (jQuery.inArray(this.value, value) >= 0 ||
-					jQuery.inArray(this.name, value) >= 0);
-
-			else if ( jQuery.nodeName( this, "select" ) ) {
-				var values = jQuery.makeArray(value);
-
-				jQuery( "option", this ).each(function(){
-					this.selected = (jQuery.inArray( this.value, values ) >= 0 ||
-						jQuery.inArray( this.text, values ) >= 0);
-				});
-
-				if ( !values.length )
-					this.selectedIndex = -1;
-
-			} else
-				this.value = value;
-		});
-	},
-
-	html: function( value ) {
-		return value === undefined ?
-			(this[0] ?
-				this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g, "") :
-				null) :
-			this.empty().append( value );
-	},
-
-	replaceWith: function( value ) {
-		return this.after( value ).remove();
-	},
-
-	eq: function( i ) {
-		return this.slice( i, +i + 1 );
-	},
-
-	slice: function() {
-		return this.pushStack( Array.prototype.slice.apply( this, arguments ),
-			"slice", Array.prototype.slice.call(arguments).join(",") );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function(elem, i){
-			return callback.call( elem, i, elem );
-		}));
-	},
-
-	andSelf: function() {
-		return this.add( this.prevObject );
-	},
-
-	domManip: function( args, table, callback ) {
-		if ( this[0] ) {
-			var fragment = (this[0].ownerDocument || this[0]).createDocumentFragment(),
-				scripts = jQuery.clean( args, (this[0].ownerDocument || this[0]), fragment ),
-				first = fragment.firstChild;
-
-			if ( first )
-				for ( var i = 0, l = this.length; i < l; i++ )
-					callback.call( root(this[i], first), this.length > 1 || i > 0 ?
-							fragment.cloneNode(true) : fragment );
-		
-			if ( scripts )
-				jQuery.each( scripts, evalScript );
-		}
-
-		return this;
-		
-		function root( elem, cur ) {
-			return table && jQuery.nodeName(elem, "table") && jQuery.nodeName(cur, "tr") ?
-				(elem.getElementsByTagName("tbody")[0] ||
-				elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
-				elem;
-		}
-	}
-};
-
-// Give the init function the jQuery prototype for later instantiation
-jQuery.fn.init.prototype = jQuery.fn;
-
-function evalScript( i, elem ) {
-	if ( elem.src )
-		jQuery.ajax({
-			url: elem.src,
-			async: false,
-			dataType: "script"
-		});
-
-	else
-		jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
-
-	if ( elem.parentNode )
-		elem.parentNode.removeChild( elem );
-}
-
-function now(){
-	return +new Date;
-}
-
-jQuery.extend = jQuery.fn.extend = function() {
-	// copy reference to target object
-	var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options;
-
-	// Handle a deep copy situation
-	if ( typeof target === "boolean" ) {
-		deep = target;
-		target = arguments[1] || {};
-		// skip the boolean and the target
-		i = 2;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction(target) )
-		target = {};
-
-	// extend jQuery itself if only one argument is passed
-	if ( length == i ) {
-		target = this;
-		--i;
-	}
-
-	for ( ; i < length; i++ )
-		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null )
-			// Extend the base object
-			for ( var name in options ) {
-				var src = target[ name ], copy = options[ name ];
-
-				// Prevent never-ending loop
-				if ( target === copy )
-					continue;
-
-				// Recurse if we're merging object values
-				if ( deep && copy && typeof copy === "object" && !copy.nodeType )
-					target[ name ] = jQuery.extend( deep, 
-						// Never move original objects, clone them
-						src || ( copy.length != null ? [ ] : { } )
-					, copy );
-
-				// Don't bring in undefined values
-				else if ( copy !== undefined )
-					target[ name ] = copy;
-
-			}
-
-	// Return the modified object
-	return target;
-};
-
-// exclude the following css properties to add px
-var	exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
-	// cache defaultView
-	defaultView = document.defaultView || {},
-	toString = Object.prototype.toString;
-
-jQuery.extend({
-	noConflict: function( deep ) {
-		window.$ = _$;
-
-		if ( deep )
-			window.jQuery = _jQuery;
-
-		return jQuery;
-	},
-
-	// See test/unit/core.js for details concerning isFunction.
-	// Since version 1.3, DOM methods and functions like alert
-	// aren't supported. They return false on IE (#2968).
-	isFunction: function( obj ) {
-		return toString.call(obj) === "[object Function]";
-	},
-
-	isArray: function( obj ) {
-		return toString.call(obj) === "[object Array]";
-	},
-
-	// check if an element is in a (or is an) XML document
-	isXMLDoc: function( elem ) {
-		return elem.nodeType === 9 && elem.documentElement.nodeName !== "HTML" ||
-			!!elem.ownerDocument && jQuery.isXMLDoc( elem.ownerDocument );
-	},
-
-	// Evalulates a script in a global context
-	globalEval: function( data ) {
-		if ( data && /\S/.test(data) ) {
-			// Inspired by code by Andrea Giammarchi
-			// http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html
-			var head = document.getElementsByTagName("head")[0] || document.documentElement,
-				script = document.createElement("script");
-
-			script.type = "text/javascript";
-			if ( jQuery.support.scriptEval )
-				script.appendChild( document.createTextNode( data ) );
-			else
-				script.text = data;
-
-			// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
-			// This arises when a base node is used (#2709).
-			head.insertBefore( script, head.firstChild );
-			head.removeChild( script );
-		}
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
-	},
-
-	// args is for internal usage only
-	each: function( object, callback, args ) {
-		var name, i = 0, length = object.length;
-
-		if ( args ) {
-			if ( length === undefined ) {
-				for ( name in object )
-					if ( callback.apply( object[ name ], args ) === false )
-						break;
-			} else
-				for ( ; i < length; )
-					if ( callback.apply( object[ i++ ], args ) === false )
-						break;
-
-		// A special, fast, case for the most common use of each
-		} else {
-			if ( length === undefined ) {
-				for ( name in object )
-					if ( callback.call( object[ name ], name, object[ name ] ) === false )
-						break;
-			} else
-				for ( var value = object[0];
-					i < length && callback.call( value, i, value ) !== false; value = object[++i] ){}
-		}
-
-		return object;
-	},
-
-	prop: function( elem, value, type, i, name ) {
-		// Handle executable functions
-		if ( jQuery.isFunction( value ) )
-			value = value.call( elem, i );
-
-		// Handle passing in a number to a CSS property
-		return typeof value === "number" && type == "curCSS" && !exclude.test( name ) ?
-			value + "px" :
-			value;
-	},
-
-	className: {
-		// internal only, use addClass("class")
-		add: function( elem, classNames ) {
-			jQuery.each((classNames || "").split(/\s+/), function(i, className){
-				if ( elem.nodeType == 1 && !jQuery.className.has( elem.className, className ) )
-					elem.className += (elem.className ? " " : "") + className;
-			});
-		},
-
-		// internal only, use removeClass("class")
-		remove: function( elem, classNames ) {
-			if (elem.nodeType == 1)
-				elem.className = classNames !== undefined ?
-					jQuery.grep(elem.className.split(/\s+/), function(className){
-						return !jQuery.className.has( classNames, className );
-					}).join(" ") :
-					"";
-		},
-
-		// internal only, use hasClass("class")
-		has: function( elem, className ) {
-			return elem && jQuery.inArray( className, (elem.className || elem).toString().split(/\s+/) ) > -1;
-		}
-	},
-
-	// A method for quickly swapping in/out CSS properties to get correct calculations
-	swap: function( elem, options, callback ) {
-		var old = {};
-		// Remember the old values, and insert the new ones
-		for ( var name in options ) {
-			old[ name ] = elem.style[ name ];
-			elem.style[ name ] = options[ name ];
-		}
-
-		callback.call( elem );
-
-		// Revert the old values
-		for ( var name in options )
-			elem.style[ name ] = old[ name ];
-	},
-
-	css: function( elem, name, force, extra ) {
-		if ( name == "width" || name == "height" ) {
-			var val, props = { position: "absolute", visibility: "hidden", display:"block" }, which = name == "width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ];
-
-			function getWH() {
-				val = name == "width" ? elem.offsetWidth : elem.offsetHeight;
-
-				if ( extra === "border" )
-					return;
-
-				jQuery.each( which, function() {
-					if ( !extra )
-						val -= parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0;
-					if ( extra === "margin" )
-						val += parseFloat(jQuery.curCSS( elem, "margin" + this, true)) || 0;
-					else
-						val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0;
-				});
-			}
-
-			if ( elem.offsetWidth !== 0 )
-				getWH();
-			else
-				jQuery.swap( elem, props, getWH );
-
-			return Math.max(0, Math.round(val));
-		}
-
-		return jQuery.curCSS( elem, name, force );
-	},
-
-	curCSS: function( elem, name, force ) {
-		var ret, style = elem.style;
-
-		// We need to handle opacity special in IE
-		if ( name == "opacity" && !jQuery.support.opacity ) {
-			ret = jQuery.attr( style, "opacity" );
-
-			return ret == "" ?
-				"1" :
-				ret;
-		}
-
-		// Make sure we're using the right name for getting the float value
-		if ( name.match( /float/i ) )
-			name = styleFloat;
-
-		if ( !force && style && style[ name ] )
-			ret = style[ name ];
-
-		else if ( defaultView.getComputedStyle ) {
-
-			// Only "float" is needed here
-			if ( name.match( /float/i ) )
-				name = "float";
-
-			name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase();
-
-			var computedStyle = defaultView.getComputedStyle( elem, null );
-
-			if ( computedStyle )
-				ret = computedStyle.getPropertyValue( name );
-
-			// We should always get a number back from opacity
-			if ( name == "opacity" && ret == "" )
-				ret = "1";
-
-		} else if ( elem.currentStyle ) {
-			var camelCase = name.replace(/\-(\w)/g, function(all, letter){
-				return letter.toUpperCase();
-			});
-
-			ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ];
-
-			// From the awesome hack by Dean Edwards
-			// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-
-			// If we're not dealing with a regular pixel number
-			// but a number that has a weird ending, we need to convert it to pixels
-			if ( !/^\d+(px)?$/i.test( ret ) && /^\d/.test( ret ) ) {
-				// Remember the original values
-				var left = style.left, rsLeft = elem.runtimeStyle.left;
-
-				// Put in the new values to get a computed value out
-				elem.runtimeStyle.left = elem.currentStyle.left;
-				style.left = ret || 0;
-				ret = style.pixelLeft + "px";
-
-				// Revert the changed values
-				style.left = left;
-				elem.runtimeStyle.left = rsLeft;
-			}
-		}
-
-		return ret;
-	},
-
-	clean: function( elems, context, fragment ) {
-		context = context || document;
-
-		// !context.createElement fails in IE with an error but returns typeof 'object'
-		if ( typeof context.createElement === "undefined" )
-			context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
-
-		// If a single string is passed in and it's a single tag
-		// just do a createElement and skip the rest
-		if ( !fragment && elems.length === 1 && typeof elems[0] === "string" ) {
-			var match = /^<(\w+)\s*\/?>$/.exec(elems[0]);
-			if ( match )
-				return [ context.createElement( match[1] ) ];
-		}
-
-		var ret = [], scripts = [], div = context.createElement("div");
-
-		jQuery.each(elems, function(i, elem){
-			if ( typeof elem === "number" )
-				elem += '';
-
-			if ( !elem )
-				return;
-
-			// Convert html string into DOM nodes
-			if ( typeof elem === "string" ) {
-				// Fix "XHTML"-style tags in all browsers
-				elem = elem.replace(/(<(\w+)[^>]*?)\/>/g, function(all, front, tag){
-					return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i) ?
-						all :
-						front + ">";
-				});
-
-				// Trim whitespace, otherwise indexOf won't work as expected
-				var tags = elem.replace(/^\s+/, "").substring(0, 10).toLowerCase();
-
-				var wrap =
-					// option or optgroup
-					!tags.indexOf("", "" ] ||
-
-					!tags.indexOf("", "" ] ||
-
-					tags.match(/^<(thead|tbody|tfoot|colg|cap)/) &&
-					[ 1, "", "
        " ] ||
-
-					!tags.indexOf("", "" ] ||
-
-				 	//  matched above
-					(!tags.indexOf("", "" ] ||
-
-					!tags.indexOf("", "" ] ||
-
-					// IE can't serialize  and 
-
- 
        
-   
        
- 
        
- 
- 
- 
- 
- */
-angular.module('ui.grid')
-
-.directive('uiGridMenu', ['$compile', '$timeout', '$window', '$document', 'gridUtil', 'uiGridConstants', 'i18nService',
-function ($compile, $timeout, $window, $document, gridUtil, uiGridConstants, i18nService) {
-  var uiGridMenu = {
-    priority: 0,
-    scope: {
-      // shown: '&',
-      menuItems: '=',
-      autoHide: '=?'
-    },
-    require: '?^uiGrid',
-    templateUrl: 'ui-grid/uiGridMenu',
-    replace: false,
-    link: function ($scope, $elm, $attrs, uiGridCtrl) {
-      var self = this;
-      var menuMid;
-      var $animate;
-
-      $scope.i18n = {
-        close: i18nService.getSafeText('columnMenu.close')
-      };
-
-    // *** Show/Hide functions ******
-      self.showMenu = $scope.showMenu = function(event, args) {
-        if ( !$scope.shown ){
-
-          /*
-           * In order to animate cleanly we remove the ng-if, wait a digest cycle, then
-           * animate the removal of the ng-hide.  We can't successfully (so far as I can tell)
-           * animate removal of the ng-if, as the menu items aren't there yet.  And we don't want
-           * to rely on ng-show only, as that leaves elements in the DOM that are needlessly evaluated
-           * on scroll events.
-           *
-           * Note when testing animation that animations don't run on the tutorials.  When debugging it looks
-           * like they do, but angular has a default $animate provider that is just a stub, and that's what's
-           * being called.  ALso don't be fooled by the fact that your browser has actually loaded the
-           * angular-translate.js, it's not using it.  You need to test animations in an external application.
-           */
-          $scope.shown = true;
-
-          $timeout( function() {
-            $scope.shownMid = true;
-            $scope.$emit('menu-shown');
-          });
-        } else if ( !$scope.shownMid ) {
-          // we're probably doing a hide then show, so we don't need to wait for ng-if
-          $scope.shownMid = true;
-          $scope.$emit('menu-shown');
-        }
-
-        var docEventType = 'click';
-        if (args && args.originalEvent && args.originalEvent.type && args.originalEvent.type === 'touchstart') {
-          docEventType = args.originalEvent.type;
-        }
-
-        // Turn off an existing document click handler
-        angular.element(document).off('click touchstart', applyHideMenu);
-
-        // Turn on the document click handler, but in a timeout so it doesn't apply to THIS click if there is one
-        $timeout(function() {
-          angular.element(document).on(docEventType, applyHideMenu);
-        });
-        //automatically set the focus to the first button element in the now open menu.
-        gridUtil.focus.bySelector($elm, 'button[type=button]', true);
-      };
-
-
-      self.hideMenu = $scope.hideMenu = function(event, args) {
-        if ( $scope.shown ){
-          /*
-           * In order to animate cleanly we animate the addition of ng-hide, then use a $timeout to
-           * set the ng-if (shown = false) after the animation runs.  In theory we can cascade off the
-           * callback on the addClass method, but it is very unreliable with unit tests for no discernable reason.
-           *
-           * The user may have clicked on the menu again whilst
-           * we're waiting, so we check that the mid isn't shown before applying the ng-if.
-           */
-          $scope.shownMid = false;
-          $timeout( function() {
-            if ( !$scope.shownMid ){
-              $scope.shown = false;
-              $scope.$emit('menu-hidden');
-            }
-          }, 200);
-        }
-
-        angular.element(document).off('click touchstart', applyHideMenu);
-      };
-
-      $scope.$on('hide-menu', function (event, args) {
-        $scope.hideMenu(event, args);
-      });
-
-      $scope.$on('show-menu', function (event, args) {
-        $scope.showMenu(event, args);
-      });
-
-
-    // *** Auto hide when click elsewhere ******
-      var applyHideMenu = function(){
-        if ($scope.shown) {
-          $scope.$apply(function () {
-            $scope.hideMenu();
-          });
-        }
-      };
-
-      if (typeof($scope.autoHide) === 'undefined' || $scope.autoHide === undefined) {
-        $scope.autoHide = true;
-      }
-
-      if ($scope.autoHide) {
-        angular.element($window).on('resize', applyHideMenu);
-      }
-
-      $scope.$on('$destroy', function () {
-        angular.element(document).off('click touchstart', applyHideMenu);
-      });
-
-
-      $scope.$on('$destroy', function() {
-        angular.element($window).off('resize', applyHideMenu);
-      });
-
-      if (uiGridCtrl) {
-       $scope.$on('$destroy', uiGridCtrl.grid.api.core.on.scrollBegin($scope, applyHideMenu ));
-      }
-
-      $scope.$on('$destroy', $scope.$on(uiGridConstants.events.ITEM_DRAGGING, applyHideMenu ));
-    },
-
-
-    controller: ['$scope', '$element', '$attrs', function ($scope, $element, $attrs) {
-      var self = this;
-    }]
-  };
-
-  return uiGridMenu;
-}])
-
-.directive('uiGridMenuItem', ['gridUtil', '$compile', 'i18nService', function (gridUtil, $compile, i18nService) {
-  var uiGridMenuItem = {
-    priority: 0,
-    scope: {
-      name: '=',
-      active: '=',
-      action: '=',
-      icon: '=',
-      shown: '=',
-      context: '=',
-      templateUrl: '=',
-      leaveOpen: '=',
-      screenReaderOnly: '='
-    },
-    require: ['?^uiGrid', '^uiGridMenu'],
-    templateUrl: 'ui-grid/uiGridMenuItem',
-    replace: false,
-    compile: function($elm, $attrs) {
-      return {
-        pre: function ($scope, $elm, $attrs, controllers) {
-          var uiGridCtrl = controllers[0],
-              uiGridMenuCtrl = controllers[1];
-
-          if ($scope.templateUrl) {
-            gridUtil.getTemplate($scope.templateUrl)
-                .then(function (contents) {
-                  var template = angular.element(contents);
-
-                  var newElm = $compile(template)($scope);
-                  $elm.replaceWith(newElm);
-                });
-          }
-        },
-        post: function ($scope, $elm, $attrs, controllers) {
-          var uiGridCtrl = controllers[0],
-              uiGridMenuCtrl = controllers[1];
-
-          // TODO(c0bra): validate that shown and active are functions if they're defined. An exception is already thrown above this though
-          // if (typeof($scope.shown) !== 'undefined' && $scope.shown && typeof($scope.shown) !== 'function') {
-          //   throw new TypeError("$scope.shown is defined but not a function");
-          // }
-          if (typeof($scope.shown) === 'undefined' || $scope.shown === null) {
-            $scope.shown = function() { return true; };
-          }
-
-          $scope.itemShown = function () {
-            var context = {};
-            if ($scope.context) {
-              context.context = $scope.context;
-            }
-
-            if (typeof(uiGridCtrl) !== 'undefined' && uiGridCtrl) {
-              context.grid = uiGridCtrl.grid;
-            }
-
-            return $scope.shown.call(context);
-          };
-
-          $scope.itemAction = function($event,title) {
-            gridUtil.logDebug('itemAction');
-            $event.stopPropagation();
-
-            if (typeof($scope.action) === 'function') {
-              var context = {};
-
-              if ($scope.context) {
-                context.context = $scope.context;
-              }
-
-              // Add the grid to the function call context if the uiGrid controller is present
-              if (typeof(uiGridCtrl) !== 'undefined' && uiGridCtrl) {
-                context.grid = uiGridCtrl.grid;
-              }
-
-              $scope.action.call(context, $event, title);
-
-              if ( !$scope.leaveOpen ){
-                $scope.$emit('hide-menu');
-              } else {
-                /*
-                 * XXX: Fix after column refactor
-                 * Ideally the focus would remain on the item.
-                 * However, since there are two menu items that have their 'show' property toggled instead. This is a quick fix.
-                 */
-                gridUtil.focus.bySelector(angular.element(gridUtil.closestElm($elm, ".ui-grid-menu-items")), 'button[type=button]', true);
-              }
-            }
-          };
-
-          $scope.i18n = i18nService.get();
-        }
-      };
-    }
-  };
-
-  return uiGridMenuItem;
-}]);
-
-})();
-
-(function(){
-  'use strict';
-  /**
-   * @ngdoc overview
-   * @name ui.grid.directive:uiGridOneBind
-   * @summary A group of directives that provide a one time bind to a dom element.
-   * @description A group of directives that provide a one time bind to a dom element.
-   * As one time bindings are not supported in Angular 1.2.* this directive provdes this capability.
-   * This is done to reduce the number of watchers on the dom.
-   * 
        
-   * 
        Short Example ({@link ui.grid.directive:uiGridOneBindSrc ui-grid-one-bind-src})
        
-   * 
        -        
        
-          
-        
        
-     
        
-   * Will become:
-   * 
        -       
        
-         
-       
        
-     
        
-     
        
-     
        Short Example ({@link ui.grid.directive:uiGridOneBindText ui-grid-one-bind-text})
        
-   * 
        -        
        
-     
        
-   * Will become:
-   * 
        -   
        Add this text
        
-     
        
-     
        
-   * Note: This behavior is slightly different for the {@link ui.grid.directive:uiGridOneBindIdGrid uiGridOneBindIdGrid}
-   * and {@link ui.grid.directive:uiGridOneBindAriaLabelledbyGrid uiGridOneBindAriaLabelledbyGrid} directives.
-   *
-   */
-  //https://github.com/joshkurz/Black-Belt-AngularJS-Directives/blob/master/directives/Optimization/oneBind.js
-  var oneBinders = angular.module('ui.grid');
-  angular.forEach([
-      /**
-       * @ngdoc directive
-       * @name ui.grid.directive:uiGridOneBindSrc
-       * @memberof ui.grid.directive:uiGridOneBind
-       * @element img
-       * @restrict A
-       * @param {String} uiGridOneBindSrc The angular string you want to bind. Does not support interpolation. Don't use {{scopeElt}} instead use scopeElt.
-       * @description One time binding for the src dom tag.
-       *
-       */
-      {tag: 'Src', method: 'attr'},
-      /**
-       * @ngdoc directive
-       * @name ui.grid.directive:uiGridOneBindText
-       * @element div
-       * @restrict A
-       * @param {String} uiGridOneBindText The angular string you want to bind. Does not support interpolation. Don't use {{scopeElt}} instead use scopeElt.
-       * @description One time binding for the text dom tag.
-       */
-      {tag: 'Text', method: 'text'},
-      /**
-       * @ngdoc directive
-       * @name ui.grid.directive:uiGridOneBindHref
-       * @element div
-       * @restrict A
-       * @param {String} uiGridOneBindHref The angular string you want to bind. Does not support interpolation. Don't use {{scopeElt}} instead use scopeElt.
-       * @description One time binding for the href dom tag. For more information see {@link ui.grid.directive:uiGridOneBind}.
-       */
-      {tag: 'Href', method: 'attr'},
-      /**
-       * @ngdoc directive
-       * @name ui.grid.directive:uiGridOneBindClass
-       * @element div
-       * @restrict A
-       * @param {String} uiGridOneBindClass The angular string you want to bind. Does not support interpolation. Don't use {{scopeElt}} instead use scopeElt.
-       * @param {Object} uiGridOneBindClass The object that you want to bind. At least one of the values in the object must be something other than null or undefined for the watcher to be removed.
-       *                                    this is to prevent the watcher from being removed before the scope is initialized.
-       * @param {Array} uiGridOneBindClass An array of classes to bind to this element.
-       * @description One time binding for the class dom tag. For more information see {@link ui.grid.directive:uiGridOneBind}.
-       */
-      {tag: 'Class', method: 'addClass'},
-      /**
-       * @ngdoc directive
-       * @name ui.grid.directive:uiGridOneBindHtml
-       * @element div
-       * @restrict A
-       * @param {String} uiGridOneBindHtml The angular string you want to bind. Does not support interpolation. Don't use {{scopeElt}} instead use scopeElt.
-       * @description One time binding for the html method on a dom element. For more information see {@link ui.grid.directive:uiGridOneBind}.
-       */
-      {tag: 'Html', method: 'html'},
-      /**
-       * @ngdoc directive
-       * @name ui.grid.directive:uiGridOneBindAlt
-       * @element div
-       * @restrict A
-       * @param {String} uiGridOneBindAlt The angular string you want to bind. Does not support interpolation. Don't use {{scopeElt}} instead use scopeElt.
-       * @description One time binding for the alt dom tag. For more information see {@link ui.grid.directive:uiGridOneBind}.
-       */
-      {tag: 'Alt', method: 'attr'},
-      /**
-       * @ngdoc directive
-       * @name ui.grid.directive:uiGridOneBindStyle
-       * @element div
-       * @restrict A
-       * @param {String} uiGridOneBindStyle The angular string you want to bind. Does not support interpolation. Don't use {{scopeElt}} instead use scopeElt.
-       * @description One time binding for the style dom tag. For more information see {@link ui.grid.directive:uiGridOneBind}.
-       */
-      {tag: 'Style', method: 'css'},
-      /**
-       * @ngdoc directive
-       * @name ui.grid.directive:uiGridOneBindValue
-       * @element div
-       * @restrict A
-       * @param {String} uiGridOneBindValue The angular string you want to bind. Does not support interpolation. Don't use {{scopeElt}} instead use scopeElt.
-       * @description One time binding for the value dom tag. For more information see {@link ui.grid.directive:uiGridOneBind}.
-       */
-      {tag: 'Value', method: 'attr'},
-      /**
-       * @ngdoc directive
-       * @name ui.grid.directive:uiGridOneBindId
-       * @element div
-       * @restrict A
-       * @param {String} uiGridOneBindId The angular string you want to bind. Does not support interpolation. Don't use {{scopeElt}} instead use scopeElt.
-       * @description One time binding for the value dom tag. For more information see {@link ui.grid.directive:uiGridOneBind}.
-       */
-      {tag: 'Id', method: 'attr'},
-      /**
-       * @ngdoc directive
-       * @name ui.grid.directive:uiGridOneBindIdGrid
-       * @element div
-       * @restrict A
-       * @param {String} uiGridOneBindIdGrid The angular string you want to bind. Does not support interpolation. Don't use {{scopeElt}} instead use scopeElt.
-       * @description One time binding for the id dom tag.
-       * 
        Important Note!
        
-       * If the id tag passed as a parameter does not contain the grid id as a substring
-       * then the directive will search the scope and the parent controller (if it is a uiGridController) for the grid.id value.
-       * If this value is found then it is appended to the begining of the id tag. If the grid is not found then the directive throws an error.
-       * This is done in order to ensure uniqueness of id tags across the grid.
-       * This is to prevent two grids in the same document having duplicate id tags.
-       */
-      {tag: 'Id', directiveName:'IdGrid', method: 'attr', appendGridId: true},
-      /**
-       * @ngdoc directive
-       * @name ui.grid.directive:uiGridOneBindTitle
-       * @element div
-       * @restrict A
-       * @param {String} uiGridOneBindTitle The angular string you want to bind. Does not support interpolation. Don't use {{scopeElt}} instead use scopeElt.
-       * @description One time binding for the title dom tag. For more information see {@link ui.grid.directive:uiGridOneBind}.
-       */
-      {tag: 'Title', method: 'attr'},
-      /**
-       * @ngdoc directive
-       * @name ui.grid.directive:uiGridOneBindAriaLabel
-       * @element div
-       * @restrict A
-       * @param {String} uiGridOneBindAriaLabel The angular string you want to bind. Does not support interpolation. Don't use {{scopeElt}} instead use scopeElt.
-       * @description One time binding for the aria-label dom tag. For more information see {@link ui.grid.directive:uiGridOneBind}.
-       *
        
-       * 
        -            
        
-         
        
-       * Will become:
-       * 
        -            
        
-         
        
-       */
-      {tag: 'Label', method: 'attr', aria:true},
-      /**
-       * @ngdoc directive
-       * @name ui.grid.directive:uiGridOneBindAriaLabelledby
-       * @element div
-       * @restrict A
-       * @param {String} uiGridOneBindAriaLabelledby The angular string you want to bind. Does not support interpolation. Don't use {{scopeElt}} instead use scopeElt.
-       * @description One time binding for the aria-labelledby dom tag. For more information see {@link ui.grid.directive:uiGridOneBind}.
-       *
        
-       * 
        -            
        
-         
        
-       * Will become:
-       * 
        -            
        
-         
        
-       */
-      {tag: 'Labelledby', method: 'attr', aria:true},
-      /**
-       * @ngdoc directive
-       * @name ui.grid.directive:uiGridOneBindAriaLabelledbyGrid
-       * @element div
-       * @restrict A
-       * @param {String} uiGridOneBindAriaLabelledbyGrid The angular string you want to bind. Does not support interpolation. Don't use {{scopeElt}} instead use scopeElt.
-       * @description One time binding for the aria-labelledby dom tag. For more information see {@link ui.grid.directive:uiGridOneBind}.
-       * Works somewhat like {@link ui.grid.directive:uiGridOneBindIdGrid} however this one supports a list of ids (seperated by a space) and will dynamically add the
-       * grid id to each one.
-       *
        
-       * 
        -            
        
-         
        
-       * Will become ([grid.id] will be replaced by the actual grid id):
-       * 
        -            
        
-         
        
-       */
-      {tag: 'Labelledby', directiveName:'LabelledbyGrid', appendGridId:true, method: 'attr', aria:true},
-      /**
-       * @ngdoc directive
-       * @name ui.grid.directive:uiGridOneBindAriaDescribedby
-       * @element ANY
-       * @restrict A
-       * @param {String} uiGridOneBindAriaDescribedby The angular string you want to bind. Does not support interpolation. Don't use {{scopeElt}} instead use scopeElt.
-       * @description One time binding for the aria-describedby dom tag. For more information see {@link ui.grid.directive:uiGridOneBind}.
-       *
        
-       * 
        -            
        
-         
        
-       * Will become:
-       * 
        -            
        
-         
        
-       */
-      {tag: 'Describedby', method: 'attr', aria:true},
-      /**
-       * @ngdoc directive
-       * @name ui.grid.directive:uiGridOneBindAriaDescribedbyGrid
-       * @element ANY
-       * @restrict A
-       * @param {String} uiGridOneBindAriaDescribedbyGrid The angular string you want to bind. Does not support interpolation. Don't use {{scopeElt}} instead use scopeElt.
-       * @description One time binding for the aria-labelledby dom tag. For more information see {@link ui.grid.directive:uiGridOneBind}.
-       * Works somewhat like {@link ui.grid.directive:uiGridOneBindIdGrid} however this one supports a list of ids (seperated by a space) and will dynamically add the
-       * grid id to each one.
-       *
        
-       * 
        -            
        
-         
        
-       * Will become ([grid.id] will be replaced by the actual grid id):
-       * 
        -            
        
-         
        
-       */
-      {tag: 'Describedby', directiveName:'DescribedbyGrid', appendGridId:true, method: 'attr', aria:true}],
-    function(v){
-
-      var baseDirectiveName = 'uiGridOneBind';
-      //If it is an aria tag then append the aria label seperately
-      //This is done because the aria tags are formatted aria-* and the directive name can't have a '-' character in it.
-      //If the diretiveName has to be overridden then it does so here. This is because the tag being modified and the directive sometimes don't match up.
-      var directiveName = (v.aria ? baseDirectiveName + 'Aria' : baseDirectiveName) + (v.directiveName ? v.directiveName : v.tag);
-      oneBinders.directive(directiveName, ['gridUtil', function(gridUtil){
-        return {
-          restrict: 'A',
-          require: ['?uiGrid','?^uiGrid'],
-          link: function(scope, iElement, iAttrs, controllers){
-            /* Appends the grid id to the beginnig of the value. */
-            var appendGridId = function(val){
-              var grid; //Get an instance of the grid if its available
-              //If its available in the scope then we don't need to try to find it elsewhere
-              if (scope.grid) {
-                grid = scope.grid;
-              }
-              //Another possible location to try to find the grid
-              else if (scope.col && scope.col.grid){
-                grid = scope.col.grid;
-              }
-              //Last ditch effort: Search through the provided controllers.
-              else if (!controllers.some( //Go through the controllers till one has the element we need
-                function(controller){
-                  if (controller && controller.grid) {
-                    grid = controller.grid;
-                    return true; //We've found the grid
-                  }
-              })){
-                //We tried our best to find it for you
-                gridUtil.logError("["+directiveName+"] A valid grid could not be found to bind id. Are you using this directive " +
-                                 "within the correct scope? Trying to generate id: [gridID]-" + val);
-                throw new Error("No valid grid could be found");
-              }
-
-              if (grid){
-                var idRegex = new RegExp(grid.id.toString());
-                //If the grid id hasn't been appended already in the template declaration
-                if (!idRegex.test(val)){
-                  val = grid.id.toString() + '-' + val;
-                }
-              }
-              return val;
-            };
-
-            // The watch returns a function to remove itself.
-            var rmWatcher = scope.$watch(iAttrs[directiveName], function(newV){
-              if (newV){
-                //If we are trying to add an id element then we also apply the grid id if it isn't already there
-                if (v.appendGridId) {
-                  var newIdString = null;
-                  //Append the id to all of the new ids.
-                  angular.forEach( newV.split(' '), function(s){
-                    newIdString = (newIdString ? (newIdString + ' ') : '') +  appendGridId(s);
-                  });
-                  newV = newIdString;
-                }
-
-                // Append this newValue to the dom element.
-                switch (v.method) {
-                  case 'attr': //The attr method takes two paraams the tag and the value
-                    if (v.aria) {
-                      //If it is an aria element then append the aria prefix
-                      iElement[v.method]('aria-' + v.tag.toLowerCase(),newV);
-                    } else {
-                      iElement[v.method](v.tag.toLowerCase(),newV);
-                    }
-                    break;
-                  case 'addClass':
-                    //Pulled from https://github.com/Pasvaz/bindonce/blob/master/bindonce.js
-                    if (angular.isObject(newV) && !angular.isArray(newV)) {
-                      var results = [];
-                      var nonNullFound = false; //We don't want to remove the binding unless the key is actually defined
-                      angular.forEach(newV, function (value, index) {
-                        if (value !== null && typeof(value) !== "undefined"){
-                          nonNullFound = true; //A non null value for a key was found so the object must have been initialized
-                          if (value) {results.push(index);}
-                        }
-                      });
-                      //A non null value for a key wasn't found so assume that the scope values haven't been fully initialized
-                      if (!nonNullFound){
-                        return; // If not initialized then the watcher should not be removed yet.
-                      }
-                      newV = results;
-                    }
-
-                    if (newV) {
-                      iElement.addClass(angular.isArray(newV) ? newV.join(' ') : newV);
-                    } else {
-                      return;
-                    }
-                    break;
-                  default:
-                    iElement[v.method](newV);
-                    break;
-                }
-
-                //Removes the watcher on itself after the bind
-                rmWatcher();
-              }
-            // True ensures that equality is determined using angular.equals instead of ===
-            }, true); //End rm watchers
-          } //End compile function
-        }; //End directive return
-      } // End directive function
-    ]); //End directive
-  }); // End angular foreach
-})();
-
-(function () {
-  'use strict';
-
-  var module = angular.module('ui.grid');
-
-  module.directive('uiGridRenderContainer', ['$timeout', '$document', 'uiGridConstants', 'gridUtil', 'ScrollEvent',
-    function($timeout, $document, uiGridConstants, gridUtil, ScrollEvent) {
-    return {
-      replace: true,
-      transclude: true,
-      templateUrl: 'ui-grid/uiGridRenderContainer',
-      require: ['^uiGrid', 'uiGridRenderContainer'],
-      scope: {
-        containerId: '=',
-        rowContainerName: '=',
-        colContainerName: '=',
-        bindScrollHorizontal: '=',
-        bindScrollVertical: '=',
-        enableVerticalScrollbar: '=',
-        enableHorizontalScrollbar: '='
-      },
-      controller: 'uiGridRenderContainer as RenderContainer',
-      compile: function () {
-        return {
-          pre: function prelink($scope, $elm, $attrs, controllers) {
-
-            var uiGridCtrl = controllers[0];
-            var containerCtrl = controllers[1];
-            var grid = $scope.grid = uiGridCtrl.grid;
-
-            // Verify that the render container for this element exists
-            if (!$scope.rowContainerName) {
-              throw "No row render container name specified";
-            }
-            if (!$scope.colContainerName) {
-              throw "No column render container name specified";
-            }
-
-            if (!grid.renderContainers[$scope.rowContainerName]) {
-              throw "Row render container '" + $scope.rowContainerName + "' is not registered.";
-            }
-            if (!grid.renderContainers[$scope.colContainerName]) {
-              throw "Column render container '" + $scope.colContainerName + "' is not registered.";
-            }
-
-            var rowContainer = $scope.rowContainer = grid.renderContainers[$scope.rowContainerName];
-            var colContainer = $scope.colContainer = grid.renderContainers[$scope.colContainerName];
-
-            containerCtrl.containerId = $scope.containerId;
-            containerCtrl.rowContainer = rowContainer;
-            containerCtrl.colContainer = colContainer;
-          },
-          post: function postlink($scope, $elm, $attrs, controllers) {
-
-            var uiGridCtrl = controllers[0];
-            var containerCtrl = controllers[1];
-
-            var grid = uiGridCtrl.grid;
-            var rowContainer = containerCtrl.rowContainer;
-            var colContainer = containerCtrl.colContainer;
-            var scrollTop = null;
-            var scrollLeft = null;
-
-
-            var renderContainer = grid.renderContainers[$scope.containerId];
-
-            // Put the container name on this element as a class
-            $elm.addClass('ui-grid-render-container-' + $scope.containerId);
-
-            // Scroll the render container viewport when the mousewheel is used
-            gridUtil.on.mousewheel($elm, function (event) {
-              var scrollEvent = new ScrollEvent(grid, rowContainer, colContainer, ScrollEvent.Sources.RenderContainerMouseWheel);
-              if (event.deltaY !== 0) {
-                var scrollYAmount = event.deltaY * -1 * event.deltaFactor;
-
-                scrollTop = containerCtrl.viewport[0].scrollTop;
-
-                // Get the scroll percentage
-                scrollEvent.verticalScrollLength = rowContainer.getVerticalScrollLength();
-                var scrollYPercentage = (scrollTop + scrollYAmount) / scrollEvent.verticalScrollLength;
-
-                // If we should be scrolled 100%, make sure the scrollTop matches the maximum scroll length
-                //   Viewports that have "overflow: hidden" don't let the mousewheel scroll all the way to the bottom without this check
-                if (scrollYPercentage >= 1 && scrollTop < scrollEvent.verticalScrollLength) {
-                  containerCtrl.viewport[0].scrollTop = scrollEvent.verticalScrollLength;
-                }
-
-                // Keep scrollPercentage within the range 0-1.
-                if (scrollYPercentage < 0) { scrollYPercentage = 0; }
-                else if (scrollYPercentage > 1) { scrollYPercentage = 1; }
-
-                scrollEvent.y = { percentage: scrollYPercentage, pixels: scrollYAmount };
-              }
-              if (event.deltaX !== 0) {
-                var scrollXAmount = event.deltaX * event.deltaFactor;
-
-                // Get the scroll percentage
-                scrollLeft = gridUtil.normalizeScrollLeft(containerCtrl.viewport, grid);
-                scrollEvent.horizontalScrollLength = (colContainer.getCanvasWidth() - colContainer.getViewportWidth());
-                var scrollXPercentage = (scrollLeft + scrollXAmount) / scrollEvent.horizontalScrollLength;
-
-                // Keep scrollPercentage within the range 0-1.
-                if (scrollXPercentage < 0) { scrollXPercentage = 0; }
-                else if (scrollXPercentage > 1) { scrollXPercentage = 1; }
-
-                scrollEvent.x = { percentage: scrollXPercentage, pixels: scrollXAmount };
-              }
-
-              // Let the parent container scroll if the grid is already at the top/bottom
-              if ((event.deltaY !== 0 && (scrollEvent.atTop(scrollTop) || scrollEvent.atBottom(scrollTop))) ||
-                  (event.deltaX !== 0 && (scrollEvent.atLeft(scrollLeft) || scrollEvent.atRight(scrollLeft)))) {
-                //parent controller scrolls
-              }
-              else {
-                event.preventDefault();
-                event.stopPropagation();
-                scrollEvent.fireThrottledScrollingEvent('', scrollEvent);
-              }
-
-            });
-
-            $elm.bind('$destroy', function() {
-              $elm.unbind('keydown');
-
-              ['touchstart', 'touchmove', 'touchend','keydown', 'wheel', 'mousewheel', 'DomMouseScroll', 'MozMousePixelScroll'].forEach(function (eventName) {
-                $elm.unbind(eventName);
-              });
-            });
-
-            // TODO(c0bra): Handle resizing the inner canvas based on the number of elements
-            function update() {
-              var ret = '';
-
-              var canvasWidth = colContainer.canvasWidth;
-              var viewportWidth = colContainer.getViewportWidth();
-
-              var canvasHeight = rowContainer.getCanvasHeight();
-
-              //add additional height for scrollbar on left and right container
-              //if ($scope.containerId !== 'body') {
-              //  canvasHeight -= grid.scrollbarHeight;
-              //}
-
-              var viewportHeight = rowContainer.getViewportHeight();
-              //shorten the height to make room for a scrollbar placeholder
-              if (colContainer.needsHScrollbarPlaceholder()) {
-                viewportHeight -= grid.scrollbarHeight;
-              }
-
-              var headerViewportWidth,
-                  footerViewportWidth;
-              headerViewportWidth = footerViewportWidth = colContainer.getHeaderViewportWidth();
-
-              // Set canvas dimensions
-              ret += '\n .grid' + uiGridCtrl.grid.id + ' .ui-grid-render-container-' + $scope.containerId + ' .ui-grid-canvas { width: ' + canvasWidth + 'px; height: ' + canvasHeight + 'px; }';
-
-              ret += '\n .grid' + uiGridCtrl.grid.id + ' .ui-grid-render-container-' + $scope.containerId + ' .ui-grid-header-canvas { width: ' + (canvasWidth + grid.scrollbarWidth) + 'px; }';
-
-              if (renderContainer.explicitHeaderCanvasHeight) {
-                ret += '\n .grid' + uiGridCtrl.grid.id + ' .ui-grid-render-container-' + $scope.containerId + ' .ui-grid-header-canvas { height: ' + renderContainer.explicitHeaderCanvasHeight + 'px; }';
-              }
-              else {
-                ret += '\n .grid' + uiGridCtrl.grid.id + ' .ui-grid-render-container-' + $scope.containerId + ' .ui-grid-header-canvas { height: inherit; }';
-              }
-
-              ret += '\n .grid' + uiGridCtrl.grid.id + ' .ui-grid-render-container-' + $scope.containerId + ' .ui-grid-viewport { width: ' + viewportWidth + 'px; height: ' + viewportHeight + 'px; }';
-              ret += '\n .grid' + uiGridCtrl.grid.id + ' .ui-grid-render-container-' + $scope.containerId + ' .ui-grid-header-viewport { width: ' + headerViewportWidth + 'px; }';
-
-              ret += '\n .grid' + uiGridCtrl.grid.id + ' .ui-grid-render-container-' + $scope.containerId + ' .ui-grid-footer-canvas { width: ' + (canvasWidth + grid.scrollbarWidth) + 'px; }';
-              ret += '\n .grid' + uiGridCtrl.grid.id + ' .ui-grid-render-container-' + $scope.containerId + ' .ui-grid-footer-viewport { width: ' + footerViewportWidth + 'px; }';
-
-              return ret;
-            }
-
-            uiGridCtrl.grid.registerStyleComputation({
-              priority: 6,
-              func: update
-            });
-          }
-        };
-      }
-    };
-
-  }]);
-
-  module.controller('uiGridRenderContainer', ['$scope', 'gridUtil', function ($scope, gridUtil) {
-
-  }]);
-
-})();
-
-(function(){
-  'use strict';
-
-  angular.module('ui.grid').directive('uiGridRow', ['gridUtil', function(gridUtil) {
-    return {
-      replace: true,
-      // priority: 2001,
-      // templateUrl: 'ui-grid/ui-grid-row',
-      require: ['^uiGrid', '^uiGridRenderContainer'],
-      scope: {
-         row: '=uiGridRow',
-         //rowRenderIndex is added to scope to give the true visual index of the row to any directives that need it
-         rowRenderIndex: '='
-      },
-      compile: function() {
-        return {
-          pre: function($scope, $elm, $attrs, controllers) {
-            var uiGridCtrl = controllers[0];
-            var containerCtrl = controllers[1];
-
-            var grid = uiGridCtrl.grid;
-
-            $scope.grid = uiGridCtrl.grid;
-            $scope.colContainer = containerCtrl.colContainer;
-
-            // Function for attaching the template to this scope
-            var clonedElement, cloneScope;
-            function compileTemplate() {
-              $scope.row.getRowTemplateFn.then(function (compiledElementFn) {
-                // var compiledElementFn = $scope.row.compiledElementFn;
-
-                // Create a new scope for the contents of this row, so we can destroy it later if need be
-                var newScope = $scope.$new();
-
-                compiledElementFn(newScope, function (newElm, scope) {
-                  // If we already have a cloned element, we need to remove it and destroy its scope
-                  if (clonedElement) {
-                    clonedElement.remove();
-                    cloneScope.$destroy();
-                  }
-
-                  // Empty the row and append the new element
-                  $elm.empty().append(newElm);
-
-                  // Save the new cloned element and scope
-                  clonedElement = newElm;
-                  cloneScope = newScope;
-                });
-              });
-            }
-
-            // Initially attach the compiled template to this scope
-            compileTemplate();
-
-            // If the row's compiled element function changes, we need to replace this element's contents with the new compiled template
-            $scope.$watch('row.getRowTemplateFn', function (newFunc, oldFunc) {
-              if (newFunc !== oldFunc) {
-                compileTemplate();
-              }
-            });
-          },
-          post: function($scope, $elm, $attrs, controllers) {
-
-          }
-        };
-      }
-    };
-  }]);
-
-})();
-(function(){
-// 'use strict';
-
-  /**
-   * @ngdoc directive
-   * @name ui.grid.directive:uiGridStyle
-   * @element style
-   * @restrict A
-   *
-   * @description
-   * Allows us to interpolate expressions in `
-   I am in a box.
-   
        
-   
-   
-      it('should apply the right class to the element', function () {
-        element(by.css('.blah')).getCssValue('border-top-width')
-          .then(function(c) {
-            expect(c).toContain('1px');
-          });
-      });
-   
-   
-   */
-
-
-  angular.module('ui.grid').directive('uiGridStyle', ['gridUtil', '$interpolate', function(gridUtil, $interpolate) {
-    return {
-      // restrict: 'A',
-      // priority: 1000,
-      // require: '?^uiGrid',
-      link: function($scope, $elm, $attrs, uiGridCtrl) {
-        // gridUtil.logDebug('ui-grid-style link');
-        // if (uiGridCtrl === undefined) {
-        //    gridUtil.logWarn('[ui-grid-style link] uiGridCtrl is undefined!');
-        // }
-
-        var interpolateFn = $interpolate($elm.text(), true);
-
-        if (interpolateFn) {
-          $scope.$watch(interpolateFn, function(value) {
-            $elm.text(value);
-          });
-        }
-
-          // uiGridCtrl.recalcRowStyles = function() {
-          //   var offset = (scope.options.offsetTop || 0) - (scope.options.excessRows * scope.options.rowHeight);
-          //   var rowHeight = scope.options.rowHeight;
-
-          //   var ret = '';
-          //   var rowStyleCount = uiGridCtrl.minRowsToRender() + (scope.options.excessRows * 2);
-          //   for (var i = 1; i <= rowStyleCount; i++) {
-          //     ret = ret + ' .grid' + scope.gridId + ' .ui-grid-row:nth-child(' + i + ') { top: ' + offset + 'px; }';
-          //     offset = offset + rowHeight;
-          //   }
-
-          //   scope.rowStyles = ret;
-          // };
-
-          // uiGridCtrl.styleComputions.push(uiGridCtrl.recalcRowStyles);
-
-      }
-    };
-  }]);
-
-})();
-
-(function(){
-  'use strict';
-
-  angular.module('ui.grid').directive('uiGridViewport', ['gridUtil','ScrollEvent','uiGridConstants', '$log',
-    function(gridUtil, ScrollEvent, uiGridConstants, $log) {
-      return {
-        replace: true,
-        scope: {},
-        controllerAs: 'Viewport',
-        templateUrl: 'ui-grid/uiGridViewport',
-        require: ['^uiGrid', '^uiGridRenderContainer'],
-        link: function($scope, $elm, $attrs, controllers) {
-          // gridUtil.logDebug('viewport post-link');
-
-          var uiGridCtrl = controllers[0];
-          var containerCtrl = controllers[1];
-
-          $scope.containerCtrl = containerCtrl;
-
-          var rowContainer = containerCtrl.rowContainer;
-          var colContainer = containerCtrl.colContainer;
-
-          var grid = uiGridCtrl.grid;
-
-          $scope.grid = uiGridCtrl.grid;
-
-          // Put the containers in scope so we can get rows and columns from them
-          $scope.rowContainer = containerCtrl.rowContainer;
-          $scope.colContainer = containerCtrl.colContainer;
-
-          // Register this viewport with its container
-          containerCtrl.viewport = $elm;
-
-
-          $elm.on('scroll', scrollHandler);
-
-          var ignoreScroll = false;
-
-          function scrollHandler(evt) {
-            //Leaving in this commented code in case it can someday be used
-            //It does improve performance, but because the horizontal scroll is normalized,
-            //  using this code will lead to the column header getting slightly out of line with columns
-            //
-            //if (ignoreScroll && (grid.isScrollingHorizontally || grid.isScrollingHorizontally)) {
-            //  //don't ask for scrollTop if we just set it
-            //  ignoreScroll = false;
-            //  return;
-            //}
-            //ignoreScroll = true;
-
-            var newScrollTop = $elm[0].scrollTop;
-            var newScrollLeft = gridUtil.normalizeScrollLeft($elm, grid);
-
-            var vertScrollPercentage = rowContainer.scrollVertical(newScrollTop);
-            var horizScrollPercentage = colContainer.scrollHorizontal(newScrollLeft);
-
-            var scrollEvent = new ScrollEvent(grid, rowContainer, colContainer, ScrollEvent.Sources.ViewPortScroll);
-            scrollEvent.newScrollLeft = newScrollLeft;
-            scrollEvent.newScrollTop = newScrollTop;
-            if ( horizScrollPercentage > -1 ){
-              scrollEvent.x = { percentage: horizScrollPercentage };
-            }
-
-            if ( vertScrollPercentage > -1 ){
-              scrollEvent.y = { percentage: vertScrollPercentage };
-            }
-
-            grid.scrollContainers($scope.$parent.containerId, scrollEvent);
-          }
-
-          if ($scope.$parent.bindScrollVertical) {
-            grid.addVerticalScrollSync($scope.$parent.containerId, syncVerticalScroll);
-          }
-
-          if ($scope.$parent.bindScrollHorizontal) {
-            grid.addHorizontalScrollSync($scope.$parent.containerId, syncHorizontalScroll);
-            grid.addHorizontalScrollSync($scope.$parent.containerId + 'header', syncHorizontalHeader);
-            grid.addHorizontalScrollSync($scope.$parent.containerId + 'footer', syncHorizontalFooter);
-          }
-
-          function syncVerticalScroll(scrollEvent){
-            containerCtrl.prevScrollArgs = scrollEvent;
-            var newScrollTop = scrollEvent.getNewScrollTop(rowContainer,containerCtrl.viewport);
-            $elm[0].scrollTop = newScrollTop;
-
-          }
-
-          function syncHorizontalScroll(scrollEvent){
-            containerCtrl.prevScrollArgs = scrollEvent;
-            var newScrollLeft = scrollEvent.getNewScrollLeft(colContainer, containerCtrl.viewport);
-            $elm[0].scrollLeft =  gridUtil.denormalizeScrollLeft(containerCtrl.viewport,newScrollLeft, grid);
-          }
-
-          function syncHorizontalHeader(scrollEvent){
-            var newScrollLeft = scrollEvent.getNewScrollLeft(colContainer, containerCtrl.viewport);
-            if (containerCtrl.headerViewport) {
-              containerCtrl.headerViewport.scrollLeft = gridUtil.denormalizeScrollLeft(containerCtrl.viewport,newScrollLeft, grid);
-            }
-          }
-
-          function syncHorizontalFooter(scrollEvent){
-            var newScrollLeft = scrollEvent.getNewScrollLeft(colContainer, containerCtrl.viewport);
-            if (containerCtrl.footerViewport) {
-              containerCtrl.footerViewport.scrollLeft =  gridUtil.denormalizeScrollLeft(containerCtrl.viewport,newScrollLeft, grid);
-            }
-          }
-
-
-        },
-        controller: ['$scope', function ($scope) {
-          this.rowStyle = function (index) {
-            var rowContainer = $scope.rowContainer;
-            var colContainer = $scope.colContainer;
-
-            var styles = {};
-
-            if (index === 0 && rowContainer.currentTopRow !== 0) {
-              // The row offset-top is just the height of the rows above the current top-most row, which are no longer rendered
-              var hiddenRowWidth = (rowContainer.currentTopRow) * rowContainer.grid.options.rowHeight;
-
-              // return { 'margin-top': hiddenRowWidth + 'px' };
-              styles['margin-top'] = hiddenRowWidth + 'px';
-            }
-
-            if (colContainer.currentFirstColumn !== 0) {
-              if (colContainer.grid.isRTL()) {
-                styles['margin-right'] = colContainer.columnOffset + 'px';
-              }
-              else {
-                styles['margin-left'] = colContainer.columnOffset + 'px';
-              }
-            }
-
-            return styles;
-          };
-        }]
-      };
-    }
-  ]);
-
-})();
-
-(function() {
-
-angular.module('ui.grid')
-.directive('uiGridVisible', function uiGridVisibleAction() {
-  return function ($scope, $elm, $attr) {
-    $scope.$watch($attr.uiGridVisible, function (visible) {
-        // $elm.css('visibility', visible ? 'visible' : 'hidden');
-        $elm[visible ? 'removeClass' : 'addClass']('ui-grid-invisible');
-    });
-  };
-});
-
-})();
-(function () {
-  'use strict';
-
-  angular.module('ui.grid').controller('uiGridController', ['$scope', '$element', '$attrs', 'gridUtil', '$q', 'uiGridConstants',
-                    '$templateCache', 'gridClassFactory', '$timeout', '$parse', '$compile',
-    function ($scope, $elm, $attrs, gridUtil, $q, uiGridConstants,
-              $templateCache, gridClassFactory, $timeout, $parse, $compile) {
-      // gridUtil.logDebug('ui-grid controller');
-
-      var self = this;
-
-      self.grid = gridClassFactory.createGrid($scope.uiGrid);
-
-      //assign $scope.$parent if appScope not already assigned
-      self.grid.appScope = self.grid.appScope || $scope.$parent;
-
-      $elm.addClass('grid' + self.grid.id);
-      self.grid.rtl = gridUtil.getStyles($elm[0])['direction'] === 'rtl';
-
-
-      // angular.extend(self.grid.options, );
-
-      //all properties of grid are available on scope
-      $scope.grid = self.grid;
-
-      if ($attrs.uiGridColumns) {
-        $attrs.$observe('uiGridColumns', function(value) {
-          self.grid.options.columnDefs = value;
-          self.grid.buildColumns()
-            .then(function(){
-              self.grid.preCompileCellTemplates();
-
-              self.grid.refreshCanvas(true);
-            });
-        });
-      }
-
-
-      // if fastWatch is set we watch only the length and the reference, not every individual object
-      var deregFunctions = [];
-      if (self.grid.options.fastWatch) {
-        self.uiGrid = $scope.uiGrid;
-        if (angular.isString($scope.uiGrid.data)) {
-          deregFunctions.push( $scope.$parent.$watch($scope.uiGrid.data, dataWatchFunction) );
-          deregFunctions.push( $scope.$parent.$watch(function() {
-            if ( self.grid.appScope[$scope.uiGrid.data] ){
-              return self.grid.appScope[$scope.uiGrid.data].length; 
-            } else {
-              return undefined;
-            } 
-          }, dataWatchFunction) );
-        } else {
-          deregFunctions.push( $scope.$parent.$watch(function() { return $scope.uiGrid.data; }, dataWatchFunction) );
-          deregFunctions.push( $scope.$parent.$watch(function() { return $scope.uiGrid.data.length; }, dataWatchFunction) );
-        }
-        deregFunctions.push( $scope.$parent.$watch(function() { return $scope.uiGrid.columnDefs; }, columnDefsWatchFunction) );
-        deregFunctions.push( $scope.$parent.$watch(function() { return $scope.uiGrid.columnDefs.length; }, columnDefsWatchFunction) );
-      } else {
-        if (angular.isString($scope.uiGrid.data)) {
-          deregFunctions.push( $scope.$parent.$watchCollection($scope.uiGrid.data, dataWatchFunction) );
-        } else {
-          deregFunctions.push( $scope.$parent.$watchCollection(function() { return $scope.uiGrid.data; }, dataWatchFunction) );
-        }
-        deregFunctions.push( $scope.$parent.$watchCollection(function() { return $scope.uiGrid.columnDefs; }, columnDefsWatchFunction) );
-      }
-      
-
-      function columnDefsWatchFunction(n, o) {
-        if (n && n !== o) {
-          self.grid.options.columnDefs = n;
-          self.grid.buildColumns({ orderByColumnDefs: true })
-            .then(function(){
-
-              self.grid.preCompileCellTemplates();
-
-              self.grid.callDataChangeCallbacks(uiGridConstants.dataChange.COLUMN);
-            });
-        }
-      }
-
-      function dataWatchFunction(newData) {
-        // gridUtil.logDebug('dataWatch fired');
-        var promises = [];
-        
-        if ( self.grid.options.fastWatch ){
-          if (angular.isString($scope.uiGrid.data)) {
-            newData = self.grid.appScope[$scope.uiGrid.data];
-          } else {
-            newData = $scope.uiGrid.data;
-          }
-        }
-        
-        if (newData) {
-          // columns length is greater than the number of row header columns, which don't count because they're created automatically
-          var hasColumns = self.grid.columns.length > (self.grid.rowHeaderColumns ? self.grid.rowHeaderColumns.length : 0);
-
-          if (
-            // If we have no columns
-            !hasColumns &&
-            // ... and we don't have a ui-grid-columns attribute, which would define columns for us
-            !$attrs.uiGridColumns &&
-            // ... and we have no pre-defined columns
-            self.grid.options.columnDefs.length === 0 &&
-            // ... but we DO have data
-            newData.length > 0
-          ) {
-            // ... then build the column definitions from the data that we have
-            self.grid.buildColumnDefsFromData(newData);
-          }
-
-          // If we haven't built columns before and either have some columns defined or some data defined
-          if (!hasColumns && (self.grid.options.columnDefs.length > 0 || newData.length > 0)) {
-            // Build the column set, then pre-compile the column cell templates
-            promises.push(self.grid.buildColumns()
-              .then(function() {
-                self.grid.preCompileCellTemplates();
-              }));
-          }
-
-          $q.all(promises).then(function() {
-            self.grid.modifyRows(newData)
-              .then(function () {
-                // if (self.viewport) {
-                  self.grid.redrawInPlace(true);
-                // }
-
-                $scope.$evalAsync(function() {
-                  self.grid.refreshCanvas(true);
-                  self.grid.callDataChangeCallbacks(uiGridConstants.dataChange.ROW);
-                });
-              });
-          });
-        }
-      }
-
-      var styleWatchDereg = $scope.$watch(function () { return self.grid.styleComputations; }, function() {
-        self.grid.refreshCanvas(true);
-      });
-
-      $scope.$on('$destroy', function() {
-        deregFunctions.forEach( function( deregFn ){ deregFn(); });
-        styleWatchDereg();
-      });
-
-      self.fireEvent = function(eventName, args) {
-        // Add the grid to the event arguments if it's not there
-        if (typeof(args) === 'undefined' || args === undefined) {
-          args = {};
-        }
-
-        if (typeof(args.grid) === 'undefined' || args.grid === undefined) {
-          args.grid = self.grid;
-        }
-
-        $scope.$broadcast(eventName, args);
-      };
-
-      self.innerCompile = function innerCompile(elm) {
-        $compile(elm)($scope);
-      };
-
-    }]);
-
-/**
- *  @ngdoc directive
- *  @name ui.grid.directive:uiGrid
- *  @element div
- *  @restrict EA
- *  @param {Object} uiGrid Options for the grid to use
- *
- *  @description Create a very basic grid.
- *
- *  @example
-    
-      
-        var app = angular.module('app', ['ui.grid']);
-
-        app.controller('MainCtrl', ['$scope', function ($scope) {
-          $scope.data = [
-            { name: 'Bob', title: 'CEO' },
-            { name: 'Frank', title: 'Lowly Developer' }
-          ];
-        }]);
-      
-      
-        
        
-          
        
-        
        
-              
-            
- */
-angular.module('ui.grid').directive('uiGrid', uiGridDirective);
-
-uiGridDirective.$inject = ['$compile', '$templateCache', '$timeout', '$window', 'gridUtil', 'uiGridConstants'];
-function uiGridDirective($compile, $templateCache, $timeout, $window, gridUtil, uiGridConstants) {
-  return {
-    templateUrl: 'ui-grid/ui-grid',
-    scope: {
-      uiGrid: '='
-    },
-    replace: true,
-    transclude: true,
-    controller: 'uiGridController',
-    compile: function () {
-      return {
-        post: function ($scope, $elm, $attrs, uiGridCtrl) {
-          var grid = uiGridCtrl.grid;
-          // Initialize scrollbars (TODO: move to controller??)
-          uiGridCtrl.scrollbars = [];
-          grid.element = $elm;
-
-
-          // See if the grid has a rendered width, if not, wait a bit and try again
-          var sizeCheckInterval = 100; // ms
-          var maxSizeChecks = 20; // 2 seconds total
-          var sizeChecks = 0;
-
-          // Setup (event listeners) the grid
-          setup();
-
-          // And initialize it
-          init();
-
-          // Mark rendering complete so API events can happen
-          grid.renderingComplete();
-
-          // If the grid doesn't have size currently, wait for a bit to see if it gets size
-          checkSize();
-
-          /*-- Methods --*/
-
-          function checkSize() {
-            // If the grid has no width and we haven't checked more than  times, check again in  milliseconds
-            if ($elm[0].offsetWidth <= 0 && sizeChecks < maxSizeChecks) {
-              setTimeout(checkSize, sizeCheckInterval);
-              sizeChecks++;
-            }
-            else {
-              $timeout(init);
-            }
-          }
-
-          // Setup event listeners and watchers
-          function setup() {
-            // Bind to window resize events
-            angular.element($window).on('resize', gridResize);
-
-            // Unbind from window resize events when the grid is destroyed
-            $elm.on('$destroy', function () {
-              angular.element($window).off('resize', gridResize);
-            });
-
-            // If we add a left container after render, we need to watch and react
-            $scope.$watch(function () { return grid.hasLeftContainer();}, function (newValue, oldValue) {
-              if (newValue === oldValue) {
-                return;
-              }
-              grid.refreshCanvas(true);
-            });
-
-            // If we add a right container after render, we need to watch and react
-            $scope.$watch(function () { return grid.hasRightContainer();}, function (newValue, oldValue) {
-              if (newValue === oldValue) {
-                return;
-              }
-              grid.refreshCanvas(true);
-            });
-          }
-
-          // Initialize the directive
-          function init() {
-            grid.gridWidth = $scope.gridWidth = gridUtil.elementWidth($elm);
-
-            // Default canvasWidth to the grid width, in case we don't get any column definitions to calculate it from
-            grid.canvasWidth = uiGridCtrl.grid.gridWidth;
-
-            grid.gridHeight = $scope.gridHeight = gridUtil.elementHeight($elm);
-
-            // If the grid isn't tall enough to fit a single row, it's kind of useless. Resize it to fit a minimum number of rows
-            if (grid.gridHeight < grid.options.rowHeight && grid.options.enableMinHeightCheck) {
-              autoAdjustHeight();
-            }
-
-            // Run initial canvas refresh
-            grid.refreshCanvas(true);
-          }
-
-          // Set the grid's height ourselves in the case that its height would be unusably small
-          function autoAdjustHeight() {
-            // Figure out the new height
-            var contentHeight = grid.options.minRowsToShow * grid.options.rowHeight;
-            var headerHeight = grid.options.showHeader ? grid.options.headerRowHeight : 0;
-            var footerHeight = grid.calcFooterHeight();
-            
-            var scrollbarHeight = 0;
-            if (grid.options.enableHorizontalScrollbar === uiGridConstants.scrollbars.ALWAYS) {
-              scrollbarHeight = gridUtil.getScrollbarWidth();
-            }
-
-            var maxNumberOfFilters = 0;
-            // Calculates the maximum number of filters in the columns
-            angular.forEach(grid.options.columnDefs, function(col) {
-              if (col.hasOwnProperty('filter')) {
-                if (maxNumberOfFilters < 1) {
-                    maxNumberOfFilters = 1;
-                }
-              }
-              else if (col.hasOwnProperty('filters')) {
-                if (maxNumberOfFilters < col.filters.length) {
-                    maxNumberOfFilters = col.filters.length;
-                }
-              }
-            });
-
-            if (grid.options.enableFiltering) {
-              var allColumnsHaveFilteringTurnedOff = grid.options.columnDefs.every(function(col) {
-                return col.enableFiltering === false;
-              });
-
-              if (!allColumnsHaveFilteringTurnedOff) {
-                maxNumberOfFilters++;
-              }
-            }
-
-            var filterHeight = maxNumberOfFilters * headerHeight;
-
-            var newHeight = headerHeight + contentHeight + footerHeight + scrollbarHeight + filterHeight;
-
-            $elm.css('height', newHeight + 'px');
-
-            grid.gridHeight = $scope.gridHeight = gridUtil.elementHeight($elm);
-          }
-
-          // Resize the grid on window resize events
-          function gridResize($event) {
-            grid.gridWidth = $scope.gridWidth = gridUtil.elementWidth($elm);
-            grid.gridHeight = $scope.gridHeight = gridUtil.elementHeight($elm);
-
-            grid.refreshCanvas(true);
-          }
-        }
-      };
-    }
-  };
-}
-
-})();
-
-(function(){
-  'use strict';
-
-  // TODO: rename this file to ui-grid-pinned-container.js
-
-  angular.module('ui.grid').directive('uiGridPinnedContainer', ['gridUtil', function (gridUtil) {
-    return {
-      restrict: 'EA',
-      replace: true,
-      template: '
        ',
-      scope: {
-        side: '=uiGridPinnedContainer'
-      },
-      require: '^uiGrid',
-      compile: function compile() {
-        return {
-          post: function ($scope, $elm, $attrs, uiGridCtrl) {
-            // gridUtil.logDebug('ui-grid-pinned-container ' + $scope.side + ' link');
-
-            var grid = uiGridCtrl.grid;
-
-            var myWidth = 0;
-
-            $elm.addClass('ui-grid-pinned-container-' + $scope.side);
-
-            // Monkey-patch the viewport width function
-            if ($scope.side === 'left' || $scope.side === 'right') {
-              grid.renderContainers[$scope.side].getViewportWidth = monkeyPatchedGetViewportWidth;
-            }
-
-            function monkeyPatchedGetViewportWidth() {
-              /*jshint validthis: true */
-              var self = this;
-
-              var viewportWidth = 0;
-              self.visibleColumnCache.forEach(function (column) {
-                viewportWidth += column.drawnWidth;
-              });
-
-              var adjustment = self.getViewportAdjustment();
-
-              viewportWidth = viewportWidth + adjustment.width;
-
-              return viewportWidth;
-            }
-
-            function updateContainerWidth() {
-              if ($scope.side === 'left' || $scope.side === 'right') {
-                var cols = grid.renderContainers[$scope.side].visibleColumnCache;
-                var width = 0;
-                for (var i = 0; i < cols.length; i++) {
-                  var col = cols[i];
-                  width += col.drawnWidth || col.width || 0;
-                }
-
-                return width;
-              }
-            }
-
-            function updateContainerDimensions() {
-              var ret = '';
-
-              // Column containers
-              if ($scope.side === 'left' || $scope.side === 'right') {
-                myWidth = updateContainerWidth();
-
-                // gridUtil.logDebug('myWidth', myWidth);
-
-                // TODO(c0bra): Subtract sum of col widths from grid viewport width and update it
-                $elm.attr('style', null);
-
-             //   var myHeight = grid.renderContainers.body.getViewportHeight(); // + grid.horizontalScrollbarHeight;
-
-                ret += '.grid' + grid.id + ' .ui-grid-pinned-container-' + $scope.side + ', .grid' + grid.id + ' .ui-grid-pinned-container-' + $scope.side + ' .ui-grid-render-container-' + $scope.side + ' .ui-grid-viewport { width: ' + myWidth + 'px; } ';
-              }
-
-              return ret;
-            }
-
-            grid.renderContainers.body.registerViewportAdjuster(function (adjustment) {
-              myWidth = updateContainerWidth();
-
-              // Subtract our own width
-              adjustment.width -= myWidth;
-              adjustment.side = $scope.side;
-
-              return adjustment;
-            });
-
-            // Register style computation to adjust for columns in `side`'s render container
-            grid.registerStyleComputation({
-              priority: 15,
-              func: updateContainerDimensions
-            });
-          }
-        };
-      }
-    };
-  }]);
-})();
-
-(function(){
-
-angular.module('ui.grid')
-.factory('Grid', ['$q', '$compile', '$parse', 'gridUtil', 'uiGridConstants', 'GridOptions', 'GridColumn', 'GridRow', 'GridApi', 'rowSorter', 'rowSearcher', 'GridRenderContainer', '$timeout','ScrollEvent',
-    function($q, $compile, $parse, gridUtil, uiGridConstants, GridOptions, GridColumn, GridRow, GridApi, rowSorter, rowSearcher, GridRenderContainer, $timeout, ScrollEvent) {
-
-  /**
-   * @ngdoc object
-   * @name ui.grid.core.api:PublicApi
-   * @description Public Api for the core grid features
-   *
-   */
-
-  /**
-   * @ngdoc function
-   * @name ui.grid.class:Grid
-   * @description Grid is the main viewModel.  Any properties or methods needed to maintain state are defined in
-   * this prototype.  One instance of Grid is created per Grid directive instance.
-   * @param {object} options Object map of options to pass into the grid. An 'id' property is expected.
-   */
-  var Grid = function Grid(options) {
-    var self = this;
-    // Get the id out of the options, then remove it
-    if (options !== undefined && typeof(options.id) !== 'undefined' && options.id) {
-      if (!/^[_a-zA-Z0-9-]+$/.test(options.id)) {
-        throw new Error("Grid id '" + options.id + '" is invalid. It must follow CSS selector syntax rules.');
-      }
-    }
-    else {
-      throw new Error('No ID provided. An ID must be given when creating a grid.');
-    }
-
-    self.id = options.id;
-    delete options.id;
-
-    // Get default options
-    self.options = GridOptions.initialize( options );
-
-    /**
-     * @ngdoc object
-     * @name appScope
-     * @propertyOf ui.grid.class:Grid
-     * @description reference to the application scope (the parent scope of the ui-grid element).  Assigned in ui-grid controller
-     * 
        
-     * use gridOptions.appScopeProvider to override the default assignment of $scope.$parent with any reference
-     */
-    self.appScope = self.options.appScopeProvider;
-
-    self.headerHeight = self.options.headerRowHeight;
-
-
-    /**
-     * @ngdoc object
-     * @name footerHeight
-     * @propertyOf ui.grid.class:Grid
-     * @description returns the total footer height gridFooter + columnFooter
-     */
-    self.footerHeight = self.calcFooterHeight();
-
-
-    /**
-     * @ngdoc object
-     * @name columnFooterHeight
-     * @propertyOf ui.grid.class:Grid
-     * @description returns the total column footer height
-     */
-    self.columnFooterHeight = self.calcColumnFooterHeight();
-
-    self.rtl = false;
-    self.gridHeight = 0;
-    self.gridWidth = 0;
-    self.columnBuilders = [];
-    self.rowBuilders = [];
-    self.rowsProcessors = [];
-    self.columnsProcessors = [];
-    self.styleComputations = [];
-    self.viewportAdjusters = [];
-    self.rowHeaderColumns = [];
-    self.dataChangeCallbacks = {};
-    self.verticalScrollSyncCallBackFns = {};
-    self.horizontalScrollSyncCallBackFns = {};
-
-    // self.visibleRowCache = [];
-
-    // Set of 'render' containers for self grid, which can render sets of rows
-    self.renderContainers = {};
-
-    // Create a
-    self.renderContainers.body = new GridRenderContainer('body', self);
-
-    self.cellValueGetterCache = {};
-
-    // Cached function to use with custom row templates
-    self.getRowTemplateFn = null;
-
-
-    //representation of the rows on the grid.
-    //these are wrapped references to the actual data rows (options.data)
-    self.rows = [];
-
-    //represents the columns on the grid
-    self.columns = [];
-
-    /**
-     * @ngdoc boolean
-     * @name isScrollingVertically
-     * @propertyOf ui.grid.class:Grid
-     * @description set to true when Grid is scrolling vertically. Set to false via debounced method
-     */
-    self.isScrollingVertically = false;
-
-    /**
-     * @ngdoc boolean
-     * @name isScrollingHorizontally
-     * @propertyOf ui.grid.class:Grid
-     * @description set to true when Grid is scrolling horizontally. Set to false via debounced method
-     */
-    self.isScrollingHorizontally = false;
-
-    /**
-     * @ngdoc property
-     * @name scrollDirection
-     * @propertyOf ui.grid.class:Grid
-     * @description set one of the uiGridConstants.scrollDirection values (UP, DOWN, LEFT, RIGHT, NONE), which tells
-     * us which direction we are scrolling. Set to NONE via debounced method
-     */
-    self.scrollDirection = uiGridConstants.scrollDirection.NONE;
-
-    //if true, grid will not respond to any scroll events
-    self.disableScrolling = false;
-
-
-    function vertical (scrollEvent) {
-      self.isScrollingVertically = false;
-      self.api.core.raise.scrollEnd(scrollEvent);
-      self.scrollDirection = uiGridConstants.scrollDirection.NONE;
-    }
-
-    var debouncedVertical = gridUtil.debounce(vertical, self.options.scrollDebounce);
-    var debouncedVerticalMinDelay = gridUtil.debounce(vertical, 0);
-
-    function horizontal (scrollEvent) {
-      self.isScrollingHorizontally = false;
-      self.api.core.raise.scrollEnd(scrollEvent);
-      self.scrollDirection = uiGridConstants.scrollDirection.NONE;
-    }
-
-    var debouncedHorizontal = gridUtil.debounce(horizontal, self.options.scrollDebounce);
-    var debouncedHorizontalMinDelay = gridUtil.debounce(horizontal, 0);
-
-
-    /**
-     * @ngdoc function
-     * @name flagScrollingVertically
-     * @methodOf ui.grid.class:Grid
-     * @description sets isScrollingVertically to true and sets it to false in a debounced function
-     */
-    self.flagScrollingVertically = function(scrollEvent) {
-      if (!self.isScrollingVertically && !self.isScrollingHorizontally) {
-        self.api.core.raise.scrollBegin(scrollEvent);
-      }
-      self.isScrollingVertically = true;
-      if (self.options.scrollDebounce === 0 || !scrollEvent.withDelay) {
-        debouncedVerticalMinDelay(scrollEvent);
-      }
-      else {
-        debouncedVertical(scrollEvent);
-      }
-    };
-
-    /**
-     * @ngdoc function
-     * @name flagScrollingHorizontally
-     * @methodOf ui.grid.class:Grid
-     * @description sets isScrollingHorizontally to true and sets it to false in a debounced function
-     */
-    self.flagScrollingHorizontally = function(scrollEvent) {
-      if (!self.isScrollingVertically && !self.isScrollingHorizontally) {
-        self.api.core.raise.scrollBegin(scrollEvent);
-      }
-      self.isScrollingHorizontally = true;
-      if (self.options.scrollDebounce === 0 || !scrollEvent.withDelay) {
-        debouncedHorizontalMinDelay(scrollEvent);
-      }
-      else {
-        debouncedHorizontal(scrollEvent);
-      }
-    };
-
-    self.scrollbarHeight = 0;
-    self.scrollbarWidth = 0;
-    if (self.options.enableHorizontalScrollbar === uiGridConstants.scrollbars.ALWAYS) {
-      self.scrollbarHeight = gridUtil.getScrollbarWidth();
-    }
-
-    if (self.options.enableVerticalScrollbar === uiGridConstants.scrollbars.ALWAYS) {
-      self.scrollbarWidth = gridUtil.getScrollbarWidth();
-    }
-
-
-
-    self.api = new GridApi(self);
-
-    /**
-     * @ngdoc function
-     * @name refresh
-     * @methodOf ui.grid.core.api:PublicApi
-     * @description Refresh the rendered grid on screen.
-     * The refresh method re-runs both the columnProcessors and the
-     * rowProcessors, as well as calling refreshCanvas to update all
-     * the grid sizing.  In general you should prefer to use queueGridRefresh
-     * instead, which is basically a debounced version of refresh.
-     *
-     * If you only want to resize the grid, not regenerate all the rows
-     * and columns, you should consider directly calling refreshCanvas instead.
-     *
-     */
-    self.api.registerMethod( 'core', 'refresh', this.refresh );
-
-    /**
-     * @ngdoc function
-     * @name queueGridRefresh
-     * @methodOf ui.grid.core.api:PublicApi
-     * @description Request a refresh of the rendered grid on screen, if multiple
-     * calls to queueGridRefresh are made within a digest cycle only one will execute.
-     * The refresh method re-runs both the columnProcessors and the
-     * rowProcessors, as well as calling refreshCanvas to update all
-     * the grid sizing.  In general you should prefer to use queueGridRefresh
-     * instead, which is basically a debounced version of refresh.
-     *
-     */
-    self.api.registerMethod( 'core', 'queueGridRefresh', this.queueGridRefresh );
-
-    /**
-     * @ngdoc function
-     * @name refreshRows
-     * @methodOf ui.grid.core.api:PublicApi
-     * @description Runs only the rowProcessors, columns remain as they were.
-     * It then calls redrawInPlace and refreshCanvas, which adjust the grid sizing.
-     * @returns {promise} promise that is resolved when render completes?
-     *
-     */
-    self.api.registerMethod( 'core', 'refreshRows', this.refreshRows );
-
-    /**
-     * @ngdoc function
-     * @name queueRefresh
-     * @methodOf ui.grid.core.api:PublicApi
-     * @description Requests execution of refreshCanvas, if multiple requests are made
-     * during a digest cycle only one will run.  RefreshCanvas updates the grid sizing.
-     * @returns {promise} promise that is resolved when render completes?
-     *
-     */
-    self.api.registerMethod( 'core', 'queueRefresh', this.queueRefresh );
-
-    /**
-     * @ngdoc function
-     * @name handleWindowResize
-     * @methodOf ui.grid.core.api:PublicApi
-     * @description Trigger a grid resize, normally this would be picked
-     * up by a watch on window size, but in some circumstances it is necessary
-     * to call this manually
-     * @returns {promise} promise that is resolved when render completes?
-     *
-     */
-    self.api.registerMethod( 'core', 'handleWindowResize', this.handleWindowResize );
-
-
-    /**
-     * @ngdoc function
-     * @name addRowHeaderColumn
-     * @methodOf ui.grid.core.api:PublicApi
-     * @description adds a row header column to the grid
-     * @param {object} column def
-     *
-     */
-    self.api.registerMethod( 'core', 'addRowHeaderColumn', this.addRowHeaderColumn );
-
-    /**
-     * @ngdoc function
-     * @name scrollToIfNecessary
-     * @methodOf ui.grid.core.api:PublicApi
-     * @description Scrolls the grid to make a certain row and column combo visible,
-     *   in the case that it is not completely visible on the screen already.
-     * @param {GridRow} gridRow row to make visible
-     * @param {GridCol} gridCol column to make visible
-     * @returns {promise} a promise that is resolved when scrolling is complete
-     *
-     */
-    self.api.registerMethod( 'core', 'scrollToIfNecessary', function(gridRow, gridCol) { return self.scrollToIfNecessary(gridRow, gridCol);} );
-
-    /**
-     * @ngdoc function
-     * @name scrollTo
-     * @methodOf ui.grid.core.api:PublicApi
-     * @description Scroll the grid such that the specified
-     * row and column is in view
-     * @param {object} rowEntity gridOptions.data[] array instance to make visible
-     * @param {object} colDef to make visible
-     * @returns {promise} a promise that is resolved after any scrolling is finished
-     */
-    self.api.registerMethod( 'core', 'scrollTo', function (rowEntity, colDef) { return self.scrollTo(rowEntity, colDef);}  );
-
-    /**
-     * @ngdoc function
-     * @name registerRowsProcessor
-     * @methodOf ui.grid.core.api:PublicApi
-     * @description
-     * Register a "rows processor" function. When the rows are updated,
-     * the grid calls each registered "rows processor", which has a chance
-     * to alter the set of rows (sorting, etc) as long as the count is not
-     * modified.
-     *
-     * @param {function(renderedRowsToProcess, columns )} processorFunction rows processor function, which
-     * is run in the context of the grid (i.e. this for the function will be the grid), and must
-     * return the updated rows list, which is passed to the next processor in the chain
-     * @param {number} priority the priority of this processor.  In general we try to do them in 100s to leave room
-     * for other people to inject rows processors at intermediate priorities.  Lower priority rowsProcessors run earlier.
-     *
-     * At present allRowsVisible is running at 50, sort manipulations running at 60-65, filter is running at 100,
-     * sort is at 200, grouping and treeview at 400-410, selectable rows at 500, pagination at 900 (pagination will generally want to be last)
-     */
-    self.api.registerMethod( 'core', 'registerRowsProcessor', this.registerRowsProcessor  );
-
-    /**
-     * @ngdoc function
-     * @name registerColumnsProcessor
-     * @methodOf ui.grid.core.api:PublicApi
-     * @description
-     * Register a "columns processor" function. When the columns are updated,
-     * the grid calls each registered "columns processor", which has a chance
-     * to alter the set of columns as long as the count is not
-     * modified.
-     *
-     * @param {function(renderedColumnsToProcess, rows )} processorFunction columns processor function, which
-     * is run in the context of the grid (i.e. this for the function will be the grid), and must
-     * return the updated columns list, which is passed to the next processor in the chain
-     * @param {number} priority the priority of this processor.  In general we try to do them in 100s to leave room
-     * for other people to inject columns processors at intermediate priorities.  Lower priority columnsProcessors run earlier.
-     *
-     * At present allRowsVisible is running at 50, filter is running at 100, sort is at 200, grouping at 400, selectable rows at 500, pagination at 900 (pagination will generally want to be last)
-     */
-    self.api.registerMethod( 'core', 'registerColumnsProcessor', this.registerColumnsProcessor  );
-
-
-
-    /**
-     * @ngdoc function
-     * @name sortHandleNulls
-     * @methodOf ui.grid.core.api:PublicApi
-     * @description A null handling method that can be used when building custom sort
-     * functions
-     * @example
-     * 
        -     *   mySortFn = function(a, b) {
-     *   var nulls = $scope.gridApi.core.sortHandleNulls(a, b);
-     *   if ( nulls !== null ){
-     *     return nulls;
-     *   } else {
-     *     // your code for sorting here
-     *   };
-     * 
        
-     * @param {object} a sort value a
-     * @param {object} b sort value b
-     * @returns {number} null if there were no nulls/undefineds, otherwise returns
-     * a sort value that should be passed back from the sort function
-     *
-     */
-    self.api.registerMethod( 'core', 'sortHandleNulls', rowSorter.handleNulls );
-
-
-    /**
-     * @ngdoc function
-     * @name sortChanged
-     * @methodOf  ui.grid.core.api:PublicApi
-     * @description The sort criteria on one or more columns has
-     * changed.  Provides as parameters the grid and the output of
-     * getColumnSorting, which is an array of gridColumns
-     * that have sorting on them, sorted in priority order.
-     *
-     * @param {$scope} scope The scope of the controller. This is used to deregister this event when the scope is destroyed.
-     * @param {Function} callBack Will be called when the event is emited. The function passes back an array of columns with
-     * sorts on them, in priority order.
-     *
-     * @example
-     * 
        -     *      gridApi.core.on.sortChanged( $scope, function(sortColumns){
-     *        // do something
-     *      });
-     * 
        
-     */
-    self.api.registerEvent( 'core', 'sortChanged' );
-
-      /**
-     * @ngdoc function
-     * @name columnVisibilityChanged
-     * @methodOf  ui.grid.core.api:PublicApi
-     * @description The visibility of a column has changed,
-     * the column itself is passed out as a parameter of the event.
-     * 
-     * @param {$scope} scope The scope of the controller. This is used to deregister this event when the scope is destroyed.
-     * @param {Function} callBack Will be called when the event is emited. The function passes back the GridCol that has changed.
-     *
-     * @example
-     * 
        -     *      gridApi.core.on.columnVisibilityChanged( $scope, function (column) {
-     *        // do something
-     *      } );
-     * 
        
-     */
-    self.api.registerEvent( 'core', 'columnVisibilityChanged' );
-
-    /**
-     * @ngdoc method
-     * @name notifyDataChange
-     * @methodOf ui.grid.core.api:PublicApi
-     * @description Notify the grid that a data or config change has occurred,
-     * where that change isn't something the grid was otherwise noticing.  This
-     * might be particularly relevant where you've changed values within the data
-     * and you'd like cell classes to be re-evaluated, or changed config within
-     * the columnDef and you'd like headerCellClasses to be re-evaluated.
-     * @param {string} type one of the
-     * uiGridConstants.dataChange values (ALL, ROW, EDIT, COLUMN), which tells
-     * us which refreshes to fire.
-     *
-     */
-    self.api.registerMethod( 'core', 'notifyDataChange', this.notifyDataChange );
-
-    /**
-     * @ngdoc method
-     * @name clearAllFilters
-     * @methodOf ui.grid.core.api:PublicApi
-     * @description Clears all filters and optionally refreshes the visible rows.
-     * @param {object} refreshRows Defaults to true.
-     * @param {object} clearConditions Defaults to false.
-     * @param {object} clearFlags Defaults to false.
-     * @returns {promise} If `refreshRows` is true, returns a promise of the rows refreshing.
-     */
-    self.api.registerMethod('core', 'clearAllFilters', this.clearAllFilters);
-
-    self.registerDataChangeCallback( self.columnRefreshCallback, [uiGridConstants.dataChange.COLUMN]);
-    self.registerDataChangeCallback( self.processRowsCallback, [uiGridConstants.dataChange.EDIT]);
-    self.registerDataChangeCallback( self.updateFooterHeightCallback, [uiGridConstants.dataChange.OPTIONS]);
-
-    self.registerStyleComputation({
-      priority: 10,
-      func: self.getFooterStyles
-    });
-  };
-
-   Grid.prototype.calcFooterHeight = function () {
-     if (!this.hasFooter()) {
-       return 0;
-     }
-
-     var height = 0;
-     if (this.options.showGridFooter) {
-       height += this.options.gridFooterHeight;
-     }
-
-     height += this.calcColumnFooterHeight();
-
-     return height;
-   };
-
-   Grid.prototype.calcColumnFooterHeight = function () {
-     var height = 0;
-
-     if (this.options.showColumnFooter) {
-       height += this.options.columnFooterHeight;
-     }
-
-     return height;
-   };
-
-   Grid.prototype.getFooterStyles = function () {
-     var style = '.grid' + this.id + ' .ui-grid-footer-aggregates-row { height: ' + this.options.columnFooterHeight + 'px; }';
-     style += ' .grid' + this.id + ' .ui-grid-footer-info { height: ' + this.options.gridFooterHeight + 'px; }';
-     return style;
-   };
-
-  Grid.prototype.hasFooter = function () {
-   return this.options.showGridFooter || this.options.showColumnFooter;
-  };
-
-  /**
-   * @ngdoc function
-   * @name isRTL
-   * @methodOf ui.grid.class:Grid
-   * @description Returns true if grid is RightToLeft
-   */
-  Grid.prototype.isRTL = function () {
-    return this.rtl;
-  };
-
-
-  /**
-   * @ngdoc function
-   * @name registerColumnBuilder
-   * @methodOf ui.grid.class:Grid
-   * @description When the build creates columns from column definitions, the columnbuilders will be called to add
-   * additional properties to the column.
-   * @param {function(colDef, col, gridOptions)} columnBuilder function to be called
-   */
-  Grid.prototype.registerColumnBuilder = function registerColumnBuilder(columnBuilder) {
-    this.columnBuilders.push(columnBuilder);
-  };
-
-  /**
-   * @ngdoc function
-   * @name buildColumnDefsFromData
-   * @methodOf ui.grid.class:Grid
-   * @description Populates columnDefs from the provided data
-   * @param {function(colDef, col, gridOptions)} rowBuilder function to be called
-   */
-  Grid.prototype.buildColumnDefsFromData = function (dataRows){
-    this.options.columnDefs =  gridUtil.getColumnsFromData(dataRows, this.options.excludeProperties);
-  };
-
-  /**
-   * @ngdoc function
-   * @name registerRowBuilder
-   * @methodOf ui.grid.class:Grid
-   * @description When the build creates rows from gridOptions.data, the rowBuilders will be called to add
-   * additional properties to the row.
-   * @param {function(row, gridOptions)} rowBuilder function to be called
-   */
-  Grid.prototype.registerRowBuilder = function registerRowBuilder(rowBuilder) {
-    this.rowBuilders.push(rowBuilder);
-  };
-
-
-  /**
-   * @ngdoc function
-   * @name registerDataChangeCallback
-   * @methodOf ui.grid.class:Grid
-   * @description When a data change occurs, the data change callbacks of the specified type
-   * will be called.  The rules are:
-   *
-   * - when the data watch fires, that is considered a ROW change (the data watch only notices
-   *   added or removed rows)
-   * - when the api is called to inform us of a change, the declared type of that change is used
-   * - when a cell edit completes, the EDIT callbacks are triggered
-   * - when the columnDef watch fires, the COLUMN callbacks are triggered
-   * - when the options watch fires, the OPTIONS callbacks are triggered
-   *
-   * For a given event:
-   * - ALL calls ROW, EDIT, COLUMN, OPTIONS and ALL callbacks
-   * - ROW calls ROW and ALL callbacks
-   * - EDIT calls EDIT and ALL callbacks
-   * - COLUMN calls COLUMN and ALL callbacks
-   * - OPTIONS calls OPTIONS and ALL callbacks
-   *
-   * @param {function(grid)} callback function to be called
-   * @param {array} types the types of data change you want to be informed of.  Values from
-   * the uiGridConstants.dataChange values ( ALL, EDIT, ROW, COLUMN, OPTIONS ).  Optional and defaults to
-   * ALL
-   * @returns {function} deregister function - a function that can be called to deregister this callback
-   */
-  Grid.prototype.registerDataChangeCallback = function registerDataChangeCallback(callback, types, _this) {
-    var uid = gridUtil.nextUid();
-    if ( !types ){
-      types = [uiGridConstants.dataChange.ALL];
-    }
-    if ( !Array.isArray(types)){
-      gridUtil.logError("Expected types to be an array or null in registerDataChangeCallback, value passed was: " + types );
-    }
-    this.dataChangeCallbacks[uid] = { callback: callback, types: types, _this:_this };
-
-    var self = this;
-    var deregisterFunction = function() {
-      delete self.dataChangeCallbacks[uid];
-    };
-    return deregisterFunction;
-  };
-
-  /**
-   * @ngdoc function
-   * @name callDataChangeCallbacks
-   * @methodOf ui.grid.class:Grid
-   * @description Calls the callbacks based on the type of data change that
-   * has occurred. Always calls the ALL callbacks, calls the ROW, EDIT, COLUMN and OPTIONS callbacks if the
-   * event type is matching, or if the type is ALL.
-   * @param {number} type the type of event that occurred - one of the
-   * uiGridConstants.dataChange values (ALL, ROW, EDIT, COLUMN, OPTIONS)
-   */
-  Grid.prototype.callDataChangeCallbacks = function callDataChangeCallbacks(type, options) {
-    angular.forEach( this.dataChangeCallbacks, function( callback, uid ){
-      if ( callback.types.indexOf( uiGridConstants.dataChange.ALL ) !== -1 ||
-           callback.types.indexOf( type ) !== -1 ||
-           type === uiGridConstants.dataChange.ALL ) {
-        if (callback._this) {
-           callback.callback.apply(callback._this,this);
-        }
-        else {
-          callback.callback( this );
-        }
-      }
-    }, this);
-  };
-
-  /**
-   * @ngdoc function
-   * @name notifyDataChange
-   * @methodOf ui.grid.class:Grid
-   * @description Notifies us that a data change has occurred, used in the public
-   * api for users to tell us when they've changed data or some other event that
-   * our watches cannot pick up
-   * @param {string} type the type of event that occurred - one of the
-   * uiGridConstants.dataChange values (ALL, ROW, EDIT, COLUMN)
-   */
-  Grid.prototype.notifyDataChange = function notifyDataChange(type) {
-    var constants = uiGridConstants.dataChange;
-    if ( type === constants.ALL ||
-         type === constants.COLUMN ||
-         type === constants.EDIT ||
-         type === constants.ROW ||
-         type === constants.OPTIONS ){
-      this.callDataChangeCallbacks( type );
-    } else {
-      gridUtil.logError("Notified of a data change, but the type was not recognised, so no action taken, type was: " + type);
-    }
-  };
-
-
-  /**
-   * @ngdoc function
-   * @name columnRefreshCallback
-   * @methodOf ui.grid.class:Grid
-   * @description refreshes the grid when a column refresh
-   * is notified, which triggers handling of the visible flag.
-   * This is called on uiGridConstants.dataChange.COLUMN, and is
-   * registered as a dataChangeCallback in grid.js
-   * @param {string} name column name
-   */
-  Grid.prototype.columnRefreshCallback = function columnRefreshCallback( grid ){
-    grid.buildColumns();
-    grid.queueGridRefresh();
-  };
-
-
-  /**
-   * @ngdoc function
-   * @name processRowsCallback
-   * @methodOf ui.grid.class:Grid
-   * @description calls the row processors, specifically
-   * intended to reset the sorting when an edit is called,
-   * registered as a dataChangeCallback on uiGridConstants.dataChange.EDIT
-   * @param {string} name column name
-   */
-  Grid.prototype.processRowsCallback = function processRowsCallback( grid ){
-    grid.queueGridRefresh();
-  };
-
-
-  /**
-   * @ngdoc function
-   * @name updateFooterHeightCallback
-   * @methodOf ui.grid.class:Grid
-   * @description recalculates the footer height,
-   * registered as a dataChangeCallback on uiGridConstants.dataChange.OPTIONS
-   * @param {string} name column name
-   */
-  Grid.prototype.updateFooterHeightCallback = function updateFooterHeightCallback( grid ){
-    grid.footerHeight = grid.calcFooterHeight();
-    grid.columnFooterHeight = grid.calcColumnFooterHeight();
-  };
-
-
-  /**
-   * @ngdoc function
-   * @name getColumn
-   * @methodOf ui.grid.class:Grid
-   * @description returns a grid column for the column name
-   * @param {string} name column name
-   */
-  Grid.prototype.getColumn = function getColumn(name) {
-    var columns = this.columns.filter(function (column) {
-      return column.colDef.name === name;
-    });
-    return columns.length > 0 ? columns[0] : null;
-  };
-
-  /**
-   * @ngdoc function
-   * @name getColDef
-   * @methodOf ui.grid.class:Grid
-   * @description returns a grid colDef for the column name
-   * @param {string} name column.field
-   */
-  Grid.prototype.getColDef = function getColDef(name) {
-    var colDefs = this.options.columnDefs.filter(function (colDef) {
-      return colDef.name === name;
-    });
-    return colDefs.length > 0 ? colDefs[0] : null;
-  };
-
-  /**
-   * @ngdoc function
-   * @name assignTypes
-   * @methodOf ui.grid.class:Grid
-   * @description uses the first row of data to assign colDef.type for any types not defined.
-   */
-  /**
-   * @ngdoc property
-   * @name type
-   * @propertyOf ui.grid.class:GridOptions.columnDef
-   * @description the type of the column, used in sorting.  If not provided then the
-   * grid will guess the type.  Add this only if the grid guessing is not to your
-   * satisfaction.  One of:
-   * - 'string'
-   * - 'boolean'
-   * - 'number'
-   * - 'date'
-   * - 'object'
-   * - 'numberStr'
-   * Note that if you choose date, your dates should be in a javascript date type
-   *
-   */
-  Grid.prototype.assignTypes = function(){
-    var self = this;
-    self.options.columnDefs.forEach(function (colDef, index) {
-
-      //Assign colDef type if not specified
-      if (!colDef.type) {
-        var col = new GridColumn(colDef, index, self);
-        var firstRow = self.rows.length > 0 ? self.rows[0] : null;
-        if (firstRow) {
-          colDef.type = gridUtil.guessType(self.getCellValue(firstRow, col));
-        }
-        else {
-          colDef.type = 'string';
-        }
-      }
-    });
-  };
-
-
-  /**
-   * @ngdoc function
-   * @name isRowHeaderColumn
-   * @methodOf ui.grid.class:Grid
-   * @description returns true if the column is a row Header
-   * @param {object} column column
-   */
-  Grid.prototype.isRowHeaderColumn = function isRowHeaderColumn(column) {
-    return this.rowHeaderColumns.indexOf(column) !== -1;
-  };
-
-  /**
-  * @ngdoc function
-  * @name addRowHeaderColumn
-  * @methodOf ui.grid.class:Grid
-  * @description adds a row header column to the grid
-  * @param {object} column def
-  */
-  Grid.prototype.addRowHeaderColumn = function addRowHeaderColumn(colDef) {
-    var self = this;
-    var rowHeaderCol = new GridColumn(colDef, gridUtil.nextUid(), self);
-    rowHeaderCol.isRowHeader = true;
-    if (self.isRTL()) {
-      self.createRightContainer();
-      rowHeaderCol.renderContainer = 'right';
-    }
-    else {
-      self.createLeftContainer();
-      rowHeaderCol.renderContainer = 'left';
-    }
-
-    // relies on the default column builder being first in array, as it is instantiated
-    // as part of grid creation
-    self.columnBuilders[0](colDef,rowHeaderCol,self.options)
-      .then(function(){
-        rowHeaderCol.enableFiltering = false;
-        rowHeaderCol.enableSorting = false;
-        rowHeaderCol.enableHiding = false;
-        self.rowHeaderColumns.push(rowHeaderCol);
-        self.buildColumns()
-          .then( function() {
-            self.preCompileCellTemplates();
-            self.queueGridRefresh();
-          });
-      });
-  };
-
-  /**
-   * @ngdoc function
-   * @name getOnlyDataColumns
-   * @methodOf ui.grid.class:Grid
-   * @description returns all columns except for rowHeader columns
-   */
-  Grid.prototype.getOnlyDataColumns = function getOnlyDataColumns() {
-    var self = this;
-    var cols = [];
-    self.columns.forEach(function (col) {
-      if (self.rowHeaderColumns.indexOf(col) === -1) {
-        cols.push(col);
-      }
-    });
-    return cols;
-  };
-
-  /**
-   * @ngdoc function
-   * @name buildColumns
-   * @methodOf ui.grid.class:Grid
-   * @description creates GridColumn objects from the columnDefinition.  Calls each registered
-   * columnBuilder to further process the column
-   * @param {object} options  An object contains options to use when building columns
-   *
-   * * **orderByColumnDefs**: defaults to **false**. When true, `buildColumns` will reorder existing columns according to the order within the column definitions.
-   *
-   * @returns {Promise} a promise to load any needed column resources
-   */
-  Grid.prototype.buildColumns = function buildColumns(opts) {
-    var options = {
-      orderByColumnDefs: false
-    };
-
-    angular.extend(options, opts);
-
-    // gridUtil.logDebug('buildColumns');
-    var self = this;
-    var builderPromises = [];
-    var headerOffset = self.rowHeaderColumns.length;
-    var i;
-
-    // Remove any columns for which a columnDef cannot be found
-    // Deliberately don't use forEach, as it doesn't like splice being called in the middle
-    // Also don't cache columns.length, as it will change during this operation
-    for (i = 0; i < self.columns.length; i++){
-      if (!self.getColDef(self.columns[i].name)) {
-        self.columns.splice(i, 1);
-        i--;
-      }
-    }
-
-    //add row header columns to the grid columns array _after_ columns without columnDefs have been removed
-    self.rowHeaderColumns.forEach(function (rowHeaderColumn) {
-      self.columns.unshift(rowHeaderColumn);
-    });
-
-
-    // look at each column def, and update column properties to match.  If the column def
-    // doesn't have a column, then splice in a new gridCol
-    self.options.columnDefs.forEach(function (colDef, index) {
-      self.preprocessColDef(colDef);
-      var col = self.getColumn(colDef.name);
-
-      if (!col) {
-        col = new GridColumn(colDef, gridUtil.nextUid(), self);
-        self.columns.splice(index + headerOffset, 0, col);
-      }
-      else {
-        // tell updateColumnDef that the column was pre-existing
-        col.updateColumnDef(colDef, false);
-      }
-
-      self.columnBuilders.forEach(function (builder) {
-        builderPromises.push(builder.call(self, colDef, col, self.options));
-      });
-    });
-
-    /*** Reorder columns if necessary ***/
-    if (!!options.orderByColumnDefs) {
-      // Create a shallow copy of the columns as a cache
-      var columnCache = self.columns.slice(0);
-
-      // We need to allow for the "row headers" when mapping from the column defs array to the columns array
-      //   If we have a row header in columns[0] and don't account for it   we'll overwrite it with the column in columnDefs[0]
-
-      // Go through all the column defs, use the shorter of columns length and colDefs.length because if a user has given two columns the same name then
-      // columns will be shorter than columnDefs.  In this situation we'll avoid an error, but the user will still get an unexpected result
-      var len = Math.min(self.options.columnDefs.length, self.columns.length);
-      for (i = 0; i < len; i++) {
-        // If the column at this index has a different name than the column at the same index in the column defs...
-        if (self.columns[i + headerOffset].name !== self.options.columnDefs[i].name) {
-          // Replace the one in the cache with the appropriate column
-          columnCache[i + headerOffset] = self.getColumn(self.options.columnDefs[i].name);
-        }
-        else {
-          // Otherwise just copy over the one from the initial columns
-          columnCache[i + headerOffset] = self.columns[i + headerOffset];
-        }
-      }
-
-      // Empty out the columns array, non-destructively
-      self.columns.length = 0;
-
-      // And splice in the updated, ordered columns from the cache
-      Array.prototype.splice.apply(self.columns, [0, 0].concat(columnCache));
-    }
-
-    return $q.all(builderPromises).then(function(){
-      if (self.rows.length > 0){
-        self.assignTypes();
-      }
-    });
-  };
-
-/**
- * @ngdoc function
- * @name preCompileCellTemplates
- * @methodOf ui.grid.class:Grid
- * @description precompiles all cell templates
- */
-  Grid.prototype.preCompileCellTemplates = function() {
-    var self = this;
-
-    var preCompileTemplate = function( col ) {
-      var html = col.cellTemplate.replace(uiGridConstants.MODEL_COL_FIELD, self.getQualifiedColField(col));
-      html = html.replace(uiGridConstants.COL_FIELD, 'grid.getCellValue(row, col)');
-
-      var compiledElementFn = $compile(html);
-      col.compiledElementFn = compiledElementFn;
-
-      if (col.compiledElementFnDefer) {
-        col.compiledElementFnDefer.resolve(col.compiledElementFn);
-      }
-    };
-
-    this.columns.forEach(function (col) {
-      if ( col.cellTemplate ){
-        preCompileTemplate( col );
-      } else if ( col.cellTemplatePromise ){
-        col.cellTemplatePromise.then( function() {
-          preCompileTemplate( col );
-        });
-      }
-    });
-  };
-
-  /**
-   * @ngdoc function
-   * @name getGridQualifiedColField
-   * @methodOf ui.grid.class:Grid
-   * @description Returns the $parse-able accessor for a column within its $scope
-   * @param {GridColumn} col col object
-   */
-  Grid.prototype.getQualifiedColField = function (col) {
-    return 'row.entity.' + gridUtil.preEval(col.field);
-  };
-
-  /**
-   * @ngdoc function
-   * @name createLeftContainer
-   * @methodOf ui.grid.class:Grid
-   * @description creates the left render container if it doesn't already exist
-   */
-  Grid.prototype.createLeftContainer = function() {
-    if (!this.hasLeftContainer()) {
-      this.renderContainers.left = new GridRenderContainer('left', this, { disableColumnOffset: true });
-    }
-  };
-
-  /**
-   * @ngdoc function
-   * @name createRightContainer
-   * @methodOf ui.grid.class:Grid
-   * @description creates the right render container if it doesn't already exist
-   */
-  Grid.prototype.createRightContainer = function() {
-    if (!this.hasRightContainer()) {
-      this.renderContainers.right = new GridRenderContainer('right', this, { disableColumnOffset: true });
-    }
-  };
-
-  /**
-   * @ngdoc function
-   * @name hasLeftContainer
-   * @methodOf ui.grid.class:Grid
-   * @description returns true if leftContainer exists
-   */
-  Grid.prototype.hasLeftContainer = function() {
-    return this.renderContainers.left !== undefined;
-  };
-
-  /**
-   * @ngdoc function
-   * @name hasRightContainer
-   * @methodOf ui.grid.class:Grid
-   * @description returns true if rightContainer exists
-   */
-  Grid.prototype.hasRightContainer = function() {
-    return this.renderContainers.right !== undefined;
-  };
-
-
-      /**
-   * undocumented function
-   * @name preprocessColDef
-   * @methodOf ui.grid.class:Grid
-   * @description defaults the name property from field to maintain backwards compatibility with 2.x
-   * validates that name or field is present
-   */
-  Grid.prototype.preprocessColDef = function preprocessColDef(colDef) {
-    var self = this;
-
-    if (!colDef.field && !colDef.name) {
-      throw new Error('colDef.name or colDef.field property is required');
-    }
-
-    //maintain backwards compatibility with 2.x
-    //field was required in 2.x.  now name is required
-    if (colDef.name === undefined && colDef.field !== undefined) {
-      // See if the column name already exists:
-      var newName = colDef.field,
-        counter = 2;
-      while (self.getColumn(newName)) {
-        newName = colDef.field + counter.toString();
-        counter++;
-      }
-      colDef.name = newName;
-    }
-  };
-
-  // Return a list of items that exist in the `n` array but not the `o` array. Uses optional property accessors passed as third & fourth parameters
-  Grid.prototype.newInN = function newInN(o, n, oAccessor, nAccessor) {
-    var self = this;
-
-    var t = [];
-    for (var i = 0; i < n.length; i++) {
-      var nV = nAccessor ? n[i][nAccessor] : n[i];
-
-      var found = false;
-      for (var j = 0; j < o.length; j++) {
-        var oV = oAccessor ? o[j][oAccessor] : o[j];
-        if (self.options.rowEquality(nV, oV)) {
-          found = true;
-          break;
-        }
-      }
-      if (!found) {
-        t.push(nV);
-      }
-    }
-
-    return t;
-  };
-
-  /**
-   * @ngdoc function
-   * @name getRow
-   * @methodOf ui.grid.class:Grid
-   * @description returns the GridRow that contains the rowEntity
-   * @param {object} rowEntity the gridOptions.data array element instance
-   * @param {array} rows [optional] the rows to look in - if not provided then
-   * looks in grid.rows
-   */
-  Grid.prototype.getRow = function getRow(rowEntity, lookInRows) {
-    var self = this;
-
-    lookInRows = typeof(lookInRows) === 'undefined' ? self.rows : lookInRows;
-
-    var rows = lookInRows.filter(function (row) {
-      return self.options.rowEquality(row.entity, rowEntity);
-    });
-    return rows.length > 0 ? rows[0] : null;
-  };
-
-
-  /**
-   * @ngdoc function
-   * @name modifyRows
-   * @methodOf ui.grid.class:Grid
-   * @description creates or removes GridRow objects from the newRawData array.  Calls each registered
-   * rowBuilder to further process the row
-   * @param {array} newRawData Modified set of data
-   *
-   * This method aims to achieve three things:
-   * 1. the resulting rows array is in the same order as the newRawData, we'll call
-   * rowsProcessors immediately after to sort the data anyway
-   * 2. if we have row hashing available, we try to use the rowHash to find the row
-   * 3. no memory leaks - rows that are no longer in newRawData need to be garbage collected
-   *
-   * The basic logic flow makes use of the newRawData, oldRows and oldHash, and creates
-   * the newRows and newHash
-   *
-   * ```
-   * newRawData.forEach newEntity
-   *   if (hashing enabled)
-   *     check oldHash for newEntity
-   *   else
-   *     look for old row directly in oldRows
-   *   if !oldRowFound     // must be a new row
-   *     create newRow
-   *   append to the newRows and add to newHash
-   *   run the processors
-   * ```
-   * 
-   * Rows are identified using the hashKey if configured.  If not configured, then rows
-   * are identified using the gridOptions.rowEquality function
-   * 
-   * This method is useful when trying to select rows immediately after loading data without
-   * using a $timeout/$interval, e.g.:
-   * 
-   *   $scope.gridOptions.data =  someData;
-   *   $scope.gridApi.grid.modifyRows($scope.gridOptions.data);
-   *   $scope.gridApi.selection.selectRow($scope.gridOptions.data[0]);
-   * 
-   * OR to persist row selection after data update (e.g. rows selected, new data loaded, want
-   * originally selected rows to be re-selected))
-   */
-  Grid.prototype.modifyRows = function modifyRows(newRawData) {
-    var self = this;
-    var oldRows = self.rows.slice(0);
-    var oldRowHash = self.rowHashMap || self.createRowHashMap();
-    self.rowHashMap = self.createRowHashMap();
-    self.rows.length = 0;
-
-    newRawData.forEach( function( newEntity, i ) {
-      var newRow;
-      if ( self.options.enableRowHashing ){
-        // if hashing is enabled, then this row will be in the hash if we already know about it
-        newRow = oldRowHash.get( newEntity );
-      } else {
-        // otherwise, manually search the oldRows to see if we can find this row
-        newRow = self.getRow(newEntity, oldRows);
-      }
-
-      // if we didn't find the row, it must be new, so create it
-      if ( !newRow ){
-        newRow = self.processRowBuilders(new GridRow(newEntity, i, self));
-      }
-
-      self.rows.push( newRow );
-      self.rowHashMap.put( newEntity, newRow );
-    });
-
-    self.assignTypes();
-
-    var p1 = $q.when(self.processRowsProcessors(self.rows))
-      .then(function (renderableRows) {
-        return self.setVisibleRows(renderableRows);
-      });
-
-    var p2 = $q.when(self.processColumnsProcessors(self.columns))
-      .then(function (renderableColumns) {
-        return self.setVisibleColumns(renderableColumns);
-      });
-
-    return $q.all([p1, p2]);
-  };
-
-
-  /**
-   * Private Undocumented Method
-   * @name addRows
-   * @methodOf ui.grid.class:Grid
-   * @description adds the newRawData array of rows to the grid and calls all registered
-   * rowBuilders. this keyword will reference the grid
-   */
-  Grid.prototype.addRows = function addRows(newRawData) {
-    var self = this;
-
-    var existingRowCount = self.rows.length;
-    for (var i = 0; i < newRawData.length; i++) {
-      var newRow = self.processRowBuilders(new GridRow(newRawData[i], i + existingRowCount, self));
-
-      if (self.options.enableRowHashing) {
-        var found = self.rowHashMap.get(newRow.entity);
-        if (found) {
-          found.row = newRow;
-        }
-      }
-
-      self.rows.push(newRow);
-    }
-  };
-
-  /**
-   * @ngdoc function
-   * @name processRowBuilders
-   * @methodOf ui.grid.class:Grid
-   * @description processes all RowBuilders for the gridRow
-   * @param {GridRow} gridRow reference to gridRow
-   * @returns {GridRow} the gridRow with all additional behavior added
-   */
-  Grid.prototype.processRowBuilders = function processRowBuilders(gridRow) {
-    var self = this;
-
-    self.rowBuilders.forEach(function (builder) {
-      builder.call(self, gridRow, self.options);
-    });
-
-    return gridRow;
-  };
-
-  /**
-   * @ngdoc function
-   * @name registerStyleComputation
-   * @methodOf ui.grid.class:Grid
-   * @description registered a styleComputation function
-   *
-   * If the function returns a value it will be appended into the grid's `
        "
-  );
-
-
-  $templateCache.put('ui-grid/uiGridCell',
-    "
        {{COL_FIELD CUSTOM_FILTERS}}
        "
-  );
-
-
-  $templateCache.put('ui-grid/uiGridColumnMenu',
-    "
        "
-  );
-
-
-  $templateCache.put('ui-grid/uiGridFooterCell',
-    "
        {{ col.getAggregationText() + ( col.getAggregationValue() CUSTOM_FILTERS ) }}
        "
-  );
-
-
-  $templateCache.put('ui-grid/uiGridHeaderCell',
-    "
        {{ col.displayName CUSTOM_FILTERS }}  {{col.sort.priority}}
         
        "
-  );
-
-
-  $templateCache.put('ui-grid/uiGridMenu',
-    "
        "
-  );
-
-
-  $templateCache.put('ui-grid/uiGridMenuItem',
-    ""
-  );
-
-
-  $templateCache.put('ui-grid/uiGridRenderContainer',
-    "
        "
-  );
-
-
-  $templateCache.put('ui-grid/uiGridViewport',
-    "
        "
-  );
-
-
-  $templateCache.put('ui-grid/cellEditor',
-    "
        "
-  );
-
-
-  $templateCache.put('ui-grid/dropdownEditor',
-    "
        "
-  );
-
-
-  $templateCache.put('ui-grid/fileChooserEditor',
-    "
        "
-  );
-
-
-  $templateCache.put('ui-grid/expandableRow',
-    "
        "
-  );
-
-
-  $templateCache.put('ui-grid/expandableRowHeader',
-    "
        "
-  );
-
-
-  $templateCache.put('ui-grid/expandableScrollFiller',
-    "
        "
-  );
-
-
-  $templateCache.put('ui-grid/expandableTopRowHeader',
-    "
        "
-  );
-
-
-  $templateCache.put('ui-grid/csvLink',
-    "LINK_LABEL"
-  );
-
-
-  $templateCache.put('ui-grid/importerMenuItem',
-    "
        • "
-  );
-
-
-  $templateCache.put('ui-grid/importerMenuItemContainer',
-    "
        "
-  );
-
-
-  $templateCache.put('ui-grid/pagination',
-    "
            0\">/ {{ paginationApi.getTotalPages() }}  
         1\"> {{sizesLabel}}
        {{grid.options.paginationPageSize}} {{sizesLabel}}
         0\">{{showingLow}} - {{showingHigh}} {{paginationOf}} {{grid.options.totalItems}} {{totalItemsLabel}}
        "
-  );
-
-
-  $templateCache.put('ui-grid/columnResizer',
-    "
        "
-  );
-
-
-  $templateCache.put('ui-grid/gridFooterSelectedItems',
-    "({{\"search.selectedItems\" | t}} {{grid.selection.selectedCount}})"
-  );
-
-
-  $templateCache.put('ui-grid/selectionHeaderCell',
-    "
        "
-  );
-
-
-  $templateCache.put('ui-grid/selectionRowHeader',
-    "
        "
-  );
-
-
-  $templateCache.put('ui-grid/selectionRowHeaderButtons',
-    "
         
        "
-  );
-
-
-  $templateCache.put('ui-grid/selectionSelectAllButtons',
-    "
        "
-  );
-
-
-  $templateCache.put('ui-grid/treeBaseExpandAllButtons',
-    "
         0 && grid.treeBase.expandAll, 'ui-grid-icon-plus-squared': grid.treeBase.numberLevels > 0 && !grid.treeBase.expandAll}\" ng-click=\"headerButtonClick($event)\">
        "
-  );
-
-
-  $templateCache.put('ui-grid/treeBaseHeaderCell',
-    "
        "
-  );
-
-
-  $templateCache.put('ui-grid/treeBaseRowHeader',
-    "
        "
-  );
-
-
-  $templateCache.put('ui-grid/treeBaseRowHeaderButtons',
-    "
         -1 }\" ng-click=\"treeButtonClick(row, $event)\"> -1 ) || ( row.treeNode.children && row.treeNode.children.length > 0 ) ) && row.treeNode.state === 'expanded', 'ui-grid-icon-plus-squared': ( ( grid.options.showTreeExpandNoChildren && row.treeLevel > -1 ) || ( row.treeNode.children && row.treeNode.children.length > 0 ) ) && row.treeNode.state === 'collapsed'}\" ng-style=\"{'padding-left': grid.options.treeIndent * row.treeLevel + 'px'}\">  
        "
-  );
-
-}]);
diff --git a/vid/src/main/webapp/static/fusion/raptor/uigrid/ui-grid.svg b/vid/src/main/webapp/static/fusion/raptor/uigrid/ui-grid.svg
deleted file mode 100644
index 3d675f637..000000000
--- a/vid/src/main/webapp/static/fusion/raptor/uigrid/ui-grid.svg
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-Copyright (C) 2015 by original authors @ fontello.com
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/vid/src/main/webapp/static/fusion/raptor/uigrid/ui-grid.ttf b/vid/src/main/webapp/static/fusion/raptor/uigrid/ui-grid.ttf
deleted file mode 100644
index dbf56e98532dec249d4b06607fbcc4df0ce28a79..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8564
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
Ui5x3!e4EdI(^9^T+o6~JH@2B3&;S4c

diff --git a/vid/src/main/webapp/static/fusion/raptor/uigrid/ui-grid.woff b/vid/src/main/webapp/static/fusion/raptor/uigrid/ui-grid.woff
deleted file mode 100644
index fb19c43cf244fd1c9e786a1a433705e42ea02a47..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4792
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 type pairs
-	class2type = {},
-
-	// List of deleted data cache ids, so we can reuse them
-	core_deletedIds = [],
-
-	core_version = "1.10.2",
-
-	// Save a reference to some core methods
-	core_concat = core_deletedIds.concat,
-	core_push = core_deletedIds.push,
-	core_slice = core_deletedIds.slice,
-	core_indexOf = core_deletedIds.indexOf,
-	core_toString = class2type.toString,
-	core_hasOwn = class2type.hasOwnProperty,
-	core_trim = core_version.trim,
-
-	// Define a local copy of jQuery
-	jQuery = function( selector, context ) {
-		// The jQuery object is actually just the init constructor 'enhanced'
-		return new jQuery.fn.init( selector, context, rootjQuery );
-	},
-
-	// Used for matching numbers
-	core_pnum = /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,
-
-	// Used for splitting on whitespace
-	core_rnotwhite = /\S+/g,
-
-	// Make sure we trim BOM and NBSP (here's looking at you, Safari 5.0 and IE)
-	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
-
-	// A simple way to check for HTML strings
-	// Prioritize #id over  to avoid XSS via location.hash (#9521)
-	// Strict HTML recognition (#11290: must start with <)
-	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,
-
-	// Match a standalone tag
-	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>|)$/,
-
-	// JSON RegExp
-	rvalidchars = /^[\],:{}\s]*$/,
-	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
-	rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,
-	rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,
-
-	// Matches dashed string for camelizing
-	rmsPrefix = /^-ms-/,
-	rdashAlpha = /-([\da-z])/gi,
-
-	// Used by jQuery.camelCase as callback to replace()
-	fcamelCase = function( all, letter ) {
-		return letter.toUpperCase();
-	},
-
-	// The ready event handler
-	completed = function( event ) {
-
-		// readyState === "complete" is good enough for us to call the dom ready in oldIE
-		if ( document.addEventListener || event.type === "load" || document.readyState === "complete" ) {
-			detach();
-			jQuery.ready();
-		}
-	},
-	// Clean-up method for dom ready events
-	detach = function() {
-		if ( document.addEventListener ) {
-			document.removeEventListener( "DOMContentLoaded", completed, false );
-			window.removeEventListener( "load", completed, false );
-
-		} else {
-			document.detachEvent( "onreadystatechange", completed );
-			window.detachEvent( "onload", completed );
-		}
-	};
-
-jQuery.fn = jQuery.prototype = {
-	// The current version of jQuery being used
-	jquery: core_version,
-
-	constructor: jQuery,
-	init: function( selector, context, rootjQuery ) {
-		var match, elem;
-
-		// HANDLE: $(""), $(null), $(undefined), $(false)
-		if ( !selector ) {
-			return this;
-		}
-
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
-				// Assume that strings that start and end with <> are HTML and skip the regex check
-				match = [ null, selector, null ];
-
-			} else {
-				match = rquickExpr.exec( selector );
-			}
-
-			// Match html or make sure no context is specified for #id
-			if ( match && (match[1] || !context) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] ) {
-					context = context instanceof jQuery ? context[0] : context;
-
-					// scripts is true for back-compat
-					jQuery.merge( this, jQuery.parseHTML(
-						match[1],
-						context && context.nodeType ? context.ownerDocument || context : document,
-						true
-					) );
-
-					// HANDLE: $(html, props)
-					if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
-						for ( match in context ) {
-							// Properties of context are called as methods if possible
-							if ( jQuery.isFunction( this[ match ] ) ) {
-								this[ match ]( context[ match ] );
-
-							// ...and otherwise set as attributes
-							} else {
-								this.attr( match, context[ match ] );
-							}
-						}
-					}
-
-					return this;
-
-				// HANDLE: $(#id)
-				} else {
-					elem = document.getElementById( match[2] );
-
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE and Opera return items
-						// by name instead of ID
-						if ( elem.id !== match[2] ) {
-							return rootjQuery.find( selector );
-						}
-
-						// Otherwise, we inject the element directly into the jQuery object
-						this.length = 1;
-						this[0] = elem;
-					}
-
-					this.context = document;
-					this.selector = selector;
-					return this;
-				}
-
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return ( context || rootjQuery ).find( selector );
-
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return this.constructor( context ).find( selector );
-			}
-
-		// HANDLE: $(DOMElement)
-		} else if ( selector.nodeType ) {
-			this.context = this[0] = selector;
-			this.length = 1;
-			return this;
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return rootjQuery.ready( selector );
-		}
-
-		if ( selector.selector !== undefined ) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
-		return jQuery.makeArray( selector, this );
-	},
-
-	// Start with an empty selector
-	selector: "",
-
-	// The default length of a jQuery object is 0
-	length: 0,
-
-	toArray: function() {
-		return core_slice.call( this );
-	},
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num == null ?
-
-			// Return a 'clean' array
-			this.toArray() :
-
-			// Return just the object
-			( num < 0 ? this[ this.length + num ] : this[ num ] );
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems ) {
-
-		// Build a new jQuery matched element set
-		var ret = jQuery.merge( this.constructor(), elems );
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-		ret.context = this.context;
-
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
-	},
-
-	ready: function( fn ) {
-		// Add the callback
-		jQuery.ready.promise().done( fn );
-
-		return this;
-	},
-
-	slice: function() {
-		return this.pushStack( core_slice.apply( this, arguments ) );
-	},
-
-	first: function() {
-		return this.eq( 0 );
-	},
-
-	last: function() {
-		return this.eq( -1 );
-	},
-
-	eq: function( i ) {
-		var len = this.length,
-			j = +i + ( i < 0 ? len : 0 );
-		return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		}));
-	},
-
-	end: function() {
-		return this.prevObject || this.constructor(null);
-	},
-
-	// For internal use only.
-	// Behaves like an Array's method, not like a jQuery method.
-	push: core_push,
-	sort: [].sort,
-	splice: [].splice
-};
-
-// Give the init function the jQuery prototype for later instantiation
-jQuery.fn.init.prototype = jQuery.fn;
-
-jQuery.extend = jQuery.fn.extend = function() {
-	var src, copyIsArray, copy, name, options, clone,
-		target = arguments[0] || {},
-		i = 1,
-		length = arguments.length,
-		deep = false;
-
-	// Handle a deep copy situation
-	if ( typeof target === "boolean" ) {
-		deep = target;
-		target = arguments[1] || {};
-		// skip the boolean and the target
-		i = 2;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
-		target = {};
-	}
-
-	// extend jQuery itself if only one argument is passed
-	if ( length === i ) {
-		target = this;
-		--i;
-	}
-
-	for ( ; i < length; i++ ) {
-		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null ) {
-			// Extend the base object
-			for ( name in options ) {
-				src = target[ name ];
-				copy = options[ name ];
-
-				// Prevent never-ending loop
-				if ( target === copy ) {
-					continue;
-				}
-
-				// Recurse if we're merging plain objects or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
-					if ( copyIsArray ) {
-						copyIsArray = false;
-						clone = src && jQuery.isArray(src) ? src : [];
-
-					} else {
-						clone = src && jQuery.isPlainObject(src) ? src : {};
-					}
-
-					// Never move original objects, clone them
-					target[ name ] = jQuery.extend( deep, clone, copy );
-
-				// Don't bring in undefined values
-				} else if ( copy !== undefined ) {
-					target[ name ] = copy;
-				}
-			}
-		}
-	}
-
-	// Return the modified object
-	return target;
-};
-
-jQuery.extend({
-	// Unique for each copy of jQuery on the page
-	// Non-digits removed to match rinlinejQuery
-	expando: "jQuery" + ( core_version + Math.random() ).replace( /\D/g, "" ),
-
-	noConflict: function( deep ) {
-		if ( window.$ === jQuery ) {
-			window.$ = _$;
-		}
-
-		if ( deep && window.jQuery === jQuery ) {
-			window.jQuery = _jQuery;
-		}
-
-		return jQuery;
-	},
-
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
-
-	// A counter to track how many items to wait for before
-	// the ready event fires. See #6781
-	readyWait: 1,
-
-	// Hold (or release) the ready event
-	holdReady: function( hold ) {
-		if ( hold ) {
-			jQuery.readyWait++;
-		} else {
-			jQuery.ready( true );
-		}
-	},
-
-	// Handle when the DOM is ready
-	ready: function( wait ) {
-
-		// Abort if there are pending holds or we're already ready
-		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
-			return;
-		}
-
-		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-		if ( !document.body ) {
-			return setTimeout( jQuery.ready );
-		}
-
-		// Remember that the DOM is ready
-		jQuery.isReady = true;
-
-		// If a normal DOM Ready event fired, decrement, and wait if need be
-		if ( wait !== true && --jQuery.readyWait > 0 ) {
-			return;
-		}
-
-		// If there are functions bound, to execute
-		readyList.resolveWith( document, [ jQuery ] );
-
-		// Trigger any bound ready events
-		if ( jQuery.fn.trigger ) {
-			jQuery( document ).trigger("ready").off("ready");
-		}
-	},
-
-	// See test/unit/core.js for details concerning isFunction.
-	// Since version 1.3, DOM methods and functions like alert
-	// aren't supported. They return false on IE (#2968).
-	isFunction: function( obj ) {
-		return jQuery.type(obj) === "function";
-	},
-
-	isArray: Array.isArray || function( obj ) {
-		return jQuery.type(obj) === "array";
-	},
-
-	isWindow: function( obj ) {
-		/* jshint eqeqeq: false */
-		return obj != null && obj == obj.window;
-	},
-
-	isNumeric: function( obj ) {
-		return !isNaN( parseFloat(obj) ) && isFinite( obj );
-	},
-
-	type: function( obj ) {
-		if ( obj == null ) {
-			return String( obj );
-		}
-		return typeof obj === "object" || typeof obj === "function" ?
-			class2type[ core_toString.call(obj) ] || "object" :
-			typeof obj;
-	},
-
-	isPlainObject: function( obj ) {
-		var key;
-
-		// Must be an Object.
-		// Because of IE, we also have to check the presence of the constructor property.
-		// Make sure that DOM nodes and window objects don't pass through, as well
-		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-			return false;
-		}
-
-		try {
-			// Not own constructor property must be Object
-			if ( obj.constructor &&
-				!core_hasOwn.call(obj, "constructor") &&
-				!core_hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
-				return false;
-			}
-		} catch ( e ) {
-			// IE8,9 Will throw exceptions on certain host objects #9897
-			return false;
-		}
-
-		// Support: IE<9
-		// Handle iteration over inherited properties before own properties.
-		if ( jQuery.support.ownLast ) {
-			for ( key in obj ) {
-				return core_hasOwn.call( obj, key );
-			}
-		}
-
-		// Own properties are enumerated firstly, so to speed up,
-		// if last one is own, then all properties are own.
-		for ( key in obj ) {}
-
-		return key === undefined || core_hasOwn.call( obj, key );
-	},
-
-	isEmptyObject: function( obj ) {
-		var name;
-		for ( name in obj ) {
-			return false;
-		}
-		return true;
-	},
-
-	error: function( msg ) {
-		throw new Error( msg );
-	},
-
-	// data: string of html
-	// context (optional): If specified, the fragment will be created in this context, defaults to document
-	// keepScripts (optional): If true, will include scripts passed in the html string
-	parseHTML: function( data, context, keepScripts ) {
-		if ( !data || typeof data !== "string" ) {
-			return null;
-		}
-		if ( typeof context === "boolean" ) {
-			keepScripts = context;
-			context = false;
-		}
-		context = context || document;
-
-		var parsed = rsingleTag.exec( data ),
-			scripts = !keepScripts && [];
-
-		// Single tag
-		if ( parsed ) {
-			return [ context.createElement( parsed[1] ) ];
-		}
-
-		parsed = jQuery.buildFragment( [ data ], context, scripts );
-		if ( scripts ) {
-			jQuery( scripts ).remove();
-		}
-		return jQuery.merge( [], parsed.childNodes );
-	},
-
-	parseJSON: function( data ) {
-		// Attempt to parse using the native JSON parser first
-		if ( window.JSON && window.JSON.parse ) {
-			return window.JSON.parse( data );
-		}
-
-		if ( data === null ) {
-			return data;
-		}
-
-		if ( typeof data === "string" ) {
-
-			// Make sure leading/trailing whitespace is removed (IE can't handle it)
-			data = jQuery.trim( data );
-
-			if ( data ) {
-				// Make sure the incoming data is actual JSON
-				// Logic borrowed from http://json.org/json2.js
-				if ( rvalidchars.test( data.replace( rvalidescape, "@" )
-					.replace( rvalidtokens, "]" )
-					.replace( rvalidbraces, "")) ) {
-
-					return ( new Function( "return " + data ) )();
-				}
-			}
-		}
-
-		jQuery.error( "Invalid JSON: " + data );
-	},
-
-	// Cross-browser xml parsing
-	parseXML: function( data ) {
-		var xml, tmp;
-		if ( !data || typeof data !== "string" ) {
-			return null;
-		}
-		try {
-			if ( window.DOMParser ) { // Standard
-				tmp = new DOMParser();
-				xml = tmp.parseFromString( data , "text/xml" );
-			} else { // IE
-				xml = new ActiveXObject( "Microsoft.XMLDOM" );
-				xml.async = "false";
-				xml.loadXML( data );
-			}
-		} catch( e ) {
-			xml = undefined;
-		}
-		if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
-			jQuery.error( "Invalid XML: " + data );
-		}
-		return xml;
-	},
-
-	noop: function() {},
-
-	// Evaluates a script in a global context
-	// Workarounds based on findings by Jim Driscoll
-	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
-	globalEval: function( data ) {
-		if ( data && jQuery.trim( data ) ) {
-			// We use execScript on Internet Explorer
-			// We use an anonymous function so that context is window
-			// rather than jQuery in Firefox
-			( window.execScript || function( data ) {
-				window[ "eval" ].call( window, data );
-			} )( data );
-		}
-	},
-
-	// Convert dashed to camelCase; used by the css and data modules
-	// Microsoft forgot to hump their vendor prefix (#9572)
-	camelCase: function( string ) {
-		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
-	},
-
-	// args is for internal usage only
-	each: function( obj, callback, args ) {
-		var value,
-			i = 0,
-			length = obj.length,
-			isArray = isArraylike( obj );
-
-		if ( args ) {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			}
-
-		// A special, fast, case for the most common use of each
-		} else {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			}
-		}
-
-		return obj;
-	},
-
-	// Use native String.trim function wherever possible
-	trim: core_trim && !core_trim.call("\uFEFF\xA0") ?
-		function( text ) {
-			return text == null ?
-				"" :
-				core_trim.call( text );
-		} :
-
-		// Otherwise use our own trimming functionality
-		function( text ) {
-			return text == null ?
-				"" :
-				( text + "" ).replace( rtrim, "" );
-		},
-
-	// results is for internal usage only
-	makeArray: function( arr, results ) {
-		var ret = results || [];
-
-		if ( arr != null ) {
-			if ( isArraylike( Object(arr) ) ) {
-				jQuery.merge( ret,
-					typeof arr === "string" ?
-					[ arr ] : arr
-				);
-			} else {
-				core_push.call( ret, arr );
-			}
-		}
-
-		return ret;
-	},
-
-	inArray: function( elem, arr, i ) {
-		var len;
-
-		if ( arr ) {
-			if ( core_indexOf ) {
-				return core_indexOf.call( arr, elem, i );
-			}
-
-			len = arr.length;
-			i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
-
-			for ( ; i < len; i++ ) {
-				// Skip accessing in sparse arrays
-				if ( i in arr && arr[ i ] === elem ) {
-					return i;
-				}
-			}
-		}
-
-		return -1;
-	},
-
-	merge: function( first, second ) {
-		var l = second.length,
-			i = first.length,
-			j = 0;
-
-		if ( typeof l === "number" ) {
-			for ( ; j < l; j++ ) {
-				first[ i++ ] = second[ j ];
-			}
-		} else {
-			while ( second[j] !== undefined ) {
-				first[ i++ ] = second[ j++ ];
-			}
-		}
-
-		first.length = i;
-
-		return first;
-	},
-
-	grep: function( elems, callback, inv ) {
-		var retVal,
-			ret = [],
-			i = 0,
-			length = elems.length;
-		inv = !!inv;
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( ; i < length; i++ ) {
-			retVal = !!callback( elems[ i ], i );
-			if ( inv !== retVal ) {
-				ret.push( elems[ i ] );
-			}
-		}
-
-		return ret;
-	},
-
-	// arg is for internal usage only
-	map: function( elems, callback, arg ) {
-		var value,
-			i = 0,
-			length = elems.length,
-			isArray = isArraylike( elems ),
-			ret = [];
-
-		// Go through the array, translating each of the items to their
-		if ( isArray ) {
-			for ( ; i < length; i++ ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret[ ret.length ] = value;
-				}
-			}
-
-		// Go through every key on the object,
-		} else {
-			for ( i in elems ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret[ ret.length ] = value;
-				}
-			}
-		}
-
-		// Flatten any nested arrays
-		return core_concat.apply( [], ret );
-	},
-
-	// A global GUID counter for objects
-	guid: 1,
-
-	// Bind a function to a context, optionally partially applying any
-	// arguments.
-	proxy: function( fn, context ) {
-		var args, proxy, tmp;
-
-		if ( typeof context === "string" ) {
-			tmp = fn[ context ];
-			context = fn;
-			fn = tmp;
-		}
-
-		// Quick check to determine if target is callable, in the spec
-		// this throws a TypeError, but we will just return undefined.
-		if ( !jQuery.isFunction( fn ) ) {
-			return undefined;
-		}
-
-		// Simulated bind
-		args = core_slice.call( arguments, 2 );
-		proxy = function() {
-			return fn.apply( context || this, args.concat( core_slice.call( arguments ) ) );
-		};
-
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		proxy.guid = fn.guid = fn.guid || jQuery.guid++;
-
-		return proxy;
-	},
-
-	// Multifunctional method to get and set values of a collection
-	// The value/s can optionally be executed if it's a function
-	access: function( elems, fn, key, value, chainable, emptyGet, raw ) {
-		var i = 0,
-			length = elems.length,
-			bulk = key == null;
-
-		// Sets many values
-		if ( jQuery.type( key ) === "object" ) {
-			chainable = true;
-			for ( i in key ) {
-				jQuery.access( elems, fn, i, key[i], true, emptyGet, raw );
-			}
-
-		// Sets one value
-		} else if ( value !== undefined ) {
-			chainable = true;
-
-			if ( !jQuery.isFunction( value ) ) {
-				raw = true;
-			}
-
-			if ( bulk ) {
-				// Bulk operations run against the entire set
-				if ( raw ) {
-					fn.call( elems, value );
-					fn = null;
-
-				// ...except when executing function values
-				} else {
-					bulk = fn;
-					fn = function( elem, key, value ) {
-						return bulk.call( jQuery( elem ), value );
-					};
-				}
-			}
-
-			if ( fn ) {
-				for ( ; i < length; i++ ) {
-					fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) );
-				}
-			}
-		}
-
-		return chainable ?
-			elems :
-
-			// Gets
-			bulk ?
-				fn.call( elems ) :
-				length ? fn( elems[0], key ) : emptyGet;
-	},
-
-	now: function() {
-		return ( new Date() ).getTime();
-	},
-
-	// A method for quickly swapping in/out CSS properties to get correct calculations.
-	// Note: this method belongs to the css module but it's needed here for the support module.
-	// If support gets modularized, this method should be moved back to the css module.
-	swap: function( elem, options, callback, args ) {
-		var ret, name,
-			old = {};
-
-		// Remember the old values, and insert the new ones
-		for ( name in options ) {
-			old[ name ] = elem.style[ name ];
-			elem.style[ name ] = options[ name ];
-		}
-
-		ret = callback.apply( elem, args || [] );
-
-		// Revert the old values
-		for ( name in options ) {
-			elem.style[ name ] = old[ name ];
-		}
-
-		return ret;
-	}
-});
-
-jQuery.ready.promise = function( obj ) {
-	if ( !readyList ) {
-
-		readyList = jQuery.Deferred();
-
-		// Catch cases where $(document).ready() is called after the browser event has already occurred.
-		// we once tried to use readyState "interactive" here, but it caused issues like the one
-		// discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
-		if ( document.readyState === "complete" ) {
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			setTimeout( jQuery.ready );
-
-		// Standards-based browsers support DOMContentLoaded
-		} else if ( document.addEventListener ) {
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", completed, false );
-
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", completed, false );
-
-		// If IE event model is used
-		} else {
-			// Ensure firing before onload, maybe late but safe also for iframes
-			document.attachEvent( "onreadystatechange", completed );
-
-			// A fallback to window.onload, that will always work
-			window.attachEvent( "onload", completed );
-
-			// If IE and not a frame
-			// continually check to see if the document is ready
-			var top = false;
-
-			try {
-				top = window.frameElement == null && document.documentElement;
-			} catch(e) {}
-
-			if ( top && top.doScroll ) {
-				(function doScrollCheck() {
-					if ( !jQuery.isReady ) {
-
-						try {
-							// Use the trick by Diego Perini
-							// http://javascript.nwbox.com/IEContentLoaded/
-							top.doScroll("left");
-						} catch(e) {
-							return setTimeout( doScrollCheck, 50 );
-						}
-
-						// detach all dom ready events
-						detach();
-
-						// and execute any waiting functions
-						jQuery.ready();
-					}
-				})();
-			}
-		}
-	}
-	return readyList.promise( obj );
-};
-
-// Populate the class2type map
-jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-});
-
-function isArraylike( obj ) {
-	var length = obj.length,
-		type = jQuery.type( obj );
-
-	if ( jQuery.isWindow( obj ) ) {
-		return false;
-	}
-
-	if ( obj.nodeType === 1 && length ) {
-		return true;
-	}
-
-	return type === "array" || type !== "function" &&
-		( length === 0 ||
-		typeof length === "number" && length > 0 && ( length - 1 ) in obj );
-}
-
-// All jQuery objects should point back to these
-rootjQuery = jQuery(document);
-/*!
- * Sizzle CSS Selector Engine v1.10.2
- * http://sizzlejs.com/
- *
- * Copyright 2013 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2013-07-03
- */
-(function( window, undefined ) {
-
-var i,
-	support,
-	cachedruns,
-	Expr,
-	getText,
-	isXML,
-	compile,
-	outermostContext,
-	sortInput,
-
-	// Local document vars
-	setDocument,
-	document,
-	docElem,
-	documentIsHTML,
-	rbuggyQSA,
-	rbuggyMatches,
-	matches,
-	contains,
-
-	// Instance-specific data
-	expando = "sizzle" + -(new Date()),
-	preferredDoc = window.document,
-	dirruns = 0,
-	done = 0,
-	classCache = createCache(),
-	tokenCache = createCache(),
-	compilerCache = createCache(),
-	hasDuplicate = false,
-	sortOrder = function( a, b ) {
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-		return 0;
-	},
-
-	// General-purpose constants
-	strundefined = typeof undefined,
-	MAX_NEGATIVE = 1 << 31,
-
-	// Instance methods
-	hasOwn = ({}).hasOwnProperty,
-	arr = [],
-	pop = arr.pop,
-	push_native = arr.push,
-	push = arr.push,
-	slice = arr.slice,
-	// Use a stripped-down indexOf if we can't use a native one
-	indexOf = arr.indexOf || function( elem ) {
-		var i = 0,
-			len = this.length;
-		for ( ; i < len; i++ ) {
-			if ( this[i] === elem ) {
-				return i;
-			}
-		}
-		return -1;
-	},
-
-	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
-
-	// Regular expressions
-
-	// Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
-	whitespace = "[\\x20\\t\\r\\n\\f]",
-	// http://www.w3.org/TR/css3-syntax/#characters
-	characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
-
-	// Loosely modeled on CSS identifier characters
-	// An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors
-	// Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
-	identifier = characterEncoding.replace( "w", "w#" ),
-
-	// Acceptable operators http://www.w3.org/TR/selectors/#attribute-selectors
-	attributes = "\\[" + whitespace + "*(" + characterEncoding + ")" + whitespace +
-		"*(?:([*^$|!~]?=)" + whitespace + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + identifier + ")|)|)" + whitespace + "*\\]",
-
-	// Prefer arguments quoted,
-	//   then not containing pseudos/brackets,
-	//   then attribute selectors/non-parenthetical expressions,
-	//   then anything else
-	// These preferences are here to reduce the number of selectors
-	//   needing tokenize in the PSEUDO preFilter
-	pseudos = ":(" + characterEncoding + ")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|" + attributes.replace( 3, 8 ) + ")*)|.*)\\)|)",
-
-	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
-	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
-
-	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
-	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
-
-	rsibling = new RegExp( whitespace + "*[+~]" ),
-	rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*)" + whitespace + "*\\]", "g" ),
-
-	rpseudo = new RegExp( pseudos ),
-	ridentifier = new RegExp( "^" + identifier + "$" ),
-
-	matchExpr = {
-		"ID": new RegExp( "^#(" + characterEncoding + ")" ),
-		"CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
-		"TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
-		"ATTR": new RegExp( "^" + attributes ),
-		"PSEUDO": new RegExp( "^" + pseudos ),
-		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
-			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
-			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
-		"bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
-		// For use in libraries implementing .is()
-		// We use this for POS matching in `select`
-		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
-			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
-	},
-
-	rnative = /^[^{]+\{\s*\[native \w/,
-
-	// Easily-parseable/retrievable ID or TAG or CLASS selectors
-	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
-
-	rinputs = /^(?:input|select|textarea|button)$/i,
-	rheader = /^h\d$/i,
-
-	rescape = /'|\\/g,
-
-	// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
-	runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
-	funescape = function( _, escaped, escapedWhitespace ) {
-		var high = "0x" + escaped - 0x10000;
-		// NaN means non-codepoint
-		// Support: Firefox
-		// Workaround erroneous numeric interpretation of +"0x"
-		return high !== high || escapedWhitespace ?
-			escaped :
-			// BMP codepoint
-			high < 0 ?
-				String.fromCharCode( high + 0x10000 ) :
-				// Supplemental Plane codepoint (surrogate pair)
-				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
-	};
-
-// Optimize for push.apply( _, NodeList )
-try {
-	push.apply(
-		(arr = slice.call( preferredDoc.childNodes )),
-		preferredDoc.childNodes
-	);
-	// Support: Android<4.0
-	// Detect silently failing push.apply
-	arr[ preferredDoc.childNodes.length ].nodeType;
-} catch ( e ) {
-	push = { apply: arr.length ?
-
-		// Leverage slice if possible
-		function( target, els ) {
-			push_native.apply( target, slice.call(els) );
-		} :
-
-		// Support: IE<9
-		// Otherwise append directly
-		function( target, els ) {
-			var j = target.length,
-				i = 0;
-			// Can't trust NodeList.length
-			while ( (target[j++] = els[i++]) ) {}
-			target.length = j - 1;
-		}
-	};
-}
-
-function Sizzle( selector, context, results, seed ) {
-	var match, elem, m, nodeType,
-		// QSA vars
-		i, groups, old, nid, newContext, newSelector;
-
-	if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
-		setDocument( context );
-	}
-
-	context = context || document;
-	results = results || [];
-
-	if ( !selector || typeof selector !== "string" ) {
-		return results;
-	}
-
-	if ( (nodeType = context.nodeType) !== 1 && nodeType !== 9 ) {
-		return [];
-	}
-
-	if ( documentIsHTML && !seed ) {
-
-		// Shortcuts
-		if ( (match = rquickExpr.exec( selector )) ) {
-			// Speed-up: Sizzle("#ID")
-			if ( (m = match[1]) ) {
-				if ( nodeType === 9 ) {
-					elem = context.getElementById( m );
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE, Opera, and Webkit return items
-						// by name instead of ID
-						if ( elem.id === m ) {
-							results.push( elem );
-							return results;
-						}
-					} else {
-						return results;
-					}
-				} else {
-					// Context is not a document
-					if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
-						contains( context, elem ) && elem.id === m ) {
-						results.push( elem );
-						return results;
-					}
-				}
-
-			// Speed-up: Sizzle("TAG")
-			} else if ( match[2] ) {
-				push.apply( results, context.getElementsByTagName( selector ) );
-				return results;
-
-			// Speed-up: Sizzle(".CLASS")
-			} else if ( (m = match[3]) && support.getElementsByClassName && context.getElementsByClassName ) {
-				push.apply( results, context.getElementsByClassName( m ) );
-				return results;
-			}
-		}
-
-		// QSA path
-		if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
-			nid = old = expando;
-			newContext = context;
-			newSelector = nodeType === 9 && selector;
-
-			// qSA works strangely on Element-rooted queries
-			// We can work around this by specifying an extra ID on the root
-			// and working up from there (Thanks to Andrew Dupont for the technique)
-			// IE 8 doesn't work on object elements
-			if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
-				groups = tokenize( selector );
-
-				if ( (old = context.getAttribute("id")) ) {
-					nid = old.replace( rescape, "\\$&" );
-				} else {
-					context.setAttribute( "id", nid );
-				}
-				nid = "[id='" + nid + "'] ";
-
-				i = groups.length;
-				while ( i-- ) {
-					groups[i] = nid + toSelector( groups[i] );
-				}
-				newContext = rsibling.test( selector ) && context.parentNode || context;
-				newSelector = groups.join(",");
-			}
-
-			if ( newSelector ) {
-				try {
-					push.apply( results,
-						newContext.querySelectorAll( newSelector )
-					);
-					return results;
-				} catch(qsaError) {
-				} finally {
-					if ( !old ) {
-						context.removeAttribute("id");
-					}
-				}
-			}
-		}
-	}
-
-	// All others
-	return select( selector.replace( rtrim, "$1" ), context, results, seed );
-}
-
-/**
- * Create key-value caches of limited size
- * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
- *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
- *	deleting the oldest entry
- */
-function createCache() {
-	var keys = [];
-
-	function cache( key, value ) {
-		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
-		if ( keys.push( key += " " ) > Expr.cacheLength ) {
-			// Only keep the most recent entries
-			delete cache[ keys.shift() ];
-		}
-		return (cache[ key ] = value);
-	}
-	return cache;
-}
-
-/**
- * Mark a function for special use by Sizzle
- * @param {Function} fn The function to mark
- */
-function markFunction( fn ) {
-	fn[ expando ] = true;
-	return fn;
-}
-
-/**
- * Support testing using an element
- * @param {Function} fn Passed the created div and expects a boolean result
- */
-function assert( fn ) {
-	var div = document.createElement("div");
-
-	try {
-		return !!fn( div );
-	} catch (e) {
-		return false;
-	} finally {
-		// Remove from its parent by default
-		if ( div.parentNode ) {
-			div.parentNode.removeChild( div );
-		}
-		// release memory in IE
-		div = null;
-	}
-}
-
-/**
- * Adds the same handler for all of the specified attrs
- * @param {String} attrs Pipe-separated list of attributes
- * @param {Function} handler The method that will be applied
- */
-function addHandle( attrs, handler ) {
-	var arr = attrs.split("|"),
-		i = attrs.length;
-
-	while ( i-- ) {
-		Expr.attrHandle[ arr[i] ] = handler;
-	}
-}
-
-/**
- * Checks document order of two siblings
- * @param {Element} a
- * @param {Element} b
- * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
- */
-function siblingCheck( a, b ) {
-	var cur = b && a,
-		diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
-			( ~b.sourceIndex || MAX_NEGATIVE ) -
-			( ~a.sourceIndex || MAX_NEGATIVE );
-
-	// Use IE sourceIndex if available on both nodes
-	if ( diff ) {
-		return diff;
-	}
-
-	// Check if b follows a
-	if ( cur ) {
-		while ( (cur = cur.nextSibling) ) {
-			if ( cur === b ) {
-				return -1;
-			}
-		}
-	}
-
-	return a ? 1 : -1;
-}
-
-/**
- * Returns a function to use in pseudos for input types
- * @param {String} type
- */
-function createInputPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return name === "input" && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for buttons
- * @param {String} type
- */
-function createButtonPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return (name === "input" || name === "button") && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for positionals
- * @param {Function} fn
- */
-function createPositionalPseudo( fn ) {
-	return markFunction(function( argument ) {
-		argument = +argument;
-		return markFunction(function( seed, matches ) {
-			var j,
-				matchIndexes = fn( [], seed.length, argument ),
-				i = matchIndexes.length;
-
-			// Match elements found at the specified indexes
-			while ( i-- ) {
-				if ( seed[ (j = matchIndexes[i]) ] ) {
-					seed[j] = !(matches[j] = seed[j]);
-				}
-			}
-		});
-	});
-}
-
-/**
- * Detect xml
- * @param {Element|Object} elem An element or a document
- */
-isXML = Sizzle.isXML = function( elem ) {
-	// documentElement is verified for cases where it doesn't yet exist
-	// (such as loading iframes in IE - #4833)
-	var documentElement = elem && (elem.ownerDocument || elem).documentElement;
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-// Expose support vars for convenience
-support = Sizzle.support = {};
-
-/**
- * Sets document-related variables once based on the current document
- * @param {Element|Object} [doc] An element or document object to use to set the document
- * @returns {Object} Returns the current document
- */
-setDocument = Sizzle.setDocument = function( node ) {
-	var doc = node ? node.ownerDocument || node : preferredDoc,
-		parent = doc.defaultView;
-
-	// If no document and documentElement is available, return
-	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
-		return document;
-	}
-
-	// Set our document
-	document = doc;
-	docElem = doc.documentElement;
-
-	// Support tests
-	documentIsHTML = !isXML( doc );
-
-	// Support: IE>8
-	// If iframe document is assigned to "document" variable and if iframe has been reloaded,
-	// IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936
-	// IE6-8 do not support the defaultView property so parent will be undefined
-	if ( parent && parent.attachEvent && parent !== parent.top ) {
-		parent.attachEvent( "onbeforeunload", function() {
-			setDocument();
-		});
-	}
-
-	/* Attributes
-	---------------------------------------------------------------------- */
-
-	// Support: IE<8
-	// Verify that getAttribute really returns attributes and not properties (excepting IE8 booleans)
-	support.attributes = assert(function( div ) {
-		div.className = "i";
-		return !div.getAttribute("className");
-	});
-
-	/* getElement(s)By*
-	---------------------------------------------------------------------- */
-
-	// Check if getElementsByTagName("*") returns only elements
-	support.getElementsByTagName = assert(function( div ) {
-		div.appendChild( doc.createComment("") );
-		return !div.getElementsByTagName("*").length;
-	});
-
-	// Check if getElementsByClassName can be trusted
-	support.getElementsByClassName = assert(function( div ) {
-		div.innerHTML = "
        ";
-
-		// Support: Safari<4
-		// Catch class over-caching
-		div.firstChild.className = "i";
-		// Support: Opera<10
-		// Catch gEBCN failure to find non-leading classes
-		return div.getElementsByClassName("i").length === 2;
-	});
-
-	// Support: IE<10
-	// Check if getElementById returns elements by name
-	// The broken getElementById methods don't pick up programatically-set names,
-	// so use a roundabout getElementsByName test
-	support.getById = assert(function( div ) {
-		docElem.appendChild( div ).id = expando;
-		return !doc.getElementsByName || !doc.getElementsByName( expando ).length;
-	});
-
-	// ID find and filter
-	if ( support.getById ) {
-		Expr.find["ID"] = function( id, context ) {
-			if ( typeof context.getElementById !== strundefined && documentIsHTML ) {
-				var m = context.getElementById( id );
-				// Check parentNode to catch when Blackberry 4.6 returns
-				// nodes that are no longer in the document #6963
-				return m && m.parentNode ? [m] : [];
-			}
-		};
-		Expr.filter["ID"] = function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				return elem.getAttribute("id") === attrId;
-			};
-		};
-	} else {
-		// Support: IE6/7
-		// getElementById is not reliable as a find shortcut
-		delete Expr.find["ID"];
-
-		Expr.filter["ID"] =  function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id");
-				return node && node.value === attrId;
-			};
-		};
-	}
-
-	// Tag
-	Expr.find["TAG"] = support.getElementsByTagName ?
-		function( tag, context ) {
-			if ( typeof context.getElementsByTagName !== strundefined ) {
-				return context.getElementsByTagName( tag );
-			}
-		} :
-		function( tag, context ) {
-			var elem,
-				tmp = [],
-				i = 0,
-				results = context.getElementsByTagName( tag );
-
-			// Filter out possible comments
-			if ( tag === "*" ) {
-				while ( (elem = results[i++]) ) {
-					if ( elem.nodeType === 1 ) {
-						tmp.push( elem );
-					}
-				}
-
-				return tmp;
-			}
-			return results;
-		};
-
-	// Class
-	Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
-		if ( typeof context.getElementsByClassName !== strundefined && documentIsHTML ) {
-			return context.getElementsByClassName( className );
-		}
-	};
-
-	/* QSA/matchesSelector
-	---------------------------------------------------------------------- */
-
-	// QSA and matchesSelector support
-
-	// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
-	rbuggyMatches = [];
-
-	// qSa(:focus) reports false when true (Chrome 21)
-	// We allow this because of a bug in IE8/9 that throws an error
-	// whenever `document.activeElement` is accessed on an iframe
-	// So, we allow :focus to pass through QSA all the time to avoid the IE error
-	// See http://bugs.jquery.com/ticket/13378
-	rbuggyQSA = [];
-
-	if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) {
-		// Build QSA regex
-		// Regex strategy adopted from Diego Perini
-		assert(function( div ) {
-			// Select is set to empty string on purpose
-			// This is to test IE's treatment of not explicitly
-			// setting a boolean content attribute,
-			// since its presence should be enough
-			// http://bugs.jquery.com/ticket/12359
-			div.innerHTML = "";
-
-			// Support: IE8
-			// Boolean attributes and "value" are not treated correctly
-			if ( !div.querySelectorAll("[selected]").length ) {
-				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
-			}
-
-			// Webkit/Opera - :checked should return selected option elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":checked").length ) {
-				rbuggyQSA.push(":checked");
-			}
-		});
-
-		assert(function( div ) {
-
-			// Support: Opera 10-12/IE8
-			// ^= $= *= and empty values
-			// Should not select anything
-			// Support: Windows 8 Native Apps
-			// The type attribute is restricted during .innerHTML assignment
-			var input = doc.createElement("input");
-			input.setAttribute( "type", "hidden" );
-			div.appendChild( input ).setAttribute( "t", "" );
-
-			if ( div.querySelectorAll("[t^='']").length ) {
-				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
-			}
-
-			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":enabled").length ) {
-				rbuggyQSA.push( ":enabled", ":disabled" );
-			}
-
-			// Opera 10-11 does not throw on post-comma invalid pseudos
-			div.querySelectorAll("*,:x");
-			rbuggyQSA.push(",.*:");
-		});
-	}
-
-	if ( (support.matchesSelector = rnative.test( (matches = docElem.webkitMatchesSelector ||
-		docElem.mozMatchesSelector ||
-		docElem.oMatchesSelector ||
-		docElem.msMatchesSelector) )) ) {
-
-		assert(function( div ) {
-			// Check to see if it's possible to do matchesSelector
-			// on a disconnected node (IE 9)
-			support.disconnectedMatch = matches.call( div, "div" );
-
-			// This should fail with an exception
-			// Gecko does not error, returns false instead
-			matches.call( div, "[s!='']:x" );
-			rbuggyMatches.push( "!=", pseudos );
-		});
-	}
-
-	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
-	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
-
-	/* Contains
-	---------------------------------------------------------------------- */
-
-	// Element contains another
-	// Purposefully does not implement inclusive descendent
-	// As in, an element does not contain itself
-	contains = rnative.test( docElem.contains ) || docElem.compareDocumentPosition ?
-		function( a, b ) {
-			var adown = a.nodeType === 9 ? a.documentElement : a,
-				bup = b && b.parentNode;
-			return a === bup || !!( bup && bup.nodeType === 1 && (
-				adown.contains ?
-					adown.contains( bup ) :
-					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
-			));
-		} :
-		function( a, b ) {
-			if ( b ) {
-				while ( (b = b.parentNode) ) {
-					if ( b === a ) {
-						return true;
-					}
-				}
-			}
-			return false;
-		};
-
-	/* Sorting
-	---------------------------------------------------------------------- */
-
-	// Document order sorting
-	sortOrder = docElem.compareDocumentPosition ?
-	function( a, b ) {
-
-		// Flag for duplicate removal
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		var compare = b.compareDocumentPosition && a.compareDocumentPosition && a.compareDocumentPosition( b );
-
-		if ( compare ) {
-			// Disconnected nodes
-			if ( compare & 1 ||
-				(!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
-
-				// Choose the first element that is related to our preferred document
-				if ( a === doc || contains(preferredDoc, a) ) {
-					return -1;
-				}
-				if ( b === doc || contains(preferredDoc, b) ) {
-					return 1;
-				}
-
-				// Maintain original order
-				return sortInput ?
-					( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
-					0;
-			}
-
-			return compare & 4 ? -1 : 1;
-		}
-
-		// Not directly comparable, sort on existence of method
-		return a.compareDocumentPosition ? -1 : 1;
-	} :
-	function( a, b ) {
-		var cur,
-			i = 0,
-			aup = a.parentNode,
-			bup = b.parentNode,
-			ap = [ a ],
-			bp = [ b ];
-
-		// Exit early if the nodes are identical
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-
-		// Parentless nodes are either documents or disconnected
-		} else if ( !aup || !bup ) {
-			return a === doc ? -1 :
-				b === doc ? 1 :
-				aup ? -1 :
-				bup ? 1 :
-				sortInput ?
-				( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
-				0;
-
-		// If the nodes are siblings, we can do a quick check
-		} else if ( aup === bup ) {
-			return siblingCheck( a, b );
-		}
-
-		// Otherwise we need full lists of their ancestors for comparison
-		cur = a;
-		while ( (cur = cur.parentNode) ) {
-			ap.unshift( cur );
-		}
-		cur = b;
-		while ( (cur = cur.parentNode) ) {
-			bp.unshift( cur );
-		}
-
-		// Walk down the tree looking for a discrepancy
-		while ( ap[i] === bp[i] ) {
-			i++;
-		}
-
-		return i ?
-			// Do a sibling check if the nodes have a common ancestor
-			siblingCheck( ap[i], bp[i] ) :
-
-			// Otherwise nodes in our document sort first
-			ap[i] === preferredDoc ? -1 :
-			bp[i] === preferredDoc ? 1 :
-			0;
-	};
-
-	return doc;
-};
-
-Sizzle.matches = function( expr, elements ) {
-	return Sizzle( expr, null, null, elements );
-};
-
-Sizzle.matchesSelector = function( elem, expr ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	// Make sure that attribute selectors are quoted
-	expr = expr.replace( rattributeQuotes, "='$1']" );
-
-	if ( support.matchesSelector && documentIsHTML &&
-		( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
-		( !rbuggyQSA     || !rbuggyQSA.test( expr ) ) ) {
-
-		try {
-			var ret = matches.call( elem, expr );
-
-			// IE 9's matchesSelector returns false on disconnected nodes
-			if ( ret || support.disconnectedMatch ||
-					// As well, disconnected nodes are said to be in a document
-					// fragment in IE 9
-					elem.document && elem.document.nodeType !== 11 ) {
-				return ret;
-			}
-		} catch(e) {}
-	}
-
-	return Sizzle( expr, document, null, [elem] ).length > 0;
-};
-
-Sizzle.contains = function( context, elem ) {
-	// Set document vars if needed
-	if ( ( context.ownerDocument || context ) !== document ) {
-		setDocument( context );
-	}
-	return contains( context, elem );
-};
-
-Sizzle.attr = function( elem, name ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	var fn = Expr.attrHandle[ name.toLowerCase() ],
-		// Don't get fooled by Object.prototype properties (jQuery #13807)
-		val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
-			fn( elem, name, !documentIsHTML ) :
-			undefined;
-
-	return val === undefined ?
-		support.attributes || !documentIsHTML ?
-			elem.getAttribute( name ) :
-			(val = elem.getAttributeNode(name)) && val.specified ?
-				val.value :
-				null :
-		val;
-};
-
-Sizzle.error = function( msg ) {
-	throw new Error( "Syntax error, unrecognized expression: " + msg );
-};
-
-/**
- * Document sorting and removing duplicates
- * @param {ArrayLike} results
- */
-Sizzle.uniqueSort = function( results ) {
-	var elem,
-		duplicates = [],
-		j = 0,
-		i = 0;
-
-	// Unless we *know* we can detect duplicates, assume their presence
-	hasDuplicate = !support.detectDuplicates;
-	sortInput = !support.sortStable && results.slice( 0 );
-	results.sort( sortOrder );
-
-	if ( hasDuplicate ) {
-		while ( (elem = results[i++]) ) {
-			if ( elem === results[ i ] ) {
-				j = duplicates.push( i );
-			}
-		}
-		while ( j-- ) {
-			results.splice( duplicates[ j ], 1 );
-		}
-	}
-
-	return results;
-};
-
-/**
- * Utility function for retrieving the text value of an array of DOM nodes
- * @param {Array|Element} elem
- */
-getText = Sizzle.getText = function( elem ) {
-	var node,
-		ret = "",
-		i = 0,
-		nodeType = elem.nodeType;
-
-	if ( !nodeType ) {
-		// If no nodeType, this is expected to be an array
-		for ( ; (node = elem[i]); i++ ) {
-			// Do not traverse comment nodes
-			ret += getText( node );
-		}
-	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
-		// Use textContent for elements
-		// innerText usage removed for consistency of new lines (see #11153)
-		if ( typeof elem.textContent === "string" ) {
-			return elem.textContent;
-		} else {
-			// Traverse its children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				ret += getText( elem );
-			}
-		}
-	} else if ( nodeType === 3 || nodeType === 4 ) {
-		return elem.nodeValue;
-	}
-	// Do not include comment or processing instruction nodes
-
-	return ret;
-};
-
-Expr = Sizzle.selectors = {
-
-	// Can be adjusted by the user
-	cacheLength: 50,
-
-	createPseudo: markFunction,
-
-	match: matchExpr,
-
-	attrHandle: {},
-
-	find: {},
-
-	relative: {
-		">": { dir: "parentNode", first: true },
-		" ": { dir: "parentNode" },
-		"+": { dir: "previousSibling", first: true },
-		"~": { dir: "previousSibling" }
-	},
-
-	preFilter: {
-		"ATTR": function( match ) {
-			match[1] = match[1].replace( runescape, funescape );
-
-			// Move the given value to match[3] whether quoted or unquoted
-			match[3] = ( match[4] || match[5] || "" ).replace( runescape, funescape );
-
-			if ( match[2] === "~=" ) {
-				match[3] = " " + match[3] + " ";
-			}
-
-			return match.slice( 0, 4 );
-		},
-
-		"CHILD": function( match ) {
-			/* matches from matchExpr["CHILD"]
-				1 type (only|nth|...)
-				2 what (child|of-type)
-				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
-				4 xn-component of xn+y argument ([+-]?\d*n|)
-				5 sign of xn-component
-				6 x of xn-component
-				7 sign of y-component
-				8 y of y-component
-			*/
-			match[1] = match[1].toLowerCase();
-
-			if ( match[1].slice( 0, 3 ) === "nth" ) {
-				// nth-* requires argument
-				if ( !match[3] ) {
-					Sizzle.error( match[0] );
-				}
-
-				// numeric x and y parameters for Expr.filter.CHILD
-				// remember that false/true cast respectively to 0/1
-				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
-				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
-
-			// other types prohibit arguments
-			} else if ( match[3] ) {
-				Sizzle.error( match[0] );
-			}
-
-			return match;
-		},
-
-		"PSEUDO": function( match ) {
-			var excess,
-				unquoted = !match[5] && match[2];
-
-			if ( matchExpr["CHILD"].test( match[0] ) ) {
-				return null;
-			}
-
-			// Accept quoted arguments as-is
-			if ( match[3] && match[4] !== undefined ) {
-				match[2] = match[4];
-
-			// Strip excess characters from unquoted arguments
-			} else if ( unquoted && rpseudo.test( unquoted ) &&
-				// Get excess from tokenize (recursively)
-				(excess = tokenize( unquoted, true )) &&
-				// advance to the next closing parenthesis
-				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
-
-				// excess is a negative index
-				match[0] = match[0].slice( 0, excess );
-				match[2] = unquoted.slice( 0, excess );
-			}
-
-			// Return only captures needed by the pseudo filter method (type and argument)
-			return match.slice( 0, 3 );
-		}
-	},
-
-	filter: {
-
-		"TAG": function( nodeNameSelector ) {
-			var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
-			return nodeNameSelector === "*" ?
-				function() { return true; } :
-				function( elem ) {
-					return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
-				};
-		},
-
-		"CLASS": function( className ) {
-			var pattern = classCache[ className + " " ];
-
-			return pattern ||
-				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
-				classCache( className, function( elem ) {
-					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== strundefined && elem.getAttribute("class") || "" );
-				});
-		},
-
-		"ATTR": function( name, operator, check ) {
-			return function( elem ) {
-				var result = Sizzle.attr( elem, name );
-
-				if ( result == null ) {
-					return operator === "!=";
-				}
-				if ( !operator ) {
-					return true;
-				}
-
-				result += "";
-
-				return operator === "=" ? result === check :
-					operator === "!=" ? result !== check :
-					operator === "^=" ? check && result.indexOf( check ) === 0 :
-					operator === "*=" ? check && result.indexOf( check ) > -1 :
-					operator === "$=" ? check && result.slice( -check.length ) === check :
-					operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 :
-					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
-					false;
-			};
-		},
-
-		"CHILD": function( type, what, argument, first, last ) {
-			var simple = type.slice( 0, 3 ) !== "nth",
-				forward = type.slice( -4 ) !== "last",
-				ofType = what === "of-type";
-
-			return first === 1 && last === 0 ?
-
-				// Shortcut for :nth-*(n)
-				function( elem ) {
-					return !!elem.parentNode;
-				} :
-
-				function( elem, context, xml ) {
-					var cache, outerCache, node, diff, nodeIndex, start,
-						dir = simple !== forward ? "nextSibling" : "previousSibling",
-						parent = elem.parentNode,
-						name = ofType && elem.nodeName.toLowerCase(),
-						useCache = !xml && !ofType;
-
-					if ( parent ) {
-
-						// :(first|last|only)-(child|of-type)
-						if ( simple ) {
-							while ( dir ) {
-								node = elem;
-								while ( (node = node[ dir ]) ) {
-									if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) {
-										return false;
-									}
-								}
-								// Reverse direction for :only-* (if we haven't yet done so)
-								start = dir = type === "only" && !start && "nextSibling";
-							}
-							return true;
-						}
-
-						start = [ forward ? parent.firstChild : parent.lastChild ];
-
-						// non-xml :nth-child(...) stores cache data on `parent`
-						if ( forward && useCache ) {
-							// Seek `elem` from a previously-cached index
-							outerCache = parent[ expando ] || (parent[ expando ] = {});
-							cache = outerCache[ type ] || [];
-							nodeIndex = cache[0] === dirruns && cache[1];
-							diff = cache[0] === dirruns && cache[2];
-							node = nodeIndex && parent.childNodes[ nodeIndex ];
-
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-
-								// Fallback to seeking `elem` from the start
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								// When found, cache indexes on `parent` and break
-								if ( node.nodeType === 1 && ++diff && node === elem ) {
-									outerCache[ type ] = [ dirruns, nodeIndex, diff ];
-									break;
-								}
-							}
-
-						// Use previously-cached element index if available
-						} else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) {
-							diff = cache[1];
-
-						// xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...)
-						} else {
-							// Use the same loop as above to seek `elem` from the start
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) {
-									// Cache the index of each encountered element
-									if ( useCache ) {
-										(node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ];
-									}
-
-									if ( node === elem ) {
-										break;
-									}
-								}
-							}
-						}
-
-						// Incorporate the offset, then check against cycle size
-						diff -= last;
-						return diff === first || ( diff % first === 0 && diff / first >= 0 );
-					}
-				};
-		},
-
-		"PSEUDO": function( pseudo, argument ) {
-			// pseudo-class names are case-insensitive
-			// http://www.w3.org/TR/selectors/#pseudo-classes
-			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
-			// Remember that setFilters inherits from pseudos
-			var args,
-				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
-					Sizzle.error( "unsupported pseudo: " + pseudo );
-
-			// The user may use createPseudo to indicate that
-			// arguments are needed to create the filter function
-			// just as Sizzle does
-			if ( fn[ expando ] ) {
-				return fn( argument );
-			}
-
-			// But maintain support for old signatures
-			if ( fn.length > 1 ) {
-				args = [ pseudo, pseudo, "", argument ];
-				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
-					markFunction(function( seed, matches ) {
-						var idx,
-							matched = fn( seed, argument ),
-							i = matched.length;
-						while ( i-- ) {
-							idx = indexOf.call( seed, matched[i] );
-							seed[ idx ] = !( matches[ idx ] = matched[i] );
-						}
-					}) :
-					function( elem ) {
-						return fn( elem, 0, args );
-					};
-			}
-
-			return fn;
-		}
-	},
-
-	pseudos: {
-		// Potentially complex pseudos
-		"not": markFunction(function( selector ) {
-			// Trim the selector passed to compile
-			// to avoid treating leading and trailing
-			// spaces as combinators
-			var input = [],
-				results = [],
-				matcher = compile( selector.replace( rtrim, "$1" ) );
-
-			return matcher[ expando ] ?
-				markFunction(function( seed, matches, context, xml ) {
-					var elem,
-						unmatched = matcher( seed, null, xml, [] ),
-						i = seed.length;
-
-					// Match elements unmatched by `matcher`
-					while ( i-- ) {
-						if ( (elem = unmatched[i]) ) {
-							seed[i] = !(matches[i] = elem);
-						}
-					}
-				}) :
-				function( elem, context, xml ) {
-					input[0] = elem;
-					matcher( input, null, xml, results );
-					return !results.pop();
-				};
-		}),
-
-		"has": markFunction(function( selector ) {
-			return function( elem ) {
-				return Sizzle( selector, elem ).length > 0;
-			};
-		}),
-
-		"contains": markFunction(function( text ) {
-			return function( elem ) {
-				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
-			};
-		}),
-
-		// "Whether an element is represented by a :lang() selector
-		// is based solely on the element's language value
-		// being equal to the identifier C,
-		// or beginning with the identifier C immediately followed by "-".
-		// The matching of C against the element's language value is performed case-insensitively.
-		// The identifier C does not have to be a valid language name."
-		// http://www.w3.org/TR/selectors/#lang-pseudo
-		"lang": markFunction( function( lang ) {
-			// lang value must be a valid identifier
-			if ( !ridentifier.test(lang || "") ) {
-				Sizzle.error( "unsupported lang: " + lang );
-			}
-			lang = lang.replace( runescape, funescape ).toLowerCase();
-			return function( elem ) {
-				var elemLang;
-				do {
-					if ( (elemLang = documentIsHTML ?
-						elem.lang :
-						elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
-
-						elemLang = elemLang.toLowerCase();
-						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
-					}
-				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
-				return false;
-			};
-		}),
-
-		// Miscellaneous
-		"target": function( elem ) {
-			var hash = window.location && window.location.hash;
-			return hash && hash.slice( 1 ) === elem.id;
-		},
-
-		"root": function( elem ) {
-			return elem === docElem;
-		},
-
-		"focus": function( elem ) {
-			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
-		},
-
-		// Boolean properties
-		"enabled": function( elem ) {
-			return elem.disabled === false;
-		},
-
-		"disabled": function( elem ) {
-			return elem.disabled === true;
-		},
-
-		"checked": function( elem ) {
-			// In CSS3, :checked should return both checked and selected elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			var nodeName = elem.nodeName.toLowerCase();
-			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
-		},
-
-		"selected": function( elem ) {
-			// Accessing this property makes selected-by-default
-			// options in Safari work properly
-			if ( elem.parentNode ) {
-				elem.parentNode.selectedIndex;
-			}
-
-			return elem.selected === true;
-		},
-
-		// Contents
-		"empty": function( elem ) {
-			// http://www.w3.org/TR/selectors/#empty-pseudo
-			// :empty is only affected by element nodes and content nodes(including text(3), cdata(4)),
-			//   not comment, processing instructions, or others
-			// Thanks to Diego Perini for the nodeName shortcut
-			//   Greater than "@" means alpha characters (specifically not starting with "#" or "?")
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				if ( elem.nodeName > "@" || elem.nodeType === 3 || elem.nodeType === 4 ) {
-					return false;
-				}
-			}
-			return true;
-		},
-
-		"parent": function( elem ) {
-			return !Expr.pseudos["empty"]( elem );
-		},
-
-		// Element/input types
-		"header": function( elem ) {
-			return rheader.test( elem.nodeName );
-		},
-
-		"input": function( elem ) {
-			return rinputs.test( elem.nodeName );
-		},
-
-		"button": function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return name === "input" && elem.type === "button" || name === "button";
-		},
-
-		"text": function( elem ) {
-			var attr;
-			// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc)
-			// use getAttribute instead to test this case
-			return elem.nodeName.toLowerCase() === "input" &&
-				elem.type === "text" &&
-				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === elem.type );
-		},
-
-		// Position-in-collection
-		"first": createPositionalPseudo(function() {
-			return [ 0 ];
-		}),
-
-		"last": createPositionalPseudo(function( matchIndexes, length ) {
-			return [ length - 1 ];
-		}),
-
-		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			return [ argument < 0 ? argument + length : argument ];
-		}),
-
-		"even": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 0;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"odd": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 1;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; --i >= 0; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; ++i < length; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		})
-	}
-};
-
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
-
-// Add button/input type pseudos
-for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
-	Expr.pseudos[ i ] = createInputPseudo( i );
-}
-for ( i in { submit: true, reset: true } ) {
-	Expr.pseudos[ i ] = createButtonPseudo( i );
-}
-
-// Easy API for creating new setFilters
-function setFilters() {}
-setFilters.prototype = Expr.filters = Expr.pseudos;
-Expr.setFilters = new setFilters();
-
-function tokenize( selector, parseOnly ) {
-	var matched, match, tokens, type,
-		soFar, groups, preFilters,
-		cached = tokenCache[ selector + " " ];
-
-	if ( cached ) {
-		return parseOnly ? 0 : cached.slice( 0 );
-	}
-
-	soFar = selector;
-	groups = [];
-	preFilters = Expr.preFilter;
-
-	while ( soFar ) {
-
-		// Comma and first run
-		if ( !matched || (match = rcomma.exec( soFar )) ) {
-			if ( match ) {
-				// Don't consume trailing commas as valid
-				soFar = soFar.slice( match[0].length ) || soFar;
-			}
-			groups.push( tokens = [] );
-		}
-
-		matched = false;
-
-		// Combinators
-		if ( (match = rcombinators.exec( soFar )) ) {
-			matched = match.shift();
-			tokens.push({
-				value: matched,
-				// Cast descendant combinators to space
-				type: match[0].replace( rtrim, " " )
-			});
-			soFar = soFar.slice( matched.length );
-		}
-
-		// Filters
-		for ( type in Expr.filter ) {
-			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
-				(match = preFilters[ type ]( match ))) ) {
-				matched = match.shift();
-				tokens.push({
-					value: matched,
-					type: type,
-					matches: match
-				});
-				soFar = soFar.slice( matched.length );
-			}
-		}
-
-		if ( !matched ) {
-			break;
-		}
-	}
-
-	// Return the length of the invalid excess
-	// if we're just parsing
-	// Otherwise, throw an error or return tokens
-	return parseOnly ?
-		soFar.length :
-		soFar ?
-			Sizzle.error( selector ) :
-			// Cache the tokens
-			tokenCache( selector, groups ).slice( 0 );
-}
-
-function toSelector( tokens ) {
-	var i = 0,
-		len = tokens.length,
-		selector = "";
-	for ( ; i < len; i++ ) {
-		selector += tokens[i].value;
-	}
-	return selector;
-}
-
-function addCombinator( matcher, combinator, base ) {
-	var dir = combinator.dir,
-		checkNonElements = base && dir === "parentNode",
-		doneName = done++;
-
-	return combinator.first ?
-		// Check against closest ancestor/preceding element
-		function( elem, context, xml ) {
-			while ( (elem = elem[ dir ]) ) {
-				if ( elem.nodeType === 1 || checkNonElements ) {
-					return matcher( elem, context, xml );
-				}
-			}
-		} :
-
-		// Check against all ancestor/preceding elements
-		function( elem, context, xml ) {
-			var data, cache, outerCache,
-				dirkey = dirruns + " " + doneName;
-
-			// We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
-			if ( xml ) {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						if ( matcher( elem, context, xml ) ) {
-							return true;
-						}
-					}
-				}
-			} else {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						outerCache = elem[ expando ] || (elem[ expando ] = {});
-						if ( (cache = outerCache[ dir ]) && cache[0] === dirkey ) {
-							if ( (data = cache[1]) === true || data === cachedruns ) {
-								return data === true;
-							}
-						} else {
-							cache = outerCache[ dir ] = [ dirkey ];
-							cache[1] = matcher( elem, context, xml ) || cachedruns;
-							if ( cache[1] === true ) {
-								return true;
-							}
-						}
-					}
-				}
-			}
-		};
-}
-
-function elementMatcher( matchers ) {
-	return matchers.length > 1 ?
-		function( elem, context, xml ) {
-			var i = matchers.length;
-			while ( i-- ) {
-				if ( !matchers[i]( elem, context, xml ) ) {
-					return false;
-				}
-			}
-			return true;
-		} :
-		matchers[0];
-}
-
-function condense( unmatched, map, filter, context, xml ) {
-	var elem,
-		newUnmatched = [],
-		i = 0,
-		len = unmatched.length,
-		mapped = map != null;
-
-	for ( ; i < len; i++ ) {
-		if ( (elem = unmatched[i]) ) {
-			if ( !filter || filter( elem, context, xml ) ) {
-				newUnmatched.push( elem );
-				if ( mapped ) {
-					map.push( i );
-				}
-			}
-		}
-	}
-
-	return newUnmatched;
-}
-
-function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
-	if ( postFilter && !postFilter[ expando ] ) {
-		postFilter = setMatcher( postFilter );
-	}
-	if ( postFinder && !postFinder[ expando ] ) {
-		postFinder = setMatcher( postFinder, postSelector );
-	}
-	return markFunction(function( seed, results, context, xml ) {
-		var temp, i, elem,
-			preMap = [],
-			postMap = [],
-			preexisting = results.length,
-
-			// Get initial elements from seed or context
-			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
-
-			// Prefilter to get matcher input, preserving a map for seed-results synchronization
-			matcherIn = preFilter && ( seed || !selector ) ?
-				condense( elems, preMap, preFilter, context, xml ) :
-				elems,
-
-			matcherOut = matcher ?
-				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
-				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
-
-					// ...intermediate processing is necessary
-					[] :
-
-					// ...otherwise use results directly
-					results :
-				matcherIn;
-
-		// Find primary matches
-		if ( matcher ) {
-			matcher( matcherIn, matcherOut, context, xml );
-		}
-
-		// Apply postFilter
-		if ( postFilter ) {
-			temp = condense( matcherOut, postMap );
-			postFilter( temp, [], context, xml );
-
-			// Un-match failing elements by moving them back to matcherIn
-			i = temp.length;
-			while ( i-- ) {
-				if ( (elem = temp[i]) ) {
-					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
-				}
-			}
-		}
-
-		if ( seed ) {
-			if ( postFinder || preFilter ) {
-				if ( postFinder ) {
-					// Get the final matcherOut by condensing this intermediate into postFinder contexts
-					temp = [];
-					i = matcherOut.length;
-					while ( i-- ) {
-						if ( (elem = matcherOut[i]) ) {
-							// Restore matcherIn since elem is not yet a final match
-							temp.push( (matcherIn[i] = elem) );
-						}
-					}
-					postFinder( null, (matcherOut = []), temp, xml );
-				}
-
-				// Move matched elements from seed to results to keep them synchronized
-				i = matcherOut.length;
-				while ( i-- ) {
-					if ( (elem = matcherOut[i]) &&
-						(temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) {
-
-						seed[temp] = !(results[temp] = elem);
-					}
-				}
-			}
-
-		// Add elements to results, through postFinder if defined
-		} else {
-			matcherOut = condense(
-				matcherOut === results ?
-					matcherOut.splice( preexisting, matcherOut.length ) :
-					matcherOut
-			);
-			if ( postFinder ) {
-				postFinder( null, results, matcherOut, xml );
-			} else {
-				push.apply( results, matcherOut );
-			}
-		}
-	});
-}
-
-function matcherFromTokens( tokens ) {
-	var checkContext, matcher, j,
-		len = tokens.length,
-		leadingRelative = Expr.relative[ tokens[0].type ],
-		implicitRelative = leadingRelative || Expr.relative[" "],
-		i = leadingRelative ? 1 : 0,
-
-		// The foundational matcher ensures that elements are reachable from top-level context(s)
-		matchContext = addCombinator( function( elem ) {
-			return elem === checkContext;
-		}, implicitRelative, true ),
-		matchAnyContext = addCombinator( function( elem ) {
-			return indexOf.call( checkContext, elem ) > -1;
-		}, implicitRelative, true ),
-		matchers = [ function( elem, context, xml ) {
-			return ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
-				(checkContext = context).nodeType ?
-					matchContext( elem, context, xml ) :
-					matchAnyContext( elem, context, xml ) );
-		} ];
-
-	for ( ; i < len; i++ ) {
-		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
-			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
-		} else {
-			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
-
-			// Return special upon seeing a positional matcher
-			if ( matcher[ expando ] ) {
-				// Find the next relative operator (if any) for proper handling
-				j = ++i;
-				for ( ; j < len; j++ ) {
-					if ( Expr.relative[ tokens[j].type ] ) {
-						break;
-					}
-				}
-				return setMatcher(
-					i > 1 && elementMatcher( matchers ),
-					i > 1 && toSelector(
-						// If the preceding token was a descendant combinator, insert an implicit any-element `*`
-						tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
-					).replace( rtrim, "$1" ),
-					matcher,
-					i < j && matcherFromTokens( tokens.slice( i, j ) ),
-					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
-					j < len && toSelector( tokens )
-				);
-			}
-			matchers.push( matcher );
-		}
-	}
-
-	return elementMatcher( matchers );
-}
-
-function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
-	// A counter to specify which element is currently being matched
-	var matcherCachedRuns = 0,
-		bySet = setMatchers.length > 0,
-		byElement = elementMatchers.length > 0,
-		superMatcher = function( seed, context, xml, results, expandContext ) {
-			var elem, j, matcher,
-				setMatched = [],
-				matchedCount = 0,
-				i = "0",
-				unmatched = seed && [],
-				outermost = expandContext != null,
-				contextBackup = outermostContext,
-				// We must always have either seed elements or context
-				elems = seed || byElement && Expr.find["TAG"]( "*", expandContext && context.parentNode || context ),
-				// Use integer dirruns iff this is the outermost matcher
-				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1);
-
-			if ( outermost ) {
-				outermostContext = context !== document && context;
-				cachedruns = matcherCachedRuns;
-			}
-
-			// Add elements passing elementMatchers directly to results
-			// Keep `i` a string if there are no elements so `matchedCount` will be "00" below
-			for ( ; (elem = elems[i]) != null; i++ ) {
-				if ( byElement && elem ) {
-					j = 0;
-					while ( (matcher = elementMatchers[j++]) ) {
-						if ( matcher( elem, context, xml ) ) {
-							results.push( elem );
-							break;
-						}
-					}
-					if ( outermost ) {
-						dirruns = dirrunsUnique;
-						cachedruns = ++matcherCachedRuns;
-					}
-				}
-
-				// Track unmatched elements for set filters
-				if ( bySet ) {
-					// They will have gone through all possible matchers
-					if ( (elem = !matcher && elem) ) {
-						matchedCount--;
-					}
-
-					// Lengthen the array for every element, matched or not
-					if ( seed ) {
-						unmatched.push( elem );
-					}
-				}
-			}
-
-			// Apply set filters to unmatched elements
-			matchedCount += i;
-			if ( bySet && i !== matchedCount ) {
-				j = 0;
-				while ( (matcher = setMatchers[j++]) ) {
-					matcher( unmatched, setMatched, context, xml );
-				}
-
-				if ( seed ) {
-					// Reintegrate element matches to eliminate the need for sorting
-					if ( matchedCount > 0 ) {
-						while ( i-- ) {
-							if ( !(unmatched[i] || setMatched[i]) ) {
-								setMatched[i] = pop.call( results );
-							}
-						}
-					}
-
-					// Discard index placeholder values to get only actual matches
-					setMatched = condense( setMatched );
-				}
-
-				// Add matches to results
-				push.apply( results, setMatched );
-
-				// Seedless set matches succeeding multiple successful matchers stipulate sorting
-				if ( outermost && !seed && setMatched.length > 0 &&
-					( matchedCount + setMatchers.length ) > 1 ) {
-
-					Sizzle.uniqueSort( results );
-				}
-			}
-
-			// Override manipulation of globals by nested matchers
-			if ( outermost ) {
-				dirruns = dirrunsUnique;
-				outermostContext = contextBackup;
-			}
-
-			return unmatched;
-		};
-
-	return bySet ?
-		markFunction( superMatcher ) :
-		superMatcher;
-}
-
-compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) {
-	var i,
-		setMatchers = [],
-		elementMatchers = [],
-		cached = compilerCache[ selector + " " ];
-
-	if ( !cached ) {
-		// Generate a function of recursive functions that can be used to check each element
-		if ( !group ) {
-			group = tokenize( selector );
-		}
-		i = group.length;
-		while ( i-- ) {
-			cached = matcherFromTokens( group[i] );
-			if ( cached[ expando ] ) {
-				setMatchers.push( cached );
-			} else {
-				elementMatchers.push( cached );
-			}
-		}
-
-		// Cache the compiled function
-		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
-	}
-	return cached;
-};
-
-function multipleContexts( selector, contexts, results ) {
-	var i = 0,
-		len = contexts.length;
-	for ( ; i < len; i++ ) {
-		Sizzle( selector, contexts[i], results );
-	}
-	return results;
-}
-
-function select( selector, context, results, seed ) {
-	var i, tokens, token, type, find,
-		match = tokenize( selector );
-
-	if ( !seed ) {
-		// Try to minimize operations if there is only one group
-		if ( match.length === 1 ) {
-
-			// Take a shortcut and set the context if the root selector is an ID
-			tokens = match[0] = match[0].slice( 0 );
-			if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
-					support.getById && context.nodeType === 9 && documentIsHTML &&
-					Expr.relative[ tokens[1].type ] ) {
-
-				context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
-				if ( !context ) {
-					return results;
-				}
-				selector = selector.slice( tokens.shift().value.length );
-			}
-
-			// Fetch a seed set for right-to-left matching
-			i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
-			while ( i-- ) {
-				token = tokens[i];
-
-				// Abort if we hit a combinator
-				if ( Expr.relative[ (type = token.type) ] ) {
-					break;
-				}
-				if ( (find = Expr.find[ type ]) ) {
-					// Search, expanding context for leading sibling combinators
-					if ( (seed = find(
-						token.matches[0].replace( runescape, funescape ),
-						rsibling.test( tokens[0].type ) && context.parentNode || context
-					)) ) {
-
-						// If seed is empty or no tokens remain, we can return early
-						tokens.splice( i, 1 );
-						selector = seed.length && toSelector( tokens );
-						if ( !selector ) {
-							push.apply( results, seed );
-							return results;
-						}
-
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	// Compile and execute a filtering function
-	// Provide `match` to avoid retokenization if we modified the selector above
-	compile( selector, match )(
-		seed,
-		context,
-		!documentIsHTML,
-		results,
-		rsibling.test( selector )
-	);
-	return results;
-}
-
-// One-time assignments
-
-// Sort stability
-support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
-
-// Support: Chrome<14
-// Always assume duplicates if they aren't passed to the comparison function
-support.detectDuplicates = hasDuplicate;
-
-// Initialize against the default document
-setDocument();
-
-// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
-// Detached nodes confoundingly follow *each other*
-support.sortDetached = assert(function( div1 ) {
-	// Should return 1, but returns 4 (following)
-	return div1.compareDocumentPosition( document.createElement("div") ) & 1;
-});
-
-// Support: IE<8
-// Prevent attribute/property "interpolation"
-// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !assert(function( div ) {
-	div.innerHTML = "";
-	return div.firstChild.getAttribute("href") === "#" ;
-}) ) {
-	addHandle( "type|href|height|width", function( elem, name, isXML ) {
-		if ( !isXML ) {
-			return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
-		}
-	});
-}
-
-// Support: IE<9
-// Use defaultValue in place of getAttribute("value")
-if ( !support.attributes || !assert(function( div ) {
-	div.innerHTML = "";
-	div.firstChild.setAttribute( "value", "" );
-	return div.firstChild.getAttribute( "value" ) === "";
-}) ) {
-	addHandle( "value", function( elem, name, isXML ) {
-		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
-			return elem.defaultValue;
-		}
-	});
-}
-
-// Support: IE<9
-// Use getAttributeNode to fetch booleans when getAttribute lies
-if ( !assert(function( div ) {
-	return div.getAttribute("disabled") == null;
-}) ) {
-	addHandle( booleans, function( elem, name, isXML ) {
-		var val;
-		if ( !isXML ) {
-			return (val = elem.getAttributeNode( name )) && val.specified ?
-				val.value :
-				elem[ name ] === true ? name.toLowerCase() : null;
-		}
-	});
-}
-
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.pseudos;
-jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-
-
-})( window );
-// String to Object options format cache
-var optionsCache = {};
-
-// Convert String-formatted options into Object-formatted ones and store in cache
-function createOptions( options ) {
-	var object = optionsCache[ options ] = {};
-	jQuery.each( options.match( core_rnotwhite ) || [], function( _, flag ) {
-		object[ flag ] = true;
-	});
-	return object;
-}
-
-/*
- * Create a callback list using the following parameters:
- *
- *	options: an optional list of space-separated options that will change how
- *			the callback list behaves or a more traditional option object
- *
- * By default a callback list will act like an event callback list and can be
- * "fired" multiple times.
- *
- * Possible options:
- *
- *	once:			will ensure the callback list can only be fired once (like a Deferred)
- *
- *	memory:			will keep track of previous values and will call any callback added
- *					after the list has been fired right away with the latest "memorized"
- *					values (like a Deferred)
- *
- *	unique:			will ensure a callback can only be added once (no duplicate in the list)
- *
- *	stopOnFalse:	interrupt callings when a callback returns false
- *
- */
-jQuery.Callbacks = function( options ) {
-
-	// Convert options from String-formatted to Object-formatted if needed
-	// (we check in cache first)
-	options = typeof options === "string" ?
-		( optionsCache[ options ] || createOptions( options ) ) :
-		jQuery.extend( {}, options );
-
-	var // Flag to know if list is currently firing
-		firing,
-		// Last fire value (for non-forgettable lists)
-		memory,
-		// Flag to know if list was already fired
-		fired,
-		// End of the loop when firing
-		firingLength,
-		// Index of currently firing callback (modified by remove if needed)
-		firingIndex,
-		// First callback to fire (used internally by add and fireWith)
-		firingStart,
-		// Actual callback list
-		list = [],
-		// Stack of fire calls for repeatable lists
-		stack = !options.once && [],
-		// Fire callbacks
-		fire = function( data ) {
-			memory = options.memory && data;
-			fired = true;
-			firingIndex = firingStart || 0;
-			firingStart = 0;
-			firingLength = list.length;
-			firing = true;
-			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
-				if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
-					memory = false; // To prevent further calls using add
-					break;
-				}
-			}
-			firing = false;
-			if ( list ) {
-				if ( stack ) {
-					if ( stack.length ) {
-						fire( stack.shift() );
-					}
-				} else if ( memory ) {
-					list = [];
-				} else {
-					self.disable();
-				}
-			}
-		},
-		// Actual Callbacks object
-		self = {
-			// Add a callback or a collection of callbacks to the list
-			add: function() {
-				if ( list ) {
-					// First, we save the current length
-					var start = list.length;
-					(function add( args ) {
-						jQuery.each( args, function( _, arg ) {
-							var type = jQuery.type( arg );
-							if ( type === "function" ) {
-								if ( !options.unique || !self.has( arg ) ) {
-									list.push( arg );
-								}
-							} else if ( arg && arg.length && type !== "string" ) {
-								// Inspect recursively
-								add( arg );
-							}
-						});
-					})( arguments );
-					// Do we need to add the callbacks to the
-					// current firing batch?
-					if ( firing ) {
-						firingLength = list.length;
-					// With memory, if we're not firing then
-					// we should call right away
-					} else if ( memory ) {
-						firingStart = start;
-						fire( memory );
-					}
-				}
-				return this;
-			},
-			// Remove a callback from the list
-			remove: function() {
-				if ( list ) {
-					jQuery.each( arguments, function( _, arg ) {
-						var index;
-						while( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
-							list.splice( index, 1 );
-							// Handle firing indexes
-							if ( firing ) {
-								if ( index <= firingLength ) {
-									firingLength--;
-								}
-								if ( index <= firingIndex ) {
-									firingIndex--;
-								}
-							}
-						}
-					});
-				}
-				return this;
-			},
-			// Check if a given callback is in the list.
-			// If no argument is given, return whether or not list has callbacks attached.
-			has: function( fn ) {
-				return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length );
-			},
-			// Remove all callbacks from the list
-			empty: function() {
-				list = [];
-				firingLength = 0;
-				return this;
-			},
-			// Have the list do nothing anymore
-			disable: function() {
-				list = stack = memory = undefined;
-				return this;
-			},
-			// Is it disabled?
-			disabled: function() {
-				return !list;
-			},
-			// Lock the list in its current state
-			lock: function() {
-				stack = undefined;
-				if ( !memory ) {
-					self.disable();
-				}
-				return this;
-			},
-			// Is it locked?
-			locked: function() {
-				return !stack;
-			},
-			// Call all callbacks with the given context and arguments
-			fireWith: function( context, args ) {
-				if ( list && ( !fired || stack ) ) {
-					args = args || [];
-					args = [ context, args.slice ? args.slice() : args ];
-					if ( firing ) {
-						stack.push( args );
-					} else {
-						fire( args );
-					}
-				}
-				return this;
-			},
-			// Call all the callbacks with the given arguments
-			fire: function() {
-				self.fireWith( this, arguments );
-				return this;
-			},
-			// To know if the callbacks have already been called at least once
-			fired: function() {
-				return !!fired;
-			}
-		};
-
-	return self;
-};
-jQuery.extend({
-
-	Deferred: function( func ) {
-		var tuples = [
-				// action, add listener, listener list, final state
-				[ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
-				[ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
-				[ "notify", "progress", jQuery.Callbacks("memory") ]
-			],
-			state = "pending",
-			promise = {
-				state: function() {
-					return state;
-				},
-				always: function() {
-					deferred.done( arguments ).fail( arguments );
-					return this;
-				},
-				then: function( /* fnDone, fnFail, fnProgress */ ) {
-					var fns = arguments;
-					return jQuery.Deferred(function( newDefer ) {
-						jQuery.each( tuples, function( i, tuple ) {
-							var action = tuple[ 0 ],
-								fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
-							// deferred[ done | fail | progress ] for forwarding actions to newDefer
-							deferred[ tuple[1] ](function() {
-								var returned = fn && fn.apply( this, arguments );
-								if ( returned && jQuery.isFunction( returned.promise ) ) {
-									returned.promise()
-										.done( newDefer.resolve )
-										.fail( newDefer.reject )
-										.progress( newDefer.notify );
-								} else {
-									newDefer[ action + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments );
-								}
-							});
-						});
-						fns = null;
-					}).promise();
-				},
-				// Get a promise for this deferred
-				// If obj is provided, the promise aspect is added to the object
-				promise: function( obj ) {
-					return obj != null ? jQuery.extend( obj, promise ) : promise;
-				}
-			},
-			deferred = {};
-
-		// Keep pipe for back-compat
-		promise.pipe = promise.then;
-
-		// Add list-specific methods
-		jQuery.each( tuples, function( i, tuple ) {
-			var list = tuple[ 2 ],
-				stateString = tuple[ 3 ];
-
-			// promise[ done | fail | progress ] = list.add
-			promise[ tuple[1] ] = list.add;
-
-			// Handle state
-			if ( stateString ) {
-				list.add(function() {
-					// state = [ resolved | rejected ]
-					state = stateString;
-
-				// [ reject_list | resolve_list ].disable; progress_list.lock
-				}, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
-			}
-
-			// deferred[ resolve | reject | notify ]
-			deferred[ tuple[0] ] = function() {
-				deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments );
-				return this;
-			};
-			deferred[ tuple[0] + "With" ] = list.fireWith;
-		});
-
-		// Make the deferred a promise
-		promise.promise( deferred );
-
-		// Call given func if any
-		if ( func ) {
-			func.call( deferred, deferred );
-		}
-
-		// All done!
-		return deferred;
-	},
-
-	// Deferred helper
-	when: function( subordinate /* , ..., subordinateN */ ) {
-		var i = 0,
-			resolveValues = core_slice.call( arguments ),
-			length = resolveValues.length,
-
-			// the count of uncompleted subordinates
-			remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
-
-			// the master Deferred. If resolveValues consist of only a single Deferred, just use that.
-			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
-
-			// Update function for both resolve and progress values
-			updateFunc = function( i, contexts, values ) {
-				return function( value ) {
-					contexts[ i ] = this;
-					values[ i ] = arguments.length > 1 ? core_slice.call( arguments ) : value;
-					if( values === progressValues ) {
-						deferred.notifyWith( contexts, values );
-					} else if ( !( --remaining ) ) {
-						deferred.resolveWith( contexts, values );
-					}
-				};
-			},
-
-			progressValues, progressContexts, resolveContexts;
-
-		// add listeners to Deferred subordinates; treat others as resolved
-		if ( length > 1 ) {
-			progressValues = new Array( length );
-			progressContexts = new Array( length );
-			resolveContexts = new Array( length );
-			for ( ; i < length; i++ ) {
-				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
-					resolveValues[ i ].promise()
-						.done( updateFunc( i, resolveContexts, resolveValues ) )
-						.fail( deferred.reject )
-						.progress( updateFunc( i, progressContexts, progressValues ) );
-				} else {
-					--remaining;
-				}
-			}
-		}
-
-		// if we're not waiting on anything, resolve the master
-		if ( !remaining ) {
-			deferred.resolveWith( resolveContexts, resolveValues );
-		}
-
-		return deferred.promise();
-	}
-});
-jQuery.support = (function( support ) {
-
-	var all, a, input, select, fragment, opt, eventName, isSupported, i,
-		div = document.createElement("div");
-
-	// Setup
-	div.setAttribute( "className", "t" );
-	div.innerHTML = "  
        a";
-
-	// Finish early in limited (non-browser) environments
-	all = div.getElementsByTagName("*") || [];
-	a = div.getElementsByTagName("a")[ 0 ];
-	if ( !a || !a.style || !all.length ) {
-		return support;
-	}
-
-	// First batch of tests
-	select = document.createElement("select");
-	opt = select.appendChild( document.createElement("option") );
-	input = div.getElementsByTagName("input")[ 0 ];
-
-	a.style.cssText = "top:1px;float:left;opacity:.5";
-
-	// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
-	support.getSetAttribute = div.className !== "t";
-
-	// IE strips leading whitespace when .innerHTML is used
-	support.leadingWhitespace = div.firstChild.nodeType === 3;
-
-	// Make sure that tbody elements aren't automatically inserted
-	// IE will insert them into empty tables
-	support.tbody = !div.getElementsByTagName("tbody").length;
-
-	// Make sure that link elements get serialized correctly by innerHTML
-	// This requires a wrapper element in IE
-	support.htmlSerialize = !!div.getElementsByTagName("link").length;
-
-	// Get the style information from getAttribute
-	// (IE uses .cssText instead)
-	support.style = /top/.test( a.getAttribute("style") );
-
-	// Make sure that URLs aren't manipulated
-	// (IE normalizes it by default)
-	support.hrefNormalized = a.getAttribute("href") === "/a";
-
-	// Make sure that element opacity exists
-	// (IE uses filter instead)
-	// Use a regex to work around a WebKit issue. See #5145
-	support.opacity = /^0.5/.test( a.style.opacity );
-
-	// Verify style float existence
-	// (IE uses styleFloat instead of cssFloat)
-	support.cssFloat = !!a.style.cssFloat;
-
-	// Check the default checkbox/radio value ("" on WebKit; "on" elsewhere)
-	support.checkOn = !!input.value;
-
-	// Make sure that a selected-by-default option has a working selected property.
-	// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
-	support.optSelected = opt.selected;
-
-	// Tests for enctype support on a form (#6743)
-	support.enctype = !!document.createElement("form").enctype;
-
-	// Makes sure cloning an html5 element does not cause problems
-	// Where outerHTML is undefined, this still works
-	support.html5Clone = document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav>";
-
-	// Will be defined later
-	support.inlineBlockNeedsLayout = false;
-	support.shrinkWrapBlocks = false;
-	support.pixelPosition = false;
-	support.deleteExpando = true;
-	support.noCloneEvent = true;
-	support.reliableMarginRight = true;
-	support.boxSizingReliable = true;
-
-	// Make sure checked status is properly cloned
-	input.checked = true;
-	support.noCloneChecked = input.cloneNode( true ).checked;
-
-	// Make sure that the options inside disabled selects aren't marked as disabled
-	// (WebKit marks them as disabled)
-	select.disabled = true;
-	support.optDisabled = !opt.disabled;
-
-	// Support: IE<9
-	try {
-		delete div.test;
-	} catch( e ) {
-		support.deleteExpando = false;
-	}
-
-	// Check if we can trust getAttribute("value")
-	input = document.createElement("input");
-	input.setAttribute( "value", "" );
-	support.input = input.getAttribute( "value" ) === "";
-
-	// Check if an input maintains its value after becoming a radio
-	input.value = "t";
-	input.setAttribute( "type", "radio" );
-	support.radioValue = input.value === "t";
-
-	// #11217 - WebKit loses check when the name is after the checked attribute
-	input.setAttribute( "checked", "t" );
-	input.setAttribute( "name", "t" );
-
-	fragment = document.createDocumentFragment();
-	fragment.appendChild( input );
-
-	// Check if a disconnected checkbox will retain its checked
-	// value of true after appended to the DOM (IE6/7)
-	support.appendChecked = input.checked;
-
-	// WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	// Support: IE<9
-	// Opera does not clone events (and typeof div.attachEvent === undefined).
-	// IE9-10 clones events bound via attachEvent, but they don't trigger with .click()
-	if ( div.attachEvent ) {
-		div.attachEvent( "onclick", function() {
-			support.noCloneEvent = false;
-		});
-
-		div.cloneNode( true ).click();
-	}
-
-	// Support: IE<9 (lack submit/change bubble), Firefox 17+ (lack focusin event)
-	// Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP)
-	for ( i in { submit: true, change: true, focusin: true }) {
-		div.setAttribute( eventName = "on" + i, "t" );
-
-		support[ i + "Bubbles" ] = eventName in window || div.attributes[ eventName ].expando === false;
-	}
-
-	div.style.backgroundClip = "content-box";
-	div.cloneNode( true ).style.backgroundClip = "";
-	support.clearCloneStyle = div.style.backgroundClip === "content-box";
-
-	// Support: IE<9
-	// Iteration over object's inherited properties before its own.
-	for ( i in jQuery( support ) ) {
-		break;
-	}
-	support.ownLast = i !== "0";
-
-	// Run tests that need a body at doc ready
-	jQuery(function() {
-		var container, marginDiv, tds,
-			divReset = "padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",
-			body = document.getElementsByTagName("body")[0];
-
-		if ( !body ) {
-			// Return for frameset docs that don't have a body
-			return;
-		}
-
-		container = document.createElement("div");
-		container.style.cssText = "border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px";
-
-		body.appendChild( container ).appendChild( div );
-
-		// Support: IE8
-		// Check if table cells still have offsetWidth/Height when they are set
-		// to display:none and there are still other visible table cells in a
-		// table row; if so, offsetWidth/Height are not reliable for use when
-		// determining if an element has been hidden directly using
-		// display:none (it is still safe to use offsets if a parent element is
-		// hidden; don safety goggles and see bug #4512 for more information).
-		div.innerHTML = "
        t
        ";
-		tds = div.getElementsByTagName("td");
-		tds[ 0 ].style.cssText = "padding:0;margin:0;border:0;display:none";
-		isSupported = ( tds[ 0 ].offsetHeight === 0 );
-
-		tds[ 0 ].style.display = "";
-		tds[ 1 ].style.display = "none";
-
-		// Support: IE8
-		// Check if empty table cells still have offsetWidth/Height
-		support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
-
-		// Check box-sizing and margin behavior.
-		div.innerHTML = "";
-		div.style.cssText = "box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;";
-
-		// Workaround failing boxSizing test due to offsetWidth returning wrong value
-		// with some non-1 values of body zoom, ticket #13543
-		jQuery.swap( body, body.style.zoom != null ? { zoom: 1 } : {}, function() {
-			support.boxSizing = div.offsetWidth === 4;
-		});
-
-		// Use window.getComputedStyle because jsdom on node.js will break without it.
-		if ( window.getComputedStyle ) {
-			support.pixelPosition = ( window.getComputedStyle( div, null ) || {} ).top !== "1%";
-			support.boxSizingReliable = ( window.getComputedStyle( div, null ) || { width: "4px" } ).width === "4px";
-
-			// Check if div with explicit width and no margin-right incorrectly
-			// gets computed margin-right based on width of container. (#3333)
-			// Fails in WebKit before Feb 2011 nightlies
-			// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-			marginDiv = div.appendChild( document.createElement("div") );
-			marginDiv.style.cssText = div.style.cssText = divReset;
-			marginDiv.style.marginRight = marginDiv.style.width = "0";
-			div.style.width = "1px";
-
-			support.reliableMarginRight =
-				!parseFloat( ( window.getComputedStyle( marginDiv, null ) || {} ).marginRight );
-		}
-
-		if ( typeof div.style.zoom !== core_strundefined ) {
-			// Support: IE<8
-			// Check if natively block-level elements act like inline-block
-			// elements when setting their display to 'inline' and giving
-			// them layout
-			div.innerHTML = "";
-			div.style.cssText = divReset + "width:1px;padding:1px;display:inline;zoom:1";
-			support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 );
-
-			// Support: IE6
-			// Check if elements with layout shrink-wrap their children
-			div.style.display = "block";
-			div.innerHTML = "
        ";
-			div.firstChild.style.width = "5px";
-			support.shrinkWrapBlocks = ( div.offsetWidth !== 3 );
-
-			if ( support.inlineBlockNeedsLayout ) {
-				// Prevent IE 6 from affecting layout for positioned elements #11048
-				// Prevent IE from shrinking the body in IE 7 mode #12869
-				// Support: IE<8
-				body.style.zoom = 1;
-			}
-		}
-
-		body.removeChild( container );
-
-		// Null elements to avoid leaks in IE
-		container = div = tds = marginDiv = null;
-	});
-
-	// Null elements to avoid leaks in IE
-	all = select = fragment = opt = a = input = null;
-
-	return support;
-})({});
-
-var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/,
-	rmultiDash = /([A-Z])/g;
-
-function internalData( elem, name, data, pvt /* Internal Use Only */ ){
-	if ( !jQuery.acceptData( elem ) ) {
-		return;
-	}
-
-	var ret, thisCache,
-		internalKey = jQuery.expando,
-
-		// We have to handle DOM nodes and JS objects differently because IE6-7
-		// can't GC object references properly across the DOM-JS boundary
-		isNode = elem.nodeType,
-
-		// Only DOM nodes need the global jQuery cache; JS object data is
-		// attached directly to the object so GC can occur automatically
-		cache = isNode ? jQuery.cache : elem,
-
-		// Only defining an ID for JS objects if its cache already exists allows
-		// the code to shortcut on the same path as a DOM node with no cache
-		id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey;
-
-	// Avoid doing any more work than we need to when trying to get data on an
-	// object that has no data at all
-	if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && data === undefined && typeof name === "string" ) {
-		return;
-	}
-
-	if ( !id ) {
-		// Only DOM nodes need a new unique ID for each element since their data
-		// ends up in the global cache
-		if ( isNode ) {
-			id = elem[ internalKey ] = core_deletedIds.pop() || jQuery.guid++;
-		} else {
-			id = internalKey;
-		}
-	}
-
-	if ( !cache[ id ] ) {
-		// Avoid exposing jQuery metadata on plain JS objects when the object
-		// is serialized using JSON.stringify
-		cache[ id ] = isNode ? {} : { toJSON: jQuery.noop };
-	}
-
-	// An object can be passed to jQuery.data instead of a key/value pair; this gets
-	// shallow copied over onto the existing cache
-	if ( typeof name === "object" || typeof name === "function" ) {
-		if ( pvt ) {
-			cache[ id ] = jQuery.extend( cache[ id ], name );
-		} else {
-			cache[ id ].data = jQuery.extend( cache[ id ].data, name );
-		}
-	}
-
-	thisCache = cache[ id ];
-
-	// jQuery data() is stored in a separate object inside the object's internal data
-	// cache in order to avoid key collisions between internal data and user-defined
-	// data.
-	if ( !pvt ) {
-		if ( !thisCache.data ) {
-			thisCache.data = {};
-		}
-
-		thisCache = thisCache.data;
-	}
-
-	if ( data !== undefined ) {
-		thisCache[ jQuery.camelCase( name ) ] = data;
-	}
-
-	// Check for both converted-to-camel and non-converted data property names
-	// If a data property was specified
-	if ( typeof name === "string" ) {
-
-		// First Try to find as-is property data
-		ret = thisCache[ name ];
-
-		// Test for null|undefined property data
-		if ( ret == null ) {
-
-			// Try to find the camelCased property
-			ret = thisCache[ jQuery.camelCase( name ) ];
-		}
-	} else {
-		ret = thisCache;
-	}
-
-	return ret;
-}
-
-function internalRemoveData( elem, name, pvt ) {
-	if ( !jQuery.acceptData( elem ) ) {
-		return;
-	}
-
-	var thisCache, i,
-		isNode = elem.nodeType,
-
-		// See jQuery.data for more information
-		cache = isNode ? jQuery.cache : elem,
-		id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
-
-	// If there is already no cache entry for this object, there is no
-	// purpose in continuing
-	if ( !cache[ id ] ) {
-		return;
-	}
-
-	if ( name ) {
-
-		thisCache = pvt ? cache[ id ] : cache[ id ].data;
-
-		if ( thisCache ) {
-
-			// Support array or space separated string names for data keys
-			if ( !jQuery.isArray( name ) ) {
-
-				// try the string as a key before any manipulation
-				if ( name in thisCache ) {
-					name = [ name ];
-				} else {
-
-					// split the camel cased version by spaces unless a key with the spaces exists
-					name = jQuery.camelCase( name );
-					if ( name in thisCache ) {
-						name = [ name ];
-					} else {
-						name = name.split(" ");
-					}
-				}
-			} else {
-				// If "name" is an array of keys...
-				// When data is initially created, via ("key", "val") signature,
-				// keys will be converted to camelCase.
-				// Since there is no way to tell _how_ a key was added, remove
-				// both plain key and camelCase key. #12786
-				// This will only penalize the array argument path.
-				name = name.concat( jQuery.map( name, jQuery.camelCase ) );
-			}
-
-			i = name.length;
-			while ( i-- ) {
-				delete thisCache[ name[i] ];
-			}
-
-			// If there is no data left in the cache, we want to continue
-			// and let the cache object itself get destroyed
-			if ( pvt ? !isEmptyDataObject(thisCache) : !jQuery.isEmptyObject(thisCache) ) {
-				return;
-			}
-		}
-	}
-
-	// See jQuery.data for more information
-	if ( !pvt ) {
-		delete cache[ id ].data;
-
-		// Don't destroy the parent cache unless the internal data object
-		// had been the only thing left in it
-		if ( !isEmptyDataObject( cache[ id ] ) ) {
-			return;
-		}
-	}
-
-	// Destroy the cache
-	if ( isNode ) {
-		jQuery.cleanData( [ elem ], true );
-
-	// Use delete when supported for expandos or `cache` is not a window per isWindow (#10080)
-	/* jshint eqeqeq: false */
-	} else if ( jQuery.support.deleteExpando || cache != cache.window ) {
-		/* jshint eqeqeq: true */
-		delete cache[ id ];
-
-	// When all else fails, null
-	} else {
-		cache[ id ] = null;
-	}
-}
-
-jQuery.extend({
-	cache: {},
-
-	// The following elements throw uncatchable exceptions if you
-	// attempt to add expando properties to them.
-	noData: {
-		"applet": true,
-		"embed": true,
-		// Ban all objects except for Flash (which handle expandos)
-		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-	},
-
-	hasData: function( elem ) {
-		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
-		return !!elem && !isEmptyDataObject( elem );
-	},
-
-	data: function( elem, name, data ) {
-		return internalData( elem, name, data );
-	},
-
-	removeData: function( elem, name ) {
-		return internalRemoveData( elem, name );
-	},
-
-	// For internal use only.
-	_data: function( elem, name, data ) {
-		return internalData( elem, name, data, true );
-	},
-
-	_removeData: function( elem, name ) {
-		return internalRemoveData( elem, name, true );
-	},
-
-	// A method for determining if a DOM node can handle the data expando
-	acceptData: function( elem ) {
-		// Do not set data on non-element because it will not be cleared (#8335).
-		if ( elem.nodeType && elem.nodeType !== 1 && elem.nodeType !== 9 ) {
-			return false;
-		}
-
-		var noData = elem.nodeName && jQuery.noData[ elem.nodeName.toLowerCase() ];
-
-		// nodes accept data unless otherwise specified; rejection can be conditional
-		return !noData || noData !== true && elem.getAttribute("classid") === noData;
-	}
-});
-
-jQuery.fn.extend({
-	data: function( key, value ) {
-		var attrs, name,
-			data = null,
-			i = 0,
-			elem = this[0];
-
-		// Special expections of .data basically thwart jQuery.access,
-		// so implement the relevant behavior ourselves
-
-		// Gets all values
-		if ( key === undefined ) {
-			if ( this.length ) {
-				data = jQuery.data( elem );
-
-				if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
-					attrs = elem.attributes;
-					for ( ; i < attrs.length; i++ ) {
-						name = attrs[i].name;
-
-						if ( name.indexOf("data-") === 0 ) {
-							name = jQuery.camelCase( name.slice(5) );
-
-							dataAttr( elem, name, data[ name ] );
-						}
-					}
-					jQuery._data( elem, "parsedAttrs", true );
-				}
-			}
-
-			return data;
-		}
-
-		// Sets multiple values
-		if ( typeof key === "object" ) {
-			return this.each(function() {
-				jQuery.data( this, key );
-			});
-		}
-
-		return arguments.length > 1 ?
-
-			// Sets one value
-			this.each(function() {
-				jQuery.data( this, key, value );
-			}) :
-
-			// Gets one value
-			// Try to fetch any internally stored data first
-			elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : null;
-	},
-
-	removeData: function( key ) {
-		return this.each(function() {
-			jQuery.removeData( this, key );
-		});
-	}
-});
-
-function dataAttr( elem, key, data ) {
-	// If nothing was found internally, try to fetch any
-	// data from the HTML5 data-* attribute
-	if ( data === undefined && elem.nodeType === 1 ) {
-
-		var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
-
-		data = elem.getAttribute( name );
-
-		if ( typeof data === "string" ) {
-			try {
-				data = data === "true" ? true :
-					data === "false" ? false :
-					data === "null" ? null :
-					// Only convert to a number if it doesn't change the string
-					+data + "" === data ? +data :
-					rbrace.test( data ) ? jQuery.parseJSON( data ) :
-						data;
-			} catch( e ) {}
-
-			// Make sure we set the data so it isn't changed later
-			jQuery.data( elem, key, data );
-
-		} else {
-			data = undefined;
-		}
-	}
-
-	return data;
-}
-
-// checks a cache object for emptiness
-function isEmptyDataObject( obj ) {
-	var name;
-	for ( name in obj ) {
-
-		// if the public data object is empty, the private is still empty
-		if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) {
-			continue;
-		}
-		if ( name !== "toJSON" ) {
-			return false;
-		}
-	}
-
-	return true;
-}
-jQuery.extend({
-	queue: function( elem, type, data ) {
-		var queue;
-
-		if ( elem ) {
-			type = ( type || "fx" ) + "queue";
-			queue = jQuery._data( elem, type );
-
-			// Speed up dequeue by getting out quickly if this is just a lookup
-			if ( data ) {
-				if ( !queue || jQuery.isArray(data) ) {
-					queue = jQuery._data( elem, type, jQuery.makeArray(data) );
-				} else {
-					queue.push( data );
-				}
-			}
-			return queue || [];
-		}
-	},
-
-	dequeue: function( elem, type ) {
-		type = type || "fx";
-
-		var queue = jQuery.queue( elem, type ),
-			startLength = queue.length,
-			fn = queue.shift(),
-			hooks = jQuery._queueHooks( elem, type ),
-			next = function() {
-				jQuery.dequeue( elem, type );
-			};
-
-		// If the fx queue is dequeued, always remove the progress sentinel
-		if ( fn === "inprogress" ) {
-			fn = queue.shift();
-			startLength--;
-		}
-
-		if ( fn ) {
-
-			// Add a progress sentinel to prevent the fx queue from being
-			// automatically dequeued
-			if ( type === "fx" ) {
-				queue.unshift( "inprogress" );
-			}
-
-			// clear up the last queue stop function
-			delete hooks.stop;
-			fn.call( elem, next, hooks );
-		}
-
-		if ( !startLength && hooks ) {
-			hooks.empty.fire();
-		}
-	},
-
-	// not intended for public consumption - generates a queueHooks object, or returns the current one
-	_queueHooks: function( elem, type ) {
-		var key = type + "queueHooks";
-		return jQuery._data( elem, key ) || jQuery._data( elem, key, {
-			empty: jQuery.Callbacks("once memory").add(function() {
-				jQuery._removeData( elem, type + "queue" );
-				jQuery._removeData( elem, key );
-			})
-		});
-	}
-});
-
-jQuery.fn.extend({
-	queue: function( type, data ) {
-		var setter = 2;
-
-		if ( typeof type !== "string" ) {
-			data = type;
-			type = "fx";
-			setter--;
-		}
-
-		if ( arguments.length < setter ) {
-			return jQuery.queue( this[0], type );
-		}
-
-		return data === undefined ?
-			this :
-			this.each(function() {
-				var queue = jQuery.queue( this, type, data );
-
-				// ensure a hooks for this queue
-				jQuery._queueHooks( this, type );
-
-				if ( type === "fx" && queue[0] !== "inprogress" ) {
-					jQuery.dequeue( this, type );
-				}
-			});
-	},
-	dequeue: function( type ) {
-		return this.each(function() {
-			jQuery.dequeue( this, type );
-		});
-	},
-	// Based off of the plugin by Clint Helfers, with permission.
-	// http://blindsignals.com/index.php/2009/07/jquery-delay/
-	delay: function( time, type ) {
-		time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
-		type = type || "fx";
-
-		return this.queue( type, function( next, hooks ) {
-			var timeout = setTimeout( next, time );
-			hooks.stop = function() {
-				clearTimeout( timeout );
-			};
-		});
-	},
-	clearQueue: function( type ) {
-		return this.queue( type || "fx", [] );
-	},
-	// Get a promise resolved when queues of a certain type
-	// are emptied (fx is the type by default)
-	promise: function( type, obj ) {
-		var tmp,
-			count = 1,
-			defer = jQuery.Deferred(),
-			elements = this,
-			i = this.length,
-			resolve = function() {
-				if ( !( --count ) ) {
-					defer.resolveWith( elements, [ elements ] );
-				}
-			};
-
-		if ( typeof type !== "string" ) {
-			obj = type;
-			type = undefined;
-		}
-		type = type || "fx";
-
-		while( i-- ) {
-			tmp = jQuery._data( elements[ i ], type + "queueHooks" );
-			if ( tmp && tmp.empty ) {
-				count++;
-				tmp.empty.add( resolve );
-			}
-		}
-		resolve();
-		return defer.promise( obj );
-	}
-});
-var nodeHook, boolHook,
-	rclass = /[\t\r\n\f]/g,
-	rreturn = /\r/g,
-	rfocusable = /^(?:input|select|textarea|button|object)$/i,
-	rclickable = /^(?:a|area)$/i,
-	ruseDefault = /^(?:checked|selected)$/i,
-	getSetAttribute = jQuery.support.getSetAttribute,
-	getSetInput = jQuery.support.input;
-
-jQuery.fn.extend({
-	attr: function( name, value ) {
-		return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 );
-	},
-
-	removeAttr: function( name ) {
-		return this.each(function() {
-			jQuery.removeAttr( this, name );
-		});
-	},
-
-	prop: function( name, value ) {
-		return jQuery.access( this, jQuery.prop, name, value, arguments.length > 1 );
-	},
-
-	removeProp: function( name ) {
-		name = jQuery.propFix[ name ] || name;
-		return this.each(function() {
-			// try/catch handles cases where IE balks (such as removing a property on window)
-			try {
-				this[ name ] = undefined;
-				delete this[ name ];
-			} catch( e ) {}
-		});
-	},
-
-	addClass: function( value ) {
-		var classes, elem, cur, clazz, j,
-			i = 0,
-			len = this.length,
-			proceed = typeof value === "string" && value;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).addClass( value.call( this, j, this.className ) );
-			});
-		}
-
-		if ( proceed ) {
-			// The disjunction here is for better compressibility (see removeClass)
-			classes = ( value || "" ).match( core_rnotwhite ) || [];
-
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					" "
-				);
-
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
-							cur += clazz + " ";
-						}
-					}
-					elem.className = jQuery.trim( cur );
-
-				}
-			}
-		}
-
-		return this;
-	},
-
-	removeClass: function( value ) {
-		var classes, elem, cur, clazz, j,
-			i = 0,
-			len = this.length,
-			proceed = arguments.length === 0 || typeof value === "string" && value;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).removeClass( value.call( this, j, this.className ) );
-			});
-		}
-		if ( proceed ) {
-			classes = ( value || "" ).match( core_rnotwhite ) || [];
-
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				// This expression is here for better compressibility (see addClass)
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					""
-				);
-
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						// Remove *all* instances
-						while ( cur.indexOf( " " + clazz + " " ) >= 0 ) {
-							cur = cur.replace( " " + clazz + " ", " " );
-						}
-					}
-					elem.className = value ? jQuery.trim( cur ) : "";
-				}
-			}
-		}
-
-		return this;
-	},
-
-	toggleClass: function( value, stateVal ) {
-		var type = typeof value;
-
-		if ( typeof stateVal === "boolean" && type === "string" ) {
-			return stateVal ? this.addClass( value ) : this.removeClass( value );
-		}
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( i ) {
-				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
-			});
-		}
-
-		return this.each(function() {
-			if ( type === "string" ) {
-				// toggle individual class names
-				var className,
-					i = 0,
-					self = jQuery( this ),
-					classNames = value.match( core_rnotwhite ) || [];
-
-				while ( (className = classNames[ i++ ]) ) {
-					// check each className given, space separated list
-					if ( self.hasClass( className ) ) {
-						self.removeClass( className );
-					} else {
-						self.addClass( className );
-					}
-				}
-
-			// Toggle whole class name
-			} else if ( type === core_strundefined || type === "boolean" ) {
-				if ( this.className ) {
-					// store className if set
-					jQuery._data( this, "__className__", this.className );
-				}
-
-				// If the element has a class name or if we're passed "false",
-				// then remove the whole classname (if there was one, the above saved it).
-				// Otherwise bring back whatever was previously saved (if anything),
-				// falling back to the empty string if nothing was stored.
-				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
-			}
-		});
-	},
-
-	hasClass: function( selector ) {
-		var className = " " + selector + " ",
-			i = 0,
-			l = this.length;
-		for ( ; i < l; i++ ) {
-			if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
-				return true;
-			}
-		}
-
-		return false;
-	},
-
-	val: function( value ) {
-		var ret, hooks, isFunction,
-			elem = this[0];
-
-		if ( !arguments.length ) {
-			if ( elem ) {
-				hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
-
-				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
-					return ret;
-				}
-
-				ret = elem.value;
-
-				return typeof ret === "string" ?
-					// handle most common string cases
-					ret.replace(rreturn, "") :
-					// handle cases where value is null/undef or number
-					ret == null ? "" : ret;
-			}
-
-			return;
-		}
-
-		isFunction = jQuery.isFunction( value );
-
-		return this.each(function( i ) {
-			var val;
-
-			if ( this.nodeType !== 1 ) {
-				return;
-			}
-
-			if ( isFunction ) {
-				val = value.call( this, i, jQuery( this ).val() );
-			} else {
-				val = value;
-			}
-
-			// Treat null/undefined as ""; convert numbers to string
-			if ( val == null ) {
-				val = "";
-			} else if ( typeof val === "number" ) {
-				val += "";
-			} else if ( jQuery.isArray( val ) ) {
-				val = jQuery.map(val, function ( value ) {
-					return value == null ? "" : value + "";
-				});
-			}
-
-			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
-
-			// If set returns undefined, fall back to normal setting
-			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
-				this.value = val;
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	valHooks: {
-		option: {
-			get: function( elem ) {
-				// Use proper attribute retrieval(#6932, #12072)
-				var val = jQuery.find.attr( elem, "value" );
-				return val != null ?
-					val :
-					elem.text;
-			}
-		},
-		select: {
-			get: function( elem ) {
-				var value, option,
-					options = elem.options,
-					index = elem.selectedIndex,
-					one = elem.type === "select-one" || index < 0,
-					values = one ? null : [],
-					max = one ? index + 1 : options.length,
-					i = index < 0 ?
-						max :
-						one ? index : 0;
-
-				// Loop through all the selected options
-				for ( ; i < max; i++ ) {
-					option = options[ i ];
-
-					// oldIE doesn't update selected after form reset (#2551)
-					if ( ( option.selected || i === index ) &&
-							// Don't return options that are disabled or in a disabled optgroup
-							( jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null ) &&
-							( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
-
-						// Get the specific value for the option
-						value = jQuery( option ).val();
-
-						// We don't need an array for one selects
-						if ( one ) {
-							return value;
-						}
-
-						// Multi-Selects return an array
-						values.push( value );
-					}
-				}
-
-				return values;
-			},
-
-			set: function( elem, value ) {
-				var optionSet, option,
-					options = elem.options,
-					values = jQuery.makeArray( value ),
-					i = options.length;
-
-				while ( i-- ) {
-					option = options[ i ];
-					if ( (option.selected = jQuery.inArray( jQuery(option).val(), values ) >= 0) ) {
-						optionSet = true;
-					}
-				}
-
-				// force browsers to behave consistently when non-matching value is set
-				if ( !optionSet ) {
-					elem.selectedIndex = -1;
-				}
-				return values;
-			}
-		}
-	},
-
-	attr: function( elem, name, value ) {
-		var hooks, ret,
-			nType = elem.nodeType;
-
-		// don't get/set attributes on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		// Fallback to prop when attributes are not supported
-		if ( typeof elem.getAttribute === core_strundefined ) {
-			return jQuery.prop( elem, name, value );
-		}
-
-		// All attributes are lowercase
-		// Grab necessary hook if one is defined
-		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
-			name = name.toLowerCase();
-			hooks = jQuery.attrHooks[ name ] ||
-				( jQuery.expr.match.bool.test( name ) ? boolHook : nodeHook );
-		}
-
-		if ( value !== undefined ) {
-
-			if ( value === null ) {
-				jQuery.removeAttr( elem, name );
-
-			} else if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				elem.setAttribute( name, value + "" );
-				return value;
-			}
-
-		} else if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
-			return ret;
-
-		} else {
-			ret = jQuery.find.attr( elem, name );
-
-			// Non-existent attributes return null, we normalize to undefined
-			return ret == null ?
-				undefined :
-				ret;
-		}
-	},
-
-	removeAttr: function( elem, value ) {
-		var name, propName,
-			i = 0,
-			attrNames = value && value.match( core_rnotwhite );
-
-		if ( attrNames && elem.nodeType === 1 ) {
-			while ( (name = attrNames[i++]) ) {
-				propName = jQuery.propFix[ name ] || name;
-
-				// Boolean attributes get special treatment (#10870)
-				if ( jQuery.expr.match.bool.test( name ) ) {
-					// Set corresponding property to false
-					if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
-						elem[ propName ] = false;
-					// Support: IE<9
-					// Also clear defaultChecked/defaultSelected (if appropriate)
-					} else {
-						elem[ jQuery.camelCase( "default-" + name ) ] =
-							elem[ propName ] = false;
-					}
-
-				// See #9699 for explanation of this approach (setting first, then removal)
-				} else {
-					jQuery.attr( elem, name, "" );
-				}
-
-				elem.removeAttribute( getSetAttribute ? name : propName );
-			}
-		}
-	},
-
-	attrHooks: {
-		type: {
-			set: function( elem, value ) {
-				if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
-					// Setting the type on a radio button after the value resets the value in IE6-9
-					// Reset value to default in case type is set after value during creation
-					var val = elem.value;
-					elem.setAttribute( "type", value );
-					if ( val ) {
-						elem.value = val;
-					}
-					return value;
-				}
-			}
-		}
-	},
-
-	propFix: {
-		"for": "htmlFor",
-		"class": "className"
-	},
-
-	prop: function( elem, name, value ) {
-		var ret, hooks, notxml,
-			nType = elem.nodeType;
-
-		// don't get/set properties on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-		if ( notxml ) {
-			// Fix name and attach hooks
-			name = jQuery.propFix[ name ] || name;
-			hooks = jQuery.propHooks[ name ];
-		}
-
-		if ( value !== undefined ) {
-			return hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ?
-				ret :
-				( elem[ name ] = value );
-
-		} else {
-			return hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ?
-				ret :
-				elem[ name ];
-		}
-	},
-
-	propHooks: {
-		tabIndex: {
-			get: function( elem ) {
-				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
-				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-				// Use proper attribute retrieval(#12072)
-				var tabindex = jQuery.find.attr( elem, "tabindex" );
-
-				return tabindex ?
-					parseInt( tabindex, 10 ) :
-					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
-						0 :
-						-1;
-			}
-		}
-	}
-});
-
-// Hooks for boolean attributes
-boolHook = {
-	set: function( elem, value, name ) {
-		if ( value === false ) {
-			// Remove boolean attributes when set to false
-			jQuery.removeAttr( elem, name );
-		} else if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
-			// IE<8 needs the *property* name
-			elem.setAttribute( !getSetAttribute && jQuery.propFix[ name ] || name, name );
-
-		// Use defaultChecked and defaultSelected for oldIE
-		} else {
-			elem[ jQuery.camelCase( "default-" + name ) ] = elem[ name ] = true;
-		}
-
-		return name;
-	}
-};
-jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
-	var getter = jQuery.expr.attrHandle[ name ] || jQuery.find.attr;
-
-	jQuery.expr.attrHandle[ name ] = getSetInput && getSetAttribute || !ruseDefault.test( name ) ?
-		function( elem, name, isXML ) {
-			var fn = jQuery.expr.attrHandle[ name ],
-				ret = isXML ?
-					undefined :
-					/* jshint eqeqeq: false */
-					(jQuery.expr.attrHandle[ name ] = undefined) !=
-						getter( elem, name, isXML ) ?
-
-						name.toLowerCase() :
-						null;
-			jQuery.expr.attrHandle[ name ] = fn;
-			return ret;
-		} :
-		function( elem, name, isXML ) {
-			return isXML ?
-				undefined :
-				elem[ jQuery.camelCase( "default-" + name ) ] ?
-					name.toLowerCase() :
-					null;
-		};
-});
-
-// fix oldIE attroperties
-if ( !getSetInput || !getSetAttribute ) {
-	jQuery.attrHooks.value = {
-		set: function( elem, value, name ) {
-			if ( jQuery.nodeName( elem, "input" ) ) {
-				// Does not return so that setAttribute is also used
-				elem.defaultValue = value;
-			} else {
-				// Use nodeHook if defined (#1954); otherwise setAttribute is fine
-				return nodeHook && nodeHook.set( elem, value, name );
-			}
-		}
-	};
-}
-
-// IE6/7 do not support getting/setting some attributes with get/setAttribute
-if ( !getSetAttribute ) {
-
-	// Use this for any attribute in IE6/7
-	// This fixes almost every IE6/7 issue
-	nodeHook = {
-		set: function( elem, value, name ) {
-			// Set the existing or create a new attribute node
-			var ret = elem.getAttributeNode( name );
-			if ( !ret ) {
-				elem.setAttributeNode(
-					(ret = elem.ownerDocument.createAttribute( name ))
-				);
-			}
-
-			ret.value = value += "";
-
-			// Break association with cloned elements by also using setAttribute (#9646)
-			return name === "value" || value === elem.getAttribute( name ) ?
-				value :
-				undefined;
-		}
-	};
-	jQuery.expr.attrHandle.id = jQuery.expr.attrHandle.name = jQuery.expr.attrHandle.coords =
-		// Some attributes are constructed with empty-string values when not defined
-		function( elem, name, isXML ) {
-			var ret;
-			return isXML ?
-				undefined :
-				(ret = elem.getAttributeNode( name )) && ret.value !== "" ?
-					ret.value :
-					null;
-		};
-	jQuery.valHooks.button = {
-		get: function( elem, name ) {
-			var ret = elem.getAttributeNode( name );
-			return ret && ret.specified ?
-				ret.value :
-				undefined;
-		},
-		set: nodeHook.set
-	};
-
-	// Set contenteditable to false on removals(#10429)
-	// Setting to empty string throws an error as an invalid value
-	jQuery.attrHooks.contenteditable = {
-		set: function( elem, value, name ) {
-			nodeHook.set( elem, value === "" ? false : value, name );
-		}
-	};
-
-	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
-	// This is for removals
-	jQuery.each([ "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = {
-			set: function( elem, value ) {
-				if ( value === "" ) {
-					elem.setAttribute( name, "auto" );
-					return value;
-				}
-			}
-		};
-	});
-}
-
-
-// Some attributes require a special call on IE
-// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !jQuery.support.hrefNormalized ) {
-	// href/src property should get the full normalized URL (#10299/#12915)
-	jQuery.each([ "href", "src" ], function( i, name ) {
-		jQuery.propHooks[ name ] = {
-			get: function( elem ) {
-				return elem.getAttribute( name, 4 );
-			}
-		};
-	});
-}
-
-if ( !jQuery.support.style ) {
-	jQuery.attrHooks.style = {
-		get: function( elem ) {
-			// Return undefined in the case of empty string
-			// Note: IE uppercases css property names, but if we were to .toLowerCase()
-			// .cssText, that would destroy case senstitivity in URL's, like in "background"
-			return elem.style.cssText || undefined;
-		},
-		set: function( elem, value ) {
-			return ( elem.style.cssText = value + "" );
-		}
-	};
-}
-
-// Safari mis-reports the default selected property of an option
-// Accessing the parent's selectedIndex property fixes it
-if ( !jQuery.support.optSelected ) {
-	jQuery.propHooks.selected = {
-		get: function( elem ) {
-			var parent = elem.parentNode;
-
-			if ( parent ) {
-				parent.selectedIndex;
-
-				// Make sure that it also works with optgroups, see #5701
-				if ( parent.parentNode ) {
-					parent.parentNode.selectedIndex;
-				}
-			}
-			return null;
-		}
-	};
-}
-
-jQuery.each([
-	"tabIndex",
-	"readOnly",
-	"maxLength",
-	"cellSpacing",
-	"cellPadding",
-	"rowSpan",
-	"colSpan",
-	"useMap",
-	"frameBorder",
-	"contentEditable"
-], function() {
-	jQuery.propFix[ this.toLowerCase() ] = this;
-});
-
-// IE6/7 call enctype encoding
-if ( !jQuery.support.enctype ) {
-	jQuery.propFix.enctype = "encoding";
-}
-
-// Radios and checkboxes getter/setter
-jQuery.each([ "radio", "checkbox" ], function() {
-	jQuery.valHooks[ this ] = {
-		set: function( elem, value ) {
-			if ( jQuery.isArray( value ) ) {
-				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
-			}
-		}
-	};
-	if ( !jQuery.support.checkOn ) {
-		jQuery.valHooks[ this ].get = function( elem ) {
-			// Support: Webkit
-			// "" is returned instead of "on" if a value isn't specified
-			return elem.getAttribute("value") === null ? "on" : elem.value;
-		};
-	}
-});
-var rformElems = /^(?:input|select|textarea)$/i,
-	rkeyEvent = /^key/,
-	rmouseEvent = /^(?:mouse|contextmenu)|click/,
-	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
-	rtypenamespace = /^([^.]*)(?:\.(.+)|)$/;
-
-function returnTrue() {
-	return true;
-}
-
-function returnFalse() {
-	return false;
-}
-
-function safeActiveElement() {
-	try {
-		return document.activeElement;
-	} catch ( err ) { }
-}
-
-/*
- * Helper functions for managing events -- not part of the public interface.
- * Props to Dean Edwards' addEvent library for many of the ideas.
- */
-jQuery.event = {
-
-	global: {},
-
-	add: function( elem, types, handler, data, selector ) {
-		var tmp, events, t, handleObjIn,
-			special, eventHandle, handleObj,
-			handlers, type, namespaces, origType,
-			elemData = jQuery._data( elem );
-
-		// Don't attach events to noData or text/comment nodes (but allow plain objects)
-		if ( !elemData ) {
-			return;
-		}
-
-		// Caller can pass in an object of custom data in lieu of the handler
-		if ( handler.handler ) {
-			handleObjIn = handler;
-			handler = handleObjIn.handler;
-			selector = handleObjIn.selector;
-		}
-
-		// Make sure that the handler has a unique ID, used to find/remove it later
-		if ( !handler.guid ) {
-			handler.guid = jQuery.guid++;
-		}
-
-		// Init the element's event structure and main handler, if this is the first
-		if ( !(events = elemData.events) ) {
-			events = elemData.events = {};
-		}
-		if ( !(eventHandle = elemData.handle) ) {
-			eventHandle = elemData.handle = function( e ) {
-				// Discard the second event of a jQuery.event.trigger() and
-				// when an event is called after a page has unloaded
-				return typeof jQuery !== core_strundefined && (!e || jQuery.event.triggered !== e.type) ?
-					jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
-					undefined;
-			};
-			// Add elem as a property of the handle fn to prevent a memory leak with IE non-native events
-			eventHandle.elem = elem;
-		}
-
-		// Handle multiple events separated by a space
-		types = ( types || "" ).match( core_rnotwhite ) || [""];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-			// There *must* be a type, no attaching namespace-only handlers
-			if ( !type ) {
-				continue;
-			}
-
-			// If event changes its type, use the special event handlers for the changed type
-			special = jQuery.event.special[ type ] || {};
-
-			// If selector defined, determine special event api type, otherwise given type
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-
-			// Update special based on newly reset type
-			special = jQuery.event.special[ type ] || {};
-
-			// handleObj is passed to all event handlers
-			handleObj = jQuery.extend({
-				type: type,
-				origType: origType,
-				data: data,
-				handler: handler,
-				guid: handler.guid,
-				selector: selector,
-				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
-				namespace: namespaces.join(".")
-			}, handleObjIn );
-
-			// Init the event handler queue if we're the first
-			if ( !(handlers = events[ type ]) ) {
-				handlers = events[ type ] = [];
-				handlers.delegateCount = 0;
-
-				// Only use addEventListener/attachEvent if the special events handler returns false
-				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-					// Bind the global event handler to the element
-					if ( elem.addEventListener ) {
-						elem.addEventListener( type, eventHandle, false );
-
-					} else if ( elem.attachEvent ) {
-						elem.attachEvent( "on" + type, eventHandle );
-					}
-				}
-			}
-
-			if ( special.add ) {
-				special.add.call( elem, handleObj );
-
-				if ( !handleObj.handler.guid ) {
-					handleObj.handler.guid = handler.guid;
-				}
-			}
-
-			// Add to the element's handler list, delegates in front
-			if ( selector ) {
-				handlers.splice( handlers.delegateCount++, 0, handleObj );
-			} else {
-				handlers.push( handleObj );
-			}
-
-			// Keep track of which events have ever been used, for event optimization
-			jQuery.event.global[ type ] = true;
-		}
-
-		// Nullify elem to prevent memory leaks in IE
-		elem = null;
-	},
-
-	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, selector, mappedTypes ) {
-		var j, handleObj, tmp,
-			origCount, t, events,
-			special, handlers, type,
-			namespaces, origType,
-			elemData = jQuery.hasData( elem ) && jQuery._data( elem );
-
-		if ( !elemData || !(events = elemData.events) ) {
-			return;
-		}
-
-		// Once for each type.namespace in types; type may be omitted
-		types = ( types || "" ).match( core_rnotwhite ) || [""];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-			// Unbind all events (on this namespace, if provided) for the element
-			if ( !type ) {
-				for ( type in events ) {
-					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
-				}
-				continue;
-			}
-
-			special = jQuery.event.special[ type ] || {};
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-			handlers = events[ type ] || [];
-			tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" );
-
-			// Remove matching events
-			origCount = j = handlers.length;
-			while ( j-- ) {
-				handleObj = handlers[ j ];
-
-				if ( ( mappedTypes || origType === handleObj.origType ) &&
-					( !handler || handler.guid === handleObj.guid ) &&
-					( !tmp || tmp.test( handleObj.namespace ) ) &&
-					( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
-					handlers.splice( j, 1 );
-
-					if ( handleObj.selector ) {
-						handlers.delegateCount--;
-					}
-					if ( special.remove ) {
-						special.remove.call( elem, handleObj );
-					}
-				}
-			}
-
-			// Remove generic event handler if we removed something and no more handlers exist
-			// (avoids potential for endless recursion during removal of special event handlers)
-			if ( origCount && !handlers.length ) {
-				if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
-					jQuery.removeEvent( elem, type, elemData.handle );
-				}
-
-				delete events[ type ];
-			}
-		}
-
-		// Remove the expando if it's no longer used
-		if ( jQuery.isEmptyObject( events ) ) {
-			delete elemData.handle;
-
-			// removeData also checks for emptiness and clears the expando if empty
-			// so use it instead of delete
-			jQuery._removeData( elem, "events" );
-		}
-	},
-
-	trigger: function( event, data, elem, onlyHandlers ) {
-		var handle, ontype, cur,
-			bubbleType, special, tmp, i,
-			eventPath = [ elem || document ],
-			type = core_hasOwn.call( event, "type" ) ? event.type : event,
-			namespaces = core_hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : [];
-
-		cur = tmp = elem = elem || document;
-
-		// Don't do events on text and comment nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		// focus/blur morphs to focusin/out; ensure we're not firing them right now
-		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
-			return;
-		}
-
-		if ( type.indexOf(".") >= 0 ) {
-			// Namespaced trigger; create a regexp to match event type in handle()
-			namespaces = type.split(".");
-			type = namespaces.shift();
-			namespaces.sort();
-		}
-		ontype = type.indexOf(":") < 0 && "on" + type;
-
-		// Caller can pass in a jQuery.Event object, Object, or just an event type string
-		event = event[ jQuery.expando ] ?
-			event :
-			new jQuery.Event( type, typeof event === "object" && event );
-
-		// Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true)
-		event.isTrigger = onlyHandlers ? 2 : 3;
-		event.namespace = namespaces.join(".");
-		event.namespace_re = event.namespace ?
-			new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) :
-			null;
-
-		// Clean up the event in case it is being reused
-		event.result = undefined;
-		if ( !event.target ) {
-			event.target = elem;
-		}
-
-		// Clone any incoming data and prepend the event, creating the handler arg list
-		data = data == null ?
-			[ event ] :
-			jQuery.makeArray( data, [ event ] );
-
-		// Allow special events to draw outside the lines
-		special = jQuery.event.special[ type ] || {};
-		if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
-			return;
-		}
-
-		// Determine event propagation path in advance, per W3C events spec (#9951)
-		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
-		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
-
-			bubbleType = special.delegateType || type;
-			if ( !rfocusMorph.test( bubbleType + type ) ) {
-				cur = cur.parentNode;
-			}
-			for ( ; cur; cur = cur.parentNode ) {
-				eventPath.push( cur );
-				tmp = cur;
-			}
-
-			// Only add window if we got to document (e.g., not plain obj or detached DOM)
-			if ( tmp === (elem.ownerDocument || document) ) {
-				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
-			}
-		}
-
-		// Fire handlers on the event path
-		i = 0;
-		while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) {
-
-			event.type = i > 1 ?
-				bubbleType :
-				special.bindType || type;
-
-			// jQuery handler
-			handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" );
-			if ( handle ) {
-				handle.apply( cur, data );
-			}
-
-			// Native handler
-			handle = ontype && cur[ ontype ];
-			if ( handle && jQuery.acceptData( cur ) && handle.apply && handle.apply( cur, data ) === false ) {
-				event.preventDefault();
-			}
-		}
-		event.type = type;
-
-		// If nobody prevented the default action, do it now
-		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
-
-			if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) &&
-				jQuery.acceptData( elem ) ) {
-
-				// Call a native DOM method on the target with the same name name as the event.
-				// Can't use an .isFunction() check here because IE6/7 fails that test.
-				// Don't do default actions on window, that's where global variables be (#6170)
-				if ( ontype && elem[ type ] && !jQuery.isWindow( elem ) ) {
-
-					// Don't re-trigger an onFOO event when we call its FOO() method
-					tmp = elem[ ontype ];
-
-					if ( tmp ) {
-						elem[ ontype ] = null;
-					}
-
-					// Prevent re-triggering of the same event, since we already bubbled it above
-					jQuery.event.triggered = type;
-					try {
-						elem[ type ]();
-					} catch ( e ) {
-						// IE<9 dies on focus/blur to hidden element (#1486,#12518)
-						// only reproducible on winXP IE8 native, not IE9 in IE8 mode
-					}
-					jQuery.event.triggered = undefined;
-
-					if ( tmp ) {
-						elem[ ontype ] = tmp;
-					}
-				}
-			}
-		}
-
-		return event.result;
-	},
-
-	dispatch: function( event ) {
-
-		// Make a writable jQuery.Event from the native event object
-		event = jQuery.event.fix( event );
-
-		var i, ret, handleObj, matched, j,
-			handlerQueue = [],
-			args = core_slice.call( arguments ),
-			handlers = ( jQuery._data( this, "events" ) || {} )[ event.type ] || [],
-			special = jQuery.event.special[ event.type ] || {};
-
-		// Use the fix-ed jQuery.Event rather than the (read-only) native event
-		args[0] = event;
-		event.delegateTarget = this;
-
-		// Call the preDispatch hook for the mapped type, and let it bail if desired
-		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
-			return;
-		}
-
-		// Determine handlers
-		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
-
-		// Run delegates first; they may want to stop propagation beneath us
-		i = 0;
-		while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) {
-			event.currentTarget = matched.elem;
-
-			j = 0;
-			while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) {
-
-				// Triggered event must either 1) have no namespace, or
-				// 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
-				if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) {
-
-					event.handleObj = handleObj;
-					event.data = handleObj.data;
-
-					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
-							.apply( matched.elem, args );
-
-					if ( ret !== undefined ) {
-						if ( (event.result = ret) === false ) {
-							event.preventDefault();
-							event.stopPropagation();
-						}
-					}
-				}
-			}
-		}
-
-		// Call the postDispatch hook for the mapped type
-		if ( special.postDispatch ) {
-			special.postDispatch.call( this, event );
-		}
-
-		return event.result;
-	},
-
-	handlers: function( event, handlers ) {
-		var sel, handleObj, matches, i,
-			handlerQueue = [],
-			delegateCount = handlers.delegateCount,
-			cur = event.target;
-
-		// Find delegate handlers
-		// Black-hole SVG  instance trees (#13180)
-		// Avoid non-left-click bubbling in Firefox (#3861)
-		if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) {
-
-			/* jshint eqeqeq: false */
-			for ( ; cur != this; cur = cur.parentNode || this ) {
-				/* jshint eqeqeq: true */
-
-				// Don't check non-elements (#13208)
-				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
-				if ( cur.nodeType === 1 && (cur.disabled !== true || event.type !== "click") ) {
-					matches = [];
-					for ( i = 0; i < delegateCount; i++ ) {
-						handleObj = handlers[ i ];
-
-						// Don't conflict with Object.prototype properties (#13203)
-						sel = handleObj.selector + " ";
-
-						if ( matches[ sel ] === undefined ) {
-							matches[ sel ] = handleObj.needsContext ?
-								jQuery( sel, this ).index( cur ) >= 0 :
-								jQuery.find( sel, this, null, [ cur ] ).length;
-						}
-						if ( matches[ sel ] ) {
-							matches.push( handleObj );
-						}
-					}
-					if ( matches.length ) {
-						handlerQueue.push({ elem: cur, handlers: matches });
-					}
-				}
-			}
-		}
-
-		// Add the remaining (directly-bound) handlers
-		if ( delegateCount < handlers.length ) {
-			handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) });
-		}
-
-		return handlerQueue;
-	},
-
-	fix: function( event ) {
-		if ( event[ jQuery.expando ] ) {
-			return event;
-		}
-
-		// Create a writable copy of the event object and normalize some properties
-		var i, prop, copy,
-			type = event.type,
-			originalEvent = event,
-			fixHook = this.fixHooks[ type ];
-
-		if ( !fixHook ) {
-			this.fixHooks[ type ] = fixHook =
-				rmouseEvent.test( type ) ? this.mouseHooks :
-				rkeyEvent.test( type ) ? this.keyHooks :
-				{};
-		}
-		copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
-
-		event = new jQuery.Event( originalEvent );
-
-		i = copy.length;
-		while ( i-- ) {
-			prop = copy[ i ];
-			event[ prop ] = originalEvent[ prop ];
-		}
-
-		// Support: IE<9
-		// Fix target property (#1925)
-		if ( !event.target ) {
-			event.target = originalEvent.srcElement || document;
-		}
-
-		// Support: Chrome 23+, Safari?
-		// Target should not be a text node (#504, #13143)
-		if ( event.target.nodeType === 3 ) {
-			event.target = event.target.parentNode;
-		}
-
-		// Support: IE<9
-		// For mouse/key events, metaKey==false if it's undefined (#3368, #11328)
-		event.metaKey = !!event.metaKey;
-
-		return fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
-	},
-
-	// Includes some event props shared by KeyEvent and MouseEvent
-	props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
-
-	fixHooks: {},
-
-	keyHooks: {
-		props: "char charCode key keyCode".split(" "),
-		filter: function( event, original ) {
-
-			// Add which for key events
-			if ( event.which == null ) {
-				event.which = original.charCode != null ? original.charCode : original.keyCode;
-			}
-
-			return event;
-		}
-	},
-
-	mouseHooks: {
-		props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
-		filter: function( event, original ) {
-			var body, eventDoc, doc,
-				button = original.button,
-				fromElement = original.fromElement;
-
-			// Calculate pageX/Y if missing and clientX/Y available
-			if ( event.pageX == null && original.clientX != null ) {
-				eventDoc = event.target.ownerDocument || document;
-				doc = eventDoc.documentElement;
-				body = eventDoc.body;
-
-				event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
-				event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
-			}
-
-			// Add relatedTarget, if necessary
-			if ( !event.relatedTarget && fromElement ) {
-				event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
-			}
-
-			// Add which for click: 1 === left; 2 === middle; 3 === right
-			// Note: button is not normalized, so don't use it
-			if ( !event.which && button !== undefined ) {
-				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
-			}
-
-			return event;
-		}
-	},
-
-	special: {
-		load: {
-			// Prevent triggered image.load events from bubbling to window.load
-			noBubble: true
-		},
-		focus: {
-			// Fire native event if possible so blur/focus sequence is correct
-			trigger: function() {
-				if ( this !== safeActiveElement() && this.focus ) {
-					try {
-						this.focus();
-						return false;
-					} catch ( e ) {
-						// Support: IE<9
-						// If we error on focus to hidden element (#1486, #12518),
-						// let .trigger() run the handlers
-					}
-				}
-			},
-			delegateType: "focusin"
-		},
-		blur: {
-			trigger: function() {
-				if ( this === safeActiveElement() && this.blur ) {
-					this.blur();
-					return false;
-				}
-			},
-			delegateType: "focusout"
-		},
-		click: {
-			// For checkbox, fire native event so checked state will be right
-			trigger: function() {
-				if ( jQuery.nodeName( this, "input" ) && this.type === "checkbox" && this.click ) {
-					this.click();
-					return false;
-				}
-			},
-
-			// For cross-browser consistency, don't fire native .click() on links
-			_default: function( event ) {
-				return jQuery.nodeName( event.target, "a" );
-			}
-		},
-
-		beforeunload: {
-			postDispatch: function( event ) {
-
-				// Even when returnValue equals to undefined Firefox will still show alert
-				if ( event.result !== undefined ) {
-					event.originalEvent.returnValue = event.result;
-				}
-			}
-		}
-	},
-
-	simulate: function( type, elem, event, bubble ) {
-		// Piggyback on a donor event to simulate a different one.
-		// Fake originalEvent to avoid donor's stopPropagation, but if the
-		// simulated event prevents default then we do the same on the donor.
-		var e = jQuery.extend(
-			new jQuery.Event(),
-			event,
-			{
-				type: type,
-				isSimulated: true,
-				originalEvent: {}
-			}
-		);
-		if ( bubble ) {
-			jQuery.event.trigger( e, null, elem );
-		} else {
-			jQuery.event.dispatch.call( elem, e );
-		}
-		if ( e.isDefaultPrevented() ) {
-			event.preventDefault();
-		}
-	}
-};
-
-jQuery.removeEvent = document.removeEventListener ?
-	function( elem, type, handle ) {
-		if ( elem.removeEventListener ) {
-			elem.removeEventListener( type, handle, false );
-		}
-	} :
-	function( elem, type, handle ) {
-		var name = "on" + type;
-
-		if ( elem.detachEvent ) {
-
-			// #8545, #7054, preventing memory leaks for custom events in IE6-8
-			// detachEvent needed property on element, by name of that event, to properly expose it to GC
-			if ( typeof elem[ name ] === core_strundefined ) {
-				elem[ name ] = null;
-			}
-
-			elem.detachEvent( name, handle );
-		}
-	};
-
-jQuery.Event = function( src, props ) {
-	// Allow instantiation without the 'new' keyword
-	if ( !(this instanceof jQuery.Event) ) {
-		return new jQuery.Event( src, props );
-	}
-
-	// Event object
-	if ( src && src.type ) {
-		this.originalEvent = src;
-		this.type = src.type;
-
-		// Events bubbling up the document may have been marked as prevented
-		// by a handler lower down the tree; reflect the correct value.
-		this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false ||
-			src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse;
-
-	// Event type
-	} else {
-		this.type = src;
-	}
-
-	// Put explicitly provided properties onto the event object
-	if ( props ) {
-		jQuery.extend( this, props );
-	}
-
-	// Create a timestamp if incoming event doesn't have one
-	this.timeStamp = src && src.timeStamp || jQuery.now();
-
-	// Mark it as fixed
-	this[ jQuery.expando ] = true;
-};
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
-	isDefaultPrevented: returnFalse,
-	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse,
-
-	preventDefault: function() {
-		var e = this.originalEvent;
-
-		this.isDefaultPrevented = returnTrue;
-		if ( !e ) {
-			return;
-		}
-
-		// If preventDefault exists, run it on the original event
-		if ( e.preventDefault ) {
-			e.preventDefault();
-
-		// Support: IE
-		// Otherwise set the returnValue property of the original event to false
-		} else {
-			e.returnValue = false;
-		}
-	},
-	stopPropagation: function() {
-		var e = this.originalEvent;
-
-		this.isPropagationStopped = returnTrue;
-		if ( !e ) {
-			return;
-		}
-		// If stopPropagation exists, run it on the original event
-		if ( e.stopPropagation ) {
-			e.stopPropagation();
-		}
-
-		// Support: IE
-		// Set the cancelBubble property of the original event to true
-		e.cancelBubble = true;
-	},
-	stopImmediatePropagation: function() {
-		this.isImmediatePropagationStopped = returnTrue;
-		this.stopPropagation();
-	}
-};
-
-// Create mouseenter/leave events using mouseover/out and event-time checks
-jQuery.each({
-	mouseenter: "mouseover",
-	mouseleave: "mouseout"
-}, function( orig, fix ) {
-	jQuery.event.special[ orig ] = {
-		delegateType: fix,
-		bindType: fix,
-
-		handle: function( event ) {
-			var ret,
-				target = this,
-				related = event.relatedTarget,
-				handleObj = event.handleObj;
-
-			// For mousenter/leave call the handler if related is outside the target.
-			// NB: No relatedTarget if the mouse left/entered the browser window
-			if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
-				event.type = handleObj.origType;
-				ret = handleObj.handler.apply( this, arguments );
-				event.type = fix;
-			}
-			return ret;
-		}
-	};
-});
-
-// IE submit delegation
-if ( !jQuery.support.submitBubbles ) {
-
-	jQuery.event.special.submit = {
-		setup: function() {
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
-			}
-
-			// Lazy-add a submit handler when a descendant form may potentially be submitted
-			jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
-				// Node name check avoids a VML-related crash in IE (#9807)
-				var elem = e.target,
-					form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined;
-				if ( form && !jQuery._data( form, "submitBubbles" ) ) {
-					jQuery.event.add( form, "submit._submit", function( event ) {
-						event._submit_bubble = true;
-					});
-					jQuery._data( form, "submitBubbles", true );
-				}
-			});
-			// return undefined since we don't need an event listener
-		},
-
-		postDispatch: function( event ) {
-			// If form was submitted by the user, bubble the event up the tree
-			if ( event._submit_bubble ) {
-				delete event._submit_bubble;
-				if ( this.parentNode && !event.isTrigger ) {
-					jQuery.event.simulate( "submit", this.parentNode, event, true );
-				}
-			}
-		},
-
-		teardown: function() {
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
-			}
-
-			// Remove delegated handlers; cleanData eventually reaps submit handlers attached above
-			jQuery.event.remove( this, "._submit" );
-		}
-	};
-}
-
-// IE change delegation and checkbox/radio fix
-if ( !jQuery.support.changeBubbles ) {
-
-	jQuery.event.special.change = {
-
-		setup: function() {
-
-			if ( rformElems.test( this.nodeName ) ) {
-				// IE doesn't fire change on a check/radio until blur; trigger it on click
-				// after a propertychange. Eat the blur-change in special.change.handle.
-				// This still fires onchange a second time for check/radio after blur.
-				if ( this.type === "checkbox" || this.type === "radio" ) {
-					jQuery.event.add( this, "propertychange._change", function( event ) {
-						if ( event.originalEvent.propertyName === "checked" ) {
-							this._just_changed = true;
-						}
-					});
-					jQuery.event.add( this, "click._change", function( event ) {
-						if ( this._just_changed && !event.isTrigger ) {
-							this._just_changed = false;
-						}
-						// Allow triggered, simulated change events (#11500)
-						jQuery.event.simulate( "change", this, event, true );
-					});
-				}
-				return false;
-			}
-			// Delegated event; lazy-add a change handler on descendant inputs
-			jQuery.event.add( this, "beforeactivate._change", function( e ) {
-				var elem = e.target;
-
-				if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "changeBubbles" ) ) {
-					jQuery.event.add( elem, "change._change", function( event ) {
-						if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
-							jQuery.event.simulate( "change", this.parentNode, event, true );
-						}
-					});
-					jQuery._data( elem, "changeBubbles", true );
-				}
-			});
-		},
-
-		handle: function( event ) {
-			var elem = event.target;
-
-			// Swallow native change events from checkbox/radio, we already triggered them above
-			if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) {
-				return event.handleObj.handler.apply( this, arguments );
-			}
-		},
-
-		teardown: function() {
-			jQuery.event.remove( this, "._change" );
-
-			return !rformElems.test( this.nodeName );
-		}
-	};
-}
-
-// Create "bubbling" focus and blur events
-if ( !jQuery.support.focusinBubbles ) {
-	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-
-		// Attach a single capturing handler while someone wants focusin/focusout
-		var attaches = 0,
-			handler = function( event ) {
-				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
-			};
-
-		jQuery.event.special[ fix ] = {
-			setup: function() {
-				if ( attaches++ === 0 ) {
-					document.addEventListener( orig, handler, true );
-				}
-			},
-			teardown: function() {
-				if ( --attaches === 0 ) {
-					document.removeEventListener( orig, handler, true );
-				}
-			}
-		};
-	});
-}
-
-jQuery.fn.extend({
-
-	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
-		var type, origFn;
-
-		// Types can be a map of types/handlers
-		if ( typeof types === "object" ) {
-			// ( types-Object, selector, data )
-			if ( typeof selector !== "string" ) {
-				// ( types-Object, data )
-				data = data || selector;
-				selector = undefined;
-			}
-			for ( type in types ) {
-				this.on( type, selector, data, types[ type ], one );
-			}
-			return this;
-		}
-
-		if ( data == null && fn == null ) {
-			// ( types, fn )
-			fn = selector;
-			data = selector = undefined;
-		} else if ( fn == null ) {
-			if ( typeof selector === "string" ) {
-				// ( types, selector, fn )
-				fn = data;
-				data = undefined;
-			} else {
-				// ( types, data, fn )
-				fn = data;
-				data = selector;
-				selector = undefined;
-			}
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		} else if ( !fn ) {
-			return this;
-		}
-
-		if ( one === 1 ) {
-			origFn = fn;
-			fn = function( event ) {
-				// Can use an empty set, since event contains the info
-				jQuery().off( event );
-				return origFn.apply( this, arguments );
-			};
-			// Use same guid so caller can remove using origFn
-			fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
-		}
-		return this.each( function() {
-			jQuery.event.add( this, types, fn, data, selector );
-		});
-	},
-	one: function( types, selector, data, fn ) {
-		return this.on( types, selector, data, fn, 1 );
-	},
-	off: function( types, selector, fn ) {
-		var handleObj, type;
-		if ( types && types.preventDefault && types.handleObj ) {
-			// ( event )  dispatched jQuery.Event
-			handleObj = types.handleObj;
-			jQuery( types.delegateTarget ).off(
-				handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
-				handleObj.selector,
-				handleObj.handler
-			);
-			return this;
-		}
-		if ( typeof types === "object" ) {
-			// ( types-object [, selector] )
-			for ( type in types ) {
-				this.off( type, selector, types[ type ] );
-			}
-			return this;
-		}
-		if ( selector === false || typeof selector === "function" ) {
-			// ( types [, fn] )
-			fn = selector;
-			selector = undefined;
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		}
-		return this.each(function() {
-			jQuery.event.remove( this, types, fn, selector );
-		});
-	},
-
-	trigger: function( type, data ) {
-		return this.each(function() {
-			jQuery.event.trigger( type, data, this );
-		});
-	},
-	triggerHandler: function( type, data ) {
-		var elem = this[0];
-		if ( elem ) {
-			return jQuery.event.trigger( type, data, elem, true );
-		}
-	}
-});
-var isSimple = /^.[^:#\[\.,]*$/,
-	rparentsprev = /^(?:parents|prev(?:Until|All))/,
-	rneedsContext = jQuery.expr.match.needsContext,
-	// methods guaranteed to produce a unique set when starting from a unique set
-	guaranteedUnique = {
-		children: true,
-		contents: true,
-		next: true,
-		prev: true
-	};
-
-jQuery.fn.extend({
-	find: function( selector ) {
-		var i,
-			ret = [],
-			self = this,
-			len = self.length;
-
-		if ( typeof selector !== "string" ) {
-			return this.pushStack( jQuery( selector ).filter(function() {
-				for ( i = 0; i < len; i++ ) {
-					if ( jQuery.contains( self[ i ], this ) ) {
-						return true;
-					}
-				}
-			}) );
-		}
-
-		for ( i = 0; i < len; i++ ) {
-			jQuery.find( selector, self[ i ], ret );
-		}
-
-		// Needed because $( selector, context ) becomes $( context ).find( selector )
-		ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
-		ret.selector = this.selector ? this.selector + " " + selector : selector;
-		return ret;
-	},
-
-	has: function( target ) {
-		var i,
-			targets = jQuery( target, this ),
-			len = targets.length;
-
-		return this.filter(function() {
-			for ( i = 0; i < len; i++ ) {
-				if ( jQuery.contains( this, targets[i] ) ) {
-					return true;
-				}
-			}
-		});
-	},
-
-	not: function( selector ) {
-		return this.pushStack( winnow(this, selector || [], true) );
-	},
-
-	filter: function( selector ) {
-		return this.pushStack( winnow(this, selector || [], false) );
-	},
-
-	is: function( selector ) {
-		return !!winnow(
-			this,
-
-			// If this is a positional/relative selector, check membership in the returned set
-			// so $("p:first").is("p:last") won't return true for a doc with two "p".
-			typeof selector === "string" && rneedsContext.test( selector ) ?
-				jQuery( selector ) :
-				selector || [],
-			false
-		).length;
-	},
-
-	closest: function( selectors, context ) {
-		var cur,
-			i = 0,
-			l = this.length,
-			ret = [],
-			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
-				jQuery( selectors, context || this.context ) :
-				0;
-
-		for ( ; i < l; i++ ) {
-			for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) {
-				// Always skip document fragments
-				if ( cur.nodeType < 11 && (pos ?
-					pos.index(cur) > -1 :
-
-					// Don't pass non-elements to Sizzle
-					cur.nodeType === 1 &&
-						jQuery.find.matchesSelector(cur, selectors)) ) {
-
-					cur = ret.push( cur );
-					break;
-				}
-			}
-		}
-
-		return this.pushStack( ret.length > 1 ? jQuery.unique( ret ) : ret );
-	},
-
-	// Determine the position of an element within
-	// the matched set of elements
-	index: function( elem ) {
-
-		// No argument, return index in parent
-		if ( !elem ) {
-			return ( this[0] && this[0].parentNode ) ? this.first().prevAll().length : -1;
-		}
-
-		// index in selector
-		if ( typeof elem === "string" ) {
-			return jQuery.inArray( this[0], jQuery( elem ) );
-		}
-
-		// Locate the position of the desired element
-		return jQuery.inArray(
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[0] : elem, this );
-	},
-
-	add: function( selector, context ) {
-		var set = typeof selector === "string" ?
-				jQuery( selector, context ) :
-				jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ),
-			all = jQuery.merge( this.get(), set );
-
-		return this.pushStack( jQuery.unique(all) );
-	},
-
-	addBack: function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter(selector)
-		);
-	}
-});
-
-function sibling( cur, dir ) {
-	do {
-		cur = cur[ dir ];
-	} while ( cur && cur.nodeType !== 1 );
-
-	return cur;
-}
-
-jQuery.each({
-	parent: function( elem ) {
-		var parent = elem.parentNode;
-		return parent && parent.nodeType !== 11 ? parent : null;
-	},
-	parents: function( elem ) {
-		return jQuery.dir( elem, "parentNode" );
-	},
-	parentsUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "parentNode", until );
-	},
-	next: function( elem ) {
-		return sibling( elem, "nextSibling" );
-	},
-	prev: function( elem ) {
-		return sibling( elem, "previousSibling" );
-	},
-	nextAll: function( elem ) {
-		return jQuery.dir( elem, "nextSibling" );
-	},
-	prevAll: function( elem ) {
-		return jQuery.dir( elem, "previousSibling" );
-	},
-	nextUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "nextSibling", until );
-	},
-	prevUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "previousSibling", until );
-	},
-	siblings: function( elem ) {
-		return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
-	},
-	children: function( elem ) {
-		return jQuery.sibling( elem.firstChild );
-	},
-	contents: function( elem ) {
-		return jQuery.nodeName( elem, "iframe" ) ?
-			elem.contentDocument || elem.contentWindow.document :
-			jQuery.merge( [], elem.childNodes );
-	}
-}, function( name, fn ) {
-	jQuery.fn[ name ] = function( until, selector ) {
-		var ret = jQuery.map( this, fn, until );
-
-		if ( name.slice( -5 ) !== "Until" ) {
-			selector = until;
-		}
-
-		if ( selector && typeof selector === "string" ) {
-			ret = jQuery.filter( selector, ret );
-		}
-
-		if ( this.length > 1 ) {
-			// Remove duplicates
-			if ( !guaranteedUnique[ name ] ) {
-				ret = jQuery.unique( ret );
-			}
-
-			// Reverse order for parents* and prev-derivatives
-			if ( rparentsprev.test( name ) ) {
-				ret = ret.reverse();
-			}
-		}
-
-		return this.pushStack( ret );
-	};
-});
-
-jQuery.extend({
-	filter: function( expr, elems, not ) {
-		var elem = elems[ 0 ];
-
-		if ( not ) {
-			expr = ":not(" + expr + ")";
-		}
-
-		return elems.length === 1 && elem.nodeType === 1 ?
-			jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] :
-			jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
-				return elem.nodeType === 1;
-			}));
-	},
-
-	dir: function( elem, dir, until ) {
-		var matched = [],
-			cur = elem[ dir ];
-
-		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
-			if ( cur.nodeType === 1 ) {
-				matched.push( cur );
-			}
-			cur = cur[dir];
-		}
-		return matched;
-	},
-
-	sibling: function( n, elem ) {
-		var r = [];
-
-		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType === 1 && n !== elem ) {
-				r.push( n );
-			}
-		}
-
-		return r;
-	}
-});
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, not ) {
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep( elements, function( elem, i ) {
-			/* jshint -W018 */
-			return !!qualifier.call( elem, i, elem ) !== not;
-		});
-
-	}
-
-	if ( qualifier.nodeType ) {
-		return jQuery.grep( elements, function( elem ) {
-			return ( elem === qualifier ) !== not;
-		});
-
-	}
-
-	if ( typeof qualifier === "string" ) {
-		if ( isSimple.test( qualifier ) ) {
-			return jQuery.filter( qualifier, elements, not );
-		}
-
-		qualifier = jQuery.filter( qualifier, elements );
-	}
-
-	return jQuery.grep( elements, function( elem ) {
-		return ( jQuery.inArray( elem, qualifier ) >= 0 ) !== not;
-	});
-}
-function createSafeFragment( document ) {
-	var list = nodeNames.split( "|" ),
-		safeFrag = document.createDocumentFragment();
-
-	if ( safeFrag.createElement ) {
-		while ( list.length ) {
-			safeFrag.createElement(
-				list.pop()
-			);
-		}
-	}
-	return safeFrag;
-}
-
-var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" +
-		"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
-	rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
-	rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
-	rleadingWhitespace = /^\s+/,
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
-	rtagName = /<([\w:]+)/,
-	rtbody = /\s*$/g,
-
-	// We have to close these tags to support XHTML (#13200)
-	wrapMap = {
-		option: [ 1, "" ],
-		legend: [ 1, "
        ", "
        " ],
-		area: [ 1, "", "" ],
-		param: [ 1, "", "" ],
-		thead: [ 1, "", "
        " ],
-		tr: [ 2, "", "
        " ],
-		col: [ 2, "", "
        " ],
-		td: [ 3, "", "
        " ],
-
-		// IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags,
-		// unless wrapped in a div with non-breaking characters in front of it.
-		_default: jQuery.support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X
        ", "
        "  ]
-	},
-	safeFragment = createSafeFragment( document ),
-	fragmentDiv = safeFragment.appendChild( document.createElement("div") );
-
-wrapMap.optgroup = wrapMap.option;
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-jQuery.fn.extend({
-	text: function( value ) {
-		return jQuery.access( this, function( value ) {
-			return value === undefined ?
-				jQuery.text( this ) :
-				this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) );
-		}, null, value, arguments.length );
-	},
-
-	append: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.appendChild( elem );
-			}
-		});
-	},
-
-	prepend: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.insertBefore( elem, target.firstChild );
-			}
-		});
-	},
-
-	before: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this );
-			}
-		});
-	},
-
-	after: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			}
-		});
-	},
-
-	// keepData is for internal use only--do not document
-	remove: function( selector, keepData ) {
-		var elem,
-			elems = selector ? jQuery.filter( selector, this ) : this,
-			i = 0;
-
-		for ( ; (elem = elems[i]) != null; i++ ) {
-
-			if ( !keepData && elem.nodeType === 1 ) {
-				jQuery.cleanData( getAll( elem ) );
-			}
-
-			if ( elem.parentNode ) {
-				if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) {
-					setGlobalEval( getAll( elem, "script" ) );
-				}
-				elem.parentNode.removeChild( elem );
-			}
-		}
-
-		return this;
-	},
-
-	empty: function() {
-		var elem,
-			i = 0;
-
-		for ( ; (elem = this[i]) != null; i++ ) {
-			// Remove element nodes and prevent memory leaks
-			if ( elem.nodeType === 1 ) {
-				jQuery.cleanData( getAll( elem, false ) );
-			}
-
-			// Remove any remaining nodes
-			while ( elem.firstChild ) {
-				elem.removeChild( elem.firstChild );
-			}
-
-			// If this is a select, ensure that it displays empty (#12336)
-			// Support: IE<9
-			if ( elem.options && jQuery.nodeName( elem, "select" ) ) {
-				elem.options.length = 0;
-			}
-		}
-
-		return this;
-	},
-
-	clone: function( dataAndEvents, deepDataAndEvents ) {
-		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
-
-		return this.map( function () {
-			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
-		});
-	},
-
-	html: function( value ) {
-		return jQuery.access( this, function( value ) {
-			var elem = this[0] || {},
-				i = 0,
-				l = this.length;
-
-			if ( value === undefined ) {
-				return elem.nodeType === 1 ?
-					elem.innerHTML.replace( rinlinejQuery, "" ) :
-					undefined;
-			}
-
-			// See if we can take a shortcut and just use innerHTML
-			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
-				( jQuery.support.htmlSerialize || !rnoshimcache.test( value )  ) &&
-				( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
-				!wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) {
-
-				value = value.replace( rxhtmlTag, "<$1>" );
-
-				try {
-					for (; i < l; i++ ) {
-						// Remove element nodes and prevent memory leaks
-						elem = this[i] || {};
-						if ( elem.nodeType === 1 ) {
-							jQuery.cleanData( getAll( elem, false ) );
-							elem.innerHTML = value;
-						}
-					}
-
-					elem = 0;
-
-				// If using innerHTML throws an exception, use the fallback method
-				} catch(e) {}
-			}
-
-			if ( elem ) {
-				this.empty().append( value );
-			}
-		}, null, value, arguments.length );
-	},
-
-	replaceWith: function() {
-		var
-			// Snapshot the DOM in case .domManip sweeps something relevant into its fragment
-			args = jQuery.map( this, function( elem ) {
-				return [ elem.nextSibling, elem.parentNode ];
-			}),
-			i = 0;
-
-		// Make the changes, replacing each context element with the new content
-		this.domManip( arguments, function( elem ) {
-			var next = args[ i++ ],
-				parent = args[ i++ ];
-
-			if ( parent ) {
-				// Don't use the snapshot next if it has moved (#13810)
-				if ( next && next.parentNode !== parent ) {
-					next = this.nextSibling;
-				}
-				jQuery( this ).remove();
-				parent.insertBefore( elem, next );
-			}
-		// Allow new content to include elements from the context set
-		}, true );
-
-		// Force removal if there was no new content (e.g., from empty arguments)
-		return i ? this : this.remove();
-	},
-
-	detach: function( selector ) {
-		return this.remove( selector, true );
-	},
-
-	domManip: function( args, callback, allowIntersection ) {
-
-		// Flatten any nested arrays
-		args = core_concat.apply( [], args );
-
-		var first, node, hasScripts,
-			scripts, doc, fragment,
-			i = 0,
-			l = this.length,
-			set = this,
-			iNoClone = l - 1,
-			value = args[0],
-			isFunction = jQuery.isFunction( value );
-
-		// We can't cloneNode fragments that contain checked, in WebKit
-		if ( isFunction || !( l <= 1 || typeof value !== "string" || jQuery.support.checkClone || !rchecked.test( value ) ) ) {
-			return this.each(function( index ) {
-				var self = set.eq( index );
-				if ( isFunction ) {
-					args[0] = value.call( this, index, self.html() );
-				}
-				self.domManip( args, callback, allowIntersection );
-			});
-		}
-
-		if ( l ) {
-			fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, !allowIntersection && this );
-			first = fragment.firstChild;
-
-			if ( fragment.childNodes.length === 1 ) {
-				fragment = first;
-			}
-
-			if ( first ) {
-				scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
-				hasScripts = scripts.length;
-
-				// Use the original fragment for the last item instead of the first because it can end up
-				// being emptied incorrectly in certain situations (#8070).
-				for ( ; i < l; i++ ) {
-					node = fragment;
-
-					if ( i !== iNoClone ) {
-						node = jQuery.clone( node, true, true );
-
-						// Keep references to cloned scripts for later restoration
-						if ( hasScripts ) {
-							jQuery.merge( scripts, getAll( node, "script" ) );
-						}
-					}
-
-					callback.call( this[i], node, i );
-				}
-
-				if ( hasScripts ) {
-					doc = scripts[ scripts.length - 1 ].ownerDocument;
-
-					// Reenable scripts
-					jQuery.map( scripts, restoreScript );
-
-					// Evaluate executable scripts on first document insertion
-					for ( i = 0; i < hasScripts; i++ ) {
-						node = scripts[ i ];
-						if ( rscriptType.test( node.type || "" ) &&
-							!jQuery._data( node, "globalEval" ) && jQuery.contains( doc, node ) ) {
-
-							if ( node.src ) {
-								// Hope ajax is available...
-								jQuery._evalUrl( node.src );
-							} else {
-								jQuery.globalEval( ( node.text || node.textContent || node.innerHTML || "" ).replace( rcleanScript, "" ) );
-							}
-						}
-					}
-				}
-
-				// Fix #11809: Avoid leaking memory
-				fragment = first = null;
-			}
-		}
-
-		return this;
-	}
-});
-
-// Support: IE<8
-// Manipulating tables requires a tbody
-function manipulationTarget( elem, content ) {
-	return jQuery.nodeName( elem, "table" ) &&
-		jQuery.nodeName( content.nodeType === 1 ? content : content.firstChild, "tr" ) ?
-
-		elem.getElementsByTagName("tbody")[0] ||
-			elem.appendChild( elem.ownerDocument.createElement("tbody") ) :
-		elem;
-}
-
-// Replace/restore the type attribute of script elements for safe DOM manipulation
-function disableScript( elem ) {
-	elem.type = (jQuery.find.attr( elem, "type" ) !== null) + "/" + elem.type;
-	return elem;
-}
-function restoreScript( elem ) {
-	var match = rscriptTypeMasked.exec( elem.type );
-	if ( match ) {
-		elem.type = match[1];
-	} else {
-		elem.removeAttribute("type");
-	}
-	return elem;
-}
-
-// Mark scripts as having already been evaluated
-function setGlobalEval( elems, refElements ) {
-	var elem,
-		i = 0;
-	for ( ; (elem = elems[i]) != null; i++ ) {
-		jQuery._data( elem, "globalEval", !refElements || jQuery._data( refElements[i], "globalEval" ) );
-	}
-}
-
-function cloneCopyEvent( src, dest ) {
-
-	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
-		return;
-	}
-
-	var type, i, l,
-		oldData = jQuery._data( src ),
-		curData = jQuery._data( dest, oldData ),
-		events = oldData.events;
-
-	if ( events ) {
-		delete curData.handle;
-		curData.events = {};
-
-		for ( type in events ) {
-			for ( i = 0, l = events[ type ].length; i < l; i++ ) {
-				jQuery.event.add( dest, type, events[ type ][ i ] );
-			}
-		}
-	}
-
-	// make the cloned public data object a copy from the original
-	if ( curData.data ) {
-		curData.data = jQuery.extend( {}, curData.data );
-	}
-}
-
-function fixCloneNodeIssues( src, dest ) {
-	var nodeName, e, data;
-
-	// We do not need to do anything for non-Elements
-	if ( dest.nodeType !== 1 ) {
-		return;
-	}
-
-	nodeName = dest.nodeName.toLowerCase();
-
-	// IE6-8 copies events bound via attachEvent when using cloneNode.
-	if ( !jQuery.support.noCloneEvent && dest[ jQuery.expando ] ) {
-		data = jQuery._data( dest );
-
-		for ( e in data.events ) {
-			jQuery.removeEvent( dest, e, data.handle );
-		}
-
-		// Event data gets referenced instead of copied if the expando gets copied too
-		dest.removeAttribute( jQuery.expando );
-	}
-
-	// IE blanks contents when cloning scripts, and tries to evaluate newly-set text
-	if ( nodeName === "script" && dest.text !== src.text ) {
-		disableScript( dest ).text = src.text;
-		restoreScript( dest );
-
-	// IE6-10 improperly clones children of object elements using classid.
-	// IE10 throws NoModificationAllowedError if parent is null, #12132.
-	} else if ( nodeName === "object" ) {
-		if ( dest.parentNode ) {
-			dest.outerHTML = src.outerHTML;
-		}
-
-		// This path appears unavoidable for IE9. When cloning an object
-		// element in IE9, the outerHTML strategy above is not sufficient.
-		// If the src has innerHTML and the destination does not,
-		// copy the src.innerHTML into the dest.innerHTML. #10324
-		if ( jQuery.support.html5Clone && ( src.innerHTML && !jQuery.trim(dest.innerHTML) ) ) {
-			dest.innerHTML = src.innerHTML;
-		}
-
-	} else if ( nodeName === "input" && manipulation_rcheckableType.test( src.type ) ) {
-		// IE6-8 fails to persist the checked state of a cloned checkbox
-		// or radio button. Worse, IE6-7 fail to give the cloned element
-		// a checked appearance if the defaultChecked value isn't also set
-
-		dest.defaultChecked = dest.checked = src.checked;
-
-		// IE6-7 get confused and end up setting the value of a cloned
-		// checkbox/radio button to an empty string instead of "on"
-		if ( dest.value !== src.value ) {
-			dest.value = src.value;
-		}
-
-	// IE6-8 fails to return the selected option to the default selected
-	// state when cloning options
-	} else if ( nodeName === "option" ) {
-		dest.defaultSelected = dest.selected = src.defaultSelected;
-
-	// IE6-8 fails to set the defaultValue to the correct value when
-	// cloning other types of input fields
-	} else if ( nodeName === "input" || nodeName === "textarea" ) {
-		dest.defaultValue = src.defaultValue;
-	}
-}
-
-jQuery.each({
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var elems,
-			i = 0,
-			ret = [],
-			insert = jQuery( selector ),
-			last = insert.length - 1;
-
-		for ( ; i <= last; i++ ) {
-			elems = i === last ? this : this.clone(true);
-			jQuery( insert[i] )[ original ]( elems );
-
-			// Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get()
-			core_push.apply( ret, elems.get() );
-		}
-
-		return this.pushStack( ret );
-	};
-});
-
-function getAll( context, tag ) {
-	var elems, elem,
-		i = 0,
-		found = typeof context.getElementsByTagName !== core_strundefined ? context.getElementsByTagName( tag || "*" ) :
-			typeof context.querySelectorAll !== core_strundefined ? context.querySelectorAll( tag || "*" ) :
-			undefined;
-
-	if ( !found ) {
-		for ( found = [], elems = context.childNodes || context; (elem = elems[i]) != null; i++ ) {
-			if ( !tag || jQuery.nodeName( elem, tag ) ) {
-				found.push( elem );
-			} else {
-				jQuery.merge( found, getAll( elem, tag ) );
-			}
-		}
-	}
-
-	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
-		jQuery.merge( [ context ], found ) :
-		found;
-}
-
-// Used in buildFragment, fixes the defaultChecked property
-function fixDefaultChecked( elem ) {
-	if ( manipulation_rcheckableType.test( elem.type ) ) {
-		elem.defaultChecked = elem.checked;
-	}
-}
-
-jQuery.extend({
-	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
-		var destElements, node, clone, i, srcElements,
-			inPage = jQuery.contains( elem.ownerDocument, elem );
-
-		if ( jQuery.support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) {
-			clone = elem.cloneNode( true );
-
-		// IE<=8 does not properly clone detached, unknown element nodes
-		} else {
-			fragmentDiv.innerHTML = elem.outerHTML;
-			fragmentDiv.removeChild( clone = fragmentDiv.firstChild );
-		}
-
-		if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
-				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
-
-			// We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
-			destElements = getAll( clone );
-			srcElements = getAll( elem );
-
-			// Fix all IE cloning issues
-			for ( i = 0; (node = srcElements[i]) != null; ++i ) {
-				// Ensure that the destination node is not null; Fixes #9587
-				if ( destElements[i] ) {
-					fixCloneNodeIssues( node, destElements[i] );
-				}
-			}
-		}
-
-		// Copy the events from the original to the clone
-		if ( dataAndEvents ) {
-			if ( deepDataAndEvents ) {
-				srcElements = srcElements || getAll( elem );
-				destElements = destElements || getAll( clone );
-
-				for ( i = 0; (node = srcElements[i]) != null; i++ ) {
-					cloneCopyEvent( node, destElements[i] );
-				}
-			} else {
-				cloneCopyEvent( elem, clone );
-			}
-		}
-
-		// Preserve script evaluation history
-		destElements = getAll( clone, "script" );
-		if ( destElements.length > 0 ) {
-			setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
-		}
-
-		destElements = srcElements = node = null;
-
-		// Return the cloned set
-		return clone;
-	},
-
-	buildFragment: function( elems, context, scripts, selection ) {
-		var j, elem, contains,
-			tmp, tag, tbody, wrap,
-			l = elems.length,
-
-			// Ensure a safe fragment
-			safe = createSafeFragment( context ),
-
-			nodes = [],
-			i = 0;
-
-		for ( ; i < l; i++ ) {
-			elem = elems[ i ];
-
-			if ( elem || elem === 0 ) {
-
-				// Add nodes directly
-				if ( jQuery.type( elem ) === "object" ) {
-					jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
-
-				// Convert non-html into a text node
-				} else if ( !rhtml.test( elem ) ) {
-					nodes.push( context.createTextNode( elem ) );
-
-				// Convert html into DOM nodes
-				} else {
-					tmp = tmp || safe.appendChild( context.createElement("div") );
-
-					// Deserialize a standard representation
-					tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase();
-					wrap = wrapMap[ tag ] || wrapMap._default;
-
-					tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1>" ) + wrap[2];
-
-					// Descend through wrappers to the right content
-					j = wrap[0];
-					while ( j-- ) {
-						tmp = tmp.lastChild;
-					}
-
-					// Manually add leading whitespace removed by IE
-					if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
-						nodes.push( context.createTextNode( rleadingWhitespace.exec( elem )[0] ) );
-					}
-
-					// Remove IE's autoinserted  from table fragments
-					if ( !jQuery.support.tbody ) {
-
-						// String was a , *may* have spurious 
-						elem = tag === "table" && !rtbody.test( elem ) ?
-							tmp.firstChild :
-
-							// String was a bare  or 
-							wrap[1] === "
        " && !rtbody.test( elem ) ?
-								tmp :
-								0;
-
-						j = elem && elem.childNodes.length;
-						while ( j-- ) {
-							if ( jQuery.nodeName( (tbody = elem.childNodes[j]), "tbody" ) && !tbody.childNodes.length ) {
-								elem.removeChild( tbody );
-							}
-						}
-					}
-
-					jQuery.merge( nodes, tmp.childNodes );
-
-					// Fix #12392 for WebKit and IE > 9
-					tmp.textContent = "";
-
-					// Fix #12392 for oldIE
-					while ( tmp.firstChild ) {
-						tmp.removeChild( tmp.firstChild );
-					}
-
-					// Remember the top-level container for proper cleanup
-					tmp = safe.lastChild;
-				}
-			}
-		}
-
-		// Fix #11356: Clear elements from fragment
-		if ( tmp ) {
-			safe.removeChild( tmp );
-		}
-
-		// Reset defaultChecked for any radios and checkboxes
-		// about to be appended to the DOM in IE 6/7 (#8060)
-		if ( !jQuery.support.appendChecked ) {
-			jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked );
-		}
-
-		i = 0;
-		while ( (elem = nodes[ i++ ]) ) {
-
-			// #4087 - If origin and destination elements are the same, and this is
-			// that element, do not do anything
-			if ( selection && jQuery.inArray( elem, selection ) !== -1 ) {
-				continue;
-			}
-
-			contains = jQuery.contains( elem.ownerDocument, elem );
-
-			// Append to fragment
-			tmp = getAll( safe.appendChild( elem ), "script" );
-
-			// Preserve script evaluation history
-			if ( contains ) {
-				setGlobalEval( tmp );
-			}
-
-			// Capture executables
-			if ( scripts ) {
-				j = 0;
-				while ( (elem = tmp[ j++ ]) ) {
-					if ( rscriptType.test( elem.type || "" ) ) {
-						scripts.push( elem );
-					}
-				}
-			}
-		}
-
-		tmp = null;
-
-		return safe;
-	},
-
-	cleanData: function( elems, /* internal */ acceptData ) {
-		var elem, type, id, data,
-			i = 0,
-			internalKey = jQuery.expando,
-			cache = jQuery.cache,
-			deleteExpando = jQuery.support.deleteExpando,
-			special = jQuery.event.special;
-
-		for ( ; (elem = elems[i]) != null; i++ ) {
-
-			if ( acceptData || jQuery.acceptData( elem ) ) {
-
-				id = elem[ internalKey ];
-				data = id && cache[ id ];
-
-				if ( data ) {
-					if ( data.events ) {
-						for ( type in data.events ) {
-							if ( special[ type ] ) {
-								jQuery.event.remove( elem, type );
-
-							// This is a shortcut to avoid jQuery.event.remove's overhead
-							} else {
-								jQuery.removeEvent( elem, type, data.handle );
-							}
-						}
-					}
-
-					// Remove cache only if it was not already removed by jQuery.event.remove
-					if ( cache[ id ] ) {
-
-						delete cache[ id ];
-
-						// IE does not allow us to delete expando properties from nodes,
-						// nor does it have a removeAttribute function on Document nodes;
-						// we must handle all of these cases
-						if ( deleteExpando ) {
-							delete elem[ internalKey ];
-
-						} else if ( typeof elem.removeAttribute !== core_strundefined ) {
-							elem.removeAttribute( internalKey );
-
-						} else {
-							elem[ internalKey ] = null;
-						}
-
-						core_deletedIds.push( id );
-					}
-				}
-			}
-		}
-	},
-
-	_evalUrl: function( url ) {
-		return jQuery.ajax({
-			url: url,
-			type: "GET",
-			dataType: "script",
-			async: false,
-			global: false,
-			"throws": true
-		});
-	}
-});
-jQuery.fn.extend({
-	wrapAll: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapAll( html.call(this, i) );
-			});
-		}
-
-		if ( this[0] ) {
-			// The elements to wrap the target around
-			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
-
-			if ( this[0].parentNode ) {
-				wrap.insertBefore( this[0] );
-			}
-
-			wrap.map(function() {
-				var elem = this;
-
-				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
-					elem = elem.firstChild;
-				}
-
-				return elem;
-			}).append( this );
-		}
-
-		return this;
-	},
-
-	wrapInner: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapInner( html.call(this, i) );
-			});
-		}
-
-		return this.each(function() {
-			var self = jQuery( this ),
-				contents = self.contents();
-
-			if ( contents.length ) {
-				contents.wrapAll( html );
-
-			} else {
-				self.append( html );
-			}
-		});
-	},
-
-	wrap: function( html ) {
-		var isFunction = jQuery.isFunction( html );
-
-		return this.each(function(i) {
-			jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
-		});
-	},
-
-	unwrap: function() {
-		return this.parent().each(function() {
-			if ( !jQuery.nodeName( this, "body" ) ) {
-				jQuery( this ).replaceWith( this.childNodes );
-			}
-		}).end();
-	}
-});
-var iframe, getStyles, curCSS,
-	ralpha = /alpha\([^)]*\)/i,
-	ropacity = /opacity\s*=\s*([^)]*)/,
-	rposition = /^(top|right|bottom|left)$/,
-	// swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
-	// see here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
-	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
-	rmargin = /^margin/,
-	rnumsplit = new RegExp( "^(" + core_pnum + ")(.*)$", "i" ),
-	rnumnonpx = new RegExp( "^(" + core_pnum + ")(?!px)[a-z%]+$", "i" ),
-	rrelNum = new RegExp( "^([+-])=(" + core_pnum + ")", "i" ),
-	elemdisplay = { BODY: "block" },
-
-	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
-	cssNormalTransform = {
-		letterSpacing: 0,
-		fontWeight: 400
-	},
-
-	cssExpand = [ "Top", "Right", "Bottom", "Left" ],
-	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ];
-
-// return a css property mapped to a potentially vendor prefixed property
-function vendorPropName( style, name ) {
-
-	// shortcut for names that are not vendor prefixed
-	if ( name in style ) {
-		return name;
-	}
-
-	// check for vendor prefixed names
-	var capName = name.charAt(0).toUpperCase() + name.slice(1),
-		origName = name,
-		i = cssPrefixes.length;
-
-	while ( i-- ) {
-		name = cssPrefixes[ i ] + capName;
-		if ( name in style ) {
-			return name;
-		}
-	}
-
-	return origName;
-}
-
-function isHidden( elem, el ) {
-	// isHidden might be called from jQuery#filter function;
-	// in that case, element will be second argument
-	elem = el || elem;
-	return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
-}
-
-function showHide( elements, show ) {
-	var display, elem, hidden,
-		values = [],
-		index = 0,
-		length = elements.length;
-
-	for ( ; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-
-		values[ index ] = jQuery._data( elem, "olddisplay" );
-		display = elem.style.display;
-		if ( show ) {
-			// Reset the inline display of this element to learn if it is
-			// being hidden by cascaded rules or not
-			if ( !values[ index ] && display === "none" ) {
-				elem.style.display = "";
-			}
-
-			// Set elements which have been overridden with display: none
-			// in a stylesheet to whatever the default browser style is
-			// for such an element
-			if ( elem.style.display === "" && isHidden( elem ) ) {
-				values[ index ] = jQuery._data( elem, "olddisplay", css_defaultDisplay(elem.nodeName) );
-			}
-		} else {
-
-			if ( !values[ index ] ) {
-				hidden = isHidden( elem );
-
-				if ( display && display !== "none" || !hidden ) {
-					jQuery._data( elem, "olddisplay", hidden ? display : jQuery.css( elem, "display" ) );
-				}
-			}
-		}
-	}
-
-	// Set the display of most of the elements in a second loop
-	// to avoid the constant reflow
-	for ( index = 0; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-		if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
-			elem.style.display = show ? values[ index ] || "" : "none";
-		}
-	}
-
-	return elements;
-}
-
-jQuery.fn.extend({
-	css: function( name, value ) {
-		return jQuery.access( this, function( elem, name, value ) {
-			var len, styles,
-				map = {},
-				i = 0;
-
-			if ( jQuery.isArray( name ) ) {
-				styles = getStyles( elem );
-				len = name.length;
-
-				for ( ; i < len; i++ ) {
-					map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
-				}
-
-				return map;
-			}
-
-			return value !== undefined ?
-				jQuery.style( elem, name, value ) :
-				jQuery.css( elem, name );
-		}, name, value, arguments.length > 1 );
-	},
-	show: function() {
-		return showHide( this, true );
-	},
-	hide: function() {
-		return showHide( this );
-	},
-	toggle: function( state ) {
-		if ( typeof state === "boolean" ) {
-			return state ? this.show() : this.hide();
-		}
-
-		return this.each(function() {
-			if ( isHidden( this ) ) {
-				jQuery( this ).show();
-			} else {
-				jQuery( this ).hide();
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	// Add in style property hooks for overriding the default
-	// behavior of getting and setting a style property
-	cssHooks: {
-		opacity: {
-			get: function( elem, computed ) {
-				if ( computed ) {
-					// We should always get a number back from opacity
-					var ret = curCSS( elem, "opacity" );
-					return ret === "" ? "1" : ret;
-				}
-			}
-		}
-	},
-
-	// Don't automatically add "px" to these possibly-unitless properties
-	cssNumber: {
-		"columnCount": true,
-		"fillOpacity": true,
-		"fontWeight": true,
-		"lineHeight": true,
-		"opacity": true,
-		"order": true,
-		"orphans": true,
-		"widows": true,
-		"zIndex": true,
-		"zoom": true
-	},
-
-	// Add in properties whose names you wish to fix before
-	// setting or getting the value
-	cssProps: {
-		// normalize float css property
-		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
-	},
-
-	// Get and set the style property on a DOM Node
-	style: function( elem, name, value, extra ) {
-		// Don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
-			return;
-		}
-
-		// Make sure that we're working with the right name
-		var ret, type, hooks,
-			origName = jQuery.camelCase( name ),
-			style = elem.style;
-
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) );
-
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// Check if we're setting a value
-		if ( value !== undefined ) {
-			type = typeof value;
-
-			// convert relative number strings (+= or -=) to relative numbers. #7345
-			if ( type === "string" && (ret = rrelNum.exec( value )) ) {
-				value = ( ret[1] + 1 ) * ret[2] + parseFloat( jQuery.css( elem, name ) );
-				// Fixes bug #9237
-				type = "number";
-			}
-
-			// Make sure that NaN and null values aren't set. See: #7116
-			if ( value == null || type === "number" && isNaN( value ) ) {
-				return;
-			}
-
-			// If a number was passed in, add 'px' to the (except for certain CSS properties)
-			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
-				value += "px";
-			}
-
-			// Fixes #8908, it can be done more correctly by specifing setters in cssHooks,
-			// but it would mean to define eight (for every problematic property) identical functions
-			if ( !jQuery.support.clearCloneStyle && value === "" && name.indexOf("background") === 0 ) {
-				style[ name ] = "inherit";
-			}
-
-			// If a hook was provided, use that value, otherwise just set the specified value
-			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) {
-
-				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
-				// Fixes bug #5509
-				try {
-					style[ name ] = value;
-				} catch(e) {}
-			}
-
-		} else {
-			// If a hook was provided get the non-computed value from there
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
-				return ret;
-			}
-
-			// Otherwise just get the value from the style object
-			return style[ name ];
-		}
-	},
-
-	css: function( elem, name, extra, styles ) {
-		var num, val, hooks,
-			origName = jQuery.camelCase( name );
-
-		// Make sure that we're working with the right name
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) );
-
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// If a hook was provided get the computed value from there
-		if ( hooks && "get" in hooks ) {
-			val = hooks.get( elem, true, extra );
-		}
-
-		// Otherwise, if a way to get the computed value exists, use that
-		if ( val === undefined ) {
-			val = curCSS( elem, name, styles );
-		}
-
-		//convert "normal" to computed value
-		if ( val === "normal" && name in cssNormalTransform ) {
-			val = cssNormalTransform[ name ];
-		}
-
-		// Return, converting to number if forced or a qualifier was provided and val looks numeric
-		if ( extra === "" || extra ) {
-			num = parseFloat( val );
-			return extra === true || jQuery.isNumeric( num ) ? num || 0 : val;
-		}
-		return val;
-	}
-});
-
-// NOTE: we've included the "window" in window.getComputedStyle
-// because jsdom on node.js will break without it.
-if ( window.getComputedStyle ) {
-	getStyles = function( elem ) {
-		return window.getComputedStyle( elem, null );
-	};
-
-	curCSS = function( elem, name, _computed ) {
-		var width, minWidth, maxWidth,
-			computed = _computed || getStyles( elem ),
-
-			// getPropertyValue is only needed for .css('filter') in IE9, see #12537
-			ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined,
-			style = elem.style;
-
-		if ( computed ) {
-
-			if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
-				ret = jQuery.style( elem, name );
-			}
-
-			// A tribute to the "awesome hack by Dean Edwards"
-			// Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right
-			// Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
-			// this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
-			if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
-
-				// Remember the original values
-				width = style.width;
-				minWidth = style.minWidth;
-				maxWidth = style.maxWidth;
-
-				// Put in the new values to get a computed value out
-				style.minWidth = style.maxWidth = style.width = ret;
-				ret = computed.width;
-
-				// Revert the changed values
-				style.width = width;
-				style.minWidth = minWidth;
-				style.maxWidth = maxWidth;
-			}
-		}
-
-		return ret;
-	};
-} else if ( document.documentElement.currentStyle ) {
-	getStyles = function( elem ) {
-		return elem.currentStyle;
-	};
-
-	curCSS = function( elem, name, _computed ) {
-		var left, rs, rsLeft,
-			computed = _computed || getStyles( elem ),
-			ret = computed ? computed[ name ] : undefined,
-			style = elem.style;
-
-		// Avoid setting ret to empty string here
-		// so we don't default to auto
-		if ( ret == null && style && style[ name ] ) {
-			ret = style[ name ];
-		}
-
-		// From the awesome hack by Dean Edwards
-		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-
-		// If we're not dealing with a regular pixel number
-		// but a number that has a weird ending, we need to convert it to pixels
-		// but not position css attributes, as those are proportional to the parent element instead
-		// and we can't measure the parent instead because it might trigger a "stacking dolls" problem
-		if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) {
-
-			// Remember the original values
-			left = style.left;
-			rs = elem.runtimeStyle;
-			rsLeft = rs && rs.left;
-
-			// Put in the new values to get a computed value out
-			if ( rsLeft ) {
-				rs.left = elem.currentStyle.left;
-			}
-			style.left = name === "fontSize" ? "1em" : ret;
-			ret = style.pixelLeft + "px";
-
-			// Revert the changed values
-			style.left = left;
-			if ( rsLeft ) {
-				rs.left = rsLeft;
-			}
-		}
-
-		return ret === "" ? "auto" : ret;
-	};
-}
-
-function setPositiveNumber( elem, value, subtract ) {
-	var matches = rnumsplit.exec( value );
-	return matches ?
-		// Guard against undefined "subtract", e.g., when used as in cssHooks
-		Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
-		value;
-}
-
-function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
-	var i = extra === ( isBorderBox ? "border" : "content" ) ?
-		// If we already have the right measurement, avoid augmentation
-		4 :
-		// Otherwise initialize for horizontal or vertical properties
-		name === "width" ? 1 : 0,
-
-		val = 0;
-
-	for ( ; i < 4; i += 2 ) {
-		// both box models exclude margin, so add it if we want it
-		if ( extra === "margin" ) {
-			val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
-		}
-
-		if ( isBorderBox ) {
-			// border-box includes padding, so remove it if we want content
-			if ( extra === "content" ) {
-				val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-			}
-
-			// at this point, extra isn't border nor margin, so remove border
-			if ( extra !== "margin" ) {
-				val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		} else {
-			// at this point, extra isn't content, so add padding
-			val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-
-			// at this point, extra isn't content nor padding, so add border
-			if ( extra !== "padding" ) {
-				val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		}
-	}
-
-	return val;
-}
-
-function getWidthOrHeight( elem, name, extra ) {
-
-	// Start with offset property, which is equivalent to the border-box value
-	var valueIsBorderBox = true,
-		val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
-		styles = getStyles( elem ),
-		isBorderBox = jQuery.support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
-
-	// some non-html elements return undefined for offsetWidth, so check for null/undefined
-	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
-	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
-	if ( val <= 0 || val == null ) {
-		// Fall back to computed then uncomputed css if necessary
-		val = curCSS( elem, name, styles );
-		if ( val < 0 || val == null ) {
-			val = elem.style[ name ];
-		}
-
-		// Computed unit is not pixels. Stop here and return.
-		if ( rnumnonpx.test(val) ) {
-			return val;
-		}
-
-		// we need the check for style in case a browser which returns unreliable values
-		// for getComputedStyle silently falls back to the reliable elem.style
-		valueIsBorderBox = isBorderBox && ( jQuery.support.boxSizingReliable || val === elem.style[ name ] );
-
-		// Normalize "", auto, and prepare for extra
-		val = parseFloat( val ) || 0;
-	}
-
-	// use the active box-sizing model to add/subtract irrelevant styles
-	return ( val +
-		augmentWidthOrHeight(
-			elem,
-			name,
-			extra || ( isBorderBox ? "border" : "content" ),
-			valueIsBorderBox,
-			styles
-		)
-	) + "px";
-}
-
-// Try to determine the default display value of an element
-function css_defaultDisplay( nodeName ) {
-	var doc = document,
-		display = elemdisplay[ nodeName ];
-
-	if ( !display ) {
-		display = actualDisplay( nodeName, doc );
-
-		// If the simple way fails, read from inside an iframe
-		if ( display === "none" || !display ) {
-			// Use the already-created iframe if possible
-			iframe = ( iframe ||
-				jQuery("