Error controller and other changes
Merge branch 'master' of https://github.com/staafl/team-azure-dragon
dll commit