Merge branch 'master' into infra

# Conflicts:
#	lib/utils.js.map

Author: Amir Tocker

.travis.yml

@@ -1,6 +1,7 @@
 language: node_js
 node_js:
-- '5.11'
+- '4'
+- '6'
 env:
   matrix:
     secure: JXtnVGwM09h0TwTD3pl4htaVn0fotnbfXNvFUXKnz/+OOETha5/GtaZSzrKTWUBbLAlC1VfE9FN5YovKOnfknquijBlgZi+lc3AX7r/chtvSGJiSqGtvQwtmOsNrF/eUIZ1rmoZSGbPgwSB7/3Mg8yyrx402d9dripiAYugAPJuOnhMUa2JlR2nQqBEJf90yeqIO9luKBeBUJCYUxSJeJhSAUgSRoPq8Z7OOtIePTShtN3cwFD/X2+OsTrQc99qqQQH1iC8DPQZgWjIjDwuzzDovy16gVanto+X2Mbb8pxsFu0LkPz0z25W/MBpU+Wyobmb8mcyvgo0Wjbcrf2u0OzOtpDF04TyjBQroLi/7gwlFGro1IIEkNVgF9Ju7LepFKrChS3fe9Wk7a/cey//PkC/A5I8hHr8Ii06Ew7oAnLsgDs6Ib6QN4kOWvVCoQ1rDVGiqaNH8WtET+l2EpBFXocxdPMTKVd4x/oQSUbripiDpsYKS+FLSiZ91sqDh2wF6jxdaTNOwB3/5RN+2HF3d1nFWtwiglXsTaP9ojJGFus518tT9oi5rkz6fUE7A8HleLX5ezziHOW8XQ4Ui/3dYyn52lVpN3ZVeZrh4PtVviYzf9tuVXvh8TwMPZHTOIIYVj3RYERflCJeb7CgPRd5fO/uwrD7IZFeZ1ScMBkCY+aU=

CHANGELOG.md

@@ -1,4 +1,35 @@
 
+1.5.0 / 2016-12-29
+==================
+
+New functionality
+-----------------
+
+  * `add_context` & `remove_all_context` API
+  * Add `data-max-chunk-size` to input created by `image_upload_tag`
+  * Add `moderation` and `phash` parameters to explicit API
+  
+    
+Other changes
+-------------
+
+  * Modify Travis configuration to test NodeJS v4 and v6 only.
+  * Modify `TEST_TAG`
+  * Use Sinon spy in `start_at` test
+  * Support context as hash argument in context API
+  * Delete streaming profiles after tests
+  * Fix signing URL tests, Fixes #89
+  * Add timeout to delete streaming profile test
+  * add tests for add_context & remove_all_context
+  * add add_context & remove_all_context methods
+  * fix test description
+  * add test to phash in an explicit call
+  * add test to moderation parameter in an explicit call
+  * Add test to accepts {effect: art:incognito}
+  * support phash in explicit call
+  * Fix missing moderation parameter in an explicit call
+  * Fix `nil` to `null`. Call `config()` with parameter name.
+
 1.4.6 / 2016-11-25
 ==================