Repo updates
Merge branch 'master' of https://github.com/parbake/install

Conflicts:
	config/jsc