deploy script now merges master into bin before deploying
Merge branch 'master' into bin