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

Conflicts:
	pom.xml