diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..f27ce26
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,46 @@
+**Note: for support questions, please use one of these channels:** https://github.com/aspnet/Home/blob/dev/CONTRIBUTING.md#filing-issues. This repository's issues are reserved for feature requests and bug reports.
+
+* **I'm submitting a ...**
+- [ ] bug report
+- [ ] feature request
+- [ ] support request => Please do not submit support request here, see note at the top of this template.
+
+* **What Modules or Template are related to this Issue?**
+- [ ] AngularServices
+- [ ] NodeServices
+- [ ] ReactServices
+- [ ] SpaServices
+- [ ] Angular2 Spa
+- [ ] Knockout Spa 
+- [ ] ReactRedux Spa
+- [ ] React Spa
+
+
+* **Do you want to request a *feature* or report a *bug*?**
+
+
+
+* **What is the current behavior?**
+
+
+
+* **If the current behavior is a bug, please provide the steps to reproduce and if possible a minimal demo of the problem** by creating a github repo.
+
+
+
+* **What is the expected behavior?**
+
+
+
+* **What is the motivation / use case for changing the behavior?**
+
+
+
+* **Please tell us about your environment:**
+
+- Browser: [all | Chrome XX | Firefox XX | IE XX | Safari XX ]
+- OS:  [all | Mac OS X | Windows | Linux ]
+- Platform: [all | NodeJs | Java | PHP | .Net | Ruby]
+
+
+* **Other information** (e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. stackoverflow, gitter, etc)
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..733500d
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,32 @@
+* **Please check if the PR fulfills these requirements**
+- [ ] The commit message follows our guidelines: https://github.com/aspnet/Home/blob/dev/CONTRIBUTING.md#contributing-code-and-content
+- [ ] Tests for the changes have been added (for bug fixes / features)
+- [ ] Docs have been added / updated (for bug fixes / features)
+
+* **What Modules or Template are related to this pull-request?**
+- [ ] AngularServices
+- [ ] NodeServices
+- [ ] ReactServices
+- [ ] SpaServices
+- [ ] Angular2 Spa
+- [ ] Knockout Spa 
+- [ ] ReactRedux Spa
+- [ ] React Spa
+
+* **What kind of change does this PR introduce?** (Bug fix, feature, docs update, ...)
+remove unused proxy imports from some test files
+
+
+* **What is the current behavior?** (You can also link to an open issue here)
+
+
+
+* **What is the new behavior (if this is a feature change)?**
+
+
+
+* **Does this PR introduce a breaking change?** (What changes might users need to make in their application due to this PR?)
+No
+
+
+* **Other information**: