Chapter 02 - Auto Scanning and Auto wiring
Merge remote-tracking branch 'origin/master'

Conflicts:

	lab/spring/documentation/spring-in-action/part1-core-spring/chapter01.html