Add functionality to replace override blocks
Merge branch 'master' of github.com:incuna/angular-blocks