Fixed merge issues.
Merge branch 'master' of https://github.com/phoenixoff/Editor

Conflicts:
	RemedyPic.v11.suo
Fixed save function. Now saves properly.
Fixed saving bug.
Fixed saving bug. Merged two commits.

Conflicts:
	RemedyPic.v11.suo