allowed only master and feature branches to initiate travis builds
Merge branch 'master' into mocks