Merge pull request #2145 from patrickli/select2-width

Always add 'form-control' class to select boxes
Merge branch 'master' into custom