test
Merge branch 'master' of https://github.com/artlaber/monkeyshare.git

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