Revert "Revert 508b062..1066ded"

This reverts commit cf43a15aa284b4af2a4db153effcb04b4d14f4c8.
Revert "Upgrade ui-select2 to ui-select"

This reverts commit 31ad9044ee7394c91ba63468da4b7f8c3f3e8f3b.