Merge branch 'master' of https://github.com/ivaynberg/select2
(fixed syntax error in the previous commit)
Merge branch 'master' of https://github.com/astax-t/select2

Conflicts:
	select2.js