merge
Merge branch 'master' of https://github.com/Stigol-LLC/Divitron

Conflicts:
	Divitron-csharp.sln
	Divitron.sln