change the url of the twitter bootstrap in the composer.json
Merge branch 'refs/heads/master' into 2.1