test branch
test branch
Merge remote-tracking branch 'origin/arbuz_tests'

Conflicts:
	hello/pom.xml
	hello/src/main/scala/istuff/hello/rest/HelloResource.scala
Test z felixa
Revert "felix v4.2"

This reverts commit cdad423fd90e81d2c07d1edffe20c650bf10fa20.
Test z felixa