maj server
maj TU
plugin javassist
resolve conflict
Merge branch 'master' of https://github.com/analytica-devteam/analytica-agent

Conflicts:
	src/test/java/com/kleegroup/analytica/agent/AbstractAgentManagerTest.java
	src/test/java/com/kleegroup/analytica/agent/local/managers-test.xml