Replacing bootstrap 2.3 with 3.0
Merging conflicts