Merge remote-tracking branch 'remotes/origin/v1.0-dev-foooon' into v1.0-dev-Emil

Conflicts:
	Simplanum Extension/templates/tpls.js
вёрстка просмотрщика