changed *Controller to *Bean
Merge remote-tracking branch 'origin/second-edition' into second-edition