Only disable wildcard imports if one of the namespaces being imported matches the namespace of the reference.
Don't import stratego-parallel.
Updated generated files.
Bump version to 1.2.0 and use Java 7.
Update generated files.
Support multiple custom-properties strategies.
Merge branch 'master' into prop-lists

Conflicts:
	org.metaborg.meta.lang.nabl/build.generated.xml
	org.metaborg.meta.lang.nabl/build.main.xml
	org.metaborg.meta.lang.nabl/trans/generation/sections.str
	org.metaborg.meta.lang.nabl/trans/generation/use-sites.str