Update to Bootstrap 2.2.2
Resolve conflicts