Merge remote-tracking branch 'origin/master'

Conflicts:

	TBEA/BusinessPerformance/Web/testWebProject/target/m2e-wtp/web-resources/META-INF/maven/com.tbea.test/testWebProject/pom.properties

merge