Many fix.
Merge branch 'master' of https://github.com/primalbase/twitter-bootstrap

Conflicts:
	composer.phar