merging caef3b67512a4ea2af2866da88b62d199e95177a
Merge pull request #796 from lassewesth/master

Using junit instead of ruby for acceptance tests