prepare for next development iteration
Merge remote-tracking branch 'origin/master' into integration/master

Conflicts:
	pom.xml
	zanata-common-api/pom.xml