Merge pull request #13 from carrielies/master

upgraded to play 2.2.2