Implement project type when put-project and put-version: https://bugzilla.redhat.com/show_bug.cgi?id=895280
Merge branch 'integration/master' of github.com:zanata/zanata-api into integration/master

Conflicts:
	zanata-common-api/src/main/java/org/zanata/rest/dto/ProjectType.java