Fix Select2 Button styles
Merge branch 'select-2-options' into dev

Conflicts:
	css/dist/cmb.min.css