Fix title in errors demo.
Add timeout- example for AngularJS.
Fix merge conflicts.