Merge remote-tracking branch 'upstream/master'

Conflicts:
	dist/jquery.autocomplete.js
	dist/jquery.autocomplete.min.js
	src/jquery.autocomplete.js
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Changes to be committed:
#
#	modified:   devbridge-autocomplete.jquery.json
#	modified:   dist/jquery.autocomplete.js
#	modified:   dist/jquery.autocomplete.min.js
#	new file:   dist/jquery.autocomplete.min.js~
#	modified:   index.htm
#	modified:   readme.md
#	renamed:    content/countries.txt -> scripts/countries.js
#	modified:   scripts/demo.js
#	modified:   spec/autocompleteBehavior.js
#	modified:   src/jquery.autocomplete.js
#	new file:   src/jquery.autocomplete.js~
#