Grammar fixed and JS code formatted.
Grammar fixed and JS code formatted.
Merge branch 'dev'

Conflicts:
	package.json