added --zero and --fresh to deploy
Merge branch '1.2.X'