resolving issues with non-hierarchical URI
Merge branch 'master' of https://github.com/SL2Team/sl2.git

Conflicts:
	src/main/scala/de/tuberlin/uebb/sl2/modules/Configs.scala
fixing issue with non-hierarchical URI. CodeGenSpec-Tests fail,
currently.
Merge branch 'master' of https://github.com/SL2Team/sl2.git

Conflicts:
	src/main/scala/de/tuberlin/uebb/sl2/impl/MultiDriver.scala
	src/main/scala/de/tuberlin/uebb/sl2/modules/ModuleLinearization.scala
a principle problem remains: prelude from Jar file cannot be accessed
from Browser/node.js and needs to be copied
Merge branch 'master' of https://github.com/SL2Team/sl2

Conflicts:
	src/main/scala/de/tuberlin/uebb/sl2/impl/ModuleResolverImpl.scala
	src/main/scala/de/tuberlin/uebb/sl2/impl/MultiDriver.scala