Merge pull request #258 from SalesforceFoundation/feature/168-controllers-error-handling

Feature/168 controllers error handling
Update links to mrbelvedere for deployManagedUAT target
Merge pull request #261 from jlantz/feature/218-build-external-pull-req

Update links to mrbelvedere for deployManagedUAT target
Merge dev into feature/168-controllers-error-handling