encoding and decoding special characters properly
Merge branch '2.1.x' of github.com:playframework/Play20 into 2.1.x