Updated detailed diffs.
Merge branch 'master' of github.com:atomfrede/animated-octo-adventure

Conflicts:
	jenkins.web/src/main/webapp/app/controllers/findbugs.js