Building Shell
Merge branch 'master' into createProj