Merge pull request #1 from balihoo/BranchBuild

Branch build
breaking the branch again
Merge branches 'master' and 'master' of https://github.com/balihoo/PlayGitFlowTravisHerokuTest into BranchBuild