tt
Merge branch 'master' of github.com:krestine/randomSelectProject

Conflicts:
	RandomSelectProject/target/m2e-wtp/web-resources/META-INF/maven/com.project/myapp/pom.properties
z
Merge branch 'master' of github.com:krestine/randomSelectProject

Conflicts:
	RandomSelectProject/target/m2e-wtp/web-resources/META-INF/maven/com.project/myapp/pom.properties
mem