Merge branch 'branch/twitter-bootstrap' into testing