diff --git a/wfe-appserver/pom.xml b/wfe-appserver/pom.xml
index 7dd5b61451..f5ace5db96 100644
--- a/wfe-appserver/pom.xml
+++ b/wfe-appserver/pom.xml
@@ -63,12 +63,6 @@
 			<version>${project.version}</version>
 			<type>ear</type>
 		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>wfe-remotebots</artifactId>
-			<version>${project.version}</version>
-			<type>ear</type>
-		</dependency>
 	</dependencies>
 
 	<build>
@@ -133,18 +127,6 @@
 							</descriptors>
 						</configuration>
 					</execution>
-					<execution>
-						<id>assemble-server-remotebots</id>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<phase>package</phase>
-						<configuration>
-							<descriptors>
-								<descriptor>src/assembly/7/wfe-bots-diff.xml</descriptor>
-							</descriptors>
-						</configuration>
-					</execution>
 				</executions>
 			</plugin>
 		</plugins>
diff --git a/wfe-appserver/src/assembly/4/wfe-bots-diff.xml b/wfe-appserver/src/assembly/4/wfe-bots-diff.xml
deleted file mode 100644
index 64a91dc30c..0000000000
--- a/wfe-appserver/src/assembly/4/wfe-bots-diff.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-
-	<id>remotebots-${version}</id>
-
-	<formats>
-		<format>zip</format>
-	</formats>
-
-	<includeBaseDirectory>false</includeBaseDirectory>
-
-	<dependencySets>
-		<dependencySet>
-			<includes>
-				<include>ru.runa.wfe:wfe-remotebots</include>
-			</includes>
-			<unpack>true</unpack>
-			<outputDirectory>jboss/server/default/deploy/runawfe.ear</outputDirectory>
-		</dependencySet>
-	</dependencySets>
-
-</assembly>
diff --git a/wfe-appserver/src/assembly/7/wfe-bots-diff.xml b/wfe-appserver/src/assembly/7/wfe-bots-diff.xml
deleted file mode 100644
index 0b93642016..0000000000
--- a/wfe-appserver/src/assembly/7/wfe-bots-diff.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-
-	<id>remotebots-${version}</id>
-
-	<formats>
-		<format>zip</format>
-	</formats>
-
-	<includeBaseDirectory>false</includeBaseDirectory>
-
-	<fileSets>
-		<fileSet>
-			<directory>${project.basedir}/src/main/resources/deployment</directory>
-			<outputDirectory>jboss/standalone/deployments</outputDirectory>
-		</fileSet>
-	</fileSets>
-
-	<dependencySets>
-		<dependencySet>
-			<includes>
-				<include>ru.runa.wfe:wfe-remotebots</include>
-			</includes>
-			<unpack>true</unpack>
-			<outputDirectory>jboss/standalone/deployments/runawfe.ear</outputDirectory>
-		</dependencySet>
-	</dependencySets>
-
-</assembly>
diff --git a/wfe-bots/src/main/jboss/server/default/conf/bot/TextFileTemplate_demo.txt b/wfe-bots/src/main/jboss/server/default/conf/bot/TextFileTemplate_demo.txt
deleted file mode 100644
index 8e01a7972e..0000000000
--- a/wfe-bots/src/main/jboss/server/default/conf/bot/TextFileTemplate_demo.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-        Report title: ${header}.
-
-                     number: ${number}       
-		     date:   ${date}
-
-
-        Text: 
-${mainText}
\ No newline at end of file
diff --git a/wfe-bots/src/main/jboss/server/default/conf/bot/demo/soapBot-whois.xml b/wfe-bots/src/main/jboss/server/default/conf/bot/demo/soapBot-whois.xml
deleted file mode 100644
index b59b2fae3e..0000000000
--- a/wfe-bots/src/main/jboss/server/default/conf/bot/demo/soapBot-whois.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<config xmlns="http://runa.ru/xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://runa.ru/xml webServiceTaskHandlerConfig.xsd">
-	<url>http://www.webservicex.net/whois.asmx</url>
-	<SOAPAction>http://www.webservicex.net/GetWhoIS</SOAPAction>
-	<request-method>POST</request-method>
-	<errorAction>IGNORE</errorAction>
-	<log>true</log>
-	<interaction>
-		<request>
-<![CDATA[<?xml version="1.0" encoding="utf-8"?>
-<soap:Envelope xmlns:runawfe="http://runa.ru/xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-  <soap:Body>
-    <GetWhoIS xmlns="http://www.webservicex.net">
-      <HostName><runawfe:variable name="DNS_name"/></HostName>
-    </GetWhoIS>
-  </soap:Body>
-</soap:Envelope>]]>
-		</request>
-		<response variable="DNS_information">
-<![CDATA[<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:wsx="http://www.webservicex.net" xmlns:wfe_ve="ru.runa.wf.logic.bot.WebServiceTaskHandler">
-    <xsl:script implements-prefix="wsx" language="java" src="java:ru.runa.wf.logic.bot.WebServiceTaskHandler"/>
-    <xsl:output method="text" indent="yes"/>
-    <xsl:template match="text()|@*|*|processing-instruction()|comment()"> 
-        <xsl:copy> 
-                <xsl:apply-templates select="text()|@*|*|processing-instruction()|comment()"/> 
-        </xsl:copy> 
-    </xsl:template> 
-    <xsl:template match="wsx:GetWhoISResult">
-      <xsl:variable name="variableName" value="DNS_information"/>
-      <xsl:variable name="variableValue" select="text()"/>
-      <xsl:value-of select="wfe_ve:setNewVariable('DNS_information', $variableValue)"/>
-    </xsl:template>
-</xsl:stylesheet>
-]]>
-		</response>
-	</interaction>
-</config>
\ No newline at end of file
diff --git a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/assigner1.properties b/wfe-bots/src/main/jboss/server/default/conf/bot/handler/assigner1.properties
deleted file mode 100644
index 1691a3ed89..0000000000
--- a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/assigner1.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-swimlaneName = dddSwimlane
-assignerFunction = ru.runa.af.organizationfunction.FirstParameterAssignerFunction(${executorId})
diff --git a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/msword-report.xml b/wfe-bots/src/main/jboss/server/default/conf/bot/handler/msword-report.xml
deleted file mode 100644
index ff7a6ee35b..0000000000
--- a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/msword-report.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<msword-report-task xmlns="http://runa.ru/xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://runa.ru/xml msword-report-task.xsd">
-	<!-- 
-		Bookmarks in sample-template.doc will be replaced by formated values of process variables.
-		Sample-templated will be saved as report.doc  and assigned to process variable resultWord.
-	-->
-	<report template-path="/bot/sample-template.doc" output-variable="resultWord" output-variable-file-name="report.doc">
-		<mapping bookmark="date" variable="date" />
-		<mapping bookmark="double" variable="double" />
-		<mapping bookmark="string" variable="string" />
-	</report>
-</msword-report-task>
diff --git a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/soapBotTest.xml b/wfe-bots/src/main/jboss/server/default/conf/bot/handler/soapBotTest.xml
deleted file mode 100644
index edc7e686b6..0000000000
--- a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/soapBotTest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<config xmlns="http://runa.ru/xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://runa.ru/xml soapHandlerConfig.xsd" url="http://localhost:8080/af.webservice/AuthenticationBean?wsdl" object="AuthenticationWebService" method="authenticateDB" service_wsdl="http://runa.ru/workflow/webservices">
-	<request>
-		<variable wfe_name="actorName" service_name="name" />
-		<variable wfe_name="actorPassword" service_name="password" />
-	</request>
-	<response>
-	</response>
-</config>
\ No newline at end of file
diff --git a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/text-report.xml b/wfe-bots/src/main/jboss/server/default/conf/bot/handler/text-report.xml
deleted file mode 100644
index a346a05190..0000000000
--- a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/text-report.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<config xmlns="http://runa.ru/xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://runa.ru/xml textreport.xsd">
-	<template fileName="/bot/TextFileTemplate_demo.txt" fileEncoding="UTF8" />
-	<report fileName="textFile.txt" fileEncoding="UTF8" variableName="resultTextFile" contentType="plain/text" />
-	<replacements xmlFormat="true" applyToRegexp="false" />
-</config>
\ No newline at end of file
diff --git a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/textFile.xml b/wfe-bots/src/main/jboss/server/default/conf/bot/handler/textFile.xml
deleted file mode 100644
index f56528f166..0000000000
--- a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/textFile.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<config xmlns="http://runa.ru/xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://runa.ru/xml textreport.xsd">
-	<template fileName="/bot/TextFileTemplate_demo.txt" fileEncoding="UTF8" />
-
-	<report fileName="textFile.txt" fileEncoding="UTF8" variableName="resultTextFile" contentType="plain/text" />
-
-	<replacements xmlFormat="true" applyToRegexp="false" />
-
-     <formatters>
-            <variable variableName="date" formatClass="ru.runa.wf.web.forms.format.DateFormat" pattern="dd-MM-yy" />
-      </formatters>
-</config>
\ No newline at end of file
diff --git a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/update1.xml b/wfe-bots/src/main/jboss/server/default/conf/bot/handler/update1.xml
deleted file mode 100644
index c804a24fd8..0000000000
--- a/wfe-bots/src/main/jboss/server/default/conf/bot/handler/update1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<config xmlns="http://runa.ru/xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://runa.ru/xml update-permissions.xsd">
-	<method>set</method>
-	<orgFunctions>
-		<orgFunction>ru.runa.af.organizationfunction.ExecutorByNameFunction(Dofs)</orgFunction>
-		<orgFunction>ru.runa.af.organizationfunction.ExecutorByNameFunction(?)</orgFunction>
-		<orgFunction>ru.runa.af.organizationfunction.ExecutorByNameFunction(${executorId})</orgFunction>
-	</orgFunctions>
-	<permissions>
-		<permission>permission.read</permission>
-	</permissions>
-	<condition varName="testDecisionVar" varValue="test" />
-</config>
\ No newline at end of file
diff --git a/wfe-bots/src/main/jboss/server/default/conf/bot/sample-template.doc b/wfe-bots/src/main/jboss/server/default/conf/bot/sample-template.doc
deleted file mode 100644
index f722b14947..0000000000
Binary files a/wfe-bots/src/main/jboss/server/default/conf/bot/sample-template.doc and /dev/null differ
diff --git a/wfe-core/src/main/adminkit/conf/jndi.properties b/wfe-core/src/main/adminkit/conf/jndi.properties
deleted file mode 100644
index 908696bef3..0000000000
--- a/wfe-core/src/main/adminkit/conf/jndi.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-java.naming.factory.initial=org.jboss.naming.remote.client.InitialContextFactory
-java.naming.factory.url.pkgs=org.jboss.ejb.client.naming
-java.naming.provider.url=remote://localhost:4447
-#java.naming.security.principal=user
-#java.naming.security.credentials=pass
-jboss.naming.client.ejb.context=true
\ No newline at end of file
diff --git a/wfe-core/src/main/adminkit/conf/wfe.custom.ejb.properties b/wfe-core/src/main/adminkit/conf/wfe.custom.ejb.properties
deleted file mode 100644
index f95328d7a3..0000000000
--- a/wfe-core/src/main/adminkit/conf/wfe.custom.ejb.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-ejb.type=remote
-
-# How to build JNDI name for EJBs.  
-# Supported placeholders are: ${username} (user login), ${domain.name} (as specified in property 'authentication.domain.name')
-#  ${bean.name} name of the EJB
-#  ${ejb.type} as specified in property 'ejb.type'
-#  ${interface.class.name} interface class name
-#  ${jar.name} ejb jar name (i.e. wfe-service)
-# 
-#  Examples
-#  (jboss4, deploy without EAR) AD (default)           ${bean.name}/${ejb.type}
-#  (jboss4, deployed as EAR)                           runawfe/${bean.name}/${ejb.type}
-#  (jboss7, deployed as EAR, in client app)            runawfe/${jar.name}/${bean.name}!${interface.class.name}
-#  (jboss7, deployed as EAR, inside jboss)             java:global/runawfe/${jar.name}-${jar.version}/${bean.name}!${interface.class.name}
-ejb.jndiName.format=runawfe/${jar.name}-4.2.0RC/${bean.name}!${interface.class.name}
-
diff --git a/wfe-core/src/main/adminkit/ldap-importer.bat b/wfe-core/src/main/adminkit/ldap-importer.bat
deleted file mode 100644
index 89166d0b05..0000000000
--- a/wfe-core/src/main/adminkit/ldap-importer.bat
+++ /dev/null
@@ -1,14 +0,0 @@
-@echo off
-
-REM ########Configuration###############
-
-set LOGIN="Administrator"
-set PASSWORD="wf"
-
-REM ########End of Configuration###############
-
-set CLASSPATH=".\conf;.\lib\*"
-
-set JAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,address=8789,server=y,suspend=n"
-
-java %JAVA_OPTS% -cp %CLASSPATH% ru.runa.wfe.service.client.LDAPImporterClient %LOGIN% %PASSWORD%
diff --git a/wfe-core/src/main/adminkit/ldap-importer.sh b/wfe-core/src/main/adminkit/ldap-importer.sh
deleted file mode 100644
index 81f3575865..0000000000
--- a/wfe-core/src/main/adminkit/ldap-importer.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-########Configuration###############
-LOGIN="Administrator"
-PASSWORD="wf"
-########End of Configuration###############
-
-CLASSPATH="./conf:./lib/*"
-
-java -cp ${CLASSPATH} ru.runa.wfe.service.client.LDAPImporterClient ${LOGIN} ${PASSWORD}
diff --git a/wfe-core/src/main/adminkit/lib/content b/wfe-core/src/main/adminkit/lib/content
deleted file mode 100644
index 27559d7fc8..0000000000
--- a/wfe-core/src/main/adminkit/lib/content
+++ /dev/null
@@ -1,10 +0,0 @@
-commons-codec-1.7.jar                   jboss-marshalling-1.3.11.GA.jar                 spring-core-3.1.2.RELEASE.jar
-commons-logging.jar                     jboss-marshalling-river-1.3.11.GA.jar           spring-expression-3.1.2.RELEASE.jar
-dom4j-1.6.1.jar                         jboss-remote-naming-1.0.2.Final.jar             spring-jdbc-3.1.2.RELEASE.jar
-guava-17.0.jar                          jboss-remoting-3.2.3.GA.jar                     spring-orm-3.1.2.RELEASE.jar
-jboss7ejbclient-0.0.1-SNAPSHOT.jar      jboss-sasl-1.0.0.Final.jar                      spring-tx-3.1.2.RELEASE.jar
-jboss-ejb-api_3.1_spec-1.0.1.Final.jar  jboss-transaction-api_1.1_spec-1.0.0.Final.jar  wfe-bots-4.2.0-SNAPSHOT.jar
-jboss-ejb-client-1.0.5.Final.jar        spring-aop-3.1.2.RELEASE.jar                    wfe-core-4.2.0-SNAPSHOT.jar
-jboss-logging-3.1.0.GA.jar              spring-asm-3.1.2.RELEASE.jar                    wfe-service-4.2.0-SNAPSHOT.jar
-jboss-logmanager-1.2.2.GA.jar           spring-beans-3.1.2.RELEASE.jar                  xnio-api-3.0.3.GA.jar
-jboss-logmanager-log4j-1.0.0.GA.jar     spring-context-3.1.2.RELEASE.jar                xnio-nio-3.0.3.GA.jar
diff --git a/wfe-core/src/main/adminkit/log4j.xml b/wfe-core/src/main/adminkit/log4j.xml
deleted file mode 100644
index c2c6e11512..0000000000
--- a/wfe-core/src/main/adminkit/log4j.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
-   <!-- A time/date based rolling appender -->
-   <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="File" value="client.log"/>
-      <param name="Append" value="true"/>
-      <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-      <layout class="org.apache.log4j.PatternLayout">
-         <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
-      </layout>
-   </appender>
-
-   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Message\n -->
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-      </layout>
-   </appender>
-
-   <category name="ru.runa">
-     <priority value="DEBUG"/>
-   </category>
-
-   <root>
-      <priority value="INFO" />
-      <appender-ref ref="CONSOLE"/>
-      <appender-ref ref="FILE"/>
-   </root>
-
-</log4j:configuration>
diff --git a/wfe-core/src/main/adminkit/script-runner.bat b/wfe-core/src/main/adminkit/script-runner.bat
deleted file mode 100644
index d7160e9abe..0000000000
--- a/wfe-core/src/main/adminkit/script-runner.bat
+++ /dev/null
@@ -1,18 +0,0 @@
-@echo off
-
-REM ########Configuration###############
-
-set SCRIPT_PATH="scripts/deploy-samples-script.xml"
-set LOGIN="Administrator"
-set PASSWORD="wf"
-
-REM ########End of Configuration###############
-
-set CLASSPATH=".\conf;.\lib\*"
-
-set JAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,address=8789,server=y,suspend=n"
-
-java %JAVA_OPTS% -cp %CLASSPATH% ru.runa.wfe.service.client.AdminScriptClient %SCRIPT_PATH% %LOGIN% %PASSWORD%
-
-
-
diff --git a/wfe-core/src/main/adminkit/script-runner.sh b/wfe-core/src/main/adminkit/script-runner.sh
deleted file mode 100644
index 375082b0e8..0000000000
--- a/wfe-core/src/main/adminkit/script-runner.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-########Configuration###############
-SCRIPT_PATH="scripts/deploy-samples-script.xml"
-LOGIN="Administrator"
-PASSWORD="wf"
-########End of Configuration###############
-
-CLASSPATH="./conf:./lib/*"
-
-if [ "$JAVA_HOME" != "" ]
-then
-	JAVA=$JAVA_HOME/bin/java
-else
-	JAVA=java
-fi
-
-JAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,address=8789,server=y,suspend=n"
-
-$JAVA $JAVA_OPTS -cp ${CLASSPATH} ru.runa.wfe.service.client.AdminScriptClient ${SCRIPT_PATH} ${LOGIN} ${PASSWORD}
diff --git a/wfe-core/src/main/adminkit/scripts/deploy-samples-script.xml b/wfe-core/src/main/adminkit/scripts/deploy-samples-script.xml
deleted file mode 100644
index 5490c613c5..0000000000
--- a/wfe-core/src/main/adminkit/scripts/deploy-samples-script.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<workflowScript xmlns="http://runa.ru/xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<createGroup name="manager" description="group for managers"/>
-	<createGroup name="human resource" description="group for human resource department"/>
-	<createGroup name="bookkeeper" description="group for bookkeepers"/>
-	<createGroup name="staff" description="group for main work personal"/>
-	<createGroup name="all" description="group for all employees"/>
-
-	<createActor name="julius" fullName="Gaius Julius Caesar" password="123" />
-	<createActor name="nero" fullName="Nero Claudius Caesar" password="123" />
-	<createActor name="cleopatra" fullName="Cleopatra VII The Daughter of the Pharaoh" password="123" />
-	<createActor name="octavia" fullName="Octavia Minor" password="123" />
-	<createActor name="tiberius" fullName="Tiberius Claudius Drusus" password="123" />
-	<createActor name="marcus" fullName="Marcus Aurelius Antoninus" password="123" />
-	<createActor name="gaiua" fullName="Gaiua Flavius Valerius Constantinus" password="123" />
-	<createActor name="attila" fullName="Attila the King of Huns" password="123" />
-	<createActor name="caligula" fullName="Gaius Iulius Germanicus" password="123" />
-	<createActor name="UniversalBot" fullName="Bot for a Demo" password="321" />
-	<createActor name="StopBot" fullName="Bot for stopping old processes" password="321" />
-	<createActor name="WebServiceBot" fullName="Bot for executing web service requests" password="321" />
-
-	<namedIdentitySet name="allProcesses" type="ProcessDefinition">
-		<identity name="TextFileCreation"/>
-		<identity name="BotDemo"/>
-		<identity name="Businesstrip"/>
-		<identity name="Vacation"/>
-		<identity name="Overtime Work"/>
-		<identity name="Report"/>
-		<identity name="FileUpload"/>
-		<identity name="Hello World"/>
-		<identity name="SubProcess"/>
-		<identity name="MainProcess"/>
-		<identity name="MultiInstanceSubProcess"/>
-		<identity name="MultiInstanceProcess"/>
-		<identity name="ExecuteFormulaDemo"/>
-		<identity name="TimerDemo"/>
-		<identity name="BPMNdemo"/>
-		<identity name="AjaxFormDemo"/>
-		<identity name="WebService - who is"/>
-		<identity name="MSWordReport"/>
-	</namedIdentitySet>
-	<namedIdentitySet name="managerProcesses" type="ProcessDefinition">
-		<identity name="Businesstrip"/>
-		<identity name="Overtime Work"/>
-		<identity name="Report"/>
-	</namedIdentitySet>
-	<namedIdentitySet name="genericProcesses" type="ProcessDefinition">
-		<identity name="TextFileCreation"/>
-		<identity name="BotDemo"/>
-		<identity name="Vacation"/>
-		<identity name="FileUpload"/>
-		<identity name="Hello World"/>
-		<identity name="MainProcess"/>
-		<identity name="MultiInstanceProcess"/>
-		<identity name="ExecuteFormulaDemo"/>
-		<identity name="TimerDemo"/>
-		<identity name="AjaxFormDemo"/>
-		<identity name="BPMNdemo"/>
-		<identity name="WebService - who is"/>
-		<identity name="MSWordReport"/>
-	</namedIdentitySet>
-		
-	<namedIdentitySet name="allActors" type="Executor">
-		<identity name="julius"/>
-		<identity name="nero"/>
-		<identity name="cleopatra"/>
-		<identity name="octavia"/>
-		<identity name="tiberius"/>
-		<identity name="marcus"/>
-		<identity name="gaiua"/>
-		<identity name="attila"/>
-		<identity name="caligula"/>
-		<identity name="UniversalBot"/>
-	</namedIdentitySet>
-	<namedIdentitySet name="allGroupsExceptALL" type="Executor">
-		<identity name="manager"/>
-		<identity name="human resource"/>
-		<identity name="bookkeeper"/>
-		<identity name="staff"/>
-	</namedIdentitySet>
-
-	<deployProcessDefinition file="../samples/Hello World.par" />
-	<deployProcessDefinition file="../samples/BPMNdemo.par" />
-	<deployProcessDefinition file="../samples/ExecuteFormulaDemo.par"/>
-	<deployProcessDefinition file="../samples/AjaxFormDemo.par" />
-	<deployProcessDefinition file="../samples/FileUpload.par" />
-	<deployProcessDefinition file="../samples/TimerDemo.par" />
-	<deployProcessDefinition file="../samples/Report.par" />
-	<deployProcessDefinition file="../samples/Overtime Work.par" />
-	<deployProcessDefinition file="../samples/Vacation.par" /> 
-	<deployProcessDefinition file="../samples/Businesstrip.par" />
-	<deployProcessDefinition file="../samples/MainProcess.par" />
-	<deployProcessDefinition file="../samples/SubProcess.par" />
-	<deployProcessDefinition file="../samples/MultiInstanceProcess.par" />
-	<deployProcessDefinition file="../samples/MultiInstanceSubProcess.par" />
-	<deployProcessDefinition file="../samples/BotDemo.par" />
-	<deployProcessDefinition file="../samples/TextFileCreation.par" />
-	<deployProcessDefinition file="../samples/WebService - who is.par" />
-	<deployProcessDefinition file="../samples/MSWordReport.par" />
-
-	<addPermissionsOnDefinition executor="all">
-		<namedIdentitySet name="allProcesses" type="ProcessDefinition"/>
-		<permission name="permission.read"/>
-		<permission name="permission.read_process"/>
-	</addPermissionsOnDefinition>
-	<addPermissionsOnDefinition executor="manager">
-		<namedIdentitySet name="managerProcesses" type="ProcessDefinition"/>
-		<permission name="permission.start_process"/>
-	</addPermissionsOnDefinition>
-	<addPermissionsOnDefinition executor="all">
-		<namedIdentitySet name="genericProcesses" type="ProcessDefinition"/>
-		<permission name="permission.start_process"/>
-	</addPermissionsOnDefinition>
-
-	<addExecutorsToGroup name="Administrators">
-		<executor name="StopBot"/>
-	</addExecutorsToGroup>
-
-	<addExecutorsToGroup name="manager">
-		<executor name="julius"/>
-		<executor name="nero"/>
-	</addExecutorsToGroup>
-
-	<addExecutorsToGroup name="human resource">
-		<executor name="cleopatra"/>
-		<executor name="octavia"/>
-	</addExecutorsToGroup>
-
-	<addExecutorsToGroup name="bookkeeper">
-		<executor name="caligula"/>
-		<executor name="tiberius"/>
-	</addExecutorsToGroup>
-
-	<addExecutorsToGroup name="staff">
-		<executor name="marcus"/>
-		<executor name="gaiua"/>
-		<executor name="attila"/>
-	</addExecutorsToGroup>
-
-	<addExecutorsToGroup name="all">
-		<namedIdentitySet name="allActors" type="Executor"/>
-	</addExecutorsToGroup>
-
-	<addPermissionsOnSystem executor="all">
-		<permission name="permission.read"/>
-		<permission name="permission.login_to_system"/>
-	</addPermissionsOnSystem> 
-	
-	<addPermissionsOnGroup executor="all">
-		<namedIdentitySet name="allGroupsExceptALL" type="Executor"/>
-		<permission name="permission.read"/>
-		<permission name="permission.list_group"/>
-	</addPermissionsOnGroup>
-
-	<addPermissionsOnActor executor="all">
-		<namedIdentitySet name="allActors" type="Executor"/>
-		<permission name="permission.read"/>
-	</addPermissionsOnActor>
-
-	<addPermissionsOnBotStations executor="UniversalBot">
-		<permission name="permission.read"/>
-	</addPermissionsOnBotStations>
-	<addPermissionsOnBotStations executor="StopBot">
-		<permission name="permission.read"/>
-	</addPermissionsOnBotStations>
-	<addPermissionsOnBotStations executor="WebServiceBot">
-		<permission name="permission.read"/>
-	</addPermissionsOnBotStations>
-	
-	<createBotStation name="localbotstation" address="localhost:10099" />
-	<createBot botStation="localbotstation" name="UniversalBot" password="321" startTimeout="200"/>
-	<createBot botStation="localbotstation" name="StopBot" password="321" startTimeout="200"/>
-	<createBot botStation="localbotstation" name="WebServiceBot" password="321" startTimeout="200"/>
-	<addConfigurationsToBot botStation="localbotstation" name="UniversalBot">
-		<botConfiguration name="DoNothing" handler="ru.runa.wf.logic.bot.DoNothingTaskHandler" configuration="" />
-		<botConfiguration name = "create text file" handler="ru.runa.wf.logic.bot.TextReportTaskHandler" configuration="bot/handler/textFile.xml" />
-		<botConfiguration name = "Generate MS Word Report" handler="ru.runa.wf.logic.bot.MSWordReportTaskHandler" configuration="bot/handler/msword-report.xml" />
-	</addConfigurationsToBot>
-	<addConfigurationsToBot botStation="localbotstation" name="StopBot">
-		<botConfiguration name="state1" handler="ru.runa.wf.logic.bot.CancelOldProcesses" configuration=""/>
-	</addConfigurationsToBot>
-	<addConfigurationsToBot botStation="localbotstation" name="WebServiceBot">
-		<botConfiguration name="Load whois information" handler="ru.runa.wf.logic.bot.WebServiceTaskHandler" configuration="bot/demo/soapBot-whois.xml"/>
-	</addConfigurationsToBot>
-	
-	<relation name="Boss">
-		<left>
-			<executor name="nero"/>
-		</left>
-		<right>
-			<executor name="caligula"/>
-			<executor name="attila"/>
-		</right>
-	</relation>
-	<relation name="Boss">
-		<left>
-			<executor name="julius"/>
-		</left>
-		<right>
-			<executor name="julius"/>
-			<executor name="nero"/>
-			<executor name="cleopatra"/>
-			<executor name="octavia"/>
-			<executor name="tiberius"/>
-			<executor name="marcus"/>
-		</right>
-	</relation>
-	
-</workflowScript>
diff --git a/wfe-core/src/main/adminkit/scripts/features-demonstration-script.xml b/wfe-core/src/main/adminkit/scripts/features-demonstration-script.xml
deleted file mode 100644
index c413b742af..0000000000
--- a/wfe-core/src/main/adminkit/scripts/features-demonstration-script.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<workflowScript xmlns="http://runa.ru/xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	 <!-- This script was designed to demonstrate features of RUNA WFE scripting language
-	 it shows how to create/remove executors, grant/set/removke permissions etc.
-	 -->
-	<createGroup name="employee"/>
-	<createGroup name="boss"/>
-	<createActor name="dorothy" fullName="Dorothy Gale" />
-	<createActor name="toto" description="Dorothy's dog" />
-	<createActor name="lion" fullName="The Cowardly Lion" />
-	<createActor name="scarecrow" fullName="The Scarecrow" />
-	<createActor name="tin" fullName="The Tin Man"  password="secretword" />
-	<createActor name="gulch" fullName="The Wicked Witch of the West"  description="Someone we will create and delete in this script" />
-
-	<addExecutorsToGroup name="employee">
-		<executor name="lion"/>
-		<executor name="dorothy"/>
-		<executor name="scarecrow"/>
-		<executor name="tin"/>
-		<executor name="gulch"/>
-	</addExecutorsToGroup>
-	
-	<removeExecutorsFromGroup name="employee">
-		<executor name="dorothy"/>
-	</removeExecutorsFromGroup>
-
-	<addExecutorsToGroup name="boss">
-		<executor name="dorothy"/>
-	</addExecutorsToGroup>
-
-	<setPermissionsOnActor name="toto" executor="dorothy">
-		<permission name="permission.update_permissions"/>
-	</setPermissionsOnActor>
-
-	<addPermissionsOnActor name="toto" executor="dorothy">
-		<permission name="permission.read"/>
-	</addPermissionsOnActor>
-
-	<removePermissionsOnActor name="toto" executor="dorothy">
-		<permission name="permission.update_permissions"/>
-	</removePermissionsOnActor>
-
-	<setPermissionsOnGroup name="employee" executor="dorothy">
-		<permission name="permission.read"/>
-		<permission name="permission.update_permissions"/>
-	</setPermissionsOnGroup>
-
-	<addPermissionsOnGroup name="employee" executor="dorothy">
-		<permission name="permission.list_group"/>
-		<permission name="permission.add_to_group"/>
-		<permission name="permission.remove_from_group"/>
-	</addPermissionsOnGroup>
-
-	<removePermissionsOnGroup name="employee" executor="dorothy">
-		<permission name="permission.update_permissions"/>
-	</removePermissionsOnGroup>
-
-	<addPermissionsOnGroup name="employee" executor="employee">
-		<permission name="permission.read"/>
-		<permission name="permission.list_group"/>
-		<permission name="permission.add_to_group"/>
-		<permission name="permission.remove_from_group"/>
-	</addPermissionsOnGroup>
-
-	<addPermissionsOnActor name="tin" executor="employee">
-		<permission name="permission.read"/>
-		<permission name="permission.update_permissions"/>
-	</addPermissionsOnActor>
-
-	<setPermissionsOnDefinition name="Vacation" executor="employee">
-		<permission name="permission.read"/>
-	</setPermissionsOnDefinition>
-	
-	<addPermissionsOnDefinition name="Vacation" executor="employee">
-		<permission name="permission.read"/>
-		<permission name="permission.update_permissions"/>
-		<permission name="permission.redeploy_definition"/>
-		<permission name="permission.undeploy_definition"/>
-		<permission name="permission.start_process"/>
-		<permission name="permission.read_process"/>
-	</addPermissionsOnDefinition>
-	
-	<removePermissionsOnDefinition name="Vacation" executor="employee">
-		<permission name="permission.update_permissions"/>
-	</removePermissionsOnDefinition>
-	
-	<setPermissionsOnProcesses name="Vacation" executor="employee">
-		<permission name="permission.read" />
-		<permission name="permission.update_permissions" />
-	</setPermissionsOnProcesses>
-	
-	
-	<addPermissionsOnProcesses name="Vacation" executor="employee">
-		<permission name="permission.cancel_process" />
-	</addPermissionsOnProcesses>
-
-    <removePermissionsOnProcesses name="Vacation" executor="employee">
-		<permission name="permission.update_permissions" />
-	</removePermissionsOnProcesses>
-
-	<setPermissionsOnSystem executor="employee">
-		<permission name="permission.read" />
-		<permission name="permission.update_permissions" />
-	</setPermissionsOnSystem>
-
-	<addPermissionsOnSystem executor="employee">
-		<permission name="permission.login_to_system" />
-	</addPermissionsOnSystem>
-
-    <removePermissionsOnSystem executor="employee">
-		<permission name="permission.update_permissions" />
-	</removePermissionsOnSystem>
-
-	<deleteExecutor name="gulch" />
-
-	<!-- not implemented yet
-	<removeAllPermissionsFromSystem />
-	<removeAllPermissionsFromExecutor name="toto" />
-	<removeAllPermissionsFromProcessDefinition name="over time work demo" />
-	<removeAllPermissionsFromProcesses name="over time work demo" />
-	-->
-
-<!-- List of all possible permissions
-permission.read
-permission.update_permissions
-permission.login_to_system
-permission.create_executor
-permission.deploy_definition
-permission.update_executor
-permission.list_group
-permission.add_to_group
-permission.remove_from_group
-permission.redeploy_definition
-permission.undeploy_definition
-permission.start_process
-permission.read_process
-permission.cancel_process
-permission.bot_station_configure
--->
-
-
-</workflowScript>
diff --git a/wfe-core/src/main/adminkit/scripts/test-archive-remove-processes.xml b/wfe-core/src/main/adminkit/scripts/test-archive-remove-processes.xml
deleted file mode 100644
index 22f34c3e5e..0000000000
--- a/wfe-core/src/main/adminkit/scripts/test-archive-remove-processes.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<workflowScript xmlns="http://runa.ru/xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<!--used format pattern for DateTime="2007-02-02T23:59:59" -->
-<!--  
- <removeOldProcesses id="9" /> 
- <removeOldProcesses id="1" idTill="100"/> 
- <removeOldProcesses startDate="2010-06-23T11:30:00" endDate="2010-06-23T11:32:00" dateInterval="true" />
- <removeOldProcesses endDate="2010-05-20T20:00:00" /> 
- <removeOldProcesses startDate="2010-05-20T20:00:00" />
- <removeOldProcesses startDate="2009-10-06T18:30:00" endDate="2009-10-07T12:01:00" /> 
- <removeOldProcesses startDate="2010-05-28T20:00:00" name="Vacation" version="2" /> 
- <removeOldProcesses startDate="2010-05-28T20:00:00" name="Vacation" /> 
- <removeOldProcesses startDate="2010-05-28T20:00:00" name="Vacation" onlyFinished="false"/> 
- <removeOldProcessDefinitionVersion name="Vacation" version="5" />
- 
-  <archiveOldProcesses id="69" />
-  <archiveOldProcesses id="400" idTill="420" />
-  <archiveOldProcesses startDate="2010-06-23T11:30:00" endDate="2010-06-23T11:32:00" dateInterval="true" />  
-
-  <archiveOldProcesses startDate="2010-05-28T16:36:00" />  
-  <archiveOldProcesses startDate="2010-06-04T15:00:00" name="Vacation" version="2" /> 
- <archiveOldProcesses startDate="2009-12-29T13:29:00" />
-
- -->
- 
- <archiveOldProcesses id="1" idTill="100"/> 
- 
- 
-</workflowScript>
diff --git a/wfe-core/src/main/java/ru/runa/wfe/audit/TaskAssignLog.java b/wfe-core/src/main/java/ru/runa/wfe/audit/TaskAssignLog.java
index 32d3ff9c25..a1c17a225e 100644
--- a/wfe-core/src/main/java/ru/runa/wfe/audit/TaskAssignLog.java
+++ b/wfe-core/src/main/java/ru/runa/wfe/audit/TaskAssignLog.java
@@ -21,17 +21,22 @@
  */
 package ru.runa.wfe.audit;
 
