update Bootstrap to 2.3.1
Merge branch 'master' into for_bashu