ReleaseMerge
ReleaseMerge

Conflicts:
	Project/Project-csharp.sln
	Project/Project.sln
Merge branch 'master' into gui_edit

Conflicts:
	Project/Project-csharp.sln
	Project/Project.sln