Model
Merge branch 'master' of https://github.com/dlhextall/gti710-edroidz

Conflicts:

	target/m2e-wtp/web-resources/META-INF/maven/ca.etsmtl/edroidz/pom.properties