Base configuration for Spring IoC and MVC.
Merge remote-tracking branch 'origin/master'