typescript plugin
Merge branch 'master' of github.com:LOG4900/Sauce

Conflicts:
	project/Settings.scala