Commit to work
Merge branch 'master' of https://github.com/Superliminal/YoutubeRPG

Conflicts:
	TileMapEditorYoutube/ContentLibrary/ContentLibrary.dll
	TileMapEditorYoutube/TileMapEditorYoutube/ContentLibrary.dll
	TileMapEditorYoutube/TileMapEditorYoutube/Editor.cs