Merge pull request #433 from support-project/develop

Develop to Master
support-project · Aug 6, 2016 · 2c010d9 · 2c010d9
2 parents 77a6227 + ac29be8
commit 2c010d9
Show file tree

Hide file tree

Showing 139 changed files with 7,218 additions and 738 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -91,6 +91,15 @@
    - License: [MIT] http://fortawesome.github.io/Font-Awesome/license/
    - project-url: http://fortawesome.github.io/Font-Awesome/
 
+
+- html5shiv
+   - License: [MIT] https://github.com/aFarkas/html5shiv/blob/master/MIT%20and%20GPL2%20licenses.md
+   - project-url: https://github.com/aFarkas/html5shiv
+
+- respond
+   - License: [MIT]https://github.com/scottjehl/Respond/blob/master/LICENSE-MIT
+   - project-url: https://github.com/scottjehl/Respond
+
 - notifyjs
    - License: [MIT] https://github.com/jpillora/notifyjs
    - project-url: http://notifyjs.com/
@@ -143,3 +152,12 @@
    - License: [MIT] https://github.com/lipis/flag-icon-css/blob/master/LICENSE
    - project-url: https://github.com/lipis/flag-icon-css
 
+- moment
+   - License: [MIT] https://github.com/moment/moment/blob/develop/LICENSE
+   - project-url: http://momentjs.com/
+
+- clipboard
+   - License: [MIT] https://zenorocha.mit-license.org/
+   - project-url: https://github.com/zenorocha/clipboard.js
+
+
diff --git a/document/database/A5M2_knowledge.pdf b/document/database/A5M2_knowledge.pdf