Merge conflict
Fixed screwed up permissions
Fix screwed up permissions
Add sterling bootstrap sub theme