Creating template
Merge remote-tracking branch 'openshift/master'

Conflicts:
	.openshift/markers/java7
	src/main/java/.gitkeep
	src/main/resources/.gitkeep
multithread