Merge remote-tracking branch 'origin/master'

Conflicts:
	coo-s-vote/src/test/java/readme.txt