diff --git a/demo-shell-ng2/app/app.component.html b/demo-shell-ng2/app/app.component.html
index 72ef8f04b0..cdb4077c1f 100644
--- a/demo-shell-ng2/app/app.component.html
+++ b/demo-shell-ng2/app/app.component.html
@@ -17,6 +17,7 @@
Uploader
Activiti
Webscript
+ Tag
Login
About
@@ -47,6 +48,7 @@
Login Demo
Activiti Components Demo
Webscript
+ Tag
About
ECM host
diff --git a/demo-shell-ng2/app/app.routes.ts b/demo-shell-ng2/app/app.routes.ts
index feaa94f7c0..2d6fd318ee 100644
--- a/demo-shell-ng2/app/app.routes.ts
+++ b/demo-shell-ng2/app/app.routes.ts
@@ -25,6 +25,7 @@ import {
LoginDemoComponent,
ActivitiDemoComponent,
WebscriptComponent,
+ TagComponent,
AboutComponent,
FormViewer
} from './components/index';
@@ -42,6 +43,7 @@ export const routes: RouterConfig = [
{ path: 'activiti/tasks/:id', component: FormViewer },
{ path: 'activiti/tasksnode/:id', component: FormNodeViewer },
{ path: 'webscript', component: WebscriptComponent },
+ { path: 'tag', component: TagComponent },
{ path: 'about', component: AboutComponent }
];
diff --git a/demo-shell-ng2/app/components/index.ts b/demo-shell-ng2/app/components/index.ts
index 368d7ea43e..9a0eb3b24c 100644
--- a/demo-shell-ng2/app/components/index.ts
+++ b/demo-shell-ng2/app/components/index.ts
@@ -23,5 +23,6 @@ export { LoginDemoComponent } from './login/login-demo.component';
export { ActivitiDemoComponent } from './activiti/activiti-demo.component';
export { FormViewer } from './activiti/form-viewer.component';
export { WebscriptComponent } from './webscript/webscript.component';
+export { TagComponent } from './tag/tag.component';
export { AboutComponent } from './about/about.component';
export { FilesComponent } from './files/files.component';
diff --git a/demo-shell-ng2/app/components/tag/tag.component.ts b/demo-shell-ng2/app/components/tag/tag.component.ts
new file mode 100644
index 0000000000..b04db97abf
--- /dev/null
+++ b/demo-shell-ng2/app/components/tag/tag.component.ts
@@ -0,0 +1,41 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Component } from '@angular/core';
+import { TAGCOMPONENT, TAGSERVICES } from 'ng2-alfresco-tag';
+
+@Component({
+ selector: 'alfresco-tag-demo',
+ template: `
+
+
+