migrated master to play 2.2
bumped version to 2.2RC2
merge upstream to 2.2.1