adapt to the new api when generating a new activity
Merge branch 'master' of github.com:greg0ire/switch