commit everything
Merge branch 'origin/master'

Conflicts:
	onyx/onyx-csharp.sln
	onyx/onyx.sln