;'
Merge remote-tracking branch 'origin/master'

Conflicts:
	taxi/target/m2e-wtp/web-resources/META-INF/maven/com.taxi/taxi/pom.properties