merge request for both bootstrap v2 and v3 support