bug editor fixed
Merge branch 'develop' of https://github.com/PhpNinja/Php-Ninja-Backoffice into develop

Conflicts:
	models/formModel.php