Fix front deployment
Fix grunt deploy target ip address
Merge branch 'step1' into step2