Merge from Tibor main branch.
Merge branch 'master' of git://github.com/MiquelSanahuja/mTor
Add some dependencies.
Merge branch 'master' of git://github.com/MiquelSanahuja/mTor

Conflicts:
	pom.xml