Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	npm-shrinkwrap.json

Author: impaler

.gitignore

@@ -1,4 +1,5 @@
 /.idea
 /node_modules
 /test/*temp
-npm-debug.log
+/npm-debug.log
+/documentation

.travis.yml

@@ -19,3 +19,13 @@ script:
   - node node_modules/jasmine-node/bin/jasmine-node --version # expect jasmine 2.x
   - npm run lint
   - npm test
+
+after_success:
+  - npm run autodocs
+env:
+  global:
+  - secure: U+IdWhk/tUsG9e7hOxxeGhzbJ3iYYtvRyz4zExVI6JJz22TJX5UXwJJQmrrNcM1bwt1GTAbX3xYavE+kqs9I5wyeMX92+/o1gz2vp/46wRXAKC/X8lULVH0vopVtnKZnyKUIzQTYd7NxX0JsweJ9Y/4szkskygnTDu6lXkpPPVk=
+  # - DOCUMENT_BRANCH: ${TRAVIS_BRANCH}
+  - FLAG_PUBLISH_ON_RELEASE: 'true'
+  - REPO_SLUG: 'angularity/angularity.github.io'
+  - GH_PUBLISH_BRANCH: 'master'