Begin new SNAPSHOT.
Merge branch 'master' of https://github.com/Avira/couchdoop into develop

Conflicts:
	pom.xml
Merge branch 'master' into develop

Conflicts:
	pom.xml