Play 2.3 updates (rearrange the imports)