Added background images and template layouts
merge conflict resolution