chmod +x install.sh
Tweaking
Merge branch 'master' into nextgen-inheritance-upgrade

Conflicts:
	install.sh