upgraded project to play 2.2.1
updated tests
resolved merge