working mac version
Merge branch 'master' of https://github.com/iDevForFun/CrossPlatformEditor

Conflicts:
	CrossPlatformLogic/ImageLoader.cs
	WindowsEditor/bin/Debug/WindowsEditor.exe
	WindowsEditor/bin/Debug/WindowsEditor.exe.mdb
	WindowsEditor/obj/Debug/WindowsEditor.exe