Merge pull request #250 from mbenson/master

FORGE-729
FORGE-731: API support for nested annotations as annotation element values
FORGE-436: JavaSource needs a way to parse nested annotations