Rand % commit
Merge branch 'master' of https://github.com/dadamitskiy/Scarlet-Metaphor

Conflicts:
	ROGProtoPrototype/ROGProtoPrototype-csharp.sln
	ROGProtoPrototype/ROGProtoPrototype.sln
	ROGProtoPrototype/ROGProtoPrototype.userprefs