Merge branch 'release/1.0.1'
Adds correct calls to will / did move to parent controller
Merge branch 'release/1.0.2'
Merge branch 'master' into develop
messed up branching model for a bit there