Merge branch 'master'
Deleted form-control css