update travis-ci branch name for master
update travis-ci branch name for alpha
merged travis-ci lines
Merge branch 'alpha'