Merge branch 'master' of https://github.com/thushear/redis-spring

Conflicts:
	src/main/java/com/interface21/context/MessageSource.java