merge Bootstrap3

Merge the original to my fork.