...
Merge branch 'master' of https://github.com/3rdstage/exercise.git

Conflicts:
	thirdstage.exercise.spring3/run/data/hsqldb/shop3.properties