content update
Merge branch 'master' of https://github.com/filin-from-2042/Lynxcms

Conflicts:
	protected/runtime/application.log