Merging
Merge branch 'master' of https://github.com/phoenixoff/Editor

Conflicts:
	RemedyPic.v11.suo