Refactoring deployment phase user prompt
Merge remote-tracking branch 'upstream/master'
Fixing merge errors
Merge pull request #23 from elElmo/master

Fixing merge problems