Fixed typo
Updated JSHint to check package.json and bower.json
Emphasis bugfix
Corrected spelling error
Merge branch 'master' into develop

Conflicts:
	bower.json
Updated version