Update Scala to 2.11.0
temp
Merge branch 'master' of https://github.com/limansky/ts2scala

Conflicts:
	build.sbt