merged changes from latest mobileweb cli
Merge remote-tracking branch 'origin/master'