upgraded to play 2.2.2
Merge pull request #13 from carrielies/master

upgraded to play 2.2.2
Merge branch 'master' into ignore_twitter_test