Changed to spring framework
Merge branch 'testBranchTom' of github.com:tkolsen/myplanner into testBranchTom