update cocos api
update
Merge branch 'master' into win

Conflicts:
	Installed Packages/BracketHighlighter.sublime-package
	Installed Packages/Theme - Phoenix.sublime-package
	Packages/SublimeLinter/commands.py
	Packages/SublimeLinter/package-metadata.json
	Packages/User/Package Control.last-run
	Packages/User/Package Control.sublime-settings
	Packages/User/api.sublime-completions