Updated classes of form generators as per in Twitter Bootstrap 3
Resolved conflicts