home test

Signed-off-by: Ost <ost.mutant@gmail.com>
test

Signed-off-by: Ost <ost.mutant@gmail.com>
Merge branch 'master' of https://github.com/OstMutant/TestProject

Conflicts:
	.classpath
	target/m2e-wtp/web-resources/META-INF/maven/com.ost/prepare/pom.properties
test

Signed-off-by: Ost <ost.mutant@gmail.com>