Updating Tab Bar
Update bootstrap from 2.x to 3.x
Merging