Test to parse scala 'self' keyword. WIP.
Merge branch 'master' into server