Merge remote-tracking branch 'origin/master'

Conflicts:
	UtH-develop/vs2013/TestProject/TestProject.vcxproj.filters

clubbing

???