plugin config
plugin config
plugin config
Merge remote-tracking branch 'origin/master' into plugin

Conflicts:
	jsglr-layout/.classpath
	jsglr-layout/.externalToolBuilders/Python grammar.launch
	jsglr-layout/.externalToolBuilders/jsglr haskell.launch
	jsglr-layout/META-INF/MANIFEST.MF
replace cycles
version
fix NPE
make standard tokenizer
Merge branch 'master' into plugin

Conflicts:
	jsglr-layout/.externalToolBuilders/jsglr haskell.launch
Merge remote-tracking branch 'origin/master' into plugin
removed legacy annotations; ignore-indent -> ignore-layout
register formater
require java 1.6
support max-parsing: parse as long as possible.
added test case
fix NPE
simplify filterTree a bit
Merge branch 'master' into plugin

Conflicts:
	jsglr-layout/.project
	jsglr-layout/src/org/spoofax/jsglr_layout/client/Disambiguator.java
add layout-constraint table
bugfix "all" constraint