Merge branch 'master' into feature/search-by-context

# Conflicts:
#	lib/api.js
#	lib/api.js.map
#	lib/config.js
#	lib/preloaded_file.js
#	lib/upload_stream.js
#	lib/uploader.js
#	lib/uploader.js.map
#	lib/utils.js
#	lib/utils.js.map
#	lib/v2/api.js
#	lib/v2/index.js
#	lib/v2/uploader.js
#	test/api_spec.coffee

Author: Amir Tocker