RCB
Merge branch 'master' into hello-world
FSB 80.
Merge branch 'master' into hello-world
RCB
Merge branch 'master' into hello-world
Simplified.
Merge branch 'master' into hello-world

Conflicts:
	src/main/java/de/schlichtherle/demo/guice/Bootstrap.java
Asking for pull requests with different localizations.
Merge branch 'master' into hello-world