Merge branch 'master' of https://github.com/yocki/Activiti

pom.xml

 <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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-
+<!-- q -->
   <name>Activiti</name>
   <description>BPM and workflow engine</description>
   <groupId>org.activiti</groupId>