Add form-control-static
Merge branch 'develop'