Merge branch 'stemming' into develop

Conflicts:
	.gitignore
	data-processing.sln
	data-processing.vcxproj
reorganised projects