merge
gitignore
Merge branch 'master' of https://github.com/timon-langlotz/Repotelligence

Conflicts:
	plug-ins/org.repotelligence.core/src/org/repotelligence/core/ui/wizard/ResourceSelectionPage.java
	plug-ins/org.repotelligence.target/.gitignore