Setting up arquillian as the integration environment
Merge remote-tracking branch 'origin/master'