small changes
Merge branch 'origin' of github.com:clubajax/mocha-bootstrap