Merge pull request #2 from benjamn/update-lineStart-in-scanXJSText

Update lineStart when lineNumber is incremented in scanXJSText
Fix parse error when static class method comes after proto method

This fails to parse:
`class A { foo() {} static bar() {}}`

I'm not sure exactly why the strict branching check was put in place, but we
don't need to do much more than check if the first token is 'static' when
parsing a method definition -- so this works and fixes the issue.

All tests pass, etc

https://code.google.com/p/esprima/issues/detail?id=430
Merge branch 'harmony' into fb-harmony
Add support for empty XJS expressions
Separate fb syntax tests into their own test file
Merge remote-tracking branch 'upstream/harmony' into fb-harmony

Conflicts:
	test/harmonytest.js
Use standard parse error for invalid token when expecting an XJSIdentifier
Add grammar for function signature type annotations
Adopt semver-compliant versioning that preserves both local and upstream versions

This fork of esprima, for the foreseeable future, only adds features to its
upstream counterpart. As such, we would like it to be possible to track both
changes to the upstream version it is tracking as well as local changes (in a
semver compliant way).

We've decided that the way we will do this is to simply make all semver version
parts equal to (fb-harmony version) * 1000 * (upstream version). If upstream
esprima ever gets to version 999, I'll admit defeat...but hopefully that's an
unlikely possibility.
Update package.json description and contributors info so that the esprima team doesn't get spam for issues with our fork, etc