Next development version
Merge branch 'master' of github.com:abiquo/task-service into 2.6

Conflicts:
	pom.xml
Use common-test instead of api-model/tests
Merge 2.6