test
Merge branch 'master' of https://github.com/hsirvio/grizzly_webservice

Conflicts:
	Delalbazar/target/classes/META-INF/maven/Delalbazar/Delalbazar/pom.properties