Supressing JSHint errors
Merge branch 'master' into advobyalanna