push some spring changes, currently will not run though
Merge remote-tracking branch 'origin/master'