merge conflicts solved, thanks Friedhelm!
Merge branch 'master' of github.com:rappidio/wizard