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

Conflicts:
	pom.xml
	zanata-common-api/pom.xml
Merge branch 'release' into integration/master
Update zanata-parent
Revert "Update zanata-parent"

This reverts commit 7bb0ba8f0e4c413c15318f5f615052fccde721d9.
Upgrade parent; exclude findbugs:jsr305
Merge pull request #14 from zanata/exclude-jsr305

Exclude findbugs:jsr305
Remove exception for findbugs annotations
rhbz1110627 - add REST endpoint for project config
Merge pull request #15 from zanata/rhbz1110627-zanata-init

rhbz1110627 - add REST endpoint for project config
Remove banned dependencies
ignore intellij idea config
add function to get supported source types for a ProjectType
Add test for ProjectType and add license headers.
Merge pull request #17 from zanata/supported-source-types

Add function to ProjectType to get supported source types.
[maven-release-plugin] prepare release api-3.4.0
[maven-release-plugin] prepare for next development iteration
add .orig files to .gitignore
Merge diverged release branch with -s ours.

Release branch appears to have had a backported update, then had the
release plugin run to generate a tag and update version numbers.

I am merging it into master but discarding the version changes, so
that the release tag remains part of the direct history of the development
branch.

This is happening the day after a release was made. It should have been
done before, but there should be no harm in merging it now, it just means
the recent release node is not strictly an ancestor of the previous release.
The next release will be an ancestor of both.