Merge branch 'develop' into issue/1344

* develop: (409 commits)
  ignore .vscode and package-lock.json
  supress npm warnings
  article view now generated after article model saved
  Fixes #1772
  Amend check to allow undefined data
  Switch to local log func
  Stop throwing error if repo update check failed
  Fix version check
  Add override for removal of list items
  Handle response errors better
  amend title for clarity following code review
  better help text, more consistent use of '?' in titles
  remove some ARIA labels that were not used add the core properties _isVisible and _isHidden add missing 'instruction' property to article & block improve usability through better titles/help text
  Master changes (#1741)
  Fix bug with recursive function call
  Remove testing header
  Update CHANGELOG for release 0.4.0 (#1739)
  Enchancements to install/update (#1726)
  Amend contentModel._children to allow for arrays
  fixes 1474
  ...

# Conflicts:
#	frontend/src/core/helpers.js

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,29 @@
+# BUG Template
+
+## Expected Behaviour
+
+## Actual Behaviour
+
+## Steps to Reproduce
+1.
+1.
+1.
+
+## Versions
+  - Authoring Tool Version:
+  - Framework Version:
+  - Operating System:
+  - Browser:
+
+
+# Feature Request Template
+
+## Affected Area
+
+## Requested Feature
+
+## Use Case
+
+## Current Workaround
+
+## Additional Information

.gitignore

@@ -1,21 +1,19 @@
-/adapt_framework
-
 /conf/config.json
 
 /data
 
-/frontend/src/adaptbuilder/css/adapt.css
-/frontend/src/adaptbuilder/css/adapt.css.map
-/frontend/src/adaptbuilder/css/adapt.css.map.imports
-/frontend/src/adaptbuilder/js/
+/frontend/build
 
+/frontend/src/modules/modules.js
 /frontend/src/plugins/plugins.js
 /frontend/src/templates/templates.js
 
 /node_modules/
 /nbproject/
 /master/
 
+package-lock.json
+
 /plugins/content/component/versions/
 /plugins/content/component/componentcache/
 /plugins/content/extension/versions/
@@ -33,10 +31,6 @@
 
 /.settings
 
-version.json
-
 .idea
-.vagrant
-.env
 .project
-*.iml
+.vscode

.travis.yml

@@ -1,10 +1,22 @@
 ---
 language: node_js
 node_js:
-  - '4.2'
+  - "4"
+  - "5"
+  - "6"
 
 sudo: required
 
+env:
+  - CXX=g++-4.8
+
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.8
+
 branches:
   only:
     - master
@@ -16,13 +28,12 @@ git:
 services:
   - mongodb
 
-cache:
-  directories:
-    - node_modules
-
 before_install:
-  - npm install -g npm
+  - git --version
+  - mongod --version
   - npm install -g adapt-cli
+  - adapt --version
+  - npm install -g grunt-cli
 
 install:
   - npm config set spin false
@@ -37,4 +48,3 @@ notifications:
       - https://webhooks.gitter.im/e/984c2f87fa167719344b
     on_success: change  # options: [always|never|change] default: always
     on_failure: always  # options: [always|never|change] default: always
-    on_start: false     # default: false