Merge remote-tracking branch 'origin/master'

Conflicts:
	target/classes/META-INF/maven/org.springframework/gs-scheduling-tasks/pom.properties
test commit 2
Merge remote-tracking branch 'origin/master'