version bump
Fix test data multiple scope
upgrade to play 2.2.4
Fix merge conflicts