Update to Twitter Bootstrap v3.1.0

Signed-off-by: crynobone <crynobone@gmail.com>
Update changelog.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1'

Signed-off-by: crynobone <crynobone@gmail.com>

Conflicts:
	composer.json