removed target from git
Merge branch 'master' of git@github.com:utwente-di/di20.git

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/20/webapp/pom.properties