Project updated to use Play 2.2.0
Merge remote-tracking branch 'origin/activate' into activate