# This is a combination of 2 commits.
# The first commit's message is:

refactor nodes editor interface
save/apply button
editor js fixes

# This is the 2nd commit message:

merge master
fix autologinUID
fix delete not checking csrf token

refactor nodes editor interface
save/apply button
editor js fixes

merge master

Update README.md
bugfixes
Merge branch 'master' into develop

Conflicts:
	public/editor/templates/widgets/model/form.tpl
	public/modules/core/abstract/module.php
Alternative response with symfony response
IOC in controller/actions
i18n refactoring //@todo move to symfony translation component
Changed namespace, skip `Modules`
Aliases to classes in config