refactor deploy
rebase changes on master
rename target -> upstream
rebase from develop
fix deploy
fix deploy
generated by travis
generated by travis
generated by travis