Merge remote-tracking branch 'remotes/mpawlak/RELEASE-2.1-JSP' into RELEASE-2.1-JSP

Conflicts:
	core/activiti-context/src/main/java/org/aperteworkflow/ext/activiti/ActivitiBpmSession.java
	core/base-gui/src/main/java/pl/net/bluesoft/rnd/processtool/plugins/util/UserProcessQueuesSizeProvider.java
	core/base-gui/src/main/java/pl/net/bluesoft/rnd/processtool/ui/activity/ActivityQueuesPane.java
	core/base-gui/src/main/java/pl/net/bluesoft/rnd/processtool/ui/activity/QueueListPane.java
	core/base-gui/src/main/java/pl/net/bluesoft/rnd/processtool/ui/process/ProcessMultiViewDataPane.java
	core/base-gui/src/main/java/pl/net/bluesoft/rnd/processtool/ui/queues/QueuesMainPane.java
	core/base-gui/src/main/webapp/WEB-INF/web.xml
	core/integration-interface/src/main/java/pl/net/bluesoft/rnd/processtool/bpm/ProcessToolBpmSession.java
	core/integration-interface/src/main/java/pl/net/bluesoft/rnd/processtool/bpm/impl/AbstractProcessToolSession.java
	core/integration-interface/src/main/java/pl/net/bluesoft/rnd/processtool/filters/factory/ProcessInstanceFilterFactory.java
	core/integration/src/main/java/org/aperteworkflow/service/AperteWorkflowProcessServiceImpl.java
	core/integration/src/main/java/pl/net/bluesoft/rnd/processtool/dao/impl/ProcessDefinitionDAOImpl.java
	core/integration/src/main/java/pl/net/bluesoft/rnd/processtool/dao/impl/ProcessInstanceDAOImpl.java
	core/integration/src/main/java/pl/net/bluesoft/rnd/processtool/dao/impl/UserDataDAOImpl.java
	core/integration/src/main/java/pl/net/bluesoft/rnd/processtool/plugins/ProcessToolRegistryImpl.java
	core/jbpm-context/pom.xml
	core/jbpm-context/src/main/java/pl/net/bluesoft/rnd/pt/ext/jbpm/ProcessToolContextFactoryImpl.java
	core/jbpm-context/src/main/java/pl/net/bluesoft/rnd/pt/ext/jbpm/ProcessToolJbpmSession.java
	core/jbpm-context/src/main/java/pl/net/bluesoft/rnd/pt/ext/jbpm/query/BpmTaskFilterQuery.java
	core/jbpm-context/src/main/java/pl/net/bluesoft/rnd/pt/ext/jbpm/query/BpmTaskQuery.java
	core/jbpm-gui/pom.xml
	core/jbpm-gui/src/main/java/pl/net/bluesoft/rnd/util/ProcessToolRegistryContextLoader.java
	core/model/src/main/java/pl/net/bluesoft/rnd/processtool/model/BpmTask.java
	core/model/src/main/java/pl/net/bluesoft/rnd/processtool/model/QueueType.java
	core/model/src/main/java/pl/net/bluesoft/rnd/processtool/model/config/ProcessDefinitionConfig.java
	plugins/bpm-notifications/src/main/java/pl/net/bluesoft/rnd/pt/ext/bpmnotifications/step/SendMailStep.java