#319 fix for lock selections
Updating lock to be an expression
Merge branch 'feat-lock'

* feat-lock:
  Updating lock to be an expression
  #319 fix for lock selections

Conflicts:
	dist/select.css
	dist/select.js
	dist/select.min.css
	dist/select.min.js
	src/select.js
	src/select2/match-multiple.tpl.html