fix fix fix
Merge branch 'master' of https://github.com/Hatscat/CodeShaFu_project

Conflicts:
	editor.php