Bootstrap 3.1.1 added

Merging this with the master