Resavanje Darkovih konflikta. Primer 2.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Spring3Example/src/main/java/com/mkyong/core/Test.java