Upgraded Bootstrap to 3.2
Merge commit 'b8da0f7a290b1c680494915ce220b0b170eba9e7' into 1.1