+import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
+import java.util.List;
+import java.util.Set;
 import javax.persistence.DiscriminatorValue;
 import javax.persistence.Entity;
 import javax.persistence.Transient;
-
+import ru.runa.wfe.audit.presentation.ExecutorIdsValue;
 import ru.runa.wfe.audit.presentation.ExecutorNameValue;
 import ru.runa.wfe.task.Task;
+import ru.runa.wfe.user.Actor;
 import ru.runa.wfe.user.Executor;
 
 /**
  * Logging task assignment.
- * 
+ *
  * @author Dofs
  */
 @Entity
@@ -42,14 +47,19 @@ public class TaskAssignLog extends TaskLog {
     public TaskAssignLog() {
     }
 
-    public TaskAssignLog(Task task, Executor newExecutor) {
+    public TaskAssignLog(Task task, Executor oldExecutor, Executor newExecutor, Set<Actor> actors) {
         super(task);
-        if (task.getExecutor() != null) {
-            addAttribute(ATTR_OLD_VALUE, task.getExecutor().getName());
+        if (oldExecutor != null) {
+            addAttribute(ATTR_OLD_VALUE, oldExecutor.getName());
         }
         if (newExecutor != null) {
             addAttribute(ATTR_NEW_VALUE, newExecutor.getName());
         }
+        List<Long> ids = Lists.newArrayList();
+        for (Executor executor : actors) {
+            ids.add(executor.getId());
+        }
+        addAttribute(ATTR_MESSAGE, Joiner.on(ExecutorIdsValue.DELIM).join(ids));
         setSeverity(Severity.INFO);
     }
 
@@ -63,10 +73,15 @@ public String getNewExecutorName() {
         return getAttribute(ATTR_NEW_VALUE);
     }
 
+    @Transient
+    public String getExecutorIds() {
+        return getAttribute(ATTR_MESSAGE);
+    }
+
     @Override
     @Transient
     public Object[] getPatternArguments() {
-        return new Object[] { getTaskName(), new ExecutorNameValue(getAttribute(ATTR_NEW_VALUE)) };
+        return new Object[] { getTaskName(), new ExecutorNameValue(getAttribute(ATTR_NEW_VALUE)), new ExecutorIdsValue(getExecutorIds()) };
     }
 
     @Override
diff --git a/wfe-core/src/main/java/ru/runa/wfe/audit/presentation/ExecutorIdsValue.java b/wfe-core/src/main/java/ru/runa/wfe/audit/presentation/ExecutorIdsValue.java
index c606c01a66..4072331fb1 100644
--- a/wfe-core/src/main/java/ru/runa/wfe/audit/presentation/ExecutorIdsValue.java
+++ b/wfe-core/src/main/java/ru/runa/wfe/audit/presentation/ExecutorIdsValue.java
@@ -1,10 +1,9 @@
 package ru.runa.wfe.audit.presentation;
 
+import com.google.common.collect.Lists;
 import java.io.Serializable;
 import java.util.List;
 
-import com.google.common.collect.Lists;
-
 public class ExecutorIdsValue implements Serializable {
     private static final long serialVersionUID = 1L;
     public static final String DELIM = ";";
@@ -14,8 +13,10 @@ public ExecutorIdsValue() {
     }
 
     public ExecutorIdsValue(String idsString) {
-        for (String idString : idsString.split(DELIM, -1)) {
-            ids.add(Long.valueOf(idString));
+        if (idsString != null) {
+            for (String idString : idsString.split(DELIM, -1)) {
+                ids.add(Long.valueOf(idString));
+            }
         }
     }
 
diff --git a/wfe-core/src/main/java/ru/runa/wfe/task/Task.java b/wfe-core/src/main/java/ru/runa/wfe/task/Task.java
index dda4312bd3..90969b4392 100644
--- a/wfe-core/src/main/java/ru/runa/wfe/task/Task.java
+++ b/wfe-core/src/main/java/ru/runa/wfe/task/Task.java
@@ -43,8 +43,6 @@
 import org.apache.commons.logging.LogFactory;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
-import org.hibernate.annotations.Cascade;
-import org.hibernate.annotations.CascadeType;
 import org.hibernate.annotations.CollectionOfElements;
 import org.hibernate.annotations.ForeignKey;
 import org.hibernate.annotations.Index;
@@ -67,7 +65,9 @@
 import ru.runa.wfe.lang.InteractionNode;
 import ru.runa.wfe.lang.TaskDefinition;
 import ru.runa.wfe.task.logic.TaskNotifier;
+import ru.runa.wfe.user.Actor;
 import ru.runa.wfe.user.Executor;
+import ru.runa.wfe.user.Group;
 
 /**
  * is one task that can be assigned to an actor (read: put in someone's task list) and that can trigger the continuation of execution of the token
@@ -272,9 +272,13 @@ public void assignExecutor(ExecutionContext executionContext, Executor executor,
         if (!Objects.equal(getExecutor(), executor)) {
             log.debug("assigning " + this + " to " + executor);
             Executor previousExecutor = getExecutor();
-            // log this assignment
-            executionContext.addLog(new TaskAssignLog(this, executor));
-            // do the actual assignment
+            Set<Actor> assignedActors;
+            if (executor instanceof Group) {
+                assignedActors = Sets.newHashSet(ApplicationContextFactory.getExecutorDAO().getGroupActors((Group) executor));
+            } else {
+                assignedActors = Sets.newHashSet((Actor) executor);
+            }
+            executionContext.addLog(new TaskAssignLog(this, previousExecutor, executor, assignedActors));
             setExecutor(executor);
             setAssignDate(new Date());
             InteractionNode node = (InteractionNode) executionContext.getProcessDefinition().getNodeNotNull(nodeId);
diff --git a/wfe-office/src/main/java/ru/runa/wfe/office/doc/MergeDocxHandler.java b/wfe-office/src/main/java/ru/runa/wfe/office/doc/MergeDocxHandler.java
index c7e16e6aa7..1564f3bf69 100644
--- a/wfe-office/src/main/java/ru/runa/wfe/office/doc/MergeDocxHandler.java
+++ b/wfe-office/src/main/java/ru/runa/wfe/office/doc/MergeDocxHandler.java
@@ -9,8 +9,12 @@
 import org.apache.poi.xwpf.converter.pdf.PdfOptions;
 import org.apache.poi.xwpf.usermodel.IBodyElement;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.apache.poi.xwpf.usermodel.XWPFHyperlinkRun;
 import org.apache.poi.xwpf.usermodel.XWPFParagraph;
+import org.apache.poi.xwpf.usermodel.XWPFRelation;
+import org.apache.poi.xwpf.usermodel.XWPFRun;
 import org.apache.poi.xwpf.usermodel.XWPFTable;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTHyperlink;
 import ru.runa.wfe.definition.FileDataProvider;
 import ru.runa.wfe.office.doc.MergeDocxConfig.DocxInfo;
 import ru.runa.wfe.office.shared.FilesSupplierConfigParser;
@@ -43,14 +47,32 @@ protected Map<String, Object> executeAction(VariableProvider variableProvider, F
                 for (IBodyElement bodyElement : mergingDocument.getBodyElements()) {
                     if (bodyElement instanceof XWPFParagraph) {
                         XWPFParagraph paragraph = (XWPFParagraph) bodyElement;
-                        document.createParagraph();
+                        List<XWPFRun> runs = paragraph.getRuns();
+                        XWPFParagraph newParagraph = document.createParagraph();
+                        XWPFRun newRun = null;
+                        for (XWPFRun run : runs) {
+                            if (run instanceof XWPFHyperlinkRun) {
+                                XWPFHyperlinkRun hlRun = (XWPFHyperlinkRun) run;
+                                String rId = newParagraph
+                                        .getPart()
+                                        .getPackagePart()
+                                        .addExternalRelationship(hlRun.getCTHyperlink().getRArray(0).getTArray(0).getStringValue(),
+                                                XWPFRelation.HYPERLINK.getRelation()).getId();
+                                CTHyperlink newHyperlink = newParagraph.getCTP().addNewHyperlink();
+                                newHyperlink.set(hlRun.getCTHyperlink());
+                                newHyperlink.setId(rId);
+                                newRun = new XWPFHyperlinkRun(newHyperlink, newHyperlink.getRArray(0), newParagraph);
+                                newParagraph.addRun(newRun);
+                            } else {
+                                newRun = newParagraph.createRun();
+                                newRun.getCTR().set(run.getCTR());
+                            }
+                        }
                         if (docxInfo.addBreak) {
-                            paragraph.setPageBreak(true);
+                            newParagraph.setPageBreak(true);
                             docxInfo.addBreak = false;
                         }
-                        document.setParagraph(paragraph, document.getParagraphs().size() - 1);
-                    }
-                    if (bodyElement instanceof XWPFTable) {
+                    } else if (bodyElement instanceof XWPFTable) {
                         XWPFTable table = (XWPFTable) bodyElement;
                         document.createTable();
                         document.setTable(document.getTables().size() - 1, table);
diff --git a/wfe-remotebots/pom.xml b/wfe-remotebots/pom.xml
deleted file mode 100644
index 6783d557d3..0000000000
--- a/wfe-remotebots/pom.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>ru.runa.wfe</groupId>
-		<artifactId>wfe-app</artifactId>
-		<version>4-SNAPSHOT</version>
-		<relativePath>../wfe-app/pom.xml</relativePath>
-	</parent>
-
-	<artifactId>wfe-remotebots</artifactId>
-	<packaging>ear</packaging>
-
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>wfe-service</artifactId>
-			<version>${project.version}</version>
-			<type>jar</type>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>wfe-bots</artifactId>
-			<version>${project.version}</version>
-			<type>ejb</type>
-		</dependency>
-		<dependency>
-			<groupId>dom4j</groupId>
-			<artifactId>dom4j</artifactId>
-			<version>1.6.1</version>
-		</dependency>
-	</dependencies>
-
-	<profiles>
-		<profile>
-			<id>jboss7</id>
-			<activation>
-				<property>
-					<name>appserver</name>
-				</property>
-			</activation>
-			<properties>
-				<java.naming.factory.initial>org.jboss.naming.remote.client.InitialContextFactory</java.naming.factory.initial>
-				<java.naming.provider.url>remote://localhost:4447</java.naming.provider.url>
-				<java.naming.factory.url.pkgs></java.naming.factory.url.pkgs>
-				<jboss.naming.client.ejb.context>true</jboss.naming.client.ejb.context>
-			</properties>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-ear-plugin</artifactId>
-						<configuration>
-							<finalName>runawfe</finalName>
-							<displayName>RunaWFE remote botstation</displayName>
-							<version>5</version>
-							<defaultLibBundleDir>lib</defaultLibBundleDir>
-							<filtering>true</filtering>
-							<modules>
-								<jarModule>
-									<groupId>${project.groupId}</groupId>
-									<artifactId>wfe-core</artifactId>
-								</jarModule>
-								<jarModule>
-									<groupId>${project.groupId}</groupId>
-									<artifactId>wfe-service</artifactId>
-								</jarModule>
-								<ejbModule>
-									<groupId>${project.groupId}</groupId>
-									<artifactId>wfe-bots</artifactId>
-								</ejbModule>
-							</modules>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-
-</project>
diff --git a/wfe-remotebots/src/main/application/jndi.properties b/wfe-remotebots/src/main/application/jndi.properties
deleted file mode 100644
index 91238ae2f8..0000000000
--- a/wfe-remotebots/src/main/application/jndi.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# JbossAS4
-# java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-# java.naming.provider.url=jnp://rtwf.rtr.ru:10099
-# java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-
-# JbossAS7
-# java.naming.factory.initial=org.jboss.naming.remote.client.InitialContextFactory
-# java.naming.provider.url=remote://localhost:4447
-# jboss.naming.client.ejb.context=true
-
-java.naming.factory.initial=${java.naming.factory.initial}
-java.naming.provider.url=${java.naming.provider.url}
-java.naming.factory.url.pkgs=${java.naming.factory.url.pkgs}
-jboss.naming.client.ejb.context=${jboss.naming.client.ejb.context}
diff --git a/wfe-remotebots/src/main/application/wfe.custom.botstation.properties b/wfe-remotebots/src/main/application/wfe.custom.botstation.properties
deleted file mode 100644
index 4185e6be61..0000000000
--- a/wfe-remotebots/src/main/application/wfe.custom.botstation.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# customization goes here
-
-#botstation.invocation.period.seconds = 300
-#botstation.system.username = Administrator
-#botstation.system.password = wf
-
-#bot.logger.class=ru.runa.wfe.botlogger.RunaBotLogger
diff --git a/wfe-remotebots/src/main/application/wfe.custom.ejb.properties b/wfe-remotebots/src/main/application/wfe.custom.ejb.properties
deleted file mode 100644
index 99e2fddebf..0000000000
--- a/wfe-remotebots/src/main/application/wfe.custom.ejb.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-ejb.type=remote
-
-# How to build JNDI name for EJBs.  
-# Supported placeholders are: ${username} (user login), ${domain.name} (as specified in property 'authentication.domain.name')
-#  ${bean.name} name of the EJB
-#  ${ejb.type} as specified in property 'ejb.type'
-#  ${interface.class.name} interface class name
-# 
-#  Examples
-#  (jboss4, deploy without EAR) AD (default)           ${bean.name}/${ejb.type}
-#  (jboss4, deployed as EAR)                           runawfe/${bean.name}/${ejb.type}
-#  (jboss7, deployed as EAR, in client app)            runawfe/wfe.service/${bean.name}!${interface.class.name}
-#  (jboss7, deployed as EAR, inside jboss)             java:global/runawfe/wfe.service/${bean.name}!${interface.class.name}
-ejb.jndiName.format=runawfe/${bean.name}/${ejb.type}
diff --git a/wfe-web/src/main/webapp/WEB-INF/af/main_layout.jsp b/wfe-web/src/main/webapp/WEB-INF/af/main_layout.jsp
index 0701347c49..2c059b5bb9 100644
--- a/wfe-web/src/main/webapp/WEB-INF/af/main_layout.jsp
+++ b/wfe-web/src/main/webapp/WEB-INF/af/main_layout.jsp
@@ -105,7 +105,7 @@
 				--%>
 				<%= WebResources.getAdditionalLinks() %>
 				<div style="padding: 3px; color: #aaa;">
-					<bean:message key="title.version"/> <b><%= Version.get() %></b>
+					<bean:message key="title.version"/> <b><%= Version.get() %> Free</b>
 				</div>
 				<div style="padding: 3px; color: #ccc;">
 					<bean:message key="title.build"/>
diff --git a/wfe-web/src/main/webapp/WEB-INF/classes/struts.properties b/wfe-web/src/main/webapp/WEB-INF/classes/struts.properties
index 7392f7f93b..f17bfa5f3a 100644
--- a/wfe-web/src/main/webapp/WEB-INF/classes/struts.properties
+++ b/wfe-web/src/main/webapp/WEB-INF/classes/struts.properties
@@ -234,7 +234,7 @@ history.log.SendMessageLog = Sent message <b>{0}</b>
 history.log.SubprocessEndLog = Subprocess <b>{0}</b> completed 
 history.log.SubprocessStartLog = Subprocess <b>{0}</b> started 
 history.log.SwimlaneAssignLog = Swimlane <b>{0}</b> assigned to <b>{1}</b>
-history.log.TaskAssignLog = Task <b>{0}</b> assigned to executor <b>{1}</b>
+history.log.TaskAssignLog = Task <b>{0}</b> assigned to executor <b>{1}</b> (new are: <b>{2}</b>)
 history.log.TaskCancelledLog = Task <b>{0}</b> was cancelled by handler <b>{1}</b>
 history.log.TaskCreateLog = Created task <b>{0}</b>
 history.log.TaskDelegationLog = Task <b>{0}</b> delegated to <b>{1}</b> by <b>{2}</b>
diff --git a/wfe-web/src/main/webapp/WEB-INF/classes/struts_ru.properties b/wfe-web/src/main/webapp/WEB-INF/classes/struts_ru.properties
index 7a391b74a6..70538fc405 100644
--- a/wfe-web/src/main/webapp/WEB-INF/classes/struts_ru.properties
+++ b/wfe-web/src/main/webapp/WEB-INF/classes/struts_ru.properties
@@ -229,7 +229,7 @@ history.log.SendMessageLog = \u041e\u0442\u043f\u0440\u0430\u0432\u043b\u0435\u0
 history.log.SubprocessEndLog = \u0417\u0430\u0432\u0435\u0440\u0448\u0435\u043d \u043f\u043e\u0434\u043f\u0440\u043e\u0446\u0435\u0441\u0441 <b>{0}</b>
 history.log.SubprocessStartLog = \u0417\u0430\u043f\u0443\u0449\u0435\u043d \u043f\u043e\u0434\u043f\u0440\u043e\u0446\u0435\u0441\u0441 <b>{0}</b>
 history.log.SwimlaneAssignLog = \u0420\u043e\u043b\u044c-\u0434\u043e\u0440\u043e\u0436\u043a\u0430 <b>{0}</b> \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0430 \u0438\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044e <b>{1}</b>
-history.log.TaskAssignLog = \u0417\u0430\u0434\u0430\u043d\u0438\u0435 <b>{0}</b> \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043e \u0438\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044e <b>{1}</b>
+history.log.TaskAssignLog = \u0417\u0430\u0434\u0430\u043d\u0438\u0435 <b>{0}</b> \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043e \u0438\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044e <b>{1}</b> (\u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u044b: <b>{2}</b>)
 history.log.TaskCancelledLog = \u0417\u0430\u0434\u0430\u043d\u0438\u0435 <b>{0}</b> \u043e\u0442\u043c\u0435\u043d\u0435\u043d\u043e \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a\u043e\u043c <b>{1}</b>
 history.log.TaskCreateLog = \u0421\u043e\u0437\u0434\u0430\u043d\u043e \u0437\u0430\u0434\u0430\u043d\u0438\u0435 <b>{0}</b>
 history.log.TaskDelegationLog = \u0417\u0430\u0434\u0430\u043d\u0438\u0435 <b>{0}</b> \u0434\u0435\u043b\u0435\u0433\u0438\u0440\u043e\u0432\u0430\u043d\u043e <b>{1}</b> \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u043c <b>{2}</b>
diff --git a/wfe-web/src/main/webapp/WEB-INF/common/version.jsp b/wfe-web/src/main/webapp/WEB-INF/common/version.jsp
index 361c4139cb..524e100d65 100644
--- a/wfe-web/src/main/webapp/WEB-INF/common/version.jsp
+++ b/wfe-web/src/main/webapp/WEB-INF/common/version.jsp
@@ -5,7 +5,7 @@
 <tiles:insert page="/WEB-INF/af/main_layout.jsp" flush="true">
 
 <tiles:put name="body" type="string" >
-	<p>Версия <b><%= ru.runa.common.Version.get() %></b></p>
+	<p>Версия <b><%= ru.runa.common.Version.get() %> Free</b></p>
 	<p>Запуск <b><%= ru.runa.common.Version.getStartupDateTimeString() %></b></p>
 </tiles:put>
 
diff --git a/wfe-web/src/main/webapp/images/big_logo.gif b/wfe-web/src/main/webapp/images/big_logo.gif
index 7633323390..aee00f2efa 100644
Binary files a/wfe-web/src/main/webapp/images/big_logo.gif and b/wfe-web/src/main/webapp/images/big_logo.gif differ