Merge branch 'develop' of github.com:slywalker/TwitterBootstrap into develop
fixed composer.json