merge Bootstrap3

From original to my branch