Migration to play 2.1
Upgraded jquery version
Merge remote-tracking branch 'origin/master'