Merged overwritten templates with changes from bootstrap3 repository