Merging JavaConfig branch into master. Spring updated to 4, JavaConfig updates tested, Test cases updated. Still need to fix Controller test.