Fixed compliation error caused by conflicting merges

The changes to make the javascript router in Java return JavaScript, and
the movement of this to twirl, caused the build to fail.