Refactoring to bootstrap 3.0 RC1
Fixing merge conflicts