Merge pull request #17 from teddy-hoo/master

fix bugs in weiqi's code
add staging and production deploy
add upgrade task