Fixed merging of README
Merge branch '2.1-spring4-dev' into 2.1-spring4-master