#345 mechanika (kilka zmian)
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/Plugin/Pisma/View/Elements/editor.ctp