update for play 2.1, some lint