feat(match): show x icon to clear/reset the current value (select2)
Adding ability to have a callback for highlighting an item
Merge remote-tracking branch 'origin/feat-allowclear'

* origin/feat-allowclear:
  feat(match): show x icon to clear/reset the current value (select2)
Updating build
updating docs
#319 - Fix for locking selections
Adding read me updates
#319 fix for lock selections
some more docs
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
updating readme
manual merge of feat lock
Merge branch 'feat-nogroup'

* feat-nogroup:
  #310 Fix for when group is not defined but select has other groups
Updating build and adding group docs
If 'search-enabled' attribute is missing, use value, defined in 'uiSelectConfig.searchEnabled' instead of hard-coded 'true'
moving to select choice
Merge branch 'feat-highlight'

* feat-highlight:
  moving to select choice
updating builds
Changed the choices.tpl to fix bug with IE groups

Modified all 3 of the choices.tpl.html to fix a bug that was not
allowing IE to render group names. Instead of using {{}} for the name I
switched it to ng-bind syntax.