Updated JSHint
Merge branch 'develop'
2.1.4