Merge branch 'master' into develop

Conflicts:
	package.json
Merge
Support token starting with symbol like $ or _
Merge branch 'develop'

Conflicts:
	package.json