...
Merge branch 'master' of https://github.com/lsoft/ml

Conflicts:
	MyNN/MyNN.sln.DotSettings.user