deploy script and user spec
Merge remote-tracking branch 'origin/master'