Update jQuery to 2.1.0
Fix tests for non english locales
Fix gruntfile inclusion of jQuery
squashed from jasonsanjose/travis-sprint-33
use master and release target branches to limit which branches travis will build
enable test task for master and release branches
Remove duplicate none value
Reorder alphabetically
Merge branch 'master' into jasonsanjose/squashed-cla-check

Conflicts:
	.travis.yml
Updated by ALF automation.
Merge pull request #6778 from adobe/alf_localization

ALF Automation
Merge pull request #6766 from WebsiteDeveloper/patch-1

Remove duplicate none value for list-style
fix alphabetic ordering
Merge pull request #6789 from adobe/randy/fix-alpha

Fix alphabetic ordering
Makes reusable context objects for searching in project scope
merging Sprint 36 changes in the 'release' branch back into master
Fix bug with scopeOrder lengthening
Updated by ALF automation.
Merge pull request #6802 from adobe/bchin/merging-release-sprint-36-into-master

merging Sprint 36 changes in the 'release' branch back into master
Merge pull request #6804 from adobe/alf_localization

ALF Automation