fixing merge conflicts
Merge branch 'master' of https://github.com/jming/spring2013