Fix travis
Merge branch 'master' of github.com:Codaxis/bootstrap3-helpers
Fix composer.json